From 92f0cb57c047ec1eb031896664bb9e394b2c56a7 Mon Sep 17 00:00:00 2001 From: Gregory Marco Date: Sun, 18 Oct 2026 21:57:35 -0500 Subject: [PATCH 1/4] Remove hidden teleportal class. It doesn't do anything that the hidden group doesn't already, since the hidden logic is done in the player. Also, hidden teleportal inherited the relative position bug that was since fixed in the regular one. --- hidden_teleporter.gd | 43 ---------------------------------------- hidden_teleporter.gd.uid | 1 - hidden_teleporter.tscn | 40 ------------------------------------- world.tscn | 6 ++++-- 4 files changed, 4 insertions(+), 86 deletions(-) delete mode 100644 hidden_teleporter.gd delete mode 100644 hidden_teleporter.gd.uid delete mode 100644 hidden_teleporter.tscn diff --git a/hidden_teleporter.gd b/hidden_teleporter.gd deleted file mode 100644 index 7ac5ebb..0000000 --- a/hidden_teleporter.gd +++ /dev/null @@ -1,43 +0,0 @@ -extends Node2D - -@export var paired_teleporter: String -var checked_teleport -var telecam_speed_mult = 4 -var enabled = true -var cooldown = 2 - -func _ready() -> void: - modulate = Color.PURPLE - add_to_group("TELEPORTERS") - add_to_group("Hidden") - -func check_for_pair() -> String: - return paired_teleporter - -func disable(): - enabled = false - $Sprite2D.modulate = Color.DARK_ORANGE - -func enable(): - enabled = true - $Sprite2D.modulate = Color.WHITE - -func _process(delta: float) -> void: - pass - -func _physics_process(delta: float) -> void: - pass - -func _on_contact(body) -> void: - #get_tree().call_group("TELEPORTERS","disable") - for teleporter in get_tree().get_nodes_in_group("TELEPORTERS"): - if teleporter != self: - if teleporter.paired_teleporter == paired_teleporter and enabled: - %Player2D.get_node("Camera2D").position_smoothing_enabled = false - if %Player2D.teleport_cooldown > 0: - return - body.set_position(teleporter.get_position()) - %Player2D.on_teleport() - disable() - await get_tree().create_timer(cooldown).timeout - enable() diff --git a/hidden_teleporter.gd.uid b/hidden_teleporter.gd.uid deleted file mode 100644 index 80bc369..0000000 --- a/hidden_teleporter.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://btxx0p5ccar5f diff --git a/hidden_teleporter.tscn b/hidden_teleporter.tscn deleted file mode 100644 index 2e18ab1..0000000 --- a/hidden_teleporter.tscn +++ /dev/null @@ -1,40 +0,0 @@ -[gd_scene format=3 uid="uid://7bjqgxckho"] - -[ext_resource type="Script" uid="uid://btxx0p5ccar5f" path="res://hidden_teleporter.gd" id="1_52wed"] -[ext_resource type="Texture2D" uid="uid://d0tvtt4eu8jmt" path="res://art/block/portal.png" id="2_rx1y0"] -[ext_resource type="Texture2D" uid="uid://55ihxa2emnep" path="res://art/block/portal2.png" id="3_5admx"] -[ext_resource type="Texture2D" uid="uid://d4a5x8gwhl2wc" path="res://art/block/portal3.png" id="4_tfiuq"] - -[sub_resource type="SpriteFrames" id="SpriteFrames_tuehi"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("2_rx1y0") -}, { -"duration": 1.0, -"texture": ExtResource("3_5admx") -}, { -"duration": 1.0, -"texture": ExtResource("4_tfiuq") -}], -"loop": 1, -"name": &"default", -"speed": 5.0 -}] - -[sub_resource type="CircleShape2D" id="CircleShape2D_7k7bx"] -radius = 9.0 - -[node name="HiddenTeleporter" type="Node2D" unique_id=1201409437 groups=["Hidden"]] -script = ExtResource("1_52wed") - -[node name="Sprite2D" type="AnimatedSprite2D" parent="." unique_id=395479262] -sprite_frames = SubResource("SpriteFrames_tuehi") -autoplay = "default" - -[node name="Area2D" type="Area2D" parent="Sprite2D" unique_id=2050186824] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite2D/Area2D" unique_id=1560168165] -shape = SubResource("CircleShape2D_7k7bx") - -[connection signal="body_entered" from="Sprite2D/Area2D" to="." method="_on_contact"] diff --git a/world.tscn b/world.tscn index 5f6815f..2bc3750 100644 --- a/world.tscn +++ b/world.tscn @@ -35,7 +35,6 @@ [ext_resource type="PackedScene" uid="uid://cue2gfw1bdfh7" path="res://sign_arrow_up.tscn" id="31_jjr1n"] [ext_resource type="PackedScene" uid="uid://div6quttr84u1" path="res://horizontal_moving_block.tscn" id="34_w44yn"] [ext_resource type="PackedScene" uid="uid://b61sumdnt0qqh" path="res://hidden_horizontal_moving_block.tscn" id="35_6ah6f"] -[ext_resource type="PackedScene" uid="uid://7bjqgxckho" path="res://hidden_teleporter.tscn" id="36_g1i3r"] [ext_resource type="PackedScene" uid="uid://c13khrhjy5nrj" path="res://saw.tscn" id="37_my276"] [ext_resource type="PackedScene" uid="uid://bnuiagw3bblfh" path="res://hat_pickup.tscn" id="38_yx0jh"] @@ -2481,7 +2480,7 @@ position = Vector2(-619, -477.55838) [node name="HiddenHorizontalMovingBlock4" parent="QuadrantC" unique_id=1059738582 instance=ExtResource("35_6ah6f")] position = Vector2(-367, -477.55832) -[node name="HiddenTeleporter" parent="QuadrantC" unique_id=1585223156 instance=ExtResource("36_g1i3r")] +[node name="HiddenTeleporter" parent="QuadrantC" unique_id=1585223156 groups=["Hidden"] instance=ExtResource("4_gbfbk")] position = Vector2(-491, -133.91316) paired_teleporter = "C1" @@ -2724,4 +2723,7 @@ position = Vector2(-4297, 467.7119) position = Vector2(-4396, 458.85) sign_text = "DEBUG MODE WARP PORTALS" +[node name="Pharaoh" parent="DebugPortals" unique_id=1770352474 groups=["Hidden"] instance=ExtResource("15_hiqwa")] +position = Vector2(-4150, 460.8193) + [connection signal="toggled" from="CanvasLayer/MusicButton" to="CanvasLayer/MusicButton" method="_on_toggled"] From 0b68c7beb0742e4de249f939bb24fcf08189601f Mon Sep 17 00:00:00 2001 From: Gregory Marco Date: Sun, 18 Oct 2026 23:01:54 -0500 Subject: [PATCH 2/4] Add floor to quadrant c to help alleviate teleportal wonkiness --- teleporter.gd | 25 ++++++++----- world.tscn | 101 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 76 insertions(+), 50 deletions(-) diff --git a/teleporter.gd b/teleporter.gd index c243711..9a245aa 100644 --- a/teleporter.gd +++ b/teleporter.gd @@ -28,15 +28,20 @@ func _physics_process(delta: float) -> void: pass func _on_contact(body) -> void: + if not enabled: + return + #get_tree().call_group("TELEPORTERS","disable") for teleporter in get_tree().get_nodes_in_group("TELEPORTERS"): - if teleporter != self: - if teleporter.paired_teleporter == paired_teleporter and enabled: - %Player2D.get_node("Camera2D").position_smoothing_enabled = false - if %Player2D.teleport_cooldown > 0: - return - body.set_position(teleporter.global_position) - %Player2D.on_teleport() - disable() - await get_tree().create_timer(cooldown).timeout - enable() + if teleporter == self: + continue + + if teleporter.paired_teleporter == paired_teleporter: + %Player2D.get_node("Camera2D").position_smoothing_enabled = false + if %Player2D.teleport_cooldown > 0: + return + body.set_position(teleporter.global_position) + %Player2D.on_teleport() + disable() + await get_tree().create_timer(cooldown).timeout + enable() diff --git a/world.tscn b/world.tscn index 2bc3750..8aae566 100644 --- a/world.tscn +++ b/world.tscn @@ -1355,11 +1355,11 @@ modulate = Color(1, 1, 1, 1) position = Vector2(53, -303.27414) [node name="Teleporter" parent="QuadrantC" unique_id=672497775 instance=ExtResource("4_gbfbk")] -position = Vector2(-65, -356.44577) +position = Vector2(-67, -352.50696) paired_teleporter = "C1" [node name="Teleporter2" parent="QuadrantC" unique_id=1657885766 instance=ExtResource("4_gbfbk")] -position = Vector2(-961, -131.94382) +position = Vector2(-961, -132.92844) paired_teleporter = "C3" [node name="Block" parent="QuadrantC" unique_id=1060735363 instance=ExtResource("2_036b0")] @@ -1425,36 +1425,36 @@ position = Vector2(-322, -128.00523) [node name="Block45" parent="QuadrantC" unique_id=1209323393 instance=ExtResource("2_036b0")] position = Vector2(-370, -300.32016) -[node name="Block46" parent="QuadrantC" unique_id=1245640277 instance=ExtResource("2_036b0")] -position = Vector2(-370, -314.10535) - -[node name="Block47" parent="QuadrantC" unique_id=150619654 instance=ExtResource("2_036b0")] -position = Vector2(-402, -300.32016) - -[node name="Block48" parent="QuadrantC" unique_id=430380623 instance=ExtResource("2_036b0")] -position = Vector2(-403, -315.09) - -[node name="Block49" parent="QuadrantC" unique_id=612009100 instance=ExtResource("2_036b0")] -position = Vector2(-560, -300.32016) - -[node name="Block50" parent="QuadrantC" unique_id=1973610367 instance=ExtResource("2_036b0")] -position = Vector2(-560, -314.10535) - -[node name="Block51" parent="QuadrantC" unique_id=791222372 instance=ExtResource("2_036b0")] -position = Vector2(-592, -300.32016) - -[node name="Block52" parent="QuadrantC" unique_id=622670780 instance=ExtResource("2_036b0")] -position = Vector2(-593, -315.09) - [node name="Block53" parent="QuadrantC" unique_id=309240966 instance=ExtResource("2_036b0")] position = Vector2(-838, -520.88324) +[node name="Block46" parent="QuadrantC" unique_id=1245640277 instance=ExtResource("2_036b0")] +position = Vector2(-370, -314.10535) + [node name="Block54" parent="QuadrantC" unique_id=1513232438 instance=ExtResource("2_036b0")] position = Vector2(-838, -534.66846) +[node name="Block49" parent="QuadrantC" unique_id=612009100 instance=ExtResource("2_036b0")] +position = Vector2(-560, -300.32016) + +[node name="Block47" parent="QuadrantC" unique_id=150619654 instance=ExtResource("2_036b0")] +position = Vector2(-402, -300.32016) + +[node name="Block50" parent="QuadrantC" unique_id=1973610367 instance=ExtResource("2_036b0")] +position = Vector2(-560, -314.10535) + [node name="Block55" parent="QuadrantC" unique_id=1693597001 instance=ExtResource("2_036b0")] position = Vector2(-870, -520.88324) +[node name="Block51" parent="QuadrantC" unique_id=791222372 instance=ExtResource("2_036b0")] +position = Vector2(-592, -300.32016) + +[node name="Block48" parent="QuadrantC" unique_id=430380623 instance=ExtResource("2_036b0")] +position = Vector2(-403, -315.09) + +[node name="Block52" parent="QuadrantC" unique_id=622670780 instance=ExtResource("2_036b0")] +position = Vector2(-593, -315.09) + [node name="Block56" parent="QuadrantC" unique_id=1720574496 instance=ExtResource("2_036b0")] position = Vector2(-871, -535.6531) @@ -1470,6 +1470,18 @@ position = Vector2(-1070, -462.78848) [node name="Block60" parent="QuadrantC" unique_id=876678248 instance=ExtResource("2_036b0")] position = Vector2(-1071, -477.55832) +[node name="Block95" parent="QuadrantC" unique_id=1276827863 instance=ExtResource("2_036b0")] +position = Vector2(-50, -334.7831) + +[node name="Block96" parent="QuadrantC" unique_id=1906981054 instance=ExtResource("2_036b0")] +position = Vector2(-50, -348.56833) + +[node name="Block97" parent="QuadrantC" unique_id=1555384249 instance=ExtResource("2_036b0")] +position = Vector2(-82, -334.7831) + +[node name="Block98" parent="QuadrantC" unique_id=760466353 instance=ExtResource("2_036b0")] +position = Vector2(-83, -349.55295) + [node name="Block61" parent="QuadrantC" unique_id=1679544876 instance=ExtResource("2_036b0")] position = Vector2(-946, -345.61435) @@ -1576,7 +1588,7 @@ position = Vector2(-1050, -1097.892) position = Vector2(-491, -118.15868) [node name="Teleporter3" parent="QuadrantC" unique_id=514093193 instance=ExtResource("4_gbfbk")] -position = Vector2(-715, -133.91315) +position = Vector2(-715, -134.89789) paired_teleporter = "C2" [node name="Block14" parent="QuadrantC" unique_id=25815394 instance=ExtResource("2_036b0")] @@ -1646,26 +1658,12 @@ paired_teleporter = "C7" position = Vector2(-523, -749.3236) [node name="Teleporter5" parent="QuadrantC" unique_id=1450932853 instance=ExtResource("4_gbfbk")] -position = Vector2(-306, -129.97452) +position = Vector2(-306, -130.95914) paired_teleporter = "C4" [node name="Block16" parent="QuadrantC" unique_id=1112314894 instance=ExtResource("2_036b0")] position = Vector2(-306, -113.23539) -[node name="Teleporter9" parent="QuadrantC" unique_id=2083407478 instance=ExtResource("4_gbfbk")] -position = Vector2(-576, -317.05927) -paired_teleporter = "C5" - -[node name="Block20" parent="QuadrantC" unique_id=1507035532 instance=ExtResource("2_036b0")] -position = Vector2(-576, -300.32013) - -[node name="Teleporter10" parent="QuadrantC" unique_id=1039511867 instance=ExtResource("4_gbfbk")] -position = Vector2(-386, -317.05927) -paired_teleporter = "C5" - -[node name="Block21" parent="QuadrantC" unique_id=1090742592 instance=ExtResource("2_036b0")] -position = Vector2(-386, -300.32013) - [node name="Teleporter4" parent="QuadrantC" unique_id=1638253534 instance=ExtResource("4_gbfbk")] position = Vector2(-630, -1092.9688) paired_teleporter = "C6" @@ -1680,11 +1678,25 @@ paired_teleporter = "C9" [node name="Block23" parent="QuadrantC" unique_id=634060816 instance=ExtResource("2_036b0")] position = Vector2(-630, -1155.0021) +[node name="Teleporter9" parent="QuadrantC" unique_id=2083407478 instance=ExtResource("4_gbfbk")] +position = Vector2(-576, -318.04388) +paired_teleporter = "C5" + +[node name="Teleporter10" parent="QuadrantC" unique_id=1039511867 instance=ExtResource("4_gbfbk")] +position = Vector2(-386, -318.04388) +paired_teleporter = "C5" + +[node name="Block20" parent="QuadrantC" unique_id=1507035532 instance=ExtResource("2_036b0")] +position = Vector2(-576, -300.32013) + [node name="HiddenSpike" parent="QuadrantC" unique_id=947724428 instance=ExtResource("28_k83mh")] visible = true position = Vector2(-97, -391.89328) rotation = -3.1415925 +[node name="Block21" parent="QuadrantC" unique_id=1090742592 instance=ExtResource("2_036b0")] +position = Vector2(-386, -300.32013) + [node name="HiddenSpike2" parent="QuadrantC" unique_id=363082019 instance=ExtResource("28_k83mh")] visible = true position = Vector2(-68, -391.89328) @@ -2481,9 +2493,18 @@ position = Vector2(-619, -477.55838) position = Vector2(-367, -477.55832) [node name="HiddenTeleporter" parent="QuadrantC" unique_id=1585223156 groups=["Hidden"] instance=ExtResource("4_gbfbk")] -position = Vector2(-491, -133.91316) +position = Vector2(-491, -134.89789) paired_teleporter = "C1" +[node name="LongerBlock8" parent="QuadrantC" unique_id=988254324 instance=ExtResource("6_dwbse")] +position = Vector2(-890, -37.416832) + +[node name="LongerBlock9" parent="QuadrantC" unique_id=415765863 instance=ExtResource("6_dwbse")] +position = Vector2(-592, 20.67791) + +[node name="LongerBlock10" parent="QuadrantC" unique_id=1760950741 instance=ExtResource("6_dwbse")] +position = Vector2(-289, -34.462864) + [node name="Pharaoh6" parent="." unique_id=740205336 instance=ExtResource("15_hiqwa")] position = Vector2(8168, -681.3824) From 83ed18c33218a5ab5febe0a712fe9bd6b10e67da Mon Sep 17 00:00:00 2001 From: debugman18 Date: Sun, 18 Oct 2026 23:18:25 -0500 Subject: [PATCH 3/4] Hats --- art/hats/pickup_sprite.png | Bin 0 -> 951 bytes art/hats/pickup_sprite.png.import | 43 ++++++++++++++++++++++++++++++ hat_pickup.gd | 4 +-- hat_pickup.tscn | 2 +- world.tscn | 6 ++++- 5 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 art/hats/pickup_sprite.png create mode 100644 art/hats/pickup_sprite.png.import diff --git a/art/hats/pickup_sprite.png b/art/hats/pickup_sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..79b020acd43ea359253d11503c7bf1254ec200e5 GIT binary patch literal 951 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sEXgD|57Yp@DXP_o1|q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&(KJi(Y*wyXh&*2!0mNL8ovaHWW=#XKL4XNp zG80&3kfjBX1=VF}U;vWcd10}U@nw%qKy}HUE{-7<{!1r%X9y>Xw7yT7bmo4g>fAk2 zTZ2|-)~cwjedM-gtx~V{(nq`Wb_qHPDoTHM4ZP@kH)El+;HnF*8@XLqPH`|i8WrTr zWp-(iulgC4$uqaiv{8F}=$u38;;%V%JK8`0eO|=)FZjl_)&I@@M<=Q+*j{fTwq)nD z4G&5!8RqOX@UP?l!w}sYws&Qj=*JaN56rZh;x)S7efjlb?Zn-;8T|eHdoTFz%3rH} zd@WnWoqGzWzqhS(XJn9zm95vQ+|+eMuPet+(Iv=3a>k5WMur(zUu-JVb5G?HF{y5j zx&7I4)5STiTnsLZ3|zm}g{N5P%f}a7UsK&&v2H(ab7v$2!v=|lpM9^i=30F^`de|z znqRLye}*V!R@|*L6iz&U>gi;0sh!*8GG3S-X4>5N`SQi9MFAN*I<~KhuL)muW#3eu z{trB_Hifds`Zm>9a%CCs_HDR%p#IU)J9{gmx2;U>dSe&Cx8iW=VQn$v19dg5M+jf9;wFUakq3W~u8pZF{LYEy}b?b%&EU zv(zDv{?twHpIy!ke=)b3q2dmEw}SJnnQYV3j=$^SKg!6EXS3UW#jkFj?DBwiR;I1G zCJ!e^TMB>pXUbQ6Cj5iIoTZNgCb-U3;?A$Dd>0#aLi1hn4juQMpVss~S(~byzOG7S{wQW+%lhhkVH(fsNQk%~8Gu7=$GXMIR+xreJ&8lvl zmB(oNyx>&FhN( void: - pass + hat_texture = load("res://art/hats/" + str(hat_type) + ".png") func _process(delta: float) -> void: pass diff --git a/hat_pickup.tscn b/hat_pickup.tscn index 50e37a4..acc1cbe 100644 --- a/hat_pickup.tscn +++ b/hat_pickup.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://bnuiagw3bblfh"] [ext_resource type="Script" uid="uid://47y55iry2pd6" path="res://hat_pickup.gd" id="1_fs7cl"] -[ext_resource type="Texture2D" uid="uid://ba4kjeulthw1g" path="res://art/hats/dunce1.png" id="2_fs7cl"] +[ext_resource type="Texture2D" uid="uid://qm5i00us5qaf" path="res://art/hats/pickup_sprite.png" id="2_fs7cl"] [sub_resource type="CircleShape2D" id="CircleShape2D_y0cpo"] diff --git a/world.tscn b/world.tscn index 67e871a..ff8b762 100644 --- a/world.tscn +++ b/world.tscn @@ -2669,7 +2669,9 @@ position = Vector2(8321, -1772.382) position = Vector2(8520, -1950.6049) [node name="HatPickup" parent="." unique_id=812970241 instance=ExtResource("38_yx0jh")] -position = Vector2(-4677, 352.50708) +position = Vector2(-4924, 220.5631) +rotation = 0.014323293 +hat_type = "dunce1" [node name="DebugPortals" type="Node2D" parent="." unique_id=1727548024 groups=["Debug Mode Only"]] @@ -2753,9 +2755,11 @@ position = Vector2(-4150, 460.8193) [node name="HatPickup2" parent="." unique_id=307172210 instance=ExtResource("38_yx0jh")] position = Vector2(9596, -1253.4679) +hat_type = "pope1" [node name="HatPickup3" parent="." unique_id=875650398 instance=ExtResource("38_yx0jh")] position = Vector2(7700, 929.51587) +hat_type = "cap1" [node name="HatPickup4" parent="." unique_id=1755769172 instance=ExtResource("38_yx0jh")] position = Vector2(8510, -958.0709) From 78d1c205de551374e9fdb1c2e50fac5f181415b1 Mon Sep 17 00:00:00 2001 From: debugman18 Date: Sun, 18 Oct 2026 23:28:18 -0500 Subject: [PATCH 4/4] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8adaf11..470e197 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .godot/ /android/ /web_released +/web_released