Fix ballpoint splatling range

Closes #2761
This commit is contained in:
Kalle 2026-01-21 17:46:01 +02:00
parent 1ffccd70de
commit d60a8b0d5e
3 changed files with 10 additions and 7 deletions

View File

@ -808,8 +808,8 @@ export const weaponParams = {
Mid: 1.125,
},
},
Range_SpawnSpeed: 1.1,
Range_GoStraightStateEndMaxSpeed: 1.027,
Range_SpawnSpeed: 2.21915,
Range_GoStraightStateEndMaxSpeed: 10,
Range_GoStraightToBrakeStateFrame: 8,
MoveSpeed: 0.086,
MoveSpeed_Charge: 0.086,

View File

@ -194,9 +194,9 @@ describe("calculateDamageCombos - one-shot exclusion", () => {
});
expect(comboWithSubAndOneShot).toBeDefined();
expect(
comboWithSubAndOneShot!.segments.some((s) => s.isSubWeapon),
).toBe(true);
expect(comboWithSubAndOneShot!.segments.some((s) => s.isSubWeapon)).toBe(
true,
);
expect(
comboWithSubAndOneShot!.segments.some((s) => s.damageValue >= 100),
).toBe(true);

View File

@ -343,9 +343,12 @@ function extractRangeParams(weapon: MainWeapon, params: any) {
const isSplatling = category === "SPLATLINGS";
if (isSplatling) {
const moveParam = params.MoveParam;
const isBallpoint = weapon.Id === 4030 || weapon.Id === 4031;
const moveParam = isBallpoint ? params.VariableMoveParam : params.MoveParam;
return {
Range_SpawnSpeed: moveParam?.SpawnSpeedFirstLastAndSecond,
Range_SpawnSpeed: isBallpoint
? moveParam?.SpawnSpeed
: moveParam?.SpawnSpeedFirstLastAndSecond,
Range_GoStraightStateEndMaxSpeed: moveParam?.GoStraightStateEndMaxSpeed,
Range_GoStraightToBrakeStateFrame: moveParam?.GoStraightToBrakeStateFrame,
};