Changeset 9535

Timestamp:

04/26/08 04:06:08 (5 months ago)

Author:

bct

Message:

tictactoe: notify user of when won/lost

Files:

• branches/session_centric/src/tictactoe.py (modified) (15 diffs)

branches/session_centric/src/tictactoe.py

@@ -16 +16 @@
 
 class TicTacToeSession(stanza_session.StanzaSession):
+        # initiate a session
         def begin(self, rows = 3, cols = 3, role_s = 'x'):
                 self.rows = rows
@@ -21 +22 @@
 
                 self.role_s = role_s
+
+                self.strike = 3
 
                 if self.role_s == 'x':
@@ -69 +72 @@
                         self.cols = 3
 
+                # number in a row needed to win
                 if form.getField('strike'):
                         self.strike = int(form.getField('strike').getValues()[0])
@@ -104 +108 @@
 
                         self.our_turn()
-
-        def is_my_turn(self):
-                # XXX not great semantics
-                return self.received == self.ignore
 
         # just sent an invitation, expecting a reply
@@ -120 +120 @@
 
                 elif msg.getTag('decline', namespace=games_ns):
-                        self.XXX()
+                        # XXX notify the user
+
+                        # XXX end session
+                        pass
 
         # silently ignores any received messages
@@ -126 +129 @@
                 pass
 
+        def game_over(self, msg):
+                invite = msg.getTag('invite', namespace=games_ns)
+
+                # ignore messages unless they're renewing the game
+                if invite and invite.getAttr('type') == 'renew':
+                        self.invited(msg)
+
         def wait_for_move(self, msg):
                 turn = msg.getTag('turn', namespace=games_ns)
@@ -136 +146 @@
                 if id != self.next_move_id:
                         print 'unexpected move id, lost a move somewhere?'
-                        raise
+                        return
 
                 try:
                         self.board.mark(row, col, self.role_o)
                 except InvalidMove, e:
-                        print 'received invalid move'
+                        # received an invalid move, end the game.
+
+                        # XXX notify the user
+                        self.terminate('cheating')
                         return
 
@@ -154 +167 @@
                         self.our_turn()
 
+        def is_my_turn(self):
+                # XXX not great semantics
+                return self.received == self.ignore
+
         def our_turn(self):
                 # ignore messages until we've made our move
                 self.received = self.ignore
-                self.board.win.set_title(self.board.title + ': your turn')
+                self.board.set_title('your turn')
 
         def their_turn(self):
                 self.received = self.wait_for_move
-                self.board.win.set_title(self.board.title + ': their turn')
+                self.board.set_title('their turn')
 
         # called when the board receives input
@@ -174 +191 @@
 
                 # check win conditions
-                if self.board.check_for_strike(self.role_s, row, col,self.strike):
+                if self.board.check_for_strike(self.role_s, row, col, self.strike):
                         self.won()
                 elif self.board.full():
@@ -183 +200 @@
                         self.their_turn()
 
+        # sends a move message
         def send_move(self, row, column):
                 msg = xmpp.Message()
@@ -199 +217 @@
                 self.send(msg)
 
+        # sends a termination message and ends the game
+        def terminate(self, reason):
+                msg = xmpp.Message()
+
+                terminate = msg.NT.terminate
+                terminate.setNamespace(games_ns)
+                terminate.setAttr('reason', reason)
+
+                self.send(msg)
+
+                self.received = self.game_over
+
+        def won(self):
+                self.terminate('won')
+                self.board.won()
+
+        def lost(self):
+                self.terminate('lost')
+                self.board.lost()
+
+        def drawn(self):
+                self.terminate('draw')
+                self.board.drawn()
+
 class TicTacToeBoard:
+        def __init__(self, session, rows, cols):
+                self.session = session
+
+                self.state = 'None'
+
+                self.rows = rows
+                self.cols = cols
+
+                self.board = [ [None] * self.cols for r in xrange(self.rows) ]
+
+                self.setup_window()
+
         def check_for_strike(self, p, r, c, strike):
-                # up and down, left and right
+                # number in a row: up and down, left and right
                 tallyI = 0
                 tally_ = 0
 
-                # right triangles: L\ , F/
+                # number in a row: diagonal
+                # (imagine L or F as two sides of a right triangle: L\ or F/)
                 tallyL = 0
                 tallyF = 0
@@ -242 +297 @@
                 return False
 
-        def __init__(self, session, rows, cols):
-                self.session = session
-
-                self.rows = rows
-                self.cols = cols
-
-                self.board = [ [None] * self.cols for r in xrange(self.rows) ]
-
-                self.setup_window()
-
         # is the board full?
         def full(self):
@@ -264 +309 @@
                 self.win = gtk.Window()
 
-                self.title = 'tic-tac-toe with %s' % self.session.jid
-
-                self.win.set_title(self.title)
+                self.title_prefix = 'tic-tac-toe with %s' % self.session.jid
+                self.set_title()
+
                 self.win.set_app_paintable(True)
 
@@ -314 +359 @@
                                         self.draw_o(cr, i, j, row_height, col_width)
 
+                # XXX draw 'won', 'lost', 'draw'
+
         def draw_x(self, cr, row, col, row_height, col_width):
                 cr.set_source_rgb(0, 0, 0)
@@ -352 +399 @@
 
                 self.win.queue_draw()
+
+        def set_title(self, suffix = None):
+                str = self.title_prefix
+
+                if suffix:
+                        str += ': ' + suffix
+
+                self.win.set_title(str)
+
+        def won(self):
+                self.state = 'won'
+                self.set_title('you won!')
+                self.win.queue_draw()
+
+        def lost(self):
+                self.state = 'lost'
+                self.set_title('you lost.')
+                self.win.queue_draw()
+
+        def drawn(self):
+                self.state = 'drawn'
+                self.win.set_title(self.title_prefix + ': a draw.')
+                self.win.queue_draw()