Add posters and spruce up cutscenes

2024-12-04 16:27:23 -05:00 · 2024-12-04 16:27:23 -05:00 · 2bae00a644
commit 2bae00a644
parent 38e30ddcc4
7 changed files with 225 additions and 26 deletions
--- a/Cutscenes/prototype_clone_victory.tres
+++ b/Cutscenes/prototype_clone_victory.tres
@ -85,7 +85,7 @@ character = 2
 custom_name = ""
 portrait_set = "default"
 portrait_emotion = "normal"
-messages = Array[String](["It's fine. Now that you're both here, you may go into your positions.", "I'll let the people come in now."])
+messages = Array[String](["It's all good. Now that you're both here, why don't we get this show on the road?", "I'll let everyone know the party's getting started."])
 textbox_direction = 1

 [sub_resource type="Resource" id="Resource_p2wwu"]
@ -100,6 +100,16 @@ time = 1.21667
 script = ExtResource("1_wfaj3")
 message = &"scene_2"

+[sub_resource type="Resource" id="Resource_wtu3y"]
+script = ExtResource("8_w0so3")
+target_camera = NodePath("../HiroPlayer/Camera2D")
+to_initial = null
+target = Vector2(0, -60)
+relative = false
+speed = 1.0
+teleport = false
+wait_until_completion = true
+
 [sub_resource type="Resource" id="Resource_tjwhc"]
 script = ExtResource("4_joqmj")
 music = ExtResource("9_ee6cr")
@ -119,7 +129,7 @@ character = 2
 custom_name = ""
 portrait_set = "default"
 portrait_emotion = "normal"
-messages = Array[String](["Now! The moment you've all been waiting for!", "Today's exhibition match  between two of our local fighters, Hiro and Reed!"])
+messages = Array[String](["Now! The moment you've all been waiting for!", "Today's exhibition match here at Rikika Dojo, between our two local fighters, ", "Hiro and Reed!"])
 textbox_direction = 1

 [sub_resource type="Resource" id="Resource_o6ly6"]
@ -128,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"]
@ -140,16 +150,6 @@ portrait_emotion = "normal"
 messages = Array[String](["Yeah! Don't hold anything back!", "Let's give this crowd a good show!"])
 textbox_direction = 1

-[sub_resource type="Resource" id="Resource_wtu3y"]
-script = ExtResource("8_w0so3")
-target_camera = NodePath("../HiroPlayer/Camera2D")
-to_initial = null
-target = Vector2(0, -60)
-relative = false
-speed = 1.0
-teleport = false
-wait_until_completion = true
-
 [sub_resource type="Resource" id="Resource_hs1wh"]
 script = ExtResource("3_0uw7j")
 character = 4
@ -208,5 +208,5 @@ textbox_direction = 0
 [resource]
 resource_name = "prototype_clone_defeated"
 script = ExtResource("1_75ljw")
-commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_jm5v6"), SubResource("Resource_as31p"), SubResource("Resource_xcdd6"), SubResource("Resource_bagm4"), SubResource("Resource_v16hg"), SubResource("Resource_vu1m2"), SubResource("Resource_4u6io"), SubResource("Resource_ork8h"), SubResource("Resource_5axwh"), SubResource("Resource_jdwa3"), SubResource("Resource_wsgt4"), SubResource("Resource_p2wwu"), SubResource("Resource_ben6d"), SubResource("Resource_5fw3k"), SubResource("Resource_tjwhc"), SubResource("Resource_t0ilw"), SubResource("Resource_3k148"), SubResource("Resource_f6433"), SubResource("Resource_o6ly6"), SubResource("Resource_pu4kf"), SubResource("Resource_wtu3y"), SubResource("Resource_hs1wh"), SubResource("Resource_apw73"), SubResource("Resource_yt0uq"), SubResource("Resource_lafmq"), SubResource("Resource_v7db0"), SubResource("Resource_p8wvt")])
+commands = Array[Resource("res://Scripts/Cutscenes/Commands/base.gd")]([SubResource("Resource_jm5v6"), SubResource("Resource_as31p"), SubResource("Resource_xcdd6"), SubResource("Resource_bagm4"), SubResource("Resource_v16hg"), SubResource("Resource_vu1m2"), SubResource("Resource_4u6io"), SubResource("Resource_ork8h"), SubResource("Resource_5axwh"), SubResource("Resource_jdwa3"), SubResource("Resource_wsgt4"), SubResource("Resource_p2wwu"), SubResource("Resource_ben6d"), SubResource("Resource_5fw3k"), SubResource("Resource_wtu3y"), SubResource("Resource_tjwhc"), SubResource("Resource_t0ilw"), SubResource("Resource_3k148"), SubResource("Resource_f6433"), SubResource("Resource_o6ly6"), SubResource("Resource_pu4kf"), SubResource("Resource_hs1wh"), SubResource("Resource_apw73"), SubResource("Resource_yt0uq"), SubResource("Resource_lafmq"), SubResource("Resource_v7db0"), SubResource("Resource_p8wvt")])
 auto_start_on_load = true
