From 39a7eb14b487ada5b935ec98c37074af5c57c195 Mon Sep 17 00:00:00 2001
From: pennyrigate <pennyrigate@cybergal.com>
Date: Sat, 7 Jan 2023 03:02:26 -0500
Subject: [PATCH] saving and level list

---
 ...d.png-d633f5249ccc091a7e592fabc835a18c.md5 |   4 +-
 ....png-d633f5249ccc091a7e592fabc835a18c.stex | Bin 366 -> 366 bytes
 fonts/2ndpuberty..fnt                         |   2 +-
 fonts/2ndpuberty..tres                        |   3 ++
 game.gd                                       |  38 ++++++++++-----
 graphics/hud/hud.png                          | Bin 734 -> 736 bytes
 maps/level_select.gd                          |  32 ++++++++-----
 maps/level_select.tscn                        |  45 +++++++++++++++---
 maps/map01.gd                                 |   2 +
 maps/map01.tscn                               |   2 +
 objects/exit/exit.gd                          |  17 +++++++
 objects/hud/hud.gd                            |  12 ++---
 objects/hud/hud.tscn                          |  23 +++++----
 13 files changed, 128 insertions(+), 52 deletions(-)
 create mode 100644 fonts/2ndpuberty..tres

diff --git a/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.md5 b/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.md5
index 1d7212b..e1201a3 100644
--- a/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.md5
+++ b/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.md5
@@ -1,3 +1,3 @@
-source_md5="c0160f559a57791b0ab96a8c9ef45d0c"
-dest_md5="a40b0bbf70fb2e4f0d971d734f832ac1"
+source_md5="82f232cbd11bbebe6d1233db07f644d6"
+dest_md5="5ae15f7f93ebb7667d6cf1268987bb99"
 
diff --git a/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.stex b/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.stex
index 2522f531f6a39000be5b9c67c8d0a8cbc6571bed..e39c5ca39f5f405ecef6de596169341d3338af8e 100644
GIT binary patch
delta 177
zcmV;i08anz0`3BkvL4;DXGip(k=wRmWV!8j@;ewblB6id^w9q0J{|~|k<b@^MIvGp
zIGm?juqMK*F8$Js0kSBHEhT)^N%cc0s73z_l5W9zAOskOx98SlOaNod5?QYq1j&R8
z)`K+{+pX+T*05lWHJb`{huzYrvtL}SEoM`B)~RRNmLSr)X?)Y5bpKN=SP}X0A>=MQ
fAG`mNw}05~=l37^PyUnt<UjccPyXwF|N9?d?XFyM

delta 177
zcmV;i08anz0`3BkvK~FXXGip(k=wRmWV!8j@;ex}k)%k=$5;7>d${=Sk<b@^1rZ?%
z8l0zFuo}XvEd64}fLIj8CK5i%r1}AhX(@jONw;7SgaF0p?YZ?B6TleLMAmDDKsMom
zL0EIK*~%VeO%|)MW*foouv_wU_DdIPi`hn=W$IbBMXc#Gjc*zX-Tzbz*247o5T-0U
fAG`mNw}05~=l37^PyUnt<UjccPyXwF|N9?dNIYF$

diff --git a/fonts/2ndpuberty..fnt b/fonts/2ndpuberty..fnt
index d88c9c6..89d88e8 100644
--- a/fonts/2ndpuberty..fnt
+++ b/fonts/2ndpuberty..fnt
@@ -1,5 +1,5 @@
 info face="2ndPubertyMono" size=16 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=1,1,2,1 spacing=-2,0
-common lineHeight=20 base=12 scaleW=512 scaleH=512 pages=1 packed=0
+common lineHeight=7 base=12 scaleW=512 scaleH=512 pages=1 packed=0
 page id=0 file="2ndpuberty..png"
 chars count=97
 char id=0       x=108  y=20   width=8    height=20   xoffset=0    yoffset=-1   xadvance=6    page=0    chnl=0 
diff --git a/fonts/2ndpuberty..tres b/fonts/2ndpuberty..tres
new file mode 100644
index 0000000..dc36313
--- /dev/null
+++ b/fonts/2ndpuberty..tres
@@ -0,0 +1,3 @@
+[gd_resource type="BitmapFont" format=2]
+
+[resource]
diff --git a/game.gd b/game.gd
index c4de057..a06b551 100644
--- a/game.gd
+++ b/game.gd
@@ -77,20 +77,34 @@ func clear_collectibles():
 #Save
 func save():
 	var save = ConfigFile.new()
