Menu
▾
▴
[Megamek-cvs] SF.net SVN: megamek:[7646] trunk/megamek
|
From: <bee...@us...> - 2010-05-14 12:50:55
|
Revision: 7646
http://megamek.svn.sourceforge.net/megamek/?rev=7646&view=rev
Author: beerockxs
Date: 2010-05-14 12:50:45 +0000 (Fri, 14 May 2010)
Log Message:
-----------
+ Patch 2995669: more infantry weapons
Modified Paths:
--------------
trunk/megamek/docs/contributors.txt
trunk/megamek/docs/history.txt
trunk/megamek/src/megamek/common/Compute.java
trunk/megamek/src/megamek/common/WeaponType.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicAxeWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBasicCrossbowWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBlackjackWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBokkenWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicCarbonReinforcedNailsWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicClanVibroSwordWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicCompoundBowWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaggerWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaikyuBowWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDoubleStunStaffWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHankyuBowWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHatchetWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHeavyCrossbowWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicImprovisedClubWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicKatanaWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicLongBowWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMedusaWhipWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMiniStunstickWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMonowireWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNeuralLashWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNeuralWhipWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNoDachiWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNunchakuWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicPolearmWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicShortBowWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicShurikenWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicSingleStunStaffWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicStaffWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicStunstickWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicSwordWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroAxeWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroBladeWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroKatanaWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroSwordWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicWakizashiWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicWhipWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolBlazerPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolClanERLaserPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolClanPulseLaserPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolHoldOutLaserPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolHoldoutGyrojetPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolLaserPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolNakjimaLaserPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolPaintGunPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolPulseLaserPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolSonicStunnerWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolSunbeamLaserPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolSunbeamNovaLaserPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPistolWhiteDwarfLaserPistolWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleBlazerRifleWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleClanERLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleClanMauserIICIASInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleClanMauserIICIASWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleClanPulseLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleEbonyAssaultLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleFederatedBarrettM61ALaserInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleFederatedBarrettM61ALaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleIntekLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleMagnaLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleMarxXXLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleMauser1200LSSWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleMauser960LaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleMaxellPL10LaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRiflePulseLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleRadiumLaserSniperWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleSunbeamStarfireERLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryWeaponHandler.java
trunk/megamek/src/megamek/server/Server.java
Added Paths:
-----------
trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMicroWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMiniInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMiniWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeRAGWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeStandardWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryRifleLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySMGClanGaussWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySMGGuntherMP20Weapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySMGImperator2894A1Weapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySMGKA23SubgunWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySMGRorynexRM3XXIWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySMGRuganWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySMGWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportAutoGrenadeLauncherInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportAutoGrenadeLauncherWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportClanBearhunterAutocannonWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportClanERHeavyLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportClanERLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportClanSemiPortableERLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportClanSemiPortableHeavyLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportClanSemiPortablePulseLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportCompactGrenadeLauncherWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportDavidLightGaussRifleWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportDragonsbaneDisposablePulseLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportERHeavyLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportERLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportFiredrakeNeedlerWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportGrandMaulerGaussCannonWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportGrenadeLauncherInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportGrenadeLauncherWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyAutoGrenadeLauncherInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyAutoGrenadeLauncherWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyGrenadeLauncherInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyGrenadeLauncherWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyMachineGunWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyMortarInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyMortarWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyPPCWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyPulseLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyRecoillessRifleInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHeavyRecoillessRifleWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportHellboreAssaultLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportKingDavidLightGaussRifleWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportLAWWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportLightMachineGunWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportLightMortarInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportLightMortarWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportLightRecoillessRifleInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportLightRecoillessRifleWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportMagshotGaussRifleWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportMediumRecoillessRifleInfernoWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportMediumRecoillessRifleWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportMk1LightAAWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportMk2PortableAAWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportOneShotMRMWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportPortableAutocannonWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportPortableFlamerWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportPortablePPCWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportPulseLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportSemiPortableLaserWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportStandardSRMWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportTsunamiHeavyGaussRifleWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantrySupportVLAWWeapon.java
Removed Paths:
-------------
trunk/megamek/src/megamek/common/weapons/infantry/InfantryLaserRifleWeapon.java
trunk/megamek/src/megamek/common/weapons/infantry/InfantryPortableFlamerWeapon.java
Modified: trunk/megamek/docs/contributors.txt
===================================================================
--- trunk/megamek/docs/contributors.txt 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/docs/contributors.txt 2010-05-14 12:50:45 UTC (rev 7646)
@@ -66,6 +66,8 @@
bobtehpwnz0r <bob...@us...>
fle <ga...@us...>
Mike Kiscaden <eld...@us...>
+ Magnus Kerensky <mke...@us...>
+ Numien Deathwyrm <nu...@us...>
XML Parser:
Tom Gibara (original URL: http://gibaradunn.srac.org/tiny/index.shtml)
Modified: trunk/megamek/docs/history.txt
===================================================================
--- trunk/megamek/docs/history.txt 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/docs/history.txt 2010-05-14 12:50:45 UTC (rev 7646)
@@ -16,6 +16,7 @@
+ Bug: Extended and Enhanced LRMs had wrong BV
+ Bug: BA mines and misc equipment not counting for BV
+ Patch 3000277, Bugs 2995326, 2956157, 2956087: Artillery cannons
++ Patch 2995669: more infantry weapons
v0.35.15 (2010-05-02, 21:11 UTC+2)
+ Improve swing board drawing performance by a huuge margin
Modified: trunk/megamek/src/megamek/common/Compute.java
===================================================================
--- trunk/megamek/src/megamek/common/Compute.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/Compute.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -871,6 +871,7 @@
int range = wpn.getInfantryRange();
int mod = 0;
+
switch (range) {
case 0:
if(distance > 0) {
@@ -1005,13 +1006,14 @@
return new ToHitData(TargetRoll.AUTOMATIC_FAIL, "Target out of range");
}
+
//a bunch of special conditions at range 0
if(distance == 0) {
+
if(wpn.hasFlag(WeaponType.F_INF_POINT_BLANK)) {
- mods.addModifier(1, "melee weapon penalty");
+ mod +=3;
}
-
if(wpn.hasFlag(WeaponType.F_INF_ENCUMBER) || (wpn.getCrew() > 1)) {
mod++;
}
Modified: trunk/megamek/src/megamek/common/WeaponType.java
===================================================================
--- trunk/megamek/src/megamek/common/WeaponType.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/WeaponType.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -178,6 +178,7 @@
public static final BigInteger F_INF_POINT_BLANK = BigInteger.valueOf(1).shiftLeft(52);
public static final BigInteger F_INF_SUPPORT = BigInteger.valueOf(1).shiftLeft(53);
public static final BigInteger F_INF_ENCUMBER = BigInteger.valueOf(1).shiftLeft(54);
+ public static final BigInteger F_INF_ARCHAIC = BigInteger.valueOf(1).shiftLeft(55);
// add maximum range for AT2
public static final int RANGE_SHORT = 1;
@@ -937,12 +938,14 @@
EquipmentType.addType(new StopSwarmAttack());
// Infantry Level 1 Weapons
+ EquipmentType.addType(new InfantryRifleAutoRifleWeapon());
+ EquipmentType.addType(new InfantryRifleLaserWeapon());
+ EquipmentType.addType(new InfantryLRMWeapon());
EquipmentType.addType(new InfantryLightSRMWeapon());
EquipmentType.addType(new InfantryInfernoSRMWeapon());
EquipmentType.addType(new InfantryLRMWeapon());
- EquipmentType.addType(new InfantryLaserRifleWeapon());
- EquipmentType.addType(new InfantryPortableFlamerWeapon());
- EquipmentType.addType(new InfantryPortableFlamerWeapon());
+ EquipmentType.addType(new InfantryRifleLaserWeapon());
+ EquipmentType.addType(new InfantrySupportPortableFlamerWeapon());
//Infantry Archaic Weapons
EquipmentType.addType(new InfantryArchaicAxeWeapon());
EquipmentType.addType(new InfantryArchaicBasicCrossbowWeapon());
@@ -1118,11 +1121,78 @@
EquipmentType.addType(new InfantryShotgunSawnoffDoubleBarrelWeapon());
EquipmentType.addType(new InfantryShotgunSawnoffPumpActionWeapon());
// Infantry Support Weapons
+ EquipmentType.addType(new InfantrySupportMk1LightAAWeapon());
+ EquipmentType.addType(new InfantrySupportMk2PortableAAWeapon());
+ EquipmentType.addType(new InfantrySupportClanBearhunterAutocannonWeapon());
+ EquipmentType.addType(new InfantrySupportPortableAutocannonWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyFlamerWeapon());
+ EquipmentType.addType(new InfantrySupportGrandMaulerGaussCannonWeapon());
+ EquipmentType.addType(new InfantrySupportMagshotGaussRifleWeapon());
+ EquipmentType.addType(new InfantrySupportTsunamiHeavyGaussRifleWeapon());
+ EquipmentType.addType(new InfantrySupportDavidLightGaussRifleWeapon());
+ EquipmentType.addType(new InfantrySupportKingDavidLightGaussRifleWeapon());
+ EquipmentType.addType(new InfantrySupportGrenadeLauncherWeapon());
+ EquipmentType.addType(new InfantrySupportGrenadeLauncherInfernoWeapon());
+ EquipmentType.addType(new InfantrySupportAutoGrenadeLauncherWeapon());
+ EquipmentType.addType(new InfantrySupportAutoGrenadeLauncherInfernoWeapon());
+ EquipmentType.addType(new InfantrySupportCompactGrenadeLauncherWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyGrenadeLauncherWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyGrenadeLauncherInfernoWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyAutoGrenadeLauncherWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyAutoGrenadeLauncherInfernoWeapon());
+ EquipmentType.addType(new InfantrySupportHellboreAssaultLaserWeapon());
+ EquipmentType.addType(new InfantrySupportLightMachineGunWeapon());
EquipmentType.addType(new InfantryPortableMGWeapon());
- EquipmentType.addType(new InfantrySupportHeavyFlamerWeapon());
- EquipmentType.addType(new InfantrySupportHeavySRMWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyMachineGunWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyMortarWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyMortarInfernoWeapon());
+ EquipmentType.addType(new InfantrySupportLightMortarWeapon());
+ EquipmentType.addType(new InfantrySupportLightMortarInfernoWeapon());
+ EquipmentType.addType(new InfantrySupportOneShotMRMWeapon());
+ EquipmentType.addType(new InfantrySupportFiredrakeNeedlerWeapon());
+ EquipmentType.addType(new InfantrySupportPortablePPCWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyPPCWeapon());
EquipmentType.addType(new InfantrySupportPortablePlasmaWeapon());
- EquipmentType.addType(new InfantrySupportSemiPortableMachineGunWeapon());
+
+ EquipmentType.addType(new InfantrySupportDragonsbaneDisposablePulseLaserWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyRecoillessRifleWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyRecoillessRifleInfernoWeapon());
+ EquipmentType.addType(new InfantrySupportLightRecoillessRifleWeapon());
+ EquipmentType.addType(new InfantrySupportLightRecoillessRifleInfernoWeapon());
+ EquipmentType.addType(new InfantrySupportMediumRecoillessRifleWeapon());
+ EquipmentType.addType(new InfantrySupportMediumRecoillessRifleInfernoWeapon());
+ EquipmentType.addType(new InfantrySupportLAWWeapon());
+ EquipmentType.addType(new InfantrySupportVLAWWeapon());
+ EquipmentType.addType(new InfantrySupportStandardSRMWeapon());
+ EquipmentType.addType(new InfantryLightSRMWeapon());
+ EquipmentType.addType(new InfantrySupportLaserWeapon());
+ EquipmentType.addType(new InfantrySupportERLaserWeapon());
+ EquipmentType.addType(new InfantrySupportClanERLaserWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyLaserWeapon());
+ EquipmentType.addType(new InfantrySupportERHeavyLaserWeapon());
+ EquipmentType.addType(new InfantrySupportClanERHeavyLaserWeapon());
+ EquipmentType.addType(new InfantrySupportClanSemiPortableHeavyLaserWeapon());
+ EquipmentType.addType(new InfantrySupportClanSemiPortableERLaserWeapon());
+ EquipmentType.addType(new InfantrySupportSemiPortableLaserWeapon());
+ EquipmentType.addType(new InfantrySupportPulseLaserWeapon());
+ EquipmentType.addType(new InfantrySupportHeavyPulseLaserWeapon());
+ EquipmentType.addType(new InfantrySupportClanSemiPortablePulseLaserWeapon());
+ // Infantry Grenade Weapons
+ EquipmentType.addType(new InfantryGrenadeInfernoWeapon());
+ EquipmentType.addType(new InfantryGrenadeMicroWeapon());
+ EquipmentType.addType(new InfantryGrenadeMiniInfernoWeapon());
+ EquipmentType.addType(new InfantryGrenadeRAGWeapon());
+ EquipmentType.addType(new InfantryGrenadeStandardWeapon());
+ // Infantry SMG Weapons
+ EquipmentType.addType(new InfantrySMGClanGaussWeapon());
+ EquipmentType.addType(new InfantrySMGGuntherMP20Weapon());
+ EquipmentType.addType(new InfantrySMGImperator2894A1Weapon());
+ EquipmentType.addType(new InfantrySMGKA23SubgunWeapon());
+ EquipmentType.addType(new InfantrySMGRorynexRM3XXIWeapon());
+ EquipmentType.addType(new InfantrySMGRuganWeapon());
+ EquipmentType.addType(new InfantrySMGWeapon());
+
+
EquipmentType.addType(new ISFireExtinguisher());
EquipmentType.addType(new CLFireExtinguisher());
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicAxeWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicAxeWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicAxeWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -37,9 +37,10 @@
setInternalName(name);
addLookupName("InfantryAxe");
addLookupName("InfantryBladeAxe");
+ ammoType = AmmoType.T_NA;
cost = 25;
bv = 0.06;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.07;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBasicCrossbowWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBasicCrossbowWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBasicCrossbowWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -39,7 +39,7 @@
ammoType = AmmoType.T_NA;
cost = 10;
bv = 0.01;
- flags = flags.or(F_NO_FIRES).or(F_BALLISTIC);
+ flags = flags.or(F_NO_FIRES).or(F_BALLISTIC).or(F_INF_ARCHAIC);
infantryDamage = 0.01;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBlackjackWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBlackjackWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBlackjackWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -37,9 +37,10 @@
setInternalName(name);
addLookupName("InfantryBlackjack");
addLookupName("InfantrySap");
+ ammoType = AmmoType.T_NA;
cost = 5;
bv = 0;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_NONPENETRATING);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_NONPENETRATING).or(F_INF_ARCHAIC);
infantryDamage = 0.05;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBokkenWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBokkenWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicBokkenWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Bokken";
setInternalName(name);
addLookupName("InfantryBokken");
+ ammoType = AmmoType.T_NA;
cost = 15;
bv = 0.03;
- flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.04;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicCarbonReinforcedNailsWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicCarbonReinforcedNailsWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicCarbonReinforcedNailsWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Carbon Reinforced Fingernails";
setInternalName(name);
addLookupName("InfantryCarbonFingernails");
+ ammoType = AmmoType.T_NA;
cost = 1000;
bv = 0.02;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.02;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicClanVibroSwordWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicClanVibroSwordWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicClanVibroSwordWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Clan Vibro Sword";
setInternalName(name);
addLookupName("InfantryClanVibroSword");
+ ammoType = AmmoType.T_NA;
cost = 500;
bv = 0.26;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.32;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicCompoundBowWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicCompoundBowWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicCompoundBowWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -39,7 +39,7 @@
ammoType = AmmoType.T_NA;
cost = 15;
bv = 0.01;
- flags = flags.or(F_NO_FIRES).or(F_BALLISTIC);
+ flags = flags.or(F_NO_FIRES).or(F_BALLISTIC).or(F_INF_ARCHAIC);
infantryDamage = 0.01;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaggerWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaggerWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaggerWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -38,9 +38,10 @@
addLookupName("InfantryDagger");
addLookupName("InfantryKnife");
addLookupName("InfantryBayonet");
+ ammoType = AmmoType.T_NA;
cost = 8;
bv = 0.02;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.02;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaikyuBowWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaikyuBowWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaikyuBowWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -39,7 +39,7 @@
ammoType = AmmoType.T_NA;
cost = 30;
bv = 0.01;
- flags = flags.or(F_NO_FIRES).or(F_BALLISTIC);
+ flags = flags.or(F_NO_FIRES).or(F_BALLISTIC).or(F_INF_ARCHAIC);
infantryDamage = 0.01;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaoWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaoWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDaoWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Dao";
setInternalName(name);
addLookupName("InfantryDaoSword");
+ ammoType = AmmoType.T_NA;
cost = 200;
bv = 0.03;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.04;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDoubleStunStaffWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDoubleStunStaffWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicDoubleStunStaffWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Double Ended Stun Staff";
setInternalName(name);
addLookupName("InfantryDoubleStunStaff");
+ ammoType = AmmoType.T_NA;
cost = 500;
bv = 0.06;
- flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.07;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHankyuBowWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHankyuBowWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHankyuBowWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -39,7 +39,7 @@
ammoType = AmmoType.T_NA;
cost = 15;
bv = 0.01;
- flags = flags.or(F_NO_FIRES).or(F_BALLISTIC);
+ flags = flags.or(F_NO_FIRES).or(F_BALLISTIC).or(F_INF_ARCHAIC);
infantryDamage = 0.0;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHatchetWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHatchetWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHatchetWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -37,9 +37,10 @@
setInternalName(name);
addLookupName("InfantryHatchet");
addLookupName("InfantryTomahawk");
+ ammoType = AmmoType.T_NA;
cost = 10;
bv = 0.03;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.04;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHeavyCrossbowWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHeavyCrossbowWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicHeavyCrossbowWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -39,7 +39,7 @@
ammoType = AmmoType.T_NA;
cost = 20;
bv = 0.02;
- flags = flags.or(F_NO_FIRES).or(F_BALLISTIC);
+ flags = flags.or(F_NO_FIRES).or(F_BALLISTIC).or(F_INF_ARCHAIC);
infantryDamage = 0.02;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicImprovisedClubWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicImprovisedClubWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicImprovisedClubWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -37,9 +37,10 @@
setInternalName(name);
addLookupName("InfantryClub");
addLookupName("InfantryImprovised");
+ ammoType = AmmoType.T_NA;
cost = 0;
bv = 0.02;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.02;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicKatanaWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicKatanaWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicKatanaWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Katana";
setInternalName(name);
addLookupName("InfantryKatana");
+ ammoType = AmmoType.T_NA;
cost = 250;
bv = 0.03;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.04;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicLongBowWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicLongBowWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicLongBowWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -39,7 +39,7 @@
ammoType = AmmoType.T_NA;
cost = 20;
bv = 0.01;
- flags = flags.or(F_NO_FIRES).or(F_BALLISTIC);
+ flags = flags.or(F_NO_FIRES).or(F_BALLISTIC).or(F_INF_ARCHAIC);
infantryDamage = 0.01;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMedusaWhipWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMedusaWhipWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMedusaWhipWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Medusa Whip";
setInternalName(name);
addLookupName("InfantryClanMedusaWhip");
+ ammoType = AmmoType.T_NA;
cost = 2200;
bv = 0.13;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_NONPENETRATING);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_NONPENETRATING).or(F_INF_ARCHAIC);
infantryDamage = 0.16;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMiniStunstickWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMiniStunstickWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMiniStunstickWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -39,7 +39,7 @@
ammoType = AmmoType.T_AC;
cost = 50;
bv = 0.04;
- flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.05;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMonowireWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMonowireWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicMonowireWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Monowire";
setInternalName(name);
addLookupName("InfantryMonowire");
+ ammoType = AmmoType.T_NA;
cost = 200;
bv = 0.28;
- flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.35;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNeuralLashWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNeuralLashWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNeuralLashWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Neural Lash";
setInternalName(name);
addLookupName("InfantryNeuralLash");
+ ammoType = AmmoType.T_NA;
cost = 750;
bv = 0.07;
- flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.09;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNeuralWhipWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNeuralWhipWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNeuralWhipWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Neural Whip";
setInternalName(name);
addLookupName("InfantryNeuralWhip");
+ ammoType = AmmoType.T_NA;
cost = 500;
bv = 0.07;
- flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.09;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNoDachiWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNoDachiWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNoDachiWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "No Dachi";
setInternalName(name);
addLookupName("InfantryNoDachi");
+ ammoType = AmmoType.T_NA;
cost = 300;
bv = 0.04;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.05;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNunchakuWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNunchakuWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicNunchakuWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Nunchaku";
setInternalName(name);
addLookupName("InfantryNunchaku");
+ ammoType = AmmoType.T_NA;
cost = 10;
bv = 0.02;
- flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.02;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicPolearmWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicPolearmWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicPolearmWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Polearm";
setInternalName(name);
addLookupName("InfantryPolearm");
+ ammoType = AmmoType.T_NA;
cost = 50;
bv = 0.03;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.04;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicShortBowWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicShortBowWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicShortBowWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -39,7 +39,7 @@
ammoType = AmmoType.T_NA;
cost = 10;
bv = 0.01;
- flags = flags.or(F_NO_FIRES).or(F_BALLISTIC);
+ flags = flags.or(F_NO_FIRES).or(F_BALLISTIC).or(F_INF_ARCHAIC);
infantryDamage = 0.0;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicShurikenWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicShurikenWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicShurikenWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Shuriken";
setInternalName(name);
addLookupName("InfantryShuriken");
+ ammoType = AmmoType.T_NA;
cost = 5;
bv = 0;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicSingleStunStaffWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicSingleStunStaffWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicSingleStunStaffWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Single Ended Stun Staff";
setInternalName(name);
addLookupName("InfantrySingleStunStaff");
+ ammoType = AmmoType.T_NA;
cost = 300;
bv = 0.06;
- flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.07;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicStaffWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicStaffWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicStaffWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Staff";
setInternalName(name);
addLookupName("InfantryStaff");
+ ammoType = AmmoType.T_NA;
cost = 5;
bv = 0.03;
- flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.04;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicStunstickWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicStunstickWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicStunstickWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Stun Stick";
setInternalName(name);
addLookupName("InfantryStunstick");
+ ammoType = AmmoType.T_NA;
cost = 200;
bv = 0.06;
- flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.07;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicSwordWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicSwordWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicSwordWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Sword";
setInternalName(name);
addLookupName("InfantrySword");
+ ammoType = AmmoType.T_NA;
cost = 30;
bv = 0.03;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.04;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroAxeWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroAxeWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroAxeWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Vibro Axe";
setInternalName(name);
addLookupName("InfantryVibroAxe");
+ ammoType = AmmoType.T_NA;
cost = 150;
bv = 0.28;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.35;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroBladeWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroBladeWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroBladeWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Vibro Blade";
setInternalName(name);
addLookupName("InfantryVibroBlade");
+ ammoType = AmmoType.T_NA;
cost = 100;
bv = 0.14;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.18;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroKatanaWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroKatanaWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroKatanaWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Vibro Katana";
setInternalName(name);
addLookupName("InfantryVibroKatana");
+ ammoType = AmmoType.T_NA;
cost = 350;
bv = 0.21;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.26;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroSwordWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroSwordWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicVibroSwordWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -37,9 +37,10 @@
setInternalName(name);
addLookupName("InfantryVibroSword");
addLookupName("InfantryISVibroSword");
+ ammoType = AmmoType.T_NA;
cost = 300;
bv = 0.21;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.26;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicWakizashiWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicWakizashiWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicWakizashiWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -36,9 +36,10 @@
name = "Wakizashi";
setInternalName(name);
addLookupName("InfantryWakizashi");
+ ammoType = AmmoType.T_NA;
cost = 150;
bv = 0.02;
- flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.02;
infantryRange = 0;
}
Modified: trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicWhipWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicWhipWeapon.java 2010-05-12 18:23:36 UTC (rev 7645)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryArchaicWhipWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -17,6 +17,7 @@
*/
package megamek.common.weapons.infantry;
+import megamek.common.AmmoType;
import megamek.common.TechConstants;
/**
@@ -35,9 +36,10 @@
name = "Whip";
setInternalName(name);
addLookupName("InfantryWhip");
+ ammoType = AmmoType.T_NA;
cost = 18;
bv = 0.04;
- flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK);
+ flags = flags.or(F_NO_FIRES).or(F_INF_NONPENETRATING).or(F_INF_POINT_BLANK).or(F_INF_ARCHAIC);
infantryDamage = 0.05;
infantryRange = 0;
}
Added: trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeInfernoWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeInfernoWeapon.java (rev 0)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeInfernoWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -0,0 +1,46 @@
+/**
+ * MegaMek - Copyright (C) 2004,2005 Ben Mazur (bm...@se...)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+/*
+ * Created on Sep 7, 2005
+ *
+ */
+package megamek.common.weapons.infantry;
+
+import megamek.common.AmmoType;
+import megamek.common.TechConstants;
+
+/**
+ * @author Ben Grills
+ */
+public class InfantryGrenadeInfernoWeapon extends InfantryWeapon {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3164871600230559641L;
+
+ public InfantryGrenadeInfernoWeapon() {
+ super();
+ techLevel = TechConstants.T_TW_ALL;
+ name = "Inferno Grenades";
+ setInternalName(name);
+ addLookupName("InfantryInfernoGrenade");
+ ammoType = AmmoType.T_NA;
+ cost = 16;
+ bv = 0.22;
+ flags = flags.or(F_INFERNO).or(F_BALLISTIC).or(F_INF_SUPPORT);
+ infantryDamage = 0.15;
+ infantryRange = 0;
+ }
+}
Added: trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMicroWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMicroWeapon.java (rev 0)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMicroWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -0,0 +1,46 @@
+/**
+ * MegaMek - Copyright (C) 2004,2005 Ben Mazur (bm...@se...)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+/*
+ * Created on Sep 7, 2005
+ *
+ */
+package megamek.common.weapons.infantry;
+
+import megamek.common.AmmoType;
+import megamek.common.TechConstants;
+
+/**
+ * @author Ben Grills
+ */
+public class InfantryGrenadeMicroWeapon extends InfantryWeapon {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3164871600230559641L;
+
+ public InfantryGrenadeMicroWeapon() {
+ super();
+ techLevel = TechConstants.T_TW_ALL;
+ name = "Micro Grenades";
+ setInternalName(name);
+ addLookupName("InfantryMicroGrenade");
+ ammoType = AmmoType.T_NA;
+ cost = 2;
+ bv = 0.08;
+ flags = flags.or(F_NO_FIRES).or(F_BALLISTIC).or(F_INF_SUPPORT);
+ infantryDamage = 0.10;
+ infantryRange = 0;
+ }
+}
Added: trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMiniInfernoWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMiniInfernoWeapon.java (rev 0)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMiniInfernoWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -0,0 +1,46 @@
+/**
+ * MegaMek - Copyright (C) 2004,2005 Ben Mazur (bm...@se...)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+/*
+ * Created on Sep 7, 2005
+ *
+ */
+package megamek.common.weapons.infantry;
+
+import megamek.common.AmmoType;
+import megamek.common.TechConstants;
+
+/**
+ * @author Ben Grills
+ */
+public class InfantryGrenadeMiniInfernoWeapon extends InfantryWeapon {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3164871600230559641L;
+
+ public InfantryGrenadeMiniInfernoWeapon() {
+ super();
+ techLevel = TechConstants.T_TW_ALL;
+ name = "Mini Inferno Grenades";
+ setInternalName(name);
+ addLookupName("InfantryMiniInfernoGrenade");
+ ammoType = AmmoType.T_NA;
+ cost = 8;
+ bv = 0.15;
+ flags = flags.or(F_INFERNO).or(F_BALLISTIC).or(F_INF_SUPPORT);
+ infantryDamage = 0.09;
+ infantryRange = 0;
+ }
+}
Added: trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMiniWeapon.java
===================================================================
--- trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMiniWeapon.java (rev 0)
+++ trunk/megamek/src/megamek/common/weapons/infantry/InfantryGrenadeMiniWeapon.java 2010-05-14 12:50:45 UTC (rev 7646)
@@ -0,0 +1,46 @@
+/**
+ * MegaMek - Copyright (C) 2004,2005 Ben Mazur (bm...@se...)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+/*
+ * Created on Sep 7, 2005
+ *
+ */
+package megamek.common.weapons.infantry;
+
+import megamek.common.AmmoType;
+import megamek.common.TechConstants;
+
+/**
+ * @author Ben Grills
+ */
+public class InfantryGrenadeMiniWeapon extends InfantryWeapon {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3164871600230559641L;
+
+ public InfantryGrenadeMiniWeapon() {
+ super();
+ techLevel = TechConstants.T_TW_ALL;
+ name = "Mini Grenades";
+ setInternalName(name);
+ addLookupName("InfantryMiniGrenade");
+ ammoType = AmmoType.T_NA;
+ cost = 8;
+ bv = 0.15;
+ flags = flags.or(F_NO_FIRES).or(F_BALLISTIC).or(F_INF_SUPPORT);
+ infantryDamage = 0.19;
+ infantryRange = 0;
+ }
+}
Add...
[truncated message content] |