Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen:[25693] branches/6.04.x
|
From: <ama...@us...> - 2014-12-03 02:02:37
|
Revision: 25693
http://sourceforge.net/p/pcgen/code/25693
Author: amaitland
Date: 2014-12-03 02:02:24 +0000 (Wed, 03 Dec 2014)
Log Message:
-----------
Backport OS improvements
Modified Paths:
--------------
branches/6.04.x/outputsheets/base.xml.ftl
branches/6.04.x/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm.ftl
branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_class_features.xslt
branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_equipment.xslt
branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_features.xslt
branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_hp_defense.xslt
branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_spells_condensed.xslt
branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_spells_list.xslt
branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_alt_largetext.xslt
branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_common_blocks.xslt
branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_spell_list_only.xslt
branches/6.04.x/preview/d20/fantasy/Standard.htm.ftl
Modified: branches/6.04.x/outputsheets/base.xml.ftl
===================================================================
--- branches/6.04.x/outputsheets/base.xml.ftl 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/outputsheets/base.xml.ftl 2014-12-03 02:02:24 UTC (rev 25693)
@@ -148,6 +148,7 @@
<@loop from=0 to=pcvar('COUNT[LANGUAGES]-1') ; lang , lang_has_next>
<language>${pcstring('LANGUAGES.${lang}')}</language>
</@loop>
+ <language>${pcstring('ABILITYALL.ANY.0.ASPECT=Language.ASPECT.Language')}</language>
<all>${pcstring('LANGUAGES')}</all>
</languages>
<location>${pcstring('LOCATION')}</location>
@@ -173,7 +174,11 @@
<portrait_thumb>${pcstring('PORTRAIT.THUMB')}</portrait_thumb>
</portrait>
<phobias>${pcstring('PHOBIAS')}</phobias>
- <race>${pcstring('RACE')}</race>
+ <#if (pcstring("ABILITYALL.ANY.0.TYPE=RaceName.HASASPECT.RaceName") = "Y")>
+ <race>${pcstring('ABILITYALL.ANY.0.ASPECT=RaceName.ASPECT.RaceName')}</race>
+ <#else>
+ <race>${pcstring('RACE')}</race>
+ </#if>
<race>
<@loop from=0 to=pcvar('countdistinct("ABILITIES","CATEGORY=Internal","ASPECT=RaceExtra")-1') ; ability , ability_has_next>
<raceextra>${pcstring('ABILITYALL.Internal.HIDDEN.${ability}.ASPECT.RaceExtra')}</raceextra>
@@ -340,6 +345,7 @@
<spell_failure>${pcstring('SPELLFAILURE')}</spell_failure>
<check_penalty>${pcstring('ACCHECK')}</check_penalty>
<spell_resistance>${pcstring('SR')}</spell_resistance>
+ <hero_points>${pcstring('VAR.HEROPOINTS.INTVAL')}</hero_points>
</initiative>
<!--
====================================
@@ -371,7 +377,11 @@
<eclipse_total>${pcstring('VAR.CharacterSkillPts.INTVAL')}</eclipse_total>
</skillpoints>
<list_mods>${pcstring('SKILLLISTMODS')}</list_mods>
- <max_class_skill_level>${pcstring('MAXSKILLLEVEL')}</max_class_skill_level>
+ <#if (pcvar("VAR.Max_Rank_Display") > 0)>
+ <max_class_skill_level>${pcstring('VAR.Max_Rank_Display')}</max_class_skill_level>
+ <#else>
+ <max_class_skill_level>${pcstring('MAXSKILLLEVEL')}</max_class_skill_level>
+ </#if>
<max_cross_class_skill_level>${pcstring('MAXCCSKILLLEVEL')}</max_cross_class_skill_level>
<@loop from=0 to=pcvar('count("SKILLSIT", "VIEW=VISIBLE_EXPORT")')-1 ; skill ,skill_has_next>
<skill>
@@ -502,7 +512,7 @@
<base_attack_bonus>${pcstring('ATTACK.MELEE')}</base_attack_bonus>
<stat_mod>${pcstring('VAR.CMB_STAT.INTVAL.SIGN')}</stat_mod>
<size_mod>${pcstring('VAR.CMB_SizeMod.INTVAL.SIGN')}</size_mod>
- <misc_mod>${pcstring('VAR.CMB-ATTACK.MELEE.BASE-VAR.CMB_STAT-VAR.CMB_SizeMod.INTVAL.SIGN')}</misc_mod>
+ <misc_mod></misc_mod> <#-- This formula is giving incorrect results - STAT/STAT ${pcstring('VAR.CMB-ATTACK.MELEE.BASE-VAR.CMB_STAT-VAR.CMB_SizeMod.INTVAL.SIGN')} -->
<epic_mod/>
<temp_mod/>
<!-- Base values (not yet used) -->
@@ -1602,6 +1612,18 @@
<!--
====================================
====================================
+ Resistance Table
+ ====================================
+ ====================================-->
+ <resistances>
+ <@loop from=0 to=pcvar('countdistinct("ABILITIES","CATEGORY=Special Ability","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","ASPECT=ResistanceOutput")-1') ; resistance , resistance_has_next>
+ <resistance>${pcstring('ABILITYALL.Special Ability.${resistance}.TYPE=Resistance.ASPECT.ResistanceOutput')}</resistance>
+ </@loop>
+ </resistances>
+
+ <!--
+ ====================================
+ ====================================
Racial Traits
====================================
====================================-->
@@ -2520,6 +2542,15 @@
</afflictions>
<!--
+ ====================================
+ ====================================
+ PFS Chronicles
+ ====================================
+ ====================================-->
+ <pfs_chronicles>
+ <@abilityBlock category="PFS Chronicle" nature="ALL" hidden=false typeName="PFSChronicle" nodeName="pfs_chronicle" />
+ </pfs_chronicles>
+ <!--
====================================
====================================
Temporary Bonus
Modified: branches/6.04.x/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm.ftl
===================================================================
--- branches/6.04.x/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm.ftl 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm.ftl 2014-12-03 02:02:24 UTC (rev 25693)
@@ -138,6 +138,12 @@
<td colspan="1" class="h">${pcstring('EXP.CURRENT')}</td>
<td colspan="1" class="h">${pcstring('RACE')}</td>
+ <#if (pcstring("ABILITYALL.Special Ability.${ability}.TYPE=RaceName.HASASPECT.RaceName") = "Y")>
+ <td colspan="1" class="h">${pcstring('ABILITYALL.ANY.0.ASPECT=RaceName.ASPECT.RaceName')}</td>
+ <#else>
+ <td colspan="1" class="h">${pcstring('RACE')}</td>
+ </#if>
+
<td class="h">${pcstring('SIZELONG')} / ${pcstring('FACE')}</td>
<td class="h">${pcstring('HEIGHT')}</td>
<td class="h">${pcstring('WEIGHT')}</td>
@@ -1359,7 +1365,8 @@
<td align="center" class="font8"><b>${pcstring('((ABILITYALL.Special Ability.${turncount}.ASPECT=TurnType.ASPECT.TurnLevel)-2).INTVAL')}</b></td>
<td colspan="2" class="border" align="center"><font style="font-size: small">
<@loop from=0 to=pcvar('ABILITYALL.Special Ability.${turncount}.ASPECT=TurnType.ASPECT.TurnTimes.INTVAL') step=5 > ☐ </@loop>
- </font></td>
+<!-- -->
+ </font></td>
</tr>
<tr>
<td bgcolor="gray" align="center" class="font8"><b>7 - 9</b></td>
@@ -1395,7 +1402,7 @@
<!-- Channeling Table -->
<!-- Start Channeling Table -->
-<@loop from=0 to=pcvar('count("ABILITIES","CATEGORY=Special Ability","ASPECT=ChannelingType")-1') ; turncount , turncount_has_next>
+<@loop from=0 to=pcvar('count("ABILITIES","CATEGORY=Special Ability","ASPECT=ChannelingType")-1') ; channelingcount , channelingcount_has_next>
<table width="100%" cellspacing="0" cellpadding="3" summary="Channeling Table">
<tr>
<td bgcolor="black" align="center" colspan="4"><font color="white" style="font-size: small"><b>${pcstring('ABILITYALL.Special Ability.${channelingcount}.ASPECT=ChannelingType.ASPECT.ChannelingType')} ${pcstring('ABILITYALL.Special Ability.${channelingcount}.ASPECT=ChannelingType.ASPECT.ChannelingKind')}</b></font></td>
@@ -1487,7 +1494,7 @@
<td bgcolor="black" align="center" colspan="1"><font color="white" style="font-size: small"><b>LANGUAGES</b></font></td>
</tr>
<tr>
- <td valign="top" width="100%" class="border8">${pcstring('LANGUAGES')}<br /></td>
+ <td valign="top" width="100%" class="border8">${pcstring('LANGUAGES')} ${pcstring('ABILITYALL.ANY.0.ASPECT=Language.ASPECT.Language')}<br /></td>
</tr>
</table>
<!-- STOP Language Table -->
@@ -1686,6 +1693,37 @@
</tr>
</table>
<!-- STOP Feat Table -->
+
+<!-- START PFS Chronicles Table -->
+<#if (pcvar('count("ABILITIES","CATEGORY=PFS Chronicles","TYPE=PFSChronicle","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")') > 0)>
+ <table width="100%" cellspacing="0" cellpadding="2" summary="Feat Table">
+ <tr>
+ <th bgcolor="black" align="center" colspan="2"><font color="white" style="font-size: small"><b>PFS Chronicles</b></font></th>
+ </tr>
+<@loop from=0 to=pcvar('count("ABILITIES","CATEGORY=PFS Chronicles","TYPE=PFSChronicle","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1') ; PFSChronicle , PFSChronicle_has_next>
+<#if (PFSChronicle % 2 = 0)><tr bgcolor="#DDDDDD"><#else><tr bgcolor="white"></#if>
+ <td valign="top" width="70%" class="font8"><b>
+<#assign typeOfAbility = pcstring("ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle.TYPE")?lower_case />
+<#if (pcstring("ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle.HASASPECT.Name") = "Y")>
+${pcstring('ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle.ASPECT.Name')}
+<@typeOfAbilitySuffix typeOfAbility=typeOfAbility />
+<#else>
+${pcstring('ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle')}
+<@typeOfAbilitySuffix typeOfAbility=typeOfAbility />
+</#if>
+</b>
+</td>
+<td class="font8" valign="top" width="30%" align="right">[${pcstring('ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle.SOURCE')}]</td>
+<tr>
+<#if (PFSChronicle % 2 = 0)><tr bgcolor="#DDDDDD"><#else><tr bgcolor="white"></#if>
+<td class="font8" valign="top" align="indent" colspan="2">    
+${pcstring('ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle.DESC')}</td>
+ </tr>
+</@loop>
+ </table>
+</#if>
+<!-- STOP PFS Chronicles Table -->
+
<!-- ================================================================ -->
<!-- Start of Temporary Bonuses table -->
Modified: branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_class_features.xslt
===================================================================
--- branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_class_features.xslt 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_class_features.xslt 2014-12-03 02:02:24 UTC (rev 25693)
@@ -23,7 +23,7 @@
<xsl:template name="features.left">
<xsl:param name="features"/>
<xsl:param name="RunningTotal" select="0"/>
-
+
<xsl:choose>
<xsl:when test="not($features)">
<!--No more Items so return Running Total -->
@@ -104,7 +104,7 @@
<xsl:param name="description.title" select="''"/>
<xsl:param name="description" />
<xsl:param name="width" select="'wide'" />
-
+
<fo:table table-layout="fixed" space-before="2mm" keep-together="always" border-collapse="collapse">
<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="concat($attribute, '.border')"/></xsl:call-template>
<fo:table-column column-width="18mm"/>
@@ -231,7 +231,7 @@
<xsl:template name="eclipse_channeling.intensity">
<xsl:param name="die"/>
<xsl:param name="number"/>
-
+
<xsl:variable name="shade">
<xsl:choose>
<xsl:when test="$number mod 2 = 0">darkline</xsl:when>
@@ -371,7 +371,7 @@
<xsl:call-template name="eclipse_channeling.intensity">
<xsl:with-param name="die" select="'Up to 0'"/>
<xsl:with-param name="number" select="number(channel_intensity)-8"/>
-
+
</xsl:call-template>
<xsl:call-template name="eclipse_channeling.intensity">
<xsl:with-param name="die" select="'1 - 3'"/>
@@ -502,7 +502,7 @@
<xsl:template name="turning.hitdice">
<xsl:param name="die"/>
<xsl:param name="number"/>
-
+
<xsl:variable name="shade">
<xsl:choose>
<xsl:when test="$number mod 2 = 0">darkline</xsl:when>
@@ -808,7 +808,7 @@
====================================
====================================-->
<xsl:template match="layonhands">
-
+
<xsl:call-template name="class.feature.perday">
<xsl:with-param name="attribute" select="'bard'"/>
<xsl:with-param name="name" select="'LAY ON HANDS'"/>
@@ -877,6 +877,19 @@
</fo:block>
</fo:table-cell>
</fo:table-row>
+ <xsl:for-each select="subability">
+ <fo:table-row keep-with-next.within-column="always">
+ <fo:table-cell padding="3pt" number-columns-spanned="2">
+ <xsl:call-template name="attrib">
+ <xsl:with-param name="attribute" select="'checklist'"/>
+ </xsl:call-template>
+ <fo:block font-size="5pt" font-weight="bold">
+ <xsl:if test="name != ''"> <xsl:value-of select="name"/>:</xsl:if>
+ <fo:inline font-size="5pt" font-weight="normal"><xsl:value-of select="description"/><xsl:if test="source != ''"> [<xsl:value-of select="source"/>]</xsl:if></fo:inline>
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </xsl:for-each>
</fo:table-body>
</fo:table>
|%|
Modified: branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_equipment.xslt
===================================================================
--- branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_equipment.xslt 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_equipment.xslt 2014-12-03 02:02:24 UTC (rev 25693)
@@ -189,7 +189,9 @@
<fo:block space-before.optimum="1pt" font-size="5pt">
<xsl:value-of select="special_properties"/>
<xsl:value-of select="quality"/>
- <xsl:value-of select="contents"/>
+ <xsl:if test="contents_num > 0">
+ <xsl:value-of select="contents"/>
+ </xsl:if>
</fo:block>
</fo:table-cell>
</fo:table-row>
Modified: branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_features.xslt
===================================================================
--- branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_features.xslt 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_features.xslt 2014-12-03 02:02:24 UTC (rev 25693)
@@ -644,7 +644,23 @@
</xsl:call-template>
</xsl:if>
</xsl:template>
-
+ <!--
+====================================
+====================================
+ TEMPLATE - PFS CHRONICLES
+====================================
+====================================-->
+ <xsl:template match="pfs_chronicles">
+ <xsl:if test="count(pfs_chronicle) > 0">
+ <xsl:call-template name="bold.list">
+ <xsl:with-param name="attribute" select="'pfs_chronicles'" />
+ <xsl:with-param name="title" select="'PFS Chronicles'" />
+ <xsl:with-param name="list" select="pfs_chronicle"/>
+ <xsl:with-param name="name.tag" select="'name'"/>
+ <xsl:with-param name="desc.tag" select="'description'"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:template>
<!--
====================================
====================================
Modified: branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_hp_defense.xslt
===================================================================
--- branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_hp_defense.xslt 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_hp_defense.xslt 2014-12-03 02:02:24 UTC (rev 25693)
@@ -804,7 +804,8 @@
</fo:table>
<!-- END ini-base table -->
</xsl:template>
- <!--
+
+ <!-- NOT USED
====================================
====================================
TEMPLATE - Base Attack TABLE
@@ -901,6 +902,47 @@
<!-- END encumberance table -->
</xsl:template>
+ <!--
+====================================
+====================================
+ TEMPLATE - Resistance TABLE
+====================================
+====================================-->
+ <xsl:template name="resistances">
+ <!-- BEGIN Resistance table -->
+ <fo:table table-layout="fixed">
+ <!-- 0.26 * $pagePrintableWidth - 2 mm -->
+ <fo:table-column>
+ <xsl:attribute name="column-width"><xsl:value-of select="0.50 * (0.26 * $pagePrintableWidth - 4)" />mm</xsl:attribute>
+ </fo:table-column>
+ <fo:table-body>
+ <fo:table-row height="2pt">
+ <xsl:message>Test</xsl:message>
+ <fo:table-cell/>
+ </fo:table-row>
+ <fo:table-row>
+ <xsl:message>Test</xsl:message>
+ <fo:table-cell>
+ <xsl:call-template name="attrib">
+ <xsl:with-param name="attribute" select="'initiative.title'"/>
+ </xsl:call-template>
+ <fo:block line-height="10pt" font-weight="bold" font-size="7pt" space-before="1pt">Res</fo:block>
+ </fo:table-cell>
+ <fo:table-cell/>
+ <fo:table-cell>
+ <xsl:call-template name="attrib">
+ <xsl:with-param name="attribute" select="'initiative.total'"/>
+ </xsl:call-template>
+ <fo:block space-before.optimum="2pt" font-size="8pt">
+ <xsl:value-of select="resistance"/>
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+<!-- </xsl:if> -->
+ <!-- END Resistance table -->
+ </xsl:template>
<!--
====================================
Modified: branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_spells_condensed.xslt
===================================================================
--- branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_spells_condensed.xslt 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_spells_condensed.xslt 2014-12-03 02:02:24 UTC (rev 25693)
@@ -272,7 +272,7 @@
</xsl:when>
<xsl:otherwise>
<xsl:choose>
- <xsl:when test="@known != 0">
+ <xsl:when test="@number = 0 and @known != 0">
at will
</xsl:when>
<xsl:otherwise>
@@ -821,8 +821,7 @@
<xsl:attribute name="column-width"><xsl:value-of select="$pagePrintableWidth" />mm</xsl:attribute>
</fo:table-column>
<fo:table-body>
- <fo:table-row>
- <xsl:message>Test</xsl:message>
+ <fo:table-row> <xsl:message>Test</xsl:message>
<fo:table-cell padding-top="1pt">
<xsl:call-template name="attrib">
<xsl:with-param name="attribute" select="'spells.memorized.header'"/>
@@ -919,8 +918,7 @@
<xsl:attribute name="column-width"><xsl:value-of select="$pagePrintableWidth div 5" />mm</xsl:attribute>
</fo:table-column>
<fo:table-body>
- <fo:table-row>
- <xsl:message>Test</xsl:message>
+ <fo:table-row> <xsl:message>Test Spells Memorized Header</xsl:message>
<fo:table-cell padding-top="1pt" number-columns-spanned="5">
<xsl:call-template name="attrib">
<xsl:with-param name="attribute" select="'spells.memorized.header'"/>
@@ -943,8 +941,7 @@
====================================-->
<xsl:template match="class" mode="spells.memorized">
<xsl:if test="count(.//spell) > 0">
- <fo:table-row>
- <xsl:message>Test</xsl:message>
+ <fo:table-row> <xsl:message>Test "Spells Memorized Section"</xsl:message>
<fo:table-cell padding-top="1pt" number-columns-spanned="5">
<xsl:call-template name="attrib">
<xsl:with-param name="attribute" select="'spells.memorized.header'"/>
@@ -954,14 +951,16 @@
</fo:block>
</fo:table-cell>
</fo:table-row>
- <fo:table-row>
- <xsl:message>Test</xsl:message>
- <xsl:apply-templates select="level[@number < 5]" mode="spells.memorized"/>
- </fo:table-row>
- <fo:table-row>
- <xsl:message>Test</xsl:message>
- <xsl:apply-templates select="level[@number >= 5]" mode="spells.memorized"/>
- </fo:table-row>
+ <xsl:if test="@number < 5">
+ <fo:table-row> <xsl:message>Test Levels 4-</xsl:message>
+ <xsl:apply-templates select="level[@number < 5]" mode="spells.memorized"/>
+ </fo:table-row>
+ </xsl:if>
+ <xsl:if test="@number >= 5">
+ <fo:table-row> <xsl:message>Test Levels 5+</xsl:message>
+ <xsl:apply-templates select="level[@number >= 5]" mode="spells.memorized"/>
+ </fo:table-row>
+ </xsl:if>
</xsl:if>
</xsl:template>
<!--
@@ -982,8 +981,7 @@
<xsl:attribute name="column-width"><xsl:value-of select="0.80 * $pagePrintableWidth div 5" />mm</xsl:attribute>
</fo:table-column>
<fo:table-body>
- <fo:table-row>
- <xsl:message>Test</xsl:message>
+ <fo:table-row> <xsl:message>Test Spells Memorized Level Grant</xsl:message>
<fo:table-cell padding-top="1pt" number-columns-spanned="2">
<xsl:call-template name="attrib">
<xsl:with-param name="attribute" select="'spells.memorized.level'"/>
@@ -1007,8 +1005,7 @@
====================================
====================================-->
<xsl:template match="spell" mode="spells.memorized">
- <fo:table-row>
- <xsl:message>Test END</xsl:message>
+ <fo:table-row> <xsl:message>Test END - Spells Memorized</xsl:message>
<xsl:choose>
<xsl:when test="times_memorized >= 0">
<fo:table-cell padding-top="0pt" text-align="end">
@@ -1037,7 +1034,12 @@
<xsl:with-param name="attribute" select="'spells.memorized'"/>
</xsl:call-template>
<xsl:value-of select="bonusspell"/>
- <xsl:value-of select="name"/> (DC:<xsl:value-of select="dc"/>)
+ <xsl:value-of select="name"/>
+ <xsl:choose>
+ <xsl:when test="dc >= 0">
+ (DC:<xsl:value-of select="dc"/>)
+ </xsl:when>
+ </xsl:choose>
</fo:block>
</fo:table-cell>
</fo:table-row>
Modified: branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_spells_list.xslt
===================================================================
--- branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_spells_list.xslt 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/outputsheets/d20/fantasy/pdf/common_sheet/block_spells_list.xslt 2014-12-03 02:02:24 UTC (rev 25693)
@@ -16,12 +16,12 @@
TEMPLATE - SPELLS_LIST
====================================
====================================-->
- <xsl:template match="spells_list">
+ <xsl:template match="spells">
<!-- BEGIN Spells Pages -->
<xsl:if test="count(.//spell) > 0">
<xsl:apply-templates select="spells_innate/racial_innate"/>
<xsl:apply-templates select="spells_innate/class_innate"/>
-<!-- <xsl:apply-templates select="known_spells"/> -->
+<!-- <xsl:apply-templates select="known_spells"/> -->
<xsl:apply-templates select="memorized_spells"/>
</xsl:if>
<!-- END Spells Pages -->
@@ -266,7 +266,7 @@
</xsl:when>
<xsl:otherwise>
<xsl:choose>
- <xsl:when test="@known != 0">
+ <xsl:when test="@number != 0 and @known != 0">
at will
</xsl:when>
<xsl:otherwise>
Modified: branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_alt_largetext.xslt
===================================================================
--- branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_alt_largetext.xslt 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_alt_largetext.xslt 2014-12-03 02:02:24 UTC (rev 25693)
@@ -7045,7 +7045,7 @@
</xsl:when>
<xsl:otherwise>
<xsl:choose>
- <xsl:when test="@known != 0">
+ <xsl:when test="@number = 0 and @known != 0">
at will
</xsl:when>
<xsl:otherwise>
Modified: branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_common_blocks.xslt
===================================================================
--- branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_common_blocks.xslt 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_common_blocks.xslt 2014-12-03 02:02:24 UTC (rev 25693)
@@ -324,6 +324,7 @@
<fo:table-row>
<fo:table-cell number-columns-spanned="2">
<xsl:apply-templates select="saving_throws"/>
+ <xsl:apply-templates select="resistances"/>
<xsl:apply-templates select="attack" mode="conditional"/>
<xsl:apply-templates select="attack" mode="ranged_melee"/>
<xsl:apply-templates select="weapons/martialarts"/>
@@ -423,6 +424,8 @@
<!-- End 4th Edition Style -->
<xsl:apply-templates select="salient_divine_abilities"/>
<xsl:apply-templates select="feats"/>
+ <xsl:apply-templates select="pfs_chronicles"/>
+
<xsl:apply-templates select="domains"/>
<xsl:apply-templates select="weapon_proficiencies"/>
<!--> <xsl:apply-templates select="proficiency_specials"/>-->
@@ -436,7 +439,7 @@
<!--> ADITIONAL PAGES for Spells -->
<xsl:apply-templates select="spells"/>
<xsl:apply-templates select="basics" mode="bio"/>
- <xsl:apply-templates select="basics/notes" mode="bio"/>
+ <xsl:apply-templates select="basics/notes" mode="bio"/>
</fo:root>
</xsl:template>
Modified: branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_spell_list_only.xslt
===================================================================
--- branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_spell_list_only.xslt 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/outputsheets/d20/fantasy/pdf/fantasy_master_spell_list_only.xslt 2014-12-03 02:02:24 UTC (rev 25693)
@@ -26,7 +26,7 @@
<xsl:import href="common_sheet/block_protection.xslt"/>
<xsl:import href="common_sheet/block_psionics.xslt"/>
<xsl:import href="common_sheet/block_skills.xslt"/>
- <xsl:import href="common_sheet/block_spells_list.xslt"/>
+ <xsl:import href="common_sheet/block_spells_list.xslt"/>
<xsl:import href="common_sheet/block_stat_block.xslt"/>
<xsl:import href="common_sheet/block_weapons.xslt"/>
<!-- END -->
@@ -275,7 +275,7 @@
<!-- CHARACTER HEADER -->
<fo:block span="all" space-after.optimum="3pt">
<!-- We Display only the Spells in List Form -->
- <xsl:apply-templates select="spells_list"/>
+ <xsl:apply-templates select="spells"/>
</fo:block>
<fo:block span="all">
<fo:table table-layout="fixed">
Modified: branches/6.04.x/preview/d20/fantasy/Standard.htm.ftl
===================================================================
--- branches/6.04.x/preview/d20/fantasy/Standard.htm.ftl 2014-12-03 01:57:30 UTC (rev 25692)
+++ branches/6.04.x/preview/d20/fantasy/Standard.htm.ftl 2014-12-03 02:02:24 UTC (rev 25693)
@@ -1691,8 +1691,40 @@
</tr>
</table>
<!-- STOP Feat Table -->
+
+<!-- START PFS Chronicles Table -->
+<#if (pcvar('count("ABILITIES","CATEGORY=PFS Chronicles","TYPE=PFSChronicle","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")') > 0)>
+ <table width="100%" cellspacing="0" cellpadding="2" summary="Feat Table">
+ <tr>
+ <th bgcolor="black" align="center" colspan="2"><font color="white" style="font-size: small"><b>PFS Chronicles</b></font></th>
+ </tr>
+<@loop from=0 to=pcvar('count("ABILITIES","CATEGORY=PFS Chronicles","TYPE=PFSChronicle","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1') ; PFSChronicle , PFSChronicle_has_next>
+<#if (PFSChronicle % 2 = 0)><tr bgcolor="#DDDDDD"><#else><tr bgcolor="white"></#if>
+ <td valign="top" width="70%" class="font8"><b>
+<#assign typeOfAbility = pcstring("ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle.TYPE")?lower_case />
+<#if (pcstring("ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle.HASASPECT.Name") = "Y")>
+${pcstring('ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle.ASPECT.Name')}
+<@typeOfAbilitySuffix typeOfAbility=typeOfAbility />
+<#else>
+${pcstring('ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle')}
+<@typeOfAbilitySuffix typeOfAbility=typeOfAbility />
+</#if>
+</b>
+</td>
+<td class="font8" valign="top" width="30%" align="right">[${pcstring('ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle.SOURCE')}]</td>
+<tr>
+<#if (PFSChronicle % 2 = 0)><tr bgcolor="#DDDDDD"><#else><tr bgcolor="white"></#if>
+<td class="font8" valign="top" align="indent" colspan="2">    
+${pcstring('ABILITYALL.PFS Chronicles.VISIBLE.${PFSChronicle}.TYPE=PFSChronicle.DESC')}</td>
+ </tr>
+</@loop>
+ </table>
+</#if>
+<!-- STOP PFS Chronicles Table -->
<!-- ================================================================ -->
+
+
<!-- Start of Temporary Bonuses table -->
<#if (pcvar("COUNT[TEMPBONUSNAMES]") > 0) >
<tr><td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
