Merge branch 'main' of http://git.nanoyagi.com/NanoYagi/JumpRopeOldTech

OldComputer.tscn

@@ -101,6 +101,6 @@ text = "[center]>> PharaOS 2000 Boot Sequence
 >> [color=red]WARN[/color]: Detected anomalies!
 >> [color=red]WARN[/color]: Memory integrity at [color=red]%d%%[/color]!
 >> [color=green]User[/color]: Please load backup data disk ([color=green]1 of 4[/color])
->> [color=#4278ff]Player[/color]: Press [color=#4278ff]interact [E][/color] or [color=#4278ff]jump [Space][/color] to exit."
+>> [color=#4278ff]Player[/color]: Press [color=#4278ff]interact [{INTERACT}][/color] or [color=#4278ff]jump [{JUMP}][/color] to exit."
 fit_content = true
 vertical_alignment = 1

art/slides/Endcomic.png.import

@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cex4bvshv8q67"
+path="res://.godot/imported/Endcomic.png-3ac3eb121fb3372be1133132c6d90e78.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/slides/Endcomic.png"
+dest_files=["res://.godot/imported/Endcomic.png-3ac3eb121fb3372be1133132c6d90e78.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

old_computer.gd

@@ -6,8 +6,10 @@ var disks_loaded = []
 var starting_integrity = 2
 var total_integrity = starting_integrity + len(disks_wanted)
 
+var base_text: String = ""
+
 func _ready() -> void:
-	$ConsoleText.text = $ConsoleText.text % get_memory_integrity()
+	base_text = $ConsoleText.text % get_memory_integrity()
 
 func load_disk(disk_num: int) -> bool:
 	if !disk_num or (disk_num in disks_loaded):
@@ -34,7 +36,7 @@ func load_disk(disk_num: int) -> bool:
 			">> [color=green]System initialization complete[/color]. Beginning reactivation sequence."
 		)
 		printline(
-			">> [color=#4278ff]Player[/color]: Press [color=#4278ff][E][/color] or [color=#4278ff][Space][/color] to return to the outside world."
+			">> [color=#4278ff]Player[/color]: Press [color=#4278ff][{INTERACT}][/color] or [color=#4278ff][{JUMP}][/color] to return to the outside world."
 		)
 
 	return true
@@ -51,13 +53,24 @@ func has_finished_initialization() -> bool:
 	return disks_wanted.is_empty()
 
 func open() -> void:
+	render_text()
 	visible = true
 	$BackgroundPanel/ForegroundPanel/ScreenPanel/OldComputerShader.show()
 	%Player2D/Parallax2D.hide()
 
 func printline(line: String) -> void:
 	open()
-	$ConsoleText.text += "\n" + line
+	base_text += "\n" + line
+	render_text()
+
+func render_text() -> void:
+	var interact_key = "E"
+	var jump_key = "Space"
+	if %Player2D.controller_ui:
+		interact_key = "B"
+		jump_key = "A"
+
+	$ConsoleText.text = base_text.replace("{INTERACT}", interact_key).replace("{JUMP}", jump_key)
 
 func close() -> void:
 	if has_finished_initialization():

world.tscn

@@ -888,4 +888,8 @@ position = Vector2(-2113, -379.0928)
 [node name="SignArrowUp" parent="." unique_id=119455146 instance=ExtResource("31_jjr1n")]
 position = Vector2(-1763, 365.30762)
 
+[node name="Pharaoh5" parent="." unique_id=842333198 instance=ExtResource("15_hiqwa")]
+position = Vector2(7220, -385.9854)
+
+
 [connection signal="toggled" from="CanvasLayer/MusicButton" to="CanvasLayer/MusicButton" method="_on_toggled"]