creyD/ludum_dare_46
1
0
Fork 0
mirror of https://github.com/creyD/ludum_dare_46.git synced 2026-06-13 22:12:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

not working cards

Browse Source
This commit is contained in:
Mienek
2020-04-20 21:20:24 +02:00
parent acc7f184c0
commit 9bca89ae1a
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd
View File

@@ -18,7 +18,7 @@ func starting():
DrNDr.usedCards[2]!=randcards[0] &&\ DrNDr.usedCards[2]!=randcards[0] &&\
DrNDr.usedCards[3]!=randcards[0] &&\ DrNDr.usedCards[3]!=randcards[0] &&\
DrNDr.usedCards[4]!=randcards[0]): DrNDr.usedCards[4]!=randcards[0]):
randcards[1] = randi() % DrNDrPre.cards.EMPTY randcards[0] = randi() % DrNDrPre.cards.EMPTY
while(randcards[0] == randcards[1] &&\ while(randcards[0] == randcards[1] &&\
DrNDr.usedCards[0]!=randcards[1] &&\ DrNDr.usedCards[0]!=randcards[1] &&\
DrNDr.usedCards[1]!=randcards[1] &&\ DrNDr.usedCards[1]!=randcards[1] &&\
@@ -35,7 +35,7 @@ func starting():
DrNDr.usedCards[4]!=randcards[2]): DrNDr.usedCards[4]!=randcards[2]):
randcards[2] = randi() % DrNDrPre.cards.EMPTY randcards[2] = randi() % DrNDrPre.cards.EMPTY
var shownCards = [] var shownCards = []
for i in range(2): for i in range(3):
match randcards[i]: match randcards[i]:
DrNDrPre.cards.BANANA: DrNDrPre.cards.BANANA:
shownCards.append(load("res://Objects/Banana/BananaCard.tscn").instance()) 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()) shownCards.append(load("res://Objects/Traps/Bear/BearCard.tscn").instance())
DrNDrPre.cards.FLAME: DrNDrPre.cards.FLAME:
shownCards.append(load("res://Objects/Traps/Flame/FlameCard.tscn").instance()) shownCards.append(load("res://Objects/Traps/Flame/FlameCard.tscn").instance())
DrNDrPre.cards.SPIKE: #DrNDrPre.cards.SPIKE:
shownCards.append(load("res://Objects/Traps/Spike/SpikeCard.tscn").instance()) #shownCards.append(load("res://Objects/Traps/Spike/SpikeCard.tscn").instance())
DrNDrPre.cards.SLIME: DrNDrPre.cards.SLIME:
shownCards.append(load("res://Objects/Slime/SlimeCard.tscn").instance()) shownCards.append(load("res://Objects/Slime/SlimeCard.tscn").instance())
for i in range(2): for i in range(3):
$Cards.add_child(shownCards[i]) $Cards.add_child(shownCards[i])
shownCards[0].global_position = Vector2(100,150) shownCards[0].rect_position = [100,150]
shownCards[1].global_position = Vector2(200,150) shownCards[1].rect_position = Vector2(200,150)
shownCards[2].global_position = Vector2(300,150) shownCards[2].rect_position = Vector2(300,150)
func _on_Button_pressed(): func _on_Button_pressed():

2
src/Menus/SelectUpgradeUI/SelectUpgradeUI.tscn
View File

@@ -25,4 +25,6 @@ text = "Continue"
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="Cards" type="Node" parent="."]
[connection signal="pressed" from="Button" to="." method="_on_Button_pressed"] [connection signal="pressed" from="Button" to="." method="_on_Button_pressed"]

10
src/Objects/Barrel/BarrelCard.tscn
View File

@@ -11,16 +11,16 @@
[sub_resource type="SpriteFrames" id=1] [sub_resource type="SpriteFrames" id=1]
animations = [ { animations = [ {
"frames": [ ExtResource( 4 ) ],
"loop": false,
"name": "lvl0",
"speed": 60.0
}, {
"frames": [ ExtResource( 3 ) ], "frames": [ ExtResource( 3 ) ],
"loop": false, "loop": false,
"name": "lvl1", "name": "lvl1",
"speed": 60.0 "speed": 60.0
}, { }, {
"frames": [ ExtResource( 4 ) ],
"loop": false,
"name": "lvl0",
"speed": 60.0
}, {
"frames": [ ExtResource( 2 ) ], "frames": [ ExtResource( 2 ) ],
"loop": false, "loop": false,
"name": "lvl2", "name": "lvl2",

7
src/World.tscn
View File

@@ -23,7 +23,7 @@ HeroTemplate = ExtResource( 1 )
[node name="Background" parent="." instance=ExtResource( 7 )] [node name="Background" parent="." instance=ExtResource( 7 )]
pause_mode = 1 pause_mode = 1
frame = 40 frame = 1
[node name="FloorTileMap" type="TileMap" parent="."] [node name="FloorTileMap" type="TileMap" parent="."]
pause_mode = 1 pause_mode = 1
@@ -62,7 +62,6 @@ margin_right = 0.0
margin_bottom = 0.463318 margin_bottom = 0.463318
[node name="SelectUpgradeUI" parent="CanvasLayer" instance=ExtResource( 9 )] [node name="SelectUpgradeUI" parent="CanvasLayer" instance=ExtResource( 9 )]
visible = false
[node name="Win" type="Button" parent="CanvasLayer"] [node name="Win" type="Button" parent="CanvasLayer"]
visible = false visible = false
@@ -72,3 +71,7 @@ margin_left = -42.0
margin_bottom = 24.0 margin_bottom = 24.0
text = "Win" text = "Win"
[connection signal="pressed" from="CanvasLayer/Win" to="." method="_on_Win_pressed"] [connection signal="pressed" from="CanvasLayer/Win" to="." method="_on_Win_pressed"]
[editable path="CanvasLayer/DragNDropUI"]
[editable path="CanvasLayer/SelectUpgradeUI"]