--- a/Cutscenes/prototype_reed_defeated_nsfw_melee.tres
+++ b/Cutscenes/prototype_reed_defeated_nsfw_melee.tres
@ -41,7 +41,7 @@ character = 2
 custom_name = ""
 portrait_set = "default"
 portrait_emotion = "normal"
-messages = Array[String](["Uh... Ladies and gentlemen... We have a winner!", "The winner is Reed!"])
+messages = Array[String](["C'mon Hiro, we didn't all gather here today to see your uhh... 'shortcomings'.", "Well, anyway... Today's winner is Reed! Give it up for our fully clothed fighter!"])
 textbox_direction = 1

 [sub_resource type="Resource" id="Resource_fjmn0"]
--- a/Cutscenes/prototype_reed_defeated_nsfw_range.tres
+++ b/Cutscenes/prototype_reed_defeated_nsfw_range.tres
@ -41,7 +41,7 @@ character = 2
 custom_name = ""
 portrait_set = "default"
 portrait_emotion = "normal"
-messages = Array[String](["Uh... Ladies and gentlemen... We have a winner!", "The winner is Reed!"])
+messages = Array[String](["C'mon Hiro, we didn't all gather here today to see your uhh... 'shortcomings'.", "Well, anyway... Today's winner is Reed! Give it up for our fully clothed fighter!"])
 textbox_direction = 1

 [sub_resource type="Resource" id="Resource_xxogb"]
--- a/Cutscenes/prototype_reed_draw_nsfw.tres
+++ b/Cutscenes/prototype_reed_draw_nsfw.tres
@ -31,7 +31,7 @@ script = ExtResource("2_o3yf1")
 character = 1
 custom_name = ""
 portrait_set = "default"
-portrait_emotion = "normal"
+portrait_emotion = "unsure"
 messages = Array[String](["Oops. Guess I overdid it.", "Still... I'm impressed.", "Not only about your skills, but also your..."])
 textbox_direction = 1

--- a/Cutscenes/prototype_reed_victory.tres
+++ b/Cutscenes/prototype_reed_victory.tres
@ -32,7 +32,7 @@ character = 2
 custom_name = ""
 portrait_set = "default"
 portrait_emotion = "normal"
-messages = Array[String](["Alright folks, that's all for today. Thank you all so much for being here today!"])
+messages = Array[String](["Looks like we 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."])
 textbox_direction = 1

 [sub_resource type="Resource" id="Resource_abgul"]
--- 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"]
@ -204,8 +204,17 @@ 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_bdof0"]
+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_efygu"), SubResource("Resource_bdof0"), SubResource("Resource_u7g7o"), SubResource("Resource_ujwnf"), SubResource("Resource_ts1m3"), SubResource("Resource_uibnf")])
 auto_start_on_load = true
--- a/world/world.tscn
+++ b/world/world.tscn
@ -1,4 +1,4 @@
-[gd_scene load_steps=76 format=3 uid="uid://bxuxjqxxqy7ce"]
+[gd_scene load_steps=78 format=3 uid="uid://bxuxjqxxqy7ce"]

 [ext_resource type="PackedScene" uid="uid://di21xheryhp0k" path="res://Hiro/hiro_player.tscn" id="1_c1gpq"]
 [ext_resource type="PackedScene" uid="uid://b8sfype1vx5ad" path="res://Nem/nem_npc.tscn" id="1_sqt7d"]
@ -43,6 +43,8 @@
 [ext_resource type="PackedScene" uid="uid://bbybt6r6351yp" path="res://Audio/sound_manager.tscn" id="25_hm8b0"]
 [ext_resource type="PackedScene" uid="uid://dd2km6qhpdicx" path="res://Hiro/hiro_ai.tscn" id="30_le27a"]
 [ext_resource type="Script" path="res://Scripts/collidable_barrier.gd" id="43_8q2dl"]
+[ext_resource type="Texture2D" uid="uid://cq0f4ps8k3t5s" path="res://world/jed gundam game bg poster.png" id="44_mvkv4"]
+[ext_resource type="Texture2D" uid="uid://cp173llopa6h5" path="res://world/kingdom hearts game bg poster.png" id="45_25b7g"]

 [sub_resource type="LabelSettings" id="LabelSettings_f2g0a"]
 font = ExtResource("2_64thh")
@ -211,6 +213,36 @@ animations = [{
 "texture": SubResource("AtlasTexture_d3bfk")
 }, {
 "duration": 1.0,
+"texture": SubResource("AtlasTexture_d3bfk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_d3bfk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_d3bfk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_d3bfk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_d3bfk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_d3bfk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_d3bfk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_d3bfk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_d3bfk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_d3bfk")
+}, {
+"duration": 1.0,
 "texture": SubResource("AtlasTexture_xme0k")
 }],
 "loop": true,
