From a27892488a8e633de3d169b44c6791f569b66924 Mon Sep 17 00:00:00 2001 From: Raxki Date: Sun, 27 Oct 2024 15:53:34 -0400 Subject: [PATCH] Make some tweaks --- Cutscenes/prototype_clone_victory.tres | 16 ++++++++-------- Hiro/Hiro Walk Sprite Cycle Line Up.png | 4 ++-- UI/battle_ui.tscn | 2 +- world/world.tscn | 8 +++++--- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Cutscenes/prototype_clone_victory.tres b/Cutscenes/prototype_clone_victory.tres index 1420d19..e97bfa2 100644 --- a/Cutscenes/prototype_clone_victory.tres +++ b/Cutscenes/prototype_clone_victory.tres @@ -41,8 +41,8 @@ message = &"show_reed" script = ExtResource("6_aee84") target_character = NodePath("../ReedAI") target_type = "Vector" -use_character_speed = true -speed = 300.0 +use_character_speed = false +speed = 70.0 animation_state = "cut_walk" target_vector = Vector2(0, 50) target_node = NodePath("..") @@ -100,6 +100,11 @@ time = 1.21667 script = ExtResource("1_wfaj3") message = &"scene_2" +[sub_resource type="Resource" id="Resource_tjwhc"] +script = ExtResource("4_joqmj") +music = ExtResource("9_ee6cr") +crossfade = true + [sub_resource type="Resource" id="Resource_t0ilw"] script = ExtResource("1_wfaj3") message = &"fade_in" @@ -200,13 +205,8 @@ portrait_emotion = "normal" messages = Array[String](["Go!!"]) textbox_direction = 0 -[sub_resource type="Resource" id="Resource_tjwhc"] -script = ExtResource("4_joqmj") -music = ExtResource("9_ee6cr") -crossfade = true - [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_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"), SubResource("Resource_tjwhc")]) +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")]) auto_start_on_load = true diff --git a/Hiro/Hiro Walk Sprite Cycle Line Up.png b/Hiro/Hiro Walk Sprite Cycle Line Up.png index 1b58cfe..add5233 100644 --- a/Hiro/Hiro Walk Sprite Cycle Line Up.png +++ b/Hiro/Hiro Walk Sprite Cycle Line Up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e98e4ccab03d23fdb74afa22bc378646e63cb932980e8e6c311e8e8bd5bd8ee -size 8555 +oid sha256:c1cb3bd231e06ca390254df1d0644ca4a89447f9283097b75b455afe3c3c4db4 +size 8805 diff --git a/UI/battle_ui.tscn b/UI/battle_ui.tscn index b206ab8..aeee708 100644 --- a/UI/battle_ui.tscn +++ b/UI/battle_ui.tscn @@ -49,7 +49,7 @@ texture_progress = ExtResource("4_vjleo") [node name="Spacer" type="Control" parent="MarginContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 -size_flags_stretch_ratio = 2.0 +size_flags_stretch_ratio = 3.5 [node name="EnemyBar" type="TextureProgressBar" parent="MarginContainer/HBoxContainer"] texture_filter = 1 diff --git a/world/world.tscn b/world/world.tscn index f2f105d..6441b6b 100644 --- a/world/world.tscn +++ b/world/world.tscn @@ -6,7 +6,7 @@ [ext_resource type="FontFile" uid="uid://bgqotudi6bifk" path="res://UI/Gundam 00 font gaufont.ttf" id="2_64thh"] [ext_resource type="Script" path="res://Scripts/UI/pause_menu.gd" id="2_nw73f"] [ext_resource type="PackedScene" uid="uid://bcwkugn6v3oy7" path="res://addons/godot_state_charts/utilities/state_chart_debugger.tscn" id="2_o5str"] -[ext_resource type="Resource" uid="uid://ck75kipijh0fn" path="res://Cutscenes/prototype_clone_victory.tres" id="3_f8ahk"] +[ext_resource type="Resource" uid="uid://bj3rm1r1ouq0r" path="res://Cutscenes/prototype_start.tres" id="3_s1wqq"] [ext_resource type="Texture2D" uid="uid://b40la2vyf4rn6" path="res://world/Fighting Dojo BG.png" id="4_elb6q"] [ext_resource type="AudioStream" uid="uid://b72f2jvv2283j" path="res://Audio/SFX/dialog_page.wav" id="6_vecai"] [ext_resource type="AudioStream" uid="uid://drossx2nhgeue" path="res://Audio/SFX/dialog_open.wav" id="7_lglyc"] @@ -137,7 +137,7 @@ script = ExtResource("1_y634h") [node name="CutsceneManager" type="Node" parent="."] script = ExtResource("19_5yvrq") -cutscene = ExtResource("3_f8ahk") +cutscene = ExtResource("3_s1wqq") [node name="MusicManager" parent="." instance=ExtResource("24_03wyf")] @@ -264,6 +264,7 @@ offset_right = 81.24 offset_bottom = 155.0 scale = Vector2(0.75, 0.75) size_flags_horizontal = 0 +enabled = false initial_node_to_watch = NodePath("../../../ReedAI") [node name="MapElements" type="Node2D" parent="."] @@ -351,7 +352,7 @@ attack_power = 10 position = Vector2(-55, 283) player_character = NodePath("../HiroPlayer") KNOCKBACK_REPOSITION_POWER = 90 -MELEE_RADIUS = 105 +MELEE_RADIUS = 80 reduce_recoil_time_threshold = 0.75 max_health = 400 health = 400 @@ -475,6 +476,7 @@ polygon = PackedVector2Array(-84, -31, -76, -57, -43, -71, -84, -71) [connection signal="defeated" from="ShadowClone" to="." method="_on_shadow_clone_defeated"] [connection signal="got_hurt" from="ShadowClone" to="SoundManager" method="_on_character_got_hurt"] [connection signal="got_hurt" from="ShadowClone" to="CanvasLayer/BattleUI" method="_on_enemy_got_hurt"] +[connection signal="attack_did_hit" from="ReedAI" to="HiroPlayer" method="_on_enemy_attack_did_hit"] [connection signal="attacked" from="ReedAI" to="SoundManager" method="_on_humanoid_character_attacked"] [connection signal="defeated" from="ReedAI" to="." method="_on_reed_ai_defeated" flags=7] [connection signal="got_hurt" from="ReedAI" to="SoundManager" method="_on_character_got_hurt"]