From 36c8ea6cc763c895e91301fd396dbb32eb27344d Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Mon, 3 Mar 2014 20:19:07 -0700
Subject: [PATCH] 30s penalties (2014 ruleset)

---
 AndroidManifest.xml                           | 4 ++--
 Makefile                                      | 2 +-
 src/org/woozle/penaltytimer/JammerButton.java | 6 +++---
 src/org/woozle/penaltytimer/TimerButton.java  | 5 ++++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c586f01..3c43414 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.woozle.penaltytimer"
-      android:versionCode="6"
-      android:versionName="1.3">
+      android:versionCode="8"
+      android:versionName="1.5">
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4" />
     <uses-permission android:name="android.permission.VIBRATE"/>
     <application android:label="@string/app_name" android:description="@string/description" android:icon="@drawable/ic_launcher">
diff --git a/Makefile b/Makefile
index b220cb2..3f50a37 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SDK = /opt/android-sdk
 
 ZIPALIGN = $(SDK)/tools/zipalign
 
-default: release-install
+default: debug-install
 
 install: debug-install
 debug-install: bin/PenaltyTimer-debug.apk
diff --git a/src/org/woozle/penaltytimer/JammerButton.java b/src/org/woozle/penaltytimer/JammerButton.java
index f7ad942..126f5ca 100644
--- a/src/org/woozle/penaltytimer/JammerButton.java
+++ b/src/org/woozle/penaltytimer/JammerButton.java
@@ -32,11 +32,11 @@ public class JammerButton extends TimerButton
             penalized = true;
 
             if (peer.penalized) {
-                // 7.4.1 -- Add a minute
+                // 6.4.1 -- Add penaltyTime
             } else {
-                // 7.4 -- Take a minute away from the other side
+                // 6.4 -- Take penaltyTime away from the other side
                 // if it goes negative, that's our time.
-                long orem = peer.remaining() - 60000;
+                long orem = peer.remaining() - (penaltyTime * 1000);
 
                 if (orem < 0) {
                     set(-orem);
diff --git a/src/org/woozle/penaltytimer/TimerButton.java b/src/org/woozle/penaltytimer/TimerButton.java
index 0d5a068..52c8fa3 100644
--- a/src/org/woozle/penaltytimer/TimerButton.java
+++ b/src/org/woozle/penaltytimer/TimerButton.java
@@ -15,6 +15,9 @@ import java.util.*;
 public class TimerButton
     implements OnClickListener, OnLongClickListener
 {
+	final int penaltyTime = 30;
+	final int maxPenalties = 7;
+
     Button b;
     Timer      updateTimer;
     public long startTime = 0;
@@ -134,7 +137,7 @@ public class TimerButton
     }
 
     public void onClick(View v) {
-        set((remaining() + 60000) % (60 * 8 * 1000));
+        set((remaining() + penaltyTime * 1000) % (penaltyTime * (maxPenalties + 1) * 1000));
         start();
     }