From 7c95e3c8fc38f26599f2854a9c593b00f2a94ca6 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Thu, 27 Mar 2025 20:23:53 +0100 Subject: [PATCH] Briefing layout fixes and indicator --- Dialogue/Characters/Colonel.dch | 2 +- Dialogue/Styles/Briefing_Style.tres | 11 ++++-- Dialogue/Styles/VN.tres | 5 +-- ExternalMaterial/3DCursor/3DCursor.pxc | Bin 2985 -> 3581 bytes ExternalMaterial/3DCursor/3DCursor.pxc1 | Bin 3020 -> 3227 bytes ExternalMaterial/3DCursor/DialogueCursor.png | 3 ++ .../3DCursor/DialogueCursor.png.import | 34 ++++++++++++++++++ .../3DCursor/DialogueCursorBig.png | 3 ++ .../3DCursor/DialogueCursorBig.png.import | 34 ++++++++++++++++++ .../custom_visual_novel_textbox.tscn | 5 +-- Scenes/Maps/Intro_Briefing.tscn | 1 + Scenes/Maps/Level3.tscn | 1 - Scenes/test.tscn | 2 +- 13 files changed, 91 insertions(+), 10 deletions(-) create mode 100644 ExternalMaterial/3DCursor/DialogueCursor.png create mode 100644 ExternalMaterial/3DCursor/DialogueCursor.png.import create mode 100644 ExternalMaterial/3DCursor/DialogueCursorBig.png create mode 100644 ExternalMaterial/3DCursor/DialogueCursorBig.png.import 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 8dc9763ac0b884c649598ec1f44ec2d3fec2b4e9..2a07c5b77641abbe5b333afeca1b8e4fbe9ed293 100644 GIT binary patch literal 3581 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

k6`N>ocmy5rEJ~g#fb0?g_C_RsPc&B= zERUKQ8~F|h5Qm<^t8lXy&knl(hrC;XMcBuS$_V>8RPdqyJgqIx`6r5lM%nqau zj5wPwO>!ESD2u`ynmzPV23{aluGV?z?EwuRJIICmk~rrfVQ>1T7QOh2W*C~hJ8|=@ zW_F)foLDsFh`$#d#kAA^zHIC}%~Ba?$&NF!ag+J zlPEaCQ#N$7@-#Lg;`{t-QaAtR>e@dfNAoIM{P9LRJdQlc5mk}vFULTcuOUT$7eUoZ z^DWJHhxrQhTNcOvNyYJd7yX|QASjFD*YSC6s}6f#CHC)DD<8kyuhzE*A)N31t*hj- zDZRERUNH|%OMJ%5BKfjNzATb2i{zj6P!`EQAzc>9zdrF%7Rmq1isb30A4s}hS5131 zy_bT=Iy^qsIudlW@rha%$^W!SD=U6iqVh65ckR2-mMN7BF4MJTy0%Q$KC_TAUHfXH zWxBRZ*Y-a&kgTefX`XzzIF!*6 zY{2)AH%`#6>ruMaV0j*~e9x1h@vcq9uHbRjK2lJ|tVF#%=hj6i;ta%&LlB zPn$rgbNr}S{qh<}auy}$o2Oq>ZJeWoIA>jOo*euOWxjRI)bxF?AN4<+9BZbmTRM4% z8l=%^NEhz$-5J#m=|d}mY|V(?j@INKd;4ftHSk`)Uvy)WBiXm-?St~Y#2<78_L3{~ zy~N+ME@tNofofeUL zv5CqAg;#H)nrKq)qso0$xsNLMQU6E#D2>$y?MCe{$@q{r>89W_8^PoAvew6brOx!y z=uLDFw@=5~eBmd0#b1&my-Zy<6h$@GM|yph^_r}wPPgj{Z?+sCLPlbJa2W>dsILb) z^5hydJ&zSYxev)DVB7qxHQM7G62Sg?G_QW-Ia_{M9|~H~0inAgL%<|HfD43V$mAgL zkF4sCH=)=%_R%6b#*JNgc1RfuFRfd$Gra&i4v?SF#f}}r0Sol7L*lSUn+<~*;^)C} zOJzC%Juq^iop2N%EBE<;MS~LYevZ!zR8@9#pjEdd+0Z4%Hjl4IQ%1=Xyht`au>e>^ z3G;Ig*)S(A9sxIAW4~<{?X5~buAf6*PqkKHe!N+HgFZHyuwiYh07ba(-~aPJQmrwc DM8@%7 literal 2985 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 diff --git a/ExternalMaterial/3DCursor/3DCursor.pxc1 b/ExternalMaterial/3DCursor/3DCursor.pxc1 index 52c2c1783bebbb9b612e807709ec0186085406fa..270c117545598fff4005a4448bd25477fb8c63cf 100644 GIT binary patch literal 3227 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 NFE20u`#({zR2mk$M%w@Y literal 3020 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 Oaq9Q@um1o=0Q!tl%o6bc 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)