[Megamek-cvs] SF.net SVN: megamek:[6435] trunk/megamek

[<to...@us...>]

Revision: 6435
          http://megamek.svn.sourceforge.net/megamek/?rev=6435&view=rev
Author:   torren
Date:     2009-02-19 18:58:56 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
+ Updated Armored Crits code

Modified Paths:
--------------
    trunk/megamek/docs/history.txt
    trunk/megamek/src/megamek/common/Mounted.java

Modified: trunk/megamek/docs/history.txt
===================================================================
--- trunk/megamek/docs/history.txt	2009-02-19 18:05:22 UTC (rev 6434)
+++ trunk/megamek/docs/history.txt	2009-02-19 18:58:56 UTC (rev 6435)
@@ -35,6 +35,7 @@
 + Bug: Direct-fire artillery is +4 to-hit, not +5 (TacOps, pg. 185)
 + Bug: ProtoMechs not causing 1 CF damage to buildings when entering.
 + Bug 2414528: BA jumping into a building should need PSR to avoid damage
++ Updated Armored Crits code
 
 v0.33.40 (2009-02-08, 2:27 UTC+1)
 + Reorganized game options so that unofficial options are integrated into the appropriate tabs

Modified: trunk/megamek/src/megamek/common/Mounted.java
===================================================================
--- trunk/megamek/src/megamek/common/Mounted.java	2009-02-19 18:05:22 UTC (rev 6434)
+++ trunk/megamek/src/megamek/common/Mounted.java	2009-02-19 18:58:56 UTC (rev 6435)
@@ -1041,10 +1041,12 @@
 
     public void setArmored(boolean armored) {
         // Ammobins cannot be armored.
-        if (!(getType() instanceof AmmoType)) {
+        if (getType() instanceof AmmoType) {
+            armoredComponent = false;
+        } else if (getType() instanceof MiscType && (getType().hasFlag(MiscType.F_HARJEL) || getType().hasFlag(MiscType.F_SPIKES) || getType().hasFlag(MiscType.F_REACTIVE) || getType().hasFlag(MiscType.F_MODULAR_ARMOR) || ((MiscType) getType()).isShield())) {
+                armoredComponent = false;
+        } else {
             armoredComponent = armored;
-        } else {
-            armoredComponent = false;
         }
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.