Merge remote-tracking branch 'http/main'

art/sarco_open.png.import

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

hidden_spike.gd

@@ -0,0 +1,14 @@
+extends Node2D
+
+func _ready() -> void:
+	add_to_group("Hidden")
+
+func _process(delta: float) -> void:
+	pass
+	
+func on_contact(body: Node2D) -> void:
+	if body==%Player2D and %Player2D.death_cooldown == 0:
+		print("SLASH KILL")
+		%Player2D/Jetpack/DeathSound.play()
+		%Player2D.on_death(false,%Player2D.position)
+	print(body)

hidden_spike.gd.uid

@@ -0,0 +1 @@
+uid://b65drnv6461kp

hidden_spike.tscn

@@ -0,0 +1,24 @@
+[gd_scene format=3 uid="uid://cap0wo5ij7hfv"]
+
+[ext_resource type="Script" uid="uid://b65drnv6461kp" path="res://hidden_spike.gd" id="1_k2eht"]
+[ext_resource type="Texture2D" uid="uid://bu5wgerfu7cbc" path="res://art/spike.png" id="2_vt54o"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_xfwl5"]
+size = Vector2(15, 7.5)
+
+[node name="HiddenSpike" type="Node2D" unique_id=1739014101]
+visible = false
+script = ExtResource("1_k2eht")
+
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=813041394]
+texture_filter = 1
+position = Vector2(0, 2)
+texture = ExtResource("2_vt54o")
+
+[node name="Area2D" type="Area2D" parent="." unique_id=170499029]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D" unique_id=1865546056]
+position = Vector2(0, 4.75)
+shape = SubResource("RectangleShape2D_xfwl5")
+
+[connection signal="body_entered" from="Area2D" to="." method="on_contact"]

pharaoh.gd

@@ -1,5 +1,8 @@
 extends Interactable
 
+func set_open (is_open: bool) -> void:
+	$Sprite2D.play("open" if is_open else "closed")
+
 func _on_interacted() -> void:
 	%OldComputer.open()
 
@@ -9,6 +12,9 @@ func _on_interacted() -> void:
 	if %Player2D.spawn_point != new_spawn_point:
 		%Player2D.spawn_point = new_spawn_point
 		%OldComputer.printline(">> Respawn point set to %s" % new_spawn_point)
+		
+		for sarcophagus in get_tree().get_nodes_in_group("sarcophagi"):
+			sarcophagus.set_open(sarcophagus == self)
 	
 	var wanted_disk = %OldComputer.get_next_disk_num()
 	

pharaoh.tscn

@@ -3,16 +3,39 @@
 [ext_resource type="Script" uid="uid://bh588bpddschq" path="res://pharaoh.gd" id="1_mt7kg"]
 [ext_resource type="Texture2D" uid="uid://b2nldodte5p6s" path="res://art/sarco_closed.png" id="2_mt7kg"]
 [ext_resource type="Texture2D" uid="uid://d0cd1alr8k706" path="res://art/interact_button.png" id="3_6vea8"]
+[ext_resource type="Texture2D" uid="uid://b7t1tef0syf74" path="res://art/sarco_open.png" id="3_r6lmd"]
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_xwxqv"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("2_mt7kg")
+}],
+"loop": 1,
+"name": &"closed",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("3_r6lmd")
+}],
+"loop": 1,
+"name": &"open",
+"speed": 5.0
+}]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_eumkw"]
 size = Vector2(26, 32)
 
-[node name="Pharaoh" type="Node2D" unique_id=1201409437]
+[node name="Pharaoh" type="Node2D" unique_id=1201409437 groups=["sarcophagi"]]
 script = ExtResource("1_mt7kg")
 
-[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1680278216]
+[node name="Sprite2D" type="AnimatedSprite2D" parent="." unique_id=834105031]
 position = Vector2(0, -16)
-texture = ExtResource("2_mt7kg")
+sprite_frames = SubResource("SpriteFrames_xwxqv")
+animation = &"closed"
+autoplay = "closed"
+frame_progress = 0.3689026
 
 [node name="Area2D" type="Area2D" parent="Sprite2D" unique_id=2050186824]
 

world.tscn

@@ -27,6 +27,8 @@
 [ext_resource type="PackedScene" uid="uid://byfgwmvln8ukh" path="res://vertical_block.tscn" id="25_mc2jv"]
 [ext_resource type="PackedScene" uid="uid://dt43trxumfv0i" path="res://hidden_sign.tscn" id="26_bo7i5"]
 [ext_resource type="PackedScene" uid="uid://b1ccvtwwb1cl7" path="res://long_floor_spike.tscn" id="27_4h6ng"]
+[ext_resource type="PackedScene" uid="uid://cap0wo5ij7hfv" path="res://hidden_spike.tscn" id="28_k83mh"]
+[ext_resource type="Script" uid="uid://b65drnv6461kp" path="res://hidden_spike.gd" id="29_qktwf"]
 
 [node name="World" type="Node2D" unique_id=1327991900]
 process_mode = 1
