From 3d318a5c073d422ffc5f5f76310b055375e5c45a Mon Sep 17 00:00:00 2001 From: Jonas Braus Date: Sat, 3 Aug 2024 17:28:37 +0200 Subject: [PATCH] fixed grow bug --- export_presets.cfg | 6 +-- scenes/levels/level_3.tscn | 81 +++++++++++++++++++------------------- scripts/player.gd | 1 + 3 files changed, 45 insertions(+), 43 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index 0b77979..9676f90 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -419,7 +419,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../../../../../home/jonas/Schreibtisch/Export_Mario_Web/retromario.html" +export_path="../../../../../home/jonas/Schreibtisch/Export_Web/retromario.html" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -438,10 +438,10 @@ html/head_include="" html/canvas_resize_policy=2 html/focus_canvas_on_start=true html/experimental_virtual_keyboard=false -progressive_web_app/enabled=false +progressive_web_app/enabled=true progressive_web_app/offline_page="" progressive_web_app/display=1 -progressive_web_app/orientation=0 +progressive_web_app/orientation=1 progressive_web_app/icon_144x144="" progressive_web_app/icon_180x180="" progressive_web_app/icon_512x512="" diff --git a/scenes/levels/level_3.tscn b/scenes/levels/level_3.tscn index eed61c4..659a171 100644 --- a/scenes/levels/level_3.tscn +++ b/scenes/levels/level_3.tscn @@ -7498,6 +7498,21 @@ sources/0 = SubResource("TileSetAtlasSource_ap3i2") a = Vector2(3435, -6.03052) b = Vector2(-161, -6.99857) +[sub_resource type="Animation" id="Animation_43lkd"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(768, 0)] +} + [sub_resource type="Animation" id="Animation_uhxu0"] resource_name = "idle" length = 2.0 @@ -7515,7 +7530,13 @@ tracks/0/keys = { "values": [Vector2(768, 0), Vector2(768, -128)] } -[sub_resource type="Animation" id="Animation_43lkd"] +[sub_resource type="AnimationLibrary" id="AnimationLibrary_7dsyn"] +_data = { +"RESET": SubResource("Animation_43lkd"), +"idle": SubResource("Animation_uhxu0") +} + +[sub_resource type="Animation" id="Animation_f8oep"] length = 0.001 tracks/0/type = "value" tracks/0/imported = false @@ -7527,13 +7548,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector2(768, 0)] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_7dsyn"] -_data = { -"RESET": SubResource("Animation_43lkd"), -"idle": SubResource("Animation_uhxu0") +"values": [Vector2(1360, -96)] } [sub_resource type="Animation" id="Animation_fan04"] @@ -7553,7 +7568,13 @@ tracks/0/keys = { "values": [Vector2(1360, -96), Vector2(1200, -96)] } -[sub_resource type="Animation" id="Animation_f8oep"] +[sub_resource type="AnimationLibrary" id="AnimationLibrary_83w78"] +_data = { +"RESET": SubResource("Animation_f8oep"), +"idle": SubResource("Animation_fan04") +} + +[sub_resource type="Animation" id="Animation_jcry1"] length = 0.001 tracks/0/type = "value" tracks/0/imported = false @@ -7565,13 +7586,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector2(1360, -96)] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_83w78"] -_data = { -"RESET": SubResource("Animation_f8oep"), -"idle": SubResource("Animation_fan04") +"values": [Vector2(1424, -96)] } [sub_resource type="Animation" id="Animation_jks6o"] @@ -7591,7 +7606,13 @@ tracks/0/keys = { "values": [Vector2(1424, -96), Vector2(1552, -96)] } -[sub_resource type="Animation" id="Animation_jcry1"] +[sub_resource type="AnimationLibrary" id="AnimationLibrary_cyuth"] +_data = { +"RESET": SubResource("Animation_jcry1"), +"idle": SubResource("Animation_jks6o") +} + +[sub_resource type="Animation" id="Animation_yp5lb"] length = 0.001 tracks/0/type = "value" tracks/0/imported = false @@ -7603,13 +7624,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector2(1424, -96)] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_cyuth"] -_data = { -"RESET": SubResource("Animation_jcry1"), -"idle": SubResource("Animation_jks6o") +"values": [Vector2(2160, -80)] } [sub_resource type="Animation" id="Animation_gx0ad"] @@ -7629,21 +7644,6 @@ tracks/0/keys = { "values": [Vector2(1952, -80), Vector2(2160, -80)] } -[sub_resource type="Animation" id="Animation_yp5lb"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector2(2160, -80)] -} - [sub_resource type="AnimationLibrary" id="AnimationLibrary_1r8uv"] _data = { "RESET": SubResource("Animation_yp5lb"), @@ -7856,7 +7856,8 @@ position = Vector2(800, -32) hit_object = ExtResource("12_3jx48") [node name="Flag" parent="." instance=ExtResource("7_8nkc7")] -position = Vector2(2440, -14) +z_index = 20 +position = Vector2(2438, -15) load_level = "level_0" level_score = 4 diff --git a/scripts/player.gd b/scripts/player.gd index c6fea44..d30210d 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -163,6 +163,7 @@ func _physics_process(delta): func grow(): if not is_big: is_big = true + position.y -= 20 collision_shape_2d.shape.height = 31 pipedetector_ground.position.y += 8