Added fightworld background and cat dialogue

art/fightworld_background.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ciaabo8kcx2hw"
+path="res://.godot/imported/fightworld_background.png-be6589f7fa4be8e56ee338eabec1ff36.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/fightworld_background.png"
+dest_files=["res://.godot/imported/fightworld_background.png-be6589f7fa4be8e56ee338eabec1ff36.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+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/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+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

art/indoor/indoor outdoor/domovoi_single.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dfp3tpx3fjges"
+path="res://.godot/imported/domovoi_single.png-54325e2fb332bab49d527581994f50c7.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/indoor/indoor outdoor/domovoi_single.png"
+dest_files=["res://.godot/imported/domovoi_single.png-54325e2fb332bab49d527581994f50c7.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+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/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+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

dialog/Characters/Domovoi.dch

@@ -19,12 +19,22 @@
 },
 "style": "NPC_narrative"
 },
-&"default_portrait": "",
+&"default_portrait": "default",
 &"description": "Yeli's Domovoi",
 &"display_name": "Domovoi",
 &"mirror": false,
 &"nicknames": [""],
 &"offset": Vector2(0, 0),
-&"portraits": {},
+&"portraits": {
+"default": {
+"export_overrides": {
+"image": "\"res://art/indoor/indoor outdoor/domovoi_single.png\""
+},
+"mirror": false,
+"offset": Vector2(0, 0),
+"scale": 1,
+"scene": ""
+}
+},
 &"scale": 1.0
 }

dialog/Characters/semi_cat.dch

