From: <jde...@us...> - 2013-09-18 10:18:11
|
Revision: 21417 http://sourceforge.net/p/pcgen/code/21417 Author: jdempsey Date: 2013-09-18 10:18:08 +0000 (Wed, 18 Sep 2013) Log Message: ----------- Fix bug: Situational Error with Weapon Prof error message on character load Issue#: CODE-2205 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2013-09-18 04:47:15 UTC (rev 21416) +++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2013-09-18 10:18:08 UTC (rev 21417) @@ -105,6 +105,7 @@ import pcgen.core.SystemCollections; import pcgen.core.WeaponProf; import pcgen.core.analysis.BonusAddition; +import pcgen.core.analysis.ChooseActivation; import pcgen.core.analysis.DomainApplication; import pcgen.core.analysis.RaceAlignment; import pcgen.core.analysis.SkillRankControl; @@ -439,6 +440,15 @@ private void addKeyedTemplate(PCTemplate template, String choice) { + if (ChooseActivation.hasChooseToken(template) && choice == null) + { + final String message = + "Template ignored: " + + template + + " as a choice was expected but none was present in character."; + warnings.add(message); + return; + } final int preXP = thePC.getXP(); templateInputFacet.importSelection(thePC.getCharID(), template, choice); thePC.addTemplate(template); @@ -1508,7 +1518,9 @@ parseWeaponProficienciesLine(line); } - checkWeaponProficiencies(); + // This is not reliable during character load, and the warning is + // of little value, so I'm disabling the check for now. + //checkWeaponProficiencies(); } if (cache.containsKey(TAG_ARMORPROF)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |