From: <pj...@us...> - 2007-03-24 07:23:50
|
Revision: 2572 http://svn.sourceforge.net/pcgen/?rev=2572&view=rev Author: pjdb Date: 2007-03-24 00:23:49 -0700 (Sat, 24 Mar 2007) Log Message: ----------- 1687262: Add support for "Average, Rounded Up" dice rolling Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/Constants.java Trunk/pcgen/code/src/java/pcgen/core/Globals.java Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties Modified: Trunk/pcgen/code/src/java/pcgen/core/Constants.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Constants.java 2007-03-24 02:31:15 UTC (rev 2571) +++ Trunk/pcgen/code/src/java/pcgen/core/Constants.java 2007-03-24 07:23:49 UTC (rev 2572) @@ -228,6 +228,8 @@ int HP_STANDARD = 0; /** 4 */ int HP_USERROLLED = 4; + /** 5 */ + int HP_AVERAGE_ROUNDED_UP = 5; /** 9999 */ int INVALID_LEVEL = 9999; Modified: Trunk/pcgen/code/src/java/pcgen/core/Globals.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2007-03-24 02:31:15 UTC (rev 2571) +++ Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2007-03-24 07:23:49 UTC (rev 2572) @@ -2599,6 +2599,11 @@ break; + case Constants.HP_AVERAGE_ROUNDED_UP: + roll = (int)Math.ceil((min + max)/2.0); + + break; + case Constants.HP_STANDARD:default: roll = Math.abs(Globals.getRandomInt(max - min + 1)) + min; Modified: Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java 2007-03-24 02:31:15 UTC (rev 2571) +++ Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java 2007-03-24 07:23:49 UTC (rev 2572) @@ -431,6 +431,8 @@ new JRadioButton(PropertyFactory.getString("in_Prefs_hpStandard")); private JRadioButton hpUserRolled = new JRadioButton(PropertyFactory.getString("in_Prefs_hpUserRolled")); + private JRadioButton hpAverageRoundedUp = + new JRadioButton(PropertyFactory.getString("in_Prefs_hpAverageRoundedUp")); // Language private JRadioButton langEng; @@ -671,6 +673,10 @@ { SettingsHandler.setHPRollMethod(Constants.HP_USERROLLED); } + else if (hpAverageRoundedUp.isSelected()) + { + SettingsHandler.setHPRollMethod(Constants.HP_AVERAGE_ROUNDED_UP); + } SettingsHandler.setHPPct(hpPct.getValue()); SettingsHandler.setHPMaxAtFirstLevel(maxHpAtFirstLevel.isSelected()); @@ -1210,6 +1216,11 @@ break; + case Constants.HP_AVERAGE_ROUNDED_UP: + hpAverageRoundedUp.setSelected(true); + + break; + case Constants.HP_STANDARD: //No break default: @@ -2035,6 +2046,11 @@ gridbag.setConstraints(hpPct, c); hitPointsPanel.add(hpPct); + Utility.buildConstraints(c, 1, iRow++, 2, 1, 0, 0); + gridbag.setConstraints(hpAverageRoundedUp, c); + hitPointsPanel.add(hpAverageRoundedUp); + exclusiveGroup.add(hpAverageRoundedUp); + Utility.buildConstraints(c, 0, iRow, 2, 1, 0, 0); label = new JLabel(PropertyFactory.getString("in_Prefs_hpMaxAtFirst") Modified: Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties 2007-03-24 02:31:15 UTC (rev 2571) +++ Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties 2007-03-24 07:23:49 UTC (rev 2572) @@ -2817,6 +2817,8 @@ in_Prefs_hpMaxAtFirst=Maximum HP at First Level +in_Prefs_hpAverageRoundedUp=Average, Rounded Up + in_Prefs_houseRules=House Rules in_Prefs_hrCrossSkillCost=Cross-class Skill Cost (deprecated use SKILLCOST_CROSSCLASS tag in game mode's miscinfo file) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |