From: <boo...@us...> - 2006-04-15 01:49:38
|
Revision: 800 Author: boomer70 Date: 2006-04-14 18:49:34 -0700 (Fri, 14 Apr 2006) ViewCVS: http://svn.sourceforge.net/pcgen/?rev=800&view=rev Log Message: ----------- Last minor fixes for wieldcategories when SIZEOBJ is set and using 3.5 data. Includes a fix for [ 1410949 ] gnome cannot equip longsword, but can equip greatclub. Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java Modified: Trunk/pcgen/code/src/java/pcgen/core/Equipment.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2006-04-15 01:33:22 UTC (rev 799) +++ Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2006-04-15 01:49:34 UTC (rev 800) @@ -4669,7 +4669,7 @@ if (profName == null || profName.length() == 0) { return this.getName(); - } + } return profName; } @@ -7251,13 +7251,13 @@ WieldCategory wCat = null; WeaponProf wp = getExpandedWeaponProf(aPC); - if (hasWield()) + + // Get this equipments WieldCategory from gameMode + wCat = WieldCategory.findByName(getWield()); + + if (hasWield() && !Globals.checkRule(RuleConstants.SIZEOBJ)) { - // Get this equipments WieldCategory from gameMode - wCat = WieldCategory.findByName(getWield()); - // Get the starting effective wield category - // TODO Fix this nonsense wCat = wCat.adjustForSize(aPC, this); } else @@ -7330,6 +7330,11 @@ // or a bonus from the weapon itself aBump += (int) bonusTo(aPC, "WEAPON", "WIELDCATEGORY", true); + if (aBump == 0) + { + return wCat; + } + return wCat.getWieldCategoryStep(aBump); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |