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

Success After X

Browse Source 
added a prefrence for the user to select what are counted as successes

closes #37

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
Ricky Barrette
2012-05-04 11:52:48 -04:00
parent 55484786ec
commit 64921d7304
5 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,5 +37,8 @@
<string name="game_mode">Game Mode</string> <string name="game_mode">Game Mode</string>
<string name="ones_subtract">Ones Subtract</string> <string name="ones_subtract">Ones Subtract</string>
<string name="ones_subtract_msg">Ones count as -1 to your successes</string> <string name="ones_subtract_msg">Ones count as -1 to your successes</string>
<string name="success_after">Success After</string>
<string name="success_after_msg">Choose what are counted as successes, starting at the selected value.</string>
<string name="seven">7</string>
</resources> </resources>

16
ExaltedDice/res/values/successes.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="success_after">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
<item>9</item>
</string-array>
</resources>

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

@@ -25,6 +25,14 @@
android:summary="@string/ones_subtract_msg" android:summary="@string/ones_subtract_msg"
android:title="@string/ones_subtract" /> android:title="@string/ones_subtract" />
<ListPreference
android:defaultValue="7"
android:entries="@array/success_after"
android:entryValues="@array/success_after"
android:key="success_after"
android:summary="@string/success_after_msg"
android:title="@string/success_after" />
<PreferenceCategory android:title="@string/contact_us" > <PreferenceCategory android:title="@string/contact_us" >
<Preference <Preference
android:key="email" android:key="email"

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

@@ -584,7 +584,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
Log.i(TAG, "successes()"); Log.i(TAG, "successes()");
int intSuccesses = 0; int intSuccesses = 0;
for (int i = 0; i < roll.length; i++) { for (int i = 0; i < roll.length; i++) {
if (roll[i] >= 7) if (roll[i] >= Integer.parseInt(mSettings.getString(Settings.KEY_SUCCESS_AFTER, "7")))
intSuccesses++; intSuccesses++;
if(mSettings.getBoolean(Settings.KEY_TENS_COUNT_TWICE, true)) if(mSettings.getBoolean(Settings.KEY_TENS_COUNT_TWICE, true))
if (roll[i] == 10) if (roll[i] == 10)
@@ -592,8 +592,6 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
if(mSettings.getBoolean(Settings.KEY_ONES_SUBRACT, false)) if(mSettings.getBoolean(Settings.KEY_ONES_SUBRACT, false))
if (roll[i] == 1) if (roll[i] == 1)
intSuccesses--; intSuccesses--;
} }
return intSuccesses; return intSuccesses;
} }

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

@@ -34,7 +34,7 @@ public class Settings extends PreferenceActivity implements OnPreferenceClickLis
public static final String KEY_TENS_COUNT_TWICE = "tens_count_twice"; public static final String KEY_TENS_COUNT_TWICE = "tens_count_twice";
public static final String KEY_COLOR = "color"; public static final String KEY_COLOR = "color";
public static final String KEY_ONES_SUBRACT = "ones_subtract"; public static final String KEY_ONES_SUBRACT = "ones_subtract";
// public static final String KEY_ = ""; public static final String KEY_SUCCESS_AFTER = "success_after";
// public static final String KEY_ = ""; // public static final String KEY_ = "";
// public static final String KEY_ = ""; // public static final String KEY_ = "";