Began block restructure

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.

.gitignore

@@ -1,3 +1,5 @@
 # Godot 4+ specific ignores
 .godot/
 /android/
+/web_released
+/web_released

FE0031B4.jpg.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://u2pls12umjb4"
+uid="uid://wbtg6085ukle"
-path="res://.godot/imported/index.png-4e9e8d383724ead390b9cd460dfa0229.ctex"
+path="res://.godot/imported/FE0031B4.jpg-22e832d7b8cf85d577d1d3994d8e3ce0.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://web_released/index.png"
+source_file="res://FE0031B4.jpg"
-dest_files=["res://.godot/imported/index.png-4e9e8d383724ead390b9cd460dfa0229.ctex"]
+dest_files=["res://.godot/imported/FE0031B4.jpg-22e832d7b8cf85d577d1d3994d8e3ce0.ctex"]
 
 [params]
 

art/+Y6tTX.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bexc8mxf4wunh"
+uid="uid://dbjb5a353bq5p"
-path="res://.godot/imported/index.icon.png-cd84f171887b41d406500683c840dd56.ctex"
+path="res://.godot/imported/+Y6tTX.png-727916852968e76cc993d8b7d6d6d93a.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://web_released/index.icon.png"
+source_file="res://art/+Y6tTX.png"
-dest_files=["res://.godot/imported/index.icon.png-cd84f171887b41d406500683c840dd56.ctex"]
+dest_files=["res://.godot/imported/+Y6tTX.png-727916852968e76cc993d8b7d6d6d93a.ctex"]
 
 [params]
 

art/CwIZf+.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cw13qw66wv4bv"
+uid="uid://cgyp2d3phoeqd"
-path="res://.godot/imported/index.apple-touch-icon.png-4f839b98ddf0f20283844c698bece728.ctex"
+path="res://.godot/imported/CwIZf+.png-d1acec1f682e0950ce7b5cc0bfb297db.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://web_released/index.apple-touch-icon.png"
+source_file="res://art/CwIZf+.png"
-dest_files=["res://.godot/imported/index.apple-touch-icon.png-4f839b98ddf0f20283844c698bece728.ctex"]
+dest_files=["res://.godot/imported/CwIZf+.png-d1acec1f682e0950ce7b5cc0bfb297db.ctex"]
 
 [params]
 

art/crystal_green.png.import

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

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

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

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

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

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

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

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

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

block.tscn

@@ -1,17 +0,0 @@
-[gd_scene format=3 uid="uid://ckqable762x8v"]
-
-[ext_resource type="Texture2D" uid="uid://blbaaqyrt8dtk" path="res://art/block/block.png" id="1_im0tn"]
-
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_f3sb7"]
-size = Vector2(16, 14)
-
-[node name="Block" type="RigidBody2D" unique_id=1409784601]
-gravity_scale = 0.0
-freeze = true
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1866755047]
-shape = SubResource("RectangleShape2D_f3sb7")
-
-[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1680278216]
-texture_filter = 1
-texture = ExtResource("1_im0tn")

hat_pickup.gd

@@ -0,0 +1,20 @@
+extends Node2D
+
+@export var hat_type:= ""
+
+var hat_texture = load("res://art/hats/" + str(hat_type) + ".png")
+
+func _ready() -> void:
+	hat_texture = load("res://art/hats/" + str(hat_type) + ".png")
+
+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://qm5i00us5qaf" path="res://art/hats/pickup_sprite.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"]

hidden_horizontal_long_block.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://ch0417iiviaxb"]
 
 [ext_resource type="Script" uid="uid://dcesonmhay5vo" path="res://hidden_vertical_long_block.gd" id="1_llak8"]
-[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://block.tscn" id="2_se82m"]
+[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://level_editor/blocks/block_simple.tscn" id="2_se82m"]
 
 [node name="HiddenHorizontalLongBlock" type="RigidBody2D" unique_id=925152188 groups=["Hidden"]]
 modulate = Color(0, 0.54509807, 0.54509807, 1)

hidden_teleporter.gd

@@ -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()

hidden_teleporter.gd.uid

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

hidden_teleporter.tscn

@@ -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"]

hidden_vertical_long_block.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://b5ssjxl1l3fx0"]
 
 [ext_resource type="Script" uid="uid://dcesonmhay5vo" path="res://hidden_vertical_long_block.gd" id="1_tmhet"]
-[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://block.tscn" id="2_667v4"]
+[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://level_editor/blocks/block_simple.tscn" id="2_667v4"]
 
 [node name="HiddenVerticalLongBlock" type="RigidBody2D" unique_id=925152188 groups=["Hidden"]]
 modulate = Color(0, 0.54509807, 0.54509807, 1)

icon.svg

@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><rect width="124" height="124" x="2" y="2" fill="#363d52" stroke="#212532" stroke-width="4" rx="14"/><g fill="#fff" transform="translate(12.322 12.322)scale(.101)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="translate(12.322 12.322)scale(.101)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 96 64">
+  <image width="96" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABACAYAAADlNHIOAAAACXBIWXMAAAsSAAALEgHS3X78AAABpklEQVR4nO3cMUoDQRTG8VnxPl7AYttgZyVYW3iAYBfBTnIAF0SshKQRUoS0i+QCHmXNAdZ6HrjDMMl+M+7/BykGks0kHy8vOztJ5ZzrHWTOeOu1CECMAMQIQIwAxAhA7Ly0Ce8+lhnM4m+z23nU/akAMQIQIwCx4npASPdzyHuCBhUgRgBiBCD273qAWl3X3gzath2cERUgRgBiBCCWfQ/Ife0nFRUgRgBiBCBW3HnA8+vWGz/cXQ3e/+b+yRv3vb8LZ908nvTxIVSAGAGIEYDY5AKoqsq7jf14iwoQIwAxAhDLfnt67FqQ+ppws/7yxlwPyBwBiBGAWPZrQaG9lqVfL6ACxAhAjADEknvA8nM36iuYX8+Oejy73m+tXhZHfT6LChAjADECEJv83tDUz3i79hOLChAjADECECu+B8T+Ltey+/ljhdb7Q6gAMQIQIwCxk/eAQ9d54+/98Gfm5q3xxnatyY73203yHJPQA8pGAGIEIDb6ecDFpf+9O9QTYo9n2ePbHrN4XyU9vz1eLCpAjADECECMvy4WowLECECMADBhzrlf4+1RaAhPjVAAAAAASUVORK5CYII="/>
+</svg>

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", 

level_editor/blocks/block_simple.gd

@@ -0,0 +1,49 @@
+class_name Block_Simple
+
+extends RigidBody2D
+
+# Last known sprite. In edge cases involving states.
+
+# Block type refers to our specific block script.
+# They should always extend eventually from block_simple.
+@export var block_type:Script
+
+# Set the animation (sprite sheet) to the specfied block types.
+func SetSpriteSheet(animation):
+	$Sprite.animation = animation
+
+# If this is false (default) then the block is horizontally facing.
+@export var is_vertical:bool
+
+# Tags the block has. These dictate interactions.
+# These must be strings.
+@export var tags:Array = [str]
+
+# Rotate the block in a way that we can control.
+# Default to 90 because that's a common use case.
+func rotate_block(degrees:int = 90):
+	rotate(degrees)
+	
+# This runs BEFORE the instance is loaded. 
+# There's a lot you can't do here, as it doesn't exist yet.
+func _init():
+	pass
+	#SetSpriteSheet(str(block_type))
+	#set_script(block_type)
+
+# This runs AFTER the instance is loaded.
+# This runs BEFORE the instance is added to the scene tree.
+func _ready() -> void:
+	if is_vertical:
+		rotate_block(90)
+	set_script(block_type)
+
+# This runs every frame. Expensive.
+func _process(delta: float) -> void:
+	var _last_known_delta = delta
+
+func on_player_near(body: Node2D) -> void:
+	print("Player is touching block with tags: " + str(tags))
+
+func on_player_leave(body: Node2D) -> void:
+	print("Player is leaving block with tags: " + str(tags))

level_editor/blocks/block_simple.gd.uid

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

level_editor/blocks/block_simple.tscn

@@ -0,0 +1,54 @@
+[gd_scene format=3 uid="uid://ckqable762x8v"]
+
+[ext_resource type="Script" uid="uid://b65ci82qp1pa0" path="res://level_editor/blocks/block_simple.gd" id="1_64qyq"]
+[ext_resource type="Script" uid="uid://2nvcig3fqetr" path="res://level_editor/blocks/block_spike.gd" id="2_rhp63"]
+[ext_resource type="Texture2D" uid="uid://blbaaqyrt8dtk" path="res://art/block/block.png" id="2_xmhd5"]
+[ext_resource type="Texture2D" uid="uid://bu5wgerfu7cbc" path="res://art/spike.png" id="3_rhp63"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_f3sb7"]
+size = Vector2(16, 14)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_q6akc"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("2_xmhd5")
+}],
+"loop": 1,
+"name": &"block_simple",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("3_rhp63")
+}],
+"loop": 1,
+"name": &"block_spike",
+"speed": 5.0
+}]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_lxo14"]
+
+[node name="Block_Simple" type="RigidBody2D" unique_id=1409784601]
+gravity_scale = 0.0
+freeze = true
+script = ExtResource("1_64qyq")
+block_type = ExtResource("2_rhp63")
+tags = [null]
+
+[node name="BlockShape" type="CollisionShape2D" parent="." unique_id=1866755047]
+shape = SubResource("RectangleShape2D_f3sb7")
+
+[node name="Sprite" type="AnimatedSprite2D" parent="." unique_id=321127444]
+texture_filter = 1
+sprite_frames = SubResource("SpriteFrames_q6akc")
+animation = &"block_simple"
+autoplay = "block_simple"
+
+[node name="EffectCollision" type="Area2D" parent="." unique_id=1756054567]
+
+[node name="EffectShape" type="CollisionShape2D" parent="EffectCollision" unique_id=392861580]
+shape = SubResource("RectangleShape2D_lxo14")
+
+[connection signal="body_entered" from="EffectCollision" to="." method="on_player_near"]
+[connection signal="body_exited" from="EffectCollision" to="." method="on_player_leave"]

level_editor/blocks/block_spike.gd

@@ -0,0 +1,25 @@
+class_name Block_Spike
+
+extends Block_Simple
+
+# This runs BEFORE the instance is loaded. 
+# There's a lot you can't do here, as it doesn't exist yet.
+func _init():
+	is_vertical = false
+	tags = ["Spike","Hazard"]
+
+# This runs AFTER the instance is loaded.
+# This runs BEFORE the instance is added to the scene tree.
+func _ready() -> void:
+	if is_vertical:
+		rotate_block(90)
+
+# This runs every frame. Expensive.
+func _process(delta: float) -> void:
+	var _last_known_delta = delta
+
+func on_player_near(body: Node2D) -> void:
+	print("Player is touching block with tags: " + str(tags))
+
+func on_player_leave(body: Node2D) -> void:
+	print("Player is leaving block with tags: " + str(tags))

level_editor/blocks/block_spike.gd.uid

@@ -0,0 +1 @@
+uid://2nvcig3fqetr

long_block.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3 uid="uid://dx4pfup3sbk0f"]
 
-[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://block.tscn" id="1_r8bmj"]
+[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://level_editor/blocks/block_simple.tscn" id="1_r8bmj"]
 
 [node name="LongBlock" type="Node2D" unique_id=426800863]
 

longer_block.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3 uid="uid://biot4cuwgohvo"]
 
-[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://block.tscn" id="1_plc11"]
+[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://level_editor/blocks/block_simple.tscn" id="1_plc11"]
 
 [node name="LongerBlock" type="Node2D" unique_id=426800863]
 

playerclass.gd

@@ -1,3 +1,4 @@
+class_name PlayerClassextends 
 extends CharacterBody2D
 
 var controller_ui = false
@@ -39,6 +40,10 @@ func _ready() -> void:
 
 	for hidden_object in get_tree().get_nodes_in_group("Hidden"):
 		hidden_object.hide()
+	
+	if not OS.is_debug_build():
+		for object in get_tree().get_nodes_in_group("Debug Mode Only"):
+			object.queue_free()
 	#%Dialogue.show_text("Hello world!").dismiss_after(2)
 	
 func refresh_dash(new_dashes):
@@ -157,24 +162,29 @@ func _process(delta: float) -> void:
 	if Input.is_action_just_pressed("jump"):
 		%OldComputer.close()
 
+		# Single jump from floor.
 		if is_on_floor():
 			velocity.y = JUMP_VELOCITY
+		# Air jump, if we have any left.
 		elif !is_on_floor() and jumps >= 1:
-			#Air/double jump
 			jumps -= 1
 			velocity.y = JUMP_VELOCITY
 			$Jetpack/DoubleJumpSound.play()
 		if jumps == 0:
 			$Jetpack/JumpIndicator.hide()
 	
+	# Pull the player down more quickly when they let go of the jump key.
+	# This improves responsiveness.
 	if Input.is_action_just_released("jump"):
 		velocity.y = -(0.001 * JUMP_VELOCITY)
 		
+	# Eventual wall grabs
 	if Input.is_action_pressed("jump") and is_on_wall_only():
-		pass
+		print("Spider Rhombini, Spider Rhombini...")
-		#print("WALL HANGING")
+		
-		#velocity.y = 0
+	# Eventual ceiling grabs
-		#velocity.x = 0
+	if Input.is_action_pressed("jump") and is_on_ceiling_only():
+		print("Does whatever, a Spider Rhombini does...")
 
 	var direction = Input.get_axis("move_left","move_right")
 
@@ -207,15 +217,19 @@ func _process(delta: float) -> void:
 		if dashes == 0:
 			$Jetpack/DashIndicator.hide()
 
+	# Slow the player down if they're on keyboard.
 	elif direction and !dashing:
-		velocity.x = direction * SPEED
+		if controller_ui:
+			velocity.x = direction * SPEED 
+		else:
+			velocity.x = direction * SPEED * 0.75
 		$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
@@ -230,6 +244,8 @@ func _process(delta: float) -> void:
 		print("SLASH KILL")
 		on_death(true)
 	
+	#func get_floor_tags():
+		
 	fall_timer += 1*delta
 	if is_on_floor():
 		fall_timer = 0

playerclass.tscn

@@ -1,36 +1,35 @@
 [gd_scene format=3 uid="uid://pmnwck5v0ntm"]
 
-[ext_resource type="Script" uid="uid://cojhnj15psd2x" path="res://player_2d.gd" id="1_sy00s"]
+[ext_resource type="Script" uid="uid://cojhnj15psd2x" path="res://playerclass.gd" id="1_5duxp"]
-[ext_resource type="Shader" uid="uid://mmf86jusrkrr" path="res://shaders/warp_shader.gdshader" id="3_gt2ls"]
+[ext_resource type="AudioStream" uid="uid://bkiipooikacjj" path="res://sound/patience.wav" id="2_stm81"]
-[ext_resource type="Texture2D" uid="uid://dpdxs6gjmexgh" path="res://art/background.png" id="3_p3026"]
+[ext_resource type="Script" uid="uid://544kxhmunfcp" path="res://background_music.gd" id="3_ttanp"]
-[ext_resource type="Script" uid="uid://544kxhmunfcp" path="res://background_music.gd" id="3_sxtm6"]
+[ext_resource type="AudioStream" uid="uid://8iiafankqo4i" path="res://sound/stepping.wav" id="4_yip33"]
-[ext_resource type="AudioStream" uid="uid://8iiafankqo4i" path="res://sound/stepping.wav" id="4_ix7pg"]
+[ext_resource type="Shader" uid="uid://mmf86jusrkrr" path="res://shaders/warp_shader.gdshader" id="5_neyal"]
-[ext_resource type="Texture2D" uid="uid://biv3f67rqumak" path="res://art/level_start.png" id="4_nj6as"]
+[ext_resource type="Script" uid="uid://3bqq3mfbby2c" path="res://warp_shader.gd" id="6_6fvs5"]
-[ext_resource type="Script" uid="uid://3bqq3mfbby2c" path="res://warp_shader.gd" id="4_pmt5n"]
+[ext_resource type="Texture2D" uid="uid://biv3f67rqumak" path="res://art/level_start.png" id="7_edptc"]
-[ext_resource type="Texture2D" uid="uid://ddhhtwgtowokp" path="res://art/player/crouch/frame1.png" id="6_3prq1"]
+[ext_resource type="Texture2D" uid="uid://dpdxs6gjmexgh" path="res://art/background.png" id="8_mjiju"]
-[ext_resource type="Texture2D" uid="uid://do1kisv06nhnk" path="res://art/player/crouch/frame0.png" id="6_lu0ka"]
+[ext_resource type="Texture2D" uid="uid://do1kisv06nhnk" path="res://art/player/crouch/frame0.png" id="9_2cwu2"]
-[ext_resource type="Texture2D" uid="uid://dyxbitw8hbd3s" path="res://art/player/crouch/frame2.png" id="7_lu0ka"]
+[ext_resource type="Texture2D" uid="uid://ddhhtwgtowokp" path="res://art/player/crouch/frame1.png" id="10_1fojg"]
-[ext_resource type="Texture2D" uid="uid://bfyd1tro3s0gl" path="res://art/player/crystal2.png" id="7_oy4pt"]
+[ext_resource type="Texture2D" uid="uid://dyxbitw8hbd3s" path="res://art/player/crouch/frame2.png" id="11_q60t1"]
-[ext_resource type="Texture2D" uid="uid://dh7a1knyqn5nd" path="res://art/player/running/frame3.png" id="7_pmt5n"]
+[ext_resource type="Texture2D" uid="uid://m5djssna67e1" path="res://art/player/crouch/frame3.png" id="12_shx8o"]
-[ext_resource type="Texture2D" uid="uid://lk0f1qyswyxv" path="res://art/player/running/frame1.png" id="8_3prq1"]
+[ext_resource type="Texture2D" uid="uid://lk0f1qyswyxv" path="res://art/player/running/frame1.png" id="13_86mff"]
-[ext_resource type="Texture2D" uid="uid://yf13nw31k8ua" path="res://art/player/running/frame4.png" id="8_nj6as"]
+[ext_resource type="Texture2D" uid="uid://lmje8plw76e1" path="res://art/player/running/frame2.png" id="14_x1dp2"]
-[ext_resource type="Texture2D" uid="uid://du5i0tg6u1lal" path="res://art/player/crystal3.png" id="8_ukfft"]
+[ext_resource type="Texture2D" uid="uid://dh7a1knyqn5nd" path="res://art/player/running/frame3.png" id="15_ih5k4"]
-[ext_resource type="Texture2D" uid="uid://lmje8plw76e1" path="res://art/player/running/frame2.png" id="9_lu0ka"]
+[ext_resource type="Texture2D" uid="uid://yf13nw31k8ua" path="res://art/player/running/frame4.png" id="16_uko10"]
-[ext_resource type="Texture2D" uid="uid://bko8dvawpul3c" path="res://art/player/crystal4.png" id="9_ur4nw"]
+[ext_resource type="Texture2D" uid="uid://dgq8el2qldlui" path="res://art/player/crystal.png" id="17_qiwkp"]
-[ext_resource type="Texture2D" uid="uid://m5djssna67e1" path="res://art/player/crouch/frame3.png" id="9_w0gjo"]
+[ext_resource type="Texture2D" uid="uid://bfyd1tro3s0gl" path="res://art/player/crystal2.png" id="18_0xmip"]
-[ext_resource type="Texture2D" uid="uid://ba4kjeulthw1g" path="res://art/hats/dunce1.png" id="10_5s8kx"]
+[ext_resource type="Texture2D" uid="uid://du5i0tg6u1lal" path="res://art/player/crystal3.png" id="19_kbmrq"]
-[ext_resource type="Texture2D" uid="uid://cn31x2l44je2t" path="res://art/dash_glow.png" id="10_ur4nw"]
+[ext_resource type="Texture2D" uid="uid://bko8dvawpul3c" path="res://art/player/crystal4.png" id="20_eo5qq"]
-[ext_resource type="Texture2D" uid="uid://biscdhn8jh8ha" path="res://art/jump_glow.png" id="11_3lee2"]
+[ext_resource type="Texture2D" uid="uid://d1tj8sw2hiwgw" path="res://art/dash_particle.png" id="21_esbp8"]
-[ext_resource type="Texture2D" uid="uid://cp1v5uhvbfws6" path="res://art/hats/dunce2.png" id="11_4apft"]
+[ext_resource type="Texture2D" uid="uid://cn31x2l44je2t" path="res://art/dash_glow.png" id="22_ek43q"]
-[ext_resource type="Texture2D" uid="uid://dgq8el2qldlui" path="res://art/player/crystal.png" id="12_4apft"]
+[ext_resource type="Texture2D" uid="uid://deacp021ytuew" path="res://art/jump_particle.png" id="23_lbx0d"]
-[ext_resource type="AudioStream" uid="uid://bkiipooikacjj" path="res://sound/patience.wav" id="12_5s8kx"]
+[ext_resource type="Texture2D" uid="uid://biscdhn8jh8ha" path="res://art/jump_glow.png" id="24_k0rqh"]
-[ext_resource type="Texture2D" uid="uid://d1tj8sw2hiwgw" path="res://art/dash_particle.png" id="16_ur4nw"]
+[ext_resource type="AudioStream" uid="uid://dc7bd22vwkf34" path="res://sound/death.wav" id="25_g8wc1"]
-[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="26_mlgy2"]
-[ext_resource type="AudioStream" uid="uid://b4dkj4gmvk7bg" path="res://sound/double_jump.wav" id="20_1741q"]
+[ext_resource type="AudioStream" uid="uid://q7eau835xuja" path="res://sound/secret.wav" id="27_ng6ly"]
-[ext_resource type="AudioStream" uid="uid://dc7bd22vwkf34" path="res://sound/death.wav" id="20_l50qk"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_pmt5n"]
-shader = ExtResource("3_gt2ls")
+shader = ExtResource("5_neyal")
 
 [sub_resource type="QuadMesh" id="QuadMesh_nj6as"]
 size = Vector2(1280, 720)
@@ -39,16 +38,16 @@ size = Vector2(1280, 720)
 animations = [{
 "frames": [{
 "duration": 1.0,
-"texture": ExtResource("6_lu0ka")
+"texture": ExtResource("9_2cwu2")
 }, {
 "duration": 1.0,
-"texture": ExtResource("6_3prq1")
+"texture": ExtResource("10_1fojg")
 }, {
 "duration": 1.0,
-"texture": ExtResource("7_lu0ka")
+"texture": ExtResource("11_q60t1")
 }, {
 "duration": 1.0,
-"texture": ExtResource("9_w0gjo")
+"texture": ExtResource("12_shx8o")
 }],
 "loop": 1,
 "name": &"crouch",
@@ -56,10 +55,10 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": ExtResource("8_3prq1")
+"texture": ExtResource("13_86mff")
 }, {
 "duration": 1.0,
-"texture": ExtResource("9_lu0ka")
+"texture": ExtResource("14_x1dp2")
 }],
 "loop": 1,
 "name": &"idle",
@@ -67,58 +66,36 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": ExtResource("7_pmt5n")
+"texture": ExtResource("15_ih5k4")
 }, {
 "duration": 1.0,
-"texture": ExtResource("8_nj6as")
+"texture": ExtResource("16_uko10")
 }, {
 "duration": 1.0,
-"texture": ExtResource("8_3prq1")
+"texture": ExtResource("13_86mff")
 }, {
 "duration": 1.0,
-"texture": ExtResource("9_lu0ka")
+"texture": ExtResource("14_x1dp2")
 }],
 "loop": 1,
 "name": &"running",
 "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": [{
 "duration": 1.0,
-"texture": ExtResource("12_4apft")
+"texture": ExtResource("17_qiwkp")
 }, {
 "duration": 1.0,
-"texture": ExtResource("7_oy4pt")
+"texture": ExtResource("18_0xmip")
 }, {
 "duration": 1.0,
-"texture": ExtResource("8_ukfft")
+"texture": ExtResource("19_kbmrq")
 }, {
 "duration": 1.0,
-"texture": ExtResource("9_ur4nw")
+"texture": ExtResource("20_eo5qq")
 }],
 "loop": 1,
 "name": &"idle",
@@ -129,20 +106,22 @@ animations = [{
 radius = 6.0
 height = 12.0
 
-[node name="Player2D" type="CharacterBody2D" unique_id=889851478]
+[node name="PlayerClass" type="CharacterBody2D" unique_id=889851478]
 safe_margin = 0.06
-script = ExtResource("1_sy00s")
+script = ExtResource("1_5duxp")
 
 [node name="BackgroundMusic" type="AudioStreamPlayer2D" parent="." unique_id=299359239]
-stream = ExtResource("12_5s8kx")
+stream = ExtResource("2_stm81")
+autoplay = true
 playback_type = 1
-script = ExtResource("3_sxtm6")
+script = ExtResource("3_ttanp")
 
 [node name="MeditateMusic" type="AudioStreamPlayer2D" parent="." unique_id=1027402564]
-stream = ExtResource("4_ix7pg")
+stream = ExtResource("4_yip33")
 volume_db = -80.0
+autoplay = true
 playback_type = 1
-script = ExtResource("3_sxtm6")
+script = ExtResource("3_ttanp")
 
 [node name="CanvasLayer2" type="CanvasLayer" parent="." unique_id=1854423107]
 
@@ -150,11 +129,11 @@ script = ExtResource("3_sxtm6")
 material = SubResource("ShaderMaterial_pmt5n")
 position = Vector2(0, -1)
 mesh = SubResource("QuadMesh_nj6as")
-script = ExtResource("4_pmt5n")
+script = ExtResource("6_6fvs5")
 
 [node name="Sprite2D" type="Sprite2D" parent="CanvasLayer2/WarpShader" unique_id=1651549733]
 visible = false
-texture = ExtResource("4_nj6as")
+texture = ExtResource("7_edptc")
 
 [node name="Parallax2D" type="Parallax2D" parent="." unique_id=270393374]
 repeat_size = Vector2(1280, 720)
@@ -164,7 +143,7 @@ ignore_camera_scroll = true
 
 [node name="Sprite2D" type="Sprite2D" parent="Parallax2D" unique_id=1267606565]
 scale = Vector2(3, 3)
-texture = ExtResource("3_p3026")
+texture = ExtResource("8_mjiju")
 
 [node name="Camera2D" type="Camera2D" parent="." unique_id=962368438]
 zoom = Vector2(2.2, 2.2)
@@ -180,14 +159,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]
 
@@ -199,36 +174,39 @@ autoplay = "idle"
 
 [node name="DashIndicator" type="CPUParticles2D" parent="Jetpack" unique_id=1424397604]
 position = Vector2(-11, -2)
-texture = ExtResource("16_ur4nw")
+texture = ExtResource("21_esbp8")
 lifetime = 0.1
 gravity = Vector2(0, 0)
 
 [node name="DashIndicatorGlow" type="PointLight2D" parent="Jetpack/DashIndicator" unique_id=1334369973]
 position = Vector2(-1, 0)
 energy = 10.0
-texture = ExtResource("10_ur4nw")
+texture = ExtResource("22_ek43q")
 
 [node name="JumpIndicator" type="CPUParticles2D" parent="Jetpack" unique_id=1519478958]
 position = Vector2(13, -2)
-texture = ExtResource("18_fat58")
+texture = ExtResource("23_lbx0d")
 lifetime = 0.1
 gravity = Vector2(0, 0)
 
 [node name="JumpIndicatorGlow" type="PointLight2D" parent="Jetpack/JumpIndicator" unique_id=920409859]
 position = Vector2(-1, 0)
 energy = 10.0
-texture = ExtResource("11_3lee2")
+texture = ExtResource("24_k0rqh")
 
 [node name="JumpSound" type="AudioStreamPlayer2D" parent="Jetpack" unique_id=2009313321]
 
 [node name="DashSound" type="AudioStreamPlayer2D" parent="Jetpack" unique_id=403353396]
 
 [node name="DeathSound" type="AudioStreamPlayer2D" parent="Jetpack" unique_id=1365918564]
-stream = ExtResource("20_l50qk")
+stream = ExtResource("25_g8wc1")
 
 [node name="DoubleJumpSound" type="AudioStreamPlayer2D" parent="Jetpack" unique_id=1131911389]
-stream = ExtResource("20_1741q")
+stream = ExtResource("26_mlgy2")
 
 [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_ng6ly")

project.godot

@@ -26,6 +26,7 @@ window/stretch/mode="canvas_items"
 
 Hidden=""
 "Hidden in editor"=""
+"Debug Mode Only"=""
 
 [gui]
 
@@ -226,7 +227,7 @@ dash={
 )]
 }
 dash_down={
-"deadzone": 0.2,
+"deadzone": 0.4,
 "events": [Object(InputEventJoypadMotion,
 "resource_local_to_scene": false,
 "resource_name": "",

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 == self:
-			if teleporter.paired_teleporter == paired_teleporter and enabled:
+			continue
-				%Player2D.get_node("Camera2D").position_smoothing_enabled = false
+
-				if %Player2D.teleport_cooldown > 0:
+		if teleporter.paired_teleporter == paired_teleporter:
-					return
+			%Player2D.get_node("Camera2D").position_smoothing_enabled = false
-				body.set_position(teleporter.global_position)
+			if %Player2D.teleport_cooldown > 0:
-				%Player2D.on_teleport()
+				return
-				disable()
+			body.set_position(teleporter.global_position)
-				await get_tree().create_timer(cooldown).timeout
+			%Player2D.on_teleport()
-				enable()
+			disable()
+			await get_tree().create_timer(cooldown).timeout
+			enable()

vertical_long_block.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://bos6oh7nwyeca"]
 
 [ext_resource type="Script" uid="uid://0o8303qahgvi" path="res://vertical_long_block.gd" id="1_23eij"]
-[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://block.tscn" id="1_noju1"]
+[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://level_editor/blocks/block_simple.tscn" id="1_noju1"]
 
 [node name="VerticalLongBlock" type="RigidBody2D" unique_id=925152188]
 rotation = 1.5707964

web_released/index.html

@@ -111,7 +111,7 @@ body {
 
 		<script src="index.js"></script>
 		<script>
-const GODOT_CONFIG = {"args":[],"canvasResizePolicy":2,"emscriptenPoolSize":8,"ensureCrossOriginIsolationHeaders":true,"executable":"index","experimentalVK":false,"fileSizes":{"index.pck":15227116,"index.wasm":32537295},"focusCanvas":true,"gdextensionLibs":[],"godotPoolSize":4};
+const GODOT_CONFIG = {"args":[],"canvasResizePolicy":2,"emscriptenPoolSize":8,"ensureCrossOriginIsolationHeaders":true,"executable":"index","experimentalVK":false,"fileSizes":{"index.pck":19255648,"index.wasm":32537295},"focusCanvas":true,"gdextensionLibs":[],"godotPoolSize":4};
 const GODOT_THREADS_ENABLED = false;
 const engine = new Engine(GODOT_CONFIG);
 

world.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://iivvrut0lfsr"]
 
-[ext_resource type="PackedScene" uid="uid://pmnwck5v0ntm" path="res://player_2d.tscn" id="1_aqk2v"]
+[ext_resource type="PackedScene" uid="uid://pmnwck5v0ntm" path="res://playerclass.tscn" id="1_aqk2v"]
-[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://block.tscn" id="2_036b0"]
+[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://level_editor/blocks/block_simple.tscn" id="2_036b0"]
 [ext_resource type="Script" uid="uid://bds4m5we8nwe3" path="res://fps_label.gd" id="2_dwbse"]
 [ext_resource type="PackedScene" uid="uid://dx4pfup3sbk0f" path="res://long_block.tscn" id="3_dwbse"]
 [ext_resource type="Script" uid="uid://dtomgfu8ib50f" path="res://coin_label.gd" id="3_wse8f"]
@@ -35,8 +35,8 @@
 [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"]
 
 [node name="World" type="Node2D" unique_id=1327991900]
 process_mode = 1
@@ -403,15 +403,15 @@ position = Vector2(0, -58.094738)
 position = Vector2(0, -85.66513)
 
 [node name="Disk" parent="Tutorial" unique_id=514380026 instance=ExtResource("10_2u3nc")]
-position = Vector2(55, 95.511696)
+position = Vector2(426, 363.3383)
 disk_num = 1
 
 [node name="Disk2" parent="Tutorial" unique_id=369042906 instance=ExtResource("10_2u3nc")]
-position = Vector2(8512, -893.08356)
+position = Vector2(8293, -704.0295)
 disk_num = 2
 
 [node name="Disk4" parent="Tutorial" unique_id=1193788903 instance=ExtResource("10_2u3nc")]
-position = Vector2(9593, -1262.3298)
+position = Vector2(9084, -1026.997)
 disk_num = 4
 
 [node name="WallSpike" parent="Tutorial" unique_id=287086441 instance=ExtResource("10_hiqwa")]
@@ -448,6 +448,10 @@ position = Vector2(1368, 401)
 [node name="LongBlock11" parent="Tutorial" unique_id=1016724328 instance=ExtResource("6_dwbse")]
 position = Vector2(1149, 629.44025)
 
+[node name="HatPickup" parent="Tutorial" unique_id=1480603595 instance=ExtResource("38_yx0jh")]
+position = Vector2(53, 103.38895)
+hat_type = "hat_pirate"
+
 [node name="CanvasLayer" type="CanvasLayer" parent="." unique_id=1637221343 groups=["Hidden in editor"]]
 visible = false
 
@@ -904,7 +908,7 @@ sign_text = "YOUR DASH WILL ALSO BE REFRESHED..."
 
 [node name="HiddenSpike" parent="." unique_id=1878715961 instance=ExtResource("28_k83mh")]
 visible = true
-position = Vector2(8232, -721.7533)
+position = Vector2(8234, -692.2137)
 
 [node name="HiddenSpike2" type="Node2D" parent="." unique_id=141634991]
 position = Vector2(8254, -686.30566)
@@ -965,12 +969,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 +993,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 +1057,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 +1157,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")]
@@ -1417,11 +1359,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(-965, -163.45284)
+position = Vector2(-961, -132.92844)
 paired_teleporter = "C3"
 
 [node name="Block" parent="QuadrantC" unique_id=1060735363 instance=ExtResource("2_036b0")]
@@ -1434,17 +1376,227 @@ position = Vector2(-66, -334.78317)
 position = Vector2(37, -465.74265)
 
 [node name="Block12" parent="QuadrantC" unique_id=1345743581 instance=ExtResource("2_036b0")]
-position = Vector2(-965, -146.71371)
+position = Vector2(-961, -115.204704)
+
+[node name="Block13" parent="QuadrantC" unique_id=289002208 instance=ExtResource("2_036b0")]
+position = Vector2(-945, -115.204704)
+
+[node name="Block30" parent="QuadrantC" unique_id=816473810 instance=ExtResource("2_036b0")]
+position = Vector2(-945, -128.9899)
+
+[node name="Block31" parent="QuadrantC" unique_id=1119400275 instance=ExtResource("2_036b0")]
+position = Vector2(-977, -115.204704)
+
+[node name="Block32" parent="QuadrantC" unique_id=1205660476 instance=ExtResource("2_036b0")]
+position = Vector2(-978, -129.97455)
+
+[node name="Block33" parent="QuadrantC" unique_id=442471976 instance=ExtResource("2_036b0")]
+position = Vector2(-699, -117.17402)
+
+[node name="Block34" parent="QuadrantC" unique_id=425268934 instance=ExtResource("2_036b0")]
+position = Vector2(-699, -130.95921)
+
+[node name="Block35" parent="QuadrantC" unique_id=736645162 instance=ExtResource("2_036b0")]
+position = Vector2(-731, -117.17402)
+
+[node name="Block36" parent="QuadrantC" unique_id=1307552840 instance=ExtResource("2_036b0")]
+position = Vector2(-732, -131.94386)
+
+[node name="Block37" parent="QuadrantC" unique_id=740712660 instance=ExtResource("2_036b0")]
+position = Vector2(-475, -118.158676)
+
+[node name="Block38" parent="QuadrantC" unique_id=32020515 instance=ExtResource("2_036b0")]
+position = Vector2(-475, -131.94386)
+
+[node name="Block39" parent="QuadrantC" unique_id=1616557258 instance=ExtResource("2_036b0")]
+position = Vector2(-507, -118.158676)
+
+[node name="Block40" parent="QuadrantC" unique_id=2082878213 instance=ExtResource("2_036b0")]
+position = Vector2(-508, -132.92851)
+
+[node name="Block41" parent="QuadrantC" unique_id=2083560450 instance=ExtResource("2_036b0")]
+position = Vector2(-289, -113.23539)
+
+[node name="Block42" parent="QuadrantC" unique_id=1628327753 instance=ExtResource("2_036b0")]
+position = Vector2(-289, -127.02058)
+
+[node name="Block43" parent="QuadrantC" unique_id=1929797721 instance=ExtResource("2_036b0")]
+position = Vector2(-321, -113.23539)
+
+[node name="Block44" parent="QuadrantC" unique_id=665750308 instance=ExtResource("2_036b0")]
+position = Vector2(-322, -128.00523)
+
+[node name="Block45" parent="QuadrantC" unique_id=1209323393 instance=ExtResource("2_036b0")]
+position = Vector2(-370, -300.32016)
+
+[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)
+
+[node name="Block57" parent="QuadrantC" unique_id=275949868 instance=ExtResource("2_036b0")]
+position = Vector2(-1038, -462.78848)
+
+[node name="Block58" parent="QuadrantC" unique_id=448020578 instance=ExtResource("2_036b0")]
+position = Vector2(-1038, -476.5737)
+
+[node name="Block59" parent="QuadrantC" unique_id=558676740 instance=ExtResource("2_036b0")]
+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)
+
+[node name="Block62" parent="QuadrantC" unique_id=139724863 instance=ExtResource("2_036b0")]
+position = Vector2(-946, -359.39957)
+
+[node name="Block63" parent="QuadrantC" unique_id=180177121 instance=ExtResource("2_036b0")]
+position = Vector2(-978, -345.61435)
+
+[node name="Block64" parent="QuadrantC" unique_id=2075438743 instance=ExtResource("2_036b0")]
+position = Vector2(-979, -360.3842)
+
+[node name="Block65" parent="QuadrantC" unique_id=609931076 instance=ExtResource("2_036b0")]
+position = Vector2(-1038, -637.07275)
+
+[node name="Block66" parent="QuadrantC" unique_id=2000871365 instance=ExtResource("2_036b0")]
+position = Vector2(-1038, -650.858)
+
+[node name="Block67" parent="QuadrantC" unique_id=493059217 instance=ExtResource("2_036b0")]
+position = Vector2(-1070, -637.07275)
+
+[node name="Block68" parent="QuadrantC" unique_id=1467233851 instance=ExtResource("2_036b0")]
+position = Vector2(-1071, -651.8426)
+
+[node name="Block69" parent="QuadrantC" unique_id=543160899 instance=ExtResource("2_036b0")]
+position = Vector2(-831, -718.79926)
+
+[node name="Block70" parent="QuadrantC" unique_id=1656570543 instance=ExtResource("2_036b0")]
+position = Vector2(-831, -732.5845)
+
+[node name="Block71" parent="QuadrantC" unique_id=1696017732 instance=ExtResource("2_036b0")]
+position = Vector2(-863, -718.79926)
+
+[node name="Block72" parent="QuadrantC" unique_id=1699215291 instance=ExtResource("2_036b0")]
+position = Vector2(-864, -733.5691)
+
+[node name="Block73" parent="QuadrantC" unique_id=136259557 instance=ExtResource("2_036b0")]
+position = Vector2(-1034, -798.55646)
+
+[node name="Block74" parent="QuadrantC" unique_id=929515331 instance=ExtResource("2_036b0")]
+position = Vector2(-1034, -812.3417)
+
+[node name="Block75" parent="QuadrantC" unique_id=223961949 instance=ExtResource("2_036b0")]
+position = Vector2(-1066, -798.55646)
+
+[node name="Block76" parent="QuadrantC" unique_id=1502454646 instance=ExtResource("2_036b0")]
+position = Vector2(-1067, -813.3263)
+
+[node name="Block81" parent="QuadrantC" unique_id=24476348 instance=ExtResource("2_036b0")]
+position = Vector2(-614, -1076.2296)
+
+[node name="Block82" parent="QuadrantC" unique_id=1950341352 instance=ExtResource("2_036b0")]
+position = Vector2(-614, -1090.0148)
+
+[node name="Block83" parent="QuadrantC" unique_id=1021392365 instance=ExtResource("2_036b0")]
+position = Vector2(-646, -1076.2296)
+
+[node name="Block84" parent="QuadrantC" unique_id=1832848474 instance=ExtResource("2_036b0")]
+position = Vector2(-647, -1090.9994)
+
+[node name="Block85" parent="QuadrantC" unique_id=2061840861 instance=ExtResource("2_036b0")]
+position = Vector2(-614, -1155.0022)
+
+[node name="Block86" parent="QuadrantC" unique_id=447383137 instance=ExtResource("2_036b0")]
+position = Vector2(-614, -1168.7874)
+
+[node name="Block87" parent="QuadrantC" unique_id=1165773981 instance=ExtResource("2_036b0")]
+position = Vector2(-646, -1155.0022)
+
+[node name="Block88" parent="QuadrantC" unique_id=674314005 instance=ExtResource("2_036b0")]
+position = Vector2(-647, -1169.772)
+
+[node name="Block89" parent="QuadrantC" unique_id=777112118 instance=ExtResource("2_036b0")]
+position = Vector2(-507, -749.32367)
+
+[node name="Block90" parent="QuadrantC" unique_id=1049368346 instance=ExtResource("2_036b0")]
+position = Vector2(-507, -763.1088)
+
+[node name="Block91" parent="QuadrantC" unique_id=458496420 instance=ExtResource("2_036b0")]
+position = Vector2(-539, -749.32367)
+
+[node name="Block92" parent="QuadrantC" unique_id=1450029391 instance=ExtResource("2_036b0")]
+position = Vector2(-540, -764.09344)
+
+[node name="Block93" parent="QuadrantC" unique_id=1620661090 instance=ExtResource("2_036b0")]
+position = Vector2(-345, -594.7326)
+
+[node name="Block94" parent="QuadrantC" unique_id=1723175333 instance=ExtResource("2_036b0")]
+position = Vector2(-346, -609.5024)
+
+[node name="Block77" parent="QuadrantC" unique_id=828815177 instance=ExtResource("2_036b0")]
+position = Vector2(-1017, -1083.1222)
+
+[node name="Block78" parent="QuadrantC" unique_id=1063720595 instance=ExtResource("2_036b0")]
+position = Vector2(-1017, -1096.9073)
+
+[node name="Block79" parent="QuadrantC" unique_id=184039110 instance=ExtResource("2_036b0")]
+position = Vector2(-1049, -1083.1222)
+
+[node name="Block80" parent="QuadrantC" unique_id=1214915944 instance=ExtResource("2_036b0")]
+position = Vector2(-1050, -1097.892)
 
 [node name="Block22" parent="QuadrantC" unique_id=208623108 instance=ExtResource("2_036b0")]
-position = Vector2(-495, -149.6677)
+position = Vector2(-491, -118.15868)
 
 [node name="Teleporter3" parent="QuadrantC" unique_id=514093193 instance=ExtResource("4_gbfbk")]
-position = Vector2(-719, -165.42216)
+position = Vector2(-715, -134.89789)
 paired_teleporter = "C2"
 
 [node name="Block14" parent="QuadrantC" unique_id=25815394 instance=ExtResource("2_036b0")]
-position = Vector2(-719, -148.68303)
+position = Vector2(-715, -117.17402)
 
 [node name="Teleporter6" parent="QuadrantC" unique_id=408093378 instance=ExtResource("4_gbfbk")]
 position = Vector2(-963, -362.3535)
@@ -1476,7 +1628,7 @@ position = Vector2(-1054, -463.7732)
 
 [node name="Teleporter13" parent="QuadrantC" unique_id=353476236 instance=ExtResource("4_gbfbk")]
 position = Vector2(-854, -537.62244)
-paired_teleporter = "C8"
+paired_teleporter = "C9"
 
 [node name="Block25" parent="QuadrantC" unique_id=1871263659 instance=ExtResource("2_036b0")]
 position = Vector2(-854, -520.8833)
@@ -1510,32 +1662,18 @@ paired_teleporter = "C7"
 position = Vector2(-523, -749.3236)
 
 [node name="Teleporter5" parent="QuadrantC" unique_id=1450932853 instance=ExtResource("4_gbfbk")]
-position = Vector2(-310, -161.48354)
+position = Vector2(-306, -130.95914)
 paired_teleporter = "C4"
 
 [node name="Block16" parent="QuadrantC" unique_id=1112314894 instance=ExtResource("2_036b0")]
-position = Vector2(-310, -144.7444)
+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(-631, -1095.9227)
+position = Vector2(-630, -1092.9688)
 paired_teleporter = "C6"
 
 [node name="Block15" parent="QuadrantC" unique_id=2046333542 instance=ExtResource("2_036b0")]
-position = Vector2(-631, -1079.1835)
+position = Vector2(-630, -1076.2295)
 
 [node name="Teleporter11" parent="QuadrantC" unique_id=1697212240 instance=ExtResource("4_gbfbk")]
 position = Vector2(-630, -1171.7413)
@@ -1544,11 +1682,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)
@@ -1641,15 +1793,15 @@ position = Vector2(-491, -359.39963)
 
 [node name="HiddenSpike5" parent="QuadrantC" unique_id=713848853 instance=ExtResource("28_k83mh")]
 visible = true
-position = Vector2(-492, -443.09518)
+position = Vector2(-491, -481.49698)
 
 [node name="HiddenSpike6" parent="QuadrantC" unique_id=710135932 instance=ExtResource("28_k83mh")]
 visible = true
-position = Vector2(-491.99988, -407.64792)
+position = Vector2(-490.99988, -446.0497)
 rotation = 3.1503193
 
 [node name="Block10" parent="QuadrantC" unique_id=1036988490 instance=ExtResource("2_036b0")]
-position = Vector2(-492, -425.37155)
+position = Vector2(-491, -463.77335)
 
 [node name="Spike" parent="QuadrantC" unique_id=227627360 instance=ExtResource("12_k3n1d")]
 position = Vector2(-1087, -222.53244)
@@ -2331,33 +2483,32 @@ position = Vector2(317, -1141.2169)
 position = Vector2(332, -1141.2167)
 
 [node name="Disk3" parent="QuadrantC" unique_id=224370384 instance=ExtResource("10_2u3nc")]
-position = Vector2(-71, -450.97263)
+position = Vector2(-367, -448.01868)
 disk_num = 3
 
 [node name="HiddenHorizontalMovingBlock" parent="QuadrantC" unique_id=521432634 instance=ExtResource("35_6ah6f")]
-visible = false
 modulate = Color(1, 1, 1, 1)
 position = Vector2(-720, -912.7766)
 
-[node name="HiddenHorizontalMovingBlock2" parent="QuadrantC" unique_id=406601912 instance=ExtResource("35_6ah6f")]
-visible = false
-modulate = Color(1, 1, 1, 1)
-position = Vector2(-481, -477.55835)
-
 [node name="HiddenHorizontalMovingBlock3" parent="QuadrantC" unique_id=525687146 instance=ExtResource("35_6ah6f")]
-visible = false
-modulate = Color(1, 1, 1, 1)
 position = Vector2(-619, -477.55838)
 
 [node name="HiddenHorizontalMovingBlock4" parent="QuadrantC" unique_id=1059738582 instance=ExtResource("35_6ah6f")]
-visible = false
-modulate = Color(1, 1, 1, 1)
 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(-495, -165.42218)
+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)
 
@@ -2517,10 +2668,104 @@ 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(-4924, 220.5631)
+rotation = 0.014323293
+hat_type = "dunce1"
 
-[node name="Saw7" parent="." unique_id=908772956 instance=ExtResource("37_my276")]
+[node name="DebugPortals" type="Node2D" parent="." unique_id=1727548024 groups=["Debug Mode Only"]]
-position = Vector2(8566, -2316.897)
+
+[node name="Teleporter19" parent="DebugPortals" unique_id=448556847 instance=ExtResource("4_gbfbk")]
+position = Vector2(-4242, 448.01877)
+paired_teleporter = "WARP3"
+
+[node name="Teleporter20" parent="DebugPortals" unique_id=1184852122 instance=ExtResource("4_gbfbk")]
+position = Vector2(-4199, 447.03412)
+paired_teleporter = "WARP4"
+
+[node name="Teleporter22" parent="DebugPortals" unique_id=1602293215 instance=ExtResource("4_gbfbk")]
+position = Vector2(-4341, 447.03412)
+paired_teleporter = "WARP1"
+
+[node name="Teleporter21" parent="DebugPortals" unique_id=166720549 instance=ExtResource("4_gbfbk")]
+position = Vector2(-4289, 447.03412)
+paired_teleporter = "WARP2"
+
+[node name="Block95" parent="DebugPortals" unique_id=841118333 instance=ExtResource("2_036b0")]
+position = Vector2(6523, 40.370922)
+
+[node name="Block97" parent="DebugPortals" unique_id=313568192 instance=ExtResource("2_036b0")]
+position = Vector2(6491, 40.370922)
+
+[node name="Teleporter18" parent="DebugPortals" unique_id=71064754 instance=ExtResource("4_gbfbk")]
+position = Vector2(6507, 23.63176)
+paired_teleporter = "WARP3"
+
+[node name="Block99" parent="DebugPortals" unique_id=238182326 instance=ExtResource("2_036b0")]
+position = Vector2(6507, 40.370922)
+
+[node name="Block96" parent="DebugPortals" unique_id=248633569 instance=ExtResource("2_036b0")]
+position = Vector2(8017, -625.257)
+
+[node name="Block98" parent="DebugPortals" unique_id=615938034 instance=ExtResource("2_036b0")]
+position = Vector2(7985, -625.257)
+
+[node name="Teleporter23" parent="DebugPortals" unique_id=178131491 instance=ExtResource("4_gbfbk")]
+position = Vector2(8001, -641.99615)
+paired_teleporter = "WARP2"
+
+[node name="Block100" parent="DebugPortals" unique_id=1713678932 instance=ExtResource("2_036b0")]
+position = Vector2(8001, -625.257)
+
+[node name="Block101" parent="DebugPortals" unique_id=290674675 instance=ExtResource("2_036b0")]
+position = Vector2(8690, -761.13965)
+
+[node name="Block102" parent="DebugPortals" unique_id=2085114650 instance=ExtResource("2_036b0")]
+position = Vector2(8658, -761.13965)
+
+[node name="Teleporter24" parent="DebugPortals" unique_id=1219598362 instance=ExtResource("4_gbfbk")]
+position = Vector2(8674, -777.8788)
+paired_teleporter = "WARP4"
+
+[node name="Block103" parent="DebugPortals" unique_id=11466330 instance=ExtResource("2_036b0")]
+position = Vector2(8674, -761.13965)
+
+[node name="Block104" parent="DebugPortals" unique_id=1272805817 instance=ExtResource("2_036b0")]
+position = Vector2(80, 269.79596)
+
+[node name="Block105" parent="DebugPortals" unique_id=1267090097 instance=ExtResource("2_036b0")]
+position = Vector2(48, 269.79596)
+
+[node name="Teleporter25" parent="DebugPortals" unique_id=2005115604 instance=ExtResource("4_gbfbk")]
+position = Vector2(64, 253.05678)
+paired_teleporter = "WARP1"
+
+[node name="Block106" parent="DebugPortals" unique_id=1054937590 instance=ExtResource("2_036b0")]
+position = Vector2(64, 269.79596)
+
+[node name="LongerBlock" parent="DebugPortals" unique_id=914814155 instance=ExtResource("6_dwbse")]
+position = Vector2(-4297, 467.7119)
+
+[node name="Sign" parent="DebugPortals" unique_id=1217139165 instance=ExtResource("24_wjb0r")]
+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)
+
+[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)
+hat_type = "wizard1"
+
+[node name="Block_Simple" parent="." unique_id=272296253 instance=ExtResource("2_036b0")]
+position = Vector2(-4746, 277.6732)
 
 [connection signal="toggled" from="CanvasLayer/MusicButton" to="CanvasLayer/MusicButton" method="_on_toggled"]

world2.tscn

@@ -2,8 +2,8 @@
 
 [ext_resource type="Script" uid="uid://boovn4st1uq41" path="res://rich_text_label.gd" id="1_xdth8"]
 [ext_resource type="Script" uid="uid://bds4m5we8nwe3" path="res://fps_label.gd" id="2_vef27"]
-[ext_resource type="PackedScene" uid="uid://pmnwck5v0ntm" path="res://player_2d.tscn" id="3_mu6c3"]
+[ext_resource type="PackedScene" uid="uid://pmnwck5v0ntm" path="res://playerclass.tscn" id="3_mu6c3"]
-[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://block.tscn" id="4_46256"]
+[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://level_editor/blocks/block_simple.tscn" id="4_46256"]
 [ext_resource type="PackedScene" uid="uid://dx4pfup3sbk0f" path="res://long_block.tscn" id="5_mu6c3"]
 [ext_resource type="PackedScene" uid="uid://bos6oh7nwyeca" path="res://vertical_long_block.tscn" id="6_46256"]
 [ext_resource type="PackedScene" uid="uid://dbk4f76ux6dsv" path="res://wallspike.tscn" id="7_46256"]