diff --git a/Dialogue/Characters/ICE.dch b/Dialogue/Characters/ICE.dch index 5ad035d0..c7f50177 100644 --- a/Dialogue/Characters/ICE.dch +++ b/Dialogue/Characters/ICE.dch @@ -24,6 +24,15 @@ "scale": 1, "scene": "" }, +"Happy": { +"export_overrides": { +"image": "\"res://Sprites/Expression/ICE/ICE02.png\"" +}, +"mirror": false, +"offset": Vector2(0, 0), +"scale": 1, +"scene": "" +}, "Neutral": { "export_overrides": { "image": "\"res://Sprites/Expression/ICE/ICE00.png\"" diff --git a/Dialogue/Characters/Rumia.dch b/Dialogue/Characters/Rumia.dch index 8debd3a7..66722b07 100644 --- a/Dialogue/Characters/Rumia.dch +++ b/Dialogue/Characters/Rumia.dch @@ -33,6 +33,15 @@ "scale": 1, "scene": "" }, +"Defeated": { +"export_overrides": { +"image": "\"res://Sprites/Expression/Rumia/RumiaDefeated.png\"" +}, +"mirror": false, +"offset": Vector2(0, 0), +"scale": 1, +"scene": "" +}, "Neutral": { "export_overrides": { "image": "\"res://Sprites/Expression/Rumia/Rumia00.png\"" diff --git a/Dialogue/Timelines/Rumia_Intro.dtl b/Dialogue/Timelines/Rumia_Intro.dtl index d6aeb57c..7551b0e4 100644 --- a/Dialogue/Timelines/Rumia_Intro.dtl +++ b/Dialogue/Timelines/Rumia_Intro.dtl @@ -1,12 +1,12 @@ [style name="VN"] -join Cirno left -join Rumia right +join Cirno (Embarassed) left +join Rumia (Surprised) right Cirno: Rumia? Why are you here? -Rumia: I have no idea, I was flying through the forest in my darkness bubble and I ended up here after I hit something hard that made me feel all tingly. -Cirno: I think we're in another world, it's full of bad guys and there are good guys who fight them, it's pretty cool. -Rumia: I found some tasty humans but after the first few ones I ate they all ran away and started sending these metal things after me -Rumia: And they don't even care for spell card duels, I tried challenging one of them and it just kept shooting at me! +Rumia (Puzzled): I have no idea, I was flying through the forest in my darkness bubble and I ended up here after I hit something hard that made me feel all tingly. +Cirno (Neutral): I think we're in another world, it's full of bad guys and there are good guys who fight them, it's pretty cool. +Rumia (Neutral): I found some tasty humans but after the first few ones I ate they all ran away and started sending these metal things after me +Rumia (Thinking): And they don't even care for spell card duels, I tried challenging one of them and it just kept shooting at me! Cirno: Yeah it's brutal here, follow me back to the base, I can protect you from the metal guys! -Rumia: I don't want to be protected by you, I'm plenty strong myself -Cirno: No way, I am the strongest -Rumia: Well, let's settle this with a battle +Rumia (Smug): I don't want to be protected by you, I'm plenty strong myself +Cirno (Smug Talk): No way, I am the strongest +Rumia (Cool): Well, let's settle this with a battle diff --git a/Dialogue/Timelines/Tutorial/tutorial_gun.dtl b/Dialogue/Timelines/Tutorial/tutorial_gun.dtl index 2bdc310b..30f76099 100644 --- a/Dialogue/Timelines/Tutorial/tutorial_gun.dtl +++ b/Dialogue/Timelines/Tutorial/tutorial_gun.dtl @@ -1,5 +1,5 @@ ICE: Here's your gun, pick it up by approaching it and pressing F or [something] when you see the marker around it. -Cirno: I don't need a gun, I can use pretty strong magic! +Cirno (Smug Talk): I don't need a gun, I can use pretty strong magic! ICE: Perhaps in your original world, we ran some tests and it seems like using raw magic will tire you out really fast in this world ICE: Probably because this world does not have natural magic, so the magic in your body is all you have. ICE: This gun was specifically made for you, it feeds on your internal magic and emits it in a very efficient way diff --git a/Dialogue/Timelines/Tutorial/tutorial_intro.dtl b/Dialogue/Timelines/Tutorial/tutorial_intro.dtl index d03b7f2b..c15c4449 100644 --- a/Dialogue/Timelines/Tutorial/tutorial_intro.dtl +++ b/Dialogue/Timelines/Tutorial/tutorial_intro.dtl @@ -7,6 +7,7 @@ ICE (Perplexed): Not really...\ Let's put this aside for now and listen closely. ICE (Neutral): This is a virtual training facility, you are actually sleeping in the real world while the computer is feeding you this simulation. ICE: It's a great tool to train quickly, you'll become an amazing fighter in no time! -ICE: For now let's start with the very basics\: use WASD or the left control stick to move and approach the control pad on the northern wall. +ICE: For now let's start with the very basics\: +ICE: Use WASD or the left control stick to move and approach the control pad on the northern wall. Cirno (Puzzled): Which direction is north again? ICE (No Words): UP! It's up. diff --git a/Dialogue/Timelines/Tutorial/tutorial_teleporter_2.dtl b/Dialogue/Timelines/Tutorial/tutorial_teleporter_2.dtl index 40eba4da..60c01e77 100644 --- a/Dialogue/Timelines/Tutorial/tutorial_teleporter_2.dtl +++ b/Dialogue/Timelines/Tutorial/tutorial_teleporter_2.dtl @@ -1,4 +1,4 @@ -Cirno: WHOAAA it was all tingly and swirly and suddenly I was somewhere else! +Cirno (Emabrassed Surprised): WHOAAA it was all tingly and swirly and suddenly I was somewhere else! ICE: Yes, that's a teleporter, if you step on one and it's active it will take you somewhere else. ICE: If the lights on its sides are blinking it means it's active and you can use it. ICE: The destination telepad does not need to be active to teleport to it, sometimes they are one-way trips. diff --git a/Dialogue/Timelines/computer1.dtl b/Dialogue/Timelines/computer1.dtl index 3a493cdf..86d98da9 100644 --- a/Dialogue/Timelines/computer1.dtl +++ b/Dialogue/Timelines/computer1.dtl @@ -1,6 +1,9 @@ -computer: Hi, this is a computer, I display lore and data -Cirno: I don't know how to read... +ICE: This is a computer terminal, they are usually left unsecured and may provide valuable information! +Cirno (Embarassed): I don't know how to read... ICE: Don't worry, I'll read it aloud for you! ICE: Here's what it says\: computer: Research in the new refining method using the artifact is going according to schedule. -computer: All expectations have been exceded, this artefact is truly miraculous. +computer: All expectations have been exceeded, this artefact is truly miraculous, our production increased by 300%! +computer: The sludge toxicity also went way up but it's still within the parameters set by management, yet we still had a few fatal accidents last week due to unprotected walkways. +computer: However management keeps reassuring us that they are doing all they can and the budget for safety is small. +computer: We'll just have to be more careful. diff --git a/Dialogue/Timelines/computer2.dtl b/Dialogue/Timelines/computer2.dtl index 3e570dd5..472021ef 100644 --- a/Dialogue/Timelines/computer2.dtl +++ b/Dialogue/Timelines/computer2.dtl @@ -1,7 +1,7 @@ computer: To all security personnel\: an intruder was detected in the facility. computer: The intruder looks like a blonde little girl wearing dark clothes and a red ribbon. computer: Despite the apparences she's capable of generating highly dangerous projectiles capable of a high degree of destruction. -computer: It is advised to keep the distance from the subject and immediately notify security on sight. +computer: It is advised to keep the distance from the subject and immediately notify security on sight. computer: She's been recorded on camera while devouring human personnel. The subject is currently sealed in storage A while we wait for reinforcements, do not open the storage for any reason. -Cirno: Huh, that sounds like somebody I know... +Cirno (Puzzled): Huh, that sounds like somebody I know... ICE: Could it be somebody from your world? diff --git a/Dialogue/Timelines/rumia_defeat.dtl b/Dialogue/Timelines/rumia_defeat.dtl index 188216ea..15b3cbe7 100644 --- a/Dialogue/Timelines/rumia_defeat.dtl +++ b/Dialogue/Timelines/rumia_defeat.dtl @@ -1,13 +1,13 @@ [style name="VN"] -join Cirno left -join Rumia right -Cirno: I was the strongest after all! -Rumia: Gah, I get it, I'll follow you -ICE: There is a telepad just north of here, you can take it and I'll reroute it back to our base -Rumia: Your ribbon is speaking! +join Cirno (Smug) left +join Rumia (Defeated) right +Cirno (Smug): I was the strongest after all! +Rumia (Defeated): Gah, I get it, I'll follow you +ICE (Happy): There is a telepad just north of here, you can take it and I'll reroute it back to our base +Rumia (Surprised): Your ribbon is speaking! Cirno: Yeah isn't that cool? There's a little person living in my ribbon now! -ICE: I'm not a small person... nevermind -Cirno: Ah Rumia, since I won the duel now you got to follow my rules\: do NOT eat the nice humans at the base! -Rumia: Whaaat? Not even a bite?? -Cirno: NO. EATING. They're nice, they helped me, they will help us go back home. -Rumia: I'll do what you say for now but only because we're in a weird place, I hope we can go back home soon... +ICE (No Words): I'm not a small person... nevermind +Cirno (Neutral): Ah Rumia, since I won the duel now you got to follow my rules\: do NOT eat the nice humans at the base! +Rumia (Surprised): Whaaat? Not even a bite?? +Cirno (Embarassed Angry): NO. EATING. They're nice, they helped me, they will help us go back home. +Rumia (Thinking): I'll do what you say for now but only because we're in a weird place, I hope we can go back home soon... diff --git a/Dialogue/Timelines/rumia_rebel_base_1.dtl b/Dialogue/Timelines/rumia_rebel_base_1.dtl index e284b6e4..97c6c388 100644 --- a/Dialogue/Timelines/rumia_rebel_base_1.dtl +++ b/Dialogue/Timelines/rumia_rebel_base_1.dtl @@ -3,6 +3,6 @@ join Cirno left join Rumia right Rumia: Hey Cirno, are you sure I cannot eat these people? Cirno: I already said you cannot, they've been really nice to me! -Rumia: Buuuut they look so tasty!! I'm getting hungry you know... +Rumia (Smug): Buuuut they look so tasty!! I'm getting hungry you know... Cirno: I think that if you ask really nicely they'll let you go on a mission and then you can eat all the evil humans you want. -Rumia: Really? I'm going to ask right away! Thank you! +Rumia (Surprised): Really? I'm going to ask right away! Thank you! diff --git a/Dialogue/Timelines/testintro.dtl b/Dialogue/Timelines/testintro.dtl index 0df9051b..f893724c 100644 --- a/Dialogue/Timelines/testintro.dtl +++ b/Dialogue/Timelines/testintro.dtl @@ -1,12 +1,12 @@ -Cirno: I infiltrated the facility! -ICE: Yes, thanks to our hackers who rewired the telepad. -Cirno: Yes of course, so what is this place? -ICE: Weren't you listening to the briefing? This is the enemy refinery we need to infiltrate. -Cirno: Sorry that was so boring I was falling asleep -ICE: It's important! Please try to stay awake when critical mission data is being relayed to you! -Cirno: Don't worry, whatever it is I can deal with it and you will help me, right? -ICE: Yes indeed, my primary mission is to assist you. -Cirno: You're being a really good subordinate! -ICE: Ok now to business\: you need to retrieve the artifact that is kept deep inside the facility and escape back to our base. +Cirno (Happy): I infiltrated the facility! +ICE (Smug): Yes, thanks to our hackers who rewired the telepad. +Cirno (Smug Talk): Yes of course, so what is this place? +ICE (No Words): Weren't you listening to the briefing? This is the enemy refinery we need to infiltrate. +Cirno (Embarassed): Sorry that was so boring I was falling asleep +ICE (Neutral): It's important! Please try to stay awake when critical mission data is being relayed to you! +Cirno (Happy): Don't worry, whatever it is I can deal with it and you will help me, right? +ICE (Happy): Yes indeed, my primary mission is to assist you. +Cirno (Smug Talk): You're being a really good subordinate! +ICE (Neutral): Ok now to business\: you need to retrieve the artifact that is kept deep inside the facility and escape back to our base. ICE: Try to use any terminal you may find, we might be able to find more information that way. ICE: And finally, try to remain undetected for as long as possible, cameras might summon reinforcements to your location if you get spotted. diff --git a/Resources/BossPhases/Rumia_Boss_Script.tres b/Resources/BossPhases/Rumia_Boss_Script.tres index d52f16e6..e133be2d 100644 --- a/Resources/BossPhases/Rumia_Boss_Script.tres +++ b/Resources/BossPhases/Rumia_Boss_Script.tres @@ -7,12 +7,12 @@ [ext_resource type="Resource" uid="uid://ddb5dqocmk6x7" path="res://Resources/BossPhases/Rumia_NS2.tres" id="4_liqsl"] [ext_resource type="Resource" uid="uid://hy1alw04fbds" path="res://Resources/BossPhases/Rumia_Lasers.tres" id="5_r3b4k"] [ext_resource type="Script" uid="uid://inasa76li3ym" path="res://Scripts/Resources/ScriptableBullets/BossScript.cs" id="6_6bmbe"] -[ext_resource type="Texture2D" uid="uid://csuprfskdo1qp" path="res://Sprites/Portraits/Rumia.png" id="7_liqsl"] +[ext_resource type="Texture2D" uid="uid://begjak1f47840" path="res://Sprites/Expression/Rumia/Rumia05_resized.png" id="7_tlqss"] [resource] script = ExtResource("6_6bmbe") BossName = &"Rumia" Phases = Array[ExtResource("1_rrh11")]([ExtResource("2_mpjlq"), ExtResource("3_tlqss"), ExtResource("4_liqsl"), ExtResource("5_r3b4k")]) -PortraitTexture = ExtResource("7_liqsl") +PortraitTexture = ExtResource("7_tlqss") HudPrefab = ExtResource("1_tlqss") metadata/_custom_type_script = "uid://inasa76li3ym" diff --git a/Scripts/GlobalState.cs b/Scripts/GlobalState.cs index 02fdd957..0cec97ea 100644 --- a/Scripts/GlobalState.cs +++ b/Scripts/GlobalState.cs @@ -65,6 +65,7 @@ public partial class GlobalState : Node }) .Build() .PlayUnpausable(); + //CallDeferred(MethodName.DeferredGotoScene, path, startData); } @@ -81,7 +82,7 @@ public partial class GlobalState : Node // Add it to the active scene, as child of root. GetTree().Root.AddChild(CurrentScene); - + // Optionally, to make it compatible with the SceneTree.change_scene_to_file() API. GetTree().CurrentScene = CurrentScene; diff --git a/Sprites/Expression/ICE/ICE02.png b/Sprites/Expression/ICE/ICE02.png new file mode 100644 index 00000000..d894f682 --- /dev/null +++ b/Sprites/Expression/ICE/ICE02.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:946c78fc441e99fe2454d187dbb85e929587b5ccd54b83c3217d0a3758c771d5 +size 7307 diff --git a/Sprites/Expression/ICE/ICE02.png.import b/Sprites/Expression/ICE/ICE02.png.import new file mode 100644 index 00000000..8091c459 --- /dev/null +++ b/Sprites/Expression/ICE/ICE02.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b5er46qllxhqn" +path="res://.godot/imported/ICE02.png-bb1ce9ea73796fd7c99400a8a80b42a1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Expression/ICE/ICE02.png" +dest_files=["res://.godot/imported/ICE02.png-bb1ce9ea73796fd7c99400a8a80b42a1.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/Sprites/Expression/Rumia/Rumia05_resized.png b/Sprites/Expression/Rumia/Rumia05_resized.png new file mode 100644 index 00000000..f0ba6a72 --- /dev/null +++ b/Sprites/Expression/Rumia/Rumia05_resized.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bab2e8a7659ee7afbcd125cb223b521b6d6248ceddcd8695170ccd5214861b9 +size 5070 diff --git a/Sprites/Expression/Rumia/Rumia05_resized.png.import b/Sprites/Expression/Rumia/Rumia05_resized.png.import new file mode 100644 index 00000000..f4ad7691 --- /dev/null +++ b/Sprites/Expression/Rumia/Rumia05_resized.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://begjak1f47840" +path="res://.godot/imported/Rumia05_resized.png-222a02b61b5f621139f0de6c23983246.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Expression/Rumia/Rumia05_resized.png" +dest_files=["res://.godot/imported/Rumia05_resized.png-222a02b61b5f621139f0de6c23983246.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/Sprites/Expression/Rumia/RumiaDefeated.png b/Sprites/Expression/Rumia/RumiaDefeated.png new file mode 100644 index 00000000..cb97e2d6 --- /dev/null +++ b/Sprites/Expression/Rumia/RumiaDefeated.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13564571075f448367d7d70a24fc0a1537783557bc297806cd7de6441c0d8da5 +size 14956 diff --git a/Sprites/Expression/Rumia/RumiaDefeated.png.import b/Sprites/Expression/Rumia/RumiaDefeated.png.import new file mode 100644 index 00000000..2ae52ad9 --- /dev/null +++ b/Sprites/Expression/Rumia/RumiaDefeated.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bjee0jhj6wfor" +path="res://.godot/imported/RumiaDefeated.png-98af2e515f97a2bb03324af760178c33.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Expression/Rumia/RumiaDefeated.png" +dest_files=["res://.godot/imported/RumiaDefeated.png-98af2e515f97a2bb03324af760178c33.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