Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes a number of duplicated infantry weapons #5802

Merged
merged 1 commit into from
Jul 26, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions megamek/src/megamek/common/WeaponType.java
Original file line number Diff line number Diff line change
Expand Up @@ -1571,21 +1571,6 @@ public static void initializeTypes() {
EquipmentType.addType(new InfantryPulseLaserPistolNWW12());
EquipmentType.addType(new InfantryPulseLaserPistolRDISunSwarmPulsar());

EquipmentType.addType(new InfantryLaserPistolAA75L());
EquipmentType.addType(new InfantryLaserPistolAWAWilibyMk4LaserPistol());
EquipmentType.addType(new InfantryLaserPistolBR25());
EquipmentType.addType(new InfantryLaserPistolBrightStarL12());
EquipmentType.addType(new InfantryLaserPistolBrightStarL15());
EquipmentType.addType(new InfantryLaserPistolBrightStarL7());
EquipmentType.addType(new InfantryLaserPistolDarklightIVLaserPistol());
EquipmentType.addType(new InfantryLaserPistolKelvin000Lancer3MM());
EquipmentType.addType(new InfantryLaserPistolXingShan());
EquipmentType.addType(new InfantryLaserPistolXingShanER());
EquipmentType.addType(new InfantryPulseLaserPistolMedusaIII());
EquipmentType.addType(new InfantryPulseLaserPistolMedusaIV());
EquipmentType.addType(new InfantryPulseLaserPistolNWW12());
EquipmentType.addType(new InfantryPulseLaserPistolRDISunSwarmPulsar());

// Clan Pistols - Commented out can be considered Obsolete
EquipmentType.addType(new InfantryPistolClanERLaserPistolWeapon());
EquipmentType.addType(new InfantryPistolClanGaussPistolWeapon());
Expand Down Expand Up @@ -1730,19 +1715,6 @@ public static void initializeTypes() {
EquipmentType.addType(new InfantryPulseLaserRifleGaul());
EquipmentType.addType(new InfantryPulseLaserRifleTirbuni());

// Shrapnel Laser Rifles
EquipmentType.addType(new InfantryLaserCarbineBrightstarL15());
EquipmentType.addType(new InfantryLaserRifleDarkLightCLLight());
EquipmentType.addType(new InfantryLaserRifleDWSL5S());
EquipmentType.addType(new InfantryLaserRifleScorcherVIBlazerRifle());
EquipmentType.addType(new InfantryLaserRifleSyrtisFirebolt12Repaired());
EquipmentType.addType(new InfantryLaserRifleSyrtisFirebolt12Unrepaired());
EquipmentType.addType(new InfantryLaserRifleWolfBaronSunraker());
EquipmentType.addType(new InfantryLaserRifleYangLie());
EquipmentType.addType(new InfantryPulseLaserRifleDWSL5C());
EquipmentType.addType(new InfantryPulseLaserRifleGaul());
EquipmentType.addType(new InfantryPulseLaserRifleTirbuni());

// Shrapnel Sniper Files
EquipmentType.addType(new InfantrySniperRifleBartonAMRAntiArmor());
EquipmentType.addType(new InfantrySniperRifleBartonAMRStandard());
Expand Down