From: <th...@us...> - 2008-10-04 01:00:37
|
Revision: 7894 http://pcgen.svn.sourceforge.net/pcgen/?rev=7894&view=rev Author: thpr Date: 2008-10-04 01:00:34 +0000 (Sat, 04 Oct 2008) Log Message: ----------- [ 2115669 ] ARMORTYPE:Medium|Light broken. Issue#: 2115669 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/cdom/modifier/ChangeArmorType.java Trunk/pcgen/code/src/java/pcgen/core/Equipment.java Modified: Trunk/pcgen/code/src/java/pcgen/cdom/modifier/ChangeArmorType.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/cdom/modifier/ChangeArmorType.java 2008-10-04 00:19:45 UTC (rev 7893) +++ Trunk/pcgen/code/src/java/pcgen/cdom/modifier/ChangeArmorType.java 2008-10-04 01:00:34 UTC (rev 7894) @@ -77,8 +77,8 @@ // throw new IllegalArgumentException( // "Resulting Type for ChangeArmorType cannot be null"); // } - result = resultType; - source = sourceType; + result = resultType.toUpperCase(); + source = sourceType.toUpperCase(); } /** @@ -104,7 +104,7 @@ */ public String applyModifier(String obj, Object context) { - return source.equals(obj) ? result : obj; + return source.equalsIgnoreCase(obj) ? result : obj; } /** Modified: Trunk/pcgen/code/src/java/pcgen/core/Equipment.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2008-10-04 00:19:45 UTC (rev 7893) +++ Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2008-10-04 01:00:34 UTC (rev 7894) @@ -4635,7 +4635,7 @@ // // Use the primary type(s) if none defined for secondary // - final List<String> calculatedTypeList; + List<String> calculatedTypeList; if (bPrimary || (getAltTypeCount() == 0)) { calculatedTypeList = new ArrayList<String>(getTypeList(false)); @@ -4669,6 +4669,12 @@ } } + /* + * CONSIDER I think there is a weird order of operations issue nere, need to check + * if it existed way back, e.g. SVN 6206. The issue is if a Type is introduced by a + * MOD, then the ChangeArmorType system doesn't seem to be able to grab/modify it + * Is that correct? - thpr 10/3/08 + */ // // Add in all of the types from each EquipmentModifier // currently applied to this piece of equipment @@ -4695,6 +4701,7 @@ List<String> removedTypeList = new ArrayList<String>(calculatedTypeList); removedTypeList.removeAll(newTypeList); modTypeList.removeAll(removedTypeList); + calculatedTypeList = newTypeList; for (String aType : eqMod.getSafeListFor(ListKey.ITEM_TYPES)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |