Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen: [6194] Trunk/pcgen/code/src/java
|
From: <th...@us...> - 2008-05-04 22:05:04
|
Revision: 6194
http://pcgen.svn.sourceforge.net/pcgen/?rev=6194&view=rev
Author: thpr
Date: 2008-05-04 15:05:05 -0700 (Sun, 04 May 2008)
Log Message:
-----------
Remove More tokens & associated code
Modified Paths:
--------------
Trunk/pcgen/code/src/java/pcgen/core/Movement.java
Trunk/pcgen/code/src/java/pcgen/core/PCClass.java
Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java
Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
Trunk/pcgen/code/src/java/pcgen/core/Race.java
Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassLevelPanel.java
Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java
Trunk/pcgen/code/src/java/pcgen/gui/editor/MovementPanel.java
Removed Paths:
-------------
Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/FeatToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/FeatautoToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/GameToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/InitToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LangnumToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LevelsperfeatToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LicensedToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/MoveaLst.java
Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/WeaponautoLst.java
Modified: Trunk/pcgen/code/src/java/pcgen/core/Movement.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Movement.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/pcgen/core/Movement.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -128,9 +128,10 @@
*/
public void setMoveRatesFlag(int i)
{
- /*
- * CONSIDER Should any check be done here on the value of i?
- */
+ if (i != 0 && i != 2)
+ {
+ throw new IllegalArgumentException("Rate Flag must be 0 or 2");
+ }
moveRatesFlag = i;
}
@@ -351,10 +352,6 @@
txt.append("\tMOVE");
switch (moveRatesFlag)
{
- case 1: // MOVEA:
- txt.append('A');
- break;
-
case 2: // MOVECLONE:
txt.append("CLONE");
break;
Modified: Trunk/pcgen/code/src/java/pcgen/core/PCClass.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -84,36 +84,6 @@
private List<LevelProperty<Movement>> movementList = null;
/*
- * FUTURETYPESAFETY This is throwing around Feat names as Strings. :(
- *
- * This requires a Chooser of some type to be able to be present in PCClass, as
- * this may be a CHOOSE: String rather than an individual Feat
- */
- /*
- * FINALALLCLASSLEVELS The automatic Feats appropriate to any given level (they
- * should be stored in a series of LevelProperty objects) need to be placed
- * into each individual PCClassLevel when it is constructed.
- */
- private List<LevelProperty<String>> featAutos = null;
-
- /*
- * FUTURETYPESAFETY The Feats should be type safe, not Strings... The challenge
- * here is that this also is difficult to make Type Safe. The problem is not
- * in having the Abilities themselves be passed in (That is distinctly
- * possible), it is in getting the associated Strings correct, as those
- * are magically processed based on the PC's deity - so the DEITYWEAPON
- * associated String would need to be recognized as magical and processed
- * correctly in the code before it is added to the PC, but still appear as
- * the magical string here (and somehow do that in a typesafe way).
- */
- /*
- * FINALALLCLASSLEVELS Since the Feats are being granted by level, this needs to
- * account for that and actually store these by level and put them into the
- * appropriate PCClassLevel.
- */
- private List<LevelProperty<String>> featList = null;
-
- /*
* LEVELONEONLY This variable (automatically known spells) only needs to be
* loaded into the first PCClassLevel returned by PCClass, because the data
* is static (doesn't change by level) and because it will be tested
@@ -1301,150 +1271,6 @@
}
/*
- * FINALPCCLASSONLY This is only for PCClass - used to edit the class
- */
- public final Collection<LevelProperty<String>> getAllFeatAutos()
- {
- Collection<LevelProperty<String>> returnList = null;
- if (featAutos == null)
- {
- List<LevelProperty<String>> empty = Collections.emptyList();
- returnList = Collections.unmodifiableCollection(empty);
- }
- else
- {
- returnList = Collections.unmodifiableCollection(featAutos);
- }
- return returnList;
- }
-
- /*
- * FINALPCCLASSANDLEVEL This is required in PCClassLevel and should be present in
- * PCClass for PCClassLevel creation (in the factory)
- */
- public final Collection<String> getFeatAutos(int aLevel)
- {
- List<String> returnList = new ArrayList<String>();
- if (featAutos != null)
- {
- for (LevelProperty<String> autoFeat : featAutos)
- {
- if (autoFeat.getLevel() == aLevel)
- {
- returnList.add(autoFeat.getObject());
- }
- }
- }
- return returnList;
- }
-
- // public Collection<String> getAutoAbilityList(final AbilityCategory aCategory)
- // {
- // if ( aCategory == AbilityCategory.FEAT )
- // {
- // return getFeatAutos();
- // }
- // if ( theAutoAbilities == null )
- // {
- // return Collections.emptyList();
- // }
- // final List<String> ret = new ArrayList<String>();
- // for ( final int lvl : theAutoAbilities.getSecondaryKeySet(aCategory) )
- // {
- // if ( lvl <= level )
- // {
- // ret.addAll(theAutoAbilities.get(aCategory, lvl));
- // }
- // }
- // return Collections.unmodifiableList(ret);
- // }
- /**
- * Removes an AUTO feat from the list of feats this class grants.
- *
- * @param aFeat
- * The feat string to remove.
- */
- /*
- * FINALPCCLASSONLY This is for GUI construction of a PCClass and is therefore
- * only required in PCClass and not PCClassLevel
- */
- public boolean removeFeatAuto(String type)
- {
- if (featAutos == null)
- {
- return false;
- }
- for (LevelProperty<String> autoFeat : featAutos)
- {
- if (autoFeat.getObject().equals(type))
- {
- return featAutos.remove(autoFeat);
- }
- }
- return false;
- }
-
- /**
- * Removes an AUTO feat from the list of feats this class grants.
- *
- * @param aLevel
- * The level the feat would have been granted at.
- * @param aFeat
- * The feat string to remove.
- */
- /*
- * FINALPCCLASSONLY This is for GUI construction of a PCClass and is therefore
- * only required in PCClass and not PCClassLevel
- */
- public boolean removeFeatAuto(int aLevel, String type)
- {
- if (featAutos == null)
- {
- return false;
- }
- for (LevelProperty<String> autoFeat : featAutos)
- {
- if (autoFeat.getLevel() == aLevel
- && autoFeat.getObject().equals(type))
- {
- return featAutos.remove(autoFeat);
- }
- }
- return false;
- }
-
- // public void removeAutoAbility(final AbilityCategory aCategory, final int aLevel, final String aKey)
- // {
- // if ( aCategory == AbilityCategory.FEAT )
- // {
- // removeFeatAuto(aLevel, aKey);
- // return;
- // }
- // if ( theAutoAbilities == null )
- // {
- // return;
- // }
- // final List<String> abilities = theAutoAbilities.get(aCategory, aLevel);
- // if ( abilities != null )
- // {
- // abilities.remove(aKey);
- // }
- // }
-
- /*
- * FINALPCCLASSONLY This is for construction of a PCClass
- */
- public final List<LevelProperty<String>> getFeatList()
- {
- if (featList == null)
- {
- final List<LevelProperty<String>> ret = Collections.emptyList();
- return Collections.unmodifiableList(ret);
- }
- return Collections.unmodifiableList(featList);
- }
-
- /*
* FINALPCCLASSANDLEVEL Input from a Tag, and factory creation of a PCClassLevel
* require this method
*/
@@ -2828,29 +2654,6 @@
templates = null;
}
- /*
- * FINALPCCLASSANDLEVEL Input from a Tag, and factory creation of a PCClassLevel
- * require this method. The PCClassLevelversion should NOT be level
- * dependent
- */
- public void addFeatAuto(final int aLevel, final String aString)
- {
- if (featAutos == null)
- {
- featAutos = new ArrayList<LevelProperty<String>>();
- }
- featAutos.add(LevelProperty.getLevelProperty(aLevel, aString));
- }
-
- /*
- * FINALPCCLASSONLY This is an editor and loader requirement, therefore
- * PCClass only
- */
- public void clearFeatAutos()
- {
- featAutos = null;
- }
-
// public void setAutoAbilities(final AbilityCategory aCategory, final int aLevel, final List<String> aList)
// {
// if ( aCategory == AbilityCategory.FEAT )
@@ -3866,24 +3669,7 @@
}
}
- if (featList != null)
- {
- for (LevelProperty<String> lp : featList)
- {
- pccTxt.append(lineSep).append(lp.getLevel());
- pccTxt.append("\tFEATAUTO:").append(lp.getObject());
- }
- }
-
// TODO - Add ABILITY tokens.
- if (featAutos != null)
- {
- for (LevelProperty<String> autoFeat : featAutos)
- {
- pccTxt.append(lineSep).append(autoFeat.getLevel());
- pccTxt.append("\tFEATAUTO:").append(autoFeat.getObject());
- }
- }
List<String> udamList = getListFor(ListKey.UDAM);
if ((udamList != null) && (udamList.size() != 0))
@@ -4129,21 +3915,6 @@
substitutionClassList.add(sClass);
}
- /*
- * FINALPCCLASSANDLEVEL This needs to be in both PCClass (since it's imported from
- * a Tag) and PCClassLevel (although the PCClassLevel version should not be
- * level dependent)
- */
- public void addFeatList(final int aLevel, final String aFeatList)
- {
- // TODO - Make this not string based.
- if (featList == null)
- {
- featList = new ArrayList<LevelProperty<String>>();
- }
- featList.add(LevelProperty.getLevelProperty(aLevel, aFeatList));
- }
-
private SpellProgressionInfo getConstructingSpellProgressionInfo()
{
if (castInfo == null)
@@ -4457,11 +4228,6 @@
aClass.castInfo = castInfo.clone();
}
// aClass.acList = new ArrayList<String>(acList);
- if (featList != null)
- {
- aClass.featList =
- new ArrayList<LevelProperty<String>>(featList);
- }
// aClass.vFeatList = (ArrayList) vFeatList.clone();
if (vFeatList != null)
{
@@ -4480,11 +4246,6 @@
aClass.hitDieLockList =
new ArrayList<LevelProperty<String>>(hitDieLockList);
}
- if (featAutos != null)
- {
- aClass.featAutos =
- new ArrayList<LevelProperty<String>>(featAutos);
- }
// if ( theAutoAbilities != null )
// {
// aClass.theAutoAbilities = new DoubleKeyMap<AbilityCategory, Integer, List<String>>(theAutoAbilities);
@@ -5828,11 +5589,6 @@
*/
void doMinusLevelMods(final PlayerCharacter aPC, final int oldLevel)
{
- if (!isMonster())
- {
- changeFeatsForLevel(oldLevel, false, aPC);
- }
-
subAddsForLevel(oldLevel, aPC);
aPC.removeVariable("CLASS:" + getKeyName() + "|"
+ Integer.toString(oldLevel));
@@ -5846,11 +5602,6 @@
void doPlusLevelMods(final int newLevel, final PlayerCharacter aPC,
final PCLevelInfo pcLevelInfo)
{
- if (!isMonster())
- {
- changeFeatsForLevel(newLevel, true, aPC);
- }
-
addVariablesForLevel(newLevel, aPC);
// moved after changeSpecials and addVariablesForLevel
@@ -6787,59 +6538,7 @@
return iBonus * iTimes;
}
- /**
- * This method adds or deletes feats for a level.
- *
- * @param aLevel
- * the level to affect
- * @param addThem
- * whether to add or remove feats
- * @param aPC
- */
/*
- * PCCLASSONLY This (or really a derivative of it, since this is actually
- * making some choices) is part of getLevel method of PCClass (the factory
- * that produces PCClassLevels.
- *
- * Note (theoretically) that Feat removal should not need to be possible, as
- * the subLevel method of PCClass will not be present moving forward
- * (hopefully)
- */
- private void changeFeatsForLevel(final int aLevel, final boolean addThem,
- final PlayerCharacter aPC)
- {
- if ((aPC == null) || featList == null || featList.isEmpty())
- {
- return;
- }
-
- PCLevelInfo pcLevelInfo = null;
- for (PCLevelInfo pcl : aPC.getLevelInfo())
- {
- if (pcl.getClassKeyName().equalsIgnoreCase(getKeyName())
- && pcl.getLevel() == aLevel)
- {
- pcLevelInfo = pcl;
- break;
- }
- }
-
- for (LevelProperty<String> lp : featList)
- {
- if (lp.getLevel() == aLevel)
- {
- final double preFeatCount = aPC.getUsedFeatCount();
- AbilityUtilities.modFeatsFromList(aPC, pcLevelInfo, lp
- .getObject(), addThem, aLevel == 1);
-
- final double postFeatCount = aPC.getUsedFeatCount();
- // Adjust the feat count by the total number that were given
- aPC.adjustFeats(postFeatCount - preFeatCount);
- }
- }
- }
-
- /*
* DELETEMETHOD through refactoring this to another location. While this is
* yet another potentially useful utility function, PCClass really isn't the
* appropriate place for this method.
@@ -7540,34 +7239,6 @@
return Collections.unmodifiableMap(attackCycleMap);
}
- /**
- * Remove all auto feats gained via a level
- * @param aLevel
- * @deprecated
- */
- /*
- * FINALPCCLASSONLY I think (heh) that committing this to the PCClassLevel really should
- * be part of the PCClass Factory, and thus part of the creation of the PCClassLevel
- * and thus only in PCClass
- *
- */
- @Deprecated
- public void removeAllAutoFeats(final int aLevel)
- {
- if (featAutos != null)
- {
- for (Iterator<LevelProperty<String>> it = featAutos.iterator(); it
- .hasNext();)
- {
- LevelProperty<String> autoFeat = it.next();
- if (autoFeat.getLevel() == aLevel)
- {
- it.remove();
- }
- }
- }
- }
-
public int getMinLevelForSpellLevel(int spellLevel, boolean allowBonus)
{
if (castInfo == null)
Modified: Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -93,7 +93,6 @@
private int bonusInitialFeats = 0;
private int bonusSkillsPerLevel = 0;
private String hitDieLock = "";
- private int levelsPerFeat = 3;
private int nonProficiencyPenalty = 1;
private String raceType = "";
private Integer hands;
@@ -412,18 +411,6 @@
}
/**
- * Set an override for the one feat per 3 levels for creatures this template
- * is applied to
- *
- * @param argLevelsPerFeat
- * the number of levels between level dependant feats
- */
- public void setLevelsPerFeat(final int argLevelsPerFeat)
- {
- levelsPerFeat = argLevelsPerFeat;
- }
-
- /**
* Takes an integer input which it uses to access Games mode's "statlist"
* array. If that stat has been locked at 10 then it is considered a
* non-ability.
@@ -632,11 +619,6 @@
txt.append("\tLEVELADJUSTMENT:").append(levelAdjustment);
}
- if (levelsPerFeat != 3)
- {
- txt.append("\tLEVELSPERFEAT:").append(levelsPerFeat);
- }
-
if (nonProficiencyPenalty <= 0)
{
txt.append("\tNONPP:").append(nonProficiencyPenalty);
Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -9763,9 +9763,7 @@
if (pcRace != null)
{
- i +=
- (pcRace.getLangNum() + (int) getTotalBonusTo("LANGUAGES",
- "NUMBER"));
+ i += ((int) getTotalBonusTo("LANGUAGES", "NUMBER"));
}
//
@@ -11979,26 +11977,6 @@
increaseMoveArray(moveRate, moveType, moveMult, multOp);
}
- else if (moveFlag == 1)
- { // add moveRate to movement.
-
- for (int i = 0; i < movements.length; i++)
- {
- moveRate =
- new Double(anDouble + movements[i].doubleValue());
-
- if (moveType.equals(movementTypes[i]))
- {
- movements[i] = moveRate;
- movementMult[i] = moveMult;
- movementMultOp[i] = multOp;
-
- return;
- }
-
- increaseMoveArray(moveRate, moveType, moveMult, multOp);
- }
- }
else
{ // get base movement, then add moveRate
moveRate = new Double(anDouble + movements[0].doubleValue());
@@ -17587,67 +17565,6 @@
for (final PCClass aClass : getClassList())
{
- List<String> classFeatList = new ArrayList<String>();
- for (int lvl = 0; lvl <= aClass.getLevel(); lvl++)
- {
- for (String st : aClass.getFeatAutos(lvl))
- {
- classFeatList.add(st);
- }
- }
- for (String autoFeat : classFeatList)
- {
- final int idx = autoFeat.indexOf('[');
-
- if (idx >= 0)
- {
- final StringTokenizer bTok =
- new StringTokenizer(autoFeat.substring(idx + 1),
- "[]");
- final List<Prerequisite> preReqList =
- new ArrayList<Prerequisite>();
-
- while (bTok.hasMoreTokens())
- {
- final String prereqString = bTok.nextToken();
- Logging
- .debugPrint("Why is the prerequisite '"
- + prereqString
- + "' parsed in PlayerCharacter.featAutoList() rather than the persistence layer");
- try
- {
- final PreParserFactory factory =
- PreParserFactory.getInstance();
- final Prerequisite prereq =
- factory.parse(prereqString);
- preReqList.add(prereq);
- }
- catch (PersistenceLayerException ple)
- {
- Logging.errorPrint(ple.getMessage(), ple);
- }
- }
-
- autoFeat = autoFeat.substring(0, idx);
-
- if (preReqList.size() != 0)
- {
- if (!PrereqHandler.passesAll(preReqList, this, null))
- {
- continue;
- }
- }
- }
-
- Ability added =
- AbilityUtilities
- .addCloneOfGlobalAbilityToListWithChoices(
- abilities, Constants.FEAT_CATEGORY, autoFeat);
- if (added != null)
- {
- added.setFeatType(Ability.Nature.AUTOMATIC);
- }
- }
addAutoProfsToList(aClass
.getSafeListFor(ListKey.SELECTED_WEAPON_PROF_BONUS), abilities);
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/Race.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Race.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/pcgen/core/Race.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -51,7 +51,6 @@
private List<String> monCSkillList = null;
// TODO - Why do we need a hit point map in the race?
private Map<String, Integer> hitPointMap = new HashMap<String, Integer>();
- private Integer initMod = Integer.valueOf(0);
private String hitDieLock = Constants.EMPTY_STRING;
private String ageString = Constants.EMPTY_STRING;
@@ -77,7 +76,6 @@
private int hitDice = 0;
private int hitDiceSize = 0;
private Integer initialSkillMultiplier = null;
- private int langNum = 0;
private int legs = 2;
private int monsterClassLevels = 0;
private int reach = 5;
@@ -325,11 +323,6 @@
return hitPointMap.size();
}
- public void setInitMod(final Integer initMod)
- {
- this.initMod = initMod;
- }
-
/**
* Set the initial skill multiplier that should be used for this
* race. Use null to 'unset' the race's value and make it default
@@ -360,11 +353,6 @@
return initialSkillMultiplier;
}
- public void setLangNum(final int langNum)
- {
- this.langNum = langNum;
- }
-
public void setLegs(final int argLegs)
{
legs = argLegs;
@@ -876,16 +864,6 @@
hitDiceSize);
}
- if (initMod.intValue() != 0)
- {
- txt.append("\tINIT:").append(initMod.toString());
- }
-
- if (langNum != 0)
- {
- txt.append("\tLANGNUM:").append(langNum);
- }
-
if (!"0".equals(levelAdjustment))
{
txt.append("\tLEVELADJUSTMENT:").append(levelAdjustment);
@@ -941,7 +919,6 @@
aRace.heightString = heightString;
aRace.weightString = weightString;
aRace.featList = featList;
- aRace.langNum = langNum;
aRace.initialSkillMultiplier = initialSkillMultiplier;
aRace.levelAdjustment = levelAdjustment;
aRace.CR = CR;
@@ -1074,11 +1051,6 @@
return hitDieLock;
}
- int getLangNum()
- {
- return langNum;
- }
-
String getMonsterClass(final PlayerCharacter aPC)
{
return getMonsterClass(aPC, true);
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassLevelPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassLevelPanel.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassLevelPanel.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -298,16 +298,6 @@
levelTagList.add(new LevelTag(lp.getLevel(), LevelTag.TAG_SR, lp.getObject()));
}
- for (LevelProperty<String> lp : obj.getFeatList())
- {
- levelTagList.add(new LevelTag(lp.getLevel(), LevelTag.TAG_FEAT, lp.getObject()));
- }
-
- for (LevelProperty<String> c : obj.getAllFeatAutos() )
- {
- levelTagList.add(new LevelTag(c.getLevel(), LevelTag.TAG_FEATAUTO, c.getObject()));
- }
-
/*
aCol = obj.vFeatList();
if (aCol != null)
@@ -584,14 +574,6 @@
case LevelTag.TAG_DEFINE:
case LevelTag.TAG_DR:
case LevelTag.TAG_FEAT:
- break;
-
- case LevelTag.TAG_FEATAUTO:
- obj.removeFeatAuto(lt.getLevel(), lt.getValue());
- bRemoved = true;
-
- break;
-
case LevelTag.TAG_KIT:
case LevelTag.TAG_KNOWN:
case LevelTag.TAG_REGION:
@@ -917,7 +899,6 @@
private static final int TAG_DEFINE = 4;
private static final int TAG_DR = 5;
private static final int TAG_FEAT = 6;
- private static final int TAG_FEATAUTO = 7;
private static final int TAG_KIT = 8;
private static final int TAG_KNOWN = 9;
private static final int TAG_REGION = 10;
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -934,7 +934,6 @@
PCClass thisPCClass = (PCClass) thisPObject;
thisPCClass.clearTemplates();
thisPCClass.addUmult(".CLEAR");
- thisPCClass.clearFeatAutos();
thisPCClass.clearUdamList();
break;
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/MovementPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/MovementPanel.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/MovementPanel.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -56,7 +56,7 @@
static final long serialVersionUID = 3024201499870849149L;
private static final String[] rateTypes = new String[]
{
- "MOVE (Set movement rate)", "MOVEA (Adjust movement rate)", "MOVECLONE (Adjust based on default rate)"
+ "MOVE (Set movement rate)", "<unused>", "MOVECLONE (Adjust based on default rate)"
};
private JButton btnAdd;
private JButton btnRemove;
Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/FeatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/FeatToken.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/FeatToken.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -1,30 +0,0 @@
-package plugin.lsttokens.deprecated;
-
-import pcgen.core.PCClass;
-import pcgen.core.PObject;
-import pcgen.persistence.lst.DeprecatedToken;
-import pcgen.persistence.lst.PCClassLstToken;
-
-/**
- * Class deals with FEAT Token
- */
-public class FeatToken implements PCClassLstToken, DeprecatedToken
-{
-
- public String getTokenName()
- {
- return "FEAT";
- }
-
- public boolean parse(PCClass pcclass, String value, int level)
- {
- pcclass.addFeatList(level, value);
- return true;
- }
-
- public String getMessage(PObject obj, String value)
- {
- return "Use ADD:FEAT, VFEAT or FEATAUTO instead.";
- }
-
-}
\ No newline at end of file
Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/FeatautoToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/FeatautoToken.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/FeatautoToken.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -1,54 +0,0 @@
-package plugin.lsttokens.deprecated;
-
-import java.util.StringTokenizer;
-
-import pcgen.core.Constants;
-import pcgen.core.PCClass;
-import pcgen.core.PObject;
-import pcgen.persistence.lst.DeprecatedToken;
-import pcgen.persistence.lst.PCClassLstToken;
-
-/**
- * Class deals with FEATAUTO Token
- */
-public class FeatautoToken implements PCClassLstToken, DeprecatedToken
-{
-
- public String getTokenName()
- {
- return "FEATAUTO";
- }
-
- public boolean parse(PCClass pcclass, String value, int level)
- {
- final StringTokenizer aTok = new StringTokenizer(value, Constants.PIPE);
-
- while (aTok.hasMoreTokens())
- {
- final String fName = aTok.nextToken();
-
- if (fName.startsWith(".CLEAR"))
- {
- if (fName.startsWith(".CLEAR."))
- {
- pcclass.removeFeatAuto(fName.substring(7));
- }
- else
- {
- pcclass.clearFeatAutos();
- }
- }
- else
- {
- pcclass.addFeatAuto(level, fName);
- }
- }
- return true;
- }
-
- public String getMessage(PObject obj, String value)
- {
- return getTokenName()
- + " has been deprecated, please use AUTO:FEAT|...";
- }
-}
Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/GameToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/GameToken.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/GameToken.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -1,31 +0,0 @@
-package plugin.lsttokens.deprecated;
-
-import pcgen.core.Campaign;
-import pcgen.core.PObject;
-import pcgen.persistence.lst.CampaignLstToken;
-import pcgen.persistence.lst.DeprecatedToken;
-
-import java.net.URI;
-
-/**
- * Class deals with GAME Token
- */
-public class GameToken implements CampaignLstToken, DeprecatedToken
-{
-
- public String getTokenName()
- {
- return "GAME";
- }
-
- public boolean parse(Campaign campaign, String value, URI sourceUri)
- {
- campaign.setGameMode(value);
- return true;
- }
-
- public String getMessage(PObject obj, String value)
- {
- return "Use GAMEMODE: instead.";
- }
-}
Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/InitToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/InitToken.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/InitToken.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -1,37 +0,0 @@
-package plugin.lsttokens.deprecated;
-
-import pcgen.core.PObject;
-import pcgen.core.Race;
-import pcgen.persistence.lst.DeprecatedToken;
-import pcgen.persistence.lst.RaceLstToken;
-
-/**
- * Class deals with INIT Token
- */
-public class InitToken implements RaceLstToken, DeprecatedToken
-{
-
- public String getTokenName()
- {
- return "INIT";
- }
-
- public boolean parse(Race race, String value)
- {
- try
- {
- race.setInitMod(Integer.valueOf(value));
- return true;
- }
- catch (NumberFormatException nfe)
- {
- return false;
- }
- }
-
- public String getMessage(PObject obj, String value)
- {
- return getTokenName()
- + " is deprecated, because it does not function (value is never read)";
- }
-}
Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LangnumToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LangnumToken.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LangnumToken.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -1,36 +0,0 @@
-package plugin.lsttokens.deprecated;
-
-import pcgen.core.PObject;
-import pcgen.core.Race;
-import pcgen.persistence.lst.DeprecatedToken;
-import pcgen.persistence.lst.RaceLstToken;
-
-/**
- * Class deals with LANGNUM Token
- */
-public class LangnumToken implements RaceLstToken, DeprecatedToken
-{
-
- public String getTokenName()
- {
- return "LANGNUM";
- }
-
- public boolean parse(Race race, String value)
- {
- try
- {
- race.setLangNum(Integer.parseInt(value));
- return true;
- }
- catch (NumberFormatException nfe)
- {
- return false;
- }
- }
-
- public String getMessage(PObject obj, String value)
- {
- return "Use BONUS:LANG|BONUS|x instead";
- }
-}
Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LevelsperfeatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LevelsperfeatToken.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LevelsperfeatToken.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -1,49 +0,0 @@
-package plugin.lsttokens.deprecated;
-
-import pcgen.core.PCTemplate;
-import pcgen.core.PObject;
-import pcgen.persistence.lst.DeprecatedToken;
-import pcgen.persistence.lst.PCTemplateLstToken;
-import pcgen.util.Logging;
-
-/**
- * Class deals with LEVELSPERFEAT Token
- */
-public class LevelsperfeatToken implements PCTemplateLstToken, DeprecatedToken
-{
-
- public String getTokenName()
- {
- return "LEVELSPERFEAT";
- }
-
- // how many levels per feat.
- public boolean parse(PCTemplate template, String value)
- {
- try
- {
- final int newLevels = Integer.parseInt(value);
-
- if (newLevels >= 0)
- {
- template.setLevelsPerFeat(newLevels);
- }
- else
- {
- Logging.errorPrint("Levels Per Feat must be "
- + "greater than or equal to zero: " + value);
- return false;
- }
- }
- catch (NumberFormatException nfe)
- {
- return false;
- }
- return true;
- }
-
- public String getMessage(PObject obj, String value)
- {
- return "Use BONUS with a Formula instead";
- }
-}
Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LicensedToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LicensedToken.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/LicensedToken.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -1,31 +0,0 @@
-package plugin.lsttokens.deprecated;
-
-import pcgen.core.Campaign;
-import pcgen.core.PObject;
-import pcgen.persistence.lst.CampaignLstToken;
-import pcgen.persistence.lst.DeprecatedToken;
-
-import java.net.URI;
-
-/**
- * Class deals with LICENSED Token
- */
-public class LicensedToken implements CampaignLstToken, DeprecatedToken
-{
-
- public String getTokenName()
- {
- return "LICENSED";
- }
-
- public boolean parse(Campaign campaign, String value, URI sourceUri)
- {
- campaign.setIsLicensed(value.startsWith("Y"));
- return true;
- }
-
- public String getMessage(PObject obj, String value)
- {
- return "Use ISLICENSED: instead.";
- }
-}
Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/MoveaLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/MoveaLst.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/MoveaLst.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -1,37 +0,0 @@
-/*
- * Created on Sep 2, 2005
- *
- */
-package plugin.lsttokens.deprecated;
-
-import pcgen.core.Movement;
-import pcgen.core.PObject;
-import pcgen.persistence.lst.DeprecatedToken;
-import pcgen.persistence.lst.GlobalLstToken;
-
-/**
- * @author djones4
- *
- */
-public class MoveaLst implements GlobalLstToken, DeprecatedToken
-{
-
- public String getTokenName()
- {
- return "MOVEA";
- }
-
- public boolean parse(PObject obj, String value, int anInt)
- {
- Movement cm = Movement.getMovementFrom(value);
- cm.setMoveRatesFlag(1);
- obj.setMovement(cm, anInt);
- return true;
- }
-
- public String getMessage(PObject obj, String value)
- {
- return getTokenName()
- + " is deprecated. Please use BONUS|MOVEADD or BONUS|POSTMOVEADD";
- }
-}
Deleted: Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/WeaponautoLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/WeaponautoLst.java 2008-05-04 21:48:44 UTC (rev 6193)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/deprecated/WeaponautoLst.java 2008-05-04 22:05:05 UTC (rev 6194)
@@ -1,47 +0,0 @@
-/*
- * Created on Sep 2, 2005
- *
- */
-package plugin.lsttokens.deprecated;
-
-import pcgen.core.PObject;
-import pcgen.persistence.lst.DeprecatedToken;
-import pcgen.persistence.lst.GlobalLstToken;
-import pcgen.util.PropertyFactory;
-
-/**
- * @author djones4
- *
- */
-public class WeaponautoLst implements DeprecatedToken, GlobalLstToken
-{
-
- /**
- * @see pcgen.persistence.lst.LstToken#getTokenName()
- */
- public String getTokenName()
- {
- return "WEAPONAUTO"; //$NON-NLS-1$
- }
-
- /**
- * @see pcgen.persistence.lst.GlobalLstToken#parse(pcgen.core.PObject, java.lang.String, int)
- */
- public boolean parse(PObject obj, String value, int anInt)
- {
- obj.addAutoArray("WEAPONPROF", value); //$NON-NLS-1$
- // obj.addWeaponProfAutos(value);
- return true;
- }
-
- /**
- * @see pcgen.persistence.lst.DeprecatedToken#getMessage(pcgen.core.PObject, java.lang.String)
- */
- public String getMessage(@SuppressWarnings("unused")
- final PObject anObj, @SuppressWarnings("unused")
- final String anValue)
- {
- return PropertyFactory
- .getString("Warnings.LstTokens.Deprecated.WeaponAutoToken"); //$NON-NLS-1$
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|