pcgen-commit-svn — Subversion commits

[pcgen-commit-svn] SF.net SVN: pcgen:[15073] Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ advanced_players_guide/pfapg_abilities_class.lst

[<gjo...@us...>]

Revision: 15073
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15073&view=rev
Author:   gjorbjond
Date:     2011-05-31 20:25:53 +0000 (Tue, 31 May 2011)

Log Message:
-----------
Summoner's 'greater aspect' description cleanup.

Modified Paths:
--------------
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2011-05-31 20:15:58 UTC (rev 15072)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2011-05-31 20:25:53 UTC (rev 15073)
@@ -471,7 +471,7 @@
 Greater Shield Ally						KEY:Greater Shield Ally ~ Summoner			CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:Whenever an ally is within your eidolon's reach, the ally receives a +2 shield bonus to its Armor Class and a +2 circumstance bonus on its saving throws. For you, the bonuses increase to +4. The bonuses do not apply if your eidolon is grappled, helpless, paralyzed, stunned, or unconscious.
 Life Bond								KEY:Life Bond ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:Your life becomes linked to your eidolon's. As long as your eidolon has 1 or more hit points, you are protected from harm. Damage in excess of that which would reduce you to fewer than 0 hit points is instead transferred to your eidolon. This damage is transferred 1 point at a time, meaning that as soon as your eidolon is reduced to a number of negative hit points equal to its Constitution score, all excess damage remains with the summoner.
 Merge Forms								KEY:Merge Forms ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:MergeFormsRounds|0																																																DESC:As a full-round action, you can touch your eidolon to merge forms. This transformation includes all of your gear. While merged in this way, you are protected from harm and cannot be the target of spells or effects. All effects and spells currently targeting you are suspended until you emerge from your eidolon (although durations continue to expire).  You can cast spells while inside your eidolon by taking control of your eidolon for the duration of the casting. Any material components used for these spells are taken from your gear, even though they are otherwise inaccessible. You can direct all of your eidolon's actions while merged, can perceive through its senses, and can speak through its voice. You can use this ability for %1 rounds per day. You can end this effect at any time as a swift action. You emerge in a square adjacent to your eidolon if able. If your eidolon is returned to its home plane while you are merged with it, you are immediately ejected, taking 4d6 points of damage, and are stunned for 1 round.|MergeFormsRounds
-Greater Aspect							KEY:Greater Aspect ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:MasterLevel|0	DEFINE:EidMaxAttacks|0	DEFINE:EidUsedAttacks|0	DEFINE:EidArms|0	DEFINE:EidArmsUsed|0	DEFINE:EidLegs|0	DEFINE:EidLegsUsed|0																											DESC:You can divert more of your eidolon's evolutions to yourself. This ability functions as the aspect ability, but up to 6 evolution points can be taken. Unlike the aspect ability, your eidolon loses 1 point from its evolution pool for every 2 points (or fraction thereof) diverted to you.																																																																																																																																																																																																																																																																																																																																										BONUS:ABILITYPOOL|Eidolon Evolution|6	BONUS:VAR|EidArms|1	BONUS:VAR|EidLegs|1
+Greater Aspect							KEY:Greater Aspect ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:MasterLevel|0	DEFINE:EidMaxAttacks|0	DEFINE:EidUsedAttacks|0	DEFINE:EidArms|0	DEFINE:EidArmsUsed|0	DEFINE:EidLegs|0	DEFINE:EidLegsUsed|0																											DESC:You can divert your eidolon's evolutions to yourself. You may take up to 6 evolution points. Your eidolon loses 1 point from its evolution pool for every 2 points (or fraction thereof) diverted to you.																																																																																																																																																																																																																																																																																																																																										BONUS:ABILITYPOOL|Eidolon Evolution|6	BONUS:VAR|EidArms|1	BONUS:VAR|EidLegs|1
 Twin Eidolon							KEY:Twin Eidolon ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:TwinEidolonMinutes|0																																																DESC:As a standard action, you can assume the shape of your eidolon, copying all of its evolutions, form, and abilities. Your Strength, Dexterity, and Constitution scores change to match the base scores of your eidolon. You can choose to have any gear that you carry become absorbed by your new form, as with spells from the polymorph subschool. Items with continuous effects continue to function while absorbed in this way. You lose your natural attacks and all racial traits (except bonus feats, skills, and languages) in favor of the abilities granted by your eidolon's evolutions. You retain all of your class features. You can keep this form for %1 minutes per day. This duration does not need to be consecutive, but it must be spent in 1-minute increments. You can end this effect as a free action.|TwinEidolonMinutes
 Gate									KEY:Gate ~ Summoner					CATEGORY:Special Ability	TYPE:SpecialQuality.SpellLike																																																																																																									DESC:You may cast Gate with your Summon Monster spell-like abilty.
 


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15072] Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ advanced_players_guide

[<gjo...@us...>]

Revision: 15072
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15072&view=rev
Author:   gjorbjond
Date:     2011-05-31 20:15:58 +0000 (Tue, 31 May 2011)

Log Message:
-----------
Summoner ability cleanup.

Modified Paths:
--------------
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_classes_base.lst

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2011-05-31 17:52:22 UTC (rev 15071)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2011-05-31 20:15:58 UTC (rev 15072)
@@ -460,20 +460,20 @@
 #
 # Ability Name							Unique Key							Category of Ability		Type										Visible		Required Ability									Restricted Ability						Required AL			Restricted AL		Required Class		Required Skill					Var. Min. Value			Define																															Innate Spells																		Description																																																																																																																																																																																																																																																																																																									Multiple?	Choose						Automatically Gained Armor Prof.	Automatically Gained Feat														Automatically Gained Weapon Prof.	Ability																																										Bonus to Ability Pool																										Save checks bonus								Combat bonus			Add to base move			Bonus to skill									Bonus to spell known/L																																																																																												Stat bonus		Modify VAR																																																												Add to vision																						Allow Follower			Allowed Companions																																																									Class Skill									Vision							Source Page		Aspects													Description of the Benefits																																																																																																											List of Known Class Spells by Level																																																																																												List of Class Spells by Level
 Cantrips								KEY:Cantrips ~ Summoner					CATEGORY:Special Ability	TYPE:SpecialQuality																																																																																																										DESC:You have learned a number of cantrips, or 0-level spells. These spells are cast like any other spells, but they do not consume any slots and may be used again.
-Summon Monster							KEY:Summon Monster ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.SpellLike																																																					DEFINE:SMLevel|0	DEFINE:SMTimes|0	DEFINE:SMDuration|0																																											DESC:Summon Monster %1 (Sp) ~ (%2 per day) cast as a standard action and the creatures remain for %3 minutes (instead of %3 rounds).  Drawing upon this ability uses up the same power as the summoner uses to call his eidolon. As a result, he can only use this ability when his eidolon is not summoned.|SMLevel|SMTimes|SMDuration
-Eidolon																CATEGORY:Special Ability	TYPE:SpecialQuality.Extraordinary																																																				DEFINE:EidolonLevel|0																																																	DESC:A summoner begins play with the ability to summon to his side a powerful outsider called an eidolon. The eidolon forms a link with the summoner, who, forever after, summons an aspect of the same creature. An eidolon has the same alignment as the summoner that calls it. Eidolons are treated as summoned creatures, except that they are not sent back to their home plane until reduced to a number of negative hit points equal to or greater than their Constitution score. In addition, due to its tie to its summoner, an eidolon can touch and attack creatures warded by protection from evil and similar effects that prevent contact with summoned creatures. A summoner can summon his eidolon in a ritual that takes 1 minute to perform. When summoned in this way, the eidolon hit points are unchanged from the last time it was summoned. The only exception to this is if the eidolon was slain, in which case it returns with half its normal hit points. The eidolon remains until dismissed by the summoner (a standard action). If the eidolon is sent back to its home plane due to damage, it cannot be summoned again until the following day. The eidolon cannot be sent back to its home plane by means of dispel magic, but spells such as dismissal and banishment work normally.																																																																																																																																																																																																																																																																																																																																																																																																																												FOLLOWERS:Eidolon|1		COMPANIONLIST:Eidolon|RACETYPE=Eidolon
-Life Link																CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:A close bond is formed with his eidolon. Whenever the eidolon takes enough damage to send it back to its home plane, the summoner can, as a free action, sacrifice any number of hit points. Each hit point sacrificed in this way prevents 1 point of damage done to the eidolon. This can prevent the eidolon from being sent back to its home plane. In addition, the eidolon and the summoner must remain within 100 feet of one another for the eidolon to remain at full strength. If the eidolon is beyond 100 feet but closer than 1,000 feet, its current and maximum hit point totals are reduced by 50%%. If the eidolon is more than 1,000 feet away but closer than 10,000 feet, its current and maximum hit point totals are reduced by 75%%. If the eidolon is more than 10,000 feet away, it is immediately returned to its home plane. Current hit points lost in this way are not restored when the eidolon gets closer to its summoner, but its maximum hit point total does return to normal.
-Bond Senses																CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:As a standard action, share the senses of his eidolon, hearing, seeing, smelling, tasting, and touching everything the eidolon does. He can use this ability a number of rounds per day equal to his summoner level. There is no range to this effect, but the eidolon and the summoner must be on the same plane. The summoner can end this effect as a free action.
-Shield Ally																CATEGORY:Special Ability	TYPE:SpecialQuality.Extraordinary																																																																																																								DESC:Whenever a summoner is within his eidolon's reach, the summoner receives a +2 shield bonus to his Armor Class and a +2 circumstance bonus on his saving throws. This bonus does not apply if the eidolon is grappled, helpless, paralyzed, stunned, or unconscious.
-Maker's Call															CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:MakersCallTimes|0																																																DESC:As a standard action, a summoner can call his eidolon to his side. This functions as dimension door, using the summoner's caster level. When used, the eidolon appears adjacent to the summoner (or as close as possible if all adjacent spaces are occupied). If the eidolon is out of range, the ability is wasted. (%1/day)|MakersCallTimes
-Transposition															CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:Use maker's call ability to swap locations with eidolon. If it is larger than him, he can appear in any square occupied by the eidolon. The eidolon must occupy the square that was occupied by the summoner if able, or as close as possible if it is not able.
-Aspect																CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:MasterLevel|0	DEFINE:EidMaxAttacks|0	DEFINE:EidUsedAttacks|0	DEFINE:EidArms|0	DEFINE:EidArmsUsed|0	DEFINE:EidLegs|0	DEFINE:EidLegsUsed|0																											DESC:Divert up to 2 points from his eidolon's evolution pool to add evolutions to himself. He cannot select any evolution that the eidolon could not possess, and he must be able to meet the requirements as well. He cannot select the ability increase evolution through this ability. Any points spent in this way are taken from the eidolon's evolution pool (reducing the total number available to the eidolon). The summoner can change the evolutions he receives from these points any time he can change the eidolon's evolutions.																																																																																																																																																																																																																																																																																																					BONUS:ABILITYPOOL|Eidolon Evolution|2																																																																																																																																																								BONUS:VAR|EidArms|1	BONUS:VAR|EidLegs|1
-Greater Shield Ally														CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:Whenever an ally is within an eidolon's reach, the ally receives a +2 shield bonus to its Armor Class and a +2 circumstance bonus on its saving throws. If this ally is the summoner, these bonuses increase to +4. This bonus does not apply if the eidolon is grappled, helpless, paralyzed, stunned, or unconscious.
-Life Bond																CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:Summoner's life becomes linked to his eidolon's. As long as the eidolon has 1 or more hit points, the summoner is protected from harm. Damage in excess of that which would reduce the summoner to fewer than 0 hit points is instead transferred to the eidolon. This damage is transferred 1 point at a time, meaning that as soon as the eidolon is reduced to a number of negative hit points equal to its Constitution score, all excess damage remains with the summoner.
-Merge Forms																CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:As a full-round action, a summoner can touch his eidolon and the two can merge forms. This transformation includes all of the summoner's gear. While merged in this way, the summoner is protected from harm and cannot be the target of spells or effects. All effects and spells currently targeting the summoner are suspended until the summoner emerges from the eidolon (although durations continue to expire).  The summoner can cast spells while inside the eidolon by taking control of the eidolon for the duration of the casting. Any material components used for these spells are taken from the summoner's gear, even though they are otherwise inaccessible. The summoner can direct all of the eidolon's actions while merged, can perceive through its senses, and can speak through its voice. The summoner can use this ability for a number of rounds per day equal to his summoner level. He can end this effect at any time as a swift action. The summoner emerges in a square adjacent to the eidolon if able. If the eidolon is returned to its home plane while the summoner is merged with it, the summoner is immediately ejected, taking 4d6 points of damage, and is stunned for 1 round.
-Greater Aspect															CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:Summoner can divert more of his eidolon's evolutions to himself. This ability functions as the aspect ability, but up to 6 evolution points can be taken. Unlike the aspect ability, the eidolon loses 1 point from its evolution pool for every 2 points (or fraction thereof) diverted to the summoner.																																																																																																																																																																																																																																																																																																																																										BONUS:ABILITYPOOL|Eidolon Evolution|4
-Twin Eidolon															CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:Summoner and his eidolon share a true connection. As a standard action, the summoner can assume the shape of his eidolon, copying all of its evolutions, form, and abilities. His Strength, Dexterity, and Constitution scores change to match the base scores of his eidolon. He can choose to have any gear that he carries become absorbed by his new form, as with spells from the polymorph subschool. Items with continuous effects continue to function while absorbed in this way. The summoner loses his natural attacks and all racial traits (except bonus feats, skills, and languages) in favor of the abilities granted by his eidolon's evolutions. The summoner retains all of his class features. The summoner can keep this form for a number of minutes per day equal to his summoner level. This duration does not need to be consecutive, but it must be spent in 1-minute increments. The summoner can end this effect as a free action.
-Gate									KEY:Gate ~ Summoner					CATEGORY:Special Ability	TYPE:SpecialQuality.SpellLike																																																																																																									DESC:Summoner may cast Summon Monster 9 or Gate with his spell-like abilty.
+Summon Monster							KEY:Summon Monster ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.SpellLike																																																					DEFINE:SMLevel|0	DEFINE:SMTimes|0	DEFINE:SMDuration|0																																											DESC:You can cast Summon Monster %1 as a spell-like ability %2 times per day as a standard action and the creatures remain for %3 minutes (instead of %3 rounds).  Drawing upon this ability uses up the same power you use to call your eidolon. As a result, you can only use this ability when your eidolon is not summoned.|SMLevel|SMTimes|SMDuration
+Eidolon								KEY:Eidolon ~ Summoner					CATEGORY:Special Ability	TYPE:SpecialQuality.Extraordinary																																																				DEFINE:EidolonLevel|0																																																	DESC:You possess the ability to summon a powerful outsider called an eidolon. You always summon an aspect of the same creature. Your eidolon has your alignment and can speak all of your languages. Your eidolon is treated as a summoned creature, except that it is not sent back to its home plane until reduced to a number of negative hit points equal to or greater than its Constitution score. In addition, due to its tie to you, your eidolon can touch and attack creatures warded by protection from evil and similar effects that prevent contact with summoned creatures. You can summon your eidolon in a ritual that takes 1 minute to perform. When summoned in this way, your eidolon's hit points are unchanged from the last time it was summoned. The only exception to this is if your eidolon was slain, in which case it returns with half its normal hit points. Your eidolon remains until dismissed (a standard action). If your eidolon is sent back to its home plane due to damage, it cannot be summoned again until the following day. Your eidolon cannot be sent back to its home plane by means of dispel magic, but spells such as dismissal and banishment work normally.																																																																																																																																																																																																																																																																																																																																																																																																																												FOLLOWERS:Eidolon|1		COMPANIONLIST:Eidolon|RACETYPE=Eidolon
+Life Link								KEY:Life Link ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:A close bond is formed with your eidolon. Whenever your eidolon takes enough damage to send it back to its home plane, you can, as a free action, sacrifice any number of hit points. Each hit point sacrificed in this way prevents 1 point of damage done to your eidolon. This can prevent your eidolon from being sent back to its home plane. In addition, you and your eidolon must remain within 100 feet of one another for your eidolon to remain at full strength. If your eidolon is beyond 100 feet but closer than 1,000 feet, its current and maximum hit point totals are reduced by 50%%. If your eidolon is more than 1,000 feet away but closer than 10,000 feet, its current and maximum hit point totals are reduced by 75%%. If your eidolon is more than 10,000 feet away, it is immediately returned to its home plane. Current hit points lost in this way are not restored when your eidolon gets closer to you, but its maximum hit point total does return to normal.
+Bond Senses								KEY:Bond Senses ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:BondSensesRounds|0																																																DESC:As a standard action, share the senses of your eidolon, hearing, seeing, smelling, tasting, and touching everything your eidolon does. He can use this ability %1 rounds per day. There is no range to this effect, but your eidolon and you must be on the same plane. The summoner can end this effect as a free action.|BondSensesRounds
+Shield Ally								KEY:Shield Ally ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Extraordinary																																																																																																								DESC:Whenever you are within your eidolon's reach, you receives a +2 shield bonus to your Armor Class and a +2 circumstance bonus on your saving throws. This bonus does not apply if your eidolon is grappled, helpless, paralyzed, stunned, or unconscious.
+Maker's Call							KEY:Maker's Call ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:MakersCallTimes|0																																																DESC:As a standard action, you can call your eidolon to your side. This functions as dimension door, using your caster level. When used, your eidolon appears adjacent to you (or as close as possible if all adjacent spaces are occupied). If your eidolon is out of range, the ability is wasted. (%1/day)|MakersCallTimes
+Transposition							KEY:Transposition ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:You may use your maker's call ability to swap locations with eidolon. If it is larger than you, you can appear in any square occupied by your eidolon. Your eidolon must occupy the square that was occupied by you if able, or as close as possible if it is not able.
+Aspect								KEY:Aspect ~ Summoner					CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:MasterLevel|0	DEFINE:EidMaxAttacks|0	DEFINE:EidUsedAttacks|0	DEFINE:EidArms|0	DEFINE:EidArmsUsed|0	DEFINE:EidLegs|0	DEFINE:EidLegsUsed|0																											DESC:You may divert up to 2 points from your eidolon's evolution pool to add evolutions to yourself. You cannot select any evolution that your eidolon could not possess, and you must be able to meet the requirements as well. You cannot select the ability increase evolution through this ability. Any points spent in this way are taken from your eidolon's evolution pool (reducing the total number available to your eidolon). You can change the evolutions you receives from these points any time you can change your eidolon's evolutions.																																																																																																																																																																																																																																																																																																	BONUS:ABILITYPOOL|Eidolon Evolution|2	BONUS:VAR|EidArms|1	BONUS:VAR|EidLegs|1
+Greater Shield Ally						KEY:Greater Shield Ally ~ Summoner			CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:Whenever an ally is within your eidolon's reach, the ally receives a +2 shield bonus to its Armor Class and a +2 circumstance bonus on its saving throws. For you, the bonuses increase to +4. The bonuses do not apply if your eidolon is grappled, helpless, paralyzed, stunned, or unconscious.
+Life Bond								KEY:Life Bond ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																																																																								DESC:Your life becomes linked to your eidolon's. As long as your eidolon has 1 or more hit points, you are protected from harm. Damage in excess of that which would reduce you to fewer than 0 hit points is instead transferred to your eidolon. This damage is transferred 1 point at a time, meaning that as soon as your eidolon is reduced to a number of negative hit points equal to its Constitution score, all excess damage remains with the summoner.
+Merge Forms								KEY:Merge Forms ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:MergeFormsRounds|0																																																DESC:As a full-round action, you can touch your eidolon to merge forms. This transformation includes all of your gear. While merged in this way, you are protected from harm and cannot be the target of spells or effects. All effects and spells currently targeting you are suspended until you emerge from your eidolon (although durations continue to expire).  You can cast spells while inside your eidolon by taking control of your eidolon for the duration of the casting. Any material components used for these spells are taken from your gear, even though they are otherwise inaccessible. You can direct all of your eidolon's actions while merged, can perceive through its senses, and can speak through its voice. You can use this ability for %1 rounds per day. You can end this effect at any time as a swift action. You emerge in a square adjacent to your eidolon if able. If your eidolon is returned to its home plane while you are merged with it, you are immediately ejected, taking 4d6 points of damage, and are stunned for 1 round.|MergeFormsRounds
+Greater Aspect							KEY:Greater Aspect ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:MasterLevel|0	DEFINE:EidMaxAttacks|0	DEFINE:EidUsedAttacks|0	DEFINE:EidArms|0	DEFINE:EidArmsUsed|0	DEFINE:EidLegs|0	DEFINE:EidLegsUsed|0																											DESC:You can divert more of your eidolon's evolutions to yourself. This ability functions as the aspect ability, but up to 6 evolution points can be taken. Unlike the aspect ability, your eidolon loses 1 point from its evolution pool for every 2 points (or fraction thereof) diverted to you.																																																																																																																																																																																																																																																																																																																																										BONUS:ABILITYPOOL|Eidolon Evolution|6	BONUS:VAR|EidArms|1	BONUS:VAR|EidLegs|1
+Twin Eidolon							KEY:Twin Eidolon ~ Summoner				CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural																																																				DEFINE:TwinEidolonMinutes|0																																																DESC:As a standard action, you can assume the shape of your eidolon, copying all of its evolutions, form, and abilities. Your Strength, Dexterity, and Constitution scores change to match the base scores of your eidolon. You can choose to have any gear that you carry become absorbed by your new form, as with spells from the polymorph subschool. Items with continuous effects continue to function while absorbed in this way. You lose your natural attacks and all racial traits (except bonus feats, skills, and languages) in favor of the abilities granted by your eidolon's evolutions. You retain all of your class features. You can keep this form for %1 minutes per day. This duration does not need to be consecutive, but it must be spent in 1-minute increments. You can end this effect as a free action.|TwinEidolonMinutes
+Gate									KEY:Gate ~ Summoner					CATEGORY:Special Ability	TYPE:SpecialQuality.SpellLike																																																																																																									DESC:You may cast Gate with your Summon Monster spell-like abilty.
 
 #Witch Special Abilities
 # Ability Name	Unique Key	Category of Ability	Type	Visible	Define	Description	Virtual Feat	Source Page	Followers

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_classes_base.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_classes_base.lst	2011-05-31 17:52:22 UTC (rev 15071)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_classes_base.lst	2011-05-31 20:15:58 UTC (rev 15072)
@@ -205,28 +205,28 @@
 ###Block:Proficiencies
 1																							ABILITY:Special Ability|AUTOMATIC|All Automatic Proficiencies		AUTO:FEAT|Simple Weapon Proficiency|Armor Proficiency (Light)
 #
-1									BONUS:VAR|EidolonLevel|CL										ABILITY:Special Ability|AUTOMATIC|Cantrips ~ Summoner|Eidolon|Life Link
+1									BONUS:VAR|EidolonLevel|CL										ABILITY:Special Ability|AUTOMATIC|Cantrips ~ Summoner|Eidolon ~ Summoner|Life Link ~ Summoner
 1									BONUS:VAR|SMDuration|CL	BONUS:VAR|SMLevel|min(9,(CL+1)/2)	BONUS:VAR|SMTimes|CHA+3	ABILITY:Special Ability|AUTOMATIC|Summon Monster ~ Summoner
 1	CAST:0,1			KNOWN:4,2
-2	CAST:0,2			KNOWN:5,3																	ABILITY:Special Ability|AUTOMATIC|Bond Senses
+2	CAST:0,2			KNOWN:5,3			BONUS:VAR|BondSensesRounds|CL										ABILITY:Special Ability|AUTOMATIC|Bond Senses ~ Summoner
 3	CAST:0,3			KNOWN:6,4
-4	CAST:0,3,1			KNOWN:6,4,2																	ABILITY:Special Ability|AUTOMATIC|Shield Ally
+4	CAST:0,3,1			KNOWN:6,4,2																	ABILITY:Special Ability|AUTOMATIC|Shield Ally ~ Summoner|PREVARLT:CL,12
 5	CAST:0,4,2			KNOWN:6,4,3
-6	CAST:0,4,3			KNOWN:6,4,4			BONUS:VAR|MakersCallTimes|((CL-2)/4)								ABILITY:Special Ability|AUTOMATIC|Maker's Call
+6	CAST:0,4,3			KNOWN:6,4,4			BONUS:VAR|MakersCallTimes|((CL-2)/4)								ABILITY:Special Ability|AUTOMATIC|Maker's Call ~ Summoner
 7	CAST:0,4,3,1		KNOWN:6,5,4,2
-8	CAST:0,4,4,2		KNOWN:6,5,4,3																ABILITY:Special Ability|AUTOMATIC|Transposition
+8	CAST:0,4,4,2		KNOWN:6,5,4,3																ABILITY:Special Ability|AUTOMATIC|Transposition ~ Summoner
 9	CAST:0,5,4,3		KNOWN:6,5,4,4
-10	CAST:0,5,4,3,1		KNOWN:6,5,5,4,2		BONUS:VAR|MasterLevel|CL	BONUS:VAR|EidMaxAttacks|5					ABILITY:Special Ability|AUTOMATIC|Aspect
+10	CAST:0,5,4,3,1		KNOWN:6,5,5,4,2		BONUS:VAR|MasterLevel|CL	BONUS:VAR|EidMaxAttacks|5					ABILITY:Special Ability|AUTOMATIC|Aspect ~ Summoner|PREVARLT:CL,18
 11	CAST:0,5,4,4,2		KNOWN:6,6,5,4,3
-12	CAST:0,5,5,4,3		KNOWN:6,6,5,4,4																ABILITY:Special Ability|AUTOMATIC|Greater Shield Ally
+12	CAST:0,5,5,4,3		KNOWN:6,6,5,4,4																ABILITY:Special Ability|AUTOMATIC|Greater Shield Ally ~ Summoner
 13	CAST:0,5,5,4,3,1		KNOWN:6,6,5,5,4,2
-14	CAST:0,5,5,4,4,2		KNOWN:6,6,6,5,4,3		BONUS:VAR|EidMaxAttacks|1										ABILITY:Special Ability|AUTOMATIC|Life Bond
+14	CAST:0,5,5,4,4,2		KNOWN:6,6,6,5,4,3		BONUS:VAR|EidMaxAttacks|1										ABILITY:Special Ability|AUTOMATIC|Life Bond ~ Summoner
 15	CAST:0,5,5,5,4,3		KNOWN:6,6,6,5,4,4
-16	CAST:0,5,5,5,4,3,1	KNOWN:6,6,6,5,5,4,2															ABILITY:Special Ability|AUTOMATIC|Merge Forms
+16	CAST:0,5,5,5,4,3,1	KNOWN:6,6,6,5,5,4,2	BONUS:VAR|MergeFormsRounds|CL										ABILITY:Special Ability|AUTOMATIC|Merge Forms ~ Summoner
 17	CAST:0,5,5,5,4,4,2	KNOWN:6,6,6,6,5,4,3
-18	CAST:0,5,5,5,5,4,3	KNOWN:6,6,6,6,5,4,4															ABILITY:Special Ability|AUTOMATIC|Greater Aspect
+18	CAST:0,5,5,5,5,4,3	KNOWN:6,6,6,6,5,4,4															ABILITY:Special Ability|AUTOMATIC|Greater Aspect ~ Summoner
 19	CAST:0,5,5,5,5,5,4	KNOWN:6,6,6,6,5,5,4	BONUS:VAR|EidMaxAttacks|1										ABILITY:Special Ability|AUTOMATIC|Gate ~ Summoner
-20	CAST:0,5,5,5,5,5,5	KNOWN:6,6,6,6,6,5,5															ABILITY:Special Ability|AUTOMATIC|Twin Eidolon
+20	CAST:0,5,5,5,5,5,5	KNOWN:6,6,6,6,6,5,5	BONUS:VAR|TwinEidolonMinutes|CL									ABILITY:Special Ability|AUTOMATIC|Twin Eidolon ~ Summoner
 
 
 # Class Name	Hit Dice	Type			Abbreviation	Max Level	Source Page		Define			Save checks bonus											Combat bonus


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15071] Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ advanced_players_guide/pfapg_abilities_class.lst

[<pap...@us...>]

Revision: 15071
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15071&view=rev
Author:   papa_drb
Date:     2011-05-31 17:52:22 +0000 (Tue, 31 May 2011)

Log Message:
-----------
Nature Oracle - Corrected text for Bonded Mount (SU)
Issue#: NEWSOURCE-32

Modified Paths:
--------------
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2011-05-31 12:43:36 UTC (rev 15070)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2011-05-31 17:52:22 UTC (rev 15071)
@@ -395,7 +395,7 @@
 # Oracle Revelations: Nature
 # TODO: Working on it.
 # Ability Name							Unique Key							Category of Ability		Type										Visible		Required Ability									Restricted Ability						Required AL			Restricted AL		Required Class		Required Skill					Var. Min. Value			Define																															Innate Spells																		Description																																																																																																																																																																																																																																																																																																									Multiple?	Choose						Automatically Gained Armor Prof.	Automatically Gained Feat														Automatically Gained Weapon Prof.	Ability																																										Bonus to Ability Pool																										Save checks bonus								Combat bonus			Add to base move			Bonus to skill									Bonus to spell known/L																																																																																												Stat bonus		Modify VAR																																																												Add to vision																						Allow Follower			Allowed Companions																																																									Class Skill									Vision							Source Page		Aspects													Description of the Benefits																																																																																																											List of Known Class Spells by Level																																																																																												List of Class Spells by Level
-Bonded Mount							KEY:Bonded Mount ~ Nature Mystery			CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural.NatureRevelation																																																																																																					DESC:You gain the ability to take 20 on all Knowledge skill checks. Your understanding of the fundamental underpinnings of reality has also become so advanced that once per day, you can cast wish. This ability does not require a material component, but the wish cannot be used to grant ability score bonuses, nor can it be used to replicate spells with expensive material components.																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			SOURCEPAGE:p.50
+Bonded Mount							KEY:Bonded Mount ~ Nature Mystery			CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural.NatureRevelation																																																																																																					DESC:You gain the service of an unusually intelligent, strong, and loyal mount. The creature must be one that you are capable of riding and is suitable as a mount. A Medium oracle can select a camel or a horse. A Small oracle can select a pony or wolf, but can also select a boar or a dog if she is at least 4th level. This mount functions as a druid\x92s animal companion, using your oracle level as your effective druid level. Bonded mounts have an Intelligence score of at least 6.																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			SOURCEPAGE:p.50
 Erosion Touch							KEY:Erosion Touch ~ Nature Mystery			CATEGORY:Special Ability	TYPE:SpecialAttack.Supernatural.NatureRevelation																																																	DEFINE:OracleErosionTouchDamageDice|0	DEFINE:OracleErosionTouchTimes|0																																								DESC:As a melee touch attack, you can deal %1d6 points of damage to objects or constructs. If used against an object in another creatureUs possession, treat this attack as a sunder combat maneuver. You can use this ability %2 time(s) per day.|OracleErosionTouchDamageDice|OracleErosionTouchTimes																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																									BONUS:VAR|OracleErosionTouchDamageDice|classlevel("Oracle")	BONUS:VAR|OracleErosionTouchTimes|1+classlevel("Oracle")/3																																																																																																																																																					SOURCEPAGE:p.50
 Friend to the Animals						KEY:Friend to the Animals ~ Nature Mystery	CATEGORY:Special Ability	TYPE:SpecialQuality.Extraordinary.NatureRevelation																																																	DEFINE:OracleFriendtotheAnimalsSaveBonus|0																																													DESC:Add all summon nature's ally spells to your spell list. You must still select these spells using your allotment of spells known. Animals within 30 feet of you receive a %1 bonus on all saving throws.|OracleFriendtotheAnimalsSaveBonus																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			BONUS:VAR|OracleFriendtotheAnimalsSaveBonus|CHA																																																																																																																																																																	SOURCEPAGE:p.50																																																																																																																														SPELLKNOWN:CLASS|Oracle=1|Summon Nature's Ally I|Oracle=2|Summon Nature's Ally II|Oracle=3|Summon Nature's Ally III|Oracle=4|Summon Nature's Ally IV|Oracle=5|Summon Nature's Ally V|Oracle=6|Summon Nature's Ally VI|Oracle=7|Summon Nature's Ally VII|Oracle=8|Summon Nature's Ally VIII|Oracle=9|Summon Nature's Ally IX
 Life Leach								KEY:Life Leach ~ Nature Mystery			CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural.NatureRevelation																																	PRECLASS:1,Oracle=7													DEFINE:OracleLifeLeachDamageDice|0	DEFINE:OracleLifeLeachDuration|0	DEFINE:OracleLifeLeachTimes|0																																				DESC:You can draw life force from the bodies of enemies and channel it into yourself.																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																												BONUS:VAR|OracleLifeLeachDamageDice|classlevel("Oracle")/2	BONUS:VAR|OracleLifeLeachDuration|CHA	BONUS:VAR|OracleLifeLeachTimes|(classlevel("Oracle")-3)/4																																																																																																																																														SOURCEPAGE:p.50															BENEFIT:As a standard action, you can drain the life essence from one living target within 30 feet. The target takes %1d6 points of damage. You gain temporary hit points equal to the damage you deal. You canUt gain more than the targetUs current hit points + the targetUs Constitution score (which is enough to kill the subject). The temporary hit points last %2 hours. The target receives a Fortitude save (DC %3) to halve the damage (and the temporary hit points you gain). You may use this ability %4 time(s) per day.|OracleLifeLeachDamageDice|OracleRevelationDC|OracleLifeLeachDuration|OracleLifeLeachTimes


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15070] Trunk/pcgen/docs/listfilepages/ globalfilestagpages/globalfilesother.html

[<mar...@us...>]

Revision: 15070
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15070&view=rev
Author:   maredudd800
Date:     2011-05-31 12:43:36 +0000 (Tue, 31 May 2011)

Log Message:
-----------
Additional clean-up.
Issue#: NEWTAG-5

Modified Paths:
--------------
    Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html

Modified: Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html
===================================================================
--- Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html	2011-05-31 12:31:35 UTC (rev 15069)
+++ Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html	2011-05-31 12:43:36 UTC (rev 15070)
@@ -880,7 +880,7 @@
 		<li>This tag provides a generic text field by which LST objects can be sorted.</li>
 		<li><strong>SORTKEY</strong> can be modified with the <a href="#MOD">MOD</a> tag.</li>
 	</ul>
-	<p class="indent1"><strong>Note:</strong> When sorting lists of objects, PCGen will sort by <strong>SORTKEY</strong>, <strong>OUTPUTNAME</strong> then LST Name (e.g. &quot;Enlarge Spell&quot;, 
+	<p class="sidebar1"><strong>Note:</strong> When sorting lists of objects, PCGen will sort by <strong>SORTKEY</strong>, <strong>OUTPUTNAME</strong> then LST Name (e.g. &quot;Enlarge Spell&quot;, 
 		&quot;Quicken Spell&quot;, etc), in that order. Sorts order is 0-9, A-Z.</p>
 	<p class="indent1"><strong>Example:</strong></p>
 	<p class="indent2"><code>Enlarge Spell&lt;tab&gt;SORTKEY:Metamagic~Enlarge Spell</code></p>


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15069] Trunk/pcgen/docs/listfilepages/ globalfilestagpages/globalfilesother.html

[<mar...@us...>]

Revision: 15069
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15069&view=rev
Author:   maredudd800
Date:     2011-05-31 12:31:35 +0000 (Tue, 31 May 2011)

Log Message:
-----------
Clean up tag docs
Issue#: NEWTAG-5

Modified Paths:
--------------
    Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html

Modified: Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html
===================================================================
--- Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html	2011-05-30 11:56:35 UTC (rev 15068)
+++ Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesother.html	2011-05-31 12:31:35 UTC (rev 15069)
@@ -874,20 +874,22 @@
 
 	<p class="new">*** New 5.17.4</p>
 	<p class="indent0"><strong><a name="SORTKEY">Tag Name:</a></strong> SORTKEY:x</p>
-	<p class="indent1"><strong>Variables Used (y):</strong> Text (Alpha Numeric)</p>
+	<p class="indent1"><strong>Variables Used (x):</strong> Text (Alpha Numeric)</p>
 	<p class="indent1"><strong>What it does:</strong></p>
-	<p class="indent2">Sorts in the order of 0-9, A-Z. When sorting lists of objects, PCGen would use, SORTKEY, OUTPUTNAME or Name in that order to determine what to sort on and then it would order by the values, being a text field you can do whatever fancy grouping you like without pcgen having to interpret it</p>
+	<ul class="indent2">
+		<li>This tag provides a generic text field by which LST objects can be sorted.</li>
+		<li><strong>SORTKEY</strong> can be modified with the <a href="#MOD">MOD</a> tag.</li>
+	</ul>
+	<p class="indent1"><strong>Note:</strong> When sorting lists of objects, PCGen will sort by <strong>SORTKEY</strong>, <strong>OUTPUTNAME</strong> then LST Name (e.g. &quot;Enlarge Spell&quot;, 
+		&quot;Quicken Spell&quot;, etc), in that order. Sorts order is 0-9, A-Z.</p>
 	<p class="indent1"><strong>Example:</strong></p>
 	<p class="indent2"><code>Enlarge Spell&lt;tab&gt;SORTKEY:Metamagic~Enlarge Spell</code></p>
 	<p class="indent2"><code>Quicken Spell&lt;tab&gt;SORTKEY:11-MetaMagic~Quicken Spell</code></p>
 	<p class="indent2"><code>Early Feat&lt;tab&gt;SORTKEY:Z-Me last</code></p>
 	<p class="indent3">Would Display as</p>
-	<p class="indent3">Quicken Spell</p>
-	<p class="indent3">Enlarge Spell</p>
-	<p class="indent3">Early Feat</p>
-	<p class="indent1"><strong>NOTES:</strong></p>
-	<p class="indent2">Order of Operation - SORTKEY, OUTPUTNAME, NAME</p>
-	<p class="indent2">Can be 'MOD'ed</p>
+	<p class="indent4">Quicken Spell</p>
+	<p class="indent4">Enlarge Spell</p>
+	<p class="indent4">Early Feat</p>
 
 <hr>
 


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

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

[<nu...@us...>]

Revision: 15068
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15068&view=rev
Author:   nuance
Date:     2011-05-30 11:56:35 +0000 (Mon, 30 May 2011)

Log Message:
-----------
CheckStyle updates.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/ACValue.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/CasterLevel.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Concentration.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/DR.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Feat.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Followers.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/ItemCapacity.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/ItemCost.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/ItemWeight.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/MonNonSkillHD.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/PCLevel.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/PPCost.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/PointBuy.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/SkillPool.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/SkillRank.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/WieldCategory.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -508,6 +508,9 @@
 	String LST_EXCLUSIVE = "EXCLUSIVE";
 
 	/** A snippet of List code as a constant. */
+	String LST_LEVEL = "LEVEL";
+
+	/** A snippet of List code as a constant. */
 	String LST_LIST = "LIST";
 
 	/** A snippet of List code as a constant. */
@@ -517,6 +520,9 @@
 	String LST_NONEXCLUSIVE = "NONEXCLUSIVE";
 
 	/** A snippet of List code as a constant. */
+	String LST_NUMBER = "NUMBER";
+
+	/** A snippet of List code as a constant. */
 	String LST_SCHOOL = "SCHOOL";
 
 	/** A snippet of List code as a constant. */

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/ACValue.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/ACValue.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/ACValue.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -29,12 +29,15 @@
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>ACValue</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:ACVALUE token.
  */
 public final class ACValue extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
@@ -43,12 +46,22 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/CasterLevel.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/CasterLevel.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/CasterLevel.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -25,20 +25,24 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>CasterLevel</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:CASTERLEVEL token.
  */
 public final class CasterLevel extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		if (token.startsWith("TYPE="))
+		if (token.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
@@ -50,12 +54,22 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Concentration.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Concentration.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Concentration.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -25,20 +25,24 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>CasterLevel</code>
- *
- * @author  Stefan Radermacher <za...@us...>
+ * Handles the BONUS:CONCENTRATION token.
  */
 public final class Concentration extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		if (token.startsWith("TYPE="))
+		if (token.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
@@ -50,12 +54,22 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/DR.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/DR.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/DR.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -29,12 +29,15 @@
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>DR</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:DR token.
  */
 public final class DR extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
@@ -43,12 +46,22 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Feat.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Feat.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Feat.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -29,17 +29,20 @@
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>Feat</code>
- *
- * @author  Devon Jones <sou...@ev...>
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:FEAT token.
  */
 public final class Feat extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		if ("POOL".equals(token) || "MONSTERPOOL".equals(token)
+		if ("POOL".equals(token)
+			|| "MONSTERPOOL".equals(token)
 			|| "PCPOOL".equals(token))
 		{
 			addBonusInfo(token);
@@ -49,12 +52,22 @@
 		return false;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Followers.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Followers.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Followers.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -1,3 +1,25 @@
+/*
+ * Followers.java
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Current Ver: $Revision$
+ * Last Editor: $Author: $
+ * Last Edited: $Date$
+ *
+ */
 package plugin.bonustokens;
 
 import pcgen.core.bonus.BonusObj;
@@ -3,13 +25,15 @@
 import pcgen.rules.context.LoadContext;
 
+/**
+ * Handles the BONUS:FOLLOWERS token.
+ */
 public class Followers extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
-	public String getBonusHandled()
-	{
-		return "FOLLOWERS";
-	}
-
-	@Override
 	protected boolean parseToken(LoadContext context, final String argToken)
 	{
@@ -23,9 +47,26 @@
 		//		return false;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
+
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
+	@Override
+	public String getBonusHandled()
+	{
+		return "FOLLOWERS";
+	}
+
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/ItemCapacity.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/ItemCapacity.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/ItemCapacity.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -25,20 +25,24 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>ItemCapacity</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:ITEMCAPACITY token.
  */
 public final class ItemCapacity extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		if (token.startsWith("TYPE="))
+		if (token.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
@@ -50,12 +54,22 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/ItemCost.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/ItemCost.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/ItemCost.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -29,12 +29,15 @@
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>ItemCost</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:ITEMCOST token.
  */
 public final class ItemCost extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
@@ -50,12 +53,22 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/ItemWeight.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/ItemWeight.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/ItemWeight.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -25,21 +25,25 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>ItemWeight</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:ITEMWEIGHT token.
  */
 public final class ItemWeight extends BonusObj
 {
 
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		if (token.startsWith("TYPE="))
+		if (token.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
@@ -51,12 +55,22 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/MonNonSkillHD.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/MonNonSkillHD.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/MonNonSkillHD.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -42,18 +42,33 @@
 {
 	private static final String[] bonusTags = {"NUMBER", "LOCKNUMBER"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "MONNONSKILLHD";
 	}
 
+	/**
+	 * Get by index, an monster non-skill hit die attribute that may be bonused.
+	 * @param tagNumber the index of the monster non-skill hit die attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The monster non-skill hit die attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
 		return bonusTags[tagNumber];
 	}
 
+	/**
+	 * Get the number of monster non-skill hit die attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of monster non-skill hit die attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/PCLevel.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/PCLevel.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/PCLevel.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -25,20 +25,24 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>PCLevel</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:PCLEVEL token.
  */
 public final class PCLevel extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		if (token.startsWith("TYPE="))
+		if (token.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
@@ -50,12 +54,22 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/PPCost.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/PPCost.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/PPCost.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -25,20 +25,24 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>PPCost</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:PPCOST token.
  */
 public final class PPCost extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		if (token.startsWith("TYPE="))
+		if (token.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
@@ -50,12 +54,22 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/PointBuy.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/PointBuy.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/PointBuy.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -29,12 +29,15 @@
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>PointBuy</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:POINTBUY token.
  */
 public final class PointBuy extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
@@ -52,12 +55,22 @@
 		return false;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/SkillPool.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/SkillPool.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/SkillPool.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -25,28 +25,32 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>SkillPoints</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:SKILLPOOL token.
  */
 public final class SkillPool extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		if (token.startsWith("CLASS"))
+		if (token.startsWith(Constants.LST_CLASS))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
-		else if (token.startsWith("LEVEL"))
+		else if (token.startsWith(Constants.LST_LEVEL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
-		else if ("NUMBER".equals(token))
+		else if (Constants.LST_NUMBER.equals(token))
 		{
 			addBonusInfo(token);
 		}
@@ -58,12 +62,22 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/SkillRank.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/SkillRank.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/SkillRank.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -25,20 +25,24 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>SkillRank</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:SKILLRANK token.
  */
 public final class SkillRank extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		if (token.startsWith("TYPE="))
+		if (token.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
@@ -50,12 +54,22 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/WieldCategory.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/WieldCategory.java	2011-05-30 10:53:43 UTC (rev 15067)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/WieldCategory.java	2011-05-30 11:56:35 UTC (rev 15068)
@@ -38,7 +38,7 @@
 	 * Return the bonus tag handled by this class.
 	 * @return The bonus handled by this class.
 	 */
-	@Override
+		@Override
 	public String getBonusHandled()
 	{
 		return "WIELDCATEGORY";


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

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

[<nu...@us...>]

Revision: 15067
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15067&view=rev
Author:   nuance
Date:     2011-05-30 10:53:43 +0000 (Mon, 30 May 2011)

Log Message:
-----------
CheckStyle updates.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Skill.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/SkillPoints.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Slots.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Spell.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/SpellCast.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/SpellCastMult.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnownMult.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Weapon.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/WeaponProf.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/WieldCategory.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-30 10:02:18 UTC (rev 15066)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-30 10:53:43 UTC (rev 15067)
@@ -455,6 +455,9 @@
 	String LST_SHIELDTYPE_EQUAL = "SHIELDTYPE=";
 
 	/** A snippet of List code as a constant. */
+	String LST_STAT_EQUAL = "STAT=";
+
+	/** A snippet of List code as a constant. */
 	String LST_TYPE_DOT = "TYPE.";
 
 	/** A snippet of List code as a constant. */

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Skill.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Skill.java	2011-05-30 10:02:18 UTC (rev 15066)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Skill.java	2011-05-30 10:53:43 UTC (rev 15067)
@@ -25,32 +25,37 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>Skill</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:SKILL token.
  */
 public final class Skill extends BonusObj
 {
-	private static final String[] bonusTags = {"LIST", "ALL"};
+	private static final String[] BONUS_TAGS = {"LIST", "ALL"};
 
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		for (int i = 0; i < bonusTags.length; ++i)
+		for (int i = 0; i < BONUS_TAGS.length; ++i)
 		{
-			if (bonusTags[i].equals(token))
+			if (BONUS_TAGS[i].equals(token))
 			{
-				addBonusInfo(Integer.valueOf(i));
+				addBonusInfo(i);
 
 				return true;
 			}
 		}
 
-		if (token.startsWith("STAT=") || token.startsWith("TYPE="))
+		if (token.startsWith(Constants.LST_STAT_EQUAL)
+			|| token.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
@@ -62,17 +67,27 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		if (obj instanceof Integer)
 		{
-			return bonusTags[((Integer) obj).intValue()];
+			return BONUS_TAGS[(Integer) obj];
 		}
 
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/SkillPoints.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/SkillPoints.java	2011-05-30 10:02:18 UTC (rev 15066)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/SkillPoints.java	2011-05-30 10:53:43 UTC (rev 15067)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>SkillPoints</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:SKILLPOINTS token.
  */
 public final class SkillPoints extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"NUMBER"};
+	private static final String[] BONUS_TAGS = {"NUMBER"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "SKILLPOINTS";
 	}
 
+	/**
+	 * Get by index, an individual skill point attribute that may be bonused.
+	 * @param tagNumber the index of the skill point attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The skill point attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of skill point attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of skill point attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Slots.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Slots.java	2011-05-30 10:02:18 UTC (rev 15066)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Slots.java	2011-05-30 10:53:43 UTC (rev 15067)
@@ -28,32 +28,45 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>Slots</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:SLOTS token.
  */
 public final class Slots extends MultiTagBonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{"AMULET", "BELT", "BOOT", "BRACER", "CAPE", "EYEGEAR", "GLOVE",
 				"HANDS", "HEADGEAR", "LEGS", "ROBE", "RING", "Shield", "SHIRT",
 				"SUIT", "WEAPON"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "SLOTS";
 	}
 
+	/**
+	 * Get by index, an individual slot type that may be bonused.
+	 * @param tagNumber the index of the slot type.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The slot type.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of slot types that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of slot types.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Spell.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Spell.java	2011-05-30 10:02:18 UTC (rev 15066)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Spell.java	2011-05-30 10:53:43 UTC (rev 15067)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>Spell</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:SPELL token.
  */
 public final class Spell extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"DC"};
+	private static final String[] BONUS_TAGS = {"DC"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "SPELL";
 	}
 
+	/**
+	 * Get by index, an individual spell attribute that may be bonused.
+	 * @param tagNumber the index of the spell attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The type of SizeMOD.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of spell attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of spell attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/SpellCast.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/SpellCast.java	2011-05-30 10:02:18 UTC (rev 15066)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/SpellCast.java	2011-05-30 10:53:43 UTC (rev 15067)
@@ -25,14 +25,13 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.core.bonus.util.SpellCastInfo;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>SpellCast</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:SPELLCAST token.
  */
 public final class SpellCast extends BonusObj
 {
@@ -42,14 +41,20 @@
 	 * @param token
 	 * @return
 	 */
+
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		int idx = token.indexOf(";LEVEL=");
+		int idx = token.indexOf(Constants.LST_SEMI_LEVEL_EQUAL);
 
 		if (idx < 0)
 		{
-			idx = token.indexOf(";LEVEL.");
+			idx = token.indexOf(Constants.LST_SEMI_LEVEL_DOT);
 		}
 
 		if (idx < 0)
@@ -57,13 +62,19 @@
 			return false;
 		}
 
-		final String level = token.substring(idx + 7);
+		final String level = token.substring(idx + Constants.SUBSTRING_LENGTH_SEVEN);
 
 		addBonusInfo(new SpellCastInfo(token.substring(0, idx), level));
 
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
@@ -72,18 +83,22 @@
 
 		if (sci.getType() != null)
 		{
-			sb.append("TYPE.").append(((SpellCastInfo) obj).getType());
+			sb.append(Constants.LST_TYPE_DOT).append(((SpellCastInfo) obj).getType());
 		}
 		else if (sci.getPcClassName() != null)
 		{
-			sb.append("CLASS.").append(((SpellCastInfo) obj).getPcClassName());
+			sb.append(Constants.LST_CLASS_DOT).append(((SpellCastInfo) obj).getPcClassName());
 		}
 
-		sb.append(";LEVEL.").append(((SpellCastInfo) obj).getLevel());
+		sb.append(Constants.LST_SEMI_LEVEL_DOT).append(((SpellCastInfo) obj).getLevel());
 
 		return sb.toString();
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/SpellCastMult.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/SpellCastMult.java	2011-05-30 10:02:18 UTC (rev 15066)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/SpellCastMult.java	2011-05-30 10:53:43 UTC (rev 15067)
@@ -25,14 +25,12 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.core.bonus.util.SpellCastInfo;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>SpellCastMult</code>
- *
- * @author  Greg Bingleman <by...@ho...>
  */
 public final class SpellCastMult extends BonusObj
 {
@@ -42,14 +40,20 @@
 	 * @param token
 	 * @return
 	 */
+
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		int idx = token.indexOf(";LEVEL=");
+		int idx = token.indexOf(Constants.LST_SEMI_LEVEL_EQUAL);
 
 		if (idx < 0)
 		{
-			idx = token.indexOf(";LEVEL.");
+			idx = token.indexOf(Constants.LST_SEMI_LEVEL_DOT);
 		}
 
 		if (idx < 0)
@@ -57,13 +61,19 @@
 			return false;
 		}
 
-		final String level = token.substring(idx + 7);
+		final String level = token.substring(idx + Constants.SUBSTRING_LENGTH_SEVEN);
 
 		addBonusInfo(new SpellCastInfo(token.substring(0, idx), level));
 
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
@@ -72,18 +82,22 @@
 
 		if (sci.getType() != null)
 		{
-			sb.append("TYPE.").append(((SpellCastInfo) obj).getType());
+			sb.append(Constants.LST_TYPE_DOT).append(((SpellCastInfo) obj).getType());
 		}
 		else if (sci.getPcClassName() != null)
 		{
-			sb.append("CLASS.").append(((SpellCastInfo) obj).getPcClassName());
+			sb.append(Constants.LST_CLASS_DOT).append(((SpellCastInfo) obj).getPcClassName());
 		}
 
-		sb.append(";LEVEL.").append(((SpellCastInfo) obj).getLevel());
+		sb.append(Constants.LST_SEMI_LEVEL_DOT).append(((SpellCastInfo) obj).getLevel());
 
 		return sb.toString();
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnownMult.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnownMult.java	2011-05-30 10:02:18 UTC (rev 15066)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnownMult.java	2011-05-30 10:53:43 UTC (rev 15067)
@@ -25,6 +25,7 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.core.bonus.util.SpellCastInfo;
 import pcgen.rules.context.LoadContext;
@@ -42,14 +43,20 @@
 	 * @param token
 	 * @return
 	 */
+
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		int idx = token.indexOf(";LEVEL=");
+		int idx = token.indexOf(Constants.LST_SEMI_LEVEL_EQUAL);
 
 		if (idx < 0)
 		{
-			idx = token.indexOf(";LEVEL.");
+			idx = token.indexOf(Constants.LST_SEMI_LEVEL_DOT);
 		}
 
 		if (idx < 0)
@@ -57,13 +64,19 @@
 			return false;
 		}
 
-		final String level = token.substring(idx + 7);
+		final String level = token.substring(idx + Constants.SUBSTRING_LENGTH_SEVEN);
 
 		addBonusInfo(new SpellCastInfo(token.substring(0, idx), level));
 
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
@@ -72,18 +85,22 @@
 
 		if (sci.getType() != null)
 		{
-			sb.append("TYPE.").append(((SpellCastInfo) obj).getType());
+			sb.append(Constants.LST_TYPE_DOT).append(((SpellCastInfo) obj).getType());
 		}
 		else if (sci.getPcClassName() != null)
 		{
-			sb.append("CLASS.").append(((SpellCastInfo) obj).getPcClassName());
+			sb.append(Constants.LST_CLASS_DOT).append(((SpellCastInfo) obj).getPcClassName());
 		}
 
-		sb.append(";LEVEL.").append(((SpellCastInfo) obj).getLevel());
+		sb.append(Constants.LST_SEMI_LEVEL_DOT).append(((SpellCastInfo) obj).getLevel());
 
 		return sb.toString();
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Weapon.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Weapon.java	2011-05-30 10:02:18 UTC (rev 15066)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Weapon.java	2011-05-30 10:53:43 UTC (rev 15067)
@@ -28,31 +28,44 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>Weapon</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:WEAPON token.
  */
 public final class Weapon extends MultiTagBonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			new String[]{"ATTACKS", "ATTACKSPROGRESS", "WEAPONBAB", "DAMAGE",
 				"DAMAGESIZE", "TOHIT", "WIELDCATEGORY"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "WEAPON";
 	}
 
+	/**
+	 * Get by index, an individual weapon attribute that may be bonused.
+	 * @param tagNumber the index of the weapon attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The weapon attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of weapon attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of weapon attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/WeaponProf.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/WeaponProf.java	2011-05-30 10:02:18 UTC (rev 15066)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/WeaponProf.java	2011-05-30 10:53:43 UTC (rev 15067)
@@ -28,9 +28,7 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>WeaponProf</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:WEAPONPROF= token.
  */
 public final class WeaponProf extends MultiTagBonusObj
 {
@@ -40,18 +38,33 @@
 				"TOHIT-SHORTRANGE", "TOHITOVERSIZE", "WEAPONBAB",
 				"WIELDCATEGORY"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "WEAPONPROF=";
 	}
 
+	/**
+	 * Get by index, an individual weapon proficiency attribute that may be bonused.
+	 * @param tagNumber the index of the weapon proficiency attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The weapon proficiency attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
 		return bonusTags[tagNumber];
 	}
 
+	/**
+	 * Get the number of weapon proficiency attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of weapon proficiency attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/WieldCategory.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/WieldCategory.java	2011-05-30 10:02:18 UTC (rev 15066)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/WieldCategory.java	2011-05-30 10:53:43 UTC (rev 15067)
@@ -27,31 +27,43 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>WieldCategory</code>
- *
- * @author  Jayme Cox <jay...@us...>
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:WIELDCATEGORY token.
  */
 public final class WieldCategory extends MultiTagBonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{"LIGHT", "ONEHANDED", "TWOHANDED"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "WIELDCATEGORY";
 	}
 
+	/**
+	 * Get by index, an individual wield category that may be bonused.
+	 * @param tagNumber the index of the wield category.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The wield category.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of wield categories that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of wield categories.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }


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

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

[<nu...@us...>]

Revision: 15066
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15066&view=rev
Author:   nuance
Date:     2011-05-30 10:02:18 +0000 (Mon, 30 May 2011)

Log Message:
-----------
CheckStyle updates.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/AbilityPool.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Combat.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/DC.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Domain.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Eqm.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/EqmArmor.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/EqmWeapon.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/HD.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/HP.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Lang.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Languages.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/LoadMult.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Misc.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/ModSkillPoints.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/MonSkillPts.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/MoveAdd.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/MoveMult.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/PostMoveAdd.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/PostRangeAdd.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/RangeAdd.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/RangeMult.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/SizeMod.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnown.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/SpellPointCosts.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/UDam.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Var.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Vision.java
    Trunk/pcgen/code/src/java/plugin/converter/FavClassConvertPlugin.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/TemplateLst.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -443,6 +443,12 @@
 	String LST_CAST_EQUAL = "CAST=";
 
 	/** A snippet of List code as a constant. */
+	String LST_CLASS_DOT = "CLASS.";
+
+	/** A snippet of List code as a constant. */
+	String LST_CLASS_EQUAL = "CLASS=";
+
+	/** A snippet of List code as a constant. */
 	String LST_SHIELDTYPE_DOT = "SHIELDTYPE.";
 
 	/** A snippet of List code as a constant. */
@@ -460,49 +466,72 @@
 	/** A snippet of List code as a constant. */
 	String LST_NOT_TYPE_EQUAL = "!TYPE=";
 
+
 	/** A snippet of List code as a constant. */
-	String LST_ALL = "ALL";
+	String LST_PERCENT_CHOICE = "%CHOICE";
 
 	/** A snippet of List code as a constant. */
-	String LST_ANY = "ANY";
+	String LST_PERCENT_LIST = "%LIST";
 
 	/** A snippet of List code as a constant. */
-	String LST_LIST = "LIST";
+	String LST_CHOOSE_COLON = "CHOOSE:";
 
 	/** A snippet of List code as a constant. */
-	String LST_PERCENT_CHOICE = "%CHOICE";
+	String LST_ADD_CHOICE_COLON = "ADDCHOICE:";
 
+
 	/** A snippet of List code as a constant. */
-	String LST_PERCENT_LIST = "%LIST";
+	String LST_ALL = "ALL";
 
 	/** A snippet of List code as a constant. */
-	String LST_NONE = "NONE";
+	String LST_ANY = "ANY";
 
 	/** A snippet of List code as a constant. */
-	String LST_CHOOSE = "CHOOSE:";
+	String LST_CROSS_CLASS = "CROSSCLASSSKILLS";
 
 	/** A snippet of List code as a constant. */
-	String LST_ADD_CHOICE = "ADDCHOICE:";
+	String LST_CHOICE = "CHOICE";
 
 	/** A snippet of List code as a constant. */
-	String LST_UNTRAINED = "UNTRAINED";
+	String LST_CLASS = "CLASS";
 
 	/** A snippet of List code as a constant. */
-	String LST_TRAINED = "TRAINED";
+	String LST_DESCRIPTOR = "DESCRIPTOR";
 
 	/** A snippet of List code as a constant. */
+	String LST_DOMAIN = "DOMAIN";
+
+	/** A snippet of List code as a constant. */
 	String LST_EXCLUSIVE = "EXCLUSIVE";
 
 	/** A snippet of List code as a constant. */
+	String LST_LIST = "LIST";
+
+	/** A snippet of List code as a constant. */
+	String LST_NONE = "NONE";
+
+	/** A snippet of List code as a constant. */
 	String LST_NONEXCLUSIVE = "NONEXCLUSIVE";
 
+	/** A snippet of List code as a constant. */
+	String LST_SCHOOL = "SCHOOL";
 
 	/** A snippet of List code as a constant. */
-	String LST_CROSS_CLASS = "CROSSCLASSSKILLS";
+	String LST_SUBSCHOOL = "SUBSCHOOL";
 
 	/** A snippet of List code as a constant. */
-	String LST_CHOICE = "CHOICE";
+	String LST_SPELL = "SPELL";
 
+	/** A snippet of List code as a constant. */
+	String LST_TRAINED = "TRAINED";
+
+	/** A snippet of List code as a constant. */
+	String LST_TYPE = "TYPE";
+
+	/** A snippet of List code as a constant. */
+	String LST_UNTRAINED = "UNTRAINED";
+
+
 	/** A constant used in List parsing of Favoured Class. */
 	String HIGHEST_LEVEL_CLASS = "HIGHESTLEVELCLASS";
 
@@ -615,6 +644,10 @@
 
 	/**
 	 * The length of various LST constants that need to stripped from the front of a string during parsing.  */
+	int SUBSTRING_LENGTH_SIX = 6;
+
+	/**
+	 * The length of various LST constants that need to stripped from the front of a string during parsing.  */
 	int SUBSTRING_LENGTH_SEVEN = 7;
 
 	/**

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/AbilityPool.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/AbilityPool.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/AbilityPool.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -29,8 +29,6 @@
 
 /**
  * Handles the BONUS:ABILITYPOOL token.
- *
- * @author  boomer70 <boo...@ya...>
  */
 public final class AbilityPool extends BonusObj
 {
@@ -63,8 +61,8 @@
 	}
 
 	/**
-	 * Return a list of the bonuses handled by this class.
-	 * @return A list of the bonuses handled by this class.
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
 	 */
 	@Override
 	public String getBonusHandled()

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -146,6 +146,10 @@
 
 	private static CheckInfo listCheck = new CheckInfo(null, false);
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Combat.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Combat.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Combat.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,33 +28,46 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>Combat</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:COMBAT token.
  */
 public final class Combat extends MultiTagBonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{"AC", "ATTACKS", "ATTACKS-SECONDARY", "BAB", "DAMAGE",
 				"DAMAGESIZE", "DAMAGE-PRIMARY", "DAMAGE-SECONDARY",
 				"DAMAGE-SHORTRANGE", "DEFENSE", "INITIATIVE", "REACH", "TOHIT",
 				"TOHIT-PRIMARY", "TOHIT-SECONDARY", "TOHIT-SHORTRANGE"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "COMBAT";
 	}
 
+	/**
+	 * Get by index, an individual combat attribute that may be bonused.
+	 * @param tagNumber the index of the combat attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The combat attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of combat attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of combat attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/DC.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/DC.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/DC.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -25,74 +25,85 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>DC</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:DC token.
  */
 public final class DC extends BonusObj
 {
-	private static final String[] bonusTags = {"FEATBONUS", "ALLSPELLS"};
+	private static final String[] BONUS_TAGS = {"FEATBONUS", "ALLSPELLS"};
 
 	/*
-	 * is either a bonusTag[]
+	 * When parsing the token, valid tokens are either a bonusTag[]
 	 * or:
 	 *    CLASS.<ClassName>
-	 *    DESCRIPTOR.<Descrpt>
+	 *    DESCRIPTOR.<Description>
 	 *    DOMAIN.<DomainName>
 	 *    SCHOOL.<SchoolName>
 	 *    SUBSCHOOL.<SubSchoolName>
 	 *    TYPE.<CasterType>
 	 *    SPELL.<SpellName>
 	 */
+
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		for (int i = 0; i < bonusTags.length; ++i)
+		for (int i = 0; i < BONUS_TAGS.length; ++i)
 		{
-			if (token.equals(bonusTags[i]))
+			if (token.equals(BONUS_TAGS[i]))
 			{
-				addBonusInfo(Integer.valueOf(i));
+				addBonusInfo(i);
 
 				return true;
 			}
 		}
 
-		// Must remove the %LIST if present
+		boolean valid = token.startsWith(Constants.LST_CLASS);
+		valid = valid || token.startsWith(Constants.LST_DESCRIPTOR);
+		valid = valid || token.startsWith(Constants.LST_DOMAIN);
+		valid = valid || token.startsWith(Constants.LST_SCHOOL);
+		valid = valid || token.startsWith(Constants.LST_SUBSCHOOL);
+		valid = valid || token.startsWith(Constants.LST_TYPE);
+		valid = valid || token.startsWith(Constants.LST_SPELL);
 
-		/*
-		 if (token.indexOf(".%LIST") > 0)
-		 {
-		 token = token.substring(0, token.indexOf(".%LIST"));
-		 }
-		 */
-		if (token.startsWith("CLASS") || token.startsWith("DESCRIPTOR")
-			|| token.startsWith("DOMAIN") || token.startsWith("SCHOOL")
-			|| token.startsWith("SUBSCHOOL") || token.startsWith("TYPE")
-			|| token.startsWith("SPELL"))
+		if (valid)
 		{
 			addBonusInfo(token);
 
 			return true;
 		}
-
 		return false;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		if (obj instanceof Integer)
 		{
-			return bonusTags[((Integer) obj).intValue()];
+			return BONUS_TAGS[(Integer) obj];
 		}
 
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Domain.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Domain.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Domain.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>Domain</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:DOMAIN token.
  */
 public final class Domain extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"NUMBER"};
+	private static final String[] BONUS_TAGS = {"NUMBER"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "DOMAIN";
 	}
 
+	/**
+	 * Get by index, an individual attribute of a domain that may be bonused.
+	 * @param tagNumber the index of the domain attribute type.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The domain attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of domain attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of domain attribute.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Eqm.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Eqm.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Eqm.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,30 +28,43 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>Eqm</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:EQM token.
  */
 public final class Eqm extends MultiTagBonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{"WEIGHTADD", "WEIGHTDIV", "WEIGHTMULT"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "EQM";
 	}
 
+	/**
+	 * Get by index, an individual equipment attribute that may be bonused.
+	 * @param tagNumber the index of the equipment attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The equipment attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of equipment attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of equipment attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/EqmArmor.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/EqmArmor.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/EqmArmor.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,30 +28,43 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>EqmArmor</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:EQMARMOR token.
  */
 public final class EqmArmor extends MultiTagBonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{"AC", "ACCHECK", "DEFBONUS", "EDR", "MAXDEX", "SPELLFAILURE"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "EQMARMOR";
 	}
 
+	/**
+	 * Get by index, an individual armour equipment attribute that may be bonused.
+	 * @param tagNumber the index of the equipment attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The equipment attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of armour equipment attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of equipment attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/EqmWeapon.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/EqmWeapon.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/EqmWeapon.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,31 +28,44 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>EqmWeapon</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:EQMWEAPON token.
  */
 public final class EqmWeapon extends MultiTagBonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{"CRITRANGEADD", "CRITRANGEDOUBLE", "DAMAGESIZE", "RANGEADD",
 				"RANGEMULT"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "EQMWEAPON";
 	}
 
+	/**
+	 * Get by index, an individual weapon equipment attribute that may be bonused.
+	 * @param tagNumber the index of the equipment attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The equipment attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of weapon equipment attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of equipment attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/HD.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/HD.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/HD.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -34,23 +34,38 @@
  */
 public final class HD extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"MAX", "MIN"};
+	private static final String[] BONUS_TAGS = {"MAX", "MIN"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "HD";
 	}
 
+	/**
+	 * Get by index, an individual hit die attribute that may be bonused.
+	 * @param tagNumber the index of the hit die attribute .
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The hit die attribute .
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of hit die attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of hit die attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/HP.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/HP.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/HP.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,30 +28,43 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>HP</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:HP token.
  */
 public final class HP extends MultiTagBonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{"BONUS", "CURRENTMAX", "CURRENTMAXPERLEVEL", "ALTHP"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "HP";
 	}
 
+	/**
+	 * Get by index, an individual hit point attribute that may be bonused.
+	 * @param tagNumber the index of the hit point attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The hit point attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of hit point attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of hit point attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Lang.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Lang.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Lang.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>Lang</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:LANG token.
  */
 public final class Lang extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"BONUS"};
+	private static final String[] BONUS_TAGS = {"BONUS"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "LANG";
 	}
 
+	/**
+	 * Get by index, an individual language attribute that may be bonused.
+	 * @param tagNumber the index of the language attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The language attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of language attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of language attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Languages.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Languages.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Languages.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>Languages</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:LANGUAGES token.
  */
 public final class Languages extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"NUMBER"};
+	private static final String[] BONUS_TAGS = {"NUMBER"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "LANGUAGES";
 	}
 
+	/**
+	 * Get by index, an individual language attribute that may be bonused.
+	 * @param tagNumber the index of the language attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The language attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of language attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of language attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/LoadMult.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/LoadMult.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/LoadMult.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>LoadMult</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:LOADMULT token.
  */
 public final class LoadMult extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"TYPE.SIZE", "TYPE=SIZE"};
+	private static final String[] BONUS_TAGS = {"TYPE.SIZE", "TYPE=SIZE"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "LOADMULT";
 	}
 
+	/**
+	 * Get by index, an individual load mult attribute that may be bonused.
+	 * @param tagNumber the index of the load mult attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The load mult attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of load mult attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of load mult attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Misc.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Misc.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Misc.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -27,31 +27,44 @@
 
 import pcgen.core.bonus.MultiTagBonusObj;
 
-/**
- * <code>Misc</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+/**MISC
+ * Handles the BONUS:MISC token.
  */
 public final class Misc extends MultiTagBonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{"ACCHECK", "MAXDEX", "SPELLFAILURE", "SR", "CR"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "MISC";
 	}
 
+	/**
+	 * Get by index, an individual miscellaneous attribute that may be bonused.
+	 * @param tagNumber the index of the miscellaneous attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The miscellaneous attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of miscellaneous attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of miscellaneous attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/ModSkillPoints.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/ModSkillPoints.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/ModSkillPoints.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>ModSkillPoints</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:MODSKILLPOINTS token.
  */
 public final class ModSkillPoints extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"NUMBER"};
+	private static final String[] BONUS_TAGS = {"NUMBER"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "MODSKILLPOINTS";
 	}
 
+	/**
+	 * Get by index, an individual attribute that may be bonused.
+	 * @param tagNumber the index of the skill point attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The skill point attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of skill point attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of skill point attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/MonSkillPts.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/MonSkillPts.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/MonSkillPts.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>MonSkillPts</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:MONSKILLPTS token.
  */
 public final class MonSkillPts extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"NUMBER", "LOCKNUMBER"};
+	private static final String[] BONUS_TAGS = {"NUMBER", "LOCKNUMBER"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "MONSKILLPTS";
 	}
 
+	/**
+	 * Get by index, an individual monster skill point attribute that may be bonused.
+	 * @param tagNumber the index of the monster skill point attribute type.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The type of monster skill point attribute .
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of types of monster skill point attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of monster skill point attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/MoveAdd.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/MoveAdd.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/MoveAdd.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -1,5 +1,5 @@
 /*
- * Move.java
+ * MoveAdd.java
  * Copyright 2002 (C) Greg Bingleman <by...@ho...>
  *
  * This library is free software; you can redistribute it and/or
@@ -25,35 +25,39 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 import pcgen.util.enumeration.Load;
 
 /**
- * <code>Move</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:MOVEADD token.
  **/
 public final class MoveAdd extends BonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{Load.LIGHT.toString(), Load.MEDIUM.toString(),
 				Load.HEAVY.toString(), Load.OVERLOAD.toString()};
 
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		for (int i = 0; i < bonusTags.length; ++i)
+		for (int i = 0; i < BONUS_TAGS.length; ++i)
 		{
-			if (bonusTags[i].equals(token))
+			if (BONUS_TAGS[i].equals(token))
 			{
-				addBonusInfo(Integer.valueOf(i));
+				addBonusInfo(i);
 
 				return true;
 			}
 		}
 
-		if (token.startsWith("TYPE="))
+		if (token.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
@@ -65,17 +69,27 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		if (obj instanceof Integer)
 		{
-			return bonusTags[((Integer) obj).intValue()];
+			return BONUS_TAGS[(Integer) obj];
 		}
 
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/MoveMult.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/MoveMult.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/MoveMult.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -1,5 +1,5 @@
 /*
- * Move.java
+ * MoveMult.java
  * Copyright 2002 (C) Greg Bingleman <by...@ho...>
  *
  * This library is free software; you can redistribute it and/or
@@ -25,35 +25,39 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 import pcgen.util.enumeration.Load;
 
 /**
- * <code>Move</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:MOVEMULT token.
  **/
 public final class MoveMult extends BonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{Load.LIGHT.toString(), Load.MEDIUM.toString(),
 				Load.HEAVY.toString(), Load.OVERLOAD.toString()};
 
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		for (int i = 0; i < bonusTags.length; ++i)
+		for (int i = 0; i < BONUS_TAGS.length; ++i)
 		{
-			if (bonusTags[i].equals(token))
+			if (BONUS_TAGS[i].equals(token))
 			{
-				addBonusInfo(Integer.valueOf(i));
+				addBonusInfo(i);
 
 				return true;
 			}
 		}
 
-		if (token.startsWith("TYPE="))
+		if (token.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
@@ -65,17 +69,27 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		if (obj instanceof Integer)
 		{
-			return bonusTags[((Integer) obj).intValue()];
+			return BONUS_TAGS[(Integer) obj];
 		}
 
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/PostMoveAdd.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/PostMoveAdd.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/PostMoveAdd.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -25,35 +25,39 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 import pcgen.util.enumeration.Load;
 
 /**
- * <code>Move</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:POSTMOVEADD token.
  **/
 public final class PostMoveAdd extends BonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{Load.LIGHT.toString(), Load.MEDIUM.toString(),
 				Load.HEAVY.toString(), Load.OVERLOAD.toString()};
 
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		for (int i = 0; i < bonusTags.length; ++i)
+		for (int i = 0; i < BONUS_TAGS.length; ++i)
 		{
-			if (bonusTags[i].equals(token))
+			if (BONUS_TAGS[i].equals(token))
 			{
-				addBonusInfo(Integer.valueOf(i));
+				addBonusInfo(i);
 
 				return true;
 			}
 		}
 
-		if (token.startsWith("TYPE="))
+		if (token.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			addBonusInfo(token.replace('=', '.'));
 		}
@@ -65,17 +69,27 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		if (obj instanceof Integer)
 		{
-			return bonusTags[((Integer) obj).intValue()];
+			return BONUS_TAGS[(Integer) obj];
 		}
 
 		return (String) obj;
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/PostRangeAdd.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/PostRangeAdd.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/PostRangeAdd.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>PostRangeAdd</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:POSTRANGEADD token.
  */
 public final class PostRangeAdd extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"PROJECTILE", "THROWN"};
+	private static final String[] BONUS_TAGS = {"PROJECTILE", "THROWN"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "POSTRANGEADD";
 	}
 
+	/**
+	 * Get by index, an individual range attribute that may be bonused.
+	 * @param tagNumber the index of the range attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The range attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of range attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of range attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/RangeAdd.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/RangeAdd.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/RangeAdd.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>RangeAdd</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:RANGEADD token.
  */
 public final class RangeAdd extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"PROJECTILE", "THROWN"};
+	private static final String[] BONUS_TAGS = {"PROJECTILE", "THROWN"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "RANGEADD";
 	}
 
+	/**
+	 * Get by index, an individual range attribute that may be bonused.
+	 * @param tagNumber the index of the range attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The range attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of range attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of range attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/RangeMult.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/RangeMult.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/RangeMult.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>RangeMult</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:RANGEMULT token.
  */
 public final class RangeMult extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"PROJECTILE", "THROWN"};
+	private static final String[] BONUS_TAGS = {"PROJECTILE", "THROWN"};
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "RANGEMULT";
 	}
 
+	/**
+	 * Get by index, an individual range attribute that may be bonused.
+	 * @param tagNumber the index of the range attribute.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The range attribute.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of range attributes that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of range attributes.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/SizeMod.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/SizeMod.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/SizeMod.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -28,29 +28,42 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>SizeMod</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:SIZEMOD token.
  */
 public final class SizeMod extends MultiTagBonusObj
 {
-	private static final String[] bonusTags = {"NUMBER",};
+	private static final String[] BONUS_TAGS = {"NUMBER", };
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "SIZEMOD";
 	}
 
+	/**
+	 * Get by index, an individual type of SizeMOD that may be bonused.
+	 * @param tagNumber the index of the SizeMOD type.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The type of SizeMOD.
+	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
+	/**
+	 * Get the number of types of SizeMod that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of SizeMOD types.
+	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnown.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnown.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnown.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -90,8 +90,8 @@
 	}
 
 	/**
-	 * Return a list of the bonuses handled by this class.
-	 * @return A list of the bonuses handled by this class.
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
 	 */
 	@Override
 	public String getBonusHandled()

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/SpellPointCosts.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/SpellPointCosts.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/SpellPointCosts.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -1,5 +1,24 @@
-/**
- * 
+/*
+ * SpellPointCosts.java
+ * Copyright 2006 (C) Joe Frazier
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Current Ver: $Revision: $
+ * Last Editor: $Author: $
+ * Last Edited: $Date: $
  */
 package plugin.bonustokens;
 
@@ -12,19 +31,23 @@
 import pcgen.util.Logging;
 
 /**
- * @author Joe.Frazier
- *
+ * Handles the BONUS:SPELLPOINTCOSTS token.
  */
 public class SpellPointCosts extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		SpellPointCostInfo spi = null;
-		SpellPointFilterType type =null;
-		String typeValue =null;
-		String part = null;
-		
+		SpellPointCostInfo spi;
+		SpellPointFilterType type;
+		String typeValue;
+		String part;
+
 		if (token == null)
 		{
 			Logging.errorPrint("Malformed BONUS:SPELLPOINTCOST.");
@@ -70,8 +93,9 @@
 			part = "TOTAL";
 		}
 			
-		
-		if(type == null || typeValue == null || part == null)
+
+		// Type cannot be null at this point
+		if(typeValue == null || part == null)
 		{
 			Logging.errorPrint("Malformed BONUS:SPELLPOINTCOST: " + token);
 			return false;
@@ -83,7 +107,13 @@
 
 		return true;
 	}
-	
+
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(Object obj)
 	{
@@ -99,10 +129,13 @@
 		return sb.toString();
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{
 		return "SPELLPOINTCOST";
 	}
-	
 }

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -143,6 +143,10 @@
 		}
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/UDam.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/UDam.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/UDam.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -25,48 +25,67 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.Globals;
 import pcgen.core.PCClass;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
+import pcgen.rules.context.ReferenceContext;
 import pcgen.util.Logging;
 
 /**
- * <code>UDam</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:UDam token.
  */
 public final class UDam extends BonusObj
 {
+	/**
+	 * Parse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
+	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		if (token.startsWith("CLASS=") || token.startsWith("CLASS."))
+		if (token.startsWith(Constants.LST_CLASS_EQUAL)
+			|| token.startsWith(Constants.LST_CLASS_DOT))
 		{
-			addBonusInfo(token.substring(6));
+			addBonusInfo(token.substring(Constants.SUBSTRING_LENGTH_SIX));
 			return true;
 		}
 
-		Logging.errorPrint("BONUS:UDAM syntax must have "
-				+ "Info (2nd arg to BONUS) start with CLASS= or CLASS. ");
+		Logging.errorPrint(
+			"BONUS:UDAM syntax must have Info (2nd arg to BONUS) start with CLASS= or CLASS. ");
 		return false;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
 		if (obj instanceof String)
 		{
-			final PCClass aClass = Globals.getContext().ref.silentlyGetConstructedCDOMObject(PCClass.class, ((String) obj));
+			String sObj = (String) obj;
+			final ReferenceContext ref = Globals.getContext().ref;
+			final PCClass aClass = ref.silentlyGetConstructedCDOMObject(PCClass.class, sObj);
+
 			if (aClass != null)
 			{
 				replaceBonusInfo(obj, aClass);
 			}
-			return "CLASS." + obj;
+			return Constants.LST_CLASS_DOT + obj;
 		}
-		return "CLASS." + ((PCClass) obj).getKeyName();
+		return Constants.LST_CLASS_DOT + ((PCClass) obj).getKeyName();
 	}
 
+	/**
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Var.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Var.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Var.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -61,8 +61,8 @@
 	}
 
 	/**
-	 * Return a list of the bonuses handled by this class.
-	 * @return A list of the bonuses handled by this class.
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
 	 */
 	@Override
 	public String getBonusHandled()

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Vision.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Vision.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Vision.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -39,8 +39,8 @@
 				"ECHOSENSE", "X-RAY"};
 
 	/**
-	 * Return a list of the bonuses handled by this class.
-	 * @return A list of the bonuses handled by this class.
+	 * Return the bonus tag handled by this class.
+	 * @return The bonus handled by this class.
 	 */
 	@Override
 	public String getBonusHandled()

Modified: Trunk/pcgen/code/src/java/plugin/converter/FavClassConvertPlugin.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/converter/FavClassConvertPlugin.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/converter/FavClassConvertPlugin.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -46,7 +46,7 @@
 	public String process(TokenProcessEvent tpe)
 	{
 		String value = tpe.getValue();
-		if (!value.startsWith(Constants.LST_CHOOSE))
+		if (!value.startsWith(Constants.LST_CHOOSE_COLON))
 		{
 			// Don't consume, force the default processor to do the work...
 			return null;

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/TemplateLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/TemplateLst.java	2011-05-29 22:38:42 UTC (rev 15065)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/TemplateLst.java	2011-05-30 10:02:18 UTC (rev 15066)
@@ -61,16 +61,16 @@
 		String remaining;
 		boolean consolidate = false;
 		boolean specialLegal = false;
-		if (value.startsWith(Constants.LST_CHOOSE))
+		if (value.startsWith(Constants.LST_CHOOSE_COLON))
 		{
 			lk = ListKey.TEMPLATE_CHOOSE;
-			remaining = value.substring(Constants.LST_CHOOSE.length());
+			remaining = value.substring(Constants.LST_CHOOSE_COLON.length());
 			consolidate = true;
 		}
-		else if (value.startsWith(Constants.LST_ADD_CHOICE))
+		else if (value.startsWith(Constants.LST_ADD_CHOICE_COLON))
 		{
 			lk = ListKey.TEMPLATE_ADDCHOICE;
-			remaining = value.substring(Constants.LST_ADD_CHOICE.length());
+			remaining = value.substring(Constants.LST_ADD_CHOICE_COLON.length());
 		}
 		else
 		{
@@ -110,7 +110,7 @@
 		if (consolidate)
 		{
 			CDOMCompoundOrReference<PCTemplate> ref = new CDOMCompoundOrReference<PCTemplate>(
-					PCTEMPLATE_CLASS, Constants.LST_CHOOSE);
+					PCTEMPLATE_CLASS, Constants.LST_CHOOSE_COLON);
 			for (CDOMReference<PCTemplate> r : list)
 			{
 				ref.addReference(r);
@@ -174,7 +174,7 @@
 		{
 			for (CDOMReference<PCTemplate> ref : chadded)
 			{
-				list.add(Constants.LST_CHOOSE
+				list.add(Constants.LST_CHOOSE_COLON
 						+ ref.getLSTformat(false).replaceAll(",", "\\|"));
 			}
 		}
@@ -186,7 +186,7 @@
 				.getAdded();
 		if (addedItems != null && !addedItems.isEmpty())
 		{
-			list.add(Constants.LST_ADD_CHOICE
+			list.add(Constants.LST_ADD_CHOICE_COLON
 					+ ReferenceUtilities.joinLstFormat(addedItems,
 							Constants.PIPE));
 		}


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

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

[<nu...@us...>]

Revision: 15065
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15065&view=rev
Author:   nuance
Date:     2011-05-29 22:38:42 +0000 (Sun, 29 May 2011)

Log Message:
-----------
CheckStyle updates.

Some reorganisation and renaming of the constants.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
    Trunk/pcgen/code/src/java/pcgen/cdom/reference/PatternMatchingReference.java
    Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java
    Trunk/pcgen/code/src/java/pcgen/rules/persistence/ChoiceSetLoadUtilities.java
    Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenUtilities.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/CcskillLst.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/CskillLst.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CcskillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CskillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/equipment/ContainsToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/kit/spells/SpellsToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CcskillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CskillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CcskillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CskillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/race/MonccskillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/race/MoncskillToken.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -385,8 +385,8 @@
 	 * Various parsing token constants
 	 ********************************************************************/
 
-	/** Pipe '|' character as a string. */
-	String PIPE = "|"; //$NON-NLS-1$
+	/** Colon ':' character as a string. */
+	String COLON = ":";
 
 	/** Comma ',' character as a string. */
 	String COMMA = ","; //$NON-NLS-1$
@@ -394,25 +394,31 @@
 	/** Dot '.' character as a string. */
 	String DOT = ".";
 
-	/** Colon ':' character as a string. */
-	String COLON = ":";
-
 	/** Equals '=' character as a string. */
 	String EQUALS = "=";
 
-	/** Asterisk '*' character as a string. */
+	/** Percent '%' character as a string. */
+	String PERCENT = "%";
+
+	/** Pipe '|' character as a string. */
+	String PIPE = "|"; //$NON-NLS-1$
+
+	/** Tab '*' character as a string. */
 	String TAB = "\t";
 
-	/** Percent character as a constant. */
-	char PERCENT = '%';
-
 	/** Asterisk '*' character as a constant. */
 	char CHAR_ASTERISK = '*';
 
+	/** Percent character as a constant. */
+	char CHAR_PERCENT = '%';
+
 	/** A snippet of List code as a constant. */
 	String LST_DOT_CLEAR = ".CLEAR";
 
 	/** A snippet of List code as a constant. */
+	String LST_DOT_CLEAR_ALL = ".CLEARALL";
+
+	/** A snippet of List code as a constant. */
 	String LST_DOT_CLEAR_DOT = ".CLEAR.";
 
 	/** A snippet of List code as a constant. */
@@ -422,27 +428,39 @@
 	String LST_SEMI_LEVEL_EQUAL = ";LEVEL=";
 
 	/** A snippet of List code as a constant. */
-	String LST_BASE = "BASE.";
+	String LST_ARMORTYPE_DOT = "ARMORTYPE.";
 
 	/** A snippet of List code as a constant. */
+	String LST_ARMORTYPE_EQUAL = "ARMORTYPE=";
+
+	/** A snippet of List code as a constant. */
+	String LST_BASE_DOT = "BASE.";
+
+	/** A snippet of List code as a constant. */
 	String LST_CAST_DOT = "CAST.";
 
 	/** A snippet of List code as a constant. */
 	String LST_CAST_EQUAL = "CAST=";
 
 	/** A snippet of List code as a constant. */
-	String LST_TYPE_OLD = "TYPE.";
+	String LST_SHIELDTYPE_DOT = "SHIELDTYPE.";
 
 	/** A snippet of List code as a constant. */
-	String LST_NOT_TYPE_OLD = "!TYPE.";
+	String LST_SHIELDTYPE_EQUAL = "SHIELDTYPE=";
 
 	/** A snippet of List code as a constant. */
-	String LST_TYPE = "TYPE=";
+	String LST_TYPE_DOT = "TYPE.";
 
 	/** A snippet of List code as a constant. */
-	String LST_NOT_TYPE = "!TYPE=";
+	String LST_TYPE_EQUAL = "TYPE=";
 
 	/** A snippet of List code as a constant. */
+	String LST_NOT_TYPE_DOT = "!TYPE.";
+
+	/** A snippet of List code as a constant. */
+	String LST_NOT_TYPE_EQUAL = "!TYPE=";
+
+	/** A snippet of List code as a constant. */
 	String LST_ALL = "ALL";
 
 	/** A snippet of List code as a constant. */
@@ -452,7 +470,7 @@
 	String LST_LIST = "LIST";
 
 	/** A snippet of List code as a constant. */
-	String LST_PATTERN = "%";
+	String LST_PERCENT_CHOICE = "%CHOICE";
 
 	/** A snippet of List code as a constant. */
 	String LST_PERCENT_LIST = "%LIST";
@@ -461,27 +479,12 @@
 	String LST_NONE = "NONE";
 
 	/** A snippet of List code as a constant. */
-	String LST_DOT_CLEAR_ALL = ".CLEARALL";
-
-	/** A snippet of List code as a constant. */
 	String LST_CHOOSE = "CHOOSE:";
 
 	/** A snippet of List code as a constant. */
 	String LST_ADD_CHOICE = "ADDCHOICE:";
 
 	/** A snippet of List code as a constant. */
-	String LST_SHIELDTYPE = "SHIELDTYPE=";
-
-	/** A snippet of List code as a constant. */
-	String LST_SHIELDTYPE_OLD = "SHIELDTYPE.";
-
-	/** A snippet of List code as a constant. */
-	String LST_ARMORTYPE = "ARMORTYPE=";
-
-	/** A snippet of List code as a constant. */
-	String LST_ARMORTYPE_OLD = "ARMORTYPE.";
-
-	/** A snippet of List code as a constant. */
 	String LST_UNTRAINED = "UNTRAINED";
 
 	/** A snippet of List code as a constant. */
@@ -500,9 +503,6 @@
 	/** A snippet of List code as a constant. */
 	String LST_CHOICE = "CHOICE";
 
-	/** A snippet of List code as a constant. */
-	String LST_PERCENT_CHOICE = "%CHOICE";
-
 	/** A constant used in List parsing of Favoured Class. */
 	String HIGHEST_LEVEL_CLASS = "HIGHESTLEVELCLASS";
 

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/reference/PatternMatchingReference.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/reference/PatternMatchingReference.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/reference/PatternMatchingReference.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -73,7 +73,7 @@
 	 *            The pattern used to identify items which this
 	 *            PatternMatchingReference will contain. Note that this pattern
 	 *            must end with the PCGen pattern characters (defined by
-	 *            Constants.LST_PATTERN)
+	 *            Constants.PERCENT)
 	 * @throws IllegalArgumentException
 	 *             if the starting group is null or the provided pattern does
 	 *             not end with the PCGen pattern characters
@@ -88,7 +88,7 @@
 					"Starting Group cannot be null in PatternMatchingReference");
 		}
 		all = startingGroup;
-		String lstPattern = Constants.LST_PATTERN;
+		String lstPattern = Constants.PERCENT;
 		int patternchar = patternText.length() - lstPattern.length();
 		if (patternText.indexOf(lstPattern) != patternchar)
 		{

Modified: Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -361,7 +361,7 @@
 	 */
 	private static boolean isTypeTest(String key)
 	{
-		return key.startsWith(Constants.LST_TYPE) || key.startsWith(Constants.LST_TYPE_OLD);
+		return key.startsWith(Constants.LST_TYPE_EQUAL) || key.startsWith(Constants.LST_TYPE_DOT);
 	}
 
 	/**

Modified: Trunk/pcgen/code/src/java/pcgen/rules/persistence/ChoiceSetLoadUtilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/rules/persistence/ChoiceSetLoadUtilities.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/pcgen/rules/persistence/ChoiceSetLoadUtilities.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -346,12 +346,12 @@
 			return sc.getAllReference();
 		}
 		String key = pi.key;
-		if (key.startsWith(Constants.LST_TYPE_OLD))
+		if (key.startsWith(Constants.LST_TYPE_DOT))
 		{
 			return TokenUtilities.getTypeReference(sc, key
 					.substring(5));
 		}
-		if (key.startsWith(Constants.LST_NOT_TYPE_OLD))
+		if (key.startsWith(Constants.LST_NOT_TYPE_DOT))
 		{
 			return new NegatingPrimitive<T>(TokenUtilities.getTypeReference(
 					sc, key.substring(6)));

Modified: Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenUtilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenUtilities.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenUtilities.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -50,13 +50,13 @@
 	public static <T extends Loadable> CDOMReference<T> getTypeOrPrimitive(
 			ReferenceManufacturer<T> rm, String s)
 	{
-		if (s.startsWith(Constants.LST_TYPE_OLD)
-				|| s.startsWith(Constants.LST_TYPE))
+		if (s.startsWith(Constants.LST_TYPE_DOT)
+				|| s.startsWith(Constants.LST_TYPE_EQUAL))
 		{
 			return getTypeReference(rm, s.substring(5));
 		}
-		else if (s.startsWith(Constants.LST_NOT_TYPE_OLD)
-				|| s.startsWith(Constants.LST_NOT_TYPE))
+		else if (s.startsWith(Constants.LST_NOT_TYPE_DOT)
+				|| s.startsWith(Constants.LST_NOT_TYPE_EQUAL))
 		{
 			Logging.errorPrint("!TYPE not supported in token, found: " + s);
 			return null;

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -45,7 +45,7 @@
 		boolean isBase = false;
 		final String token;
 
-		if (argToken.startsWith(Constants.LST_BASE))
+		if (argToken.startsWith(Constants.LST_BASE_DOT))
 		{
 			token = argToken.substring(Constants.SUBSTRING_LENGTH_FIVE);
 			isBase = true;
@@ -98,7 +98,7 @@
 		}
 
 		String token = ((CheckInfo) obj).isBase()
-			? Constants.LST_BASE
+			? Constants.LST_BASE_DOT
 			: Constants.EMPTY_STRING;
 
 		return token + ((CheckInfo) obj).getPobj().getLSTformat(false);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/CcskillLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/CcskillLst.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/CcskillLst.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -162,7 +162,7 @@
 	private CDOMReference<Skill> getSkillReference(LoadContext context,
 			String tokText)
 	{
-		if (tokText.endsWith(Constants.LST_PATTERN))
+		if (tokText.endsWith(Constants.PERCENT))
 		{
 			return new PatternMatchingReference<Skill>(Skill.class, context.ref
 					.getCDOMAllReference(SKILL_CLASS), tokText);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/CskillLst.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/CskillLst.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/CskillLst.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -161,7 +161,7 @@
 	private CDOMReference<Skill> getSkillReference(LoadContext context,
 			String tokText)
 	{
-		if (tokText.endsWith(Constants.LST_PATTERN))
+		if (tokText.endsWith(Constants.PERCENT))
 		{
 			return new PatternMatchingReference<Skill>(Skill.class, context.ref
 					.getCDOMAllReference(SKILL_CLASS), tokText);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -136,8 +136,8 @@
 				{
 					spelltypes.add(token);
 				}
-				else if (token.startsWith(Constants.LST_TYPE_OLD)
-						|| token.startsWith(Constants.LST_TYPE))
+				else if (token.startsWith(Constants.LST_TYPE_DOT)
+						|| token.startsWith(Constants.LST_TYPE_EQUAL))
 				{
 					CDOMReference<PCClass> ref = TokenUtilities
 							.getTypeReference(context, PCCLASS_CLASS, token

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ArmorProfToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -139,8 +139,8 @@
 				armorProfs
 						.add(context.ref.getCDOMAllReference(ARMORPROF_CLASS));
 			}
-			else if (aProf.startsWith(Constants.LST_ARMORTYPE_OLD)
-					|| aProf.startsWith(Constants.LST_ARMORTYPE))
+			else if (aProf.startsWith(Constants.LST_ARMORTYPE_DOT)
+					|| aProf.startsWith(Constants.LST_ARMORTYPE_EQUAL))
 			{
 				foundOther = true;
 				CDOMReference<Equipment> ref = TokenUtilities.getTypeReference(

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/auto/ShieldProfToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -139,8 +139,8 @@
 				shieldProfs.add(context.ref
 						.getCDOMAllReference(SHIELDPROF_CLASS));
 			}
-			else if (aProf.startsWith(Constants.LST_SHIELDTYPE_OLD)
-					|| aProf.startsWith(Constants.LST_SHIELDTYPE))
+			else if (aProf.startsWith(Constants.LST_SHIELDTYPE_DOT)
+					|| aProf.startsWith(Constants.LST_SHIELDTYPE_EQUAL))
 			{
 				foundOther = true;
 				CDOMReference<Equipment> ref = TokenUtilities.getTypeReference(

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/auto/WeaponProfToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -146,8 +146,8 @@
 				else
 				{
 					foundOther = true;
-					if (aProf.startsWith(Constants.LST_TYPE_OLD)
-							|| aProf.startsWith(Constants.LST_TYPE))
+					if (aProf.startsWith(Constants.LST_TYPE_DOT)
+							|| aProf.startsWith(Constants.LST_TYPE_EQUAL))
 					{
 						CDOMGroupRef<WeaponProf> rr = TokenUtilities
 								.getTypeReference(context, WEAPONPROF_CLASS,

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CcskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CcskillToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CcskillToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -167,7 +167,7 @@
 	private CDOMReference<Skill> getSkillReference(LoadContext context,
 			String tokText)
 	{
-		if (tokText.endsWith(Constants.LST_PATTERN))
+		if (tokText.endsWith(Constants.PERCENT))
 		{
 			return new PatternMatchingReference<Skill>(Skill.class, context.ref
 					.getCDOMAllReference(SKILL_CLASS), tokText);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CskillToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/domain/CskillToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -166,7 +166,7 @@
 	private CDOMReference<Skill> getSkillReference(LoadContext context,
 			String tokText)
 	{
-		if (tokText.endsWith(Constants.LST_PATTERN))
+		if (tokText.endsWith(Constants.PERCENT))
 		{
 			return new PatternMatchingReference<Skill>(Skill.class, context.ref
 					.getCDOMAllReference(SKILL_CLASS), tokText);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/equipment/ContainsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/equipment/ContainsToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/equipment/ContainsToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -71,8 +71,8 @@
 			weightCapacity = weightCapacity.substring(1);
 		}
 
-		int percentLoc = weightCapacity.indexOf(Constants.PERCENT);
-		if (percentLoc != weightCapacity.lastIndexOf(Constants.PERCENT))
+		int percentLoc = weightCapacity.indexOf(Constants.CHAR_PERCENT);
+		if (percentLoc != weightCapacity.lastIndexOf(Constants.CHAR_PERCENT))
 		{
 			return new ParseResult.Fail("Cannot have two weight reduction "
 							+ "characters (indicated by %): " + value);
@@ -224,7 +224,7 @@
 				IntegerKey.CONTAINER_REDUCE_WEIGHT);
 		if (reducePercent != null)
 		{
-			sb.append(reducePercent).append(Constants.PERCENT);
+			sb.append(reducePercent).append(Constants.CHAR_PERCENT);
 		}
 
 		BigDecimal cap = context.getObjectContext().getObject(eq,

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/kit/spells/SpellsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/kit/spells/SpellsToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/kit/spells/SpellsToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -213,7 +213,7 @@
 				{
 					StringBuilder spell = new StringBuilder();
 					spell.append(StringUtil.replaceAll(ksi.getLSTformat(),
-							Constants.LST_TYPE, Constants.LST_TYPE_OLD));
+							Constants.LST_TYPE_EQUAL, Constants.LST_TYPE_DOT));
 					if (abils != null && !abils.isEmpty())
 					{
 						spell.append('[');

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CcskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CcskillToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CcskillToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -146,7 +146,7 @@
 	private CDOMReference<Skill> getSkillReference(LoadContext context,
 			String tokText)
 	{
-		if (tokText.endsWith(Constants.LST_PATTERN))
+		if (tokText.endsWith(Constants.PERCENT))
 		{
 			return new PatternMatchingReference<Skill>(Skill.class, context.ref
 					.getCDOMAllReference(SKILL_CLASS), tokText);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CskillToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/CskillToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -149,7 +149,7 @@
 	private CDOMReference<Skill> getSkillReference(LoadContext context,
 			String tokText)
 	{
-		if (tokText.endsWith(Constants.LST_PATTERN))
+		if (tokText.endsWith(Constants.PERCENT))
 		{
 			return new PatternMatchingReference<Skill>(Skill.class, context.ref
 					.getCDOMAllReference(SKILL_CLASS), tokText);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CcskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CcskillToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CcskillToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -147,7 +147,7 @@
 	private CDOMReference<Skill> getSkillReference(LoadContext context,
 			String tokText)
 	{
-		if (tokText.endsWith(Constants.LST_PATTERN))
+		if (tokText.endsWith(Constants.PERCENT))
 		{
 			return new PatternMatchingReference<Skill>(Skill.class, context.ref
 					.getCDOMAllReference(SKILL_CLASS), tokText);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CskillToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/pcclass/level/CskillToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -146,7 +146,7 @@
 	private CDOMReference<Skill> getSkillReference(LoadContext context,
 			String tokText)
 	{
-		if (tokText.endsWith(Constants.LST_PATTERN))
+		if (tokText.endsWith(Constants.PERCENT))
 		{
 			return new PatternMatchingReference<Skill>(Skill.class, context.ref
 					.getCDOMAllReference(SKILL_CLASS), tokText);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/race/MonccskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/race/MonccskillToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/race/MonccskillToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -154,7 +154,7 @@
 	private CDOMReference<Skill> getSkillReference(LoadContext context, Race r,
 			String tokText)
 	{
-		if (tokText.endsWith(Constants.LST_PATTERN))
+		if (tokText.endsWith(Constants.PERCENT))
 		{
 			return new PatternMatchingReference<Skill>(Skill.class, context.ref
 					.getCDOMAllReference(SKILL_CLASS), tokText);

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/race/MoncskillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/race/MoncskillToken.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/race/MoncskillToken.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -185,7 +185,7 @@
 	private CDOMReference<Skill> getSkillReference(LoadContext context,
 			String tokText)
 	{
-		if (tokText.endsWith(Constants.LST_PATTERN))
+		if (tokText.endsWith(Constants.PERCENT))
 		{
 			return new PatternMatchingReference<Skill>(Skill.class, context.ref
 					.getCDOMAllReference(SKILL_CLASS), tokText);

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -64,8 +64,8 @@
 				}
 
 				// Match against a TYPE of armour
-				if (desiredType.startsWith(Constants.LST_TYPE)
-					|| desiredType.startsWith(Constants.LST_TYPE_OLD))
+				if (desiredType.startsWith(Constants.LST_TYPE_EQUAL)
+					|| desiredType.startsWith(Constants.LST_TYPE_DOT))
 				{
 
 					String stripped = desiredType.substring(Constants.SUBSTRING_LENGTH_FIVE);

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java	2011-05-29 22:14:34 UTC (rev 15064)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java	2011-05-29 22:38:42 UTC (rev 15065)
@@ -73,8 +73,8 @@
 			// Work out exactlywhat we are going to test.
 			final String aString = prereq.getKey();
 			List<String> typeList = null;
-			if (aString.startsWith(Constants.LST_TYPE)
-				|| aString.startsWith(Constants.LST_TYPE_OLD))
+			if (aString.startsWith(Constants.LST_TYPE_EQUAL)
+				|| aString.startsWith(Constants.LST_TYPE_DOT))
 			{
 				String stripped = aString.substring(Constants.SUBSTRING_LENGTH_FIVE);
 				typeList = CoreUtility.split(stripped, '.');


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

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

[<nu...@us...>]

Revision: 15064
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15064&view=rev
Author:   nuance
Date:     2011-05-29 22:14:34 +0000 (Sun, 29 May 2011)

Log Message:
-----------
CheckStyle updates.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
    Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenLibrary.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/AbilityPool.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnown.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Var.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Vision.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-29 21:17:18 UTC (rev 15063)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-29 22:14:34 UTC (rev 15064)
@@ -416,13 +416,19 @@
 	String LST_DOT_CLEAR_DOT = ".CLEAR.";
 
 	/** A snippet of List code as a constant. */
+	String LST_SEMI_LEVEL_DOT = ";LEVEL.";
+
+	/** A snippet of List code as a constant. */
+	String LST_SEMI_LEVEL_EQUAL = ";LEVEL=";
+
+	/** A snippet of List code as a constant. */
 	String LST_BASE = "BASE.";
 
 	/** A snippet of List code as a constant. */
-	String LST_CAST_OLD = "CAST.";
+	String LST_CAST_DOT = "CAST.";
 
 	/** A snippet of List code as a constant. */
-	String LST_CAST = "CAST=";
+	String LST_CAST_EQUAL = "CAST=";
 
 	/** A snippet of List code as a constant. */
 	String LST_TYPE_OLD = "TYPE.";
@@ -604,9 +610,12 @@
 	int ARBITRARY_END_SKILL_INDEX = 999;
 
 	/**
-	 * The length of both the LST_TYPE and LST_TYPE_OLD constants.  */
+	 * The length of various LST constants that need to stripped from the front of a string during parsing.  */
 	int SUBSTRING_LENGTH_FIVE = 5;
 
+	/**
+	 * The length of various LST constants that need to stripped from the front of a string during parsing.  */
+	int SUBSTRING_LENGTH_SEVEN = 7;
 
 	/**
 	 * The default for whether to print the weapon proficiencies.

Modified: Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenLibrary.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenLibrary.java	2011-05-29 21:17:18 UTC (rev 15063)
+++ Trunk/pcgen/code/src/java/pcgen/rules/persistence/TokenLibrary.java	2011-05-29 22:14:34 UTC (rev 15064)
@@ -458,7 +458,9 @@
 	 * @throws InstantiationException
 	 * @throws IllegalAccessException
 	 */
-	public static boolean addBonusClass(Class bonusClass, String bonusName) throws InstantiationException, IllegalAccessException {
+	public static boolean addBonusClass(Class bonusClass,
+	                                    String bonusName) throws InstantiationException, IllegalAccessException
+	{
 		if (BonusObj.class.isAssignableFrom(bonusClass))
 		{
 			final BonusObj bonusObj = (BonusObj) bonusClass.newInstance();

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/AbilityPool.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/AbilityPool.java	2011-05-29 21:17:18 UTC (rev 15063)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/AbilityPool.java	2011-05-29 22:14:34 UTC (rev 15064)
@@ -28,17 +28,16 @@
 import pcgen.util.Logging;
 
 /**
- * Handles <code>BONUS:ABILITYPOOL|&lt;ability category&gt;|&lt;number&gt;
- * </code> token
+ * Handles the BONUS:ABILITYPOOL token.
  *
  * @author  boomer70 <boo...@ya...>
- * 
- * @since 5.11.1
  */
 public final class AbilityPool extends BonusObj
 {
 	/**
+	 * Parse the bonus token.
 	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
 	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
@@ -52,7 +51,10 @@
 	}
 
 	/**
+	 * Unparse the bonus token.
 	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
 	 */
 	@Override
 	protected String unparseToken(final Object obj)
@@ -61,7 +63,8 @@
 	}
 
 	/**
-	 * @see pcgen.core.bonus.BonusObj#getBonusesHandled()
+	 * Return a list of the bonuses handled by this class.
+	 * @return A list of the bonuses handled by this class.
 	 */
 	@Override
 	public String getBonusHandled()

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnown.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnown.java	2011-05-29 21:17:18 UTC (rev 15063)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/SpellKnown.java	2011-05-29 22:14:34 UTC (rev 15064)
@@ -25,31 +25,30 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.bonus.BonusObj;
 import pcgen.core.bonus.util.SpellCastInfo;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>SpellKnown</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * Handles the BONUS:SPELLKNOWN token.
  */
 public final class SpellKnown extends BonusObj
 {
 	/**
-	 * CLASS=<classname OR Any>;LEVEL=<level>
-	 * TYPE=<type>;LEVEL=<level>
-	 * @param token
-	 * @return TRUE or FALSE
+	 * Parse the bonus token.
+	 * @param token The token to parse.
+	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
 	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		int idx = token.indexOf(";LEVEL=");
+		int idx = token.indexOf(Constants.LST_SEMI_LEVEL_EQUAL);
 
 		if (idx < 0)
 		{
-			idx = token.indexOf(";LEVEL.");
+			idx = token.indexOf(Constants.LST_SEMI_LEVEL_DOT);
 		}
 
 		if (idx < 0)
@@ -57,13 +56,19 @@
 			return false;
 		}
 
-		final String level = token.substring(idx + 7);
+		final String level = token.substring(idx + Constants.SUBSTRING_LENGTH_SEVEN);
 
 		addBonusInfo(new SpellCastInfo(token.substring(0, idx), level));
 
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
@@ -84,6 +89,10 @@
 		return sb.toString();
 	}
 
+	/**
+	 * Return a list of the bonuses handled by this class.
+	 * @return A list of the bonuses handled by this class.
+	 */
 	@Override
 	public String getBonusHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java	2011-05-29 21:17:18 UTC (rev 15063)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java	2011-05-29 22:14:34 UTC (rev 15064)
@@ -52,8 +52,8 @@
 			}
 		}
 
-		if (token.startsWith(Constants.LST_CAST)
-			|| token.startsWith(Constants.LST_CAST_OLD))
+		if (token.startsWith(Constants.LST_CAST_EQUAL)
+			|| token.startsWith(Constants.LST_CAST_DOT))
 		{
 			PCStat stat = context.ref.getAbbreviatedObject(
 				PCStat.class,

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Var.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Var.java	2011-05-29 21:17:18 UTC (rev 15063)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Var.java	2011-05-29 22:14:34 UTC (rev 15064)
@@ -36,7 +36,9 @@
 public final class Var extends BonusObj
 {
 	/**
+	 * Parse the bonus token.
 	 * @see pcgen.core.bonus.BonusObj#parseToken(LoadContext, java.lang.String)
+	 * @return True if successfully parsed.
 	 */
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
@@ -47,7 +49,10 @@
 	}
 
 	/**
+	 * Unparse the bonus token.
 	 * @see pcgen.core.bonus.BonusObj#unparseToken(java.lang.Object)
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
 	 */
 	@Override
 	protected String unparseToken(final Object obj)
@@ -56,7 +61,8 @@
 	}
 
 	/**
-	 * @see pcgen.core.bonus.BonusObj#getBonusesHandled()
+	 * Return a list of the bonuses handled by this class.
+	 * @return A list of the bonuses handled by this class.
 	 */
 	@Override
 	public String getBonusHandled()

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Vision.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Vision.java	2011-05-29 21:17:18 UTC (rev 15063)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Vision.java	2011-05-29 22:14:34 UTC (rev 15064)
@@ -28,18 +28,19 @@
 import pcgen.core.bonus.MultiTagBonusObj;
 
 /**
- * <code>Vision</code> deals with bonuses to a character's vision
+ * <code>Vision</code> deals with bonuses to a character's vision.
  *
  * @author  Greg Bingleman <by...@ho...>
  */
 public final class Vision extends MultiTagBonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{"NORMAL", "LOW-LIGHT", "DARKVISION", "BLINDSIGHT", "TREMORSENSE",
 				"ECHOSENSE", "X-RAY"};
 
 	/**
-	 * @see pcgen.core.bonus.BonusObj#getBonusesHandled()
+	 * Return a list of the bonuses handled by this class.
+	 * @return A list of the bonuses handled by this class.
 	 */
 	@Override
 	public String getBonusHandled()
@@ -48,20 +49,25 @@
 	}
 
 	/**
+	 * Get by index, an individual type of vision that may be bonused.
+	 * @param tagNumber the index of the vision type.
 	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The type of vision.
 	 */
 	@Override
 	protected String getBonusTag(final int tagNumber)
 	{
-		return bonusTags[tagNumber];
+		return BONUS_TAGS[tagNumber];
 	}
 
 	/**
-	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTagLength()
+	 * Get the number of types of vision that may be bonused.
+	 * @see pcgen.core.bonus.MultiTagBonusObj#getBonusTag(int)
+	 * @return The number of vision types.
 	 */
 	@Override
 	protected int getBonusTagLength()
 	{
-		return bonusTags.length;
+		return BONUS_TAGS.length;
 	}
 }


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

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

[<nu...@us...>]

Revision: 15063
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15063&view=rev
Author:   nuance
Date:     2011-05-29 21:17:18 +0000 (Sun, 29 May 2011)

Log Message:
-----------
CheckStyle updates.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
    Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-29 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-29 21:17:18 UTC (rev 15063)
@@ -419,6 +419,12 @@
 	String LST_BASE = "BASE.";
 
 	/** A snippet of List code as a constant. */
+	String LST_CAST_OLD = "CAST.";
+
+	/** A snippet of List code as a constant. */
+	String LST_CAST = "CAST=";
+
+	/** A snippet of List code as a constant. */
 	String LST_TYPE_OLD = "TYPE.";
 
 	/** A snippet of List code as a constant. */
@@ -598,12 +604,8 @@
 	int ARBITRARY_END_SKILL_INDEX = 999;
 
 	/**
-	 * The length of the string "BASE.".  */
-	int LENGTH_OF_BASE_SUBSTRING = 5;
-
-	/**
 	 * The length of both the LST_TYPE and LST_TYPE_OLD constants.  */
-	int LENGTH_OF_TYPE_SUBSTRING = 5;
+	int SUBSTRING_LENGTH_FIVE = 5;
 
 
 	/**

Modified: Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java	2011-05-29 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/pcgen/core/prereq/PrerequisiteUtilities.java	2011-05-29 21:17:18 UTC (rev 15063)
@@ -195,7 +195,7 @@
 		final boolean keyIsType = isTypeTest(prereq.getKey());
 
 		final String strippedKey = keyIsType
-			? prereq.getKey().substring(Constants.LENGTH_OF_TYPE_SUBSTRING)
+			? prereq.getKey().substring(Constants.SUBSTRING_LENGTH_FIVE)
 			: prereq.getKey();
 
 		int runningTotal = 0;
@@ -251,7 +251,7 @@
 
 					if (prereq.getSubKey() != null)
 					{
-						final int len = Constants.LENGTH_OF_TYPE_SUBSTRING;
+						final int len = Constants.SUBSTRING_LENGTH_FIVE;
 
 						final boolean subKeyIsType = isTypeTest(prereq.getSubKey());
 						final String subKey = subKeyIsType
@@ -321,7 +321,7 @@
 
 		if (subKeyIsType)
 		{
-			final String type = prereq.getSubKey().substring(Constants.LENGTH_OF_TYPE_SUBSTRING);
+			final String type = prereq.getSubKey().substring(Constants.SUBSTRING_LENGTH_FIVE);
 			runningTotal = countSubKeyType(character, ability, type, countMults);
 		}
 

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java	2011-05-29 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java	2011-05-29 21:17:18 UTC (rev 15063)
@@ -47,7 +47,7 @@
 
 		if (argToken.startsWith(Constants.LST_BASE))
 		{
-			token = argToken.substring(Constants.LENGTH_OF_BASE_SUBSTRING);
+			token = argToken.substring(Constants.SUBSTRING_LENGTH_FIVE);
 			isBase = true;
 		}
 		else

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java	2011-05-29 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Stat.java	2011-05-29 21:17:18 UTC (rev 15063)
@@ -25,6 +25,7 @@
  */
 package plugin.bonustokens;
 
+import pcgen.cdom.base.Constants;
 import pcgen.core.PCClass;
 import pcgen.core.PCStat;
 import pcgen.core.bonus.BonusObj;
@@ -32,32 +33,31 @@
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>Stat</code>
- *
- * @author  Greg Bingleman <by...@ho...>
+ * This is the class that implements the Stat bonuses.
  */
 public final class Stat extends BonusObj
 {
-	private static final String[] bonusTags =
+	private static final String[] BONUS_TAGS =
 			{"BASESPELLSTAT", "BASESPELLKNOWNSTAT"};
 
 	@Override
 	protected boolean parseToken(LoadContext context, final String token)
 	{
-		for (int i = 0; i < bonusTags.length; ++i)
+		for (int i = 0; i < BONUS_TAGS.length; ++i)
 		{
-			if (bonusTags[i].equals(token))
+			if (BONUS_TAGS[i].equals(token))
 			{
-				addBonusInfo(Integer.valueOf(i));
-
+				addBonusInfo(i);
 				return true;
 			}
 		}
 
-		if (token.startsWith("CAST=") || token.startsWith("CAST."))
+		if (token.startsWith(Constants.LST_CAST)
+			|| token.startsWith(Constants.LST_CAST_OLD))
 		{
 			PCStat stat = context.ref.getAbbreviatedObject(
-					PCStat.class, token.substring(5));
+				PCStat.class,
+				token.substring(Constants.SUBSTRING_LENGTH_FIVE));
 
 			if (stat != null)
 			{
@@ -68,8 +68,7 @@
 		}
 		else
 		{
-			PCStat stat = context.ref.getAbbreviatedObject(
-					PCStat.class, token);
+			PCStat stat = context.ref.getAbbreviatedObject(PCStat.class, token);
 
 			if (stat != null)
 			{
@@ -77,8 +76,8 @@
 			}
 			else
 			{
-				final PCClass aClass = context.ref
-						.silentlyGetConstructedCDOMObject(PCClass.class, token);
+				final PCClass aClass =
+					context.ref.silentlyGetConstructedCDOMObject(PCClass.class, token);
 
 				if (aClass != null)
 				{
@@ -101,11 +100,11 @@
 	{
 		if (obj instanceof Integer)
 		{
-			return bonusTags[((Integer) obj).intValue()];
+			return BONUS_TAGS[(Integer) obj];
 		}
 		else if (obj instanceof CastStat)
 		{
-			return "CAST." + ((CastStat) obj).stat.getAbb();
+			return "CAST." + ((CastStat) obj).getStat().getAbb();
 		}
 		else if (obj instanceof PCClass)
 		{
@@ -120,21 +119,28 @@
 	}
 
 	/**
-	 * Deals with the Stat for casting
+	 * Deals with the Stat for casting.
 	 */
 	public static class CastStat
 	{
-		/** A stat */
-		public final PCStat stat;
+		private final PCStat stat;
 
 		/**
-		 * Constuctor
-		 * @param argStat
+		 * Constructor.
+		 * @param argStat The spell casting stat.
 		 */
 		public CastStat(final PCStat argStat)
 		{
 			stat = argStat;
 		}
+
+		/** Get the spell casting stat.
+		 * @return The spell casting stat.
+		 * */
+		public PCStat getStat()
+		{
+			return stat;
+		}
 	}
 
 	@Override

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java	2011-05-29 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java	2011-05-29 21:17:18 UTC (rev 15063)
@@ -68,7 +68,7 @@
 					|| desiredType.startsWith(Constants.LST_TYPE_OLD))
 				{
 
-					String stripped = desiredType.substring(Constants.LENGTH_OF_TYPE_SUBSTRING);
+					String stripped = desiredType.substring(Constants.SUBSTRING_LENGTH_FIVE);
 					StringTokenizer tok = new StringTokenizer(stripped.toUpperCase(), ".");
 
 					boolean match = false;

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java	2011-05-29 20:05:07 UTC (rev 15062)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java	2011-05-29 21:17:18 UTC (rev 15063)
@@ -76,7 +76,7 @@
 			if (aString.startsWith(Constants.LST_TYPE)
 				|| aString.startsWith(Constants.LST_TYPE_OLD))
 			{
-				String stripped = aString.substring(Constants.LENGTH_OF_TYPE_SUBSTRING);
+				String stripped = aString.substring(Constants.SUBSTRING_LENGTH_FIVE);
 				typeList = CoreUtility.split(stripped, '.');
 			}
 


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

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

[<nu...@us...>]

Revision: 15062
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15062&view=rev
Author:   nuance
Date:     2011-05-29 20:05:07 +0000 (Sun, 29 May 2011)

Log Message:
-----------
CheckStyle updates.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
    Trunk/pcgen/code/src/java/pcgen/core/bonus/BonusObj.java
    Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java

Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-29 18:29:56 UTC (rev 15061)
+++ Trunk/pcgen/code/src/java/pcgen/cdom/base/Constants.java	2011-05-29 20:05:07 UTC (rev 15062)
@@ -416,6 +416,9 @@
 	String LST_DOT_CLEAR_DOT = ".CLEAR.";
 
 	/** A snippet of List code as a constant. */
+	String LST_BASE = "BASE.";
+
+	/** A snippet of List code as a constant. */
 	String LST_TYPE_OLD = "TYPE.";
 
 	/** A snippet of List code as a constant. */
@@ -595,6 +598,10 @@
 	int ARBITRARY_END_SKILL_INDEX = 999;
 
 	/**
+	 * The length of the string "BASE.".  */
+	int LENGTH_OF_BASE_SUBSTRING = 5;
+
+	/**
 	 * The length of both the LST_TYPE and LST_TYPE_OLD constants.  */
 	int LENGTH_OF_TYPE_SUBSTRING = 5;
 

Modified: Trunk/pcgen/code/src/java/pcgen/core/bonus/BonusObj.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/bonus/BonusObj.java	2011-05-29 18:29:56 UTC (rev 15061)
+++ Trunk/pcgen/code/src/java/pcgen/core/bonus/BonusObj.java	2011-05-29 20:05:07 UTC (rev 15062)
@@ -50,17 +50,20 @@
  **/
 public abstract class BonusObj extends ConcretePrereqObject implements Serializable, Cloneable, QualifyingObject
 {
-	private List<Object>    bonusInfo       = new ArrayList<Object>();
-	private Map<String, String>     dependMap  = new HashMap<String, String>();
+	private List<Object> bonusInfo = new ArrayList<Object>();
+	private Map<String, String> dependMap  = new HashMap<String, String>();
 	private Formula bonusFormula = FormulaFactory.ZERO;
+
 	/** The name of the bonus e.g. STAT or COMBAT */
-	private String  bonusName            = Constants.EMPTY_STRING;
+	private String bonusName            = Constants.EMPTY_STRING;
+
 	/** The type of the bonus e.g. Enhancement or Dodge */
-	private String  bonusType            = Constants.EMPTY_STRING;
-	private String  varPart              = Constants.EMPTY_STRING;
-	private String typeOfBonus           = Bonus.BONUS_UNDEFINED;
-	private String  stringRepresentation = null;
-	private String tokenSource = null;
+	private String bonusType            = Constants.EMPTY_STRING;
+	private String varPart              = Constants.EMPTY_STRING;
+	private String typeOfBonus          = Bonus.BONUS_UNDEFINED;
+	private String stringRepresentation = null;
+	private String tokenSource          = null;
+
 	private boolean saveToPCG = true;
 
 	/** An enum for the possible stacking modifiers a bonus can have */

Modified: Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java	2011-05-29 18:29:56 UTC (rev 15061)
+++ Trunk/pcgen/code/src/java/plugin/bonustokens/Checks.java	2011-05-29 20:05:07 UTC (rev 15062)
@@ -26,13 +26,14 @@
 package plugin.bonustokens;
 
 import pcgen.cdom.base.CDOMReference;
+import pcgen.cdom.base.Constants;
 import pcgen.cdom.reference.CDOMDirectSingleRef;
 import pcgen.core.PCCheck;
 import pcgen.core.bonus.BonusObj;
 import pcgen.rules.context.LoadContext;
 
 /**
- * <code>Checks</code>
+ * <code>Checks</code>.
  *
  * @author  Greg Bingleman <by...@ho...>
  */
@@ -44,9 +45,9 @@
 		boolean isBase = false;
 		final String token;
 
-		if (argToken.startsWith("BASE."))
+		if (argToken.startsWith(Constants.LST_BASE))
 		{
-			token = argToken.substring(5);
+			token = argToken.substring(Constants.LENGTH_OF_BASE_SUBSTRING);
 			isBase = true;
 		}
 		else
@@ -57,7 +58,7 @@
 		if ("%LIST".equals(token))
 		{
 			// Special case of:  BONUS:CHECKS|%LIST|x
-			addBonusInfo(LIST_CHECK);
+			addBonusInfo(listCheck);
 		}
 		else if ("ALL".equals(token))
 		{
@@ -67,17 +68,14 @@
 			 * CHECKS are established need to test both CHECKS|Blah and
 			 * CHECKS|ALL
 			 */
-			for (PCCheck check : context.ref
-					.getConstructedCDOMObjects(PCCheck.class))
+			for (PCCheck check : context.ref.getConstructedCDOMObjects(PCCheck.class))
 			{
-				addBonusInfo(new CheckInfo(CDOMDirectSingleRef.getRef(check),
-						isBase));
+				addBonusInfo(new CheckInfo(CDOMDirectSingleRef.getRef(check), isBase));
 			}
 		}
 		else
 		{
-			CDOMReference<PCCheck> aCheck = context.ref
-					.getCDOMReference(PCCheck.class, token);
+			CDOMReference<PCCheck> aCheck = context.ref.getCDOMReference(PCCheck.class, token);
 			//Invalid name is caught by Unconstructed Reference system
 			addBonusInfo(new CheckInfo(aCheck, isBase));
 		}
@@ -85,46 +83,68 @@
 		return true;
 	}
 
+	/**
+	 * Unparse the bonus token.
+	 * @param obj The object to unparse
+	 * @return The unparsed string.
+	 */
 	@Override
 	protected String unparseToken(final Object obj)
 	{
-		String token = "";
 
-		if (obj.equals(LIST_CHECK))
+		if (obj.equals(listCheck))
 		{
-			return token + "%LIST";
+			return Constants.LST_PERCENT_LIST;
 		}
-		else if (((CheckInfo) obj).isBase)
-		{
-			token = "BASE.";
-		}
 
-		return token + ((CheckInfo) obj).pobj.getLSTformat(false);
+		String token = ((CheckInfo) obj).isBase()
+			? Constants.LST_BASE
+			: Constants.EMPTY_STRING;
+
+		return token + ((CheckInfo) obj).getPobj().getLSTformat(false);
 	}
 
 	/**
-	 * Deals with the CheckInfo
+	 * Deals with the CheckInfo.
 	 */
 	public static class CheckInfo
 	{
-		/** The PObject */
-		public final CDOMReference<PCCheck> pobj;
-		/** whether this is a base check, True or False */
-		public final boolean isBase;
+		private final CDOMReference<PCCheck> pobj;
 
+		private final boolean isBase;
+
 		/**
-		 * Constructor
-		 * @param argPobj
-		 * @param argIsBase
+		 * Constructor.
+		 * @param argPobj The PObject.
+		 * @param argIsBase Whether this is a base check.
 		 */
 		public CheckInfo(final CDOMReference<PCCheck> argPobj, final boolean argIsBase)
 		{
 			pobj = argPobj;
 			isBase = argIsBase;
 		}
+
+		/**
+		 * The PObject.
+		 * @return the stored PObject.
+		 */
+		public CDOMReference<PCCheck> getPobj()
+		{
+			return pobj;
+		}
+
+		/**
+		 *  Whether this is a base check.
+		 *
+		 * @return True or False.
+		 */
+		public boolean isBase()
+		{
+			return isBase;
+		}
 	}
 
-	public static CheckInfo LIST_CHECK = new CheckInfo(null, false);
+	private static CheckInfo listCheck = new CheckInfo(null, false);
 
 	@Override
 	public String getBonusHandled()


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15061] Trunk/pcgen/code/src/java/plugin/doomsdaybook/ util/VariableException.java

[<nu...@us...>]

Revision: 15061
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15061&view=rev
Author:   nuance
Date:     2011-05-29 18:29:56 +0000 (Sun, 29 May 2011)

Log Message:
-----------


Added Paths:
-----------
    Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/VariableException.java

Added: Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/VariableException.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/VariableException.java	                        (rev 0)
+++ Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/VariableException.java	2011-05-29 18:29:56 UTC (rev 15061)
@@ -0,0 +1,56 @@
+/*
+ *  RPGeneration - A role playing utility generate interesting things
+ *  Copyright (C) 2002 Devon D Jones
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  The author of this program grants you the ability to use this code
+ *  in conjunction with code that is covered under the Open Gaming License
+ *
+ * VariableException.java
+ *
+ * Created on November 1, 2002, 1:22 PM
+ */
+package plugin.doomsdaybook.util;
+
+/**
+ * <code>VariableException</code> is an exception raised when a problem
+ * occurs when processing a variable.
+ *
+ * Last Editor: $Author: jdempsey $
+ * Last Edited: $Date: 2006-12-17 04:36:01 +0000 (Sun, 17 Dec 2006) $
+ *
+ * @author Devon D Jones
+ * @version $Revision: 1777 $
+ */
+public class VariableException extends Exception
+{
+	/**
+	 * Creates a new instance of <code>VariableException</code> without detail message.
+	 */
+	public VariableException()
+	{
+		// Empty Constructor
+	}
+
+	/**
+	 * Constructs an instance of <code>VariableException</code> with the specified detail message.
+	 * @param msg the detail message.
+	 */
+	public VariableException(String msg)
+	{
+		super(msg);
+	}
+}


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15060] Trunk/pcgen/code/src/java/plugin/doomsdaybook/ util/variableException.java

[<nu...@us...>]

Revision: 15060
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15060&view=rev
Author:   nuance
Date:     2011-05-29 18:28:54 +0000 (Sun, 29 May 2011)

Log Message:
-----------
temporary delete

Removed Paths:
-------------
    Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/variableException.java

Deleted: Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/variableException.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/variableException.java	2011-05-29 18:26:07 UTC (rev 15059)
+++ Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/variableException.java	2011-05-29 18:28:54 UTC (rev 15060)
@@ -1,56 +0,0 @@
-/*
- *  RPGeneration - A role playing utility generate interesting things
- *  Copyright (C) 2002 Devon D Jones
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  The author of this program grants you the ability to use this code
- *  in conjunction with code that is covered under the Open Gaming License
- *
- * variableException.java
- *
- * Created on November 1, 2002, 1:22 PM
- */
-package plugin.doomsdaybook.util;
-
-/**
- * <code>variableException</code> is an exception raised when a problem 
- * occurs when processing a variable.
- *
- * Last Editor: $Author$
- * Last Edited: $Date$
- *
- * @author Devon D Jones
- * @version $Revision$
- */
-public class variableException extends Exception
-{
-	/**
-	 * Creates a new instance of <code>variableException</code> without detail message.
-	 */
-	public variableException()
-	{
-		// Empty Constructor
-	}
-
-	/**
-	 * Constructs an instance of <code>variableException</code> with the specified detail message.
-	 * @param msg the detail message.
-	 */
-	public variableException(String msg)
-	{
-		super(msg);
-	}
-}


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

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

[<nu...@us...>]

Revision: 15059
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15059&view=rev
Author:   nuance
Date:     2011-05-29 18:26:07 +0000 (Sun, 29 May 2011)

Log Message:
-----------
CheckStyle updates.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/VariableHashMap.java
    Trunk/pcgen/code/src/java/plugin/experience/ExperienceList.java

Modified: Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/VariableHashMap.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/VariableHashMap.java	2011-05-29 18:04:23 UTC (rev 15058)
+++ Trunk/pcgen/code/src/java/plugin/doomsdaybook/util/VariableHashMap.java	2011-05-29 18:26:07 UTC (rev 15059)
@@ -90,15 +90,15 @@
 	 * 
 	 * @param key The key of the variable to be retrieved. 
 	 * @return The value fo the variable.
-	 * @throws variableException When no entry exists for the supplied key.
+	 * @throws VariableException When no entry exists for the supplied key.
 	 */
-	public String getVal(String key) throws variableException
+	public String getVal(String key) throws VariableException
 	{
 		String value = get(key);
 
 		if (value == null)
 		{
-			throw new variableException("Variable " + key
+			throw new VariableException("Variable " + key
 				+ " does not exist, cannot get value");
 		}
 
@@ -111,13 +111,13 @@
 	 * 
 	 * @param key The key of the variable to be set.
 	 * @param value The new value for the variable
-	 * @throws variableException When no entry exists for the supplied key.
+	 * @throws VariableException When no entry exists for the supplied key.
 	 */
-	public void setVar(String key, String value) throws variableException
+	public void setVar(String key, String value) throws VariableException
 	{
 		if (get(key) == null)
 		{
-			throw new variableException("Variable " + key
+			throw new VariableException("Variable " + key
 				+ " does not exist, cannot set value");
 		}
 
@@ -154,15 +154,15 @@
 	 * @param key The key of the variable to be updated.
 	 * @param add The amount to add to the variable.
 	 * @return The new value of the variable.
-	 * @throws variableException When no entry exists for the supplied key.
+	 * @throws VariableException When no entry exists for the supplied key.
 	 */
-	public String addVar(String key, int add) throws variableException
+	public String addVar(String key, int add) throws VariableException
 	{
 		String value = get(key);
 
 		if (value == null)
 		{
-			throw new variableException("Variable " + key
+			throw new VariableException("Variable " + key
 				+ " does not exist, cannot add to value");
 		}
 
@@ -188,15 +188,15 @@
 	 * @param key The key of the variable to be updated.
 	 * @param divide The amount to divide the variable's value by.
 	 * @return The new value of the variable.
-	 * @throws variableException When no entry exists for the supplied key.
+	 * @throws VariableException When no entry exists for the supplied key.
 	 */
-	public String divideVar(String key, int divide) throws variableException
+	public String divideVar(String key, int divide) throws VariableException
 	{
 		String value = get(key);
 
 		if (value == null)
 		{
-			throw new variableException("Variable " + key
+			throw new VariableException("Variable " + key
 				+ " does not exist, cannot divide by value");
 		}
 
@@ -218,9 +218,9 @@
 	 * Perform the supplied Operations in sequence.
 	 * 
 	 * @param ops The Operations to be performed.
-	 * @throws variableException When no entry exists for an Operation's key.
+	 * @throws VariableException When no entry exists for an Operation's key.
 	 */
-	public void doOperation(List<Operation> ops) throws variableException
+	public void doOperation(List<Operation> ops) throws VariableException
 	{
 		for (Operation op : ops)
 		{
@@ -235,9 +235,9 @@
 	 * thrown.
 	 * 
 	 * @param op The Operation to be performed.
-	 * @throws variableException When no entry exists for the Operation's key.
+	 * @throws VariableException When no entry exists for the Operation's key.
 	 */
-	public void doOperation(Operation op) throws variableException
+	public void doOperation(Operation op) throws VariableException
 	{
 		String type = op.getType();
 		String key = op.getKey();
@@ -273,9 +273,9 @@
 	/**
 	 * Perform the initialization Operations in sequence.
 	 * 
-	 * @throws variableException When no entry exists for an Operation's key.
+	 * @throws VariableException When no entry exists for an Operation's key.
 	 */
-	public void initialize() throws variableException
+	public void initialize() throws VariableException
 	{
 		doOperation(initialize);
 	}
@@ -288,16 +288,16 @@
 	 * @param key The key of the variable to be updated.
 	 * @param multiply The amount to multiply the variable's value by.
 	 * @return The new value of the variable.
-	 * @throws variableException When no entry exists for the supplied key.
+	 * @throws VariableException When no entry exists for the supplied key.
 	 */
 	public String multiplyVar(String key, int multiply)
-		throws variableException
+		throws VariableException
 	{
 		String value = get(key);
 
 		if (value == null)
 		{
-			throw new variableException("Variable " + key
+			throw new VariableException("Variable " + key
 				+ " does not exist, cannot multiply by value");
 		}
 
@@ -349,16 +349,16 @@
 	 * @param key The key of the variable to be updated.
 	 * @param subtract The amount to subtract from the variable.
 	 * @return The new value of the variable.
-	 * @throws variableException When no entry exists for the supplied key.
+	 * @throws VariableException When no entry exists for the supplied key.
 	 */
 	public String subtractVar(String key, int subtract)
-		throws variableException
+		throws VariableException
 	{
 		String value = get(key);
 
 		if (value == null)
 		{
-			throw new variableException("Variable " + key
+			throw new VariableException("Variable " + key
 				+ " does not exist, cannot subtract from value");
 		}
 

Modified: Trunk/pcgen/code/src/java/plugin/experience/ExperienceList.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/experience/ExperienceList.java	2011-05-29 18:04:23 UTC (rev 15058)
+++ Trunk/pcgen/code/src/java/plugin/experience/ExperienceList.java	2011-05-29 18:26:07 UTC (rev 15059)
@@ -5,7 +5,7 @@
 import javax.swing.DefaultListModel;
 
 /**
- * ExperienceList
+ * ExperienceList. This class holds all the characters that are to be displayed in a JList.
  */
 public class ExperienceList extends DefaultListModel
 {


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15058] Trunk/pcgen/code/src/java/plugin/jepcommands/ CountCommand.java

[<nu...@us...>]

Revision: 15058
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15058&view=rev
Author:   nuance
Date:     2011-05-29 18:04:23 +0000 (Sun, 29 May 2011)

Log Message:
-----------
CheckStyle updates.

Also reindented the code, removing an unnecessary tab from just about every line.

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/plugin/jepcommands/CountCommand.java

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/CountCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/CountCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/CountCommand.java	2011-05-29 18:04:23 UTC (rev 15058)
@@ -97,805 +97,795 @@
 	public enum JepCountEnum
 	{
 		ABILITIES
+			{
+				// Abilities are PObjects, we can implement the filterSet directly
+				// i.e. without using PObject proxies.
+
+				public Map<Nature, Set<Ability>> abdata;
+
+				protected void getData(final PlayerCharacter pc)
 				{
-					// Abilities are PObjects, we can implement the filterSet directly
-					// i.e. without using PObject proxies.
+					abdata = pc.getAbilitiesSet();
+				}
 
-					public Map<Nature, Set<Ability>> abdata;
+				public Object count(final PlayerCharacter pc,
+				                    final Object[] params) throws ParseException
+				{
 
-					protected void getData(final PlayerCharacter pc)
-					{
-						abdata = pc.getAbilitiesSet();
-					}
+					final Object[] par = validateParams(params);
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
+					final ParameterTree pt = convertParams(par);
 
-						final Object[] par = validateParams(params);
+					getData(pc);
 
-						final ParameterTree pt = convertParams(par);
+					final Set<PObject> filtered = doFilterP(pt);
 
-						getData(pc);
+					return countData(filtered, pc);
+				}
 
-						final Set<PObject> filtered = doFilterP(pt);
+				protected Object countData(final Iterable<PObject> filtered,
+				                           PlayerCharacter pc)
+				{
+					double accum = 0;
 
-						return countData(filtered, pc);
+					for (final PObject ab : filtered)
+					{
+						final double ac = pc.getSelectCorrectedAssociationCount(ab);
+						accum += 1.01 >= ac ? 1 : ac;
 					}
+					return accum;
+				}
 
-					protected Object countData(final Iterable<PObject> filtered, PlayerCharacter pc)
-					{
-						double accum = 0;
+				protected Set<? extends PObject> filterSetP(final String c)
+				{
+					final String[] keyValue = c.split("=");
+					final JepAbilityCountEnum en;
 
-						for (final PObject ab : filtered)
-						{
-							final double ac = pc.getSelectCorrectedAssociationCount(ab);
-							accum += 1.01 >= ac ? 1 : ac;
-						}
-						return accum;
+					try
+					{
+						en = JepAbilityCountEnum.valueOf(keyValue[0]);
 					}
-
-					protected Set<? extends PObject> filterSetP(final String c)
+					catch (IllegalArgumentException ex)
 					{
-						final String[] keyValue = c.split("=");
-						final JepAbilityCountEnum en;
+						Logging.errorPrint(
+							"Bad paramter to count(\"Ability\"), " + c);
+						return new HashSet<PObject>();
+					}
 
-						try
-						{
-							en = JepAbilityCountEnum.valueOf(keyValue[0]);
-						}
-						catch (IllegalArgumentException ex)
-						{
-							Logging.errorPrint(
-									"Bad paramter to count(\"Ability\"), " + c);
-							return new HashSet<PObject>();
-						}
+					Set<Ability> cs = null;
+					Ability a;
+					final Iterator<? extends PObject> abIt;
 
-						Set<Ability> cs = null;
-						Ability a;
-						final Iterator<? extends PObject> abIt;
+					switch (en)
+					{
+						case CATEGORY:
+						case CAT:
+							final String cat = keyValue[1];
+							cs = new HashSet<Ability>(abdata.get(Nature.ANY));
 
-						switch (en)
-						{
-							case CATEGORY:
-							case CAT:
-								final String cat = keyValue[1];
-								cs = new HashSet<Ability>(abdata.get(Nature.ANY));
+							abIt = cs.iterator();
 
-								abIt = cs.iterator();
-
-								while (abIt.hasNext())
+							while (abIt.hasNext())
+							{
+								a = (Ability) abIt.next();
+								if (!a.getCategory().equalsIgnoreCase(cat))
 								{
-									a = (Ability) abIt.next();
-									if (!a.getCategory().equalsIgnoreCase(cat))
-									{
-										abIt.remove();
-									}
+									abIt.remove();
 								}
-								break;
+							}
+							break;
 
-							case NAME:
-							case NAM:
-								cs = filterAbilitiesByName(keyValue);
-								break;
+						case NAME:
+						case NAM:
+							cs = filterAbilitiesByName(keyValue);
+							break;
 
-							case KEY:
-								cs = filterAbilitiesByKeyName(keyValue);
-								break;
+						case KEY:
+							cs = filterAbilitiesByKeyName(keyValue);
+							break;
 
-							case NATURE:
-							case NAT:
-								Nature n;
-								try
-								{
-									n = Nature.valueOf(keyValue[1]);
-								}
-								catch (IllegalArgumentException ex)
-								{
-									Logging.errorPrint(
-											"Bad paramter to count(\"Ability\"), no such NATURE "
-											+ c);
-									n = Nature.ANY;
-								}
-								cs = new HashSet<Ability>(abdata.get(n));
-								break;
+						case NATURE:
+						case NAT:
+							Nature n;
+							try
+							{
+								n = Nature.valueOf(keyValue[1]);
+							}
+							catch (IllegalArgumentException ex)
+							{
+								Logging.errorPrint(
+									"Bad paramter to count(\"Ability\"), no such NATURE "
+										+ c);
+								n = Nature.ANY;
+							}
+							cs = new HashSet<Ability>(abdata.get(n));
+							break;
 
-							case TYPE:
-							case TYP:
-								cs = new HashSet<Ability>(abdata.get(Nature.ANY));
-								abIt = cs.iterator();
+						case TYPE:
+						case TYP:
+							cs = new HashSet<Ability>(abdata.get(Nature.ANY));
+							abIt = cs.iterator();
 
-								filterPObjectByType(abIt, keyValue[1]);
-								break;
+							filterPObjectByType(abIt, keyValue[1]);
+							break;
 
-							case VISIBILITY:
-							case VIS:
-								cs = new HashSet<Ability>(abdata.get(Nature.ANY));
+						case VISIBILITY:
+						case VIS:
+							cs = new HashSet<Ability>(abdata.get(Nature.ANY));
 
-								try
-								{
-									final Visibility vi = Visibility.valueOf(keyValue[1]);
-									abIt = cs.iterator();
+							try
+							{
+								final Visibility vi = Visibility.valueOf(keyValue[1]);
+								abIt = cs.iterator();
 
-									while (abIt.hasNext())
+								while (abIt.hasNext())
+								{
+									a = (Ability) abIt.next();
+									if (!a.getSafe(ObjectKey.VISIBILITY).equals(vi))
 									{
-										a = (Ability) abIt.next();
-										if (!a.getSafe(ObjectKey.VISIBILITY).equals(vi))
-										{
-											abIt.remove();
-										}
+										abIt.remove();
 									}
 								}
-								catch (IllegalArgumentException ex)
-								{
-									Logging.errorPrint(
-											"Bad paramter to count(\"Ability\"), no such Visibility "
-											+ keyValue[1]);
-								}
-						}
-
-						return cs;
+							}
+							catch (IllegalArgumentException ex)
+							{
+								Logging.errorPrint(
+									"Bad paramter to count(\"Ability\"), no such Visibility "
+										+ keyValue[1]);
+							}
 					}
 
-					/**
-					 * Filter the abilities by their display name. 
-					 * @param keyValue The count parameters. The 2nd entry is the name to be matched.
-					 * @return The set of abilities matching the name.
-					 */
-					private Set<Ability> filterAbilitiesByName(final String[] keyValue)
+					return cs;
+				}
+
+				/**
+				 * Filter the abilities by their display name.
+				 * @param keyValue The count parameters. The 2nd entry is the name to be matched.
+				 * @return The set of abilities matching the name.
+				 */
+				private Set<Ability> filterAbilitiesByName(final String[] keyValue)
+				{
+					Set<Ability> cs;
+					final Iterator<? extends PObject> abIt;
+					cs = new HashSet<Ability>(abdata.get(Nature.ANY));
+					abIt = cs.iterator();
+
+					while (abIt.hasNext())
 					{
-						Set<Ability> cs;
-						final Iterator<? extends PObject> abIt;
-						cs = new HashSet<Ability>(abdata.get(Nature.ANY));
-						abIt = cs.iterator();
+						final Ability ab = (Ability) abIt.next();
 
-						while (abIt.hasNext())
-						{
-							final Ability ab = (Ability) abIt.next();
+						final String name = (ab.getSafe(ObjectKey.MULTIPLE_ALLOWED)) ?
+							AbilityUtilities.getUndecoratedName(
+								ab.getDisplayName(),
+								new ArrayList<String>()) :
+							ab.getDisplayName();
 
-							final String name = (ab.getSafe(ObjectKey.MULTIPLE_ALLOWED)) ?
-										AbilityUtilities.getUndecoratedName(
-												ab.getDisplayName(),
-												new ArrayList<String>()) :
-										ab.getDisplayName();
-							
-							if (!name.equalsIgnoreCase(keyValue[1]))
-							{
-								abIt.remove();
-							}
+						if (!name.equalsIgnoreCase(keyValue[1]))
+						{
+							abIt.remove();
 						}
-						return cs;
 					}
+					return cs;
+				}
 
-					/**
-					 * Filter the abilities by their key name. 
-					 * @param keyValue The count parameters. The 2nd entry is the key to be matched.
-					 * @return The set of abilities matching the key.
-					 */
-					private Set<Ability> filterAbilitiesByKeyName(final String[] keyValue)
+				/**
+				 * Filter the abilities by their key name.
+				 * @param keyValue The count parameters. The 2nd entry is the key to be matched.
+				 * @return The set of abilities matching the key.
+				 */
+				private Set<Ability> filterAbilitiesByKeyName(final String[] keyValue)
+				{
+					Set<Ability> cs;
+					final Iterator<? extends PObject> abIt;
+					cs = new HashSet<Ability>(abdata.get(Nature.ANY));
+					abIt = cs.iterator();
+
+					while (abIt.hasNext())
 					{
-						Set<Ability> cs;
-						final Iterator<? extends PObject> abIt;
-						cs = new HashSet<Ability>(abdata.get(Nature.ANY));
-						abIt = cs.iterator();
+						final Ability ab = (Ability) abIt.next();
 
-						while (abIt.hasNext())
-						{
-							final Ability ab = (Ability) abIt.next();
+						final String name = ab.getKeyName();
 
-							final String name = ab.getKeyName();
-							
-							if (!name.equalsIgnoreCase(keyValue[1]))
-							{
-								abIt.remove();
-							}
+						if (!name.equalsIgnoreCase(keyValue[1]))
+						{
+							abIt.remove();
 						}
-						return cs;
 					}
+					return cs;
+				}
 
-					protected Set<String> filterSetS(final String c) throws ParseException
-					{
-						throw new ParseException(
-								"Ability is a PObject, should be calling filterSetP");
-					}
-				},
+				protected Set<String> filterSetS(final String c) throws ParseException
+				{
+					throw new ParseException(
+						"Ability is a PObject, should be calling filterSetP");
+				}
+			},
 
 		CLASSES
+			{
+				// Classes are PObjects, we can implement the filterSet directly
+				// i.e. without using PObject proxies.
+
+				public Set<PCClass> objdata;
+
+				protected void getData(final PlayerCharacter pc)
 				{
-					// Classes are PObjects, we can implement the filterSet directly
-					// i.e. without using PObject proxies.
+					objdata = new HashSet<PCClass>();
+					objdata.addAll(pc.getClassSet());
+				}
 
-					public Set<PCClass> objdata;
+				public Object count(
+					final PlayerCharacter pc, final Object[] params) throws
+					ParseException
+				{
+					final Object[] par = validateParams(params);
+					final ParameterTree pt = convertParams(par);
 
-					protected void getData(final PlayerCharacter pc)
-					{
-						objdata = new HashSet<PCClass>();
-						objdata.addAll(pc.getClassSet());
-					}
+					getData(pc);
+					final Set<PObject> filtered = doFilterP(pt);
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						final Object[] par = validateParams(params);
-						final ParameterTree pt = convertParams(par);
+					return (double) filtered.size();
+				}
 
-						getData(pc);
-						final Set<PObject> filtered = doFilterP(pt);
+				protected Set<String> filterSetS(final String c) throws ParseException
+				{
+					throw new ParseException(
+						"PCClass is a PObject, should be calling filterSetP");
+				}
 
-						return (double) filtered.size();
-					}
+				protected Set<? extends PObject> filterSetP(final String c) throws
+					ParseException
+				{
+					final String[] keyValue = c.split("=");
 
-					protected Set<String> filterSetS(final String c) throws ParseException
+					if (!"TYPE".equalsIgnoreCase(keyValue[0]))
 					{
 						throw new ParseException(
-								"PCClass is a PObject, should be calling filterSetP");
+							"Bad parameter to count(\"CLASSES\" ... )" + c);
 					}
 
-					protected Set<? extends PObject> filterSetP(final String c) throws
-																	  ParseException
-					{
-						final String[] keyValue = c.split("=");
+					final Set<PCClass> cs = new HashSet<PCClass>(objdata);
+					final Iterator<? extends PObject> it = cs.iterator();
 
-						if (!"TYPE".equalsIgnoreCase(keyValue[0]))
-						{
-							throw new ParseException(
-									"Bad parameter to count(\"CLASSES\" ... )" + c);
-						}
+					filterPObjectByType(it, keyValue[1]);
 
-						final Set<PCClass> cs = new HashSet<PCClass>(objdata);
-						final Iterator<? extends PObject> It = cs.iterator();
+					return cs;
+				}
+			},
 
-						filterPObjectByType(It, keyValue[1]);
+		DOMAINS
+			{
+				// Domains are not PObjects
 
-						return cs;
-					}
-				},
+				public PlayerCharacter pc;
 
-		DOMAINS
+				protected void getData(final PlayerCharacter aPc)
 				{
-					// Domains are not PObjects
+					this.pc = aPc;
+				}
 
-					public PlayerCharacter pc;
+				public Object count(final PlayerCharacter aPc,
+				                    final Object[] params) throws ParseException
+				{
+					final Object[] par = validateParams(params);
+					final ParameterTree pt = convertParams(par);
 
-					protected void getData(final PlayerCharacter pc)
-					{
-						this.pc = pc;
-					}
+					getData(aPc);
+					final Set<String> filtered = doFilterS(pt);
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						final Object[] par = validateParams(params);
-						final ParameterTree pt = convertParams(par);
+					return (double) filtered.size();
+				}
 
-						getData(pc);
-						final Set<String> filtered = doFilterS(pt);
+				protected Set<String> filterSetS(final String kv) throws
+					ParseException
+				{
+					final String[] keyValue = kv.split("=");
 
-						return (double) filtered.size();
+					if (!"TYPE".equalsIgnoreCase(keyValue[0]))
+					{
+						throw new ParseException(
+							"Bad parameter to count(\"" + this + "\" ... )" + kv);
 					}
 
-					protected Set<String> filterSetS(final String kv) throws
-																	  ParseException
-					{
-						final String[] keyValue = kv.split("=");
+					final Set<String> pSet = new HashSet<String>();
 
-						if (!"TYPE".equalsIgnoreCase(keyValue[0]))
+					// Hack (should allow various values, but PCGen can only do PCClass)
+					if (keyValue[1].equals("PCClass"))
+					{
+						// at this point we have a set of character domains
+						// which meet the
+						// selection criteria of this leaf node of the parameter tree.
+						// we now convert this to a set of Strings so that the generic doFilterS
+						// can perform set operations on them
+						for (Domain d : pc.getDomainSet())
 						{
-							throw new ParseException(
-									"Bad parameter to count(\"" + this + "\" ... )" + kv);
+							ClassSource source = pc.getDomainSource(d);
+							pSet.add(source.getPcclass().getKeyName());
 						}
+					}
 
-						final Set<String> pSet = new HashSet<String>();
+					return pSet;
+				}
 
-						// Hack (should allow various values, but PCGen can only do PCClass)
-						if (keyValue[1].equals("PCClass"))
-						{
-							// at this point we have a set of character domains
-							// which meet the
-							// selection criteria of this leaf node of the parameter tree.
-							// we now convert this to a set of Strings so that the generic doFilterS
-							// can perform set operations on them
-							for (Domain d : pc.getDomainSet())
-							{
-								ClassSource source = pc.getDomainSource(d);
-								pSet.add(source.getPcclass().getKeyName());
-							}
-						}
+				protected Set<? extends PObject> filterSetP(final String c) throws
+					ParseException
+				{
+					throw new ParseException(
+						"CharacterDomain is not a PObject, should be calling filterSetS");
+				}
+			},
 
-						return pSet;
-					}
+		EQUIPMENT
+			{
+				// Equipment is/are PObjects, we can implement the filterSet directly
 
-					protected Set<? extends PObject> filterSetP(final String c) throws
-																	  ParseException
-					{
-						throw new ParseException(
-								"CharacterDomain is not a PObject, should be calling filterSetS");
-					}
-				},
+				public Set<Equipment> objdata;
 
-		EQUIPMENT
+				protected void getData(final PlayerCharacter pc)
 				{
-					// Equipment is/are PObjects, we can implement the filterSet directly
+					objdata = new HashSet<Equipment>();
+					objdata.addAll(pc.getEquipmentListInOutputOrder());
+				}
 
-					public Set<Equipment> objdata;
+				public Object count(final PlayerCharacter pc,
+				                    final Object[] params) throws ParseException
+				{
+					final Object[] par = validateParams(params);
+					final ParameterTree pt = convertParams(par);
 
-					protected void getData(final PlayerCharacter pc)
-					{
-						objdata = new HashSet<Equipment>();
-						objdata.addAll(pc.getEquipmentListInOutputOrder());
-					}
+					getData(pc);
+					final Set<PObject> filtered = doFilterP(pt);
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						final Object[] par = validateParams(params);
-						final ParameterTree pt = convertParams(par);
+					return (double) filtered.size();
+				}
 
-						getData(pc);
-						final Set<PObject> filtered = doFilterP(pt);
 
-						return (double) filtered.size();
-					}
+				protected Set<String> filterSetS(final String c) throws ParseException
+				{
+					throw new ParseException(
+						"Equipment is a PObject, should be calling filterSetP");
+				}
 
+				protected Set<? extends PObject> filterSetP(final String c) throws
+					ParseException
+				{
+					final String[] keyValue = c.split("=");
 
-					protected Set<String> filterSetS(final String c) throws ParseException
+					final JepEquipmentCountEnum en;
+
+					try
 					{
-						throw new ParseException(
-								"Equipment is a PObject, should be calling filterSetP");
+						en = JepEquipmentCountEnum.valueOf(keyValue[0]);
 					}
-
-					protected Set<? extends PObject> filterSetP(final String c) throws
-																	  ParseException
+					catch (IllegalArgumentException ex)
 					{
-						final String[] keyValue = c.split("=");
+						Logging.errorPrint(
+							"Bad paramter to count(\"Equipment\"), " + c);
+						return new HashSet<PObject>();
+					}
 
-						final JepEquipmentCountEnum en;
+					final Set<Equipment> cs = new HashSet<Equipment>(objdata);
+					final Iterator<? extends PObject> it = cs.iterator();
 
-						try
-						{
-							en = JepEquipmentCountEnum.valueOf(keyValue[0]);
-						}
-						catch (IllegalArgumentException ex)
-						{
-							Logging.errorPrint(
-									"Bad paramter to count(\"Equipment\"), " + c);
-							return new HashSet<PObject>();
-						}
+					switch (en)
+					{
+						case TYPE:
+							filterPObjectByType(it, keyValue[1]);
+							break;
 
-						final Set<Equipment> cs = new HashSet<Equipment>(objdata);
-						final Iterator<? extends PObject> It = cs.iterator();
-
-						switch (en)
-						{
-							case TYPE:
-								filterPObjectByType(It, keyValue[1]);
-								break;
-
-							case WIELDCATEGORY:
-								while (It.hasNext())
+						case WIELDCATEGORY:
+							while (it.hasNext())
+							{
+								final Equipment e = (Equipment) it.next();
+								if (!e.getWieldName().equalsIgnoreCase(keyValue[1]))
 								{
-									final Equipment e = (Equipment) It.next();
-									if (!e.getWieldName().equalsIgnoreCase(keyValue[1]))
-									{
-										It.remove();
-									}
+									it.remove();
 								}
-								break;
+							}
+							break;
 
-								// TODO have no idea how to get a suitable list of equipement
-								// and test for this.
+						// TODO have no idea how to get a suitable list of equipment
+						// and test for this.
 
-							case LOCATION:
-								if ("CARRIED".equalsIgnoreCase(keyValue[1])
-									|| "Equipped".equalsIgnoreCase(keyValue[1]))
-								{
-//						while (It.hasNext())
+						case LOCATION:
+							if ("CARRIED".equalsIgnoreCase(keyValue[1])
+								|| "Equipped".equalsIgnoreCase(keyValue[1]))
+							{
+//						while (it.hasNext())
 //						{
-//							Equipment e = (Equipment) It.next();
+//							Equipment e = (Equipment) it.next();
 //							if (! e.getParent().equalsIgnoreCase(keyValue[1]));
 //							{
-//								It.remove();
+//								it.remove();
 //							}
 //						}
-								}
-							case LOC:
-								break;
-							case TYP:
-								break;
-							case WDC:
-								break;
-						}
-
-						return cs;
+							}
+						case LOC:
+							break;
+						case TYP:
+							break;
+						case WDC:
+							break;
 					}
-				},
 
+					return cs;
+				}
+			},
+
 		FOLLOWERS
-				{
-					// Followers are not PObjects.
+			{
+				// Followers are not PObjects.
 
-					public Map<Follower, String> objdata;
+				public Map<Follower, String> objdata;
 
-					protected void getData(final PlayerCharacter pc)
+				protected void getData(final PlayerCharacter pc)
+				{
+					for (final Follower f : pc.getFollowerList())
 					{
-						for (final Follower f : pc.getFollowerList())
-						{
 
-							// map each followoer to an empty string. Each of these
-							// Strings is unique and is mapped to exactly one Follower.
+						// map each follower to an empty string. Each of these
+						// Strings is unique and is mapped to exactly one Follower.
 
-							objdata.put(f, "");
-						}
+						objdata.put(f, "");
 					}
+				}
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						final Object[] par = validateParams(params);
-						final ParameterTree pt = convertParams(par);
+				public Object count(final PlayerCharacter pc,
+				                    final Object[] params) throws ParseException
+				{
+					final Object[] par = validateParams(params);
+					final ParameterTree pt = convertParams(par);
 
-						getData(pc);
-						final Set<String> filtered = doFilterS(pt);
+					getData(pc);
+					final Set<String> filtered = doFilterS(pt);
 
-						return countDataS(filtered);
-					}
+					return countDataS(filtered);
+				}
 
-					protected Set<? extends PObject> filterSetP(final String c) throws
-																	  ParseException
-					{
-						throw new ParseException(
-								"Follower is not a PObject, should be calling filterSetS");
-					}
+				protected Set<? extends PObject> filterSetP(final String c) throws
+					ParseException
+				{
+					throw new ParseException(
+						"Follower is not a PObject, should be calling filterSetS");
+				}
 
-					// If we need to be able to filter out any of these followers,
-					// this is where it should be done.
-					protected Set<String> filterSetS(final String c)
-					{
-						return (Set<String>) objdata.values();
-					}
-				},
+				// If we need to be able to filter out any of these followers,
+				// this is where it should be done.
+				protected Set<String> filterSetS(final String c)
+				{
+					return (Set<String>) objdata.values();
+				}
+			},
 
 		LANGUAGES
+			{
+				// Languages are PObjects, we can implement the filterSet directly
+				// i.e. without using PObject proxies.
+
+				public Set<Language> objdata;
+
+				protected void getData(final PlayerCharacter pc)
 				{
-					// Languages are PObjects, we can implement the filterSet directly
-					// i.e. without using PObject proxies.
+					objdata = new HashSet<Language>();
+					objdata.addAll(pc.getLanguageSet());
+				}
 
-					public Set<Language> objdata;
+				public Object count(final PlayerCharacter pc,
+				                    final Object[] params) throws ParseException
+				{
+					final Object[] par = validateParams(params);
+					final ParameterTree pt = convertParams(par);
 
-					protected void getData(final PlayerCharacter pc)
-					{
-						objdata = new HashSet<Language>();
-						objdata.addAll(pc.getLanguageSet());
-					}
+					getData(pc);
+					final Set<PObject> filtered = doFilterP(pt);
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						final Object[] par = validateParams(params);
-						final ParameterTree pt = convertParams(par);
+					return (double) filtered.size();
+				}
 
-						getData(pc);
-						final Set<PObject> filtered = doFilterP(pt);
+				protected Set<? extends PObject> filterSetP(final String c) throws
+					ParseException
+				{
+					final String[] keyValue = c.split("=");
 
-						return (double) filtered.size();
+					if (!"TYPE".equalsIgnoreCase(keyValue[0]))
+					{
+						throw new ParseException(
+							MessageFormat.format(
+								"Bad parameter to count(\"CLASSES\" ... ){0}",
+								c));
 					}
 
-					protected Set<? extends PObject> filterSetP(final String c) throws
-																	  ParseException
-					{
-						final String[] keyValue = c.split("=");
+					final Set<Language> cs = new HashSet<Language>(objdata);
+					final Iterator<? extends PObject> it = cs.iterator();
 
-						if (!"TYPE".equalsIgnoreCase(keyValue[0]))
-						{
-							throw new ParseException(
-									MessageFormat.format(
-											"Bad parameter to count(\"CLASSES\" ... ){0}",
-											c));
-						}
+					filterPObjectByType(it, keyValue[1]);
 
-						final Set<Language> cs = new HashSet<Language>(objdata);
-						final Iterator<? extends PObject> It = cs.iterator();
+					return cs;
+				}
 
-						filterPObjectByType(It, keyValue[1]);
+				protected Set<String> filterSetS(final String c) throws ParseException
+				{
+					throw new ParseException(
+						"Language is a PObject, should be calling filterSetP");
+				}
+			},
 
-						return cs;
-					}
+		RACESUBTYPES
+			{
+				// RaceSubTypes are not PObjects
 
-					protected Set<String> filterSetS(final String c) throws ParseException
-					{
-						throw new ParseException(
-								"Language is a PObject, should be calling filterSetP");
-					}
-				},
+				public Set<RaceSubType> objdata = new HashSet<RaceSubType>();
 
-		RACESUBTYPES
+				protected void getData(final PlayerCharacter pc)
 				{
-					// RaceSubTypes are not PObjects
+					objdata.addAll(pc.getRacialSubTypes());
+				}
 
-					public Set<RaceSubType> objdata = new HashSet<RaceSubType>();
+				public Object count(final PlayerCharacter pc,
+				                    final Object[] params) throws ParseException
+				{
+					final Object[] par = validateParams(params);
+					final ParameterTree pt = convertParams(par);
 
-					protected void getData(final PlayerCharacter pc)
-					{
-						objdata.addAll(pc.getRacialSubTypes());
-					}
+					getData(pc);
+					final Set<String> filtered = doFilterS(pt);
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						final Object[] par = validateParams(params);
-						final ParameterTree pt = convertParams(par);
+					return (double) filtered.size();
+				}
 
-						getData(pc);
-						final Set<String> filtered = doFilterS(pt);
+				protected Set<? extends PObject> filterSetP(final String c) throws
+					ParseException
+				{
+					throw new ParseException(
+						"RaceSubType is not a PObject, should be calling filterSetS");
+				}
 
-						return (double) filtered.size();
-					}
+				protected Set<String> filterSetS(final String c) throws ParseException
+				{
+					final String[] keyValue = c.split("=");
 
-					protected Set<? extends PObject> filterSetP(final String c) throws
-																	  ParseException
+					if (!"TYPE".equalsIgnoreCase(keyValue[0]))
 					{
 						throw new ParseException(
-								"RaceSubType is not a PObject, should be calling filterSetS");
+							MessageFormat.format(
+								"Bad parameter to count(\"CLASSES\" ... ){0}",
+								c));
 					}
 
-					protected Set<String> filterSetS(final String c) throws ParseException
+					final Set<String> rSet = new HashSet<String>();
+					for (RaceSubType rst : objdata)
 					{
-						final String[] keyValue = c.split("=");
+						rSet.add(rst.toString());
+					}
 
-						if (!"TYPE".equalsIgnoreCase(keyValue[0]))
-						{
-							throw new ParseException(
-									MessageFormat.format(
-											"Bad parameter to count(\"CLASSES\" ... ){0}",
-											c));
-						}
+					// If we want all then we don't need to filter.
+					if (!"ALL".equalsIgnoreCase(keyValue[1]))
+					{
 
-						final Set<String> rSet = new HashSet<String>();
-						for (RaceSubType rst : objdata)
-						{
-							rSet.add(rst.toString());
-						}
+						final Iterator<String> pcRaceSubTypeIterator =
+							rSet.iterator();
 
-						// If we want all then we don't need to filter.
-						if (!"ALL".equalsIgnoreCase(keyValue[1]))
+						// Make a List of all the types that each RaceSubType should match
+						final Collection<String> typeList = new ArrayList<String>();
+						Collections.addAll(typeList, keyValue[1].split("\\."));
+
+						// These nested loops remove all raceSubTypes from rSet that do not
+						// match all of the types in typeList
+						while (pcRaceSubTypeIterator.hasNext())
 						{
+							final String pcRaceSubType = pcRaceSubTypeIterator.next();
 
-							final Iterator<String> pcRaceSubTypeIterator =
-									rSet.iterator();
-
-							// Make a List of all the types that each RaceSubType should match
-							final Collection<String> typeList = new ArrayList<String>();
-							Collections.addAll(typeList, keyValue[1].split("\\."));
-
-							// These nested loops remove all raceSubTypes from rSet that do not
-							// match all of the types in typeList
-							while (pcRaceSubTypeIterator.hasNext())
+							for (final String aType : typeList)
 							{
-								final String pcRaceSubType = pcRaceSubTypeIterator.next();
-
-								for (final String aType : typeList)
+								if (!pcRaceSubType.equals(aType))
 								{
-									if (!pcRaceSubType.equals(aType))
-									{
-										pcRaceSubTypeIterator.remove();
-										break;
-									}
+									pcRaceSubTypeIterator.remove();
+									break;
 								}
 							}
 						}
-
-						return rSet;
 					}
-				},
 
+					return rSet;
+				}
+			},
+
 		SKILLS
+			{
+				// Skill is a PObject
+				public Set<Skill> objdata;
+
+				protected void getData(final PlayerCharacter pc)
 				{
-					// Skill is a PObject
-					public Set<Skill> objdata;
+					objdata = new HashSet<Skill>();
+					pc.refreshSkillList();
+					objdata.addAll(pc.getSkillSet());
+				}
 
-					protected void getData(final PlayerCharacter pc)
-					{
-						objdata = new HashSet<Skill>();
-						pc.refreshSkillList();
-						objdata.addAll(pc.getSkillSet());
-					}
+				public Object count(final PlayerCharacter pc,
+				                    final Object[] params) throws ParseException
+				{
+					final Object[] par = validateParams(params);
+					final ParameterTree pt = convertParams(par);
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						final Object[] par = validateParams(params);
-						final ParameterTree pt = convertParams(par);
+					getData(pc);
+					final Set<PObject> filtered = doFilterP(pt);
 
-						getData(pc);
-						final Set<PObject> filtered = doFilterP(pt);
+					return (double) filtered.size();
+				}
 
-						return (double) filtered.size();
-					}
+				protected Set<String> filterSetS(final String c) throws ParseException
+				{
+					throw new ParseException(
+						"Skill is a PObject, should be calling filterSetP");
+				}
 
-					protected Set<String> filterSetS(final String c) throws ParseException
+				protected Set<? extends PObject> filterSetP(final String c) throws
+					ParseException
+				{
+					final String[] keyValue = c.split("=");
+
+					if (!"TYPE".equalsIgnoreCase(keyValue[0]))
 					{
 						throw new ParseException(
-								"Skill is a PObject, should be calling filterSetP");
+							"Bad parameter to count(\"CLASSES\" ... )" + c);
 					}
 
-					protected Set<? extends PObject> filterSetP(final String c) throws
-																	  ParseException
-					{
-						final String[] keyValue = c.split("=");
+					final Set<Skill> cs = new HashSet<Skill>(objdata);
+					final Iterator<? extends PObject> it = cs.iterator();
 
-						if (!"TYPE".equalsIgnoreCase(keyValue[0]))
-						{
-							throw new ParseException(
-									"Bad parameter to count(\"CLASSES\" ... )" + c);
-						}
+					filterPObjectByType(it, keyValue[1]);
 
-						final Set<Skill> cs = new HashSet<Skill>(objdata);
-						final Iterator<? extends PObject> It = cs.iterator();
+					return cs;
+				}
+			},
 
-						filterPObjectByType(It, keyValue[1]);
+		SPELLBOOKS
+			{
 
-						return cs;
-					}
-				},
+				/**
+				 * Count a character's Spell Books.
+				 *
+				 * @param pc The character being counted.
+				 * @param params The parameters determining which spell books get counted.
+				 * @return A Double with the number of matching spell books.
+				 * @throws ParseException If any invalid parameters are encountered.
+				 */
+				public Object count(final PlayerCharacter pc,
+				                    final Object[] params) throws ParseException
+				{
+					return pc.getSpellBookCount();
+				}
 
-		SPELLBOOKS
+				protected void getData(final PlayerCharacter pc)
 				{
+				}
 
-					/**
-					 * Count a character's Spell Books.
-					 *
-					 * @param pc The character being counted.
-					 * @param params The parameters determining which spell books get counted.
-					 * @return A Double with the number of matching spell books.
-					 * @throws ParseException If any invalid parameters are encountered.
-					 */
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						return (double) pc.getSpellBookCount();
-					}
+				protected Set<? extends PObject> filterSetP(final String c)
+				{
+					return new HashSet<PObject>();
+				}
+				protected Set<String> filterSetS(final String c)
+				{
+					return new HashSet<String>();
+				}
+			},
 
-					protected void getData(final PlayerCharacter pc)
-					{
-					}
-
-					protected Set<? extends PObject> filterSetP(final String c)
-					{
-						return new HashSet<PObject>();
-					}
-					protected Set<String> filterSetS(final String c)
-					{
-						return new HashSet<String>();
-					}
-				},
-
 		SPELLS
+			{
+				protected void getData(final PlayerCharacter pc)
 				{
-					protected void getData(final PlayerCharacter pc)
-					{
-					}
+				}
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						return Double.valueOf("0.0");
-					}
+				public Object count(
+					final PlayerCharacter pc, final Object[] params) throws
+					ParseException
+				{
+					return Double.valueOf("0.0");
+				}
 
-					protected Set<String> filterSetS(final String c) throws ParseException
-					{
-						throw new ParseException("Not implemented yet");
-					}
+				protected Set<String> filterSetS(final String c) throws ParseException
+				{
+					throw new ParseException("Not implemented yet");
+				}
 
-					protected Set<? extends PObject> filterSetP(final String c) throws
-																	  ParseException
-					{
-						throw new ParseException("Not implemented yet");
-					}
-				},
+				protected Set<? extends PObject> filterSetP(final String c) throws
+					ParseException
+				{
+					throw new ParseException("Not implemented yet");
+				}
+			},
 
 		SPELLSINBOOK
+			{
+
+				protected void getData(final PlayerCharacter pc)
 				{
+				}
 
-					protected void getData(final PlayerCharacter pc)
-					{
-					}
+				public Object count(final PlayerCharacter pc,
+				                    final Object[] params) throws ParseException
+				{
+					return Double.valueOf("0.0");
+				}
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						return Double.valueOf("0.0");
-					}
+				protected Set<String> filterSetS(final String c) throws ParseException
+				{
+					throw new ParseException("Not implemented yet");
+				}
 
-					protected Set<String> filterSetS(final String c) throws ParseException
-					{
-						throw new ParseException("Not implemented yet");
-					}
+				protected Set<? extends PObject> filterSetP(final String c) throws
+					ParseException
+				{
+					throw new ParseException("Not implemented yet");
+				}
+			},
 
-					protected Set<? extends PObject> filterSetP(final String c) throws
-																	  ParseException
-					{
-						throw new ParseException("Not implemented yet");
-					}
-				},
-
 		SPELLSKNOWN
+			{
+				protected void getData(final PlayerCharacter pc)
 				{
-					protected void getData(final PlayerCharacter pc)
-					{
-					}
+				}
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						return Double.valueOf("0.0");
-					}
+				public Object count(final PlayerCharacter pc,
+				                    final Object[] params) throws ParseException
+				{
+					return Double.valueOf("0.0");
+				}
 
-					protected Set<String> filterSetS(final String c) throws ParseException
-					{
-						throw new ParseException("Not implemented yet");
-					}
+				protected Set<String> filterSetS(final String c) throws ParseException
+				{
+					throw new ParseException("Not implemented yet");
+				}
 
-					protected Set<? extends PObject> filterSetP(final String c) throws
-																	  ParseException
-					{
-						throw new ParseException("Not implemented yet");
-					}
-				},
+				protected Set<? extends PObject> filterSetP(final String c) throws
+					ParseException
+				{
+					throw new ParseException("Not implemented yet");
+				}
+			},
 
 		TEMPLATES
+			{
+				public Set<PCTemplate> objdata = new HashSet<PCTemplate>();
+
+				protected void getData(final PlayerCharacter pc)
 				{
-					public Set<PCTemplate> objdata = new HashSet<PCTemplate>();
+					objdata.addAll(pc.getTemplateSet());
+				}
 
-					protected void getData(final PlayerCharacter pc)
-					{
-						objdata.addAll(pc.getTemplateSet());
-					}
+				public Object count(final PlayerCharacter pc,
+				                    final Object[] params) throws ParseException
+				{
+					return Double.valueOf("0.0");
+				}
 
-					public Object count(
-							final PlayerCharacter pc, final Object[] params) throws
-																			 ParseException
-					{
-						return Double.valueOf("0.0");
-					}
+				protected Set<String> filterSetS(final String c) throws ParseException
+				{
+					throw new ParseException(
+						"PCTemplate is a PObject, should be calling filterSetP");
+				}
 
-					protected Set<String> filterSetS(final String c) throws ParseException
+				protected Set<? extends PObject> filterSetP(final String c) throws
+					ParseException
+				{
+					final String[] keyValue = c.split("=");
+
+					if (!"TYPE".equalsIgnoreCase(keyValue[0]))
 					{
 						throw new ParseException(
-								"PCTemplate is a PObject, should be calling filterSetP");
+							"Bad parameter to count(\"CLASSES\" ... )" + c);
 					}
 
-					protected Set<? extends PObject> filterSetP(final String c) throws
-																	  ParseException
-					{
-						final String[] keyValue = c.split("=");
+					final Set<PCTemplate> cs = new HashSet<PCTemplate>(objdata);
+					final Iterator<? extends PObject> it = cs.iterator();
 
-						if (!"TYPE".equalsIgnoreCase(keyValue[0]))
-						{
-							throw new ParseException(
-									"Bad parameter to count(\"CLASSES\" ... )" + c);
-						}
+					filterPObjectByType(it, keyValue[1]);
+					return cs;
+				}
 
-						final Set<PCTemplate> cs = new HashSet<PCTemplate>(objdata);
-						final Iterator<? extends PObject> It = cs.iterator();
+			};
 
-						filterPObjectByType(It, keyValue[1]);
-						return cs;
-					}
-
-				};
-
 		public static String CountType = "";
 
 		private static ParameterTree convertParams(final Object[] params)
@@ -913,7 +903,7 @@
 					else
 					{
 						final ParameterTree npt =
-								ParameterTree.makeTree(ParameterTree.andString);
+							ParameterTree.makeTree(ParameterTree.andString);
 						npt.setLeftTree(pt);
 						pt = npt;
 						final ParameterTree npt1 = ParameterTree.makeTree((String) param);
@@ -923,15 +913,14 @@
 				catch (ParseException pe)
 				{
 					Logging.errorPrint(
-							MessageFormat.format(
-									"Malformed parameter to count {0}", param), pe);
+						MessageFormat.format(
+							"Malformed parameter to count {0}", param), pe);
 				}
 			}
 			return pt;
 		}
 
-		private static void filterPObjectByType(
-				final Iterator<? extends PObject> It, final String tString)
+		private static void filterPObjectByType(final Iterator<? extends PObject> it, final String tString)
 		{
 			// If we want all then we don't need to filter.
 			if (!"ALL".equalsIgnoreCase(tString))
@@ -943,15 +932,15 @@
 
 				// These nested loops remove all PObjects from the collection being
 				// iterated that do not match all of the types in typeList
-				while (It.hasNext())
+				while (it.hasNext())
 				{
-					final PObject pObj = It.next();
+					final PObject pObj = it.next();
 
 					for (final String type : typeList)
 					{
 						if (!pObj.isType(type))
 						{
-							It.remove();
+							it.remove();
 							break;
 						}
 					}
@@ -978,10 +967,10 @@
 		}
 
 		public abstract Object count(PlayerCharacter pc, Object[] params) throws
-																		  ParseException;
+			ParseException;
 
 		public Object countP(final PlayerCharacter pc, final Object[] params) throws
-																			  ParseException
+			ParseException
 		{
 			final Object[] par = validateParams(params);
 			final ParameterTree pt = convertParams(par);
@@ -1003,7 +992,7 @@
 			final String c = pt.getContents();
 
 			if (c.equalsIgnoreCase(ParameterTree.orString) || c.equalsIgnoreCase(
-					ParameterTree.andString))
+				ParameterTree.andString))
 			{
 				final Set<PObject> a = doFilterP(pt.getLeftTree());
 				final Set<PObject> b = doFilterP(pt.getRightTree());
@@ -1022,7 +1011,7 @@
 		}
 
 		public Object countS(final PlayerCharacter pc, final Object[] params) throws
-																			  ParseException
+			ParseException
 		{
 			final Object[] par = validateParams(params);
 			final ParameterTree pt = convertParams(par);
@@ -1044,7 +1033,7 @@
 			final String c = pt.getContents();
 
 			if (c.equalsIgnoreCase(ParameterTree.orString) || c.equalsIgnoreCase(
-					ParameterTree.andString))
+				ParameterTree.andString))
 			{
 				final Set<String> a = doFilterS(pt.getLeftTree());
 				final Set<String> b = doFilterS(pt.getRightTree());
@@ -1071,7 +1060,7 @@
 	}
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 */
 	public CountCommand()
 	{
@@ -1079,7 +1068,8 @@
 	}
 
 	/**
-	 * @see pcgen.util.PCGenCommand#getFunctionName()
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
 	 */
 	@Override
 	public String getFunctionName()
@@ -1095,16 +1085,15 @@
 	private PlayerCharacter getPC()
 	{
 		PlayerCharacter pc = null;
-		//noinspection InstanceofInterfaces
 		if (parent instanceof VariableProcessor)
 		{
 			pc = ((VariableProcessor) parent).getPc();
 		}
-		else //noinspection InstanceofInterfaces
-			if (parent instanceof PlayerCharacter)
-			{
-				pc = (PlayerCharacter) parent;
-			}
+		else
+		if (parent instanceof PlayerCharacter)
+		{
+			pc = (PlayerCharacter) parent;
+		}
 		return pc;
 	}
 
@@ -1152,7 +1141,7 @@
 		if (pc == null)
 		{
 			throw new ParseException(
-					"Invalid parent (no PC): "
+				"Invalid parent (no PC): "
 					+ parent.getClass().getName());
 		}
 
@@ -1164,7 +1153,7 @@
 			// move all but the first parameter from the stack into and array of Objects
 			final Object[] params = paramStackToArray(inStack, curNumberOfParameters - 1);
 
-			// retrieve the first Object, this should be a String whch will map directly to
+			// retrieve the first Object, this should be a String which will map directly to
 			// a JepCountEnum, this specifies the type of count to perform
 			final Object toCount = inStack.pop();
 


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

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

[<nu...@us...>]

Revision: 15057
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15057&view=rev
Author:   nuance
Date:     2011-05-29 17:33:33 +0000 (Sun, 29 May 2011)

Log Message:
-----------
CheckStyle updates

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/plugin/jepcommands/CeilCommand.java
    Trunk/pcgen/code/src/java/plugin/jepcommands/CharBonusToCommand.java
    Trunk/pcgen/code/src/java/plugin/jepcommands/ClassLevelCommand.java
    Trunk/pcgen/code/src/java/plugin/jepcommands/FloorCommand.java
    Trunk/pcgen/code/src/java/plugin/jepcommands/GetVarCommand.java
    Trunk/pcgen/code/src/java/plugin/jepcommands/IfCommand.java
    Trunk/pcgen/code/src/java/plugin/jepcommands/IsgamemodeCommand.java
    Trunk/pcgen/code/src/java/plugin/jepcommands/MaxCommand.java
    Trunk/pcgen/code/src/java/plugin/jepcommands/MinCommand.java
    Trunk/pcgen/code/src/java/plugin/jepcommands/OrCommand.java
    Trunk/pcgen/code/src/java/plugin/jepcommands/RollCommand.java
    Trunk/pcgen/code/src/java/plugin/jepcommands/SkillInfoCommand.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/AbilityToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/AlignmentToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProficiencyToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CheckToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ClassToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DeityToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipmentToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectionToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/LangToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NoChoiceToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/PCStatToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/RaceToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SchoolsToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProficiencyToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SizeToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellLevelToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/StringToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/TemplateToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java
    Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProficiencyToken.java

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/CeilCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/CeilCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/CeilCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -19,6 +19,10 @@
 		numberOfParameters = 1;
 	}
 
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
+	 */
 	public String getFunctionName()
 	{
 		return "CEIL";

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/CharBonusToCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/CharBonusToCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/CharBonusToCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -22,6 +22,10 @@
 		numberOfParameters = -1;
 	}
 
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
+	 */
 	public String getFunctionName()
 	{
 		return "CHARBONUSTO";

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/ClassLevelCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/ClassLevelCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/ClassLevelCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -26,6 +26,10 @@
 		numberOfParameters = -1;
 	}
 
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
+	 */
 	public String getFunctionName()
 	{
 		return "CLASSLEVEL";

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/FloorCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/FloorCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/FloorCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -19,6 +19,10 @@
 		numberOfParameters = 1;
 	}
 
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
+	 */
 	public String getFunctionName()
 	{
 		return "FLOOR";

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/GetVarCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/GetVarCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/GetVarCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -24,6 +24,10 @@
 		numberOfParameters = -1; // allow variable # of parameters
 	}
 
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
+	 */
 	public String getFunctionName()
 	{
 		return "VAR";

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/IfCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/IfCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/IfCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -35,6 +35,10 @@
 		numberOfParameters = 3;
 	}
 
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
+	 */
 	public String getFunctionName()
 	{
 		return "IF";

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/IsgamemodeCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/IsgamemodeCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/IsgamemodeCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -60,8 +60,9 @@
 		numberOfParameters = 1;
 	}
 
-	/* (non-Javadoc)
-	 * @see pcgen.util.PCGenCommand#getFunctionName()
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
 	 */
 	public String getFunctionName()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/MaxCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/MaxCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/MaxCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -23,6 +23,10 @@
 		numberOfParameters = -1;
 	}
 
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
+	 */
 	public String getFunctionName()
 	{
 		return "MAX";

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/MinCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/MinCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/MinCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -23,6 +23,10 @@
 		numberOfParameters = -1;
 	}
 
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
+	 */
 	public String getFunctionName()
 	{
 		return "MIN";

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/OrCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/OrCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/OrCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -50,6 +50,10 @@
         numberOfParameters = -1;
     }
 
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
+	 */
 	public String getFunctionName()
 	{
 		return "OR";

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/RollCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/RollCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/RollCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -18,6 +18,10 @@
 		numberOfParameters = 1;
 	}
 
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
+	 */
 	public String getFunctionName()
 	{
 		return "ROLL";

Modified: Trunk/pcgen/code/src/java/plugin/jepcommands/SkillInfoCommand.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/jepcommands/SkillInfoCommand.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/jepcommands/SkillInfoCommand.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -32,6 +32,10 @@
 		numberOfParameters = 2;
 	}
 
+	/**
+	 * Gets the name of the function handled by this class.
+	 * @return The name of the function.
+	 */
 	public String getFunctionName()
 	{
 		return "SKILLINFO";

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/AbilityToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/AbilityToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/AbilityToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -45,6 +45,10 @@
 import pcgen.rules.persistence.token.ComplexParseResult;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles Abilities.
+ */
+
 public class AbilityToken extends AbstractTokenWithSeparator<CDOMObject>
 		implements CDOMSecondaryToken<CDOMObject>,
 		PersistentChoiceActor<Ability>

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/AlignmentToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/AlignmentToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/AlignmentToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.AbbreviatedCreator;
 import pcgen.rules.persistence.token.AbstractSimpleChooseToken;
 
+/**
+ * New chooser plugin, handles PC Alignment.
+ */
 public class AlignmentToken extends AbstractSimpleChooseToken<PCAlignment>
 {
 	private static final Class<PCAlignment> PCALIGNMENT_CLASS = PCAlignment.class;

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProficiencyToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProficiencyToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ArmorProficiencyToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.token.AbstractQualifiedChooseToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles Armour Proficiency.
+ */
 public class ArmorProficiencyToken extends
 		AbstractQualifiedChooseToken<ArmorProf>
 {

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CheckToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CheckToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/CheckToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -21,6 +21,9 @@
 import pcgen.core.PCCheck;
 import pcgen.rules.persistence.token.AbstractSimpleChooseToken;
 
+/**
+ * New chooser plugin, handles checks.
+ */
 public class CheckToken extends AbstractSimpleChooseToken<PCCheck>
 {
 	private static final Class<PCCheck> PCCHECK_CLASS = PCCheck.class;

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ClassToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ClassToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ClassToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.token.AbstractQualifiedChooseToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles PC class.
+ */
 public class ClassToken extends AbstractQualifiedChooseToken<PCClass>
 {
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DeityToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DeityToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DeityToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.token.AbstractQualifiedChooseToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles Deity.
+ */
 public class DeityToken extends AbstractQualifiedChooseToken<Deity>
 {
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/DomainToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -28,6 +28,9 @@
 import pcgen.rules.persistence.token.ParseResult;
 import pcgen.util.Logging;
 
+/**
+ * New chooser plugin, handles Domain.
+ */
 public class DomainToken extends AbstractQualifiedChooseToken<Domain>
 {
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipmentToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipmentToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/EquipmentToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.token.AbstractQualifiedChooseToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles Equipment.
+ */
 public class EquipmentToken extends AbstractQualifiedChooseToken<Equipment>
 {
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectionToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectionToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatSelectionToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -44,6 +44,9 @@
 import pcgen.rules.persistence.token.CDOMSecondaryToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles feat selection.
+ */
 public class FeatSelectionToken extends AbstractTokenWithSeparator<CDOMObject>
 		implements CDOMSecondaryToken<CDOMObject>,
 		PersistentChoiceActor<AbilitySelection>

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/FeatToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -41,6 +41,9 @@
 import pcgen.rules.persistence.token.ComplexParseResult;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles feats.
+ */
 public class FeatToken extends AbstractTokenWithSeparator<CDOMObject> implements
 		CDOMSecondaryToken<CDOMObject>, PersistentChoiceActor<Ability>
 {

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/LangToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/LangToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/LangToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.token.AbstractQualifiedChooseToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles language.
+ */
 public class LangToken extends AbstractQualifiedChooseToken<Language>
 {
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NoChoiceToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NoChoiceToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NoChoiceToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -37,6 +37,9 @@
 import pcgen.rules.persistence.token.CDOMSecondaryToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles no Choice.
+ */
 public class NoChoiceToken implements CDOMSecondaryToken<CDOMObject>,
 		ChooseInformation<String>, PersistentChoiceActor<String>
 {

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/NumberToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -26,6 +26,9 @@
 import pcgen.rules.persistence.token.CDOMSecondaryToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles numbers.
+ */
 public class NumberToken implements CDOMSecondaryToken<CDOMObject>
 {
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/PCStatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/PCStatToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/PCStatToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.AbbreviatedCreator;
 import pcgen.rules.persistence.token.AbstractSimpleChooseToken;
 
+/**
+ * New chooser plugin, handles stats.
+ */
 public class PCStatToken extends AbstractSimpleChooseToken<PCStat>
 {
 	private static final Class<PCStat> PCSTAT_CLASS = PCStat.class;

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/RaceToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/RaceToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/RaceToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.token.AbstractQualifiedChooseToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles Race.
+ */
 public class RaceToken extends AbstractQualifiedChooseToken<Race>
 {
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SchoolsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SchoolsToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SchoolsToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -26,6 +26,9 @@
 import pcgen.rules.persistence.token.ParseResult;
 import pcgen.util.Logging;
 
+/**
+ * New chooser plugin, handles spell schools.
+ */
 public class SchoolsToken extends AbstractSimpleChooseToken<SpellSchool>
 {
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProficiencyToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProficiencyToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/ShieldProficiencyToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.token.AbstractQualifiedChooseToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles shield proficiency.
+ */
 public class ShieldProficiencyToken extends
 		AbstractQualifiedChooseToken<ShieldProf>
 {

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SizeToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SizeToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SizeToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -21,6 +21,9 @@
 import pcgen.core.SizeAdjustment;
 import pcgen.rules.persistence.token.AbstractSimpleChooseToken;
 
+/**
+ * New chooser plugin, handles size.
+ */
 public class SizeToken extends AbstractSimpleChooseToken<SizeAdjustment>
 {
 	private static final Class<SizeAdjustment> SIZEADJUSTMENT_CLASS = SizeAdjustment.class;

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SkillToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.token.AbstractQualifiedChooseToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles skills.
+ */
 public class SkillToken extends AbstractQualifiedChooseToken<Skill>
 {
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellLevelToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellLevelToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellLevelToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -43,6 +43,9 @@
 import pcgen.rules.persistence.token.ParseResult;
 import pcgen.util.Logging;
 
+/**
+ * New chooser plugin, handles Spell Level.
+ */
 public class SpellLevelToken extends AbstractTokenWithSeparator<CDOMObject>
 		implements CDOMSecondaryToken<CDOMObject>,
 		PersistentChoiceActor<SpellLevel>

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/SpellsToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -28,6 +28,9 @@
 import pcgen.rules.persistence.token.ParseResult;
 import pcgen.util.Logging;
 
+/**
+ * New chooser plugin, handles Spells.
+ */
 public class SpellsToken extends AbstractQualifiedChooseToken<Spell>
 {
 	private static final Class<Spell> SPELL_CLASS = Spell.class;

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/StringToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/StringToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/StringToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -37,6 +37,9 @@
 import pcgen.rules.persistence.token.CDOMSecondaryToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles Strings.
+ */
 public class StringToken implements CDOMSecondaryToken<CDOMObject>,
 		PersistentChoiceActor<String>
 {

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/TemplateToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/TemplateToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/TemplateToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.token.AbstractQualifiedChooseToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles Templates.
+ */
 public class TemplateToken extends AbstractQualifiedChooseToken<PCTemplate>
 {
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/UserInputToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -29,6 +29,9 @@
 import pcgen.rules.persistence.token.ParseResult;
 import pcgen.util.Logging;
 
+/**
+ * New chooser plugin, handles User Input.
+ */
 public class UserInputToken implements CDOMSecondaryToken<CDOMObject>
 {
 

Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProficiencyToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProficiencyToken.java	2011-05-29 16:35:11 UTC (rev 15056)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/choose/WeaponProficiencyToken.java	2011-05-29 17:33:33 UTC (rev 15057)
@@ -25,6 +25,9 @@
 import pcgen.rules.persistence.token.AbstractQualifiedChooseToken;
 import pcgen.rules.persistence.token.ParseResult;
 
+/**
+ * New chooser plugin, handles Weapon Proficiency.
+ */
 public class WeaponProficiencyToken extends
 		AbstractQualifiedChooseToken<WeaponProf>
 {


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15056] Trunk/content/notfordistribution/paizo/ pathfinder_rpg/ultimate_magic/pfum_feats.lst

[<hen...@us...>]

Revision: 15056
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15056&view=rev
Author:   henkslaaf2
Date:     2011-05-29 16:35:11 +0000 (Sun, 29 May 2011)

Log Message:
-----------
Add page 155 of PFUM feats

Modified Paths:
--------------
    Trunk/content/notfordistribution/paizo/pathfinder_rpg/ultimate_magic/pfum_feats.lst

Modified: Trunk/content/notfordistribution/paizo/pathfinder_rpg/ultimate_magic/pfum_feats.lst
===================================================================
--- Trunk/content/notfordistribution/paizo/pathfinder_rpg/ultimate_magic/pfum_feats.lst	2011-05-29 15:32:39 UTC (rev 15055)
+++ Trunk/content/notfordistribution/paizo/pathfinder_rpg/ultimate_magic/pfum_feats.lst	2011-05-29 16:35:11 UTC (rev 15056)
@@ -1,6 +1,6 @@
-# CVS $Revision: $ $Author: $ -- Fri May 27 20:04:14 2011 -- reformated by prettylst.pl v1.39 (build )
+# CVS $Revision: $ $Author: $ -- Sun May 29 18:33:11 2011 -- reformated by prettylst.pl v1.39 (build )
 SOURCELONG:Ultimate Magic	SOURCESHORT:PFUM	SOURCEWEB:http://paizo.com/pathfinderRPG/v5748btpy8g7s	SOURCEDATE:2011-05
-# Original Entry by: Stefan Radermacher
+# Original Entry by: Stefan Radermacher, Henk Slaaf
 
 
 
@@ -18,136 +18,137 @@
 
 
 ###Block: Feats
-# Feat Name	Type	Required Ability	Req. Att.	Required Class	Required Feat	Required Lvl	Required Shield Proficiencies	Required Skill	Req. Known Spell	Req. Spell Type	Required Stat	Var. Min. Value	Description	Stackable?	Multiple?	Choose	Add Spell Lvl	Bonus to Ability Pool	Modify VAR	Source Page	Description of the Benefits	SOURCEPAGE=p.149	SOURCEPAGE=p.150
-Abundant Revelations	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Oracle's Mystery	DESC:You can plumb the depths of your mystery to use your revelations more often.	SOURCEPAGE:p.142	BENEFIT:Choose one of your revelations that has a number of uses per day. You gain 1 additional use per day of that revelation.
-Accursed Critical	TYPE:Critical	PRECLASS:1,SPELLCASTER=9	PREFEAT:1,Critical Focus	PRESPELL:1,Bestow Curse,Major Curse	DESC:Your spells carry an embedded curse that manifests when they strike true.	SOURCEPAGE:p.142	BENEFIT:When you confirm a critical hit with a spell or spell-like ability, you may cast bestow curse or major curse on that target as an immediate action. This works even with ranged spells. You must have bestow curse or major curse prepared or otherwise available to cast, and using this ability casts the corresponding spell.
-Accursed Hex	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Hex ~ Witch	DESC:You can make a second attempt at failed hexes.	SOURCEPAGE:p.143	BENEFIT:When you target a creature with a hex that cannot target the same creature more than once per day, and that creature succeeds at its saving throw against the hex’s effect, you can target the creature with the same hex a second time before the end of your next turn. If the second attempt fails, you can make no further attempts to target that creature with the same hex for 1 day.
-Advanced Ranger Trap	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Trap ~ Ranger	PRECLASS:1,Ranger=5	DESC:Your ranger traps are especially difficult to notice and avoid.	SOURCEPAGE:p.143	BENEFIT:Add +1 to the Difficulty Class on all Perception and Disable Device skill checks to find or disable the traps you make with your trap class feature. Add a +1 to the Difficulty Class on all saving throws against the effects of the trap you make with your trap class feature.
-Antagonize	TYPE:General	DESC:Whether with biting remarks or hurtful words, you are adept at making creatures angry with you.	SOURCEPAGE:p.143	BENEFIT:You can make Diplomacy and Intimidate checks to make creatures respond to you with hostility. No matter which skill you use, antagonizing a creature takes a standard action that does not provoke attacks of opportunity, and has a DC equal to the target’s Hit Dice + the target’s Wisdom modifier. The benefits you gain for this check depend on the skill you use. This is a mind-affecting effect.
-Blighted Critical	TYPE:Critical	PRECLASS:1,SPELLCASTER=5	DESC:With a critical hit from a spell or spell-like ability, you give the target a minor spellblight.	SOURCEPAGE:p.143	BENEFIT:Whenever you confirm a critical hit with a touch spell, ranged touch spell, or spell-like ability against an opponent, the victim gains a random minor spellblight.
-Blighted Critical Mastery	TYPE:General	PRECLASS:1,SPELLCASTER=9	PREFEAT:1,Blighted Critical,Critical Focus	DESC:You control the type of spellblight your critical hits give your opponent.	SOURCEPAGE:p.143	BENEFIT:Whenever you apply a spellblight by way of the Blighted Critical or Greater Blighted critical feat, you can choose the spellblight you apply rather than determining it randomly.
-Burning Spell	TYPE:Metamagic	DESC:You cause creatures to take extra damage when you affect them with a spell that has the acid or fire descriptor.	ADDSPELLLEVEL:2	SOURCEPAGE:p.143	BENEFIT:The acid or fire effects of the affected spell adhere to the creature, causing more damage the next round. When a creature takes acid or fire damage from the affected spell, that creature takes damage equal to 2 × the spell’s actual level at the start of its next turn. The damage is acid or fire, as determined by the spell’s descriptor. If a burning spell has both the fire and acid descriptor, the caster chooses what kind of damage is dealt by the burning spell effect. A burning spell uses up a slot two levels higher than the spell’s actual level.
-Channeled Shield Wall	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Channel Energy	PREPROFWITHSHIELD:1,TYPE.Light,TYPE.Heavy	PREVARGTEQ:ChannelEnergyDice,3	DESC:You draw upon your channel energy to enhance the protective ability of your shield and those of allies while they are adjacent to you.	SOURCEPAGE:p.143	BENEFIT:As a swift action, you can spend a use of your channel energy to grant yourself a +2 deflection bonus while using a shield. This bonus lasts 1 minute per cleric level or effective cleric level. While you benefit from this bonus, allies with shields also gain a +2 deflection bonus while they are adjacent to you.
-Concussive Spell	TYPE:Metamagic	DESC:You cause creatures to be disoriented when you affect them with a spell that has the sonic descriptor.	ADDSPELLLEVEL:2	SOURCEPAGE:p.143	BENEFIT:With sonic damage comes a concussive wave of energy that rattles creatures affected by the spell. A concussive spell causes creatures that take damage from a spell that has the sonic descriptor to take a -2 penalty on attack rolls, saving throws, skill checks, and ability checks for a number of rounds equal to the actual spell level of the spell. A concussive spell only affects spells with the sonic descriptor. A concussive spell uses up a spell slot two levels higher than the spell’s actual level.
-Create Reliquary Arms and Shields	TYPE:ItemCreation	PREFEAT:1,Craft Magic Arms and Armor	PRESPELL:1,Consecrate,Desecrate	DESC:Your magical creations are infused with divine power.	SOURCEPAGE:p.148	BENEFIT:When you craft a magic weapon, magic armor, or magic shield, you may add one casting of consecrate or desecrate as part of the item crafting process. The item becomes a reliquary and can be used as a holy (or unholy) symbol divine focus of your deity. If you cast consecrate or desecrate, your reliquary counts as a permanent fixture for that spell while it remains in the spell’s area.
-Create Sanguine Elixir	TYPE:ItemCreation	PRECLASS:1,Sorcerer=3	PREFEAT:1,Brew Potion	PRESKILL:1,Craft (Alchemy)=12	PRESTAT:1,CHA=15	DESC:You can condense a fraction of your bloodline’s power into a powerful elixir.	SOURCEPAGE:p.148	BENEFIT:Once per day, when you clear your mind to regain spell slots, you can create a sanguine elixir. When you do, pick one of your bloodline powers. You transfer that power into a small potion that any creature can drink to temporarily gain the benefit of your bloodline power. Creating a sanguine elixir takes 1 hour, and requires special oils and distillates worth 100 gp, and when you make the sanguine elixir, you lose access to the bloodline power until the next time you clear your mind to regain spell slots. Sanguine elixirs are extremely unstable. They lose their potency 1 day after they are created.
-Defending Eidolon	TYPE:General	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Shield Ally	DESC:You have trained your eidolon to protect you.	SOURCEPAGE:p.148	BENEFIT:Whenever you are adjacent to your eidolon, you can choose for the eidolon to take a -1 penalty on melee attack rolls and combat maneuver checks to gain a +1 dodge bonus to your Armor Class. When your eidolon’s base attack bonus reaches +5, and for every +5 thereafter, the penalty increases by -1 and the dodge bonus increases by +1. You must choose to use this feat when your eidolon is making an attack or full-attack action with melee or natural weapons, and its effect lasts until your eidolon’s next turn, or until you are no longer adjacent to the eidolon, whichever occurs f irst.
-Deny Death	PREABILITY:1,CATEGORY=Special Ability,Ki Pool	PREFEAT:1,Endurance	DESC:Your ki is so strong that it can deny death.	SOURCEPAGE:p.148	BENEFIT:As long as you have 1 ki point in your ki pool, when you fail your Constitution check to stabilize, you do not lose 1 hit point. If you succeed at the check, you can spend 1 ki point to heal 1d6 hit points. If you roll a natural 20 on the check to stabilize, you can spend 1 ki point to heal 2d6 hit points of damage instead.
-Detect Expertise	TYPE:General	PRESPELL:1,Detect Chaos,Detect Evil,Detect Good, Detect Law,Datect Magic	PRESTAT:1,INT=13	DESC:You can detect the mystic specialty of a foe.	SOURCEPAGE:p.148	BENEFIT:When you use any of the spells listed in this feat’s prerequisites to detect a creature’s alignment or its magic, you have a chance of detecting what spellcasting expertise it has. After you observe a creature with the detect spell for 3 rounds, it must make a Will save (DC %1). If it fails the saving throw, you learn what bloodlines, domains, hexes, schools, or mysteries (if any) the creature possesses. If the creature makes its save, it is immune to the effects of this feat for 24 hours.|10+CASTERLEVEL+INT
-Die for Your Master	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Tumor Familiar	DESC:Your tumor familiar goes to any length to save your life.	SOURCEPAGE:p.148	BENEFIT: If your tumor familiar is attached, and you would be reduced to 0 or fewer hit points by damage in combat (from a weapon or other blow, not a spell or special ability), the familiar throws itself in the way of the attack as an immediate action. If it makes a Ref lex saving throw (DC = damage dealt), it takes all the damage from the attack. If it fails, it takes half damage and you take half damage. The familiar must be aware of the attack and able to react to it in order to use this ability, and it can only do this once per day—if it is denied its Dexterity bonus to AC, it can’t use this ability. Since this effect would not normally allow the familiar to make a Ref lex save for half damage, its improved evasion ability does not apply on this saving throw.
-Divine Interference	TYPE:General	PRECLASS:1,SPELLCASTER.Divine=10	DESC:You can convert a spell to interfere with an enemy’s attack.	SOURCEPAGE:p.149	BENEFIT:As an immediate action, when an enemy within 30 feet hits an ally with an attack, you can sacrifice a prepared divine spell or (if you are a spontaneous caster) an unused spell slot and make the enemy reroll the attack roll. The second attack roll takes a penalty equal to the level of the spell you sacrifice. You must sacrifice a spell of 1st-level or higher to use this ability. Whether or not the second attack is successful, you cannot use this effect on the same creature again for 1 day.
-Dragonbane Aura	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Aura of Courage	PRECLASS:1,SPELLCASTER=8	DESC:Those within your dragonbane aura gain the same protection that you do.	SOURCEPAGE:p.149	BENEFIT:When fighting dragons, your aura of courage expands to a 20-foot-radius emanation, and allies in the aura gain a morale bonus on saving throws against dragon breath equal to your aura of courage’s bonus against fear effects.
-Echoing Spell	TYPE:Metamagic	DESC:You have learned how to release most, but not all, of a spell’s potential when you cast it.	ADDSPELLLEVEL:3	SOURCEPAGE:p.149	BENEFIT:When you cast an echoing spell, it does not disappear entirely from memory, and you can cast it one additional time during that day. If you prepare spells, this second casting does not require you to prepare it in another spell slot. If you spontaneously cast spells, this second casting does not expend another available spell slot. An echoing spell uses up a spe
+# Feat Name					Type						Required Ability															Req. Att.	Required Class				Required Feat										Required Lvl	Required Shield Proficiencies			Required Skill				Req. Known Spell																																					Req. Spell Type				Required Stat		Var. Min. Value				Description																							Stackable?	Multiple?	Choose									Add Spell Lvl	Bonus to Ability Pool					Bonus to skill																					Modify VAR											Source Page		Description of the Benefits																																																																																																																																																																																																																																																						SOURCEPAGE=p.149	SOURCEPAGE=p.150
+Abundant Revelations			TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Oracle's Mystery																																																																																																			DESC:You can plumb the depths of your mystery to use your revelations more often.																																																																							SOURCEPAGE:p.142	BENEFIT:Choose one of your revelations that has a number of uses per day. You gain 1 additional use per day of that revelation.
+Accursed Critical				TYPE:Critical																							PRECLASS:1,SPELLCASTER=9		PREFEAT:1,Critical Focus																								PRESPELL:1,Bestow Curse,Major Curse																																																		DESC:Your spells carry an embedded curse that manifests when they strike true.																																																																							SOURCEPAGE:p.142	BENEFIT:When you confirm a critical hit with a spell or spell-like ability, you may cast bestow curse or major curse on that target as an immediate action. This works even with ranged spells. You must have bestow curse or major curse prepared or otherwise available to cast, and using this ability casts the corresponding spell.
+Accursed Hex				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Hex ~ Witch																																																																																																				DESC:You can make a second attempt at failed hexes.																																																																												SOURCEPAGE:p.143	BENEFIT:When you target a creature with a hex that cannot target the same creature more than once per day, and that creature succeeds at its saving throw against the hex’s effect, you can target the creature with the same hex a second time before the end of your next turn. If the second attempt fails, you can make no further attempts to target that creature with the same hex for 1 day.
+Advanced Ranger Trap			TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Trap ~ Ranger											PRECLASS:1,Ranger=5																																																																																						DESC:Your ranger traps are especially difficult to notice and avoid.																																																																									SOURCEPAGE:p.143	BENEFIT:Add +1 to the Difficulty Class on all Perception and Disable Device skill checks to find or disable the traps you make with your trap class feature. Add a +1 to the Difficulty Class on all saving throws against the effects of the trap you make with your trap class feature.
+Antagonize					TYPE:General																																																																																																																DESC:Whether with biting remarks or hurtful words, you are adept at making creatures angry with you.																																																																				SOURCEPAGE:p.143	BENEFIT:You can make Diplomacy and Intimidate checks to make creatures respond to you with hostility. No matter which skill you use, antagonizing a creature takes a standard action that does not provoke attacks of opportunity, and has a DC equal to the target’s Hit Dice + the target’s Wisdom modifier. The benefits you gain for this check depend on the skill you use. This is a mind-affecting effect.
+Blighted Critical				TYPE:Critical																							PRECLASS:1,SPELLCASTER=5																																																																																					DESC:With a critical hit from a spell or spell-like ability, you give the target a minor spellblight.																																																																				SOURCEPAGE:p.143	BENEFIT:Whenever you confirm a critical hit with a touch spell, ranged touch spell, or spell-like ability against an opponent, the victim gains a random minor spellblight.
+Blighted Critical Mastery		TYPE:General																							PRECLASS:1,SPELLCASTER=9		PREFEAT:1,Blighted Critical,Critical Focus																																																																												DESC:You control the type of spellblight your critical hits give your opponent.																																																																							SOURCEPAGE:p.143	BENEFIT:Whenever you apply a spellblight by way of the Blighted Critical or Greater Blighted critical feat, you can choose the spellblight you apply rather than determining it randomly.
+Burning Spell				TYPE:Metamagic																																																																																																																DESC:You cause creatures to take extra damage when you affect them with a spell that has the acid or fire descriptor.																			ADDSPELLLEVEL:2																																												SOURCEPAGE:p.143	BENEFIT:The acid or fire effects of the affected spell adhere to the creature, causing more damage the next round. When a creature takes acid or fire damage from the affected spell, that creature takes damage equal to 2 × the spell’s actual level at the start of its next turn. The damage is acid or fire, as determined by the spell’s descriptor. If a burning spell has both the fire and acid descriptor, the caster chooses what kind of damage is dealt by the burning spell effect. A burning spell uses up a slot two levels higher than the spell’s actual level.
+Channeled Shield Wall			TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Channel Energy																																PREPROFWITHSHIELD:1,TYPE.Light,TYPE.Heavy																																																								PREVARGTEQ:ChannelEnergyDice,3	DESC:You draw upon your channel energy to enhance the protective ability of your shield and those of allies while they are adjacent to you.																																																													SOURCEPAGE:p.143	BENEFIT:As a swift action, you can spend a use of your channel energy to grant yourself a +2 deflection bonus while using a shield. This bonus lasts 1 minute per cleric level or effective cleric level. While you benefit from this bonus, allies with shields also gain a +2 deflection bonus while they are adjacent to you.
+Concussive Spell				TYPE:Metamagic																																																																																																																DESC:You cause creatures to be disoriented when you affect them with a spell that has the sonic descriptor.																					ADDSPELLLEVEL:2																																												SOURCEPAGE:p.143	BENEFIT:With sonic damage comes a concussive wave of energy that rattles creatures affected by the spell. A concussive spell causes creatures that take damage from a spell that has the sonic descriptor to take a -2 penalty on attack rolls, saving throws, skill checks, and ability checks for a number of rounds equal to the actual spell level of the spell. A concussive spell only affects spells with the sonic descriptor. A concussive spell uses up a spell slot two levels higher than the spell’s actual level.
+Create Reliquary Arms and Shields	TYPE:ItemCreation																													PREFEAT:1,Craft Magic Arms and Armor																						PRESPELL:1,Consecrate,Desecrate																																																		DESC:Your magical creations are infused with divine power.																																																																											SOURCEPAGE:p.148	BENEFIT:When you craft a magic weapon, magic armor, or magic shield, you may add one casting of consecrate or desecrate as part of the item crafting process. The item becomes a reliquary and can be used as a holy (or unholy) symbol divine focus of your deity. If you cast consecrate or desecrate, your reliquary counts as a permanent fixture for that spell while it remains in the spell’s area.
+Create Sanguine Elixir			TYPE:ItemCreation																							PRECLASS:1,Sorcerer=3			PREFEAT:1,Brew Potion																			PRESKILL:1,Craft (Alchemy)=12																																															PRESTAT:1,CHA=15								DESC:You can condense a fraction of your bloodline’s power into a powerful elixir.																																																																						SOURCEPAGE:p.148	BENEFIT:Once per day, when you clear your mind to regain spell slots, you can create a sanguine elixir. When you do, pick one of your bloodline powers. You transfer that power into a small potion that any creature can drink to temporarily gain the benefit of your bloodline power. Creating a sanguine elixir takes 1 hour, and requires special oils and distillates worth 100 gp, and when you make the sanguine elixir, you lose access to the bloodline power until the next time you clear your mind to regain spell slots. Sanguine elixirs are extremely unstable. They lose their potency 1 day after they are created.
+Defending Eidolon				TYPE:General	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Shield Ally																																																																																																				DESC:You have trained your eidolon to protect you.																																																																												SOURCEPAGE:p.148	BENEFIT:Whenever you are adjacent to your eidolon, you can choose for the eidolon to take a -1 penalty on melee attack rolls and combat maneuver checks to gain a +1 dodge bonus to your Armor Class. When your eidolon’s base attack bonus reaches +5, and for every +5 thereafter, the penalty increases by -1 and the dodge bonus increases by +1. You must choose to use this feat when your eidolon is making an attack or full-attack action with melee or natural weapons, and its effect lasts until your eidolon’s next turn, or until you are no longer adjacent to the eidolon, whichever occurs f irst.
+Deny Death											PREABILITY:1,CATEGORY=Special Ability,Ki Pool																		PREFEAT:1,Endurance																																																																																DESC:Your ki is so strong that it can deny death.																																																																												SOURCEPAGE:p.148	BENEFIT:As long as you have 1 ki point in your ki pool, when you fail your Constitution check to stabilize, you do not lose 1 hit point. If you succeed at the check, you can spend 1 ki point to heal 1d6 hit points. If you roll a natural 20 on the check to stabilize, you can spend 1 ki point to heal 2d6 hit points of damage instead.
+Detect Expertise				TYPE:General																																																									PRESPELL:1,Detect Chaos,Detect Evil,Detect Good, Detect Law,Datect Magic																																	PRESTAT:1,INT=13								DESC:You can detect the mystic specialty of a foe.																																																																												SOURCEPAGE:p.148	BENEFIT:When you use any of the spells listed in this feat’s prerequisites to detect a creature’s alignment or its magic, you have a chance of detecting what spellcasting expertise it has. After you observe a creature with the detect spell for 3 rounds, it must make a Will save (DC %1). If it fails the saving throw, you learn what bloodlines, domains, hexes, schools, or mysteries (if any) the creature possesses. If the creature makes its save, it is immune to the effects of this feat for 24 hours.|10+CASTERLEVEL+INT
+Die for Your Master			TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Tumor Familiar																																																																																																				DESC:Your tumor familiar goes to any length to save your life.																																																																										SOURCEPAGE:p.148	BENEFIT: If your tumor familiar is attached, and you would be reduced to 0 or fewer hit points by damage in combat (from a weapon or other blow, not a spell or special ability), the familiar throws itself in the way of the attack as an immediate action. If it makes a Ref lex saving throw (DC = damage dealt), it takes all the damage from the attack. If it fails, it takes half damage and you take half damage. The familiar must be aware of the attack and able to react to it in order to use this ability, and it can only do this once per day—if it is denied its Dexterity bonus to AC, it can’t use this ability. Since this effect would not normally allow the familiar to make a Ref lex save for half damage, its improved evasion ability does not apply on this saving throw.
+Divine Interference			TYPE:General																							PRECLASS:1,SPELLCASTER.Divine=10																																																																																				DESC:You can convert a spell to interfere with an enemy’s attack.																																																																									SOURCEPAGE:p.149	BENEFIT:As an immediate action, when an enemy within 30 feet hits an ally with an attack, you can sacrifice a prepared divine spell or (if you are a spontaneous caster) an unused spell slot and make the enemy reroll the attack roll. The second attack roll takes a penalty equal to the level of the spell you sacrifice. You must sacrifice a spell of 1st-level or higher to use this ability. Whether or not the second attack is successful, you cannot use this effect on the same creature again for 1 day.
+Dragonbane Aura				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Aura of Courage											PRECLASS:1,SPELLCASTER=8																																																																																					DESC:Those within your dragonbane aura gain the same protection that you do.																																																																								SOURCEPAGE:p.149	BENEFIT:When fighting dragons, your aura of courage expands to a 20-foot-radius emanation, and allies in the aura gain a morale bonus on saving throws against dragon breath equal to your aura of courage’s bonus against fear effects.
+Echoing Spell				TYPE:Metamagic																																																																																																																DESC:You have learned how to release most, but not all, of a spell’s potential when you cast it.																						ADDSPELLLEVEL:3																																												SOURCEPAGE:p.149	BENEFIT:When you cast an echoing spell, it does not disappear entirely from memory, and you can cast it one additional time during that day. If you prepare spells, this second casting does not require you to prepare it in another spell slot. If you spontaneously cast spells, this second casting does not expend another available spell slot. An echoing spell uses up a spe
 # TODO: how to select a bloodline power? Characters are not required to actually have the bloodline
 # TODO: how to  make a select option? The chooser must select only those bloodline for which the character has the appropriate Skill Focus
-Eldritch Heritage	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Sorcerer Bloodline	PREFEAT:1,Skill Focus	PRELEVEL:MIN=3	PRESTAT:1,CHA=13	DESC:You are descended from a long line of sorcerers, and some portion of their power f lows in your veins.	BENEFIT:Select one sorcerer bloodline. You must have Skill focus in the class skill that bloodline grants to a sorcerer at 1st level (for example, Heal for the celestial bloodline). This bloodline cannot be a bloodline you already have. You gain the first-level bloodline power for the selected bloodline. For purposes of using that power, treat your sorcerer level as equal to your character level -2, even if you have levels in sorcerer. You do not gain any of the other bloodline abilities.	SOURCEPAGE=p.149:
-Ensemble	TYPE:Teamwork	PRESKILL:1,TYPE.Perform=5	DESC:You can create an ensemble of skilled and amateur performers to aid you in your performance.	BENEFIT:When you are performing, allies within 20 feet who also have this feat can aid you with your Perform checks (including those made as part of bardic performance) as if they were aiding another as an immediate action. The allies make their aid another rolls before you make your check. No more than four allies can grant you a bonus with aid another. Allies aiding you do not need to use the same category of the Perform skill that you are using in order to aid you.	SOURCEPAGE=p.149:
-Evolved Familiar	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Arcane Bond ~ Familiar	PRESTAT:2,INT=13,CHA=13	DESC:Your familiar is different from others of its kind.	BENEFIT:Select an evolution from the list of 1-point evolutions available to a summoner’s eidolon. Your familiar has this evolution. The familiar must conform to any limitations of the evolution. For instance, no familiars can benefit from the mount evolution and only familiars with wings can take the wing buffet evolution. If you gain a new familiar, your old familiar loses all evolutions, and you can select a new 1-point evolution for the new familiar.	SOURCEPAGE=p.149:
-Exploit Lore	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Monster Lore ~ Inquisitor	PREATT:11	DESC:You can use your knowledge of a creature’s weaknesses to deliver a driving and relentless assault against it.	BENEFIT:Once per day, when you successfully identify all abilities and weaknesses of a creature using the appropriate Knowledge check, you gain a +2 bonus on attack and damage rolls against that creature for 1 minute. If you identify the abilities and weaknesses of numerous creatures, you must pick one creature to be the target of this effect.	SOURCEPAGE=p.149:
-Extra Arcana	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Magus Arcana ~ Magus	DESC:You have unlocked the secret of a new magus arcana.	STACK:YES	MULT:YES	CHOOSE:NOCHOICE	BONUS:ABILITYPOOL|Magus Arcana|1	BENEFIT:You gain one additional magus arcana. You must meet all the prerequisites for this magus arcana. Special - You can gain this feat multiple times.	SOURCEPAGE=p.149:
-Extra Arcane Pool	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Magus Arcana ~ Magus	DESC:You have learned how to draw more power from your arcane pool.	STACK:YES	MULT:YES	CHOOSE:NOCHOICE	BONUS:ABILITYPOOL|MagusArcanePool|2	BENEFIT:Your arcane pool increases by 2. Special - you can gain this feat multiple times.	SOURCEPAGE=p.150:
-Extended Bane	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Bane ~ Inquisitor	DESC:Your dedication knows no limit. Your wrath dies hard.	BONUS:ABILITYPOOL|InquisitorBanePool|MAX(0,WIS)	BENEFIT:Add your Wisdom bonus (+%1) to the number of rounds per day that you can use your bane ability.|MAX(0,WIS)	SOURCEPAGE=p.150:
+Eldritch Heritage				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Sorcerer Bloodline																PREFEAT:1,Skill Focus									PRELEVEL:MIN=3																																																											PRESTAT:1,CHA=13								DESC:You are descended from a long line of sorcerers, and some portion of their power f lows in your veins.																																																																						BENEFIT:Select one sorcerer bloodline. You must have Skill focus in the class skill that bloodline grants to a sorcerer at 1st level (for example, Heal for the celestial bloodline). This bloodline cannot be a bloodline you already have. You gain the first-level bloodline power for the selected bloodline. For purposes of using that power, treat your sorcerer level as equal to your character level -2, even if you have levels in sorcerer. You do not gain any of the other bloodline abilities.																																																																																																																																																																								SOURCEPAGE=p.149:
+Ensemble					TYPE:Teamwork																																																			PRESKILL:1,TYPE.Perform=5																																																									DESC:You can create an ensemble of skilled and amateur performers to aid you in your performance.																																																																							BENEFIT:When you are performing, allies within 20 feet who also have this feat can aid you with your Perform checks (including those made as part of bardic performance) as if they were aiding another as an immediate action. The allies make their aid another rolls before you make your check. No more than four allies can grant you a bonus with aid another. Allies aiding you do not need to use the same category of the Perform skill that you are using in order to aid you.																																																																																																																																																																												SOURCEPAGE=p.149:
+Evolved Familiar				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Arcane Bond ~ Familiar																																																																																								PRESTAT:2,INT=13,CHA=13							DESC:Your familiar is different from others of its kind.																																																																														BENEFIT:Select an evolution from the list of 1-point evolutions available to a summoner’s eidolon. Your familiar has this evolution. The familiar must conform to any limitations of the evolution. For instance, no familiars can benefit from the mount evolution and only familiars with wings can take the wing buffet evolution. If you gain a new familiar, your old familiar loses all evolutions, and you can select a new 1-point evolution for the new familiar.																																																																																																																																																																														SOURCEPAGE=p.149:
+Exploit Lore				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Monster Lore ~ Inquisitor							PREATT:11																																																																																										DESC:You can use your knowledge of a creature’s weaknesses to deliver a driving and relentless assault against it.																																																																				BENEFIT:Once per day, when you successfully identify all abilities and weaknesses of a creature using the appropriate Knowledge check, you gain a +2 bonus on attack and damage rolls against that creature for 1 minute. If you identify the abilities and weaknesses of numerous creatures, you must pick one creature to be the target of this effect.																																																																																																																																																																																																	SOURCEPAGE=p.149:
+Extra Arcana				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Magus Arcana ~ Magus																																																																																																			DESC:You have unlocked the secret of a new magus arcana.															STACK:YES	MULT:YES	CHOOSE:NOCHOICE											BONUS:ABILITYPOOL|Magus Arcana|1																																									BENEFIT:You gain one additional magus arcana. You must meet all the prerequisites for this magus arcana. Special - You can gain this feat multiple times.																																																																																																																																																																																																																																	SOURCEPAGE=p.149:
+Extra Arcane Pool				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Magus Arcana ~ Magus																																																																																																			DESC:You have learned how to draw more power from your arcane pool.													STACK:YES	MULT:YES	CHOOSE:NOCHOICE											BONUS:ABILITYPOOL|MagusArcanePool|2																																									BENEFIT:Your arcane pool increases by 2. Special - you can gain this feat multiple times.																																																																																																																																																																																																																																															SOURCEPAGE=p.150:
+Extended Bane				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Bane ~ Inquisitor																																																																																																			DESC:Your dedication knows no limit. Your wrath dies hard.																																BONUS:ABILITYPOOL|InquisitorBanePool|MAX(0,WIS)																																							BENEFIT:Add your Wisdom bonus (+%1) to the number of rounds per day that you can use your bane ability.|MAX(0,WIS)																																																																																																																																																																																																																																										SOURCEPAGE=p.150:
 # TODO: How to select Cantrips or Orisons? How to add to the Cantrips or Orisons spells known? This feat is broken. Wizards have no cantrips known, just number of spells in spellbook?
-Extra Cantrips or Orisons	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,TYPE.CantripsOrisons	SOURCEPAGE=p.150:
+Extra Cantrips or Orisons		TYPE:General				PREABILITY:1,CATEGORY=Special Ability,TYPE.CantripsOrisons																																																																																																																																																																																																																																																																																																																																																																																																																																																							SOURCEPAGE=p.150:
 # TODO: How to add to the Evolution pool?
-Extra Evolution	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Eidolon	STACK:YES	MULT:YES	SOURCEPAGE=p.150:
+Extra Evolution				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Eidolon																																																																																																																													STACK:YES	MULT:YES																																																																																																																																																																																																																																																																																																																									SOURCEPAGE=p.150:
 # TODO: How to add to the Ranger Trap pool?
-Extra Ranger Trap	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Trap ~ Ranger
+Extra Ranger Trap				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Trap ~ Ranger
 # TODO: How to add to the Summon pool?
-Extra Summons	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Summon Monster ~ Summoner
-Eyes of Judgment	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Detect Alignment ~ Inquisitor	PRECLASS:1,SPELLCASTER=6	DESC:The true motives of creatures cannot escape your discerning gaze.	SOURCEPAGE:p.150	BENEFIT:When using your detect alignment class feature, you may spend 3 rounds studying a creature within 60 feet. You cannot take any other actions while doing this. After that time has passed, you learn the alignment of the creature.
-Fast Empathy	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Wild Empathy	PRESKILL:1,Handle Animal=5	DESC:Your empathic attunement to nature connects you swiftly with bestial minds.	SOURCEPAGE:p.150	BENEFIT:Using wild empathy is a standard action for you.
+Extra Summons				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Summon Monster ~ Summoner
+Eyes of Judgment				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Detect Alignment ~ Inquisitor								PRECLASS:1,SPELLCASTER=6																																																																																					DESC:The true motives of creatures cannot escape your discerning gaze.																																																																									SOURCEPAGE:p.150	BENEFIT:When using your detect alignment class feature, you may spend 3 rounds studying a creature within 60 feet. You cannot take any other actions while doing this. After that time has passed, you learn the alignment of the creature.
+Fast Empathy				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Wild Empathy																																							PRESKILL:1,Handle Animal=5																																																									DESC:Your empathic attunement to nature connects you swiftly with bestial minds.																																																																							SOURCEPAGE:p.150	BENEFIT:Using wild empathy is a standard action for you.
 # TODO: how to make the user choose a favored enemy from the list?
-Favored Judgment	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Judgment ~ Inquisitor	PRESTAT:1,WIS=13	DESC:Your judgment against a particular type of creature is particularly harsh.	MULT:YES	SOURCEPAGE:p.150	BENEFIT:Select a favored race from the ranger’s favored enemies chart. Any sacred or profane bonus you gain from a judgment is 1 higher for attacks you make against or take from creatures that match the selected favored enemy.
-Fearless Aura	TYPE:General	PREABILITY:1,CATEGORY=Special Ability,Aura of Courage	PRECLASS:1,SPELLCASTER=8	DESC:Your aura of courage becomes more potent, as your steadfast resolve is also manifested by your allies.	SOURCEPAGE:p.150	BENEFIT:Your aura of courage expands to a 20-footradius emanation. Allies within the aura are immune to fear effects.
+Favored Judgment				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Judgment ~ Inquisitor																																																																																									PRESTAT:1,WIS=13								DESC:Your judgment against a particular type of creature is particularly harsh.													MULT:YES																																																									SOURCEPAGE:p.150	BENEFIT:Select a favored race from the ranger’s favored enemies chart. Any sacred or profane bonus you gain from a judgment is 1 higher for attacks you make against or take from creatures that match the selected favored enemy.
+Fearless Aura				TYPE:General				PREABILITY:1,CATEGORY=Special Ability,Aura of Courage											PRECLASS:1,SPELLCASTER=8																																																																																					DESC:Your aura of courage becomes more potent, as your steadfast resolve is also manifested by your allies.																																																																			SOURCEPAGE:p.150	BENEFIT:Your aura of courage expands to a 20-footradius emanation. Allies within the aura are immune to fear effects.
 # TODO: prereq ability to cast bard spells, ability to cast an arcane fire spell from some other spellcasting class.
-Fire Music	TYPE:General	PRESKILL:1,Spellcraft=5	DESC:Your ability to command fire and bardic music has created a strange blend of both magics.	SOURCEPAGE:p.151	BENEFIT:When you cast a bard spell that deals damage, you may replace the spell’s normal damage with fire damage or split the spell’s damage so that half of it is the normal damage type and half is fire damage.	BENEFIT:If you cast a summon monster spell as a bard spell, you may choose to give the summoned creature a fiery appearance, which gives it fire resistance 5 and adds +1 fire damage to all of its natural attacks. The creature sheds dim light in a 5-foot radius. This aspect of the feat has no effect if the creature already has the fire subtype.	BENEFIT:When you use this feat, the affected spell gains the fire descriptor.
-Flaring Spell	TYPE:Metamagic	DESC:You dazzle creatures when you affect them with a spell that has the fire, light, or electricity descriptor.	ADDSPELLLEVEL:1	SOURCEPAGE:p.151	BENEFIT:The electricity, fire, or light effects of the affected spell create a f laring that dazzles creatures that take damage from the spell. A f lare spell causes a creature that takes fire or electricity damage from the affected spell to become dazzled for a number of rounds equal to the actual level of the spell. A f laring spell only affects spells with a fire, light, or electricity descriptor. A f laring spell uses up a spell slot one level higher than the spell’s actual level.
-Focused Eidolon	TYPE:General	PREABILITY:1,CATEGORY:Special Ability,Shield Ally	DESC:Your bond with your eidolon helps to focus your concentration.	SOURCEPAGE:p.151	BENEFIT:While you are adjacent to your eidolon, you receive a +4 bonus on concentration checks.
-Gliding Steps	TYPE:General	PREABILITY:1,CATEGORY:Special Ability,Ki Pool	PREFEAT:1,Dodge	PREFEAT:1,Mobility	PREFEAT:1,Nimble Moves	DESC:You skate across the surface of the earth as if gliding on ice.	SOURCEPAGE:p.151	BENEFIT:If you have at least one ki in your ki pool, when you move you do not provoke attacks of opportunity when leaving the first square of that movement. You can spend 1 ki point to avoid provoking attacks of opportunity during that entire move.
-Grant Initiative	TYPE:General	PREABILITY:1,CATEGORY:Special Ability,Cunning Initiative ~ Inquisitor	DESC:Not only are you a master at taking the initiative, but you can also grant it to someone else.	SOURCEPAGE:p.151	BENEFIT:At the start of each encounter, you can either choose to keep the bonus granted to you by your Wisdom modifier on initiative checks or choose to give that bonus to one of your allies that you can see. You must make this choice before you or the ally you are granting the bonus to makes the initiative check.
-Greater Blighted Critical	TYPE:Critical	PRECLASS:1,SPELLCASTER=12	PREFEAT:1,Blighted Critical	PREFEAT:1,Critical Focus	DESC:Your critical hit from a spell or spell-like ability aff licts the target with a major spellblight.	SOURCEPAGE:p.151	BENEFIT:Whenever you confirm a critical hit with a touch spell, ranged touch spell, or spell-like ability against an opponent, the victim gains a random major spellblight (see page 96 of Ultimate Magic).	BENEFIT:Special - You can only apply the effects of one critical feat to a given critical hit unless you possess Critical Mastery.
+Fire Music					TYPE:General																																																			PRESKILL:1,Spellcraft=5																																																										DESC:Your ability to command fire and bardic music has created a strange blend of both magics.																																																																					SOURCEPAGE:p.151	BENEFIT:When you cast a bard spell that deals damage, you may replace the spell’s normal damage with fire damage or split the spell’s damage so that half of it is the normal damage type and half is fire damage.	BENEFIT:If you cast a summon monster spell as a bard spell, you may choose to give the summoned creature a fiery appearance, which gives it fire resistance 5 and adds +1 fire damage to all of its natural attacks. The creature sheds dim light in a 5-foot radius. This aspect of the feat has no effect if the creature already has the fire subtype.	BENEFIT:When you use this feat, the affected spell gains the fire descriptor.
+Flaring Spell				TYPE:Metamagic																																																																																																																DESC:You dazzle creatures when you affect them with a spell that has the fire, light, or electricity descriptor.																				ADDSPELLLEVEL:1																																												SOURCEPAGE:p.151	BENEFIT:The electricity, fire, or light effects of the affected spell create a f laring that dazzles creatures that take damage from the spell. A f lare spell causes a creature that takes fire or electricity damage from the affected spell to become dazzled for a number of rounds equal to the actual level of the spell. A f laring spell only affects spells with a fire, light, or electricity descriptor. A f laring spell uses up a spell slot one level higher than the spell’s actual level.
+Focused Eidolon				TYPE:General				PREABILITY:1,CATEGORY:Special Ability,Shield Ally																																																																																																				DESC:Your bond with your eidolon helps to focus your concentration.																																																																									SOURCEPAGE:p.151	BENEFIT:While you are adjacent to your eidolon, you receive a +4 bonus on concentration checks.
+Gliding Steps				TYPE:General				PREABILITY:1,CATEGORY:Special Ability,Ki Pool																		PREFEAT:1,Dodge	PREFEAT:1,Mobility	PREFEAT:1,Nimble Moves																																																																									DESC:You skate across the surface of the earth as if gliding on ice.																																																																									SOURCEPAGE:p.151	BENEFIT:If you have at least one ki in your ki pool, when you move you do not provoke attacks of opportunity when leaving the first square of that movement. You can spend 1 ki point to avoid provoking attacks of opportunity during that entire move.
+Grant Initiative				TYPE:General				PREABILITY:1,CATEGORY:Special Ability,Cunning Initiative ~ Inquisitor																																																																																																	DESC:Not only are you a master at taking the initiative, but you can also grant it to someone else.																																																																				SOURCEPAGE:p.151	BENEFIT:At the start of each encounter, you can either choose to keep the bonus granted to you by your Wisdom modifier on initiative checks or choose to give that bonus to one of your allies that you can see. You must make this choice before you or the ally you are granting the bonus to makes the initiative check.
+Greater Blighted Critical		TYPE:Critical																							PRECLASS:1,SPELLCASTER=12		PREFEAT:1,Blighted Critical	PREFEAT:1,Critical Focus																																																																										DESC:Your critical hit from a spell or spell-like ability aff licts the target with a major spellblight.																																																																			SOURCEPAGE:p.151	BENEFIT:Whenever you confirm a critical hit with a touch spell, ranged touch spell, or spell-like ability against an opponent, the victim gains a random major spellblight (see page 96 of Ultimate Magic).	BENEFIT:Special - You can only apply the effects of one critical feat to a given critical hit unless you possess Critical Mastery.
 # TODO: how to select a bloodline power? Characters are not required to actually have the bloodline
-Greater Eldritch Heritage	TYPE:General	PREFEAT:1,Eldritch Heritage	PREFEAT:1,Improved Eldritch Heritage	PRELEVEL:MIN=17	PRESTAT:1,CHA=17	DESC:Your discovered bloodline power reaches its zenith.	SOURCEPAGE:p.152	BENEFIT:You gain an additional power from the bloodline you selected with the Eldritch Heritage feat. You gain a 15th-level (or lower) sorcerer bloodline power that you do not already have. For purposes of using that power, treat your character level as your sorcerer level for all your sorcerer bloodline powers granted by this feat, Eldritch Heritage, and Improved Eldritch Heritage.
-Greater Mercy	TYPE:General	PREABILITY:1,CATEGORY:Special Ability,Lay on Hands	PREABILITY:1,CATEGORY:Special Ability,Mercy	PRESTAT:1,CHA=13	DESC:Your mercy has incredible recuperative properties.	SOURCEPAGE:p.152	BENEFIT:When you use your lay on hands ability and the target of that ability does not have any conditions your mercies can remove, it instead heals an additional +1d6 points of damage.
+Greater Eldritch Heritage		TYPE:General																													PREFEAT:1,Eldritch Heritage	PREFEAT:1,Improved Eldritch Heritage	PRELEVEL:MIN=17																																																											PRESTAT:1,CHA=17								DESC:Your discovered bloodline power reaches its zenith.																																																																											SOURCEPAGE:p.152	BENEFIT:You gain an additional power from the bloodline you selected with the Eldritch Heritage feat. You gain a 15th-level (or lower) sorcerer bloodline power that you do not already have. For purposes of using that power, treat your character level as your sorcerer level for all your sorcerer bloodline powers granted by this feat, Eldritch Heritage, and Improved Eldritch Heritage.
+Greater Mercy				TYPE:General				PREABILITY:1,CATEGORY:Special Ability,Lay on Hands	PREABILITY:1,CATEGORY:Special Ability,Mercy																																																																																		PRESTAT:1,CHA=13								DESC:Your mercy has incredible recuperative properties.																																																																											SOURCEPAGE:p.152	BENEFIT:When you use your lay on hands ability and the target of that ability does not have any conditions your mercies can remove, it instead heals an additional +1d6 points of damage.
 # TODO: should depend on the ability to PREPARE spells, not on the ability to CAST them
-Greater Spell Specialization	TYPE:General	PREFEAT:1,Spell Focus	PREFEAT:1,Spell Specialization	PRESPELLTYPE:1,Arcane=5,Divine=5	PRESTAT:1,INT=13	DESC:You can sacrifice a prepared spell in order to spontaneously cast your specialized spell.	SOURCEPAGE:p.152	BENEFIT:By sacrificing a prepared spell of the same or higher level than your specialized spell, you may spontaneously cast your specialized spell. The specialized spell is treated as its normal level, regardless of the spell slot used to cast it. You may add a metamagic feat to the spell by increasing the spell slot and casting time, just like a cleric spontaneously casting a cure or inf lict spell with a metamagic feat.
+Greater Spell Specialization		TYPE:General																													PREFEAT:1,Spell Focus	PREFEAT:1,Spell Specialization																																																										PRESPELLTYPE:1,Arcane=5,Divine=5	PRESTAT:1,INT=13								DESC:You can sacrifice a prepared spell in order to spontaneously cast your specialized spell.																																																																					SOURCEPAGE:p.152	BENEFIT:By sacrificing a prepared spell of the same or higher level than your specialized spell, you may spontaneously cast your specialized spell. The specialized spell is treated as its normal level, regardless of the spell slot used to cast it. You may add a metamagic feat to the spell by increasing the spell slot and casting time, just like a cleric spontaneously casting a cure or inf lict spell with a metamagic feat.
 # TODO: should check if the chooser works
-Greater Wild Empathy	TYPE:General	PREABILITY:1,CATEGORY:Special Ability,Wild Empathy	PRESKILL:1,Knowledge (Nature)=5	STACK:NO	MULT:YES	CHOOSE:STRING|Elementals|Fey|Lycanthropes|Plants|Vermin	SOURCEPAGE:p.152	BENEFIT:You gain a +2 insight bonus on wild empathy checks, and you may use wild empathy to duplicate an Intimidate check rather than a Diplomacy check. In addition, choose one of the following creature types: elementals, fey, lycanthropes, plants, or vermin. You may inf luence creatures of that type with wild empathy, if their Intelligence score is 1 or 2. Once you choose the type of creature, it cannot be changed.	BENEFIT:Special - You may select this feat more than once. Each time, you may choose an additional creature type to influence.
-Implant Bomb	TYPE:General	DESC:You can attach a bomb to a creature that explodes when the creature dies or after 24 hours.	SOURCEPAGE:p.152	BENEFIT:You may implant a bomb in a willing or helpless creature (a mindless creature under your control, such as a zombie, counts as willing for this purpose). This takes 1 hour and expends 1 use of your bomb ability for the day. When the implanted creature dies or is destroyed, the bomb detonates in the creature’s square as if it were a delayed bomb set by you (though you can set the bomb’s damage to less than your normal bomb damage). You can use any bomb-affecting discoveries on this implanted bomb (acid bomb, frost bomb, smoke bomb, and so on) as normal. The bomb automatically detonates 24 hours after you implant it in the creature.	BENEFIT:If you expend 150 gp worth of alchemical reagents per die of the bomb’s damage (for example, 750 gp for a 5d6 bomb), the bomb does not automatically detonate after 24 hours, and only detonates if the creature dies or is destroyed (24 hours after implantation, this bomb no longer counts toward your daily total).	BENEFIT:Implanting a bomb is as invasive as using the Heal skill to treat deadly wounds and leaves surgical scars unless the creature is healed by magic or abilities such as regeneration or fast healing. Some creatures (such as oozes, elementals, and creatures with the incorporeal quality) cannot have bombs implanted in them. Removing an implanted bomb requires a Heal check to treat deadly wounds, followed by a dispel magic spell or Disable Device check to neutralize the bomb (DC %1).|11 + classlevel("Alchemist")
+Greater Wild Empathy			TYPE:General				PREABILITY:1,CATEGORY:Special Ability,Wild Empathy																																							PRESKILL:1,Knowledge (Nature)=5																																																																																STACK:NO	MULT:YES	CHOOSE:STRING|Elementals|Fey|Lycanthropes|Plants|Vermin																																															SOURCEPAGE:p.152	BENEFIT:You gain a +2 insight bonus on wild empathy checks, and you may use wild empathy to duplicate an Intimidate check rather than a Diplomacy check. In addition, choose one of the following creature types: elementals, fey, lycanthropes, plants, or vermin. You may inf luence creatures of that type with wild empathy, if their Intelligence score is 1 or 2. Once you choose the type of creature, it cannot be changed.	BENEFIT:Special - You may select this feat more than once. Each time, you may choose an additional creature type to influence.
+Implant Bomb				TYPE:General																																																																																																																DESC:You can attach a bomb to a creature that explodes when the creature dies or after 24 hours.																																																																				SOURCEPAGE:p.152	BENEFIT:You may implant a bomb in a willing or helpless creature (a mindless creature under your control, such as a zombie, counts as willing for this purpose). This takes 1 hour and expends 1 use of your bomb ability for the day. When the implanted creature dies or is destroyed, the bomb detonates in the creature’s square as if it were a delayed bomb set by you (though you can set the bomb’s damage to less than your normal bomb damage). You can use any bomb-affecting discoveries on this implanted bomb (acid bomb, frost bomb, smoke bomb, and so on) as normal. The bomb automatically detonates 24 hours after you implant it in the creature.	BENEFIT:If you expend 150 gp worth of alchemical reagents per die of the bomb’s damage (for example, 750 gp for a 5d6 bomb), the bomb does not automatically detonate after 24 hours, and only detonates if the creature dies or is destroyed (24 hours after implantation, this bomb no longer counts toward your daily total).	BENEFIT:Implanting a bomb is as invasive as using the Heal skill to treat deadly wounds and leaves surgical scars unless the creature is healed by magic or abilities such as regeneration or fast healing. Some creatures (such as oozes, elementals, and creatures with the incorporeal quality) cannot have bombs implanted in them. Re...
 
[truncated message content]

[pcgen-commit-svn] SF.net SVN: pcgen:[15055] Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ advanced_players_guide/pfapg_abilities_archetypes.lst

[<pap...@us...>]

Revision: 15055
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15055&view=rev
Author:   papa_drb
Date:     2011-05-29 15:32:39 +0000 (Sun, 29 May 2011)

Log Message:
-----------
Restorative Touch power from Restoration subdomain. Change "3 + wisdom modifier" to actual number "%1 times per day|3+WIS"
Issue#: NEWSOURCE-32

Modified Paths:
--------------
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_archetypes.lst

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_archetypes.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_archetypes.lst	2011-05-29 15:19:36 UTC (rev 15054)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_archetypes.lst	2011-05-29 15:32:39 UTC (rev 15055)
@@ -306,7 +306,7 @@
 Purifying Touch			KEY:Purifying Touch ~ Purity Subdomain			CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural	DESC:At 8th level, you can touch a willing creature with divine power, giving it a saving throw against each effect currently affecting it, using the original saving throw DC of the effect. Each successful saving throw ends the related effect. The creature can choose not to make a save against an effect. You can use this ability once per day at 8th level, plus one additional time per day at 14th and 20th level.																																																															SOURCEPAGE:p.94
 Rage					KEY:Rage ~ Rage Subdomain					CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural	DESC:At 8th level, you can enter a fearsome rage, like a barbarian, for a number of rounds per day equal to your cleric level. At 12th and 16th level, you can select one rage power. You cannot select any rage power that possesses a level requirement, but otherwise your barbarian level is equal to 1/2 your cleric level. These rounds of rage stack with any rounds of rage you might have from levels of barbarian.																																																																SOURCEPAGE:p.95
 Bestow Resolve			KEY:Bestow Resolve ~ Resolve Subdomain			CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural	DESC:At 8th level, you can bless creatures with the boldness of your deity. You can bestow a number of temporary hit points equal to your level + your Wisdom modifier to all allies within 20 feet. The temporary hit points remain for 1 minute. You can use this ability once per day at 8th level, plus one additional time per day for every 4 levels you possess beyond 8th.																																																																							SOURCEPAGE:p.95
-Restorative Touch			KEY:Restorative Touch ~ Restoriation Subdomain		CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural	DESC:You can touch a creature, letting the healing power of your deity from through you to relieve the creature of a minor condition. Your touch can remove the dazed, fatigued, shaken, sickened, or staggered condition. You choose which condition is removed. You can use this ability a number of times per day equal to 3 + your Wisdom modifier.																																																																											SOURCEPAGE:p.95
+Restorative Touch			KEY:Restorative Touch ~ Restoriation Subdomain		CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural	DESC:You can touch a creature, letting the healing power of your deity from through you to relieve the creature of a minor condition. Your touch can remove the dazed, fatigued, shaken, sickened, or staggered condition. You choose which condition is removed. You can use this ability %1 times per day.|3+WIS																																																																											SOURCEPAGE:p.95
 Gift of Life			KEY:Gift of Life ~ Resurrection Subdomain			CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural	DESC:At 8th level, you can touch a creature that has died within the past minute to grant it a few moments of life. The dead creature returns to life for a number of rounds equal to your cleric level. Creatures returned to life in this way have a number of hit points equal to half your cleric level, and continue to be affected by any still-active spells, conditions, or afflications present at the time of their death. At the end of this time, the creature dies again. The creature is free to act as it sees fit during this time. You are granted no control over it. You can use this power once per day at 8th level, plus one additional time per day for every four levels beyond 8th.																		SOURCEPAGE:p.96
 Powerful Persuader		KEY:Powerful Persuader ~ Revolution Subdomain		CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural	DESC:At 8th level, when you make a Diplomacy or Intimidate check, you can roll twice and take the higher result. Using this ability is a free action. You can use this ability once per day at 8th level, plus one additional time per day for every 2 levels beyond 8th.																																																																																								SOURCEPAGE:p.96
 Untouched by the Seasons	KEY:Untouched by the Seasons ~ Seasons Subdomain	CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural	DESC:By touching a creature, you can grant it the benefits of endure elements, which last for 1 hour per cleric level. You can use this ability a number of times per day equal to 3 + your Wisdom modifier.																																																																																																		SOURCEPAGE:p.96


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15054] Trunk/pcgen/code/src/java/plugin/pretokens/parser

[<nu...@us...>]

Revision: 15054
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15054&view=rev
Author:   nuance
Date:     2011-05-29 15:19:36 +0000 (Sun, 29 May 2011)

Log Message:
-----------
CheckStyle updates

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAbilityParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAgeSetParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAlignParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreApplyParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreArmorProfParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreArmorTypeParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAttackParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreBaseSizeParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreBirthplaceParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCSkillParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCampaignParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCheckParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCityParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreClassLevelMaxParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreClassParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDamageReductionParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityAlignParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityDomainParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDomainParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipBothParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipPrimaryParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipSecondaryParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipTwoWeaponParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreFeatParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreGenderParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHDParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHPParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHandsParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreItemParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreLanguageParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreLegsParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreLevelMaxParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreLevelParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreMoveParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PrePCLevelParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PrePointBuyMethodParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreRaceParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreReachParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreRegionParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreRuleParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreShieldProfParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSizeParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSkillParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSkillTotalParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSpecialAbilityParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSpellBookParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSpellCastParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSpellDescriptorParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSpellParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSpellResistanceParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSpellSchoolParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSpellSchoolSubParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSpellTypeParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreStatParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreSubClassParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreTemplateParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreTextParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreTypeParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreUnarmedAttackParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreVariableParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreVisionParser.java
    Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreWeaponProfParser.java

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAbilityParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAbilityParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAbilityParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -36,13 +36,8 @@
 import pcgen.util.PropertyFactory;
 
 /**
- * <code>PreAbilityParser</code> parses PREABILITY prerequisite tokens.
+ * A prerequisite parser class that handles the parsing of pre ability tokens.
  *
- * Last Editor: $Author: jdempsey $
- * Last Edited: $Date: 2006-12-17 15:36:01 +1100 (Sun, 17 Dec 2006) $
- *
- * @author James Dempsey <jde...@us...>
- * @version $Revision: 1777 $
  */
 public class PreAbilityParser extends AbstractPrerequisiteListParser implements
 		PrerequisiteParserInterface
@@ -59,7 +54,8 @@
 	}
 
 	/**
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#kindsHandled()
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{
@@ -67,15 +63,24 @@
 	}
 
 	/**
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#parse(java.lang.String, java.lang.String, boolean, boolean)
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 		prereq.setOriginalCheckmult(formula.indexOf(",CHECKMULT,") != -1);
 
 		// Extract category

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAgeSetParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAgeSetParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAgeSetParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -31,29 +31,42 @@
 import pcgen.util.Logging;
 
 /**
- * @author perchrh
+ * A prerequisite parser class that handles the parsing of pre age set tokens.
  *
  */
 public class PreAgeSetParser extends AbstractPrerequisiteListParser
 implements PrerequisiteParserInterface
 {
 
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled() {
 		return new String[]{"AGESET", "AGESETEQ", "AGESETGT", "AGESETGTEQ", "AGESETLT", 
 				"AGESETLTEQ", "AGESETNEQ"}; //$NON-NLS-1$
 	}
 
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrereqParserInterface#parse(java.lang.String)
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-			boolean invertResult, boolean overrideQualify)
-	throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
 		
-		Prerequisite prereq =
-			super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 
 		//Operand should be either an integer or a recognizable String
 		try{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAlignParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAlignParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAlignParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -37,30 +37,40 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre align tokens.
  *
  */
 public class PreAlignParser extends AbstractPrerequisiteParser implements
 		PrerequisiteParserInterface
 {
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrereqParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"align"};
 	}
 
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrereqParserInterface#parse(java.lang.String)
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 		String[] alignments = formula.split(",");
 
 		final GameMode gm = SettingsHandler.getGame();

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreApplyParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreApplyParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreApplyParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -31,27 +31,37 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre apply tokens.
  *
  */
 public class PreApplyParser extends AbstractPrerequisiteParser implements
 		PrerequisiteParserInterface
 {
-
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrereqParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"APPLY"};
 	}
 
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrereqParserInterface#parse(java.lang.String)
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify)
 	{
 
 		String[] andTokens = formula.split(",");

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreArmorProfParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreArmorProfParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreArmorProfParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,15 +32,16 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre armourprof tokens.
  *
  */
 public class PreArmorProfParser extends AbstractPrerequisiteListParser
 		implements PrerequisiteParserInterface
 {
 
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrereqParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreArmorTypeParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreArmorTypeParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreArmorTypeParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,15 +32,15 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre armour tokens.
  *
  */
 public class PreArmorTypeParser extends AbstractPrerequisiteListParser
 		implements PrerequisiteParserInterface
 {
-
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrereqParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAttackParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAttackParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreAttackParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -35,30 +35,40 @@
 import pcgen.util.Logging;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre attack tokens.
  *
  */
 public class PreAttackParser extends AbstractPrerequisiteParser implements
 		PrerequisiteParserInterface
 {
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrereqParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"ATT"};
 	}
 
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrereqParserInterface#parse(java.lang.String, java.lang.String, boolean)
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 
 		try
 		{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreBaseSizeParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreBaseSizeParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreBaseSizeParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -35,14 +35,15 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre base size tokens.
  *
  */
 public class PreBaseSizeParser extends AbstractPrerequisiteParser implements
 		PrerequisiteParserInterface
 {
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{
@@ -50,16 +51,25 @@
 			"BASESIZEGTEQ", "BASESIZELT", "BASESIZELTEQ", "BASESIZENEQ"};
 	}
 
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#parse(java.lang.String, java.lang.String, boolean)
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 		try
 		{
 			prereq.setKind("basesize");

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreBirthplaceParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreBirthplaceParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreBirthplaceParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -35,24 +35,40 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre birthplace tokens.
  *
  */
 public class PreBirthplaceParser extends AbstractPrerequisiteParser implements
 		PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"BIRTHPLACE"};
 	}
 
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
+	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 		prereq.setKey(formula);
 		prereq.setOperator(PrerequisiteOperator.EQ);
 

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCSkillParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCSkillParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCSkillParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -27,27 +27,40 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author arknight
+ * A prerequisite parser class that handles the parsing of pre CSkill tokens.
  *
  */
 public class PreCSkillParser extends AbstractPrerequisiteListParser implements
 		PrerequisiteParserInterface
 {
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"CSKILL"};
 	}
 
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
+	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 
 		// Convert all of the key="feat (subfeat)" to key="feat" subkey="subfeat"
 		convertKeysToSubKeys(prereq, "skill");

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCampaignParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCampaignParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCampaignParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -28,21 +28,15 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * The Class <code>PreCampaignParser</code> is responsible for 
- * parsing a PRECAMPAIGN tag and generating a Prerequisite object 
- * based on that tag.
- * 
- * Last Editor: $Author: $
- * Last Edited: $Date:  $
- * 
- * @author James Dempsey <jde...@us...>
- * @version $Revision:  $
+ * A prerequisite parser class that handles the parsing of pre CAMPAIGN tokens.
+ *
  */
 public class PreCampaignParser extends AbstractPrerequisiteListParser implements
 		PrerequisiteParserInterface
 {
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{
@@ -52,21 +46,23 @@
 	/**
 	 * Parse the pre req list
 	 * 
-	 * @param kind 
-	 * @param formula 
-	 * @param invertResult 
-	 * @param overrideQualify 
-	 * @return PreReq 
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
 	 * @throws PersistenceLayerException 
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
 
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 		setNoNeedForChar(prereq);
 
 		//

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCheckParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCheckParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCheckParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,14 +32,15 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre check tokens.
  *
  */
 public class PreCheckParser extends AbstractPrerequisiteListParser implements
 		PrerequisiteParserInterface
 {
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCityParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCityParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreCityParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,15 +32,15 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre city tokens.
  *
  */
 public class PreCityParser extends AbstractPrerequisiteSimpleParser implements
 		PrerequisiteParserInterface
 {
-
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreClassLevelMaxParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreClassLevelMaxParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreClassLevelMaxParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -35,35 +35,48 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre class level max tokens.
  *
  */
 public class PreClassLevelMaxParser extends AbstractPrerequisiteListParser
 		implements PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"CLASSLEVELMAX"};
 	}
 
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#parse(java.lang.String, java.lang.String, boolean)
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 
-		// ClassLevelMax is basically the inverse of class
-		//
-		// PRECLASSLEVELMAX:Barbarian=1					-> !PRECLASS:Barbarian=2
-		// !PRECLASSLEVELMAX:Barbarian=1				-> PRECLASS:Barbarian=2
-		// PRECLASSLEVELMAX:Fighter=1,SPELLCASTER=2		-> PREMULT:2,[!PRECLASS:Fighter=2],[!PRECLASS:SPELLCASTER=3]
-		// PRECLASSLEVELMAX:Fighter,SPELLCASTER=2		-> PREMULT:2,[!PRECLASS:Fighter=3],[!PRECLASS:SPELLCASTER=3]
-		//
+	// ClassLevelMax is basically the inverse of class
+	//
+	// PRECLASSLEVELMAX:Barbarian=1			!PRECLASS:Barbarian=2
+	// !PRECLASSLEVELMAX:Barbarian=1		PRECLASS:Barbarian=2
+	// PRECLASSLEVELMAX:Fighter=1,SPELLCASTER=2	PREMULT:2,[!PRECLASS:Fighter=2],[!PRECLASS:SPELLCASTER=3]
+	// PRECLASSLEVELMAX:Fighter,SPELLCASTER=2	PREMULT:2,[!PRECLASS:Fighter=3],[!PRECLASS:SPELLCASTER=3]
+	//
 
 		changeFromLevelMax(prereq);
 		if (invertResult)
@@ -75,7 +88,7 @@
 	}
 
 	//
-	// Change all occurances of PRECLASSLEVELMAX to PRECLASS
+	// Change all occurrences of PRECLASSLEVELMAX to PRECLASS
 	//
 	private void changeFromLevelMax(Prerequisite p)
 	{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreClassParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreClassParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreClassParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,9 +32,8 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * PRECLASS Parser
- * 
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre class tokens.
+ *
  */
 public class PreClassParser extends AbstractPrerequisiteListParser implements
 		PrerequisiteParserInterface

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDamageReductionParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDamageReductionParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDamageReductionParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -37,28 +37,43 @@
 import java.util.StringTokenizer;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre damage reduction tokens.
  *
  */
 public class PreDamageReductionParser extends AbstractPrerequisiteParser
 		implements PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"DR"};
 	}
 
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
+	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 		prereq.setKind(null); // PREMULT
 
-		final StringTokenizer inputTokenizer =
-				new StringTokenizer(formula, ",");
+		final StringTokenizer inputTokenizer = new StringTokenizer(formula, ",");
 
 		// the number of DRs which must match
 		String tok = inputTokenizer.nextToken();
@@ -76,8 +91,7 @@
 		// Parse all of the tokens in the input list
 		while (inputTokenizer.hasMoreTokens())
 		{
-			final StringTokenizer inputDRTokenizer =
-					new StringTokenizer(inputTokenizer.nextToken(), "=.");
+			final StringTokenizer inputDRTokenizer = new StringTokenizer(inputTokenizer.nextToken(), "=.");
 			final String drType = inputDRTokenizer.nextToken(); // either Good.10 or Good=10
 			final int drValue;
 

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityAlignParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityAlignParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityAlignParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -39,31 +39,43 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre deity align tokens.
  *
  */
 public class PreDeityAlignParser extends AbstractPrerequisiteParser implements
 		PrerequisiteParserInterface
 {
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"DEITYALIGN"};
 	}
 
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
+	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 		prereq.setKind(null); // PREMULT
 
-		final StringTokenizer inputTokenizer =
-				new StringTokenizer(formula, ",");
+		final StringTokenizer inputTokenizer = new StringTokenizer(formula, ",");
 
 		while (inputTokenizer.hasMoreTokens())
 		{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityDomainParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityDomainParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityDomainParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,12 +32,16 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre deity domain tokens.
  *
  */
 public class PreDeityDomainParser extends AbstractPrerequisiteListParser
 		implements PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"DEITYDOMAIN"};

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDeityParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -48,7 +48,8 @@
 		PrerequisiteParserInterface
 {
 	/**
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#kindsHandled()
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{
@@ -56,15 +57,24 @@
 	}
 
 	/**
-	 * @see pcgen.persistence.lst.prereq.AbstractPrerequisiteListParser#parse(java.lang.String, java.lang.String, boolean, boolean)
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 
 		// Scan for any has deity options
 		replaceHasDeityPrereqs(prereq);
@@ -84,10 +94,13 @@
 		{
 			char firstChar = key.charAt(0);
 			if ((key.length() == 1)
-					&& (firstChar == 'y' || firstChar == 'Y'
-							|| firstChar == 'n' || firstChar == 'N')
-					|| key.equalsIgnoreCase("yes")
-					|| key.equalsIgnoreCase("no")) {
+				&& (firstChar == 'y'
+					|| firstChar == 'Y'
+					|| firstChar == 'n'
+					|| firstChar == 'N')
+				|| key.equalsIgnoreCase("yes")
+				|| key.equalsIgnoreCase("no"))
+			{
 				if (firstChar == 'y' || firstChar == 'Y')
 				{
 					prereq.setKey("Y");

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDomainParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDomainParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreDomainParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,14 +32,15 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre domain tokens.
  *
  */
 public class PreDomainParser extends AbstractPrerequisiteListParser implements
 		PrerequisiteParserInterface
 {
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipBothParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipBothParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipBothParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,12 +32,16 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre equip both tokens.
  *
  */
 public class PreEquipBothParser extends AbstractPrerequisiteListParser
 		implements PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"EQUIPBOTH"};

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,12 +32,16 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre equip tokens.
  *
  */
 public class PreEquipParser extends AbstractPrerequisiteListParser implements
 		PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"EQUIP"};

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipPrimaryParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipPrimaryParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipPrimaryParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,12 +32,16 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre equip primary tokens.
  *
  */
 public class PreEquipPrimaryParser extends AbstractPrerequisiteListParser
 		implements PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"EQUIPPRIMARY"};

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipSecondaryParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipSecondaryParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipSecondaryParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,12 +32,16 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre equip secondary tokens.
  *
  */
 public class PreEquipSecondaryParser extends AbstractPrerequisiteListParser
 		implements PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"EQUIPSECONDARY"};

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipTwoWeaponParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipTwoWeaponParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreEquipTwoWeaponParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -38,6 +38,10 @@
 public class PreEquipTwoWeaponParser extends AbstractPrerequisiteListParser
 		implements PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"EQUIPTWOWEAPON"};

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreFeatParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreFeatParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreFeatParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,13 +32,8 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * <code>PreFeatParser</code> parses PREFEAT prerequisite tokens.
+ * A prerequisite parser class that handles the parsing of pre feat tokens.
  *
- * Last Editor: $Author$
- * Last Edited: $Date$
- *
- * @author Chris Ward <fr...@pu...>
- * @version $Revision$
  */
 public class PreFeatParser extends AbstractPrerequisiteListParser implements
 		PrerequisiteParserInterface
@@ -52,7 +47,8 @@
 	}
 
 	/**
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#kindsHandled()
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{
@@ -60,15 +56,24 @@
 	}
 
 	/**
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#parse(java.lang.String, java.lang.String, boolean, boolean)
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 		
 		prereq.setOriginalCheckmult(formula.indexOf(",CHECKMULT,") != -1);
 

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreGenderParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreGenderParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreGenderParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -35,25 +35,40 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre gender tokens.
  *
  */
 public class PreGenderParser extends AbstractPrerequisiteSimpleParser implements
 		PrerequisiteParserInterface
 {
-
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"GENDER"};
 	}
 
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
+	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 		prereq.setKey(formula);
 		prereq.setOperator(PrerequisiteOperator.EQ);
 		if (invertResult)

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHDParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHDParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHDParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -38,24 +38,40 @@
 import pcgen.util.Logging;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre HD tokens.
  *
  */
 public class PreHDParser extends AbstractPrerequisiteParser implements
 		PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"HD", "HDSILENT"};
 	}
 
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
+	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 
 		if(formula.contains("MIN") || formula.contains("MAX"))
 		{
@@ -71,7 +87,8 @@
 				if (vals.length !=2)
 				{
 					throw new PersistenceLayerException(
-							"PREHD must be either 'MIN=x', 'MAX=y' or 'MIN=x,MAX=y' where 'x' and 'y' are integers. '"
+							"PREHD must be either 'MIN=x', 'MAX=y' or "
+								+ "'MIN=x,MAX=y' where 'x' and 'y' are integers. '"
 								+ formula + "' is not valid. ");
 					
 				}
@@ -84,7 +101,8 @@
 				catch (NumberFormatException nfe)
 				{
 					throw new PersistenceLayerException(
-						"PREHD must be either 'MIN=x', 'MAX=y' or 'MIN=x,MAX=y' where 'x' and 'y' are integers. '"
+						"PREHD must be either 'MIN=x', 'MAX=y' or "
+							+ "'MIN=x,MAX=y' where 'x' and 'y' are integers. '"
 							+ formula + "' is not valid: " + hdVal
 							+ " is not an integer");
 				}
@@ -148,8 +166,10 @@
 	 * @param prereq
 	 * @throws PersistenceLayerException
 	 */
-	private void processOldSyntax(String formula, Prerequisite prereq)
-			throws PersistenceLayerException {
+	private void processOldSyntax(
+		String formula,
+		Prerequisite prereq) throws PersistenceLayerException
+	{
 		int plusLoc = formula.indexOf('+');
 		if (plusLoc == -1)
 		{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHPParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHPParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHPParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -35,24 +35,41 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre HP tokens.
  *
  */
 public class PreHPParser extends AbstractPrerequisiteParser implements
 		PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"HP"};
 	}
 
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
+	 */
+
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 
 		try
 		{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHandsParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHandsParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreHandsParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -35,14 +35,15 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre hands tokens.
  *
  */
 public class PreHandsParser extends AbstractPrerequisiteParser implements
 		PrerequisiteParserInterface
 {
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#kindsHandled()
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
 	 */
 	public String[] kindsHandled()
 	{
@@ -50,16 +51,25 @@
 			"HANDSLT", "HANDSLTEQ", "HANDSNEQ"};
 	}
 
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#parse(java.lang.String, java.lang.String, boolean)
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 		try
 		{
 			prereq.setKind("hands");

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreItemParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreItemParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreItemParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -32,12 +32,16 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre item tokens.
  *
  */
 public class PreItemParser extends AbstractPrerequisiteListParser implements
 		PrerequisiteParserInterface
 {
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"ITEM"};

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreLanguageParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreLanguageParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreLanguageParser.java	2011-05-29 15:19:36 UTC (rev 15054)
@@ -34,28 +34,40 @@
 import pcgen.persistence.lst.prereq.PrerequisiteParserInterface;
 
 /**
- * @author wardc
+ * A prerequisite parser class that handles the parsing of pre language tokens.
  *
  */
 public class PreLanguageParser extends AbstractPrerequisiteListParser implements
 		PrerequisiteParserInterface
 {
-
+	/**
+	 * Get the type of prerequisite handled by this token.
+	 * @return the type of prerequisite handled by this token.
+	 */
 	public String[] kindsHandled()
 	{
 		return new String[]{"LANGUAGE", "LANG"};
 	}
 
-	/* (non-Javadoc)
-	 * @see pcgen.persistence.lst.prereq.PrerequisiteParserInterface#parse(java.lang.String, java.lang.String, boolean)
+	/**
+	 * Parse the pre req list
+	 *
+	 * @param kind The kind of the prerequisite (less the "PRE" prefix)
+	 * @param formula The body of the prerequisite.
+	 * @param invertResult Whether the prerequisite should invert the result.
+	 * @param overrideQualify
+	 *           if set true, this prerequisite will be enforced in spite
+	 *           of any "QUALIFY" tag that may be present.
+	 * @return PreReq
+	 * @throws PersistenceLayerException
 	 */
 	@Override
-	public Prerequisite parse(String kind, String formula,
-		boolean invertResult, boolean overrideQualify)
-		throws PersistenceLayerException
+	public Prerequisite parse(String kind,
+	                          String formula,
+	                          boolean invertResult,
+	                          boolean overrideQualify) throws PersistenceLayerException
 	{
-		Prerequisite prereq =
-				super.parse(kind, formula, invertResult, overrideQualify);
+		Prerequisite prereq = super.parse(kind, formula, invertResult, overrideQualify);
 
 		if (prereq.getKind() != null)
 		{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreLegsParser.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/parser/PreLegsParser.java	2011-05-29 15:13:15 UTC (rev 15053)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/parser/Pre...
 
[truncated message content]

[pcgen-commit-svn] SF.net SVN: pcgen:[15053] Trunk/content/notfordistribution/paizo/ pathfinder_rpg/ultimate_magic/pfum_feats.lst

[<hen...@us...>]

Revision: 15053
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15053&view=rev
Author:   henkslaaf2
Date:     2011-05-29 15:13:15 +0000 (Sun, 29 May 2011)

Log Message:
-----------
Add a couple more feats from PFUM (page 154)

Modified Paths:
--------------
    Trunk/content/notfordistribution/paizo/pathfinder_rpg/ultimate_magic/pfum_feats.lst

Modified: Trunk/content/notfordistribution/paizo/pathfinder_rpg/ultimate_magic/pfum_feats.lst
===================================================================
--- Trunk/content/notfordistribution/paizo/pathfinder_rpg/ultimate_magic/pfum_feats.lst	2011-05-29 15:12:57 UTC (rev 15052)
+++ Trunk/content/notfordistribution/paizo/pathfinder_rpg/ultimate_magic/pfum_feats.lst	2011-05-29 15:13:15 UTC (rev 15053)
@@ -85,21 +85,26 @@
 Ki Stand	TYPE:General	PREABILITY:1,CATEGORY:Special Ability,Ki Pool	DESC:If an opponent knocks you down, you swiftly rebound with an attack.	SOURCEPAGE:p.153	BENEFIT:While you have at least 1 ki point in your ki pool, you can stand up as a swift action that provokes attacks of opportunity.	BENEFIT:You may spend 1 point of your ki pool to stand up as a swift action without provoking attacks of opportunity.
 # TODO: Actually add a Ranger Trap
 Learn Ranger Trap	TYPE:General	PRESKILL:1,Survival=5	DESC:You learn how to create one kind of ranger trap.	SOURCEPAGE:p.153	BENEFIT:Select one ranger trap (see page 64 of Ultimate Magic). You may use this trap %1 times per day. The DC for your trap is %2, and it lasts 1 day per two character levels.|MAX(1, WIS)|10 + ECL/2 + WIS	BENEFIT:If you are not a ranger, you can only set extraordinary traps with this feat; like all extraordinary ranger traps, this decreases the trap DC by 2.	BENEFIT:Special - A ranger may use ranger traps a number of times per day equal to 1/2 his ranger level plus his Wisdom bonus (%3). See the description of ranger traps for durations.|WIS + classlevel("Ranger")/2
-Life Lure	TYPE:General	DESC:iYour channeled positive energy is irresistibly sweet to nearby undead.	SOURCEPAGE:p.153	BENEFIT:As a standard action, you can channel positive energy to fascinate all undead within 30 feet for a %1 rounds. Undead that succeed at a Will save (DC %2) are unaffected. Channeling energy for this purpose does not heal or harm creatures.|MAX(1,CHA)|10 + (classlevel("Cleric") + classlevel("Oracle"))/2 + CHA
-Moonlight Summons	TYPE:General	DESC:	SOURCEPAGE:p.153	BENEFIT:
-Mystic Stride	TYPE:General	DESC:	SOURCEPAGE:p.153	BENEFIT:
-Oracular Intuition	TYPE:General	DESC:	SOURCEPAGE:p.153	BENEFIT:
-Painful Anchor	TYPE:General	DESC:	SOURCEPAGE:p.153	BENEFIT:
-Piercing Spell	TYPE:Metamagic
-Planar Preservationist	TYPE:General
-Powerful Shape	TYPE:General
-Prodigy	TYPE:General
-Prophetic Visionary	TYPE:General
-Pure Fiath	TYPE:General
-Quarterstaff Master	TYPE:Combat
-Quick Channel	TYPE:General
-Quick Wild Shape	TYPE:General
-Radiant Charge	TYPE:General
+# TODO: Instead of adding tons of variables to the sources, reference the DC of channeling itself. Players can look at text as well :)
+Life Lure	TYPE:General	DESC:Your channeled positive energy is irresistibly sweet to nearby undead.	PREABILITY:1,CATEGORY:Special Ability,Channel Positive Energy	SOURCEPAGE:p.153	BENEFIT:As a standard action, you can channel positive energy to fascinate all undead within 30 feet for a %1 rounds. Undead that succeed at a Will save are unaffected. Use the same DC for this ability as the DC for channeling energy to harm undead. Channeling energy for this purpose does not heal or harm creatures.|MAX(1,CHA)
+Moonlight Summons	TYPE:General	DESC:Your summoned minions are infused with the power of the moon.	PREFEAT:1,Spell Focus(Conjuration)	PRESPELL:1,Summon Nature's Ally I,Summon Nature's Ally II,Summon Nature's Ally III,Summon Nature's Ally IV,Summon Nature's Ally V,Summon Nature's Ally VI,Summon Nature's Ally VII,Summon Nature's Ally VIII,Summon Nature's Ally IX	SOURCEPAGE:p.153	BENEFIT:Creatures you summon shed light as a light spell. They are immune to confusion and sleep effects, and their natural weapons are treated as silver for the purposes of overcoming damage reduction.
+Mystic Stride	TYPE:General	DESC:Enchanted vegetation does not bar your path.	PRESTAT:1,DEX=15	PREABILITY:1,CATEGORY:Special Ability,Woodland Stride	SOURCEPAGE:p.153	BENEFIT:You can move at full speed even through thorns, briars, and overgrown areas that are enchanted or magically manipulated to impede motion, even if those areas confer the entangled condition.
+Oracular Intuition	TYPE:General	DESC:You are highly sensitive to magic and changes in a person’s demeanor.	PREABILITY:1,CATEGORY:Special Ability,TYPE:OracleMystery	BONUS:SKILL|Sense Motive|if(skillinfo("RANK","Sense Motive")>=10,4,2)	BONUS:SKILL|Spellcraft|if(skillinfo("RANK","Spellcraft")>=10,4,2)	SOURCEPAGE:p.153	BENEFIT:You get a +2 bonus on Sense Motive checks and Spellcraft checks. If you have 10 or more ranks in one of these skills, the bonus increases to +4 for that skill.
+# TODO: Depend on anchoring aura paladin ability
+Painful Anchor	TYPE:General	DESC:Evil outsiders take damage when they attempt to connect to other planes.	SOURCEPAGE:p.153	BENEFIT:When an evil outsider uses a calling, summoning, or teleportation effect, or any ability that physically transports a creature to or from another plane (such as blink or etherealness) within your anchoring aura, it takes damage equal to 4d8 + %1. This damage comes from holy power and is not subject to damage reduction, energy immunities, or energy resistances.|CHA
+Piercing Spell	TYPE:Metamagic	ADDSPELLLEVEL:1	DESC:Your studies have helped you develop methods to overcome spell resistance.	SOURCEPAGE:p.154	BENEFIT:When you cast a piercing spell against a target with spell resistance, it treats the spell resistance of the target as 5 lower than its actual SR. A piercing spell uses up a spell slot one level higher than the spell’s actual level.
+# TODO: Actually add the bonus extracts
+Planar Preservationist	TYPE:General	PREABILITY:1,CATEGORY:Archetype,Alchemist Archetype ~ Preservationist	DESC:You know how to preserve and reconstitute extraplanar monsters as well as normal animals.	SOURCEPAGE:p.154	BENEFIT:For every summon nature’s ally extract you know, you learn the equivalent summon monster spell as an extract. If you later learn other summon nature’s ally extracts, you automatically learn the equivalent summon monster spell as an extract.
+Powerful Shape	TYPE:General	PREABILITY:1,CATEGORY:Special Ability,Wild Shape	PRECLASS:1,Druid=8	DESC:Your wild shapes are mighty and muscular.	SOURCEPAGE:p.154	BENEFIT:When in wild shape, treat your size as one category larger for the purpose of calculating CMB, CMD, carrying capacity, and any size-based special attacks you use or that are used against you (such as grab, swallow whole, and trample).
+# TODO: Implement the chooser
+Prodigy	TYPE:General	DESC:You are naturally skilled at arts, professions, and the acquisition of knowledge.	SOURCEPAGE:p.154	BENEFIT:Choose two Craft, Perform, or Profession skills in any combination (two Craft skills, a Craft skill and a Perform skill, and so on). You receive a +2 bonus on checks with these skills. If you have 10 or more ranks in any one of these skills, the bonus increases to +4 for that skill.	MULT:YES	STACK:NO
+Prophetic Visionary	TYPE:General	PREABILITY:1,CATEGORY:Special Ability,TYPE:OracleMystery	DESC:Your oracular abilities give you a glimpse into the future.	SOURCEPAGE:p.154	BENEFIT:Once per day, you can enter a deep trance to receive a vision of the future. The trance lasts for 10 minutes, during which time you can take no other actions. If you are interrupted, you must begin again. When you come out of the trance, you know whether a particular action in the immediate future will bring good or bad results, as an augury spell with a 70% chance of success.
+Pure Faith	TYPE:General	DESC:Not only are you immune to disease, like most paladins, but you also are highly resilient to poisons.	PREABILITY:1,CATEGORY:Special Ability,Divine Health	SOURCEPAGE:p.154	BENEFIT:You gain a +4 sacred bonus to saving throws against poison.
+# TODO: How to make the character qualify for Weapon Specialization in the quarterstaff, but not for other WS? The variable WeapSpecQualify cannot be set to 1 for this. Maybe we should create a special Weapon Specialization ~ Quarterstaff for this?
+Quarterstaff Master	TYPE:Combat	DESC:You can wield a quarterstaff as either a two-handed or one-handed weapon.	PREFEAT:1,Weapon Focus(Quarterstaff)	PREATT:5	SOURCEPAGE:p.154	BENEFIT:By employing a number of different stances and techniques, you can wield a quarterstaff as a onehanded weapon. At the start of your turn, you decide whether or not you are going to wield the quarterstaff as a one-handed or two-handed weapon. When you wield it as a one-handed weapon, your other hand is free, and you cannot use the staff as a double weapon. You can take the feat Weapon Specialization in the quarterstaff even if you have no levels in fighter.
+Quick Channel	TYPE:General	DESC:Your divine energies f lash with dazzling speed.	PRESKILL:1,Knowledge (Religion)=5	PREABILITY:1,CATEGORY:Special Ability,Channel Energy	SOURCEPAGE:p.154	BENEFIT:You may channel energy as a move action by spending 2 daily uses of that ability.
+Quick Wild Shape	TYPE:General	DESC:You sacrifice power for speed in changing form.	PREABILITY:1,CATEGORY:Special Ability,Wild Shape	PRECLASS:1,Druid=8	SOURCEPAGE:p.154	BENEFIT:You can wild shape as a move action or a swift action. However, you are limited to forms available to a druid two levels lower when changing form as a move action, or four levels lower as a swift action.
+Radiant Charge	TYPE:General	DESC:When you charge, you do so with the power of faith.	PREABILITY:1,CATEGORY:Special Ability,Lay On Hands	SOURCEPAGE:p.154	BENEFIT:When you hit with a charge attack, you can expend all of your remaining uses of lay on hands to deal extra damage equal to 1d6 per use of lay on hands expended + your Charisma bonus. This damage comes from holy power and is not subject to damage reduction, energy immunities, or energy resistances.
 Remote Bomb	TYPE:General
 Resilient Eidolon	TYPE:General
 Reward of Grace	TYPE:General


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15052] Trunk/utilities/prettylst/prettylst.pl

[<hen...@us...>]

Revision: 15052
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15052&view=rev
Author:   henkslaaf2
Date:     2011-05-29 15:12:57 +0000 (Sun, 29 May 2011)

Log Message:
-----------
Fix prettylst.pl, the array was missing a comma after 'ARMORTYPE'

Modified Paths:
--------------
    Trunk/utilities/prettylst/prettylst.pl

Modified: Trunk/utilities/prettylst/prettylst.pl
===================================================================
--- Trunk/utilities/prettylst/prettylst.pl	2011-05-29 14:37:48 UTC (rev 15051)
+++ Trunk/utilities/prettylst/prettylst.pl	2011-05-29 15:12:57 UTC (rev 15052)
@@ -3713,7 +3713,7 @@
 my %token_CHOOSE_tag = map { $_ => 1 } (
 	'ABILITY',
 	'ARMORPROF',			# Deprecated 5.15 - Remove 6.0
-	'ARMORPROFICIENCY'
+	'ARMORPROFICIENCY',
 	'ARMORTYPE',
 	'CCSKILLLIST',		# Deprecated 5.13.9 - Remove 5.16. Use CHOOSE:SKILLSNAMED instead.
 	'CSKILLS',


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15051] Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ core_rulebook/pfcr_abilities_class.lst

[<hen...@us...>]

Revision: 15051
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15051&view=rev
Author:   henkslaaf2
Date:     2011-05-29 14:37:48 +0000 (Sun, 29 May 2011)

Log Message:
-----------
Sorcerer Fey Bloodline ability Woodland Stride counts as Woodland Stride proper. Now it satisfies the prereq for Mystic Stride

Modified Paths:
--------------
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/core_rulebook/pfcr_abilities_class.lst

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/core_rulebook/pfcr_abilities_class.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/core_rulebook/pfcr_abilities_class.lst	2011-05-29 13:02:34 UTC (rev 15050)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/core_rulebook/pfcr_abilities_class.lst	2011-05-29 14:37:48 UTC (rev 15051)
@@ -837,7 +837,7 @@
 # Ability Name		Unique Key					Output Name				Category of Ability		Type									Innate Spells									Description																								Ability								Damage Reduction	Source Page		Description of the Benefits
 Bloodline Arcana (Fey)							OUTPUTNAME:Bloodline Arcana	CATEGORY:Special Ability	TYPE:SpecialQuality																	DESC:Whenever you cast a spell of the compulsion subschool, increase the spell's DC by +2.										BONUS:DC|SUBSCHOOL.Compulsion|2												SOURCEPAGE:p.76
 Laughing Touch		KEY:Laughing Touch ~ Fey Bloodline						CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural															DESC:You can cause a creature to burst out laughing for 1 round as a melee touch attack.																							SOURCEPAGE:p.76	BENEFIT:You can cause a creature to burst out laughing for 1 round as a melee touch attack. A laughing creature can only take a move action and can defend itself normally. Once a creature has been affected by laughing touch, it is immune to its effects for 1 day. You can use this ability %1 times a day.|BloodlinePowerTimes
-Woodland Stride		KEY:Woodland Stride ~ Fey Bloodline						CATEGORY:Special Ability	TYPE:SpecialQuality.Extraordinary.ModifyMovement												DESC:You can move through any sort of undergrowth at your normal speed and without taking damage or suffering any other impairment.																SOURCEPAGE:p.76	BENEFIT:You can move through any sort of undergrowth (such as natural thorns, briars, overgrown areas, and similar terrain) at your normal speed and without taking damage or suffering any other impairment. Thorns, briars, and overgrown areas that have been magically manipulated to impede motion, however, still affect you.
+Woodland Stride		KEY:Woodland Stride ~ Fey Bloodline						CATEGORY:Special Ability	TYPE:SpecialQuality.Extraordinary.ModifyMovement	SERVESAS:ABILITY=Special Ability|Woodland Stride						DESC:You can move through any sort of undergrowth at your normal speed and without taking damage or suffering any other impairment.																SOURCEPAGE:p.76	BENEFIT:You can move through any sort of undergrowth (such as natural thorns, briars, overgrown areas, and similar terrain) at your normal speed and without taking damage or suffering any other impairment. Thorns, briars, and overgrown areas that have been magically manipulated to impede motion, however, still affect you.
 Fleeting Glance		KEY:Fleeting Glance ~ Fey Bloodline						CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural															DESC:You can turn invisible for %1 rounds per day. This ability functions as greater invisibility. These rounds need not be consecutive.|BloodlineLVL													SOURCEPAGE:p.76
 Fey Magic			KEY:Fey Magic ~ Fey Bloodline							CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural															DESC:You may reroll any caster level check made to overcome spell resistance.																									SOURCEPAGE:p.76	BENEFIT:You may reroll any caster level check made to overcome spell resistance. You must decide to use this ability before the results are revealed. You must take the second result, even if it is worse. You can use this ability at will.
 Soul of the Fey		KEY:Soul of the Fey ~ Fey Bloodline						CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural				SPELLS:Innate|TIMES=1|CASTERLEVEL=BloodlineLVL|Shadow Walk,16+CHA	DESC:Your soul becomes one with the world of the fey. You gain immunity to poison and DR 10/cold iron.								ABILITY:Special Ability|AUTOMATIC|Immunity to Poison	DR:10/Cold Iron	SOURCEPAGE:p.76	BENEFIT:Your soul becomes one with the world of the fey. You gain immunity to poison and DR 10/cold iron. Creatures of the animal type do not attack you unless compelled to do so through magic. Once per day, you can cast shadow walk as a bonus spell.


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

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

[<nu...@us...>]

Revision: 15050
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15050&view=rev
Author:   nuance
Date:     2011-05-29 13:02:34 +0000 (Sun, 29 May 2011)

Log Message:
-----------
CheckStyle updates

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/character/CachedVariable.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAttackTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreCheckTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSpellTypeTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreStatTester.java
    Trunk/pcgen/code/src/java/plugin/pretokens/test/PreUnarmedAttackTester.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/character/CachedVariable.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/character/CachedVariable.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/pcgen/core/character/CachedVariable.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -26,43 +26,45 @@
 package pcgen.core.character;
 
 /**
- * @author Valued Customer
- * @param <T> 
- * @todo This doesn't belong in this package.  It should probably be an inner
+ * @param <T>
+ * Todo This doesn't belong in this package.  It should probably be an inner
  * class in VariableProcessor.
  *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
  */
-public final class CachedVariable<T> {
+public final class CachedVariable<T>
+{
 	private int serial;
 	private T value;
 	/**
 	 * @return Returns the serial.
 	 */
-	public int getSerial() {
+	public int getSerial()
+	{
 		return serial;
 	}
 
 	/**
-	 * @param serial The serial to set.
+	 * @param i The serial to set.
 	 */
-	public void setSerial(final int serial) {
-		this.serial = serial;
+	public void setSerial(final int i)
+	{
+		serial = i;
 	}
 
 	/**
 	 * @return Returns the value.
 	 */
-	public T getValue() {
+	public T getValue()
+	{
 		return value;
 	}
 
 	/**
-	 * @param value The value to set.
+	 * @param v The value to set.
 	 */
-	public void setValue(final T value) {
-		this.value = value;
+	public void setValue(final T v)
+	{
+		value = v;
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreArmorTypeTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -29,6 +29,7 @@
 import java.util.StringTokenizer;
 
 import pcgen.cdom.base.CDOMObject;
+import pcgen.cdom.base.Constants;
 import pcgen.core.Equipment;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.prereq.AbstractPrerequisiteTest;
@@ -36,8 +37,7 @@
 import pcgen.core.prereq.PrerequisiteTest;
 
 /**
- * @author wardc
- *
+ * Prerequisite test the type of a piece of armour.
  */
 public class PreArmorTypeTester extends AbstractPrerequisiteTest implements PrerequisiteTest
 {
@@ -64,12 +64,13 @@
 				}
 
 				// Match against a TYPE of armour
-				if (desiredType.startsWith("TYPE=")
-					|| desiredType.startsWith("TYPE.")) //$NON-NLS-1$ //$NON-NLS-2$
+				if (desiredType.startsWith(Constants.LST_TYPE)
+					|| desiredType.startsWith(Constants.LST_TYPE_OLD))
 				{
-					StringTokenizer tok =
-							new StringTokenizer(desiredType.substring(5)
-								.toUpperCase(), ".");
+
+					String stripped = desiredType.substring(Constants.LENGTH_OF_TYPE_SUBSTRING);
+					StringTokenizer tok = new StringTokenizer(stripped.toUpperCase(), ".");
+
 					boolean match = false;
 					if (tok.hasMoreTokens())
 					{

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAttackTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAttackTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreAttackTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -35,8 +35,7 @@
 import pcgen.util.PropertyFactory;
 
 /**
- * @author wardc
- *
+ * Prerequisite test the type of a piece of armour.
  */
 public class PreAttackTester extends AbstractPrerequisiteTest implements PrerequisiteTest
 {
@@ -45,7 +44,10 @@
 	 * @see pcgen.core.prereq.PrerequisiteTest#passes(pcgen.core.PlayerCharacter)
 	 */
 	@Override
-	public int passes(final Prerequisite prereq, final PlayerCharacter character, CDOMObject source)
+	public int passes(
+		final Prerequisite prereq,
+		final PlayerCharacter character,
+		CDOMObject source)
 		throws PrerequisiteException
 	{
 		int runningTotal;
@@ -58,8 +60,10 @@
 		}
 		catch (NumberFormatException exc)
 		{
-			throw new PrerequisiteException(PropertyFactory.getFormattedString(
-				"PreAttack.error.badly_formed_attribute", prereq.getOperand())); //$NON-NLS-1$
+			throw new PrerequisiteException(
+				PropertyFactory.getFormattedString(
+					"PreAttack.error.badly_formed_attribute", //$NON-NLS-1$
+					prereq.getOperand()));
 		}
 
 		return countedTotal(prereq, runningTotal);
@@ -80,9 +84,10 @@
 	@Override
 	public String toHtmlString(final Prerequisite prereq)
 	{
-		return PropertyFactory
-			.getFormattedString(
-				"PreAttack.toHtml", new Object[]{prereq.getOperator().toDisplayString(), prereq.getOperand()}); //$NON-NLS-1$ //$NON-NLS-2$
+		return PropertyFactory.getFormattedString(
+			"PreAttack.toHtml",  //$NON-NLS-1$
+			prereq.getOperator().toDisplayString(),
+			prereq.getOperand());
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreCheckTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreCheckTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreCheckTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -15,15 +15,12 @@
 import pcgen.core.prereq.PrerequisiteTest;
 
 /**
- * @author wardc
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
+ * Prerequisite test that the character has a non-zero value for a given check.
  */
 public class PreCheckTester extends AbstractPrerequisiteTest implements PrerequisiteTest
 {
 
-	/** Constructor */
+	/** Constructor. */
 	public PreCheckTester()
 	{
 		super();
@@ -47,17 +44,12 @@
 		int runningTotal = 0;
 
 		final String checkName = prereq.getKey();
-		final int operand =
-				character.getVariableValue(prereq.getOperand(), "").intValue(); //$NON-NLS-1$
-		PCCheck check = Globals.getContext().ref
-				.silentlyGetConstructedCDOMObject(PCCheck.class, checkName);
+		final int operand = character.getVariableValue(prereq.getOperand(), "").intValue(); //$NON-NLS-1$
+		PCCheck check = Globals.getContext().ref.silentlyGetConstructedCDOMObject(PCCheck.class, checkName);
 		if (check != null)
 		{
-			final int characterCheckBonus =
-					character.getTotalCheck(check);
-			runningTotal =
-					prereq.getOperator().compare(characterCheckBonus, operand) > 0
-						? 1 : 0;
+			final int characterCheckBonus = character.getTotalCheck(check);
+			runningTotal = prereq.getOperator().compare(characterCheckBonus, operand) > 0 ? 1 : 0;
 		}
 		return countedTotal(prereq, runningTotal);
 	}

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreDeityAlignTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -18,10 +18,7 @@
 import pcgen.util.PropertyFactory;
 
 /**
- * @author wardc
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
+ * Prerequisite test that the character has a deity with the correct alignment.
  */
 public class PreDeityAlignTester extends AbstractPrerequisiteTest implements PrerequisiteTest
 {
@@ -84,9 +81,10 @@
 	@Override
 	public String toHtmlString(final Prerequisite prereq)
 	{
-		return PropertyFactory
-			.getFormattedString(
-				"PreDeityAlign.toHtml", prereq.getOperator().toDisplayString(), getPCAlignment(prereq.getOperand()).getAbb()); //$NON-NLS-1$
+		return PropertyFactory.getFormattedString(
+			"PreDeityAlign.toHtml", //$NON-NLS-1$
+			prereq.getOperator().toDisplayString(),
+			getPCAlignment(prereq.getOperand()).getAbb());
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreItemTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -27,6 +27,7 @@
 package plugin.pretokens.test;
 
 import pcgen.cdom.base.CDOMObject;
+import pcgen.cdom.base.Constants;
 import pcgen.core.Equipment;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.prereq.AbstractPrerequisiteTest;
@@ -39,7 +40,7 @@
 import java.util.List;
 
 /**
- * @author wardc
+ * Sets requirements for items a character must possess.
  *
  */
 public class PreItemTester extends AbstractPrerequisiteTest implements
@@ -72,9 +73,11 @@
 			// Work out exactlywhat we are going to test.
 			final String aString = prereq.getKey();
 			List<String> typeList = null;
-			if (aString.startsWith("TYPE=") || aString.startsWith("TYPE.")) //$NON-NLS-1$ //$NON-NLS-2$
+			if (aString.startsWith(Constants.LST_TYPE)
+				|| aString.startsWith(Constants.LST_TYPE_OLD))
 			{
-				typeList = CoreUtility.split(aString.substring(5), '.');
+				String stripped = aString.substring(Constants.LENGTH_OF_TYPE_SUBSTRING);
+				typeList = CoreUtility.split(stripped, '.');
 			}
 
 			for (Equipment eq : character.getEquipmentSet())

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSpellTypeTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSpellTypeTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreSpellTypeTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -35,7 +35,7 @@
 import pcgen.util.PropertyFactory;
 
 /**
- * @author wardc
+ * This is used to check the characters spellcasting ability.
  *
  */
 public class PreSpellTypeTester extends AbstractPrerequisiteTest implements
@@ -57,16 +57,15 @@
 		catch (NumberFormatException e)
 		{
 			requiredLevel = 1;
-			Logging
-				.errorPrintLocalised(
-					"PreSpellType.Badly_formed_spell_type", prereq.getOperand(), prereq.toString()); //$NON-NLS-1$
+			Logging.errorPrintLocalised(
+				"PreSpellType.Badly_formed_spell_type", //$NON-NLS-1$
+				prereq.getOperand(),
+				prereq.toString());
 		}
 
-		int count = character.countSpellCastTypeLevel(castingType,
-				requiredLevel);
+		int count = character.countSpellCastTypeLevel(castingType, requiredLevel);
 
-		final int runningTotal =
-			prereq.getOperator().compare(count, 1);
+		final int runningTotal = prereq.getOperator().compare(count, 1);
 		return countedTotal(prereq, runningTotal);
 	}
 
@@ -86,8 +85,8 @@
 	public String toHtmlString(final Prerequisite prereq)
 	{
 		return PropertyFactory.getFormattedString("PreSpellType.toHtml", //$NON-NLS-1$
-			new Object[]{prereq.getOperator().toDisplayString(),
-				1, prereq.getKey(), prereq.getOperand()});
+			prereq.getOperator().toDisplayString(),
+			1, prereq.getKey(), prereq.getOperand());
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreStatTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreStatTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreStatTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -76,9 +76,11 @@
 	@Override
 	public String toHtmlString(final Prerequisite prereq)
 	{
-		return PropertyFactory
-			.getFormattedString(
-				"PreStat.toHtml", prereq.getKey(), prereq.getOperator().toString(), prereq.getOperand()); //$NON-NLS-1$
+		return PropertyFactory.getFormattedString(
+			"PreStat.toHtml", //$NON-NLS-1$
+			prereq.getKey(),
+			prereq.getOperator().toString(),
+			prereq.getOperand());
 	}
 
 }

Modified: Trunk/pcgen/code/src/java/plugin/pretokens/test/PreUnarmedAttackTester.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/pretokens/test/PreUnarmedAttackTester.java	2011-05-28 16:19:31 UTC (rev 15049)
+++ Trunk/pcgen/code/src/java/plugin/pretokens/test/PreUnarmedAttackTester.java	2011-05-29 13:02:34 UTC (rev 15050)
@@ -75,9 +75,10 @@
 	@Override
 	public String toHtmlString(final Prerequisite prereq)
 	{
-		return PropertyFactory
-			.getFormattedString(
-				"PreUnarmedAttack.toHtml", prereq.getOperator().toString(), prereq.getOperand()); //$NON-NLS-1$
+		return PropertyFactory.getFormattedString(
+			"PreUnarmedAttack.toHtml", //$NON-NLS-1$
+			prereq.getOperator().toString(),
+			prereq.getOperand());
 	}
 
 }


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

[pcgen-commit-svn] SF.net SVN: pcgen:[15049] Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ advanced_players_guide

[<hen...@us...>]

Revision: 15049
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15049&view=rev
Author:   henkslaaf2
Date:     2011-05-28 16:19:31 +0000 (Sat, 28 May 2011)

Log Message:
-----------
Rework the Oracle Life Channel ability: do not mix APG variables into Core.

Modified Paths:
--------------
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst
    Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_feats_mods.lst

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2011-05-28 16:19:13 UTC (rev 15048)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_abilities_class.lst	2011-05-28 16:19:31 UTC (rev 15049)
@@ -324,7 +324,7 @@
 # Ability Name	Unique Key	Category of Ability	Type	Visible	Required Ability	Restricted Ability	Required AL	Restricted AL	Required Class	Required Skill	Var. Min. Value	Define	Innate Spells	Description	Multiple?	Choose	Automatically Gained Armor Prof.	Automatically Gained Feat	Automatically Gained Weapon Prof.	Ability	Bonus to Ability Pool	Save checks bonus	Combat bonus	Add to base move	Bonus to skill	Stat bonus	Modify VAR	Add to vision	Allow Follower	Allowed Companions	Class Skill	Vision	Source Page	Aspects	Description of the Benefits	List of Known Class Spells by Level
 # TODO - implemented like this, the number of times an Oracle/Cleric multiclasser is able to channel stacks improperly. If it should at all.
 # According to http://paizo.com/paizo/messageboards/paizoPublishing/pathfinder/pathfinderRPG/rules/clericAndOracleChannelEnergy it does not
-Channel Energy							KEY:Channel Energy ~ Bone Mystery			CATEGORY:Special Ability	TYPE:Internal								VISIBLE:NO																																														DEFINE:ChannelEnergyTimes|0	DEFINE:ChannelEnergyDice|0	DEFINE:ChannelEnergyDC|0	DEFINE:ChannelEnergyLVL|0	DEFINE:ChannelEnergyDieSize|6																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																						BONUS:VAR|ChannelEnergyLVL|CL	BONUS:VAR|ChannelEnergyDice|(ChannelEnergyLVL+1)/2	BONUS:VAR|ChannelEnergyDC|10+(ChannelEnergyLVL/2)+CHA	BONUS:VAR|ChannelEnergyTimes|3+CHA																																																																																																																																												SOURCEPAGE:p.22
+Channel Energy							KEY:Channel Energy ~ Bone Mystery			CATEGORY:Special Ability	TYPE:Internal								VISIBLE:NO																																											SERVESAS:ABILITY=Special Ability|Channel Energy|Channel Negative Energy			DEFINE:ChannelEnergyTimes|0	DEFINE:ChannelEnergyDice|0	DEFINE:ChannelEnergyDC|0	DEFINE:ChannelEnergyLVL|0	DEFINE:ChannelEnergyDieSize|6																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																						BONUS:VAR|ChannelEnergyLVL|CL	BONUS:VAR|ChannelEnergyDice|(ChannelEnergyLVL+1)/2	BONUS:VAR|ChannelEnergyDC|10+(ChannelEnergyLVL/2)+CHA	BONUS:VAR|ChannelEnergyTimes|3+CHA																																																																																																																																												SOURCEPAGE:p.22
 Channel Negative Energy						KEY:Channel Negative Energy ~ Bone Mystery	CATEGORY:Special Ability	TYPE:SpecialAttack.Supernatural																																				PRECLASS:1,Oracle=1													DEFINE:ChannelNegativeEnergyDC|0																																															DESC:You can channel negative energy for the purposes of commanding undead %1 times/day.|ChannelEnergyTimes																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																									BONUS:VAR|ChannelNegativeEnergyDC|ChannelEnergyDC																																																																																																																																																																SOURCEPAGE:p.46	ASPECT:Ability Benefit|(DC %1, %2/day)|ChannelNegativeEnergyDC|ChannelEnergyTimes
 
 # Oracle Revelations: Flame
@@ -359,8 +359,8 @@
 # Ability Name	Unique Key	Category of Ability	Type	Visible	Required Ability	Restricted Ability	Required AL	Restricted AL	Required Class	Required Skill	Var. Min. Value	Define	Innate Spells	Description	Multiple?	Choose	Automatically Gained Armor Prof.	Automatically Gained Feat	Automatically Gained Weapon Prof.	Ability	Bonus to Ability Pool	Save checks bonus	Combat bonus	Add to base move	Bonus to skill	Stat bonus	Modify VAR	Add to vision	Allow Follower	Allowed Companions	Class Skill	Vision	Source Page	Aspects	Description of the Benefits	List of Known Class Spells by Level
 # TODO - implemented like this, the number of times an Oracle/Cleric multiclasser is able to channel do not stack.
 # According to http://paizo.com/paizo/messageboards/paizoPublishing/pathfinder/pathfinderRPG/rules/clericAndOracleChannelEnergy it does indeed not.
-Channel								KEY:Channel ~ Life Mystery				CATEGORY:Special Ability	TYPE:SpecialAttack.Supernatural.LifeRevelation																																																																																																						DESC:You can unleash a wave of positive energy dealing %1d%2 (DC %3 for half) %4/day.|LifeChannelEnergyDice|LifeChannelEnergyDieSize|LifeChannelEnergyDC|LifeChannelEnergyTimes																																																																																																																																																																																																																																																																																																																				ABILITY:Special Ability|AUTOMATIC|Channel Energy ~ Life Mystery																																																																																																																																																																																																																																																																																																																																																																							SOURCEPAGE:p.48															BENEFIT:You can unleash a wave of positive energy like a cleric. You must choose to deal %1d%2 points of positive energy damage to undead creatures or to heal living creatures of %1d%2 points of damage. Creatures that take damage from channeled energy receive a DC %3 Will save to halve the damage. You can use this abilty %4 times per day.|LifeChannelEnergyDice|LifeChannelEnergyDieSize|LifeChannelEnergyDC|LifeChannelEnergyTimes
-Channel Energy							KEY:Channel Energy ~ Life Mystery			CATEGORY:Special Ability	TYPE:Internal								VISIBLE:NO																																														DEFINE:LifeChannelEnergyTimes|0	DEFINE:LifeChannelEnergyDice|0	DEFINE:LifeChannelEnergyDC|0	DEFINE:LifeChannelEnergyLVL|0	DEFINE:LifeChannelEnergyDieSize|6																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			BONUS:VAR|LifeChannelEnergyLVL|classlevel("Oracle")	BONUS:VAR|LifeChannelEnergyDice|(LifeChannelEnergyLVL+1)/2	BONUS:VAR|LifeChannelEnergyDC|10+(LifeChannelEnergyLVL/2)+CHA	BONUS:VAR|LifeChannelEnergyTimes|1+CHA																																																																																																																																				SOURCEPAGE:p.48
+Channel								KEY:Channel ~ Life Mystery				CATEGORY:Special Ability	TYPE:SpecialAttack.Supernatural.LifeRevelation																																																																																																						DESC:You can unleash a wave of positive energy dealing %1d%2 (DC %3 for half) %4/day.|ChannelEnergyOracleLifeDice|ChannelEnergyOracleLifeDieSize|ChannelEnergyOracleLifeDC|ChannelEnergyOracleLifeTimes																																																																																																																																																																																																																																																																																																																				ABILITY:Special Ability|AUTOMATIC|Channel Energy ~ Life Mystery																																																																																																																																																																																																																																																																																																																																																																							SOURCEPAGE:p.48															BENEFIT:You can unleash a wave of positive energy like a cleric. You must choose to deal %1d%2 points of positive energy damage to undead creatures or to heal living creatures of %1d%2 points of damage. Creatures that take damage from channeled energy receive a DC %3 Will save to halve the damage. You can use this abilty %4 times per day.|ChannelEnergyOracleLifeDice|ChannelEnergyOracleLifeDieSize|ChannelEnergyOracleLifeDC|ChannelEnergyOracleLifeTimes
+Channel Energy							KEY:Channel Energy ~ Life Mystery			CATEGORY:Special Ability	TYPE:Internal								VISIBLE:NO																																												SERVESAS:ABILITY=Special Ability|Channel Energy|Channel Positive Energy		DEFINE:ChannelEnergyOracleLifeTimes|0	DEFINE:ChannelEnergyOracleLifeDice|0	DEFINE:ChannelEnergyOracleLifeDC|0	DEFINE:ChannelEnergyOracleLifeLVL|0	DEFINE:ChannelEnergyOracleLifeDieSize|6																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			BONUS:VAR|ChannelEnergyOracleLifeLVL|classlevel("Oracle")	BONUS:VAR|ChannelEnergyOracleLifeDice|(ChannelEnergyOracleLifeLVL+1)/2	BONUS:VAR|ChannelEnergyOracleLifeDC|10+(ChannelEnergyOracleLifeLVL/2)+CHA	BONUS:VAR|ChannelEnergyOracleLifeTimes|1+CHA																																																																																																																																				SOURCEPAGE:p.48
 # TODO: This revelation is like the Clerical ability to Channel Positive Energy
 Combat Healer							KEY:Combat Healer ~ Life Mystery			CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural.LifeRevelation																																		PRECLASS:1,Oracle=7													DEFINE:OracleCombatHealerTimes|0																																															DESC:You cast cure spells as a swift action by expending two spell slots %1 time(s) a day.|OracleCombatHealerTimes																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																							BONUS:VAR|OracleCombatHealerTimes|1+(classlevel("Oracle")-7)/4																																																																																																																																																														SOURCEPAGE:p.49															BENEFIT:You cast cure spells as a swift action by expending two spell slots. This does not increase the level of the spell. You can use this ability %1 time(s) per day.|OracleCombatHealerTimes
 Delay Affliction							KEY:Delay Affliction ~ Life Mystery			CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural.LifeRevelation																																																		DEFINE:OracleDelatAfflictionTimes|0	DEFINE:OracleDelayAfflictionDuration|0																																								DESC:As an immediate action, %1 time(s) per day, whenever you fail a saving throw against a disease or poison, you may ignore its effects for %2 hour(s). At 7th and 15th level, you can use this ability one additional time per day.|OracleDelayAfflictionTimes|OracleDelayAfflictionDuration																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																											BONUS:VAR|OracleDelayAfflictionTimes|1	BONUS:VAR|OracleDelayAfflictionTimes|1|PRECLASS:1,Oracle=7	BONUS:VAR|OracleDelayAfflictionTimes|1|PRECLASS:1,Oracle=15	BONUS:VAR|OracleDelatAfflictionDuration|classlevel("Oracle")																																																																																																																																			SOURCEPAGE:p.49
@@ -541,7 +541,7 @@
 Unholy Resilience		KEY:Unholy Resilience ~ Antipaladin		CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural			VISIBLE:NO									DEFINE:UnholyResilience|max(CHA,0)																																																																																		BONUS:CHECKS|ALL|UnholyResilience																															SOURCEPAGE:p.120
 Plague Bringer		KEY:Plague Bringer ~ Antipaladin		CATEGORY:Special Ability	TYPE:SpecialQuality.Extraordinary																																																								DESC:The powers of darkness make you a beacon of corruption and disease. You do not take any damage or from diseases. You can still contract diseases and spread them to others, but You are otherwise immune to their effects.																																											SOURCEPAGE:p.120
 Cruelty			KEY:Cruelty ~ Antipaladin			CATEGORY:Special Ability	TYPE:Internal						VISIBLE:NO									DEFINE:Cruelties|0	DEFINE:CrueltyLVL|0																																																																										BONUS:ABILITYPOOL|Cruelty|Cruelties										BONUS:VAR|Cruelties|min(CrueltyLVL/3,4)
-Channel Negative Energy	KEY:Channel Negative Energy ~ Antipaladin	CATEGORY:Special Ability	TYPE:SpecialAttack.Supernatural					SERVESAS:ABILITY=Special Ability|Channel Energy	DEFINE:ChannelEnergyPaladinDice|0	DEFINE:ChannelEnergyPaladinDC|0	DEFINE:ChannelEnergyPaladinLVL|0	DEFINE:ChannelEnergyPaladinDieSize|6	DEFINE:ChannelEnergyPaladinDC|0													DESC:You can unleash a wave of negative energy.																																														BONUS:VAR|ChannelEnergyPaladinDice|(ChannelEnergyPaladinLVL+1)/2	BONUS:VAR|ChannelEnergyPaladinDC|10+(ChannelEnergyPaladinLVL/2)+CHA					SOURCEPAGE:p.121	BENEFIT:You can unleash a wave of negative energy. You must choose to deal %1d%2 points of negative energy damage to living creatures or to heal undead creatures of %1d%2 points of damage. Creatures that take damage from channeled energy receive a DC %3 Will save to halve the damage. Using this ability consumes two uses of your Touch of Corruption ability.|ChannelEnergyPaladinDice|ChannelEnergyPaladinDieSize|ChannelEnergyPaladinDC
+Channel Negative Energy	KEY:Channel Negative Energy ~ Antipaladin	CATEGORY:Special Ability	TYPE:SpecialAttack.Supernatural					SERVESAS:ABILITY=Special Ability|Channel Energy|Channel Negative Energy		DEFINE:ChannelEnergyPaladinDice|0	DEFINE:ChannelEnergyPaladinDC|0	DEFINE:ChannelEnergyPaladinLVL|0	DEFINE:ChannelEnergyPaladinDieSize|6	DEFINE:ChannelEnergyPaladinDC|0													DESC:You can unleash a wave of negative energy.																																														BONUS:VAR|ChannelEnergyPaladinDice|(ChannelEnergyPaladinLVL+1)/2	BONUS:VAR|ChannelEnergyPaladinDC|10+(ChannelEnergyPaladinLVL/2)+CHA					SOURCEPAGE:p.121	BENEFIT:You can unleash a wave of negative energy. You must choose to deal %1d%2 points of negative energy damage to living creatures or to heal undead creatures of %1d%2 points of damage. Creatures that take damage from channeled energy receive a DC %3 Will save to halve the damage. Using this ability consumes two uses of your Touch of Corruption ability.|ChannelEnergyPaladinDice|ChannelEnergyPaladinDieSize|ChannelEnergyPaladinDC
 Unholy Champion		KEY:Unholy Champion ~ Antipaladin		CATEGORY:Special Ability	TYPE:SpecialQuality.Supernatural													DEFINE:UnholyChampionCasterLevel|HolyChampionLVL	DEFINE:UnholyChampionLVL|0																														DESC:You are a conduit for the might of the dark powers.																																									BONUS:DR|Good|5																												SOURCEPAGE:p.123	BENEFIT:You are a conduit for the might of the dark powers. Your DR increases to 10/good. Whenever you use Smite Good and successfully strike a good outsider, the outsider is also subject to a Banishment at caster level %1 (you weapon and unholy symbol automatically count as objects that the subject hates). After the Banishment effect and the damage from the attack is resolved, the smite immediately ends. In addition, whenever you channel negative energy or use touch of corruption to damage a creature, you deal the maximum possible amount.|UnholyChampionCasterLevel
 
 ###Block: Antipaladin Aura abilities

Modified: Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_feats_mods.lst
===================================================================
--- Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_feats_mods.lst	2011-05-28 16:19:13 UTC (rev 15048)
+++ Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/advanced_players_guide/pfapg_feats_mods.lst	2011-05-28 16:19:31 UTC (rev 15049)
@@ -146,6 +146,12 @@
 Command Undead.MOD	BONUS:VAR|CommandUndeadDC|1|PREABILITY:1,CATEGORY=Special Ability,Sacred Conduit ~ Trait
 Turn Undead.MOD		BONUS:VAR|TurnUndeadDC|1|PREABILITY:1,CATEGORY=Special Ability,Sacred Conduit ~ Trait
 
+# Improved Channeling adds a bonus to Life Oracle channel DC
+# Extra Channeling adds a bonus to Life Oracle daily limit
+Extra Channel.MOD	BONUS:VAR|ChannelEnergyOracleLifeTimes|2
+Improved Channel.MOD	BONUS:VAR|ChannelEnergyOracleLifeDC|2
+Turn Undead.MOD		BONUS:VAR|TurnUndeadDC|ChannelEnergyOracleLifeLVL/2
+
 #
 # End
 #


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