diff --git a/app/features/build-analyzer/core/weapon-params.ts b/app/features/build-analyzer/core/weapon-params.ts
index f30063fdc..8d3e806a3 100644
--- a/app/features/build-analyzer/core/weapon-params.ts
+++ b/app/features/build-analyzer/core/weapon-params.ts
@@ -76,6 +76,18 @@ export const weaponParams = {
 			Stand_DegSwerve: 0,
 			InkConsume: 0.008,
 		},
+		"22": {
+			SpecialPoint: 180,
+			subWeaponId: 11,
+			specialWeaponId: 5,
+			WeaponSpeedType: "Fast",
+			MoveSpeed: 0.072,
+			DamageParam_ValueMax: 280,
+			DamageParam_ValueMin: 140,
+			Jump_DegSwerve: 0,
+			Stand_DegSwerve: 0,
+			InkConsume: 0.008,
+		},
 		"30": {
 			SpecialPoint: 180,
 			subWeaponId: 5,
@@ -102,6 +114,19 @@ export const weaponParams = {
 			InkRecoverStop: 15,
 			InkConsume: 0.005,
 		},
+		"32": {
+			SpecialPoint: 180,
+			subWeaponId: 2,
+			specialWeaponId: 19,
+			WeaponSpeedType: "Fast",
+			MoveSpeed: 0.072,
+			DamageParam_ValueMax: 240,
+			DamageParam_ValueMin: 120,
+			Jump_DegSwerve: 15.54,
+			Stand_DegSwerve: 12.63,
+			InkRecoverStop: 15,
+			InkConsume: 0.005,
+		},
 		"40": {
 			SpecialPoint: 210,
 			subWeaponId: 1,
@@ -124,6 +149,17 @@ export const weaponParams = {
 			Stand_DegSwerve: 4.86,
 			InkConsume: 0.0092,
 		},
+		"42": {
+			SpecialPoint: 190,
+			subWeaponId: 2,
+			specialWeaponId: 17,
+			MoveSpeed: 0.072,
+			DamageParam_ValueMax: 360,
+			DamageParam_ValueMin: 180,
+			Jump_DegSwerve: 11.66,
+			Stand_DegSwerve: 4.86,
+			InkConsume: 0.0092,
+		},
 		"45": {
 			SpecialPoint: 210,
 			subWeaponId: 1,
@@ -237,6 +273,23 @@ export const weaponParams = {
 			Stand_DegSwerve: 2.5,
 			InkConsume: 0.02,
 		},
+		"72": {
+			SpecialPoint: 190,
+			subWeaponId: 0,
+			specialWeaponId: 4,
+			overwrites: {
+				ConsumeRt_Main: {
+					High: 0.5,
+					Mid: 0.7,
+				},
+			},
+			MoveSpeed: 0.055,
+			DamageParam_ValueMax: 450,
+			DamageParam_ValueMin: 225,
+			Jump_DegSwerve: 6,
+			Stand_DegSwerve: 2.5,
+			InkConsume: 0.02,
+		},
 		"80": {
 			SpecialPoint: 190,
 			subWeaponId: 3,
@@ -259,6 +312,17 @@ export const weaponParams = {
 			Stand_DegSwerve: 4,
 			InkConsume: 0.023,
 		},
+		"82": {
+			SpecialPoint: 190,
+			subWeaponId: 12,
+			specialWeaponId: 15,
+			MoveSpeed: 0.04,
+			DamageParam_ValueMax: 620,
+			DamageParam_ValueMin: 350,
+			Jump_DegSwerve: 11.3511,
+			Stand_DegSwerve: 4,
+			InkConsume: 0.023,
+		},
 		"90": {
 			SpecialPoint: 180,
 			subWeaponId: 12,
@@ -281,6 +345,17 @@ export const weaponParams = {
 			Stand_DegSwerve: 2.5,
 			InkConsume: 0.016,
 		},
+		"92": {
+			SpecialPoint: 190,
+			subWeaponId: 2,
+			specialWeaponId: 18,
+			MoveSpeed: 0.06,
+			DamageParam_ValueMax: 320,
+			DamageParam_ValueMin: 160,
+			Jump_DegSwerve: 8,
+			Stand_DegSwerve: 2.5,
+			InkConsume: 0.016,
+		},
 		"100": {
 			SpecialPoint: 190,
 			subWeaponId: 9,
@@ -448,6 +523,32 @@ export const weaponParams = {
 			InkRecoverStop: 57,
 			InkConsume: 0.1,
 		},
+		"212": {
+			SpecialPoint: 180,
+			subWeaponId: 8,
+			specialWeaponId: 12,
+			overwrites: {
+				ReduceJumpSwerveRate: {
+					Mid: 0.5,
+				},
+			},
+			MoveSpeed: 0.045,
+			DamageParam_ValueDirect: 1250,
+			BlastParam_DistanceDamage: [
+				{
+					Damage: 700,
+					Distance: 0.94,
+				},
+				{
+					Damage: 500,
+					Distance: 3.3,
+				},
+			],
+			Jump_DegSwerve: 10,
+			Stand_DegSwerve: 0,
+			InkRecoverStop: 57,
+			InkConsume: 0.1,
+		},
 		"220": {
 			SpecialPoint: 210,
 			subWeaponId: 1,
@@ -658,6 +759,32 @@ export const weaponParams = {
 			InkRecoverStop: 50,
 			InkConsume: 0.08,
 		},
+		"252": {
+			SpecialPoint: 200,
+			subWeaponId: 1,
+			specialWeaponId: 15,
+			overwrites: {
+				ReduceJumpSwerveRate: {
+					Mid: 0.5,
+				},
+			},
+			MoveSpeed: 0.05,
+			DamageParam_ValueDirect: 850,
+			BlastParam_DistanceDamage: [
+				{
+					Damage: 350,
+					Distance: 0.94,
+				},
+				{
+					Damage: 350,
+					Distance: 3.3,
+				},
+			],
+			Jump_DegSwerve: 8,
+			Stand_DegSwerve: 0,
+			InkRecoverStop: 50,
+			InkConsume: 0.08,
+		},
 		"260": {
 			SpecialPoint: 180,
 			subWeaponId: 3,
@@ -682,7 +809,7 @@ export const weaponParams = {
 			Jump_DegSwerve: 8,
 			Stand_DegSwerve: 0,
 			InkRecoverStop: 60,
-			InkConsume: 0.085,
+			InkConsume: 0.095,
 		},
 		"261": {
 			SpecialPoint: 200,
@@ -708,7 +835,7 @@ export const weaponParams = {
 			Jump_DegSwerve: 8,
 			Stand_DegSwerve: 0,
 			InkRecoverStop: 60,
-			InkConsume: 0.085,
+			InkConsume: 0.095,
 		},
 		"300": {
 			SpecialPoint: 190,
@@ -736,6 +863,19 @@ export const weaponParams = {
 			InkRecoverStop: 25,
 			InkConsume: 0.011,
 		},
+		"302": {
+			SpecialPoint: 200,
+			subWeaponId: 0,
+			specialWeaponId: 10,
+			TripleShotSpanFrame: 8,
+			MoveSpeed: 0.08,
+			DamageParam_ValueMax: 310,
+			DamageParam_ValueMin: 155,
+			Jump_DegSwerve: 6,
+			Stand_DegSwerve: 1,
+			InkRecoverStop: 25,
+			InkConsume: 0.011,
+		},
 		"310": {
 			SpecialPoint: 190,
 			subWeaponId: 9,
@@ -774,6 +914,25 @@ export const weaponParams = {
 			InkRecoverStop: 25,
 			InkConsume: 0.0208,
 		},
+		"312": {
+			SpecialPoint: 200,
+			subWeaponId: 1,
+			specialWeaponId: 14,
+			overwrites: {
+				ConsumeRt_Main: {
+					High: 0.5,
+					Mid: 0.7,
+				},
+			},
+			TripleShotSpanFrame: 20,
+			MoveSpeed: 0.06,
+			DamageParam_ValueMax: 440,
+			DamageParam_ValueMin: 220,
+			Jump_DegSwerve: 1,
+			Stand_DegSwerve: 1,
+			InkRecoverStop: 25,
+			InkConsume: 0.0208,
+		},
 		"400": {
 			SpecialPoint: 220,
 			subWeaponId: 4,
@@ -828,6 +987,18 @@ export const weaponParams = {
 			WideSwingUnitGroupParam_DamageParam_DamageMaxValue: 1000,
 			InkConsume_WeaponSwingParam: 0.0396,
 		},
+		"1002": {
+			SpecialPoint: 180,
+			subWeaponId: 5,
+			specialWeaponId: 16,
+			WeaponSpeedType: "Fast",
+			BodyParam_Damage: 700,
+			VerticalSwingUnitGroupParam_DamageParam_DamageMinValue: 350,
+			VerticalSwingUnitGroupParam_DamageParam_DamageMaxValue: 1200,
+			WideSwingUnitGroupParam_DamageParam_DamageMinValue: 250,
+			WideSwingUnitGroupParam_DamageParam_DamageMaxValue: 1000,
+			InkConsume_WeaponSwingParam: 0.0396,
+		},
 		"1010": {
 			SpecialPoint: 180,
 			subWeaponId: 6,
@@ -897,6 +1068,24 @@ export const weaponParams = {
 			WideSwingUnitGroupParam_DamageParam_DamageMaxValue: 1800,
 			InkConsume_WeaponSwingParam: 0.18,
 		},
+		"1022": {
+			SpecialPoint: 180,
+			subWeaponId: 9,
+			specialWeaponId: 9,
+			overwrites: {
+				ConsumeRt_Main: {
+					High: 0.5,
+					Mid: 0.7,
+				},
+			},
+			WeaponSpeedType: "Slow",
+			BodyParam_Damage: 1250,
+			VerticalSwingUnitGroupParam_DamageParam_DamageMinValue: 400,
+			VerticalSwingUnitGroupParam_DamageParam_DamageMaxValue: 1800,
+			WideSwingUnitGroupParam_DamageParam_DamageMinValue: 400,
+			WideSwingUnitGroupParam_DamageParam_DamageMaxValue: 1800,
+			InkConsume_WeaponSwingParam: 0.18,
+		},
 		"1030": {
 			SpecialPoint: 210,
 			subWeaponId: 10,
@@ -943,6 +1132,17 @@ export const weaponParams = {
 			WideSwingUnitGroupParam_DamageParam_DamageMaxValue: 700,
 			InkConsume_WeaponSwingParam: 0.09,
 		},
+		"1042": {
+			SpecialPoint: 180,
+			subWeaponId: 13,
+			specialWeaponId: 18,
+			BodyParam_Damage: 700,
+			VerticalSwingUnitGroupParam_DamageParam_DamageMinValue: 400,
+			VerticalSwingUnitGroupParam_DamageParam_DamageMaxValue: 1200,
+			WideSwingUnitGroupParam_DamageParam_DamageMinValue: 400,
+			WideSwingUnitGroupParam_DamageParam_DamageMaxValue: 700,
+			InkConsume_WeaponSwingParam: 0.09,
+		},
 		"1100": {
 			SpecialPoint: 180,
 			subWeaponId: 0,
@@ -981,6 +1181,15 @@ export const weaponParams = {
 			SwingUnitGroupParam_DamageParam_DamageMaxValue: 400,
 			InkConsume_WeaponSwingParam: 0.03,
 		},
+		"1112": {
+			SpecialPoint: 200,
+			subWeaponId: 7,
+			specialWeaponId: 17,
+			BodyParam_Damage: 250,
+			SwingUnitGroupParam_DamageParam_DamageMinValue: 200,
+			SwingUnitGroupParam_DamageParam_DamageMaxValue: 400,
+			InkConsume_WeaponSwingParam: 0.03,
+		},
 		"1115": {
 			SpecialPoint: 190,
 			subWeaponId: 1,
@@ -1008,6 +1217,15 @@ export const weaponParams = {
 			SwingUnitGroupParam_DamageParam_DamageMaxValue: 600,
 			InkConsume_WeaponSwingParam: 0.048,
 		},
+		"1122": {
+			SpecialPoint: 180,
+			subWeaponId: 4,
+			specialWeaponId: 1,
+			BodyParam_Damage: 300,
+			SwingUnitGroupParam_DamageParam_DamageMinValue: 310,
+			SwingUnitGroupParam_DamageParam_DamageMaxValue: 600,
+			InkConsume_WeaponSwingParam: 0.048,
+		},
 		"2000": {
 			SpecialPoint: 190,
 			subWeaponId: 9,
@@ -1058,6 +1276,18 @@ export const weaponParams = {
 			InkConsumeFullCharge: 0.18,
 			InkConsumeMinCharge: 0.0225,
 		},
+		"2012": {
+			SpecialPoint: 200,
+			subWeaponId: 3,
+			specialWeaponId: 12,
+			MoveSpeedFullCharge: 0.02,
+			DamageParam_ValueFullCharge: 1600,
+			DamageParam_ValueMaxCharge: 800,
+			DamageParam_ValueMinCharge: 400,
+			KeepChargeFullFrame: 75,
+			InkConsumeFullCharge: 0.18,
+			InkConsumeMinCharge: 0.0225,
+		},
 		"2015": {
 			SpecialPoint: 190,
 			subWeaponId: 0,
@@ -1092,6 +1322,17 @@ export const weaponParams = {
 			InkConsumeFullCharge: 0.18,
 			InkConsumeMinCharge: 0.0225,
 		},
+		"2022": {
+			SpecialPoint: 200,
+			subWeaponId: 3,
+			specialWeaponId: 12,
+			MoveSpeedFullCharge: 0.02,
+			DamageParam_ValueFullCharge: 1600,
+			DamageParam_ValueMaxCharge: 800,
+			DamageParam_ValueMinCharge: 400,
+			InkConsumeFullCharge: 0.18,
+			InkConsumeMinCharge: 0.0225,
+		},
 		"2030": {
 			SpecialPoint: 210,
 			subWeaponId: 10,
@@ -1231,6 +1472,7 @@ export const weaponParams = {
 			DamageParam_ValueMaxCharge: 680,
 			DamageParam_ValueMinCharge: 400,
 			ChargeFrameFullCharge: 72,
+			InkRecoverStop: 20,
 			InkConsumeFullCharge: 0.35,
 			InkConsumeMinCharge: 0.0197,
 		},
@@ -1243,6 +1485,7 @@ export const weaponParams = {
 			DamageParam_ValueMaxCharge: 680,
 			DamageParam_ValueMinCharge: 400,
 			ChargeFrameFullCharge: 72,
+			InkRecoverStop: 20,
 			InkConsumeFullCharge: 0.35,
 			InkConsumeMinCharge: 0.0197,
 		},
@@ -1298,6 +1541,17 @@ export const weaponParams = {
 			InkRecoverStop: 35,
 			InkConsumeSlosher: 0.06,
 		},
+		"3012": {
+			SpecialPoint: 180,
+			subWeaponId: 0,
+			specialWeaponId: 19,
+			WeaponSpeedType: "Fast",
+			MoveSpeed: 0.066,
+			DamageParam_ValueDirectMax: 620,
+			DamageParam_ValueDirectMin: 350,
+			InkRecoverStop: 35,
+			InkConsumeSlosher: 0.06,
+		},
 		"3020": {
 			SpecialPoint: 220,
 			subWeaponId: 5,
@@ -1393,6 +1647,16 @@ export const weaponParams = {
 			InkRecoverStop: 50,
 			InkConsumeSlosher: 0.09,
 		},
+		"3052": {
+			SpecialPoint: 200,
+			subWeaponId: 6,
+			specialWeaponId: 12,
+			MoveSpeed: 0.04,
+			DamageParam_ValueDirectMax: 480,
+			DamageParam_ValueDirectMin: 350,
+			InkRecoverStop: 50,
+			InkConsumeSlosher: 0.09,
+		},
 		"4000": {
 			SpecialPoint: 190,
 			subWeaponId: 2,
@@ -1433,6 +1697,26 @@ export const weaponParams = {
 			InkRecoverStop: 30,
 			InkConsumeFullChargeSplatling: 0.15,
 		},
+		"4002": {
+			SpecialPoint: 190,
+			subWeaponId: 8,
+			specialWeaponId: 1,
+			overwrites: {
+				MoveVelRt_Shot: {
+					High: 1.4,
+					Low: 1,
+					Mid: 1.2,
+				},
+			},
+			MoveSpeed: 0.086,
+			MoveSpeed_Charge: 0.072,
+			DamageParam_ValueMax: 320,
+			DamageParam_ValueMin: 160,
+			Jump_DegSwerve: 8,
+			Stand_DegSwerve: 4,
+			InkRecoverStop: 30,
+			InkConsumeFullChargeSplatling: 0.15,
+		},
 		"4010": {
 			SpecialPoint: 200,
 			subWeaponId: 3,
@@ -1547,6 +1831,33 @@ export const weaponParams = {
 			InkRecoverStop: 40,
 			InkConsumeFullChargeSplatling: 0.35,
 		},
+		"4022": {
+			SpecialPoint: 200,
+			subWeaponId: 3,
+			specialWeaponId: 2,
+			overwrites: {
+				ConsumeRt_Main: {
+					High: 0.5,
+					Low: 1,
+					Mid: 0.7,
+				},
+				MoveVelRt_Shot: {
+					High: 1.35,
+					Low: 1,
+					Mid: 1.175,
+				},
+			},
+			WeaponSpeedType: "Slow",
+			MoveSpeed: 0.06,
+			MoveSpeed_Charge: 0.044,
+			DamageParam_ValueMax: 320,
+			DamageParam_ValueMin: 160,
+			DamageParam_ValueFullChargeMax: 400,
+			Jump_DegSwerve: 6,
+			Stand_DegSwerve: 3,
+			InkRecoverStop: 40,
+			InkConsumeFullChargeSplatling: 0.35,
+		},
 		"4030": {
 			SpecialPoint: 210,
 			subWeaponId: 5,
@@ -1705,6 +2016,19 @@ export const weaponParams = {
 			InkConsume: 0.00663,
 			InkConsume_SideStepParam: 0.05,
 		},
+		"5002": {
+			SpecialPoint: 190,
+			subWeaponId: 0,
+			specialWeaponId: 9,
+			WeaponSpeedType: "Fast",
+			MoveSpeed: 0.084,
+			DamageParam_ValueMax: 360,
+			DamageParam_ValueMin: 180,
+			Jump_DegSwerve: 11.66,
+			Stand_DegSwerve: 6.8,
+			InkConsume: 0.00663,
+			InkConsume_SideStepParam: 0.05,
+		},
 		"5010": {
 			SpecialPoint: 190,
 			subWeaponId: 1,
@@ -1729,6 +2053,18 @@ export const weaponParams = {
 			InkConsume: 0.0072,
 			InkConsume_SideStepParam: 0.07,
 		},
+		"5012": {
+			SpecialPoint: 190,
+			subWeaponId: 5,
+			specialWeaponId: 2,
+			MoveSpeed: 0.08,
+			DamageParam_ValueMax: 300,
+			DamageParam_ValueMin: 150,
+			Jump_DegSwerve: 7.5,
+			Stand_DegSwerve: 2,
+			InkConsume: 0.0072,
+			InkConsume_SideStepParam: 0.07,
+		},
 		"5015": {
 			SpecialPoint: 190,
 			subWeaponId: 1,
@@ -1793,6 +2129,18 @@ export const weaponParams = {
 			InkConsume: 0.012,
 			InkConsume_SideStepParam: 0.08,
 		},
+		"5032": {
+			SpecialPoint: 190,
+			subWeaponId: 9,
+			specialWeaponId: 19,
+			MoveSpeed: 0.072,
+			DamageParam_ValueMax: 280,
+			DamageParam_ValueMin: 140,
+			Jump_DegSwerve: 8,
+			Stand_DegSwerve: 4,
+			InkConsume: 0.012,
+			InkConsume_SideStepParam: 0.08,
+		},
 		"5040": {
 			SpecialPoint: 200,
 			subWeaponId: 7,
@@ -1906,6 +2254,23 @@ export const weaponParams = {
 			InkConsumeUmbrella_WeaponShelterCanopyParam: 0.3,
 			InkConsume_WeaponShelterShotgunParam: 0.11,
 		},
+		"6012": {
+			SpecialPoint: 190,
+			subWeaponId: 11,
+			specialWeaponId: 16,
+			overwrites: {
+				ConsumeRt_Main: {
+					High: 0.5,
+					Mid: 0.7,
+				},
+			},
+			WeaponSpeedType: "Slow",
+			MoveSpeed: 0.05,
+			DamageParam_ValueMax: 1190,
+			CanopyHP: 7000,
+			InkConsumeUmbrella_WeaponShelterCanopyParam: 0.3,
+			InkConsume_WeaponShelterShotgunParam: 0.11,
+		},
 		"6020": {
 			SpecialPoint: 180,
 			subWeaponId: 10,
@@ -1926,6 +2291,16 @@ export const weaponParams = {
 			CanopyHP: 2000,
 			InkConsume_WeaponShelterShotgunParam: 0.04,
 		},
+		"6022": {
+			SpecialPoint: 180,
+			subWeaponId: 6,
+			specialWeaponId: 9,
+			WeaponSpeedType: "Fast",
+			MoveSpeed: 0.072,
+			DamageParam_ValueMax: 400,
+			CanopyHP: 2000,
+			InkConsume_WeaponShelterShotgunParam: 0.04,
+		},
 		"6030": {
 			SpecialPoint: 190,
 			subWeaponId: 12,
@@ -1978,6 +2353,22 @@ export const weaponParams = {
 			ChargeFrameFullCharge: 72,
 			InkConsumeFullCharge_ChargeParam: 0.085,
 		},
+		"7012": {
+			SpecialPoint: 200,
+			subWeaponId: 12,
+			specialWeaponId: 10,
+			MoveSpeedFullCharge: 0.068,
+			DamageParam_ValueMax: 350,
+			DamageParam_ValueMin: 300,
+			BlastParam_DistanceDamage: [
+				{
+					Damage: 300,
+					Distance: 2,
+				},
+			],
+			ChargeFrameFullCharge: 72,
+			InkConsumeFullCharge_ChargeParam: 0.085,
+		},
 		"7015": {
 			SpecialPoint: 190,
 			subWeaponId: 11,
@@ -2024,6 +2415,24 @@ export const weaponParams = {
 			KeepChargeFullFrame: 75,
 			InkConsumeFullCharge_ChargeParam: 0.065,
 		},
+		"7022": {
+			SpecialPoint: 200,
+			subWeaponId: 13,
+			specialWeaponId: 6,
+			WeaponSpeedType: "Fast",
+			MoveSpeedFullCharge: 0.084,
+			DamageParam_ValueMax: 450,
+			DamageParam_ValueMin: 300,
+			BlastParam_DistanceDamage: [
+				{
+					Damage: 280,
+					Distance: 2,
+				},
+			],
+			ChargeFrameFullCharge: 34,
+			KeepChargeFullFrame: 75,
+			InkConsumeFullCharge_ChargeParam: 0.065,
+		},
 		"7030": {
 			SpecialPoint: 200,
 			subWeaponId: 7,
@@ -2080,6 +2489,17 @@ export const weaponParams = {
 			InkConsume_SwingParam: 0.052,
 			InkConsumeFullCharge_ChargeParam: 0.117,
 		},
+		"8002": {
+			SpecialPoint: 190,
+			subWeaponId: 7,
+			specialWeaponId: 6,
+			DamageParam_SplatanaVerticalDirect: 1400,
+			DamageParam_SplatanaVertical: 700,
+			DamageParam_SplatanaHorizontalDirect: 550,
+			DamageParam_SplatanaHorizontal: 350,
+			InkConsume_SwingParam: 0.052,
+			InkConsumeFullCharge_ChargeParam: 0.117,
+		},
 		"8005": {
 			SpecialPoint: 210,
 			subWeaponId: 2,
@@ -2115,6 +2535,18 @@ export const weaponParams = {
 			InkConsume_SwingParam: 0.03,
 			InkConsumeFullCharge_ChargeParam: 0.06,
 		},
+		"8012": {
+			SpecialPoint: 190,
+			subWeaponId: 6,
+			specialWeaponId: 1,
+			WeaponSpeedType: "Fast",
+			DamageParam_SplatanaVerticalDirect: 1200,
+			DamageParam_SplatanaVertical: 600,
+			DamageParam_SplatanaHorizontalDirect: 450,
+			DamageParam_SplatanaHorizontal: 300,
+			InkConsume_SwingParam: 0.03,
+			InkConsumeFullCharge_ChargeParam: 0.06,
+		},
 		"8020": {
 			SpecialPoint: 210,
 			subWeaponId: 1,
@@ -2405,8 +2837,8 @@ export const weaponParams = {
 				},
 			},
 			SubInkSaveLv: 1,
-			InkConsume: 0.6,
-			InkRecoverStop: 75,
+			InkConsume: 0.55,
+			InkRecoverStop: 80,
 		},
 		"12": {
 			overwrites: {
diff --git a/app/features/build-analyzer/routes/analyzer.tsx b/app/features/build-analyzer/routes/analyzer.tsx
index bf3372260..8404e96b2 100644
--- a/app/features/build-analyzer/routes/analyzer.tsx
+++ b/app/features/build-analyzer/routes/analyzer.tsx
@@ -88,7 +88,7 @@ import "../analyzer.css";
 import * as R from "remeda";
 import { SendouSwitch } from "~/components/elements/Switch";
 
-export const CURRENT_PATCH = "9.3";
+export const CURRENT_PATCH = "10.0";
 
 export const meta: MetaFunction = (args) => {
 	return metaTags({
diff --git a/app/features/builds/builds-constants.ts b/app/features/builds/builds-constants.ts
index cfd6a4b26..b0ed739e2 100644
--- a/app/features/builds/builds-constants.ts
+++ b/app/features/builds/builds-constants.ts
@@ -5,6 +5,10 @@ export const MAX_BUILD_FILTERS = 6;
 export const FILTER_SEARCH_PARAM_KEY = "f";
 
 export const PATCHES = [
+	{
+		patch: "10.0.0",
+		date: "2025-06-12",
+	},
 	{
 		patch: "9.3.0",
 		date: "2025-03-13",
@@ -13,10 +17,10 @@ export const PATCHES = [
 		patch: "9.2.0",
 		date: "2024-11-20",
 	},
-	{
-		patch: "9.0.0",
-		date: "2024-08-29",
-	},
+	// {
+	// 	patch: "9.0.0",
+	// 	date: "2024-08-29",
+	// },
 	// {
 	// 	patch: "8.1.0",
 	// 	date: "2024-07-17",
diff --git a/app/features/map-list-generator/core/map-pool-serializer/serializer.test.ts b/app/features/map-list-generator/core/map-pool-serializer/serializer.test.ts
index b1aa0c677..72e3bf680 100644
--- a/app/features/map-list-generator/core/map-pool-serializer/serializer.test.ts
+++ b/app/features/map-list-generator/core/map-pool-serializer/serializer.test.ts
@@ -6,7 +6,7 @@ import {
 import type { MapPoolObject } from "./types";
 
 const testSerializedPool =
-	"tw:1998000;sz:1d0a000;tc:164c000;rm:15e0000;cb:1ce0000";
+	"tw:3330000;sz:3a14000;tc:2c98000;rm:2bc0000;cb:39c0000";
 
 describe("Map pool serializer", () => {
 	test("Unserializes and then serializes to same result", () => {
diff --git a/app/features/object-damage-calculator/calculator-constants.ts b/app/features/object-damage-calculator/calculator-constants.ts
index 6406476ba..22c65174f 100644
--- a/app/features/object-damage-calculator/calculator-constants.ts
+++ b/app/features/object-damage-calculator/calculator-constants.ts
@@ -152,6 +152,15 @@ export const damageTypesToCombine: Partial<
 			multiplierOnly: true,
 		},
 	],
+	// Stickerz Splatana Stamper
+	8002: [
+		{ when: "SPLATANA_VERTICAL_DIRECT", combineWith: "SPLATANA_VERTICAL" },
+		{
+			when: "SPLATANA_HORIZONTAL_DIRECT",
+			combineWith: "SPLATANA_HORIZONTAL",
+			multiplierOnly: true,
+		},
+	],
 	// Order Splatana Replica
 	8005: [
 		{ when: "SPLATANA_VERTICAL_DIRECT", combineWith: "SPLATANA_VERTICAL" },
@@ -179,6 +188,15 @@ export const damageTypesToCombine: Partial<
 			multiplierOnly: true,
 		},
 	],
+	// Splatana Wiper RUS-T
+	8012: [
+		{ when: "SPLATANA_VERTICAL_DIRECT", combineWith: "SPLATANA_VERTICAL" },
+		{
+			when: "SPLATANA_HORIZONTAL_DIRECT",
+			combineWith: "SPLATANA_HORIZONTAL",
+			multiplierOnly: true,
+		},
+	],
 	// Mint Decavitator
 	8020: [
 		{ when: "SPLATANA_VERTICAL_DIRECT", combineWith: "SPLATANA_VERTICAL" },
diff --git a/app/features/object-damage-calculator/core/object-dmg.json b/app/features/object-damage-calculator/core/object-dmg.json
index 17fbca7b3..61add4825 100644
--- a/app/features/object-damage-calculator/core/object-dmg.json
+++ b/app/features/object-damage-calculator/core/object-dmg.json
@@ -2175,6 +2175,10 @@
 				"target": "GreatBarrier_WeakPoint",
 				"rate": 2.4
 			},
+			{
+				"target": "NiceBall_Armor",
+				"rate": 1
+			},
 			{
 				"target": "ShockSonar",
 				"rate": 2.4
@@ -2362,7 +2366,7 @@
 			},
 			{
 				"target": "Chariot",
-				"rate": 2
+				"rate": 4
 			},
 			{
 				"target": "Gachihoko_Barrier",
@@ -2963,7 +2967,7 @@
 			},
 			{
 				"target": "ShockSonar",
-				"rate": 4.8
+				"rate": 2.4
 			},
 			{
 				"target": "Wsb_Flag",
@@ -3113,7 +3117,7 @@
 			},
 			{
 				"target": "ShockSonar",
-				"rate": 4.8
+				"rate": 2.4
 			},
 			{
 				"target": "Wsb_Flag",
@@ -5134,7 +5138,7 @@
 			},
 			{
 				"target": "Chariot",
-				"rate": 2
+				"rate": 3
 			},
 			{
 				"target": "Gachihoko_Barrier",
diff --git a/app/features/object-damage-calculator/core/objectDamage.ts b/app/features/object-damage-calculator/core/objectDamage.ts
index 50a1f8f6f..5cbced132 100644
--- a/app/features/object-damage-calculator/core/objectDamage.ts
+++ b/app/features/object-damage-calculator/core/objectDamage.ts
@@ -11,7 +11,7 @@ import type {
 	SpecialWeaponId,
 	SubWeaponId,
 } from "~/modules/in-game-lists/types";
-import { altWeaponIdToId } from "~/modules/in-game-lists/weapon-ids";
+import { weaponIdToBaseWeaponId } from "~/modules/in-game-lists/weapon-ids";
 import invariant from "~/utils/invariant";
 import { roundToNDecimalPlaces } from "~/utils/number";
 import {
@@ -23,14 +23,6 @@ import type { CombineWith, DamageReceiver } from "../calculator-types";
 import objectDamages from "./object-dmg.json";
 import { objectHitPoints } from "./objectHitPoints";
 
-const getNormalizedMainWeapondId = (id: MainWeaponId) => {
-	if (altWeaponIdToId.has(id)) {
-		return altWeaponIdToId.get(id)!;
-	}
-
-	return id % 10 !== 0 ? ((id - 1) as MainWeaponId) : id;
-};
-
 export function damageTypeToMultipliers({
 	type,
 	weapon,
@@ -44,7 +36,7 @@ export function damageTypeToMultipliers({
 		if (
 			weapon.type === "MAIN" &&
 			(objectDamagesObj.mainWeaponIds as MainWeaponId[]).includes(
-				getNormalizedMainWeapondId(weapon.id),
+				weaponIdToBaseWeaponId(weapon.id),
 			)
 		) {
 			matchingKeys.push(key as keyof typeof objectDamages);
@@ -88,9 +80,7 @@ function resolveRelevantKey({
 		// handle alt kits e.g. Splatteshot might have id 10 but Tentatek Splattershot has id 11
 		// but in the context of this function they are one and the same
 		const normalizedWeaponId =
-			weapon.type === "MAIN"
-				? getNormalizedMainWeapondId(weapon.id)
-				: weapon.id;
+			weapon.type === "MAIN" ? weaponIdToBaseWeaponId(weapon.id) : weapon.id;
 
 		if (weaponType !== weapon.type) continue;
 		if (!weaponIds.includes(normalizedWeaponId)) continue;
diff --git a/app/features/object-damage-calculator/core/objectHitPoints.ts b/app/features/object-damage-calculator/core/objectHitPoints.ts
index 52c8ef307..989e5fc86 100644
--- a/app/features/object-damage-calculator/core/objectHitPoints.ts
+++ b/app/features/object-damage-calculator/core/objectHitPoints.ts
@@ -16,7 +16,7 @@ import {
 import invariant from "~/utils/invariant";
 import type { HitPoints } from "../calculator-types";
 
-const WAVE_BREAKER_HP = 400;
+const WAVE_BREAKER_HP = 480;
 const SPRINKLER_HP = 120;
 const RAINMAKER_HP = 1000;
 const SPLAT_BRELLA_SHIELD_HP = 500;
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 d73204019..68299f340 100644
--- a/app/features/object-damage-calculator/routes/object-damage-calculator.tsx
+++ b/app/features/object-damage-calculator/routes/object-damage-calculator.tsx
@@ -42,7 +42,7 @@ import type { MetaFunction } from "@remix-run/node";
 import { SendouSwitch } from "~/components/elements/Switch";
 import { metaTags } from "~/utils/remix";
 
-export const CURRENT_PATCH = "9.3";
+export const CURRENT_PATCH = "10.0";
 
 export const shouldRevalidate: ShouldRevalidateFunction = () => false;
 
diff --git a/app/features/user-page/core/build-sorting.server.ts b/app/features/user-page/core/build-sorting.server.ts
index 8786e67d2..b836aa739 100644
--- a/app/features/user-page/core/build-sorting.server.ts
+++ b/app/features/user-page/core/build-sorting.server.ts
@@ -2,7 +2,7 @@ import type { BuildSort } from "~/db/tables";
 import type * as BuildRepository from "~/features/builds/BuildRepository.server";
 import { modesShort } from "~/modules/in-game-lists/modes";
 import type { MainWeaponId } from "~/modules/in-game-lists/types";
-import { weaponIdToBucketId } from "~/modules/in-game-lists/weapon-ids";
+import { weaponIdToBaseWeaponId } from "~/modules/in-game-lists/weapon-ids";
 import { DEFAULT_BUILD_SORT } from "../user-page-constants";
 
 interface SortBuildsArgs {
@@ -56,13 +56,13 @@ export function sortBuilds({
 		WEAPON_POOL: (a, b) => {
 			const aLowestWeaponIdx = weaponPool.findIndex((wp) =>
 				a.weapons
-					.map((wpn) => weaponIdToBucketId(wpn.weaponSplId))
-					.includes(weaponIdToBucketId(wp)),
+					.map((wpn) => weaponIdToBaseWeaponId(wpn.weaponSplId))
+					.includes(weaponIdToBaseWeaponId(wp)),
 			);
 			const bLowestWeaponIdx = weaponPool.findIndex((wp) =>
 				b.weapons
-					.map((wpn) => weaponIdToBucketId(wpn.weaponSplId))
-					.includes(weaponIdToBucketId(wp)),
+					.map((wpn) => weaponIdToBaseWeaponId(wpn.weaponSplId))
+					.includes(weaponIdToBaseWeaponId(wp)),
 			);
 
 			if (aLowestWeaponIdx === -1 && bLowestWeaponIdx !== -1) return 1;
diff --git a/app/modules/in-game-lists/stage-ids.ts b/app/modules/in-game-lists/stage-ids.ts
index ed85c507e..30dde1f3d 100644
--- a/app/modules/in-game-lists/stage-ids.ts
+++ b/app/modules/in-game-lists/stage-ids.ts
@@ -24,6 +24,7 @@ export const stageIds = [
 	21, // Robo ROM-en
 	22, // Marlin Airport
 	23, // Lemuria Hub
+	24, // Urchin Underpass
 ] as const;
 
 export const stagesObj = {
@@ -51,4 +52,5 @@ export const stagesObj = {
 	ROBO_ROM_EN: 21,
 	MARLIN_AIRPORT: 22,
 	LEMURIA_HUB: 23,
+	URCHIN_UNDERPASS: 24,
 } as const;
diff --git a/app/modules/in-game-lists/weapon-ids.test.ts b/app/modules/in-game-lists/weapon-ids.test.ts
index b3676bc3a..3bddc68cb 100644
--- a/app/modules/in-game-lists/weapon-ids.test.ts
+++ b/app/modules/in-game-lists/weapon-ids.test.ts
@@ -1,1467 +1,5 @@
 import { describe, expect, test } from "vitest";
-import type { MainWeaponId } from "./types";
-import { weaponIdToArrayWithAlts, weaponIdToBucketId } from "./weapon-ids";
-
-describe("weaponIdToBucketId()", () => {
-	test("Each weaponId is mapped to its correct bucket", () => {
-		const mappings = [
-			[0, 0],
-			[1, 0],
-			[10, 10],
-			[11, 10],
-			[20, 20],
-			[21, 20],
-			[30, 30],
-			[31, 30],
-			[40, 40],
-			[41, 40],
-			[45, 40],
-			[46, 40],
-			[47, 40],
-			[50, 50],
-			[51, 50],
-			[60, 60],
-			[61, 60],
-			[70, 70],
-			[71, 70],
-			[80, 80],
-			[81, 80],
-			[90, 90],
-			[91, 90],
-			[100, 100],
-			[101, 100],
-			[200, 200],
-			[201, 200],
-			[205, 200],
-			[210, 210],
-			[211, 210],
-			[220, 220],
-			[221, 220],
-			[230, 230],
-			[231, 230],
-			[240, 240],
-			[241, 240],
-			[250, 250],
-			[251, 250],
-			[260, 260],
-			[261, 260],
-			[300, 300],
-			[301, 300],
-			[310, 310],
-			[311, 310],
-			[400, 400],
-			[401, 400],
-			[1000, 1000],
-			[1001, 1000],
-			[1010, 1010],
-			[1011, 1010],
-			[1015, 1010],
-			[1020, 1020],
-			[1021, 1020],
-			[1030, 1030],
-			[1031, 1030],
-			[1040, 1040],
-			[1041, 1040],
-			[1100, 1100],
-			[1101, 1100],
-			[1110, 1110],
-			[1111, 1110],
-			[1115, 1110],
-			[1120, 1120],
-			[1121, 1120],
-			[2000, 2000],
-			[2001, 2000],
-			[2010, 2010],
-			[2011, 2010],
-			[2015, 2010],
-			[2020, 2020],
-			[2021, 2020],
-			[2030, 2030],
-			[2031, 2030],
-			[2040, 2040],
-			[2041, 2040],
-			[2050, 2050],
-			[2051, 2050],
-			[2060, 2060],
-			[2061, 2060],
-			[2070, 2070],
-			[2071, 2070],
-			[3000, 3000],
-			[3001, 3000],
-			[3005, 3000],
-			[3010, 3010],
-			[3011, 3010],
-			[3020, 3020],
-			[3021, 3020],
-			[3030, 3030],
-			[3031, 3030],
-			[3040, 3040],
-			[3041, 3040],
-			[3050, 3050],
-			[3051, 3050],
-			[4000, 4000],
-			[4001, 4000],
-			[4010, 4010],
-			[4011, 4010],
-			[4015, 4010],
-			[4020, 4020],
-			[4021, 4020],
-			[4030, 4030],
-			[4031, 4030],
-			[4040, 4040],
-			[4041, 4040],
-			[4050, 4050],
-			[4051, 4050],
-			[5000, 5000],
-			[5001, 5000],
-			[5010, 5010],
-			[5011, 5010],
-			[5015, 5010],
-			[5020, 5020],
-			[5021, 5020],
-			[5030, 5030],
-			[5031, 5030],
-			[5040, 5040],
-			[5041, 5040],
-			[5050, 5050],
-			[5051, 5050],
-			[6000, 6000],
-			[6001, 6000],
-			[6005, 6000],
-			[6010, 6010],
-			[6011, 6010],
-			[6020, 6020],
-			[6021, 6020],
-			[6030, 6030],
-			[6031, 6030],
-			[7010, 7010],
-			[7011, 7010],
-			[7015, 7010],
-			[7020, 7020],
-			[7021, 7020],
-			[7030, 7030],
-			[7031, 7030],
-			[8000, 8000],
-			[8001, 8000],
-			[8005, 8000],
-			[8010, 8010],
-			[8011, 8010],
-			[8020, 8020],
-			[8021, 8020],
-		];
-		for (const [id, expected] of mappings) {
-			expect(weaponIdToBucketId(id as MainWeaponId)).toBe(expected);
-		}
-	});
-
-	test("Buckets represent the same main weapon across variants", () => {
-		const weaponData: Record<MainWeaponId, any> = {
-			"250": {
-				season: 0,
-				sub: "PoisonMist",
-				special: "SpBlower",
-				class: "Blaster",
-				kit: "LightLong_00",
-				reference_kit: "LightLong_00",
-				reference_id: 250,
-			},
-			"251": {
-				season: 4,
-				sub: "LineMarker",
-				special: "SpMicroLaser",
-				class: "Blaster",
-				kit: "LightLong_01",
-				reference_kit: "LightLong_01",
-				reference_id: 251,
-			},
-			"230": {
-				season: 0,
-				sub: "Bomb_Splash",
-				special: "SpUltraShot",
-				class: "Blaster",
-				kit: "LightShort_00",
-				reference_kit: "LightShort_00",
-				reference_id: 230,
-			},
-			"231": {
-				season: 3,
-				sub: "Bomb_Curling",
-				special: "SpFirework",
-				class: "Blaster",
-				kit: "LightShort_01",
-				reference_kit: "LightShort_01",
-				reference_id: 231,
-			},
-			"240": {
-				season: 0,
-				sub: "Trap",
-				special: "SpTripleTornado",
-				class: "Blaster",
-				kit: "Light_00",
-				reference_kit: "Light_00",
-				reference_id: 240,
-			},
-			"241": {
-				season: 3,
-				sub: "Bomb_Torpedo",
-				special: "SpJetpack",
-				class: "Blaster",
-				kit: "Light_01",
-				reference_kit: "Light_01",
-				reference_id: 241,
-			},
-			"220": {
-				season: 0,
-				sub: "Bomb_Suction",
-				special: "SpShockSonar",
-				class: "Blaster",
-				kit: "Long_00",
-				reference_kit: "Long_00",
-				reference_id: 220,
-			},
-			"221": {
-				season: 8,
-				sub: "Bomb_Splash",
-				special: "SpCastle",
-				class: "Blaster",
-				kit: "Long_01",
-				reference_kit: "Long_01",
-				reference_id: 221,
-			},
-			"210": {
-				season: 0,
-				sub: "Bomb_Robot",
-				special: "SpGreatBarrier",
-				class: "Blaster",
-				kit: "Middle_00",
-				reference_kit: "Middle_00",
-				reference_id: 210,
-			},
-			"211": {
-				season: 6,
-				sub: "PointSensor",
-				special: "SpPogo",
-				class: "Blaster",
-				kit: "Middle_01",
-				reference_kit: "Middle_01",
-				reference_id: 211,
-			},
-			"260": {
-				season: 4,
-				sub: "Sprinkler",
-				special: "SpSkewer",
-				class: "Blaster",
-				kit: "Precision_00",
-				reference_kit: "Precision_00",
-				reference_id: 260,
-			},
-			"261": {
-				season: 6,
-				sub: "Bomb_Quick",
-				special: "SpNiceBall",
-				class: "Blaster",
-				kit: "Precision_01",
-				reference_kit: "Precision_01",
-				reference_id: 261,
-			},
-			"200": {
-				season: 0,
-				sub: "Bomb_Splash",
-				special: "SpSuperHook",
-				class: "Blaster",
-				kit: "Short_00",
-				reference_kit: "Short_00",
-				reference_id: 200,
-			},
-			"201": {
-				season: 2,
-				sub: "Bomb_Fizzy",
-				special: "SpUltraStamp",
-				class: "Blaster",
-				kit: "Short_01",
-				reference_kit: "Short_01",
-				reference_id: 201,
-			},
-			"205": {
-				season: -1,
-				sub: "Bomb_Splash",
-				special: "SpSuperHook",
-				class: "Blaster",
-				kit: "Short_O",
-				reference_kit: "Short_00",
-				reference_id: 200,
-			},
-			"1120": {
-				season: 4,
-				sub: "Bomb_Curling",
-				special: "SpShockSonar",
-				class: "Brush",
-				kit: "Heavy_00",
-				reference_kit: "Heavy_00",
-				reference_id: 1120,
-			},
-			"1121": {
-				season: 6,
-				sub: "PointSensor",
-				special: "SpMultiMissile",
-				class: "Brush",
-				kit: "Heavy_01",
-				reference_kit: "Heavy_01",
-				reference_id: 1121,
-			},
-			"1100": {
-				season: 0,
-				sub: "Bomb_Splash",
-				special: "SpMicroLaser",
-				class: "Brush",
-				kit: "Mini_00",
-				reference_kit: "Mini_00",
-				reference_id: 1100,
-			},
-			"1101": {
-				season: 2,
-				sub: "Trap",
-				special: "SpUltraStamp",
-				class: "Brush",
-				kit: "Mini_01",
-				reference_kit: "Mini_01",
-				reference_id: 1101,
-			},
-			"1110": {
-				season: 0,
-				sub: "Bomb_Suction",
-				special: "SpSuperHook",
-				class: "Brush",
-				kit: "Normal_00",
-				reference_kit: "Normal_00",
-				reference_id: 1110,
-			},
-			"1111": {
-				season: 5,
-				sub: "Beacon",
-				special: "SpInkStorm",
-				class: "Brush",
-				kit: "Normal_01",
-				reference_kit: "Normal_01",
-				reference_id: 1111,
-			},
-			"1115": {
-				season: -1,
-				sub: "Bomb_Suction",
-				special: "SpSuperHook",
-				class: "Brush",
-				kit: "Normal_O",
-				reference_kit: "Normal_00",
-				reference_id: 1110,
-			},
-			"2060": {
-				season: 0,
-				sub: "Bomb_Torpedo",
-				special: "SpMultiMissile",
-				class: "Charger",
-				kit: "Keeper_00",
-				reference_kit: "Keeper_00",
-				reference_id: 2060,
-			},
-			"2061": {
-				season: 5,
-				sub: "Bomb_Fizzy",
-				special: "SpUltraStamp",
-				class: "Charger",
-				kit: "Keeper_01",
-				reference_kit: "Keeper_01",
-				reference_id: 2061,
-			},
-			"2050": {
-				season: 0,
-				sub: "Bomb_Robot",
-				special: "SpMicroLaser",
-				class: "Charger",
-				kit: "Light_00",
-				reference_kit: "Light_00",
-				reference_id: 2050,
-			},
-			"2051": {
-				season: 8,
-				sub: "Bomb_Fizzy",
-				special: "SpFirework",
-				class: "Charger",
-				kit: "Light_01",
-				reference_kit: "Light_01",
-				reference_id: 2051,
-			},
-			"2040": {
-				season: 0,
-				sub: "Trap",
-				special: "SpShockSonar",
-				class: "Charger",
-				kit: "LongScope_00",
-				reference_kit: "LongScope_00",
-				reference_id: 2040,
-			},
-			"2041": {
-				season: 7,
-				sub: "Beacon",
-				special: "SpCastle",
-				class: "Charger",
-				kit: "LongScope_01",
-				reference_kit: "LongScope_01",
-				reference_id: 2041,
-			},
-			"2030": {
-				season: 0,
-				sub: "Trap",
-				special: "SpShockSonar",
-				class: "Charger",
-				kit: "Long_00",
-				reference_kit: "Long_00",
-				reference_id: 2030,
-			},
-			"2031": {
-				season: 7,
-				sub: "Beacon",
-				special: "SpCastle",
-				class: "Charger",
-				kit: "Long_01",
-				reference_kit: "Long_01",
-				reference_id: 2031,
-			},
-			"2020": {
-				season: 0,
-				sub: "Bomb_Splash",
-				special: "SpBlower",
-				class: "Charger",
-				kit: "NormalScope_00",
-				reference_kit: "NormalScope_00",
-				reference_id: 2020,
-			},
-			"2021": {
-				season: 3,
-				sub: "Shield",
-				special: "SpTripleTornado",
-				class: "Charger",
-				kit: "NormalScope_01",
-				reference_kit: "NormalScope_01",
-				reference_id: 2021,
-			},
-			"2010": {
-				season: 0,
-				sub: "Bomb_Splash",
-				special: "SpBlower",
-				class: "Charger",
-				kit: "Normal_00",
-				reference_kit: "Normal_00",
-				reference_id: 2010,
-			},
-			"2011": {
-				season: 3,
-				sub: "Shield",
-				special: "SpTripleTornado",
-				class: "Charger",
-				kit: "Normal_01",
-				reference_kit: "Normal_01",
-				reference_id: 2011,
-			},
-			"2015": {
-				season: -1,
-				sub: "Bomb_Splash",
-				special: "SpBlower",
-				class: "Charger",
-				kit: "Normal_O",
-				reference_kit: "Normal_00",
-				reference_id: 2010,
-			},
-			"2070": {
-				season: 2,
-				sub: "Sprinkler",
-				special: "SpEnergyStand",
-				class: "Charger",
-				kit: "Pencil_00",
-				reference_kit: "Pencil_00",
-				reference_id: 2070,
-			},
-			"2071": {
-				season: 6,
-				sub: "Shield",
-				special: "SpInkStorm",
-				class: "Charger",
-				kit: "Pencil_01",
-				reference_kit: "Pencil_01",
-				reference_id: 2071,
-			},
-			"2000": {
-				season: 0,
-				sub: "PointSensor",
-				special: "SpGreatBarrier",
-				class: "Charger",
-				kit: "Quick_00",
-				reference_kit: "Quick_00",
-				reference_id: 2000,
-			},
-			"2001": {
-				season: 7,
-				sub: "Bomb_Robot",
-				special: "SpSuperHook",
-				class: "Charger",
-				kit: "Quick_01",
-				reference_kit: "Quick_01",
-				reference_id: 2001,
-			},
-			"5030": {
-				season: 0,
-				sub: "Bomb_Splash",
-				special: "SpShockSonar",
-				class: "Maneuver",
-				kit: "Dual_00",
-				reference_kit: "Dual_00",
-				reference_id: 5030,
-			},
-			"5031": {
-				season: 4,
-				sub: "Beacon",
-				special: "SpFirework",
-				class: "Maneuver",
-				kit: "Dual_01",
-				reference_kit: "Dual_01",
-				reference_id: 5031,
-			},
-			"5020": {
-				season: 0,
-				sub: "Shield",
-				special: "SpNiceBall",
-				class: "Maneuver",
-				kit: "Gallon_00",
-				reference_kit: "Gallon_00",
-				reference_id: 5020,
-			},
-			"5021": {
-				season: 7,
-				sub: "PointSensor",
-				special: "SpUltraShot",
-				class: "Maneuver",
-				kit: "Gallon_01",
-				reference_kit: "Gallon_01",
-				reference_id: 5021,
-			},
-			"5050": {
-				season: 7,
-				sub: "Trap",
-				special: "SpMicroLaser",
-				class: "Maneuver",
-				kit: "Long_00",
-				reference_kit: "Long_00",
-				reference_id: 5050,
-			},
-			"5051": {
-				season: 8,
-				sub: "Bomb_Quick",
-				special: "SpTripleTornado",
-				class: "Maneuver",
-				kit: "Long_01",
-				reference_kit: "Long_01",
-				reference_id: 5051,
-			},
-			"5010": {
-				season: 0,
-				sub: "Bomb_Suction",
-				special: "SpChariot",
-				class: "Maneuver",
-				kit: "Normal_00",
-				reference_kit: "Normal_00",
-				reference_id: 5010,
-			},
-			"5011": {
-				season: 6,
-				sub: "Bomb_Curling",
-				special: "SpPogo",
-				class: "Maneuver",
-				kit: "Normal_01",
-				reference_kit: "Normal_01",
-				reference_id: 5011,
-			},
-			"5015": {
-				season: -1,
-				sub: "Bomb_Suction",
-				special: "SpChariot",
-				class: "Maneuver",
-				kit: "Normal_O",
-				reference_kit: "Normal_00",
-				reference_id: 5010,
-			},
-			"5000": {
-				season: 0,
-				sub: "Beacon",
-				special: "SpEnergyStand",
-				class: "Maneuver",
-				kit: "Short_00",
-				reference_kit: "Short_00",
-				reference_id: 5000,
-			},
-			"5001": {
-				season: 2,
-				sub: "Bomb_Torpedo",
-				special: "SpSkewer",
-				class: "Maneuver",
-				kit: "Short_01",
-				reference_kit: "Short_01",
-				reference_id: 5001,
-			},
-			"5040": {
-				season: 0,
-				sub: "Bomb_Robot",
-				special: "SpSkewer",
-				class: "Maneuver",
-				kit: "Stepper_00",
-				reference_kit: "Stepper_00",
-				reference_id: 5040,
-			},
-			"5041": {
-				season: 4,
-				sub: "Sprinkler",
-				special: "SpSuperHook",
-				class: "Maneuver",
-				kit: "Stepper_01",
-				reference_kit: "Stepper_01",
-				reference_id: 5041,
-			},
-			"1000": {
-				season: 0,
-				sub: "Bomb_Robot",
-				special: "SpSuperHook",
-				class: "Roller",
-				kit: "Compact_00",
-				reference_kit: "Compact_00",
-				reference_id: 1000,
-			},
-			"1001": {
-				season: 2,
-				sub: "Bomb_Quick",
-				special: "SpUltraShot",
-				class: "Roller",
-				kit: "Compact_01",
-				reference_kit: "Compact_01",
-				reference_id: 1001,
-			},
-			"1020": {
-				season: 0,
-				sub: "Sprinkler",
-				special: "SpEnergyStand",
-				class: "Roller",
-				kit: "Heavy_00",
-				reference_kit: "Heavy_00",
-				reference_id: 1020,
-			},
-			"1021": {
-				season: 5,
-				sub: "Bomb_Splash",
-				special: "SpFirework",
-				class: "Roller",
-				kit: "Heavy_01",
-				reference_kit: "Heavy_01",
-				reference_id: 1021,
-			},
-			"1030": {
-				season: 0,
-				sub: "Trap",
-				special: "SpMultiMissile",
-				class: "Roller",
-				kit: "Hunter_00",
-				reference_kit: "Hunter_00",
-				reference_id: 1030,
-			},
-			"1031": {
-				season: 7,
-				sub: "Bomb_Suction",
-				special: "SpChimney",
-				class: "Roller",
-				kit: "Hunter_01",
-				reference_kit: "Hunter_01",
-				reference_id: 1031,
-			},
-			"1010": {
-				season: 0,
-				sub: "Bomb_Curling",
-				special: "SpGreatBarrier",
-				class: "Roller",
-				kit: "Normal_00",
-				reference_kit: "Normal_00",
-				reference_id: 1010,
-			},
-			"1011": {
-				season: 3,
-				sub: "Beacon",
-				special: "SpCastle",
-				class: "Roller",
-				kit: "Normal_01",
-				reference_kit: "Normal_01",
-				reference_id: 1011,
-			},
-			"1015": {
-				season: -1,
-				sub: "Bomb_Curling",
-				special: "SpGreatBarrier",
-				class: "Roller",
-				kit: "Normal_O",
-				reference_kit: "Normal_00",
-				reference_id: 1010,
-			},
-			"1040": {
-				season: 2,
-				sub: "Shield",
-				special: "SpBlower",
-				class: "Roller",
-				kit: "Wide_00",
-				reference_kit: "Wide_00",
-				reference_id: 1040,
-			},
-			"1041": {
-				season: 4,
-				sub: "LineMarker",
-				special: "SpInkStorm",
-				class: "Roller",
-				kit: "Wide_01",
-				reference_kit: "Wide_01",
-				reference_id: 1041,
-			},
-			"8020": {
-				season: 8,
-				sub: "Bomb_Suction",
-				special: "SpGreatBarrier",
-				class: "Saber",
-				kit: "Heavy_00",
-				reference_kit: "Heavy_00",
-				reference_id: 8020,
-			},
-			"8021": {
-				season: 8,
-				sub: "Shield",
-				special: "SpJetpack",
-				class: "Saber",
-				kit: "Heavy_01",
-				reference_kit: "Heavy_01",
-				reference_id: 8021,
-			},
-			"8010": {
-				season: 1,
-				sub: "Bomb_Torpedo",
-				special: "SpUltraStamp",
-				class: "Saber",
-				kit: "Lite_00",
-				reference_kit: "Lite_00",
-				reference_id: 8010,
-			},
-			"8011": {
-				season: 4,
-				sub: "Beacon",
-				special: "SpMultiMissile",
-				class: "Saber",
-				kit: "Lite_01",
-				reference_kit: "Lite_01",
-				reference_id: 8011,
-			},
-			"8000": {
-				season: 0,
-				sub: "Bomb_Quick",
-				special: "SpSuperHook",
-				class: "Saber",
-				kit: "Normal_00",
-				reference_kit: "Normal_00",
-				reference_id: 8000,
-			},
-			"8001": {
-				season: 6,
-				sub: "PoisonMist",
-				special: "SpChariot",
-				class: "Saber",
-				kit: "Normal_01",
-				reference_kit: "Normal_01",
-				reference_id: 8001,
-			},
-			"8005": {
-				season: -1,
-				sub: "Bomb_Quick",
-				special: "SpSuperHook",
-				class: "Saber",
-				kit: "Normal_O",
-				reference_kit: "Normal_00",
-				reference_id: 8000,
-			},
-			"6020": {
-				season: 0,
-				sub: "Trap",
-				special: "SpSkewer",
-				class: "Shelter",
-				kit: "Compact_00",
-				reference_kit: "Compact_00",
-				reference_id: 6020,
-			},
-			"6021": {
-				season: 6,
-				sub: "Bomb_Torpedo",
-				special: "SpChimney",
-				class: "Shelter",
-				kit: "Compact_01",
-				reference_kit: "Compact_01",
-				reference_id: 6021,
-			},
-			"6030": {
-				season: 7,
-				sub: "LineMarker",
-				special: "SpGreatBarrier",
-				class: "Shelter",
-				kit: "Focus_00",
-				reference_kit: "Focus_00",
-				reference_id: 6030,
-			},
-			"6031": {
-				season: 8,
-				sub: "PoisonMist",
-				special: "SpPogo",
-				class: "Shelter",
-				kit: "Focus_01",
-				reference_kit: "Focus_01",
-				reference_id: 6031,
-			},
-			"6000": {
-				season: 0,
-				sub: "Sprinkler",
-				special: "SpTripleTornado",
-				class: "Shelter",
-				kit: "Normal_00",
-				reference_kit: "Normal_00",
-				reference_id: 6000,
-			},
-			"6001": {
-				season: 5,
-				sub: "Bomb_Robot",
-				special: "SpJetpack",
-				class: "Shelter",
-				kit: "Normal_01",
-				reference_kit: "Normal_01",
-				reference_id: 6001,
-			},
-			"6005": {
-				season: -1,
-				sub: "Sprinkler",
-				special: "SpTripleTornado",
-				class: "Shelter",
-				kit: "Normal_O",
-				reference_kit: "Normal_00",
-				reference_id: 6000,
-			},
-			"6010": {
-				season: 0,
-				sub: "Beacon",
-				special: "SpBlower",
-				class: "Shelter",
-				kit: "Wide_00",
-				reference_kit: "Wide_00",
-				reference_id: 6010,
-			},
-			"6011": {
-				season: 4,
-				sub: "Trap",
-				special: "SpUltraShot",
-				class: "Shelter",
-				kit: "Wide_01",
-				reference_kit: "Wide_01",
-				reference_id: 6011,
-			},
-			"30": {
-				season: 0,
-				sub: "Bomb_Fizzy",
-				special: "SpSkewer",
-				class: "Shooter",
-				kit: "Blaze_00",
-				reference_kit: "Blaze_00",
-				reference_id: 30,
-			},
-			"31": {
-				season: 2,
-				sub: "Sprinkler",
-				special: "SpNiceBall",
-				class: "Shooter",
-				kit: "Blaze_01",
-				reference_kit: "Blaze_01",
-				reference_id: 31,
-			},
-			"70": {
-				season: 0,
-				sub: "LineMarker",
-				special: "SpChariot",
-				class: "Shooter",
-				kit: "Expert_00",
-				reference_kit: "Expert_00",
-				reference_id: 70,
-			},
-			"71": {
-				season: 2,
-				sub: "Bomb_Suction",
-				special: "SpNiceBall",
-				class: "Shooter",
-				kit: "Expert_01",
-				reference_kit: "Expert_01",
-				reference_id: 71,
-			},
-			"10": {
-				season: 0,
-				sub: "Bomb_Splash",
-				special: "SpGreatBarrier",
-				class: "Shooter",
-				kit: "First_00",
-				reference_kit: "First_00",
-				reference_id: 10,
-			},
-			"11": {
-				season: 2,
-				sub: "Bomb_Torpedo",
-				special: "SpShockSonar",
-				class: "Shooter",
-				kit: "First_01",
-				reference_kit: "First_01",
-				reference_id: 11,
-			},
-			"400": {
-				season: 0,
-				sub: "Shield",
-				special: "SpUltraShot",
-				class: "Shooter",
-				kit: "Flash_00",
-				reference_kit: "Flash_00",
-				reference_id: 400,
-			},
-			"401": {
-				season: 6,
-				sub: "Bomb_Robot",
-				special: "SpChimney",
-				class: "Shooter",
-				kit: "Flash_01",
-				reference_kit: "Flash_01",
-				reference_id: 401,
-			},
-			"50": {
-				season: 0,
-				sub: "Shield",
-				special: "SpMicroLaser",
-				class: "Shooter",
-				kit: "Gravity_00",
-				reference_kit: "Gravity_00",
-				reference_id: 50,
-			},
-			"51": {
-				season: 7,
-				sub: "Bomb_Curling",
-				special: "SpChimney",
-				class: "Shooter",
-				kit: "Gravity_01",
-				reference_kit: "Gravity_01",
-				reference_id: 51,
-			},
-			"80": {
-				season: 0,
-				sub: "Sprinkler",
-				special: "SpBlower",
-				class: "Shooter",
-				kit: "Heavy_00",
-				reference_kit: "Heavy_00",
-				reference_id: 80,
-			},
-			"81": {
-				season: 3,
-				sub: "Shield",
-				special: "SpCastle",
-				class: "Shooter",
-				kit: "Heavy_01",
-				reference_kit: "Heavy_01",
-				reference_id: 81,
-			},
-			"90": {
-				season: 0,
-				sub: "LineMarker",
-				special: "SpBlower",
-				class: "Shooter",
-				kit: "Long_00",
-				reference_kit: "Long_00",
-				reference_id: 90,
-			},
-			"91": {
-				season: 3,
-				sub: "PoisonMist",
-				special: "SpInkStorm",
-				class: "Shooter",
-				kit: "Long_01",
-				reference_kit: "Long_01",
-				reference_id: 91,
-			},
-			"40": {
-				season: 0,
-				sub: "Bomb_Suction",
-				special: "SpUltraShot",
-				class: "Shooter",
-				kit: "Normal_00",
-				reference_kit: "Normal_00",
-				reference_id: 40,
-			},
-			"41": {
-				season: 2,
-				sub: "Bomb_Splash",
-				special: "SpTripleTornado",
-				class: "Shooter",
-				kit: "Normal_01",
-				reference_kit: "Normal_01",
-				reference_id: 41,
-			},
-			"45": {
-				season: 0,
-				sub: "Bomb_Suction",
-				special: "SpUltraShot",
-				class: "Shooter",
-				kit: "Normal_H",
-				reference_kit: "Normal_00",
-				reference_id: 40,
-			},
-			"47": {
-				season: -1,
-				sub: "Bomb_Suction",
-				special: "SpUltraShot",
-				class: "Shooter",
-				kit: "Normal_O",
-				reference_kit: "Normal_00",
-				reference_id: 40,
-			},
-			"46": {
-				season: -1,
-				sub: "Bomb_Splash",
-				special: "SpTripleTornado",
-				class: "Shooter",
-				kit: "Normal_Oct",
-				reference_kit: "Normal_01",
-				reference_id: 41,
-			},
-			"20": {
-				season: 0,
-				sub: "Bomb_Quick",
-				special: "SpChariot",
-				class: "Shooter",
-				kit: "Precision_00",
-				reference_kit: "Precision_00",
-				reference_id: 20,
-			},
-			"21": {
-				season: 3,
-				sub: "Bomb_Suction",
-				special: "SpTripleTornado",
-				class: "Shooter",
-				kit: "Precision_01",
-				reference_kit: "Precision_01",
-				reference_id: 21,
-			},
-			"100": {
-				season: 2,
-				sub: "PointSensor",
-				special: "SpMicroLaser",
-				class: "Shooter",
-				kit: "QuickLong_00",
-				reference_kit: "QuickLong_00",
-				reference_id: 100,
-			},
-			"101": {
-				season: 4,
-				sub: "Trap",
-				special: "SpJetpack",
-				class: "Shooter",
-				kit: "QuickLong_01",
-				reference_kit: "QuickLong_01",
-				reference_id: 101,
-			},
-			"60": {
-				season: 0,
-				sub: "Bomb_Suction",
-				special: "SpEnergyStand",
-				class: "Shooter",
-				kit: "QuickMiddle_00",
-				reference_kit: "QuickMiddle_00",
-				reference_id: 60,
-			},
-			"61": {
-				season: 3,
-				sub: "Bomb_Robot",
-				special: "SpFirework",
-				class: "Shooter",
-				kit: "QuickMiddle_01",
-				reference_kit: "QuickMiddle_01",
-				reference_id: 61,
-			},
-			"0": {
-				season: 0,
-				sub: "Bomb_Curling",
-				special: "SpUltraStamp",
-				class: "Shooter",
-				kit: "Short_00",
-				reference_kit: "Short_00",
-				reference_id: 0,
-			},
-			"1": {
-				season: 3,
-				sub: "Beacon",
-				special: "SpMicroLaser",
-				class: "Shooter",
-				kit: "Short_01",
-				reference_kit: "Short_01",
-				reference_id: 1,
-			},
-			"310": {
-				season: 0,
-				sub: "PointSensor",
-				special: "SpEnergyStand",
-				class: "Shooter",
-				kit: "TripleMiddle_00",
-				reference_kit: "TripleMiddle_00",
-				reference_id: 310,
-			},
-			"311": {
-				season: 4,
-				sub: "Shield",
-				special: "SpGreatBarrier",
-				class: "Shooter",
-				kit: "TripleMiddle_01",
-				reference_kit: "TripleMiddle_01",
-				reference_id: 311,
-			},
-			"300": {
-				season: 0,
-				sub: "Bomb_Curling",
-				special: "SpChariot",
-				class: "Shooter",
-				kit: "TripleQuick_00",
-				reference_kit: "TripleQuick_00",
-				reference_id: 300,
-			},
-			"301": {
-				season: 3,
-				sub: "Bomb_Quick",
-				special: "SpUltraStamp",
-				class: "Shooter",
-				kit: "TripleQuick_01",
-				reference_kit: "TripleQuick_01",
-				reference_id: 301,
-			},
-			"3030": {
-				season: 0,
-				sub: "Sprinkler",
-				special: "SpInkStorm",
-				class: "Slosher",
-				kit: "Bathtub_00",
-				reference_kit: "Bathtub_00",
-				reference_id: 3030,
-			},
-			"3031": {
-				season: 5,
-				sub: "LineMarker",
-				special: "SpCastle",
-				class: "Slosher",
-				kit: "Bathtub_01",
-				reference_kit: "Bathtub_01",
-				reference_id: 3031,
-			},
-			"3010": {
-				season: 0,
-				sub: "PoisonMist",
-				special: "SpJetpack",
-				class: "Slosher",
-				kit: "Diffusion_00",
-				reference_kit: "Diffusion_00",
-				reference_id: 3010,
-			},
-			"3011": {
-				season: 3,
-				sub: "Bomb_Fizzy",
-				special: "SpEnergyStand",
-				class: "Slosher",
-				kit: "Diffusion_01",
-				reference_kit: "Diffusion_01",
-				reference_id: 3011,
-			},
-			"3050": {
-				season: 5,
-				sub: "Bomb_Suction",
-				special: "SpSkewer",
-				class: "Slosher",
-				kit: "Double_00",
-				reference_kit: "Double_00",
-				reference_id: 3050,
-			},
-			"3051": {
-				season: 7,
-				sub: "Beacon",
-				special: "SpShockSonar",
-				class: "Slosher",
-				kit: "Double_01",
-				reference_kit: "Double_01",
-				reference_id: 3051,
-			},
-			"3020": {
-				season: 0,
-				sub: "Bomb_Fizzy",
-				special: "SpNiceBall",
-				class: "Slosher",
-				kit: "Launcher_00",
-				reference_kit: "Launcher_00",
-				reference_id: 3020,
-			},
-			"3021": {
-				season: 5,
-				sub: "PointSensor",
-				special: "SpUltraShot",
-				class: "Slosher",
-				kit: "Launcher_01",
-				reference_kit: "Launcher_01",
-				reference_id: 3021,
-			},
-			"3000": {
-				season: 0,
-				sub: "Bomb_Splash",
-				special: "SpTripleTornado",
-				class: "Slosher",
-				kit: "Strong_00",
-				reference_kit: "Strong_00",
-				reference_id: 3000,
-			},
-			"3001": {
-				season: 2,
-				sub: "LineMarker",
-				special: "SpSuperHook",
-				class: "Slosher",
-				kit: "Strong_01",
-				reference_kit: "Strong_01",
-				reference_id: 3001,
-			},
-			"3005": {
-				season: -1,
-				sub: "Bomb_Splash",
-				special: "SpTripleTornado",
-				class: "Slosher",
-				kit: "Strong_O",
-				reference_kit: "Strong_00",
-				reference_id: 3000,
-			},
-			"3040": {
-				season: 0,
-				sub: "PointSensor",
-				special: "SpInkStorm",
-				class: "Slosher",
-				kit: "Washtub_00",
-				reference_kit: "Washtub_00",
-				reference_id: 3040,
-			},
-			"3041": {
-				season: 7,
-				sub: "Shield",
-				special: "SpPogo",
-				class: "Slosher",
-				kit: "Washtub_01",
-				reference_kit: "Washtub_01",
-				reference_id: 3041,
-			},
-			"4030": {
-				season: 0,
-				sub: "Bomb_Fizzy",
-				special: "SpJetpack",
-				class: "Spinner",
-				kit: "Downpour_00",
-				reference_kit: "Downpour_00",
-				reference_id: 4030,
-			},
-			"4031": {
-				season: 5,
-				sub: "Trap",
-				special: "SpBlower",
-				class: "Spinner",
-				kit: "Downpour_01",
-				reference_kit: "Downpour_01",
-				reference_id: 4031,
-			},
-			"4050": {
-				season: 5,
-				sub: "Bomb_Curling",
-				special: "SpEnergyStand",
-				class: "Spinner",
-				kit: "HyperShort_00",
-				reference_kit: "HyperShort_00",
-				reference_id: 4050,
-			},
-			"4051": {
-				season: 8,
-				sub: "Bomb_Splash",
-				special: "SpChariot",
-				class: "Spinner",
-				kit: "HyperShort_01",
-				reference_kit: "HyperShort_01",
-				reference_id: 4051,
-			},
-			"4020": {
-				season: 0,
-				sub: "Bomb_Robot",
-				special: "SpNiceBall",
-				class: "Spinner",
-				kit: "Hyper_00",
-				reference_kit: "Hyper_00",
-				reference_id: 4020,
-			},
-			"4021": {
-				season: 8,
-				sub: "Trap",
-				special: "SpChimney",
-				class: "Spinner",
-				kit: "Hyper_01",
-				reference_kit: "Hyper_01",
-				reference_id: 4021,
-			},
-			"4000": {
-				season: 0,
-				sub: "Bomb_Quick",
-				special: "SpUltraStamp",
-				class: "Spinner",
-				kit: "Quick_00",
-				reference_kit: "Quick_00",
-				reference_id: 4000,
-			},
-			"4001": {
-				season: 2,
-				sub: "PoisonMist",
-				special: "SpGreatBarrier",
-				class: "Spinner",
-				kit: "Quick_01",
-				reference_kit: "Quick_01",
-				reference_id: 4001,
-			},
-			"4040": {
-				season: 0,
-				sub: "PointSensor",
-				special: "SpInkStorm",
-				class: "Spinner",
-				kit: "Serein_00",
-				reference_kit: "Serein_00",
-				reference_id: 4040,
-			},
-			"4041": {
-				season: 7,
-				sub: "Bomb_Suction",
-				special: "SpPogo",
-				class: "Spinner",
-				kit: "Serein_01",
-				reference_kit: "Serein_01",
-				reference_id: 4041,
-			},
-			"4010": {
-				season: 0,
-				sub: "Sprinkler",
-				special: "SpShockSonar",
-				class: "Spinner",
-				kit: "Standard_00",
-				reference_kit: "Standard_00",
-				reference_id: 4010,
-			},
-			"4011": {
-				season: 4,
-				sub: "PointSensor",
-				special: "SpCastle",
-				class: "Spinner",
-				kit: "Standard_01",
-				reference_kit: "Standard_01",
-				reference_id: 4011,
-			},
-			"4015": {
-				season: -1,
-				sub: "Sprinkler",
-				special: "SpShockSonar",
-				class: "Spinner",
-				kit: "Standard_O",
-				reference_kit: "Standard_00",
-				reference_id: 4010,
-			},
-			"7030": {
-				season: 8,
-				sub: "Bomb_Robot",
-				special: "SpUltraStamp",
-				class: "Stringer",
-				kit: "Explosion_00",
-				reference_kit: "Explosion_00",
-				reference_id: 7030,
-			},
-			"7031": {
-				season: 8,
-				sub: "PointSensor",
-				special: "SpShockSonar",
-				class: "Stringer",
-				kit: "Explosion_01",
-				reference_kit: "Explosion_01",
-				reference_id: 7031,
-			},
-			"7010": {
-				season: 0,
-				sub: "PoisonMist",
-				special: "SpMicroLaser",
-				class: "Stringer",
-				kit: "Normal_00",
-				reference_kit: "Normal_00",
-				reference_id: 7010,
-			},
-			"7011": {
-				season: 5,
-				sub: "Sprinkler",
-				special: "SpFirework",
-				class: "Stringer",
-				kit: "Normal_01",
-				reference_kit: "Normal_01",
-				reference_id: 7011,
-			},
-			"7015": {
-				season: -1,
-				sub: "PoisonMist",
-				special: "SpMicroLaser",
-				class: "Stringer",
-				kit: "Normal_O",
-				reference_kit: "Normal_00",
-				reference_id: 7010,
-			},
-			"7020": {
-				season: 0,
-				sub: "Bomb_Curling",
-				special: "SpMultiMissile",
-				class: "Stringer",
-				kit: "Short_00",
-				reference_kit: "Short_00",
-				reference_id: 7020,
-			},
-			"7021": {
-				season: 6,
-				sub: "Shield",
-				special: "SpSkewer",
-				class: "Stringer",
-				kit: "Short_01",
-				reference_kit: "Short_01",
-				reference_id: 7021,
-			},
-		};
-
-		const main: any = {};
-
-		const weaponPrefix = (kit: string): string => {
-			const idx = kit.search(/_/g);
-			return kit.substring(0, idx);
-		};
-
-		for (const [id, { kit }] of Object.entries(weaponData)) {
-			const bucket = weaponIdToBucketId(Number(id) as MainWeaponId);
-			if (main[bucket] === undefined) {
-				main[bucket] = weaponPrefix(kit);
-			} else {
-				expect(main[bucket]).toBe(weaponPrefix(kit));
-			}
-		}
-	});
-});
+import { weaponIdToArrayWithAlts, weaponIdToBaseWeaponId } from "./weapon-ids";
 
 describe("weaponIdToArrayWithAlts", () => {
 	test("handles weapon id without alts", () => {
@@ -1488,3 +26,16 @@ describe("weaponIdToArrayWithAlts", () => {
 		expect(result).toEqual([41, 46]);
 	});
 });
+
+describe("weaponIdToBaseWeaponId()", () => {
+	test("returns correct IDs for 2nd & 3rd kit", () => {
+		expect(weaponIdToBaseWeaponId(210)).toBe(210);
+		expect(weaponIdToBaseWeaponId(211)).toBe(210);
+		expect(weaponIdToBaseWeaponId(212)).toBe(210);
+	});
+
+	test("returns correct ID for alt kits", () => {
+		expect(weaponIdToBaseWeaponId(45)).toBe(40);
+		expect(weaponIdToBaseWeaponId(47)).toBe(40);
+	});
+});
diff --git a/app/modules/in-game-lists/weapon-ids.ts b/app/modules/in-game-lists/weapon-ids.ts
index f12878d1f..9b854321f 100644
--- a/app/modules/in-game-lists/weapon-ids.ts
+++ b/app/modules/in-game-lists/weapon-ids.ts
@@ -5,65 +5,70 @@ export const weaponCategories = [
 	{
 		name: "SHOOTERS",
 		weaponIds: [
-			0, 1, 10, 11, 20, 21, 30, 31, 40, 41, 45, 46, 47, 50, 51, 60, 61, 70, 71,
-			80, 81, 90, 91, 100, 101, 300, 301, 310, 311, 400, 401,
+			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,
 		],
 	},
 	{
 		name: "BLASTERS",
 		weaponIds: [
-			200, 201, 205, 210, 211, 220, 221, 230, 231, 240, 241, 250, 251, 260, 261,
+			200, 201, 205, 210, 211, 212, 220, 221, 230, 231, 240, 241, 250, 251, 252,
+			260, 261,
 		],
 	},
 	{
 		name: "ROLLERS",
 		weaponIds: [
-			1000, 1001, 1010, 1011, 1015, 1020, 1021, 1030, 1031, 1040, 1041,
+			1000, 1001, 1002, 1010, 1011, 1015, 1020, 1021, 1022, 1030, 1031, 1040,
+			1041, 1042,
 		],
 	},
 	{
 		name: "BRUSHES",
-		weaponIds: [1100, 1101, 1110, 1111, 1115, 1121, 1120],
+		weaponIds: [1100, 1101, 1110, 1111, 1112, 1122, 1115, 1121, 1120],
 	},
 	{
 		name: "CHARGERS",
 		weaponIds: [
-			2000, 2001, 2010, 2011, 2015, 2020, 2021, 2030, 2031, 2040, 2041, 2050,
-			2051, 2060, 2061, 2070, 2071,
+			2000, 2001, 2010, 2011, 2012, 2015, 2020, 2021, 2022, 2030, 2031, 2040,
+			2041, 2050, 2051, 2060, 2061, 2070, 2071,
 		],
 	},
 	{
 		name: "SLOSHERS",
 		weaponIds: [
-			3000, 3001, 3005, 3010, 3011, 3020, 3021, 3030, 3031, 3040, 3041, 3050,
-			3051,
+			3000, 3001, 3005, 3010, 3011, 3012, 3020, 3021, 3030, 3031, 3040, 3041,
+			3050, 3051, 3052,
 		],
 	},
 	{
 		name: "SPLATLINGS",
 		weaponIds: [
-			4000, 4001, 4010, 4011, 4015, 4020, 4021, 4030, 4031, 4040, 4041, 4050,
-			4051,
+			4000, 4001, 4002, 4010, 4011, 4015, 4020, 4021, 4022, 4030, 4031, 4040,
+			4041, 4050, 4051,
 		],
 	},
 	{
 		name: "DUALIES",
 		weaponIds: [
-			5000, 5001, 5010, 5015, 5011, 5020, 5021, 5030, 5031, 5040, 5041, 5050,
-			5051,
+			5000, 5001, 5002, 5010, 5015, 5011, 5012, 5020, 5021, 5030, 5031, 5032,
+			5040, 5041, 5050, 5051,
 		],
 	},
 	{
 		name: "BRELLAS",
-		weaponIds: [6000, 6001, 6005, 6010, 6011, 6020, 6021, 6030, 6031],
+		weaponIds: [
+			6000, 6001, 6005, 6010, 6011, 6012, 6020, 6021, 6022, 6030, 6031,
+		],
 	},
 	{
 		name: "STRINGERS",
-		weaponIds: [7010, 7011, 7015, 7020, 7021, 7030, 7031],
+		weaponIds: [7010, 7011, 7012, 7015, 7020, 7021, 7022, 7030, 7031],
 	},
 	{
 		name: "SPLATANAS",
-		weaponIds: [8000, 8001, 8005, 8010, 8011, 8020, 8021],
+		weaponIds: [8000, 8001, 8002, 8005, 8010, 8011, 8012, 8020, 8021],
 	},
 ] as const;
 
@@ -260,4 +265,18 @@ export const exampleMainWeaponIdWithSpecialWeaponId = (
 	}
 };
 
-export const weaponIdToBucketId = (id: MainWeaponId): number => id - (id % 10);
+/**
+ * Calculates the base weapon ID from a main weapon ID.
+ *
+ * @example
+ * // Returns 40 (because Splattershot is the base weapon for its kit)
+ * weaponIdToBaseWeaponId(40); // -> 40
+ *
+ * // (41 is Tentatek Splattershot, which is an alt kit of Splattershot)
+ * weaponIdToBaseWeaponId(41); // -> 40
+ *
+ * // (45 is Hero Shot Replica, which is an alt skin of Splattershot)
+ * weaponIdToBaseWeaponId(45); // -> 40
+ */
+export const weaponIdToBaseWeaponId = (id: MainWeaponId) =>
+	(id - (id % 10)) as MainWeaponId;
diff --git a/app/styles/common.css b/app/styles/common.css
index 40c3cd233..e83cd9be8 100644
--- a/app/styles/common.css
+++ b/app/styles/common.css
@@ -1539,7 +1539,7 @@ html[dir="rtl"] .fix-rtl {
 
 .map-pool-picker {
 	--map-width: 90px;
-	--map-height: 50.63px;
+	--map-height: 50px;
 }
 
 .map-pool-picker__slot {
diff --git a/locales/da/game-misc.json b/locales/da/game-misc.json
index 48b4f3ef2..2cc7fe012 100644
--- a/locales/da/game-misc.json
+++ b/locales/da/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "Robo ROM-en",
 	"STAGE_22": "Marlin Airport",
 	"STAGE_23": "Lemuria Hub",
+	"STAGE_24": "Urchin Underpass",
 	"ABILITY_ISM": "Primær blæksparer",
 	"ABILITY_ISS": "Sekundær blæksparer",
 	"ABILITY_IRU": "Blækpåfyldning+",
diff --git a/locales/da/weapons.json b/locales/da/weapons.json
index 699a80764..46b6b52f7 100644
--- a/locales/da/weapons.json
+++ b/locales/da/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Rapid Blaster Pro",
 	"MAIN_251": "Rapid Blaster Pro Deco",
+	"MAIN_252": "Rapid Blaster Pro WNT-R",
 	"MAIN_230": "Clash Blaster",
 	"MAIN_231": "Clash Blaster Neo",
 	"MAIN_240": "Rapid Blaster",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Custom Range Blaster",
 	"MAIN_210": "Blaster",
 	"MAIN_211": "Custom Blaster",
+	"MAIN_212": "Gleamz Blaster",
 	"MAIN_260": "S-BLAST '92",
 	"MAIN_261": "S-BLAST '91",
 	"MAIN_200": "Luna Blaster",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Order Blaster Replica",
 	"MAIN_1120": "Painbrush",
 	"MAIN_1121": "Painbrush Nouveau",
+	"MAIN_1122": "Painbrush BRN-Z",
 	"MAIN_1100": "Inkbrush",
 	"MAIN_1101": "Inkbrush Nouveau",
 	"MAIN_1110": "Octobrush",
 	"MAIN_1111": "Octobrush Nouveau",
+	"MAIN_1112": "Cometz Octobrush",
 	"MAIN_1115": "Orderbrush Replica",
 	"MAIN_2060": "Goo Tuber",
 	"MAIN_2061": "Custom Goo Tuber",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "Custom E-liter 4K",
 	"MAIN_2020": "Splatterscope",
 	"MAIN_2021": "Z+F Splatterscope",
+	"MAIN_2022": "Splatterscope CAM-O",
 	"MAIN_2010": "Splat Charger",
 	"MAIN_2011": "Z+F Splat Charger",
+	"MAIN_2012": "Splat Charger CAM-O",
 	"MAIN_2015": "Order Charger Replica",
 	"MAIN_2070": "Snipewriter 5H",
 	"MAIN_2071": "Snipewriter 5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "New Squiffer",
 	"MAIN_5030": "Dualie Squelchers",
 	"MAIN_5031": "Custom Dualie Squelchers",
+	"MAIN_5032": "Hoofz Dualie Squelchers",
 	"MAIN_5020": "Glooga Dualies",
 	"MAIN_5021": "Glooga Dualies Deco",
 	"MAIN_5050": "Douser Dualies FF",
 	"MAIN_5051": "Custom Douser Dualies FF",
 	"MAIN_5010": "Splat Dualies",
 	"MAIN_5011": "Enperry Splat Dualies",
+	"MAIN_5012": "Twinklez Splat Dualies",
 	"MAIN_5015": "Order Dualie Replicas",
 	"MAIN_5000": "Dapple Dualies",
 	"MAIN_5001": "Dapple Dualies Nouveau",
+	"MAIN_5002": "Dapple Dualies NOC-T",
 	"MAIN_5040": "Dark Tetra Dualies",
 	"MAIN_5041": "Light Tetra Dualies",
 	"MAIN_1000": "Carbon Roller",
 	"MAIN_1001": "Carbon Roller Deco",
+	"MAIN_1002": "Carbon Roller ANG-L",
 	"MAIN_1020": "Dynamo Roller",
 	"MAIN_1021": "Gold Dynamo Roller",
+	"MAIN_1022": "Starz Dynamo Roller",
 	"MAIN_1030": "Flingza Roller",
 	"MAIN_1031": "Foil Flingza Roller",
 	"MAIN_1010": "Splat Roller",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Order Roller Replica",
 	"MAIN_1040": "Big Swig Roller",
 	"MAIN_1041": "Big Swig Roller Express",
+	"MAIN_1042": "Planetz Big Swig Roller",
 	"MAIN_8020": "Mint Decavitator",
 	"MAIN_8021": "Charcoal Decavitator",
 	"MAIN_8010": "Splatana Wiper",
 	"MAIN_8011": "Splatana Wiper Deco",
+	"MAIN_8012": "Splatana Wiper RUS-T",
 	"MAIN_8000": "Splatana Stamper",
 	"MAIN_8001": "Splatana Stamper Nouveau",
+	"MAIN_8002": "Stickerz Splatana Stamper",
 	"MAIN_8005": "Order Splatana Replica",
 	"MAIN_6020": "Undercover Brella",
 	"MAIN_6021": "Undercover Sorella Brella",
+	"MAIN_6022": "Patternz Undercover Brella",
 	"MAIN_6030": "Recycled Brella 24 Mk I",
 	"MAIN_6031": "Recycled Brella 24 Mk II",
 	"MAIN_6000": "Splat Brella",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Order Brella Replica",
 	"MAIN_6010": "Tenta Brella",
 	"MAIN_6011": "Tenta Sorella Brella",
+	"MAIN_6012": "Tenta Brella CRE-M",
 	"MAIN_30": "Aerospray MG",
 	"MAIN_31": "Aerospray RG",
+	"MAIN_32": "Colorz Aerospray",
 	"MAIN_70": "Splattershot Pro",
 	"MAIN_71": "Forge Splattershot Pro",
+	"MAIN_72": "Splattershot Pro FRZ-N",
 	"MAIN_10": "Splattershot Jr.",
 	"MAIN_11": "Custom Splattershot Jr.",
 	"MAIN_400": "Squeezer",
@@ -90,15 +108,19 @@
 	"MAIN_51": ".52 Gal Deco",
 	"MAIN_80": ".96 Gal",
 	"MAIN_81": ".96 Gal Deco",
+	"MAIN_82": "Clawz .96 Gal",
 	"MAIN_90": "Jet Squelcher",
 	"MAIN_91": "Custom Jet Squelcher",
+	"MAIN_92": "Jet Squelcher COB-R",
 	"MAIN_40": "Splattershot",
 	"MAIN_41": "Tentatek Splattershot",
+	"MAIN_42": "Glamorz Splattershot",
 	"MAIN_45": "Hero Shot Replica",
 	"MAIN_47": "Order Shot Replica",
 	"MAIN_46": "Octo Shot Replica",
 	"MAIN_20": "Splash-o-matic",
 	"MAIN_21": "Neo Splash-o-matic",
+	"MAIN_22": "Splash-o-matic GCK-O",
 	"MAIN_100": "Splattershot Nova",
 	"MAIN_101": "Annaki Splattershot Nova",
 	"MAIN_60": "N-ZAP '85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Neo Sploosh-o-matic",
 	"MAIN_310": "H-3 Nozzlenose",
 	"MAIN_311": "H-3 Nozzlenose D",
+	"MAIN_312": "H-3 Nozzlenose VIP-R",
 	"MAIN_300": "L-3 Nozzlenose",
 	"MAIN_301": "L-3 Nozzlenose D",
+	"MAIN_302": "Glitterz L-3 Nozzlenose",
 	"MAIN_3030": "Bloblobber",
 	"MAIN_3031": "Bloblobber Deco",
 	"MAIN_3010": "Tri-Slosher",
 	"MAIN_3011": "Tri-Slosher Nouveau",
+	"MAIN_3012": "Tri-Slosher ASH-N",
 	"MAIN_3050": "Dread Wringer",
 	"MAIN_3051": "Dread Wringer D",
+	"MAIN_3052": "Hornz Dread Wringer",
 	"MAIN_3020": "Sloshing Machine",
 	"MAIN_3021": "Sloshing Machine Neo",
 	"MAIN_3000": "Slosher",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Heavy Edit Splatling Nouveau",
 	"MAIN_4020": "Hydra Splatling",
 	"MAIN_4021": "Custom Hydra Splatling",
+	"MAIN_4022": "Torrentz Hydra Splatling",
 	"MAIN_4000": "Mini Splatling",
 	"MAIN_4001": "Zink Mini Splatling",
+	"MAIN_4002": "Mini Splatling RTL-R",
 	"MAIN_4040": "Nautilus 47",
 	"MAIN_4041": "Nautilus 79",
 	"MAIN_4010": "Heavy Splatling",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Custom Wellstring V",
 	"MAIN_7010": "Tri-Stringer",
 	"MAIN_7011": "Inkline Tri-Stringer",
+	"MAIN_7012": "Bulbz Tri-Stringer",
 	"MAIN_7015": "Order Stringer Replica",
 	"MAIN_7020": "REEF-LUX 450",
 	"MAIN_7021": "REEF-LUX 450 Deco",
+	"MAIN_7022": "REEF-LUX 450 MIL-K",
 	"SUB_8": "Squid Beakon",
 	"SUB_6": "Curling Bomb",
 	"SUB_5": "Fizzy Bomb",
diff --git a/locales/de/game-misc.json b/locales/de/game-misc.json
index 2f3c6298a..90949cbb1 100644
--- a/locales/de/game-misc.json
+++ b/locales/de/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "ROM & RAMen",
 	"STAGE_22": "La Ola Airport",
 	"STAGE_23": "Bahnhof Lemuria",
+	"STAGE_24": "Dekabahnstation",
 	"ABILITY_ISM": "Hauptverbrauch",
 	"ABILITY_ISS": "Sekundärverbrauch",
 	"ABILITY_IRU": "Regeneration +",
diff --git a/locales/de/weapons.json b/locales/de/weapons.json
index 5a9e35690..60aae9311 100644
--- a/locales/de/weapons.json
+++ b/locales/de/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Turbo-Blaster Plus",
 	"MAIN_251": "Turbo-Blaster Plus Deko",
+	"MAIN_252": "Turbo-Blaster Plus WNT-R",
 	"MAIN_230": "Kontra-Blaster",
 	"MAIN_231": "Kontra-Blaster Neo",
 	"MAIN_240": "Turbo-Blaster",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Fern-Blaster SE",
 	"MAIN_210": "Blaster",
 	"MAIN_211": "Blaster SE",
+	"MAIN_212": "Blaster GLAM",
 	"MAIN_260": "S-BLAST92",
 	"MAIN_261": "S-BLAST91",
 	"MAIN_200": "Luna-Blaster",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Ordnung-Blaster Replik",
 	"MAIN_1120": "Fächerfärber",
 	"MAIN_1121": "Fächerfärber Fresco",
+	"MAIN_1122": "Fächerfärber BRN-Z",
 	"MAIN_1100": "Quasto",
 	"MAIN_1101": "Quasto Fresco",
 	"MAIN_1110": "Kalligraf",
 	"MAIN_1111": "Kalligraf Fresco",
+	"MAIN_1112": "Kalligraf Astro",
 	"MAIN_1115": "Ordnung-Kalligraf Replik",
 	"MAIN_2060": "T-Tuber",
 	"MAIN_2061": "T-Tuber SE",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "E-liter 4K SE",
 	"MAIN_2020": "Ziel-Konzentrator",
 	"MAIN_2021": "Zekkori-Ziel-Konzentrator",
+	"MAIN_2022": "Ziel-Konzentrator TAR-N",
 	"MAIN_2010": "Klecks-Konzentrator",
 	"MAIN_2011": "Zekkori-Klecks-Konzentrator",
+	"MAIN_2012": "Klecks-Konzentrator TAR-N",
 	"MAIN_2015": "Ordnung-Konzentrator Replik",
 	"MAIN_2070": "R-BLR/5H",
 	"MAIN_2071": "R-BLR/5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "Sepiator β",
 	"MAIN_5030": "Dual-Platscher",
 	"MAIN_5031": "Dual-Platscher SE",
+	"MAIN_5032": "Dual-Platscher ZBR",
 	"MAIN_5020": "Kelvin 525",
 	"MAIN_5021": "Kelvin 525 Deko",
 	"MAIN_5050": "Lösch-Doppler FW",
 	"MAIN_5051": "Lösch-Doppler FW SE",
 	"MAIN_5010": "Klecks-Doppler",
 	"MAIN_5011": "Enperry-Klecks-Doppler",
+	"MAIN_5012": "Glitz-Klecks-Doppler",
 	"MAIN_5015": "Ordnung-Doppler Replik",
 	"MAIN_5000": "Sprenkler",
 	"MAIN_5001": "Sprenkler Fresco",
+	"MAIN_5002": "Sprenkler U-HU",
 	"MAIN_5040": "Quadhopper Noir",
 	"MAIN_5041": "Quadhopper Blanc",
 	"MAIN_1000": "Karbonroller",
 	"MAIN_1001": "Karbonroller Deko",
+	"MAIN_1002": "Karbonroller ANG-LR",
 	"MAIN_1020": "Dynaroller",
 	"MAIN_1021": "Dynaroller Tesla",
+	"MAIN_1022": "Dynaroller Galaxa",
 	"MAIN_1030": "Flex-Roller",
 	"MAIN_1031": "Flex-Roller Fol",
 	"MAIN_1010": "Klecksroller",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Ordnung-Roller Replik",
 	"MAIN_1040": "Breitroller",
 	"MAIN_1041": "Breitroller Express",
+	"MAIN_1042": "Breitroller Exzell",
 	"MAIN_8020": "Minz-Prophylator",
 	"MAIN_8021": "Carbo-Prophylator",
 	"MAIN_8010": "Wischer-Splatana",
 	"MAIN_8011": "Wischer-Splatana Deko",
+	"MAIN_8012": "Wischer-Splatana RST-G",
 	"MAIN_8000": "Stempel-Splatana",
 	"MAIN_8001": "Stempel-Splatana Fresco",
+	"MAIN_8002": "Stempel-Splatana Sticker",
 	"MAIN_8005": "Ordnung-Splatana Replik",
 	"MAIN_6020": "UnderCover",
 	"MAIN_6021": "Sorella-UnderCover",
+	"MAIN_6022": "Flair-UnderCover",
 	"MAIN_6030": "Bast-Pluviator 24-A",
 	"MAIN_6031": "Bast-Pluviator 24-B",
 	"MAIN_6000": "Parapluviator",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Ordnung-Pluviator Replik",
 	"MAIN_6010": "Camp-Pluviator",
 	"MAIN_6011": "Sorella-Camp-Pluviator",
+	"MAIN_6012": "Camp-Pluviator CR-MA",
 	"MAIN_30": "Airbrush MG",
 	"MAIN_31": "Airbrush RG",
+	"MAIN_32": "Airbrush RGB",
 	"MAIN_70": "Profi-Kleckser",
 	"MAIN_71": "Focus-Profi-Kleckser",
+	"MAIN_72": "Profi-Kleckser CH-LL",
 	"MAIN_10": "Junior-Kleckser",
 	"MAIN_11": "Junior-Kleckser Plus",
 	"MAIN_400": "Quetscher",
@@ -90,15 +108,19 @@
 	"MAIN_51": ".52 Gallon Deko",
 	"MAIN_80": ".96 Gallon",
 	"MAIN_81": ".96 Gallon Deko",
+	"MAIN_82": ".96 Gallon Leo",
 	"MAIN_90": "Platscher",
 	"MAIN_91": "Platscher SE",
+	"MAIN_92": "Platscher KB-RA",
 	"MAIN_40": "Kleckser",
 	"MAIN_41": "Tentatek-Kleckser",
+	"MAIN_42": "Chroma-Kleckser",
 	"MAIN_45": "Heldenwaffe Replik",
 	"MAIN_47": "Ordnung-Kleckser Replik",
 	"MAIN_46": "Okto-Kleckser Replik",
 	"MAIN_20": "Fein-Disperser",
 	"MAIN_21": "Fein-Disperser Neo",
+	"MAIN_22": "Fein-Disperser GK-KO",
 	"MAIN_100": "Kosmo-Kleckser",
 	"MAIN_101": "Annaki-Kosmo-Kleckser",
 	"MAIN_60": "N-ZAP85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Disperser Neo",
 	"MAIN_310": "S3 Tintenwerfer",
 	"MAIN_311": "S3 Tintenwerfer D",
+	"MAIN_312": "S3 Tintenwerfer VIP-R",
 	"MAIN_300": "L3 Tintenwerfer",
 	"MAIN_301": "L3 Tintenwerfer D",
+	"MAIN_302": "L3 Tintenwerfer Oro",
 	"MAIN_3030": "Wannen-Schwapper",
 	"MAIN_3031": "Wannen-Schwapper Deko",
 	"MAIN_3010": "3R-Schwapper",
 	"MAIN_3011": "3R-Schwapper Fresco",
+	"MAIN_3012": "3R-Schwapper OX-D",
 	"MAIN_3050": "Schwappwascher",
 	"MAIN_3051": "Schwappwascher D",
+	"MAIN_3052": "Schwappwascher Horn",
 	"MAIN_3020": "Trommel-Schwapper",
 	"MAIN_3021": "Trommel-Schwapper Neo",
 	"MAIN_3000": "Schwapper",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Kartuschierer Fresco",
 	"MAIN_4020": "Hydrant",
 	"MAIN_4021": "Hydrant SE",
+	"MAIN_4022": "Hydrant ATÜ",
 	"MAIN_4000": "Klecks-Splatling",
 	"MAIN_4001": "Sagitron-Klecks-Splatling",
+	"MAIN_4002": "Klecks-Splatling KLP-R",
 	"MAIN_4040": "Nautilus 47",
 	"MAIN_4041": "Nautilus 79",
 	"MAIN_4010": "Splatling",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Penta-Pumper SE",
 	"MAIN_7010": "Tri-Stringer",
 	"MAIN_7011": "Alpomar-Tri-Stringer",
+	"MAIN_7012": "Prisma-Tri-Stringer",
 	"MAIN_7015": "Ordnung-Stringer Replik",
 	"MAIN_7020": "LACT-450",
 	"MAIN_7021": "LACT-450 Deko",
+	"MAIN_7022": "LACT-450 Q-MLCH",
 	"SUB_8": "Sprungboje",
 	"SUB_6": "Curling-Bombe",
 	"SUB_5": "Sprudel-Bombe",
diff --git a/locales/en/game-misc.json b/locales/en/game-misc.json
index 9daa53ec5..41ec81dc2 100644
--- a/locales/en/game-misc.json
+++ b/locales/en/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "Robo ROM-en",
 	"STAGE_22": "Marlin Airport",
 	"STAGE_23": "Lemuria Hub",
+	"STAGE_24": "Urchin Underpass",
 	"ABILITY_ISM": "Ink Saver (Main)",
 	"ABILITY_ISS": "Ink Saver (Sub)",
 	"ABILITY_IRU": "Ink Recovery Up",
diff --git a/locales/en/weapons.json b/locales/en/weapons.json
index 699a80764..46b6b52f7 100644
--- a/locales/en/weapons.json
+++ b/locales/en/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Rapid Blaster Pro",
 	"MAIN_251": "Rapid Blaster Pro Deco",
+	"MAIN_252": "Rapid Blaster Pro WNT-R",
 	"MAIN_230": "Clash Blaster",
 	"MAIN_231": "Clash Blaster Neo",
 	"MAIN_240": "Rapid Blaster",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Custom Range Blaster",
 	"MAIN_210": "Blaster",
 	"MAIN_211": "Custom Blaster",
+	"MAIN_212": "Gleamz Blaster",
 	"MAIN_260": "S-BLAST '92",
 	"MAIN_261": "S-BLAST '91",
 	"MAIN_200": "Luna Blaster",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Order Blaster Replica",
 	"MAIN_1120": "Painbrush",
 	"MAIN_1121": "Painbrush Nouveau",
+	"MAIN_1122": "Painbrush BRN-Z",
 	"MAIN_1100": "Inkbrush",
 	"MAIN_1101": "Inkbrush Nouveau",
 	"MAIN_1110": "Octobrush",
 	"MAIN_1111": "Octobrush Nouveau",
+	"MAIN_1112": "Cometz Octobrush",
 	"MAIN_1115": "Orderbrush Replica",
 	"MAIN_2060": "Goo Tuber",
 	"MAIN_2061": "Custom Goo Tuber",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "Custom E-liter 4K",
 	"MAIN_2020": "Splatterscope",
 	"MAIN_2021": "Z+F Splatterscope",
+	"MAIN_2022": "Splatterscope CAM-O",
 	"MAIN_2010": "Splat Charger",
 	"MAIN_2011": "Z+F Splat Charger",
+	"MAIN_2012": "Splat Charger CAM-O",
 	"MAIN_2015": "Order Charger Replica",
 	"MAIN_2070": "Snipewriter 5H",
 	"MAIN_2071": "Snipewriter 5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "New Squiffer",
 	"MAIN_5030": "Dualie Squelchers",
 	"MAIN_5031": "Custom Dualie Squelchers",
+	"MAIN_5032": "Hoofz Dualie Squelchers",
 	"MAIN_5020": "Glooga Dualies",
 	"MAIN_5021": "Glooga Dualies Deco",
 	"MAIN_5050": "Douser Dualies FF",
 	"MAIN_5051": "Custom Douser Dualies FF",
 	"MAIN_5010": "Splat Dualies",
 	"MAIN_5011": "Enperry Splat Dualies",
+	"MAIN_5012": "Twinklez Splat Dualies",
 	"MAIN_5015": "Order Dualie Replicas",
 	"MAIN_5000": "Dapple Dualies",
 	"MAIN_5001": "Dapple Dualies Nouveau",
+	"MAIN_5002": "Dapple Dualies NOC-T",
 	"MAIN_5040": "Dark Tetra Dualies",
 	"MAIN_5041": "Light Tetra Dualies",
 	"MAIN_1000": "Carbon Roller",
 	"MAIN_1001": "Carbon Roller Deco",
+	"MAIN_1002": "Carbon Roller ANG-L",
 	"MAIN_1020": "Dynamo Roller",
 	"MAIN_1021": "Gold Dynamo Roller",
+	"MAIN_1022": "Starz Dynamo Roller",
 	"MAIN_1030": "Flingza Roller",
 	"MAIN_1031": "Foil Flingza Roller",
 	"MAIN_1010": "Splat Roller",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Order Roller Replica",
 	"MAIN_1040": "Big Swig Roller",
 	"MAIN_1041": "Big Swig Roller Express",
+	"MAIN_1042": "Planetz Big Swig Roller",
 	"MAIN_8020": "Mint Decavitator",
 	"MAIN_8021": "Charcoal Decavitator",
 	"MAIN_8010": "Splatana Wiper",
 	"MAIN_8011": "Splatana Wiper Deco",
+	"MAIN_8012": "Splatana Wiper RUS-T",
 	"MAIN_8000": "Splatana Stamper",
 	"MAIN_8001": "Splatana Stamper Nouveau",
+	"MAIN_8002": "Stickerz Splatana Stamper",
 	"MAIN_8005": "Order Splatana Replica",
 	"MAIN_6020": "Undercover Brella",
 	"MAIN_6021": "Undercover Sorella Brella",
+	"MAIN_6022": "Patternz Undercover Brella",
 	"MAIN_6030": "Recycled Brella 24 Mk I",
 	"MAIN_6031": "Recycled Brella 24 Mk II",
 	"MAIN_6000": "Splat Brella",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Order Brella Replica",
 	"MAIN_6010": "Tenta Brella",
 	"MAIN_6011": "Tenta Sorella Brella",
+	"MAIN_6012": "Tenta Brella CRE-M",
 	"MAIN_30": "Aerospray MG",
 	"MAIN_31": "Aerospray RG",
+	"MAIN_32": "Colorz Aerospray",
 	"MAIN_70": "Splattershot Pro",
 	"MAIN_71": "Forge Splattershot Pro",
+	"MAIN_72": "Splattershot Pro FRZ-N",
 	"MAIN_10": "Splattershot Jr.",
 	"MAIN_11": "Custom Splattershot Jr.",
 	"MAIN_400": "Squeezer",
@@ -90,15 +108,19 @@
 	"MAIN_51": ".52 Gal Deco",
 	"MAIN_80": ".96 Gal",
 	"MAIN_81": ".96 Gal Deco",
+	"MAIN_82": "Clawz .96 Gal",
 	"MAIN_90": "Jet Squelcher",
 	"MAIN_91": "Custom Jet Squelcher",
+	"MAIN_92": "Jet Squelcher COB-R",
 	"MAIN_40": "Splattershot",
 	"MAIN_41": "Tentatek Splattershot",
+	"MAIN_42": "Glamorz Splattershot",
 	"MAIN_45": "Hero Shot Replica",
 	"MAIN_47": "Order Shot Replica",
 	"MAIN_46": "Octo Shot Replica",
 	"MAIN_20": "Splash-o-matic",
 	"MAIN_21": "Neo Splash-o-matic",
+	"MAIN_22": "Splash-o-matic GCK-O",
 	"MAIN_100": "Splattershot Nova",
 	"MAIN_101": "Annaki Splattershot Nova",
 	"MAIN_60": "N-ZAP '85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Neo Sploosh-o-matic",
 	"MAIN_310": "H-3 Nozzlenose",
 	"MAIN_311": "H-3 Nozzlenose D",
+	"MAIN_312": "H-3 Nozzlenose VIP-R",
 	"MAIN_300": "L-3 Nozzlenose",
 	"MAIN_301": "L-3 Nozzlenose D",
+	"MAIN_302": "Glitterz L-3 Nozzlenose",
 	"MAIN_3030": "Bloblobber",
 	"MAIN_3031": "Bloblobber Deco",
 	"MAIN_3010": "Tri-Slosher",
 	"MAIN_3011": "Tri-Slosher Nouveau",
+	"MAIN_3012": "Tri-Slosher ASH-N",
 	"MAIN_3050": "Dread Wringer",
 	"MAIN_3051": "Dread Wringer D",
+	"MAIN_3052": "Hornz Dread Wringer",
 	"MAIN_3020": "Sloshing Machine",
 	"MAIN_3021": "Sloshing Machine Neo",
 	"MAIN_3000": "Slosher",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Heavy Edit Splatling Nouveau",
 	"MAIN_4020": "Hydra Splatling",
 	"MAIN_4021": "Custom Hydra Splatling",
+	"MAIN_4022": "Torrentz Hydra Splatling",
 	"MAIN_4000": "Mini Splatling",
 	"MAIN_4001": "Zink Mini Splatling",
+	"MAIN_4002": "Mini Splatling RTL-R",
 	"MAIN_4040": "Nautilus 47",
 	"MAIN_4041": "Nautilus 79",
 	"MAIN_4010": "Heavy Splatling",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Custom Wellstring V",
 	"MAIN_7010": "Tri-Stringer",
 	"MAIN_7011": "Inkline Tri-Stringer",
+	"MAIN_7012": "Bulbz Tri-Stringer",
 	"MAIN_7015": "Order Stringer Replica",
 	"MAIN_7020": "REEF-LUX 450",
 	"MAIN_7021": "REEF-LUX 450 Deco",
+	"MAIN_7022": "REEF-LUX 450 MIL-K",
 	"SUB_8": "Squid Beakon",
 	"SUB_6": "Curling Bomb",
 	"SUB_5": "Fizzy Bomb",
diff --git a/locales/es-ES/game-misc.json b/locales/es-ES/game-misc.json
index 85afa1fd8..db23c6c8b 100644
--- a/locales/es-ES/game-misc.json
+++ b/locales/es-ES/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "Factoría RAMen",
 	"STAGE_22": "Aeropuerto Marlín",
 	"STAGE_23": "Terminal Dragón",
+	"STAGE_24": "Parque Viaducto",
 	"ABILITY_ISM": "Tintahorro (ppal.)",
 	"ABILITY_ISS": "Tintahorro (sec.)",
 	"ABILITY_IRU": "Recarga rápida",
diff --git a/locales/es-ES/weapons.json b/locales/es-ES/weapons.json
index 8bfb8589f..dc8364741 100644
--- a/locales/es-ES/weapons.json
+++ b/locales/es-ES/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Superdevastador",
 	"MAIN_251": "Superdevastador DX",
+	"MAIN_252": "Superdevastador INV",
 	"MAIN_230": "Turbodevastador",
 	"MAIN_231": "Turbodevastador neo",
 	"MAIN_240": "Devastador exprés",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Teledevastador SP",
 	"MAIN_210": "Devastador",
 	"MAIN_211": "Devastador SP",
+	"MAIN_212": "Devastador LUX",
 	"MAIN_260": "D-VAST 92",
 	"MAIN_261": "D-VAST 91",
 	"MAIN_200": "Ultradevastador",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Devastador orden (réplica)",
 	"MAIN_1120": "Brocha abanico",
 	"MAIN_1121": "Brocha abanico maestra",
+	"MAIN_1122": "Brocha abanico BNC",
 	"MAIN_1100": "Pincel",
 	"MAIN_1101": "Pincel maestro",
 	"MAIN_1110": "Brocha",
 	"MAIN_1111": "Brocha maestra",
+	"MAIN_1112": "Brocha cometa",
 	"MAIN_1115": "Brocha orden (réplica)",
 	"MAIN_2060": "Tubofusil",
 	"MAIN_2061": "Tubofusil SP",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "Entintador 4K SP",
 	"MAIN_2020": "Cargatintas con mira",
 	"MAIN_2021": "Cargatintas con mira Ezkkor",
+	"MAIN_2022": "Cargatintas con mira BSQ",
 	"MAIN_2010": "Cargatintas",
 	"MAIN_2011": "Cargatintas Ezkkor",
+	"MAIN_2012": "Cargatintas BSQ",
 	"MAIN_2015": "Cargatintas orden (réplica)",
 	"MAIN_2070": "Cargaminas 5H",
 	"MAIN_2071": "Cargaminas 5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "Kalarrapid β",
 	"MAIN_5030": "Barredora dual",
 	"MAIN_5031": "Barredora dual SP",
+	"MAIN_5032": "Barredora dual rayas",
 	"MAIN_5020": "Fundidora 525 dual",
 	"MAIN_5021": "Fundidora 525 dual DX",
 	"MAIN_5050": "Extintor Dual FF",
 	"MAIN_5051": "Extintor Dual FF SP",
 	"MAIN_5010": "Difusor dual",
 	"MAIN_5011": "Difusor dual B",
+	"MAIN_5012": "Difusor dual chispa",
 	"MAIN_5015": "Difusor dual orden (réplica)",
 	"MAIN_5000": "Atomizador dual",
 	"MAIN_5001": "Atomizador dual maestro",
+	"MAIN_5002": "Atomizador dual búho",
 	"MAIN_5040": "Motatrónic dual negro",
 	"MAIN_5041": "Motatrónic dual blanco",
 	"MAIN_1000": "Rodillo de carbono",
 	"MAIN_1001": "Rodillo de carbono DX",
+	"MAIN_1002": "Rodillo de carbono ABSL",
 	"MAIN_1020": "Dinamorrodillo",
 	"MAIN_1021": "Dinamorrodillo T",
+	"MAIN_1022": "Dinamorrodillo cosmos",
 	"MAIN_1030": "Rodillo versátil",
 	"MAIN_1031": "Rodillo versátil B",
 	"MAIN_1010": "Rodillo básico",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Rodillo orden (réplica)",
 	"MAIN_1040": "Rodillo mágnum",
 	"MAIN_1041": "Rodillo mágnum B",
+	"MAIN_1042": "Rodillo mágnum SAT",
 	"MAIN_8020": "Odontintador menta",
 	"MAIN_8021": "Odontintador carbón",
 	"MAIN_8010": "Azotintador brisa",
 	"MAIN_8011": "Azotintador brisa DX",
+	"MAIN_8012": "Azotintador brisa óxido",
 	"MAIN_8000": "Azotintador pro",
 	"MAIN_8001": "Azotintador pro maestro",
+	"MAIN_8002": "Azotintador pro pegatas",
 	"MAIN_8005": "Azotintador orden (réplica)",
 	"MAIN_6020": "Paratintas clásico",
 	"MAIN_6021": "Paratintas clásico B",
+	"MAIN_6022": "Paratintas clásico MIX",
 	"MAIN_6030": "Prototintas 24-I",
 	"MAIN_6031": "Prototintas 24-II",
 	"MAIN_6000": "Paratintas",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Paratintas orden (réplica)",
 	"MAIN_6010": "Paratintas maxi",
 	"MAIN_6011": "Paratintas maxi B",
+	"MAIN_6012": "Paratintas maxi crema",
 	"MAIN_30": "Aerógrafo pro",
 	"MAIN_31": "Aerógrafo plus",
+	"MAIN_32": "Aerógrafo arcoíris",
 	"MAIN_70": "Lanzatintas plus",
 	"MAIN_71": "Lanzatintas plus B",
+	"MAIN_72": "Lanzatintas plus gélido",
 	"MAIN_10": "Lanzatintas novato",
 	"MAIN_11": "Lanzatintas novato B",
 	"MAIN_400": "Tintopresor",
@@ -90,15 +108,19 @@
 	"MAIN_51": "Salpicadora 2000 DX",
 	"MAIN_80": "Salpicadora 3000",
 	"MAIN_81": "Salpicadora 3000 DX",
+	"MAIN_82": "Salpicadora 3000 garra",
 	"MAIN_90": "Megabarredora",
 	"MAIN_91": "Megabarredora SP",
+	"MAIN_92": "Megabarredora cobra",
 	"MAIN_40": "Lanzatintas",
 	"MAIN_41": "Lanzatintas B",
+	"MAIN_42": "Lanzatintas ZAS",
 	"MAIN_45": "Pistola de élite (réplica)",
 	"MAIN_47": "Lanzatintas orden (réplica)",
 	"MAIN_46": "Pistola octariana (réplica)",
 	"MAIN_20": "Marcador fino",
 	"MAIN_21": "Marcador fino neo",
+	"MAIN_22": "Marcador fino geco",
 	"MAIN_100": "Lanzatintas espacial",
 	"MAIN_101": "Lanzatintas espacial B",
 	"MAIN_60": "N-ZAP 85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Marcador neo",
 	"MAIN_310": "Tintambor pesado",
 	"MAIN_311": "Tintambor pesado D",
+	"MAIN_312": "Tintambor pesado áspid",
 	"MAIN_300": "Tintambor ligero",
 	"MAIN_301": "Tintambor ligero D",
+	"MAIN_302": "Tintambor ligero chapa",
 	"MAIN_3030": "Derramatic baño",
 	"MAIN_3031": "Derramatic baño DX",
 	"MAIN_3010": "Derramatic triple",
 	"MAIN_3011": "Derramatic triple maestro",
+	"MAIN_3012": "Derramatic triple ceniza",
 	"MAIN_3050": "Friegamatic",
 	"MAIN_3051": "Friegamatic D",
+	"MAIN_3052": "Friegamatic asta",
 	"MAIN_3020": "Derramatic centrífugo",
 	"MAIN_3021": "Derramatic centrífugo neo",
 	"MAIN_3000": "Derramatic",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Corrigetintas maestro",
 	"MAIN_4020": "Extintador",
 	"MAIN_4021": "Extintador SP",
+	"MAIN_4022": "Extintador presión",
 	"MAIN_4000": "Tintralladora ligera",
 	"MAIN_4001": "Tintralladora ligera B",
+	"MAIN_4002": "Tintralladora ligera pitón",
 	"MAIN_4040": "Subtralladora 47",
 	"MAIN_4041": "Subtralladora 79",
 	"MAIN_4010": "Tintralladora",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Arcrotensor V SP",
 	"MAIN_7010": "Arcromatizador triple",
 	"MAIN_7011": "Arcromatizador triple B",
+	"MAIN_7012": "Arcromatizador triple LUZ",
 	"MAIN_7015": "Arcromatizador orden (réplica)",
 	"MAIN_7020": "AR-CR0 450",
 	"MAIN_7021": "AR-CR0 450 DX",
+	"MAIN_7022": "AR-CR0 450 lácteo",
 	"SUB_8": "Baliza transportadora",
 	"SUB_6": "Bomba deslizante",
 	"SUB_5": "Bomba carbónica",
diff --git a/locales/es-US/game-misc.json b/locales/es-US/game-misc.json
index 819f52d2b..6e7ed6c71 100644
--- a/locales/es-US/game-misc.json
+++ b/locales/es-US/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "Factoría RAMen",
 	"STAGE_22": "Aeropuerto Marlín",
 	"STAGE_23": "Terminal Dragón",
+	"STAGE_24": "Parque Viaducto",
 	"ABILITY_ISM": "Ahorro tinta (ppal.)",
 	"ABILITY_ISS": "Ahorro tinta (sec.)",
 	"ABILITY_IRU": "Mejor recarga tinta",
diff --git a/locales/es-US/weapons.json b/locales/es-US/weapons.json
index 20b4ed040..e856aa604 100644
--- a/locales/es-US/weapons.json
+++ b/locales/es-US/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Turbolanzamotas Pro",
 	"MAIN_251": "Turbolanzamotas Pro chic",
+	"MAIN_252": "Turbolanzamotas INV",
 	"MAIN_230": "Hiperlanzamotas",
 	"MAIN_231": "Hiperlanzamotas neo",
 	"MAIN_240": "Turbolanzamotas",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Telelanzamotas adaptado",
 	"MAIN_210": "Lanzamotas",
 	"MAIN_211": "Lanzamotas adaptado",
+	"MAIN_212": "Lanzamotas DSX",
 	"MAIN_260": "L-MOT 92",
 	"MAIN_261": "L-MOT 91",
 	"MAIN_200": "Lanzamotas Nova",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Lanzamotas orden réplica",
 	"MAIN_1120": "Pincel abanico",
 	"MAIN_1121": "Pincel abanico maestro",
+	"MAIN_1122": "Pincel abanico BNC",
 	"MAIN_1100": "Pincel",
 	"MAIN_1101": "Pincel maestro",
 	"MAIN_1110": "Pincel caligrafía",
 	"MAIN_1111": "Pincel caligrafía maestro",
+	"MAIN_1112": "Pincel caligrafía CMX",
 	"MAIN_1115": "Pincel caligrafía orden réplica",
 	"MAIN_2060": "Entintubo",
 	"MAIN_2061": "Entintubo adaptado",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "Entintador 4K adaptado",
 	"MAIN_2020": "Telecargatintas",
 	"MAIN_2021": "Telecargatintas ZyS",
+	"MAIN_2022": "Telecargatintas BSQ",
 	"MAIN_2010": "Cargatintas",
 	"MAIN_2011": "Cargatintas ZyS",
+	"MAIN_2012": "Cargatintas BSQ",
 	"MAIN_2015": "Cargatintas orden réplica",
 	"MAIN_2070": "Cargaminas 5H",
 	"MAIN_2071": "Cargaminas 5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "Delineador Y",
 	"MAIN_5030": "Soplador dual",
 	"MAIN_5031": "Soplador dual adaptado",
+	"MAIN_5032": "Soplador dual RYX",
 	"MAIN_5020": "Fundidora 525 dual",
 	"MAIN_5021": "Fundidora 525 dual chic",
 	"MAIN_5050": "Extintor dual FF",
 	"MAIN_5051": "Extintor dual FF adaptado",
 	"MAIN_5010": "Difusor dual",
 	"MAIN_5011": "Difusor dual Emperi",
+	"MAIN_5012": "Difusor dual CHX",
 	"MAIN_5015": "Difusor dual orden réplica",
 	"MAIN_5000": "Atomizador dual",
 	"MAIN_5001": "Atomizador dual maestro",
+	"MAIN_5002": "Atomizador dual NCT",
 	"MAIN_5040": "Tetra dual negro",
 	"MAIN_5041": "Tetra dual blanco",
 	"MAIN_1000": "Rodillo de carbono",
 	"MAIN_1001": "Rodillo de carbono chic",
+	"MAIN_1002": "Rodillo de carbono ABL",
 	"MAIN_1020": "Rodillo Pro",
 	"MAIN_1021": "Rodillo Pro dorado",
+	"MAIN_1022": "Rodillo Pro CSX",
 	"MAIN_1030": "Rodillo versátil",
 	"MAIN_1031": "Rodillo versátil Foil",
 	"MAIN_1010": "Rodillo básico",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Rodillo orden réplica",
 	"MAIN_1040": "Rodillo mágnum",
 	"MAIN_1041": "Rodillo mágnum exprés",
+	"MAIN_1042": "Rodillo mágnum PLX",
 	"MAIN_8020": "Odontintador menta",
 	"MAIN_8021": "Odontintador carbón",
 	"MAIN_8010": "Azotintador brisa",
 	"MAIN_8011": "Azotintador brisa chic",
+	"MAIN_8012": "Azotintador brisa OXD",
 	"MAIN_8000": "Azotintador Pro",
 	"MAIN_8001": "Azotintador Pro maestro",
+	"MAIN_8002": "Azotintador Pro CLX",
 	"MAIN_8005": "Azotintador orden réplica",
 	"MAIN_6020": "Paratintas discreto",
 	"MAIN_6021": "Paratintas discreto Sorella",
+	"MAIN_6022": "Paratintas discreto PTX",
 	"MAIN_6030": "Prototintas 24-I",
 	"MAIN_6031": "Prototintas 24-II",
 	"MAIN_6000": "Paratintas",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Paratintas orden réplica",
 	"MAIN_6010": "Paratintas forestal",
 	"MAIN_6011": "Paratintas forestal Sorella",
+	"MAIN_6012": "Paratintas forestal CRM",
 	"MAIN_30": "Aerógrafo GP",
 	"MAIN_31": "Aerógrafo GN",
+	"MAIN_32": "Aerógrafo ARX",
 	"MAIN_70": "Rociador Pro",
 	"MAIN_71": "Rociador Forima",
+	"MAIN_72": "Rociador Pro GLD",
 	"MAIN_10": "Rociador básico",
 	"MAIN_11": "Rociador básico adaptado",
 	"MAIN_400": "Tintopresor",
@@ -90,15 +108,19 @@
 	"MAIN_51": "Salpicadora 2000 chic",
 	"MAIN_80": "Salpicadora 3000",
 	"MAIN_81": "Salpicadora 3000 chic",
+	"MAIN_82": "Salpicadora 3000 GRX",
 	"MAIN_90": "Megasoplador",
 	"MAIN_91": "Megasoplador adaptado",
+	"MAIN_92": "Megasoplador CBR",
 	"MAIN_40": "Rociador",
 	"MAIN_41": "Rociador Tentáctica",
+	"MAIN_42": "Rociador GLX",
 	"MAIN_45": "Rociador de élite réplica",
 	"MAIN_47": "Rociador orden réplica",
 	"MAIN_46": "Rociador octariano réplica",
 	"MAIN_20": "Plumón",
 	"MAIN_21": "Plumón neo",
+	"MAIN_22": "Plumón GCO",
 	"MAIN_100": "Rociador espacial",
 	"MAIN_101": "Rociador espacial Annak",
 	"MAIN_60": "N-ZAP 85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Marcador grueso neo",
 	"MAIN_310": "Manguera pesada",
 	"MAIN_311": "Manguera pesada D",
+	"MAIN_312": "Manguera pesada PTN",
 	"MAIN_300": "Manguera ligera",
 	"MAIN_301": "Manguera ligera D",
+	"MAIN_302": "Manguera ligera BRX",
 	"MAIN_3030": "Derramatic baño",
 	"MAIN_3031": "Derramatic baño chic",
 	"MAIN_3010": "Derramatic triple",
 	"MAIN_3011": "Derramatic triple maestro",
+	"MAIN_3012": "Derramatic triple CNZ",
 	"MAIN_3050": "Friegamatic",
 	"MAIN_3051": "Friegamatic D",
+	"MAIN_3052": "Friegamatic ATX",
 	"MAIN_3020": "Derramatic centrífugo",
 	"MAIN_3021": "Derramatic centrífugo neo",
 	"MAIN_3000": "Derramatic",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Corrigetintas maestro",
 	"MAIN_4020": "Garabateador HD",
 	"MAIN_4021": "Garabateador HD adaptado",
+	"MAIN_4022": "Garabateador HD TRX",
 	"MAIN_4000": "Garabateador",
 	"MAIN_4001": "Garabateador Tintaz",
+	"MAIN_4002": "Garabateador CSB",
 	"MAIN_4040": "Nautilo 47",
 	"MAIN_4041": "Nautilo 79",
 	"MAIN_4010": "Garabateador Pro",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Arcrotensor V adaptado",
 	"MAIN_7010": "Arcromatizador triple",
 	"MAIN_7011": "Arcromatizador triple Moluskia",
+	"MAIN_7012": "Arcromatizador triple FCX",
 	"MAIN_7015": "Arcromatizador orden réplica",
 	"MAIN_7020": "AR-CR0 450",
 	"MAIN_7021": "AR-CR0 450 chic",
+	"MAIN_7022": "AR-CR0 450 LCT",
 	"SUB_8": "Baliza",
 	"SUB_6": "Bomba deslizante",
 	"SUB_5": "Bomba carbónica",
diff --git a/locales/fr-CA/game-misc.json b/locales/fr-CA/game-misc.json
index 1eab5f20d..ca137de97 100644
--- a/locales/fr-CA/game-misc.json
+++ b/locales/fr-CA/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "Arène Méca-ramen",
 	"STAGE_22": "Terminal Rorqual",
 	"STAGE_23": "Gare Aiguillat",
+	"STAGE_24": "Passage Turbot",
 	"ABILITY_ISM": "Encrémenteur (pr.)",
 	"ABILITY_ISS": "Encrémenteur (sec.)",
 	"ABILITY_IRU": "Levée d'encre",
diff --git a/locales/fr-CA/weapons.json b/locales/fr-CA/weapons.json
index ba999697d..842308e91 100644
--- a/locales/fr-CA/weapons.json
+++ b/locales/fr-CA/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Turboblasteur pro",
 	"MAIN_251": "Turboblasteur pro chic",
+	"MAIN_252": "Turboblasteur pro POL-R",
 	"MAIN_230": "Rafalblasteur",
 	"MAIN_231": "Rafalblasteur néo",
 	"MAIN_240": "Turboblasteur",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Éclablasteur LP modifié",
 	"MAIN_210": "Éclablasteur",
 	"MAIN_211": "Éclablasteur modifié",
+	"MAIN_212": "Éclablasteur miragius",
 	"MAIN_260": "S-Blasteur '92",
 	"MAIN_261": "S-Blasteur '91",
 	"MAIN_200": "Proxiblasteur",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Blasteur d'Ordre (réplique)",
 	"MAIN_1120": "Épinceau écaïe",
 	"MAIN_1121": "Épinceau écaïe nuancé",
+	"MAIN_1122": "Épinceau écaïe BRN-Z",
 	"MAIN_1100": "Épinceau",
 	"MAIN_1101": "Épinceau nuancé",
 	"MAIN_1110": "Épinceau brosse",
 	"MAIN_1111": "Épinceau brosse nuancé",
+	"MAIN_1112": "Épinceau brosse stellius",
 	"MAIN_1115": "Pinceau d'Ordre (réplique)",
 	"MAIN_2060": "Détubeur",
 	"MAIN_2061": "Détubeur modifié",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "X-traceur + modifié",
 	"MAIN_2020": "Concentraceur zoom",
 	"MAIN_2021": "Concentraceur zoom E+A",
+	"MAIN_2022": "Concentraceur zoom CAM-O",
 	"MAIN_2010": "Concentraceur",
 	"MAIN_2011": "Concentraceur E+A",
+	"MAIN_2012": "Concentraceur CAM-O",
 	"MAIN_2015": "Fusil d'Ordre (réplique)",
 	"MAIN_2070": "Crayon X - 5H",
 	"MAIN_2071": "Crayon X - 5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "Lignizateur bêta",
 	"MAIN_5030": "Double nettoyeur",
 	"MAIN_5031": "Double nettoyeur modifié",
+	"MAIN_5032": "Double nettoyeur zébranius",
 	"MAIN_5020": "Double Kelvin 525",
 	"MAIN_5021": "Double Kelvin 525 chic",
 	"MAIN_5050": "Double ignifugeur",
 	"MAIN_5051": "Double ignifugeur modifié",
 	"MAIN_5010": "Double encreur",
 	"MAIN_5011": "Double encreur DUX",
+	"MAIN_5012": "Double encreur flambius",
 	"MAIN_5015": "Arme double d'Ordre (réplique)",
 	"MAIN_5000": "Double moucheteur",
 	"MAIN_5001": "Double moucheteur nuancé",
+	"MAIN_5002": "Double moucheteur NOC-T",
 	"MAIN_5040": "Double voltigeur noir",
 	"MAIN_5041": "Double voltigeur blanc",
 	"MAIN_1000": "Rouleau carbone",
 	"MAIN_1001": "Rouleau carbone chic",
+	"MAIN_1002": "Rouleau carbone BOD-RWA",
 	"MAIN_1020": "Dynamo-rouleau",
 	"MAIN_1021": "Dynamo-rouleau pro",
+	"MAIN_1022": "Dynamo-rouleau galaxius",
 	"MAIN_1030": "Flexi-rouleau",
 	"MAIN_1031": "Flexi-rouleau aluminium",
 	"MAIN_1010": "Rouleau",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Rouleau d'Ordre (réplique)",
 	"MAIN_1040": "Rouleau large",
 	"MAIN_1041": "Rouleau large Xpress",
+	"MAIN_1042": "Rouleau large astralius",
 	"MAIN_8020": "Sabrifrice menthe",
 	"MAIN_8021": "Sabrifrice charbon",
 	"MAIN_8010": "Éclatana Doto",
 	"MAIN_8011": "Éclatana Doto chic",
+	"MAIN_8012": "Éclatana Doto OXY-D",
 	"MAIN_8000": "Éclatana d'estampe",
 	"MAIN_8001": "Éclatana d'estampe nuancé",
+	"MAIN_8002": "Éclatana d'estampe décolius",
 	"MAIN_8005": "Éclatana d'Ordre (réplique)",
 	"MAIN_6020": "Para-encre espion",
 	"MAIN_6021": "Para-encre espion Sorella",
+	"MAIN_6022": "Para-encre espion mélangius",
 	"MAIN_6030": "Para-encre Ré-gen 24 Mk I",
 	"MAIN_6031": "Para-encre Ré-gen 24 Mk II",
 	"MAIN_6000": "Para-encre",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Para-encre d'Ordre (réplique)",
 	"MAIN_6010": "Méga para-encre",
 	"MAIN_6011": "Méga para-encre Sorella",
+	"MAIN_6012": "Méga para-encre CRM-A",
 	"MAIN_30": "Pouche-pouche",
 	"MAIN_31": "Pouche-pouche premium",
+	"MAIN_32": "Pouche-pouche chromius",
 	"MAIN_70": "Liquéficateur pro",
 	"MAIN_71": "Liquéficateur pro Fosia",
+	"MAIN_72": "Liquéficateur pro GLA-C",
 	"MAIN_10": "Liquéficateur ultra",
 	"MAIN_11": "Liquéficateur ultra modifié",
 	"MAIN_400": "Compresseur",
@@ -90,15 +108,19 @@
 	"MAIN_51": "Calibre 2000 chic",
 	"MAIN_80": "Calibre 3000",
 	"MAIN_81": "Calibre 3000 chic",
+	"MAIN_82": "Calibre 3000 guépius",
 	"MAIN_90": "Méganettoyeur",
 	"MAIN_91": "Méganettoyeur modifié",
+	"MAIN_92": "Méganettoyeur COB-R",
 	"MAIN_40": "Liquéficateur",
 	"MAIN_41": "Liquéficateur Tentatek",
+	"MAIN_42": "Liquéficateur glamius",
 	"MAIN_45": "Liquéfi. héroïque (rép.)",
 	"MAIN_47": "Lanceur d'Ordre (réplique)",
 	"MAIN_46": "Lanceur octaling (réplique)",
 	"MAIN_20": "Marqueur léger",
 	"MAIN_21": "Marqueur léger néo",
+	"MAIN_22": "Marqueur léger G-KO",
 	"MAIN_100": "Lanceur spatial",
 	"MAIN_101": "Lanceur spatial Aroz",
 	"MAIN_60": "N-ZAP 85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Marqueur lourd néo",
 	"MAIN_310": "Arroseur lourd",
 	"MAIN_311": "Arroseur lourd requin",
+	"MAIN_312": "Arroseur lourd VIP-R",
 	"MAIN_300": "Arroseur léger",
 	"MAIN_301": "Arroseur léger requin",
+	"MAIN_302": "Arroseur léger éclatius",
 	"MAIN_3030": "Bassineur",
 	"MAIN_3031": "Bassineur chic",
 	"MAIN_3010": "Seauceur trio",
 	"MAIN_3011": "Seauceur nuancé",
+	"MAIN_3012": "Seauceur trio 100-DRÉ",
 	"MAIN_3050": "Seau S-Horreur",
 	"MAIN_3051": "Seau S-Horreur requin",
+	"MAIN_3052": "Seau S-Horreur kératius",
 	"MAIN_3020": "Encrifugeur",
 	"MAIN_3021": "Encrifugeur néo",
 	"MAIN_3000": "Seauceur",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Correcteur nuancé",
 	"MAIN_4020": "Exteinteur",
 	"MAIN_4021": "Exteinteur modifié",
+	"MAIN_4022": "Exteinteur cascadius",
 	"MAIN_4000": "Badigeonneur XP",
 	"MAIN_4001": "Badigeonneur XP Leviathus",
+	"MAIN_4002": "Badigeonneur XP VN-1",
 	"MAIN_4040": "Nautilus 47",
 	"MAIN_4041": "Nautilus 79",
 	"MAIN_4010": "Badigeonneur",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Multisperceur V modifié",
 	"MAIN_7010": "Trisperceur",
 	"MAIN_7011": "Trisperceur Abysma",
+	"MAIN_7012": "Trisperceur prismalius",
 	"MAIN_7015": "Transperceur d'Ordre (réplique)",
 	"MAIN_7020": "Coralux 450",
 	"MAIN_7021": "Coralux 450 chic",
+	"MAIN_7022": "Coralux 450 LACTO",
 	"SUB_8": "Balise de saut",
 	"SUB_6": "Bombe curling",
 	"SUB_5": "Bombe soda",
diff --git a/locales/fr-EU/game-misc.json b/locales/fr-EU/game-misc.json
index 304b43ba7..f573e820d 100644
--- a/locales/fr-EU/game-misc.json
+++ b/locales/fr-EU/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "Arène Méca-ramen",
 	"STAGE_22": "Terminal Rorqual",
 	"STAGE_23": "Gare Aiguillat",
+	"STAGE_24": "Passage Turbot",
 	"ABILITY_ISM": "Encrémenteur (pr.)",
 	"ABILITY_ISS": "Encrémenteur (sec.)",
 	"ABILITY_IRU": "Levée d'encre",
diff --git a/locales/fr-EU/weapons.json b/locales/fr-EU/weapons.json
index a075597e2..d16e18cf1 100644
--- a/locales/fr-EU/weapons.json
+++ b/locales/fr-EU/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Turboblaster pro",
 	"MAIN_251": "Turboblaster pro chic",
+	"MAIN_252": "Turboblaster pro POL-R",
 	"MAIN_230": "Rafablaster",
 	"MAIN_231": "Rafablaster Néo",
 	"MAIN_240": "Turboblaster",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Éclablaster XL griffé",
 	"MAIN_210": "Éclablaster",
 	"MAIN_211": "Éclablaster modifié",
+	"MAIN_212": "Éclablaster mirapex",
 	"MAIN_260": "S-Blaster '92",
 	"MAIN_261": "S-Blaster '91",
 	"MAIN_200": "Proxiblaster",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Blaster d'Ordre (réplique)",
 	"MAIN_1120": "Épinceau écaïe",
 	"MAIN_1121": "Épinceau écaïe nuancé",
+	"MAIN_1122": "Épinceau écaïe BRN-Z",
 	"MAIN_1100": "Épinceau",
 	"MAIN_1101": "Épinceau nuancé",
 	"MAIN_1110": "Épinceau brosse",
 	"MAIN_1111": "Épinceau brosse nuancé",
+	"MAIN_1112": "Épinceau brosse stellapex",
 	"MAIN_1115": "Pinceau d'Ordre (réplique)",
 	"MAIN_2060": "Détubeur",
 	"MAIN_2061": "Détubeur modifié",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "Extraceur + modifié",
 	"MAIN_2020": "Concentraceur zoom",
 	"MAIN_2021": "Concentraceur zoom E+F",
+	"MAIN_2022": "Concentraceur zoom CAM-O",
 	"MAIN_2010": "Concentraceur",
 	"MAIN_2011": "Concentraceur E+F",
+	"MAIN_2012": "Concentraceur CAM-O",
 	"MAIN_2015": "Fusil d'Ordre (réplique)",
 	"MAIN_2070": "Crayon X - 5H",
 	"MAIN_2071": "Crayon X - 5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "Décap'express Bêta",
 	"MAIN_5030": "Double nettoyeur",
 	"MAIN_5031": "Double nettoyeur modifié",
+	"MAIN_5032": "Double nettoyeur zébrapex",
 	"MAIN_5020": "Double Kelvin 525",
 	"MAIN_5021": "Double Kelvin 525 chic",
 	"MAIN_5050": "Double ignifugeur",
 	"MAIN_5051": "Double ignifugeur modifié",
 	"MAIN_5010": "Double encreur",
 	"MAIN_5011": "Double encreur griffé",
+	"MAIN_5012": "Double encreur flambapex",
 	"MAIN_5015": "Arme double d'Ordre (réplique)",
 	"MAIN_5000": "Double moucheteur",
 	"MAIN_5001": "Double moucheteur nuancé",
+	"MAIN_5002": "Double moucheteur NOC-T",
 	"MAIN_5040": "Double voltigeur noir",
 	"MAIN_5041": "Double voltigeur blanc",
 	"MAIN_1000": "Rouleau carbone",
 	"MAIN_1001": "Rouleau carbone chic",
+	"MAIN_1002": "Rouleau carbone BOD-RWA",
 	"MAIN_1020": "Dynamo-rouleau",
 	"MAIN_1021": "Dynamo-rouleau tesla",
+	"MAIN_1022": "Dynamo-rouleau galapex",
 	"MAIN_1030": "Flexi-rouleau",
 	"MAIN_1031": "Flexi-rouleau alu",
 	"MAIN_1010": "Rouleau",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Rouleau d'Ordre (réplique)",
 	"MAIN_1040": "Rouleau large",
 	"MAIN_1041": "Rouleau large Xpress",
+	"MAIN_1042": "Rouleau large astrapex",
 	"MAIN_8020": "Sabrifrice menthe",
 	"MAIN_8021": "Sabrifrice charbon",
 	"MAIN_8010": "Éclatana Doto",
 	"MAIN_8011": "Éclatana Doto chic",
+	"MAIN_8012": "Éclatana Doto OXY-D",
 	"MAIN_8000": "Éclatana d'estampe",
 	"MAIN_8001": "Éclatana d'estampe nuancé",
+	"MAIN_8002": "Éclatana d'estampe décapex",
 	"MAIN_8005": "Éclatana d'Ordre (réplique)",
 	"MAIN_6020": "Para-encre espion",
 	"MAIN_6021": "Para-encre espion Sorella",
+	"MAIN_6022": "Para-encre espion amalgapex",
 	"MAIN_6030": "Para-encre Ré-gen 24 Mk I",
 	"MAIN_6031": "Para-encre Ré-gen 24 Mk II",
 	"MAIN_6000": "Para-encre",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Para-encre d'Ordre (réplique)",
 	"MAIN_6010": "Para-encre XL",
 	"MAIN_6011": "Para-encre XL Sorella",
+	"MAIN_6012": "Para-encre XL CRM-A",
 	"MAIN_30": "Aérogun",
 	"MAIN_31": "Aérogun premium",
+	"MAIN_32": "Aérogun chromapex",
 	"MAIN_70": "Liquidateur pro",
 	"MAIN_71": "Liquidateur pro griffé",
+	"MAIN_72": "Liquidateur pro GLA-C",
 	"MAIN_10": "Liquidateur Jr.",
 	"MAIN_11": "Liquidateur Sr.",
 	"MAIN_400": "Compresseur",
@@ -90,15 +108,19 @@
 	"MAIN_51": "Calibre 2000 chic",
 	"MAIN_80": "Calibre 3000",
 	"MAIN_81": "Calibre 3000 chic",
+	"MAIN_82": "Calibre 3000 guépapex",
 	"MAIN_90": "Nettoyeur XL",
 	"MAIN_91": "Nettoyeur XL modifié",
+	"MAIN_92": "Nettoyeur XL COB-R",
 	"MAIN_40": "Liquidateur",
 	"MAIN_41": "Liquidateur griffé",
+	"MAIN_42": "Liquidateur glamapex",
 	"MAIN_45": "Lanceur héroïque (réplique)",
 	"MAIN_47": "Lanceur d'Ordre (réplique)",
 	"MAIN_46": "Lanceur Octaling (réplique)",
 	"MAIN_20": "Marqueur léger",
 	"MAIN_21": "Marqueur léger Néo",
+	"MAIN_22": "Marqueur léger G-KO",
 	"MAIN_100": "Lanceur spatial",
 	"MAIN_101": "Lanceur spatial Aroz",
 	"MAIN_60": "N-ZAP 85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Marqueur lourd Néo",
 	"MAIN_310": "Arroseur lourd",
 	"MAIN_311": "Arroseur lourd Cétacé",
+	"MAIN_312": "Arroseur lourd VIP-R",
 	"MAIN_300": "Arroseur léger",
 	"MAIN_301": "Arroseur léger Cétacé",
+	"MAIN_302": "Arroseur léger éclapex",
 	"MAIN_3030": "Bassineur",
 	"MAIN_3031": "Bassineur chic",
 	"MAIN_3010": "Dépoteur",
 	"MAIN_3011": "Dépoteur nuancé",
+	"MAIN_3012": "Dépoteur 100-DRÉ",
 	"MAIN_3050": "Seau S-Horreur",
 	"MAIN_3051": "Seau S-Horreur Cétacé",
+	"MAIN_3052": "Seau S-Horreur kérapex",
 	"MAIN_3020": "Encrifugeur",
 	"MAIN_3021": "Encrifugeur Néo",
 	"MAIN_3000": "Seauceur",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Correcteur nuancé",
 	"MAIN_4020": "Exteinteur",
 	"MAIN_4021": "Exteinteur modifié",
+	"MAIN_4022": "Exteinteur cascapex",
 	"MAIN_4000": "Badigeonneur XS",
 	"MAIN_4001": "Badigeonneur XS griffé",
+	"MAIN_4002": "Badigeonneur XS VN-1",
 	"MAIN_4040": "Nautilus 47",
 	"MAIN_4041": "Nautilus 79",
 	"MAIN_4010": "Badigeonneur",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Multisperceur V modifié",
 	"MAIN_7010": "Trisperceur",
 	"MAIN_7011": "Trisperceur Abysma",
+	"MAIN_7012": "Trisperceur prismapex",
 	"MAIN_7015": "Transperceur d'Ordre (réplique)",
 	"MAIN_7020": "Coralux 450",
 	"MAIN_7021": "Coralux 450 chic",
+	"MAIN_7022": "Coralux 450 LACTO",
 	"SUB_8": "Balise de saut",
 	"SUB_6": "Bombe curling",
 	"SUB_5": "Bombe soda",
diff --git a/locales/he/game-misc.json b/locales/he/game-misc.json
index 24db3d21e..ab07b7e5c 100644
--- a/locales/he/game-misc.json
+++ b/locales/he/game-misc.json
@@ -22,7 +22,8 @@
 	"STAGE_20": "Bluefin Depot",
 	"STAGE_21": "Robo ROM-en",
 	"STAGE_22": "Marlin Airport",
-	"STAGE_23": "",
+	"STAGE_23": "Lemuria Hub",
+	"STAGE_24": "Urchin Underpass",
 	"ABILITY_ISM": "Ink Saver (Main)",
 	"ABILITY_ISS": "Ink Saver (Sub)",
 	"ABILITY_IRU": "Ink Recovery Up",
diff --git a/locales/he/weapons.json b/locales/he/weapons.json
index 699a80764..46b6b52f7 100644
--- a/locales/he/weapons.json
+++ b/locales/he/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Rapid Blaster Pro",
 	"MAIN_251": "Rapid Blaster Pro Deco",
+	"MAIN_252": "Rapid Blaster Pro WNT-R",
 	"MAIN_230": "Clash Blaster",
 	"MAIN_231": "Clash Blaster Neo",
 	"MAIN_240": "Rapid Blaster",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Custom Range Blaster",
 	"MAIN_210": "Blaster",
 	"MAIN_211": "Custom Blaster",
+	"MAIN_212": "Gleamz Blaster",
 	"MAIN_260": "S-BLAST '92",
 	"MAIN_261": "S-BLAST '91",
 	"MAIN_200": "Luna Blaster",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Order Blaster Replica",
 	"MAIN_1120": "Painbrush",
 	"MAIN_1121": "Painbrush Nouveau",
+	"MAIN_1122": "Painbrush BRN-Z",
 	"MAIN_1100": "Inkbrush",
 	"MAIN_1101": "Inkbrush Nouveau",
 	"MAIN_1110": "Octobrush",
 	"MAIN_1111": "Octobrush Nouveau",
+	"MAIN_1112": "Cometz Octobrush",
 	"MAIN_1115": "Orderbrush Replica",
 	"MAIN_2060": "Goo Tuber",
 	"MAIN_2061": "Custom Goo Tuber",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "Custom E-liter 4K",
 	"MAIN_2020": "Splatterscope",
 	"MAIN_2021": "Z+F Splatterscope",
+	"MAIN_2022": "Splatterscope CAM-O",
 	"MAIN_2010": "Splat Charger",
 	"MAIN_2011": "Z+F Splat Charger",
+	"MAIN_2012": "Splat Charger CAM-O",
 	"MAIN_2015": "Order Charger Replica",
 	"MAIN_2070": "Snipewriter 5H",
 	"MAIN_2071": "Snipewriter 5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "New Squiffer",
 	"MAIN_5030": "Dualie Squelchers",
 	"MAIN_5031": "Custom Dualie Squelchers",
+	"MAIN_5032": "Hoofz Dualie Squelchers",
 	"MAIN_5020": "Glooga Dualies",
 	"MAIN_5021": "Glooga Dualies Deco",
 	"MAIN_5050": "Douser Dualies FF",
 	"MAIN_5051": "Custom Douser Dualies FF",
 	"MAIN_5010": "Splat Dualies",
 	"MAIN_5011": "Enperry Splat Dualies",
+	"MAIN_5012": "Twinklez Splat Dualies",
 	"MAIN_5015": "Order Dualie Replicas",
 	"MAIN_5000": "Dapple Dualies",
 	"MAIN_5001": "Dapple Dualies Nouveau",
+	"MAIN_5002": "Dapple Dualies NOC-T",
 	"MAIN_5040": "Dark Tetra Dualies",
 	"MAIN_5041": "Light Tetra Dualies",
 	"MAIN_1000": "Carbon Roller",
 	"MAIN_1001": "Carbon Roller Deco",
+	"MAIN_1002": "Carbon Roller ANG-L",
 	"MAIN_1020": "Dynamo Roller",
 	"MAIN_1021": "Gold Dynamo Roller",
+	"MAIN_1022": "Starz Dynamo Roller",
 	"MAIN_1030": "Flingza Roller",
 	"MAIN_1031": "Foil Flingza Roller",
 	"MAIN_1010": "Splat Roller",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Order Roller Replica",
 	"MAIN_1040": "Big Swig Roller",
 	"MAIN_1041": "Big Swig Roller Express",
+	"MAIN_1042": "Planetz Big Swig Roller",
 	"MAIN_8020": "Mint Decavitator",
 	"MAIN_8021": "Charcoal Decavitator",
 	"MAIN_8010": "Splatana Wiper",
 	"MAIN_8011": "Splatana Wiper Deco",
+	"MAIN_8012": "Splatana Wiper RUS-T",
 	"MAIN_8000": "Splatana Stamper",
 	"MAIN_8001": "Splatana Stamper Nouveau",
+	"MAIN_8002": "Stickerz Splatana Stamper",
 	"MAIN_8005": "Order Splatana Replica",
 	"MAIN_6020": "Undercover Brella",
 	"MAIN_6021": "Undercover Sorella Brella",
+	"MAIN_6022": "Patternz Undercover Brella",
 	"MAIN_6030": "Recycled Brella 24 Mk I",
 	"MAIN_6031": "Recycled Brella 24 Mk II",
 	"MAIN_6000": "Splat Brella",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Order Brella Replica",
 	"MAIN_6010": "Tenta Brella",
 	"MAIN_6011": "Tenta Sorella Brella",
+	"MAIN_6012": "Tenta Brella CRE-M",
 	"MAIN_30": "Aerospray MG",
 	"MAIN_31": "Aerospray RG",
+	"MAIN_32": "Colorz Aerospray",
 	"MAIN_70": "Splattershot Pro",
 	"MAIN_71": "Forge Splattershot Pro",
+	"MAIN_72": "Splattershot Pro FRZ-N",
 	"MAIN_10": "Splattershot Jr.",
 	"MAIN_11": "Custom Splattershot Jr.",
 	"MAIN_400": "Squeezer",
@@ -90,15 +108,19 @@
 	"MAIN_51": ".52 Gal Deco",
 	"MAIN_80": ".96 Gal",
 	"MAIN_81": ".96 Gal Deco",
+	"MAIN_82": "Clawz .96 Gal",
 	"MAIN_90": "Jet Squelcher",
 	"MAIN_91": "Custom Jet Squelcher",
+	"MAIN_92": "Jet Squelcher COB-R",
 	"MAIN_40": "Splattershot",
 	"MAIN_41": "Tentatek Splattershot",
+	"MAIN_42": "Glamorz Splattershot",
 	"MAIN_45": "Hero Shot Replica",
 	"MAIN_47": "Order Shot Replica",
 	"MAIN_46": "Octo Shot Replica",
 	"MAIN_20": "Splash-o-matic",
 	"MAIN_21": "Neo Splash-o-matic",
+	"MAIN_22": "Splash-o-matic GCK-O",
 	"MAIN_100": "Splattershot Nova",
 	"MAIN_101": "Annaki Splattershot Nova",
 	"MAIN_60": "N-ZAP '85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Neo Sploosh-o-matic",
 	"MAIN_310": "H-3 Nozzlenose",
 	"MAIN_311": "H-3 Nozzlenose D",
+	"MAIN_312": "H-3 Nozzlenose VIP-R",
 	"MAIN_300": "L-3 Nozzlenose",
 	"MAIN_301": "L-3 Nozzlenose D",
+	"MAIN_302": "Glitterz L-3 Nozzlenose",
 	"MAIN_3030": "Bloblobber",
 	"MAIN_3031": "Bloblobber Deco",
 	"MAIN_3010": "Tri-Slosher",
 	"MAIN_3011": "Tri-Slosher Nouveau",
+	"MAIN_3012": "Tri-Slosher ASH-N",
 	"MAIN_3050": "Dread Wringer",
 	"MAIN_3051": "Dread Wringer D",
+	"MAIN_3052": "Hornz Dread Wringer",
 	"MAIN_3020": "Sloshing Machine",
 	"MAIN_3021": "Sloshing Machine Neo",
 	"MAIN_3000": "Slosher",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Heavy Edit Splatling Nouveau",
 	"MAIN_4020": "Hydra Splatling",
 	"MAIN_4021": "Custom Hydra Splatling",
+	"MAIN_4022": "Torrentz Hydra Splatling",
 	"MAIN_4000": "Mini Splatling",
 	"MAIN_4001": "Zink Mini Splatling",
+	"MAIN_4002": "Mini Splatling RTL-R",
 	"MAIN_4040": "Nautilus 47",
 	"MAIN_4041": "Nautilus 79",
 	"MAIN_4010": "Heavy Splatling",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Custom Wellstring V",
 	"MAIN_7010": "Tri-Stringer",
 	"MAIN_7011": "Inkline Tri-Stringer",
+	"MAIN_7012": "Bulbz Tri-Stringer",
 	"MAIN_7015": "Order Stringer Replica",
 	"MAIN_7020": "REEF-LUX 450",
 	"MAIN_7021": "REEF-LUX 450 Deco",
+	"MAIN_7022": "REEF-LUX 450 MIL-K",
 	"SUB_8": "Squid Beakon",
 	"SUB_6": "Curling Bomb",
 	"SUB_5": "Fizzy Bomb",
diff --git a/locales/it/game-misc.json b/locales/it/game-misc.json
index 471f396ba..b25fed838 100644
--- a/locales/it/game-misc.json
+++ b/locales/it/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "Roboramen",
 	"STAGE_22": "Aeroporto Ondabianca",
 	"STAGE_23": "Stazione Lemuria",
+	"STAGE_24": "Periferia urbana",
 	"ABILITY_ISM": "Eco-colore princ.",
 	"ABILITY_ISS": "Eco-colore second.",
 	"ABILITY_IRU": "Recupero colore +",
diff --git a/locales/it/weapons.json b/locales/it/weapons.json
index d24695f0a..63a9b3bc2 100644
--- a/locales/it/weapons.json
+++ b/locales/it/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Blaster élite",
 	"MAIN_251": "Blaster élite DX",
+	"MAIN_252": "Blaster élite INV-N",
 	"MAIN_230": "Blaster da mischia",
 	"MAIN_231": "Blaster da mischia Neo",
 	"MAIN_240": "Blaster rapido",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Blaster a distanza CM",
 	"MAIN_210": "Blaster",
 	"MAIN_211": "Blaster CM",
+	"MAIN_212": "Blaster glam-bon",
 	"MAIN_260": "S-BLAST92",
 	"MAIN_261": "S-BLAST91",
 	"MAIN_200": "Blaster lunar",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Blaster Ordine replica",
 	"MAIN_1120": "Tonnoretto",
 	"MAIN_1121": "Tonnoretto master",
+	"MAIN_1122": "Tonnoretto BRN-Z",
 	"MAIN_1100": "Calamaravaggio",
 	"MAIN_1101": "Calamaravaggio master",
 	"MAIN_1110": "Tinturicchio",
 	"MAIN_1111": "Tinturicchio master",
+	"MAIN_1112": "Tinturicchio comet-bon",
 	"MAIN_1115": "Pennello Ordine replica",
 	"MAIN_2060": "Tintubator",
 	"MAIN_2061": "Tintubator CM",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "Tinter a carica 4K CM",
 	"MAIN_2020": "Splatter con mirino",
 	"MAIN_2021": "Splatter con mirino logo",
+	"MAIN_2022": "Splatter con mirino FRS-T",
 	"MAIN_2010": "Splatter a carica",
 	"MAIN_2011": "Splatter a carica logo",
+	"MAIN_2012": "Splatter a carica FRS-T",
 	"MAIN_2015": "Splatter Ordine replica",
 	"MAIN_2070": "Lapis cecchino 5H",
 	"MAIN_2071": "Lapis cecchino 5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "Kalamarapid β",
 	"MAIN_5030": "Sweeper duplo",
 	"MAIN_5031": "Sweeper duplo CM",
+	"MAIN_5032": "Sweeper duplo zebra-bon",
 	"MAIN_5020": "Kelvin duplo 525",
 	"MAIN_5021": "Kelvin duplo 525 DX",
 	"MAIN_5050": "Repolper estintori FF",
 	"MAIN_5051": "Repolper estintori FF CM",
 	"MAIN_5010": "Repolper duplo",
 	"MAIN_5011": "Repolper duplo logo",
+	"MAIN_5012": "Repolper duplo metal-bon",
 	"MAIN_5015": "Repolper Ordine replica",
 	"MAIN_5000": "Ripolpella duplo",
 	"MAIN_5001": "Ripolpella duplo master",
+	"MAIN_5002": "Ripolpella duplo NOT-T",
 	"MAIN_5040": "Moscarpino duplo nero",
 	"MAIN_5041": "Moscarpino duplo bianco",
 	"MAIN_1000": "Rullo di carbonio",
 	"MAIN_1001": "Rullo di carbonio DX",
+	"MAIN_1002": "Rullo di carbonio PSC-AB",
 	"MAIN_1020": "Rullo dinamo",
 	"MAIN_1021": "Rullo dinamo dorato",
+	"MAIN_1022": "Rullo dinamo galax-bon",
 	"MAIN_1030": "Flexi-rullo",
 	"MAIN_1031": "Flexi-rullo B",
 	"MAIN_1010": "Rullo splat",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Rullo Ordine replica",
 	"MAIN_1040": "Ampiorullo",
 	"MAIN_1041": "Ampiorullo Express",
+	"MAIN_1042": "Ampiorullo astra-bon",
 	"MAIN_8020": "Spazzolama menta",
 	"MAIN_8021": "Spazzolama carbone",
 	"MAIN_8010": "Tergilama",
 	"MAIN_8011": "Tergilama DX",
+	"MAIN_8012": "Tergilama RUG-N",
 	"MAIN_8000": "Splattalama",
 	"MAIN_8001": "Splattalama master",
+	"MAIN_8002": "Splattalama adesi-bon",
 	"MAIN_8005": "Lama Ordine replica",
 	"MAIN_6020": "Bombrello",
 	"MAIN_6021": "Bombrello Solerra",
+	"MAIN_6022": "Bombrello sgargia-bon",
 	"MAIN_6030": "Sparasole riciclo 24-I",
 	"MAIN_6031": "Sparasole riciclo 24-II",
 	"MAIN_6000": "Sparasole",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Sparasole Ordine replica",
 	"MAIN_6010": "Sparatenda",
 	"MAIN_6011": "Sparatenda Solerra",
+	"MAIN_6012": "Sparatenda CRM-A",
 	"MAIN_30": "Aerografo",
 	"MAIN_31": "Aerografo élite",
+	"MAIN_32": "Aerografo color-bon",
 	"MAIN_70": "Splasher élite",
 	"MAIN_71": "Splasher élite logo",
+	"MAIN_72": "Splasher élite GLA-C",
 	"MAIN_10": "Sparacolore recluta",
 	"MAIN_11": "Sparacolore logo",
 	"MAIN_400": "Strizzer",
@@ -90,15 +108,19 @@
 	"MAIN_51": "Calibro 2000 DX",
 	"MAIN_80": "Calibro 3000",
 	"MAIN_81": "Calibro 3000 DX",
+	"MAIN_82": "Calibro 3000 leo-bon",
 	"MAIN_90": "Sweeper",
 	"MAIN_91": "Sweeper CM",
+	"MAIN_92": "Sweeper COB-R",
 	"MAIN_40": "Splasher",
 	"MAIN_41": "Splasher logo",
+	"MAIN_42": "Splasher iride-bon",
 	"MAIN_45": "Pistola élite replica",
 	"MAIN_47": "Pistola Ordine replica",
 	"MAIN_46": "Octosplasher replica",
 	"MAIN_20": "Marker d'assalto",
 	"MAIN_21": "Marker d'assalto Neo",
+	"MAIN_22": "Marker d'assalto GEC-O",
 	"MAIN_100": "Splasher Nova",
 	"MAIN_101": "Splasher Nova Annak",
 	"MAIN_60": "N-ZAP85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Marker Neo",
 	"MAIN_310": "Triplete",
 	"MAIN_311": "Triplete D",
+	"MAIN_312": "Triplete VIP-R",
 	"MAIN_300": "Triplete compatto",
 	"MAIN_301": "Triplete compatto D",
+	"MAIN_302": "Triplete compatto lucci-bon",
 	"MAIN_3030": "Secchiostro vasca",
 	"MAIN_3031": "Secchiostro vasca DX",
 	"MAIN_3010": "Secchiostro triplo",
 	"MAIN_3011": "Secchiostro triplo master",
+	"MAIN_3012": "Secchiostro triplo POL-V",
 	"MAIN_3050": "Secchiapavimenti",
 	"MAIN_3051": "Secchiapavimenti D",
+	"MAIN_3052": "Secchiapavimenti acu-bon",
 	"MAIN_3020": "Secchiostro centrifuga",
 	"MAIN_3021": "Secchiostro centrifuga Neo",
 	"MAIN_3000": "Secchiostro",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Splatling a pennarelli master",
 	"MAIN_4020": "Idrante",
 	"MAIN_4021": "Idrante CM",
+	"MAIN_4022": "Idrante spray-bon",
 	"MAIN_4000": "Mini splatling",
 	"MAIN_4001": "Mini splatling logo",
+	"MAIN_4002": "Mini splatling PIT-N",
 	"MAIN_4040": "Nautilus 47",
 	"MAIN_4041": "Nautilus 79",
 	"MAIN_4010": "Splatling a tanica",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Fontanarco V CM",
 	"MAIN_7010": "Tri-calamarco",
 	"MAIN_7011": "Tri-calamarco Maremont",
+	"MAIN_7012": "Tri-calamarco LED-bon",
 	"MAIN_7015": "Calamarco Ordine replica",
 	"MAIN_7020": "ARCO-RAL 450",
 	"MAIN_7021": "ARCO-RAL 450 DX",
+	"MAIN_7022": "ARCO-RAL 450 LAT-T",
 	"SUB_8": "Trasferitore",
 	"SUB_6": "Bomba curling",
 	"SUB_5": "Bomba a gassosa",
diff --git a/locales/ja/game-misc.json b/locales/ja/game-misc.json
index c949de53f..49f5f1f2a 100644
--- a/locales/ja/game-misc.json
+++ b/locales/ja/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "バイガイ亭",
 	"STAGE_22": "カジキ空港",
 	"STAGE_23": "リュウグウターミナル",
+	"STAGE_24": "デカライン高架下",
 	"ABILITY_ISM": "インク効率アップ(メイン)",
 	"ABILITY_ISS": "インク効率アップ(サブ)",
 	"ABILITY_IRU": "インク回復力アップ",
diff --git a/locales/ja/weapons.json b/locales/ja/weapons.json
index abc313667..8cbfff796 100644
--- a/locales/ja/weapons.json
+++ b/locales/ja/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Rブラスターエリート",
 	"MAIN_251": "Rブラスターエリートデコ",
+	"MAIN_252": "RブラスターエリートWNTR",
 	"MAIN_230": "クラッシュブラスター",
 	"MAIN_231": "クラッシュブラスターネオ",
 	"MAIN_240": "ラピッドブラスター",
@@ -9,6 +10,7 @@
 	"MAIN_221": "ロングブラスターカスタム",
 	"MAIN_210": "ホットブラスター",
 	"MAIN_211": "ホットブラスターカスタム",
+	"MAIN_212": "ホットブラスター艶",
 	"MAIN_260": "S-BLAST92",
 	"MAIN_261": "S-BLAST91",
 	"MAIN_200": "ノヴァブラスター",
@@ -16,10 +18,12 @@
 	"MAIN_205": "オーダーブラスター レプリカ",
 	"MAIN_1120": "フィンセント",
 	"MAIN_1121": "フィンセント・ヒュー",
+	"MAIN_1122": "フィンセントBRNZ",
 	"MAIN_1100": "パブロ",
 	"MAIN_1101": "パブロ・ヒュー",
 	"MAIN_1110": "ホクサイ",
 	"MAIN_1111": "ホクサイ・ヒュー",
+	"MAIN_1112": "ホクサイ彗",
 	"MAIN_1115": "オーダーブラシ レプリカ",
 	"MAIN_2060": "ソイチューバー",
 	"MAIN_2061": "ソイチューバーカスタム",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "リッター4Kカスタム",
 	"MAIN_2020": "スプラスコープ",
 	"MAIN_2021": "スプラスコープコラボ",
+	"MAIN_2022": "スプラスコープFRST",
 	"MAIN_2010": "スプラチャージャー",
 	"MAIN_2011": "スプラチャージャーコラボ",
+	"MAIN_2012": "スプラチャージャーFRST",
 	"MAIN_2015": "オーダーチャージャー レプリカ",
 	"MAIN_2070": "R-PEN/5H",
 	"MAIN_2071": "R-PEN/5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "スクイックリンβ",
 	"MAIN_5030": "デュアルスイーパー",
 	"MAIN_5031": "デュアルスイーパーカスタム",
+	"MAIN_5032": "デュアルスイーパー蹄",
 	"MAIN_5020": "ケルビン525",
 	"MAIN_5021": "ケルビン525デコ",
 	"MAIN_5050": "ガエンFF",
 	"MAIN_5051": "ガエンFFカスタム",
 	"MAIN_5010": "スプラマニューバー",
 	"MAIN_5011": "スプラマニューバーコラボ",
+	"MAIN_5012": "スプラマニューバー耀",
 	"MAIN_5015": "オーダーマニューバー レプリカ",
 	"MAIN_5000": "スパッタリー",
 	"MAIN_5001": "スパッタリー・ヒュー",
+	"MAIN_5002": "スパッタリーOWL",
 	"MAIN_5040": "クアッドホッパーブラック",
 	"MAIN_5041": "クアッドホッパーホワイト",
 	"MAIN_1000": "カーボンローラー",
 	"MAIN_1001": "カーボンローラーデコ",
+	"MAIN_1002": "カーボンローラーANGL",
 	"MAIN_1020": "ダイナモローラー",
 	"MAIN_1021": "ダイナモローラーテスラ",
+	"MAIN_1022": "ダイナモローラー冥",
 	"MAIN_1030": "ヴァリアブルローラー",
 	"MAIN_1031": "ヴァリアブルローラーフォイル",
 	"MAIN_1010": "スプラローラー",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "オーダーローラー レプリカ",
 	"MAIN_1040": "ワイドローラー",
 	"MAIN_1041": "ワイドローラーコラボ",
+	"MAIN_1042": "ワイドローラー惑",
 	"MAIN_8020": "デンタルワイパーミント",
 	"MAIN_8021": "デンタルワイパースミ",
 	"MAIN_8010": "ドライブワイパー",
 	"MAIN_8011": "ドライブワイパーデコ",
+	"MAIN_8012": "ドライブワイパーRUST",
 	"MAIN_8000": "ジムワイパー",
 	"MAIN_8001": "ジムワイパー・ヒュー",
+	"MAIN_8002": "ジムワイパー封",
 	"MAIN_8005": "オーダーワイパー レプリカ",
 	"MAIN_6020": "スパイガジェット",
 	"MAIN_6021": "スパイガジェットソレーラ",
+	"MAIN_6022": "スパイガジェット繚",
 	"MAIN_6030": "24式張替傘・甲",
 	"MAIN_6031": "24式張替傘・乙",
 	"MAIN_6000": "パラシェルター",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "オーダーシェルター レプリカ",
 	"MAIN_6010": "キャンピングシェルター",
 	"MAIN_6011": "キャンピングシェルターソレーラ",
+	"MAIN_6012": "キャンピングシェルターCREM",
 	"MAIN_30": "プロモデラーMG",
 	"MAIN_31": "プロモデラーRG",
+	"MAIN_32": "プロモデラー彩",
 	"MAIN_70": "プライムシューター",
 	"MAIN_71": "プライムシューターコラボ",
+	"MAIN_72": "プライムシューターFRZN",
 	"MAIN_10": "わかばシューター",
 	"MAIN_11": "もみじシューター",
 	"MAIN_400": "ボトルガイザー",
@@ -90,15 +108,19 @@
 	"MAIN_51": ".52ガロンデコ",
 	"MAIN_80": ".96ガロン",
 	"MAIN_81": ".96ガロンデコ",
+	"MAIN_82": ".96ガロン爪",
 	"MAIN_90": "ジェットスイーパー",
 	"MAIN_91": "ジェットスイーパーカスタム",
+	"MAIN_92": "ジェットスイーパーCOBR",
 	"MAIN_40": "スプラシューター",
 	"MAIN_41": "スプラシューターコラボ",
+	"MAIN_42": "スプラシューター煌",
 	"MAIN_45": "ヒーローシューター レプリカ",
 	"MAIN_47": "オーダーシューター レプリカ",
 	"MAIN_46": "オクタシューター レプリカ",
 	"MAIN_20": "シャープマーカー",
 	"MAIN_21": "シャープマーカーネオ",
+	"MAIN_22": "シャープマーカーGECK",
 	"MAIN_100": "スペースシューター",
 	"MAIN_101": "スペースシューターコラボ",
 	"MAIN_60": "N-ZAP85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "ボールドマーカーネオ",
 	"MAIN_310": "H3リールガン",
 	"MAIN_311": "H3リールガンD",
+	"MAIN_312": "H3リールガンSNAK",
 	"MAIN_300": "L3リールガン",
 	"MAIN_301": "L3リールガンD",
+	"MAIN_302": "L3リールガン箔",
 	"MAIN_3030": "オーバーフロッシャー",
 	"MAIN_3031": "オーバーフロッシャーデコ",
 	"MAIN_3010": "ヒッセン",
 	"MAIN_3011": "ヒッセン・ヒュー",
+	"MAIN_3012": "ヒッセンASH",
 	"MAIN_3050": "モップリン",
 	"MAIN_3051": "モップリンD",
+	"MAIN_3052": "モップリン角",
 	"MAIN_3020": "スクリュースロッシャー",
 	"MAIN_3021": "スクリュースロッシャーネオ",
 	"MAIN_3000": "バケットスロッシャー",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "イグザミナー・ヒュー",
 	"MAIN_4020": "ハイドラント",
 	"MAIN_4021": "ハイドラントカスタム",
+	"MAIN_4022": "ハイドラント圧",
 	"MAIN_4000": "スプラスピナー",
 	"MAIN_4001": "スプラスピナーコラボ",
+	"MAIN_4002": "スプラスピナーPYTN",
 	"MAIN_4040": "ノーチラス47",
 	"MAIN_4041": "ノーチラス79",
 	"MAIN_4010": "バレルスピナー",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "フルイドVカスタム",
 	"MAIN_7010": "トライストリンガー",
 	"MAIN_7011": "トライストリンガーコラボ",
+	"MAIN_7012": "トライストリンガー燈",
 	"MAIN_7015": "オーダーストリンガー レプリカ",
 	"MAIN_7020": "LACT-450",
 	"MAIN_7021": "LACT-450デコ",
+	"MAIN_7022": "LACT-450MILK",
 	"SUB_8": "ジャンプビーコン",
 	"SUB_6": "カーリングボム",
 	"SUB_5": "タンサンボム",
diff --git a/locales/ko/game-misc.json b/locales/ko/game-misc.json
index 87e2403a9..c48c59801 100644
--- a/locales/ko/game-misc.json
+++ b/locales/ko/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "수랑정",
 	"STAGE_22": "청새치 공항",
 	"STAGE_23": "용궁 터미널",
+	"STAGE_24": "데카 라인 고가 밑",
 	"ABILITY_ISM": "잉크 효율 업(메인)",
 	"ABILITY_ISS": "잉크 효율 업(서브)",
 	"ABILITY_IRU": "잉크 회복력 업",
diff --git a/locales/ko/weapons.json b/locales/ko/weapons.json
index 610613f8a..8816eddf3 100644
--- a/locales/ko/weapons.json
+++ b/locales/ko/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "R 블래스터 엘리트",
 	"MAIN_251": "R 블래스터 엘리트 데코",
+	"MAIN_252": "R 블래스터 엘리트 WNTR",
 	"MAIN_230": "크래시 블래스터",
 	"MAIN_231": "네오 크래시 블래스터",
 	"MAIN_240": "래피드 블래스터",
@@ -9,6 +10,7 @@
 	"MAIN_221": "커스텀 롱 블래스터",
 	"MAIN_210": "핫 블래스터",
 	"MAIN_211": "커스텀 핫 블래스터",
+	"MAIN_212": "글림 핫 블래스터",
 	"MAIN_260": "S-BLAST92",
 	"MAIN_261": "S-BLAST91",
 	"MAIN_200": "노바 블래스터",
@@ -16,10 +18,12 @@
 	"MAIN_205": "오더 블래스터 레플리카",
 	"MAIN_1120": "빈센트",
 	"MAIN_1121": "빈센트 휴",
+	"MAIN_1122": "빈센트 BRNZ",
 	"MAIN_1100": "파블로",
 	"MAIN_1101": "파블로 휴",
 	"MAIN_1110": "호쿠사이",
 	"MAIN_1111": "호쿠사이 휴",
+	"MAIN_1112": "코메트 호쿠사이",
 	"MAIN_1115": "오더 브러시 레플리카",
 	"MAIN_2060": "소이 튜버",
 	"MAIN_2061": "커스텀 소이 튜버",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "커스텀 리터 4K",
 	"MAIN_2020": "스플랫 스코프",
 	"MAIN_2021": "스플랫 스코프 컬래버",
+	"MAIN_2022": "스플랫 스코프 FRST",
 	"MAIN_2010": "스플랫 차저",
 	"MAIN_2011": "스플랫 차저 컬래버",
+	"MAIN_2012": "스플랫 차저 FRST",
 	"MAIN_2015": "오더 차저 레플리카",
 	"MAIN_2070": "R-PEN/5H",
 	"MAIN_2071": "R-PEN/5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "스퀵 클린 β",
 	"MAIN_5030": "듀얼 스위퍼",
 	"MAIN_5031": "커스텀 듀얼 스위퍼",
+	"MAIN_5032": "후프 듀얼 스위퍼",
 	"MAIN_5020": "켈빈 525",
 	"MAIN_5021": "켈빈 525 데코",
 	"MAIN_5050": "소방 FF",
 	"MAIN_5051": "커스텀 소방 FF",
 	"MAIN_5010": "스플랫 머누버",
 	"MAIN_5011": "스플랫 머누버 컬래버",
+	"MAIN_5012": "트윙클 스플랫 머누버",
 	"MAIN_5015": "오더 머누버 레플리카",
 	"MAIN_5000": "스퍼터리",
 	"MAIN_5001": "스퍼터리 휴",
+	"MAIN_5002": "스퍼터리 OWL",
 	"MAIN_5040": "블랙 쿼드 호퍼",
 	"MAIN_5041": "화이트 쿼드 호퍼",
 	"MAIN_1000": "카본 롤러",
 	"MAIN_1001": "카본 롤러 데코",
+	"MAIN_1002": "카본 롤러 ANGL",
 	"MAIN_1020": "다이너모 롤러",
 	"MAIN_1021": "골드 다이너모 롤러",
+	"MAIN_1022": "스타 다이너모 롤러",
 	"MAIN_1030": "베리어블 롤러",
 	"MAIN_1031": "포일 베리어블 롤러",
 	"MAIN_1010": "스플랫 롤러",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "오더 롤러 레플리카",
 	"MAIN_1040": "와이드 롤러",
 	"MAIN_1041": "와이드 롤러 컬래버",
+	"MAIN_1042": "플래닛 와이드 롤러",
 	"MAIN_8020": "민트 덴탈 와이퍼",
 	"MAIN_8021": "잉크 덴탈 와이퍼",
 	"MAIN_8010": "드라이브 와이퍼",
 	"MAIN_8011": "드라이브 와이퍼 데코",
+	"MAIN_8012": "드라이브 와이퍼 RUST",
 	"MAIN_8000": "사무 와이퍼",
 	"MAIN_8001": "사무 와이퍼 휴",
+	"MAIN_8002": "스티커 사무 와이퍼",
 	"MAIN_8005": "오더 와이퍼 레플리카",
 	"MAIN_6020": "스파이 가젯",
 	"MAIN_6021": "스파이 가젯 소렐라",
+	"MAIN_6022": "패턴 스파이 가젯",
 	"MAIN_6030": "24식 도돌이 우산 갑",
 	"MAIN_6031": "24식 도돌이 우산 을",
 	"MAIN_6000": "파라 셸터",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "오더 셸터 레플리카",
 	"MAIN_6010": "캠핑 셸터",
 	"MAIN_6011": "캠핑 셸터 소렐라",
+	"MAIN_6012": "캠핑 셸터 CREM",
 	"MAIN_30": "프로모델러 MG",
 	"MAIN_31": "프로모델러 RG",
+	"MAIN_32": "컬러 프로모델러",
 	"MAIN_70": "프라임 슈터",
 	"MAIN_71": "프라임 슈터 컬래버",
+	"MAIN_72": "프라임 슈터 FRZN",
 	"MAIN_10": "새싹 슈터",
 	"MAIN_11": "단풍 슈터",
 	"MAIN_400": "보틀 가이저",
@@ -90,15 +108,19 @@
 	"MAIN_51": ".52 갤런 데코",
 	"MAIN_80": ".96 갤런",
 	"MAIN_81": ".96 갤런 데코",
+	"MAIN_82": "클로 .96 갤런",
 	"MAIN_90": "제트 스위퍼",
 	"MAIN_91": "커스텀 제트 스위퍼",
+	"MAIN_92": "제트 스위퍼 COBR",
 	"MAIN_40": "스플랫 슈터",
 	"MAIN_41": "스플랫 슈터 컬래버",
+	"MAIN_42": "글램 스플랫 슈터",
 	"MAIN_45": "히어로 슈터 레플리카",
 	"MAIN_47": "오더 슈터 레플리카",
 	"MAIN_46": "옥타 슈터 레플리카",
 	"MAIN_20": "샤프 마커",
 	"MAIN_21": "네오 샤프 마커",
+	"MAIN_22": "샤프 마커 GECK",
 	"MAIN_100": "스페이스 슈터",
 	"MAIN_101": "스페이스 슈터 컬래버",
 	"MAIN_60": "N-ZAP85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "네오 볼드 마커",
 	"MAIN_310": "H3 릴 건",
 	"MAIN_311": "H3 릴 건 D",
+	"MAIN_312": "H3 릴 건 SNAK",
 	"MAIN_300": "L3 릴 건",
 	"MAIN_301": "L3 릴 건 D",
+	"MAIN_302": "글리터 L3 릴 건",
 	"MAIN_3030": "오버플로셔",
 	"MAIN_3031": "오버플로셔 데코",
 	"MAIN_3010": "물통",
 	"MAIN_3011": "물통 휴",
+	"MAIN_3012": "물통 ASH",
 	"MAIN_3050": "몹 링",
 	"MAIN_3051": "몹 링 D",
+	"MAIN_3052": "혼 몹 링",
 	"MAIN_3020": "스크루 슬로셔",
 	"MAIN_3021": "네오 스크루 슬로셔",
 	"MAIN_3000": "버킷 슬로셔",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "이그재미너 휴",
 	"MAIN_4020": "하이드런트",
 	"MAIN_4021": "커스텀 하이드런트",
+	"MAIN_4022": "토렌트 하이드런트",
 	"MAIN_4000": "스플랫 스피너",
 	"MAIN_4001": "스플랫 스피너 컬래버",
+	"MAIN_4002": "스플랫 스피너 PYTN",
 	"MAIN_4040": "노틸러스 47",
 	"MAIN_4041": "노틸러스 79",
 	"MAIN_4010": "배럴 스피너",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "커스텀 플루이드 V",
 	"MAIN_7010": "트라이 스트링거",
 	"MAIN_7011": "트라이 스트링거 컬래버",
+	"MAIN_7012": "벌브 트라이 스트링거",
 	"MAIN_7015": "오더 스트링거 레플리카",
 	"MAIN_7020": "LACT-450",
 	"MAIN_7021": "LACT-450 데코",
+	"MAIN_7022": "LACT-450 MILK",
 	"SUB_8": "점프 비컨",
 	"SUB_6": "컬링 밤",
 	"SUB_5": "탄산 밤",
diff --git a/locales/nl/game-misc.json b/locales/nl/game-misc.json
index 7882c71cd..32b8a0fec 100644
--- a/locales/nl/game-misc.json
+++ b/locales/nl/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "Bami-Byte",
 	"STAGE_22": "Trekvis Airport",
 	"STAGE_23": "Lemurië Centraal",
+	"STAGE_24": "Knooppunt Kabeljauw",
 	"ABILITY_ISM": "Hoofdspaarder",
 	"ABILITY_ISS": "Subspaarder",
 	"ABILITY_IRU": "Inktvulling",
diff --git a/locales/nl/weapons.json b/locales/nl/weapons.json
index cbc7de8c9..75e783b1a 100644
--- a/locales/nl/weapons.json
+++ b/locales/nl/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Flitsblaster Pro",
 	"MAIN_251": "Flitsblaster Pro Deco",
+	"MAIN_252": "Flitsblaster Pro WNT-R",
 	"MAIN_230": "Knalblaster",
 	"MAIN_231": "Knalblaster Neo",
 	"MAIN_240": "Flitsblaster",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Gemodde Teleblaster",
 	"MAIN_210": "Klodderblaster",
 	"MAIN_211": "Gemodde Klodderblaster",
+	"MAIN_212": "Klodderblaster Schÿn",
 	"MAIN_260": "S-BLAST '92",
 	"MAIN_261": "S-BLAST '91",
 	"MAIN_200": "Lunablaster",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Ordeblaster (replica)",
 	"MAIN_1120": "Kwistkwast",
 	"MAIN_1121": "Kwistkwast Nouveau",
+	"MAIN_1122": "Kwistkwast BRN-S",
 	"MAIN_1100": "Inktkwast",
 	"MAIN_1101": "Inktkwast Nouveau",
 	"MAIN_1110": "Octokwast",
 	"MAIN_1111": "Octokwast Nouveau",
+	"MAIN_1112": "Octokwast Kösmös",
 	"MAIN_1115": "Ordekwast (replica)",
 	"MAIN_2060": "Spetbuizer",
 	"MAIN_2061": "Gemodde Spetbuizer",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "Gemodde E-liter 4K",
 	"MAIN_2020": "Schelpschutter",
 	"MAIN_2021": "Zekkofin Schelpschutter",
+	"MAIN_2022": "Schelpschutter CAM-O",
 	"MAIN_2010": "Bloplader",
 	"MAIN_2011": "Zekkofin Bloplader",
+	"MAIN_2012": "Bloplader CAM-O",
 	"MAIN_2015": "Ordelader (replica)",
 	"MAIN_2070": "Schotlood 5H",
 	"MAIN_2071": "Schotlood 5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "Octopoets Ultra",
 	"MAIN_5030": "Dubbelplonzers",
 	"MAIN_5031": "Gemodde Dubbelplonzers",
+	"MAIN_5032": "Dubbelplonzers Zëbra",
 	"MAIN_5020": "Kelvin 525",
 	"MAIN_5021": "Kelvin 525 Deco",
 	"MAIN_5050": "Blusknallers BW",
 	"MAIN_5051": "Gemodde Blusknallers BW",
 	"MAIN_5010": "Dubbelknallers",
 	"MAIN_5011": "Enperry Dubbelknallers",
+	"MAIN_5012": "Dubbelknallers Fönkel",
 	"MAIN_5015": "Ordeknallers (replica)",
 	"MAIN_5000": "Dubbelspatters",
 	"MAIN_5001": "Dubbelspatters Nouveau",
+	"MAIN_5002": "Dubbelspatters VLR-M",
 	"MAIN_5040": "Quadhoppers Zwart",
 	"MAIN_5041": "Quadhoppers Wit",
 	"MAIN_1000": "Carbonroller",
 	"MAIN_1001": "Carbonroller Deco",
+	"MAIN_1002": "Carbonroller HNG-L",
 	"MAIN_1020": "Dynamoroller",
 	"MAIN_1021": "Gouden Dynamoroller",
+	"MAIN_1022": "Dynamoroller Aströ",
 	"MAIN_1030": "Flexroller",
 	"MAIN_1031": "Foil Flexroller",
 	"MAIN_1010": "Klodderroller",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Orderoller (replica)",
 	"MAIN_1040": "Breedroller",
 	"MAIN_1041": "Breedroller Impuls",
+	"MAIN_1042": "Breedroller Fütür",
 	"MAIN_8020": "Schrobbehak PM",
 	"MAIN_8021": "Schrobbehak HK",
 	"MAIN_8010": "Wisserbladzwieper",
 	"MAIN_8011": "Wisserbladzwieper Deco",
+	"MAIN_8012": "Wisserbladzwieper O-XID",
 	"MAIN_8000": "Stempelzwieper",
 	"MAIN_8001": "Stempelzwieper Nouveau",
+	"MAIN_8002": "Stempelzwieper Pläkkerz",
 	"MAIN_8005": "Ordezwieper (replica)",
 	"MAIN_6020": "Paraplenzer",
 	"MAIN_6021": "Sorella Paraplenzer",
+	"MAIN_6022": "Paraplenzer Fräppant",
 	"MAIN_6030": "Protoplenzer 24-I",
 	"MAIN_6031": "Protoplenzer 24-II",
 	"MAIN_6000": "Plenzer",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Ordeplenzer (replica)",
 	"MAIN_6010": "Kampeerplenzer",
 	"MAIN_6011": "Sorella Kampeerplenzer",
+	"MAIN_6012": "Kampeerplenzer CRE-M",
 	"MAIN_30": "Kladderwerper",
 	"MAIN_31": "Kladderwerper Pro",
+	"MAIN_32": "Kladderwerper Bönt",
 	"MAIN_70": "Superspetter Pro",
 	"MAIN_71": "Forge Superspetter Pro",
+	"MAIN_72": "Superspetter Pro BIB-R",
 	"MAIN_10": "Superspetter jr.",
 	"MAIN_11": "Gemodde Superspetter jr.",
 	"MAIN_400": "Floeper",
@@ -90,15 +108,19 @@
 	"MAIN_51": ".52 Kaliter Deco",
 	"MAIN_80": ".96 Kaliter",
 	"MAIN_81": ".96 Kaliter Deco",
+	"MAIN_82": ".96 Kaliter Pänter",
 	"MAIN_90": "Straalplonzer",
 	"MAIN_91": "Gemodde Straalplonzer",
+	"MAIN_92": "Straalplonzer COB-R",
 	"MAIN_40": "Superspetter",
 	"MAIN_41": "Tentatek Superspetter",
+	"MAIN_42": "Superspetter Glänz",
 	"MAIN_45": "Heldenspetter (replica)",
 	"MAIN_47": "Ordespetter (replica)",
 	"MAIN_46": "Octospetter (replica)",
 	"MAIN_20": "Spetterspuit",
 	"MAIN_21": "Spetterspuit Neo",
+	"MAIN_22": "Spetterspuit GKK-O",
 	"MAIN_100": "Superspetter Nova",
 	"MAIN_101": "Annaki Superspetter Nova",
 	"MAIN_60": "N-ZAP '85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Spettertuit Neo",
 	"MAIN_310": "H-3 Langsnuit",
 	"MAIN_311": "H-3 Langsnuit D",
+	"MAIN_312": "H-3 Langsnuit ANC-D",
 	"MAIN_300": "L-3 Stompsnuit",
 	"MAIN_301": "L-3 Stompsnuit D",
+	"MAIN_302": "L-3 Stompsnuit Spränkel",
 	"MAIN_3030": "Spatkuip",
 	"MAIN_3031": "Spatkuip Deco",
 	"MAIN_3010": "Triomorser",
 	"MAIN_3011": "Triomorser Nouveau",
+	"MAIN_3012": "Triomorser GRW-G",
 	"MAIN_3050": "Wringmorser",
 	"MAIN_3051": "Wringmorser D",
+	"MAIN_3052": "Wringmorser Hörnz",
 	"MAIN_3020": "Klotstrommel",
 	"MAIN_3021": "Klotstrommel Neo",
 	"MAIN_3000": "Morser",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Examinator Nouveau",
 	"MAIN_4020": "Blusling",
 	"MAIN_4021": "Gemodde Blusling",
+	"MAIN_4022": "Blusling Störtvlud",
 	"MAIN_4000": "Mini-Spetling",
 	"MAIN_4001": "Zink Mini-Spetling",
+	"MAIN_4002": "Mini-Spetling PYT-N",
 	"MAIN_4040": "Nautilus 47",
 	"MAIN_4041": "Nautilus 79",
 	"MAIN_4010": "Spetling",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Gemodde Pentapomper",
 	"MAIN_7010": "Triospanner",
 	"MAIN_7011": "Inkline Triospanner",
+	"MAIN_7012": "Triospanner Lüminus",
 	"MAIN_7015": "Ordespanner (replica)",
 	"MAIN_7020": "RIF-LEX 450",
 	"MAIN_7021": "RIF-LEX 450 Deco",
+	"MAIN_7022": "RIF-LEX 450 MEL-K",
 	"SUB_8": "Springschotel",
 	"SUB_6": "Curlingbom",
 	"SUB_5": "Bomblikje",
diff --git a/locales/pl/game-misc.json b/locales/pl/game-misc.json
index 24db3d21e..ab07b7e5c 100644
--- a/locales/pl/game-misc.json
+++ b/locales/pl/game-misc.json
@@ -22,7 +22,8 @@
 	"STAGE_20": "Bluefin Depot",
 	"STAGE_21": "Robo ROM-en",
 	"STAGE_22": "Marlin Airport",
-	"STAGE_23": "",
+	"STAGE_23": "Lemuria Hub",
+	"STAGE_24": "Urchin Underpass",
 	"ABILITY_ISM": "Ink Saver (Main)",
 	"ABILITY_ISS": "Ink Saver (Sub)",
 	"ABILITY_IRU": "Ink Recovery Up",
diff --git a/locales/pl/weapons.json b/locales/pl/weapons.json
index 699a80764..46b6b52f7 100644
--- a/locales/pl/weapons.json
+++ b/locales/pl/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Rapid Blaster Pro",
 	"MAIN_251": "Rapid Blaster Pro Deco",
+	"MAIN_252": "Rapid Blaster Pro WNT-R",
 	"MAIN_230": "Clash Blaster",
 	"MAIN_231": "Clash Blaster Neo",
 	"MAIN_240": "Rapid Blaster",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Custom Range Blaster",
 	"MAIN_210": "Blaster",
 	"MAIN_211": "Custom Blaster",
+	"MAIN_212": "Gleamz Blaster",
 	"MAIN_260": "S-BLAST '92",
 	"MAIN_261": "S-BLAST '91",
 	"MAIN_200": "Luna Blaster",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Order Blaster Replica",
 	"MAIN_1120": "Painbrush",
 	"MAIN_1121": "Painbrush Nouveau",
+	"MAIN_1122": "Painbrush BRN-Z",
 	"MAIN_1100": "Inkbrush",
 	"MAIN_1101": "Inkbrush Nouveau",
 	"MAIN_1110": "Octobrush",
 	"MAIN_1111": "Octobrush Nouveau",
+	"MAIN_1112": "Cometz Octobrush",
 	"MAIN_1115": "Orderbrush Replica",
 	"MAIN_2060": "Goo Tuber",
 	"MAIN_2061": "Custom Goo Tuber",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "Custom E-liter 4K",
 	"MAIN_2020": "Splatterscope",
 	"MAIN_2021": "Z+F Splatterscope",
+	"MAIN_2022": "Splatterscope CAM-O",
 	"MAIN_2010": "Splat Charger",
 	"MAIN_2011": "Z+F Splat Charger",
+	"MAIN_2012": "Splat Charger CAM-O",
 	"MAIN_2015": "Order Charger Replica",
 	"MAIN_2070": "Snipewriter 5H",
 	"MAIN_2071": "Snipewriter 5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "New Squiffer",
 	"MAIN_5030": "Dualie Squelchers",
 	"MAIN_5031": "Custom Dualie Squelchers",
+	"MAIN_5032": "Hoofz Dualie Squelchers",
 	"MAIN_5020": "Glooga Dualies",
 	"MAIN_5021": "Glooga Dualies Deco",
 	"MAIN_5050": "Douser Dualies FF",
 	"MAIN_5051": "Custom Douser Dualies FF",
 	"MAIN_5010": "Splat Dualies",
 	"MAIN_5011": "Enperry Splat Dualies",
+	"MAIN_5012": "Twinklez Splat Dualies",
 	"MAIN_5015": "Order Dualie Replicas",
 	"MAIN_5000": "Dapple Dualies",
 	"MAIN_5001": "Dapple Dualies Nouveau",
+	"MAIN_5002": "Dapple Dualies NOC-T",
 	"MAIN_5040": "Dark Tetra Dualies",
 	"MAIN_5041": "Light Tetra Dualies",
 	"MAIN_1000": "Carbon Roller",
 	"MAIN_1001": "Carbon Roller Deco",
+	"MAIN_1002": "Carbon Roller ANG-L",
 	"MAIN_1020": "Dynamo Roller",
 	"MAIN_1021": "Gold Dynamo Roller",
+	"MAIN_1022": "Starz Dynamo Roller",
 	"MAIN_1030": "Flingza Roller",
 	"MAIN_1031": "Foil Flingza Roller",
 	"MAIN_1010": "Splat Roller",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Order Roller Replica",
 	"MAIN_1040": "Big Swig Roller",
 	"MAIN_1041": "Big Swig Roller Express",
+	"MAIN_1042": "Planetz Big Swig Roller",
 	"MAIN_8020": "Mint Decavitator",
 	"MAIN_8021": "Charcoal Decavitator",
 	"MAIN_8010": "Splatana Wiper",
 	"MAIN_8011": "Splatana Wiper Deco",
+	"MAIN_8012": "Splatana Wiper RUS-T",
 	"MAIN_8000": "Splatana Stamper",
 	"MAIN_8001": "Splatana Stamper Nouveau",
+	"MAIN_8002": "Stickerz Splatana Stamper",
 	"MAIN_8005": "Order Splatana Replica",
 	"MAIN_6020": "Undercover Brella",
 	"MAIN_6021": "Undercover Sorella Brella",
+	"MAIN_6022": "Patternz Undercover Brella",
 	"MAIN_6030": "Recycled Brella 24 Mk I",
 	"MAIN_6031": "Recycled Brella 24 Mk II",
 	"MAIN_6000": "Splat Brella",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Order Brella Replica",
 	"MAIN_6010": "Tenta Brella",
 	"MAIN_6011": "Tenta Sorella Brella",
+	"MAIN_6012": "Tenta Brella CRE-M",
 	"MAIN_30": "Aerospray MG",
 	"MAIN_31": "Aerospray RG",
+	"MAIN_32": "Colorz Aerospray",
 	"MAIN_70": "Splattershot Pro",
 	"MAIN_71": "Forge Splattershot Pro",
+	"MAIN_72": "Splattershot Pro FRZ-N",
 	"MAIN_10": "Splattershot Jr.",
 	"MAIN_11": "Custom Splattershot Jr.",
 	"MAIN_400": "Squeezer",
@@ -90,15 +108,19 @@
 	"MAIN_51": ".52 Gal Deco",
 	"MAIN_80": ".96 Gal",
 	"MAIN_81": ".96 Gal Deco",
+	"MAIN_82": "Clawz .96 Gal",
 	"MAIN_90": "Jet Squelcher",
 	"MAIN_91": "Custom Jet Squelcher",
+	"MAIN_92": "Jet Squelcher COB-R",
 	"MAIN_40": "Splattershot",
 	"MAIN_41": "Tentatek Splattershot",
+	"MAIN_42": "Glamorz Splattershot",
 	"MAIN_45": "Hero Shot Replica",
 	"MAIN_47": "Order Shot Replica",
 	"MAIN_46": "Octo Shot Replica",
 	"MAIN_20": "Splash-o-matic",
 	"MAIN_21": "Neo Splash-o-matic",
+	"MAIN_22": "Splash-o-matic GCK-O",
 	"MAIN_100": "Splattershot Nova",
 	"MAIN_101": "Annaki Splattershot Nova",
 	"MAIN_60": "N-ZAP '85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Neo Sploosh-o-matic",
 	"MAIN_310": "H-3 Nozzlenose",
 	"MAIN_311": "H-3 Nozzlenose D",
+	"MAIN_312": "H-3 Nozzlenose VIP-R",
 	"MAIN_300": "L-3 Nozzlenose",
 	"MAIN_301": "L-3 Nozzlenose D",
+	"MAIN_302": "Glitterz L-3 Nozzlenose",
 	"MAIN_3030": "Bloblobber",
 	"MAIN_3031": "Bloblobber Deco",
 	"MAIN_3010": "Tri-Slosher",
 	"MAIN_3011": "Tri-Slosher Nouveau",
+	"MAIN_3012": "Tri-Slosher ASH-N",
 	"MAIN_3050": "Dread Wringer",
 	"MAIN_3051": "Dread Wringer D",
+	"MAIN_3052": "Hornz Dread Wringer",
 	"MAIN_3020": "Sloshing Machine",
 	"MAIN_3021": "Sloshing Machine Neo",
 	"MAIN_3000": "Slosher",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Heavy Edit Splatling Nouveau",
 	"MAIN_4020": "Hydra Splatling",
 	"MAIN_4021": "Custom Hydra Splatling",
+	"MAIN_4022": "Torrentz Hydra Splatling",
 	"MAIN_4000": "Mini Splatling",
 	"MAIN_4001": "Zink Mini Splatling",
+	"MAIN_4002": "Mini Splatling RTL-R",
 	"MAIN_4040": "Nautilus 47",
 	"MAIN_4041": "Nautilus 79",
 	"MAIN_4010": "Heavy Splatling",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Custom Wellstring V",
 	"MAIN_7010": "Tri-Stringer",
 	"MAIN_7011": "Inkline Tri-Stringer",
+	"MAIN_7012": "Bulbz Tri-Stringer",
 	"MAIN_7015": "Order Stringer Replica",
 	"MAIN_7020": "REEF-LUX 450",
 	"MAIN_7021": "REEF-LUX 450 Deco",
+	"MAIN_7022": "REEF-LUX 450 MIL-K",
 	"SUB_8": "Squid Beakon",
 	"SUB_6": "Curling Bomb",
 	"SUB_5": "Fizzy Bomb",
diff --git a/locales/pt-BR/game-misc.json b/locales/pt-BR/game-misc.json
index 24db3d21e..ab07b7e5c 100644
--- a/locales/pt-BR/game-misc.json
+++ b/locales/pt-BR/game-misc.json
@@ -22,7 +22,8 @@
 	"STAGE_20": "Bluefin Depot",
 	"STAGE_21": "Robo ROM-en",
 	"STAGE_22": "Marlin Airport",
-	"STAGE_23": "",
+	"STAGE_23": "Lemuria Hub",
+	"STAGE_24": "Urchin Underpass",
 	"ABILITY_ISM": "Ink Saver (Main)",
 	"ABILITY_ISS": "Ink Saver (Sub)",
 	"ABILITY_IRU": "Ink Recovery Up",
diff --git a/locales/pt-BR/weapons.json b/locales/pt-BR/weapons.json
index 699a80764..46b6b52f7 100644
--- a/locales/pt-BR/weapons.json
+++ b/locales/pt-BR/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Rapid Blaster Pro",
 	"MAIN_251": "Rapid Blaster Pro Deco",
+	"MAIN_252": "Rapid Blaster Pro WNT-R",
 	"MAIN_230": "Clash Blaster",
 	"MAIN_231": "Clash Blaster Neo",
 	"MAIN_240": "Rapid Blaster",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Custom Range Blaster",
 	"MAIN_210": "Blaster",
 	"MAIN_211": "Custom Blaster",
+	"MAIN_212": "Gleamz Blaster",
 	"MAIN_260": "S-BLAST '92",
 	"MAIN_261": "S-BLAST '91",
 	"MAIN_200": "Luna Blaster",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Order Blaster Replica",
 	"MAIN_1120": "Painbrush",
 	"MAIN_1121": "Painbrush Nouveau",
+	"MAIN_1122": "Painbrush BRN-Z",
 	"MAIN_1100": "Inkbrush",
 	"MAIN_1101": "Inkbrush Nouveau",
 	"MAIN_1110": "Octobrush",
 	"MAIN_1111": "Octobrush Nouveau",
+	"MAIN_1112": "Cometz Octobrush",
 	"MAIN_1115": "Orderbrush Replica",
 	"MAIN_2060": "Goo Tuber",
 	"MAIN_2061": "Custom Goo Tuber",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "Custom E-liter 4K",
 	"MAIN_2020": "Splatterscope",
 	"MAIN_2021": "Z+F Splatterscope",
+	"MAIN_2022": "Splatterscope CAM-O",
 	"MAIN_2010": "Splat Charger",
 	"MAIN_2011": "Z+F Splat Charger",
+	"MAIN_2012": "Splat Charger CAM-O",
 	"MAIN_2015": "Order Charger Replica",
 	"MAIN_2070": "Snipewriter 5H",
 	"MAIN_2071": "Snipewriter 5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "New Squiffer",
 	"MAIN_5030": "Dualie Squelchers",
 	"MAIN_5031": "Custom Dualie Squelchers",
+	"MAIN_5032": "Hoofz Dualie Squelchers",
 	"MAIN_5020": "Glooga Dualies",
 	"MAIN_5021": "Glooga Dualies Deco",
 	"MAIN_5050": "Douser Dualies FF",
 	"MAIN_5051": "Custom Douser Dualies FF",
 	"MAIN_5010": "Splat Dualies",
 	"MAIN_5011": "Enperry Splat Dualies",
+	"MAIN_5012": "Twinklez Splat Dualies",
 	"MAIN_5015": "Order Dualie Replicas",
 	"MAIN_5000": "Dapple Dualies",
 	"MAIN_5001": "Dapple Dualies Nouveau",
+	"MAIN_5002": "Dapple Dualies NOC-T",
 	"MAIN_5040": "Dark Tetra Dualies",
 	"MAIN_5041": "Light Tetra Dualies",
 	"MAIN_1000": "Carbon Roller",
 	"MAIN_1001": "Carbon Roller Deco",
+	"MAIN_1002": "Carbon Roller ANG-L",
 	"MAIN_1020": "Dynamo Roller",
 	"MAIN_1021": "Gold Dynamo Roller",
+	"MAIN_1022": "Starz Dynamo Roller",
 	"MAIN_1030": "Flingza Roller",
 	"MAIN_1031": "Foil Flingza Roller",
 	"MAIN_1010": "Splat Roller",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Order Roller Replica",
 	"MAIN_1040": "Big Swig Roller",
 	"MAIN_1041": "Big Swig Roller Express",
+	"MAIN_1042": "Planetz Big Swig Roller",
 	"MAIN_8020": "Mint Decavitator",
 	"MAIN_8021": "Charcoal Decavitator",
 	"MAIN_8010": "Splatana Wiper",
 	"MAIN_8011": "Splatana Wiper Deco",
+	"MAIN_8012": "Splatana Wiper RUS-T",
 	"MAIN_8000": "Splatana Stamper",
 	"MAIN_8001": "Splatana Stamper Nouveau",
+	"MAIN_8002": "Stickerz Splatana Stamper",
 	"MAIN_8005": "Order Splatana Replica",
 	"MAIN_6020": "Undercover Brella",
 	"MAIN_6021": "Undercover Sorella Brella",
+	"MAIN_6022": "Patternz Undercover Brella",
 	"MAIN_6030": "Recycled Brella 24 Mk I",
 	"MAIN_6031": "Recycled Brella 24 Mk II",
 	"MAIN_6000": "Splat Brella",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Order Brella Replica",
 	"MAIN_6010": "Tenta Brella",
 	"MAIN_6011": "Tenta Sorella Brella",
+	"MAIN_6012": "Tenta Brella CRE-M",
 	"MAIN_30": "Aerospray MG",
 	"MAIN_31": "Aerospray RG",
+	"MAIN_32": "Colorz Aerospray",
 	"MAIN_70": "Splattershot Pro",
 	"MAIN_71": "Forge Splattershot Pro",
+	"MAIN_72": "Splattershot Pro FRZ-N",
 	"MAIN_10": "Splattershot Jr.",
 	"MAIN_11": "Custom Splattershot Jr.",
 	"MAIN_400": "Squeezer",
@@ -90,15 +108,19 @@
 	"MAIN_51": ".52 Gal Deco",
 	"MAIN_80": ".96 Gal",
 	"MAIN_81": ".96 Gal Deco",
+	"MAIN_82": "Clawz .96 Gal",
 	"MAIN_90": "Jet Squelcher",
 	"MAIN_91": "Custom Jet Squelcher",
+	"MAIN_92": "Jet Squelcher COB-R",
 	"MAIN_40": "Splattershot",
 	"MAIN_41": "Tentatek Splattershot",
+	"MAIN_42": "Glamorz Splattershot",
 	"MAIN_45": "Hero Shot Replica",
 	"MAIN_47": "Order Shot Replica",
 	"MAIN_46": "Octo Shot Replica",
 	"MAIN_20": "Splash-o-matic",
 	"MAIN_21": "Neo Splash-o-matic",
+	"MAIN_22": "Splash-o-matic GCK-O",
 	"MAIN_100": "Splattershot Nova",
 	"MAIN_101": "Annaki Splattershot Nova",
 	"MAIN_60": "N-ZAP '85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Neo Sploosh-o-matic",
 	"MAIN_310": "H-3 Nozzlenose",
 	"MAIN_311": "H-3 Nozzlenose D",
+	"MAIN_312": "H-3 Nozzlenose VIP-R",
 	"MAIN_300": "L-3 Nozzlenose",
 	"MAIN_301": "L-3 Nozzlenose D",
+	"MAIN_302": "Glitterz L-3 Nozzlenose",
 	"MAIN_3030": "Bloblobber",
 	"MAIN_3031": "Bloblobber Deco",
 	"MAIN_3010": "Tri-Slosher",
 	"MAIN_3011": "Tri-Slosher Nouveau",
+	"MAIN_3012": "Tri-Slosher ASH-N",
 	"MAIN_3050": "Dread Wringer",
 	"MAIN_3051": "Dread Wringer D",
+	"MAIN_3052": "Hornz Dread Wringer",
 	"MAIN_3020": "Sloshing Machine",
 	"MAIN_3021": "Sloshing Machine Neo",
 	"MAIN_3000": "Slosher",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Heavy Edit Splatling Nouveau",
 	"MAIN_4020": "Hydra Splatling",
 	"MAIN_4021": "Custom Hydra Splatling",
+	"MAIN_4022": "Torrentz Hydra Splatling",
 	"MAIN_4000": "Mini Splatling",
 	"MAIN_4001": "Zink Mini Splatling",
+	"MAIN_4002": "Mini Splatling RTL-R",
 	"MAIN_4040": "Nautilus 47",
 	"MAIN_4041": "Nautilus 79",
 	"MAIN_4010": "Heavy Splatling",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Custom Wellstring V",
 	"MAIN_7010": "Tri-Stringer",
 	"MAIN_7011": "Inkline Tri-Stringer",
+	"MAIN_7012": "Bulbz Tri-Stringer",
 	"MAIN_7015": "Order Stringer Replica",
 	"MAIN_7020": "REEF-LUX 450",
 	"MAIN_7021": "REEF-LUX 450 Deco",
+	"MAIN_7022": "REEF-LUX 450 MIL-K",
 	"SUB_8": "Squid Beakon",
 	"SUB_6": "Curling Bomb",
 	"SUB_5": "Fizzy Bomb",
diff --git a/locales/ru/game-misc.json b/locales/ru/game-misc.json
index c8e59dfca..947ddfdd4 100644
--- a/locales/ru/game-misc.json
+++ b/locales/ru/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "«Роборамэн»",
 	"STAGE_22": "Аэропорт Пенково",
 	"STAGE_23": "Вокзал Лемурия",
+	"STAGE_24": "Район Дека",
 	"ABILITY_ISM": "Основной баллон X",
 	"ABILITY_ISS": "Запасной баллон X",
 	"ABILITY_IRU": "Быстрый баллон",
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 966af9fd4..d988e79b0 100644
--- a/locales/ru/weapons.json
+++ b/locales/ru/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "Бластермат ПРО",
 	"MAIN_251": "Бластермат ПРО «Деко»",
+	"MAIN_252": "Бластермат ПРО «К-ЛОТУН»",
 	"MAIN_230": "Контрабластер",
 	"MAIN_231": "Контрабластер «Нео»",
 	"MAIN_240": "Бластермат",
@@ -9,6 +10,7 @@
 	"MAIN_221": "Дальнобластер «Понт»",
 	"MAIN_210": "Бластер",
 	"MAIN_211": "Бластер «Понт»",
+	"MAIN_212": "Бластер «Лоск»",
 	"MAIN_260": "S-BLAST 92",
 	"MAIN_261": "S-BLAST 91",
 	"MAIN_200": "Лунобластер",
@@ -16,10 +18,12 @@
 	"MAIN_205": "Бластер Порядка (клон)",
 	"MAIN_1120": "Веерокисть «Плюхассо»",
 	"MAIN_1121": "Веерокисть «НуВо»",
+	"MAIN_1122": "Веерокисть «БРОН-З»",
 	"MAIN_1100": "Кисть",
 	"MAIN_1101": "Кисть «НуВо»",
 	"MAIN_1110": "Арт-кисть",
 	"MAIN_1111": "Арт-кисть «НуВо»",
+	"MAIN_1112": "Арт-кисть «Комета»",
 	"MAIN_1115": "Кисть Порядка (клон)",
 	"MAIN_2060": "Трубастер",
 	"MAIN_2061": "Трубастер «Понт»",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "Э-литр 95 «Понт»",
 	"MAIN_2020": "Снайпокрас",
 	"MAIN_2021": "Снайпокрас «ЙожкоТюр»",
+	"MAIN_2022": "Снайпокрас «К-ФЛЯЖ»",
 	"MAIN_2010": "Сплатган",
 	"MAIN_2011": "Сплатган «ЙожкоТюр»",
+	"MAIN_2012": "Сплатган «К-ФЛЯЖ»",
 	"MAIN_2015": "Сплатган Порядка (клон)",
 	"MAIN_2070": "Патрондаш 5Т",
 	"MAIN_2071": "Патрондаш 5М",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "Стиратель-II",
 	"MAIN_5030": "Спурт-плескари",
 	"MAIN_5031": "Спурт-плескари «Понт»",
+	"MAIN_5032": "Спурт-плескари «Копыта»",
 	"MAIN_5020": "Термоплюхи 525",
 	"MAIN_5021": "Термоплюхи 525 «Деко»",
 	"MAIN_5050": "Краскотушители 255",
 	"MAIN_5051": "Краскотушители «Понт»",
 	"MAIN_5010": "Спуртометы",
 	"MAIN_5011": "Спуртометы «К.К.»",
+	"MAIN_5012": "Спуртометы «Искра»",
 	"MAIN_5015": "Спуртометы Порядка (кл.)",
 	"MAIN_5000": "Импрессиометы",
 	"MAIN_5001": "Импрессиометы «НуВо»",
+	"MAIN_5002": "Импрессиометы «Ф-ЛИН»",
 	"MAIN_5040": "Черные спуртокроссы",
 	"MAIN_5041": "Белые спуртокроссы",
 	"MAIN_1000": "Валик ЛАЙТ",
 	"MAIN_1001": "Валик ЛАЙТ «Деко»",
+	"MAIN_1002": "Валик ЛАЙТ «У-ДИЛЬ»",
 	"MAIN_1020": "Мотовалик",
 	"MAIN_1021": "Мотовалик VIP",
+	"MAIN_1022": "Мотовалик «Пульсар»",
 	"MAIN_1030": "Омнивалик",
 	"MAIN_1031": "Омнивалик «Блеск»",
 	"MAIN_1010": "Сплат-валик",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "Валик Порядка (клон)",
 	"MAIN_1040": "Макси-валик",
 	"MAIN_1041": "Макси-валик «Экспресс»",
+	"MAIN_1042": "Макси-валик «Планета»",
 	"MAIN_8020": "Мятная дентана",
 	"MAIN_8021": "Угольная дентана",
 	"MAIN_8010": "Cплат-дворник",
 	"MAIN_8011": "Cплат-дворник «Деко»",
+	"MAIN_8012": "Сплат-дворник «РЖАВ-Ч»",
 	"MAIN_8000": "Сплат-печатель",
 	"MAIN_8001": "Сплат-печатель «НуВо»",
+	"MAIN_8002": "Сплат-печатель «Уклейка»",
 	"MAIN_8005": "Сплат-катана Порядка (кл.)",
 	"MAIN_6020": "Шпионский зонт",
 	"MAIN_6021": "Шпионский зонт «Родиччи»",
+	"MAIN_6022": "Шпионский зонт «Коллаж»",
 	"MAIN_6030": "Ребут-зонтган М-1",
 	"MAIN_6031": "Ребут-зонтган М-2",
 	"MAIN_6000": "Сплат-зонт",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "Зонтган Порядка (клон)",
 	"MAIN_6010": "Зонтент",
 	"MAIN_6011": "Зонтент «Родиччи»",
+	"MAIN_6012": "Зонтент «СЛИВ-К»",
 	"MAIN_30": "Аэроспрей",
 	"MAIN_31": "Аэроспрей ДЕЛЮКС",
+	"MAIN_32": "Аэроспрей «Перелив»",
 	"MAIN_70": "Каплестрел ПРО",
 	"MAIN_71": "Каплестрел ПРО «Блиц»",
+	"MAIN_72": "Каплестрел ПРО «СТУ-Ж»",
 	"MAIN_10": "Каплестрел-У",
 	"MAIN_11": "Каплестрел-У 2.0",
 	"MAIN_400": "Бутылятор",
@@ -90,15 +108,19 @@
 	"MAIN_51": "Струевик .52 «Деко»",
 	"MAIN_80": "Струевик .96",
 	"MAIN_81": "Струевик .96 «Деко»",
+	"MAIN_82": "Струевик .96 «Царап»",
 	"MAIN_90": "Плескарь",
 	"MAIN_91": "Плескарь «Понт»",
+	"MAIN_92": "Плескарь «КОБ-Р»",
 	"MAIN_40": "Каплестрел",
 	"MAIN_41": "Каплестрел «Щуччи»",
+	"MAIN_42": "Каплестрел «Блесна»",
 	"MAIN_45": "Каплестрел героя (клон)",
 	"MAIN_47": "Каплестрел Порядка (клон)",
 	"MAIN_46": "Осьмострел (клон)",
 	"MAIN_20": "Плюхомет",
 	"MAIN_21": "Плюхомет «Нео»",
+	"MAIN_22": "Плюхомет «Г-КОН»",
 	"MAIN_100": "Каплестрел НОВА",
 	"MAIN_101": "Каплестрел НОВА-ПАНК",
 	"MAIN_60": "N-ZAP 85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "Плюхотрон «Нео»",
 	"MAIN_310": "Тяжелый каплетрон",
 	"MAIN_311": "Тяжелый каплетрон 2.0",
+	"MAIN_312": "Т-каплетрон «МАМ-Б»",
 	"MAIN_300": "Каплетрон-компакт",
 	"MAIN_301": "Каплетрон-компакт 2.0",
+	"MAIN_302": "Каплетрон «Страз»",
 	"MAIN_3030": "Ваннаган",
 	"MAIN_3031": "Ваннаган «Деко»",
 	"MAIN_3010": "Ведроган 3 в 1",
 	"MAIN_3011": "Ведроган 3 в 1 «НуВо»",
+	"MAIN_3012": "Ведроган 3 в 1 «ГАЛЬ-Н»",
 	"MAIN_3050": "Отжиматель",
 	"MAIN_3051": "Отжиматель 2.0",
+	"MAIN_3052": "Отжиматель «Рога»",
 	"MAIN_3020": "Центрифугер",
 	"MAIN_3021": "Центрифугер «Нео»",
 	"MAIN_3000": "Ведроган",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "Корректор «НуВо»",
 	"MAIN_4020": "Брызгомет «Горыныч»",
 	"MAIN_4021": "«Понт-Горыныч»",
+	"MAIN_4022": "«Баллон-Горыныч»",
 	"MAIN_4000": "Брызгомет-М",
 	"MAIN_4001": "Брызгомет-М «Шпротус»",
+	"MAIN_4002": "Брызгомет-М «Г-ДЮК»",
 	"MAIN_4040": "Наутилус-47",
 	"MAIN_4041": "Наутилус-79",
 	"MAIN_4010": "Брызгомет XL",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "Квинтиватор «Понт»",
 	"MAIN_7010": "Тритиватор",
 	"MAIN_7011": "Тритиватор «Коллаб»",
+	"MAIN_7012": "Тритиватор «Диод»",
 	"MAIN_7015": "Тетиватор Порядка (клон)",
 	"MAIN_7020": "КО-РАЛЛ 450",
 	"MAIN_7021": "КО-РАЛЛ 450 «Деко»",
+	"MAIN_7022": "КО-РАЛЛ 450 «М-ЛОКО»",
 	"SUB_8": "Прыжковый маячок",
 	"SUB_6": "Керлинг-бомба",
 	"SUB_5": "Содовая бомба",
diff --git a/locales/zh/game-misc.json b/locales/zh/game-misc.json
index b9a113a95..2991a2fb3 100644
--- a/locales/zh/game-misc.json
+++ b/locales/zh/game-misc.json
@@ -23,6 +23,7 @@
 	"STAGE_21": "贝见亭",
 	"STAGE_22": "旗鱼机场",
 	"STAGE_23": "龙宫转运站",
+	"STAGE_24": "十路通高架桥下",
 	"ABILITY_ISM": "提升墨汁效率（主要武器）",
 	"ABILITY_ISS": "提升墨汁效率（次要武器）",
 	"ABILITY_IRU": "提升墨汁回复力",
diff --git a/locales/zh/weapons.json b/locales/zh/weapons.json
index 4ff54f689..3d2fb2b9a 100644
--- a/locales/zh/weapons.json
+++ b/locales/zh/weapons.json
@@ -1,6 +1,7 @@
 {
 	"MAIN_250": "快速爆破枪 精英",
 	"MAIN_251": "快速爆破枪 精英装饰",
+	"MAIN_252": "快速爆破枪 精英WNTR",
 	"MAIN_230": "冲涂爆破枪",
 	"MAIN_231": "冲涂爆破枪 新型",
 	"MAIN_240": "快速爆破枪",
@@ -9,6 +10,7 @@
 	"MAIN_221": "远距爆破枪 改装",
 	"MAIN_210": "火热爆破枪",
 	"MAIN_211": "火热爆破枪 改装",
+	"MAIN_212": "火热爆破枪 艳",
 	"MAIN_260": "S-BLAST92",
 	"MAIN_261": "S-BLAST91",
 	"MAIN_200": "新星爆破枪",
@@ -16,10 +18,12 @@
 	"MAIN_205": "秩序爆破枪 复制",
 	"MAIN_1120": "文森",
 	"MAIN_1121": "文森·新艺术",
+	"MAIN_1122": "文森BRNZ",
 	"MAIN_1100": "巴勃罗",
 	"MAIN_1101": "巴勃罗·新艺术",
 	"MAIN_1110": "北斋",
 	"MAIN_1111": "北斋·新艺术",
+	"MAIN_1112": "北斋 彗",
 	"MAIN_1115": "秩序排刷 复制",
 	"MAIN_2060": "高压油管枪",
 	"MAIN_2061": "高压油管枪 改装",
@@ -31,8 +35,10 @@
 	"MAIN_2031": "公升4K 改装",
 	"MAIN_2020": "斯普拉准星枪",
 	"MAIN_2021": "斯普拉准星枪 联名",
+	"MAIN_2022": "斯普拉准星枪FRST",
 	"MAIN_2010": "斯普拉蓄力狙击枪",
 	"MAIN_2011": "斯普拉蓄力狙击枪 联名",
+	"MAIN_2012": "斯普拉蓄力狙击枪FRST",
 	"MAIN_2015": "秩序蓄力狙击枪 复制",
 	"MAIN_2070": "R-PEN/5H",
 	"MAIN_2071": "R-PEN/5B",
@@ -40,21 +46,26 @@
 	"MAIN_2001": "鱿快洁β",
 	"MAIN_5030": "双重清洁枪",
 	"MAIN_5031": "双重清洁枪 改装",
+	"MAIN_5032": "双重清洁枪 蹄",
 	"MAIN_5020": "开尔文525",
 	"MAIN_5021": "开尔文525 装饰",
 	"MAIN_5050": "灭熄FF",
 	"MAIN_5051": "灭熄FF 改装",
 	"MAIN_5010": "斯普拉机动枪",
 	"MAIN_5011": "斯普拉机动枪 联名",
+	"MAIN_5012": "斯普拉机动枪 耀",
 	"MAIN_5015": "秩序机动枪 复制",
 	"MAIN_5000": "溅镀枪",
 	"MAIN_5001": "溅镀枪·新艺术",
+	"MAIN_5002": "溅镀枪OWL",
 	"MAIN_5040": "四重弹跳手枪 黑",
 	"MAIN_5041": "四重弹跳手枪 白",
 	"MAIN_1000": "碳纤维滚筒",
 	"MAIN_1001": "碳纤维滚筒 装饰",
+	"MAIN_1002": "碳纤维滚筒ANGL",
 	"MAIN_1020": "电动马达滚筒",
 	"MAIN_1021": "电动马达滚筒 高磁波",
+	"MAIN_1022": "电动马达滚筒 冥",
 	"MAIN_1030": "可变式滚筒",
 	"MAIN_1031": "可变式滚筒 金属箔",
 	"MAIN_1010": "斯普拉滚筒",
@@ -62,15 +73,19 @@
 	"MAIN_1015": "秩序滚筒 复制",
 	"MAIN_1040": "宽滚筒",
 	"MAIN_1041": "宽滚筒 联名",
+	"MAIN_1042": "宽滚筒 惑",
 	"MAIN_8020": "巨齿刮水刀 薄荷",
 	"MAIN_8021": "巨齿刮水刀 墨黑",
 	"MAIN_8010": "雨刷刮水刀",
 	"MAIN_8011": "雨刷刮水刀 装饰",
+	"MAIN_8012": "雨刷刮水刀RUST",
 	"MAIN_8000": "工作刮水刀",
 	"MAIN_8001": "工作刮水刀·新艺术",
+	"MAIN_8002": "工作刮水刀 封",
 	"MAIN_8005": "秩序刮水刀 复制",
 	"MAIN_6020": "特工配件",
 	"MAIN_6021": "特工配件 姐妹",
+	"MAIN_6022": "特工配件 缭",
 	"MAIN_6030": "24式可替换伞·甲",
 	"MAIN_6031": "24式可替换伞·乙",
 	"MAIN_6000": "遮阳防空伞",
@@ -78,10 +93,13 @@
 	"MAIN_6005": "秩序防空伞 复制",
 	"MAIN_6010": "露营防空伞",
 	"MAIN_6011": "露营防空伞 姐妹",
+	"MAIN_6012": "露营防空伞CREM",
 	"MAIN_30": "专业模型枪MG",
 	"MAIN_31": "专业模型枪RG",
+	"MAIN_32": "专业模型枪 彩",
 	"MAIN_70": "顶尖射击枪",
 	"MAIN_71": "顶尖射击枪 联名",
+	"MAIN_72": "顶尖射击枪FRZN",
 	"MAIN_10": "新叶射击枪",
 	"MAIN_11": "枫叶射击枪",
 	"MAIN_400": "开瓶喷泉枪",
@@ -90,15 +108,19 @@
 	"MAIN_51": ".52加仑 装饰",
 	"MAIN_80": ".96加仑",
 	"MAIN_81": ".96加仑 装饰",
+	"MAIN_82": ".96加仑 爪",
 	"MAIN_90": "喷射清洁枪",
 	"MAIN_91": "喷射清洁枪 改装",
+	"MAIN_92": "喷射清洁枪COBR",
 	"MAIN_40": "斯普拉射击枪",
 	"MAIN_41": "斯普拉射击枪 联名",
+	"MAIN_42": "斯普拉射击枪 煌",
 	"MAIN_45": "英雄射击枪 复制",
 	"MAIN_47": "秩序射击枪 复制",
 	"MAIN_46": "章鱼射击枪 复制",
 	"MAIN_20": "窄域标记枪",
 	"MAIN_21": "窄域标记枪 新型",
+	"MAIN_22": "窄域标记枪GECK",
 	"MAIN_100": "太空射击枪",
 	"MAIN_101": "太空射击枪 联名",
 	"MAIN_60": "N-ZAP85",
@@ -107,14 +129,18 @@
 	"MAIN_1": "广域标记枪 新型",
 	"MAIN_310": "H3卷管枪",
 	"MAIN_311": "H3卷管枪D",
+	"MAIN_312": "H3卷管枪SNAK",
 	"MAIN_300": "L3卷管枪",
 	"MAIN_301": "L3卷管枪D",
+	"MAIN_302": "L3卷管枪 箔",
 	"MAIN_3030": "满溢泡澡泼桶",
 	"MAIN_3031": "满溢泡澡泼桶 装饰",
 	"MAIN_3010": "洗笔桶",
 	"MAIN_3011": "洗笔桶·新艺术",
+	"MAIN_3012": "洗笔桶ASH",
 	"MAIN_3050": "墨瀑淋",
 	"MAIN_3051": "墨瀑淋D",
+	"MAIN_3052": "墨瀑淋 角",
 	"MAIN_3020": "回旋泼桶",
 	"MAIN_3021": "回旋泼桶 新型",
 	"MAIN_3000": "飞溅泼桶",
@@ -128,8 +154,10 @@
 	"MAIN_4051": "审查者·新艺术",
 	"MAIN_4020": "消防栓旋转枪",
 	"MAIN_4021": "消防栓旋转枪 改装",
+	"MAIN_4022": "消防栓旋转枪 压",
 	"MAIN_4000": "斯普拉旋转枪",
 	"MAIN_4001": "斯普拉旋转枪 联名",
+	"MAIN_4002": "斯普拉旋转枪PYTN",
 	"MAIN_4040": "鹦鹉螺号47",
 	"MAIN_4041": "鹦鹉螺号79",
 	"MAIN_4010": "桶装旋转枪",
@@ -139,9 +167,11 @@
 	"MAIN_7031": "邦普V 改装",
 	"MAIN_7010": "三发猎鱼弓",
 	"MAIN_7011": "三发猎鱼弓 联名",
+	"MAIN_7012": "三发猎鱼弓 灯",
 	"MAIN_7015": "秩序猎鱼弓 复制",
 	"MAIN_7020": "LACT-450",
 	"MAIN_7021": "LACT-450 装饰",
+	"MAIN_7022": "LACT-450MILK",
 	"SUB_8": "跳跃信标",
 	"SUB_6": "冰壶炸弹",
 	"SUB_5": "碳酸炸弹",
diff --git a/public/static-assets/img/main-weapons-outlined-2/1002.avif b/public/static-assets/img/main-weapons-outlined-2/1002.avif
new file mode 100644
index 000000000..2c81f622b
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/1002.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/1002.png b/public/static-assets/img/main-weapons-outlined-2/1002.png
new file mode 100644
index 000000000..3c779779d
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/1002.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/1022.avif b/public/static-assets/img/main-weapons-outlined-2/1022.avif
new file mode 100644
index 000000000..3e19fac6f
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/1022.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/1022.png b/public/static-assets/img/main-weapons-outlined-2/1022.png
new file mode 100644
index 000000000..bc28b1d2d
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/1022.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/1042.avif b/public/static-assets/img/main-weapons-outlined-2/1042.avif
new file mode 100644
index 000000000..df8c98a7c
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/1042.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/1042.png b/public/static-assets/img/main-weapons-outlined-2/1042.png
new file mode 100644
index 000000000..eeab0e80b
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/1042.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/1112.avif b/public/static-assets/img/main-weapons-outlined-2/1112.avif
new file mode 100644
index 000000000..9390f0601
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/1112.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/1112.png b/public/static-assets/img/main-weapons-outlined-2/1112.png
new file mode 100644
index 000000000..868aa04ed
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/1112.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/1122.avif b/public/static-assets/img/main-weapons-outlined-2/1122.avif
new file mode 100644
index 000000000..9d58fcbdf
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/1122.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/1122.png b/public/static-assets/img/main-weapons-outlined-2/1122.png
new file mode 100644
index 000000000..1a344d17f
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/1122.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/2012.avif b/public/static-assets/img/main-weapons-outlined-2/2012.avif
new file mode 100644
index 000000000..67bcb3919
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/2012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/2012.png b/public/static-assets/img/main-weapons-outlined-2/2012.png
new file mode 100644
index 000000000..5da972d7a
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/2012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/2022.avif b/public/static-assets/img/main-weapons-outlined-2/2022.avif
new file mode 100644
index 000000000..5f2ad7fe0
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/2022.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/2022.png b/public/static-assets/img/main-weapons-outlined-2/2022.png
new file mode 100644
index 000000000..4d309f034
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/2022.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/212.avif b/public/static-assets/img/main-weapons-outlined-2/212.avif
new file mode 100644
index 000000000..fc9dc0186
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/212.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/212.png b/public/static-assets/img/main-weapons-outlined-2/212.png
new file mode 100644
index 000000000..e483617ac
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/212.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/22.avif b/public/static-assets/img/main-weapons-outlined-2/22.avif
new file mode 100644
index 000000000..31b1cd81a
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/22.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/22.png b/public/static-assets/img/main-weapons-outlined-2/22.png
new file mode 100644
index 000000000..0a4caa6f4
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/22.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/252.avif b/public/static-assets/img/main-weapons-outlined-2/252.avif
new file mode 100644
index 000000000..e91acbffc
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/252.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/252.png b/public/static-assets/img/main-weapons-outlined-2/252.png
new file mode 100644
index 000000000..b23d7629a
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/252.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/3012.avif b/public/static-assets/img/main-weapons-outlined-2/3012.avif
new file mode 100644
index 000000000..ebde298a2
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/3012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/3012.png b/public/static-assets/img/main-weapons-outlined-2/3012.png
new file mode 100644
index 000000000..53933c6d6
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/3012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/302.avif b/public/static-assets/img/main-weapons-outlined-2/302.avif
new file mode 100644
index 000000000..f7e72ce3f
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/302.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/302.png b/public/static-assets/img/main-weapons-outlined-2/302.png
new file mode 100644
index 000000000..1645adcf6
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/302.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/3052.avif b/public/static-assets/img/main-weapons-outlined-2/3052.avif
new file mode 100644
index 000000000..c0caa1412
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/3052.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/3052.png b/public/static-assets/img/main-weapons-outlined-2/3052.png
new file mode 100644
index 000000000..015005b34
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/3052.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/312.avif b/public/static-assets/img/main-weapons-outlined-2/312.avif
new file mode 100644
index 000000000..005a44625
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/312.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/312.png b/public/static-assets/img/main-weapons-outlined-2/312.png
new file mode 100644
index 000000000..f0646062a
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/312.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/32.avif b/public/static-assets/img/main-weapons-outlined-2/32.avif
new file mode 100644
index 000000000..b450014bc
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/32.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/32.png b/public/static-assets/img/main-weapons-outlined-2/32.png
new file mode 100644
index 000000000..dea9bdedf
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/32.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/4002.avif b/public/static-assets/img/main-weapons-outlined-2/4002.avif
new file mode 100644
index 000000000..227f61d7f
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/4002.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/4002.png b/public/static-assets/img/main-weapons-outlined-2/4002.png
new file mode 100644
index 000000000..58193b845
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/4002.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/4022.avif b/public/static-assets/img/main-weapons-outlined-2/4022.avif
new file mode 100644
index 000000000..a41862f1d
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/4022.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/4022.png b/public/static-assets/img/main-weapons-outlined-2/4022.png
new file mode 100644
index 000000000..5247c7485
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/4022.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/42.avif b/public/static-assets/img/main-weapons-outlined-2/42.avif
new file mode 100644
index 000000000..7bf896a0d
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/42.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/42.png b/public/static-assets/img/main-weapons-outlined-2/42.png
new file mode 100644
index 000000000..ad8a1fa90
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/42.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/5002.avif b/public/static-assets/img/main-weapons-outlined-2/5002.avif
new file mode 100644
index 000000000..98ba6433d
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/5002.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/5002.png b/public/static-assets/img/main-weapons-outlined-2/5002.png
new file mode 100644
index 000000000..9969f2164
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/5002.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/5012.avif b/public/static-assets/img/main-weapons-outlined-2/5012.avif
new file mode 100644
index 000000000..280b79b34
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/5012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/5012.png b/public/static-assets/img/main-weapons-outlined-2/5012.png
new file mode 100644
index 000000000..989a43931
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/5012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/5032.avif b/public/static-assets/img/main-weapons-outlined-2/5032.avif
new file mode 100644
index 000000000..8ca93ba62
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/5032.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/5032.png b/public/static-assets/img/main-weapons-outlined-2/5032.png
new file mode 100644
index 000000000..ed54ddd77
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/5032.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/6012.avif b/public/static-assets/img/main-weapons-outlined-2/6012.avif
new file mode 100644
index 000000000..a6592fffb
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/6012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/6012.png b/public/static-assets/img/main-weapons-outlined-2/6012.png
new file mode 100644
index 000000000..761546f7f
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/6012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/6022.avif b/public/static-assets/img/main-weapons-outlined-2/6022.avif
new file mode 100644
index 000000000..e3af7f4e7
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/6022.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/6022.png b/public/static-assets/img/main-weapons-outlined-2/6022.png
new file mode 100644
index 000000000..bf7f53d77
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/6022.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/7012.avif b/public/static-assets/img/main-weapons-outlined-2/7012.avif
new file mode 100644
index 000000000..5bc473f95
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/7012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/7012.png b/public/static-assets/img/main-weapons-outlined-2/7012.png
new file mode 100644
index 000000000..d4b98d764
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/7012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/7022.avif b/public/static-assets/img/main-weapons-outlined-2/7022.avif
new file mode 100644
index 000000000..8adc33d0a
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/7022.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/7022.png b/public/static-assets/img/main-weapons-outlined-2/7022.png
new file mode 100644
index 000000000..07966ea4f
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/7022.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/72.avif b/public/static-assets/img/main-weapons-outlined-2/72.avif
new file mode 100644
index 000000000..4776c5b54
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/72.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/72.png b/public/static-assets/img/main-weapons-outlined-2/72.png
new file mode 100644
index 000000000..af9bd7a77
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/72.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/8002.avif b/public/static-assets/img/main-weapons-outlined-2/8002.avif
new file mode 100644
index 000000000..e03562f22
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/8002.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/8002.png b/public/static-assets/img/main-weapons-outlined-2/8002.png
new file mode 100644
index 000000000..e8a30b141
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/8002.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/8012.avif b/public/static-assets/img/main-weapons-outlined-2/8012.avif
new file mode 100644
index 000000000..f55865e4b
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/8012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/8012.png b/public/static-assets/img/main-weapons-outlined-2/8012.png
new file mode 100644
index 000000000..b7c58a314
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/8012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/82.avif b/public/static-assets/img/main-weapons-outlined-2/82.avif
new file mode 100644
index 000000000..2eb89f4f8
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/82.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/82.png b/public/static-assets/img/main-weapons-outlined-2/82.png
new file mode 100644
index 000000000..40b9c1aa2
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/82.png differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/92.avif b/public/static-assets/img/main-weapons-outlined-2/92.avif
new file mode 100644
index 000000000..042e912f1
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/92.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined-2/92.png b/public/static-assets/img/main-weapons-outlined-2/92.png
new file mode 100644
index 000000000..bf138519a
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined-2/92.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/1002.avif b/public/static-assets/img/main-weapons-outlined/1002.avif
new file mode 100644
index 000000000..a19855921
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/1002.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/1002.png b/public/static-assets/img/main-weapons-outlined/1002.png
new file mode 100644
index 000000000..39b0f72c8
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/1002.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/1022.avif b/public/static-assets/img/main-weapons-outlined/1022.avif
new file mode 100644
index 000000000..a8011d340
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/1022.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/1022.png b/public/static-assets/img/main-weapons-outlined/1022.png
new file mode 100644
index 000000000..697385fd0
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/1022.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/1042.avif b/public/static-assets/img/main-weapons-outlined/1042.avif
new file mode 100644
index 000000000..39c050921
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/1042.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/1042.png b/public/static-assets/img/main-weapons-outlined/1042.png
new file mode 100644
index 000000000..c6a36b026
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/1042.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/1112.avif b/public/static-assets/img/main-weapons-outlined/1112.avif
new file mode 100644
index 000000000..5c42d5b66
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/1112.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/1112.png b/public/static-assets/img/main-weapons-outlined/1112.png
new file mode 100644
index 000000000..459c05f33
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/1112.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/1122.avif b/public/static-assets/img/main-weapons-outlined/1122.avif
new file mode 100644
index 000000000..8dd126f52
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/1122.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/1122.png b/public/static-assets/img/main-weapons-outlined/1122.png
new file mode 100644
index 000000000..e82a2b766
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/1122.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/2012.avif b/public/static-assets/img/main-weapons-outlined/2012.avif
new file mode 100644
index 000000000..bd232df4e
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/2012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/2012.png b/public/static-assets/img/main-weapons-outlined/2012.png
new file mode 100644
index 000000000..6b8343e3d
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/2012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/2022.avif b/public/static-assets/img/main-weapons-outlined/2022.avif
new file mode 100644
index 000000000..f21120445
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/2022.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/2022.png b/public/static-assets/img/main-weapons-outlined/2022.png
new file mode 100644
index 000000000..ec3fcdbf7
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/2022.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/212.avif b/public/static-assets/img/main-weapons-outlined/212.avif
new file mode 100644
index 000000000..a0c5b78ec
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/212.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/212.png b/public/static-assets/img/main-weapons-outlined/212.png
new file mode 100644
index 000000000..d2b4f38c2
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/212.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/22.avif b/public/static-assets/img/main-weapons-outlined/22.avif
new file mode 100644
index 000000000..3a8821b37
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/22.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/22.png b/public/static-assets/img/main-weapons-outlined/22.png
new file mode 100644
index 000000000..b0b8dcda6
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/22.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/252.avif b/public/static-assets/img/main-weapons-outlined/252.avif
new file mode 100644
index 000000000..cbfba776a
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/252.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/252.png b/public/static-assets/img/main-weapons-outlined/252.png
new file mode 100644
index 000000000..8d402b2dd
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/252.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/3012.avif b/public/static-assets/img/main-weapons-outlined/3012.avif
new file mode 100644
index 000000000..c15fff39f
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/3012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/3012.png b/public/static-assets/img/main-weapons-outlined/3012.png
new file mode 100644
index 000000000..f45e3f935
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/3012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/302.avif b/public/static-assets/img/main-weapons-outlined/302.avif
new file mode 100644
index 000000000..2b0cd8b2c
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/302.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/302.png b/public/static-assets/img/main-weapons-outlined/302.png
new file mode 100644
index 000000000..e6828237c
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/302.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/3052.avif b/public/static-assets/img/main-weapons-outlined/3052.avif
new file mode 100644
index 000000000..d07dc6235
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/3052.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/3052.png b/public/static-assets/img/main-weapons-outlined/3052.png
new file mode 100644
index 000000000..b006f3172
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/3052.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/312.avif b/public/static-assets/img/main-weapons-outlined/312.avif
new file mode 100644
index 000000000..215c27759
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/312.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/312.png b/public/static-assets/img/main-weapons-outlined/312.png
new file mode 100644
index 000000000..06bcd2807
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/312.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/32.avif b/public/static-assets/img/main-weapons-outlined/32.avif
new file mode 100644
index 000000000..3a9b71645
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/32.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/32.png b/public/static-assets/img/main-weapons-outlined/32.png
new file mode 100644
index 000000000..71cceb2bc
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/32.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/4002.avif b/public/static-assets/img/main-weapons-outlined/4002.avif
new file mode 100644
index 000000000..67fd06719
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/4002.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/4002.png b/public/static-assets/img/main-weapons-outlined/4002.png
new file mode 100644
index 000000000..ae725ce8a
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/4002.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/4022.avif b/public/static-assets/img/main-weapons-outlined/4022.avif
new file mode 100644
index 000000000..dcf471bb0
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/4022.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/4022.png b/public/static-assets/img/main-weapons-outlined/4022.png
new file mode 100644
index 000000000..88101dc31
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/4022.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/42.avif b/public/static-assets/img/main-weapons-outlined/42.avif
new file mode 100644
index 000000000..f719558ec
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/42.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/42.png b/public/static-assets/img/main-weapons-outlined/42.png
new file mode 100644
index 000000000..72bfef3da
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/42.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/5002.avif b/public/static-assets/img/main-weapons-outlined/5002.avif
new file mode 100644
index 000000000..b13981fee
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/5002.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/5002.png b/public/static-assets/img/main-weapons-outlined/5002.png
new file mode 100644
index 000000000..a04027419
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/5002.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/5012.avif b/public/static-assets/img/main-weapons-outlined/5012.avif
new file mode 100644
index 000000000..ad129d65d
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/5012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/5012.png b/public/static-assets/img/main-weapons-outlined/5012.png
new file mode 100644
index 000000000..417174656
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/5012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/5032.avif b/public/static-assets/img/main-weapons-outlined/5032.avif
new file mode 100644
index 000000000..5a2ba3132
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/5032.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/5032.png b/public/static-assets/img/main-weapons-outlined/5032.png
new file mode 100644
index 000000000..0083104bf
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/5032.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/6012.avif b/public/static-assets/img/main-weapons-outlined/6012.avif
new file mode 100644
index 000000000..fa0c43fce
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/6012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/6012.png b/public/static-assets/img/main-weapons-outlined/6012.png
new file mode 100644
index 000000000..9ebac2030
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/6012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/6022.avif b/public/static-assets/img/main-weapons-outlined/6022.avif
new file mode 100644
index 000000000..e00a2c691
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/6022.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/6022.png b/public/static-assets/img/main-weapons-outlined/6022.png
new file mode 100644
index 000000000..26fdd2326
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/6022.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/7012.avif b/public/static-assets/img/main-weapons-outlined/7012.avif
new file mode 100644
index 000000000..ed92dab43
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/7012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/7012.png b/public/static-assets/img/main-weapons-outlined/7012.png
new file mode 100644
index 000000000..f7155042b
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/7012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/7022.avif b/public/static-assets/img/main-weapons-outlined/7022.avif
new file mode 100644
index 000000000..c24f2aa4e
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/7022.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/7022.png b/public/static-assets/img/main-weapons-outlined/7022.png
new file mode 100644
index 000000000..76193ff49
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/7022.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/72.avif b/public/static-assets/img/main-weapons-outlined/72.avif
new file mode 100644
index 000000000..feed8874f
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/72.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/72.png b/public/static-assets/img/main-weapons-outlined/72.png
new file mode 100644
index 000000000..f10cd447a
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/72.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/8002.avif b/public/static-assets/img/main-weapons-outlined/8002.avif
new file mode 100644
index 000000000..b8c417f6d
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/8002.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/8002.png b/public/static-assets/img/main-weapons-outlined/8002.png
new file mode 100644
index 000000000..604bef13b
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/8002.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/8012.avif b/public/static-assets/img/main-weapons-outlined/8012.avif
new file mode 100644
index 000000000..0add943cf
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/8012.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/8012.png b/public/static-assets/img/main-weapons-outlined/8012.png
new file mode 100644
index 000000000..781013f59
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/8012.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/82.avif b/public/static-assets/img/main-weapons-outlined/82.avif
new file mode 100644
index 000000000..289730df4
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/82.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/82.png b/public/static-assets/img/main-weapons-outlined/82.png
new file mode 100644
index 000000000..cc79ffbc6
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/82.png differ
diff --git a/public/static-assets/img/main-weapons-outlined/92.avif b/public/static-assets/img/main-weapons-outlined/92.avif
new file mode 100644
index 000000000..879b0e358
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/92.avif differ
diff --git a/public/static-assets/img/main-weapons-outlined/92.png b/public/static-assets/img/main-weapons-outlined/92.png
new file mode 100644
index 000000000..cdf714e01
Binary files /dev/null and b/public/static-assets/img/main-weapons-outlined/92.png differ
diff --git a/public/static-assets/img/main-weapons/1002.avif b/public/static-assets/img/main-weapons/1002.avif
new file mode 100644
index 000000000..f196509a3
Binary files /dev/null and b/public/static-assets/img/main-weapons/1002.avif differ
diff --git a/public/static-assets/img/main-weapons/1002.png b/public/static-assets/img/main-weapons/1002.png
new file mode 100644
index 000000000..1fe14019c
Binary files /dev/null and b/public/static-assets/img/main-weapons/1002.png differ
diff --git a/public/static-assets/img/main-weapons/1022.avif b/public/static-assets/img/main-weapons/1022.avif
new file mode 100644
index 000000000..8a055d180
Binary files /dev/null and b/public/static-assets/img/main-weapons/1022.avif differ
diff --git a/public/static-assets/img/main-weapons/1022.png b/public/static-assets/img/main-weapons/1022.png
new file mode 100644
index 000000000..3f973b0cb
Binary files /dev/null and b/public/static-assets/img/main-weapons/1022.png differ
diff --git a/public/static-assets/img/main-weapons/1042.avif b/public/static-assets/img/main-weapons/1042.avif
new file mode 100644
index 000000000..c8b659b01
Binary files /dev/null and b/public/static-assets/img/main-weapons/1042.avif differ
diff --git a/public/static-assets/img/main-weapons/1042.png b/public/static-assets/img/main-weapons/1042.png
new file mode 100644
index 000000000..57ec9f9a8
Binary files /dev/null and b/public/static-assets/img/main-weapons/1042.png differ
diff --git a/public/static-assets/img/main-weapons/1112.avif b/public/static-assets/img/main-weapons/1112.avif
new file mode 100644
index 000000000..147584bad
Binary files /dev/null and b/public/static-assets/img/main-weapons/1112.avif differ
diff --git a/public/static-assets/img/main-weapons/1112.png b/public/static-assets/img/main-weapons/1112.png
new file mode 100644
index 000000000..4f78d5ba4
Binary files /dev/null and b/public/static-assets/img/main-weapons/1112.png differ
diff --git a/public/static-assets/img/main-weapons/1122.avif b/public/static-assets/img/main-weapons/1122.avif
new file mode 100644
index 000000000..88cbc4411
Binary files /dev/null and b/public/static-assets/img/main-weapons/1122.avif differ
diff --git a/public/static-assets/img/main-weapons/1122.png b/public/static-assets/img/main-weapons/1122.png
new file mode 100644
index 000000000..e8116171d
Binary files /dev/null and b/public/static-assets/img/main-weapons/1122.png differ
diff --git a/public/static-assets/img/main-weapons/2012.avif b/public/static-assets/img/main-weapons/2012.avif
new file mode 100644
index 000000000..ed9aa0327
Binary files /dev/null and b/public/static-assets/img/main-weapons/2012.avif differ
diff --git a/public/static-assets/img/main-weapons/2012.png b/public/static-assets/img/main-weapons/2012.png
new file mode 100644
index 000000000..c96a5e0f5
Binary files /dev/null and b/public/static-assets/img/main-weapons/2012.png differ
diff --git a/public/static-assets/img/main-weapons/2022.avif b/public/static-assets/img/main-weapons/2022.avif
new file mode 100644
index 000000000..c2f54deff
Binary files /dev/null and b/public/static-assets/img/main-weapons/2022.avif differ
diff --git a/public/static-assets/img/main-weapons/2022.png b/public/static-assets/img/main-weapons/2022.png
new file mode 100644
index 000000000..ab452a0ff
Binary files /dev/null and b/public/static-assets/img/main-weapons/2022.png differ
diff --git a/public/static-assets/img/main-weapons/212.avif b/public/static-assets/img/main-weapons/212.avif
new file mode 100644
index 000000000..b6bc7c084
Binary files /dev/null and b/public/static-assets/img/main-weapons/212.avif differ
diff --git a/public/static-assets/img/main-weapons/212.png b/public/static-assets/img/main-weapons/212.png
new file mode 100644
index 000000000..6ff46edfe
Binary files /dev/null and b/public/static-assets/img/main-weapons/212.png differ
diff --git a/public/static-assets/img/main-weapons/22.avif b/public/static-assets/img/main-weapons/22.avif
new file mode 100644
index 000000000..c5a72416e
Binary files /dev/null and b/public/static-assets/img/main-weapons/22.avif differ
diff --git a/public/static-assets/img/main-weapons/22.png b/public/static-assets/img/main-weapons/22.png
new file mode 100644
index 000000000..6ef4e1f65
Binary files /dev/null and b/public/static-assets/img/main-weapons/22.png differ
diff --git a/public/static-assets/img/main-weapons/252.avif b/public/static-assets/img/main-weapons/252.avif
new file mode 100644
index 000000000..936c21a80
Binary files /dev/null and b/public/static-assets/img/main-weapons/252.avif differ
diff --git a/public/static-assets/img/main-weapons/252.png b/public/static-assets/img/main-weapons/252.png
new file mode 100644
index 000000000..2a1a56aa9
Binary files /dev/null and b/public/static-assets/img/main-weapons/252.png differ
diff --git a/public/static-assets/img/main-weapons/3012.avif b/public/static-assets/img/main-weapons/3012.avif
new file mode 100644
index 000000000..471fbd606
Binary files /dev/null and b/public/static-assets/img/main-weapons/3012.avif differ
diff --git a/public/static-assets/img/main-weapons/3012.png b/public/static-assets/img/main-weapons/3012.png
new file mode 100644
index 000000000..619f20458
Binary files /dev/null and b/public/static-assets/img/main-weapons/3012.png differ
diff --git a/public/static-assets/img/main-weapons/302.avif b/public/static-assets/img/main-weapons/302.avif
new file mode 100644
index 000000000..9fd6b1846
Binary files /dev/null and b/public/static-assets/img/main-weapons/302.avif differ
diff --git a/public/static-assets/img/main-weapons/302.png b/public/static-assets/img/main-weapons/302.png
new file mode 100644
index 000000000..6dd0206e7
Binary files /dev/null and b/public/static-assets/img/main-weapons/302.png differ
diff --git a/public/static-assets/img/main-weapons/3052.avif b/public/static-assets/img/main-weapons/3052.avif
new file mode 100644
index 000000000..24e4b63e7
Binary files /dev/null and b/public/static-assets/img/main-weapons/3052.avif differ
diff --git a/public/static-assets/img/main-weapons/3052.png b/public/static-assets/img/main-weapons/3052.png
new file mode 100644
index 000000000..4c8834c54
Binary files /dev/null and b/public/static-assets/img/main-weapons/3052.png differ
diff --git a/public/static-assets/img/main-weapons/312.avif b/public/static-assets/img/main-weapons/312.avif
new file mode 100644
index 000000000..8cbc8e357
Binary files /dev/null and b/public/static-assets/img/main-weapons/312.avif differ
diff --git a/public/static-assets/img/main-weapons/312.png b/public/static-assets/img/main-weapons/312.png
new file mode 100644
index 000000000..4e9dd689f
Binary files /dev/null and b/public/static-assets/img/main-weapons/312.png differ
diff --git a/public/static-assets/img/main-weapons/32.avif b/public/static-assets/img/main-weapons/32.avif
new file mode 100644
index 000000000..401f1c672
Binary files /dev/null and b/public/static-assets/img/main-weapons/32.avif differ
diff --git a/public/static-assets/img/main-weapons/32.png b/public/static-assets/img/main-weapons/32.png
new file mode 100644
index 000000000..9ed03fd26
Binary files /dev/null and b/public/static-assets/img/main-weapons/32.png differ
diff --git a/public/static-assets/img/main-weapons/4002.avif b/public/static-assets/img/main-weapons/4002.avif
new file mode 100644
index 000000000..c897f67d2
Binary files /dev/null and b/public/static-assets/img/main-weapons/4002.avif differ
diff --git a/public/static-assets/img/main-weapons/4002.png b/public/static-assets/img/main-weapons/4002.png
new file mode 100644
index 000000000..8f93706bd
Binary files /dev/null and b/public/static-assets/img/main-weapons/4002.png differ
diff --git a/public/static-assets/img/main-weapons/4022.avif b/public/static-assets/img/main-weapons/4022.avif
new file mode 100644
index 000000000..46c783fd9
Binary files /dev/null and b/public/static-assets/img/main-weapons/4022.avif differ
diff --git a/public/static-assets/img/main-weapons/4022.png b/public/static-assets/img/main-weapons/4022.png
new file mode 100644
index 000000000..d215296b4
Binary files /dev/null and b/public/static-assets/img/main-weapons/4022.png differ
diff --git a/public/static-assets/img/main-weapons/42.avif b/public/static-assets/img/main-weapons/42.avif
new file mode 100644
index 000000000..5b72725ae
Binary files /dev/null and b/public/static-assets/img/main-weapons/42.avif differ
diff --git a/public/static-assets/img/main-weapons/42.png b/public/static-assets/img/main-weapons/42.png
new file mode 100644
index 000000000..3814f45fd
Binary files /dev/null and b/public/static-assets/img/main-weapons/42.png differ
diff --git a/public/static-assets/img/main-weapons/5002.avif b/public/static-assets/img/main-weapons/5002.avif
new file mode 100644
index 000000000..b26641bca
Binary files /dev/null and b/public/static-assets/img/main-weapons/5002.avif differ
diff --git a/public/static-assets/img/main-weapons/5002.png b/public/static-assets/img/main-weapons/5002.png
new file mode 100644
index 000000000..a4705f434
Binary files /dev/null and b/public/static-assets/img/main-weapons/5002.png differ
diff --git a/public/static-assets/img/main-weapons/5012.avif b/public/static-assets/img/main-weapons/5012.avif
new file mode 100644
index 000000000..afb52e680
Binary files /dev/null and b/public/static-assets/img/main-weapons/5012.avif differ
diff --git a/public/static-assets/img/main-weapons/5012.png b/public/static-assets/img/main-weapons/5012.png
new file mode 100644
index 000000000..0fb373ab4
Binary files /dev/null and b/public/static-assets/img/main-weapons/5012.png differ
diff --git a/public/static-assets/img/main-weapons/5032.avif b/public/static-assets/img/main-weapons/5032.avif
new file mode 100644
index 000000000..cf2c1cc73
Binary files /dev/null and b/public/static-assets/img/main-weapons/5032.avif differ
diff --git a/public/static-assets/img/main-weapons/5032.png b/public/static-assets/img/main-weapons/5032.png
new file mode 100644
index 000000000..e60738732
Binary files /dev/null and b/public/static-assets/img/main-weapons/5032.png differ
diff --git a/public/static-assets/img/main-weapons/6012.avif b/public/static-assets/img/main-weapons/6012.avif
new file mode 100644
index 000000000..dd9c91bcd
Binary files /dev/null and b/public/static-assets/img/main-weapons/6012.avif differ
diff --git a/public/static-assets/img/main-weapons/6012.png b/public/static-assets/img/main-weapons/6012.png
new file mode 100644
index 000000000..26e42128f
Binary files /dev/null and b/public/static-assets/img/main-weapons/6012.png differ
diff --git a/public/static-assets/img/main-weapons/6022.avif b/public/static-assets/img/main-weapons/6022.avif
new file mode 100644
index 000000000..c16f3d849
Binary files /dev/null and b/public/static-assets/img/main-weapons/6022.avif differ
diff --git a/public/static-assets/img/main-weapons/6022.png b/public/static-assets/img/main-weapons/6022.png
new file mode 100644
index 000000000..8fd4566fe
Binary files /dev/null and b/public/static-assets/img/main-weapons/6022.png differ
diff --git a/public/static-assets/img/main-weapons/7012.avif b/public/static-assets/img/main-weapons/7012.avif
new file mode 100644
index 000000000..6569cf30e
Binary files /dev/null and b/public/static-assets/img/main-weapons/7012.avif differ
diff --git a/public/static-assets/img/main-weapons/7012.png b/public/static-assets/img/main-weapons/7012.png
new file mode 100644
index 000000000..227dceda7
Binary files /dev/null and b/public/static-assets/img/main-weapons/7012.png differ
diff --git a/public/static-assets/img/main-weapons/7022.avif b/public/static-assets/img/main-weapons/7022.avif
new file mode 100644
index 000000000..c492a2c4f
Binary files /dev/null and b/public/static-assets/img/main-weapons/7022.avif differ
diff --git a/public/static-assets/img/main-weapons/7022.png b/public/static-assets/img/main-weapons/7022.png
new file mode 100644
index 000000000..146430fc2
Binary files /dev/null and b/public/static-assets/img/main-weapons/7022.png differ
diff --git a/public/static-assets/img/main-weapons/72.avif b/public/static-assets/img/main-weapons/72.avif
new file mode 100644
index 000000000..7d8bf13f0
Binary files /dev/null and b/public/static-assets/img/main-weapons/72.avif differ
diff --git a/public/static-assets/img/main-weapons/72.png b/public/static-assets/img/main-weapons/72.png
new file mode 100644
index 000000000..beb54c126
Binary files /dev/null and b/public/static-assets/img/main-weapons/72.png differ
diff --git a/public/static-assets/img/main-weapons/8002.avif b/public/static-assets/img/main-weapons/8002.avif
new file mode 100644
index 000000000..df93e9fa7
Binary files /dev/null and b/public/static-assets/img/main-weapons/8002.avif differ
diff --git a/public/static-assets/img/main-weapons/8002.png b/public/static-assets/img/main-weapons/8002.png
new file mode 100644
index 000000000..882e361cf
Binary files /dev/null and b/public/static-assets/img/main-weapons/8002.png differ
diff --git a/public/static-assets/img/main-weapons/8012.avif b/public/static-assets/img/main-weapons/8012.avif
new file mode 100644
index 000000000..d4f8111b4
Binary files /dev/null and b/public/static-assets/img/main-weapons/8012.avif differ
diff --git a/public/static-assets/img/main-weapons/8012.png b/public/static-assets/img/main-weapons/8012.png
new file mode 100644
index 000000000..8040442e4
Binary files /dev/null and b/public/static-assets/img/main-weapons/8012.png differ
diff --git a/public/static-assets/img/main-weapons/82.avif b/public/static-assets/img/main-weapons/82.avif
new file mode 100644
index 000000000..fa4fe6a96
Binary files /dev/null and b/public/static-assets/img/main-weapons/82.avif differ
diff --git a/public/static-assets/img/main-weapons/82.png b/public/static-assets/img/main-weapons/82.png
new file mode 100644
index 000000000..1e4f3e964
Binary files /dev/null and b/public/static-assets/img/main-weapons/82.png differ
diff --git a/public/static-assets/img/main-weapons/92.avif b/public/static-assets/img/main-weapons/92.avif
new file mode 100644
index 000000000..8be74c76e
Binary files /dev/null and b/public/static-assets/img/main-weapons/92.avif differ
diff --git a/public/static-assets/img/main-weapons/92.png b/public/static-assets/img/main-weapons/92.png
new file mode 100644
index 000000000..b911c7350
Binary files /dev/null and b/public/static-assets/img/main-weapons/92.png differ
diff --git a/public/static-assets/img/stages/24.avif b/public/static-assets/img/stages/24.avif
new file mode 100644
index 000000000..ea79000d8
Binary files /dev/null and b/public/static-assets/img/stages/24.avif differ
diff --git a/public/static-assets/img/stages/24.png b/public/static-assets/img/stages/24.png
new file mode 100644
index 000000000..35f0c603c
Binary files /dev/null and b/public/static-assets/img/stages/24.png differ
diff --git a/scripts/create-analyzer-json.ts b/scripts/create-analyzer-json.ts
index f5d6bfd7f..fd9477ec0 100644
--- a/scripts/create-analyzer-json.ts
+++ b/scripts/create-analyzer-json.ts
@@ -14,8 +14,9 @@ import type { ParamsJson } from "~/modules/analyzer/types";
 import {
 	SQUID_BEAKON_ID,
 	type SpecialWeaponId,
-} from "~/modules/in-game-lists/types";
-import { type SubWeaponId, subWeaponIds } from "~/modules/in-game-lists/types";
+	type SubWeaponId,
+	subWeaponIds,
+} from "~/modules/in-game-lists/weapon-ids";
 import invariant from "~/utils/invariant";
 import playersParams from "./dicts/SplPlayer.game__GameParameterTable.json";
 import weapons from "./dicts/WeaponInfoMain.json";
diff --git a/scripts/create-misc-json.ts b/scripts/create-misc-json.ts
index 024cd4087..9114d79bb 100644
--- a/scripts/create-misc-json.ts
+++ b/scripts/create-misc-json.ts
@@ -1,7 +1,7 @@
 // @ts-nocheck
 
 import fs from "node:fs";
-import { abilitiesShort } from "~/modules/in-game-lists/types";
+import { abilitiesShort } from "~/modules/in-game-lists/abilities";
 import invariant from "~/utils/invariant";
 import {
 	LANG_JSONS_TO_CREATE,
@@ -40,6 +40,7 @@ const stages = [
 	"Robo ROM-en",
 	"Marlin Airport",
 	"Lemuria Hub",
+	"Urchin Underpass",
 ] as const;
 
 const abilityShortToInternalName = new Map([
diff --git a/scripts/replace-weapon-names.ts b/scripts/replace-weapon-names.ts
index d82284a63..2e70ac194 100644
--- a/scripts/replace-weapon-names.ts
+++ b/scripts/replace-weapon-names.ts
@@ -49,6 +49,13 @@ async function main() {
 				if (i === 1 && fileName.includes("Lv01")) return true;
 				if (i === 2 && fileName.includes("Lv00")) return true;
 
+				// ver 10.0.0
+				if (fileName.includes("Lv02")) return true;
+				if (fileName.includes("Lv03")) return true;
+				if (fileName.includes("Lv04")) return true;
+				if (fileName.includes("Lv05")) return true;
+				if (fileName.includes("Lv06")) return true;
+
 				return false;
 			};