From 10d5802064b2f0431d66fb8f8a5e5496e1245b5d Mon Sep 17 00:00:00 2001 From: Raxki Date: Sun, 24 Nov 2024 14:01:19 -0500 Subject: [PATCH] Fine tune cutscenes --- Cutscenes/prototype_clone_defeated.tres | 2 +- Cutscenes/prototype_clone_victory.tres | 4 +-- .../prototype_reed_defeated_normal_melee.tres | 10 +++--- .../prototype_reed_defeated_normal_range.tres | 14 ++++----- .../prototype_reed_defeated_nsfw_melee.tres | 17 +++++++--- .../prototype_reed_defeated_nsfw_range.tres | 15 +++++++-- Cutscenes/prototype_reed_victory.tres | 31 ++++++++++++------- Cutscenes/prototype_talk_to_nem.tres | 18 +++++------ 8 files changed, 69 insertions(+), 42 deletions(-) diff --git a/Cutscenes/prototype_clone_defeated.tres b/Cutscenes/prototype_clone_defeated.tres index acde50a..0122b6a 100644 --- a/Cutscenes/prototype_clone_defeated.tres +++ b/Cutscenes/prototype_clone_defeated.tres @@ -13,7 +13,7 @@ script = ExtResource("3_0uw7j") character = 0 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "defeated" messages = Array[String](["N-No...!"]) textbox_direction = 0 diff --git a/Cutscenes/prototype_clone_victory.tres b/Cutscenes/prototype_clone_victory.tres index e97bfa2..c8eef64 100644 --- a/Cutscenes/prototype_clone_victory.tres +++ b/Cutscenes/prototype_clone_victory.tres @@ -22,7 +22,7 @@ time = 1.0 [sub_resource type="Resource" id="Resource_xcdd6"] script = ExtResource("4_joqmj") music = ExtResource("3_ruugx") -crossfade = true +crossfade = false [sub_resource type="Resource" id="Resource_bagm4"] script = ExtResource("3_0uw7j") @@ -75,7 +75,7 @@ script = ExtResource("3_0uw7j") character = 1 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "unsure" messages = Array[String](["Uh... You wouldn't want to know."]) textbox_direction = 1 diff --git a/Cutscenes/prototype_reed_defeated_normal_melee.tres b/Cutscenes/prototype_reed_defeated_normal_melee.tres index 996b5cc..ccfe357 100644 --- a/Cutscenes/prototype_reed_defeated_normal_melee.tres +++ b/Cutscenes/prototype_reed_defeated_normal_melee.tres @@ -13,7 +13,7 @@ script = ExtResource("2_7yk7v") character = 0 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "defeated" messages = Array[String](["Oof!"]) textbox_direction = 0 @@ -26,17 +26,17 @@ portrait_emotion = "normal" messages = Array[String](["Giving up already?", "Come on, Hiro. I thought you were stronger than that."]) textbox_direction = 1 -[sub_resource type="Resource" id="Resource_cw5jl"] +[sub_resource type="Resource" id="Resource_jqnch"] script = ExtResource("2_7yk7v") character = 2 custom_name = "" portrait_set = "default" portrait_emotion = "normal" -messages = Array[String](["Ladies and gentlemen, we have a a winner!!", "Everyone give a round of aplause for Hiro!"]) -textbox_direction = 1 +messages = Array[String](["Ladies and gentlemen, we have a winner!!", "Everyone give a round of applause for Reed!"]) +textbox_direction = 0 [resource] resource_name = "reed_wins_sfw" script = ExtResource("3_nhp1k") -commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_j0qrl"), SubResource("Resource_o1ssy"), SubResource("Resource_7atw7"), SubResource("Resource_cw5jl")]) +commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_j0qrl"), SubResource("Resource_o1ssy"), SubResource("Resource_7atw7"), SubResource("Resource_jqnch")]) auto_start_on_load = true diff --git a/Cutscenes/prototype_reed_defeated_normal_range.tres b/Cutscenes/prototype_reed_defeated_normal_range.tres index 4a938d0..5e1139d 100644 --- a/Cutscenes/prototype_reed_defeated_normal_range.tres +++ b/Cutscenes/prototype_reed_defeated_normal_range.tres @@ -13,7 +13,7 @@ script = ExtResource("2_hc28m") character = 0 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "defeated" messages = Array[String](["Ugh... Why do you have a weapon? Where is MY weapon?"]) textbox_direction = 0 @@ -22,8 +22,8 @@ script = ExtResource("2_hc28m") character = 1 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" -messages = Array[String](["Whoops, I must've overdone it, hahaha!", "I guess there was no time to program your weapon."]) +portrait_emotion = "unsure" +messages = Array[String](["Whoops, I must've overdone it.", "I guess there was no time to program your weapon."]) textbox_direction = 1 [sub_resource type="Resource" id="Resource_mm75k"] @@ -31,21 +31,21 @@ script = ExtResource("2_hc28m") character = 0 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "defeated" messages = Array[String](["That's so unfair...!"]) textbox_direction = 0 -[sub_resource type="Resource" id="Resource_cw5jl"] +[sub_resource type="Resource" id="Resource_jqnch"] script = ExtResource("2_hc28m") character = 2 custom_name = "" portrait_set = "default" portrait_emotion = "normal" -messages = Array[String](["Ladies and gentlemen, we have a winner!!", "Everyone give a round of applause for Hiro!"]) +messages = Array[String](["Ladies and gentlemen, we have a winner!!", "Everyone give a round of applause for Reed!"]) textbox_direction = 1 [resource] resource_name = "reed_wins_sfw_range" script = ExtResource("3_vxdst") -commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_j0qrl"), SubResource("Resource_o1ssy"), SubResource("Resource_1wi5v"), SubResource("Resource_mm75k"), SubResource("Resource_cw5jl")]) +commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_j0qrl"), SubResource("Resource_o1ssy"), SubResource("Resource_1wi5v"), SubResource("Resource_mm75k"), SubResource("Resource_jqnch")]) auto_start_on_load = true diff --git a/Cutscenes/prototype_reed_defeated_nsfw_melee.tres b/Cutscenes/prototype_reed_defeated_nsfw_melee.tres index 1fc29c8..423b2a4 100644 --- a/Cutscenes/prototype_reed_defeated_nsfw_melee.tres +++ b/Cutscenes/prototype_reed_defeated_nsfw_melee.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="Cutscene" load_steps=9 format=3 uid="uid://cwfayxsvfvfp3"] +[gd_resource type="Resource" script_class="Cutscene" load_steps=10 format=3 uid="uid://cwfayxsvfvfp3"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/wait.gd" id="1_fyryj"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/show_dialogue.gd" id="2_4tx72"] @@ -22,7 +22,7 @@ script = ExtResource("2_4tx72") character = 1 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "unsure" messages = Array[String](["Oops. Guess I overdid it."]) textbox_direction = 1 @@ -32,7 +32,7 @@ character = 0 custom_name = "" portrait_set = "naked" portrait_emotion = "embarrased" -messages = Array[String](["Aaargh! I hate being naked in front of a crowd!!"]) +messages = Array[String](["Argh, this is so unfair!!! I hate being naked in public!"]) textbox_direction = 0 [sub_resource type="Resource" id="Resource_cw5jl"] @@ -44,8 +44,17 @@ portrait_emotion = "normal" messages = Array[String](["Uh... Ladies and gentlemen... We have a winner!", "The winner is Reed!"]) textbox_direction = 1 +[sub_resource type="Resource" id="Resource_fjmn0"] +script = ExtResource("2_4tx72") +character = 4 +custom_name = "" +portrait_set = "default" +portrait_emotion = "normal" +messages = Array[String](["Oh, boy. Now everyone here knows I'm the bigger brother. ", "In more ways than one, hehe."]) +textbox_direction = 1 + [resource] resource_name = "reed_wins_nsfw" script = ExtResource("3_6u7eb") -commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_j0qrl"), SubResource("Resource_75mgm"), SubResource("Resource_1wi5v"), SubResource("Resource_2fi0d"), SubResource("Resource_cw5jl")]) +commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_j0qrl"), SubResource("Resource_75mgm"), SubResource("Resource_1wi5v"), SubResource("Resource_2fi0d"), SubResource("Resource_cw5jl"), SubResource("Resource_fjmn0")]) auto_start_on_load = true diff --git a/Cutscenes/prototype_reed_defeated_nsfw_range.tres b/Cutscenes/prototype_reed_defeated_nsfw_range.tres index e0ae8c8..4677e64 100644 --- a/Cutscenes/prototype_reed_defeated_nsfw_range.tres +++ b/Cutscenes/prototype_reed_defeated_nsfw_range.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="Cutscene" load_steps=9 format=3 uid="uid://un8ohl1ep2j6"] +[gd_resource type="Resource" script_class="Cutscene" load_steps=10 format=3 uid="uid://un8ohl1ep2j6"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/wait.gd" id="1_m1fw4"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/show_dialogue.gd" id="2_fxrwb"] @@ -22,7 +22,7 @@ script = ExtResource("2_fxrwb") character = 1 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "unsure" messages = Array[String](["Whoops, I must've overdone it, hahaha!", "I guess there was no time to program your weapon."]) textbox_direction = 1 @@ -44,8 +44,17 @@ portrait_emotion = "normal" messages = Array[String](["Uh... Ladies and gentlemen... We have a winner!", "The winner is Reed!"]) textbox_direction = 1 +[sub_resource type="Resource" id="Resource_xxogb"] +script = ExtResource("2_fxrwb") +character = 4 +custom_name = "" +portrait_set = "default" +portrait_emotion = "normal" +messages = Array[String](["Oh, boy. Now everyone here knows I'm the bigger brother. ", " In more ways than one, hehe."]) +textbox_direction = 1 + [resource] resource_name = "reed_wins_nsfw_range" script = ExtResource("3_jryou") -commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_j0qrl"), SubResource("Resource_75mgm"), SubResource("Resource_1wi5v"), SubResource("Resource_2fi0d"), SubResource("Resource_cw5jl")]) +commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_j0qrl"), SubResource("Resource_75mgm"), SubResource("Resource_1wi5v"), SubResource("Resource_2fi0d"), SubResource("Resource_cw5jl"), SubResource("Resource_xxogb")]) auto_start_on_load = true diff --git a/Cutscenes/prototype_reed_victory.tres b/Cutscenes/prototype_reed_victory.tres index f75624a..c296add 100644 --- a/Cutscenes/prototype_reed_victory.tres +++ b/Cutscenes/prototype_reed_victory.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="Cutscene" load_steps=18 format=3 uid="uid://c8pfjfnwim673"] +[gd_resource type="Resource" script_class="Cutscene" load_steps=19 format=3 uid="uid://c8pfjfnwim673"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/wait.gd" id="1_uoty8"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/play_character_animation.gd" id="2_onwwi"] @@ -26,15 +26,6 @@ portrait_emotion = "normal" messages = Array[String](["Ok, ok! I give up! You win!", "Boy, you're stronger than I thought. Good match."]) textbox_direction = 1 -[sub_resource type="Resource" id="Resource_w88ia"] -script = ExtResource("2_vliur") -character = 3 -custom_name = "" -portrait_set = "default" -portrait_emotion = "normal" -messages = Array[String](["That was a good fight, but, my boyfriend will win next time!"]) -textbox_direction = 1 - [sub_resource type="Resource" id="Resource_dxa8x"] script = ExtResource("2_vliur") character = 2 @@ -44,6 +35,24 @@ portrait_emotion = "normal" messages = Array[String](["Alright folks, that's all for today. Thank you all so much for being here today!"]) textbox_direction = 1 +[sub_resource type="Resource" id="Resource_abgul"] +script = ExtResource("2_vliur") +character = 4 +custom_name = "" +portrait_set = "default" +portrait_emotion = "normal" +messages = Array[String](["I knew he could do it. Way to go little bro."]) +textbox_direction = 1 + +[sub_resource type="Resource" id="Resource_w88ia"] +script = ExtResource("2_vliur") +character = 3 +custom_name = "" +portrait_set = "default" +portrait_emotion = "normal" +messages = Array[String](["That was a good fight, but, my boyfriend will win next time!"]) +textbox_direction = 1 + [sub_resource type="Resource" id="Resource_uu88j"] script = ExtResource("4_s1imk") music = ExtResource("3_pudjg") @@ -78,5 +87,5 @@ time = 2.01667 [resource] resource_name = "reed_loses" script = ExtResource("3_kh4kq") -commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_j0qrl"), SubResource("Resource_abuy5"), SubResource("Resource_46i1x"), SubResource("Resource_w88ia"), SubResource("Resource_dxa8x"), SubResource("Resource_uu88j"), SubResource("Resource_qs5xn"), SubResource("Resource_qkt15"), SubResource("Resource_12o2v"), SubResource("Resource_uw5p1")]) +commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_j0qrl"), SubResource("Resource_abuy5"), SubResource("Resource_46i1x"), SubResource("Resource_dxa8x"), SubResource("Resource_abgul"), SubResource("Resource_w88ia"), SubResource("Resource_uu88j"), SubResource("Resource_qs5xn"), SubResource("Resource_qkt15"), SubResource("Resource_12o2v"), SubResource("Resource_uw5p1")]) auto_start_on_load = true diff --git a/Cutscenes/prototype_talk_to_nem.tres b/Cutscenes/prototype_talk_to_nem.tres index 47ca48f..d8cf48f 100644 --- a/Cutscenes/prototype_talk_to_nem.tres +++ b/Cutscenes/prototype_talk_to_nem.tres @@ -145,7 +145,7 @@ script = ExtResource("2_c1bel") character = 0 custom_name = "Clone" portrait_set = "clone" -portrait_emotion = "normal" +portrait_emotion = "confident" messages = Array[String](["Nah.", "Don't feel like it. I wanna do something else."]) textbox_direction = 1 @@ -154,7 +154,7 @@ script = ExtResource("2_c1bel") character = 0 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "shocked" messages = Array[String](["Aw, come on! You know how important this is to me!"]) textbox_direction = 0 @@ -163,7 +163,7 @@ script = ExtResource("2_c1bel") character = 0 custom_name = "Clone" portrait_set = "clone" -portrait_emotion = "normal" +portrait_emotion = "confident" messages = Array[String](["And what are you gonna do with a last minute sparring? Get injured?"]) textbox_direction = 1 @@ -172,7 +172,7 @@ script = ExtResource("2_c1bel") character = 0 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "angry" messages = Array[String](["Aaargh! I can't stand you!", "You don't ever listen to me! I'm your creator!"]) textbox_direction = 0 @@ -186,7 +186,7 @@ script = ExtResource("2_c1bel") character = 0 custom_name = "Clone" portrait_set = "clone" -portrait_emotion = "normal" +portrait_emotion = "confident" messages = Array[String](["You're one to talk."]) textbox_direction = 1 @@ -195,7 +195,7 @@ script = ExtResource("2_c1bel") character = 0 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "confident" messages = Array[String](["Well, I guess I will buy a new gunpla to build. Just for me. ", "And you won't even get to see me making it."]) textbox_direction = 0 @@ -204,7 +204,7 @@ script = ExtResource("2_c1bel") character = 0 custom_name = "Clone" portrait_set = "clone" -portrait_emotion = "normal" +portrait_emotion = "angry" messages = Array[String](["Tch! Fine! You asked for it!", "Don't say I warned you! You don't even know how to use the X button to attack!"]) textbox_direction = 1 @@ -213,7 +213,7 @@ script = ExtResource("2_c1bel") character = 0 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "confident" messages = Array[String](["Heh. You just told me."]) textbox_direction = 0 @@ -222,7 +222,7 @@ script = ExtResource("2_c1bel") character = 0 custom_name = "Clone" portrait_set = "clone" -portrait_emotion = "normal" +portrait_emotion = "angry" messages = Array[String](["Rrrrgghhhh!!!!"]) textbox_direction = 1