Thread: [pcgen-commit-svn] SF.net SVN: pcgen:[8735] Trunk/pcgen/code/src/java (Page 3)

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

Revision: 8735
          http://pcgen.svn.sourceforge.net/pcgen/?rev=8735&view=rev
Author:   thpr
Date:     2008-12-30 23:39:10 +0000 (Tue, 30 Dec 2008)

Log Message:
-----------
token fixes & updates for round robin behavior

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/base/TransitionChoice.java
    Trunk/pcgen/code/src/java/pcgen/cdom/choiceset/SpellCasterChoiceSet.java
    Trunk/pcgen/code/src/java/pcgen/cdom/helper/ClassSkillChoiceActor.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsLevelToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/add/FeatToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/add/VFeatToken.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/TransitionChoice.java
===================================================================

--- Trunk/pcgen/code/src/java/pcgen/cdom/base/TransitionChoice.java	2008-12-30 22:31:28 UTC (rev 8734)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/TransitionChoice.java	2008-12-30 23:39:10 UTC (rev 8735)
@@ -197,4 +197,9 @@
 	{
 		return stackLimit == null ? 0 : stackLimit;
 	}
+
+	public ChoiceActor<T> getChoiceActor()
+	{
+		return choiceActor;
+	}
 }

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/choiceset/SpellCasterChoiceSet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/choiceset/SpellCasterChoiceSet.java	2008-12-30 22:31:28 UTC (rev 8734)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/choiceset/SpellCasterChoiceSet.java	2008-12-30 23:39:10 UTC (rev 8735)
@@ -126,6 +126,10 @@
 	public String getLSTformat()
 	{
 		List<String> list = new ArrayList<String>();
+		if (primitives != null)
+		{
+			list.add(primitives.getLSTformat());
+		}
 		if (pcset != null)
 		{
 			list.add(pcset.getLSTformat());
@@ -134,10 +138,6 @@
 		{
 			list.addAll(spelltypes);
 		}
-		if (primitives != null)
-		{
-			list.add(primitives.getLSTformat());
-		}
 		return StringUtil.join(list, Constants.COMMA);
 	}
 
@@ -222,7 +222,7 @@
 	@Override
 	public int hashCode()
 	{
-		return pcset.hashCode() * 29
+		return (pcset == null ? 0 : pcset.hashCode() * 29)
 				+ (primitives == null ? 0 : primitives.hashCode());
 	}
 
@@ -259,10 +259,7 @@
 			}
 			if (primitives == null)
 			{
-				if (other.primitives != null)
-				{
-					return false;
-				}
+				return other.primitives == null;
 			}
 			return primitives.equals(other.primitives);
 		}

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/helper/ClassSkillChoiceActor.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/helper/ClassSkillChoiceActor.java	2008-12-30 22:31:28 UTC (rev 8734)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/helper/ClassSkillChoiceActor.java	2008-12-30 23:39:10 UTC (rev 8735)
@@ -72,4 +72,9 @@
 		pc.addAssoc(pcc, AssociationListKey.CSKILL, pcSkill);
 	}
 
+	public Integer getApplyRank()
+	{
+		return applyRank;
+	}
+
 }

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsLevelToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsLevelToken.java	2008-12-30 22:31:28 UTC (rev 8734)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsLevelToken.java	2008-12-30 23:39:10 UTC (rev 8735)
@@ -157,7 +157,23 @@
 						return false;
 					}
 					String rankString = tokText.substring(9);
-					autoRank = Integer.decode(rankString);
+					try
+					{
+						autoRank = Integer.decode(rankString);
+						if (autoRank <= 0)
+						{
+							Logging.errorPrint("Expected AUTORANK= to be"
+									+ " greater than zero, found: "
+									+ autoRank);
+							return false;
+						}
+					}
+					catch (NumberFormatException e)
+					{
+						Logging.errorPrint("Expected AUTORANK= to have"
+								+ " an integer value, found: " + rankString);
+						return false;
+					}
 				}
 				else
 				{
@@ -184,6 +200,12 @@
 					+ ": Contains ANY and a specific reference: " + value);
 			return false;
 		}
+		if (refs.isEmpty())
+		{
+			Logging.log(Logging.LST_ERROR, "Non-sensical " + getFullName()
+					+ ": Contains no skill reference: " + value);
+			return false;
+		}
 
 		ReferenceChoiceSet<Skill> rcs = new ReferenceChoiceSet<Skill>(refs);
 		ChoiceSet<Skill> cs = new ChoiceSet<Skill>(getTokenName(), rcs);
@@ -230,6 +252,13 @@
 					sb.append(fString).append(Constants.PIPE);
 				}
 				sb.append(cs.getLSTformat());
+				ClassSkillChoiceActor actor = (ClassSkillChoiceActor) container
+						.getChoiceActor();
+				Integer rank = actor.getApplyRank();
+				if (rank != null)
+				{
+					sb.append(Constants.COMMA).append("AUTORANK=" + rank);
+				}
 				addStrings.add(sb.toString());
 			}
 		}

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsToken.java	2008-12-30 22:31:28 UTC (rev 8734)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsToken.java	2008-12-30 23:39:10 UTC (rev 8735)
@@ -156,7 +156,23 @@
 						return false;
 					}
 					String rankString = tokText.substring(9);
