From 602cd4410ef06c6a483e245d4a503ac0fc1db726 Mon Sep 17 00:00:00 2001 From: Dendy Faist Date: Thu, 5 Mar 2026 20:47:07 +0100 Subject: [PATCH 1/5] feat: Update success screen DescLabel --- player.gd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/player.gd b/player.gd index 49f931a..3367849 100644 --- a/player.gd +++ b/player.gd @@ -82,6 +82,7 @@ func _on_area_area_entered(area: Area3D) -> void: if area.name == "StationArea": $FinishControl.visible = true $HUD.visible = false + var scoreLbl = $FinishControl/ScoreLabel for letter in SCORE_RANK: var rank = SCORE_RANK[letter] @@ -91,6 +92,11 @@ func _on_area_area_entered(area: Area3D) -> void: $Shop.available_money += rank["money"] scoreLbl.text = letter scoreLbl.add_theme_color_override("font_color", rank["color"]) + + $FinishControl/DescLabel.text = """ + Diners guanyat: %s pessetes + Diners total: %d pessetes + """ % [rank["money"], $Shop.available_money] break $TimeLimit.stop() From de1fa4badfc7ef4e48cc8f6ed0201ae572d0d0d7 Mon Sep 17 00:00:00 2001 From: Dendy Faist Date: Thu, 5 Mar 2026 20:53:05 +0100 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20Add=20=F0=9F=A5=98=20in=20the=20Pla?= =?UTF-8?q?yer/FinishControl/DescLabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- player.gd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/player.gd b/player.gd index 127bc48..aecda62 100644 --- a/player.gd +++ b/player.gd @@ -98,7 +98,9 @@ func _on_area_area_entered(area: Area3D) -> void: $FinishControl/DescLabel.text = """ Diners guanyat: %s pessetes Diners total: %d pessetes - """ % [rank["money"], $Shop.available_money] + 🥘s guanyat: %d 🥘 + 🥘s totals: %d 🥘 + """ % [rank["money"], $Shop.available_money, rank["special"], $Shop.special_currency] break $TimeLimit.stop() From 4b5bd16cef2c04eeb1a973eb61188e90c1918785 Mon Sep 17 00:00:00 2001 From: Dendy Faist Date: Thu, 5 Mar 2026 20:56:29 +0100 Subject: [PATCH 3/5] feat: Remove Xenia's bg in shop --- assets/Images/Xenia Drawing 6.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/Images/Xenia Drawing 6.svg b/assets/Images/Xenia Drawing 6.svg index 42ef4f4..043807f 100644 --- a/assets/Images/Xenia Drawing 6.svg +++ b/assets/Images/Xenia Drawing 6.svg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a9b57eb7f3ef125ab9561d08ccdf555b369210837c8a2e0f19f17f3973938d4 -size 246359 +oid sha256:f0b6e08ffbd9574c8ae804b661a4d019c18a2cb231e4faf30c358d7e2e05987c +size 244737 From 66077734b7d8465e965afc16bc3b62599bc08ff0 Mon Sep 17 00:00:00 2001 From: Dendy Faist Date: Thu, 5 Mar 2026 21:22:26 +0100 Subject: [PATCH 4/5] feat: Randomize position and spawn of pickups --- level.gd | 25 +++++++++++++++---------- pickup/bonus_time.tscn | 2 +- pickup/speed_boost.tscn | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/level.gd b/level.gd index 969168a..af4efac 100644 --- a/level.gd +++ b/level.gd @@ -8,6 +8,8 @@ var dimension: int = BASE_DIMENSION @export var ped_spawn_rate: int = 20 # Spawn Rate = rate - floor(stage_count * stage_mod) @export var ped_spawn_rate_stage_modifier: float = 0.5 +@export var speed_boost_spawn_rate = 1 +@export var bonus_time_spawn_rate = 1 var pedestrian_scn = preload("res://pedestrian.tscn") var chunk_scn = preload("res://chunk.tscn") @@ -51,16 +53,6 @@ func initialize_world() -> void: $Player.position.x = spawn.x * Global.chunk_size $Player.position.z = spawn.y * Global.chunk_size - var bt = bonus_time_scn.instantiate() - bt.position.x = spawn.x * Global.chunk_size - 10 - bt.position.z = spawn.y * Global.chunk_size + 20 - add_child(bt) - - var sb = speed_boost_scn.instantiate() - sb.position.x = spawn.x * Global.chunk_size + 10 - sb.position.z = spawn.y * Global.chunk_size + 20 - add_child(sb) - # ---- Generate the paths ---- var paths: Array = [] for path_idx in range(path_count): @@ -97,9 +89,22 @@ func initialize_world() -> void: new_chunk = spawn_scn.instantiate() else: new_chunk = chunk_scn.instantiate() + new_chunk.position = Vector3(x * Global.chunk_size+1, 0, y * Global.chunk_size+1) row.append(new_chunk) $ChunkContainer.add_child(new_chunk) + + if randi() % bonus_time_spawn_rate == 0: + var bonus_time = bonus_time_scn.instantiate() + bonus_time.position.x = new_chunk.position.x + randf_range(-Global.chunk_size/2, Global.chunk_size/2) + bonus_time.position.z = new_chunk.position.z + randf_range(-Global.chunk_size/2, Global.chunk_size/2) + $ChunkContainer.add_child(bonus_time) + if randi() % speed_boost_spawn_rate == 0: + var speed_boost = speed_boost_scn.instantiate() + speed_boost.position.x = new_chunk.position.x + randf_range(-Global.chunk_size/2, Global.chunk_size/2) + speed_boost.position.z = new_chunk.position.z + randf_range(-Global.chunk_size/2, Global.chunk_size/2) + $ChunkContainer.add_child(speed_boost) + chunks.append(row) # ---- Set exits based on paths ---- diff --git a/pickup/bonus_time.tscn b/pickup/bonus_time.tscn index bcbfd10..34ea875 100644 --- a/pickup/bonus_time.tscn +++ b/pickup/bonus_time.tscn @@ -31,7 +31,7 @@ radius = 2.3896484 script = SubResource("GDScript_rqnpm") [node name="Cartell" type="MeshInstance3D" parent="." unique_id=1340947697] -transform = Transform3D(2.0101042, 0, 0, 0, 2.0101042, 0, 0, 0, 2.0101042, 0, 0.28158534, 0) +transform = Transform3D(2.0101042, 0, 0, 0, 2.0101042, 0, 0, 0, 2.0101042, 0, 1, 0) mesh = SubResource("PlaneMesh_b5fwd") surface_material_override/0 = SubResource("StandardMaterial3D_cumbd") diff --git a/pickup/speed_boost.tscn b/pickup/speed_boost.tscn index 5417ce3..34652b1 100644 --- a/pickup/speed_boost.tscn +++ b/pickup/speed_boost.tscn @@ -30,7 +30,7 @@ radius = 2.3896484 script = SubResource("GDScript_rqnpm") [node name="Cartell" type="MeshInstance3D" parent="." unique_id=1340947697] -transform = Transform3D(2.0101042, 0, 0, 0, 2.0101042, 0, 0, 0, 2.0101042, 0, 0.28158534, 0) +transform = Transform3D(2.0101042, 0, 0, 0, 2.0101042, 0, 0, 0, 2.0101042, 0, 1, 0) mesh = SubResource("PlaneMesh_b5fwd") surface_material_override/0 = SubResource("StandardMaterial3D_cumbd") From 351dcb1fb8a549db32edaf479ba9ff9168b6159f Mon Sep 17 00:00:00 2001 From: Dendy Faist Date: Thu, 5 Mar 2026 21:26:55 +0100 Subject: [PATCH 5/5] feat: Do not spawn pickups in station --- level.gd | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/level.gd b/level.gd index af4efac..bb3864b 100644 --- a/level.gd +++ b/level.gd @@ -83,17 +83,23 @@ func initialize_world() -> void: var row: Array for y in range(dimension): var new_chunk = null + var can_spawn_pickup = false if Vector2i(x,y) == station: new_chunk = station_scn.instantiate() elif Vector2i(x,y) == spawn: new_chunk = spawn_scn.instantiate() + can_spawn_pickup = true else: new_chunk = chunk_scn.instantiate() - + can_spawn_pickup = true + new_chunk.position = Vector3(x * Global.chunk_size+1, 0, y * Global.chunk_size+1) row.append(new_chunk) $ChunkContainer.add_child(new_chunk) + if not can_spawn_pickup: + continue + if randi() % bonus_time_spawn_rate == 0: var bonus_time = bonus_time_scn.instantiate() bonus_time.position.x = new_chunk.position.x + randf_range(-Global.chunk_size/2, Global.chunk_size/2)