Thread: [pcgen-commit-svn] SF.net SVN: pcgen:[7606] Trunk/pcgen/outputsheets/base.xml

pcgen-commit-svn

[pcgen-commit-svn] SF.net SVN: pcgen:[7606] Trunk/pcgen/outputsheets/base.xml

From: <tir...@us...> - 2008-08-28 12:40:41

Revision: 7606
          http://pcgen.svn.sourceforge.net/pcgen/?rev=7606&view=rev
Author:   tir-gwaith
Date:     2008-08-28 12:40:51 +0000 (Thu, 28 Aug 2008)

Log Message:
-----------
[ 2067511 ] [PDF][Pathfinder] Add CMB table
Umm... CMB vars in base.xml.  Silly Wabbit...

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2008-08-28 11:52:27 UTC (rev 7605)
+++ Trunk/pcgen/outputsheets/base.xml	2008-08-28 12:40:51 UTC (rev 7606)
@@ -408,16 +408,39 @@
 			<epic_mod>|ATTACK.RANGED.EPIC|</epic_mod>
 			<temp_mod/>
 		</ranged>
-		<grapple>
-			<total>|ATTACK.GRAPPLE.TOTAL|</total>
-			<bab>|ATTACK.GRAPPLE.BASE|</bab>
-			<base_attack_bonus>|ATTACK.GRAPPLE|</base_attack_bonus>
-			<stat_mod>|ATTACK.GRAPPLE.STAT|</stat_mod>
-			<size_mod>|ATTACK.GRAPPLE.SIZE|</size_mod>
-			<misc_mod>|ATTACK.GRAPPLE.MISC|</misc_mod>
-			<epic_mod>|ATTACK.GRAPPLE.EPIC|</epic_mod>
-			<temp_mod/>
-		</grapple>
+		<!-- Either CMB block, or Grapple Block -->
+|IIF(HASVAR:CMB)|
+			<combat_maneuver>
+				<cmb>|VAR.CMB|</cmb>
+				<trip_base>|VAR.CMB_Trip|</trip_base>
+				<trip_defense>|VAR.CMB_Trip_DEF|</trip_defense>
+				<trip_attack>|VAR.CMB_Trip_OFF|</trip_attack>
+				<grapple_base>|VAR.CMB_Grapple|</grapple_base>
+				<grapple_defense>|VAR.CMB_Grapple_DEF|</grapple_defense>
+				<grapple_attack>|VAR.CMB_Grapple_OFF|</grapple_attack>
+				<bullrush_base>|VAR.CMB_Bull|</bullrush_base>
+				<bullrush_defense>|VAR.CMB_Bull_DEF|</bullrush_defense>
+				<bullrush_attack>|VAR.CMB_Bull_OFF|</bullrush_attack>
+				<sunder_base>|VAR.CMB_Sunder|</sunder_base>
+				<sunder_defense>|VAR.CMB_Sunder_DEF|</sunder_defense>
+				<sunder_attack>|VAR.CMB_Sunder_OFF|</sunder_attack>
+				<disarm_base>|VAR.CMB_Disarm|</disarm_base>
+				<disarm_defense>|VAR.CMB_Disarm_DEF|</disarm_defense>
+				<disarm_attack>|VAR.CMB_Disarm_OFF|</disarm_attack>
+			</combat_maneuver>
+|ELSE|
+			<grapple>
+				<total>|ATTACK.GRAPPLE.TOTAL|</total>
+				<bab>|ATTACK.GRAPPLE.BASE|</bab>
+				<base_attack_bonus>|ATTACK.GRAPPLE|</base_attack_bonus>
+				<stat_mod>|ATTACK.GRAPPLE.STAT|</stat_mod>
+				<size_mod>|ATTACK.GRAPPLE.SIZE|</size_mod>
+				<misc_mod>|ATTACK.GRAPPLE.MISC|</misc_mod>
+				<epic_mod>|ATTACK.GRAPPLE.EPIC|</epic_mod>
+				<temp_mod/>
+			</grapple>
+|ENDIF|
+		<!-- End CMB / Grapple Block -->
 	</attack>
 	<!--
 	  ====================================


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:[7607] Trunk/pcgen/outputsheets/base.xml

From: <tir...@us...> - 2008-08-28 13:18:26

Revision: 7607
          http://pcgen.svn.sourceforge.net/pcgen/?rev=7607&view=rev
Author:   tir-gwaith
Date:     2008-08-28 13:18:35 +0000 (Thu, 28 Aug 2008)

Log Message:
-----------
The correct version of CMB values, for reference in standard XSLT file

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2008-08-28 12:40:51 UTC (rev 7606)
+++ Trunk/pcgen/outputsheets/base.xml	2008-08-28 13:18:35 UTC (rev 7607)
@@ -390,6 +390,7 @@
 	<attack>
 		<melee>
 			<total>|ATTACK.MELEE.TOTAL|</total>
+			<total_short>|ATTACK.MELEE.TOTAL.SHORT|</total_short>
 			<bab>|ATTACK.MELEE.BASE|</bab>
 			<base_attack_bonus>|ATTACK.MELEE|</base_attack_bonus>
 			<stat_mod>|ATTACK.MELEE.STAT|</stat_mod>
@@ -410,24 +411,37 @@
 		</ranged>
 		<!-- Either CMB block, or Grapple Block -->
 |IIF(HASVAR:CMB)|
-			<combat_maneuver>
-				<cmb>|VAR.CMB|</cmb>
-				<trip_base>|VAR.CMB_Trip|</trip_base>
-				<trip_defense>|VAR.CMB_Trip_DEF|</trip_defense>
-				<trip_attack>|VAR.CMB_Trip_OFF|</trip_attack>
-				<grapple_base>|VAR.CMB_Grapple|</grapple_base>
-				<grapple_defense>|VAR.CMB_Grapple_DEF|</grapple_defense>
-				<grapple_attack>|VAR.CMB_Grapple_OFF|</grapple_attack>
-				<bullrush_base>|VAR.CMB_Bull|</bullrush_base>
-				<bullrush_defense>|VAR.CMB_Bull_DEF|</bullrush_defense>
-				<bullrush_attack>|VAR.CMB_Bull_OFF|</bullrush_attack>
-				<sunder_base>|VAR.CMB_Sunder|</sunder_base>
-				<sunder_defense>|VAR.CMB_Sunder_DEF|</sunder_defense>
-				<sunder_attack>|VAR.CMB_Sunder_OFF|</sunder_attack>
-				<disarm_base>|VAR.CMB_Disarm|</disarm_base>
-				<disarm_defense>|VAR.CMB_Disarm_DEF|</disarm_defense>
-				<disarm_attack>|VAR.CMB_Disarm_OFF|</disarm_attack>
-			</combat_maneuver>
+			<cmb>
+				<!-- Base stuff for standard block -->
+				<title>CMB</title>
+				<total>|VAR.CMB.INTVAL.SIGN|</total>
+				<bab>|ATTACK.MELEE.BASE|</bab>
+				<base_attack_bonus>|ATTACK.MELEE|</base_attack_bonus>
+				<stat_mod>|VAR.CMB_STAT.INTVAL.SIGN|</stat_mod>
+				<size_mod>|VAR.CMB_SizeMod.INTVAL.SIGN|</size_mod>
+				<misc_mod>|VAR.CMB-VAR.CMB_STAT-VAR.CMB_SizeMod.INTVAL.SIGN|</misc_mod>
+				<epic_mod/>
+				<temp_mod/>
+				<!-- Base values (not yet used) -->
+				<disarm_base>|VAR.CMB_Disarm.INTVAL.SIGN|</disarm_base>
+				<grapple_base>|VAR.CMB_Grapple.INTVAL.SIGN|</grapple_base>
+				<sunder_base>|VAR.CMB_Sunder.INTVAL.SIGN|</sunder_base>
+				<trip_base>|VAR.CMB_Trip.INTVAL.SIGN|</trip_base>
+				<bullrush_base>|VAR.CMB_Bull.INTVAL.SIGN|</bullrush_base>
+				<!-- Attack values -->
+				<bullrush_attack>|VAR.CMB_Bull_OFF.INTVAL.SIGN|</bullrush_attack>
+				<disarm_attack>|VAR.CMB_Disarm_OFF.INTVAL.SIGN|</disarm_attack>
+				<grapple_attack>|VAR.CMB_Grapple_OFF.INTVAL.SIGN|</grapple_attack>
+				<sunder_attack>|VAR.CMB_Sunder_OFF.INTVAL.SIGN|</sunder_attack>
+				<trip_attack>|VAR.CMB_Trip_OFF.INTVAL.SIGN|</trip_attack>
+				<!-- Defense values -->
+				<defense>|VAR.CMB+VAR.CMB_DEF.INTVAL|</defense>
+				<bullrush_defense>|VAR.CMB_Bull_DEF.INTVAL|</bullrush_defense>
+				<disarm_defense>|VAR.CMB_Disarm_DEF.INTVAL|</disarm_defense>
+				<grapple_defense>|VAR.CMB_Grapple_DEF.INTVAL|</grapple_defense>
+				<sunder_defense>|VAR.CMB_Sunder_DEF.INTVAL|</sunder_defense>
+				<trip_defense>|VAR.CMB_Trip_DEF.INTVAL|</trip_defense>
+			</cmb>
 |ELSE|
 			<grapple>
 				<total>|ATTACK.GRAPPLE.TOTAL|</total>


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:[7751] Trunk/pcgen/outputsheets/base.xml

From: <tir...@us...> - 2008-09-18 01:17:08

Revision: 7751
          http://pcgen.svn.sourceforge.net/pcgen/?rev=7751&view=rev
Author:   tir-gwaith
Date:     2008-09-18 01:17:19 +0000 (Thu, 18 Sep 2008)

Log Message:
-----------
[ 2067511 ] [PDF][Pathfinder] Add CMB table

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2008-09-18 00:08:41 UTC (rev 7750)
+++ Trunk/pcgen/outputsheets/base.xml	2008-09-18 01:17:19 UTC (rev 7751)
@@ -428,8 +428,10 @@
 				<sunder_base>|VAR.CMB_Sunder.INTVAL.SIGN|</sunder_base>
 				<trip_base>|VAR.CMB_Trip.INTVAL.SIGN|</trip_base>
 				<bullrush_base>|VAR.CMB_Bull.INTVAL.SIGN|</bullrush_base>
+				<overrun_base>|VAR.CMB_OverRun.INTVAL.SIGN|</overrun_base>
 				<!-- Attack values -->
 				<bullrush_attack>|VAR.CMB_Bull_OFF.INTVAL.SIGN|</bullrush_attack>
+				<overrun_attack>|VAR.CMB_OverRun_OFF.INTVAL.SIGN|</overrun_attack>
 				<disarm_attack>|VAR.CMB_Disarm_OFF.INTVAL.SIGN|</disarm_attack>
 				<grapple_attack>|VAR.CMB_Grapple_OFF.INTVAL.SIGN|</grapple_attack>
 				<sunder_attack>|VAR.CMB_Sunder_OFF.INTVAL.SIGN|</sunder_attack>
@@ -437,6 +439,7 @@
 				<!-- Defense values -->
 				<defense>|VAR.CMB+VAR.CMB_DEF.INTVAL|</defense>
 				<bullrush_defense>|VAR.CMB_Bull_DEF.INTVAL|</bullrush_defense>
+				<overrun_defense>|VAR.CMB_OverRun_DEF.INTVAL.SIGN|</overrun_defense>
 				<disarm_defense>|VAR.CMB_Disarm_DEF.INTVAL|</disarm_defense>
 				<grapple_defense>|VAR.CMB_Grapple_DEF.INTVAL|</grapple_defense>
 				<sunder_defense>|VAR.CMB_Sunder_DEF.INTVAL|</sunder_defense>


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:[7752] Trunk/pcgen/outputsheets/base.xml

From: Tir G. <tir...@gm...> - 2008-09-18 01:28:31

---------- Forwarded message ----------
From: Mail Delivery System <Mai...@ch...>
Date: Wed, Sep 17, 2008 at 8:24 PM
Subject: Mail delivery failed: returning message to sender
To: tir...@us...


This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

 pcg...@li...
   retry time not reached for any host after a long failure period

------ This is a copy of the message, including all the headers. ------

Return-path: <tir...@us...>
Received: from apache by bj8yhf1.ch3.sourceforge.com with local (Exim 4.69)
       (envelope-from <tir...@us...>)
       id 1Kg8FZ-0004je-Q2
       for pcg...@li...; Thu, 18 Sep 2008
01:24:05 +0000
MIME-Version: 1.0
From: tir...@us...
Errors-To: tir...@us...
To: pcg...@li...
Subject: SF.net SVN: pcgen:[7752] Trunk/pcgen/outputsheets/base.xml
X-Mailer: SVN::Notify 2.66: http://search.cpan.org/dist/SVN-Notify/
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <E1K...@bj...>
Date: Thu, 18 Sep 2008 01:24:05 +0000

Revision: 7752
         http://pcgen.svn.sourceforge.net/pcgen/?rev=7752&view=rev
Author:   tir-gwaith
Date:     2008-09-18 01:24:04 +0000 (Thu, 18 Sep 2008)

Log Message:
-----------
[ 2026509 ] add GameMode specific IIFs to base.xml

Modified Paths:
--------------
   Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml   2008-09-18 01:17:19 UTC (rev 7751)
+++ Trunk/pcgen/outputsheets/base.xml   2008-09-18 01:24:04 UTC (rev 7752)
@@ -266,7 +266,9 @@
               <natural>|AC.NaturalArmor|</natural>
               <class_bonus>|AC.ClassDefense|</class_bonus>
               <dodge_bonus>|AC.Dodge|</dodge_bonus>
+|IIF(isgamemode("Modern").OR.isgamemode("Darwins_World_2").OR.isgamemode("Sidewinder"))|
               <equipment_bonus>|AC.Equipment|</equipment_bonus>
+|ENDIF|
               <misc>|AC.Misc|</misc>
               <miss_chance/>
               <max_dex>|MAXDEX|</max_dex>


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



-- 
Tir Gwaith
PCGen LST Chimp

[pcgen-commit-svn] SF.net SVN: pcgen:[7773] Trunk/pcgen/outputsheets/base.xml

From: <edd...@us...> - 2008-09-22 16:49:02

Revision: 7773
          http://pcgen.svn.sourceforge.net/pcgen/?rev=7773&view=rev
Author:   eddyanthony
Date:     2008-09-22 16:48:40 +0000 (Mon, 22 Sep 2008)

Log Message:
-----------
[ 1830847 ] [PDF] New blocks for Special Attacks & Special Qualities

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2008-09-22 00:37:35 UTC (rev 7772)
+++ Trunk/pcgen/outputsheets/base.xml	2008-09-22 16:48:40 UTC (rev 7773)
@@ -1370,6 +1370,334 @@
 	<!--
 	  ====================================
 	  ====================================
+			SPECIAL QUALITIES
+	  ====================================
+	  ====================================-->
+
+	<special_qualities>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=SpecialQuality")==0)|
+|ELSE|
+	<!-- Standard Special Qualities -->
+|ENDIF|
+|FOR,%specialquality,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=SpecialQuality")-1,1,0|
+		<special_quality>
+|IIF(ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Extraordinary)|
+			<name>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ex)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Supernatural)|
+			<name>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Su)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:SpellLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Sp)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:PsiLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ps)</name>
+|ELSE|
+			<name>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.DESC|</description>
+			<type>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE|</type>
+			<associated>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATED|</associated>
+			<count>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</special_quality>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=SpecialQuality")==0)|
+|ELSE|
+	<!-- Automatic Special Qualities -->
+|ENDIF|
+|FOR,%specialquality,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=SpecialQuality")-1,1,0|
+		<special_quality>
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ex)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Su)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Sp)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ps)</name>
+|ELSE|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.DESC|</description>
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATEDCOUNT|</count>
+			<auto>T</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</special_quality>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=SpecialQuality")==0)|
+|ELSE|
+	<!-- Virtual Special Qualities -->
+|ENDIF|
+|FOR,%specialquality,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=SpecialQuality")-1,1,0|
+		<special_quality>
+|IIF(VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Extraordinary)|
+			<name>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ex)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Supernatural)|
+			<name>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Su)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:SpellLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Sp)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:PsiLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ps)</name>
+|ELSE|
+			<name>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.DESC|</description>
+			<type>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE|</type>
+			<associated>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATED|</associated>
+			<count>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>T</virtual>
+			<category>Special Ability</category>
+		</special_quality>
+|ENDFOR|
+	</special_qualities>
+
+	<!--
+	  ====================================
+	  ====================================
+			SPECIAL ATTACKS
+	  ====================================
+	  ====================================-->
+
+	<special_attacks>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=SpecialAttack")==0)|
+|ELSE|
+	<!-- Standard Special Attacks -->
+|ENDIF|
+|FOR,%specialattack,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=SpecialAttack")-1,1,0|
+		<special_attack>
+|IIF(ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Extraordinary)|
+			<name>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ex)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Supernatural)|
+			<name>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Su)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:SpellLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Sp)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:PsiLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ps)</name>
+|ELSE|
+			<name>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.DESC|</description>
+			<type>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE|</type>
+			<associated>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATED|</associated>
+			<count>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</special_attack>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=SpecialAttack")==0)|
+|ELSE|
+	<!-- Automatic Special Attacks -->
+|ENDIF|
+|FOR,%specialattack,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=SpecialAttack")-1,1,0|
+		<special_attack>
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ex)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Su)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Sp)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ps)</name>
+|ELSE|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.DESC|</description>
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATEDCOUNT|</count>
+			<auto>T</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</special_attack>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=SpecialAttack")==0)|
+|ELSE|
+	<!-- Virtual Special Attacks -->
+|ENDIF|
+|FOR,%specialattack,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=SpecialAttack")-1,1,0|
+		<special_attack>
+|IIF(VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Extraordinary)|
+			<name>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ex)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Supernatural)|
+			<name>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Su)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:SpellLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Sp)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:PsiLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ps)</name>
+|ELSE|
+			<name>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.DESC|</description>
+			<type>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE|</type>
+			<associated>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATED|</associated>
+			<count>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>T</virtual>
+			<category>Special Ability</category>
+		</special_attack>
+|ENDFOR|
+	</special_attacks>
+
+|IIF(count("ABILITIES";"CATEGORY=Salient Divine Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
+|ELSE|
+	<!--
+	  ====================================
+	  ====================================
+			SALIENT DIVINE ABILITIES
+	  ====================================
+	  ====================================-->
+	<salient_divine_abilities>
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Salient Divine Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
+		<salient_divine_ability>
+			<name>|ABILITY.Salient Divine Ability.VISIBLE.%ability|</name>
+			<description>|ABILITY.Salient Divine Ability.VISIBLE.%ability.DESC|</description>
+			<type>|ABILITY.Salient Divine Ability.VISIBLE.%ability.TYPE|</type>
+			<associated>|ABILITY.Salient Divine Ability.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|ABILITY.Salient Divine Ability.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Salient Divine Ability</category>
+		</salient_divine_ability>
+	</salient_divine_abilities>
+|ENDFOR|
+|ENDIF|
+
+|IIF(count("ABILITIES";"CATEGORY=Mutation";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
+|ELSE|
+	<!--
+	  ====================================
+	  ====================================
+			MUTATIONS
+	  ====================================
+	  ====================================-->
+	<mutations>
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Mutation","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
+		<mutation>
+			<name>|ABILITY.Mutation.VISIBLE.%ability|</name>
+			<description>|ABILITY.Mutation.VISIBLE.%ability.DESC|</description>
+			<type>|ABILITY.Mutation.VISIBLE.%ability.TYPE|</type>
+			<associated>|ABILITY.Mutation.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|ABILITY.Mutation.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Mutation</category>
+		</mutation>
+|ENDFOR|
+	</mutations>
+|ENDIF|
+
+	<!--
+	  ====================================
+	  ====================================
+			TALENTS
+	  ====================================
+	  ====================================-->
+	<talents>
+|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
+|ELSE|
+	<!-- Visible Standard "Talent" Ability Objects -->
+|ENDIF|
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
+		<talent>
+			<name>|ABILITY.Talent.VISIBLE.%ability|</name>
+			<description>|ABILITY.Talent.VISIBLE.%ability.DESC|</description>
+			<type>|ABILITY.Talent.VISIBLE.%ability.TYPE|</type>
+			<associated>|ABILITY.Talent.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|ABILITY.Talent.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Talent</category>
+		</talent>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC")==0)|
+|ELSE|
+	<!-- Visible Automatic "Talent" Ability Objects -->
+|ENDIF|
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC")-1,1,0|
+		<talent>
+			<name>|ABILITYAUTO.Talent.VISIBLE.%ability|</name>
+			<description>|ABILITYAUTO.Talent.VISIBLE.%ability.DESC|</description>
+			<type>|ABILITYAUTO.Talent.VISIBLE.%ability.TYPE|</type>
+			<associated>|ABILITYAUTO.Talent.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Talent.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>T</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Talent</category>
+		</talent>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL")==0)|
+|ELSE|
+	<!-- Visible Virtual "Talent" Ability Objects -->
+|ENDIF|
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL")-1,1,0|
+		<talent>
+			<name>|VABILITY.Talent.VISIBLE.%ability|</name>
+			<description>|VABILITY.Talent.VISIBLE.%ability.DESC|</description>
+			<type>|VABILITY.Talent.VISIBLE.%ability.TYPE|</type>
+			<associated>|VABILITY.Talent.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|VABILITY.Talent.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>T</virtual>
+			<category>Talent</category>
+		</talent>
+|ENDFOR|
+	</talents>
+
+	<!--
+	  ====================================
+	  ====================================
 			ABILITY OBJECTS
 	  ====================================
 	  ====================================-->


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:[11605] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2010-04-08 16:18:32

Revision: 11605
          http://pcgen.svn.sourceforge.net/pcgen/?rev=11605&view=rev
Author:   amaitland
Date:     2010-04-08 16:18:25 +0000 (Thu, 08 Apr 2010)

Log Message:
-----------
updates indicated...

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2010-04-08 16:11:33 UTC (rev 11604)
+++ Trunk/pcgen/outputsheets/base.xml	2010-04-08 16:18:25 UTC (rev 11605)
@@ -46,8 +46,14 @@
 		<name>|NAME|</name>
 		<followerof>|FOLLOWEROF|</followerof>
 		<playername>|PLAYERNAME|</playername>
-		<action_points>|VAR.ACTION.INTVAL|</action_points>
-		<remaining_action_points>|VAR.ACTIONREMAIN.INTVAL|</remaining_action_points>
+			<action_points>|VAR.ACTION.INTVAL|</action_points>
+			<remaining_action_points>|VAR.ACTIONREMAIN.INTVAL|</remaining_action_points>
+				<actionpoints>
+					<maximum>|VAR.ACTION.INTVAL|</maximum>
+					<used>|VAR.ACTIONUSED.INTVAL|</used>
+					<dicecount>|VAR.ACTIONDICECOUNT.INTVAL|</dicecount>
+					<dicesize>|VAR.ACTIONDICESIZE.INTVAL|</dicesize>
+				</actionpoints>
 		<age>|AGE|</age>
 		<alignment>
 			<long>|ALIGNMENT|</long>
@@ -99,6 +105,11 @@
 		<eyes>
 			<color>|COLOR.EYE|</color>
 		</eyes>
+		<faith_points>|VAR.FAITHPOINTS.INTVAL|</faith_points>
+		<hero_points>|VAR.HEROPOINTS.INTVAL|</hero_points>
+		<inspiration_points>|VAR.INSPIRATIONPOINTS.INTVAL|</inspiration_points>
+		<spin_points>|VAR.SPINPOINTS.INTVAL|</spin_points>
+
 		<hair>
 			<color>|COLOR.HAIR|</color>
 			<length>|LENGTH.HAIR|</length>
@@ -567,7 +578,7 @@
 <!-- Spirit Weapon - Ranged -->
 |IIF(VAR.UseSpiritWeaponRanged:1)|
 		<spiritweaponranged>
-			<total>|VAR.SpiritWeaponRangedToHit.INTVAL|</total>
+			<total>+|VAR.SpiritWeaponRangedToHit.INTVAL|</total>
 |IIF(VAR.SpiritWeaponRangedBonusDamage<0)|
 			<damage>|VAR.SpiritWeaponRangedDie.INTVAL|d|VAR.SpiritWeaponRangedDieSize.INTVAL|-|VAR.SpiritWeaponRangedBonusDamage.INTVAL|</damage>
 |ELSE|
@@ -1564,6 +1575,8 @@
 		</talent>	
 |ENDFOR|
 	</talents>
+
+
 	<!--
 	  ====================================
 	  ====================================
@@ -1951,9 +1964,9 @@
 |IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Sustain:Y)|
 			<sustain>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Sustain|</sustain>
 |ENDIF|
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASSOCIATEDCOUNT|</count>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
@@ -2026,9 +2039,9 @@
 |IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Sustain:Y)|
 			<sustain>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Sustain|</sustain>
 |ENDIF|
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASSOCIATEDCOUNT|</count>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>


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:[15595] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2011-12-01 08:06:04

Revision: 15595
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15595&view=rev
Author:   amaitland
Date:     2011-12-01 08:05:58 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Pathfinder Core: Shield Master -- OS Base Work; improvements

Issue#: DATA-450

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2011-12-01 08:05:18 UTC (rev 15594)
+++ Trunk/pcgen/outputsheets/base.xml	2011-12-01 08:05:58 UTC (rev 15595)
@@ -644,7 +644,7 @@
 |FOR,%NaturalAttack,0,count("ABILITIES","CATEGORY=Natural Attack","TYPE=NaturalAttack")-1,1,0|
 	<naturalattack>	
 		<name>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackName|</name>
-		<tohit>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackToHit|</tohit>
+		<tohit>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackToHit.SIGN|</tohit>
 		<damage>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackDamage||ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackDamageBonus.SIGN|</damage>
 		<reach>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackReach.INTVAL|</reach>
 		<notes>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackNotes||ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.DESC|</notes>

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:[15640] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2011-12-10 09:02:00

Revision: 15640
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15640&view=rev
Author:   amaitland
Date:     2011-12-10 09:01:54 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
3.5 Paladin is getting two Lay on Hands OS Blocks

Issue#: OS-150

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2011-12-10 08:25:14 UTC (rev 15639)
+++ Trunk/pcgen/outputsheets/base.xml	2011-12-10 09:01:54 UTC (rev 15640)
@@ -1256,7 +1256,7 @@
 		</layonhands>
 |%|
 
-|%VAR.LayOnHandsLVL.GTEQ.1| <!-- Pathfinder -->
+|%VAR.LayOnHandsTimes.GTEQ.1| <!-- Pathfinder -->
 		<layonhands>
 			<hp_per_day>|VAR.LayOnHandsTimes.INTVAL|</hp_per_day>
 			<hp_per_day.title>Uses per day</hp_per_day.title>
@@ -3066,10 +3066,10 @@
 			<willpower>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.2.TOTAL|</willpower>
 			<initiative_mod>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.INITIATIVEMOD|</initiative_mod>
 			<special_properties>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.SPECIALLIST|</special_properties>
-|FOR,%trick,0,COUNT[FOLLOWERTYPE.FOLLOWER.%companion.TYPE=AnimalTrick]-1,1,0|
 			<trick>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.ABILITYALL.Special Ability.VISIBLE.%animalTrick.TYPE=AnimalTrick|</trick>
+|FOR,%trick,0,COUNT[FOLLOWERTYPE.FOLLOWER.%companion.ABILITYALL.Special Ability.VISIBLE.%animalTrick.TYPE=AnimalTrick]-1,1,0|
 |ENDFOR|
-
+|ENDFOR|
 			<attacks>
 |FOR,%weap,0,COUNT[FOLLOWERTYPE.ANIMAL COMPANION.%companion.EQTYPE.WEAPON]-1,1,0|
 				<attack>

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:[7980] Trunk/pcgen/outputsheets/base.xml

From: <tir...@us...> - 2008-10-06 19:51:52

Revision: 7980
          http://pcgen.svn.sourceforge.net/pcgen/?rev=7980&view=rev
Author:   tir-gwaith
Date:     2008-10-06 19:49:10 +0000 (Mon, 06 Oct 2008)

Log Message:
-----------
[ 2067511 ] [PDF][Pathfinder] Add CMB table
Minor tweaks to keep me from going insane (order xml data same as on the PDF output), begin moving check for CMB output to an ability object (HASFEAT currently, so must be CATEGORY:FEAT, at least for the moment.)

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2008-10-06 18:20:23 UTC (rev 7979)
+++ Trunk/pcgen/outputsheets/base.xml	2008-10-06 19:49:10 UTC (rev 7980)
@@ -412,7 +412,7 @@
 			<temp_mod/>
 		</ranged>
 		<!-- Either CMB block, or Grapple Block -->
-|IIF(HASVAR:CMB)|
+|IIF(HASVAR:CMB.OR.HASFEAT:CMB Output)|
 			<cmb>
 				<!-- Base stuff for standard block -->
 				<title>CMB</title>
@@ -425,27 +425,27 @@
 				<epic_mod/>
 				<temp_mod/>
 				<!-- Base values (not yet used) -->
+				<grapple_base>|VAR.CMB_Grapple.INTVAL.SIGN|</grapple_base>
+				<trip_base>|VAR.CMB_Trip.INTVAL.SIGN|</trip_base>
 				<disarm_base>|VAR.CMB_Disarm.INTVAL.SIGN|</disarm_base>
-				<grapple_base>|VAR.CMB_Grapple.INTVAL.SIGN|</grapple_base>
 				<sunder_base>|VAR.CMB_Sunder.INTVAL.SIGN|</sunder_base>
-				<trip_base>|VAR.CMB_Trip.INTVAL.SIGN|</trip_base>
 				<bullrush_base>|VAR.CMB_Bull.INTVAL.SIGN|</bullrush_base>
-				<overrun_base>|VAR.CMB_OverRun.INTVAL.SIGN|</overrun_base>
+				<overrun_base>|VAR.CMB_Overrun.INTVAL.SIGN|</overrun_base>
 				<!-- Attack values -->
-				<bullrush_attack>|VAR.CMB_Bull_OFF.INTVAL.SIGN|</bullrush_attack>
-				<overrun_attack>|VAR.CMB_OverRun_OFF.INTVAL.SIGN|</overrun_attack>
+				<grapple_attack>|VAR.CMB_Grapple_OFF.INTVAL.SIGN|</grapple_attack>
+				<trip_attack>|VAR.CMB_Trip_OFF.INTVAL.SIGN|</trip_attack>
 				<disarm_attack>|VAR.CMB_Disarm_OFF.INTVAL.SIGN|</disarm_attack>
-				<grapple_attack>|VAR.CMB_Grapple_OFF.INTVAL.SIGN|</grapple_attack>
 				<sunder_attack>|VAR.CMB_Sunder_OFF.INTVAL.SIGN|</sunder_attack>
-				<trip_attack>|VAR.CMB_Trip_OFF.INTVAL.SIGN|</trip_attack>
+				<bullrush_attack>|VAR.CMB_Bull_OFF.INTVAL.SIGN|</bullrush_attack>
+				<overrun_attack>|VAR.CMB_Overrun_OFF.INTVAL.SIGN|</overrun_attack>
 				<!-- Defense values -->
 				<defense>|VAR.CMB+VAR.CMB_DEF.INTVAL|</defense>
-				<bullrush_defense>|VAR.CMB_Bull_DEF.INTVAL|</bullrush_defense>
-				<overrun_defense>|VAR.CMB_OverRun_DEF.INTVAL.SIGN|</overrun_defense>
+				<grapple_defense>|VAR.CMB_Grapple_DEF.INTVAL|</grapple_defense>
+				<trip_defense>|VAR.CMB_Trip_DEF.INTVAL|</trip_defense>
 				<disarm_defense>|VAR.CMB_Disarm_DEF.INTVAL|</disarm_defense>
-				<grapple_defense>|VAR.CMB_Grapple_DEF.INTVAL|</grapple_defense>
 				<sunder_defense>|VAR.CMB_Sunder_DEF.INTVAL|</sunder_defense>
-				<trip_defense>|VAR.CMB_Trip_DEF.INTVAL|</trip_defense>
+				<bullrush_defense>|VAR.CMB_Bull_DEF.INTVAL|</bullrush_defense>
+				<overrun_defense>|VAR.CMB_Overrun_DEF.INTVAL|</overrun_defense>
 			</cmb>
 |ELSE|
 			<grapple>


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:[9460] Trunk/pcgen/outputsheets/base.xml

From: <tir...@us...> - 2009-02-21 17:51:51

Revision: 9460
          http://pcgen.svn.sourceforge.net/pcgen/?rev=9460&view=rev
Author:   tir-gwaith
Date:     2009-02-21 17:51:46 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
minor cleanup.  Checking merging of files.

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-02-21 14:07:22 UTC (rev 9459)
+++ Trunk/pcgen/outputsheets/base.xml	2009-02-21 17:51:46 UTC (rev 9460)
@@ -969,7 +969,7 @@
 		<damage>|ABILITYALL.Special Ability.%turncount.TYPE=Turning.ASPECT.TurnDamage|</damage>
 		<uses_per_day>|ABILITYALL.Special Ability.%turncount.TYPE=Turning.ASPECT.TurnTimes.INTVAL|</uses_per_day>
 		<notes>|ABILITYALL.Special Ability.%turncount.TYPE=Turning.ASPECT.TurnNotes|</notes>
-	</turning>
+		</turning>
 |ENDIF|
 |ENDFOR|
 


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:[9473] Trunk/pcgen/outputsheets/base.xml

From: <tir...@us...> - 2009-02-21 23:08:36

Revision: 9473
          http://pcgen.svn.sourceforge.net/pcgen/?rev=9473&view=rev
Author:   tir-gwaith
Date:     2009-02-21 23:08:31 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
MISC mod definition was not removing BAB.

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-02-21 22:46:53 UTC (rev 9472)
+++ Trunk/pcgen/outputsheets/base.xml	2009-02-21 23:08:31 UTC (rev 9473)
@@ -423,7 +423,7 @@
 				<base_attack_bonus>|ATTACK.MELEE|</base_attack_bonus>
 				<stat_mod>|VAR.CMB_STAT.INTVAL.SIGN|</stat_mod>
 				<size_mod>|VAR.CMB_SizeMod.INTVAL.SIGN|</size_mod>
-				<misc_mod>|VAR.CMB-VAR.CMB_STAT-VAR.CMB_SizeMod.INTVAL.SIGN|</misc_mod>
+				<misc_mod>|VAR.CMB-ATTACK.MELEE.BASE-VAR.CMB_STAT-VAR.CMB_SizeMod.INTVAL.SIGN|</misc_mod>
 				<epic_mod/>
 				<temp_mod/>
 				<!-- Base values (not yet used) -->


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:[9772] Trunk/pcgen/outputsheets/base.xml

From: <kar...@us...> - 2009-03-24 10:46:54

Revision: 9772
          http://pcgen.svn.sourceforge.net/pcgen/?rev=9772&view=rev
Author:   karianna
Date:     2009-03-24 10:46:51 +0000 (Tue, 24 Mar 2009)

Log Message:
-----------
https://sourceforge.net/tracker/?func=detail&aid=2709113&group_id=25576&atid=748296 - DM Notes incorrect filtering

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-03-24 10:45:39 UTC (rev 9771)
+++ Trunk/pcgen/outputsheets/base.xml	2009-03-24 10:46:51 UTC (rev 9772)
@@ -182,6 +182,7 @@
 		<notes>
 |FOR,%note,0,COUNT[NOTES]-1,1,0|
 |IIF(NOTE.%note.NAME:DM Notes)|
+|ELSE|
 			<note>
 				<name>|NOTE.%note.NAME|</name>
 				<value>|NOTE.%note.VALUE.|</value>


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:[10541] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2009-09-17 01:49:36

Revision: 10541
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10541&view=rev
Author:   amaitland
Date:     2009-09-17 01:49:18 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
Add support for 4e, SWSE and fix errors discovered

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-09-16 13:07:27 UTC (rev 10540)
+++ Trunk/pcgen/outputsheets/base.xml	2009-09-17 01:49:18 UTC (rev 10541)
@@ -1491,55 +1491,66 @@
 |ENDFOR|
 	</special_attacks>
 
-|IIF(count("ABILITIES";"CATEGORY=Salient Divine Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
-|ELSE|
+
 	<!--
 	  ====================================
 	  ====================================
-			SALIENT DIVINE ABILITIES
+			DISADVANTAGES
 	  ====================================
 	  ====================================-->
-	<salient_divine_abilities>
-|FOR,%ability,0,count("ABILITIES","CATEGORY=Salient Divine Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
-		<salient_divine_ability>
-			<name>|ABILITY.Salient Divine Ability.VISIBLE.%ability|</name>
-			<description>|ABILITY.Salient Divine Ability.VISIBLE.%ability.DESC|</description>
-			<type>|ABILITY.Salient Divine Ability.VISIBLE.%ability.TYPE|</type>
-			<associated>|ABILITY.Salient Divine Ability.VISIBLE.%ability.ASSOCIATED|</associated>
-			<count>|ABILITY.Salient Divine Ability.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+	<disadvantages>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=Disadvantage")==0)|
+|ELSE|
+	<!-- Standard Disadvantages -->
+|ENDIF|
+|FOR,%disadvantage,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=Disadvantage")-1,1,0|
+		<disadvantage>
+			<name>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage|</name>
+			<description>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.DESC|</description>
+			<type>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.TYPE|</type>
+			<associated>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATED|</associated>
+			<count>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
-			<category>Salient Divine Ability</category>
-		</salient_divine_ability>
-	</salient_divine_abilities>
+			<category>Special Ability</category>
+		</disadvantage>
 |ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Disadvantage")==0)|
+|ELSE|
+	<!-- Automatic Disadvantages -->
 |ENDIF|
-
-|IIF(count("ABILITIES";"CATEGORY=Mutation";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
+|FOR,%disadvantage,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=Disadvantage")-1,1,0|
+		<disadvantage>
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage|</name>
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.DESC|</description>
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATEDCOUNT|</count>
+			<auto>T</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</disadvantage>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Disadvantage")==0)|
 |ELSE|
-	<!--
-	  ====================================
-	  ====================================
-			MUTATIONS
-	  ====================================
-	  ====================================-->
-	<mutations>
-|FOR,%ability,0,count("ABILITIES","CATEGORY=Mutation","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
-		<mutation>
-			<name>|ABILITY.Mutation.VISIBLE.%ability|</name>
-			<description>|ABILITY.Mutation.VISIBLE.%ability.DESC|</description>
-			<type>|ABILITY.Mutation.VISIBLE.%ability.TYPE|</type>
-			<associated>|ABILITY.Mutation.VISIBLE.%ability.ASSOCIATED|</associated>
-			<count>|ABILITY.Mutation.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+	<!-- Virtual Disadvantages -->
+|ENDIF|
+|FOR,%disadvantage,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=Disadvantage")-1,1,0|
+		<disadvantage>
+			<name>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage|</name>
+			<description>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.DESC|</description>
+			<type>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.TYPE|</type>
+			<associated>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATED|</associated>
+			<count>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
-			<virtual>F</virtual>
-			<category>Mutation</category>
-		</mutation>
+			<virtual>T</virtual>
+			<category>Special Ability</category>
+		</disadvantage>
 |ENDFOR|
-	</mutations>
-|ENDIF|
+	</disadvantages>
 
 	<!--
 	  ====================================
@@ -1547,52 +1558,101 @@
 			TALENTS
 	  ====================================
 	  ====================================-->
+
 	<talents>
-|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=Talent")==0)|
 |ELSE|
-	<!-- Visible Standard "Talent" Ability Objects -->
+	<!-- Standard Talents -->
 |ENDIF|
-|FOR,%ability,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
+|FOR,%specialquality,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=Talent")-1,1,0|
 		<talent>
-			<name>|ABILITY.Talent.VISIBLE.%ability|</name>
-			<description>|ABILITY.Talent.VISIBLE.%ability.DESC|</description>
-			<type>|ABILITY.Talent.VISIBLE.%ability.TYPE|</type>
-			<associated>|ABILITY.Talent.VISIBLE.%ability.ASSOCIATED|</associated>
-			<count>|ABILITY.Talent.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+|IIF(ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Extraordinary)|
+			<name>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Ex)</name>
+|ELSE|
+|IIF(ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Supernatural)|
+			<name>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Su)</name>
+|ELSE|
+|IIF(ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:SpellLike)|
+			<name>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Sp)</name>
+|ELSE|
+|IIF(ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:PsiLike)|
+			<name>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Ps)</name>
+|ELSE|
+			<name>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.DESC|</description>
+			<type>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE|</type>
+			<associated>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATED|</associated>
+			<count>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-		</talent>
+		</talent>	
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Talent")==0)|
 |ELSE|
-	<!-- Visible Automatic "Talent" Ability Objects -->
+	<!-- Automatic Talents -->
 |ENDIF|
-|FOR,%ability,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC")-1,1,0|
+|FOR,%talent,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=Talent")-1,1,0|
 		<talent>
-			<name>|ABILITYAUTO.Talent.VISIBLE.%ability|</name>
-			<description>|ABILITYAUTO.Talent.VISIBLE.%ability.DESC|</description>
-			<type>|ABILITYAUTO.Talent.VISIBLE.%ability.TYPE|</type>
-			<associated>|ABILITYAUTO.Talent.VISIBLE.%ability.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Talent.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+|IIF(ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent| (Ex)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent| (Su)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent| (Sp)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent| (Ps)</name>
+|ELSE|
+			<name>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.DESC|</description>
+			<type>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.TYPE|</type>
+			<associated>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATEDCOUNT|</count>
 			<auto>T</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-		</talent>
+		</talent>	
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Talent")==0)|
 |ELSE|
-	<!-- Visible Virtual "Talent" Ability Objects -->
+	<!-- Virtual Talents -->
 |ENDIF|
-|FOR,%ability,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL")-1,1,0|
+|FOR,%talent,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=Talent")-1,1,0|
 		<talent>
-			<name>|VABILITY.Talent.VISIBLE.%ability|</name>
-			<description>|VABILITY.Talent.VISIBLE.%ability.DESC|</description>
-			<type>|VABILITY.Talent.VISIBLE.%ability.TYPE|</type>
-			<associated>|VABILITY.Talent.VISIBLE.%ability.ASSOCIATED|</associated>
-			<count>|VABILITY.Talent.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+|IIF(VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Extraordinary)|
+			<name>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Ex)</name>
+|ELSE|
+|IIF(VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Supernatural)|
+			<name>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Su)</name>
+|ELSE|
+|IIF(VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:SpellLike)|
+			<name>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Sp)</name>
+|ELSE|
+|IIF(VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:PsiLike)|
+			<name>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Ps)</name>
+|ELSE|
+			<name>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.DESC|</description>
+			<type>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE|</type>
+			<associated>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATED|</associated>
+			<count>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>T</virtual>
@@ -1601,9 +1661,494 @@
 |ENDFOR|
 	</talents>
 
+
+
+
 	<!--
 	  ====================================
 	  ====================================
+			4e Powers - At-Will
+	  ====================================
+	  ====================================-->
+
+	<powers_atwills>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=AtWill")==0)|
+|ELSE|
+	<!-- Standard At Will Powers -->
+|ENDIF|
+|FOR,%atwill,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=AtWill")-1,1,0|
+		<powers_atwill>
+|IIF(ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Extraordinary)|
+			<name>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ex)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Supernatural)|
+			<name>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Su)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:SpellLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Sp)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:PsiLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ps)</name>
+|ELSE|
+			<name>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.DESC|</description>
+			<type>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE|</type>
+			<associated>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATED|</associated>
+			<count>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</powers_atwill>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=AtWill")==0)|
+|ELSE|
+	<!-- Automatic At Will Powers -->
+|ENDIF|
+|FOR,%atwill,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=AtWill")-1,1,0|
+		<powers_atwill>
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ex)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Su)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Sp)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ps)</name>
+|ELSE|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.DESC|</description>
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATEDCOUNT|</count>
+			<auto>T</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</powers_atwill>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=AtWill")==0)|
+|ELSE|
+	<!-- Virtual At Will Powers -->
+|ENDIF|
+|FOR,%atwill,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=AtWill")-1,1,0|
+		<powers_atwill>
+|IIF(VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Extraordinary)|
+			<name>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ex)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Supernatural)|
+			<name>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Su)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:SpellLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Sp)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:PsiLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ps)</name>
+|ELSE|
+			<name>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.DESC|</description>
+			<type>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE|</type>
+			<associated>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATED|</associated>
+			<count>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>T</virtual>
+			<category>Special Ability</category>
+		</powers_atwill>
+|ENDFOR|
+	</powers_atwills>
+	<!--
+	  ====================================
+	  ====================================
+			4e Powers - Encounter
+	  ====================================
+	  ====================================-->
+
+	<powers_encounters>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=Encounter")==0)|
+|ELSE|
+	<!-- Standard Encounter Powers -->
+|ENDIF|
+|FOR,%encounter,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=Encounter")-1,1,0|
+		<powers_encounter>
+|IIF(ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:Extraordinary)|
+			<name>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Ex)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:Supernatural)|
+			<name>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Su)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:SpellLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Sp)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:PsiLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Ps)</name>
+|ELSE|
+			<name>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.DESC|</description>
+			<type>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE|</type>
+			<associated>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASSOCIATED|</associated>
+			<count>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</powers_encounter>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Encounter")==0)|
+|ELSE|
+	<!-- Automatic Encounter Powers -->
+|ENDIF|
+|FOR,%encounter,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=Encounter")-1,1,0|
+		<powers_encounter>
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Ex)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Su)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Sp)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Ps)</name>
+|ELSE|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.DESC|</description>
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASSOCIATEDCOUNT|</count>
+			<auto>T</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</powers_encounter>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Encounter")==0)|
+|ELSE|
+	<!-- Virtual Encounter Powers -->
+|ENDIF|
+|FOR,%encounter,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=Encounter")-1,1,0|
+		<powers_encounter>
+|IIF(VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:Extraordinary)|
+			<name>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Ex)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:Supernatural)|
+			<name>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Su)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:SpellLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Sp)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE:PsiLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter| (Ps)</name>
+|ELSE|
+			<name>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.DESC|</description>
+			<type>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE|</type>
+			<associated>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASSOCIATED|</associated>
+			<count>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>T</virtual>
+			<category>Special Ability</category>
+		</powers_encounter>
+|ENDFOR|
+	</powers_encounters>
+	<!--
+	  ====================================
+	  ====================================
+			4e Powers - Daily
+	  ====================================
+	  ====================================-->
+
+	<powers_dailies>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=Daily")==0)|
+|ELSE|
+	<!-- Standard Daily Powers -->
+|ENDIF|
+|FOR,%daily,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=Daily")-1,1,0|
+		<powers_daily>
+|IIF(ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:Extraordinary)|
+			<name>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily| (Ex)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:Supernatural)|
+			<name>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily| (Su)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:SpellLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily| (Sp)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:PsiLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily| (Ps)</name>
+|ELSE|
+			<name>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.DESC|</description>
+			<type>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE|</type>
+			<associated>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.ASSOCIATED|</associated>
+			<count>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</powers_daily>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Daily")==0)|
+|ELSE|
+	<!-- Automatic Daily Powers -->
+|ENDIF|
+|FOR,%daily,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=Daily")-1,1,0|
+		<powers_daily>
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily| (Ex)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily| (Su)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily| (Sp)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily| (Ps)</name>
+|ELSE|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.DESC|</description>
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.ASSOCIATEDCOUNT|</count>
+			<auto>T</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</powers_daily>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Daily")==0)|
+|ELSE|
+	<!-- Virtual Daily Powers -->
+|ENDIF|
+|FOR,%daily,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=Daily")-1,1,0|
+		<powers_daily>
+|IIF(VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:Extraordinary)|
+			<name>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily| (Ex)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:Supernatural)|
+			<name>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily| (Su)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:SpellLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily| (Sp)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE:PsiLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily| (Ps)</name>
+|ELSE|
+			<name>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.DESC|</description>
+			<type>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE|</type>
+			<associated>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.ASSOCIATED|</associated>
+			<count>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>T</virtual>
+			<category>Special Ability</category>
+		</powers_daily>
+|ENDFOR|
+	</powers_dailies>
+	<!--
+	  ====================================
+	  ====================================
+			4e Powers - Utility
+	  ====================================
+	  ====================================-->
+
+	<powers_utilities>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=Utility")==0)|
+|ELSE|
+	<!-- Standard Utility Powers -->
+|ENDIF|
+|FOR,%utility,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=Utility")-1,1,0|
+		<powers_utility>
+|IIF(ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:Extraordinary)|
+			<name>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility| (Ex)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:Supernatural)|
+			<name>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility| (Su)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:SpellLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility| (Sp)</name>
+|ELSE|
+|IIF(ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:PsiLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility| (Ps)</name>
+|ELSE|
+			<name>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.DESC|</description>
+			<type>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE|</type>
+			<associated>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.ASSOCIATED|</associated>
+			<count>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</powers_utility>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Utility")==0)|
+|ELSE|
+	<!-- Automatic Utility Powers -->
+|ENDIF|
+|FOR,%utility,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=Utility")-1,1,0|
+		<powers_utility>
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility| (Ex)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility| (Su)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility| (Sp)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility| (Ps)</name>
+|ELSE|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.DESC|</description>
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.ASSOCIATEDCOUNT|</count>
+			<auto>T</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</powers_utility>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Utility")==0)|
+|ELSE|
+	<!-- Virtual Utility Powers -->
+|ENDIF|
+|FOR,%utility,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=Utility")-1,1,0|
+		<powers_utility>
+|IIF(VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:Extraordinary)|
+			<name>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility| (Ex)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:Supernatural)|
+			<name>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility| (Su)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:SpellLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility| (Sp)</name>
+|ELSE|
+|IIF(VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE:PsiLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility| (Ps)</name>
+|ELSE|
+			<name>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.DESC|</description>
+			<type>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE|</type>
+			<associated>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.ASSOCIATED|</associated>
+			<count>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>T</virtual>
+			<category>Special Ability</category>
+		</powers_utility>
+|ENDFOR|
+	</powers_utilities>
+	<!--
+	  ====================================
+	  ====================================
+			SALIENT DIVINE ABILITIES
+	  ====================================
+	  ====================================-->
+|IIF(count("ABILITIES";"CATEGORY=Salient Divine Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
+|ELSE|
+<salient_divine_abilities>
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Salient Divine Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
+		<salient_divine_ability>
+			<name>|ABILITY.Salient Divine Ability.VISIBLE.%ability|</name>
+			<description>|ABILITY.Salient Divine Ability.VISIBLE.%ability.DESC|</description>
+			<type>|ABILITY.Salient Divine Ability.VISIBLE.%ability.TYPE|</type>
+			<associated>|ABILITY.Salient Divine Ability.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|ABILITY.Salient Divine Ability.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Salient Divine Ability</category>
+		</salient_divine_ability>
+	</salient_divine_abilities>
+|ENDFOR|
+|ENDIF|
+
+|IIF(count("ABILITIES";"CATEGORY=Mutation";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
+|ELSE|
+	<!--
+	  ====================================
+	  ====================================
+			MUTATIONS
+	  ====================================
+	  ====================================-->
+	<mutations>
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Mutation","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
+		<mutation>
+			<name>|ABILITY.Mutation.VISIBLE.%ability|</name>
+			<description>|ABILITY.Mutation.VISIBLE.%ability.DESC|</description>
+			<type>|ABILITY.Mutation.VISIBLE.%ability.TYPE|</type>
+			<associated>|ABILITY.Mutation.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|ABILITY.Mutation.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Mutation</category>
+		</mutation>
+|ENDFOR|
+	</mutations>
+|ENDIF|
+
+	<!--
+	  ====================================
+	  ====================================
 			ABILITY OBJECTS
 	  ====================================
 	  ====================================-->
@@ -1745,6 +2290,112 @@
 			<category>Mutation</category>
 		</ability_object>
 |ENDFOR|
+<!-- Begin Andrew Edit -->
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
+|ELSE|
+	<!-- Visible Standard "Disadvantage" Ability Objects -->
+|ENDIF|
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
+		<ability_object>
+			<name>|ABILITY.Special Ability.VISIBLE.%ability|</name>
+			<description>|ABILITY.Special Ability.VISIBLE.%ability.DESC|</description>
+			<type>|ABILITY.Special Ability.VISIBLE.%ability.TYPE|</type>
+			<associated>|ABILITY.Special Ability.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|ABILITY.Special Ability.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</ability_object>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC")==0)|
+|ELSE|
+	<!-- Visible Automatic "Disadvantage" Ability Objects -->
+|ENDIF|
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC")-1,1,0|
+		<ability_object>
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%ability|</name>
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%ability.DESC|</description>
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%ability.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>T</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</ability_object>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL")==0)|
+|ELSE|
+	<!-- Visible Virtual "Talent" Ability Objects -->
+|ENDIF|
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL")-1,1,0|
+		<ability_object>
+			<name>|VABILITY.Special Ability.VISIBLE.%ability|</name>
+			<description>|VABILITY.Special Ability.VISIBLE.%ability.DESC|</description>
+			<type>|VABILITY.Special Ability.VISIBLE.%ability.TYPE|</type>
+			<associated>|VABILITY.Special Ability.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|VABILITY.Special Ability.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>T</virtual>
+			<category>Special Ability</category>
+		</ability_object>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=HIDDEN[or]VISIBILITY=DISPLAY_ONLY";"NATURE=NORMAL")==0)|
+|ELSE|
+	<!-- Hidden Standard "Disadvantage" Ability Objects -->
+|ENDIF|
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=HIDDEN[or]VISIBILITY=DISPLAY_ONLY","NATURE=NORMAL")-1,1,0|
+		<ability_object>
+			<name>|ABILITY.Talent.HIDDEN.%ability|</name>
+			<description>|ABILITY.Talent.HIDDEN.%ability.DESC|</description>
+			<type>|ABILITY.Talent.HIDDEN.%ability.TYPE|</type>
+			<associated>|ABILITY.Talent.HIDDEN.%ability.ASSOCIATED|</associated>
+			<count>|ABILITY.Talent.HIDDEN.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>T</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</ability_object>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=HIDDEN[or]VISIBILITY=DISPLAY_ONLY";"NATURE=AUTOMATIC")==0)|
+|ELSE|
+	<!-- Hidden Automatic "Disadvantage" Ability Objects -->
+|ENDIF|
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=HIDDEN[or]VISIBILITY=DISPLAY_ONLY","NATURE=AUTOMATIC")-1,1,0|
+		<ability_object>
+			<name>|ABILITYAUTO.Talent.HIDDEN.%ability|</name>
+			<description>|ABILITYAUTO.Talent.HIDDEN.%ability.DESC|</description>
+			<type>|ABILITYAUTO.Talent.HIDDEN.%ability.TYPE|</type>
+			<associated>|ABILITYAUTO.Talent.HIDDEN.%ability.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Talent.HIDDEN.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>T</auto>
+			<hidden>T</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</ability_object>
+|ENDFOR|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=HIDDEN[or]VISIBILITY=DISPLAY_ONLY";"NATURE=VIRTUAL")==0)|
+|ELSE|
+	<!-- Hidden Virtual "Disadvantage" Ability Objects -->
+|ENDIF|
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=HIDDEN[or]VISIBILITY=DISPLAY_ONLY","NATURE=VIRTUAL")-1,1,0|
+		<ability_object>
+			<name>|VABILITY.Talent.HIDDEN.%ability|</name>
+			<description>|VABILITY.Talent.HIDDEN.%ability.DESC|</description>
+			<type>|VABILITY.Talent.HIDDEN.%ability.TYPE|</type>
+			<associated>|VABILITY.Talent.HIDDEN.%ability.ASSOCIATED|</associated>
+			<count>|VABILITY.Talent.HIDDEN.%ability.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>T</hidden>
+			<virtual>T</virtual>
+			<category>Special Ability</category>
+		</ability_object>
+|ENDFOR|
+
+<!-- End Andrew Edit -->
+
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
 |ELSE|
 	<!-- Visible Standard "Talent" Ability Objects -->


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:[10693] Trunk/pcgen/outputsheets/base.xml

From: <tir...@us...> - 2009-10-11 11:21:52

Revision: 10693
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10693&view=rev
Author:   tir-gwaith
Date:     2009-10-11 11:21:46 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
Fantasy: Add Deflection bonus to AC Breakdown
Issue#: 2876462

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-10-11 11:20:54 UTC (rev 10692)
+++ Trunk/pcgen/outputsheets/base.xml	2009-10-11 11:21:46 UTC (rev 10693)
@@ -267,6 +267,7 @@
 		<stat_mod>|AC.Ability|</stat_mod>
 		<size_mod>|AC.Size|</size_mod>
 		<natural>|AC.NaturalArmor|</natural>
+		<deflection>|AC.Deflection|</deflection>
 		<class_bonus>|AC.ClassDefense|</class_bonus>
 		<dodge_bonus>|AC.Dodge|</dodge_bonus>
 |IIF(isgamemode("Modern").OR.isgamemode("Darwins_World_2").OR.isgamemode("Sidewinder"))|


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:[10712] Trunk/pcgen/outputsheets/base.xml

From: <tir...@us...> - 2009-10-14 02:45:45

Revision: 10712
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10712&view=rev
Author:   tir-gwaith
Date:     2009-10-14 02:45:34 +0000 (Wed, 14 Oct 2009)

Log Message:
-----------
[Pathfinder]  CMD not displaying correctly
Issue#: 2857337

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-10-14 02:43:32 UTC (rev 10711)
+++ Trunk/pcgen/outputsheets/base.xml	2009-10-14 02:45:34 UTC (rev 10712)
@@ -435,7 +435,28 @@
 				<sunder_base>|VAR.CMB_Sunder.INTVAL.SIGN|</sunder_base>
 				<bullrush_base>|VAR.CMB_Bull.INTVAL.SIGN|</bullrush_base>
 				<overrun_base>|VAR.CMB_Overrun.INTVAL.SIGN|</overrun_base>
+				<!-- Defense values -->
+|IIF(HASVAR:CMD)|
+				<!-- Pathfinder (final release) -->
 				<!-- Attack values -->
+				<grapple_attack>|VAR.CMB_Grapple.INTVAL.SIGN|</grapple_attack>
+				<trip_attack>|VAR.CMB_Trip.INTVAL.SIGN|</trip_attack>
+				<disarm_attack>|VAR.CMB_Disarm.INTVAL.SIGN|</disarm_attack>
+				<sunder_attack>|VAR.CMB_Sunder.INTVAL.SIGN|</sunder_attack>
+				<bullrush_attack>|VAR.CMB_BullRush.INTVAL.SIGN|</bullrush_attack>
+				<overrun_attack>|VAR.CMB_Overrun.INTVAL.SIGN|</overrun_attack>
+				<!-- Defense values -->
+				<defense>|VAR.CMD.INTVAL|</defense>
+				<grapple_defense>|VAR.CMD_Grapple.INTVAL|</grapple_defense>
+				<trip_defense>|VAR.CMD_Trip.INTVAL|</trip_defense>
+				<disarm_defense>|VAR.CMD_Disarm.INTVAL|</disarm_defense>
+				<sunder_defense>|VAR.CMD_Sunder.INTVAL|</sunder_defense>
+				<bullrush_defense>|VAR.CMD_BullRush.INTVAL|</bullrush_defense>
+				<overrun_defense>|VAR.CMD_Overrun.INTVAL|</overrun_defense>
+
+|ELSE|
+				<!-- Pathfinder Beta version -->
+				<!-- Attack values -->
 				<grapple_attack>|VAR.CMB_Grapple_OFF.INTVAL.SIGN|</grapple_attack>
 				<trip_attack>|VAR.CMB_Trip_OFF.INTVAL.SIGN|</trip_attack>
 				<disarm_attack>|VAR.CMB_Disarm_OFF.INTVAL.SIGN|</disarm_attack>
@@ -450,6 +471,7 @@
 				<sunder_defense>|VAR.CMB_Sunder_DEF.INTVAL|</sunder_defense>
 				<bullrush_defense>|VAR.CMB_Bull_DEF.INTVAL|</bullrush_defense>
 				<overrun_defense>|VAR.CMB_Overrun_DEF.INTVAL|</overrun_defense>
+|ENDIF|
 			</cmb>
 |ELSE|
 			<grapple>


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:[10725] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2009-10-15 02:08:01

Revision: 10725
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10725&view=rev
Author:   amaitland
Date:     2009-10-15 02:07:53 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
Export NPE, This also fixes all the sources to display in ALL abilities that have been set up.
Issue#: 2879472

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-10-15 02:01:59 UTC (rev 10724)
+++ Trunk/pcgen/outputsheets/base.xml	2009-10-15 02:07:53 UTC (rev 10725)
@@ -1449,7 +1449,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%specialattack.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%specialattack.SOURCE|</source>
 		</special_attack>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=SpecialAttack")==0)|
@@ -1483,7 +1483,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%specialattack.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%specialattack.SOURCE|</source>
 		</special_attack>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=SpecialAttack")==0)|
@@ -1517,7 +1517,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%specialattack.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%specialattack.SOURCE|</source>
 		</special_attack>
 |ENDFOR|
 	</special_attacks>
@@ -1543,7 +1543,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%disadvantage.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%disadvantage.SOURCE|</source>
 		</disadvantage>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Disadvantage")==0)|
@@ -1561,7 +1561,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%disadvantage.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%disadvantage.SOURCE|</source>
 		</disadvantage>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Disadvantage")==0)|
@@ -1579,7 +1579,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%disadvantage.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%disadvantage.SOURCE|</source>
 		</disadvantage>
 |ENDFOR|
 	</disadvantages>
@@ -1621,7 +1621,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.VISIBLE.%talent.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%talent.SOURCE|</source>
 		</talent>	
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Talent")==0)|
@@ -1655,7 +1655,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.VISIBLE.%talent.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%talent.SOURCE|</source>
 		</talent>	
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Talent")==0)|
@@ -1689,7 +1689,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.VISIBLE.%talent.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%talent.SOURCE|</source>
 		</talent>
 |ENDFOR|
 	</talents>
@@ -1731,7 +1731,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%demoncant.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%demoncant.SOURCE|</source>
 		</demon_cant>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=DemonCant")==0)|
@@ -1765,7 +1765,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%demoncant.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%demoncant.SOURCE|</source>
 		</demon_cant>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=DemonCant")==0)|
@@ -1799,7 +1799,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%demoncant.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%demoncant.SOURCE|</source>
 		</demon_cant>
 |ENDFOR|
 	</demon_cants>
@@ -1841,7 +1841,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%magegnosis.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%magegnosis.SOURCE|</source>
 		</mage_gnosis>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=MageGnosis")==0)|
@@ -1875,7 +1875,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%magegnosis.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%magegnosis.SOURCE|</source>
 		</mage_gnosis>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=MageGnosis")==0)|
@@ -1909,7 +1909,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%magegnosis.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%magegnosis.SOURCE|</source>
 		</mage_gnosis>
 |ENDFOR|
 	</mage_gnosises>
@@ -1951,7 +1951,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%vampirediscipline.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.SOURCE|</source>
 		</vampire_discipline>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=VampireDiscipline")==0)|
@@ -1985,7 +1985,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%vampirediscipline.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.SOURCE|</source>
 		</vampire_discipline>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=VampireDiscipline")==0)|
@@ -2019,7 +2019,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%vampirediscipline.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.SOURCE|</source>
 		</vampire_discipline>
 |ENDFOR|
 	</vampire_disciplines>
@@ -2062,7 +2062,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%werewolfRite.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%werewolfRite.SOURCE|</source>
 		</werewolf_rite>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=WerewolfRite")==0)|
@@ -2096,7 +2096,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%werewolfRite.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%werewolfRite.SOURCE|</source>
 		</werewolf_rite>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=WerewolfRite")==0)|
@@ -2130,7 +2130,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%werewolfRite.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%werewolfRite.SOURCE|</source>
 		</werewolf_rite>
 |ENDFOR|
 	</werewolf_rites>
@@ -2173,7 +2173,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%forcepower.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%forcepower.SOURCE|</source>
 		</force_power>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForcePower")==0)|
@@ -2207,7 +2207,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%forcepower.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%forcepower.SOURCE|</source>
 		</force_power>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForcePower")==0)|
@@ -2241,7 +2241,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%forcepower.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%forcepower.SOURCE|</source>
 		</force_power>
 |ENDFOR|
 	</force_powers>
@@ -2283,7 +2283,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.VISIBLE.%forcetechnique.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%forcetechnique.SOURCE|</source>
 		</force_technique>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForceTechniques")==0)|
@@ -2317,7 +2317,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.VISIBLE.%forcetechnique.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%forcetechnique.SOURCE|</source>
 		</force_technique>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForceTechniques")==0)|
@@ -2351,7 +2351,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.VISIBLE.%forcetechnique.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%forcetechnique.SOURCE|</source>
 		</force_technique>
 |ENDFOR|
 	</force_techniques>
@@ -2394,7 +2394,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.VISIBLE.%forcesecret.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%forcesecret.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForceSecrets")==0)|
@@ -2428,7 +2428,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.VISIBLE.%forcesecret.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%forcesecret.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForceSecrets")==0)|
@@ -2462,7 +2462,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.VISIBLE.%forcesecret.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%forcesecret.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
 	</force_secrets>
@@ -2504,7 +2504,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%atwill.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%atwill.SOURCE|</source>
 		</powers_atwill>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=AtWill")==0)|
@@ -2538,7 +2538,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%atwill.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%atwill.SOURCE|</source>
 		</powers_atwill>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=AtWill")==0)|
@@ -2572,7 +2572,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%atwill.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%atwill.SOURCE|</source>
 		</powers_atwill>
 |ENDFOR|
 	</powers_atwills>
@@ -2615,7 +2615,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%encounter.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%encounter.SOURCE|</source>
 		</powers_encounter>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Encounter")==0)|
@@ -2649,7 +2649,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%encounter.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%encounter.SOURCE|</source>
 		</powers_encounter>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Encounter")==0)|
@@ -2683,7 +2683,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%encounter.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%encounter.SOURCE|</source>
 		</powers_encounter>
 |ENDFOR|
 	</powers_encounters>
@@ -2726,7 +2726,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%daily.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%daily.SOURCE|</source>
 		</powers_daily>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Daily")==0)|
@@ -2760,7 +2760,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%daily.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%daily.SOURCE|</source>
 		</powers_daily>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Daily")==0)|
@@ -2794,7 +2794,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%daily.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%daily.SOURCE|</source>
 		</powers_daily>
 |ENDFOR|
 	</powers_dailies>
@@ -2837,7 +2837,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%utility.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%utility.SOURCE|</source>
 		</powers_utility>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Utility")==0)|
@@ -2871,7 +2871,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%utility.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%utility.SOURCE|</source>
 		</powers_utility>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Utility")==0)|
@@ -2905,7 +2905,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.VISIBLE.%utility.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%utility.SOURCE|</source>
 		</powers_utility>
 |ENDFOR|
 	</powers_utilities>


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:[10734] Trunk/pcgen/outputsheets/base.xml

From: <tir...@us...> - 2009-10-15 13:15:14

Revision: 10734
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10734&view=rev
Author:   tir-gwaith
Date:     2009-10-15 13:15:05 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
Unarmed Attack block enhancement  
More work on the xml structure, still commented out.
Issue#: 1411514

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-10-15 05:36:06 UTC (rev 10733)
+++ Trunk/pcgen/outputsheets/base.xml	2009-10-15 13:15:05 UTC (rev 10734)
@@ -503,11 +503,19 @@
 			<!-- 
 			Commenting this out (will need a test as well)
 			3.0 uses "Subdual", 3.5 uses "nonlethal".  We'll need a separate node for both.
+|IIF(<test for Lethal)|
 |IIF(VAR.UnarmedLethal>0)|
-			<type>(subdual or bludgeoning)</type>
+			<type>(lethal or nonlethal)</type>
 |ELSE|
+			<type>(nonlethal only)</type>
+|ENDIF|
+|ELSE|
+|IIF(VAR.Unarmed>0)|
+			<type>(subdual or normal)</type>
+|ELSE|
 			<type>(subdual only)</type>
 |ENDIF|
+|ENDIF|
 			 -->
 		</unarmed>
 


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:[10790] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2009-10-25 00:11:27

Revision: 10790
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10790&view=rev
Author:   amaitland
Date:     2009-10-25 00:11:19 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
Fix Source Display... All <SOURCE> Entries missing Type and two thirds missing matching syntax.

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-10-24 20:04:18 UTC (rev 10789)
+++ Trunk/pcgen/outputsheets/base.xml	2009-10-25 00:11:19 UTC (rev 10790)
@@ -494,14 +494,26 @@
 	  ====================================
 	  ====================================-->
 	<weapons>
+|IIF(VAR.UseMartialArts:1)|
+		<martialarts>
+			<total>|WEAPONH.TOTALHIT|</total>
+|IIF(VAR.MartialArtsBonusDamage<0)|
+			<damage>|VAR.MartialArtsDie.INTVAL|d|VAR.MartialArtsDieSize.INTVAL|-|VAR.MartialArtsBonusDamage.INTVAL|</damage>
+|ELSE|
+			<damage>|VAR.MartialArtsDie.INTVAL|d|VAR.MartialArtsDieSize.INTVAL|+|VAR.MartialArtsBonusDamage.INTVAL|</damage>
+|ENDIF|
+			<critical>|WEAPONH.CRIT|/x|WEAPONH.MULT|</critical>
+		<!-- Should be changed to a variable due to improved crit -->
+			<reach>|REACH|</reach>
+		</martialarts>
+|ELSE|
 		<unarmed>
 			<total>|WEAPONH.TOTALHIT|</total>
 			<damage>|WEAPONH.DAMAGE|</damage>
 			<critical>|WEAPONH.CRIT|/x|WEAPONH.MULT|</critical>
 			<!-- Should be changed to a variable due to improved crit -->
 			<reach>|REACH|</reach>
-			<!-- 
-			Commenting this out (will need a test as well)
+						<!-- Commenting this out (will need a test as well)
 			3.0 uses "Subdual", 3.5 uses "nonlethal".  We'll need a separate node for both.
 |IIF(<test for Lethal)|
 |IIF(VAR.UnarmedLethal>0)|
@@ -518,8 +530,8 @@
 |ENDIF|
 			 -->
 		</unarmed>
+|ENDIF|
 
-
 |FOR,%weap,0,COUNT[EQTYPE.WEAPON]-1,1,1|
 
 |IIF(WEAPON.%weap.CATEGORY:BOTH)|
@@ -1389,7 +1401,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.SOURCE|</source>
 		</special_quality>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=SpecialQuality")==0)|
@@ -1423,8 +1435,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.SOURCE|</source>
-
+			<source>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.SOURCE|</source>
 		</special_quality>
 |ENDFOR|
 	</special_qualities>
@@ -1466,7 +1477,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%specialattack.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.SOURCE|</source>
 		</special_attack>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=SpecialAttack")==0)|
@@ -1500,7 +1511,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%specialattack.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.SOURCE|</source>
 		</special_attack>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=SpecialAttack")==0)|
@@ -1534,7 +1545,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%specialattack.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.SOURCE|</source>
 		</special_attack>
 |ENDFOR|
 	</special_attacks>
@@ -1560,7 +1571,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%disadvantage.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.SOURCE|</source>
 		</disadvantage>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Disadvantage")==0)|
@@ -1578,7 +1589,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%disadvantage.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.SOURCE|</source>
 		</disadvantage>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Disadvantage")==0)|
@@ -1596,7 +1607,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%disadvantage.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.SOURCE|</source>
 		</disadvantage>
 |ENDFOR|
 	</disadvantages>
@@ -1638,7 +1649,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%talent.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.SOURCE|</source>
 		</talent>	
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Talent")==0)|
@@ -1672,7 +1683,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%talent.SOURCE|</source>
+			<source>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.SOURCE|</source>
 		</talent>	
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Talent")==0)|
@@ -1706,7 +1717,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%talent.SOURCE|</source>
+			<source>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.SOURCE|</source>
 		</talent>
 |ENDFOR|
 	</talents>
@@ -1748,7 +1759,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Talent.VISIBLE.%demoncant.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%demoncant.TYPE=DemonCant.SOURCE|</source>
 		</demon_cant>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=DemonCant")==0)|
@@ -1782,7 +1793,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Talent.VISIBLE.%demoncant.SOURCE|</source>
+			<source>|ABILITYAUTO.Talent.VISIBLE.%demoncant.TYPE=DemonCant.SOURCE|</source>
 		</demon_cant>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=DemonCant")==0)|
@@ -1816,7 +1827,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%demoncant.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.SOURCE|</source>
 		</demon_cant>
 |ENDFOR|
 	</demon_cants>
@@ -1858,7 +1869,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%magegnosis.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.SOURCE|</source>
 		</mage_gnosis>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=MageGnosis")==0)|
@@ -1892,7 +1903,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%magegnosis.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.SOURCE|</source>
 		</mage_gnosis>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=MageGnosis")==0)|
@@ -1926,7 +1937,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%magegnosis.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.SOURCE|</source>
 		</mage_gnosis>
 |ENDFOR|
 	</mage_gnosises>
@@ -1968,7 +1979,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.SOURCE|</source>
 		</vampire_discipline>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=VampireDiscipline")==0)|
@@ -2002,7 +2013,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.SOURCE|</source>
 		</vampire_discipline>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=VampireDiscipline")==0)|
@@ -2036,7 +2047,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.SOURCE|</source>
 		</vampire_discipline>
 |ENDFOR|
 	</vampire_disciplines>
@@ -2079,7 +2090,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%werewolfRite.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.SOURCE|</source>
 		</werewolf_rite>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=WerewolfRite")==0)|
@@ -2109,11 +2120,11 @@
 			<type>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE|</type>
 			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.ASSOCIATED|</associated>
 			<count>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.ASSOCIATEDCOUNT|</count>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.SOURCE|</source>
 			<auto>T</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%werewolfRite.SOURCE|</source>
 		</werewolf_rite>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=WerewolfRite")==0)|
@@ -2147,7 +2158,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%werewolfRite.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.SOURCE|</source>
 		</werewolf_rite>
 |ENDFOR|
 	</werewolf_rites>
@@ -2190,7 +2201,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%forcepower.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
 		</force_power>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForcePower")==0)|
@@ -2224,7 +2235,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%forcepower.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
 		</force_power>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForcePower")==0)|
@@ -2258,7 +2269,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%forcepower.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
 		</force_power>
 |ENDFOR|
 	</force_powers>
@@ -2300,7 +2311,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%forcetechnique.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.SOURCE|</source>
 		</force_technique>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForceTechniques")==0)|
@@ -2334,7 +2345,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%forcetechnique.SOURCE|</source>
+			<source>|ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.SOURCE|</source>
 		</force_technique>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForceTechniques")==0)|
@@ -2368,7 +2379,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%forcetechnique.SOURCE|</source>
+			<source>|VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.SOURCE|</source>
 		</force_technique>
 |ENDFOR|
 	</force_techniques>
@@ -2411,7 +2422,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%forcesecret.SOURCE|</source>
+			<source>|ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForceSecrets")==0)|
@@ -2445,7 +2456,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%forcesecret.SOURCE|</source>
+			<source>|ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForceSecrets")==0)|
@@ -2479,7 +2490,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%forcesecret.SOURCE|</source>
+			<source>|VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
 	</force_secrets>
@@ -2521,7 +2532,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%atwill.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.SOURCE|</source>
 		</powers_atwill>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=AtWill")==0)|
@@ -2555,7 +2566,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%atwill.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.SOURCE|</source>
 		</powers_atwill>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=AtWill")==0)|
@@ -2589,7 +2600,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%atwill.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.SOURCE|</source>
 		</powers_atwill>
 |ENDFOR|
 	</powers_atwills>
@@ -2632,7 +2643,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%encounter.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.SOURCE|</source>
 		</powers_encounter>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Encounter")==0)|
@@ -2666,7 +2677,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%encounter.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.SOURCE|</source>
 		</powers_encounter>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Encounter")==0)|
@@ -2700,7 +2711,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%encounter.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.SOURCE|</source>
 		</powers_encounter>
 |ENDFOR|
 	</powers_encounters>
@@ -2743,7 +2754,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%daily.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.SOURCE|</source>
 		</powers_daily>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Daily")==0)|
@@ -2777,7 +2788,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%daily.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.SOURCE|</source>
 		</powers_daily>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Daily")==0)|
@@ -2811,7 +2822,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%daily.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.SOURCE|</source>
 		</powers_daily>
 |ENDFOR|
 	</powers_dailies>
@@ -2854,7 +2865,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%utility.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.SOURCE|</source>
 		</powers_utility>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Utility")==0)|
@@ -2888,7 +2899,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%utility.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.SOURCE|</source>
 		</powers_utility>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Utility")==0)|
@@ -2922,7 +2933,7 @@
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%utility.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.SOURCE|</source>
 		</powers_utility>
 |ENDFOR|
 	</powers_utilities>


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:[10932] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2009-11-08 07:59:11

Revision: 10932
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10932&view=rev
Author:   amaitland
Date:     2009-11-08 07:59:03 +0000 (Sun, 08 Nov 2009)

Log Message:
-----------
Update OS Blocks to use proper category

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-11-08 07:58:29 UTC (rev 10931)
+++ Trunk/pcgen/outputsheets/base.xml	2009-11-08 07:59:03 UTC (rev 10932)
@@ -2207,106 +2207,106 @@
 	  ====================================
 	  ====================================-->
 	<force_powers>
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=ForcePower")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Force Powers";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=ForcePower")==0)|
 |ELSE|
 	<!-- Standard Force Powers -->
 |ENDIF|
-|FOR,%forcepower,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ForcePower")-1,1,0|
+|FOR,%forcepower,0,count("ABILITIES","CATEGORY=Force Powers","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ForcePower")-1,1,0|
 		<force_power>
-|IIF(ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Extraordinary)|
-			<name>|ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Ex)</name>
+|IIF(ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Extraordinary)|
+			<name>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ex)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Supernatural)|
-			<name>|ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Su)</name>
+|IIF(ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Supernatural)|
+			<name>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Su)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:SpellLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Sp)</name>
+|IIF(ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:SpellLike)|
+			<name>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Sp)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:PsiLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Ps)</name>
+|IIF(ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:PsiLike)|
+			<name>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ps)</name>
 |ELSE|
-			<name>|ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower|</name>
+			<name>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.DESC|</description>
-			<type>|ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE|</type>
-			<associated>|ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATED|</associated>
-			<count>|ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.DESC|</description>
+			<type>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE|</type>
+			<associated>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATED|</associated>
+			<count>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
-			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
+			<category>Force Powers</category>
+			<source>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
 		</force_power>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForcePower")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Force Powers";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForcePower")==0)|
 |ELSE|
 	<!-- Automatic Force Powers -->
 |ENDIF|
-|FOR,%forcepower,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=ForcePower")-1,1,0|
+|FOR,%forcepower,0,count("ABILITIES","CATEGORY=Force Powers","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=ForcePower")-1,1,0|
 		<force_power>
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Ex)</name>
+|IIF(ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ex)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Su)</name>
+|IIF(ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Su)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Sp)</name>
+|IIF(ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Sp)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Ps)</name>
+|IIF(ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ps)</name>
 |ELSE|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower|</name>
+			<name>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.DESC|</description>
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.DESC|</description>
+			<type>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE|</type>
+			<associated>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATEDCOUNT|</count>
 			<auto>T</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
-			<category>Special Ability</category>
-			<source>|ABILITYAUTO.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
+			<category>Force Powers</category>
+			<source>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
 		</force_power>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForcePower")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Force Powers";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForcePower")==0)|
 |ELSE|
 	<!-- Virtual Force Powers -->
 |ENDIF|
