|
From: <nu...@us...> - 2006-04-12 01:22:06
|
Revision: 764 Author: nuance Date: 2006-04-11 18:21:53 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pcgen/?rev=764&view=rev Log Message: ----------- Update lots of code that was using setFeats to use adjust Feats. Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/PCClass.java Trunk/pcgen/code/src/java/pcgen/core/kit/KitAbilities.java Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbility.java Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilitySpecial.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSummary.java Modified: Trunk/pcgen/code/src/java/pcgen/core/PCClass.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2006-04-12 01:20:34 UTC (rev 763) +++ Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2006-04-12 01:21:53 UTC (rev 764) @@ -4404,7 +4404,7 @@ if ((levAbility.level() == level) && levAbility.isFeat()) { - aPC.setFeats(aPC.getFeats() - 1); + aPC.adjustFeats( - 1); } } } @@ -4417,7 +4417,7 @@ setHitPoint(level - 1, zeroInt); } - aPC.setFeats( aPC.getFeats() - aPC.getBonusFeatsForNewLevel(this) ); + aPC.adjustFeats( - aPC.getBonusFeatsForNewLevel(this) ); setLevel(newLevel, aPC); removeKnownSpellsForClassLevel(aPC); @@ -5161,10 +5161,8 @@ final double postFeatCount = aPC.getUsedFeatCount(); - // // Adjust the feat count by the total number that were given - // - aPC.setFeats((aPC.getFeats() + postFeatCount) - preFeatCount); + aPC.adjustFeats(postFeatCount - preFeatCount); } } } Modified: Trunk/pcgen/code/src/java/pcgen/core/kit/KitAbilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/kit/KitAbilities.java 2006-04-12 01:20:34 UTC (rev 763) +++ Trunk/pcgen/code/src/java/pcgen/core/kit/KitAbilities.java 2006-04-12 01:21:53 UTC (rev 764) @@ -246,7 +246,7 @@ if (free == true) { // Need to pay for it first - aPC.setFeats(aPC.getFeats() + 1); + aPC.adjustFeats(1); } AbilityUtilities.modFeat(aPC, null, Info.toString(), true, false); @@ -276,7 +276,7 @@ if (free == true) { - aPC.setFeats(aPC.getFeats() + 1); + aPC.adjustFeats(1); } } } Modified: Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbility.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbility.java 2006-04-12 01:20:34 UTC (rev 763) +++ Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbility.java 2006-04-12 01:21:53 UTC (rev 764) @@ -519,7 +519,6 @@ if ("FEAT".equals(thisString)) { aPC.adjustFeats(-1); -// aPC.setFeats(aPC.getFeats() - 1); } else if (thisString.startsWith("INIT|")) { Modified: Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilitySpecial.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilitySpecial.java 2006-04-12 01:20:34 UTC (rev 763) +++ Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilitySpecial.java 2006-04-12 01:21:53 UTC (rev 764) @@ -95,7 +95,7 @@ if ("Free Feat".equals(selection)) { - aPC.setFeats(aPC.getFeats() + 1); + aPC.adjustFeats(1); continue; } Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSummary.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSummary.java 2006-04-12 01:20:34 UTC (rev 763) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSummary.java 2006-04-12 01:21:53 UTC (rev 764) @@ -2307,9 +2307,7 @@ // if (makeChange) { - double featPool = pc.getRawFeats(false); - featPool -= poolMod; - pc.setFeats(featPool); + pc.adjustFeats(- poolMod); showPointPool(); } } @@ -3101,9 +3099,7 @@ } } - double featPool = pc.getRawFeats(false); - featPool -= poolMod; - pc.setFeats(featPool); + pc.adjustFeats( - poolMod); showPointPool(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |