diff --git a/Cutscenes/prototype_clone_draw.tres b/Cutscenes/prototype_clone_draw.tres index 4cccce2..0005631 100644 --- a/Cutscenes/prototype_clone_draw.tres +++ b/Cutscenes/prototype_clone_draw.tres @@ -18,7 +18,7 @@ script = ExtResource("5_8tfma") character = 0 custom_name = "" portrait_set = "default" -portrait_emotion = "normal" +portrait_emotion = "defeated" messages = Array[String](["Wait...... W-What...? I defeated him, but... I'm down too?", "At any rate... I can't fight Reed like this..."]) textbox_direction = 0 diff --git a/Cutscenes/prototype_clone_victory.tres b/Cutscenes/prototype_clone_victory.tres index a6d40c4..48f36b3 100644 --- a/Cutscenes/prototype_clone_victory.tres +++ b/Cutscenes/prototype_clone_victory.tres @@ -138,7 +138,7 @@ character = 0 custom_name = "" portrait_set = "default" portrait_emotion = "normal" -messages = Array[String](["I've been looking forward for this day. Let's do out best!"]) +messages = Array[String](["I've been looking forward for this day. Let's do our best!"]) textbox_direction = 0 [sub_resource type="Resource" id="Resource_pu4kf"] diff --git a/Cutscenes/prototype_reed_draw_nsfw.tres b/Cutscenes/prototype_reed_draw_nsfw.tres index a20972e..b114e87 100644 --- a/Cutscenes/prototype_reed_draw_nsfw.tres +++ b/Cutscenes/prototype_reed_draw_nsfw.tres @@ -1,7 +1,6 @@ -[gd_resource type="Resource" script_class="Cutscene" load_steps=10 format=3 uid="uid://d3wuehjkx8udy"] +[gd_resource type="Resource" script_class="Cutscene" load_steps=9 format=3 uid="uid://d3wuehjkx8udy"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/wait.gd" id="1_b58rs"] -[ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/base.gd" id="1_od003"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/show_dialogue.gd" id="2_o3yf1"] [ext_resource type="Script" path="res://Scripts/Cutscenes/cutscene.gd" id="3_c4ahv"] @@ -48,5 +47,5 @@ textbox_direction = 0 [resource] resource_name = "reed_draw_nsfw" script = ExtResource("3_c4ahv") -commands = Array[ExtResource("1_od003")]([SubResource("Resource_j0qrl"), SubResource("Resource_cw5jl"), SubResource("Resource_75mgm"), SubResource("Resource_1wi5v"), SubResource("Resource_h3llg")]) +commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_j0qrl"), SubResource("Resource_cw5jl"), SubResource("Resource_75mgm"), SubResource("Resource_1wi5v"), SubResource("Resource_h3llg")]) auto_start_on_load = true diff --git a/Cutscenes/prototype_reed_victory.tres b/Cutscenes/prototype_reed_victory.tres index 92cacfe..d24d928 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=19 format=3 uid="uid://c8pfjfnwim673"] +[gd_resource type="Resource" script_class="Cutscene" load_steps=20 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"] @@ -32,7 +32,7 @@ character = 2 custom_name = "" portrait_set = "default" portrait_emotion = "normal" -messages = Array[String](["Looks like we've got a winner here, folks! Give it up for... HIRO!", "And that's all for today. Thank you all so much for being here at Rikika Dojo."]) +messages = Array[String](["Looks like we've got a winner here, folks! Give it up for... HIRO!"]) textbox_direction = 1 [sub_resource type="Resource" id="Resource_abgul"] @@ -53,6 +53,15 @@ 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_sdbgp"] +script = ExtResource("2_vliur") +character = 2 +custom_name = "" +portrait_set = "default" +portrait_emotion = "normal" +messages = Array[String](["And that's all for today. Thank you all so much for being here at Rikika Dojo."]) +textbox_direction = 1 + [sub_resource type="Resource" id="Resource_uu88j"] script = ExtResource("4_s1imk") music = ExtResource("3_pudjg") @@ -87,5 +96,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_dxa8x"), SubResource("Resource_abgul"), SubResource("Resource_w88ia"), 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_sdbgp"), 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_start.tres b/Cutscenes/prototype_start.tres index b59521d..e2eb1d1 100644 --- a/Cutscenes/prototype_start.tres +++ b/Cutscenes/prototype_start.tres @@ -93,7 +93,7 @@ character = 0 custom_name = "" portrait_set = "default" portrait_emotion = "normal" -messages = Array[String](["I can move around using the D-Pad or the keyboard arrow keys."]) +messages = Array[String](["I can move around using the D-Pad or the keyboard arrow keys.", "I can talk to other characters by pressing the X button when near them."]) textbox_direction = 0 [resource] diff --git a/Cutscenes/prototype_talk_to_nem.tres b/Cutscenes/prototype_talk_to_nem.tres index d8cf48f..b789d3e 100644 --- a/Cutscenes/prototype_talk_to_nem.tres +++ b/Cutscenes/prototype_talk_to_nem.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="Cutscene" load_steps=42 format=3 uid="uid://ck0ry5vxaj8a7"] +[gd_resource type="Resource" script_class="Cutscene" load_steps=43 format=3 uid="uid://ck0ry5vxaj8a7"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/lookat_character.gd" id="1_ri0w6"] [ext_resource type="Script" path="res://Scripts/Cutscenes/Commands/show_dialogue.gd" id="2_c1bel"] @@ -199,13 +199,22 @@ 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 +[sub_resource type="Resource" id="Resource_x55gk"] +script = ExtResource("2_c1bel") +character = 0 +custom_name = "Clone" +portrait_set = "clone" +portrait_emotion = "shocked" +messages = Array[String](["Tch! Fine! You asked for it!"]) +textbox_direction = 1 + [sub_resource type="Resource" id="Resource_efygu"] script = ExtResource("2_c1bel") character = 0 custom_name = "Clone" portrait_set = "clone" 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!"]) +messages = Array[String](["Don't say I warned you! You don't even know how to use the X button to attack!"]) textbox_direction = 1 [sub_resource type="Resource" id="Resource_u7g7o"] @@ -244,5 +253,5 @@ wait_until_completion = true [resource] resource_name = "talking_to_nem" script = ExtResource("5_wqnqw") -commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_de27e"), SubResource("Resource_3bkhm"), SubResource("Resource_tgajv"), SubResource("Resource_qi6iy"), SubResource("Resource_775qe"), SubResource("Resource_yaf72"), SubResource("Resource_h8br4"), SubResource("Resource_ecaiv"), SubResource("Resource_0c4lk"), SubResource("Resource_b2wnb"), SubResource("Resource_8188r"), SubResource("Resource_83rs0"), SubResource("Resource_blakn"), SubResource("Resource_r5wd6"), SubResource("Resource_slop4"), SubResource("Resource_h3k50"), SubResource("Resource_wo7y2"), SubResource("Resource_hi1ck"), SubResource("Resource_5ci1l"), SubResource("Resource_abui6"), SubResource("Resource_kb8r5"), SubResource("Resource_8xfaf"), SubResource("Resource_4iw0f"), SubResource("Resource_kd0jj"), SubResource("Resource_w7l1e"), SubResource("Resource_7url7"), SubResource("Resource_efygu"), SubResource("Resource_u7g7o"), SubResource("Resource_ujwnf"), SubResource("Resource_ts1m3"), SubResource("Resource_uibnf")]) +commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_de27e"), SubResource("Resource_3bkhm"), SubResource("Resource_tgajv"), SubResource("Resource_qi6iy"), SubResource("Resource_775qe"), SubResource("Resource_yaf72"), SubResource("Resource_h8br4"), SubResource("Resource_ecaiv"), SubResource("Resource_0c4lk"), SubResource("Resource_b2wnb"), SubResource("Resource_8188r"), SubResource("Resource_83rs0"), SubResource("Resource_blakn"), SubResource("Resource_r5wd6"), SubResource("Resource_slop4"), SubResource("Resource_h3k50"), SubResource("Resource_wo7y2"), SubResource("Resource_hi1ck"), SubResource("Resource_5ci1l"), SubResource("Resource_abui6"), SubResource("Resource_kb8r5"), SubResource("Resource_8xfaf"), SubResource("Resource_4iw0f"), SubResource("Resource_kd0jj"), SubResource("Resource_w7l1e"), SubResource("Resource_7url7"), SubResource("Resource_x55gk"), SubResource("Resource_efygu"), SubResource("Resource_u7g7o"), SubResource("Resource_ujwnf"), SubResource("Resource_ts1m3"), SubResource("Resource_uibnf")]) auto_start_on_load = true