-	save.set_value(str(current_level),"High Score",Game.score)
-	save.set_value(str(current_level),"Golds",Game.golds)
-	save.set_value(str(current_level),"Shard0",Game.shards_collected[0])
-	save.set_value(str(current_level),"Shard1",Game.shards_collected[1])
-	save.set_value(str(current_level),"Shard2",Game.shards_collected[2])
-	save.set_value(str(current_level),"Shard3",Game.shards_collected[3])
-	save.set_value(str(current_level),"Shard4",Game.shards_collected[4])
-	save.set_value(str(current_level),"Shard5",Game.shards_collected[5])
-	save.set_value(str(current_level),"Shard6",Game.shards_collected[6])
-	save.set_value(str(current_level),"Shard7",Game.shards_collected[7])
-	save.set_value(str(current_level),"Shard8",Game.shards_collected[8])
-	save.set_value(str(current_level),"Shard9",Game.shards_collected[9])
+	save.load(str("user://file") + str(Game.current_file) + str(".pr"))
+	if Game.shards == 5 && Game.golds == 50:
+		save.set_value(str(current_level),"100% High Score",Game.score)
+		save.set_value(str(current_level),"100% Time",Game.time)
+	else:
+		save.set_value(str(current_level),"Any% High Score",Game.score)
+		save.set_value(str(current_level),"Any% Time",Game.time)
+	if Game.shards_collected[0] == true: save.set_value(str(current_level),"Shard0",Game.shards_collected[0])
+	if Game.shards_collected[1] == true: save.set_value(str(current_level),"Shard1",Game.shards_collected[1])
+	if Game.shards_collected[2] == true: save.set_value(str(current_level),"Shard2",Game.shards_collected[2])
+	if Game.shards_collected[3] == true: save.set_value(str(current_level),"Shard3",Game.shards_collected[3])
+	if Game.shards_collected[4] == true: save.set_value(str(current_level),"Shard4",Game.shards_collected[4])
+	if Game.shards_collected[5] == true: save.set_value(str(current_level),"Shard5",Game.shards_collected[5])
+	if Game.shards_collected[6] == true: save.set_value(str(current_level),"Shard6",Game.shards_collected[6])
+	if Game.shards_collected[7] == true: save.set_value(str(current_level),"Shard7",Game.shards_collected[7])
+	if Game.shards_collected[8] == true: save.set_value(str(current_level),"Shard8",Game.shards_collected[8])
+	if Game.shards_collected[9] == true: save.set_value(str(current_level),"Shard9",Game.shards_collected[9])
 	save.save(str("user://file") + str(current_file) + str(".pr"))
 
+func timeify(input):
+	var minutes = str(floor(input / 60))
+	var seconds = floor(fmod(input,60))
+	var milliseconds := floor(fmod(input, 1) * 100)
+	if input < 600:
+		return minutes + ":" + ("%02d" % seconds) + ":" + ("%02d" % milliseconds)
+	else:
+		return "9:59:99"
+
 func _process(delta):
 	#CRT FILTER
 	if Input.is_action_just_pressed("crt"):
