Merge branch 'main' of ssh://git.egg:2222/NanoYagi/JumpRopeOldTech

hat_pickup.gd

@@ -0,0 +1,20 @@
+extends Node2D
+
+@export var hat_type:= "dunce1"
+
+var hat_texture = load("res://art/hats/" + str(hat_type) + ".png")
+
+func _ready() -> void:
+	pass
+
+func _process(delta: float) -> void:
+	pass
+
+func on_contact(body: Node2D) -> void:
+	print("BODY: " + str(body))
+	%Player2D/HatSound.play()
+	visible = false
+	%Player2D/Sprite2D/HatSprite.texture = hat_texture
+	%Player2D/Sprite2D/HatSprite.show()
+	await get_tree().create_timer(0.2).timeout
+	queue_free()

hat_pickup.gd.uid

@@ -0,0 +1 @@
+uid://47y55iry2pd6

hat_pickup.tscn

@@ -0,0 +1,21 @@
+[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"]
+
+[sub_resource type="CircleShape2D" id="CircleShape2D_y0cpo"]
+
+[node name="HatPickup" type="Node2D" unique_id=1739014101]
+script = ExtResource("1_fs7cl")
+
+[node name="HatSprite" type="Sprite2D" parent="." unique_id=813041394]
+position = Vector2(0, -8)
+texture = ExtResource("2_fs7cl")
+
+[node name="Area2D" type="Area2D" parent="." unique_id=726438646]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D" unique_id=278855113]
+position = Vector2(0, -7)
+shape = SubResource("CircleShape2D_y0cpo")
+
+[connection signal="body_entered" from="Area2D" to="." method="on_contact"]

intro.gd

@@ -3,10 +3,9 @@ extends Control
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
 	$Slideshower.play_slideshow([
-		{ "image": "Daydreaming",
+		
-		  "text": "Ever since he was a wee lad, Mr. Rhombini always had one dream." },
 		{ "image": "Obsessing",
-		  "text": "He would stay up all night researching. The internet was abuzz with talks of Ancient Technology." },
+		  "text": "Mr.Rhombini heard rumors online of Ancient Technology hidden in the ruins of an ancient society." },
 		{ "image": "res://art/keyart_thumb.png",
 		  "text": "When Mr. Rhombini heard of the legendary Pharaoh's jetpack, he could feel himself becoming obsessed." },
 		{ "image": "Journey", 

player_2d.gd

@@ -214,12 +214,12 @@ func _process(delta: float) -> void:
 	elif direction and !dashing:
 		velocity.x = direction * SPEED
 		$Sprite2D.play("running")
-		$Sprite2D/HatSprite.play("running")
+		#$Sprite2D/HatSprite.play("running")
 		
 	elif !dashing and !is_on_moving_platform:
 		velocity.x = move_toward(velocity.x, 0, FRICTION)
 		$Sprite2D.play("idle")
-		$Sprite2D/HatSprite.play("idle")
+		#$Sprite2D/HatSprite.play("idle")
 		$Parallax2D/Sprite2D.modulate = BACKGROUND_COLOR
 		
 		$MeditateMusic.volume_db = -100

player_2d.tscn

@@ -18,16 +18,15 @@
 [ext_resource type="Texture2D" uid="uid://lmje8plw76e1" path="res://art/player/running/frame2.png" id="9_lu0ka"]
 [ext_resource type="Texture2D" uid="uid://bko8dvawpul3c" path="res://art/player/crystal4.png" id="9_ur4nw"]
 [ext_resource type="Texture2D" uid="uid://m5djssna67e1" path="res://art/player/crouch/frame3.png" id="9_w0gjo"]
-[ext_resource type="Texture2D" uid="uid://ba4kjeulthw1g" path="res://art/hats/dunce1.png" id="10_5s8kx"]
 [ext_resource type="Texture2D" uid="uid://cn31x2l44je2t" path="res://art/dash_glow.png" id="10_ur4nw"]
 [ext_resource type="Texture2D" uid="uid://biscdhn8jh8ha" path="res://art/jump_glow.png" id="11_3lee2"]
-[ext_resource type="Texture2D" uid="uid://cp1v5uhvbfws6" path="res://art/hats/dunce2.png" id="11_4apft"]
 [ext_resource type="Texture2D" uid="uid://dgq8el2qldlui" path="res://art/player/crystal.png" id="12_4apft"]
 [ext_resource type="AudioStream" uid="uid://bkiipooikacjj" path="res://sound/patience.wav" id="12_5s8kx"]
 [ext_resource type="Texture2D" uid="uid://d1tj8sw2hiwgw" path="res://art/dash_particle.png" id="16_ur4nw"]
 [ext_resource type="Texture2D" uid="uid://deacp021ytuew" path="res://art/jump_particle.png" id="18_fat58"]
 [ext_resource type="AudioStream" uid="uid://b4dkj4gmvk7bg" path="res://sound/double_jump.wav" id="20_1741q"]
 [ext_resource type="AudioStream" uid="uid://dc7bd22vwkf34" path="res://sound/death.wav" id="20_l50qk"]
+[ext_resource type="AudioStream" uid="uid://q7eau835xuja" path="res://sound/secret.wav" id="27_sxtm6"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_pmt5n"]
 shader = ExtResource("3_gt2ls")
@@ -83,28 +82,6 @@ animations = [{
 "speed": 12.0
 }]
 
-[sub_resource type="SpriteFrames" id="SpriteFrames_pmt5n"]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("10_5s8kx")
-}],
-"loop": 1,
-"name": &"idle",
-"speed": 6.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("11_4apft")
-}, {
-"duration": 1.0,
-"texture": ExtResource("10_5s8kx")
-}],
-"loop": 1,
-"name": &"running",
-"speed": 6.0
-}]
-
 [sub_resource type="SpriteFrames" id="SpriteFrames_5s8kx"]
 animations = [{
 "frames": [{
@@ -180,14 +157,10 @@ animation = &"crouch"
 autoplay = "idle"
 frame_progress = 0.030440537
 
-[node name="HatSprite" type="AnimatedSprite2D" parent="Sprite2D" unique_id=1954184475]
+[node name="HatSprite" type="Sprite2D" parent="Sprite2D" unique_id=122612770]
 visible = false
 position = Vector2(0, -13)
 scale = Vector2(0.9, 0.9)
-sprite_frames = SubResource("SpriteFrames_pmt5n")
-animation = &"running"
-autoplay = "idle"
-frame_progress = 0.8061519
 
 [node name="DaydreamSprite" type="Sprite2D" parent="Sprite2D" unique_id=67766652]
 
@@ -232,3 +205,6 @@ stream = ExtResource("20_1741q")
 [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1294571021]
 position = Vector2(0, 3)
 shape = SubResource("CapsuleShape2D_ix7pg")
+
+[node name="HatSound" type="AudioStreamPlayer2D" parent="." unique_id=508539941]
+stream = ExtResource("27_sxtm6")

world.tscn

@@ -37,6 +37,7 @@
 [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"]
 
 [node name="World" type="Node2D" unique_id=1327991900]
 process_mode = 1
@@ -965,12 +966,6 @@ position = Vector2(1292, -1381.1807)
 [node name="VerticalLongBlock11" parent="Pharaoh5" unique_id=1350323303 instance=ExtResource("4_pkg7o")]
 position = Vector2(1071, -1562.1807)
 
-[node name="VerticalLongBlock12" parent="Pharaoh5" unique_id=1650192814 instance=ExtResource("4_pkg7o")]
-position = Vector2(1341, -1752.1807)
-
-[node name="VerticalLongBlock13" parent="Pharaoh5" unique_id=1589057212 instance=ExtResource("4_pkg7o")]
-position = Vector2(1045, -1927.1807)
-
 [node name="WallSpike17" parent="Pharaoh5" unique_id=929086827 instance=ExtResource("10_hiqwa")]
 position = Vector2(1307.0005, -1429.1807)
 
@@ -995,30 +990,6 @@ position = Vector2(1307.0005, -1345.4849)
 [node name="WallSpike24" parent="Pharaoh5" unique_id=861870396 instance=ExtResource("10_hiqwa")]
 position = Vector2(1307, -1331.6997)
 
-[node name="WallSpike25" parent="Pharaoh5" unique_id=2053410851 instance=ExtResource("10_hiqwa")]
-position = Vector2(1356.0005, -1800.1807)
-
-[node name="WallSpike26" parent="Pharaoh5" unique_id=774929737 instance=ExtResource("10_hiqwa")]
-position = Vector2(1356, -1786.3955)
-
-[node name="WallSpike27" parent="Pharaoh5" unique_id=461707164 instance=ExtResource("10_hiqwa")]
-position = Vector2(1356, -1772.6104)
-
-[node name="WallSpike28" parent="Pharaoh5" unique_id=349586859 instance=ExtResource("10_hiqwa")]
-position = Vector2(1356, -1757.8403)
-
-[node name="WallSpike29" parent="Pharaoh5" unique_id=1700351156 instance=ExtResource("10_hiqwa")]
-position = Vector2(1356.0005, -1744.0552)
-
-[node name="WallSpike30" parent="Pharaoh5" unique_id=792756580 instance=ExtResource("10_hiqwa")]
-position = Vector2(1356.0002, -1730.27)
-
-[node name="WallSpike31" parent="Pharaoh5" unique_id=889320038 instance=ExtResource("10_hiqwa")]
-position = Vector2(1356.0005, -1716.4849)
-
-[node name="WallSpike32" parent="Pharaoh5" unique_id=1963981929 instance=ExtResource("10_hiqwa")]
-position = Vector2(1356, -1702.6997)
-
 [node name="WallSpike33" parent="Pharaoh5" unique_id=163857781 instance=ExtResource("10_hiqwa")]
 position = Vector2(1092.0002, -1243.1807)
 rotation = -1.5707964
@@ -1083,38 +1054,6 @@ rotation = -1.5707964
 position = Vector2(1056, -1512.6997)
 rotation = -1.5707964
 
-[node name="WallSpike49" parent="Pharaoh5" unique_id=115452622 instance=ExtResource("10_hiqwa")]
-position = Vector2(1030.0002, -1974.1807)
-rotation = -1.5707964
-
-[node name="WallSpike50" parent="Pharaoh5" unique_id=975041451 instance=ExtResource("10_hiqwa")]
-position = Vector2(1030, -1960.3955)
-rotation = -1.5707964
-
-[node name="WallSpike51" parent="Pharaoh5" unique_id=1826095793 instance=ExtResource("10_hiqwa")]
-position = Vector2(1030, -1946.6104)
-rotation = -1.5707964
-
-[node name="WallSpike52" parent="Pharaoh5" unique_id=1857545336 instance=ExtResource("10_hiqwa")]
-position = Vector2(1030, -1932.1807)
-rotation = -1.5707964
-
-[node name="WallSpike53" parent="Pharaoh5" unique_id=1416419910 instance=ExtResource("10_hiqwa")]
-position = Vector2(1030.0005, -1918.0552)
-rotation = -1.5707964
-
-[node name="WallSpike54" parent="Pharaoh5" unique_id=841503173 instance=ExtResource("10_hiqwa")]
-position = Vector2(1030, -1904.27)
-rotation = -1.5707964
-
-[node name="WallSpike55" parent="Pharaoh5" unique_id=1070909624 instance=ExtResource("10_hiqwa")]
-position = Vector2(1030.0002, -1890.4849)
-rotation = -1.5707964
-
-[node name="WallSpike56" parent="Pharaoh5" unique_id=1219841854 instance=ExtResource("10_hiqwa")]
-position = Vector2(1030, -1876.6997)
-rotation = -1.5707964
-
 [node name="Spike3" parent="Pharaoh5" unique_id=139784319 instance=ExtResource("27_4h6ng")]
 position = Vector2(816, -630.1806)
 
@@ -1215,7 +1154,7 @@ position = Vector2(1082, -631.1806)
 position = Vector2(1319, -629.1806)
 
 [node name="Teleporter" parent="Pharaoh5" unique_id=2120681134 instance=ExtResource("4_gbfbk")]
-position = Vector2(1214, -2106.1807)
+position = Vector2(1193, -1706.41)
 paired_teleporter = "F"
 
 [node name="Teleporter2" parent="Pharaoh5" unique_id=880918025 instance=ExtResource("4_gbfbk")]
@@ -2705,11 +2644,8 @@ position = Vector2(8321, -1772.382)
 [node name="Saw5" parent="." unique_id=1680757565 instance=ExtResource("37_my276")]
 position = Vector2(8520, -1950.6049)
 
-[node name="Saw6" parent="." unique_id=1952059258 instance=ExtResource("37_my276")]
+[node name="HatPickup" parent="." unique_id=812970241 instance=ExtResource("38_yx0jh")]
-position = Vector2(8287, -2137.6895)
+position = Vector2(-4677, 352.50708)
-
-[node name="Saw7" parent="." unique_id=908772956 instance=ExtResource("37_my276")]
-position = Vector2(8566, -2316.897)
 
 [node name="DebugPortals" type="Node2D" parent="." unique_id=1727548024 groups=["Debug Mode Only"]]