[Megamek-cvs] megamek/megamek/common AmmoType.java,1.15,1.16 Mounted.java,1.13,1.14 WeaponType.java,1.19,1.20

[<sta...@us...>]

Update of /cvsroot/megamek/megamek/megamek/common
In directory usw-pr-cvs1:/tmp/cvs-serv13346/megamek/common

Modified Files:
	AmmoType.java Mounted.java WeaponType.java 
Log Message:
+ HeavyGaussRifles added

Index: AmmoType.java
===================================================================
RCS file: /cvsroot/megamek/megamek/megamek/common/AmmoType.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AmmoType.java	11 Oct 2002 18:32:05 -0000	1.15
--- AmmoType.java	23 Oct 2002 19:42:58 -0000	1.16
***************
*** 41,44 ****
--- 41,45 ----
      public static final int     T_AC_ULTRA          = 20;
      public static final int     T_GAUSS_LIGHT       = 21;
+     public static final int     T_GAUSS_HEAVY       = 22;
      
      // ammo flags
***************
*** 112,115 ****
--- 113,117 ----
          EquipmentType.addType(createISGaussAmmo());
          EquipmentType.addType(createISLTGaussAmmo());
+         EquipmentType.addType(createISHVGaussAmmo());
          EquipmentType.addType(createISStreakSRM2Ammo());
          EquipmentType.addType(createISStreakSRM4Ammo());
***************
*** 594,597 ****
--- 596,615 ----
          ammo.shots = 16;
          ammo.bv = 20;
+         
+         return ammo;
+     }
+     
+     public static AmmoType createISHVGaussAmmo() {
+         AmmoType ammo = new AmmoType();
+         
+         ammo.name = "Heavy Gauss Ammo";
+         ammo.internalName = "ISHeavyGauss Ammo";
+         ammo.mepName = ammo.internalName;
+         ammo.mtfName = ammo.internalName;
+         ammo.damagePerShot = 25;  // actually variable
+         ammo.explosive = false;
+         ammo.ammoType = AmmoType.T_GAUSS_HEAVY;
+         ammo.shots = 4;
+         ammo.bv = 43;
          
          return ammo;

Index: Mounted.java
===================================================================
RCS file: /cvsroot/megamek/megamek/megamek/common/Mounted.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Mounted.java	22 Oct 2002 23:49:44 -0000	1.13
--- Mounted.java	23 Oct 2002 19:42:58 -0000	1.14
***************
*** 279,282 ****
--- 279,284 ----
              } else if (wtype.getAmmoType() == AmmoType.T_GAUSS_LIGHT) {
                  return 16;
+             } else if (wtype.getAmmoType() == AmmoType.T_GAUSS_HEAVY) {
+                 return 25;
              }
          }

Index: WeaponType.java
===================================================================
RCS file: /cvsroot/megamek/megamek/megamek/common/WeaponType.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** WeaponType.java	12 Oct 2002 01:08:12 -0000	1.19
--- WeaponType.java	23 Oct 2002 19:42:59 -0000	1.20
***************
*** 128,131 ****
--- 128,132 ----
          EquipmentType.addType(createISGaussRifle());
          EquipmentType.addType(createISLightGaussRifle());
+         EquipmentType.addType(createISHeavyGaussRifle());
          EquipmentType.addType(createISUltraAC2());
          EquipmentType.addType(createISUltraAC5());
***************
*** 852,855 ****
--- 853,879 ----
          weapon.explosive = true;
          weapon.bv = 159;
+         
+         return weapon;
+     }
+     
+     public static WeaponType createISHeavyGaussRifle() {
+         WeaponType weapon = new WeaponType();
+         
+         weapon.name = "Heavy Gauss Rifle";
+         weapon.internalName = "ISHeavyGaussRifle";
+         weapon.mepName = weapon.internalName;
+         weapon.mtfName = weapon.internalName;
+         weapon.heat = 2;
+         weapon.damage = DAMAGE_VARIABLE;
+         weapon.ammoType = AmmoType.T_GAUSS_HEAVY;
+         weapon.minimumRange = 4;
+         weapon.shortRange = 6;
+         weapon.mediumRange = 13;
+         weapon.longRange = 20;
+         weapon.tonnage = 18.0f;
+         weapon.criticals = 11;
+         weapon.flags |= F_DIRECT_FIRE;
+         weapon.explosive = true;
+         weapon.bv = 346;
          
          return weapon;