[pcgen-commit-svn] SF.net SVN: pcgen:[12380] Trunk/pcgen/code/src/java/pcgen/core

[<th...@us...>]

Revision: 12380
          http://pcgen.svn.sourceforge.net/pcgen/?rev=12380&view=rev
Author:   thpr
Date:     2010-06-30 02:38:29 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
Back out SVN 12378

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
    Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java	2010-06-30 02:31:00 UTC (rev 12379)
+++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java	2010-06-30 02:38:29 UTC (rev 12380)
@@ -134,7 +134,6 @@
 import pcgen.cdom.facet.InitiativeFacet;
 import pcgen.cdom.facet.KitFacet;
 import pcgen.cdom.facet.LanguageFacet;
-import pcgen.cdom.facet.LegalDeityFacet;
 import pcgen.cdom.facet.LegsFacet;
 import pcgen.cdom.facet.LevelFacet;
 import pcgen.cdom.facet.LevelTableFacet;
@@ -189,6 +188,7 @@
 import pcgen.core.analysis.BonusCalc;
 import pcgen.core.analysis.ChooseActivation;
 import pcgen.core.analysis.DomainApplication;
+import pcgen.core.analysis.SizeUtilities;
 import pcgen.core.analysis.SkillRankControl;
 import pcgen.core.analysis.SpecialAbilityResolution;
 import pcgen.core.analysis.SpellCountCalc;
@@ -284,7 +284,6 @@
 	private MasterFacet masterFacet = FacetLibrary.getFacet(MasterFacet.class);
 	private AutoEquipmentListFacet autoListEquipmentFacet = FacetLibrary.getFacet(AutoEquipmentListFacet.class);
 	private MonsterCSkillFacet monCSkillFacet = FacetLibrary.getFacet(MonsterCSkillFacet.class);
-	private LegalDeityFacet legalDeityFacet = FacetLibrary.getFacet(LegalDeityFacet.class);
 
 	private LanguageFacet languageFacet = FacetLibrary.getFacet(LanguageFacet.class);
 	private LanguageFacet freeLangFacet = FacetLibrary.getFacet(FreeLanguageFacet.class);
@@ -6984,7 +6983,42 @@
 	 */
 	public boolean canSelectDeity(final Deity aDeity)
 	{
-		return legalDeityFacet.allows(id, aDeity);
+		if (aDeity == null)
+		{
+			return false;
+		}
+		boolean result;
+		if (classFacet.isEmpty(id))
+		{
+			result = true;
+		}
+		else
+		{
+			result = false;
+			CLASS: for (PCClass aClass : getClassSet())
+			{
+				List<CDOMReference<Deity>> deityList =
+						aClass.getListFor(ListKey.DEITY);
+				if (deityList == null)
+				{
+					result = true;
+					break;
+				}
+				else
+				{
+					for (CDOMReference<Deity> deity : deityList)
+					{
+						if (deity.contains(aDeity))
+						{
+							result = true;
+							break CLASS;
+						}
+					}
+				}
+			}
+		}
+
+		return result && aDeity.qualifies(this, aDeity);
 	}
 
 	public int classAC()
@@ -10487,6 +10521,24 @@
 	}
 
 	/**
+	 * @param info
+	 * @return character level
+	 */
+	public int getCharacterLevel(final PCLevelInfo info)
+	{
+		int i = 1;
+		for (PCLevelInfo element : pcLevelInfo)
+		{
+			if (info == element)
+			{
+				return i;
+			}
+			i++;
+		}
+		return -1;
+	}
+
+	/**
 	 * Return a list of bonus languages which the character may select from.
 	 * This function is not efficient, but is sufficient for it's current use of
 	 * only being called when the user requests the bonus language selection

Modified: Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java	2010-06-30 02:31:00 UTC (rev 12379)
+++ Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java	2010-06-30 02:38:29 UTC (rev 12380)
@@ -304,7 +304,9 @@
 				"SKILLPOOL",
 				"CLASS." + classKeyName + ";LEVEL." + Integer.toString(level));
 
-		returnValue += (int) aPC.getTotalBonusTo("SKILLPOOL", "LEVEL." + level);
+		returnValue += (int) aPC.getTotalBonusTo(
+				"SKILLPOOL",
+				"LEVEL." + aPC.getCharacterLevel(this));
 
 		return returnValue;
 	}


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