@ -275,6 +307,36 @@ animations = [{
 "texture": SubResource("AtlasTexture_3u38p")
 }, {
 "duration": 1.0,
+"texture": SubResource("AtlasTexture_3u38p")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3u38p")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3u38p")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3u38p")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3u38p")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3u38p")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3u38p")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3u38p")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3u38p")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3u38p")
+}, {
+"duration": 1.0,
 "texture": SubResource("AtlasTexture_hyuwb")
 }],
 "loop": true,
@ -348,6 +410,36 @@ animations = [{
 "texture": SubResource("AtlasTexture_447t8")
 }, {
 "duration": 1.0,
+"texture": SubResource("AtlasTexture_447t8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_447t8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_447t8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_447t8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_447t8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_447t8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_447t8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_447t8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_447t8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_447t8")
+}, {
+"duration": 1.0,
 "texture": SubResource("AtlasTexture_vbjws")
 }],
 "loop": true,
@ -403,6 +495,36 @@ animations = [{
 "texture": SubResource("AtlasTexture_ruihr")
 }, {
 "duration": 1.0,
+"texture": SubResource("AtlasTexture_ruihr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ruihr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ruihr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ruihr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ruihr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ruihr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ruihr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ruihr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ruihr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ruihr")
+}, {
+"duration": 1.0,
 "texture": SubResource("AtlasTexture_w6oru")
 }],
 "loop": true,
@ -482,6 +604,36 @@ animations = [{
 "texture": SubResource("AtlasTexture_pn8uv")
 }, {
 "duration": 1.0,
+"texture": SubResource("AtlasTexture_pn8uv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pn8uv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pn8uv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pn8uv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pn8uv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pn8uv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pn8uv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pn8uv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pn8uv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pn8uv")
+}, {
+"duration": 1.0,
 "texture": SubResource("AtlasTexture_eke06")
 }],
 "loop": true,
@ -576,7 +728,37 @@ animations = [{
 "texture": SubResource("AtlasTexture_3r342")
 }, {
 "duration": 1.0,
+"texture": SubResource("AtlasTexture_3r342")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3r342")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3r342")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3r342")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3r342")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3r342")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3r342")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3r342")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3r342")
+}, {
+"duration": 1.0,
 "texture": SubResource("AtlasTexture_hhhy2")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3r342")
 }],
 "loop": true,
 "name": &"default",
@ -812,6 +994,16 @@ position = Vector2(96, 280)
 y_sort_enabled = true
 position = Vector2(176, 280)

+[node name="JedGundamGameBgPoster" type="Sprite2D" parent="MapElements"]
+texture_filter = 1
+position = Vector2(114, 57)
+texture = ExtResource("44_mvkv4")
+
+[node name="KingdomHeartsGameBgPoster" type="Sprite2D" parent="MapElements"]
+texture_filter = 1
+position = Vector2(159, 57)
+texture = ExtResource("45_25b7g")
+
 [node name="Walls" type="Sprite2D" parent="MapElements"]
 z_index = 1
 texture_filter = 1
@ -869,6 +1061,7 @@ polygon = PackedVector2Array(158.522, 76.9076, 161.916, 75.961, 172.213, 75.961,
 script = ExtResource("9_df2wo")

 [node name="NPCs" type="Node2D" parent="."]
+visible = false
 y_sort_enabled = true
 position = Vector2(-297, 0)

@ -909,7 +1102,7 @@ frame_progress = 0.522916

 [node name="Sevi" type="AnimatedSprite2D" parent="NPCs"]
 texture_filter = 1
-position = Vector2(277, -102)
+position = Vector2(277, -101)
 sprite_frames = SubResource("SpriteFrames_nxs2l")
 autoplay = "default"
 frame_progress = 0.389513
@ -929,12 +1122,10 @@ position = Vector2(0, 80)

 [node name="BattleBarriers" type="Node2D" parent="."]
 process_mode = 4
-metadata/_edit_lock_ = true

 [node name="Barrier" type="StaticBody2D" parent="BattleBarriers"]
 collision_layer = 49
 collision_mask = 25
-metadata/_edit_lock_ = true

 [node name="CollisionShape2D4" type="CollisionPolygon2D" parent="BattleBarriers/Barrier"]
 polygon = PackedVector2Array(-84, -31, -76, -57, -43, -71, -84, -71)
@ -973,7 +1164,6 @@ detect_projectile_direction = 2
 [node name="CollisionShape2D3" type="CollisionShape2D" parent="BattleBarriers/CollidableBarrier3"]
 position = Vector2(-9, -97.5)
 shape = SubResource("RectangleShape2D_hkvwf")
-metadata/_edit_lock_ = true

 [connection signal="finished" from="CutsceneManager" to="." method="_on_cutscene_finished"]
 [connection signal="issued_command" from="CutsceneManager" to="." method="_on_cutscene_manager_issued_command"]