From: <th...@us...> - 2008-06-29 18:57:19
|
Revision: 6946 http://pcgen.svn.sourceforge.net/pcgen/?rev=6946&view=rev Author: thpr Date: 2008-06-29 11:57:29 -0700 (Sun, 29 Jun 2008) Log Message: ----------- more small refactoring on BONUS Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/PObject.java Trunk/pcgen/code/src/test/pcgen/core/bonus/BonusTest.java Modified: Trunk/pcgen/code/src/java/pcgen/core/PObject.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PObject.java 2008-06-29 18:54:21 UTC (rev 6945) +++ Trunk/pcgen/code/src/java/pcgen/core/PObject.java 2008-06-29 18:57:29 UTC (rev 6946) @@ -4127,8 +4127,17 @@ iTimes = 1; } } + double r; + if (aBonus.isValueStatic()) + { + r = aBonus.getValueAsdouble(); + } + else + { + r = calculatePartialFormulaBonus(aBonus.getValue(), listString, aPC); + } - return iTimes * calcPartialBonus(aBonus, listString, aPC); + return iTimes * r; } /** @@ -4706,16 +4715,19 @@ */ public double calcPartialBonus(final BonusObj aBonus, final String listString, final PlayerCharacter aPC) { + double r; if (aBonus.isValueStatic()) { - return aBonus.getValueAsdouble(); + r = aBonus.getValueAsdouble(); } - String aVal = aBonus.getValue(); - - return calculatePartialFormulaBonus(aVal, listString, aPC); + else + { + r = calculatePartialFormulaBonus(aBonus.getValue(), listString, aPC); + } + return r; } - private double calculatePartialFormulaBonus(String aVal, + public double calculatePartialFormulaBonus(String aVal, final String listString, final PlayerCharacter aPC) { if (listString != null) Modified: Trunk/pcgen/code/src/test/pcgen/core/bonus/BonusTest.java =================================================================== --- Trunk/pcgen/code/src/test/pcgen/core/bonus/BonusTest.java 2008-06-29 18:54:21 UTC (rev 6945) +++ Trunk/pcgen/code/src/test/pcgen/core/bonus/BonusTest.java 2008-06-29 18:57:29 UTC (rev 6946) @@ -219,8 +219,8 @@ testBonus.addAssociated("INT"); bonus.setCreatorObject(testBonus); character.addFeat(testBonus, null); - - int bonusVal = (int) testBonus.calcPartialBonus(bonus, "VISION.DARKVISION:MAGICAL BOON", character); + int bonusVal = (int) testBonus.calculatePartialFormulaBonus(bonus.getValue(), + "VISION.DARKVISION:MAGICAL BOON", character); assertEquals(14, bonusVal); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |