From 55484786ecf09841ed0a08c25c2ae4d8f80b07c4 Mon Sep 17 00:00:00 2001
From: Ricky Barrette <rickbarrette@gmail.com>
Date: Fri, 4 May 2012 11:22:48 -0400
Subject: [PATCH] Ones Subtract

added the option for the user to enable one subtract

closes #35

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
---
 ExaltedDice/res/values/strings.xml                           | 2 ++
 ExaltedDice/res/xml/settings.xml                             | 4 ++++
 .../src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java  | 5 +++++
 .../src/com/TwentyCode/android/ExaltedDice/Settings.java     | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ExaltedDice/res/values/strings.xml b/ExaltedDice/res/values/strings.xml
index 4885ef3..c57d1bd 100755
--- a/ExaltedDice/res/values/strings.xml
+++ b/ExaltedDice/res/values/strings.xml
@@ -35,5 +35,7 @@
     <string name="higlight_color">Highlight Color</string>
     <string name="higlight_color_msg">Highlights your last roll in a custom color</string>
     <string name="game_mode">Game Mode</string>
+    <string name="ones_subtract">Ones Subtract</string>
+    <string name="ones_subtract_msg">Ones count as -1 to your successes</string>
 
 </resources>
\ No newline at end of file
diff --git a/ExaltedDice/res/xml/settings.xml b/ExaltedDice/res/xml/settings.xml
index d04d0c4..078867e 100644
--- a/ExaltedDice/res/xml/settings.xml
+++ b/ExaltedDice/res/xml/settings.xml
@@ -20,6 +20,10 @@
         android:key="tens_count_twice"
         android:summary="@string/tens_count_twice_msg"
         android:title="@string/tens_count_twice" />
+    <CheckBoxPreference
+        android:key="ones_subtract"
+        android:summary="@string/ones_subtract_msg"
+        android:title="@string/ones_subtract" />
 
     <PreferenceCategory android:title="@string/contact_us" >
         <Preference
diff --git a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java
index 742f60a..ae31911 100755
--- a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java
+++ b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java
@@ -589,6 +589,11 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
 			if(mSettings.getBoolean(Settings.KEY_TENS_COUNT_TWICE, true))
 				if (roll[i] == 10)
 					intSuccesses++;
+			if(mSettings.getBoolean(Settings.KEY_ONES_SUBRACT, false))
+				if (roll[i] == 1)
+					intSuccesses--;
+			
+			
 		}
 		return intSuccesses;
 	}
diff --git a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java
index afde372..b2d4d17 100644
--- a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java
+++ b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java
@@ -33,7 +33,7 @@ public class Settings extends PreferenceActivity implements OnPreferenceClickLis
 	public static final String KEY_ROLL_AGAIN = "roll_again";
 	public static final String KEY_TENS_COUNT_TWICE = "tens_count_twice";
 	public static final String KEY_COLOR = "color";
-//	public static final String KEY_ = "";
+	public static final String KEY_ONES_SUBRACT = "ones_subtract";
 //	public static final String KEY_ = "";
 //	public static final String KEY_ = "";
 //	public static final String KEY_ = "";