From 376a40d38c588f3eacd41dcb6942650e11ca7491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Rom=C3=A1n=20N=C3=BA=C3=B1ez?= Date: Sun, 13 Sep 2026 23:28:40 +0200 Subject: [PATCH] Updated game settings and fighter assets --- assets/fighters/test/scripts/fair.attack.rhai | 8 +- assets/fighters/test/scripts/jab.attack.rhai | 12 +++ .../fighters/test/scripts/uptilt.attack.rhai | 13 +++ assets/fighters/test/test.fighter.ron | 14 ++-- assets/game_settings.ron | 8 +- assets/ui/textures/fighter_select_token.png | Bin 0 -> 5986 bytes assets/ui/textures/fighter_select_token.svg | 77 ++++++++++++++++++ 7 files changed, 121 insertions(+), 11 deletions(-) create mode 100644 assets/fighters/test/scripts/jab.attack.rhai create mode 100644 assets/fighters/test/scripts/uptilt.attack.rhai create mode 100644 assets/ui/textures/fighter_select_token.png create mode 100644 assets/ui/textures/fighter_select_token.svg diff --git a/assets/fighters/test/scripts/fair.attack.rhai b/assets/fighters/test/scripts/fair.attack.rhai index 23ce9dd..67b56e3 100644 --- a/assets/fighters/test/scripts/fair.attack.rhai +++ b/assets/fighters/test/scripts/fair.attack.rhai @@ -1,12 +1,12 @@ -frame(3); +frame(4); hitbox(0, - "Foot.L", + "hand_l", damage("5.0"), vec3("0.0", "0.0", "0.0"), - fg32("20.0"), + fg32("5.0"), angle_sakurai(), knockback_normal(), knockback("10.0"), fg32("1.0") ); -frame(6); \ No newline at end of file +frame(8); diff --git a/assets/fighters/test/scripts/jab.attack.rhai b/assets/fighters/test/scripts/jab.attack.rhai new file mode 100644 index 0000000..8c5e91a --- /dev/null +++ b/assets/fighters/test/scripts/jab.attack.rhai @@ -0,0 +1,12 @@ +frame(3); +hitbox(0, + "hand_l", + damage("5.0"), + vec3("0.0", "0.0", "0.0"), + fg32("5.0"), + angle(fg32("45.0")), + knockback_normal(), + knockback("18.0"), + fg32("140.0") +); +frame(8); diff --git a/assets/fighters/test/scripts/uptilt.attack.rhai b/assets/fighters/test/scripts/uptilt.attack.rhai new file mode 100644 index 0000000..57952b1 --- /dev/null +++ b/assets/fighters/test/scripts/uptilt.attack.rhai @@ -0,0 +1,13 @@ +frame(9); +hitbox(0, + "hand_l", + damage("5.0"), + vec3("1.0", "0.0", "0.0"), + fg32("7.0"), + angle_sakurai(), + knockback_normal(), + knockback("10.0"), + fg32("1.0") +); + +frame(15); diff --git a/assets/fighters/test/test.fighter.ron b/assets/fighters/test/test.fighter.ron index 6ec9de7..733fd29 100644 --- a/assets/fighters/test/test.fighter.ron +++ b/assets/fighters/test/test.fighter.ron @@ -15,10 +15,10 @@ dash_duration: 24, base_dash_accel: "0.1", stick_dash_accel: "0.05", - max_dash_vel: "2.3", - short_hop_vertical_velocity: "1.35", - full_jump_vertical_velocity: "2.1", - jump_horizontal_velocity: "0.7", + max_dash_vel: "2.0", + short_hop_vertical_velocity: "1.45", + full_jump_vertical_velocity: "2.0", + jump_horizontal_velocity: "0.6", air_jump_horizontal_velocity: "0.96", air_jump_multiplier: "1.0", dash_initial_velocity: "1.4", @@ -63,6 +63,10 @@ DoubleJumpBack: "JumpB_Game", Fall: "Fall_Loop_Game", Turn: "Turn_Game", + + FlinchGround: "Air_Hit_Game", + FlinchAir: "Air_Hit_Game", + AttackJab1: "Punch_Jab_Game", AttackUpTilt: "Idle_Loop_Game", AttackForwardTilt: "Idle_Loop_Game", @@ -70,7 +74,7 @@ }, attack_scripts: { NeutralAir: "fighters/test/scripts/fair.attack.rhai", - Jab: "fighters/test/scripts/fair.attack.rhai", + Jab: "fighters/test/scripts/jab.attack.rhai", UpTilt: "fighters/test/scripts/uptilt.attack.rhai", ForwardTilt: "fighters/test/scripts/uptilt.attack.rhai", DownTilt: "fighters/test/scripts/uptilt.attack.rhai", diff --git a/assets/game_settings.ron b/assets/game_settings.ron index 3974fb0..030d522 100644 --- a/assets/game_settings.ron +++ b/assets/game_settings.ron @@ -8,12 +8,16 @@ smash_input_frame_threshold: 3, input_buffer_size: 3, turn_into_dashback_window: 2, - ), fighter_common: ( walk_speed_ease: "0.5", ground_max_horizontal_velocity: "3.0", - ground_friction_over_walk_speed_multiplier: "2.0" + ground_friction_over_walk_speed_multiplier: "2.0", + knockback_stacking_window: 2, + knockback_decay_per_frame: "0.051", + knockback_launch_velocity_multiplier: "0.03", + hitstun_frames_per_unit_knockback: "0.4", + ), stage_manifest_paths: [ "stages/battlefield/test.stage.ron" diff --git a/assets/ui/textures/fighter_select_token.png b/assets/ui/textures/fighter_select_token.png new file mode 100644 index 0000000000000000000000000000000000000000..56bed671c9f315a022c2f132088f4f8c0589dffd GIT binary patch literal 5986 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 literal 0 HcmV?d00001 diff --git a/assets/ui/textures/fighter_select_token.svg b/assets/ui/textures/fighter_select_token.svg new file mode 100644 index 0000000..fe2dbad --- /dev/null +++ b/assets/ui/textures/fighter_select_token.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + +