From a759d0bcfb31aa8bc11565778a0aaea6e660fb73 Mon Sep 17 00:00:00 2001 From: Jan Schuffenhauer Date: Mon, 20 Apr 2020 21:38:29 +0200 Subject: [PATCH] HOTFIX: Doesnt brake anymore --- src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd | 6 +++--- src/Objects/Traps/Flame/FlameCard.tscn | 10 +++++----- src/World.tscn | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd b/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd index bbba339..45e5e89 100644 --- a/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd +++ b/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd @@ -55,9 +55,9 @@ func starting(): shownCards.append(load("res://Objects/Slime/SlimeCard.tscn").instance()) for i in range(3): $Cards.add_child(shownCards[i]) - shownCards[0].rect_position = [100,150] - shownCards[1].rect_position = Vector2(200,150) - shownCards[2].rect_position = Vector2(300,150) + shownCards[0].set_begin ( Vector2(100,150)) + shownCards[1].set_begin ( Vector2(200,150)) + shownCards[2].set_begin ( Vector2(300,150)) func _on_Button_pressed(): diff --git a/src/Objects/Traps/Flame/FlameCard.tscn b/src/Objects/Traps/Flame/FlameCard.tscn index 6515485..d78a194 100644 --- a/src/Objects/Traps/Flame/FlameCard.tscn +++ b/src/Objects/Traps/Flame/FlameCard.tscn @@ -11,6 +11,11 @@ [sub_resource type="SpriteFrames" id=1] animations = [ { +"frames": [ ExtResource( 5 ) ], +"loop": false, +"name": "lvl2", +"speed": 60.0 +}, { "frames": [ ExtResource( 4 ) ], "loop": false, "name": "lvl0", @@ -20,11 +25,6 @@ animations = [ { "loop": false, "name": "lvl1", "speed": 60.0 -}, { -"frames": [ ExtResource( 5 ) ], -"loop": false, -"name": "lvl2", -"speed": 60.0 } ] [node name="FlameCard" type="TextureRect"] diff --git a/src/World.tscn b/src/World.tscn index d365283..fcab27e 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -23,7 +23,7 @@ HeroTemplate = ExtResource( 1 ) [node name="Background" parent="." instance=ExtResource( 7 )] pause_mode = 1 -frame = 1 +frame = 49 [node name="FloorTileMap" type="TileMap" parent="."] pause_mode = 1 @@ -62,6 +62,7 @@ margin_right = 0.0 margin_bottom = 0.463318 [node name="SelectUpgradeUI" parent="CanvasLayer" instance=ExtResource( 9 )] +visible = false [node name="Win" type="Button" parent="CanvasLayer"] visible = false