diff --git a/Babushka.csproj b/Babushka.csproj index 76acd77..796f4da 100644 --- a/Babushka.csproj +++ b/Babushka.csproj @@ -1,4 +1,4 @@ - + net8.0 true diff --git a/Babushka.csproj.old.2 b/Babushka.csproj.old.2 new file mode 100644 index 0000000..76acd77 --- /dev/null +++ b/Babushka.csproj.old.2 @@ -0,0 +1,10 @@ + + + net8.0 + true + enable + + + + + \ No newline at end of file diff --git a/addons/babushkahelpers/babushka_dialogue_style.tres b/addons/babushkahelpers/babushka_dialogue_style.tres index ec319c2..647f7c8 100644 --- a/addons/babushkahelpers/babushka_dialogue_style.tres +++ b/addons/babushkahelpers/babushka_dialogue_style.tres @@ -12,42 +12,34 @@ [sub_resource type="Resource" id="Resource_w535h"] script = ExtResource("1_hr3vo") -overrides = {} [sub_resource type="Resource" id="Resource_j3dy5"] script = ExtResource("1_hr3vo") scene = ExtResource("2_cpmol") -overrides = {} [sub_resource type="Resource" id="Resource_d5o1r"] script = ExtResource("1_hr3vo") scene = ExtResource("3_12uyf") -overrides = {} [sub_resource type="Resource" id="Resource_g7mor"] script = ExtResource("1_hr3vo") scene = ExtResource("4_ncyk4") -overrides = {} [sub_resource type="Resource" id="Resource_wgjgg"] script = ExtResource("1_hr3vo") scene = ExtResource("5_qg2g4") -overrides = {} [sub_resource type="Resource" id="Resource_45hxc"] script = ExtResource("1_hr3vo") scene = ExtResource("6_c5ex4") -overrides = {} [sub_resource type="Resource" id="Resource_c53vn"] script = ExtResource("1_hr3vo") scene = ExtResource("7_bopa1") -overrides = {} [sub_resource type="Resource" id="Resource_n6k7j"] script = ExtResource("1_hr3vo") scene = ExtResource("8_oycnw") -overrides = {} [resource] script = ExtResource("9_i6i1n") @@ -63,6 +55,4 @@ layer_info = { "15": SubResource("Resource_c53vn"), "16": SubResource("Resource_n6k7j") } -base_overrides = {} -layers = Array[ExtResource("1_hr3vo")]([]) metadata/_latest_layer = "" diff --git a/addons/dialogic/vesna_style.tres b/addons/dialogic/vesna_style.tres index 89a40f3..1bfe954 100644 --- a/addons/dialogic/vesna_style.tres +++ b/addons/dialogic/vesna_style.tres @@ -22,17 +22,14 @@ overrides = { [sub_resource type="Resource" id="Resource_awdqn"] script = ExtResource("1_kc0s3") scene = ExtResource("2_wjopr") -overrides = {} [sub_resource type="Resource" id="Resource_5pou4"] script = ExtResource("1_kc0s3") scene = ExtResource("3_depsi") -overrides = {} [sub_resource type="Resource" id="Resource_6xrvb"] script = ExtResource("1_kc0s3") scene = ExtResource("4_wy5ku") -overrides = {} [sub_resource type="Resource" id="Resource_k1327"] script = ExtResource("1_kc0s3") @@ -55,7 +52,6 @@ overrides = { [sub_resource type="Resource" id="Resource_qtijl"] script = ExtResource("1_kc0s3") scene = ExtResource("6_iipq0") -overrides = {} [sub_resource type="Resource" id="Resource_nalij"] script = ExtResource("1_kc0s3") @@ -72,17 +68,14 @@ overrides = { [sub_resource type="Resource" id="Resource_ymn1b"] script = ExtResource("1_kc0s3") scene = ExtResource("8_4ig6v") -overrides = {} [sub_resource type="Resource" id="Resource_8j3qh"] script = ExtResource("1_kc0s3") scene = ExtResource("9_gni8k") -overrides = {} [sub_resource type="Resource" id="Resource_uu1x2"] script = ExtResource("1_kc0s3") scene = ExtResource("6_iipq0") -overrides = {} [resource] script = ExtResource("10_l174f") @@ -100,6 +93,4 @@ layer_info = { "17": SubResource("Resource_8j3qh"), "18": SubResource("Resource_uu1x2") } -base_overrides = {} -layers = Array[ExtResource("1_kc0s3")]([]) metadata/_latest_layer = "13" diff --git a/art/animation/Loading Screen Frames/Loading_Screen-1.png b/art/animation/Loading Screen Frames/Loading_Screen-1.png new file mode 100644 index 0000000..3faaa98 Binary files /dev/null and b/art/animation/Loading Screen Frames/Loading_Screen-1.png differ diff --git a/art/animation/Loading Screen Frames/Loading_Screen-1.png.import b/art/animation/Loading Screen Frames/Loading_Screen-1.png.import new file mode 100644 index 0000000..7bb80ee --- /dev/null +++ b/art/animation/Loading Screen Frames/Loading_Screen-1.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dhe7lqffdcrmd" +path="res://.godot/imported/Loading_Screen-1.png-b2ebfc7b93c4532c533cdf4a25bb63ab.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/animation/Loading Screen Frames/Loading_Screen-1.png" +dest_files=["res://.godot/imported/Loading_Screen-1.png-b2ebfc7b93c4532c533cdf4a25bb63ab.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 diff --git a/art/animation/Loading Screen Frames/Loading_Screen-2.png b/art/animation/Loading Screen Frames/Loading_Screen-2.png new file mode 100644 index 0000000..7055ac9 Binary files /dev/null and b/art/animation/Loading Screen Frames/Loading_Screen-2.png differ diff --git a/art/animation/Loading Screen Frames/Loading_Screen-2.png.import b/art/animation/Loading Screen Frames/Loading_Screen-2.png.import new file mode 100644 index 0000000..65cdd72 --- /dev/null +++ b/art/animation/Loading Screen Frames/Loading_Screen-2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cdx58mdv0x66c" +path="res://.godot/imported/Loading_Screen-2.png-c4835c5f27e815c2210474bbac2a4cdf.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/animation/Loading Screen Frames/Loading_Screen-2.png" +dest_files=["res://.godot/imported/Loading_Screen-2.png-c4835c5f27e815c2210474bbac2a4cdf.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 diff --git a/art/animation/Loading Screen Frames/Loading_Screen-3.png b/art/animation/Loading Screen Frames/Loading_Screen-3.png new file mode 100644 index 0000000..47cd90f Binary files /dev/null and b/art/animation/Loading Screen Frames/Loading_Screen-3.png differ diff --git a/art/animation/Loading Screen Frames/Loading_Screen-3.png.import b/art/animation/Loading Screen Frames/Loading_Screen-3.png.import new file mode 100644 index 0000000..6c30dc4 --- /dev/null +++ b/art/animation/Loading Screen Frames/Loading_Screen-3.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://iakxy3c2wit6" +path="res://.godot/imported/Loading_Screen-3.png-9b47950df96fa5e9cac0837732430722.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/animation/Loading Screen Frames/Loading_Screen-3.png" +dest_files=["res://.godot/imported/Loading_Screen-3.png-9b47950df96fa5e9cac0837732430722.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 diff --git a/art/animation/Loading Screen Frames/Loading_Screen-4.png b/art/animation/Loading Screen Frames/Loading_Screen-4.png new file mode 100644 index 0000000..0bf4724 Binary files /dev/null and b/art/animation/Loading Screen Frames/Loading_Screen-4.png differ diff --git a/art/animation/Loading Screen Frames/Loading_Screen-4.png.import b/art/animation/Loading Screen Frames/Loading_Screen-4.png.import new file mode 100644 index 0000000..e6c8f53 --- /dev/null +++ b/art/animation/Loading Screen Frames/Loading_Screen-4.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bdcgyhrmxr2u7" +path="res://.godot/imported/Loading_Screen-4.png-1a54331ef571bbacc866f4862895f21b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/animation/Loading Screen Frames/Loading_Screen-4.png" +dest_files=["res://.godot/imported/Loading_Screen-4.png-1a54331ef571bbacc866f4862895f21b.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 diff --git a/art/animation/Loading Screen Frames/Loading_Screen-5.png b/art/animation/Loading Screen Frames/Loading_Screen-5.png new file mode 100644 index 0000000..8bdd2b0 Binary files /dev/null and b/art/animation/Loading Screen Frames/Loading_Screen-5.png differ diff --git a/art/animation/Loading Screen Frames/Loading_Screen-5.png.import b/art/animation/Loading Screen Frames/Loading_Screen-5.png.import new file mode 100644 index 0000000..efbbfbb --- /dev/null +++ b/art/animation/Loading Screen Frames/Loading_Screen-5.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://pmit8lgrw74k" +path="res://.godot/imported/Loading_Screen-5.png-b1832d3a1c7cdcdb07a9ac87c4531ab1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/animation/Loading Screen Frames/Loading_Screen-5.png" +dest_files=["res://.godot/imported/Loading_Screen-5.png-b1832d3a1c7cdcdb07a9ac87c4531ab1.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 diff --git a/art/animation/Vesna3D/loading_screen.mp4 b/art/animation/Vesna3D/loading_screen.mp4 new file mode 100644 index 0000000..2236645 Binary files /dev/null and b/art/animation/Vesna3D/loading_screen.mp4 differ diff --git a/dialog/NPC_narrative.tres b/dialog/NPC_narrative.tres index 8d2e8b1..8acc773 100644 --- a/dialog/NPC_narrative.tres +++ b/dialog/NPC_narrative.tres @@ -24,17 +24,14 @@ overrides = { [sub_resource type="Resource" id="Resource_uxnk3"] script = ExtResource("1_0jwhi") scene = ExtResource("2_8wrfq") -overrides = {} [sub_resource type="Resource" id="Resource_ihoat"] script = ExtResource("1_0jwhi") scene = ExtResource("3_t7aeg") -overrides = {} [sub_resource type="Resource" id="Resource_pw0bl"] script = ExtResource("1_0jwhi") scene = ExtResource("4_85y6g") -overrides = {} [sub_resource type="Resource" id="Resource_lfav5"] script = ExtResource("1_0jwhi") @@ -58,7 +55,6 @@ overrides = { [sub_resource type="Resource" id="Resource_clhbu"] script = ExtResource("1_0jwhi") scene = ExtResource("6_i6h15") -overrides = {} [sub_resource type="Resource" id="Resource_umvdi"] script = ExtResource("1_0jwhi") @@ -75,17 +71,14 @@ overrides = { [sub_resource type="Resource" id="Resource_ci2ul"] script = ExtResource("1_0jwhi") scene = ExtResource("8_h83v4") -overrides = {} [sub_resource type="Resource" id="Resource_sadu5"] script = ExtResource("1_0jwhi") scene = ExtResource("9_4c2uo") -overrides = {} [sub_resource type="Resource" id="Resource_0jwhi"] script = ExtResource("1_0jwhi") scene = ExtResource("6_i6h15") -overrides = {} [resource] script = ExtResource("10_e3ue2") @@ -103,6 +96,4 @@ layer_info = { "17": SubResource("Resource_sadu5"), "18": SubResource("Resource_0jwhi") } -base_overrides = {} -layers = Array[ExtResource("1_0jwhi")]([]) metadata/_latest_layer = "13" diff --git a/prefabs/overlays/loading_screen.tscn b/prefabs/overlays/loading_screen.tscn new file mode 100644 index 0000000..82509cd --- /dev/null +++ b/prefabs/overlays/loading_screen.tscn @@ -0,0 +1,48 @@ +[gd_scene load_steps=7 format=3 uid="uid://bwjuo78b3oo7n"] + +[ext_resource type="Texture2D" uid="uid://dhe7lqffdcrmd" path="res://art/animation/Loading Screen Frames/Loading_Screen-1.png" id="1_ffxy5"] +[ext_resource type="Texture2D" uid="uid://cdx58mdv0x66c" path="res://art/animation/Loading Screen Frames/Loading_Screen-2.png" id="2_seadj"] +[ext_resource type="Texture2D" uid="uid://iakxy3c2wit6" path="res://art/animation/Loading Screen Frames/Loading_Screen-3.png" id="3_lsm2p"] +[ext_resource type="Texture2D" uid="uid://bdcgyhrmxr2u7" path="res://art/animation/Loading Screen Frames/Loading_Screen-4.png" id="4_s7rxg"] +[ext_resource type="Texture2D" uid="uid://pmit8lgrw74k" path="res://art/animation/Loading Screen Frames/Loading_Screen-5.png" id="5_1nh3o"] + +[sub_resource type="SpriteFrames" id="SpriteFrames_dmyx6"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("1_ffxy5") +}, { +"duration": 1.0, +"texture": ExtResource("2_seadj") +}, { +"duration": 1.0, +"texture": ExtResource("3_lsm2p") +}, { +"duration": 1.0, +"texture": ExtResource("4_s7rxg") +}, { +"duration": 1.0, +"texture": ExtResource("5_1nh3o") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[node name="LoadingScreen" type="Node2D"] + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="ColorRect" type="ColorRect" parent="CanvasLayer"] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="CanvasLayer"] +position = Vector2(966, 293) +sprite_frames = SubResource("SpriteFrames_dmyx6") +frame_progress = 0.8263522 diff --git a/project.godot b/project.godot index baff4e1..23fc261 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Babushka" run/main_scene="uid://bopv10dqm1knc" -config/features=PackedStringArray("4.4", "C#", "Forward Plus") +config/features=PackedStringArray("4.5", "C#", "Forward Plus") run/max_fps=120 boot_splash/fullsize=false boot_splash/image="uid://utam4axkvutc"