From 902440e5bb6cfa0ff97d1d2db9f4be0450b2873d Mon Sep 17 00:00:00 2001 From: Clevertop Date: Wed, 14 Aug 2024 01:58:28 +1000 Subject: [PATCH] save before switching renderer --- Levels/Level 9.tscn | 75 +++++++++++++++++++++++++++++++++++----- Scripts/ChronoManager.gd | 12 ++++--- 2 files changed, 74 insertions(+), 13 deletions(-) diff --git a/Levels/Level 9.tscn b/Levels/Level 9.tscn index 17219e9..1c3f55b 100644 --- a/Levels/Level 9.tscn +++ b/Levels/Level 9.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=3 uid="uid://clmgqrgrfbwn2"] +[gd_scene load_steps=10 format=3 uid="uid://clmgqrgrfbwn2"] [ext_resource type="PackedScene" uid="uid://bojbawyoy11i4" path="res://Levels/StartingRoom.tscn" id="1_b1jea"] [ext_resource type="MeshLibrary" uid="uid://cymdsgto88uty" path="res://meshLib.tres" id="2_lb4tl"] @@ -7,12 +7,14 @@ [ext_resource type="PackedScene" uid="uid://dqvq4ybcpws87" path="res://Commands/command_block.tscn" id="5_5axby"] [ext_resource type="Texture2D" uid="uid://cmvnccuywukyw" path="res://Commands/controlled_blink_new.png" id="6_osyp8"] [ext_resource type="Texture2D" uid="uid://vc7wwv4wgabf" path="res://Commands/jump.png" id="7_omu2s"] +[ext_resource type="Texture2D" uid="uid://cxljjpwweuds0" path="res://Commands/phase_shift_new.png" id="7_wil3c"] +[ext_resource type="PackedScene" uid="uid://vj1tnhm3726q" path="res://kill_block.tscn" id="8_7i57g"] [node name="Level1" type="Node3D"] [node name="ChronoManager" parent="." instance=ExtResource("1_b1jea")] -level_name = "Level 4 -Looks familiar" +level_name = "Level 9 +The Last Challenge" [node name="JumpCommand2" parent="ChronoManager" index="4"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.322, -3) @@ -21,17 +23,18 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.322, -3) mesh_library = ExtResource("2_lb4tl") cell_size = Vector3(1, 1, 1) data = { -"cells": PackedInt32Array(65535, 65529, 1, 65535, 65528, 1, 65535, 65527, 1, 65535, 65526, 1, 65535, 65525, 1, 65535, 65524, 1, 0, 65524, 1, 0, 65525, 1, 0, 65526, 1, 0, 65527, 1, 0, 65528, 1, 0, 65529, 1, 327679, 65515, 1, 327679, 65514, 1, 327679, 65513, 1, 262144, 65515, 1, 262144, 65514, 1, 262144, 65513, 1, 262144, 65512, 1, 327679, 65512, 1, 327679, 65511, 1, 262144, 65511, 1, 327679, 65509, 2, 327679, 65510, 2, 262144, 65509, 2, 262144, 65510, 2) +"cells": PackedInt32Array(65535, 65529, 1, 65535, 65528, 1, 65535, 65527, 1, 65535, 65526, 1, 65535, 65525, 1, 65535, 65524, 1, 0, 65524, 1, 0, 65525, 1, 0, 65526, 1, 0, 65527, 1, 0, 65528, 1, 0, 65529, 1, 327679, 65515, 1, 327679, 65514, 1, 327679, 65513, 1, 262144, 65515, 1, 262144, 65514, 1, 262144, 65513, 1, 262144, 65512, 1, 327679, 65512, 1, 327679, 65511, 1, 262144, 65511, 1, 327679, 65509, 196611, 327679, 65510, 196611, 262144, 65509, 196611, 262144, 65510, 196611, 262145, 65511, 196608, 262145, 65510, 196608, 262145, 65509, 196608, 262145, 65508, 196608, 262144, 65508, 196608, 327679, 65508, 196608, 327678, 65508, 196608, 327678, 65509, 196608, 327678, 65510, 196608, 327678, 65511, 196608, -131074, 65508, 196608, -131074, 65509, 196608, -131074, 65510, 196608, -131074, 65511, 196608, -65538, 65508, 196608, -65538, 65509, 196608, -65538, 65510, 196608, -65538, 65511, 196608, -2, 65508, 196608, -2, 65509, 196608, -2, 65510, 196608, -2, 65511, 196608, 65534, 65508, 196608, 65534, 65509, 196608, 65534, 65510, 196608, 65534, 65511, 196608, 131070, 65508, 196608, 131070, 65509, 196608, 131070, 65510, 196608, 131070, 65511, 196608, 196606, 65508, 196608, 196606, 65509, 196608, 196606, 65510, 196608, 196606, 65511, 196608, 262142, 65508, 196608, 262142, 65509, 196608, 262142, 65510, 196608, 262142, 65511, 196608, -131071, 65508, 196608, -131071, 65509, 196608, -131071, 65510, 196608, -131071, 65511, 196608, -65535, 65508, 196608, -65535, 65509, 196608, -65535, 65510, 196608, -65535, 65511, 196608, 1, 65508, 196608, 1, 65509, 196608, 1, 65510, 196608, 1, 65511, 196608, 65537, 65508, 196608, 65537, 65509, 196608, 65537, 65510, 196608, 65537, 65511, 196608, 131073, 65508, 196608, 131073, 65509, 196608, 131073, 65510, 196608, 131073, 65511, 196608, 196609, 65508, 196608, 196609, 65509, 196608, 196609, 65510, 196608, 196609, 65511, 196608, -196607, 65508, 196608, -196607, 65509, 196608, -196607, 65510, 196608, -196607, 65511, 196608, -131073, 65511, 196611, -65537, 65511, 196611, -1, 65511, 196611, 65535, 65511, 196611, 131071, 65511, 196611, 196607, 65511, 196611, 262143, 65511, 196611, -196608, 65511, 196611, -131072, 65511, 196611, -65536, 65511, 196611, 0, 65511, 196611, 65536, 65511, 196611, 131072, 65511, 196611, 196608, 65511, 196611, -131073, 65508, 196611, -65537, 65508, 196611, -1, 65508, 196611, 65535, 65508, 196608, 131071, 65508, 196608, 196607, 65508, 196608, 262143, 65508, 196608, -196608, 65508, 196611, -131072, 65508, 196611, -65536, 65508, 196611, 0, 65508, 196608, 65536, 65508, 196608, 131072, 65508, 196608, 196608, 65508, 196608, -1114112, 65500, 196609, -1114112, 65501, 196609, -1114112, 65502, 196609, -1114112, 65503, 196609, -1048577, 65503, 196609, -1048577, 65502, 196609, -1048577, 65501, 196609, -1048577, 65500, 196609, -1114112, 65504, 196609, -1114112, 65505, 196609, -1048577, 65505, 196609, -1048577, 65504, 196609, -1114102, 65501, 196609, -1114101, 65501, 196609, -1114101, 65500, 196609, -1114102, 65500, 196609, -1114092, 65500, 196609, -1114092, 65501, 196609, -1114091, 65501, 196609, -1114091, 65500, 196609, -1114092, 65502, 196609, -1114092, 65503, 196609, -1114092, 65504, 196609, -1114092, 65505, 196609, -1114092, 65506, 196609, -1114092, 65507, 196609, -1114092, 65508, 196609, -1114091, 65502, 196609, -1114091, 65503, 196609, -1114091, 65504, 196609, -1114091, 65505, 196609, -1114091, 65506, 196609, -1114091, 65507, 196609, -1114091, 65508, 196609, -1114091, 65510, 196610, -1114092, 65510, 196610, -1114092, 65509, 196610, -1114091, 65509, 196610) } -metadata/_editor_floor_ = Vector3(0, 0, 0) +metadata/_editor_floor_ = Vector3(1, -17, -28) [node name="EndZone" parent="." instance=ExtResource("3_jspeh")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 6, -26) +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 21, -15, -26) [node name="Sign" parent="." instance=ExtResource("4_6bmps")] -transform = Transform3D(-0.61009, 0, 0.792332, 0, 1, 0, -0.792332, 0, -0.61009, -1.07097, 1.71873, -2.59564) -sign_text = "Now you have -both kinds!" +transform = Transform3D(-0.61009, 0, 0.792332, 0, 1, 0, -0.792332, 0, -0.61009, -2.69019, 1.71873, -1.0431) +sign_text = "Here's a bit of +everything! +Good Luck!" show_pole = true [node name="BaseCommand2" parent="." instance=ExtResource("5_5axby")] @@ -39,14 +42,68 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.58846, 2.66601, -2.91549) command_name = "dash" command_sprite = ExtResource("6_osyp8") +[node name="BaseCommand5" parent="." instance=ExtResource("5_5axby")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.48437, 2.66601, -2.30134) +command_name = "dash" +command_sprite = ExtResource("6_osyp8") + +[node name="BaseCommand7" parent="." instance=ExtResource("5_5axby")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.13288, 2.66601, -1.81543) +command_name = "dash" +command_sprite = ExtResource("6_osyp8") + +[node name="BaseCommand6" parent="." instance=ExtResource("5_5axby")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.91891, 2.66601, -2.89491) +command_name = "phase" +command_sprite = ExtResource("7_wil3c") + +[node name="BaseCommand10" parent="." instance=ExtResource("5_5axby")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.59563, 3.85347, -2.79334) +command_name = "phase" +command_sprite = ExtResource("7_wil3c") + [node name="BaseCommand4" parent="." instance=ExtResource("5_5axby")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.20865, 2.66601, -2.68806) command_name = "jump" command_sprite = ExtResource("7_omu2s") +[node name="BaseCommand8" parent="." instance=ExtResource("5_5axby")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.83012, 3.23343, -2.08719) +command_name = "jump" +command_sprite = ExtResource("7_omu2s") + +[node name="BaseCommand9" parent="." instance=ExtResource("5_5axby")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.2502, 3.23343, -2.65329) +command_name = "jump" +command_sprite = ExtResource("7_omu2s") + [node name="BaseCommand3" parent="." instance=ExtResource("5_5axby")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.87202, 3.23129, -2.91549) command_name = "dash" command_sprite = ExtResource("6_osyp8") +[node name="KillBlock" parent="." instance=ExtResource("8_7i57g")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 5, -28.5) +size = Vector3(23, 10, 1) + +[node name="KillBlock5" parent="." instance=ExtResource("8_7i57g")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11, 3, -15.5) +size = Vector3(1, 14, 25) + +[node name="KillBlock6" parent="." instance=ExtResource("8_7i57g")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10, 3, -15.5) +size = Vector3(1, 14, 25) + +[node name="KillBlock3" parent="." instance=ExtResource("8_7i57g")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7, -5, -26.5) +size = Vector3(10, 10, 5) + +[node name="KillBlock4" parent="." instance=ExtResource("8_7i57g")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7, -5, -26.5) +size = Vector3(10, 10, 5) + +[node name="KillBlock2" parent="." instance=ExtResource("8_7i57g")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, -2.5, -14.5) +size = Vector3(20, 1, 20) + [editable path="ChronoManager"] diff --git a/Scripts/ChronoManager.gd b/Scripts/ChronoManager.gd index 72d4b03..25e1cb3 100644 --- a/Scripts/ChronoManager.gd +++ b/Scripts/ChronoManager.gd @@ -51,8 +51,11 @@ func _process(delta): left_door.position.x = -0.5 + clampf(door_timer*4, -0.995,0) right_door.position.x = 0.5 + clampf(-door_timer*4, 0,0.995) - if Input.is_action_just_pressed("debug_start"): - start_room() + #if Input.is_action_just_pressed("debug_start"): + #start_room() + + if Input.is_action_just_pressed("interact"): + Input.mouse_mode = Input.MOUSE_MODE_CAPTURED if Input.is_action_just_pressed("reset"): gui.show_lose_screen("Reset Pressed", 2) @@ -175,6 +178,7 @@ func _on_player_object_clicked(object): func _player_area_entered(area : Area3D): #print(area.name) if "kill" in area: - fail_room() - gui.show_lose_screen("Touched a reset block", 2) + if not player.collider.disabled: + fail_room() + gui.show_lose_screen("Touched a reset block", 2)