@@ -54,7 +56,7 @@ position = Vector2(1657, -18.708487)
 position = Vector2(2804, -19.693142)
 
 [node name="LongerBlock8" parent="StartingArea" unique_id=74356311 instance=ExtResource("6_dwbse")]
-position = Vector2(3174, -427.34094)
+position = Vector2(3155, -354.47635)
 
 [node name="LongerBlock11" parent="StartingArea" unique_id=624436532 instance=ExtResource("6_dwbse")]
 position = Vector2(3390, -1028.9663)
@@ -81,7 +83,7 @@ position = Vector2(1609, -26.585724)
 position = Vector2(2751, -27.570404)
 
 [node name="Pharaoh5" parent="StartingArea" unique_id=2064737854 instance=ExtResource("15_hiqwa")]
-position = Vector2(3089, -433.24902)
+position = Vector2(3070, -360.38443)
 
 [node name="LongBlock" parent="StartingArea" unique_id=426647893 instance=ExtResource("3_dwbse")]
 position = Vector2(207, -17.72382)
@@ -519,7 +521,7 @@ position = Vector2(6338, -42.34024)
 unique_name_in_owner = true
 
 [node name="Sign9" parent="." unique_id=573430453 instance=ExtResource("24_wjb0r")]
-position = Vector2(-1387, -44.309547)
+position = Vector2(-1406, 28.555046)
 scale = Vector2(1, 0.98465663)
 sign_text = "HOLDING DOWN WILL MEDITATE"
 text_dismiss_timer = 4
@@ -560,6 +562,18 @@ position = Vector2(7607, -277.12885)
 [node name="LongBlock" parent="." unique_id=1836871184 instance=ExtResource("3_dwbse")]
 position = Vector2(7963, -271.12885)
 
+[node name="LongBlock6" parent="." unique_id=578305907 instance=ExtResource("3_dwbse")]
+position = Vector2(8112, -673.5051)
+
+[node name="LongBlock7" parent="." unique_id=1715379866 instance=ExtResource("3_dwbse")]
+position = Vector2(8224, -674.48975)
+
+[node name="LongBlock8" parent="." unique_id=218061444 instance=ExtResource("3_dwbse")]
+position = Vector2(8335, -673.5052)
+
+[node name="LongBlock9" parent="." unique_id=1660898332 instance=ExtResource("3_dwbse")]
+position = Vector2(8447, -674.4898)
+
 [node name="VerticalLongBlock2" parent="." unique_id=10220440 instance=ExtResource("4_pkg7o")]
 position = Vector2(7864, -212.12886)
 
@@ -657,13 +671,13 @@ position = Vector2(-4771, 365.30762)
 sign_text = "HOLD SPACE TO JUMP FURTHER"
 
 [node name="Block12" parent="." unique_id=888208031 instance=ExtResource("25_mc2jv")]
-position = Vector2(-1660, -23.63176)
+position = Vector2(-1679, 49.232834)
 
 [node name="Block13" parent="." unique_id=501875762 instance=ExtResource("25_mc2jv")]
-position = Vector2(-1660, -8.861908)
+position = Vector2(-1679, 64.002686)
 
 [node name="Block14" parent="." unique_id=705772034 instance=ExtResource("25_mc2jv")]
-position = Vector2(-1660, 6.8925962)
+position = Vector2(-1679, 79.75719)
 
 [node name="Sign8" parent="." unique_id=460763419 instance=ExtResource("24_wjb0r")]
 position = Vector2(-2876, 365.30762)
@@ -671,7 +685,7 @@ sign_text = "THE LEFT CRYSTAL WILL GO OUT WHEN NO DASHES REMAIN"
 text_dismiss_timer = 4
 
 [node name="HiddenSign" parent="." unique_id=1914486910 instance=ExtResource("26_bo7i5")]
-position = Vector2(-1351, -44.30954)
+position = Vector2(-1370, 28.555054)
 sign_text = "MEDITATING REVEALS SECRETS"
 text_dismiss_timer = 4
 
@@ -714,7 +728,7 @@ position = Vector2(-3240, 372.2002)
 position = Vector2(-2093, 371.21558)
 
 [node name="Block15" parent="." unique_id=1277562320 instance=ExtResource("25_mc2jv")]
-position = Vector2(-1660, 22.647102)
+position = Vector2(-1679, 95.511696)
 
 [node name="VerticalLongBlock" parent="." unique_id=2087990778 instance=ExtResource("4_pkg7o")]
 position = Vector2(-1708, 309.1822)
@@ -778,82 +792,89 @@ position = Vector2(-1693, 357.43036)
 position = Vector2(-1694, 371.21555)
 
 [node name="WallSpike17" parent="." unique_id=1785334522 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1813.9541, 29.539698)
