Merge branch 'dev-gameplay' of https://github.com/creyD/ludum_dare_46 into dev-gameplay

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].set_begin ( Vector2(100,150))
+	shownCards[1].set_begin (  Vector2(200,150))
+	shownCards[2].set_begin ( Vector2(300,150))
 	
 	
 func _on_Button_pressed():

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"]

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",

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"]

src/World.tscn

@@ -23,7 +23,7 @@ HeroTemplate = ExtResource( 1 )
 
 [node name="Background" parent="." instance=ExtResource( 7 )]
 pause_mode = 1
-frame = 40
+frame = 49
 
 [node name="FloorTileMap" type="TileMap" parent="."]
 pause_mode = 1
@@ -72,3 +72,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"]