Hack in multi-modal behaviour
authorNeil <neil@dip.sun.ac.za>
Tue, 13 May 2014 16:53:41 +0000 (18:53 +0200)
committerNeil <neil@dip.sun.ac.za>
Tue, 13 May 2014 16:53:41 +0000 (18:53 +0200)
naja/constants.py
naja/gameboard.py
naja/widgets/info_area.py
naja/widgets/robot.py

index 8506db011dfba64eb11d70fd62b06e01cb8e3469..b6fce4e9a7b897b302b932426231f57ca9f4596f 100644 (file)
@@ -52,3 +52,7 @@ BOARD_SIZE = (5 * TILE_SIZE[0], 5 * TILE_SIZE[1])
 BIT_SIZE = (5 * TILE_SIZE[0], (SCREEN[1] - 5 * TILE_SIZE[1]) // 2)
 INFO_SIZE = (SCREEN[0] - 5 * TILE_SIZE[0], SCREEN[1])
 PLAYER_SIZE = (64, 96)
+
+# Player States
+MOVE = 1
+ACT = 2
index de0bc1e3f31c5b4b196d41a9345747a065900595..33afc5de33c824d3f103ace4918dfd8da0a73b8e 100644 (file)
@@ -1,7 +1,8 @@
 from random import choice
 
 from naja.constants import(
-    BITS, DIRECTION_BITS, CONDITION_BITS, PLAYER_DEFAULTS)
+    BITS, DIRECTION_BITS, CONDITION_BITS, PLAYER_DEFAULTS,
+    MOVE, ACT)
 from naja.player import Player
 from naja import actions
 
@@ -19,6 +20,7 @@ class GameBoard(object):
         self.locations = [item.copy() for item in state['locations']]
         self.player = player
         self.board_locations = board_locations
+        self.player_mode = MOVE
 
     @classmethod
     def new_game(cls, locations_definition,
@@ -88,6 +90,15 @@ class GameBoard(object):
         self.health -= 1
         # TODO: Check win/lose
 
+    def change_mode(self):
+        """Advance to the next mode"""
+        if self.player_mode == MOVE:
+            self.player_mode = ACT
+        elif self.player_mode == ACT:
+            self.player_mode = MOVE
+        else:
+            raise RuntimeError("Illegal player mode %s" % self.player_mode)
+
 
 class LocationCard(object):
     """
index 906e9d57d39d850e254f4e32bfb1e0c1f918d211..2a4d06b69e2ca5082ccd2508f4f27bcb7461212d 100644 (file)
@@ -2,14 +2,28 @@
 Widget for the game board information area.
 """
 import pygame
+import pygame.locals as pgl
 
-from naja.constants import INFO_SIZE, EIGHT_BIT_SCALE
+from naja.constants import INFO_SIZE, EIGHT_BIT_SCALE, MOVE, ACT
+from naja.events import InvalidateTheWorld
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
 
 from naja.widgets.base import Widget
 from naja.widgets.tile import BIT_MAP
-from naja.widgets.text import TextBoxWidget
+from naja.widgets.text import TextBoxWidget, TextWidget
+
+
+HINTS = {
+        MOVE: "Move using the arrow keys.\nPress SPACE to stay in place",
+        ACT: "Choose an action using the Up/Down keys.\n"
+             "Press Return to execute the action.",
+        }
+
+TITLES = {
+        MOVE: "Move the Robot",
+        ACT: "Choose an Action",
+        }
 
 
 class InfoAreaWidget(Widget):
@@ -20,6 +34,7 @@ class InfoAreaWidget(Widget):
         super(InfoAreaWidget, self).__init__(pos, INFO_SIZE)
         self.card = None
         self.state = state
+        self.chosen = 0
 
     def prepare(self):
         self.surface = pygame.surface.Surface(INFO_SIZE)
@@ -27,8 +42,11 @@ class InfoAreaWidget(Widget):
         # Quick hack for testing
         self.card = self.state.board_locations[self.state.player.position]
         # Extract actions and such from the card
-        y_offset = 0
-        for action in self.card.actions:
+        title = TextWidget((0, 0), TITLES[self.state.gameboard.player_mode],
+                           colour=(255, 255, 255))
+        title.render(self.surface)
+        y_offset = title.surface.get_rect().height + 8
+        for choice, action in enumerate(self.card.actions):
             if action.required_bits:
                 img_name = BIT_MAP[action.required_bits].replace('.png', '_small.png')
                 img = resources.get_image(img_name,
@@ -36,14 +54,48 @@ class InfoAreaWidget(Widget):
                 self.surface.blit(img, (0, y_offset))
                 y_offset += 8
             text = TextBoxWidget((12, y_offset), action.TEXT,
-                                 box_width= (INFO_SIZE[0] - 12) // EIGHT_BIT_SCALE,
-                                 fontsize = 28, padding = 4)
+                                 box_width=(INFO_SIZE[0] - 12) // EIGHT_BIT_SCALE,
+                                 fontsize=28)
             text.render(self.surface)
+            if choice == self.chosen:
+                colour = (255, 255, 0, 128)
+                bottom = y_offset + text.surface.get_rect().height
+                right = text.surface.get_rect().width + 12
+                pygame.draw.lines(self.surface, colour, True,
+                                  [(12, y_offset), (right, y_offset),
+                                   (right, bottom), (12, bottom)], 4)
             y_offset += text.surface.get_rect().height + 16
-
+        # We cheat horribly for layout reasons
+        hint = TextBoxWidget((0, 0), HINTS[self.state.gameboard.player_mode],
+                             box_width = INFO_SIZE[0] // EIGHT_BIT_SCALE)
+        hint.prepare()
+        y_offset = INFO_SIZE[1] - hint.surface.get_rect().height
+        self.surface.blit(hint.surface, (0, y_offset))
 
     def set_card(self, card):
         self.card = card
 
     def draw(self, surface):
         surface.blit(self.surface, self.pos)
+
+    def handle_event(self, ev):
+        if self.state.gameboard.player_mode == MOVE:
+            return super(InfoAreaWidget, self).handle_event(ev)
+        if ev.type == pgl.KEYDOWN:
+            if ev.key in (pgl.K_RETURN, pgl.K_KP_ENTER):
+                self.state.gameboard.change_mode()
+                # FIXME: also need to signal the correct action
+                # here
+                InvalidateTheWorld.post()
+                return True
+            if ev.key in (pgl.K_UP, pgl.K_w):
+                if self.chosen > 0:
+                    self.chosen -= 1
+                    InvalidateTheWorld.post()
+                    return True
+            if ev.key in (pgl.K_DOWN, pgl.K_s):
+                if self.chosen + 1 < len(self.card.actions):
+                    self.chosen += 1
+                    InvalidateTheWorld.post()
+                    return True
+        return super(InfoAreaWidget, self).handle_event(ev)
index b6e219bd0305a68a090f149b5b6301178aa95da5..3518cb0bb8b41253ad89901221ed55cd386602c8 100644 (file)
@@ -2,7 +2,7 @@
 
 import pygame.locals as pgl
 
-from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS
+from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS, ACT
 from naja.events import InvalidateTheWorld
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
@@ -39,21 +39,31 @@ class RobotWidget(Widget):
         surface.blit(self.surface, self.rect)
 
     def handle_event(self, ev):
+        if self.state.gameboard.player_mode == ACT:
+            return super(RobotWidget, self).handle_event(ev)
         if ev.type == pgl.KEYDOWN:
             if ev.key in (pgl.K_UP, pgl.K_w):
                 if self.state.player.move(BITS.NORTH):
+                    self.state.gameboard.change_mode()
                     InvalidateTheWorld.post()
                     return True
             if ev.key in (pgl.K_DOWN, pgl.K_s):
                 if self.state.player.move(BITS.SOUTH):
+                    self.state.gameboard.change_mode()
                     InvalidateTheWorld.post()
                     return True
             if ev.key in (pgl.K_LEFT, pgl.K_a):
                 if self.state.player.move(BITS.WEST):
+                    self.state.gameboard.change_mode()
                     InvalidateTheWorld.post()
                     return True
             if ev.key in (pgl.K_RIGHT, pgl.K_d):
                 if self.state.player.move(BITS.EAST):
+                    self.state.gameboard.change_mode()
                     InvalidateTheWorld.post()
                     return True
-        super(RobotWidget, self).handle_event(ev)
+            if ev.key in (pgl.K_SPACE,):
+                self.state.gameboard.change_mode()
+                InvalidateTheWorld.post()
+                return True
+        return super(RobotWidget, self).handle_event(ev)