From 9bca89ae1af13ec83d1bcfd49a3a38e2590676cd Mon Sep 17 00:00:00 2001 From: Mienek <56996468+Mienek@users.noreply.github.com> Date: Mon, 20 Apr 2020 21:20:24 +0200 Subject: [PATCH 1/2] not working cards --- src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd | 16 ++++++++-------- src/Menus/SelectUpgradeUI/SelectUpgradeUI.tscn | 2 ++ src/Objects/Barrel/BarrelCard.tscn | 10 +++++----- src/World.tscn | 7 +++++-- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd b/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd index 699fa4e..bbba339 100644 --- a/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd +++ b/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd @@ -18,7 +18,7 @@ func starting(): DrNDr.usedCards[2]!=randcards[0] &&\ DrNDr.usedCards[3]!=randcards[0] &&\ DrNDr.usedCards[4]!=randcards[0]): - randcards[1] = randi() % DrNDrPre.cards.EMPTY + randcards[0] = randi() % DrNDrPre.cards.EMPTY while(randcards[0] == randcards[1] &&\ DrNDr.usedCards[0]!=randcards[1] &&\ DrNDr.usedCards[1]!=randcards[1] &&\ @@ -35,7 +35,7 @@ func starting(): DrNDr.usedCards[4]!=randcards[2]): randcards[2] = randi() % DrNDrPre.cards.EMPTY var shownCards = [] - for i in range(2): + for i in range(3): match randcards[i]: DrNDrPre.cards.BANANA: shownCards.append(load("res://Objects/Banana/BananaCard.tscn").instance()) @@ -49,15 +49,15 @@ func starting(): shownCards.append(load("res://Objects/Traps/Bear/BearCard.tscn").instance()) DrNDrPre.cards.FLAME: shownCards.append(load("res://Objects/Traps/Flame/FlameCard.tscn").instance()) - DrNDrPre.cards.SPIKE: - shownCards.append(load("res://Objects/Traps/Spike/SpikeCard.tscn").instance()) + #DrNDrPre.cards.SPIKE: + #shownCards.append(load("res://Objects/Traps/Spike/SpikeCard.tscn").instance()) DrNDrPre.cards.SLIME: shownCards.append(load("res://Objects/Slime/SlimeCard.tscn").instance()) - for i in range(2): + for i in range(3): $Cards.add_child(shownCards[i]) - shownCards[0].global_position = Vector2(100,150) - shownCards[1].global_position = Vector2(200,150) - shownCards[2].global_position = Vector2(300,150) + shownCards[0].rect_position = [100,150] + shownCards[1].rect_position = Vector2(200,150) + shownCards[2].rect_position = Vector2(300,150) func _on_Button_pressed(): diff --git a/src/Menus/SelectUpgradeUI/SelectUpgradeUI.tscn b/src/Menus/SelectUpgradeUI/SelectUpgradeUI.tscn index 23b4616..4dcb31e 100644 --- a/src/Menus/SelectUpgradeUI/SelectUpgradeUI.tscn +++ b/src/Menus/SelectUpgradeUI/SelectUpgradeUI.tscn @@ -25,4 +25,6 @@ text = "Continue" __meta__ = { "_edit_use_anchors_": false } + +[node name="Cards" type="Node" parent="."] [connection signal="pressed" from="Button" to="." method="_on_Button_pressed"] diff --git a/src/Objects/Barrel/BarrelCard.tscn b/src/Objects/Barrel/BarrelCard.tscn index 5a0e3e0..6ccf299 100644 --- a/src/Objects/Barrel/BarrelCard.tscn +++ b/src/Objects/Barrel/BarrelCard.tscn @@ -11,16 +11,16 @@ [sub_resource type="SpriteFrames" id=1] animations = [ { -"frames": [ ExtResource( 4 ) ], -"loop": false, -"name": "lvl0", -"speed": 60.0 -}, { "frames": [ ExtResource( 3 ) ], "loop": false, "name": "lvl1", "speed": 60.0 }, { +"frames": [ ExtResource( 4 ) ], +"loop": false, +"name": "lvl0", +"speed": 60.0 +}, { "frames": [ ExtResource( 2 ) ], "loop": false, "name": "lvl2", diff --git a/src/World.tscn b/src/World.tscn index 1ac8740..d365283 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 = 40 +frame = 1 [node name="FloorTileMap" type="TileMap" parent="."] pause_mode = 1 @@ -62,7 +62,6 @@ 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 @@ -72,3 +71,7 @@ margin_left = -42.0 margin_bottom = 24.0 text = "Win" [connection signal="pressed" from="CanvasLayer/Win" to="." method="_on_Win_pressed"] + +[editable path="CanvasLayer/DragNDropUI"] + +[editable path="CanvasLayer/SelectUpgradeUI"] From a759d0bcfb31aa8bc11565778a0aaea6e660fb73 Mon Sep 17 00:00:00 2001 From: Jan Schuffenhauer Date: Mon, 20 Apr 2020 21:38:29 +0200 Subject: [PATCH 2/2] 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