From a3fb8debbbc420bd30918f642a2706af02f83779 Mon Sep 17 00:00:00 2001
From: Gregory Marco <greg@nanoyagi.com>
Date: Sat, 17 Oct 2026 18:30:53 -0500
Subject: [PATCH] Add disk numbers 1 through 4 (currently roman numerals)

---
 art/numbers/1.png        | Bin 0 -> 93 bytes
 art/numbers/1.png.import |  43 +++++++++++++++++++++++++++++++++++++++
 art/numbers/2.png        | Bin 0 -> 98 bytes
 art/numbers/2.png.import |  43 +++++++++++++++++++++++++++++++++++++++
 art/numbers/3.png        | Bin 0 -> 97 bytes
 art/numbers/3.png.import |  43 +++++++++++++++++++++++++++++++++++++++
 art/numbers/4.png        | Bin 0 -> 117 bytes
 art/numbers/4.png.import |  43 +++++++++++++++++++++++++++++++++++++++
 disk.gd                  |   3 +++
 disk.tscn                |   2 ++
 objectives_label.gd      |   2 +-
 pharaoh.gd               |   2 +-
 12 files changed, 179 insertions(+), 2 deletions(-)
 create mode 100644 art/numbers/1.png
 create mode 100644 art/numbers/1.png.import
 create mode 100644 art/numbers/2.png
 create mode 100644 art/numbers/2.png.import
 create mode 100644 art/numbers/3.png
 create mode 100644 art/numbers/3.png.import
 create mode 100644 art/numbers/4.png
 create mode 100644 art/numbers/4.png.import

diff --git a/art/numbers/1.png b/art/numbers/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e981515c83101aebc66fffa11a08bc68ed31a61b
GIT binary patch
literal 93
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`DxNNmAr`&K2@<T#{1Tl3pXa-L
qW#M&X^m#JNqK9Wev<^=a14HE#X0B%nVV{BO89ZJ6T-G@yGywpd6&GXx

literal 0
HcmV?d00001

diff --git a/art/numbers/1.png.import b/art/numbers/1.png.import
new file mode 100644
index 0000000..00a7885
--- /dev/null
+++ b/art/numbers/1.png.import
@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://csa0jku42e2q3"
+path="res://.godot/imported/1.png-be292bb4085d2b3fba4748c9259c4dbd.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/numbers/1.png"
+dest_files=["res://.godot/imported/1.png-be292bb4085d2b3fba4748c9259c4dbd.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/high_quality_mode=0
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+mipmaps/preserve_alpha_test_coverage=false
+mipmaps/alpha_test_threshold=0.5
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/art/numbers/2.png b/art/numbers/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..064b635e60ec15ddd896e2a7fb2b24f0b0d19812
GIT binary patch
literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar`&K2@<T#{1P8e{B;j*
vKc~+1NBuy0g3>jWm;?z4htClbObiV7zOivW<Jsj4)WqQF>gTe~DWM4fUmO~f

literal 0
HcmV?d00001

diff --git a/art/numbers/2.png.import b/art/numbers/2.png.import
new file mode 100644
index 0000000..842a873
--- /dev/null
+++ b/art/numbers/2.png.import
@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://5p4gwkndi1un"
+path="res://.godot/imported/2.png-7eebbc475a29d976e42436727060df80.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/numbers/2.png"
+dest_files=["res://.godot/imported/2.png-7eebbc475a29d976e42436727060df80.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/high_quality_mode=0
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+mipmaps/preserve_alpha_test_coverage=false
+mipmaps/alpha_test_threshold=0.5
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/art/numbers/3.png b/art/numbers/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..04375261bcb174363a09eae139ed7e25c15e35a6
GIT binary patch
literal 97
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8lEnWAr`&K2@<T#{1O{G{<=?A
uKXRPwpYZAQL+>39B}hm(Y>tp{VqkC)=j7<J-dhIL!{F)a=d#Wzp$Py+gc;-j

literal 0
HcmV?d00001

diff --git a/art/numbers/3.png.import b/art/numbers/3.png.import
new file mode 100644
index 0000000..a543100
--- /dev/null
+++ b/art/numbers/3.png.import
@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dtsrcmnqjjuwq"
+path="res://.godot/imported/3.png-ebfbf280803cfb699406cf40ae0d5948.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/numbers/3.png"
+dest_files=["res://.godot/imported/3.png-ebfbf280803cfb699406cf40ae0d5948.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/high_quality_mode=0
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+mipmaps/preserve_alpha_test_coverage=false
+mipmaps/alpha_test_threshold=0.5
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/art/numbers/4.png b/art/numbers/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f905ad83f55e6eeb4926757c324f0af7b41490a
GIT binary patch
literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Hl8kyAr`&K2@<T#{1O{G{<=^8
z-@i<3ZolZC<A>cRCLen5aHt`Pxqz`m|G*K0BbsH5h8r8sx>h77bTBe>t8p_cMD5=K
PG>5^{)z4*}Q$iB}Uw<T_

literal 0
HcmV?d00001

diff --git a/art/numbers/4.png.import b/art/numbers/4.png.import
new file mode 100644
index 0000000..06330d5
--- /dev/null
+++ b/art/numbers/4.png.import
@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c1m4qu2pobdhc"
+path="res://.godot/imported/4.png-3ede4dd94b7768fa3734a425aa677929.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/numbers/4.png"
+dest_files=["res://.godot/imported/4.png-3ede4dd94b7768fa3734a425aa677929.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/high_quality_mode=0
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+mipmaps/preserve_alpha_test_coverage=false
+mipmaps/alpha_test_threshold=0.5
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/disk.gd b/disk.gd
index b45da36..8b9c616 100644
--- a/disk.gd
+++ b/disk.gd
@@ -2,6 +2,9 @@ extends Pickup
 
 @export var disk_num: int
 
+func _ready() -> void:
+	$DiskNumber.texture = load("res://art/numbers/%d.png" % disk_num)
+
 func _on_picked_up() -> void:
 	%Player2D.give_disk(disk_num)
 	%Player2D.give_objective("disk%d" % disk_num, "Install data disk %d" % disk_num)
diff --git a/disk.tscn b/disk.tscn
index 630d873..0d90ff4 100644
--- a/disk.tscn
+++ b/disk.tscn
@@ -24,5 +24,7 @@ shape = SubResource("CapsuleShape2D_6qpsl")
 stream = ExtResource("4_5qg3x")
 volume_db = 1.0
 
+[node name="DiskNumber" type="Sprite2D" parent="." unique_id=1317449795]
+
 [connection signal="picked_up" from="." to="." method="_on_picked_up"]
 [connection signal="body_entered" from="Area2D" to="." method="on_contact"]
diff --git a/objectives_label.gd b/objectives_label.gd
index 7f88101..c766a16 100644
--- a/objectives_label.gd
+++ b/objectives_label.gd
@@ -4,5 +4,5 @@ extends RichTextLabel
 func _process(delta: float) -> void:
 	var new_text = "OBJECTIVES:\n"
 	for objective in %Player2D.objectives:
-		new_text = new_text + %Player2D.objectives[objective]
+		new_text = new_text + %Player2D.objectives[objective] + "\n"
 	text = new_text
diff --git a/pharaoh.gd b/pharaoh.gd
index ed550fc..7e93de6 100644
--- a/pharaoh.gd
+++ b/pharaoh.gd
@@ -26,7 +26,7 @@ func _on_interacted() -> void:
 	print("Loaded up disk ", wanted_disk)
 
 	wanted_disk = disks_wanted.front()
-	if not wanted_disk:
+	if %Player2D.has_disk(wanted_disk):
 		return
 
 	%Player2D.give_objective("disk%d" % wanted_disk, "Locate data disk %d" % wanted_disk)