Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen: [1039] Trunk/pcgen/code
|
From: <jde...@us...> - 2006-05-28 01:17:08
|
Revision: 1039 Author: jdempsey Date: 2006-05-27 18:16:37 -0700 (Sat, 27 May 2006) ViewCVS: http://svn.sourceforge.net/pcgen/?rev=1039&view=rev Log Message: ----------- FReq: 1231443 - Whitespace in OS Modified Paths: -------------- Trunk/pcgen/code/pluginbuild.xml Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java Trunk/pcgen/code/testsuite/base.xml Trunk/pcgen/code/testsuite/csheets/BarJack.xml Trunk/pcgen/code/testsuite/csheets/BrdJoe.xml Trunk/pcgen/code/testsuite/csheets/CleElf.xml Trunk/pcgen/code/testsuite/csheets/CloudGiantHalfDragon.xml Trunk/pcgen/code/testsuite/csheets/DrakelingSorc.xml Trunk/pcgen/code/testsuite/csheets/FigFae.xml Trunk/pcgen/code/testsuite/csheets/JimDop.xml Trunk/pcgen/code/testsuite/csheets/MonKee.xml Trunk/pcgen/code/testsuite/csheets/SWizSam.xml Trunk/pcgen/code/testsuite/csheets/WizShar.xml Added Paths: ----------- Trunk/pcgen/code/src/java/plugin/exporttokens/EndManualWhitespaceToken.java Trunk/pcgen/code/src/java/plugin/exporttokens/ManualWhitespaceToken.java Modified: Trunk/pcgen/code/pluginbuild.xml =================================================================== --- Trunk/pcgen/code/pluginbuild.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/pluginbuild.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -282,6 +282,13 @@ </patternset> </fileset> </jar> + <jar jarfile="${outputplugins.dir}/ExportToken-ENDMANUALWHITESPACE.jar" manifest="${src.java.dir}/plugin/exporttokens/manifest.mf"> + <fileset dir="${build.classes.dir}"> + <patternset> + <include name="plugin/exporttokens/EndManualWhitespaceToken.class" /> + </patternset> + </fileset> + </jar> <jar jarfile="${outputplugins.dir}/ExportToken-EQCONTAINERS.jar" manifest="${src.java.dir}/plugin/exporttokens/manifest.mf"> <fileset dir="${build.classes.dir}"> <patternset> @@ -457,6 +464,13 @@ </patternset> </fileset> </jar> + <jar jarfile="${outputplugins.dir}/ExportToken-MANUALWHITESPACE.jar" manifest="${src.java.dir}/plugin/exporttokens/manifest.mf"> + <fileset dir="${build.classes.dir}"> + <patternset> + <include name="plugin/exporttokens/ManualWhitespaceToken.class" /> + </patternset> + </fileset> + </jar> <jar jarfile="${outputplugins.dir}/ExportToken-MAXCCSKILLLEVEL.jar" manifest="${src.java.dir}/plugin/exporttokens/manifest.mf"> <fileset dir="${build.classes.dir}"> <patternset> Modified: Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java 2006-05-28 01:16:37 UTC (rev 1039) @@ -50,6 +50,7 @@ // Processing state variables private boolean existsOnly = false; private boolean noMoreItems = false; + private boolean manualWhitespace = false; private File templateFile; private final Map loopVariables = new HashMap(); @@ -773,10 +774,10 @@ replaceLine(lineString, output, aPC); // output a newline if output is allowed -// if (canWrite) -// { -// FileAccess.newLine(output); -// } + if (canWrite && !manualWhitespace) + { + FileAccess.newLine(output); + } } } } @@ -849,10 +850,8 @@ noMoreItems = false; replaceLine(lineString, output, aPC); - // Karianna - These three lines were removed because they were creating extra spaces - // But have been put back in as the Text Export had no \n characters which - // meant that the text export was all on one line - Bug 1370444 - if (canWrite) + // Allow the output sheet author to control new lines. + if (canWrite && !manualWhitespace) { FileAccess.newLine(output); } @@ -1183,6 +1182,10 @@ if (aString.length() > 0) { + if (manualWhitespace) + { + aString = aString.replaceAll("[ \\t]", ""); + } FileAccess.write(output, aString); } } @@ -2288,8 +2291,12 @@ { len = aString.trim().length(); - if (aString.length() > 0) + if (manualWhitespace) { + aString = aString.replaceAll("[ \\t]", ""); + } + if (len > 0) + { FileAccess.write(output, aString); } } @@ -3059,8 +3066,16 @@ { if (!inPipe && (aLine.lastIndexOf('|') < 0)) { + if (manualWhitespace) + { + aLine = aLine.replaceAll("[ \\t]", ""); + } FileAccess.write(out, aLine); - FileAccess.newLine(out); + // Allow the output sheet author to control new lines. + if (!manualWhitespace) + { + FileAccess.newLine(out); + } } else if ((inPipe && (aLine.lastIndexOf('|') < 0)) || (!inPipe && (aLine.lastIndexOf('|') == 0))) { @@ -3085,6 +3100,10 @@ if (!inPipe) { + if (manualWhitespace) + { + bString = bString.replaceAll("[ \\t]", ""); + } FileAccess.write(out, bString); } else @@ -3171,6 +3190,7 @@ { if (x++ == 0) { + Logging.errorPrint("Outputing A '" + bString + "'."); FileAccess.write(out, cStartLineString); } @@ -3223,12 +3243,14 @@ } else { + Logging.errorPrint("Outputing B '" + eString + "'."); FileAccess.write(out, eString); } } if ((x == cStep.intValue()) || (_existsOnly == _noMoreItems)) { + Logging.errorPrint("Outputing C '" + cEndLineString + "'."); FileAccess.write(out, cEndLineString); // FileAccess.newLine(out); x = 0; @@ -3361,6 +3383,22 @@ } /** + * @return Returns the manualWhitespace. + */ + public final boolean isManualWhitespace() + { + return manualWhitespace; + } + + /** + * @param manualWhitespace The manualWhitespace to set. + */ + public final void setManualWhitespace(boolean manualWhitespace) + { + this.manualWhitespace = manualWhitespace; + } + + /** * Get the token string * @param aPC * @param aString Added: Trunk/pcgen/code/src/java/plugin/exporttokens/EndManualWhitespaceToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/exporttokens/EndManualWhitespaceToken.java (rev 0) +++ Trunk/pcgen/code/src/java/plugin/exporttokens/EndManualWhitespaceToken.java 2006-05-28 01:16:37 UTC (rev 1039) @@ -0,0 +1,52 @@ +/* + * EndManualWhitespaceToken.java + * Copyright 2006 (C) James Dempsey <jde...@us...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Created on 6/05/2006 + * + * $Id: $ + * + */ +package plugin.exporttokens; + +import pcgen.core.PlayerCharacter; +import pcgen.io.ExportHandler; +import pcgen.io.exporttoken.Token; + +public class EndManualWhitespaceToken extends Token +{ + /** The tokenname implemented by this class. */ + public static final String TOKENNAME = "ENDMANUALWHITESPACE"; + + /** + * @see pcgen.io.exporttoken.Token#getTokenName() + */ + public String getTokenName() + { + return TOKENNAME; + } + + /** + * @see pcgen.io.exporttoken.Token#getToken(java.lang.String, pcgen.core.PlayerCharacter, pcgen.io.ExportHandler) + */ + public String getToken(String tokenSource, PlayerCharacter pc, ExportHandler eh) + { + eh.setManualWhitespace(false); + return ""; + } + +} Property changes on: Trunk/pcgen/code/src/java/plugin/exporttokens/EndManualWhitespaceToken.java ___________________________________________________________________ Name: keywords + "Author Revision Date Id" Name: svn:eol-style + native Added: Trunk/pcgen/code/src/java/plugin/exporttokens/ManualWhitespaceToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/exporttokens/ManualWhitespaceToken.java (rev 0) +++ Trunk/pcgen/code/src/java/plugin/exporttokens/ManualWhitespaceToken.java 2006-05-28 01:16:37 UTC (rev 1039) @@ -0,0 +1,52 @@ +/* + * ManualWhitespaceToken.java + * Copyright 2006 (C) James Dempsey <jde...@us...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Created on 6/05/2006 + * + * $Id: $ + * + */ +package plugin.exporttokens; + +import pcgen.core.PlayerCharacter; +import pcgen.io.ExportHandler; +import pcgen.io.exporttoken.Token; + +public class ManualWhitespaceToken extends Token +{ + /** The tokenname implemented by this class. */ + public static final String TOKENNAME = "MANUALWHITESPACE"; + + /** + * @see pcgen.io.exporttoken.Token#getTokenName() + */ + public String getTokenName() + { + return TOKENNAME; + } + + /** + * @see pcgen.io.exporttoken.Token#getToken(java.lang.String, pcgen.core.PlayerCharacter, pcgen.io.ExportHandler) + */ + public String getToken(String tokenSource, PlayerCharacter pc, ExportHandler eh) + { + eh.setManualWhitespace(true); + return ""; + } + +} Property changes on: Trunk/pcgen/code/src/java/plugin/exporttokens/ManualWhitespaceToken.java ___________________________________________________________________ Name: keywords + "Author Revision Date Id" Name: svn:eol-style + native Modified: Trunk/pcgen/code/testsuite/base.xml =================================================================== --- Trunk/pcgen/code/testsuite/base.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/testsuite/base.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <character> +|MANUALWHITESPACE| <!-- + =============== ===================== + ====================================|BR| + BIO|BR| ==================================== - ==================================== - BIO - ==================================== ====================================--> +|ENDMANUALWHITESPACE| <basics> <bonuses>|BONUSLIST.STAT.STR|</bonuses> <bonuses>|BONUSLIST.STAT.STR.TOTAL|</bonuses> Modified: Trunk/pcgen/code/testsuite/csheets/BarJack.xml =================================================================== --- Trunk/pcgen/code/testsuite/csheets/BarJack.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/testsuite/csheets/BarJack.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <character> - <!-- - ==================================== - ==================================== - BIO - ==================================== - ====================================--> +<!--======================================================================== +BIO +========================================================================--> <basics> <bonuses></bonuses> <bonuses></bonuses> @@ -886,8 +883,76 @@ - <weapon> <common> <name> <short>*Dagger</short> <long>*Dagger</long> </name> <category>Simple-Both (Melee)</category> <critical> <range>19-20</range> <multiplier>2</multiplier> </critical> <to_hit> <hit>+3</hit> <magic_hit>+0</magic_hit> <total_hit>+3</total_hit> </to_hit> <feat></feat> <hand>Two-Weapons</hand> <num_attacks>1</num_attacks> <reach>5</reach> <size>T</size> <special_properties></special_properties> <template></template> <type>P</type> <weight>0</weight> <sequence>0</sequence> </common> <melee> <w1_h1_p> <!-- One weapon, 1 hand, primary hand --> <to_hit>+7</to_hit> <damage>1d4+2</damage> </w1_h1_p> <w1_h1_o> <!-- One weapon, 1 handed, offhand --> <to_hit>+7</to_hit> <damage>1d4+1</damage> </w1_h1_o> <w1_h2> <!-- One weapon, 2 handed --> <to_hit>+7</to_hit> <damage>1d4+2</damage> </w1_h2> <w2_p_oh> <!-- Two weapons, this weapon in primary hand, other hand with heavy weapon --> <to_hit>+1</to_hit> <damage>1d4+2</damage> </w2_p_oh> <w2_p_ol> <!-- Two weapons, this weapon in primary hand, other hand with light weapon --> <to_hit>+3</to_hit> <damage>1d4+2</damage> </w2_p_ol> <w2_o> <!-- Two weapons, this weapon in off-hand --> <to_hit>+3</to_hit> <damage>1d4+1</damage> </w2_o> </melee> - <ranges> <range> + + + + <weapon> + <common> + <name> + <short>*Dagger</short> + <long>*Dagger</long> + </name> + <category>Simple-Both (Melee)</category> + <critical> + <range>19-20</range> + <multiplier>2</multiplier> + </critical> + <to_hit> + <hit>+3</hit> + <magic_hit>+0</magic_hit> + <total_hit>+3</total_hit> + </to_hit> + <feat></feat> + <hand>Two-Weapons</hand> + <num_attacks>1</num_attacks> + <reach>5</reach> + <size>T</size> + <special_properties></special_properties> + <template></template> + <type>P</type> + <weight>0</weight> + <sequence>0</sequence> + </common> + <melee> + <w1_h1_p> + <!-- One weapon, 1 hand, primary hand --> + <to_hit>+7</to_hit> + <damage>1d4+2</damage> + </w1_h1_p> + <w1_h1_o> + <!-- One weapon, 1 handed, offhand --> + <to_hit>+7</to_hit> + <damage>1d4+1</damage> + </w1_h1_o> + <w1_h2> + <!-- One weapon, 2 handed --> + <to_hit>+7</to_hit> + <damage>1d4+2</damage> + </w1_h2> + <w2_p_oh> + <!-- Two weapons, this weapon in primary hand, other hand with heavy weapon --> + <to_hit>+1</to_hit> + <damage>1d4+2</damage> + </w2_p_oh> + <w2_p_ol> + <!-- Two weapons, this weapon in primary hand, other hand with light weapon --> + <to_hit>+3</to_hit> + <damage>1d4+2</damage> + </w2_p_ol> + <w2_o> + <!-- Two weapons, this weapon in off-hand --> + <to_hit>+3</to_hit> + <damage>1d4+1</damage> + </w2_o> + </melee> + + + + + + + <ranges> + <range> <distance>10 ft.</distance> <to_hit>+8</to_hit> <damage>1d4+2</damage> @@ -912,7 +977,11 @@ <to_hit>+0</to_hit> <damage>1d4+2</damage> </range> - </ranges> </weapon> </weapons> + </ranges> + </weapon> + + + </weapons> <!-- ==================================== ==================================== @@ -1294,6 +1363,7 @@ <spells> <!-- ### BEGIN Innate spells ### --> <spells_innate> + <racial_innate> <spell> <name>Speak with Animals</name> @@ -1409,14 +1479,22 @@ </spell> </racial_innate> - <class_innate> </class_innate> </spells_innate><!-- ### END Innate spells ### --> + + <class_innate> + </class_innate> + </spells_innate> +<!-- ### END Innate spells ### --> <!-- ### BEGIN Known spells ### --> <known_spells> </known_spells> <!-- ### END Known spells ### --> <!-- ### BEGIN memorized spells ### --> - <memorized_spells> <!-- ### BEGIN innate memorized spell section --> <!-- ### BEGIN innate memorized spells ### --> + <memorized_spells> + <!-- ### BEGIN innate memorized spell section --> + +<!-- ### BEGIN innate memorized spells ### --> + <racial_innate_memorized> <spell> <name>Speak with Animals</name> @@ -1532,6 +1610,14 @@ </spell> </racial_innate_memorized> -<!-- ### END innate memorized spells ### --> <!-- ### BEGIN class innate memorized spells ### --> <class_innate_memorized> </class_innate_memorized> <!-- ### END class innate memorized spells ### --><!-- ### END innate memorized spell section --> <!-- ### BEGIN class Spellbook memorized spells ### --> </memorized_spells><!-- ### END class Spellbook memorized spells ### --> +<!-- ### END innate memorized spells ### --> + <!-- ### BEGIN class innate memorized spells ### --> + <class_innate_memorized> + </class_innate_memorized> + <!-- ### END class innate memorized spells ### --> +<!-- ### END innate memorized spell section --> + <!-- ### BEGIN class Spellbook memorized spells ### --> + </memorized_spells> +<!-- ### END class Spellbook memorized spells ### --> </spells> </character> Modified: Trunk/pcgen/code/testsuite/csheets/BrdJoe.xml =================================================================== --- Trunk/pcgen/code/testsuite/csheets/BrdJoe.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/testsuite/csheets/BrdJoe.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <character> - <!-- - ==================================== - ==================================== - BIO - ==================================== - ====================================--> +<!--======================================================================== +BIO +========================================================================--> <basics> <bonuses></bonuses> <bonuses></bonuses> @@ -1185,12 +1182,14 @@ ====================================--> <spells> <!-- ### BEGIN Innate spells ### --> - <spells_innate number="none"/><!-- ### END Innate spells ### --> + <spells_innate number="none"/> +<!-- ### END Innate spells ### --> <!-- ### BEGIN Known spells ### --> <known_spells> <class number="0" spelllistclass="Bard" spellcastertype="Arcane"> - <level number="0" known="4" cast="2"> <spell> + <level number="0" known="4" cast="2"> + <spell> <name>Flare</name> <outputname>Flare</outputname> <times_memorized>1</times_memorized> @@ -1302,11 +1301,22 @@ <description>5-pound telekinesis.</description> <bonusspell></bonusspell> </spell> - </level> <level number="1" known="0" cast="0"/> <level number="2" known="0" cast="0"/> <level number="3" known="0" cast="0"/> <level number="4" known="0" cast="0"/> <level number="5" known="0" cast="0"/> <level number="6" known="0" cast="0"/> <level number="7" known="0" cast="0"/> <level number="8" known="0" cast="0"/> <level number="9" known="0" cast="0"/> </class> + </level> + <level number="1" known="0" cast="0"/> + <level number="2" known="0" cast="0"/> + <level number="3" known="0" cast="0"/> + <level number="4" known="0" cast="0"/> + <level number="5" known="0" cast="0"/> + <level number="6" known="0" cast="0"/> + <level number="7" known="0" cast="0"/> + <level number="8" known="0" cast="0"/> + <level number="9" known="0" cast="0"/> + </class> </known_spells> <!-- ### END Known spells ### --> <!-- ### BEGIN memorized spells ### --> - <memorized_spells/><!-- ### END class Spellbook memorized spells ### --> + <memorized_spells/> +<!-- ### END class Spellbook memorized spells ### --> </spells> </character> Modified: Trunk/pcgen/code/testsuite/csheets/CleElf.xml =================================================================== --- Trunk/pcgen/code/testsuite/csheets/CleElf.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/testsuite/csheets/CleElf.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <character> - <!-- - ==================================== - ==================================== - BIO - ==================================== - ====================================--> +<!--======================================================================== +BIO +========================================================================--> <basics> <bonuses></bonuses> <bonuses></bonuses> @@ -905,8 +902,76 @@ - <weapon> <common> <name> <short>*Club</short> <long>*Club</long> </name> <category>Simple-Both (Melee)</category> <critical> <range>20</range> <multiplier>2</multiplier> </critical> <to_hit> <hit>+1</hit> <magic_hit>+0</magic_hit> <total_hit>+1</total_hit> </to_hit> <feat></feat> <hand>Primary</hand> <num_attacks>1</num_attacks> <reach>5</reach> <size>M</size> <special_properties></special_properties> <template></template> <type>B</type> <weight>0</weight> <sequence>0</sequence> </common> <melee> <w1_h1_p> <!-- One weapon, 1 hand, primary hand --> <to_hit>+1</to_hit> <damage>1d6</damage> </w1_h1_p> <w1_h1_o> <!-- One weapon, 1 handed, offhand --> <to_hit>-3</to_hit> <damage>1d6</damage> </w1_h1_o> <w1_h2> <!-- One weapon, 2 handed --> <to_hit>+1</to_hit> <damage>1d6</damage> </w1_h2> <w2_p_oh> <!-- Two weapons, this weapon in primary hand, other hand with heavy weapon --> <to_hit>-5</to_hit> <damage>1d6</damage> </w2_p_oh> <w2_p_ol> <!-- Two weapons, this weapon in primary hand, other hand with light weapon --> <to_hit>-3</to_hit> <damage>1d6</damage> </w2_p_ol> <w2_o> <!-- Two weapons, this weapon in off-hand --> <to_hit>-9</to_hit> <damage>1d6</damage> </w2_o> </melee> - <ranges> <range> + + + + <weapon> + <common> + <name> + <short>*Club</short> + <long>*Club</long> + </name> + <category>Simple-Both (Melee)</category> + <critical> + <range>20</range> + <multiplier>2</multiplier> + </critical> + <to_hit> + <hit>+1</hit> + <magic_hit>+0</magic_hit> + <total_hit>+1</total_hit> + </to_hit> + <feat></feat> + <hand>Primary</hand> + <num_attacks>1</num_attacks> + <reach>5</reach> + <size>M</size> + <special_properties></special_properties> + <template></template> + <type>B</type> + <weight>0</weight> + <sequence>0</sequence> + </common> + <melee> + <w1_h1_p> + <!-- One weapon, 1 hand, primary hand --> + <to_hit>+1</to_hit> + <damage>1d6</damage> + </w1_h1_p> + <w1_h1_o> + <!-- One weapon, 1 handed, offhand --> + <to_hit>-3</to_hit> + <damage>1d6</damage> + </w1_h1_o> + <w1_h2> + <!-- One weapon, 2 handed --> + <to_hit>+1</to_hit> + <damage>1d6</damage> + </w1_h2> + <w2_p_oh> + <!-- Two weapons, this weapon in primary hand, other hand with heavy weapon --> + <to_hit>-5</to_hit> + <damage>1d6</damage> + </w2_p_oh> + <w2_p_ol> + <!-- Two weapons, this weapon in primary hand, other hand with light weapon --> + <to_hit>-3</to_hit> + <damage>1d6</damage> + </w2_p_ol> + <w2_o> + <!-- Two weapons, this weapon in off-hand --> + <to_hit>-9</to_hit> + <damage>1d6</damage> + </w2_o> + </melee> + + + + + + + <ranges> + <range> <distance>10 ft.</distance> <to_hit>+2</to_hit> <damage>1d6</damage> @@ -931,8 +996,76 @@ <to_hit>-6</to_hit> <damage>1d6</damage> </range> - </ranges> </weapon> - <weapon> <common> <name> <short>Handaxe</short> <long>Handaxe</long> </name> <category>Martial-Melee</category> <critical> <range>20</range> <multiplier>3</multiplier> </critical> <to_hit> <hit>-3</hit> <magic_hit>+0</magic_hit> <total_hit>-3</total_hit> </to_hit> <feat></feat> <hand>Carried</hand> <num_attacks>1</num_attacks> <reach>5</reach> <size>S</size> <special_properties></special_properties> <template></template> <type>S</type> <weight>5</weight> <sequence>2</sequence> </common> <melee> <w1_h1_p> <!-- One weapon, 1 hand, primary hand --> <to_hit>-3</to_hit> <damage>1d6</damage> </w1_h1_p> <w1_h1_o> <!-- One weapon, 1 handed, offhand --> <to_hit>-7</to_hit> <damage>1d6</damage> </w1_h1_o> <w1_h2> <!-- One weapon, 2 handed --> <to_hit>-3</to_hit> <damage>1d6</damage> </w1_h2> <w2_p_oh> <!-- Two weapons, this weapon in primary hand, other hand with heavy weapon --> <to_hit>-9</to_hit> <damage>1d6</damage> </w2_p_oh> <w2_p_ol> <!-- Two weapons, this weapon in primary hand, other hand with light weapon --> <to_hit>-7</to_hit> <damage>1d6</damage> </w2_p_ol> <w2_o> <!-- Two weapons, this weapon in off-hand --> <to_hit>-11</to_hit> <damage>1d6</damage> </w2_o> </melee> </weapon> </weapons> + </ranges> + </weapon> + + + + + + + + <weapon> + <common> + <name> + <short>Handaxe</short> + <long>Handaxe</long> + </name> + <category>Martial-Melee</category> + <critical> + <range>20</range> + <multiplier>3</multiplier> + </critical> + <to_hit> + <hit>-3</hit> + <magic_hit>+0</magic_hit> + <total_hit>-3</total_hit> + </to_hit> + <feat></feat> + <hand>Carried</hand> + <num_attacks>1</num_attacks> + <reach>5</reach> + <size>S</size> + <special_properties></special_properties> + <template></template> + <type>S</type> + <weight>5</weight> + <sequence>2</sequence> + </common> + <melee> + <w1_h1_p> + <!-- One weapon, 1 hand, primary hand --> + <to_hit>-3</to_hit> + <damage>1d6</damage> + </w1_h1_p> + <w1_h1_o> + <!-- One weapon, 1 handed, offhand --> + <to_hit>-7</to_hit> + <damage>1d6</damage> + </w1_h1_o> + <w1_h2> + <!-- One weapon, 2 handed --> + <to_hit>-3</to_hit> + <damage>1d6</damage> + </w1_h2> + <w2_p_oh> + <!-- Two weapons, this weapon in primary hand, other hand with heavy weapon --> + <to_hit>-9</to_hit> + <damage>1d6</damage> + </w2_p_oh> + <w2_p_ol> + <!-- Two weapons, this weapon in primary hand, other hand with light weapon --> + <to_hit>-7</to_hit> + <damage>1d6</damage> + </w2_p_ol> + <w2_o> + <!-- Two weapons, this weapon in off-hand --> + <to_hit>-11</to_hit> + <damage>1d6</damage> + </w2_o> + </melee> + </weapon> + </weapons> <!-- ==================================== ==================================== @@ -985,9 +1118,17 @@ <!-- Character Rage --> - <!-- Turning ability --> <turning kind="Undead"> <level>2</level> <turn_check>1d20-1</turn_check> <damage>2d6 +1</damage> <uses_per_day>6</uses_per_day> <notes>You destroy undead if you have twice as many turning levels as they have Hit Dice</notes> </turning> + <!-- Turning ability --> + <turning kind="Undead"> + <level>2</level> + <turn_check>1d20-1</turn_check> + <damage>2d6 +1</damage> + <uses_per_day>6</uses_per_day> + <notes>You destroy undead if you have twice as many turning levels as they have Hit Dice</notes> + </turning> + <!-- 3.0 stunning fist --> <!-- 3.5 stunning fist --> @@ -1393,12 +1534,14 @@ ====================================--> <spells> <!-- ### BEGIN Innate spells ### --> - <spells_innate number="none"/><!-- ### END Innate spells ### --> + <spells_innate number="none"/> +<!-- ### END Innate spells ### --> <!-- ### BEGIN Known spells ### --> <known_spells> <class number="0" spelllistclass="Cleric" spellcastertype="Divine"> - <level number="0" known="0" cast="4"> <spell> + <level number="0" known="0" cast="4"> + <spell> <name>Create Water</name> <outputname>Create Water</outputname> <times_memorized>1</times_memorized> @@ -1734,7 +1877,9 @@ <description>Subject gains 1 temporary hp.</description> <bonusspell></bonusspell> </spell> - </level> <level number="1" known="0" cast="3+1"> <spell> + </level> + <level number="1" known="0" cast="3+1"> + <spell> <name>Bane</name> <outputname>Bane</outputname> <times_memorized>1</times_memorized> @@ -2602,11 +2747,21 @@ <description>Calls outsider to fight for the caster.</description> <bonusspell></bonusspell> </spell> - </level> <level number="2" known="0" cast="0"/> <level number="3" known="0" cast="0"/> <level number="4" known="0" cast="0"/> <level number="5" known="0" cast="0"/> <level number="6" known="0" cast="0"/> <level number="7" known="0" cast="0"/> <level number="8" known="0" cast="0"/> <level number="9" known="0" cast="0"/> </class> + </level> + <level number="2" known="0" cast="0"/> + <level number="3" known="0" cast="0"/> + <level number="4" known="0" cast="0"/> + <level number="5" known="0" cast="0"/> + <level number="6" known="0" cast="0"/> + <level number="7" known="0" cast="0"/> + <level number="8" known="0" cast="0"/> + <level number="9" known="0" cast="0"/> + </class> </known_spells> <!-- ### END Known spells ### --> <!-- ### BEGIN memorized spells ### --> - <memorized_spells/><!-- ### END class Spellbook memorized spells ### --> + <memorized_spells/> +<!-- ### END class Spellbook memorized spells ### --> </spells> </character> Modified: Trunk/pcgen/code/testsuite/csheets/CloudGiantHalfDragon.xml =================================================================== --- Trunk/pcgen/code/testsuite/csheets/CloudGiantHalfDragon.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/testsuite/csheets/CloudGiantHalfDragon.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <character> - <!-- - ==================================== - ==================================== - BIO - ==================================== - ====================================--> +<!--======================================================================== +BIO +========================================================================--> <basics> <bonuses></bonuses> <bonuses></bonuses> @@ -942,9 +939,120 @@ - <weapon> <common> <name> <short>*Bite</short> <long>*Bite (Natural/Primary)</long> </name> <category>Natural-Natural,Melee</category> <critical> <range>20</range> <multiplier>2</multiplier> </critical> <to_hit> <hit>+30</hit> <magic_hit>+0</magic_hit> <total_hit>+30</total_hit> </to_hit> <feat></feat> <hand>Primary</hand> <num_attacks>3</num_attacks> <reach>15</reach> <size>M</size> <special_properties></special_properties> <template></template> <type>BPS</type> <weight>0</weight> <sequence>0</sequence> </common> <simple> <to_hit>+30</to_hit> <damage>2d6+20</damage> <range>0 ft.</range> </simple> </weapon> - <weapon> <common> <name> <short>Slam</short> <long>Slam (Natural/Primary)</long> </name> <category>Natural-Natural,Melee</category> <critical> <range>20</range> <multiplier>2</multiplier> </critical> <to_hit> <hit>+30/+30</hit> <magic_hit>+0</magic_hit> <total_hit>+30/+30</total_hit> </to_hit> <feat></feat> <hand>Carried</hand> <num_attacks>4</num_attacks> <reach>15</reach> <size>H</size> <special_properties></special_properties> <template></template> <type>B</type> <weight>0</weight> <sequence>1</sequence> </common> <simple> <to_hit>+30/+30</to_hit> <damage>1d6+30</damage> <range>0 ft.</range> </simple> </weapon> - <weapon> <common> <name> <short>*Claw</short> <long>*Claw (Natural/Secondary)</long> </name> <category>Natural-Natural,Melee</category> <critical> <range>20</range> <multiplier>2</multiplier> </critical> <to_hit> <hit>+25/+25</hit> <magic_hit>+0</magic_hit> <total_hit>+25/+25</total_hit> </to_hit> <feat></feat> <hand>Off-hand</hand> <num_attacks>4</num_attacks> <reach>15</reach> <size>M</size> <special_properties></special_properties> <template></template> <type>PS</type> <weight>0</weight> <sequence>2</sequence> </common> <simple> <to_hit>+25/+25</to_hit> <damage>1d8+10</damage> <range>0 ft.</range> </simple> </weapon> </weapons> + + + + + <weapon> + <common> + <name> + <short>*Bite</short> + <long>*Bite (Natural/Primary)</long> + </name> + <category>Natural-Natural,Melee</category> + <critical> + <range>20</range> + <multiplier>2</multiplier> + </critical> + <to_hit> + <hit>+30</hit> + <magic_hit>+0</magic_hit> + <total_hit>+30</total_hit> + </to_hit> + <feat></feat> + <hand>Primary</hand> + <num_attacks>3</num_attacks> + <reach>15</reach> + <size>M</size> + <special_properties></special_properties> + <template></template> + <type>BPS</type> + <weight>0</weight> + <sequence>0</sequence> + </common> + <simple> + <to_hit>+30</to_hit> + <damage>2d6+20</damage> + <range>0 ft.</range> + </simple> + </weapon> + + + + + + <weapon> + <common> + <name> + <short>Slam</short> + <long>Slam (Natural/Primary)</long> + </name> + <category>Natural-Natural,Melee</category> + <critical> + <range>20</range> + <multiplier>2</multiplier> + </critical> + <to_hit> + <hit>+30/+30</hit> + <magic_hit>+0</magic_hit> + <total_hit>+30/+30</total_hit> + </to_hit> + <feat></feat> + <hand>Carried</hand> + <num_attacks>4</num_attacks> + <reach>15</reach> + <size>H</size> + <special_properties></special_properties> + <template></template> + <type>B</type> + <weight>0</weight> + <sequence>1</sequence> + </common> + <simple> + <to_hit>+30/+30</to_hit> + <damage>1d6+30</damage> + <range>0 ft.</range> + </simple> + </weapon> + + + + + + <weapon> + <common> + <name> + <short>*Claw</short> + <long>*Claw (Natural/Secondary)</long> + </name> + <category>Natural-Natural,Melee</category> + <critical> + <range>20</range> + <multiplier>2</multiplier> + </critical> + <to_hit> + <hit>+25/+25</hit> + <magic_hit>+0</magic_hit> + <total_hit>+25/+25</total_hit> + </to_hit> + <feat></feat> + <hand>Off-hand</hand> + <num_attacks>4</num_attacks> + <reach>15</reach> + <size>M</size> + <special_properties></special_properties> + <template></template> + <type>PS</type> + <weight>0</weight> + <sequence>2</sequence> + </common> + <simple> + <to_hit>+25/+25</to_hit> + <damage>1d8+10</damage> + <range>0 ft.</range> + </simple> + </weapon> + </weapons> <!-- ==================================== ==================================== @@ -1391,6 +1499,7 @@ <spells> <!-- ### BEGIN Innate spells ### --> <spells_innate> + <racial_innate> <spell> <name>Fog Cloud</name> @@ -1478,14 +1587,22 @@ </spell> </racial_innate> - <class_innate> </class_innate> </spells_innate><!-- ### END Innate spells ### --> + + <class_innate> + </class_innate> + </spells_innate> +<!-- ### END Innate spells ### --> <!-- ### BEGIN Known spells ### --> <known_spells> </known_spells> <!-- ### END Known spells ### --> <!-- ### BEGIN memorized spells ### --> - <memorized_spells> <!-- ### BEGIN innate memorized spell section --> <!-- ### BEGIN innate memorized spells ### --> + <memorized_spells> + <!-- ### BEGIN innate memorized spell section --> + +<!-- ### BEGIN innate memorized spells ### --> + <racial_innate_memorized> <spell> <name>Fog Cloud</name> @@ -1573,6 +1690,14 @@ </spell> </racial_innate_memorized> -<!-- ### END innate memorized spells ### --> <!-- ### BEGIN class innate memorized spells ### --> <class_innate_memorized> </class_innate_memorized> <!-- ### END class innate memorized spells ### --><!-- ### END innate memorized spell section --> <!-- ### BEGIN class Spellbook memorized spells ### --> </memorized_spells><!-- ### END class Spellbook memorized spells ### --> +<!-- ### END innate memorized spells ### --> + <!-- ### BEGIN class innate memorized spells ### --> + <class_innate_memorized> + </class_innate_memorized> + <!-- ### END class innate memorized spells ### --> +<!-- ### END innate memorized spell section --> + <!-- ### BEGIN class Spellbook memorized spells ### --> + </memorized_spells> +<!-- ### END class Spellbook memorized spells ### --> </spells> </character> Modified: Trunk/pcgen/code/testsuite/csheets/DrakelingSorc.xml =================================================================== --- Trunk/pcgen/code/testsuite/csheets/DrakelingSorc.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/testsuite/csheets/DrakelingSorc.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <character> - <!-- - ==================================== - ==================================== - BIO - ==================================== - ====================================--> +<!--======================================================================== +BIO +========================================================================--> <basics> <bonuses></bonuses> <bonuses></bonuses> @@ -1062,6 +1059,7 @@ <spells> <!-- ### BEGIN Innate spells ### --> <spells_innate> + <racial_innate> <spell> <name>Cause Fear</name> @@ -1093,12 +1091,17 @@ </spell> </racial_innate> - <class_innate> </class_innate> </spells_innate><!-- ### END Innate spells ### --> + + <class_innate> + </class_innate> + </spells_innate> +<!-- ### END Innate spells ### --> <!-- ### BEGIN Known spells ### --> <known_spells> <class number="1" spelllistclass="Sorcerer" spellcastertype="Arcane"> - <level number="0" known="6" cast="6"> <spell> + <level number="0" known="6" cast="6"> + <spell> <name>Detect Poison</name> <outputname>Detect Poison</outputname> <times_memorized>1</times_memorized> @@ -1266,7 +1269,9 @@ <description>Read scrolls and spellbooks.</description> <bonusspell></bonusspell> </spell> - </level> <level number="1" known="3" cast="8"> <spell> + </level> + <level number="1" known="3" cast="8"> + <spell> <name>Endure Elements</name> <outputname>Endure Elements</outputname> <times_memorized>1</times_memorized> @@ -1350,7 +1355,9 @@ <description>Masks magic item's aura.</description> <bonusspell></bonusspell> </spell> - </level> <level number="2" known="1" cast="4"> <spell> + </level> + <level number="2" known="1" cast="4"> + <spell> <name>Flaming Sphere</name> <outputname>Flaming Sphere</outputname> <times_memorized>1</times_memorized> @@ -1378,12 +1385,24 @@ <description>Rolling ball of fire, 2d6 damage, lasts (CASTERLEVEL) rounds.</description> <bonusspell></bonusspell> </spell> - </level> <level number="3" known="0" cast="0"/> <level number="4" known="0" cast="0"/> <level number="5" known="0" cast="0"/> <level number="6" known="0" cast="0"/> <level number="7" known="0" cast="0"/> <level number="8" known="0" cast="0"/> <level number="9" known="0" cast="0"/> </class> + </level> + <level number="3" known="0" cast="0"/> + <level number="4" known="0" cast="0"/> + <level number="5" known="0" cast="0"/> + <level number="6" known="0" cast="0"/> + <level number="7" known="0" cast="0"/> + <level number="8" known="0" cast="0"/> + <level number="9" known="0" cast="0"/> + </class> </known_spells> <!-- ### END Known spells ### --> <!-- ### BEGIN memorized spells ### --> - <memorized_spells> <!-- ### BEGIN innate memorized spell section --> <!-- ### BEGIN innate memorized spells ### --> + <memorized_spells> + <!-- ### BEGIN innate memorized spell section --> + +<!-- ### BEGIN innate memorized spells ### --> + <racial_innate_memorized> <spell> <name>Cause Fear</name> @@ -1415,6 +1434,14 @@ </spell> </racial_innate_memorized> -<!-- ### END innate memorized spells ### --> <!-- ### BEGIN class innate memorized spells ### --> <class_innate_memorized> </class_innate_memorized> <!-- ### END class innate memorized spells ### --><!-- ### END innate memorized spell section --> <!-- ### BEGIN class Spellbook memorized spells ### --> </memorized_spells><!-- ### END class Spellbook memorized spells ### --> +<!-- ### END innate memorized spells ### --> + <!-- ### BEGIN class innate memorized spells ### --> + <class_innate_memorized> + </class_innate_memorized> + <!-- ### END class innate memorized spells ### --> +<!-- ### END innate memorized spell section --> + <!-- ### BEGIN class Spellbook memorized spells ### --> + </memorized_spells> +<!-- ### END class Spellbook memorized spells ### --> </spells> </character> Modified: Trunk/pcgen/code/testsuite/csheets/FigFae.xml =================================================================== --- Trunk/pcgen/code/testsuite/csheets/FigFae.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/testsuite/csheets/FigFae.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <character> - <!-- - ==================================== - ==================================== - BIO - ==================================== - ====================================--> +<!--======================================================================== +BIO +========================================================================--> <basics> <bonuses></bonuses> <bonuses></bonuses> @@ -868,7 +865,71 @@ - <weapon> <common> <name> <short>*Rapier</short> <long>*Rapier</long> </name> <category>Martial-Melee</category> <critical> <range>18-20</range> <multiplier>2</multiplier> </critical> <to_hit> <hit>+3</hit> <magic_hit>+0</magic_hit> <total_hit>+3</total_hit> </to_hit> <feat></feat> <hand>Two-Weapons</hand> <num_attacks>1</num_attacks> <reach>5</reach> <size>M</size> <special_properties></special_properties> <template></template> <type>P</type> <weight>3</weight> <sequence>0</sequence> </common> <melee> <w1_h1_p> <!-- One weapon, 1 hand, primary hand --> <to_hit>+7</to_hit> <damage>1d6+3</damage> </w1_h1_p> <w1_h1_o> <!-- One weapon, 1 handed, offhand --> <to_hit>+7</to_hit> <damage>1d6+1</damage> </w1_h1_o> <w1_h2> <!-- One weapon, 2 handed --> <to_hit>+7</to_hit> <damage>1d6+4</damage> </w1_h2> <w2_p_oh> <!-- Two weapons, this weapon in primary hand, other hand with heavy weapon --> <to_hit>+3</to_hit> <damage>1d6+3</damage> </w2_p_oh> <w2_p_ol> <!-- Two weapons, this weapon in primary hand, other hand with light weapon --> <to_hit>+5</to_hit> <damage>1d6+3</damage> </w2_p_ol> <w2_o> <!-- Two weapons, this weapon in off-hand --> <to_hit>+3</to_hit> <damage>1d6+1</damage> </w2_o> </melee> </weapon> </weapons> + + + + + <weapon> + <common> + <name> + <short>*Rapier</short> + <long>*Rapier</long> + </name> + <category>Martial-Melee</category> + <critical> + <range>18-20</range> + <multiplier>2</multiplier> + </critical> + <to_hit> + <hit>+3</hit> + <magic_hit>+0</magic_hit> + <total_hit>+3</total_hit> + </to_hit> + <feat></feat> + <hand>Two-Weapons</hand> + <num_attacks>1</num_attacks> + <reach>5</reach> + <size>M</size> + <special_properties></special_properties> + <template></template> + <type>P</type> + <weight>3</weight> + <sequence>0</sequence> + </common> + <melee> + <w1_h1_p> + <!-- One weapon, 1 hand, primary hand --> + <to_hit>+7</to_hit> + <damage>1d6+3</damage> + </w1_h1_p> + <w1_h1_o> + <!-- One weapon, 1 handed, offhand --> + <to_hit>+7</to_hit> + <damage>1d6+1</damage> + </w1_h1_o> + <w1_h2> + <!-- One weapon, 2 handed --> + <to_hit>+7</to_hit> + <damage>1d6+4</damage> + </w1_h2> + <w2_p_oh> + <!-- Two weapons, this weapon in primary hand, other hand with heavy weapon --> + <to_hit>+3</to_hit> + <damage>1d6+3</damage> + </w2_p_oh> + <w2_p_ol> + <!-- Two weapons, this weapon in primary hand, other hand with light weapon --> + <to_hit>+5</to_hit> + <damage>1d6+3</damage> + </w2_p_ol> + <w2_o> + <!-- Two weapons, this weapon in off-hand --> + <to_hit>+3</to_hit> + <damage>1d6+1</damage> + </w2_o> + </melee> + </weapon> + </weapons> <!-- ==================================== ==================================== @@ -1188,13 +1249,15 @@ ====================================--> <spells> <!-- ### BEGIN Innate spells ### --> - <spells_innate number="none"/><!-- ### END Innate spells ### --> + <spells_innate number="none"/> +<!-- ### END Innate spells ### --> <!-- ### BEGIN Known spells ### --> <known_spells> </known_spells> <!-- ### END Known spells ### --> <!-- ### BEGIN memorized spells ### --> - <memorized_spells/><!-- ### END class Spellbook memorized spells ### --> + <memorized_spells/> +<!-- ### END class Spellbook memorized spells ### --> </spells> </character> Modified: Trunk/pcgen/code/testsuite/csheets/JimDop.xml =================================================================== --- Trunk/pcgen/code/testsuite/csheets/JimDop.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/testsuite/csheets/JimDop.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <character> - <!-- - ==================================== - ==================================== - BIO - ==================================== - ====================================--> +<!--======================================================================== +BIO +========================================================================--> <basics> <bonuses></bonuses> <bonuses></bonuses> @@ -890,9 +887,120 @@ - <weapon> <common> <name> <short>Bite</short> <long>Bite (Natural/Primary)</long> </name> <category>Natural-Natural,Melee</category> <critical> <range>20</range> <multiplier>2</multiplier> </critical> <to_hit> <hit>+15</hit> <magic_hit>+0</magic_hit> <total_hit>+15</total_hit> </to_hit> <feat></feat> <hand>Carried</hand> <num_attacks>2</num_attacks> <reach>5</reach> <size>M</size> <special_properties></special_properties> <template></template> <type>BPS</type> <weight>0</weight> <sequence>0</sequence> </common> <simple> <to_hit>+15</to_hit> <damage>1d6+9</damage> <range>0 ft.</range> </simple> </weapon> - <weapon> <common> <name> <short>*Slam</short> <long>*Slam (Natural/Primary)</long> </name> <category>Natural-Natural,Melee</category> <critical> <range>20</range> <multiplier>2</multiplier> </critical> <to_hit> <hit>+15</hit> <magic_hit>+0</magic_hit> <total_hit>+15</total_hit> </to_hit> <feat></feat> <hand>Primary</hand> <num_attacks>2</num_attacks> <reach>5</reach> <size>M</size> <special_properties></special_properties> <template></template> <type>B</type> <weight>0</weight> <sequence>1</sequence> </common> <simple> <to_hit>+15</to_hit> <damage>1d6+13</damage> <range>0 ft.</range> </simple> </weapon> - <weapon> <common> <name> <short>*Claw</short> <long>*Claw (Natural/Secondary)</long> </name> <category>Natural-Natural,Melee</category> <critical> <range>20</range> <multiplier>2</multiplier> </critical> <to_hit> <hit>+10/+10</hit> <magic_hit>+0</magic_hit> <total_hit>+10/+10</total_hit> </to_hit> <feat></feat> <hand>Off-hand</hand> <num_attacks>3</num_attacks> <reach>5</reach> <size>M</size> <special_properties></special_properties> <template></template> <type>PS</type> <weight>0</weight> <sequence>2</sequence> </common> <simple> <to_hit>+10/+10</to_hit> <damage>1d4+4</damage> <range>0 ft.</range> </simple> </weapon> </weapons> + + + + + <weapon> + <common> + <name> + <short>Bite</short> + <long>Bite (Natural/Primary)</long> + </name> + <category>Natural-Natural,Melee</category> + <critical> + <range>20</range> + <multiplier>2</multiplier> + </critical> + <to_hit> + <hit>+15</hit> + <magic_hit>+0</magic_hit> + <total_hit>+15</total_hit> + </to_hit> + <feat></feat> + <hand>Carried</hand> + <num_attacks>2</num_attacks> + <reach>5</reach> + <size>M</size> + <special_properties></special_properties> + <template></template> + <type>BPS</type> + <weight>0</weight> + <sequence>0</sequence> + </common> + <simple> + <to_hit>+15</to_hit> + <damage>1d6+9</damage> + <range>0 ft.</range> + </simple> + </weapon> + + + + + + <weapon> + <common> + <name> + <short>*Slam</short> + <long>*Slam (Natural/Primary)</long> + </name> + <category>Natural-Natural,Melee</category> + <critical> + <range>20</range> + <multiplier>2</multiplier> + </critical> + <to_hit> + <hit>+15</hit> + <magic_hit>+0</magic_hit> + <total_hit>+15</total_hit> + </to_hit> + <feat></feat> + <hand>Primary</hand> + <num_attacks>2</num_attacks> + <reach>5</reach> + <size>M</size> + <special_properties></special_properties> + <template></template> + <type>B</type> + <weight>0</weight> + <sequence>1</sequence> + </common> + <simple> + <to_hit>+15</to_hit> + <damage>1d6+13</damage> + <range>0 ft.</range> + </simple> + </weapon> + + + + + + <weapon> + <common> + <name> + <short>*Claw</short> + <long>*Claw (Natural/Secondary)</long> + </name> + <category>Natural-Natural,Melee</category> + <critical> + <range>20</range> + <multiplier>2</multiplier> + </critical> + <to_hit> + <hit>+10/+10</hit> + <magic_hit>+0</magic_hit> + <total_hit>+10/+10</total_hit> + </to_hit> + <feat></feat> + <hand>Off-hand</hand> + <num_attacks>3</num_attacks> + <reach>5</reach> + <size>M</size> + <special_properties></special_properties> + <template></template> + <type>PS</type> + <weight>0</weight> + <sequence>2</sequence> + </common> + <simple> + <to_hit>+10/+10</to_hit> + <damage>1d4+4</damage> + <range>0 ft.</range> + </simple> + </weapon> + </weapons> <!-- ==================================== ==================================== @@ -1406,7 +1514,8 @@ ====================================--> <spells> <!-- ### BEGIN Innate spells ### --> - <spells_innate number="none"/><!-- ### END Innate spells ### --> + <spells_innate number="none"/> +<!-- ### END Innate spells ### --> <!-- ### BEGIN Known spells ### --> <known_spells> @@ -1414,6 +1523,7 @@ </known_spells> <!-- ### END Known spells ### --> <!-- ### BEGIN memorized spells ### --> - <memorized_spells/><!-- ### END class Spellbook memorized spells ### --> + <memorized_spells/> +<!-- ### END class Spellbook memorized spells ### --> </spells> </character> Modified: Trunk/pcgen/code/testsuite/csheets/MonKee.xml =================================================================== --- Trunk/pcgen/code/testsuite/csheets/MonKee.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/testsuite/csheets/MonKee.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <character> - <!-- - ==================================== - ==================================== - BIO - ==================================== - ====================================--> +<!--======================================================================== +BIO +========================================================================--> <basics> <bonuses></bonuses> <bonuses></bonuses> @@ -1237,13 +1234,15 @@ ====================================--> <spells> <!-- ### BEGIN Innate spells ### --> - <spells_innate number="none"/><!-- ### END Innate spells ### --> + <spells_innate number="none"/> +<!-- ### END Innate spells ### --> <!-- ### BEGIN Known spells ### --> <known_spells> </known_spells> <!-- ### END Known spells ### --> <!-- ### BEGIN memorized spells ### --> - <memorized_spells/><!-- ### END class Spellbook memorized spells ### --> + <memorized_spells/> +<!-- ### END class Spellbook memorized spells ### --> </spells> </character> Modified: Trunk/pcgen/code/testsuite/csheets/SWizSam.xml =================================================================== --- Trunk/pcgen/code/testsuite/csheets/SWizSam.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/testsuite/csheets/SWizSam.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <character> - <!-- - ==================================== - ==================================== - BIO - ==================================== - ====================================--> +<!--======================================================================== +BIO +========================================================================--> <basics> <bonuses></bonuses> <bonuses></bonuses> @@ -1085,12 +1082,14 @@ ====================================--> <spells> <!-- ### BEGIN Innate spells ### --> - <spells_innate number="none"/><!-- ### END Innate spells ### --> + <spells_innate number="none"/> +<!-- ### END Innate spells ### --> <!-- ### BEGIN Known spells ### --> <known_spells> <class number="0" spelllistclass="Wizard" spellcastertype="Arcane"> - <level number="0" known="0" cast="3+1"> <spell> + <level number="0" known="0" cast="3+1"> + <spell> <name>Arcane Mark</name> <outputname>Arcane Mark</outputname> <times_memorized>1</times_memorized> @@ -1482,7 +1481,9 @@ <description>Subject gains +1 on saving throws.</description> <bonusspell></bonusspell> </spell> - </level> <level number="1" known="0" cast="2+1"> <spell> + </level> + <level number="1" known="0" cast="2+1"> + <spell> <name>Cause Fear</name> <outputname>Cause Fear</outputname> <times_memorized>1</times_memorized> @@ -1622,11 +1623,21 @@ <description>Reveals undead within 60 ft.</description> <bonusspell></bonusspell> </spell> - </level> <level number="2" known="0" cast="0"/> <level number="3" known="0" cast="0"/> <level number="4" known="0" cast="0"/> <level number="5" known="0" cast="0"/> <level number="6" known="0" cast="0"/> <level number="7" known="0" cast="0"/> <level number="8" known="0" cast="0"/> <level number="9" known="0" cast="0"/> </class> + </level> + <level number="2" known="0" cast="0"/> + <level number="3" known="0" cast="0"/> + <level number="4" known="0" cast="0"/> + <level number="5" known="0" cast="0"/> + <level number="6" known="0" cast="0"/> + <level number="7" known="0" cast="0"/> + <level number="8" known="0" cast="0"/> + <level number="9" known="0" cast="0"/> + </class> </known_spells> <!-- ### END Known spells ### --> <!-- ### BEGIN memorized spells ### --> - <memorized_spells/><!-- ### END class Spellbook memorized spells ### --> + <memorized_spells/> +<!-- ### END class Spellbook memorized spells ### --> </spells> </character> Modified: Trunk/pcgen/code/testsuite/csheets/WizShar.xml =================================================================== --- Trunk/pcgen/code/testsuite/csheets/WizShar.xml 2006-05-26 21:54:47 UTC (rev 1038) +++ Trunk/pcgen/code/testsuite/csheets/WizShar.xml 2006-05-28 01:16:37 UTC (rev 1039) @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <character> - <!-- - ==================================== - ==================================== - BIO - ==================================== - ====================================--> +<!--======================================================================== +BIO +========================================================================--> <basics> <bonuses></bonuses> <bonuses></bonuses> @@ -1098,12 +1095,14 @@ ====================================--> <spells> <!-- ### BEGIN Innate spells ### --> - <spells_innate number="none"/><!-- ### END Innate spells ### --> + <spells_innate number="none"/> +<!-- ### END Innate spells ### --> <!-- ### BEGIN Known spells ### --> <known_spells> <class number="0" spelllistclass="Wizard" spellcastertype="Arcane"> - <level number="0" known="0" cast="3"> <spell> + <level number="0" known="0" cast="3"> + <spell> <name>Arcane Mark</name> <outputname>Arcane Mark</outputname> <times_memorized>1</times_memorized> @@ -1551,7 +1550,9 @@ <description>Subject gains +1 on saving throws.</description> <bonusspell></bonusspell> </spell> - </level> <level number="1" known="0" cast="2"> <spell> + </level> + <level number="1" known="0" cast="2"> + <spell> <name>Change Self</name> <outputname>Change Self</outputname> <times_memorized>1</times_memorized> @@ -1635,11 +1636,21 @@ <description>(CASTERLEVEL) touches deal 1d6 damage and possibly 1 Str damage.</description> <bonusspell></bonusspell> </spell> - </level> <level number="2" known="0" cast="0"/> <level number="3" known="0" cast="0"/> <level number="4" known="0" cast="0"/> <level number="5" known="0" cast="0"/> <level number="6" known="0" cast="0"/> <level number="7" known="0" cast="0"/> <level number="8" known="0" cast="0"/> <level number="9" known="0" cast="0"/> </class> + </level> + <level number="2" known="0" cast="0"/> + <level number="3" known="0" cast="0"/> + <level number="4" known="0" cast="0"/> + <level number="5" known="0" cast="0"/> + <level number="6" known="0" cast="0"/> + <level number="7" known="0" cast="0"/> + <level number="8" known="0" cast="0"/> + <level number="9" known="0" cast="0"/> + </class> </known_spells> <!-- ### END Known spells ### --> <!-- ### BEGIN memorized spells ### --> - <memorized_spells/><!-- ### END class Spellbook memorized spells ### --> + <memorized_spells/> +<!-- ### 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. |