From 37636974499803423dfad390a226f833d6389abd Mon Sep 17 00:00:00 2001
From: Leah Alpert <lalpert@mit.edu>
Date: Fri, 26 Aug 2011 14:22:53 -0700
Subject: modified ddrinput to use asdw for payer 0 in debug mode. Changed
 spacing of rendered. Added new tetris file that uses pygame instead of
 tkinter.

---
 ddrinput.py | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'ddrinput.py')

diff --git a/ddrinput.py b/ddrinput.py
index 71dbfd3..92bc123 100644
--- a/ddrinput.py
+++ b/ddrinput.py
@@ -7,7 +7,12 @@ Y = 1
 KEY_LEFT = 276
 KEY_UP = 273
 KEY_DOWN = 274
-KEY_RIGHT = 275 
+KEY_RIGHT = 275
+KEY_A = 97
+KEY_S = 115
+KEY_D = 100
+KEY_W = 119
+
 DIRECTIONS = {0:'LEFT', 1:'RIGHT',  2:'UP', 3:'DOWN'}
 class DdrInput(object):
   """
@@ -18,7 +23,7 @@ class DdrInput(object):
 
 
   DEBUG MODE:
-    Use the arrow keys.  Hold down a modifier (alt, control, etc.) to get player 2
+    Use the arrow keys for player 1, asdw for player 0.
   """
   def __init__(self, debug_mode=True):
     """
@@ -69,14 +74,30 @@ class DdrInput(object):
     if self.debug_mode:
       if event.type == KEY_EVENT:
         if event.key == KEY_LEFT:
+          player_index = 1
           player_move = LEFT
         elif event.key == KEY_RIGHT:
+          player_index = 1
           player_move = RIGHT
         elif event.key == KEY_DOWN:
+          player_index = 1
           player_move = DOWN
         elif event.key == KEY_UP:
+          player_index = 1
+          player_move = UP
+        elif event.key == KEY_A:
+          player_index = 0
+          player_move = LEFT
+        elif event.key == KEY_D:
+          player_index = 0
+          player_move = RIGHT
+        elif event.key == KEY_S:
+          player_index = 0
+          player_move = DOWN
+        elif event.key == KEY_W:
+          player_index = 0
           player_move = UP
-        player_index = event.mod == 0
+       
         if player_move != None:
           return (player_index, player_move)
         else:
-- 
cgit v1.2.3