Merge pull request #1382 from LegacyKing/6.06.01RC4

6.06.01 rc4

code/src/java/pcgen/core/BonusManager.java

@@ -836,6 +836,18 @@ public int getPartialStatBonusFor(PCStat stat, boolean useTemp,
 				{
 					addIt = useEquip;
 				}
+				else if (co instanceof Ability)
+				{
+					List<String> types = ((Ability)co).getTypes();
+					if (types.contains("Equipment"))
+					{
+						addIt = useEquip;
+					}
+					else
+					{
+						addIt = true;
+					}
+				}
 				else if (tempBonusBySource.containsKey(bonus))
 				{
 					addIt = useTemp;

code/src/java/pcgen/core/GameMode.java

@@ -1292,7 +1292,7 @@ public void setWeaponReachFormula (String aString)
 	}
 
 	/**
-	 * Answer the acAbbrev field.
+	 * Set the acAbbrev field.
 	 */
 	String getACAbbrev()
 	{

code/src/java/pcgen/core/SettingsHandler.java

@@ -43,9 +43,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
-
 import javax.swing.SwingConstants;
-
 import pcgen.base.lang.StringUtil;
 import pcgen.cdom.base.Constants;
 import pcgen.cdom.enumeration.SourceFormat;
@@ -54,6 +52,7 @@
 import pcgen.core.utils.ShowMessageDelegate;
 import pcgen.core.utils.SortedProperties;
 import pcgen.persistence.PersistenceManager;
+import pcgen.system.ConfigurationSettings;
 import pcgen.system.LanguageBundle;
 import pcgen.util.Logging;
 
@@ -676,7 +675,7 @@ public static String getHTMLOutputSheetPath()
 	{
 		if ("".equals(selectedCharacterHTMLOutputSheet)) //$NON-NLS-1$
 		{
-			return getPcgenOutputSheetDir().toString();
+			return ConfigurationSettings.getOutputSheetsDir();
 		}
 
 		return new File(selectedCharacterHTMLOutputSheet).getParentFile().getAbsolutePath();
@@ -1275,7 +1274,7 @@ public static String getPDFOutputSheetPath()
 	{
 		if ("".equals(selectedCharacterPDFOutputSheet)) //$NON-NLS-1$
 		{
-			return getPcgenOutputSheetDir().toString();
+			return ConfigurationSettings.getOutputSheetsDir();
 		}
 
 		return new File(selectedCharacterPDFOutputSheet).getParentFile().getAbsolutePath();
@@ -1358,29 +1357,11 @@ public static void setPcgenOutputSheetDir(final File aFile)
 		pcgenOutputSheetDir = aFile;
 	}
 
-	/**
-	 * @deprecated Use ConfigurationSettings.getOutputSheetsDir()
-	 * @return the output sheet directory
-	 */
-	public static File getPcgenOutputSheetDir()
-	{
-		return pcgenOutputSheetDir;
-	}
-
 	public static void setPcgenPreviewDir(final File aFile)
 	{
 		pcgenPreviewDir = aFile;
 	}
-
-	/**
-	 * @deprecated Use ConfigurationSettings.getPreviewDir()
-	 * @return the preview directory
-	 */
-	public static File getPcgenPreviewDir()
-	{
-		return pcgenPreviewDir;
-	}
-
+
 	/**
 	 * Sets the path to the portrait files.
 	 *
@@ -1527,14 +1508,6 @@ public static void setSaveCustomEquipment(final boolean aBool)
 		setSaveCustomInLst(aBool);
 	}
 
-	/**
-	 * @deprecated Use PCGenSettings.OPTIONS_CONTEXT.getBoolean(PCGenSettings.OPTION_SAVE_CUSTOM_EQUIPMENT)
-	 */
-	public static boolean getSaveCustomEquipment()
-	{
-		return isSaveCustomInLst();
-	}
-
 	/**
 	 * save the outputsheet location with the PC?
 	 * @param arg

code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java

@@ -648,7 +648,7 @@ public CharacterLevelFacade findNextLevelForSkill(SkillFacade skill,
 			// 1. Selected level (if class had purchased a rank and is not above max ranks)
 			if (classHasRanksIn(skill,
 				((CharacterLevelFacadeImpl) baseLevel).getSelectedClass())
-				&& maxRanks != Float.NaN
+				&& !Float.isNaN(maxRanks)
 				&& maxRanks >= currRank
 				&& getSpentSkillPoints(baseLevel) > 0)
 			{
@@ -675,7 +675,7 @@ && getSpentSkillPoints(baseLevel) > 0)
 		}
 
 		// Check if current level ok
-		if (maxRanks != Float.NaN && maxRanks >= newRank
+		if (!Float.isNaN(maxRanks) && maxRanks >= newRank
 			&& getRemainingSkillPoints(baseLevel) > 0)
 		{
 			return baseLevel;
@@ -734,7 +734,7 @@ private CharacterLevelFacade scanForwardforLevelToBuySkill(Skill aSkill, float t
 			float maxRanks =
 					getMaxRanks(testLevel, skillCost,
 						isClassSkillForMaxRanks(testLevel, aSkill));
-			if (maxRanks != Float.NaN && maxRanks >= testRank)
+			if (!Float.isNaN(maxRanks) && maxRanks >= testRank)
 			{
 				//Logging.errorPrint("Selected level " + testLevel);
 				return testLevel;
@@ -772,7 +772,7 @@ private CharacterLevelFacade scanForLevelToRefundSkill(Skill aSkill, float testR
 			float maxRanks =
 					getMaxRanks(testLevel, skillCost,
 						isClassSkillForMaxRanks(testLevel, aSkill));
-			if (maxRanks != Float.NaN && maxRanks >= testRank)
+			if (!Float.isNaN(maxRanks) && maxRanks >= testRank)
 			{
 				//Logging.errorPrint("Selected level " + testLevel);
 				return testLevel;

code/src/java/pcgen/resources/prop/PCGenProp.properties

@@ -8,7 +8,7 @@
 HeadCodeMonkey=Bryan McRoberts (Benevolent Dictator)
 
 # Version number should be x.y.z (e.g. 2.0.0) - RC is x.xx.xx RCx
-VersionNumber=6.06.01 RC4-dev
+VersionNumber=6.06.01 RC4
 ReleaseDate=17 June, 2016
 CodeMonkeys=B. K. Oxley (binkley), Jonas Karlsson, Matthew Woodard, Peter Kahle, Tim Dugger, Tom Epperly, Brian Forester, Mario Bonassin, Jason Buchanan, Mark Hulsmanand, Jerry Hill, Eric Statz, Kurt Wimmer, David Fallon, Tyler Bannister, Thomas Clegg, Greg Bingleman, Emily Smirle, Arcady, Thomas Behr, Ryan Koppenhaver, Jayme Cox, Scott Ellsworth, Chris Ryan, James Dempsey, Walter Duncan, Devon Jones, Felipe Diniz, Frugal, Richard Askham, David Hibbs, John Watson, Stefan Radermacher, Ross Lodge, Benjamin Pew, Brian Kuehn, Aaron Divinsky, Andrew Wilson, Brian Hoff, Tom Parker, Andriy Sen, Koen Van Daele, Tobias Wichtrey, Per Christian Henden, Connor Petty, Dan Parks, Jasper Spaans, Steven West (redwolf3), Michael Isaacson, Vincent Lhote, Javier A. Ortiz Bultron, Gabriel Sorrel, John Carimando (UI), Andrew Maitland (LegacyKing)
 TestMonkeys=Dave Cortijo, Martin Brabander, John Sussenberger, Stephen Gryphon, Richard O'Doherty-Gregg, Brad Stiles, Chris Andersen, Joseff, and many more. Andrew Maitland,  David R. Bender,  Patryk Adamski,  Paul Grosse,  ratbird32, Stefan Radermacher, Vincent Lhote and Henk Slaaf (UI Beta testers)   

data/35e/fantasy_flight_games/midnight_campaign/campaign_setting/midnight35.pcc

@@ -62,7 +62,6 @@ TEMPLATE:midnight_templates_races.lst
 COMPANIONMOD:midnight_companion_mods.lst
 KIT:midnight_kits_races_monsters.lst
 
-BONUS:LANGUAGES:|NUMBER|INT
 
 # ENTRY DATE: 2015-11-30
 # LST MONKEY: Dan Schofield (schofida)

data/35e/fantasy_flight_games/midnight_campaign/campaign_setting/midnight_abilities_class.lst

@@ -1,6 +1,8 @@
 # CVS $Revision: $ $Author: $ dschofield Sun Oct  4 16:22:19 2015 -- Fri Jan  1 12:57:05 2016 -- reformated by PCGen PrettyLST v6.06.00
 #Original Entry By: Aaron Divinsky
 
+CATEGORY=Internal|Default.MOD	BONUS:LANGUAGES|NUMBER|INT
+
 ###Block: Defender Abilities
 # Ability Name			Unique Key							SORTKEY			Category of Ability		Type									Visible	Required Ability														Define			Description																												Stackable?	Multiple?	Choose				Auto Weapon Prof																			Ability							Combat bonus				Bonus to HP			Add to base move																	Save bonus		Modify VAR						Source Page		Aspects
 Weapon and Armor Proficiency	KEY:Defender ~ Weapon and Armor Proficiency	SORTKEY:Class_Defender	CATEGORY:Special Ability	TYPE:ClassFeatures.SpecialQuality				VISIBLE:YES																																																											AUTO:WEAPONPROF|Club|Dagger|Dart|Handaxe|Inutek|Hammer (Light)|Pick (Light)|Quarterstaff|Sap|Sickle|Axe (Throwing)|Sling	ABILITY:Internal|AUTOMATIC|TYPE=ArmorProfLight																																								SOURCEPAGE:p.82

data/35e/wizards_of_the_coast/rsrd/psionics/rsrd_kits_race.lst

@@ -1,6 +1,9 @@
 # CVS $Revision$ $Author$ -- Fri Oct 19 20:16:09 2012 -- reformated by prettylst.pl v1.39 (build 15052)
 SOURCELONG:Revised (v.3.5) System Reference Document	SOURCESHORT:RSRD	SOURCEWEB:http://www.wizards.com/default.asp?x=d20/article/srd35	SOURCEDATE:2000-01
 
+STARTPACK:Race ~ Psicrystal	VISIBLE:NO
+STAT:STR=10|DEX=10|CON=10|INT=10|WIS=10|CHA=10
+
 STARTPACK:Dromite Default	TYPE:DefaultMonster.MonstrousHumanoid	VISIBLE:QUALIFY	EQUIPBUY:0	PREMULT:1,[!PRERACE:1,%],[PRERACE:1,Dromite]
 NAME:Dromite
 STAT:STR=13|DEX=11|CON=12|INT=10|WIS=9|CHA=8

data/35e/wizards_of_the_coast/rsrd/psionics/rsrd_races.lst

@@ -83,7 +83,7 @@ Psicrystal (Single Minded)	STARTFEATS:1	SIZE:D	MOVE:Walk,30,Climb,20	REACH:0	VIS
 Psicrystal (Sneaky)		STARTFEATS:1	SIZE:D	MOVE:Walk,30,Climb,20	REACH:0	VISION:Sighted (40')	BONUS:SKILL|Climb|DEX-STR	BONUS:STAT|STR|-9	BONUS:STAT|DEX|5	BONUS:STAT|INT|-4	MONCSKILL:Climb|Move Silently|Spot	ABILITY:FEAT|VIRTUAL|Alertness|PREHD:MAX=1	ABILITY:Internal|AUTOMATIC|Race Traits ~ Psicrystal (Sneaky)		LEGS:0	DEFINESTAT:NONSTAT|CON	MONSTERCLASS:Companion (Psicrystal):1	RACETYPE:Construct	TYPE:Construct	SOURCEPAGE:PsionicMonsters
 Psicrystal (Sympathetic)	STARTFEATS:1	SIZE:D	MOVE:Walk,30,Climb,20	REACH:0	VISION:Sighted (40')	BONUS:SKILL|Climb|DEX-STR	BONUS:STAT|STR|-9	BONUS:STAT|DEX|5	BONUS:STAT|INT|-4	MONCSKILL:Climb|Move Silently|Spot	ABILITY:FEAT|VIRTUAL|Alertness|PREHD:MAX=1	ABILITY:Internal|AUTOMATIC|Race Traits ~ Psicrystal (Sympathetic)		LEGS:0	DEFINESTAT:NONSTAT|CON	MONSTERCLASS:Companion (Psicrystal):1	RACETYPE:Construct	TYPE:Construct	SOURCEPAGE:PsionicMonsters
 
-Psicrystal				STARTFEATS:1	SIZE:D	MOVE:Walk,30,Climb,20	REACH:0	VISION:Sighted (40')	BONUS:SKILL|Climb|DEX-STR	BONUS:STAT|STR|-9	BONUS:STAT|DEX|5	BONUS:STAT|INT|-4	MONCSKILL:Climb|Move Silently|Spot	ABILITY:FEAT|VIRTUAL|Alertness|PREHD:MAX=1	ABILITY:Internal|AUTOMATIC|Race Traits ~ Psicrystal				LEGS:0	DEFINESTAT:NONSTAT|CON	MONSTERCLASS:Companion (Psicrystal):1	RACETYPE:Construct	TYPE:Construct	SOURCEPAGE:PsionicMonsters
+Psicrystal				STARTFEATS:1	SIZE:D	MOVE:Walk,30,Climb,20	REACH:0	VISION:Sighted (40')	BONUS:SKILL|Climb|DEX-STR	BONUS:STAT|STR|-9	BONUS:STAT|DEX|5	BONUS:STAT|INT|-4	MONCSKILL:Climb|Move Silently|Spot	ABILITY:FEAT|VIRTUAL|Alertness|PREHD:MAX=1	ABILITY:Internal|AUTOMATIC|Race Traits ~ Psicrystal				LEGS:0	DEFINESTAT:NONSTAT|CON	MONSTERCLASS:Companion (Psicrystal):1	RACETYPE:Construct	TYPE:Construct	SOURCEPAGE:PsionicMonsters	KIT:1|Race ~ Psicrystal
 
 ###Block: P
 

data/5e/wizards_of_the_coast/srd5/srd5_abilities_class.lst

@@ -565,7 +565,7 @@ Champion				KEY:Martial Archetype ~ Champion				SORTKEY:Class			CATEGORY:Special
 
 # Champion
 Improved Critical			KEY:Champion Archetype ~ Improved Critical		SORTKEY:Class			CATEGORY:Special Ability	TYPE:Archetype Ability.Fighter Class Feature.Class Feature.SpecialQuality.Class Feature						DESC:Beginning when you choose this archetype at 3rd level, your weapon attacks score a critical hit on a roll of 19 or 20.																																																																																																																																																																																																																											BONUS:WEAPONPROF=TYPE.Weapon|CRITRANGEADD|1	SOURCEPAGE:p.
-Remarkable Athlete		KEY:Champion Archetype ~ Remarkable Athlete		SORTKEY:Class			CATEGORY:Special Ability	TYPE:Archetype Ability.Fighter Class Feature.Class Feature.SpecialQuality.Class Feature						DESC:Starting at 7th level, you can add half your proficiency bonus (round up) to any Strength, Dexterity, or Constitution check you make that doesn't already use your proficiency bonus. In addition, when you make a running long jump, the distance you can cover increases by a number of feet equal to +1.|STR																																																																																													BONUS:COMBAT|INITIATIVE|ceil(Proficiency_Bonus/2)										BONUS:VAR|SKILL_Athletics|ceil(Proficiency_Bonus/2)|TYPE=MISC|PREVARLT:SkillProf_Athletics,Proficiency_Bonus	BONUS:VAR|SKILL_Acrobatics|ceil(Proficiency_Bonus/2)|TYPE=MISC|PREVARLT:SkillProf_Acrobatics,Proficiency_Bonus	BONUS:VAR|SKILL_Sleight_of_Hand|ceil(Proficiency_Bonus/2)|TYPE=MISC|PREVARLT:SkillProf_Sleight_of_Hand,Proficiency_Bonus	BONUS:VAR|SKILL_Stealth|ceil(Proficiency_Bonus/2)|TYPE=MISC|PREVARLT:SkillProf_Stealth,Proficiency_Bonus									SOURCEPAGE:p.
+Remarkable Athlete		KEY:Champion Archetype ~ Remarkable Athlete		SORTKEY:Class			CATEGORY:Special Ability	TYPE:Archetype Ability.Fighter Class Feature.Class Feature.SpecialQuality.Class Feature						DESC:Starting at 7th level, you can add half your proficiency bonus (round up) to any Strength, Dexterity, or Constitution check you make that doesn't already use your proficiency bonus. In addition, when you make a running long jump, the distance you can cover increases by a number of feet equal to +%1.|STR																																																																																													BONUS:COMBAT|INITIATIVE|ceil(Proficiency_Bonus/2)										BONUS:VAR|SKILL_Athletics|ceil(Proficiency_Bonus/2)|TYPE=MISC|PREVARLT:SkillProf_Athletics,Proficiency_Bonus	BONUS:VAR|SKILL_Acrobatics|ceil(Proficiency_Bonus/2)|TYPE=MISC|PREVARLT:SkillProf_Acrobatics,Proficiency_Bonus	BONUS:VAR|SKILL_Sleight_of_Hand|ceil(Proficiency_Bonus/2)|TYPE=MISC|PREVARLT:SkillProf_Sleight_of_Hand,Proficiency_Bonus	BONUS:VAR|SKILL_Stealth|ceil(Proficiency_Bonus/2)|TYPE=MISC|PREVARLT:SkillProf_Stealth,Proficiency_Bonus									SOURCEPAGE:p.
 Additional Fighting Style	KEY:Champion Archetype ~ Additional Fighting Style	SORTKEY:Class			CATEGORY:Special Ability	TYPE:Archetype Ability.Fighter Class Feature.Class Feature.SpecialQuality.Class Feature						DESC:At 10th level, you can choose a second option from the Fighting Style class feature.																																																																																																																												BONUS:ABILITYPOOL|Fighting Style|1																																																																																																								SOURCEPAGE:p.
 Superior Critical			KEY:Champion Archetype ~ Superior Critical		SORTKEY:Class			CATEGORY:Special Ability	TYPE:Archetype Ability.Fighter Class Feature.Class Feature.SpecialQuality.Class Feature						DESC:Starting at 15th level, your weapon attacks score a critical hit on a roll of 18-20.																																																																																																																																																																																																																																	BONUS:WEAPONPROF=TYPE.Weapon|CRITRANGEADD|1	SOURCEPAGE:p.
 Survivor				KEY:Champion Archetype ~ Survivor				SORTKEY:Class			CATEGORY:Special Ability	TYPE:Archetype Ability.Fighter Class Feature.Class Feature.SpecialQuality.Class Feature						DESC:At 18th level, you attain the pinnacle of resilience in battle. At the start of each of your turns, you regain hit points equal to %1 if you have no more than half of your hit points left. You don't gain this benefit if you have 0 hit points.|5+CON																																																																																																																																																																																																													SOURCEPAGE:p.

data/5e/wizards_of_the_coast/srd5/srd5_profs_weapon.lst

@@ -4,43 +4,43 @@ SOURCELONG:System Reference Document 5.0	SOURCESHORT:SRD5	SOURCEWEB:http://dnd.w
 
 
 # Weapon Name		Type
-Club				TYPE:Simple.Monk
-Dagger			TYPE:Simple.Monk
-Greatclub			TYPE:Simple
-Handaxe			TYPE:Simple.Monk
-Javelin			TYPE:Simple.Monk
-Light Hammer		TYPE:Simple.Monk
-Mace				TYPE:Simple.Monk
-Quarterstaff		TYPE:Simple.Monk
-Sickle			TYPE:Simple.Monk
-Spear				TYPE:Simple.Monk
-Unarmed Strike		TYPE:Simple
-Unarmed Strike (Monk)	TYPE:Monk
-Crossbow (Light)		TYPE:Simple
-Dart				TYPE:Simple
-Shortbow			TYPE:Simple
-Sling				TYPE:Simple
+Club				TYPE:Weapon.Simple.Monk
+Dagger			TYPE:Weapon.Simple.Monk
+Greatclub			TYPE:Weapon.Simple
+Handaxe			TYPE:Weapon.Simple.Monk
+Javelin			TYPE:Weapon.Simple.Monk
+Light Hammer		TYPE:Weapon.Simple.Monk
+Mace				TYPE:Weapon.Simple.Monk
+Quarterstaff		TYPE:Weapon.Simple.Monk
+Sickle			TYPE:Weapon.Simple.Monk
+Spear				TYPE:Weapon.Simple.Monk
+Unarmed Strike		TYPE:Weapon.Simple
+Unarmed Strike (Monk)	TYPE:Weapon.Monk
+Crossbow (Light)		TYPE:Weapon.Simple
+Dart				TYPE:Weapon.Simple
+Shortbow			TYPE:Weapon.Simple
+Sling				TYPE:Weapon.Simple
 
-Battleaxe			TYPE:Martial
-Flail				TYPE:Martial
-Glaive			TYPE:Martial
-Greataxe			TYPE:Martial
-Greatsword			TYPE:Martial
-Halberd			TYPE:Martial
-Lance				TYPE:Martial
-Longsword			TYPE:Martial
-Maul				TYPE:Martial
-Morningstar			TYPE:Martial
-Pike				TYPE:Martial
-Rapier			TYPE:Martial
-Scimitar			TYPE:Martial
-Shortsword			TYPE:Martial.Monk
-Trident			TYPE:Martial
-War Pick			TYPE:Martial
-Warhammer			TYPE:Martial
-Whip				TYPE:Martial
-Blowgun			TYPE:Martial
-Crossbow (Hand)		TYPE:Martial
-Crossbow (Heavy)		TYPE:Martial
-Longbow			TYPE:Martial
-Net				TYPE:Martial
+Battleaxe			TYPE:Weapon.Martial
+Flail				TYPE:Weapon.Martial
+Glaive			TYPE:Weapon.Martial
+Greataxe			TYPE:Weapon.Martial
+Greatsword			TYPE:Weapon.Martial
+Halberd			TYPE:Weapon.Martial
+Lance				TYPE:Weapon.Martial
+Longsword			TYPE:Weapon.Martial
+Maul				TYPE:Weapon.Martial
+Morningstar			TYPE:Weapon.Martial
+Pike				TYPE:Weapon.Martial
+Rapier			TYPE:Weapon.Martial
+Scimitar			TYPE:Weapon.Martial
+Shortsword			TYPE:Weapon.Martial.Monk
+Trident			TYPE:Weapon.Martial
+War Pick			TYPE:Weapon.Martial
+Warhammer			TYPE:Weapon.Martial
+Whip				TYPE:Weapon.Martial
+Blowgun			TYPE:Weapon.Martial
+Crossbow (Hand)		TYPE:Weapon.Martial
+Crossbow (Heavy)		TYPE:Weapon.Martial
+Longbow			TYPE:Weapon.Martial
+Net				TYPE:Weapon.Martial