diff --git a/Dialogue/Characters/Cirno.dch b/Dialogue/Characters/Cirno.dch index 810a293b..98740bcf 100644 --- a/Dialogue/Characters/Cirno.dch +++ b/Dialogue/Characters/Cirno.dch @@ -1,20 +1,20 @@ { "@path": "res://addons/dialogic/Resources/character.gd", "@subpath": NodePath(""), -"_translation_id": "", -"color": Color(1, 1, 1, 1), -"custom_info": { +&"_translation_id": "", +&"color": Color(1, 1, 1, 1), +&"custom_info": { "sound_mood_default": "", "sound_moods": {}, "style": "" }, -"default_portrait": "Cirno", -"description": "", -"display_name": "Cirno", -"mirror": false, -"nicknames": [""], -"offset": Vector2(0, 0), -"portraits": { +&"default_portrait": "Cirno", +&"description": "", +&"display_name": "Cirno", +&"mirror": false, +&"nicknames": [""], +&"offset": Vector2(0, 0), +&"portraits": { "Cirno": { "export_overrides": { "image": "\"res://Sprites/Portraits/Cirno2.png\"" @@ -25,5 +25,5 @@ "scene": "" } }, -"scale": 1.0 +&"scale": 1.0 } \ No newline at end of file diff --git a/Dialogue/Characters/ICE.dch b/Dialogue/Characters/ICE.dch index 7e3a60dd..a82399d4 100644 --- a/Dialogue/Characters/ICE.dch +++ b/Dialogue/Characters/ICE.dch @@ -1,20 +1,20 @@ { "@path": "res://addons/dialogic/Resources/character.gd", "@subpath": NodePath(""), -"_translation_id": "", -"color": Color(1, 1, 1, 1), -"custom_info": { +&"_translation_id": "", +&"color": Color(1, 1, 1, 1), +&"custom_info": { "sound_mood_default": "", "sound_moods": {}, "style": "" }, -"default_portrait": "Default", -"description": "", -"display_name": "I.C.E.", -"mirror": false, -"nicknames": [""], -"offset": Vector2(0, 0), -"portraits": { +&"default_portrait": "Default", +&"description": "", +&"display_name": "I.C.E.", +&"mirror": false, +&"nicknames": [""], +&"offset": Vector2(0, 0), +&"portraits": { "Default": { "export_overrides": { "image": "\"res://Sprites/Portraits/ICE.png\"" @@ -25,5 +25,5 @@ "scene": "" } }, -"scale": 1.0 +&"scale": 1.0 } \ No newline at end of file diff --git a/Dialogue/Characters/Navigator.dch b/Dialogue/Characters/Navigator.dch index 8de1aa73..39094af1 100644 --- a/Dialogue/Characters/Navigator.dch +++ b/Dialogue/Characters/Navigator.dch @@ -1,20 +1,20 @@ { "@path": "res://addons/dialogic/Resources/character.gd", "@subpath": NodePath(""), -"_translation_id": "", -"color": Color(1, 1, 1, 1), -"custom_info": { +&"_translation_id": "", +&"color": Color(1, 1, 1, 1), +&"custom_info": { "sound_mood_default": "", "sound_moods": {}, "style": "" }, -"default_portrait": "Default", -"description": "", -"display_name": "Navigator", -"mirror": false, -"nicknames": [""], -"offset": Vector2(0, 0), -"portraits": { +&"default_portrait": "Default", +&"description": "", +&"display_name": "Navigator", +&"mirror": false, +&"nicknames": [""], +&"offset": Vector2(0, 0), +&"portraits": { "Default": { "export_overrides": { "image": "\"res://Sprites/Portraits/Navigator.png\"" @@ -25,5 +25,5 @@ "scene": "" } }, -"scale": 1.0 +&"scale": 1.0 } \ No newline at end of file diff --git a/Dialogue/Characters/Rumia.dch b/Dialogue/Characters/Rumia.dch index bfa7168b..4bed0b84 100644 --- a/Dialogue/Characters/Rumia.dch +++ b/Dialogue/Characters/Rumia.dch @@ -1,20 +1,20 @@ { "@path": "res://addons/dialogic/Resources/character.gd", "@subpath": NodePath(""), -"_translation_id": "", -"color": Color(1, 1, 1, 1), -"custom_info": { +&"_translation_id": "", +&"color": Color(1, 1, 1, 1), +&"custom_info": { "sound_mood_default": "", "sound_moods": {}, "style": "" }, -"default_portrait": "Default", -"description": "", -"display_name": "Rumia", -"mirror": false, -"nicknames": [""], -"offset": Vector2(0, 0), -"portraits": { +&"default_portrait": "Default", +&"description": "", +&"display_name": "Rumia", +&"mirror": false, +&"nicknames": [""], +&"offset": Vector2(0, 0), +&"portraits": { "Default": { "export_overrides": { "image": "\"res://Sprites/Portraits/Rumia.png\"" @@ -25,5 +25,5 @@ "scene": "" } }, -"scale": 1.0 +&"scale": 1.0 } \ No newline at end of file diff --git a/Dialogue/Characters/computer.dch b/Dialogue/Characters/computer.dch index b914b249..be279d15 100644 --- a/Dialogue/Characters/computer.dch +++ b/Dialogue/Characters/computer.dch @@ -1,20 +1,20 @@ { "@path": "res://addons/dialogic/Resources/character.gd", "@subpath": NodePath(""), -"_translation_id": "", -"color": Color(1, 1, 1, 1), -"custom_info": { +&"_translation_id": "", +&"color": Color(1, 1, 1, 1), +&"custom_info": { "sound_mood_default": "", "sound_moods": {}, "style": "" }, -"default_portrait": "default", -"description": "", -"display_name": "Computer", -"mirror": false, -"nicknames": [""], -"offset": Vector2(0, 0), -"portraits": { +&"default_portrait": "default", +&"description": "", +&"display_name": "Computer", +&"mirror": false, +&"nicknames": [""], +&"offset": Vector2(0, 0), +&"portraits": { "default": { "export_overrides": { "image": "\"res://Sprites/Portraits/Computer.png\"" @@ -25,5 +25,5 @@ "scene": "" } }, -"scale": 1.0 +&"scale": 1.0 } \ No newline at end of file diff --git a/Dialogue/Characters/test.dch b/Dialogue/Characters/test.dch new file mode 100644 index 00000000..957a3503 --- /dev/null +++ b/Dialogue/Characters/test.dch @@ -0,0 +1,19 @@ +{ +"@path": "res://addons/dialogic/Resources/character.gd", +"@subpath": NodePath(""), +&"_translation_id": "", +&"color": Color(1, 1, 1, 1), +&"custom_info": { +"sound_mood_default": "", +"sound_moods": {}, +"style": "" +}, +&"default_portrait": "", +&"description": "", +&"display_name": "test", +&"mirror": false, +&"nicknames": [""], +&"offset": Vector2(0, 0), +&"portraits": {}, +&"scale": 1.0 +} \ No newline at end of file diff --git a/Dialogue/Characters/test.dch.uid b/Dialogue/Characters/test.dch.uid new file mode 100644 index 00000000..79b2accc --- /dev/null +++ b/Dialogue/Characters/test.dch.uid @@ -0,0 +1 @@ +uid://cect7ll6w7ybk diff --git a/Dialogue/Timelines/computer_control_1.dtl b/Dialogue/Timelines/computer_control_1.dtl new file mode 100644 index 00000000..e3988ed8 --- /dev/null +++ b/Dialogue/Timelines/computer_control_1.dtl @@ -0,0 +1,2 @@ +computer: Remote automaton control system, engaged. +computer: Assuming Direct control. diff --git a/Dialogue/Timelines/computer_control_1.dtl.uid b/Dialogue/Timelines/computer_control_1.dtl.uid new file mode 100644 index 00000000..5904cad2 --- /dev/null +++ b/Dialogue/Timelines/computer_control_1.dtl.uid @@ -0,0 +1 @@ +uid://bdd772h4gbyn0 diff --git a/Scenes/Door_Horizontal.tscn b/Scenes/Door_Horizontal.tscn index f42a8bf3..8f32cf70 100644 --- a/Scenes/Door_Horizontal.tscn +++ b/Scenes/Door_Horizontal.tscn @@ -124,10 +124,10 @@ animations = [{ }] [sub_resource type="RectangleShape2D" id="RectangleShape2D_0wg11"] -size = Vector2(32, 32) +size = Vector2(36, 32) [sub_resource type="RectangleShape2D" id="RectangleShape2D_f2rl6"] -size = Vector2(32, 32) +size = Vector2(36, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_o7w0f"] atlas = ExtResource("2_rnx3o") diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 3775cf98..0b2d2332 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=109 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=112 format=4 uid="uid://bv451a8wgty4u"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_8tmoj"] [ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_8mh54"] @@ -367,9 +367,29 @@ WaitForCompletion = true [sub_resource type="CircleShape2D" id="CircleShape2D_8wuck"] +[sub_resource type="Resource" id="Resource_ji7au"] +resource_local_to_scene = true +script = ExtResource("46_i0omr") +TimelineName = "computer2" +WaitForCompletion = true +metadata/_custom_type_script = "uid://ddv26x2qilprb" + +[sub_resource type="Resource" id="Resource_fasrq"] +resource_local_to_scene = true +script = ExtResource("46_i0omr") +TimelineName = "computer_control_1" +WaitForCompletion = true +metadata/_custom_type_script = "uid://ddv26x2qilprb" + +[sub_resource type="Resource" id="Resource_yot54"] +script = ExtResource("64_rphi8") +Target = NodePath("../../ServerRoom/ControllabeFairyGuard2") +WaitForCompletion = true +metadata/_custom_type_script = "uid://v57xjmhi28kw" + [sub_resource type="Resource" id="Resource_o2kpk"] script = ExtResource("64_rphi8") -Target = NodePath("../../FairyGuard8") +Target = NodePath("../../../Debug Room/ControllabeFairyGuard") WaitForCompletion = true [sub_resource type="Resource" id="Resource_s3g2w"] @@ -578,6 +598,10 @@ position = Vector2(-735, -532) TurnOffMaterial = SubResource("ShaderMaterial_gmqhp") ActiveMaterial = SubResource("ShaderMaterial_jn1m0") +[node name="ControllabeFairyGuard" parent="Factory Tilemaps/Debug Room" instance=ExtResource("73_ier4h")] +position = Vector2(-581, -346) +StartingAiState = 1 + [node name="Part2" type="Node2D" parent="Factory Tilemaps"] [node name="Mainframe" parent="Factory Tilemaps/Part2" instance=ExtResource("13_acrmt")] @@ -665,11 +689,11 @@ IsEnabled = true Target = NodePath("../DebugTeleporter") [node name="DebugTeleporter" parent="Factory Tilemaps/LevelProps" instance=ExtResource("30_8fdby")] -position = Vector2(-801, 171) +position = Vector2(-1371, -214) Invisible = true [node name="BlueKeycard2" parent="Factory Tilemaps/LevelProps" instance=ExtResource("35_rblsn")] -position = Vector2(-1039, -417) +position = Vector2(-1032, -317) [node name="LargeTank2" parent="Factory Tilemaps/LevelProps" instance=ExtResource("7_lmrl1")] position = Vector2(-607, -63) @@ -725,6 +749,7 @@ position = Vector2(-1280, -272) [node name="HorizontalDoor8" parent="Factory Tilemaps/LevelProps" instance=ExtResource("12_i7i2m")] position = Vector2(-1104, -272) +State = 1 [node name="HorizontalDoor5" parent="Factory Tilemaps/LevelProps" instance=ExtResource("12_i7i2m")] position = Vector2(-1488, -368) @@ -883,21 +908,23 @@ metadata/_edit_group_ = true visible = false _trackName = "computer1" -[node name="Computer2" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] +[node name="Computer2" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target", "Targets") instance=ExtResource("31_243ec")] position = Vector2(-1464, -276) -Target = NodePath("DialogueStarter") +Target = NodePath("") +Targets = [NodePath("Script2")] -[node name="DialogueStarter" parent="Factory Tilemaps/LevelProps/Computer2" instance=ExtResource("32_68v02")] -position = Vector2(16.0001, -22) -_trackName = "computer2" +[node name="Script2" type="Node2D" parent="Factory Tilemaps/LevelProps/Computer2"] +position = Vector2(120, 25) +script = ExtResource("42_wigyb") +Events = Array[Object]([SubResource("Resource_ji7au")]) -[node name="Computer5" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] +[node name="Computer5" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1344, -251) -Target = NodePath("DialogueStarter") +Targets = [NodePath("Computer5Script")] -[node name="DialogueStarter" parent="Factory Tilemaps/LevelProps/Computer5" instance=ExtResource("32_68v02")] -position = Vector2(16.0001, -22) -_trackName = "computer2" +[node name="Computer5Script" type="Node2D" parent="Factory Tilemaps/LevelProps/Computer5"] +script = ExtResource("42_wigyb") +Events = Array[Object]([SubResource("Resource_fasrq"), SubResource("Resource_yot54")]) [node name="Computer3" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] position = Vector2(-612.57, -358.528) @@ -1006,38 +1033,53 @@ position = Vector2(-922, 105) [node name="FairyGuard7" parent="Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] position = Vector2(-1010, 203) -[node name="FairyGuard8" parent="Factory Tilemaps/LevelProps" instance=ExtResource("73_ier4h")] -position = Vector2(-581, -346) -StartingAiState = 1 - [node name="FairyGuard9" parent="Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] position = Vector2(-866, -92) [node name="Shroud" parent="Factory Tilemaps/LevelProps" instance=ExtResource("74_oaf68")] +[node name="Chest2" parent="Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] +position = Vector2(-679, -408) + +[node name="Ammo5" parent="Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] +position = Vector2(-936, 68) + +[node name="Ammo6" parent="Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] +position = Vector2(-921, 68) + +[node name="Ammo7" parent="Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] +position = Vector2(-872, 104) + +[node name="Ammo8" parent="Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] +position = Vector2(-872, 115) + +[node name="ICCTv" parent="Factory Tilemaps/LevelProps" instance=ExtResource("71_ji7au")] +position = Vector2(-1136, -445) + +[node name="ICCTv2" parent="Factory Tilemaps/LevelProps" instance=ExtResource("71_ji7au")] +position = Vector2(-1072, -445) + +[node name="ControlPad7" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")] +position = Vector2(-1306, -269) +Targets = [NodePath("../HorizontalDoor7")] + [node name="IceShotgun" parent="Factory Tilemaps/LevelProps" instance=ExtResource("19_xob8g")] position = Vector2(-885, -219) -[node name="Chest" parent="Factory Tilemaps" instance=ExtResource("25_4b2ed")] -position = Vector2(-679, -408) +[node name="ServerRoom" type="Node2D" parent="Factory Tilemaps/LevelProps"] -[node name="Ammo1" parent="Factory Tilemaps" instance=ExtResource("34_17pjh")] -position = Vector2(-936, 68) +[node name="ControllabeFairyGuard2" parent="Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("73_ier4h")] +position = Vector2(-1179, -319) +StartingAiState = 1 -[node name="Ammo2" parent="Factory Tilemaps" instance=ExtResource("34_17pjh")] -position = Vector2(-921, 68) +[node name="FairyGuard" parent="Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("73_cfpaq")] +position = Vector2(-1281, -391) -[node name="Ammo3" parent="Factory Tilemaps" instance=ExtResource("34_17pjh")] -position = Vector2(-872, 104) +[node name="FairyGuard2" parent="Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("73_cfpaq")] +position = Vector2(-1131, -398) -[node name="Ammo4" parent="Factory Tilemaps" instance=ExtResource("34_17pjh")] -position = Vector2(-872, 115) - -[node name="ICCTv" parent="Factory Tilemaps" instance=ExtResource("71_ji7au")] -position = Vector2(-1136, -445) - -[node name="ICCTv2" parent="Factory Tilemaps" instance=ExtResource("71_ji7au")] -position = Vector2(-1072, -445) +[node name="FairyGuard3" parent="Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("73_cfpaq")] +position = Vector2(-1067, -363) [node name="CameraController" type="Camera2D" parent="."] process_mode = 1 @@ -1074,3 +1116,15 @@ script = ExtResource("25_rpwvt") [node name="FairyGuard" parent="." instance=ExtResource("73_cfpaq")] position = Vector2(-934, -159) + +[node name="Fairy" parent="." instance=ExtResource("73_s4x1s")] +position = Vector2(-1272, -340) + +[node name="Fairy2" parent="." instance=ExtResource("73_s4x1s")] +position = Vector2(-1107, -327) + +[node name="Fairy3" parent="." instance=ExtResource("73_s4x1s")] +position = Vector2(-1220, -402) + +[node name="Fairy4" parent="." instance=ExtResource("73_s4x1s")] +position = Vector2(-1080, -399) diff --git a/project.godot b/project.godot index 33496d2e..d26db842 100644 --- a/project.godot +++ b/project.godot @@ -40,13 +40,15 @@ directories/dch_directory={ "ICE": "res://Dialogue/Characters/ICE.dch", "Navigator": "res://Dialogue/Characters/Navigator.dch", "Rumia": "res://Dialogue/Characters/Rumia.dch", -"computer": "res://Dialogue/Characters/computer.dch" +"computer": "res://Dialogue/Characters/computer.dch", +"test": "res://Dialogue/Characters/test.dch" } directories/dtl_directory={ "Mission1_Briefing": "res://Dialogue/Timelines/Mission1_Briefing.dtl", "Rumia_Intro": "res://Dialogue/Timelines/Rumia_Intro.dtl", "computer1": "res://Dialogue/Timelines/computer1.dtl", "computer2": "res://Dialogue/Timelines/computer2.dtl", +"computer_control_1": "res://Dialogue/Timelines/computer_control_1.dtl", "intro_story": "res://Dialogue/Timelines/intro_story.dtl", "rumia_defeat": "res://Dialogue/Timelines/rumia_defeat.dtl", "rumia_rebel_base_1": "res://Dialogue/Timelines/rumia_rebel_base_1.dtl",