Fix Tri-Stringer/Wellstring range in comp analyzer

This commit is contained in:
Kalle
2026-04-06 13:56:14 +03:00
parent 7a230b6618
commit ca229863ab
4 changed files with 9 additions and 4 deletions

View File

@@ -1005,6 +1005,7 @@ export const weaponParams = {
Range_GoStraightStateEndMaxSpeed: 10,
Range_GoStraightToBrakeStateFrame: 4,
Range_FreeGravity: 0.15,
Range_FreeAirResist: 0.24,
Range_BrakeAirResist: 0.1,
Range_BrakeGravity: 0.04,
Range_BrakeToFreeStateFrame: 1,
@@ -1026,6 +1027,7 @@ export const weaponParams = {
Range_GoStraightStateEndMaxSpeed: 10,
Range_GoStraightToBrakeStateFrame: 4,
Range_FreeGravity: 0.15,
Range_FreeAirResist: 0.24,
Range_BrakeAirResist: 0.1,
Range_BrakeGravity: 0.04,
Range_BrakeToFreeStateFrame: 1,
@@ -1042,6 +1044,7 @@ export const weaponParams = {
Range_GoStraightStateEndMaxSpeed: 10,
Range_GoStraightToBrakeStateFrame: 4,
Range_FreeGravity: 0.15,
Range_FreeAirResist: 0.24,
Range_BrakeAirResist: 0.1,
Range_BrakeGravity: 0.04,
Range_BrakeToFreeStateFrame: 1,

View File

@@ -6,8 +6,9 @@ import { getWeaponsWithRange } from "./weapon-range";
const RANGE_COMPARISONS: [MainWeaponId, MainWeaponId][] = [
[220, 210], // Range Blaster > Blaster
[70, 40], // Splattershot Pro > Splattershot
// [2020, 7030], // Splatterscope > Wellstring V TODO: a failing case
// [2070, 7010], // Snipewriter 5H > Tri-Stringer TODO: a failing case
[7010, 7030], // Tri-Stringer > Wellstring V
[2020, 7030], // Splatterscope > Wellstring V
[2070, 7010], // Snipewriter 5H > Tri-Stringer
];
describe("weapon range comparisons", () => {

View File

@@ -94,7 +94,7 @@ function simulateTrajectoryPoints(params: TrajectoryParams): TrajectoryPoint[] {
for (let i = 0; i < brakeToFreeFrame && frame < maxFrames; i++) {
vz *= 1 - brakeAirResist;
vy -= brakeGravity;
vy = (1 - brakeAirResist) * vy - brakeGravity;
z += vz;
y += vy;
points.push({ z, y });
@@ -117,7 +117,7 @@ function simulateTrajectoryPoints(params: TrajectoryParams): TrajectoryPoint[] {
while (frame < maxFrames) {
vz *= 1 - freeAirResist;
vy -= freeGravity;
vy = (1 - freeAirResist) * vy - freeGravity;
z += vz;
y += vy;

View File

@@ -349,6 +349,7 @@ function extractRangeParams(weapon: MainWeapon, params: any) {
Range_GoStraightStateEndMaxSpeed: moveParam?.GoStraightStateEndMaxSpeed,
Range_GoStraightToBrakeStateFrame: moveParam?.GoStraightToBrakeStateFrame,
Range_FreeGravity: moveParam?.FreeGravity,
Range_FreeAirResist: moveParam?.FreeAirResist,
Range_BrakeAirResist: moveParam?.BrakeAirResist,
Range_BrakeGravity: moveParam?.BrakeGravity,
Range_BrakeToFreeStateFrame: moveParam?.BrakeToFreeStateFrame,