From bd4e70f02bdd38db89e7815ea1d1cd744cc437a7 Mon Sep 17 00:00:00 2001
From: Victor Turgeon <masfervic@hotmail.com>
Date: Wed, 11 Oct 2023 10:37:23 -0400
Subject: [PATCH] time remaining in ending page

---
 Scenes/Levels/level_1.tscn |  2 +-
 Scenes/ending.tscn         | 33 ++++++++++++++++++++++++++++++++-
 Scripts/ending.gd          |  6 +++++-
 Scripts/level.gd           |  1 +
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/Scenes/Levels/level_1.tscn b/Scenes/Levels/level_1.tscn
index b288a14..7d09f92 100644
--- a/Scenes/Levels/level_1.tscn
+++ b/Scenes/Levels/level_1.tscn
@@ -3,7 +3,7 @@
 [ext_resource type="Script" path="res://Scripts/level.gd" id="1_0nmok"]
 [ext_resource type="PackedScene" uid="uid://b8s2seg2lf7wo" path="res://Scenes/Tilemaps/tileset_1.tscn" id="1_4n82n"]
 [ext_resource type="PackedScene" uid="uid://cl7w6ndvons1a" path="res://Scenes/Props/candle_1.tscn" id="2_5hdq4"]
-[ext_resource type="PackedScene" uid="uid://cf7al5uln33rn" path="res://Scenes/Props/candle_2.tscn" id="2_o33c4"]
+[ext_resource type="PackedScene" uid="uid://by2xmwcng01uy" path="res://Scenes/Props/candle_2.tscn" id="2_o33c4"]
 [ext_resource type="PackedScene" uid="uid://b5lnjonlf4i1b" path="res://Scenes/enemy.tscn" id="4_g0oey"]
 [ext_resource type="PackedScene" uid="uid://0onqgygm832d" path="res://Scenes/Player/player.tscn" id="5_ik47y"]
 [ext_resource type="AudioStream" uid="uid://c3dy35dv368ft" path="res://Assets/Music/SisNeufPiDoozHuit.mp3" id="7_but47"]
diff --git a/Scenes/ending.tscn b/Scenes/ending.tscn
index c0cf4ec..1f0b372 100644
--- a/Scenes/ending.tscn
+++ b/Scenes/ending.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=87 format=3 uid="uid://drfn4qb06jfla"]
+[gd_scene load_steps=88 format=3 uid="uid://v0vtf1d1iusm"]
 
 [ext_resource type="Script" path="res://Scripts/ending.gd" id="1_1hyxj"]
 [ext_resource type="PackedScene" uid="uid://b8s2seg2lf7wo" path="res://Scenes/Tilemaps/tileset_1.tscn" id="2_yeqls"]
@@ -11,6 +11,7 @@
 [ext_resource type="Texture2D" uid="uid://ckeayob6k71b1" path="res://Assets/Witch/noBKG_WitchIdle_strip.png" id="7_wm35e"]
 [ext_resource type="Texture2D" uid="uid://dyoeqid128gvx" path="res://Assets/Golem/noBKG_GolemIdle_strip.png" id="8_gwm2y"]
 [ext_resource type="Texture2D" uid="uid://b3a5g03ukunfa" path="res://Assets/Knight/noBKG_KnightIdle_strip.png" id="10_hwaw0"]
+[ext_resource type="Texture2D" uid="uid://iy5flm8rgj60" path="res://Assets/Inverted hourglass1.png" id="12_iov5c"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_6btik"]
 atlas = ExtResource("5_pr1ps")
@@ -831,4 +832,34 @@ stream = ExtResource("3_q0fqf")
 pitch_scale = 0.4
 autoplay = true
 
+[node name="Time" type="Control" parent="."]
+layout_mode = 3
+anchors_preset = 0
+offset_left = 320.0
+offset_top = 96.0
+offset_right = 320.0
+offset_bottom = 96.0
+size_flags_vertical = 3
+
+[node name="HBoxContainer" type="HBoxContainer" parent="Time"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_top = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="Hourglass" type="TextureRect" parent="Time/HBoxContainer"]
+layout_mode = 2
+texture = ExtResource("12_iov5c")
+expand_mode = 2
+stretch_mode = 5
+
+[node name="TimeLabel" type="Label" parent="Time/HBoxContainer"]
+layout_mode = 2
+theme = ExtResource("4_br77t")
+text = "240 Seconds Remained"
+vertical_alignment = 2
+
 [connection signal="pressed" from="Quit" to="." method="_on_quit_pressed"]
diff --git a/Scripts/ending.gd b/Scripts/ending.gd
index c5126df..3c407e5 100644
--- a/Scripts/ending.gd
+++ b/Scripts/ending.gd
@@ -7,13 +7,17 @@ var message: String = ""
 var is_win: bool = true
 var army: Dictionary = {}
 var totalBlud: float = 0
+var remainingTime: String = "0"
 
 func _ready():
 	if is_win:
 		$WinningEnemy.hide()
 		$DeadEnemy.show()
 		$DeadEnemy.play("default")
+		$Time.show()
+		$Time/HBoxContainer/TimeLabel.text = remainingTime + " Seconds Remained"
 	if !is_win:
+		$Time.hide()
 		$WinningEnemy.show()
 		$DeadEnemy.hide()
 		$WinningEnemy.play("default")	
@@ -29,7 +33,7 @@ func _ready():
 	$TotalArmyComp/Separation/ArmyTotals/Wolves/AmtWolves.text = "0" if !army.has("Wolf") else str(army["Wolf"])
 	$TotalArmyComp/Separation/ArmyTotals/Necromancers/AmtNecromancer.text = "0" if !army.has("Necromancer") else str(army["Necromancer"])
 	$"TotalArmyComp/Separation/ArmyTotals/Pit Fiends/AmtPitFiend".text = "0" if !army.has("Pit Fiend") else str(army["Pit Fiend"])
-	$TotalArmyComp/Separation/TotalBludGen/AmtBlud.text = str(totalBlud)
+	$TotalArmyComp/Separation/TotalBludGen/AmtBlud.text = str(floor(totalBlud))
 	
 func _on_quit_pressed():
 	get_tree().quit()
diff --git a/Scripts/level.gd b/Scripts/level.gd
index cf38187..00ff023 100644
--- a/Scripts/level.gd
+++ b/Scripts/level.gd
@@ -21,6 +21,7 @@ func _process(delta):
 func win_screen():
 	var enemy = $Enemy
 	var end = load("res://Scenes/ending.tscn").instantiate()
+	end.remainingTime = str(length - time - 1)
 	end.totalBlud = player.totalBludGenerated
 	end.army = player.allSpawnedMonsters
 	end.killcount = enemy.killcount