-					autoRank = Integer.decode(rankString);
+					try
+					{
+						autoRank = Integer.decode(rankString);
+						if (autoRank <= 0)
+						{
+							Logging.errorPrint("Expected AUTORANK= to be"
+									+ " greater than zero, found: "
+									+ autoRank);
+							return false;
+						}
+					}
+					catch (NumberFormatException e)
+					{
+						Logging.errorPrint("Expected AUTORANK= to have"
+								+ " an integer value, found: " + rankString);
+						return false;
+					}
 				}
 				else
 				{
@@ -183,6 +199,12 @@
 					+ ": Contains ANY and a specific reference: " + value);
 			return false;
 		}
+		if (refs.isEmpty())
+		{
+			Logging.log(Logging.LST_ERROR, "Non-sensical " + getFullName()
+					+ ": Contains no skill reference: " + value);
+			return false;
+		}
 
 		ReferenceChoiceSet<Skill> rcs = new ReferenceChoiceSet<Skill>(refs);
 		ChoiceSet<Skill> cs = new ChoiceSet<Skill>(getTokenName(), rcs);
@@ -226,6 +248,13 @@
 					sb.append(fString).append(Constants.PIPE);
 				}
 				sb.append(cs.getLSTformat());
+				ClassSkillChoiceActor actor = (ClassSkillChoiceActor) container
+						.getChoiceActor();
+				Integer rank = actor.getApplyRank();
+				if (rank != null)
+				{
+					sb.append(Constants.COMMA).append("AUTORANK=" + rank);
+				}
 				addStrings.add(sb.toString());
 			}
 		}

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/FeatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/FeatToken.java	2008-12-30 22:31:28 UTC (rev 8734)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/FeatToken.java	2008-12-30 23:39:10 UTC (rev 8735)
@@ -202,6 +202,12 @@
 					+ ": Contains ANY and a specific reference: " + value);
 			return false;
 		}
+		if (refs.isEmpty())
+		{
+			Logging.log(Logging.LST_ERROR, "Non-sensical " + getFullName()
+					+ ": Contains no ability reference: " + value);
+			return false;
+		}
 
 		AbilityRefChoiceSet rcs = new AbilityRefChoiceSet(category, refs, nature,
 				allowStack, dupChoices);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java	2008-12-30 22:31:28 UTC (rev 8734)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java	2008-12-30 23:39:10 UTC (rev 8735)
@@ -71,30 +71,21 @@
 	public boolean parse(LoadContext context, CDOMObject obj, String value)
 	{
 		int pipeLoc = value.indexOf(Constants.PIPE);
-		int count;
+		Formula count;
 		String items;
 		if (pipeLoc == -1)
 		{
-			count = 1;
+			count = Formula.ONE;
 			items = value;
 		}
 		else
 		{
 			String countString = value.substring(0, pipeLoc);
-			try
+			count = FormulaFactory.getFormulaFor(countString);
+			if (count.isStatic() && count.resolve(null, "").doubleValue() <= 0)
 			{
-				count = Integer.parseInt(countString);
-				if (count < 1)
-				{
-					Logging.log(Logging.LST_ERROR, "Count in " + getFullName()
-							+ " must be > 0");
-					return false;
-				}
-			}
-			catch (NumberFormatException nfe)
-			{
-				Logging.log(Logging.LST_ERROR, "Invalid Count in " + getFullName() + ": "
-						+ countString);
+				Logging.log(Logging.LST_ERROR, "Count in " + getFullName()
+								+ " must be > 0");
 				return false;
 			}
 			items = value.substring(pipeLoc + 1);
@@ -167,7 +158,7 @@
 				: new ReferenceChoiceSet<PCClass>(prims);
 		ChoiceSet<PCClass> cs = new SpellCasterChoiceSet(allRef, spelltypes, grcs, prcs);
 		PersistentTransitionChoice<PCClass> tc = new PersistentTransitionChoice<PCClass>(
-				cs, FormulaFactory.getFormulaFor(count));
+				cs, count);
 		tc.setTitle("Spell Caster Class Choice");
 		context.getObjectContext().addToList(obj, ListKey.ADD, tc);
 		tc.setChoiceActor(this);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/VFeatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/VFeatToken.java	2008-12-30 22:31:28 UTC (rev 8734)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/VFeatToken.java	2008-12-30 23:39:10 UTC (rev 8735)
@@ -203,6 +203,12 @@
 					+ ": Contains ANY and a specific reference: " + value);
 			return false;
 		}
+		if (refs.isEmpty())
+		{
+			Logging.log(Logging.LST_ERROR, "Non-sensical " + getFullName()
+					+ ": Contains no ability reference: " + value);
+			return false;
+		}
 
 		AbilityRefChoiceSet rcs = new AbilityRefChoiceSet(category, refs,
 				nature, allowStack, dupChoices);


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:[8735] Trunk/pcgen/code/src/java (Page 3)

RPG character generator for RPG d20 systems.

pcgen-commit-svn