diff --git a/scenes/game.tscn b/scenes/game.tscn index 5fc883d..ba7e77d 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -108,6 +108,7 @@ texture = ExtResource("10_dinhu") [node name="SpaceStation1" type="Node2D" parent="Orbits"] [node name="SpaceStation1" type="Sprite2D" parent="Orbits/SpaceStation1"] +position = Vector2(0, -10000) scale = Vector2(2, 2) texture = ExtResource("12_dinhu") script = ExtResource("13_trtic") @@ -131,7 +132,7 @@ rotation = 3.1415927 [node name="Unloadables" type="Node2D" parent="."] [node name="Player" type="RigidBody2D" parent="."] -position = Vector2(-78, 957) +position = Vector2(-78, -9043) linear_damp = 6.247 script = ExtResource("1_yqjtg") diff --git a/scenes/locations/space_station_1.tscn b/scenes/locations/space_station_1.tscn index fe6ae4b..156c76f 100644 --- a/scenes/locations/space_station_1.tscn +++ b/scenes/locations/space_station_1.tscn @@ -293,25 +293,67 @@ position = Vector2(349, -58) [node name="PlayerSpawnIntro" type="Node2D" parent="."] position = Vector2(126, -1796) -[node name="Sprite2D3" type="Sprite2D" parent="."] +[node name="StoryHandler1" type="Node2D" parent="."] +script = ExtResource("19_akl5n") + +[node name="Bed" type="Node2D" parent="."] + +[node name="Bed" type="Sprite2D" parent="Bed"] z_index = -1 position = Vector2(126, -1787) scale = Vector2(2, 2) texture = ExtResource("17_50pdk") -[node name="Sprite2D" type="StaticBody2D" parent="."] +[node name="BedFoot" type="StaticBody2D" parent="Bed"] position = Vector2(126, -1787) scale = Vector2(2, 2) -[node name="Sprite2D2" type="Sprite2D" parent="Sprite2D"] +[node name="Sprite2D2" type="Sprite2D" parent="Bed/BedFoot"] texture = ExtResource("18_83fjc") -[node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite2D"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Bed/BedFoot"] position = Vector2(-0.25, 37.5) shape = SubResource("RectangleShape2D_83fjc") -[node name="StoryHandler1" type="Node2D" parent="."] -script = ExtResource("19_akl5n") +[node name="Bed2" type="Node2D" parent="."] +position = Vector2(-384, 0) + +[node name="Bed" type="Sprite2D" parent="Bed2"] +z_index = -1 +position = Vector2(126, -1787) +scale = Vector2(2, 2) +texture = ExtResource("17_50pdk") + +[node name="BedFoot" type="StaticBody2D" parent="Bed2"] +position = Vector2(126, -1787) +scale = Vector2(2, 2) + +[node name="Sprite2D2" type="Sprite2D" parent="Bed2/BedFoot"] +texture = ExtResource("18_83fjc") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Bed2/BedFoot"] +position = Vector2(-0.25, 37.5) +shape = SubResource("RectangleShape2D_83fjc") + +[node name="Bed3" type="Node2D" parent="."] +position = Vector2(-768, 0) + +[node name="Bed" type="Sprite2D" parent="Bed3"] +z_index = -1 +position = Vector2(126, -1787) +scale = Vector2(2, 2) +texture = ExtResource("17_50pdk") + +[node name="BedFoot" type="StaticBody2D" parent="Bed3"] +position = Vector2(126, -1787) +scale = Vector2(2, 2) + +[node name="Sprite2D2" type="Sprite2D" parent="Bed3/BedFoot"] +texture = ExtResource("18_83fjc") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Bed3/BedFoot"] +position = Vector2(-0.25, 37.5) +shape = SubResource("RectangleShape2D_83fjc") [connection signal="body_entered" from="GalactamartWorker/InteractArea" to="GalactamartWorker/InteractArea" method="_on_body_entered"] [connection signal="body_exited" from="GalactamartWorker/InteractArea" to="GalactamartWorker/InteractArea" method="_on_body_exited"] diff --git a/scripts/global.gd b/scripts/global.gd index 0e7a886..4dca4ed 100644 --- a/scripts/global.gd +++ b/scripts/global.gd @@ -2,6 +2,8 @@ extends Node func _ready() -> void: load_settings() + + LimboConsole.register_command(set_story_progress, "set_story_progress", "Sets the current story_progress variable") var ground_location = null @@ -83,6 +85,9 @@ func load_settings(): func delete_game(): await DirAccess.remove_absolute("user://savegame.save") + +func set_story_progress(value: int) -> void: + stats.story_progress = value var default_stats = { "loaded": false, diff --git a/scripts/story_handler_1.gd b/scripts/story_handler_1.gd index 4221ac2..dbe8ac6 100644 --- a/scripts/story_handler_1.gd +++ b/scripts/story_handler_1.gd @@ -26,7 +26,7 @@ func _ground_ready() -> void: game.end_dialogue() - """var i = 0 + var i = 0 while i < 5: await get_tree().create_timer(0.2).timeout @@ -108,9 +108,9 @@ func _ground_ready() -> void: await get_tree().create_timer(1).timeout - await game.dialogue("Don't worry, I won't.", "doctor_1", false)""" + await game.dialogue("Don't worry, I won't.", "doctor_1", false) - var i = 0 + i = 0 while i < 35: await get_tree().create_timer(0.2).timeout