@@ -1,19 +1,29 @@
 {
 "@path": "res://addons/dialogic/Resources/character.gd",
 "@subpath": NodePath(""),
-"_translation_id": "16",
+&"_translation_id": "16",
-"color": Color(1, 1, 1, 1),
+&"color": Color(1, 1, 1, 1),
-"custom_info": {
+&"custom_info": {
 "sound_mood_default": "",
 "sound_moods": {},
 "style": ""
 },
-"default_portrait": "",
+&"default_portrait": "side",
-"description": "",
+&"description": "",
-"display_name": "Semi Cat",
+&"display_name": "Black Cat",
+&"mirror": false,
+&"nicknames": [""],
+&"offset": Vector2(0, 0),
+&"portraits": {
+"side": {
+"export_overrides": {
+"image": "\"res://art/animals/katze.png\""
+},
 "mirror": false,
-"nicknames": [""],
+"offset": Vector2(0, -300),
-"offset": Vector2(0, 0),
+"scale": 1.5,
-"portraits": {},
+"scene": ""
-"scale": 1.0
+}
+},
+&"scale": 1.0
 }

dialog/cat.dtl

@@ -0,0 +1,5 @@
+join vesna (half side) left
+join semi_cat right
+vesna: (pets)
+semi_cat: mrau!
+[end_timeline]

dialog/cat.dtl.uid

@@ -0,0 +1 @@
+uid://clwlhu4lpmyqm

prefabs/fight/fight_scene_switcher.tscn

@@ -4,6 +4,6 @@
 
 [node name="FightSceneSwitcher" type="Node"]
 script = ExtResource("1_5dt1r")
-_fightRoomScenePath = "res://scenes/Babushka_scene_fight_world_room.tscn"
+_fightRoomScenePath = "res://scenes/scene_fight_world_room.tscn"
-_fightHappeningScene = "res://scenes/Babushka_scene_fight_happening.tscn"
+_fightHappeningScene = "res://scenes/scene_fight_happening.tscn"
-_nightEndScene = "res://scenes/Babushka_scene_indoor_vesnas_room.tscn"
+_nightEndScene = "res://scenes/scene_indoor_vesnas_room.tscn"

project.godot

@@ -48,6 +48,7 @@ directories/dch_directory={
 "vesna": "res://dialog/Characters/vesna.dch"
 }
 directories/dtl_directory={
+"cat": "res://dialog/cat.dtl",
 "disclaimer": "res://dialog/disclaimer.dtl",
 "domovoi_tut": "res://dialog/testing/domovoi_tut.dtl",
 "quest1_ducks_end": "res://dialog/quests/ducks/quest1_ducks_end.dtl",

scenes/scene_fight_happening.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=20 format=3 uid="uid://cjshlwk8ajpnp"]
+[gd_scene load_steps=21 format=3 uid="uid://cjshlwk8ajpnp"]
 
 [ext_resource type="Script" uid="uid://cnhpnn8o0gybd" path="res://scripts/CSharp/Common/Fight/FightHappeningSceneSetup.cs" id="1_fiutj"]
 [ext_resource type="Script" uid="uid://c76mhhqyk4lgh" path="res://scripts/CSharp/Common/Fight/FightHappening.cs" id="1_gsk03"]
@@ -13,6 +13,7 @@
 [ext_resource type="Script" uid="uid://byf2ywov34g0x" path="res://scripts/CSharp/Common/Fight/UI/ActionSelectUiSetup.cs" id="8_bkwsr"]
 [ext_resource type="Script" uid="uid://bwm0nhvt1083k" path="res://scripts/CSharp/Common/Fight/FightMinigameHandler.cs" id="8_falfe"]
 [ext_resource type="Script" uid="uid://d2ugtb3dalrg3" path="res://scripts/CSharp/Common/Fight/FightHappeningStateDebugger.cs" id="8_tv7cl"]
+[ext_resource type="Texture2D" uid="uid://ciaabo8kcx2hw" path="res://art/fightworld_background.png" id="9_f4y3h"]
 [ext_resource type="Script" uid="uid://2f7rqk50gtdg" path="res://scripts/CSharp/Common/Fight/SwitchSceneOnFightEnd.cs" id="10_qqd8u"]
 [ext_resource type="Script" uid="uid://6nniwfxye8ss" path="res://scripts/CSharp/Common/Fight/UsedItemIndicatorVisual.cs" id="14_b4ll5"]
 [ext_resource type="Script" uid="uid://71mdwp2m4rta" path="res://scripts/CSharp/Common/Fight/UI/HealButtonVisual.cs" id="14_oy2wu"]
@@ -39,6 +40,7 @@ script = ExtResource("4_v5rv6")
 useHealItemIndicator = NodePath("../../UseItemIndicator")
 
 [node name="Camera2D" type="Camera2D" parent="."]
+scale = Vector2(0.71911293, 0.6664279)
 
 [node name="FightSetup" type="Node2D" parent="."]
 script = ExtResource("1_fiutj")
@@ -58,6 +60,11 @@ _positionDistanceFromCenter = PackedFloat32Array(300, 550, 800)
 
 [node name="EnvironmentVisuals" type="Node2D" parent="."]
 
+[node name="background" type="Sprite2D" parent="EnvironmentVisuals"]
+z_index = -100
+scale = Vector2(3, 3)
+texture = ExtResource("9_f4y3h")
+
 [node name="MinigameHandler" type="Node2D" parent="." node_paths=PackedStringArray("_minigameController")]
 script = ExtResource("8_falfe")
 _minigameController = NodePath("Minigame")

scenes/scene_fight_world_room.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=52 format=3 uid="uid://cacnapfv7w567"]
+[gd_scene load_steps=53 format=3 uid="uid://cacnapfv7w567"]
 
 [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="1_pi6ua"]
 [ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_hqa4k"]

scenes/scene_indoor_common_room.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=41 format=3 uid="uid://bm21nqepnwaik"]
+[gd_scene load_steps=43 format=3 uid="uid://bm21nqepnwaik"]
 
 [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_3al6t"]
 [ext_resource type="Texture2D" uid="uid://cnhsxxps2cw5" path="res://art/indoor/room export/Room_01_table.png" id="2_ufnxe"]
@@ -20,7 +20,9 @@
 [ext_resource type="AudioStream" uid="uid://r2f6xmjvyyjv" path="res://audio/sfx/Animals/SFX_Cat_Purr_01.wav" id="18_3oexm"]
 [ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="19_a2xrf"]
 [ext_resource type="Script" uid="uid://31p67cdowuw4" path="res://scripts/CSharp/Common/Animation/AnimationStarter.cs" id="20_lkkn4"]
+[ext_resource type="Script" uid="uid://dnipeibppjirs" path="res://scripts/CSharp/Common/NPC/DialogicOverlayStarter.cs" id="20_pejp6"]
 [ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://art/eyes_atlas.png" id="21_m0gmu"]
+[ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="21_nc3ef"]
 [ext_resource type="Texture2D" uid="uid://bqwhptcgg5ons" path="res://art/indoor/room export/Room_01_dorr_R.png" id="22_ahl31"]
 [ext_resource type="Texture2D" uid="uid://da67c7avarwq2" path="res://art/indoor/kitchen_bgAssets.png" id="23_hgs5o"]
 [ext_resource type="Texture2D" uid="uid://vyk63d0pgqm5" path="res://art/indoor/room export/Room_01_dioor L.png" id="24_t86aa"]
@@ -357,7 +359,7 @@ region_enabled = true
 region_rect = Rect2(1156, 1185, 940, 189)
 
 [node name="Katze" type="Sprite2D" parent="BackWall/Bench"]
-z_index = 10
+z_index = 15
 position = Vector2(61, -87)
 scale = Vector2(2, 2)
 texture = ExtResource("12_dckqa")
@@ -373,6 +375,14 @@ position = Vector2(-6.5, -44)
 scale = Vector2(0.5, 0.5)
 _spritesToOutline = [NodePath("..")]
 
+[node name="dialogic overlay starter" type="Node2D" parent="BackWall/Bench/Katze"]
+script = ExtResource("20_pejp6")
+_timelinesToPlay = PackedStringArray("cat")
+_startOnReady = false
+
+[node name="dialogic starter" type="Node" parent="BackWall/Bench/Katze/dialogic overlay starter"]
+script = ExtResource("21_nc3ef")
+
 [node name="Bench2" type="Sprite2D" parent="BackWall"]
 z_index = -10
 position = Vector2(-2906, 243)
@@ -600,6 +610,10 @@ _followNode = NodePath("../Vesna/CharacterBody2D")
 [connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room01PechkaDoor/InteractionArea" method="ToggleActive"]
 [connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room assets/hand" method="PlayAnimation"]
 [connection signal="Interacted" from="BackWall/Bench/Katze/InteractionArea" to="BackWall/Bench/Katze/AudioStreamPlayer2D" method="PlayOneShot"]
+[connection signal="Interacted" from="BackWall/Bench/Katze/InteractionArea" to="BackWall/Bench/Katze/dialogic overlay starter" method="ToggleDialogue"]
+[connection signal="Dialogue" from="BackWall/Bench/Katze/dialogic overlay starter" to="BackWall/Bench/Katze/dialogic overlay starter/dialogic starter" method="open"]
+[connection signal="timelineEnded" from="BackWall/Bench/Katze/dialogic overlay starter/dialogic starter" to="BackWall/Bench/Katze/InteractionArea" method="SetActiveTrue"]
+[connection signal="timelineStarted" from="BackWall/Bench/Katze/dialogic overlay starter/dialogic starter" to="BackWall/Bench/Katze/InteractionArea" method="SetActiveFalse"]
 [connection signal="InteractedTool" from="BackWall/Doors/Door_Kitchen/KitchendoorInteraction" to="." method="LoadSceneAtIndex"]
 [connection signal="InteractedTool" from="BackWall/Doors/Door_Outside/OutsideDoor" to="." method="LoadSceneAtIndex"]
 [connection signal="InteractedTool" from="BackWall/Doors/Door_Bedroom/VesnasRoomDoor" to="." method="LoadSceneAtIndex"]