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

longer_block.tscn

@@ -0,0 +1,67 @@
+[gd_scene format=3 uid="uid://biot4cuwgohvo"]
+
+[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://block.tscn" id="1_plc11"]
+
+[node name="LongerBlock" type="Node2D" unique_id=426800863]
+
+[node name="Block" parent="." unique_id=1409784601 instance=ExtResource("1_plc11")]
+
+[node name="Block2" parent="." unique_id=1014900089 instance=ExtResource("1_plc11")]
+position = Vector2(16, 0)
+
+[node name="Block3" parent="." unique_id=2110446832 instance=ExtResource("1_plc11")]
+position = Vector2(32, 0)
+
+[node name="Block4" parent="." unique_id=441908058 instance=ExtResource("1_plc11")]
+position = Vector2(48, 0)
+
+[node name="Block5" parent="." unique_id=508575690 instance=ExtResource("1_plc11")]
+position = Vector2(-48, 0)
+
+[node name="Block6" parent="." unique_id=185933468 instance=ExtResource("1_plc11")]
+position = Vector2(-32, 0)
+
+[node name="Block7" parent="." unique_id=540681257 instance=ExtResource("1_plc11")]
+position = Vector2(-16, 0)
+
+[node name="Block8" parent="." unique_id=858157661 instance=ExtResource("1_plc11")]
+position = Vector2(112, 0)
+
+[node name="Block9" parent="." unique_id=191689083 instance=ExtResource("1_plc11")]
+position = Vector2(128, 0)
+
+[node name="Block10" parent="." unique_id=268055489 instance=ExtResource("1_plc11")]
+position = Vector2(144, 0)
+
+[node name="Block11" parent="." unique_id=766174141 instance=ExtResource("1_plc11")]
+position = Vector2(160, 0)
+
+[node name="Block12" parent="." unique_id=1433420873 instance=ExtResource("1_plc11")]
+position = Vector2(64, 0)
+
+[node name="Block13" parent="." unique_id=116955174 instance=ExtResource("1_plc11")]
+position = Vector2(80, 0)
+
+[node name="Block14" parent="." unique_id=1816590739 instance=ExtResource("1_plc11")]
+position = Vector2(96, 0)
+
+[node name="Block15" parent="." unique_id=1050608707 instance=ExtResource("1_plc11")]
+position = Vector2(-112, 0)
+
+[node name="Block16" parent="." unique_id=1985556864 instance=ExtResource("1_plc11")]
+position = Vector2(-96, 0)
+
+[node name="Block17" parent="." unique_id=1683656415 instance=ExtResource("1_plc11")]
+position = Vector2(-80, 0)
+
+[node name="Block18" parent="." unique_id=1673159752 instance=ExtResource("1_plc11")]
+position = Vector2(-64, 0)
+
+[node name="Block19" parent="." unique_id=1305227454 instance=ExtResource("1_plc11")]
+position = Vector2(-160, 0)
+
+[node name="Block20" parent="." unique_id=679424717 instance=ExtResource("1_plc11")]
+position = Vector2(-144, 0)
+
+[node name="Block21" parent="." unique_id=594192308 instance=ExtResource("1_plc11")]
+position = Vector2(-128, 0)

player_2d.gd

@@ -37,7 +37,7 @@ func _process(delta: float) -> void:
 	else:
 		velocity.x = move_toward(velocity.x, 0, SPEED)
 	
-	fall_timer += 0.001
+	fall_timer += 1*delta
 	if is_on_floor():
 		fall_timer = 0
 		jumps = 1
@@ -47,6 +47,9 @@ func _process(delta: float) -> void:
 		jumps = 1
 		teleport_cooldown = 0
 		
+	if fall_timer>3:
+		get_tree().reload_current_scene()
+		
 func _physics_process(delta: float) -> void:
 
 	if not is_on_floor():

world.tscn

@@ -7,6 +7,7 @@
 [ext_resource type="PackedScene" uid="uid://dx4pfup3sbk0f" path="res://long_block.tscn" id="3_dwbse"]
 [ext_resource type="PackedScene" uid="uid://byh115n12sgvt" path="res://teleporter.tscn" id="4_gbfbk"]
 [ext_resource type="PackedScene" uid="uid://bos6oh7nwyeca" path="res://vertical_long_block.tscn" id="4_pkg7o"]
+[ext_resource type="PackedScene" uid="uid://biot4cuwgohvo" path="res://longer_block.tscn" id="6_dwbse"]
 
 [node name="World" type="Node2D" unique_id=1327991900]
 process_mode = 3
@@ -41,6 +42,7 @@ unique_name_in_owner = true
 position = Vector2(55, 59)
 
 [node name="Tutorial" type="Node2D" parent="." unique_id=1391494772]
+visible = false
 
 [node name="Teleporter1" parent="Tutorial" unique_id=1201409437 instance=ExtResource("4_gbfbk")]
 position = Vector2(149, 91.57307)
@@ -58,3 +60,23 @@ position = Vector2(166, 200)
 
 [node name="VerticalLongBlock" parent="Tutorial" unique_id=925152188 instance=ExtResource("4_pkg7o")]
 position = Vector2(250, 141)
+
+[node name="ZoeLevel" type="Node2D" parent="." unique_id=980267417]
+
+[node name="Block" parent="ZoeLevel" unique_id=878186522 instance=ExtResource("2_036b0")]
+position = Vector2(55, 118)
+
+[node name="LongBlock" parent="ZoeLevel" unique_id=426800863 instance=ExtResource("3_dwbse")]
+position = Vector2(166, 200)
+
+[node name="VerticalLongBlock" parent="ZoeLevel" unique_id=1984351408 instance=ExtResource("4_pkg7o")]
+position = Vector2(250, 141)
+
+[node name="LongBlock4" parent="." unique_id=469408536 instance=ExtResource("6_dwbse")]
+position = Vector2(544, 399)
+
+[node name="LongBlock5" parent="." unique_id=1807703449 instance=ExtResource("6_dwbse")]
+position = Vector2(880, 399)
+
+[node name="LongBlock6" parent="." unique_id=1328813509 instance=ExtResource("6_dwbse")]
+position = Vector2(1368, 401)

world2.tscn

@@ -0,0 +1,72 @@
+[gd_scene format=3 uid="uid://3tx5gwcalhsa"]
+
+[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://ckqable762x8v" path="res://block.tscn" id="4_46256"]
+
+[node name="World" type="Node2D" unique_id=1327991900]
+process_mode = 3
+
+[node name="CanvasLayer" type="CanvasLayer" parent="." unique_id=1982310971]
+
+[node name="RichTextLabel" type="RichTextLabel" parent="CanvasLayer" unique_id=63102975]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+bbcode_enabled = true
+text = "FALL TIMER:"
+script = ExtResource("1_xdth8")
+
+[node name="RichTextLabel2" type="RichTextLabel" parent="CanvasLayer" unique_id=1423365940]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_top = 22.0
+offset_bottom = 22.0
+grow_horizontal = 2
+grow_vertical = 2
+bbcode_enabled = true
+text = "FPS:"
+script = ExtResource("2_vef27")
+
+[node name="Player2D" parent="." unique_id=889851478 instance=ExtResource("3_mu6c3")]
+unique_name_in_owner = true
+position = Vector2(55, 59)
+
+[node name="Tutorial2" type="Node2D" parent="." unique_id=1047775853]
+
+[node name="Block" parent="Tutorial2" unique_id=1409784601 instance=ExtResource("4_46256")]
+position = Vector2(55, 118)
+
+[node name="Block8" parent="Tutorial2" unique_id=1164955425 instance=ExtResource("4_46256")]
+position = Vector2(469, 47)
+
+[node name="Block2" parent="Tutorial2" unique_id=2066354372 instance=ExtResource("4_46256")]
+position = Vector2(144, 96)
+
+[node name="Block3" parent="Tutorial2" unique_id=306075065 instance=ExtResource("4_46256")]
+position = Vector2(103, 170)
+
+[node name="Block4" parent="Tutorial2" unique_id=1774596669 instance=ExtResource("4_46256")]
+position = Vector2(305, 249)
+
+[node name="Block5" parent="Tutorial2" unique_id=338543358 instance=ExtResource("4_46256")]
+position = Vector2(208, -43)
+
+[node name="Block6" parent="Tutorial2" unique_id=1572531091 instance=ExtResource("4_46256")]
+position = Vector2(208, -27)
+
+[node name="Block7" parent="Tutorial2" unique_id=33521935 instance=ExtResource("4_46256")]
+position = Vector2(378, 151)
+
+[node name="Block9" parent="Tutorial2" unique_id=376286002 instance=ExtResource("4_46256")]
+position = Vector2(637, -8)
+
+[node name="Block10" parent="Tutorial2" unique_id=758201207 instance=ExtResource("4_46256")]
+position = Vector2(816, 157)
+
+[node name="Block11" parent="Tutorial2" unique_id=370326543 instance=ExtResource("4_46256")]
+position = Vector2(1025, 94)