From: <jde...@us...> - 2008-09-27 11:58:44
|
Revision: 7803 http://pcgen.svn.sourceforge.net/pcgen/?rev=7803&view=rev Author: jdempsey Date: 2008-09-27 11:58:41 +0000 (Sat, 27 Sep 2008) Log Message: ----------- FReq: Skill BONUS explanation improvement Issue#: 2002109 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/analysis/SkillModifier.java Added Paths: ----------- Trunk/pcgen/code/src/test/pcgen/core/analysis/ Trunk/pcgen/code/src/test/pcgen/core/analysis/SkillModifierTest.java Modified: Trunk/pcgen/code/src/java/pcgen/core/analysis/SkillModifier.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/analysis/SkillModifier.java 2008-09-27 07:04:45 UTC (rev 7802) +++ Trunk/pcgen/code/src/java/pcgen/core/analysis/SkillModifier.java 2008-09-27 11:58:41 UTC (rev 7803) @@ -21,6 +21,7 @@ package pcgen.core.analysis; import java.util.ArrayList; +import java.util.List; import java.util.regex.Pattern; import pcgen.cdom.enumeration.ObjectKey; @@ -158,26 +159,49 @@ double bonusObjTotal = 0.0; StringBuffer bonusDetails = new StringBuffer(); String keyName = sk.getKeyName(); + String bonusKey = ("SKILL." + keyName).toUpperCase(); for (BonusObj bonus : aPC.getActiveBonusList()) { // calculate bonus and add to activeBonusMap - if (bonus.isApplied() && "SKILL".equals(bonus.getBonusName()) - && bonus.getBonusInfoList().contains(keyName.toUpperCase())) + if (bonus.isApplied() && "SKILL".equals(bonus.getBonusName())) { - double iBonus = 0; - for (BonusPair bp : bonus.getStringListFromBonus()) + boolean include = + bonus.getBonusInfoList() + .contains(keyName.toUpperCase()); + if (!include) { - iBonus += bp.resolve(aPC).doubleValue(); + for (BonusPair bp : bonus.getStringListFromBonus()) + { + String bpKey = bp.bonusKey.toUpperCase(); + if (bpKey.startsWith(bonusKey)) + { + include = true; + break; + } + } } - if (!CoreUtility.doublesEqual(iBonus, 0.0)) + + if (include) { - if (bonusDetails.length() > 0) + double iBonus = 0; + for (BonusPair bp : bonus.getStringListFromBonus()) { - bonusDetails.append(' '); + String bpKey = bp.bonusKey.toUpperCase(); + if (bpKey.startsWith(bonusKey)) + { + iBonus += bp.resolve(aPC).doubleValue(); + } } - bonusDetails.append(Delta.toString((int) iBonus)); - bonusDetails.append(bonus.getBonusContext(shortForm)); - bonusObjTotal += iBonus; + if (!CoreUtility.doublesEqual(iBonus, 0.0)) + { + if (bonusDetails.length() > 0) + { + bonusDetails.append(' '); + } + bonusDetails.append(Delta.toString((int) iBonus)); + bonusDetails.append(bonus.getBonusContext(shortForm)); + bonusObjTotal += iBonus; + } } } } Added: Trunk/pcgen/code/src/test/pcgen/core/analysis/SkillModifierTest.java =================================================================== --- Trunk/pcgen/code/src/test/pcgen/core/analysis/SkillModifierTest.java (rev 0) +++ Trunk/pcgen/code/src/test/pcgen/core/analysis/SkillModifierTest.java 2008-09-27 11:58:41 UTC (rev 7803) @@ -0,0 +1,135 @@ +/* + * SkillModifierTest.java + * Copyright 2008 (C) James Dempsey + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Created on 27/09/2008 21:04:10 + * + * $Id: $ + */ +package pcgen.core.analysis; + +import org.junit.Test; + +import pcgen.AbstractCharacterTestCase; +import pcgen.cdom.enumeration.ObjectKey; +import pcgen.cdom.enumeration.SkillArmorCheck; +import pcgen.core.Ability; +import pcgen.core.AbilityCategory; +import pcgen.core.AssociatedChoice; +import pcgen.core.Globals; +import pcgen.core.PCClass; +import pcgen.core.PlayerCharacter; +import pcgen.core.Race; +import pcgen.core.Skill; +import pcgen.util.TestHelper; + +/** + * The Class <code>SkillModifierTest</code> is responsible for checking that the + * SkillModifier class is operating correctly. + * + * Last Editor: $Author: $ + * Last Edited: $Date: $ + * + * @author James Dempsey <jde...@us...> + * @version $Revision: $ + */ +public class SkillModifierTest extends AbstractCharacterTestCase +{ + + PCClass pcClass; + Race emptyRace = new Race(); + boolean firstTime = true; + Ability skillFocus = new Ability(); + Ability persuasive = new Ability(); + Skill bluff; + + /* (non-Javadoc) + * @see pcgen.AbstractCharacterTestCase#setUp() + */ + @Override + protected void setUp() throws Exception + { + super.setUp(); + + if (firstTime) + { + firstTime = false; + + pcClass = new PCClass(); + + TestHelper.makeSkill("Bluff", "Charisma", "CHA", true, + SkillArmorCheck.NONE); + TestHelper.makeSkill("Listen", "Wisdom", "WIS", true, + SkillArmorCheck.NONE); + + skillFocus = + TestHelper.makeAbility("Skill Focus", AbilityCategory.FEAT + .getAbilityCategory(), "General"); + skillFocus.addBonusList("SKILL|LIST|3"); + skillFocus.put(ObjectKey.MULTIPLE_ALLOWED, true); + skillFocus + .setChoiceString("SKILLSNAMED|TYPE.Strength|TYPE.Dexterity|TYPE.Constitution|TYPE.Intelligence|TYPE.Wisdom|TYPE.Charisma"); + + persuasive = + TestHelper.makeAbility("Persuasive", AbilityCategory.FEAT + .getAbilityCategory(), "General"); + persuasive.addBonusList("SKILL|KEY_Bluff,KEY_Listen|2"); + persuasive.put(ObjectKey.MULTIPLE_ALLOWED, false); + + } + + final PlayerCharacter character = getCharacter(); + character.incrementClassLevel(1, pcClass); + } + + /* (non-Javadoc) + * @see pcgen.AbstractCharacterTestCase#tearDown() + */ + @Override + protected void tearDown() throws Exception + { + pcClass = null; + super.tearDown(); + } + + /** + * Test getModifierExplanation for both lists and multiple + * bonus feats. + */ + @Test + public void testGetModifierExplanation() + { + bluff = + Globals.getContext().ref.silentlyGetConstructedCDOMObject( + Skill.class, "KEY_bluff"); + PlayerCharacter pc = getCharacter(); + + assertEquals("Initial state", "", SkillModifier.getModifierExplanation( + bluff, pc, false)); + + skillFocus.addAssociated(new AssociatedChoice<String>("KEY_Bluff")); + pc.addAbility(AbilityCategory.FEAT, skillFocus, null); + assertEquals("Bonus after skill focus", "+3[Skill Focus]", + SkillModifier.getModifierExplanation(bluff, pc, false)); + + pc.addAbility(AbilityCategory.FEAT, persuasive, null); + assertEquals("Bonus after persuasive", + "+3[Skill Focus] +2[Persuasive]", SkillModifier + .getModifierExplanation(bluff, pc, false)); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |