From 2214db888f1dfa631880587b3f86297f115a6cdd Mon Sep 17 00:00:00 2001 From: Marco Date: Thu, 8 May 2025 13:13:16 +0200 Subject: [PATCH] Split briefing --- Dialogue/Timelines/Mission1_Briefing.dtl | 15 +---- Dialogue/Timelines/Mission1_Briefing_2.dtl | 18 ++++++ .../Timelines/Mission1_Briefing_2.dtl.uid | 1 + Resources/Maps/Tutorial.tres | 7 ++- Scenes/Maps/Intro_Briefing_2.tscn | 55 +++++++++++++++++++ Scenes/Maps/Tutorial.tscn | 9 +-- project.godot | 1 + 7 files changed, 84 insertions(+), 22 deletions(-) create mode 100644 Dialogue/Timelines/Mission1_Briefing_2.dtl create mode 100644 Dialogue/Timelines/Mission1_Briefing_2.dtl.uid create mode 100644 Scenes/Maps/Intro_Briefing_2.tscn diff --git a/Dialogue/Timelines/Mission1_Briefing.dtl b/Dialogue/Timelines/Mission1_Briefing.dtl index 540cb61a..3e26a10e 100644 --- a/Dialogue/Timelines/Mission1_Briefing.dtl +++ b/Dialogue/Timelines/Mission1_Briefing.dtl @@ -10,16 +10,5 @@ Colonel: It is unlikely we'll be able to have access to it in the short term for Colonel: But most importantly of all, I'm glad you decided to help our cause, our objectives coincide and collaboration will be instrumental in reaching them. #id:38 Colonel: I know you are eager to prove yourself, and we have the perfect chance to show what you're worth. #id:39 Colonel: Because of your magical ability to regenerate from death we have assigned you one mission that would be too dangerous for our human operatives. #id:3a -update Colonel left [move_time="0.4"] -[image scene="res://Dialogue/CustomScenes/dialogic_windowed_image.tscn" arg="res://Sprites/Briefing/RefinerySmall.png" fade="0.0"] -Colonel: Our spies have reported to us that this refinery has been emitting unusual amounts of pollutants, even more powerful than what they usually emit. #id:3b -Colonel: This leads us to believe that they are making use of an artifact of extradimentional origin. #id:3c -[image scene="res://Dialogue/CustomScenes/dialogic_windowed_image.tscn" arg="res://Sprites/Briefing/WireframeYinYang.png" fade="0.0"] -Colonel: We believe the enemy to have one of these misterious artifacts in their possession and are using it to enhance their fuel production. #id:3d -Colonel: Your mission is to retrieve this artifact, it will cripple enemy operations and allow us to study it's magical effects. #id:3e -Colonel: And perhaps there will be a chance to use it to give you new abilities that will make you more effective in the field. #id:3f -[image scene="res://Dialogue/CustomScenes/dialogic_windowed_image.tscn" arg="res://Sprites/Expression/ICE/ICE00.png" fade="0.0"] -Colonel: You will be assigned an AI companion who will help you in your mission, you will get acquainted during VR training. #id:40 -[image fade="0.0"] -update Colonel center [move_time="0.2"] -Colonel: Good luck Cirno, Colonel out. #id:41 +Colonel: But first you will now undergo virtual training in order to prepare for your mission, we will have a further briefing about the mission once you are done. +Colonel: Colonel out. #id:41 diff --git a/Dialogue/Timelines/Mission1_Briefing_2.dtl b/Dialogue/Timelines/Mission1_Briefing_2.dtl new file mode 100644 index 00000000..9d61b959 --- /dev/null +++ b/Dialogue/Timelines/Mission1_Briefing_2.dtl @@ -0,0 +1,18 @@ +[style name="Briefing_Style"] +join Colonel center [animation="Fade In"] +Colonel: Welcome back Cirno, we will now go over the mission parameters. +Colonel: Because of your magical ability to regenerate from death we have assigned you one mission that would be too dangerous for our human operatives. +update Colonel left [move_time="0.4"] +[image scene="res://Dialogue/CustomScenes/dialogic_windowed_image.tscn" arg="res://Sprites/Briefing/RefinerySmall.png" fade="0.0"] +Colonel: Our spies have reported to us that this refinery has been emitting unusual amounts of pollutants, even more powerful than what they usually emit. +Colonel: This leads us to believe that they are making use of an artifact of extradimentional origin. +[image scene="res://Dialogue/CustomScenes/dialogic_windowed_image.tscn" arg="res://Sprites/Briefing/WireframeYinYang.png" fade="0.0"] +Colonel: We believe the enemy to have one of these misterious artifacts in their possession and are using it to enhance their fuel production. +Colonel: Your mission is to retrieve this artifact, it will cripple enemy operations and allow us to study it's magical effects. +Colonel: And perhaps there will be a chance to use it to give you new abilities that will make you more effective in the field. +[image scene="res://Dialogue/CustomScenes/dialogic_windowed_image.tscn" arg="res://Sprites/Expression/ICE/ICE00.png" fade="0.0"] +Colonel: You will be assigned an AI companion who will help you in your mission, you will get acquainted during VR training. +[image fade="0.0"] +update Colonel center [move_time="0.2"] +Colonel: Good luck Cirno, Colonel out. +update Colonel left [move_time="0.4"] diff --git a/Dialogue/Timelines/Mission1_Briefing_2.dtl.uid b/Dialogue/Timelines/Mission1_Briefing_2.dtl.uid new file mode 100644 index 00000000..b69846a4 --- /dev/null +++ b/Dialogue/Timelines/Mission1_Briefing_2.dtl.uid @@ -0,0 +1 @@ +uid://oqn28vc7w3fs diff --git a/Resources/Maps/Tutorial.tres b/Resources/Maps/Tutorial.tres index 0d3a4d03..c3497b3f 100644 --- a/Resources/Maps/Tutorial.tres +++ b/Resources/Maps/Tutorial.tres @@ -1,13 +1,14 @@ -[gd_resource type="Resource" script_class="MapResource" load_steps=4 format=3 uid="uid://b4u3cs6ietmow"] +[gd_resource type="Resource" script_class="MapResource" load_steps=5 format=3 uid="uid://b4u3cs6ietmow"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="1_3bwtp"] [ext_resource type="Script" uid="uid://quy4d4tgvqfy" path="res://Scripts/Resources/MapResource.cs" id="1_5stb7"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="1_dpitu"] [sub_resource type="Resource" id="Resource_dpitu"] script = ExtResource("1_3bwtp") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("1_dpitu")]([]) +RemoveEquipment = Array[ExtResource("1_dpitu")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [resource] diff --git a/Scenes/Maps/Intro_Briefing_2.tscn b/Scenes/Maps/Intro_Briefing_2.tscn new file mode 100644 index 00000000..e5d4b6c9 --- /dev/null +++ b/Scenes/Maps/Intro_Briefing_2.tscn @@ -0,0 +1,55 @@ +[gd_scene load_steps=7 format=3 uid="uid://dnd018k84qkuf"] + +[ext_resource type="Script" uid="uid://bf0tnhnwttrim" path="res://Scripts/Misc/DialogueAutoStarter.cs" id="1_mccaa"] +[ext_resource type="PackedScene" uid="uid://cpgrmlc0c1ssj" path="res://3D/BriefingRoom3D.tscn" id="2_4ps26"] +[ext_resource type="Shader" uid="uid://iw1ujgfir2li" path="res://Shaders/CRT.gdshader" id="3_4s0g4"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_pa17m"] +shader = ExtResource("3_4s0g4") +shader_parameter/screen_width = 1024.0 +shader_parameter/screen_height = 600.0 +shader_parameter/BarrelPower = 1.0 +shader_parameter/color_bleeding = 0.265 +shader_parameter/bleeding_range_x = 2.845 +shader_parameter/bleeding_range_y = 2.64 +shader_parameter/lines_distance = 4.0 +shader_parameter/scan_size = 2.0 +shader_parameter/scanline_alpha = 0.9 +shader_parameter/lines_velocity = 30.0 + +[sub_resource type="Gradient" id="Gradient_mp1dh"] +colors = PackedColorArray(1, 0.984314, 1, 1, 1, 1, 1, 1) + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_mvptm"] +gradient = SubResource("Gradient_mp1dh") + +[node name="IntroBriefing" type="Node2D"] +script = ExtResource("1_mccaa") +_trackName = &"Mission1_Briefing_2" +_finishedScenePath = &"uid://bv451a8wgty4u" + +[node name="SubViewportContainer" type="SubViewportContainer" parent="."] +offset_right = 320.0 +offset_bottom = 160.0 + +[node name="SubViewport" type="SubViewport" parent="SubViewportContainer"] +handle_input_locally = false +size = Vector2i(320, 160) +render_target_update_mode = 4 + +[node name="BriefingRoom3d" parent="SubViewportContainer/SubViewport" instance=ExtResource("2_4ps26")] + +[node name="CRT" type="TextureRect" parent="."] +visible = false +top_level = true +material = SubResource("ShaderMaterial_pa17m") +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = -7.0 +offset_top = -4.0 +offset_right = 339.0 +offset_bottom = 167.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = SubResource("GradientTexture2D_mvptm") diff --git a/Scenes/Maps/Tutorial.tscn b/Scenes/Maps/Tutorial.tscn index 877534bf..fbcf39a2 100644 --- a/Scenes/Maps/Tutorial.tscn +++ b/Scenes/Maps/Tutorial.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=51 format=4 uid="uid://bpnahwxmjgb6t"] +[gd_scene load_steps=50 format=4 uid="uid://bpnahwxmjgb6t"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_qxyfr"] [ext_resource type="Resource" uid="uid://b4u3cs6ietmow" path="res://Resources/Maps/Tutorial.tres" id="2_0xhda"] @@ -30,7 +30,6 @@ [ext_resource type="FontFile" uid="uid://cc3bdt3rt8a1o" path="res://fonts/Silver.ttf" id="25_covcf"] [ext_resource type="PackedScene" uid="uid://dx1urm7nttkqk" path="res://Scenes/Actors/level_teleporter.tscn" id="25_mfnhx"] [ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="26_r1dm5"] -[ext_resource type="Resource" uid="uid://xtg062tcon1j" path="res://Resources/Maps/Level1.tres" id="28_xlcit"] [ext_resource type="PackedScene" uid="uid://cnhgvn2salyxl" path="res://Scenes/Items/Icicle_Repeater.tscn" id="32_covcf"] [ext_resource type="PackedScene" uid="uid://cmr6fclttrpkb" path="res://Scenes/Items/Ammo1.tscn" id="33_0xhda"] [ext_resource type="Script" uid="uid://upq0b4sx7nhw" path="res://Scripts/Misc/CameraTarget.cs" id="33_xlcit"] @@ -333,8 +332,7 @@ vertical_alignment = 1 [node name="LevelTeleporter" parent="Parallax2D/Tilemaps" instance=ExtResource("25_mfnhx")] position = Vector2(999, -40) -LevelPath = "res://Scenes/test.tscn" -Map = ExtResource("28_xlcit") +LevelPath = "uid://dnd018k84qkuf" IsEnabled = true [node name="Label" type="Label" parent="Parallax2D/Tilemaps"] @@ -351,8 +349,7 @@ horizontal_alignment = 1 [node name="LevelTeleporter2" parent="Parallax2D/Tilemaps" instance=ExtResource("25_mfnhx")] position = Vector2(135, 423) -LevelPath = "res://Scenes/test.tscn" -Map = ExtResource("28_xlcit") +LevelPath = "uid://dnd018k84qkuf" IsEnabled = true [node name="IcicleRepeater" parent="Parallax2D/Tilemaps" instance=ExtResource("32_covcf")] diff --git a/project.godot b/project.godot index eb0866f8..338820ba 100644 --- a/project.godot +++ b/project.godot @@ -65,6 +65,7 @@ directories/dch_directory={ directories/dtl_directory={ "Level1_End_Intermission": "res://Dialogue/Timelines/Rebel_Base/Level1_End_Intermission.dtl", "Mission1_Briefing": "res://Dialogue/Timelines/Mission1_Briefing.dtl", +"Mission1_Briefing_2": "res://Dialogue/Timelines/Mission1_Briefing_2.dtl", "Rumia_Intro": "res://Dialogue/Timelines/Rumia_Intro.dtl", "colonel1": "res://Dialogue/Timelines/Rebel_Base/colonel1.dtl", "computer1": "res://Dialogue/Timelines/computer1.dtl",