From: <jde...@us...> - 2006-10-14 11:42:38
|
Revision: 1471 http://svn.sourceforge.net/pcgen/?rev=1471&view=rev Author: jdempsey Date: 2006-10-14 04:42:27 -0700 (Sat, 14 Oct 2006) Log Message: ----------- Correct natural weapon proficiency processing where the natural weapon is not equipped. Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Trunk/pcgen/code/testsuite/csheets/CloudGiantHalfDragon.xml Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2006-10-14 06:52:13 UTC (rev 1470) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2006-10-14 11:42:27 UTC (rev 1471) @@ -11877,7 +11877,8 @@ // Equipment for (Equipment eq : getEquipmentList()) { - if (eq.isEquipped()) + // Include natural weapons by default as they have an effect even if not equipped. + if (eq.isEquipped() || eq.isNatural()) { results.add(eq); @@ -11974,6 +11975,10 @@ return aList; } + /** + * @todo Need to confirm that getSkillList is sorted, or switch to brute force search + * @param level + */ private void addNewSkills(final int level) { final List<Skill> addItems = new ArrayList<Skill>(); Modified: Trunk/pcgen/code/testsuite/csheets/CloudGiantHalfDragon.xml =================================================================== --- Trunk/pcgen/code/testsuite/csheets/CloudGiantHalfDragon.xml 2006-10-14 06:52:13 UTC (rev 1470) +++ Trunk/pcgen/code/testsuite/csheets/CloudGiantHalfDragon.xml 2006-10-14 11:42:27 UTC (rev 1471) @@ -1433,7 +1433,7 @@ <!-- Domains --> - <weapon_proficiencies>Axe (Throwing), Battleaxe, Bite, Claw, Club, Crossbow (Heavy), Crossbow (Light), Dagger, Dagger (Punching), Dart, Falchion, Flail, Flail (Heavy), Gauntlet, Gauntlet (Spiked), Glaive, Greataxe, Greatclub, Greatsword, Guisarme, Halberd, Hammer (Light), Handaxe, Javelin, Kukri, Lance, Longbow, Longspear, Longsword, Mace (Heavy), Mace (Light), Morningstar, Pick (Heavy), Pick (Light), Quarterstaff, Ranseur, Rapier, Sap, Scimitar, Scythe, Shieldbash (Heavy), Shieldbash (Light), Shortbow, Shortspear, Sickle, Slam, Sling, Spear, Spells(Ray), Spiked Armor, Sword (Bastard), Sword (Short), Thrown Rock, Trident, Unarmed Strike, Waraxe (Dwarven), Warhammer</weapon_proficiencies> + <weapon_proficiencies>Axe (Throwing), Battleaxe, Bite, Claw, Club, Crossbow (Heavy), Crossbow (Light), Dagger, Dagger (Punching), Dart, Falchion, Flail, Flail (Heavy), Gauntlet, Gauntlet (Spiked), Glaive, Greataxe, Greatclub, Greatsword, Guisarme, Halberd, Hammer (Light), Handaxe, Javelin, Kukri, Lance, Longbow, Longspear, Longsword, Mace (Heavy), Mace (Light), Morningstar, Pick (Heavy), Pick (Light), Quarterstaff, Ranseur, Rapier, Sap, Scimitar, Scythe, Shieldbash (Heavy), Shieldbash (Light), Shortbow, Shortspear, Sickle, Slam, Sling, Spear, Spells(Ray), Spiked Armor, Sword (Bastard), Sword (Short), Trident, Unarmed Strike, Waraxe (Dwarven), Warhammer</weapon_proficiencies> <languages>Giant</languages> <templates> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |