From acc7f184c01ad30b2b16b31267fc05a816738bd8 Mon Sep 17 00:00:00 2001
From: Mienek <56996468+Mienek@users.noreply.github.com>
Date: Mon, 20 Apr 2020 20:21:07 +0200
Subject: [PATCH] some work on roundoverscreen- HAS BUGS

---
 src/Menus/DragNDrop/DragNDropUI.gd           | 16 ++++++
 src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd | 59 ++++++++++++++++++++
 src/World.gd                                 |  1 +
 src/World.tscn                               |  2 +-
 4 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/src/Menus/DragNDrop/DragNDropUI.gd b/src/Menus/DragNDrop/DragNDropUI.gd
index 197b207..e2e68c8 100644
--- a/src/Menus/DragNDrop/DragNDropUI.gd
+++ b/src/Menus/DragNDrop/DragNDropUI.gd
@@ -1,3 +1,19 @@
 extends Control
 
+var usedCards = [cards.BARREL,cards.BEAR,cards.EMPTY,cards.EMPTY,cards.EMPTY]
+
+enum cards {
+	BANANA,
+	BARRIERE,
+	BARREL,
+	SLIME,
+	TORCH,
+	BEAR,
+	FLAME,
+	SPIKE,
+	EMPTY
+}
+
+
+
 export var ObjectParent:NodePath
diff --git a/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd b/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd
index e7493d3..699fa4e 100644
--- a/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd
+++ b/src/Menus/SelectUpgradeUI/SelectUpgradeUI.gd
@@ -1,8 +1,67 @@
 extends Control
 
+const DrNDrPre = preload("res://Menus/DragNDrop/DragNDropUI.gd")
+var DrNDr 
 
 
+func _ready():
+	DrNDr = get_tree().current_scene.get_node("CanvasLayer").get_node("DragNDropUI")
+	
+	
+
+func starting():
+	var randcards = [0,0,0]
+	
+	randcards[0] = randi() % DrNDrPre.cards.EMPTY
+	while(DrNDr.usedCards[0]!=randcards[0] &&\
+		 DrNDr.usedCards[1]!=randcards[0] &&\
+		 DrNDr.usedCards[2]!=randcards[0] &&\
+		 DrNDr.usedCards[3]!=randcards[0] &&\
+		 DrNDr.usedCards[4]!=randcards[0]):
+		randcards[1] = randi() % DrNDrPre.cards.EMPTY
+	while(randcards[0] == randcards[1] &&\
+		 DrNDr.usedCards[0]!=randcards[1] &&\
+		 DrNDr.usedCards[1]!=randcards[1] &&\
+		 DrNDr.usedCards[2]!=randcards[1] &&\
+		 DrNDr.usedCards[3]!=randcards[1] &&\
+		 DrNDr.usedCards[4]!=randcards[1]):
+		randcards[1] = randi() % DrNDrPre.cards.EMPTY
+		randcards[2] = randi() % DrNDrPre.cards.EMPTY
+	while(randcards[0] == randcards[2] && randcards[1] == randcards[2] &&\
+		 DrNDr.usedCards[0]!=randcards[2] &&\
+		 DrNDr.usedCards[1]!=randcards[2] &&\
+		 DrNDr.usedCards[2]!=randcards[2] &&\
+		 DrNDr.usedCards[3]!=randcards[2] &&\
+		 DrNDr.usedCards[4]!=randcards[2]):
+		randcards[2] = randi() % DrNDrPre.cards.EMPTY
+	var shownCards = []
+	for i in range(2):
+		match randcards[i]:
+			DrNDrPre.cards.BANANA:
+				shownCards.append(load("res://Objects/Banana/BananaCard.tscn").instance())
+			DrNDrPre.cards.BARRIERE:
+				shownCards.append(load("res://Objects/Barriere/BarrierCard.tscn").instance())
+			DrNDrPre.cards.BARREL:
+				shownCards.append(load("res://Objects/Barrel/BarrelCard.tscn").instance())
+			DrNDrPre.cards.TORCH:
+				shownCards.append(load("res://Objects/Torch/TorchCard.tscn").instance())
+			DrNDrPre.cards.BEAR:
+				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.SLIME:
+				shownCards.append(load("res://Objects/Slime/SlimeCard.tscn").instance())
+	for i in range(2):
+		$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)
+	
+	
 func _on_Button_pressed():
 	Engine.time_scale=1
 	self.hide()
 	pass # Replace with function body.
+
diff --git a/src/World.gd b/src/World.gd
index c34e5a2..79d34dd 100644
--- a/src/World.gd
+++ b/src/World.gd
@@ -34,6 +34,7 @@ func hero_has_died():
 	var point = determine_spawnpoint()
 	spawn_new_hero(point.x,point.y)
 	$CanvasLayer/SelectUpgradeUI.show()
+	$CanvasLayer/SelectUpgradeUI.starting()
 
 
 func spawn_new_hero(x:float,y:float):
diff --git a/src/World.tscn b/src/World.tscn
index 2942171..1ac8740 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 = 58
+frame = 40
 
 [node name="FloorTileMap" type="TileMap" parent="."]
 pause_mode = 1