-|FOR,%forcepower,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=ForcePower")-1,1,0|
+|FOR,%forcepower,0,count("ABILITIES","CATEGORY=Force Powers","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=ForcePower")-1,1,0|
 		<force_power>
-|IIF(VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Extraordinary)|
-			<name>|VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Ex)</name>
+|IIF(VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Extraordinary)|
+			<name>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ex)</name>
 |ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Supernatural)|
-			<name>|VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Su)</name>
+|IIF(VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Supernatural)|
+			<name>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Su)</name>
 |ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:SpellLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Sp)</name>
+|IIF(VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:SpellLike)|
+			<name>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Sp)</name>
 |ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:PsiLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower| (Ps)</name>
+|IIF(VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:PsiLike)|
+			<name>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ps)</name>
 |ELSE|
-			<name>|VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower|</name>
+			<name>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.DESC|</description>
-			<type>|VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.TYPE|</type>
-			<associated>|VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATED|</associated>
-			<count>|VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATEDCOUNT|</count>
+			<description>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.DESC|</description>
+			<type>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE|</type>
+			<associated>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATED|</associated>
+			<count>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>T</virtual>
-			<category>Special Ability</category>
-			<source>|VABILITY.Special Ability.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
+			<category>Force Powers</category>
+			<source>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
 		</force_power>
 |ENDFOR|
 	</force_powers>