+position = Vector2(-1791.9232, 1.9693127)
 
 [node name="WallSpike18" parent="." unique_id=1944691589 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1813.9545, 43.324905)
+position = Vector2(-1791.9236, 15.75452)
 
 [node name="WallSpike19" parent="." unique_id=1174250473 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1813.9545, 57.110092)
+position = Vector2(-1791.9236, 29.539707)
 
 [node name="WallSpike20" parent="." unique_id=2044591878 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1813.9543, 71.87993)
+position = Vector2(-1791.9235, 44.309544)
 
 [node name="WallSpike21" parent="." unique_id=208149461 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1813.9539, 85.665115)
+position = Vector2(-1791.923, 58.09473)
 
 [node name="WallSpike22" parent="." unique_id=448818629 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1813.9542, 99.45033)
+position = Vector2(-1791.9233, 71.879944)
 
 [node name="WallSpike23" parent="." unique_id=1077905007 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1813.9541, 113.23552)
+position = Vector2(-1791.9232, 85.66513)
 
 [node name="WallSpike24" parent="." unique_id=1155541085 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1813.9545, 127.020706)
+position = Vector2(-1791.9236, 99.45032)
 
 [node name="WallSpike25" parent="." unique_id=1154232223 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1965.0306, 32.493668)
+position = Vector2(-1942.9998, 4.9232826)
 rotation = -1.5707964
 
 [node name="WallSpike26" parent="." unique_id=910557166 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1965.0308, 46.278885)
+position = Vector2(-1942.9999, 18.7085)
 rotation = -1.5707964
 
 [node name="WallSpike27" parent="." unique_id=1655122091 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1965.0309, 60.06407)
+position = Vector2(-1943, 32.493687)
 rotation = -1.5707964
 
 [node name="WallSpike28" parent="." unique_id=681987755 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1965.0309, 74.8339)
+position = Vector2(-1943, 47.263515)
 rotation = -1.5707964
 
 [node name="WallSpike29" parent="." unique_id=74798139 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1965.0305, 88.61909)
+position = Vector2(-1942.9996, 61.048702)
 rotation = -1.5707964
 
 [node name="WallSpike30" parent="." unique_id=2068253974 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1965.0308, 102.4043)
+position = Vector2(-1942.9999, 74.83391)
 rotation = -1.5707964
 
 [node name="WallSpike31" parent="." unique_id=2044392573 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1965.0306, 116.18948)
+position = Vector2(-1942.9998, 88.619095)
 rotation = -1.5707964
 
 [node name="WallSpike32" parent="." unique_id=398655446 instance=ExtResource("10_hiqwa")]
-position = Vector2(-1965.0308, 129.97469)
+position = Vector2(-1942.9999, 102.4043)
 rotation = -1.5707964
 
 [node name="VerticalLongBlock7" parent="." unique_id=273872899 instance=ExtResource("4_pkg7o")]
-position = Vector2(-1829.9542, 78.77253)
+position = Vector2(-1807.9233, 51.202145)
 
 [node name="VerticalLongBlock8" parent="." unique_id=109521298 instance=ExtResource("4_pkg7o")]
-position = Vector2(-1950.0154, 79.75719)
+position = Vector2(-1927.9845, 52.186802)
 
 [node name="LongBlock4" parent="." unique_id=635443484 instance=ExtResource("3_dwbse")]
-position = Vector2(-1889, 128.00537)
+position = Vector2(-1866.9691, 100.43498)
 
 [node name="LongBlock5" parent="." unique_id=826837835 instance=ExtResource("3_dwbse")]
-position = Vector2(-1889, 30.524355)
+position = Vector2(-1866.9691, 2.95397)
 
 [node name="Spike3" parent="." unique_id=1944305907 instance=ExtResource("27_4h6ng")]
-position = Vector2(-1920, 13.7851925)
+position = Vector2(-1897.9691, -13.7851925)
 
 [node name="Spike4" parent="." unique_id=788276134 instance=ExtResource("27_4h6ng")]
-position = Vector2(-1860, 13.7851925)
+position = Vector2(-1837.9691, -13.7851925)
 
 [node name="Sign14" parent="." unique_id=464943426 instance=ExtResource("24_wjb0r")]
 position = Vector2(-1804, 363.3383)
 sign_text = "YOUR DASH WILL ALSO BE REFRESHED..."
 text_dismiss_timer = 4
 
+[node name="HiddenSpike" parent="." unique_id=1878715961 instance=ExtResource("28_k83mh")]
+position = Vector2(8232, -721.7533)
+
+[node name="HiddenSpike2" type="Node2D" parent="." unique_id=141634991]
+position = Vector2(8254, -686.30566)
+script = ExtResource("29_qktwf")
+
 [connection signal="toggled" from="CanvasLayer/MusicButton" to="CanvasLayer/MusicButton" method="_on_toggled"]