diff --git a/app/features/build-analyzer/data/weapon-params.ts b/app/features/build-analyzer/data/weapon-params.ts index 75f64bfd9..c1a5fbcc1 100644 --- a/app/features/build-analyzer/data/weapon-params.ts +++ b/app/features/build-analyzer/data/weapon-params.ts @@ -550,12 +550,6 @@ export const weaponParams = { InkConsumeMinCharge: 0.0225, }, "2030": { - overwrites: { - ConsumeRt_Main: { - High: 0.5, - Mid: 0.7, - }, - }, DistanceFullCharge: 29.05, DistanceMaxCharge: 29.05, DistanceMinCharge: 9.045, @@ -570,12 +564,6 @@ export const weaponParams = { InkConsumeMinCharge: 0.0225, }, "2040": { - overwrites: { - ConsumeRt_Main: { - High: 0.5, - Mid: 0.7, - }, - }, DistanceFullCharge: 31.05, DistanceMaxCharge: 29.05, DistanceMinCharge: 9.045, @@ -624,8 +612,8 @@ export const weaponParams = { DamageParam_ValueMinCharge: 400, ChargeFrameFullCharge: 72, InkRecoverStop: 20, - InkConsumeFullCharge: 0.35, - InkConsumeMinCharge: 0.0197, + InkConsumeFullCharge: 0.375, + InkConsumeMinCharge: 0.0211, }, "3000": { Range_SpawnSpeed: 1.7609, @@ -656,7 +644,7 @@ export const weaponParams = { DamageParam_ValueDirectMax: 620, DamageParam_ValueDirectMin: 350, InkRecoverStop: 35, - InkConsumeSlosher: 0.06, + InkConsumeSlosher: 0.057, }, "3020": { Range_SpawnSpeed: 1.4737, @@ -1193,6 +1181,11 @@ export const weaponParams = { subWeaponId: 1, specialWeaponId: 1, }, + "48": { + SpecialPoint: 190, + subWeaponId: 0, + specialWeaponId: 14, + }, "50": { SpecialPoint: 210, subWeaponId: 4, @@ -1224,7 +1217,7 @@ export const weaponParams = { specialWeaponId: 6, }, "72": { - SpecialPoint: 190, + SpecialPoint: 180, subWeaponId: 0, specialWeaponId: 4, }, @@ -1714,7 +1707,7 @@ export const weaponParams = { specialWeaponId: 6, }, "4021": { - SpecialPoint: 200, + SpecialPoint: 190, subWeaponId: 10, specialWeaponId: 19, }, @@ -1894,7 +1887,7 @@ export const weaponParams = { specialWeaponId: 9, }, "7011": { - SpecialPoint: 190, + SpecialPoint: 200, subWeaponId: 3, specialWeaponId: 16, }, @@ -2326,9 +2319,9 @@ export const weaponParams = { }, ], DirectDamage: 2200, - Range_SpawnSpeed: 1, + Range_SpawnSpeed: 1.125, Range_GoStraightStateEndMaxSpeed: 1, - Range_GoStraightToBrakeStateFrame: 18, + Range_GoStraightToBrakeStateFrame: 16, Range_FreeGravity: 0.0190565, Range_FreeAirResist: 0.01985, Range_BrakeAirResist: 0.09, @@ -2696,14 +2689,14 @@ export const weaponParams = { DistanceDamage: [ { Damage: 2200, - Distance: 7, + Distance: 6.4, }, { Damage: 600, - Distance: 10.5, + Distance: 9.6, }, ], - Range_Radius: 7, + Range_Radius: 6.4, }, "19": { overwrites: { diff --git a/app/features/build-analyzer/routes/analyzer.tsx b/app/features/build-analyzer/routes/analyzer.tsx index 8833c816b..dfefaff54 100644 --- a/app/features/build-analyzer/routes/analyzer.tsx +++ b/app/features/build-analyzer/routes/analyzer.tsx @@ -90,7 +90,7 @@ import { buildStats } from "../core/stats"; import { buildIsEmpty, damageIsSubWeaponDamage } from "../core/utils"; import styles from "./analyzer.module.css"; -export const CURRENT_PATCH = "11.2"; +export const CURRENT_PATCH = "11.3"; export const meta: MetaFunction = (args) => { return metaTags({ diff --git a/app/features/builds/builds-constants.ts b/app/features/builds/builds-constants.ts index 10b268449..25a55b754 100644 --- a/app/features/builds/builds-constants.ts +++ b/app/features/builds/builds-constants.ts @@ -12,6 +12,7 @@ type Patch = { patch: string; date: string }; * used by both the builds date filter and the weapon params patch history. */ export const PATCHES: Array = [ + { patch: "11.3.0", date: "2026-08-19" }, { patch: "11.2.0", date: "2026-06-10" }, { patch: "11.1.0", date: "2026-03-18" }, { patch: "11.0.1", date: "2026-02-10" }, diff --git a/app/features/object-damage-calculator/data/object-dmg.json b/app/features/object-damage-calculator/data/object-dmg.json index 5e882f109..792124add 100644 --- a/app/features/object-damage-calculator/data/object-dmg.json +++ b/app/features/object-damage-calculator/data/object-dmg.json @@ -4400,7 +4400,7 @@ ] }, "Shooter": { - "mainWeaponIds": [400, 401, 40, 41, 42, 45, 47, 46, 100, 101, 60, 61], + "mainWeaponIds": [400, 401, 40, 41, 42, 45, 47, 46, 48, 100, 101, 60, 61], "subWeaponIds": [], "specialWeaponIds": [], "rates": [ diff --git a/app/features/object-damage-calculator/routes/object-damage-calculator.tsx b/app/features/object-damage-calculator/routes/object-damage-calculator.tsx index d701e2472..9504be513 100644 --- a/app/features/object-damage-calculator/routes/object-damage-calculator.tsx +++ b/app/features/object-damage-calculator/routes/object-damage-calculator.tsx @@ -43,7 +43,7 @@ import { useObjectDamage } from "../calculator-hooks"; import type { DamageReceiver } from "../calculator-types"; import styles from "./object-damage-calculator.module.css"; -export const CURRENT_PATCH = "11.2"; +export const CURRENT_PATCH = "11.3"; export const shouldRevalidate: ShouldRevalidateFunction = () => false; diff --git a/app/features/params/data/all-version-special-params.json b/app/features/params/data/all-version-special-params.json index 8bfa776b3..5cd640925 100644 --- a/app/features/params/data/all-version-special-params.json +++ b/app/features/params/data/all-version-special-params.json @@ -1,7 +1,7 @@ { "metadata": { - "generatedAt": "2026-06-15T13:59:10.026Z", - "latestVersion": "11.2.0", + "generatedAt": "2026-08-21T04:38:57.937Z", + "latestVersion": "11.3.0", "versions": [ "0.9.9", "1.0.0", @@ -33,7 +33,8 @@ "11.0.0", "11.0.1", "11.1.0", - "11.2.0" + "11.2.0", + "11.3.0" ] }, "weapons": { @@ -112,8 +113,10 @@ "FreeAirResist": 0.01985, "FreeGravity": 0.0190565, "GoStraightStateEndMaxSpeed": 1, - "GoStraightToBrakeStateFrame": 18, - "SpawnSpeed": 1 + "GoStraightToBrakeStateFrame": 16, + "SpawnSpeed": 1.125, + "GoStraightToBrakeStateFrame@11.2.0": 18, + "SpawnSpeed@11.2.0": 1 }, "UltraShotMoveParam": { "OrbitalRadiusEnd": 1, @@ -1883,11 +1886,11 @@ "DistanceDamage": [ { "Damage": 2200, - "Distance": 7 + "Distance": 6.4 }, { "Damage": 600, - "Distance": 10.5 + "Distance": 9.6 } ], "KnockBackParam": { @@ -1924,6 +1927,16 @@ } } ], + "DistanceDamage@11.2.0": [ + { + "Damage": 2200, + "Distance": 7 + }, + { + "Damage": 600, + "Distance": 10.5 + } + ], "DistanceDamage@7.1.0": [ { "Damage": 2200, @@ -1960,11 +1973,11 @@ "DistanceDamage": [ { "Damage": 2200, - "Distance": 7 + "Distance": 6.4 }, { "Damage": 600, - "Distance": 10.5 + "Distance": 9.6 } ], "KnockBackParam": { @@ -2000,6 +2013,16 @@ } } ], + "DistanceDamage@11.2.0": [ + { + "Damage": 2200, + "Distance": 7 + }, + { + "Damage": 600, + "Distance": 10.5 + } + ], "DistanceDamage@7.1.0": [ { "Damage": 2200, @@ -2031,19 +2054,21 @@ "BulletParam": { "HitPoint": 1000, "MoveCollisionHeight": [2, 1.5, 1, 0.5], - "MoveDistance": 6, + "MoveDistance": 6.54, "MoveFrame": 15, "StartInvincibleFrame": 55, "SuperJumpWaitFrame0": 30, "SuperJumpWaitFrame1": 60, "WaitRiseFrame": 0, + "MoveDistance@11.2.0": 6, "StartInvincibleFrame@7.1.0": 65 }, "spl__WeaponSpPogoParam": { "Rise_Frame": 60, - "Rise_NoDamageStartFrame": 60, + "Rise_NoDamageStartFrame": 50, "SpecialTotalFrame": 60, "Rise_Frame@7.1.0": 70, + "Rise_NoDamageStartFrame@11.2.0": 60, "Rise_NoDamageStartFrame@7.1.0": 70, "SpecialTotalFrame@7.1.0": 70 } diff --git a/app/features/params/data/all-version-sub-params.json b/app/features/params/data/all-version-sub-params.json index f0b221576..d97939552 100644 --- a/app/features/params/data/all-version-sub-params.json +++ b/app/features/params/data/all-version-sub-params.json @@ -1,7 +1,7 @@ { "metadata": { - "generatedAt": "2026-06-15T13:59:10.026Z", - "latestVersion": "11.2.0", + "generatedAt": "2026-08-21T04:38:57.937Z", + "latestVersion": "11.3.0", "versions": [ "0.9.9", "1.0.0", @@ -33,7 +33,8 @@ "11.0.0", "11.0.1", "11.1.0", - "11.2.0" + "11.2.0", + "11.3.0" ] }, "weapons": { diff --git a/app/features/params/data/all-version-weapon-params.json b/app/features/params/data/all-version-weapon-params.json index 6d8be0904..a1c21a1d2 100644 --- a/app/features/params/data/all-version-weapon-params.json +++ b/app/features/params/data/all-version-weapon-params.json @@ -1,7 +1,7 @@ { "metadata": { - "generatedAt": "2026-06-15T13:59:10.026Z", - "latestVersion": "11.2.0", + "generatedAt": "2026-08-21T04:38:57.937Z", + "latestVersion": "11.3.0", "versions": [ "0.9.9", "1.0.0", @@ -33,7 +33,8 @@ "11.0.0", "11.0.1", "11.1.0", - "11.2.0" + "11.2.0", + "11.3.0" ] }, "weapons": { @@ -536,9 +537,10 @@ "DepthScaleMin": 1.31, "DepthScaleMinBreakFree": 1.12, "DistanceMiddle": 1.1, - "WidthHalfFar": 2.25, + "WidthHalfFar": 2.07, "WidthHalfMiddle": 2.11, - "WidthHalfNear": 2.11 + "WidthHalfNear": 2.11, + "WidthHalfFar@11.2.0": 2.25 }, "SplashPaintParam": { "DepthMaxDropHeight": 3, @@ -2775,9 +2777,10 @@ "Damage": 700, "PaintParam": { "Depth": 1.5, - "SpeedMax": 0.152, + "SpeedMax": 0.16, "WidthAddWallCut": 0.4, - "WidthHalfMax": 2.2 + "WidthHalfMax": 2.2, + "SpeedMax@11.2.0": 0.152 }, "SideParam": { "CheckLength": 1.3, @@ -2815,9 +2818,9 @@ "DamageRejectRate": 0.5, "DamageRejectStartFrame": 30, "Inside": { - "DamageHighDistance": 11.2, + "DamageHighDistance": 12.43, "DamageHighValue": 500, - "DamageLowDistance": 11.2, + "DamageLowDistance": 12.43, "DamageLowValue": 500, "DamageMaxDistance": 4.2, "DamageMaxValue": 1200, @@ -2826,12 +2829,14 @@ "Degree": 5, "DepletionDamageRate": 0.5, "FinalDamageMinValue": 350, - "InsideDistanceXZ": 0 + "InsideDistanceXZ": 0, + "DamageHighDistance@11.2.0": 11.2, + "DamageLowDistance@11.2.0": 11.2 }, "Outside": { - "DamageHighDistance": 11.2, + "DamageHighDistance": 12.43, "DamageHighValue": 500, - "DamageLowDistance": 11.2, + "DamageLowDistance": 12.43, "DamageLowValue": 500, "DamageMaxDistance": 4.2, "DamageMaxValue": 1200, @@ -2840,7 +2845,9 @@ "DamageRate": 1, "Degree": 20, "DepletionDamageRate": 0.5, - "FinalDamageMinValue": 350 + "FinalDamageMinValue": 350, + "DamageHighDistance@11.2.0": 11.2, + "DamageLowDistance@11.2.0": 11.2 } }, "SpawnSplashBetweenLength": 4.2, @@ -3461,12 +3468,14 @@ "InkConsumeMaxPerFrame": 0.001, "InkConsumeMinPerFrame": 0.0002, "InkRecoverStop": 20, - "SpeedDash": 0.152, + "SpeedDash": 0.16, "SpeedDashTurnBreak": 0.128, - "SpeedInkConsumeMax": 0.152, + "SpeedInkConsumeMax": 0.16, "SpeedInkConsumeMin": 0.02, "SpeedNormal": 0.128, - "DashFrame@3.1.0": 30 + "DashFrame@3.1.0": 30, + "SpeedDash@11.2.0": 0.152, + "SpeedInkConsumeMax@11.2.0": 0.152 }, "WeaponVerticalSwingParam": { "InkConsume": 0.0396, @@ -10725,9 +10734,11 @@ }, "MainEffectiveRangeUpParam": {}, "MainWeaponSetting": { - "Overwrite_ConsumeRt_Main_High": 0.5, - "Overwrite_ConsumeRt_Main_Mid": 0.7, - "WeaponSpeedType": "Slow" + "Overwrite_ConsumeRt_Main_High": -1, + "Overwrite_ConsumeRt_Main_Mid": -1, + "WeaponSpeedType": "Slow", + "Overwrite_ConsumeRt_Main_High@11.2.0": 0.5, + "Overwrite_ConsumeRt_Main_Mid@11.2.0": 0.7 }, "MoveParam": { "DistanceFullCharge": 29.05, @@ -10830,9 +10841,11 @@ }, "MainEffectiveRangeUpParam": {}, "MainWeaponSetting": { - "Overwrite_ConsumeRt_Main_High": 0.5, - "Overwrite_ConsumeRt_Main_Mid": 0.7, - "WeaponSpeedType": "Slow" + "Overwrite_ConsumeRt_Main_High": -1, + "Overwrite_ConsumeRt_Main_Mid": -1, + "WeaponSpeedType": "Slow", + "Overwrite_ConsumeRt_Main_High@11.2.0": 0.5, + "Overwrite_ConsumeRt_Main_Mid@11.2.0": 0.7 }, "MoveParam": { "DistanceFullCharge": 31.05, @@ -11219,15 +11232,17 @@ "ChargeFrameMinCharge": 8, "FreezeFrameFullCharge": 1, "FreezeFrameMinCharge": 1, - "InkConsumeFullCharge": 0.35, - "InkConsumeMinCharge": 0.0197, + "InkConsumeFullCharge": 0.375, + "InkConsumeMinCharge": 0.0211, "InkEmptyChargeTimes": 3, "InkRecoverStop": 20, "JumpHeightFullCharge": 0.1, "MoveJumpDownBias": 0.5, "MoveSpeedFullCharge": 0.068, "PostDelayFrame": 15, + "InkConsumeFullCharge@11.2.0": 0.35, "InkConsumeFullCharge@3.1.0": 0.4, + "InkConsumeMinCharge@11.2.0": 0.0197, "InkConsumeMinCharge@3.1.0": 0.0225, "MoveSpeedFullCharge@3.1.0": 0.06 } @@ -16170,7 +16185,7 @@ "WeaponParam": { "FrameOffsetMaxDegree": 1.5, "FrameOffsetMaxMoveLength": 0.5, - "InkConsume": 0.06, + "InkConsume": 0.057, "InkRecoverStop": 35, "MoveLmtFrame": 30, "MoveSpeed": 0.066, @@ -16181,7 +16196,8 @@ "Frame": 13, "UnitOrderNum": 0 }, - "SwingLiftFrame": 12 + "SwingLiftFrame": 12, + "InkConsume@11.2.0": 0.06 }, "spl__SpawnBulletAdditionMovePlayerParam": { "GuideYMinusZero": true, @@ -22272,7 +22288,7 @@ "Jump_DegBiasEndFrame": 70, "Jump_DegBiasMax": 0.4, "Jump_DegSwerve": 8, - "LapOver_DegSwerve": 3, + "LapOver_DegSwerve": 2.7, "LapOver_RepeatFrame": 9, "MoveSpeed": 0.06, "PreDelayFrame_SquidShot": 4, @@ -22281,7 +22297,8 @@ "Stand_DegBiasDecrease": 0.005, "Stand_DegBiasKf": 0.03, "Stand_DegBiasMin": 0.03, - "Stand_DegSwerve": 3.2 + "Stand_DegSwerve": 3.2, + "LapOver_DegSwerve@11.2.0": 3 }, "spl__SpawnBulletAdditionMovePlayerParam": { "ZRate": 2 @@ -23869,7 +23886,9 @@ }, "SplashPaintParam": { "DepthScaleMax": 2.7, - "WidthHalf": 1.48, + "WidthHalf": 1.39, + "WidthHalfNearest": 1.683, + "WidthHalf@11.2.0": 1.48, "WidthHalf@7.2.0": 1.35 }, "SplashSpawnParam": { @@ -26002,6 +26021,10 @@ } ] }, + "48": { + "current": 190, + "history": [] + }, "50": { "current": 210, "history": [ @@ -26080,8 +26103,13 @@ ] }, "72": { - "current": 190, - "history": [] + "current": 180, + "history": [ + { + "version": "11.2.0", + "value": 190 + } + ] }, "80": { "current": 190, @@ -26884,8 +26912,13 @@ "history": [] }, "4021": { - "current": 200, - "history": [] + "current": 190, + "history": [ + { + "version": "11.2.0", + "value": 200 + } + ] }, "4022": { "current": 200, @@ -27141,8 +27174,13 @@ ] }, "7011": { - "current": 190, - "history": [] + "current": 200, + "history": [ + { + "version": "11.2.0", + "value": 190 + } + ] }, "7012": { "current": 200, diff --git a/app/features/params/data/damage-rate-history.json b/app/features/params/data/damage-rate-history.json index ae2b3a7c2..f3a8c7439 100644 --- a/app/features/params/data/damage-rate-history.json +++ b/app/features/params/data/damage-rate-history.json @@ -31,7 +31,8 @@ "11.0.0", "11.0.1", "11.1.0", - "11.2.0" + "11.2.0", + "11.3.0" ] }, "rows": { diff --git a/app/features/scanner/core/detectors/death/localized-messages.ts b/app/features/scanner/core/detectors/death/localized-messages.ts index 5129b9c46..8306dd93b 100644 --- a/app/features/scanner/core/detectors/death/localized-messages.ts +++ b/app/features/scanner/core/detectors/death/localized-messages.ts @@ -602,6 +602,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "章鱼射击枪 复制", name: "Octo Shot Replica", }, + { + text: "塑料瓶射击枪 复制", + name: "Plastic-Bottle Shot Replica", + }, { text: "窄域标记枪", name: "Splash-o-matic", @@ -1420,6 +1424,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "Okto-Kleckser Replik", name: "Octo Shot Replica", }, + { + text: "PET-Kleckser Replik", + name: "Plastic-Bottle Shot Replica", + }, { text: "Fein-Disperser", name: "Splash-o-matic", @@ -2222,6 +2230,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "Pistola octariana (réplica)", name: "Octo Shot Replica", }, + { + text: "Lanzatintas de plástico (réplica)", + name: "Plastic-Bottle Shot Replica", + }, { text: "Marcador fino", name: "Splash-o-matic", @@ -3044,6 +3056,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "Lanceur Octaling (réplique)", name: "Octo Shot Replica", }, + { + text: "Liquidateur soda (réplique)", + name: "Plastic-Bottle Shot Replica", + }, { text: "Marqueur léger", name: "Splash-o-matic", @@ -3858,6 +3874,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "Octosplasher replica", name: "Octo Shot Replica", }, + { + text: "Splasher frizzante replica", + name: "Plastic-Bottle Shot Replica", + }, { text: "Marker d'assalto", name: "Splash-o-matic", @@ -4640,6 +4660,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "Octospetter (replica)", name: "Octo Shot Replica", }, + { + text: "SupersPETter (replica)", + name: "Plastic-Bottle Shot Replica", + }, { text: "Spetterspuit", name: "Splash-o-matic", @@ -5446,6 +5470,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "Осьмострел (клон)", name: "Octo Shot Replica", }, + { + text: "Ботлострел (клон)", + name: "Plastic-Bottle Shot Replica", + }, { text: "Плюхомет", name: "Splash-o-matic", @@ -6272,6 +6300,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "オクタシューター レプリカ", name: "Octo Shot Replica", }, + { + text: "PETシューター レプリカ", + name: "Plastic-Bottle Shot Replica", + }, { text: "シャープマーカー", name: "Splash-o-matic", @@ -7098,6 +7130,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "옥타 슈터 레플리카", name: "Octo Shot Replica", }, + { + text: "PET 슈터 레플리카", + name: "Plastic-Bottle Shot Replica", + }, { text: "샤프 마커", name: "Splash-o-matic", @@ -7924,6 +7960,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "章魚射擊槍 複製", name: "Octo Shot Replica", }, + { + text: "寶特瓶射擊槍 複製", + name: "Plastic-Bottle Shot Replica", + }, { text: "窄域標記槍", name: "Splash-o-matic", @@ -8750,6 +8790,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "Rociador octariano réplica", name: "Octo Shot Replica", }, + { + text: "Rociador PET réplica", + name: "Plastic-Bottle Shot Replica", + }, { text: "Plumón", name: "Splash-o-matic", @@ -9572,6 +9616,10 @@ export const LOCALIZED_WEAPON_NAMES: Readonly< text: "Lanceur octaling (réplique)", name: "Octo Shot Replica", }, + { + text: "Liquéficateur liqueur (réplique)", + name: "Plastic-Bottle Shot Replica", + }, { text: "Marqueur léger", name: "Splash-o-matic", diff --git a/app/features/scanner/core/detectors/death/weapon-names.ts b/app/features/scanner/core/detectors/death/weapon-names.ts index d94246951..1290d67d2 100644 --- a/app/features/scanner/core/detectors/death/weapon-names.ts +++ b/app/features/scanner/core/detectors/death/weapon-names.ts @@ -32,6 +32,7 @@ const WEAPON_NAMES: ReadonlyMap = new Map([ ["45", "Hero Shot Replica"], ["46", "Octo Shot Replica"], ["47", "Order Shot Replica"], + ["48", "Plastic-Bottle Shot Replica"], ["50", ".52 Gal"], ["51", ".52 Gal Deco"], ["60", "N-ZAP '85"], diff --git a/app/modules/in-game-lists/game-badge-ids.ts b/app/modules/in-game-lists/game-badge-ids.ts index d0a44024e..3ba142e91 100644 --- a/app/modules/in-game-lists/game-badge-ids.ts +++ b/app/modules/in-game-lists/game-badge-ids.ts @@ -1072,6 +1072,13 @@ export const GAME_BADGE_IDS = [ "WeaponLevel_Shooter_Normal_Oct_Lv04", "WeaponLevel_Shooter_Normal_Oct_Lv05", "WeaponLevel_Shooter_Normal_Oct_Lv06", + "WeaponLevel_Shooter_Normal_S_Lv00", + "WeaponLevel_Shooter_Normal_S_Lv01", + "WeaponLevel_Shooter_Normal_S_Lv02", + "WeaponLevel_Shooter_Normal_S_Lv03", + "WeaponLevel_Shooter_Normal_S_Lv04", + "WeaponLevel_Shooter_Normal_S_Lv05", + "WeaponLevel_Shooter_Normal_S_Lv06", "WeaponLevel_Shooter_Precision_00_Lv00", "WeaponLevel_Shooter_Precision_00_Lv01", "WeaponLevel_Shooter_Precision_00_Lv02", diff --git a/app/modules/in-game-lists/weapon-ids.test.ts b/app/modules/in-game-lists/weapon-ids.test.ts index 3bddc68cb..887efcac5 100644 --- a/app/modules/in-game-lists/weapon-ids.test.ts +++ b/app/modules/in-game-lists/weapon-ids.test.ts @@ -21,9 +21,9 @@ describe("weaponIdToArrayWithAlts", () => { }); test("handles weapon id with only one alt", () => { - const id = 41; + const id = 200; const result = weaponIdToArrayWithAlts(id); - expect(result).toEqual([41, 46]); + expect(result).toEqual([200, 205]); }); }); diff --git a/app/modules/in-game-lists/weapon-ids.ts b/app/modules/in-game-lists/weapon-ids.ts index 1da74305f..ca9781bb4 100644 --- a/app/modules/in-game-lists/weapon-ids.ts +++ b/app/modules/in-game-lists/weapon-ids.ts @@ -5,9 +5,9 @@ export const weaponCategories = [ { name: "SHOOTERS", weaponIds: [ - 0, 1, 10, 11, 20, 21, 22, 30, 31, 32, 40, 41, 42, 45, 46, 47, 50, 51, 60, - 61, 70, 71, 72, 80, 81, 82, 90, 91, 92, 100, 101, 300, 301, 302, 310, 311, - 312, 400, 401, + 0, 1, 10, 11, 20, 21, 22, 30, 31, 32, 40, 41, 42, 45, 46, 47, 48, 50, 51, + 60, 61, 70, 71, 72, 80, 81, 82, 90, 91, 92, 100, 101, 300, 301, 302, 310, + 311, 312, 400, 401, ], }, { @@ -78,7 +78,7 @@ export const mainWeaponIds = weaponCategories const weaponIdToAltId = new Map([ [40, [45, 47]], - [41, 46], + [41, [46, 48]], [200, 205], [1010, 1015], [1110, 1115], @@ -94,6 +94,7 @@ const altWeaponIdToId = new Map([ [45, 40], [47, 40], [46, 41], + [48, 41], [205, 200], [1015, 1010], [1115, 1110], diff --git a/locales/da/game-badges.json b/locales/da/game-badges.json index bc081946f..5a84b46d5 100644 --- a/locales/da/game-badges.json +++ b/locales/da/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "8★ Octo Shot Replica User", "WeaponLevel_Shooter_Normal_Oct_Lv05": "9★ Octo Shot Replica User", "WeaponLevel_Shooter_Normal_Oct_Lv06": "10★ Octo Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv00": "4★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv01": "5★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv02": "6★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv03": "7★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv04": "8★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv05": "9★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv06": "10★ Plastic-Bottle Shot Replica User", "WeaponLevel_Shooter_Precision_00_Lv00": "4★ Splash-o-matic User", "WeaponLevel_Shooter_Precision_00_Lv01": "5★ Splash-o-matic User", "WeaponLevel_Shooter_Precision_00_Lv02": "6★ Splash-o-matic User", diff --git a/locales/da/weapons.json b/locales/da/weapons.json index 46b6b52f7..b7a2eeac2 100644 --- a/locales/da/weapons.json +++ b/locales/da/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Hero Shot Replica", "MAIN_47": "Order Shot Replica", "MAIN_46": "Octo Shot Replica", + "MAIN_48": "Plastic-Bottle Shot Replica", "MAIN_20": "Splash-o-matic", "MAIN_21": "Neo Splash-o-matic", "MAIN_22": "Splash-o-matic GCK-O", diff --git a/locales/de/game-badges.json b/locales/de/game-badges.json index 4f5926953..c628bd0ba 100644 --- a/locales/de/game-badges.json +++ b/locales/de/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "Okto-Kleckser Replik: 8 Sterne erreicht!", "WeaponLevel_Shooter_Normal_Oct_Lv05": "Okto-Kleckser Replik: 9 Sterne erreicht!", "WeaponLevel_Shooter_Normal_Oct_Lv06": "Okto-Kleckser Replik: 10 Sterne erreicht!", + "WeaponLevel_Shooter_Normal_S_Lv00": "PET-Kleckser Replik: 4 Sterne erreicht!", + "WeaponLevel_Shooter_Normal_S_Lv01": "PET-Kleckser Replik: 5 Sterne erreicht!", + "WeaponLevel_Shooter_Normal_S_Lv02": "PET-Kleckser Replik: 6 Sterne erreicht!", + "WeaponLevel_Shooter_Normal_S_Lv03": "PET-Kleckser Replik: 7 Sterne erreicht!", + "WeaponLevel_Shooter_Normal_S_Lv04": "PET-Kleckser Replik: 8 Sterne erreicht!", + "WeaponLevel_Shooter_Normal_S_Lv05": "PET-Kleckser Replik: 9 Sterne erreicht!", + "WeaponLevel_Shooter_Normal_S_Lv06": "PET-Kleckser Replik: 10 Sterne erreicht!", "WeaponLevel_Shooter_Precision_00_Lv00": "Fein-Disperser: 4 Sterne erreicht!", "WeaponLevel_Shooter_Precision_00_Lv01": "Fein-Disperser: 5 Sterne erreicht!", "WeaponLevel_Shooter_Precision_00_Lv02": "Fein-Disperser: 6 Sterne erreicht!", diff --git a/locales/de/weapons.json b/locales/de/weapons.json index 60aae9311..651a98206 100644 --- a/locales/de/weapons.json +++ b/locales/de/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Heldenwaffe Replik", "MAIN_47": "Ordnung-Kleckser Replik", "MAIN_46": "Okto-Kleckser Replik", + "MAIN_48": "PET-Kleckser Replik", "MAIN_20": "Fein-Disperser", "MAIN_21": "Fein-Disperser Neo", "MAIN_22": "Fein-Disperser GK-KO", diff --git a/locales/en/game-badges.json b/locales/en/game-badges.json index bc081946f..5a84b46d5 100644 --- a/locales/en/game-badges.json +++ b/locales/en/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "8★ Octo Shot Replica User", "WeaponLevel_Shooter_Normal_Oct_Lv05": "9★ Octo Shot Replica User", "WeaponLevel_Shooter_Normal_Oct_Lv06": "10★ Octo Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv00": "4★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv01": "5★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv02": "6★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv03": "7★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv04": "8★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv05": "9★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv06": "10★ Plastic-Bottle Shot Replica User", "WeaponLevel_Shooter_Precision_00_Lv00": "4★ Splash-o-matic User", "WeaponLevel_Shooter_Precision_00_Lv01": "5★ Splash-o-matic User", "WeaponLevel_Shooter_Precision_00_Lv02": "6★ Splash-o-matic User", diff --git a/locales/en/weapons.json b/locales/en/weapons.json index 46b6b52f7..b7a2eeac2 100644 --- a/locales/en/weapons.json +++ b/locales/en/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Hero Shot Replica", "MAIN_47": "Order Shot Replica", "MAIN_46": "Octo Shot Replica", + "MAIN_48": "Plastic-Bottle Shot Replica", "MAIN_20": "Splash-o-matic", "MAIN_21": "Neo Splash-o-matic", "MAIN_22": "Splash-o-matic GCK-O", diff --git a/locales/es-ES/game-badges.json b/locales/es-ES/game-badges.json index 4592f187f..f67ab41ce 100644 --- a/locales/es-ES/game-badges.json +++ b/locales/es-ES/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "Tu destreza con Pistola octariana (réplica) ha alcanzado 8★.", "WeaponLevel_Shooter_Normal_Oct_Lv05": "Tu destreza con Pistola octariana (réplica) ha alcanzado 9★.", "WeaponLevel_Shooter_Normal_Oct_Lv06": "Tu destreza con Pistola octariana (réplica) ha alcanzado 10★.", + "WeaponLevel_Shooter_Normal_S_Lv00": "Tu destreza con Lanzatintas de plástico (réplica) ha alcanzado 4★.", + "WeaponLevel_Shooter_Normal_S_Lv01": "Tu destreza con Lanzatintas de plástico (réplica) ha alcanzado 5★.", + "WeaponLevel_Shooter_Normal_S_Lv02": "Tu destreza con Lanzatintas de plástico (réplica) ha alcanzado 6★.", + "WeaponLevel_Shooter_Normal_S_Lv03": "Tu destreza con Lanzatintas de plástico (réplica) ha alcanzado 7★.", + "WeaponLevel_Shooter_Normal_S_Lv04": "Tu destreza con Lanzatintas de plástico (réplica) ha alcanzado 8★.", + "WeaponLevel_Shooter_Normal_S_Lv05": "Tu destreza con Lanzatintas de plástico (réplica) ha alcanzado 9★.", + "WeaponLevel_Shooter_Normal_S_Lv06": "Tu destreza con Lanzatintas de plástico (réplica) ha alcanzado 10★.", "WeaponLevel_Shooter_Precision_00_Lv00": "Tu destreza con Marcador fino ha alcanzado 4★.", "WeaponLevel_Shooter_Precision_00_Lv01": "Tu destreza con Marcador fino ha alcanzado 5★.", "WeaponLevel_Shooter_Precision_00_Lv02": "Tu destreza con Marcador fino ha alcanzado 6★.", diff --git a/locales/es-ES/game-misc.json b/locales/es-ES/game-misc.json index 220de4704..3537e87bf 100644 --- a/locales/es-ES/game-misc.json +++ b/locales/es-ES/game-misc.json @@ -19,7 +19,7 @@ "STAGE_17": "Centro Comercial Fletán", "STAGE_18": "Distrito Rascalópodo", "STAGE_19": "Carguero Platija", - "STAGE_20": "Mina Costera", + "STAGE_20": "Mina costera", "STAGE_21": "Factoría RAMen", "STAGE_22": "Aeropuerto Marlín", "STAGE_23": "Terminal Dragón", diff --git a/locales/es-ES/gear.json b/locales/es-ES/gear.json index c6c3ff6c5..d018138eb 100644 --- a/locales/es-ES/gear.json +++ b/locales/es-ES/gear.json @@ -126,9 +126,9 @@ "C_1063": "Camiseta Arome tándem", "C_1066": "Camiseta Annak collar", "C_1067": "Camiseta Annak brazaletes", - "C_1068": "Camiseta retro blanca", - "C_1069": "Camiseta retro azul", - "C_1070": "Camiseta retro marrón", + "C_1068": "Camiseta reditada blanca", + "C_1069": "Camiseta reditada azul", + "C_1070": "Camiseta reditada marrón", "C_1071": "Pañuelo Barazushi", "C_1072": "Camiseta Barazushi arroz", "C_1073": "Camiseta Barazushi naranja", @@ -552,13 +552,13 @@ "C_7024": "Jersey algas y estrellas", "C_7025": "Sudadera pez feroz", "H_8000": "Máscara antigás", - "C_8000": "Camisa de cuadros leñador", + "C_8000": "Camisa cuadros ocres", "S_8000": "Suela extra blanca", "H_8001": "Máscara protectora", "C_8001": "Camisa de época", "S_8001": "Suela extra rosa", "H_8002": "Pañuelo clásico", - "C_8002": "Camisa de cuadros verdes", + "C_8002": "Camisa cuadros verdes", "S_8002": "Suela extra turquesa", "H_8003": "Pañuelo calavera", "C_8003": "Camisa blanca", @@ -570,7 +570,7 @@ "C_8005": "Camisa tropical", "S_8005": "Zapato doble hebilla", "H_8006": "Mascarilla octo Theutik", - "C_8006": "Camisa de cuadros rojos", + "C_8006": "Camisa cuadros rojos", "S_8006": "Zapato elegante", "H_8007": "Mascarilla calamar", "C_8007": "Camisa medusas", @@ -582,7 +582,7 @@ "C_8009": "Camisa tonos grises", "S_8009": "Zapato doble hebilla negro", "H_8010": "Cubrenariz motocross", - "C_8010": "Camisa de cuadros retro", + "C_8010": "Camisa cuadros retro", "S_8010": "Suela extra Annak", "H_8011": "Mascarilla Forima", "C_8011": "Camisa cuello redondo", @@ -657,11 +657,11 @@ "C_10001": "Sudadera verde", "C_10002": "Sudadera Ezko", "H_10003": "Pendientes tentáculo", - "C_10004": "Sudadera azul con camisa", + "C_10004": "Sudadera con camisa", "C_10005": "Sudadera morada Theutik", "C_10006": "Sudadera gris con capucha", "C_10007": "Sudadera plantas", - "C_10008": "Sudadera rosa", + "C_10008": "Sudadera rosa con camisa", "C_10009": "Sudadera Ezko oliva", "C_10010": "Sudadera negra con capucha", "C_10012": "Sudadera de jerga roja", diff --git a/locales/es-ES/weapons.json b/locales/es-ES/weapons.json index dc8364741..30154993e 100644 --- a/locales/es-ES/weapons.json +++ b/locales/es-ES/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Pistola de élite (réplica)", "MAIN_47": "Lanzatintas orden (réplica)", "MAIN_46": "Pistola octariana (réplica)", + "MAIN_48": "Lanzatintas de plástico (réplica)", "MAIN_20": "Marcador fino", "MAIN_21": "Marcador fino neo", "MAIN_22": "Marcador fino geco", diff --git a/locales/es-US/game-badges.json b/locales/es-US/game-badges.json index ac7f00832..5f5e5803c 100644 --- a/locales/es-US/game-badges.json +++ b/locales/es-US/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "8★ con Rociador octariano réplica", "WeaponLevel_Shooter_Normal_Oct_Lv05": "9★ con Rociador octariano réplica", "WeaponLevel_Shooter_Normal_Oct_Lv06": "10★ con Rociador octariano réplica", + "WeaponLevel_Shooter_Normal_S_Lv00": "4★ con Rociador PET réplica", + "WeaponLevel_Shooter_Normal_S_Lv01": "5★ con Rociador PET réplica", + "WeaponLevel_Shooter_Normal_S_Lv02": "6★ con Rociador PET réplica", + "WeaponLevel_Shooter_Normal_S_Lv03": "7★ con Rociador PET réplica", + "WeaponLevel_Shooter_Normal_S_Lv04": "8★ con Rociador PET réplica", + "WeaponLevel_Shooter_Normal_S_Lv05": "9★ con Rociador PET réplica", + "WeaponLevel_Shooter_Normal_S_Lv06": "10★ con Rociador PET réplica", "WeaponLevel_Shooter_Precision_00_Lv00": "4★ con Plumón", "WeaponLevel_Shooter_Precision_00_Lv01": "5★ con Plumón", "WeaponLevel_Shooter_Precision_00_Lv02": "6★ con Plumón", diff --git a/locales/es-US/weapons.json b/locales/es-US/weapons.json index e856aa604..9197179a8 100644 --- a/locales/es-US/weapons.json +++ b/locales/es-US/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Rociador de élite réplica", "MAIN_47": "Rociador orden réplica", "MAIN_46": "Rociador octariano réplica", + "MAIN_48": "Rociador PET réplica", "MAIN_20": "Plumón", "MAIN_21": "Plumón neo", "MAIN_22": "Plumón GCO", diff --git a/locales/fr-CA/game-badges.json b/locales/fr-CA/game-badges.json index 8546dfdef..b08f3bb0f 100644 --- a/locales/fr-CA/game-badges.json +++ b/locales/fr-CA/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "Lanceur octaling (réplique) : niveau 8★ atteint", "WeaponLevel_Shooter_Normal_Oct_Lv05": "Lanceur octaling (réplique) : niveau 9★ atteint", "WeaponLevel_Shooter_Normal_Oct_Lv06": "Lanceur octaling (réplique) : niveau 10★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv00": "Liquéficateur liqueur (réplique) : niveau 4★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv01": "Liquéficateur liqueur (réplique) : niveau 5★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv02": "Liquéficateur liqueur (réplique) : niveau 6★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv03": "Liquéficateur liqueur (réplique) : niveau 7★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv04": "Liquéficateur liqueur (réplique) : niveau 8★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv05": "Liquéficateur liqueur (réplique) : niveau 9★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv06": "Liquéficateur liqueur (réplique) : niveau 10★ atteint", "WeaponLevel_Shooter_Precision_00_Lv00": "Marqueur léger : niveau 4★ atteint", "WeaponLevel_Shooter_Precision_00_Lv01": "Marqueur léger : niveau 5★ atteint", "WeaponLevel_Shooter_Precision_00_Lv02": "Marqueur léger : niveau 6★ atteint", diff --git a/locales/fr-CA/weapons.json b/locales/fr-CA/weapons.json index 842308e91..55fdbb66c 100644 --- a/locales/fr-CA/weapons.json +++ b/locales/fr-CA/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Liquéfi. héroïque (rép.)", "MAIN_47": "Lanceur d'Ordre (réplique)", "MAIN_46": "Lanceur octaling (réplique)", + "MAIN_48": "Liquéficateur liqueur (réplique)", "MAIN_20": "Marqueur léger", "MAIN_21": "Marqueur léger néo", "MAIN_22": "Marqueur léger G-KO", diff --git a/locales/fr-EU/game-badges.json b/locales/fr-EU/game-badges.json index a7ed726de..8b5cd5295 100644 --- a/locales/fr-EU/game-badges.json +++ b/locales/fr-EU/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "Lanceur Octaling (réplique) : niveau 8★ atteint", "WeaponLevel_Shooter_Normal_Oct_Lv05": "Lanceur Octaling (réplique) : niveau 9★ atteint", "WeaponLevel_Shooter_Normal_Oct_Lv06": "Lanceur Octaling (réplique) : niveau 10★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv00": "Liquidateur soda (réplique) : niveau 4★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv01": "Liquidateur soda (réplique) : niveau 5★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv02": "Liquidateur soda (réplique) : niveau 6★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv03": "Liquidateur soda (réplique) : niveau 7★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv04": "Liquidateur soda (réplique) : niveau 8★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv05": "Liquidateur soda (réplique) : niveau 9★ atteint", + "WeaponLevel_Shooter_Normal_S_Lv06": "Liquidateur soda (réplique) : niveau 10★ atteint", "WeaponLevel_Shooter_Precision_00_Lv00": "Marqueur léger : niveau 4★ atteint", "WeaponLevel_Shooter_Precision_00_Lv01": "Marqueur léger : niveau 5★ atteint", "WeaponLevel_Shooter_Precision_00_Lv02": "Marqueur léger : niveau 6★ atteint", diff --git a/locales/fr-EU/weapons.json b/locales/fr-EU/weapons.json index d16e18cf1..5841e905c 100644 --- a/locales/fr-EU/weapons.json +++ b/locales/fr-EU/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Lanceur héroïque (réplique)", "MAIN_47": "Lanceur d'Ordre (réplique)", "MAIN_46": "Lanceur Octaling (réplique)", + "MAIN_48": "Liquidateur soda (réplique)", "MAIN_20": "Marqueur léger", "MAIN_21": "Marqueur léger Néo", "MAIN_22": "Marqueur léger G-KO", diff --git a/locales/he/game-badges.json b/locales/he/game-badges.json index bc081946f..5a84b46d5 100644 --- a/locales/he/game-badges.json +++ b/locales/he/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "8★ Octo Shot Replica User", "WeaponLevel_Shooter_Normal_Oct_Lv05": "9★ Octo Shot Replica User", "WeaponLevel_Shooter_Normal_Oct_Lv06": "10★ Octo Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv00": "4★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv01": "5★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv02": "6★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv03": "7★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv04": "8★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv05": "9★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv06": "10★ Plastic-Bottle Shot Replica User", "WeaponLevel_Shooter_Precision_00_Lv00": "4★ Splash-o-matic User", "WeaponLevel_Shooter_Precision_00_Lv01": "5★ Splash-o-matic User", "WeaponLevel_Shooter_Precision_00_Lv02": "6★ Splash-o-matic User", diff --git a/locales/he/weapons.json b/locales/he/weapons.json index 46b6b52f7..b7a2eeac2 100644 --- a/locales/he/weapons.json +++ b/locales/he/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Hero Shot Replica", "MAIN_47": "Order Shot Replica", "MAIN_46": "Octo Shot Replica", + "MAIN_48": "Plastic-Bottle Shot Replica", "MAIN_20": "Splash-o-matic", "MAIN_21": "Neo Splash-o-matic", "MAIN_22": "Splash-o-matic GCK-O", diff --git a/locales/it/game-badges.json b/locales/it/game-badges.json index 56c366ee6..06774b4a4 100644 --- a/locales/it/game-badges.json +++ b/locales/it/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "Octosplasher replica: 8★", "WeaponLevel_Shooter_Normal_Oct_Lv05": "Octosplasher replica: 9★", "WeaponLevel_Shooter_Normal_Oct_Lv06": "Octosplasher replica: 10★", + "WeaponLevel_Shooter_Normal_S_Lv00": "Splasher frizzante replica: 4★", + "WeaponLevel_Shooter_Normal_S_Lv01": "Splasher frizzante replica: 5★", + "WeaponLevel_Shooter_Normal_S_Lv02": "Splasher frizzante replica: 6★", + "WeaponLevel_Shooter_Normal_S_Lv03": "Splasher frizzante replica: 7★", + "WeaponLevel_Shooter_Normal_S_Lv04": "Splasher frizzante replica: 8★", + "WeaponLevel_Shooter_Normal_S_Lv05": "Splasher frizzante replica: 9★", + "WeaponLevel_Shooter_Normal_S_Lv06": "Splasher frizzante replica: 10★", "WeaponLevel_Shooter_Precision_00_Lv00": "Marker d'assalto: 4★", "WeaponLevel_Shooter_Precision_00_Lv01": "Marker d'assalto: 5★", "WeaponLevel_Shooter_Precision_00_Lv02": "Marker d'assalto: 6★", diff --git a/locales/it/weapons.json b/locales/it/weapons.json index 63a9b3bc2..20ff71822 100644 --- a/locales/it/weapons.json +++ b/locales/it/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Pistola élite replica", "MAIN_47": "Pistola Ordine replica", "MAIN_46": "Octosplasher replica", + "MAIN_48": "Splasher frizzante replica", "MAIN_20": "Marker d'assalto", "MAIN_21": "Marker d'assalto Neo", "MAIN_22": "Marker d'assalto GEC-O", diff --git a/locales/ja/game-badges.json b/locales/ja/game-badges.json index 22058febd..aecf40a64 100644 --- a/locales/ja/game-badges.json +++ b/locales/ja/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "オクタシューター レプリカのじゅくれん度が★８になった", "WeaponLevel_Shooter_Normal_Oct_Lv05": "オクタシューター レプリカのじゅくれん度が★９になった", "WeaponLevel_Shooter_Normal_Oct_Lv06": "オクタシューター レプリカのじゅくれん度が★１０になった", + "WeaponLevel_Shooter_Normal_S_Lv00": "PETシューター レプリカのじゅくれん度が★４になった", + "WeaponLevel_Shooter_Normal_S_Lv01": "PETシューター レプリカのじゅくれん度が★５になった", + "WeaponLevel_Shooter_Normal_S_Lv02": "PETシューター レプリカのじゅくれん度が★６になった", + "WeaponLevel_Shooter_Normal_S_Lv03": "PETシューター レプリカのじゅくれん度が★７になった", + "WeaponLevel_Shooter_Normal_S_Lv04": "PETシューター レプリカのじゅくれん度が★８になった", + "WeaponLevel_Shooter_Normal_S_Lv05": "PETシューター レプリカのじゅくれん度が★９になった", + "WeaponLevel_Shooter_Normal_S_Lv06": "PETシューター レプリカのじゅくれん度が★１０になった", "WeaponLevel_Shooter_Precision_00_Lv00": "シャープマーカーのじゅくれん度が★４になった", "WeaponLevel_Shooter_Precision_00_Lv01": "シャープマーカーのじゅくれん度が★５になった", "WeaponLevel_Shooter_Precision_00_Lv02": "シャープマーカーのじゅくれん度が★６になった", diff --git a/locales/ja/weapons.json b/locales/ja/weapons.json index 8cbfff796..459c0b851 100644 --- a/locales/ja/weapons.json +++ b/locales/ja/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "ヒーローシューター レプリカ", "MAIN_47": "オーダーシューター レプリカ", "MAIN_46": "オクタシューター レプリカ", + "MAIN_48": "PETシューター レプリカ", "MAIN_20": "シャープマーカー", "MAIN_21": "シャープマーカーネオ", "MAIN_22": "シャープマーカーGECK", diff --git a/locales/ko/game-badges.json b/locales/ko/game-badges.json index a369ced71..6e99c2d4b 100644 --- a/locales/ko/game-badges.json +++ b/locales/ko/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "옥타 슈터 레플리카의 숙련도가 ★8에 도달했다", "WeaponLevel_Shooter_Normal_Oct_Lv05": "옥타 슈터 레플리카의 숙련도가 ★9에 도달했다", "WeaponLevel_Shooter_Normal_Oct_Lv06": "옥타 슈터 레플리카의 숙련도가 ★10에 도달했다", + "WeaponLevel_Shooter_Normal_S_Lv00": "PET 슈터 레플리카의 숙련도가 ★4에 도달했다", + "WeaponLevel_Shooter_Normal_S_Lv01": "PET 슈터 레플리카의 숙련도가 ★5에 도달했다", + "WeaponLevel_Shooter_Normal_S_Lv02": "PET 슈터 레플리카의 숙련도가 ★6에 도달했다", + "WeaponLevel_Shooter_Normal_S_Lv03": "PET 슈터 레플리카의 숙련도가 ★7에 도달했다", + "WeaponLevel_Shooter_Normal_S_Lv04": "PET 슈터 레플리카의 숙련도가 ★8에 도달했다", + "WeaponLevel_Shooter_Normal_S_Lv05": "PET 슈터 레플리카의 숙련도가 ★9에 도달했다", + "WeaponLevel_Shooter_Normal_S_Lv06": "PET 슈터 레플리카의 숙련도가 ★10에 도달했다", "WeaponLevel_Shooter_Precision_00_Lv00": "샤프 마커의 숙련도가 ★4에 도달했다", "WeaponLevel_Shooter_Precision_00_Lv01": "샤프 마커의 숙련도가 ★5에 도달했다", "WeaponLevel_Shooter_Precision_00_Lv02": "샤프 마커의 숙련도가 ★6에 도달했다", diff --git a/locales/ko/weapons.json b/locales/ko/weapons.json index 8816eddf3..4797211ba 100644 --- a/locales/ko/weapons.json +++ b/locales/ko/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "히어로 슈터 레플리카", "MAIN_47": "오더 슈터 레플리카", "MAIN_46": "옥타 슈터 레플리카", + "MAIN_48": "PET 슈터 레플리카", "MAIN_20": "샤프 마커", "MAIN_21": "네오 샤프 마커", "MAIN_22": "샤프 마커 GECK", diff --git a/locales/nl/game-badges.json b/locales/nl/game-badges.json index 1503d155b..411a6b834 100644 --- a/locales/nl/game-badges.json +++ b/locales/nl/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "Octospetter (replica): 8★!", "WeaponLevel_Shooter_Normal_Oct_Lv05": "Octospetter (replica): 9★!", "WeaponLevel_Shooter_Normal_Oct_Lv06": "Octospetter (replica): 10★!", + "WeaponLevel_Shooter_Normal_S_Lv00": "SupersPETter (replica): 4★!", + "WeaponLevel_Shooter_Normal_S_Lv01": "SupersPETter (replica): 5★!", + "WeaponLevel_Shooter_Normal_S_Lv02": "SupersPETter (replica): 6★!", + "WeaponLevel_Shooter_Normal_S_Lv03": "SupersPETter (replica): 7★!", + "WeaponLevel_Shooter_Normal_S_Lv04": "SupersPETter (replica): 8★!", + "WeaponLevel_Shooter_Normal_S_Lv05": "SupersPETter (replica): 9★!", + "WeaponLevel_Shooter_Normal_S_Lv06": "SupersPETter (replica): 10★!", "WeaponLevel_Shooter_Precision_00_Lv00": "Spetterspuit: 4★!", "WeaponLevel_Shooter_Precision_00_Lv01": "Spetterspuit: 5★!", "WeaponLevel_Shooter_Precision_00_Lv02": "Spetterspuit: 6★!", diff --git a/locales/nl/weapons.json b/locales/nl/weapons.json index 75e783b1a..70493f2dd 100644 --- a/locales/nl/weapons.json +++ b/locales/nl/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Heldenspetter (replica)", "MAIN_47": "Ordespetter (replica)", "MAIN_46": "Octospetter (replica)", + "MAIN_48": "SupersPETter (replica)", "MAIN_20": "Spetterspuit", "MAIN_21": "Spetterspuit Neo", "MAIN_22": "Spetterspuit GKK-O", diff --git a/locales/pl/game-badges.json b/locales/pl/game-badges.json index bc081946f..5a84b46d5 100644 --- a/locales/pl/game-badges.json +++ b/locales/pl/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "8★ Octo Shot Replica User", "WeaponLevel_Shooter_Normal_Oct_Lv05": "9★ Octo Shot Replica User", "WeaponLevel_Shooter_Normal_Oct_Lv06": "10★ Octo Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv00": "4★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv01": "5★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv02": "6★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv03": "7★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv04": "8★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv05": "9★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv06": "10★ Plastic-Bottle Shot Replica User", "WeaponLevel_Shooter_Precision_00_Lv00": "4★ Splash-o-matic User", "WeaponLevel_Shooter_Precision_00_Lv01": "5★ Splash-o-matic User", "WeaponLevel_Shooter_Precision_00_Lv02": "6★ Splash-o-matic User", diff --git a/locales/pl/weapons.json b/locales/pl/weapons.json index 46b6b52f7..b7a2eeac2 100644 --- a/locales/pl/weapons.json +++ b/locales/pl/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Hero Shot Replica", "MAIN_47": "Order Shot Replica", "MAIN_46": "Octo Shot Replica", + "MAIN_48": "Plastic-Bottle Shot Replica", "MAIN_20": "Splash-o-matic", "MAIN_21": "Neo Splash-o-matic", "MAIN_22": "Splash-o-matic GCK-O", diff --git a/locales/pt-BR/game-badges.json b/locales/pt-BR/game-badges.json index bc081946f..5a84b46d5 100644 --- a/locales/pt-BR/game-badges.json +++ b/locales/pt-BR/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "8★ Octo Shot Replica User", "WeaponLevel_Shooter_Normal_Oct_Lv05": "9★ Octo Shot Replica User", "WeaponLevel_Shooter_Normal_Oct_Lv06": "10★ Octo Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv00": "4★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv01": "5★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv02": "6★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv03": "7★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv04": "8★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv05": "9★ Plastic-Bottle Shot Replica User", + "WeaponLevel_Shooter_Normal_S_Lv06": "10★ Plastic-Bottle Shot Replica User", "WeaponLevel_Shooter_Precision_00_Lv00": "4★ Splash-o-matic User", "WeaponLevel_Shooter_Precision_00_Lv01": "5★ Splash-o-matic User", "WeaponLevel_Shooter_Precision_00_Lv02": "6★ Splash-o-matic User", diff --git a/locales/pt-BR/weapons.json b/locales/pt-BR/weapons.json index 46b6b52f7..b7a2eeac2 100644 --- a/locales/pt-BR/weapons.json +++ b/locales/pt-BR/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Hero Shot Replica", "MAIN_47": "Order Shot Replica", "MAIN_46": "Octo Shot Replica", + "MAIN_48": "Plastic-Bottle Shot Replica", "MAIN_20": "Splash-o-matic", "MAIN_21": "Neo Splash-o-matic", "MAIN_22": "Splash-o-matic GCK-O", diff --git a/locales/ru/game-badges.json b/locales/ru/game-badges.json index f00e5200b..fc1ad13a3 100644 --- a/locales/ru/game-badges.json +++ b/locales/ru/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "Осьмострел (клон): пользователь уровня 8 ★!", "WeaponLevel_Shooter_Normal_Oct_Lv05": "Осьмострел (клон): пользователь уровня 9 ★!", "WeaponLevel_Shooter_Normal_Oct_Lv06": "Осьмострел (клон): пользователь уровня 10 ★!", + "WeaponLevel_Shooter_Normal_S_Lv00": "Ботлострел (клон): пользователь уровня 4 ★!", + "WeaponLevel_Shooter_Normal_S_Lv01": "Ботлострел (клон): пользователь уровня 5 ★!", + "WeaponLevel_Shooter_Normal_S_Lv02": "Ботлострел (клон): пользователь уровня 6 ★!", + "WeaponLevel_Shooter_Normal_S_Lv03": "Ботлострел (клон): пользователь уровня 7 ★!", + "WeaponLevel_Shooter_Normal_S_Lv04": "Ботлострел (клон): пользователь уровня 8 ★!", + "WeaponLevel_Shooter_Normal_S_Lv05": "Ботлострел (клон): пользователь уровня 9 ★!", + "WeaponLevel_Shooter_Normal_S_Lv06": "Ботлострел (клон): пользователь уровня 10 ★!", "WeaponLevel_Shooter_Precision_00_Lv00": "Плюхомет: пользователь уровня 4 ★!", "WeaponLevel_Shooter_Precision_00_Lv01": "Плюхомет: пользователь уровня 5 ★!", "WeaponLevel_Shooter_Precision_00_Lv02": "Плюхомет: пользователь уровня 6 ★!", diff --git a/locales/ru/gear.json b/locales/ru/gear.json index 2caed8820..8564d3efd 100644 --- a/locales/ru/gear.json +++ b/locales/ru/gear.json @@ -125,7 +125,7 @@ "C_1062": "Майка «Рыба-пила»", "C_1063": "Майка-дуо «Щуччи»", "C_1066": "«Чокер» от Панкасиуса", - "C_1067": "«Манжеты» от Панкасиуса", + "C_1067": "«Браслеты» от Панкасиуса", "C_1068": "Белая ретро-майка", "C_1069": "Голубая ретро-майка", "C_1070": "Бежевая ретро-майка", @@ -305,7 +305,7 @@ "S_3023": "Кроссы «М-ЕХА»", "H_3024": "Очки «Тройная 333ащита»", "S_3024": "Слип-кроссы «Оранж»", - "H_3025": "Тактические очки", + "H_3025": "Прозрачные очки", "S_3025": "«Акульи плавники»", "H_3026": "Мотоочки", "S_3026": "Синие «креветки»", diff --git a/locales/ru/weapons.json b/locales/ru/weapons.json index d988e79b0..613d6e51f 100644 --- a/locales/ru/weapons.json +++ b/locales/ru/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "Каплестрел героя (клон)", "MAIN_47": "Каплестрел Порядка (клон)", "MAIN_46": "Осьмострел (клон)", + "MAIN_48": "Ботлострел (клон)", "MAIN_20": "Плюхомет", "MAIN_21": "Плюхомет «Нео»", "MAIN_22": "Плюхомет «Г-КОН»", diff --git a/locales/zh/game-badges.json b/locales/zh/game-badges.json index f4802c2c5..47f10b9b8 100644 --- a/locales/zh/game-badges.json +++ b/locales/zh/game-badges.json @@ -1072,6 +1072,13 @@ "WeaponLevel_Shooter_Normal_Oct_Lv04": "章鱼射击枪 复制的熟练度达到★8", "WeaponLevel_Shooter_Normal_Oct_Lv05": "章鱼射击枪 复制的熟练度达到★9", "WeaponLevel_Shooter_Normal_Oct_Lv06": "章鱼射击枪 复制的熟练度达到★10", + "WeaponLevel_Shooter_Normal_S_Lv00": "塑料瓶射击枪 复制的熟练度达到★4", + "WeaponLevel_Shooter_Normal_S_Lv01": "塑料瓶射击枪 复制的熟练度达到★5", + "WeaponLevel_Shooter_Normal_S_Lv02": "塑料瓶射击枪 复制的熟练度达到★6", + "WeaponLevel_Shooter_Normal_S_Lv03": "塑料瓶射击枪 复制的熟练度达到★7", + "WeaponLevel_Shooter_Normal_S_Lv04": "塑料瓶射击枪 复制的熟练度达到★8", + "WeaponLevel_Shooter_Normal_S_Lv05": "塑料瓶射击枪 复制的熟练度达到★9", + "WeaponLevel_Shooter_Normal_S_Lv06": "塑料瓶射击枪 复制的熟练度达到★10", "WeaponLevel_Shooter_Precision_00_Lv00": "窄域标记枪的熟练度达到★4", "WeaponLevel_Shooter_Precision_00_Lv01": "窄域标记枪的熟练度达到★5", "WeaponLevel_Shooter_Precision_00_Lv02": "窄域标记枪的熟练度达到★6", diff --git a/locales/zh/weapons.json b/locales/zh/weapons.json index 3d2fb2b9a..7864fba19 100644 --- a/locales/zh/weapons.json +++ b/locales/zh/weapons.json @@ -118,6 +118,7 @@ "MAIN_45": "英雄射击枪 复制", "MAIN_47": "秩序射击枪 复制", "MAIN_46": "章鱼射击枪 复制", + "MAIN_48": "塑料瓶射击枪 复制", "MAIN_20": "窄域标记枪", "MAIN_21": "窄域标记枪 新型", "MAIN_22": "窄域标记枪GECK",