@@ -2317,106 +2317,106 @@
 	  ====================================
 	  ====================================-->
 	<force_techniques>
-|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=ForceTechniques")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Force Techniques";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=ForceTechniques")==0)|
 |ELSE|
 	<!-- Standard Force Techniques -->
 |ENDIF|
-|FOR,%forcetechnique,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ForceTechniques")-1,1,0|
+|FOR,%forcetechnique,0,count("ABILITIES","CATEGORY=Force Techniques","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ForceTechniques")-1,1,0|
 		<force_technique>
-|IIF(ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Extraordinary)|
-			<name>|ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ex)</name>
+|IIF(ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Extraordinary)|
+			<name>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ex)</name>
 |ELSE|
-|IIF(ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Supernatural)|
-			<name>|ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Su)</name>
+|IIF(ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Supernatural)|
+			<name>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Su)</name>
 |ELSE|
-|IIF(ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:SpellLike)|
-			<name>|ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Sp)</name>
+|IIF(ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:SpellLike)|
+			<name>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Sp)</name>
 |ELSE|
-|IIF(ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:PsiLike)|
-			<name>|ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ps)</name>
+|IIF(ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:PsiLike)|
+			<name>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ps)</name>
 |ELSE|
-			<name>|ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques|</name>
+			<name>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.DESC|</description>
-			<type>|ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE|</type>
-			<associated>|ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATED|</associated>
-			<count>|ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.DESC|</description>
+			<type>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE|</type>
+			<associated>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATED|</associated>
+			<count>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
-			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.SOURCE|</source>
+			<category>Force Techniques</category>
+			<source>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.SOURCE|</source>
 		</force_technique>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForceTechniques")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Force Techniques";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForceTechniques")==0)|
 |ELSE|
 	<!-- Automatic Force Techniques -->
 |ENDIF|
-|FOR,%forcetechnique,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=ForceTechniques")-1,1,0|
+|FOR,%forcetechnique,0,count("ABILITIES","CATEGORY=Force Techniques","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=ForceTechniques")-1,1,0|
 		<force_technique>
-|IIF(ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ex)</name>
+|IIF(ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ex)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Su)</name>
+|IIF(ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Su)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Sp)</name>
+|IIF(ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Sp)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ps)</name>
+|IIF(ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ps)</name>
 |ELSE|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques|</name>
+			<name>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.DESC|</description>
-			<type>|ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE|</type>
-			<associated>|ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.DESC|</description>
+			<type>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE|</type>
+			<associated>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATEDCOUNT|</count>
 			<auto>T</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
-			<category>Talent</category>
-			<source>|ABILITYAUTO.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.SOURCE|</source>
+			<category>Force Techniques</category>
+			<source>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.SOURCE|</source>
 		</force_technique>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForceTechniques")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Force Techniques";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForceTechniques")==0)|
 |ELSE|
 	<!-- Virtual Force Techniques -->
 |ENDIF|
-|FOR,%forcetechnique,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=ForceTechniques")-1,1,0|
+|FOR,%forcetechnique,0,count("ABILITIES","CATEGORY=Force Techniques","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=ForceTechniques")-1,1,0|
 		<force_technique>
-|IIF(VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Extraordinary)|
-			<name>|VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ex)</name>
+|IIF(VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Extraordinary)|
+			<name>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ex)</name>
 |ELSE|
-|IIF(VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Supernatural)|
-			<name>|VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Su)</name>
+|IIF(VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Supernatural)|
+			<name>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Su)</name>
 |ELSE|
-|IIF(VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:SpellLike)|
-			<name>|VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Sp)</name>
+|IIF(VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:SpellLike)|
+			<name>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Sp)</name>
 |ELSE|
-|IIF(VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:PsiLike)|
-			<name>|VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ps)</name>
+|IIF(VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:PsiLike)|
+			<name>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ps)</name>
 |ELSE|
-			<name>|VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques|</name>
+			<name>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.DESC|</description>
-			<type>|VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE|</type>
-			<associated>|VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATED|</associated>
-			<count>|VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATEDCOUNT|</count>
+			<description>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.DESC|</description>
+			<type>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE|</type>
+			<associated>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATED|</associated>
+			<count>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>T</virtual>
-			<category>Talent</category>
-			<source>|VABILITY.Talent.VISIBLE.%forcetechnique.TYPE=ForceTechniques.SOURCE|</source>
+			<category>Force Techniques</category>
+			<source>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.SOURCE|</source>
 		</force_technique>
 |ENDFOR|
 	</force_techniques>


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:[10940] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2009-11-08 08:58:05

Revision: 10940
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10940&view=rev
Author:   amaitland
Date:     2009-11-08 08:57:58 +0000 (Sun, 08 Nov 2009)

Log Message:
-----------
Patch in Homebrew support features for 4e - Courtesy of Jasper Spaans

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-11-08 08:37:36 UTC (rev 10939)
+++ Trunk/pcgen/outputsheets/base.xml	2009-11-08 08:57:58 UTC (rev 10940)
@@ -2542,102 +2542,135 @@
 |ELSE|
 	<!-- Standard At Will Powers -->
 |ENDIF|
-|FOR,%atwill,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=AtWill")-1,1,0|
+|FOR,%atWill,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=AtWill")-1,1,0|
 		<powers_atwill>
-|IIF(ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Extraordinary)|
-			<name>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ex)</name>
+|IIF(ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:Extraordinary)|
+			<name>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Ex)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Supernatural)|
-			<name>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Su)</name>
+|IIF(ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:Supernatural)|
+			<name>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Su)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:SpellLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Sp)</name>
+|IIF(ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:SpellLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Sp)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:PsiLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ps)</name>
+|IIF(ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:PsiLike)|
+			<name>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Ps)</name>
 |ELSE|
-			<name>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill|</name>
+			<name>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.DESC|</description>
-			<type>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE|</type>
-			<associated>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATED|</associated>
-			<count>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.DESC|</description>
+			<type>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE|</type>
+			<associated>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASSOCIATED|</associated>
+			<count>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.SOURCE|</source>
 		</powers_atwill>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=AtWill")==0)|
 |ELSE|
 	<!-- Automatic At Will Powers -->
 |ENDIF|
-|FOR,%atwill,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=AtWill")-1,1,0|
+|FOR,%atWill,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=AtWill")-1,1,0|
 		<powers_atwill>
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ex)</name>
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Ex)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Su)</name>
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Su)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Sp)</name>
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Sp)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ps)</name>
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Ps)</name>
 |ELSE|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill|</name>
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.DESC|</description>
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.DESC|</description>
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASSOCIATEDCOUNT|</count>
 			<auto>T</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITYAUTO.Special Ability.VISIBLE.%atwill.TYPE=AtWill.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.SOURCE|</source>
 		</powers_atwill>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=AtWill")==0)|
 |ELSE|
 	<!-- Virtual At Will Powers -->
 |ENDIF|
-|FOR,%atwill,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=AtWill")-1,1,0|
+|FOR,%atWill,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=AtWill")-1,1,0|
 		<powers_atwill>
-|IIF(VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Extraordinary)|
-			<name>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ex)</name>
+|IIF(VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:Extraordinary)|
+			<name>|VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Ex)</name>
 |ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:Supernatural)|
-			<name>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Su)</name>
+|IIF(VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:Supernatural)|
+			<name>|VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Su)</name>
 |ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:SpellLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Sp)</name>
+|IIF(VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:SpellLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Sp)</name>
 |ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE:PsiLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill| (Ps)</name>
+|IIF(VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE:PsiLike)|
+			<name>|VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill| (Ps)</name>
 |ELSE|
-			<name>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill|</name>
+			<name>|VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.DESC|</description>
-			<type>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.TYPE|</type>
-			<associated>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATED|</associated>
-			<count>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.ASSOCIATEDCOUNT|</count>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Sustain|</sustain>
+|ENDIF|
+			<description>|VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.DESC|</description>
+			<type>|VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE|</type>
+			<associated>|VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASSOCIATED|</associated>
+			<count>|VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|VABILITY.Special Ability.VISIBLE.%atwill.TYPE=AtWill.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.SOURCE|</source>
 		</powers_atwill>
 |ENDFOR|
 	</powers_atwills>
@@ -2740,6 +2773,39 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Sustain|</sustain>
+|ENDIF|
 			<description>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.DESC|</description>
 			<type>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE|</type>
 			<associated>|VABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASSOCIATED|</associated>
@@ -2851,6 +2917,39 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Sustain|</sustain>
+|ENDIF|
 			<description>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.DESC|</description>
 			<type>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE|</type>
 			<associated>|VABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.ASSOCIATED|</associated>
@@ -2962,6 +3061,7 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
+
 			<description>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.DESC|</description>
 			<type>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE|</type>
 			<associated>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.ASSOCIATED|</associated>


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:[10950] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2009-11-11 01:57:20

Revision: 10950
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10950&view=rev
Author:   amaitland
Date:     2009-11-11 01:57:03 +0000 (Wed, 11 Nov 2009)

Log Message:
-----------
Last batch of fixes before splitting into gamemode specific folders.

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-11-10 18:30:25 UTC (rev 10949)
+++ Trunk/pcgen/outputsheets/base.xml	2009-11-11 01:57:03 UTC (rev 10950)
@@ -1796,7 +1796,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Talent.VISIBLE.%demoncant.TYPE=DemonCant.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.SOURCE|</source>
 		</demon_cant>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=DemonCant")==0)|
@@ -1830,7 +1830,7 @@
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITYAUTO.Talent.VISIBLE.%demoncant.TYPE=DemonCant.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.SOURCE|</source>
 		</demon_cant>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=DemonCant")==0)|
@@ -2534,6 +2534,161 @@
 	<!--
 	  ====================================
 	  ====================================
+			POWERS - CLASSFEATURES
+	  ====================================
+	  ====================================-->
+
+	<powers_classfeatures>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=ClassFeature")==0)|
+|ELSE|
+	<!-- Standard Special Qualities -->
+|ENDIF|
+|FOR,%classFeature,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=ClassFeature")-1,1,0|
+		<power_classfeature>
+
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature| (Ex)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature| (Su)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature| (Sp)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature| (Ps)</name>
+|ELSE|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.DESC|</description>
+
+|IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASPECT.Sustain|</sustain>
+|ENDIF|
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%classFeature.TYPE=ClassFeature.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</power_classfeature>
+|ENDFOR|
+	</powers_classfeatures>
+	<!--
+	  ====================================
+	  ====================================
+			POWERS - FEATPOWERS
+	  ====================================
+	  ====================================-->
+
+	<powers_featpowers>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=Feat Power")==0)|
+|ELSE|
+	<!-- Standard Special Qualities -->
+|ENDIF|
+|FOR,%featPower,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=Feat Power")-1,1,0|
+		<power_featpower>
+
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power| (Ex)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power| (Su)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power| (Sp)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power| (Ps)</name>
+|ELSE|
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.DESC|</description>
+
+|IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASPECT.Sustain|</sustain>
+|ENDIF|
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%featPower.TYPE=Feat Power.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Special Ability</category>
+		</power_featpower>
+|ENDFOR|
+	</powers_featpowers>
+
+	<!--
+	  ====================================
+	  ====================================
 			4e Powers - At-Will
 	  ====================================
 	  ====================================-->
@@ -2561,6 +2716,39 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Sustain|</sustain>
+|ENDIF|
 			<description>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.DESC|</description>
 			<type>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE|</type>
 			<associated>|ABILITY.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASSOCIATED|</associated>
@@ -2595,6 +2783,39 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASPECT.Sustain|</sustain>
+|ENDIF|
 			<description>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.DESC|</description>
 			<type>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.TYPE|</type>
 			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%atWill.TYPE=AtWill.ASSOCIATED|</associated>
@@ -2705,6 +2926,39 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Sustain|</sustain>
+|ENDIF|
 			<description>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.DESC|</description>
 			<type>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE|</type>
 			<associated>|ABILITY.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASSOCIATED|</associated>
@@ -2739,6 +2993,39 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASPECT.Sustain|</sustain>
+|ENDIF|
 			<description>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.DESC|</description>
 			<type>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.TYPE|</type>
 			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%encounter.TYPE=Encounter.ASSOCIATED|</associated>
@@ -2849,6 +3136,39 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Sustain|</sustain>
+|ENDIF|
 			<description>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.DESC|</description>
 			<type>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE|</type>
 			<associated>|ABILITY.Special Ability.VISIBLE.%daily.TYPE=Daily.ASSOCIATED|</associated>
@@ -2883,6 +3203,39 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%daily.TYPE=Daily.ASPECT.Sustain|</sustain>
+|ENDIF|
 			<description>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.DESC|</description>
 			<type>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.TYPE|</type>
 			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%daily.TYPE=Daily.ASSOCIATED|</associated>
