diff --git a/assets/fonts/MS Gothic.ttf b/assets/fonts/MS Gothic.ttf new file mode 100644 index 0000000..a205846 Binary files /dev/null and b/assets/fonts/MS Gothic.ttf differ diff --git a/assets/fonts/MS Gothic.ttf.import b/assets/fonts/MS Gothic.ttf.import new file mode 100644 index 0000000..721c784 --- /dev/null +++ b/assets/fonts/MS Gothic.ttf.import @@ -0,0 +1,36 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://1a55lafcbss" +path="res://.godot/imported/MS Gothic.ttf-fe31b0559366ecce2136a33451d351df.fontdata" + +[deps] + +source_file="res://assets/fonts/MS Gothic.ttf" +dest_files=["res://.godot/imported/MS Gothic.ttf-fe31b0559366ecce2136a33451d351df.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +modulate_color_glyphs=false +hinting=1 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/assets/sprites/character.bmp b/assets/sprites/character.bmp deleted file mode 100644 index 35b9c6a..0000000 Binary files a/assets/sprites/character.bmp and /dev/null differ diff --git a/assets/sprites/dialogue_continue.BMP b/assets/sprites/dialogue_continue.BMP new file mode 100644 index 0000000..e9a9551 Binary files /dev/null and b/assets/sprites/dialogue_continue.BMP differ diff --git a/assets/sprites/map1.bmp.import b/assets/sprites/dialogue_continue.BMP.import similarity index 72% rename from assets/sprites/map1.bmp.import rename to assets/sprites/dialogue_continue.BMP.import index 0dcdc6d..541ff4d 100644 --- a/assets/sprites/map1.bmp.import +++ b/assets/sprites/dialogue_continue.BMP.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://udsusbp3o76m" -path="res://.godot/imported/map1.bmp-9e2f42fc155126c194d55961a68898fc.ctex" +uid="uid://dj621xih5cam7" +path="res://.godot/imported/dialogue_continue.BMP-dabd4279feb14083304f5e16e0d8a0bd.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/sprites/map1.bmp" -dest_files=["res://.godot/imported/map1.bmp-9e2f42fc155126c194d55961a68898fc.ctex"] +source_file="res://assets/sprites/dialogue_continue.BMP" +dest_files=["res://.godot/imported/dialogue_continue.BMP-dabd4279feb14083304f5e16e0d8a0bd.ctex"] [params] diff --git a/assets/sprites/dialogue_ui.BMP b/assets/sprites/dialogue_ui.BMP new file mode 100644 index 0000000..e469923 Binary files /dev/null and b/assets/sprites/dialogue_ui.BMP differ diff --git a/assets/sprites/character.bmp.import b/assets/sprites/dialogue_ui.BMP.import similarity index 73% rename from assets/sprites/character.bmp.import rename to assets/sprites/dialogue_ui.BMP.import index 8a6b6ea..3882804 100644 --- a/assets/sprites/character.bmp.import +++ b/assets/sprites/dialogue_ui.BMP.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c2se5wyly6gr6" -path="res://.godot/imported/character.bmp-cf65b7adb0d5844b4deb09628dc23b0b.ctex" +uid="uid://cyl18yt5hxyb5" +path="res://.godot/imported/dialogue_ui.BMP-e3af05c48e6befb926caa8e760ab9c22.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/sprites/character.bmp" -dest_files=["res://.godot/imported/character.bmp-cf65b7adb0d5844b4deb09628dc23b0b.ctex"] +source_file="res://assets/sprites/dialogue_ui.BMP" +dest_files=["res://.godot/imported/dialogue_ui.BMP-e3af05c48e6befb926caa8e760ab9c22.ctex"] [params] diff --git a/assets/sprites/map1.bmp b/assets/sprites/map1.bmp deleted file mode 100644 index 4061ab4..0000000 Binary files a/assets/sprites/map1.bmp and /dev/null differ diff --git a/prefabs/combat_map.tscn b/prefabs/combat_map.tscn index 0a65e11..07a9bda 100644 --- a/prefabs/combat_map.tscn +++ b/prefabs/combat_map.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://bks7uplgjjdg0" path="res://nodes/combat_map.gd" id="1_jyv1f"] [ext_resource type="Script" uid="uid://c6701vy8h5rfx" path="res://resources/resource_definitions/dl_tileset.gd" id="2_8rn0j"] [ext_resource type="Texture2D" uid="uid://sjsl8q7tkx8" path="res://assets/sprites/grid_highlight.png" id="3_vcj5e"] -[ext_resource type="Script" uid="uid://cxl38x2m6sj3w" path="res://scripts/grid_overlay.gd" id="4_jelju"] +[ext_resource type="Script" uid="uid://cxl38x2m6sj3w" path="res://scripts/battle/grid_overlay.gd" id="4_jelju"] [ext_resource type="Texture2D" uid="uid://b1ks72fiesfrm" path="res://assets/sprites/combat_map_ui.BMP" id="5_mycp7"] [ext_resource type="Texture2D" uid="uid://65rmoynep5hy" path="res://assets/sprites/MP000A.BMP" id="6_muxvo"] diff --git a/prefabs/combat_ui.tscn b/prefabs/combat_ui.tscn index de5a5fb..52c9be0 100644 --- a/prefabs/combat_ui.tscn +++ b/prefabs/combat_ui.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://cy7r0udfcsqbn"] [ext_resource type="Theme" uid="uid://dx26d6py3n8xi" path="res://resources/main_ui_theme.tres" id="1_2ro41"] -[ext_resource type="Script" path="res://scripts/combat_ui.gd" id="2_ui_script"] +[ext_resource type="Script" uid="uid://w2wh6gtv3u2l" path="res://scripts/battle/combat_ui.gd" id="2_ui_script"] [node name="CombatUI" type="CanvasLayer" unique_id=1093388037] script = ExtResource("2_ui_script") @@ -19,14 +19,14 @@ offset_bottom = -8.0 grow_vertical = 0 theme = ExtResource("1_2ro41") -[node name="MarginContainer" type="MarginContainer" parent="UnitPanel"] +[node name="MarginContainer" type="MarginContainer" parent="UnitPanel" unique_id=899996785] layout_mode = 2 theme_override_constants/margin_left = 8 theme_override_constants/margin_top = 8 theme_override_constants/margin_right = 8 theme_override_constants/margin_bottom = 8 -[node name="VBoxContainer" type="VBoxContainer" parent="UnitPanel/MarginContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="UnitPanel/MarginContainer" unique_id=333573880] layout_mode = 2 [node name="NameLabel" type="Label" parent="UnitPanel/MarginContainer/VBoxContainer" unique_id=2000000002] @@ -37,11 +37,10 @@ text = "Unit" [node name="HPBar" type="ProgressBar" parent="UnitPanel/MarginContainer/VBoxContainer" unique_id=2000000003] unique_name_in_owner = true layout_mode = 2 -max_value = 100.0 value = 100.0 show_percentage = false -[node name="BackgroundTint" type="ColorRect" parent="."] +[node name="BackgroundTint" type="ColorRect" parent="." unique_id=253893594] unique_name_in_owner = true visible = false anchors_preset = 15 @@ -49,10 +48,9 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -mouse_filter = 0 color = Color(0, 0, 0, 0.4) -[node name="CombatProposalPanel" type="PanelContainer" parent="."] +[node name="CombatProposalPanel" type="PanelContainer" parent="." unique_id=2088533653] unique_name_in_owner = true visible = false anchors_preset = 8 @@ -64,109 +62,109 @@ grow_horizontal = 2 grow_vertical = 2 theme = ExtResource("1_2ro41") -[node name="MarginContainer" type="MarginContainer" parent="CombatProposalPanel"] +[node name="MarginContainer" type="MarginContainer" parent="CombatProposalPanel" unique_id=924522188] layout_mode = 2 theme_override_constants/margin_left = 12 theme_override_constants/margin_top = 12 theme_override_constants/margin_right = 12 theme_override_constants/margin_bottom = 12 -[node name="VBoxContainer" type="VBoxContainer" parent="CombatProposalPanel/MarginContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="CombatProposalPanel/MarginContainer" unique_id=666671196] layout_mode = 2 -[node name="TitleLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer"] +[node name="TitleLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer" unique_id=1520669125] layout_mode = 2 text = "COMBAT FORECAST" horizontal_alignment = 1 -[node name="StatsContainer" type="HBoxContainer" parent="CombatProposalPanel/MarginContainer/VBoxContainer"] +[node name="StatsContainer" type="HBoxContainer" parent="CombatProposalPanel/MarginContainer/VBoxContainer" unique_id=1101898616] layout_mode = 2 theme_override_constants/separation = 24 -[node name="AttackerStats" type="VBoxContainer" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer"] +[node name="AttackerStats" type="VBoxContainer" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer" unique_id=1193603706] layout_mode = 2 -[node name="AttackerNameLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats"] +[node name="AttackerNameLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats" unique_id=1574861154] unique_name_in_owner = true layout_mode = 2 text = "Attacker" -[node name="AttackerTacticSelect" type="OptionButton" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats"] +[node name="AttackerTacticSelect" type="OptionButton" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats" unique_id=1466363800] unique_name_in_owner = true layout_mode = 2 -[node name="AttackerHPBar" type="ProgressBar" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats"] +[node name="AttackerHPBar" type="ProgressBar" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats" unique_id=241886156] unique_name_in_owner = true layout_mode = 2 show_percentage = false -[node name="AttackerATKLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats"] +[node name="AttackerATKLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats" unique_id=1656041171] unique_name_in_owner = true layout_mode = 2 text = "ATK: 0" -[node name="AttackerDEFLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats"] +[node name="AttackerDEFLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats" unique_id=2145851939] unique_name_in_owner = true layout_mode = 2 text = "DEF: 0" -[node name="AttackerHITLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats"] +[node name="AttackerHITLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats" unique_id=1234331828] unique_name_in_owner = true layout_mode = 2 text = "HIT: 0%" -[node name="AttackerSPDLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats"] +[node name="AttackerSPDLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/AttackerStats" unique_id=1461624142] unique_name_in_owner = true layout_mode = 2 text = "SPD: 0" -[node name="DefenderStats" type="VBoxContainer" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer"] +[node name="DefenderStats" type="VBoxContainer" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer" unique_id=1747482540] layout_mode = 2 -[node name="DefenderNameLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats"] +[node name="DefenderNameLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats" unique_id=365769500] unique_name_in_owner = true layout_mode = 2 text = "Defender" -[node name="DefenderTacticSelect" type="OptionButton" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats"] +[node name="DefenderTacticSelect" type="OptionButton" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats" unique_id=1226652499] unique_name_in_owner = true layout_mode = 2 -[node name="DefenderHPBar" type="ProgressBar" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats"] +[node name="DefenderHPBar" type="ProgressBar" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats" unique_id=1878516243] unique_name_in_owner = true layout_mode = 2 show_percentage = false -[node name="DefenderATKLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats"] +[node name="DefenderATKLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats" unique_id=1571527922] unique_name_in_owner = true layout_mode = 2 text = "ATK: 0" -[node name="DefenderDEFLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats"] +[node name="DefenderDEFLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats" unique_id=1755454849] unique_name_in_owner = true layout_mode = 2 text = "DEF: 0" -[node name="DefenderHITLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats"] +[node name="DefenderHITLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats" unique_id=717216786] unique_name_in_owner = true layout_mode = 2 text = "HIT: 0%" -[node name="DefenderSPDLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats"] +[node name="DefenderSPDLabel" type="Label" parent="CombatProposalPanel/MarginContainer/VBoxContainer/StatsContainer/DefenderStats" unique_id=132072292] unique_name_in_owner = true layout_mode = 2 text = "SPD: 0" -[node name="ButtonContainer" type="HBoxContainer" parent="CombatProposalPanel/MarginContainer/VBoxContainer"] +[node name="ButtonContainer" type="HBoxContainer" parent="CombatProposalPanel/MarginContainer/VBoxContainer" unique_id=2145647565] layout_mode = 2 alignment = 1 -[node name="FightButton" type="Button" parent="CombatProposalPanel/MarginContainer/VBoxContainer/ButtonContainer"] +[node name="FightButton" type="Button" parent="CombatProposalPanel/MarginContainer/VBoxContainer/ButtonContainer" unique_id=2109262268] unique_name_in_owner = true layout_mode = 2 text = "Fight" -[node name="CancelButton" type="Button" parent="CombatProposalPanel/MarginContainer/VBoxContainer/ButtonContainer"] +[node name="CancelButton" type="Button" parent="CombatProposalPanel/MarginContainer/VBoxContainer/ButtonContainer" unique_id=238295206] unique_name_in_owner = true layout_mode = 2 text = "Cancel" diff --git a/project.godot b/project.godot index 263764b..e92048c 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="Dungeon Lords" -run/main_scene="uid://dlbuo46n6q238" +run/main_scene="uid://c35md0oc82je2" config/features=PackedStringArray("4.6", "Mobile") config/icon="res://icon.svg" diff --git a/resources/main_ui_theme.tres b/resources/main_ui_theme.tres index f266a5b..aec1dac 100644 --- a/resources/main_ui_theme.tres +++ b/resources/main_ui_theme.tres @@ -1,6 +1,6 @@ [gd_resource type="Theme" format=3 uid="uid://dx26d6py3n8xi"] -[ext_resource type="FontFile" uid="uid://eqhm6gv5p05t" path="res://assets/fonts/Minecraft.ttf" id="1_nmd6r"] +[ext_resource type="FontFile" uid="uid://1a55lafcbss" path="res://assets/fonts/MS Gothic.ttf" id="1_nmd6r"] [resource] default_font = ExtResource("1_nmd6r") diff --git a/scenes/dialogue_scene.tscn b/scenes/dialogue_scene.tscn new file mode 100644 index 0000000..e660f51 --- /dev/null +++ b/scenes/dialogue_scene.tscn @@ -0,0 +1,235 @@ +[gd_scene format=3 uid="uid://c35md0oc82je2"] + +[ext_resource type="Texture2D" uid="uid://cyl18yt5hxyb5" path="res://assets/sprites/dialogue_ui.BMP" id="1_cno1m"] +[ext_resource type="Theme" uid="uid://dx26d6py3n8xi" path="res://resources/main_ui_theme.tres" id="1_qpcyj"] +[ext_resource type="Texture2D" uid="uid://dj621xih5cam7" path="res://assets/sprites/dialogue_continue.BMP" id="2_qpcyj"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cno1m"] +bg_color = Color(0, 0, 0, 1) + +[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_bhyd5"] +blend_mode = 1 + +[sub_resource type="AtlasTexture" id="AtlasTexture_2e7es"] +atlas = ExtResource("1_cno1m") +region = Rect2(0, 0, 800, 228) + +[sub_resource type="LabelSettings" id="LabelSettings_bhyd5"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_xcky8"] +atlas = ExtResource("2_qpcyj") +region = Rect2(0, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_q4mab"] +atlas = ExtResource("2_qpcyj") +region = Rect2(30, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_o6y45"] +atlas = ExtResource("2_qpcyj") +region = Rect2(60, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_18hkw"] +atlas = ExtResource("2_qpcyj") +region = Rect2(90, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_w4lkc"] +atlas = ExtResource("2_qpcyj") +region = Rect2(120, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_kolsc"] +atlas = ExtResource("2_qpcyj") +region = Rect2(150, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_6myds"] +atlas = ExtResource("2_qpcyj") +region = Rect2(180, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_6ge27"] +atlas = ExtResource("2_qpcyj") +region = Rect2(210, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_i6h2p"] +atlas = ExtResource("2_qpcyj") +region = Rect2(240, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_6kf4t"] +atlas = ExtResource("2_qpcyj") +region = Rect2(270, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_dox35"] +atlas = ExtResource("2_qpcyj") +region = Rect2(300, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_lapyf"] +atlas = ExtResource("2_qpcyj") +region = Rect2(330, 0, 30, 27) + +[sub_resource type="SpriteFrames" id="SpriteFrames_61f6o"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_xcky8") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_q4mab") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_o6y45") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_18hkw") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_w4lkc") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_kolsc") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_6myds") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_6ge27") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_i6h2p") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_6kf4t") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_dox35") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_lapyf") +}], +"loop": true, +"name": &"default", +"speed": 10.0 +}] + +[sub_resource type="AtlasTexture" id="AtlasTexture_cno1m"] +atlas = ExtResource("1_cno1m") +region = Rect2(1, 257, 22, 25) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qpcyj"] +atlas = ExtResource("1_cno1m") +region = Rect2(23, 257, 22, 25) + +[sub_resource type="AtlasTexture" id="AtlasTexture_bhyd5"] +atlas = ExtResource("1_cno1m") +region = Rect2(45, 257, 22, 25) + +[sub_resource type="AtlasTexture" id="AtlasTexture_61f6o"] +atlas = ExtResource("1_cno1m") +region = Rect2(67, 257, 22, 25) + +[sub_resource type="AtlasTexture" id="AtlasTexture_6ui40"] +atlas = ExtResource("1_cno1m") +region = Rect2(89, 257, 22, 25) + +[node name="DialogueScene" type="Control" unique_id=1681812093] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme = ExtResource("1_qpcyj") + +[node name="BackgroundColor" type="Panel" parent="." unique_id=452136654] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_cno1m") + +[node name="VerticalScreen" type="VBoxContainer" parent="." unique_id=529668640] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +alignment = 2 + +[node name="DialogueBox" type="TextureRect" parent="VerticalScreen" unique_id=1915405731] +self_modulate = Color(1, 1, 1, 0.078431375) +material = SubResource("CanvasItemMaterial_bhyd5") +layout_mode = 2 +size_flags_vertical = 8 +texture = SubResource("AtlasTexture_2e7es") + +[node name="Text" type="VBoxContainer" parent="VerticalScreen/DialogueBox" unique_id=939057416] +layout_mode = 0 +offset_left = 50.0 +offset_top = 100.0 +offset_right = 750.0 +offset_bottom = 175.0 + +[node name="Speaker" type="RichTextLabel" parent="VerticalScreen/DialogueBox/Text" unique_id=956457649] +custom_minimum_size = Vector2(0, 25) +layout_mode = 2 +bbcode_enabled = true +text = "Test Speaker" +scroll_active = false + +[node name="Body" type="Label" parent="VerticalScreen/DialogueBox/Text" unique_id=364265039] +layout_mode = 2 +size_flags_vertical = 3 +text = "Lorem ipsum dolor" +label_settings = SubResource("LabelSettings_bhyd5") + +[node name="VerticalDBox" type="VBoxContainer" parent="VerticalScreen/DialogueBox" unique_id=1761650639] +layout_mode = 1 +anchors_preset = 12 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 0 + +[node name="BottomRow" type="HBoxContainer" parent="VerticalScreen/DialogueBox/VerticalDBox" unique_id=1729668164] +layout_mode = 2 +alignment = 2 + +[node name="Control" type="Control" parent="VerticalScreen/DialogueBox/VerticalDBox/BottomRow" unique_id=924058102] +custom_minimum_size = Vector2(400, 0) +layout_mode = 2 + +[node name="ContinuePlacer" type="Control" parent="VerticalScreen/DialogueBox/VerticalDBox/BottomRow" unique_id=1584205137] +layout_mode = 2 + +[node name="ContinueSprite" type="AnimatedSprite2D" parent="VerticalScreen/DialogueBox/VerticalDBox/BottomRow/ContinuePlacer" unique_id=1540136989] +position = Vector2(0, 5) +sprite_frames = SubResource("SpriteFrames_61f6o") +autoplay = "default" + +[node name="Spacer2" type="Control" parent="VerticalScreen/DialogueBox/VerticalDBox/BottomRow" unique_id=1533161680] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="DialogueButtons" type="HBoxContainer" parent="VerticalScreen/DialogueBox/VerticalDBox/BottomRow" unique_id=1572455129] +layout_mode = 2 + +[node name="History" type="TextureButton" parent="VerticalScreen/DialogueBox/VerticalDBox/BottomRow/DialogueButtons" unique_id=535301616] +layout_mode = 2 +texture_normal = SubResource("AtlasTexture_cno1m") + +[node name="Auto" type="TextureButton" parent="VerticalScreen/DialogueBox/VerticalDBox/BottomRow/DialogueButtons" unique_id=1254069471] +layout_mode = 2 +texture_normal = SubResource("AtlasTexture_qpcyj") + +[node name="FastForward" type="TextureButton" parent="VerticalScreen/DialogueBox/VerticalDBox/BottomRow/DialogueButtons" unique_id=1088780299] +layout_mode = 2 +texture_normal = SubResource("AtlasTexture_bhyd5") + +[node name="Skip" type="TextureButton" parent="VerticalScreen/DialogueBox/VerticalDBox/BottomRow/DialogueButtons" unique_id=1854859021] +layout_mode = 2 +texture_normal = SubResource("AtlasTexture_61f6o") + +[node name="Hide" type="TextureButton" parent="VerticalScreen/DialogueBox/VerticalDBox/BottomRow/DialogueButtons" unique_id=1549897664] +layout_mode = 2 +texture_normal = SubResource("AtlasTexture_6ui40") diff --git a/scenes/strategy_phase.tscn b/scenes/strategy_phase.tscn index 0bfbfff..c62fe6d 100644 --- a/scenes/strategy_phase.tscn +++ b/scenes/strategy_phase.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://cy7r0udfcsqbn" path="res://prefabs/combat_ui.tscn" id="1_6gip4"] [ext_resource type="PackedScene" uid="uid://dkhyh5ce4iuk3" path="res://prefabs/combat_map.tscn" id="2_iuoca"] [ext_resource type="Script" uid="uid://dfojm3n0em4ef" path="res://nodes/player_controller.gd" id="3_esrqm"] -[ext_resource type="Script" uid="uid://csdcbi2gtwrly" path="res://scripts/camera_controller.gd" id="4_ww3c6"] +[ext_resource type="Script" uid="uid://csdcbi2gtwrly" path="res://scripts/battle/camera_controller.gd" id="4_ww3c6"] [ext_resource type="AudioStream" uid="uid://dsikulned64qt" path="res://assets/music/combat_bgm_01.OGG" id="5_ficdm"] [ext_resource type="Script" uid="uid://cf4ivrcbky0s3" path="res://nodes/combat_system.gd" id="6_combat"] [ext_resource type="Script" uid="uid://dnsqtsx4u2hx4" path="res://nodes/strategy_phase.gd" id="7_strat"] @@ -23,7 +23,6 @@ dl_map = NodePath("../CombatMap") script = ExtResource("6_combat") [node name="Camera2D" type="Camera2D" parent="." unique_id=1739569732] -position = Vector2(384, 216) script = ExtResource("4_ww3c6") [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." unique_id=1057500234] diff --git a/scenes/vn_scene.tscn b/scenes/vn_scene.tscn index aff97b3..fe7753d 100644 --- a/scenes/vn_scene.tscn +++ b/scenes/vn_scene.tscn @@ -1,5 +1,110 @@ [gd_scene format=3 uid="uid://dsg3pxopc0fab"] +[ext_resource type="Texture2D" uid="uid://cyl18yt5hxyb5" path="res://assets/sprites/dialogue_ui.BMP" id="1_xtnmq"] +[ext_resource type="Texture2D" uid="uid://dj621xih5cam7" path="res://assets/sprites/dialogue_continue.BMP" id="2_4b6ix"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_xtnmq"] +bg_color = Color(0, 0, 0, 1) + +[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_xyfjv"] +blend_mode = 1 + +[sub_resource type="AtlasTexture" id="AtlasTexture_qmngx"] +atlas = ExtResource("1_xtnmq") +region = Rect2(0, 0, 800, 227) + +[sub_resource type="AtlasTexture" id="AtlasTexture_3sx2y"] +atlas = ExtResource("2_4b6ix") +region = Rect2(0, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_6inra"] +atlas = ExtResource("2_4b6ix") +region = Rect2(30, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ptlyn"] +atlas = ExtResource("2_4b6ix") +region = Rect2(60, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jvfhn"] +atlas = ExtResource("2_4b6ix") +region = Rect2(90, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_fvlad"] +atlas = ExtResource("2_4b6ix") +region = Rect2(120, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_kklm6"] +atlas = ExtResource("2_4b6ix") +region = Rect2(150, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1rigp"] +atlas = ExtResource("2_4b6ix") +region = Rect2(180, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qw2nj"] +atlas = ExtResource("2_4b6ix") +region = Rect2(210, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_bubp4"] +atlas = ExtResource("2_4b6ix") +region = Rect2(240, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_iivyk"] +atlas = ExtResource("2_4b6ix") +region = Rect2(270, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_5hpqg"] +atlas = ExtResource("2_4b6ix") +region = Rect2(300, 0, 30, 27) + +[sub_resource type="AtlasTexture" id="AtlasTexture_256wb"] +atlas = ExtResource("2_4b6ix") +region = Rect2(330, 0, 30, 27) + +[sub_resource type="SpriteFrames" id="SpriteFrames_r6vt6"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_3sx2y") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_6inra") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ptlyn") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_jvfhn") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_fvlad") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_kklm6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_1rigp") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qw2nj") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_bubp4") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_iivyk") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_5hpqg") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_256wb") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + [node name="VnScene" type="Control" unique_id=74039790] layout_mode = 3 anchors_preset = 15 @@ -7,3 +112,47 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 + +[node name="Panel" type="Panel" parent="." unique_id=108231475] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_xtnmq") + +[node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=546478917] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +alignment = 2 + +[node name="TextureRect" type="TextureRect" parent="VBoxContainer" unique_id=653606980] +material = SubResource("CanvasItemMaterial_xyfjv") +layout_mode = 2 +texture = SubResource("AtlasTexture_qmngx") + +[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/TextureRect" unique_id=1212665758] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +alignment = 2 + +[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TextureRect/VBoxContainer" unique_id=238151332] +layout_mode = 2 +alignment = 1 + +[node name="Control" type="Control" parent="VBoxContainer/TextureRect/VBoxContainer/HBoxContainer" unique_id=1997339270] +layout_mode = 2 + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="VBoxContainer/TextureRect/VBoxContainer/HBoxContainer/Control" unique_id=419477945] +position = Vector2(0, -27) +sprite_frames = SubResource("SpriteFrames_r6vt6") +autoplay = "default" diff --git a/scripts/camera_controller.gd b/scripts/battle/camera_controller.gd similarity index 100% rename from scripts/camera_controller.gd rename to scripts/battle/camera_controller.gd diff --git a/scripts/camera_controller.gd.uid b/scripts/battle/camera_controller.gd.uid similarity index 100% rename from scripts/camera_controller.gd.uid rename to scripts/battle/camera_controller.gd.uid diff --git a/scripts/combat_ui.gd b/scripts/battle/combat_ui.gd similarity index 100% rename from scripts/combat_ui.gd rename to scripts/battle/combat_ui.gd diff --git a/scripts/combat_ui.gd.uid b/scripts/battle/combat_ui.gd.uid similarity index 100% rename from scripts/combat_ui.gd.uid rename to scripts/battle/combat_ui.gd.uid diff --git a/scripts/grid_overlay.gd b/scripts/battle/grid_overlay.gd similarity index 100% rename from scripts/grid_overlay.gd rename to scripts/battle/grid_overlay.gd diff --git a/scripts/grid_overlay.gd.uid b/scripts/battle/grid_overlay.gd.uid similarity index 100% rename from scripts/grid_overlay.gd.uid rename to scripts/battle/grid_overlay.gd.uid diff --git a/scripts/tile_highlight.gd b/scripts/tile_highlight.gd deleted file mode 100644 index e43fb7a..0000000 --- a/scripts/tile_highlight.gd +++ /dev/null @@ -1,27 +0,0 @@ -extends ColorRect - -@export var tile_size: float = 48.0 - -var _time: float = 0.0 - - -func _ready() -> void: - size = Vector2(tile_size, tile_size) - color = Color(1.0, 1.0, 1.0, 0.25) - mouse_filter = Control.MOUSE_FILTER_IGNORE - - -func _process(delta: float) -> void: - _time += delta - color.a = 0.25 + 0.1 * sin(_time * 4.0) - - -func set_grid_coords(coords: Vector2i) -> void: - global_position = Vector2(coords) * tile_size - - -func _notification(what: int) -> void: - if what == NOTIFICATION_WM_MOUSE_EXIT: - hide() - elif what == NOTIFICATION_WM_MOUSE_ENTER: - show() diff --git a/scripts/tile_highlight.gd.uid b/scripts/tile_highlight.gd.uid deleted file mode 100644 index df93734..0000000 --- a/scripts/tile_highlight.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b31eyqov8w7bm