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

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/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

project.godot

@@ -14,7 +14,7 @@ config/name="JumpRope"
 run/main_scene="uid://p65fagt04vv8"
 config/features=PackedStringArray("4.8", "Forward Plus")
 boot_splash/image="uid://dhue32shjdpt8"
-config/icon="uid://3ukivvar0grw"
+config/icon="res://icon.svg"
 
 [display]
 

world.tscn

@@ -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)
@@ -2479,7 +2483,7 @@ 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")]
@@ -2747,4 +2751,14 @@ 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)
+
+[node name="HatPickup3" parent="." unique_id=875650398 instance=ExtResource("38_yx0jh")]
+position = Vector2(7700, 929.51587)
+
+[node name="HatPickup4" parent="." unique_id=1755769172 instance=ExtResource("38_yx0jh")]
+position = Vector2(8510, -958.0709)
+hat_type = "wizard1"
+
 [connection signal="toggled" from="CanvasLayer/MusicButton" to="CanvasLayer/MusicButton" method="_on_toggled"]