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

project.godot

@@ -383,6 +383,14 @@ interact={
 "location": 0,
 "echo": false,
 "script": null
+), Object(InputEventJoypadButton,
+"resource_local_to_scene": false,
+"resource_name": "",
+"device": -1,
+"button_index": 1,
+"pressure": 0.0,
+"pressed": true,
+"script": null
 )]
 }
 

world.tscn

@@ -53,10 +53,10 @@ position = Vector2(2861, -19.693142)
 position = Vector2(3174, -424.38696)
 
 [node name="LongerBlock11" parent="StartingArea" unique_id=624436532 instance=ExtResource("6_dwbse")]
-position = Vector2(3539, -1049.644)
+position = Vector2(3390, -1028.9663)
 
 [node name="LongerBlock9" parent="StartingArea" unique_id=1224082804 instance=ExtResource("6_dwbse")]
-position = Vector2(3872, -1049.644)
+position = Vector2(3723, -1028.9663)
 
 [node name="Pharaoh" parent="StartingArea" unique_id=1201409437 instance=ExtResource("15_hiqwa")]
 position = Vector2(-62, -24.616333)
@@ -536,11 +536,11 @@ position = Vector2(7865, -18.128824)
 position = Vector2(4097, 175.26888)
 
 [node name="Pharaoh3" parent="." unique_id=998592579 instance=ExtResource("15_hiqwa")]
-position = Vector2(-734, -663.65857)
+position = Vector2(-883, -642.9808)
 
 [node name="HiddenVerticalLongBlock" parent="." unique_id=550983536 instance=ExtResource("20_26xuy")]
 visible = true
-position = Vector2(-1553, -449.00342)
+position = Vector2(-1625, -449.00342)
 rotation = 0.0
 
 [node name="HiddenVerticalLongBlock11" parent="." unique_id=1548779318 instance=ExtResource("20_26xuy")]