diff --git a/graphics/hud/hud.png b/graphics/hud/hud.png
index 4e07fd47a4b9b20f0465e9f733c3b537bd9412d1..5a306d660c39c8e3fdd69996d2b1ebe5b5c193f0 100644
GIT binary patch
delta 311
zcmV-70m%N|1>gmcsei!$01m+cxRGn^0006NNkl<ZcwX(4?M@nD6bA8Qsfbd&|C{a0
zI!cMVhMJVLnVCT5uz$!iA#CDC&3k~`+uPa8+~G6s@h7H<<KpY@vjsk$Ai&uFMS;5?
z3kB})*9!cD0hmAF!3S>v=KZS$#{Q)O5BQu3F2An9cDoy|@qhkKfO-Eyf&VJNG>!e^
z>%J4<ao+#PrxVKoSoSB^71&OjX$07;1=!E~_iv9raV+q8|I@=0*Ey$QmtI$3yW2eP
zcF&vLN`Se*+WupKh5aMIVu91JORp<1e*bT*1-RMo*Y}SC_%{xRpN9kY8OKrY6EC~2
zz{~s(F!sOj;0c5G09r->JFjw+Q37+5U;<>5U;;lH$OF8-{sK+*1!hKDXB7Yd002ov
JPDHLkV1kz|pmqQN

delta 306
zcmV-20nPs41>Oaasei%%01m<d6(~x80006LNkl<ZcwX(4?P?-n6vphwxV5&nz5kot
z*J)H1JH;&w?2-f}$N3{q5I1qB<`m%m{(kn?Jm9Z*#D6eN95-Jpvjsk0Ai&uFO@W7B
z%LN`Ezbf#r1z`Sw2WLJ5%=;G$jQ!sfc)}MZxcyq4?RGa_<A42=0Q3Ik0{=&VX&U>-
zcl{*5^Su9=Pgh(AVA<bXYqOm;(+IFx3b3E|?>`@1aV)U7|K;h0>%wK&t=HOYcbnJU
z?sc<U2rw5|+J7vtynh6^DsUNg>$NuH_y5UKfV=&EdH*PYuQ?pv4hQZt$5E$=w_R)V
zKK}!Z{qH<Da|jBcWdyMEA*Yie0;Q8M0&p6OJiy1tZ$CK&W?(XcZ~y=R07*qoM6N<$
Eg2`!=y8r+H

diff --git a/maps/level_select.gd b/maps/level_select.gd
index 7e30ccb..8fad17b 100644
--- a/maps/level_select.gd
+++ b/maps/level_select.gd
@@ -6,6 +6,8 @@ onready var title = $Title
 onready var shard_title = $ShardTitle
 onready var shard_arrow = $ShardArrow
 onready var high_score = $HighScore
+onready var high_score_any = $HighScoreAny
+onready var high_score_100 = $HighScore100
 onready var golds = $Golds
 onready var levelarrow_up = $LevelArrowUp
 onready var levelarrow_down = $LevelArrowDown
@@ -45,6 +47,7 @@ func change_current_shard(amount):
 		shard_arrow.position.x += 15 * amount
 
 func change_current_level(amount):
+	#Change level
 	if current_level + amount != -1 && current_level + amount != levels.level.size(): #Check if in range
 		current_level += amount
 		#Show arrows or don't
@@ -63,17 +66,22 @@ func change_current_level(amount):
 		#Load new data
 		var save = ConfigFile.new()
 		save.load(str("user://file") + str(Game.current_file) + str(".pr"))
+		var str_level = str(current_level)
 		#Draw score and golds
-		high_score.text = str("%06d" % save.get_value(str(current_level),"High Score",0))
-		golds.text = str("%02d" % save.get_value(str(current_level),"Golds",0))
+#		high_score.text = str("%04d" % save.get_value(str_level,"High Score",0))
+#		golds.text = str("%02d" % save.get_value(str_level,"Golds",0))
+		#Draw High Scores
+		print(str_level)
+		high_score_any.text = "Any%\n" + str("%05d" % save.get_value(str_level,"Any% High Score",0)) + "\n" + str(Game.timeify(save.get_value(str_level,"Any% Time",0)))
+		high_score_100.text = "100%\n" + str("%05d" % save.get_value(str_level,"100% High Score",0)) + "\n" + str(Game.timeify(save.get_value(str_level,"100% Time",0)))
 		#Draw shards collected
-		shard0.visible = save.get_value(str(current_level),"Shard0",false)
-		shard1.visible = save.get_value(str(current_level),"Shard1",false)
-		shard2.visible = save.get_value(str(current_level),"Shard2",false)
-		shard3.visible = save.get_value(str(current_level),"Shard3",false)
-		shard4.visible = save.get_value(str(current_level),"Shard4",false)
-		shard5.visible = save.get_value(str(current_level),"Shard5",false)
-		shard6.visible = save.get_value(str(current_level),"Shard6",false)
-		shard7.visible = save.get_value(str(current_level),"Shard7",false)
-		shard8.visible = save.get_value(str(current_level),"Shard8",false)
-		shard9.visible = save.get_value(str(current_level),"Shard9",false)
+		shard0.visible = save.get_value(str_level,"Shard0",false)
+		shard1.visible = save.get_value(str_level,"Shard1",false)
+		shard2.visible = save.get_value(str_level,"Shard2",false)
+		shard3.visible = save.get_value(str_level,"Shard3",false)
+		shard4.visible = save.get_value(str_level,"Shard4",false)
+		shard5.visible = save.get_value(str_level,"Shard5",false)
+		shard6.visible = save.get_value(str_level,"Shard6",false)
+		shard7.visible = save.get_value(str_level,"Shard7",false)
+		shard8.visible = save.get_value(str_level,"Shard8",false)
+		shard9.visible = save.get_value(str_level,"Shard9",false)
diff --git a/maps/level_select.tscn b/maps/level_select.tscn
index e13021a..8d2638c 100644
--- a/maps/level_select.tscn
+++ b/maps/level_select.tscn
@@ -65,10 +65,12 @@ margin_top = 48.0
 margin_right = 184.0
 margin_bottom = 68.0
 theme = ExtResource( 1 )
-text = "test text"
+text = "test text
+"
 align = 1
 
 [node name="Golds" type="Label" parent="."]
+visible = false
 margin_left = 120.0
 margin_top = 88.0
 margin_right = 136.0
@@ -79,14 +81,41 @@ align = 1
 
 [node name="HighScoreText" type="Label" parent="."]
 margin_left = 56.0
-margin_top = 64.0
+margin_top = 62.0
 margin_right = 200.0
-margin_bottom = 96.0
+margin_bottom = 94.0
 theme = ExtResource( 1 )
-text = "High Score:"
+text = "High SCORE:
+
+"
+align = 1
+
+[node name="HighScoreAny" type="Label" parent="."]
+margin_left = 21.0
+margin_top = 74.0
+margin_right = 165.0
+margin_bottom = 111.0
+theme = ExtResource( 1 )
+text = "any%
+0000
+0:00:00
+"
+align = 1
+
+[node name="HighScore100" type="Label" parent="."]
+margin_left = 84.0
+margin_top = 74.0
+margin_right = 228.0
+margin_bottom = 111.0
+theme = ExtResource( 1 )
+text = "100%
+0000
+0:00:00
+"
 align = 1
 
 [node name="HighScore" type="Label" parent="."]
+visible = false
 margin_left = 56.0
 margin_top = 76.0
 margin_right = 200.0
@@ -97,15 +126,16 @@ align = 1
 
 [node name="ShardTitle" type="Label" parent="."]
 margin_left = 43.0
-margin_top = 124.0
+margin_top = 129.0
 margin_right = 213.0
-margin_bottom = 167.0
+margin_bottom = 172.0
 theme = ExtResource( 1 )
 text = "Collect all coins
 "
 align = 1
 
 [node name="ShardGraphics" type="Node2D" parent="."]
+position = Vector2( 0, 7 )
 
 [node name="Shard11" type="Sprite" parent="ShardGraphics"]
 modulate = Color( 0, 0, 0, 1 )
@@ -198,10 +228,11 @@ position = Vector2( 176, 115 )
 position = Vector2( 191, 115 )
 
 [node name="Gold" parent="." instance=ExtResource( 5 )]
+visible = false
 position = Vector2( 111, 91 )
 
 [node name="ShardArrow" type="Sprite" parent="."]
-position = Vector2( 61, 106 )
+position = Vector2( 61, 113 )
 texture = ExtResource( 4 )
 
 [node name="LevelArrowUp" type="Sprite" parent="."]
diff --git a/maps/map01.gd b/maps/map01.gd
index ca36c6d..e90a6b4 100644
--- a/maps/map01.gd
+++ b/maps/map01.gd
@@ -1,4 +1,6 @@
 extends Node2D
+export var target_time_any = 0
+export var target_time_100 = 0
 
 func _ready():
 	Game.play_sound(load("res://audio/music/rumble_loop.mp3"),Game.ac_music)
diff --git a/maps/map01.tscn b/maps/map01.tscn
index abe294b..2a793e6 100644
--- a/maps/map01.tscn
+++ b/maps/map01.tscn
@@ -25,6 +25,8 @@ extents = Vector2( 8, 128 )
 
 [node name="Map" type="Node2D"]
 script = ExtResource( 18 )
+target_time_any = 70
+target_time_100 = 180
 
 [node name="Camera2D" parent="." instance=ExtResource( 8 )]
 smoothing_enabled = false
diff --git a/objects/exit/exit.gd b/objects/exit/exit.gd
index 73bb516..d21add4 100644
--- a/objects/exit/exit.gd
+++ b/objects/exit/exit.gd
@@ -3,6 +3,7 @@ extends Node2D
 export var cost = 0
 onready var label = $Label
 onready var anims = $AnimationPlayer
+onready var map = get_owner()
 
 func _ready():
 	anims.play("closed")
@@ -16,5 +17,21 @@ func _physics_process(delta):
 func _on_Area2D_area_entered(area):
 	if area.is_in_group("player"): 
 		if Game.score > Game.high_score: Game.high_score = Game.score
+		#BONUSES
+			#Time bonus
+		if Game.golds == 50 && Game.shards == 5:
+			if Game.time < map.target_time_100: Game.score += floor(2500 * (Game.time / map.target_time_100))
+		else:
+			if Game.time < map.target_time_any: Game.score += floor(2500 * (Game.time / map.target_time_any))
+			#Collection bonus
+		if Game.golds == 50: Game.score += 500
+		if Game.shards == 5: Game.score += 500
+		if Game.golds == 50 && Game.shards == 5: Game.score += 250
+			#Life bonus
+		if Game.lives == 1: Game.score += 500
+		if Game.lives == 2: Game.score += 1500
+			#Perfect bonus
+		if Game.lives == 2 && Game.golds == 50 && Game.shards == 5 && Game.time < map.target_time_100:
+			Game.score += 1000
 		Game.save()
 		Game.change_map(load("res://maps/level_select.tscn"))
diff --git a/objects/hud/hud.gd b/objects/hud/hud.gd
index 7bb88ec..67fbd72 100644
--- a/objects/hud/hud.gd
+++ b/objects/hud/hud.gd
@@ -20,7 +20,7 @@ func _physics_process(delta):
 	#Gold Counter
 	gold_counter.text = "%02d" % Game.golds
 	#Shard Counter
-	shard_counter.text = "%02d" % Game.shards
+	shard_counter.text = str(Game.shards)
 	#Star Counter
 	red_star.visible = Game.stars[0]
 	yellow_star.visible = Game.stars[1]
@@ -28,7 +28,7 @@ func _physics_process(delta):
 	blue_star.visible = Game.stars[3]
 	magenta_star.visible = Game.stars[4]
 	#Score Counter
-	score_counter.text = "%06d" % Game.score
+	score_counter.text = "%05d" % Game.score
 	#Arrow Counter
 	arrow_counter.text = str(Game.arrows)
 	##TOUCH UP LATER
@@ -38,10 +38,4 @@ func _physics_process(delta):
 	high_counter.text = str("HIGH:") + str("%06d" % Game.high_score)
 	##Timer
 	Game.time += delta
-	var minutes = str(floor(Game.time / 60))
-	var seconds = floor(fmod(Game.time,60))
-	var milliseconds := floor(fmod(Game.time, 1) * 100)
-	if Game.time < 600:
-		time_counter.text = minutes + ":" + ("%02d" % seconds) + ":" + ("%02d" % milliseconds)
-	else:
-		time_counter.text = "9:59:99"
+	time_counter.text = Game.timeify(Game.time)
diff --git a/objects/hud/hud.tscn b/objects/hud/hud.tscn
index 3293a01..34ea3b4 100644
--- a/objects/hud/hud.tscn
+++ b/objects/hud/hud.tscn
@@ -36,36 +36,41 @@ margin_top = -2.0
 margin_right = 81.0
 margin_bottom = 18.0
 theme = ExtResource( 10 )
-text = "00"
+text = "0"
 
 [node name="RedStar" type="Sprite" parent="HUD"]
+visible = false
 material = SubResource( 1 )
-position = Vector2( 86, 5 )
+position = Vector2( 83, 5 )
 texture = ExtResource( 1 )
 region_enabled = true
 region_rect = Rect2( 0, 0, 8, 8 )
 
 [node name="YellowStar" type="Sprite" parent="HUD"]
+visible = false
 material = SubResource( 2 )
-position = Vector2( 96, 5 )
+position = Vector2( 93, 5 )
 texture = ExtResource( 1 )
 region_enabled = true
 region_rect = Rect2( 8, 0, 8, 8 )
 
 [node name="GreenStar" type="Sprite" parent="HUD"]
-position = Vector2( 106, 5 )
+visible = false
+position = Vector2( 103, 5 )
 texture = ExtResource( 1 )
 region_enabled = true
 region_rect = Rect2( 16, 0, 8, 8 )
 
 [node name="BlueStar" type="Sprite" parent="HUD"]
-position = Vector2( 116, 5 )
+visible = false
+position = Vector2( 113, 5 )
 texture = ExtResource( 1 )
 region_enabled = true
 region_rect = Rect2( 24, 0, 8, 8 )
 
 [node name="MagentaStar" type="Sprite" parent="HUD"]
-position = Vector2( 126, 5 )
+visible = false
+position = Vector2( 123, 5 )
 texture = ExtResource( 1 )
 region_enabled = true
 region_rect = Rect2( 32, 0, 8, 8 )
@@ -84,7 +89,7 @@ margin_top = -2.0
 margin_right = 263.0
 margin_bottom = 18.0
 theme = ExtResource( 10 )
-text = "000000"
+text = "00000"
 
 [node name="HighCounter" type="Label" parent="HUD"]
 visible = false
@@ -104,9 +109,9 @@ theme = ExtResource( 10 )
 text = "2"
 
 [node name="ArrowCounter" type="Label" parent="HUD"]
-margin_left = 68.0
+margin_left = 61.0
 margin_top = -2.0
-margin_right = 152.0
+margin_right = 145.0
 margin_bottom = 18.0
 theme = ExtResource( 10 )
 text = "0"