From: <th...@us...> - 2012-12-30 17:24:23
|
Revision: 18896 http://sourceforge.net/p/pcgen/code/18896 Author: thpr Date: 2012-12-30 17:24:19 +0000 (Sun, 30 Dec 2012) Log Message: ----------- Unwind character-specific (CharacterSpell knowledge) out of KnownSpellFacet Issue#: CODE-1907 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/cdom/facet/KnownSpellFacet.java Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/KnownSpellFacet.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/cdom/facet/KnownSpellFacet.java 2012-12-30 17:10:31 UTC (rev 18895) +++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/KnownSpellFacet.java 2012-12-30 17:24:19 UTC (rev 18896) @@ -34,12 +34,8 @@ import pcgen.cdom.base.PrereqObject; import pcgen.cdom.enumeration.AssociationKey; import pcgen.cdom.enumeration.CharID; -import pcgen.cdom.enumeration.ObjectKey; import pcgen.cdom.facet.base.AbstractStorageFacet; import pcgen.cdom.list.ClassSpellList; -import pcgen.core.Globals; -import pcgen.core.PCClass; -import pcgen.core.character.CharacterSpell; import pcgen.core.spell.Spell; /** @@ -448,41 +444,6 @@ return spellList; } - /** - * Add to the supplied list the additional known spells for the class that - * are specified by SPELLKNOWN tags associated with the character. Any - * existing contents of the list are preserved. - * - * @param id - * The character being tested - * @param aClass - * The PC class being checked - * @param cSpells - * The list to be populated with the spells - */ - public void addBonusKnownSpellsToList(CharID id, CDOMObject aClass, - List<CharacterSpell> cSpells) - { - if (!(aClass instanceof PCClass)) - { - return; - } - ClassSpellList classSpellList = - ((PCClass) aClass).get(ObjectKey.CLASS_SPELLLIST); - Map<Integer, List<Spell>> spellsMap = - getKnownSpells(id, classSpellList); - for (Integer spellLevel : spellsMap.keySet()) - { - List<Spell> spells = spellsMap.get(spellLevel); - for (Spell spell : spells) - { - CharacterSpell acs = new CharacterSpell(aClass, spell); - acs.addInfo(spellLevel, 1, Globals.getDefaultSpellBook()); - cSpells.add(acs); - } - } - } - public void setPrerequisiteFacet(PrerequisiteFacet prerequisiteFacet) { this.prerequisiteFacet = prerequisiteFacet; Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2012-12-30 17:10:31 UTC (rev 18895) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2012-12-30 17:24:19 UTC (rev 18896) @@ -207,6 +207,7 @@ import pcgen.cdom.inst.ObjectCache; import pcgen.cdom.inst.PCClassLevel; import pcgen.cdom.list.AbilityList; +import pcgen.cdom.list.ClassSpellList; import pcgen.cdom.list.CompanionList; import pcgen.cdom.list.DomainSpellList; import pcgen.cdom.reference.CDOMGroupRef; @@ -10924,9 +10925,27 @@ return defaultValue; } - public void addBonusKnownSpellsToList(CDOMObject obj, List<CharacterSpell> list) + public void addBonusKnownSpellsToList(CDOMObject aClass, + List<CharacterSpell> cSpells) { - knownSpellFacet.addBonusKnownSpellsToList(id, obj, list); + if (!(aClass instanceof PCClass)) + { + return; + } + ClassSpellList classSpellList = + ((PCClass) aClass).get(ObjectKey.CLASS_SPELLLIST); + Map<Integer, List<Spell>> spellsMap = + knownSpellFacet.getKnownSpells(id, classSpellList); + for (Integer spellLevel : spellsMap.keySet()) + { + List<Spell> spells = spellsMap.get(spellLevel); + for (Spell spell : spells) + { + CharacterSpell acs = new CharacterSpell(aClass, spell); + acs.addInfo(spellLevel, 1, Globals.getDefaultSpellBook()); + cSpells.add(acs); + } + } } public boolean hasBonusWeaponProfs(CDOMObject owner) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |