diff --git a/Dialogue/Characters/Colonel.dch b/Dialogue/Characters/Colonel.dch index fdeb02f7..6476f07e 100644 --- a/Dialogue/Characters/Colonel.dch +++ b/Dialogue/Characters/Colonel.dch @@ -10,7 +10,7 @@ }, &"default_portrait": "Neutral", &"description": "", -&"display_name": "Colonel Kurenai", +&"display_name": "Colonel", &"mirror": false, &"nicknames": ["Kurenai Misuzu"], &"offset": Vector2(0, 0), diff --git a/Dialogue/Styles/Briefing_Style.tres b/Dialogue/Styles/Briefing_Style.tres index 538691be..b87aa020 100644 --- a/Dialogue/Styles/Briefing_Style.tres +++ b/Dialogue/Styles/Briefing_Style.tres @@ -35,13 +35,18 @@ overrides = {} script = ExtResource("1_1na1v") scene = ExtResource("5_rmqst") overrides = { +"box_color_custom": "Color(1, 1, 1, 1)", +"box_color_use_global": "false", "box_margin_bottom": "1.0", "box_panel": "\"res://Resources/Styles/PixelStyleBoxRed.tres\"", "box_size": "Vector2(300, 50)", -"name_label_box_offset": "Vector2(0, 8)", +"name_label_box_modulate": "Color(1, 1, 1, 1)", +"name_label_box_offset": "Vector2(0, 16)", "name_label_box_panel": "\"res://Resources/Styles/PixelStyleBoxRed.tres\"", +"name_label_box_use_global_color": "false", "name_label_custom_font_size": "11.0", -"next_indicator_size": "Vector2(12, 12)", +"next_indicator_size": "Vector2(16, 16)", +"next_indicator_texture": "\"res://ExternalMaterial/3DCursor/DialogueCursor.png\"", "text_size": "6.0" } @@ -88,4 +93,4 @@ layer_info = { } base_overrides = {} layers = Array[ExtResource("1_1na1v")]([]) -metadata/_latest_layer = "18" +metadata/_latest_layer = "13" diff --git a/Dialogue/Styles/VN.tres b/Dialogue/Styles/VN.tres index 17de036d..d17f9ebd 100644 --- a/Dialogue/Styles/VN.tres +++ b/Dialogue/Styles/VN.tres @@ -46,7 +46,8 @@ overrides = { "name_label_box_panel": "\"res://Resources/Styles/PixelStyleBoxRed.tres\"", "name_label_custom_font_size": "11.0", "next_indicator_size": "Vector2(12, 12)", -"text_size": "6.0" +"text_size": "6.0", +"text_use_global_color": "false" } [sub_resource type="Resource" id="Resource_30jrk"] @@ -86,4 +87,4 @@ layer_info = { } base_overrides = {} layers = Array[ExtResource("1_47mos")]([]) -metadata/_latest_layer = "10" +metadata/_latest_layer = "13" diff --git a/ExternalMaterial/3DCursor/3DCursor.pxc b/ExternalMaterial/3DCursor/3DCursor.pxc index 8dc9763a..2a07c5b7 100644 Binary files a/ExternalMaterial/3DCursor/3DCursor.pxc and b/ExternalMaterial/3DCursor/3DCursor.pxc differ diff --git a/ExternalMaterial/3DCursor/3DCursor.pxc1 b/ExternalMaterial/3DCursor/3DCursor.pxc1 index 52c2c178..270c1175 100644 Binary files a/ExternalMaterial/3DCursor/3DCursor.pxc1 and b/ExternalMaterial/3DCursor/3DCursor.pxc1 differ diff --git a/ExternalMaterial/3DCursor/DialogueCursor.png b/ExternalMaterial/3DCursor/DialogueCursor.png new file mode 100644 index 00000000..da405e2c --- /dev/null +++ b/ExternalMaterial/3DCursor/DialogueCursor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbf8ce1020d8603c3931acf0709ceda6594cc33be66f2c3d437babef253981e9 +size 420 diff --git a/ExternalMaterial/3DCursor/DialogueCursor.png.import b/ExternalMaterial/3DCursor/DialogueCursor.png.import new file mode 100644 index 00000000..fdae9936 --- /dev/null +++ b/ExternalMaterial/3DCursor/DialogueCursor.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ck6wknexdx26s" +path="res://.godot/imported/DialogueCursor.png-55ce5ad8340264e0a219c3e3e56c5828.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ExternalMaterial/3DCursor/DialogueCursor.png" +dest_files=["res://.godot/imported/DialogueCursor.png-55ce5ad8340264e0a219c3e3e56c5828.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/ExternalMaterial/3DCursor/DialogueCursorBig.png b/ExternalMaterial/3DCursor/DialogueCursorBig.png new file mode 100644 index 00000000..f7989a3e --- /dev/null +++ b/ExternalMaterial/3DCursor/DialogueCursorBig.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b294a5bf8116fa9babe122e0445922f395f1cb7b7dae4e6f2ba523bcf381834 +size 575 diff --git a/ExternalMaterial/3DCursor/DialogueCursorBig.png.import b/ExternalMaterial/3DCursor/DialogueCursorBig.png.import new file mode 100644 index 00000000..b8981ec6 --- /dev/null +++ b/ExternalMaterial/3DCursor/DialogueCursorBig.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dtl1kxg4xwlje" +path="res://.godot/imported/DialogueCursorBig.png-67d2b2fbec187ea33fc6f256c36b982b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ExternalMaterial/3DCursor/DialogueCursorBig.png" +dest_files=["res://.godot/imported/DialogueCursorBig.png-67d2b2fbec187ea33fc6f256c36b982b.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Resources/Styles/VN_Dialogue_Box/VisualNovelTextbox/custom_visual_novel_textbox.tscn b/Resources/Styles/VN_Dialogue_Box/VisualNovelTextbox/custom_visual_novel_textbox.tscn index bf45bc5a..a4739421 100644 --- a/Resources/Styles/VN_Dialogue_Box/VisualNovelTextbox/custom_visual_novel_textbox.tscn +++ b/Resources/Styles/VN_Dialogue_Box/VisualNovelTextbox/custom_visual_novel_textbox.tscn @@ -8,8 +8,8 @@ [ext_resource type="Script" uid="uid://bkfrnlul8c6cv" path="res://addons/dialogic/Modules/Text/node_type_sound.gd" id="4_ma5mw"] [ext_resource type="Script" uid="uid://dk0xy5qppo033" path="res://addons/dialogic/Modules/Text/node_next_indicator.gd" id="5_40a50"] [ext_resource type="Script" uid="uid://cd42pehtw2oq5" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/autoadvance_indicator.gd" id="6_07xym"] -[ext_resource type="Texture2D" uid="uid://b0rpqfg4fhebk" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/next.svg" id="6_uch03"] [ext_resource type="Script" uid="uid://be3h8wr0w68dx" path="res://addons/dialogic/Modules/Text/node_name_label.gd" id="7_bi7sh"] +[ext_resource type="Texture2D" uid="uid://ck6wknexdx26s" path="res://ExternalMaterial/3DCursor/DialogueCursor.png" id="8_j47nm"] [ext_resource type="FontFile" uid="uid://coek1e2q257pq" path="res://fonts/at01.ttf" id="10_j47nm"] [sub_resource type="Animation" id="Animation_au0a2"] @@ -304,7 +304,8 @@ size_flags_vertical = 8 mouse_filter = 2 script = ExtResource("5_40a50") show_on_questions = true -texture = ExtResource("6_uch03") +texture = ExtResource("8_j47nm") +texture_size = Vector2(64, 64) metadata/_edit_layout_mode = 1 [node name="AutoAdvanceProgressbar" type="ProgressBar" parent="Anchor/AnimationParent/Sizer/DialogTextPanel"] diff --git a/Scenes/Maps/Intro_Briefing.tscn b/Scenes/Maps/Intro_Briefing.tscn index e711b12d..714b1264 100644 --- a/Scenes/Maps/Intro_Briefing.tscn +++ b/Scenes/Maps/Intro_Briefing.tscn @@ -40,6 +40,7 @@ render_target_update_mode = 4 [node name="BriefingRoom3d" parent="SubViewportContainer/SubViewport" instance=ExtResource("2_qxk7q")] [node name="CRT" type="TextureRect" parent="."] +visible = false top_level = true material = SubResource("ShaderMaterial_pa17m") anchors_preset = 15 diff --git a/Scenes/Maps/Level3.tscn b/Scenes/Maps/Level3.tscn index a7213794..28163253 100644 --- a/Scenes/Maps/Level3.tscn +++ b/Scenes/Maps/Level3.tscn @@ -190,7 +190,6 @@ scale = Vector2(73, 35) [node name="AlarmTrigger" type="Node2D" parent="Tilemaps/Actors/Shroud" node_paths=PackedStringArray("Target")] script = ExtResource("27_ao3d3") Target = NodePath("..") -ActivationType = 2 [node name="Shroud2" parent="Tilemaps/Actors" instance=ExtResource("22_4fcuc")] position = Vector2(398, 142.5) diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 665014e2..55022ad5 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1084,7 +1084,7 @@ position = Vector2(-2000, -736) [node name="ControlPad8" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")] position = Vector2(-2027, -735) Targets = [NodePath("../HorizontalForceField")] -Requirements = [ExtResource("84_ma1ta")] +Requirements = Array[ExtResource("6_8tdlb")]([ExtResource("84_ma1ta")]) [node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-872, -220)