@@ -2993,6 +3346,39 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Sustain|</sustain>
+|ENDIF|
 			<description>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.DESC|</description>
 			<type>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE|</type>
 			<associated>|ABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.ASSOCIATED|</associated>
@@ -3027,6 +3413,39 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Sustain|</sustain>
+|ENDIF|
 			<description>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.DESC|</description>
 			<type>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE|</type>
 			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%utility.TYPE=Utility.ASSOCIATED|</associated>
@@ -3061,7 +3480,39 @@
 |ENDIF|
 |ENDIF|
 |ENDIF|
-
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Special Ability.VISIBLE.%utility.TYPE=Utility.ASPECT.Sustain|</sustain>
+|ENDIF|
 			<description>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.DESC|</description>
 			<type>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.TYPE|</type>
 			<associated>|VABILITY.Special Ability.VISIBLE.%utility.TYPE=Utility.ASSOCIATED|</associated>


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:[10954] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2009-11-11 07:47:52

Revision: 10954
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10954&view=rev
Author:   amaitland
Date:     2009-11-11 07:47:45 +0000 (Wed, 11 Nov 2009)

Log Message:
-----------
Typo for OS block found

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-11-11 04:00:36 UTC (rev 10953)
+++ Trunk/pcgen/outputsheets/base.xml	2009-11-11 07:47:45 UTC (rev 10954)
@@ -2428,38 +2428,38 @@
 	  ====================================-->
 
 	<force_secrets>
-|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=ForceSecrets")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Force Secrets";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=ForceSecrets")==0)|
 |ELSE|
 	<!-- Standard Force Secrets -->
 |ENDIF|
-|FOR,%forcesecret,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ForceSecrets")-1,1,0|
+|FOR,%forcesecret,0,count("ABILITIES","CATEGORY=Force Secrets","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ForceSecrets")-1,1,0|
 		<force_secret>
-|IIF(ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Extraordinary)|
-			<name>|ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ex)</name>
+|IIF(ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Extraordinary)|
+			<name>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ex)</name>
 |ELSE|
-|IIF(ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Supernatural)|
-			<name>|ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Su)</name>
+|IIF(ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Supernatural)|
+			<name>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Su)</name>
 |ELSE|
-|IIF(ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:SpellLike)|
-			<name>|ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Sp)</name>
+|IIF(ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:SpellLike)|
+			<name>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Sp)</name>
 |ELSE|
-|IIF(ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:PsiLike)|
-			<name>|ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ps)</name>
+|IIF(ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:PsiLike)|
+			<name>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ps)</name>
 |ELSE|
-			<name>|ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets|</name>
+			<name>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.DESC|</description>
-			<type>|ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE|</type>
-			<associated>|ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
-			<count>|ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.DESC|</description>
+			<type>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE|</type>
+			<associated>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
+			<count>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
+			<source>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForceSecrets")==0)|
@@ -2468,32 +2468,32 @@
 |ENDIF|
 |FOR,%forcesecret,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=ForceSecrets")-1,1,0|
 		<force_secret>
-|IIF(ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ex)</name>
+|IIF(ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ex)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Su)</name>
+|IIF(ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Su)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Sp)</name>
+|IIF(ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Sp)</name>
 |ELSE|
-|IIF(ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ps)</name>
+|IIF(ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:PsiLike)|
+			<name>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ps)</name>
 |ELSE|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets|</name>
+			<name>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.DESC|</description>
-			<type>|ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE|</type>
-			<associated>|ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.DESC|</description>
+			<type>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE|</type>
+			<associated>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
 			<auto>T</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITYAUTO.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
+			<source>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForceSecrets")==0)|
@@ -2502,32 +2502,32 @@
 |ENDIF|
 |FOR,%forcesecret,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=ForceSecrets")-1,1,0|
 		<force_secret>
-|IIF(VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Extraordinary)|
-			<name>|VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ex)</name>
+|IIF(VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Extraordinary)|
+			<name>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ex)</name>
 |ELSE|
-|IIF(VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Supernatural)|
-			<name>|VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Su)</name>
+|IIF(VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Supernatural)|
+			<name>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Su)</name>
 |ELSE|
-|IIF(VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:SpellLike)|
-			<name>|VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Sp)</name>
+|IIF(VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:SpellLike)|
+			<name>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Sp)</name>
 |ELSE|
-|IIF(VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:PsiLike)|
-			<name>|VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ps)</name>
+|IIF(VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:PsiLike)|
+			<name>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ps)</name>
 |ELSE|
-			<name>|VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets|</name>
+			<name>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.DESC|</description>
-			<type>|VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE|</type>
-			<associated>|VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
-			<count>|VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
+			<description>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.DESC|</description>
+			<type>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE|</type>
+			<associated>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
+			<count>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Talent</category>
-			<source>|VABILITY.Talent.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
+			<source>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
 	</force_secrets>


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:[10973] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2009-11-12 05:28:11

Revision: 10973
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10973&view=rev
Author:   amaitland
Date:     2009-11-12 05:27:57 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
Clean up - pre.split

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-11-12 05:26:54 UTC (rev 10972)
+++ Trunk/pcgen/outputsheets/base.xml	2009-11-12 05:27:57 UTC (rev 10973)
@@ -328,7 +328,9 @@
 			<exclusive_total>|SKILL.%skill.EXCLUSIVE_TOTAL|</exclusive_total>
 			<type>|SKILL.%skill.TYPE|</type>
 		</skill>
-|ENDFOR|	<!-- Skills -->
+|ENDFOR|	
+
+<!-- Skills -->
 	</skills>
 	<!--
 	  ====================================
@@ -2207,108 +2209,21 @@
 	  ====================================
 	  ====================================-->
 	<force_powers>
-|IIF(count("ABILITIES";"CATEGORY=Force Powers";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=ForcePower")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Force Powers";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=ForcePower")==0)|
 |ELSE|
-	<!-- Standard Force Powers -->
+	<!-- Force Powers -->
 |ENDIF|
-|FOR,%forcepower,0,count("ABILITIES","CATEGORY=Force Powers","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ForcePower")-1,1,0|
+|FOR,%forcepower,0,count("ABILITIES","CATEGORY=Force Powers","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=ForcePower")-1,1,0|
 		<force_power>
-|IIF(ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Extraordinary)|
-			<name>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ex)</name>
-|ELSE|
-|IIF(ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Supernatural)|
-			<name>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Su)</name>
-|ELSE|
-|IIF(ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:SpellLike)|
-			<name>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Sp)</name>
-|ELSE|
-|IIF(ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:PsiLike)|
-			<name>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ps)</name>
-|ELSE|
-			<name>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.DESC|</description>
-			<type>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE|</type>
-			<associated>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATED|</associated>
-			<count>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATEDCOUNT|</count>
-			<auto>F</auto>
-			<hidden>F</hidden>
-			<virtual>F</virtual>
+			<name>|ABILITYALL.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower|</name>
+			<description>|ABILITYALL.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.DESC|</description>
+			<type>|ABILITYALL.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE|</type>
+			<associated>|ABILITYALL.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATEDCOUNT|</count>
+			<source>|ABILITYALL.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
 			<category>Force Powers</category>
-			<source>|ABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
 		</force_power>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Force Powers";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForcePower")==0)|
-|ELSE|
-	<!-- Automatic Force Powers -->
-|ENDIF|
-|FOR,%forcepower,0,count("ABILITIES","CATEGORY=Force Powers","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=ForcePower")-1,1,0|
-		<force_power>
-|IIF(ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ex)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Su)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Sp)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ps)</name>
-|ELSE|
-			<name>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.DESC|</description>
-			<type>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE|</type>
-			<associated>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATEDCOUNT|</count>
-			<auto>T</auto>
-			<hidden>F</hidden>
-			<virtual>F</virtual>
-			<category>Force Powers</category>
-			<source>|ABILITYAUTO.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
-		</force_power>
-|ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Force Powers";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForcePower")==0)|
-|ELSE|
-	<!-- Virtual Force Powers -->
-|ENDIF|
-|FOR,%forcepower,0,count("ABILITIES","CATEGORY=Force Powers","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=ForcePower")-1,1,0|
-		<force_power>
-|IIF(VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Extraordinary)|
-			<name>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ex)</name>
-|ELSE|
-|IIF(VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:Supernatural)|
-			<name>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Su)</name>
-|ELSE|
-|IIF(VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:SpellLike)|
-			<name>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Sp)</name>
-|ELSE|
-|IIF(VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE:PsiLike)|
-			<name>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower| (Ps)</name>
-|ELSE|
-			<name>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.DESC|</description>
-			<type>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.TYPE|</type>
-			<associated>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATED|</associated>
-			<count>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.ASSOCIATEDCOUNT|</count>
-			<auto>F</auto>
-			<hidden>F</hidden>
-			<virtual>T</virtual>
-			<category>Force Powers</category>
-			<source>|VABILITY.Force Powers.VISIBLE.%forcepower.TYPE=ForcePower.SOURCE|</source>
-		</force_power>
-|ENDFOR|
 	</force_powers>
 	<!--
 	  ====================================
@@ -2323,23 +2238,7 @@
 |ENDIF|
 |FOR,%forcetechnique,0,count("ABILITIES","CATEGORY=Force Techniques","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ForceTechniques")-1,1,0|
 		<force_technique>
-|IIF(ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Extraordinary)|
-			<name>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ex)</name>
-|ELSE|
-|IIF(ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Supernatural)|
-			<name>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Su)</name>
-|ELSE|
-|IIF(ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:SpellLike)|
-			<name>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Sp)</name>
-|ELSE|
-|IIF(ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:PsiLike)|
-			<name>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ps)</name>
-|ELSE|
 			<name>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
 			<description>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.DESC|</description>
 			<type>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE|</type>
 			<associated>|ABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATED|</associated>
@@ -2357,23 +2256,7 @@
 |ENDIF|
 |FOR,%forcetechnique,0,count("ABILITIES","CATEGORY=Force Techniques","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=ForceTechniques")-1,1,0|
 		<force_technique>
-|IIF(ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ex)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Su)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Sp)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ps)</name>
-|ELSE|
 			<name>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
 			<description>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.DESC|</description>
 			<type>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE|</type>
 			<associated>|ABILITYAUTO.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATED|</associated>
@@ -2391,23 +2274,7 @@
 |ENDIF|
 |FOR,%forcetechnique,0,count("ABILITIES","CATEGORY=Force Techniques","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=ForceTechniques")-1,1,0|
 		<force_technique>
-|IIF(VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Extraordinary)|
-			<name>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ex)</name>
-|ELSE|
-|IIF(VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:Supernatural)|
-			<name>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Su)</name>
-|ELSE|
-|IIF(VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:SpellLike)|
-			<name>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Sp)</name>
-|ELSE|
-|IIF(VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE:PsiLike)|
-			<name>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques| (Ps)</name>
-|ELSE|
 			<name>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
 			<description>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.DESC|</description>
 			<type>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.TYPE|</type>
 			<associated>|VABILITY.Force Techniques.VISIBLE.%forcetechnique.TYPE=ForceTechniques.ASSOCIATED|</associated>
@@ -2432,102 +2299,54 @@
 |ELSE|
 	<!-- Standard Force Secrets -->
 |ENDIF|
-|FOR,%forcesecret,0,count("ABILITIES","CATEGORY=Force Secrets","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ForceSecrets")-1,1,0|
+|FOR,%forceSecret,0,count("ABILITIES","CATEGORY=Force Secrets","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ForceSecrets")-1,1,0|
 		<force_secret>
-|IIF(ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Extraordinary)|
-			<name>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ex)</name>
-|ELSE|
-|IIF(ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Supernatural)|
-			<name>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Su)</name>
-|ELSE|
-|IIF(ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:SpellLike)|
-			<name>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Sp)</name>
-|ELSE|
-|IIF(ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:PsiLike)|
-			<name>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ps)</name>
-|ELSE|
-			<name>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.DESC|</description>
-			<type>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE|</type>
-			<associated>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
-			<count>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
+			<name>|ABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets|</name>
+			<description>|ABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.DESC|</description>
+			<type>|ABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.TYPE|</type>
+			<associated>|ABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
+			<count>|ABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
-			<category>Talent</category>
-			<source>|ABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
+			<category>Force Secrets</category>
+			<source>|ABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForceSecrets")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Force Secrets";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ForceSecrets")==0)|
 |ELSE|
 	<!-- Automatic Force Secrets -->
 |ENDIF|
-|FOR,%forcesecret,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=ForceSecrets")-1,1,0|
+|FOR,%forceSecret,0,count("ABILITIES","CATEGORY=Force Secrets","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=ForceSecrets")-1,1,0|
 		<force_secret>
-|IIF(ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ex)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Su)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Sp)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ps)</name>
-|ELSE|
-			<name>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.DESC|</description>
-			<type>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE|</type>
-			<associated>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
+			<name>|ABILITYAUTO.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets|</name>
+			<description>|ABILITYAUTO.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.DESC|</description>
+			<type>|ABILITYAUTO.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.TYPE|</type>
+			<associated>|ABILITYAUTO.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
 			<auto>T</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
-			<category>Talent</category>
-			<source>|ABILITYAUTO.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
+			<category>Force Secrets</category>
+			<source>|ABILITYAUTO.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ForceSecrets")==0)|
 |ELSE|
 	<!-- Virtual Force Secrets -->
 |ENDIF|
-|FOR,%forcesecret,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=ForceSecrets")-1,1,0|
+|FOR,%forceSecret,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=ForceSecrets")-1,1,0|
 		<force_secret>
-|IIF(VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Extraordinary)|
-			<name>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ex)</name>
-|ELSE|
-|IIF(VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:Supernatural)|
-			<name>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Su)</name>
-|ELSE|
-|IIF(VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:SpellLike)|
-			<name>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Sp)</name>
-|ELSE|
-|IIF(VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE:PsiLike)|
-			<name>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets| (Ps)</name>
-|ELSE|
-			<name>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.DESC|</description>
-			<type>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.TYPE|</type>
-			<associated>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
-			<count>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
+			<name>|VABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets|</name>
+			<description>|VABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.DESC|</description>
+			<type>|VABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.TYPE|</type>
+			<associated>|VABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.ASSOCIATED|</associated>
+			<count>|VABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>T</virtual>
-			<category>Talent</category>
-			<source>|VABILITY.Force Secrets.VISIBLE.%forcesecret.TYPE=ForceSecrets.SOURCE|</source>
+			<category>Force Secrets</category>
+			<source>|VABILITY.Force Secrets.VISIBLE.%forceSecret.TYPE=ForceSecrets.SOURCE|</source>
 		</force_secret>
 |ENDFOR|
 	</force_secrets>
@@ -3531,24 +3350,24 @@
 			SALIENT DIVINE ABILITIES
 	  ====================================
 	  ====================================-->
-|IIF(count("ABILITIES";"CATEGORY=Salient Divine Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Salient Divine Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")==0)|
 |ELSE|
 <salient_divine_abilities>
