ricky/exalted_dice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added New Settings

Browse Source 
Added modifier option

added success option: tens count twice

Change-Id: Ia978daee5fe86a8f167d0bfc32458f844bb255bd
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
Ricky Barrette
2012-02-09 09:08:56 -05:00
parent 115cca1cad
commit 6dbd1274b3
4 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ExaltedDice/res/values/strings.xml
View File

@@ -27,5 +27,10 @@
<string name="calc_successes">Calculate Successes</string> <string name="calc_successes">Calculate Successes</string>
<string name="calc_successes_summary">Calculates the total amount of success for each roll</string> <string name="calc_successes_summary">Calculates the total amount of success for each roll</string>
<string name="total_plus_mod">\nTotal + Mod: </string> <string name="total_plus_mod">\nTotal + Mod: </string>
<string name="tens_count_twice_msg">10 counts as two successes</string>
<string name="successes">Successes</string>
<string name="tens_count_twice">Tens count twice</string>
<string name="roll_mod">Roll Modifier</string>
<string name="roll_mod_msg">Calculate Roll + Modifier</string>
</resources> </resources>

15
ExaltedDice/res/xml/settings.xml
View File

@@ -6,10 +6,25 @@
android:key="roll_again" android:key="roll_again"
android:summary="@string/roll_again_summary" android:summary="@string/roll_again_summary"
android:title="@string/roll_again" /> android:title="@string/roll_again" />
<CheckBoxPreference
android:defaultValue="true"
android:key="roll_mod"
android:summary="@string/roll_mod_msg"
android:title="@string/roll_mod" />
<PreferenceCategory android:title="@string/successes" >
</PreferenceCategory>
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="calc_successes" android:key="calc_successes"
android:title="@string/calc_successes" /> android:title="@string/calc_successes" />
<CheckBoxPreference
android:defaultValue="true"
android:dependency="calc_successes"
android:key="tens_count_twice"
android:summary="@string/tens_count_twice_msg"
android:title="@string/tens_count_twice" />
<PreferenceCategory android:title="@string/contact_us" > <PreferenceCategory android:title="@string/contact_us" >
<Preference <Preference

17
ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java
View File

@@ -66,7 +66,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
mDPicker.setValue(parseD(roll.getAsString(Database.KEY_D_TYPE))); mDPicker.setValue(parseD(roll.getAsString(Database.KEY_D_TYPE)));
mModPicker.setValue(parseMod(roll.getAsString(Database.KEY_MOD).replace("'", ""))); mModPicker.setValue(parseMod(roll.getAsString(Database.KEY_MOD).replace("'", "")));
} catch(NullPointerException e){ } catch(NullPointerException e){
mModPicker.setValue(parseMod("0")); mModPicker.setValue(parseMod("+0"));
} }
} }
@@ -258,6 +258,13 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
protected void onResume() { protected void onResume() {
refresh(); refresh();
applyRollPresets(mDb.getGameRollCount(mGameId)); applyRollPresets(mDb.getGameRollCount(mGameId));
if(mSettings.getBoolean(Settings.KEY_ROLL_MOD, true)){
mModPicker.setVisibility(View.VISIBLE);
} else {
mModPicker.setVisibility(View.GONE);
mModPicker.setValue(parseMod("+0"));
}
super.onResume(); super.onResume();
} }
@@ -366,7 +373,8 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
resultsString.append(getString(R.string.total)+ total); resultsString.append(getString(R.string.total)+ total);
resultsString.append(getString(R.string.total_plus_mod)+ (total + Integer.parseInt(mModValues[mModPicker.getValue()].replace("+", "")))); if(mSettings.getBoolean(Settings.KEY_ROLL_MOD, true))
resultsString.append(getString(R.string.total_plus_mod)+ (total + Integer.parseInt(mModValues[mModPicker.getValue()].replace("+", ""))));
if(mSettings.getBoolean(Settings.KEY_CALC_SUCCESSES, true)) if(mSettings.getBoolean(Settings.KEY_CALC_SUCCESSES, true))
resultsString.append(getString(R.string.sucesses)+ successes(roll)); resultsString.append(getString(R.string.sucesses)+ successes(roll));
@@ -436,8 +444,9 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
for (int i = 0; i < roll.length; i++) { for (int i = 0; i < roll.length; i++) {
if (roll[i] >= 7) if (roll[i] >= 7)
intSuccesses++; intSuccesses++;
if (roll[i] == 10) if(mSettings.getBoolean(Settings.KEY_TENS_COUNT_TWICE, true))
intSuccesses++; if (roll[i] == 10)
intSuccesses++;
} }
return intSuccesses; return intSuccesses;
} }

4
ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java
View File

@@ -32,8 +32,8 @@ public class Settings extends PreferenceActivity implements OnPreferenceClickLis
public static final String KEY_ROLL_AGAIN = "roll_again"; public static final String KEY_ROLL_AGAIN = "roll_again";
public static final String KEY_CALC_SUCCESSES = "calc_successes"; public static final String KEY_CALC_SUCCESSES = "calc_successes";
// public static final String KEY_ = ""; public static final String KEY_TENS_COUNT_TWICE = "tens_count_twice";
// public static final String KEY_ = ""; public static final String KEY_ROLL_MOD = "roll_mod";
// public static final String KEY_ = ""; // public static final String KEY_ = "";
// public static final String KEY_ = ""; // public static final String KEY_ = "";
// public static final String KEY_ = ""; // public static final String KEY_ = "";