Thread: [pcgen-commit-svn] SF.net SVN: pcgen:[25718] Trunk/pcgen/code/src (Page 24)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 25718
          http://sourceforge.net/p/pcgen/code/25718
Author:   jdempsey
Date:     2014-12-06 05:56:41 +0000 (Sat, 06 Dec 2014)
Log Message:
-----------
Fix bug: CLASSLIST= and DOMAINLIST= should not be PC dependent
Issue#: CODE-2647

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/facet/MasterAvailableSpellFacet.java
    Trunk/pcgen/code/src/java/pcgen/core/analysis/SpellLevel.java
    Trunk/pcgen/code/src/java/plugin/primitive/spell/ClassListToken.java
    Trunk/pcgen/code/src/java/plugin/primitive/spell/DomainListToken.java
    Trunk/pcgen/code/src/test/pcgen/gui2/facade/CharacterAbilitiesTest.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/facet/MasterAvailableSpellFacet.java
===================================================================

--- Trunk/pcgen/code/src/java/pcgen/cdom/facet/MasterAvailableSpellFacet.java	2014-12-06 02:17:19 UTC (rev 25717)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/facet/MasterAvailableSpellFacet.java	2014-12-06 05:56:41 UTC (rev 25718)
@@ -116,7 +116,31 @@
 
 		return spellsInList;
 	}
+	
+	/**
+	 * Retrieve a list of any occurrence of a specific spell in the particular spell list. 
+	 * @param spellList The list to be queried
+	 * @param dsID The owning data set
+	 * @param spell The spell to be found.
+	 * @return The list of available spells.
+	 */
+	public List<AvailableSpell> getMatchingSpellsInList(
+		CDOMList<Spell> spellList, DataSetID dsID, Spell spell)
+	{
+		List<AvailableSpell> spellsInList = new ArrayList<AvailableSpell>();
+		Collection<AvailableSpell> spells = getSet(dsID);
+		for (AvailableSpell as : spells)
+		{
+			if (as.getSpelllist().equals(spellList)
+				&& as.getSpell().equals(spell))
+			{
+				spellsInList.add(as);
+			}
+		}
 
+		return spellsInList;
+	}
+
 	public void setDataSetInitializationFacet(
 		DataSetInitializationFacet datasetInitializationFacet)
 	{

Modified: Trunk/pcgen/code/src/java/pcgen/core/analysis/SpellLevel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/analysis/SpellLevel.java	2014-12-06 02:17:19 UTC (rev 25717)
+++ Trunk/pcgen/code/src/java/pcgen/core/analysis/SpellLevel.java	2014-12-06 05:56:41 UTC (rev 25718)
@@ -62,6 +62,15 @@
 		return list.toArray(new Integer[list.size()]);
 	}
 