-|FOR,%ability,0,count("ABILITIES","CATEGORY=Salient Divine Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Salient Divine Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1,1,0|
 		<salient_divine_ability>
-			<name>|ABILITY.Salient Divine Ability.VISIBLE.%ability|</name>
-			<description>|ABILITY.Salient Divine Ability.VISIBLE.%ability.DESC|</description>
-			<type>|ABILITY.Salient Divine Ability.VISIBLE.%ability.TYPE|</type>
-			<associated>|ABILITY.Salient Divine Ability.VISIBLE.%ability.ASSOCIATED|</associated>
-			<count>|ABILITY.Salient Divine Ability.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<name>|ABILITYALL.Salient Divine Ability.VISIBLE.%ability|</name>
+			<description>|ABILITYALL.Salient Divine Ability.VISIBLE.%ability.DESC|</description>
+			<type>|ABILITYALL.Salient Divine Ability.VISIBLE.%ability.TYPE|</type>
+			<associated>|ABILITYALL.Salient Divine Ability.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Salient Divine Ability.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Salient Divine Ability</category>
 		</salient_divine_ability>
-	</salient_divine_abilities>
 |ENDFOR|
-|ENDIF|
+	</salient_divine_abilities>
+
 	<!--
 	  ====================================
 	  ====================================
@@ -4168,78 +3987,100 @@
 |ELSE|
 	<!-- Standard Channeling -->
 |ENDIF|
-|FOR,%channeling,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ChannelingOutput")-1,1,0|
+|FOR,%channelingOutput,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=ChannelingOutput")-1,1,0|
 		<channeling>
-			<name>|ABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput|</name>
-			<description>|ABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.DESC|</description>
-			<type>|ABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.TYPE|</type>
-			<associated>|ABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.ASSOCIATED|</associated>
-			<count>|ABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.ASSOCIATEDCOUNT|</count>
+			<name>|ABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput|</name>
+			<description>|ABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.DESC|</description>
+			<type>|ABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.TYPE|</type>
+			<associated>|ABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.ASSOCIATED|</associated>
+			<count>|ABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.SOURCE|</source>
+			<source>|ABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.SOURCE|</source>
 		</channeling>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=ChannelingOutput")==0)|
 |ELSE|
 	<!-- Automatic Channeling -->
 |ENDIF|
-|FOR,%channeling,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=ChannelingOutput")-1,1,0|
+|FOR,%channelingOutput,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=ChannelingOutput")-1,1,0|
 		<channeling>
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput|</name>
-			<description>|ABILITYAUTO.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.DESC|</description>
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.ASSOCIATEDCOUNT|</count>
+			<name>|ABILITYAUTO.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput|</name>
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.DESC|</description>
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.TYPE|</type>
+			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.ASSOCIATED|</associated>
+			<count>|ABILITYAUTO.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.ASSOCIATEDCOUNT|</count>
 			<auto>T</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITYAUTO.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.SOURCE|</source>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.SOURCE|</source>
 		</channeling>
 |ENDFOR|
 |IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=ChannelingOutput")==0)|
 |ELSE|
 	<!-- Virtual Channeling -->
 |ENDIF|
-|FOR,%channeling,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=ChannelingOutput")-1,1,0|
+|FOR,%channelingOutput,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=ChannelingOutput")-1,1,0|
 		<channeling>
-			<name>|VABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput|</name>
-			<description>|VABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.DESC|</description>
-			<type>|VABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.TYPE|</type>
-			<associated>|VABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.ASSOCIATED|</associated>
-			<count>|VABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.ASSOCIATEDCOUNT|</count>
+			<name>|VABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput|</name>
+			<description>|VABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.DESC|</description>
+			<type>|VABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.TYPE|</type>
+			<associated>|VABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.ASSOCIATED|</associated>
+			<count>|VABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>T</virtual>
 			<category>Special Ability</category>
-			<source>|VABILITY.Special Ability.VISIBLE.%channeling.TYPE=ChannelingOutput.SOURCE|</source>
+			<source>|VABILITY.Special Ability.VISIBLE.%channelingOutput.TYPE=ChannelingOutput.SOURCE|</source>
 		</channeling>
 |ENDFOR|
 	</channelings>
 
 <!--> END Eclipse Set Add <-->
 
-
-
-|IIF(count("ABILITIES";"CATEGORY=Mutation";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL")==0)|
+	<!--
+	  ====================================
+	  ====================================
+			Occupations
+	  ====================================
+	  ====================================-->
+|IIF(count("ABILITIES";"CATEGORY=Occupation";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")==0)|
 |ELSE|
+|ENDIF|
+	<occupations>
+|FOR,%occupation,0,count("ABILITIES","CATEGORY=Occupation","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1,1,0|
+		<occupation>
+			<name>|ABILITYALL.Occupation.VISIBLE.%occupation|</name>
+			<description>|ABILITYALL.Occupation.VISIBLE.%occupation.DESC|</description>
+			<type>|ABILITYALL.Occupation.VISIBLE.%occupation.TYPE|</type>
+			<associated>|ABILITYALL.Occupation.VISIBLE.%occupation.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Occupation.VISIBLE.%occupation.ASSOCIATEDCOUNT|</count>
+			<source>|ABILITYALL.Occupation.VISIBLE.%occupation.SOURCE|</source>
+			<category>Occupation</category>
+		</occupation>
+|ENDFOR|
+	</occupations>
 	<!--
 	  ====================================
 	  ====================================
 			MUTATIONS
 	  ====================================
 	  ====================================-->
+|IIF(count("ABILITIES";"CATEGORY=Mutation";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")==0)|
+|ELSE|
 	<mutations>
-|FOR,%ability,0,count("ABILITIES","CATEGORY=Mutation","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL")-1,1,0|
+|ENDIF|
+|FOR,%mutation,0,count("ABILITIES","CATEGORY=Mutation","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1,1,0|
 		<mutation>
-			<name>|ABILITY.Mutation.VISIBLE.%ability|</name>
-			<description>|ABILITY.Mutation.VISIBLE.%ability.DESC|</description>
-			<type>|ABILITY.Mutation.VISIBLE.%ability.TYPE|</type>
-			<associated>|ABILITY.Mutation.VISIBLE.%ability.ASSOCIATED|</associated>
-			<count>|ABILITY.Mutation.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
+			<name>|ABILITYALL.Mutation.VISIBLE.%mutation|</name>
+			<description>|ABILITYALL.Mutation.VISIBLE.%mutation.DESC|</description>
+			<type>|ABILITYALL.Mutation.VISIBLE.%mutation.TYPE|</type>
+			<associated>|ABILITYALL.Mutation.VISIBLE.%mutation.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Mutation.VISIBLE.%mutation.ASSOCIATEDCOUNT|</count>
+			<source>|ABILITYALL.Mutation.VISIBLE.%mutation.SOURCE|</source>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
@@ -4247,8 +4088,6 @@
 		</mutation>
 |ENDFOR|
 	</mutations>
-|ENDIF|
-
 	<!--
 	  ====================================
 	  ====================================
@@ -5320,4 +5159,5 @@
 |ENDFOR|
 <!-- ### END class Spellbook memorized spells ### -->
 	</spells>
+
 </character>


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:[10992] Trunk/pcgen/outputsheets/base.xml

From: <ama...@us...> - 2009-11-13 17:18:35

Revision: 10992
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10992&view=rev
Author:   amaitland
Date:     2009-11-13 17:18:26 +0000 (Fri, 13 Nov 2009)

Log Message:
-----------
organize / ENDIF found out of place causing export failure. Fixed.

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2009-11-13 14:45:19 UTC (rev 10991)
+++ Trunk/pcgen/outputsheets/base.xml	2009-11-13 17:18:26 UTC (rev 10992)
@@ -1375,108 +1375,40 @@
 	  ====================================
 	  ====================================-->
 	<special_qualities>
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=SpecialQuality")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=SpecialQuality")==0)|
 |ELSE|
 	<!-- Standard Special Qualities -->
 |ENDIF|
-|FOR,%specialquality,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=SpecialQuality")-1,1,0|
+|FOR,%specialquality,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=SpecialQuality")-1,1,0|
 		<special_quality>
-|IIF(ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Extraordinary)|
-			<name>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ex)</name>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Extraordinary)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ex)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Supernatural)|
-			<name>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Su)</name>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Supernatural)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Su)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:SpellLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Sp)</name>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:SpellLike)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Sp)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:PsiLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ps)</name>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:PsiLike)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ps)</name>
 |ELSE|
-			<name>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality|</name>
+			<name>|ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.DESC|</description>
-			<type>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE|</type>
-			<associated>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATED|</associated>
-			<count>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.DESC|</description>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.SOURCE|</source>
+			<source>|ABILITYALL.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.SOURCE|</source>
 		</special_quality>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=SpecialQuality")==0)|
-|ELSE|
-	<!-- Automatic Special Qualities -->
-|ENDIF|
-|FOR,%specialquality,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=SpecialQuality")-1,1,0|
-		<special_quality>
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ex)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Su)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Sp)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ps)</name>
-|ELSE|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.DESC|</description>
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATEDCOUNT|</count>
-			<auto>T</auto>
-			<hidden>F</hidden>
-			<virtual>F</virtual>
-			<category>Special Ability</category>
-			<source>|ABILITYAUTO.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.SOURCE|</source>
-		</special_quality>
-|ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=SpecialQuality")==0)|
-|ELSE|
-	<!-- Virtual Special Qualities -->
-|ENDIF|
-|FOR,%specialquality,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=SpecialQuality")-1,1,0|
-		<special_quality>
-|IIF(VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Extraordinary)|
-			<name>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ex)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:Supernatural)|
-			<name>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Su)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:SpellLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Sp)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE:PsiLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality| (Ps)</name>
-|ELSE|
-			<name>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.DESC|</description>
-			<type>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.TYPE|</type>
-			<associated>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATED|</associated>
-			<count>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.ASSOCIATEDCOUNT|</count>
-			<auto>F</auto>
-			<hidden>F</hidden>
-			<virtual>T</virtual>
-			<category>Special Ability</category>
-			<source>|VABILITY.Special Ability.VISIBLE.%specialquality.TYPE=SpecialQuality.SOURCE|</source>
-		</special_quality>
-|ENDFOR|
 	</special_qualities>
 	<!--
 	  ====================================
@@ -1485,171 +1417,68 @@
 	  ====================================
 	  ====================================-->
 	<special_attacks>
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=SpecialAttack")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=SpecialAttack")==0)|
 |ELSE|
 	<!-- Standard Special Attacks -->
 |ENDIF|
-|FOR,%specialattack,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=SpecialAttack")-1,1,0|
+|FOR,%specialattack,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=SpecialAttack")-1,1,0|
 		<special_attack>
-|IIF(ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Extraordinary)|
-			<name>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ex)</name>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Extraordinary)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ex)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Supernatural)|
-			<name>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Su)</name>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Supernatural)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Su)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:SpellLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Sp)</name>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:SpellLike)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Sp)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:PsiLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ps)</name>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:PsiLike)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ps)</name>
 |ELSE|
-			<name>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack|</name>
+			<name>|ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.DESC|</description>
-			<type>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE|</type>
-			<associated>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATED|</associated>
-			<count>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.DESC|</description>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.SOURCE|</source>
+			<source>|ABILITYALL.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.SOURCE|</source>
 		</special_attack>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=SpecialAttack")==0)|
-|ELSE|
-	<!-- Automatic Special Attacks -->
-|ENDIF|
-|FOR,%specialattack,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=SpecialAttack")-1,1,0|
-		<special_attack>
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ex)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Su)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Sp)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ps)</name>
-|ELSE|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.DESC|</description>
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATEDCOUNT|</count>
-			<auto>T</auto>
-			<hidden>F</hidden>
-			<virtual>F</virtual>
-			<category>Special Ability</category>
-			<source>|ABILITYAUTO.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.SOURCE|</source>
-		</special_attack>
-|ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=SpecialAttack")==0)|
-|ELSE|
-	<!-- Virtual Special Attacks -->
-|ENDIF|
-|FOR,%specialattack,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=SpecialAttack")-1,1,0|
-		<special_attack>
-|IIF(VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Extraordinary)|
-			<name>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ex)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:Supernatural)|
-			<name>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Su)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:SpellLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Sp)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE:PsiLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack| (Ps)</name>
-|ELSE|
-			<name>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.DESC|</description>
-			<type>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.TYPE|</type>
-			<associated>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATED|</associated>
-			<count>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.ASSOCIATEDCOUNT|</count>
-			<auto>F</auto>
-			<hidden>F</hidden>
-			<virtual>T</virtual>
-			<category>Special Ability</category>
-			<source>|VABILITY.Special Ability.VISIBLE.%specialattack.TYPE=SpecialAttack.SOURCE|</source>
-		</special_attack>
-|ENDFOR|
 	</special_attacks>
-	<!--
+		<!--
 	  ====================================
 	  ====================================
-			DISADVANTAGES
+			Animal Trick
 	  ====================================
 	  ====================================-->
-	<disadvantages>
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=Disadvantage")==0)|
+	<animal_tricks>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=AnimalTrick")==0)|
 |ELSE|
-	<!-- Standard Disadvantages -->
+	<!-- Standard Animal Trick -->
 |ENDIF|
-|FOR,%disadvantage,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=Disadvantage")-1,1,0|
-		<disadvantage>
-			<name>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage|</name>
-			<description>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.DESC|</description>
-			<type>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.TYPE|</type>
-			<associated>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATED|</associated>
-			<count>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATEDCOUNT|</count>
+|FOR,%animalTrick,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=AnimalTrick")-1,1,0|
+		<animal_trick>
+			<name>|ABILITYALL.Special Ability.VISIBLE.%animalTrick.TYPE=AnimalTrick|</name>
+			<description>|ABILITYALL.Special Ability.VISIBLE.%animalTrick.TYPE=AnimalTrick.DESC|</description>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%animalTrick.TYPE=AnimalTrick.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%animalTrick.TYPE=AnimalTrick.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%animalTrick.TYPE=AnimalTrick.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.SOURCE|</source>
-		</disadvantage>
+			<source>|ABILITYALL.Special Ability.VISIBLE.%animalTrick.TYPE=AnimalTrick.SOURCE|</source>
+		</animal_trick>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Disadvantage")==0)|
-|ELSE|
-	<!-- Automatic Disadvantages -->
-|ENDIF|
-|FOR,%disadvantage,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=Disadvantage")-1,1,0|
-		<disadvantage>
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage|</name>
-			<description>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.DESC|</description>
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATEDCOUNT|</count>
-			<auto>T</auto>
-			<hidden>F</hidden>
-			<virtual>F</virtual>
-			<category>Special Ability</category>
-			<source>|ABILITYAUTO.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.SOURCE|</source>
-		</disadvantage>
-|ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Disadvantage")==0)|
-|ELSE|
-	<!-- Virtual Disadvantages -->
-|ENDIF|
-|FOR,%disadvantage,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=Disadvantage")-1,1,0|
-		<disadvantage>
-			<name>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage|</name>
-			<description>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.DESC|</description>
-			<type>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.TYPE|</type>
-			<associated>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATED|</associated>
-			<count>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATEDCOUNT|</count>
-			<auto>F</auto>
-			<hidden>F</hidden>
-			<virtual>T</virtual>
-			<category>Special Ability</category>
-			<source>|VABILITY.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.SOURCE|</source>
-		</disadvantage>
-|ENDFOR|
-	</disadvantages>
+	</animal_tricks>
+
 	<!--
 	  ====================================
 	  ====================================
@@ -1657,706 +1486,369 @@
 	  ====================================
 	  ====================================-->
 	<talents>
-|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=Talent")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=Talent")==0)|
 |ELSE|
 	<!-- Standard Talents -->
 |ENDIF|
-|FOR,%talent,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=Talent")-1,1,0|
+|FOR,%talent,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=Talent")-1,1,0|
 		<talent>
-|IIF(ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Extraordinary)|
-			<name>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Ex)</name>
+|IIF(ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Extraordinary)|
+			<name>|ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent| (Ex)</name>
 |ELSE|
-|IIF(ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Supernatural)|
-			<name>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Su)</name>
+|IIF(ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Supernatural)|
+			<name>|ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent| (Su)</name>
 |ELSE|
-|IIF(ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:SpellLike)|
-			<name>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Sp)</name>
+|IIF(ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:SpellLike)|
+			<name>|ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent| (Sp)</name>
 |ELSE|
-|IIF(ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:PsiLike)|
-			<name>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Ps)</name>
+|IIF(ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:PsiLike)|
+			<name>|ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent| (Ps)</name>
 |ELSE|
-			<name>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent|</name>
+			<name>|ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.DESC|</description>
-			<type>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE|</type>
-			<associated>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATED|</associated>
-			<count>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent.DESC|</description>
+			<type>|ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent.TYPE|</type>
+			<associated>|ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Talent</category>
-			<source>|ABILITY.Talent.VISIBLE.%talent.TYPE=Talent.SOURCE|</source>
+			<source>|ABILITYALL.Talent.VISIBLE.%talent.TYPE=Talent.SOURCE|</source>
 		</talent>	
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=Talent")==0)|
-|ELSE|
-	<!-- Automatic Talents -->
-|ENDIF|
-|FOR,%talent,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=Talent")-1,1,0|
-		<talent>
-|IIF(ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent| (Ex)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent| (Su)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent| (Sp)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent| (Ps)</name>
-|ELSE|
-			<name>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.DESC|</description>
-			<type>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.TYPE|</type>
-			<associated>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATEDCOUNT|</count>
-			<auto>T</auto>
-			<hidden>F</hidden>
-			<virtual>F</virtual>
-			<category>Talent</category>
-			<source>|ABILITYAUTO.Talent.VISIBLE.%talent.TYPE=Talent.SOURCE|</source>
-		</talent>	
-|ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Talent";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=Talent")==0)|
-|ELSE|
-	<!-- Virtual Talents -->
-|ENDIF|
-|FOR,%talent,0,count("ABILITIES","CATEGORY=Talent","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=Talent")-1,1,0|
-		<talent>
-|IIF(VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Extraordinary)|
-			<name>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Ex)</name>
-|ELSE|
-|IIF(VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:Supernatural)|
-			<name>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Su)</name>
-|ELSE|
-|IIF(VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:SpellLike)|
-			<name>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Sp)</name>
-|ELSE|
-|IIF(VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE:PsiLike)|
-			<name>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent| (Ps)</name>
-|ELSE|
-			<name>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.DESC|</description>
-			<type>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.TYPE|</type>
-			<associated>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATED|</associated>
-			<count>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.ASSOCIATEDCOUNT|</count>
-			<auto>F</auto>
-			<hidden>F</hidden>
-			<virtual>T</virtual>
-			<category>Talent</category>
-			<source>|VABILITY.Talent.VISIBLE.%talent.TYPE=Talent.SOURCE|</source>
-		</talent>
-|ENDFOR|
 	</talents>
 	<!--
 	  ====================================
 	  ====================================
-			Demon Cant
+			SALIENT DIVINE ABILITIES
 	  ====================================
 	  ====================================-->
-	<demon_cants>
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=DemonCant")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Salient Divine Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")==0)|
 |ELSE|
-	<!-- Standard Demon Cant -->
 |ENDIF|
-|FOR,%demoncant,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=DemonCant")-1,1,0|
-		<demon_cant>
-|IIF(ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:Extraordinary)|
-			<name>|ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Ex)</name>
-|ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:Supernatural)|
-			<name>|ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Su)</name>
-|ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:SpellLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Sp)</name>
-|ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:PsiLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Ps)</name>
-|ELSE|
-			<name>|ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.DESC|</description>
-			<type>|ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE|</type>
-			<associated>|ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.ASSOCIATED|</associated>
-			<count>|ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.ASSOCIATEDCOUNT|</count>
+<salient_divine_abilities>
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Salient Divine Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1,1,0|
+		<salient_divine_ability>
+			<name>|ABILITYALL.Salient Divine Ability.VISIBLE.%ability|</name>
+			<description>|ABILITYALL.Salient Divine Ability.VISIBLE.%ability.DESC|</description>
+			<type>|ABILITYALL.Salient Divine Ability.VISIBLE.%ability.TYPE|</type>
+			<associated>|ABILITYALL.Salient Divine Ability.VISIBLE.%ability.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Salient Divine Ability.VISIBLE.%ability.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
-			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.SOURCE|</source>
-		</demon_cant>
+			<category>Salient Divine Ability</category>
+		</salient_divine_ability>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=DemonCant")==0)|
+	</salient_divine_abilities>
+	<!--
+	  ====================================
+	  ====================================
+			Occupations
+	  ====================================
+	  ====================================-->
+|IIF(count("ABILITIES";"CATEGORY=Occupation";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")==0)|
 |ELSE|
-	<!-- Automatic Demon Cant -->
 |ENDIF|
-|FOR,%demoncant,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=DemonCant")-1,1,0|
-		<demon_cant>
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Ex)</name>
+	<occupations>
+|FOR,%occupation,0,count("ABILITIES","CATEGORY=Occupation","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1,1,0|
+		<occupation>
+			<name>|ABILITYALL.Occupation.VISIBLE.%occupation|</name>
+			<description>|ABILITYALL.Occupation.VISIBLE.%occupation.DESC|</description>
+			<type>|ABILITYALL.Occupation.VISIBLE.%occupation.TYPE|</type>
+			<associated>|ABILITYALL.Occupation.VISIBLE.%occupation.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Occupation.VISIBLE.%occupation.ASSOCIATEDCOUNT|</count>
+			<source>|ABILITYALL.Occupation.VISIBLE.%occupation.SOURCE|</source>
+			<category>Occupation</category>
+		</occupation>
+|ENDFOR|
+	</occupations>
+		<!--
+	  ====================================
+	  ====================================
+			Eclipse Recurring Bonuses
+	  ====================================
+	  ====================================-->
+	<charcreations>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=CharCreation")==0)|
 |ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Su)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Sp)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Ps)</name>
-|ELSE|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant|</name>
+	<!-- Standard Character Creation Recurring Bonuses -->
 |ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.DESC|</description>
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.ASSOCIATEDCOUNT|</count>
-			<auto>T</auto>
+|FOR,%charCreation,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=CharCreation")-1,1,0|
+		<charcreation>
+			<name>|ABILITYALL.Special Ability.VISIBLE.%charCreation.TYPE=CharCreation|</name>
+			<description>|ABILITYALL.Special Ability.VISIBLE.%charCreation.TYPE=CharCreation.DESC|</description>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%charCreation.TYPE=CharCreation.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%charCreation.TYPE=CharCreation.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%charCreation.TYPE=CharCreation.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITYAUTO.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.SOURCE|</source>
-		</demon_cant>
+			<source>|ABILITYALL.Special Ability.VISIBLE.%charCreation.TYPE=CharCreation.SOURCE|</source>
+		</charcreation>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=DemonCant")==0)|
+	</charcreations>
+		<!--
+	  ====================================
+	  ====================================
+			DISADVANTAGES
+	  ====================================
+	  ====================================-->
+	<disadvantages>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=Disadvantage")==0)|
 |ELSE|
-	<!-- Virtual Demon Cant -->
+	<!-- Standard Disadvantages -->
 |ENDIF|
-|FOR,%demoncant,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=DemonCant")-1,1,0|
-		<demon_cant>
-|IIF(VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:Extraordinary)|
-			<name>|VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Ex)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:Supernatural)|
-			<name>|VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Su)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:SpellLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Sp)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE:PsiLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant| (Ps)</name>
-|ELSE|
-			<name>|VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.DESC|</description>
-			<type>|VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.TYPE|</type>
-			<associated>|VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.ASSOCIATED|</associated>
-			<count>|VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.ASSOCIATEDCOUNT|</count>
+|FOR,%disadvantage,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=Disadvantage")-1,1,0|
+		<disadvantage>
+			<name>|ABILITYALL.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage|</name>
+			<description>|ABILITYALL.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.DESC|</description>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
-			<virtual>T</virtual>
+			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|VABILITY.Special Ability.VISIBLE.%demoncant.TYPE=DemonCant.SOURCE|</source>
-		</demon_cant>
+			<source>|ABILITYALL.Special Ability.VISIBLE.%disadvantage.TYPE=Disadvantage.SOURCE|</source>
+		</disadvantage>
 |ENDFOR|
-	</demon_cants>
+	</disadvantages>
 	<!--
 	  ====================================
 	  ====================================
-			Mage Gnosis
+			Eclipse Abilities
 	  ====================================
 	  ====================================-->
-	<mage_gnosises>
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=MageGnosis")==0)|
+	<eclipse_abilities>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=EclipseAbilityOutput")==0)|
 |ELSE|
-	<!-- Standard Mage Gnosis -->
+	<!-- Standard Eclipse Abilities -->
 |ENDIF|
-|FOR,%magegnosis,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=MageGnosis")-1,1,0|
-		<mage_gnosis>
-|IIF(ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:Extraordinary)|
-			<name>|ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Ex)</name>
+|FOR,%eclipseAbilities,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=EclipseAbilityOutput")-1,1,0|
+		<eclipse_ability>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput.TYPE:Extraordinary)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput| (Ex)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:Supernatural)|
-			<name>|ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Su)</name>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput.TYPE:Supernatural)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput| (Su)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:SpellLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Sp)</name>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput.TYPE:SpellLike)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput| (Sp)</name>
 |ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:PsiLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Ps)</name>
+|IIF(ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput.TYPE:PsiLike)|
+			<name>|ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput| (Ps)</name>
 |ELSE|
-			<name>|ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis|</name>
+			<name>|ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput|</name>
 |ENDIF|
 |ENDIF|
 |ENDIF|
 |ENDIF|
-			<description>|ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.DESC|</description>
-			<type>|ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE|</type>
-			<associated>|ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.ASSOCIATED|</associated>
-			<count>|ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.ASSOCIATEDCOUNT|</count>
+			<description>|ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput.DESC|</description>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.SOURCE|</source>
-		</mage_gnosis>
+			<source>|ABILITYALL.Special Ability.VISIBLE.%eclipseAbilities.TYPE=EclipseAbilityOutput.SOURCE|</source>
+		</eclipse_ability>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=MageGnosis")==0)|
+	</eclipse_abilities>
+	<!--
+	  ====================================
+	  ====================================
+			Spell Caster Output
+	  ====================================
+	  ====================================-->
+	<spellcasteroutputs>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=SpellCasterOutput")==0)|
 |ELSE|
-	<!-- Automatic Mage Gnosis -->
+	<!-- Standard Spell Caster Output -->
 |ENDIF|
-|FOR,%magegnosis,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=MageGnosis")-1,1,0|
-		<mage_gnosis>
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Ex)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Su)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Sp)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Ps)</name>
-|ELSE|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.DESC|</description>
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.ASSOCIATEDCOUNT|</count>
-			<auto>T</auto>
+|FOR,%spellCasterOutput,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=SpellCasterOutput")-1,1,0|
+		<spellcasteroutput>
+			<name>|ABILITYALL.Special Ability.VISIBLE.%spellCasterOutput.TYPE=SpellCasterOutput|</name>
+			<description>|ABILITYALL.Special Ability.VISIBLE.%spellCasterOutput.TYPE=SpellCasterOutput.DESC|</description>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%spellCasterOutput.TYPE=SpellCasterOutput.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%spellCasterOutput.TYPE=SpellCasterOutput.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%spellCasterOutput.TYPE=SpellCasterOutput.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITYAUTO.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.SOURCE|</source>
-		</mage_gnosis>
+			<source>|ABILITYALL.Special Ability.VISIBLE.%spellCasterOutput.TYPE=SpellCasterOutput.SOURCE|</source>
+		</spellcasteroutput>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=MageGnosis")==0)|
+	</spellcasteroutputs>
+	<!--
+	  ====================================
+	  ====================================
+			Martial Arts
+	  ====================================
+	  ====================================-->
+	<martial_arts>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=MartialArtsOutput")==0)|
 |ELSE|
-	<!-- Virtual Mage Gnosis -->
+	<!-- Standard Martial Arts -->
 |ENDIF|
-|FOR,%magegnosis,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=MageGnosis")-1,1,0|
-		<mage_gnosis>
-|IIF(VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:Extraordinary)|
-			<name>|VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Ex)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:Supernatural)|
-			<name>|VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Su)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:SpellLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Sp)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE:PsiLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis| (Ps)</name>
-|ELSE|
-			<name>|VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.DESC|</description>
-			<type>|VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.TYPE|</type>
-			<associated>|VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.ASSOCIATED|</associated>
-			<count>|VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.ASSOCIATEDCOUNT|</count>
+|FOR,%martialArtist,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=MartialArtsOutput")-1,1,0|
+		<martial_art>
+			<name>|ABILITYALL.Special Ability.VISIBLE.%martialArtist.TYPE=MartialArtsOutput|</name>
+			<description>|ABILITYALL.Special Ability.VISIBLE.%martialArtist.TYPE=MartialArtsOutput.DESC|</description>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%martialArtist.TYPE=MartialArtsOutput.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%martialArtist.TYPE=MartialArtsOutput.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%martialArtist.TYPE=MartialArtsOutput.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
-			<virtual>T</virtual>
+			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|VABILITY.Special Ability.VISIBLE.%magegnosis.TYPE=MageGnosis.SOURCE|</source>
-		</mage_gnosis>
+			<source>|ABILITYALL.Special Ability.VISIBLE.%martialArtist.TYPE=MartialArtsOutput.SOURCE|</source>
+		</martial_art>
 |ENDFOR|
-	</mage_gnosises>
+	</martial_arts>
 	<!--
 	  ====================================
 	  ====================================
-			Vampire Disciplines
+			Mystic Artist
 	  ====================================
 	  ====================================-->
-	<vampire_disciplines>
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=VampireDiscipline")==0)|
+	<mystic_artists>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=MysticArtistOutput")==0)|
 |ELSE|
-	<!-- Standard Vampire Disciplines -->
+	<!-- Standard Mystic Artist -->
 |ENDIF|
-|FOR,%vampirediscipline,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=VampireDiscipline")-1,1,0|
-		<vampire_discipline>
-|IIF(ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:Extraordinary)|
-			<name>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Ex)</name>
-|ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:Supernatural)|
-			<name>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Su)</name>
-|ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:SpellLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Sp)</name>
-|ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:PsiLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Ps)</name>
-|ELSE|
-			<name>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.DESC|</description>
-			<type>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE|</type>
-			<associated>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.ASSOCIATED|</associated>
-			<count>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.ASSOCIATEDCOUNT|</count>
+|FOR,%mysticArtist,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=MysticArtistOutput")-1,1,0|
+		<mystic_artist>
+			<name>|ABILITYALL.Special Ability.VISIBLE.%mysticArtist.TYPE=MysticArtistOutput|</name>
+			<description>|ABILITYALL.Special Ability.VISIBLE.%mysticArtist.TYPE=MysticArtistOutput.DESC|</description>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%mysticArtist.TYPE=MysticArtistOutput.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%mysticArtist.TYPE=MysticArtistOutput.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%mysticArtist.TYPE=MysticArtistOutput.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.SOURCE|</source>
-		</vampire_discipline>
+			<source>|ABILITYALL.Special Ability.VISIBLE.%mysticArtist.TYPE=MysticArtistOutput.SOURCE|</source>
+		</mystic_artist>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=VampireDiscipline")==0)|
-|ELSE|
-	<!-- Automatic Vampire Disciplines -->
-|ENDIF|
-|FOR,%vampirediscipline,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=VampireDiscipline")-1,1,0|
-		<vampire_discipline>
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Ex)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Su)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Sp)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Ps)</name>
-|ELSE|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.DESC|</description>
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.ASSOCIATEDCOUNT|</count>
-			<auto>T</auto>
-			<hidden>F</hidden>
-			<virtual>F</virtual>
-			<category>Special Ability</category>
-			<source>|ABILITYAUTO.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.SOURCE|</source>
-		</vampire_discipline>
-|ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=VampireDiscipline")==0)|
-|ELSE|
-	<!-- Virtual Vampire Disciplines -->
-|ENDIF|
-|FOR,%vampirediscipline,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=VampireDiscipline")-1,1,0|
-		<vampire_discipline>
-|IIF(VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:Extraordinary)|
-			<name>|VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Ex)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:Supernatural)|
-			<name>|VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Su)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:SpellLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Sp)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE:PsiLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline| (Ps)</name>
-|ELSE|
-			<name>|VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.DESC|</description>
-			<type>|VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.TYPE|</type>
-			<associated>|VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.ASSOCIATED|</associated>
-			<count>|VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.ASSOCIATEDCOUNT|</count>
-			<auto>F</auto>
-			<hidden>F</hidden>
-			<virtual>T</virtual>
-			<category>Special Ability</category>
-			<source>|VABILITY.Special Ability.VISIBLE.%vampirediscipline.TYPE=VampireDiscipline.SOURCE|</source>
-		</vampire_discipline>
-|ENDFOR|
-	</vampire_disciplines>
-
+	</mystic_artists>
 	<!--
 	  ====================================
 	  ====================================
-			Werewolf Rites
+			Witchcraft Abilities
 	  ====================================
 	  ====================================-->
-	<werewolf_rites>
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=NORMAL";"TYPE=WerewolfRite")==0)|
+	<witchcrafts>
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=WitchcraftOutput")==0)|
 |ELSE|
-	<!-- Standard Rites -->
+	<!-- Standard Witchcraft Abilities -->
 |ENDIF|
-|FOR,%werewolfRite,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=NORMAL","TYPE=WerewolfRite")-1,1,0|
-		<werewolf_rite>
-|IIF(ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:Extraordinary)|
-			<name>|ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Ex)</name>
-|ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:Supernatural)|
-			<name>|ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Su)</name>
-|ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:SpellLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Sp)</name>
-|ELSE|
-|IIF(ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:PsiLike)|
-			<name>|ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Ps)</name>
-|ELSE|
-			<name>|ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.DESC|</description>
-			<type>|ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE|</type>
-			<associated>|ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.ASSOCIATED|</associated>
-			<count>|ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.ASSOCIATEDCOUNT|</count>
+|FOR,%witchcraftVar,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=WitchcraftOutput")-1,1,0|
+		<witchcraft>
+			<name>|ABILITYALL.Special Ability.VISIBLE.%witchcraftVar.TYPE=WitchcraftOutput|</name>
+			<description>|ABILITYALL.Special Ability.VISIBLE.%witchcraftVar.TYPE=WitchcraftOutput.DESC|</description>
+			<type>|ABILITYALL.Special Ability.VISIBLE.%witchcraftVar.TYPE=WitchcraftOutput.TYPE|</type>
+			<associated>|ABILITYALL.Special Ability.VISIBLE.%witchcraftVar.TYPE=WitchcraftOutput.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Special Ability.VISIBLE.%witchcraftVar.TYPE=WitchcraftOutput.ASSOCIATEDCOUNT|</count>
 			<auto>F</auto>
 			<hidden>F</hidden>
 			<virtual>F</virtual>
 			<category>Special Ability</category>
-			<source>|ABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.SOURCE|</source>
-		</werewolf_rite>
+			<source>|ABILITYALL.Special Ability.VISIBLE.%witchcraftVar.TYPE=WitchcraftOutput.SOURCE|</source>
+		</witchcraft>
 |ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=AUTOMATIC";"TYPE=WerewolfRite")==0)|
-|ELSE|
-	<!-- Automatic Rites -->
-|ENDIF|
-|FOR,%werewolfRite,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=WerewolfRite")-1,1,0|
-		<werewolf_rite>
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:Extraordinary)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Ex)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:Supernatural)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Su)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:SpellLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Sp)</name>
-|ELSE|
-|IIF(ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:PsiLike)|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Ps)</name>
-|ELSE|
-			<name>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.DESC|</description>
-			<type>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE|</type>
-			<associated>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.ASSOCIATED|</associated>
-			<count>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.ASSOCIATEDCOUNT|</count>
-			<source>|ABILITYAUTO.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.SOURCE|</source>
-			<auto>T</auto>
-			<hidden>F</hidden>
-			<virtual>F</virtual>
-			<category>Special Ability</category>
-		</werewolf_rite>
-|ENDFOR|
-|IIF(count("ABILITIES";"CATEGORY=Special Ability";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"NATURE=VIRTUAL";"TYPE=WerewolfRite")==0)|
-|ELSE|
-	<!-- Virtual Rites -->
-|ENDIF|
-|FOR,%werewolfRite,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=VIRTUAL","TYPE=WerewolfRite")-1,1,0|
-		<werewolf_rite>
-|IIF(VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:Extraordinary)|
-			<name>|VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Ex)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:Supernatural)|
-			<name>|VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Su)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:SpellLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Sp)</name>
-|ELSE|
-|IIF(VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE:PsiLike)|
-			<name>|VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite| (Ps)</name>
-|ELSE|
-			<name>|VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.DESC|</description>
-			<type>|VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.TYPE|</type>
-			<associated>|VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.ASSOCIATED|</associated>
-			<count>|VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.ASSOCIATEDCOUNT|</count>
-			<auto>F</auto>
-			<hidden>F</hidden>
-			<virtual>T</virtual>
-			<category>Special Ability</category>
-			<source>|VABILITY.Special Ability.VISIBLE.%werewolfRite.TYPE=WerewolfRite.SOURCE|</source>
-		</werewolf_rite>
-|ENDFOR|
-	</werewolf_rites>
-
+	</witchcrafts>
 	<!--
 	  ====================================
 	  ====================================
-			Force Powers
+			The Path of the Dragon
 	  ====================================
 	  ====================================-->
-	<force_powers>
-|IIF(count("ABIL...
 
[truncated message content]

[pcgen-commit-svn] SF.net SVN: pcgen:[11270] Trunk/pcgen/outputsheets/base.xml

From: <za...@us...> - 2010-01-02 13:20:35

Revision: 11270
          http://pcgen.svn.sourceforge.net/pcgen/?rev=11270&view=rev
Author:   zaister
Date:     2010-01-02 13:20:28 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
added support for ability checkbox lists, conditional saving throw modifiers, and traits.

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2010-01-02 11:25:09 UTC (rev 11269)
+++ Trunk/pcgen/outputsheets/base.xml	2010-01-02 13:20:28 UTC (rev 11270)
@@ -339,7 +339,15 @@
 	  ====================================
 	  ====================================-->
 	<saving_throws>
-		<conditional_modifiers/>
+		<conditional_modifiers>
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=SaveBonus")-1,1,0|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%ability.TYPE=SaveBonus.HASASPECT.SaveBonus:Y)|
+			<savebonus>
+				<description>|ABILITYAUTO.Special Ability.%ability.TYPE=SaveBonus.ASPECT.SaveBonus|</description>
+			</savebonus>
+|ENDIF|
+|ENDFOR|
+		</conditional_modifiers>
 		<saving_throw>
 			<name>
 				<long>fortitude</long>
@@ -1137,7 +1145,36 @@
 		</leadership>
 |%|
 	</class_features>
-	<!--
+
+	<!-- Abilites with check lists -->
+	<checklists>
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","NATURE=AUTOMATIC","TYPE=CheckList")-1,1,0|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%ability.TYPE=CheckList.HASASPECT.CheckCount:Y)|
+		<checklist>
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%ability.TYPE=CheckList.TYPE:Extraordinary)|
+			<name>|ABILITYAUTO.Special Ability.%ability.TYPE=CheckList| (Ex)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%ability.TYPE=CheckList.TYPE:Supernatural)|
+			<name>|ABILITYAUTO.Special Ability.%ability.TYPE=CheckList| (Su)</name>
+|ELSE|
+|IIF(ABILITYAUTO.Special Ability.VISIBLE.%ability.TYPE=CheckList.TYPE:SpellLike)|
+			<name>|ABILITYAUTO.Special Ability.%ability.TYPE=CheckList| (Sp)</name>
+|ELSE|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<header>|ABILITYAUTO.Special Ability.VISIBLE.%ability.TYPE=CheckList|</header>
+			<description>|ABILITYAUTO.Special Ability.VISIBLE.%ability.TYPE=CheckList.DESC|</description>
+			<type>|ABILITYAUTO.Special Ability.VISIBLE.%ability.TYPE=CheckList.TYPE|</type>
+			<source>|ABILITYAUTO.Special Ability.VISIBLE.%ability.TYPE=CheckList.SOURCE|</source>
+			<check_count>|ABILITYAUTO.Special Ability.%ability.TYPE=CheckList.ASPECT.CheckCount.INTVAL|</check_count>
+			<check_type>|ABILITYAUTO.Special Ability.%ability.TYPE=CheckList.ASPECT.CheckType|</check_type>
+		</checklist>
+|ENDIF|
+|ENDFOR|
+	</checklists>
+
+<!--
 	  ====================================
 	  ====================================
 			EQUIPMENT
@@ -2577,6 +2614,21 @@
 
 
 
+	<!--
+	  ====================================
+	  ====================================
+			TRAITS
+	  ====================================
+	  ====================================-->
+	<traits>
+|FOR,%trait,0,count("ABILITIES","CATEGORY=Special Ability","TYPE=Trait","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1,1,0|
+		<trait>
+			<name>|ABILITY.Special Ability.VISIBLE.%trait.TYPE=Trait|</name>
+			<description>|ABILITY.Special Ability.VISIBLE.%trait.TYPE=Trait.DESC|</description>
+			<source>|ABILITY.Special Ability.VISIBLE.%trait.TYPE=Trait.SOURCE|</source>
+		</trait>
+|ENDFOR|
+	</traits>
 
 
 


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

1 2 3 4 > >> (Page 1 of 4)

Thread: [pcgen-commit-svn] SF.net SVN: pcgen:[7606] Trunk/pcgen/outputsheets/base.xml

RPG character generator for RPG d20 systems.

pcgen-commit-svn