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

art/saw5.png.import

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

art/slides/Obsessing.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cluf02f4cbby5"
-path="res://.godot/imported/saw4.png-bd621fa9909b47415f5261a3f191e63a.ctex"
+uid="uid://c6pasbohqevvg"
+path="res://.godot/imported/Obsessing.png-8b0f509d4e389e6ea44984fd546a9050.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://art/saw4.png"
-dest_files=["res://.godot/imported/saw4.png-bd621fa9909b47415f5261a3f191e63a.ctex"]
+source_file="res://art/slides/Obsessing.png"
+dest_files=["res://.godot/imported/Obsessing.png-8b0f509d4e389e6ea44984fd546a9050.ctex"]
 
 [params]
 

intro.gd

@@ -4,21 +4,25 @@ extends Control
 func _ready() -> void:
 	$Slideshower.play_slideshow([
 		{ "image": "Daydreaming",
-		  "text": "Ever since he was a wee lad, Mr. Rhombini had always had one dream - to fly around in a blinged up jetpack." },
+		  "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." },
 		{ "image": "res://art/keyart_thumb.png",
-		  "text": "The internet has been abuzz with talks of a legendary Pharaoh's jetpack. Mr. Rhombini's day has come." },
+		  "text": "When Mr. Rhombini heard of the legendary Pharaoh's jetpack, he could feel himself becoming obsessed." },
 		{ "image": "Journey", 
-		  "text": "Under the cover of night, Mr. Rhombini sneaks into the famous pharaoh's pyramid. This night, of all nights, it seems to glow with strange energy." },
+		  "text": "Under the cover of night, Mr. Rhombini decided to sneak into the pyramid." },
 		{ "image": "Goatcaphagus",
-		  "text": "Mr. Rhombini stumbles upon an unusual sarcophagus, a blend of ancient craftsmanship and advanced technology. The antenna have been disconnected." },
+		  "text": "Mr. Rhombini stumbled upon an unusual sarcophagus. He notices that the antenna have been disconnected." },
 		{ "image": "Activate",
-		  "text": "Mr. Rhombini excitedly connects the antenna. The sarcophagus begins to hum." },
+		  "text": "Mr. Rhombini excitedly connects the antenna. He hears the Ancient Technoloy begin to hum." },
 		{ "image": "Nicegoat",
-		  "text": "The sarcophagus swings open to reveal, not a dead body, but an old computer. The computer begins to boot up, but an error message is visible on the main screen." },
+		  "text": "The sarcophagus swings open to reveal, not a dead body, but a mysterious machine. 
+The Ancient Technology begins to boot up, but an error message is visible on the main screen." },
 		{ "images": ["PossessedbyOC", "Power_source"],
-		  "text": "However, Mr. Rhombini's attention is instantly grabbed by the other object inside the open sarcophagus." },
+		  "text": "Mr. Rhombini's attention is instantly grabbed by the other object inside the open sarcophagus." },
 		{ "image": "Glow",
-		  "text": "The Pharaoh's jetpack! Mr. Rhombini wastes no time in putting it on." }
+		  "text": "The Pharaoh's jetpack! The legends were true! It's definitely not cursed!
+Mr. Rhombini wastes no time putting on the Pharaoh's Jetpack." }
 	])
 
 func _on_slideshower_finished_playing() -> void:

saw.gd

@@ -0,0 +1,23 @@
+extends Node2D
+
+@export var max_distance = 260.0
+@export var moving = true
+var alt_position = Vector2(position.x + max_distance,0)
+@export var move_speed = 0.4
+
+func _ready() -> void:
+	alt_position = Vector2(position.x + max_distance,0)
+
+func _process(delta: float) -> void:
+	if position.x != alt_position.x:
+		position.x = move_toward(position.x, alt_position.x, move_speed)
+	else:
+		moving = false
+		%Player2D.is_on_moving_platform = false
+		#%Player2D.platform_speed = 0.0
+	
+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)

saw.gd.uid

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

saw.tscn

@@ -0,0 +1,54 @@
+[gd_scene format=3 uid="uid://c13khrhjy5nrj"]
+
+[ext_resource type="Script" uid="uid://dxgg37v8cxi76" path="res://saw.gd" id="1_reoe3"]
+[ext_resource type="Texture2D" uid="uid://cpftgnwkpx1rp" path="res://art/saw.png" id="2_b8b65"]
+[ext_resource type="Texture2D" uid="uid://dfdjachaibh2u" path="res://art/saw2.png" id="3_tse5f"]
+[ext_resource type="Texture2D" uid="uid://cwvvgwo87pct0" path="res://art/saw3.png" id="4_yv4k5"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_f3sb7"]
+size = Vector2(32, 26)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_lmieu"]
+animations = [{
+"frames": [{
+"duration": 0.3,
+"texture": ExtResource("2_b8b65")
+}, {
+"duration": 0.3,
+"texture": ExtResource("3_tse5f")
+}, {
+"duration": 0.3,
+"texture": ExtResource("4_yv4k5")
+}],
+"loop": 1,
+"name": &"default",
+"speed": 5.0
+}]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_3uo2v"]
+size = Vector2(34, 28)
+
+[node name="Saw" type="RigidBody2D" unique_id=1409784601]
+gravity_scale = 0.0
+freeze = true
+script = ExtResource("1_reoe3")
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1866755047]
+shape = SubResource("RectangleShape2D_f3sb7")
+
+[node name="Sprite2D" type="AnimatedSprite2D" parent="." unique_id=790714481]
+texture_filter = 1
+sprite_frames = SubResource("SpriteFrames_lmieu")
+autoplay = "default"
+frame_progress = 0.39573506
+
+[node name="Area2D" type="Area2D" parent="." unique_id=1910272404]
+position = Vector2(19, 7)
+rotation = -6.834404e-05
+
+[node name="ShapeCast2D" type="CollisionShape2D" parent="Area2D" unique_id=934904308]
+position = Vector2(-18.999523, -7.0012984)
+shape = SubResource("RectangleShape2D_3uo2v")
+
+[connection signal="body_entered" from="Area2D" to="." method="on_contact"]
+[connection signal="body_exited" from="Area2D" to="." method="on_leave"]