+	/**
+	 * Retrieve the first level that the pc receives the spell from the specified list. Note that this only returns 
+	 * spells that the pc has available.
+	 * 
+	 * @param sp The spell to be found.
+	 * @param list The spell list (e.g. a class spell list)
+	 * @param aPC The character who must already have the spell.
+	 * @return The level of the spell, or -1 if not found.
+	 */
 	public static int getFirstLvlForKey(Spell sp, CDOMList<Spell> list,
 			PlayerCharacter aPC)
 	{

Modified: Trunk/pcgen/code/src/java/plugin/primitive/spell/ClassListToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/primitive/spell/ClassListToken.java	2014-12-06 02:17:19 UTC (rev 25717)
+++ Trunk/pcgen/code/src/java/plugin/primitive/spell/ClassListToken.java	2014-12-06 05:56:41 UTC (rev 25718)
@@ -17,13 +17,14 @@
  */
 package plugin.primitive.spell;
 
-import java.util.Collections;
-
+import pcgen.cdom.enumeration.DataSetID;
 import pcgen.cdom.enumeration.GroupingState;
+import pcgen.cdom.facet.FacetLibrary;
+import pcgen.cdom.facet.MasterAvailableSpellFacet;
+import pcgen.cdom.helper.AvailableSpell;
 import pcgen.cdom.list.ClassSpellList;
 import pcgen.cdom.reference.CDOMSingleRef;
 import pcgen.core.PlayerCharacter;
-import pcgen.core.analysis.SpellLevel;
 import pcgen.core.spell.Spell;
 import pcgen.rules.context.LoadContext;
 import pcgen.rules.persistence.token.AbstractRestrictedSpellPrimitive;
@@ -31,6 +32,7 @@
 public class ClassListToken extends AbstractRestrictedSpellPrimitive
 {
 	private CDOMSingleRef<ClassSpellList> spelllist;
+	private MasterAvailableSpellFacet masterAvailableSpellFacet;
 
 	@Override
 	public boolean initialize(LoadContext context, Class<Spell> cl,
@@ -41,6 +43,7 @@
 			return false;
 		}
 		spelllist = context.getReferenceContext().getCDOMReference(ClassSpellList.class, value);
+		masterAvailableSpellFacet = FacetLibrary.getFacet(MasterAvailableSpellFacet.class);	
 		return initialize(context, args);
 	}
 
@@ -54,9 +57,11 @@
 	public boolean allow(PlayerCharacter pc, Spell spell)
 	{
 		ClassSpellList list = spelllist.resolvesTo();
-		for (int level : SpellLevel.levelForKey(spell, Collections
-				.singletonList(list), pc))
+		DataSetID datasetID = pc.getCharID().getDatasetID();
+		
+		for (AvailableSpell availSpell : masterAvailableSpellFacet.getMatchingSpellsInList(list, datasetID, spell))
 		{
+			int level = availSpell.getLevel();
 			if ((level >= 0) && allow(pc, level, "", spell, list))
 			{
 				return true;

Modified: Trunk/pcgen/code/src/java/plugin/primitive/spell/DomainListToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/primitive/spell/DomainListToken.java	2014-12-06 02:17:19 UTC (rev 25717)
+++ Trunk/pcgen/code/src/java/plugin/primitive/spell/DomainListToken.java	2014-12-06 05:56:41 UTC (rev 25718)
@@ -17,13 +17,14 @@
  */
 package plugin.primitive.spell;
 
-import java.util.Collections;
-
+import pcgen.cdom.enumeration.DataSetID;
 import pcgen.cdom.enumeration.GroupingState;
+import pcgen.cdom.facet.FacetLibrary;
+import pcgen.cdom.facet.MasterAvailableSpellFacet;
+import pcgen.cdom.helper.AvailableSpell;
 import pcgen.cdom.list.DomainSpellList;
 import pcgen.cdom.reference.CDOMSingleRef;
 import pcgen.core.PlayerCharacter;
-import pcgen.core.analysis.SpellLevel;
 import pcgen.core.spell.Spell;
 import pcgen.rules.context.LoadContext;
 import pcgen.rules.persistence.token.AbstractRestrictedSpellPrimitive;
@@ -31,6 +32,7 @@
 public class DomainListToken extends AbstractRestrictedSpellPrimitive
 {
 	private CDOMSingleRef<DomainSpellList> spelllist;
+	private MasterAvailableSpellFacet masterAvailableSpellFacet;
 
 	@Override
 	public boolean initialize(LoadContext context, Class<Spell> cl,
@@ -41,6 +43,7 @@
 			return false;
 		}
 		spelllist = context.getReferenceContext().getCDOMReference(DomainSpellList.class, value);
+		masterAvailableSpellFacet = FacetLibrary.getFacet(MasterAvailableSpellFacet.class);	
 		return initialize(context, args);
 	}
 
@@ -54,9 +57,11 @@
 	public boolean allow(PlayerCharacter pc, Spell spell)
 	{
 		DomainSpellList list = spelllist.resolvesTo();
-		for (int level : SpellLevel.levelForKey(spell, Collections
-				.singletonList(list), pc))
+		DataSetID datasetID = pc.getCharID().getDatasetID();
+		
+		for (AvailableSpell availSpell : masterAvailableSpellFacet.getMatchingSpellsInList(list, datasetID, spell))
 		{
+			int level = availSpell.getLevel();
 			if ((level >= 0) && allow(pc, level, "", spell, list))
 			{
 				return true;

Modified: Trunk/pcgen/code/src/test/pcgen/gui2/facade/CharacterAbilitiesTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/gui2/facade/CharacterAbilitiesTest.java	2014-12-06 02:17:19 UTC (rev 25717)
+++ Trunk/pcgen/code/src/test/pcgen/gui2/facade/CharacterAbilitiesTest.java	2014-12-06 05:56:41 UTC (rev 25718)
@@ -106,9 +106,10 @@
 		Globals.getContext().commit();
 		applyAbility(pc, AbilityCategory.FEAT, reading, "Books");
 		abilities = ca.getAbilities(AbilityCategory.FEAT);
-		assertEquals("Feat list should have one entry", 1, abilities.getSize());
+		assertFalse("Feat list should not be empty", abilities.isEmpty());
 		Ability abilityFromList = (Ability) abilities.getElementAt(0);
 		assertEquals("Should have found reading", reading, abilityFromList);
+		assertEquals("Feat list should have one entry", 1, abilities.getSize());
 
 		// Now add the choice
 		finalize(abilityFromList, "Magazines", pc, AbilityCategory.FEAT);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [pcgen-commit-svn] SF.net SVN: pcgen:[25718] Trunk/pcgen/code/src (Page 24)

RPG character generator for RPG d20 systems.

pcgen-commit-svn