X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fscenes%2Flevel.py;h=0cde6515992a4dd49717719a38d7e14c54bd8da8;hb=e5e352ddf3eba667d40a015f646eaaae95015077;hp=a1515997dc48d470044925e0193495cc904d4add;hpb=359505e8ab4874f750103bcdc6222207bf52722a;p=koperkapel.git

diff --git a/koperkapel/scenes/level.py b/koperkapel/scenes/level.py
index a151599..0cde651 100644
--- a/koperkapel/scenes/level.py
+++ b/koperkapel/scenes/level.py
@@ -4,7 +4,8 @@ from pgzero.constants import keys
 from pygame import Surface
 import pygame.locals as pgl
 from ..loaders.levelloader import levels
-from .base import Scene, ChangeSceneEvent, MoveViewportEvent, WorldEvent, defer_to_update
+from .base import (
+    Scene, ChangeSceneEvent, MoveViewportEvent, WorldEvent, defer_to_update)
 from ..constants import TILE_SIZE, WIDTH, HEIGHT
 from ..roaches import build_roach
 from ..vehicles.base import Vehicle
@@ -84,6 +85,7 @@ class BaseLevelScene(Scene):
 class GameLevelScene(BaseLevelScene):
 
     def enter(self, world):
+        self._held_keys = set()
         if self._level is not None:
             for generator in self._generators:
                 generator.unpause()
@@ -100,6 +102,8 @@ class GameLevelScene(BaseLevelScene):
         self._init_items()
         self._init_friendly_roaches()
         self._init_generators()
+        self._key_rate = 0.2
+        self._last_key_down = 0
         return self._init_roaches(world)
 
     def _init_items(self):
@@ -112,8 +116,9 @@ class GameLevelScene(BaseLevelScene):
 
     def exit(self, world):
         for generator in self._generators:
-            # We don't want these running while we're on other levels, but we don't want to delete them
-            # here either (because of the vehicle management view)
+            # We don't want these running while we're on other levels, but we
+            # don't want to delete them here either (because of the vehicle
+            # management view)
             generator.pause()
 
     def _init_generators(self):
@@ -179,9 +184,20 @@ class GameLevelScene(BaseLevelScene):
         for item in self._items:
             item.pos = self.calc_offset(
                 item.game_pos[0] * TILE_SIZE, item.game_pos[1] * TILE_SIZE)
+        more = self._check_held_keys(dt)
+        if more:
+            events.extend(more)
         return events
 
-    def _movement_key(self, key):
+    def _check_held_keys(self, dt):
+        for key in self._held_keys:
+            self._last_key_down += dt
+            if key in (keys.DOWN, keys.UP, keys.LEFT, keys.RIGHT):
+                return self._movement_key(key, dt)
+            elif key == keys.X:
+                return self._fire_key(dt)
+
+    def _movement_key(self, key, dt):
         x, y = self._player_pos
         for k, dp, angle in (
             (keys.DOWN, (0, 1), 180),
@@ -190,12 +206,18 @@ class GameLevelScene(BaseLevelScene):
             (keys.RIGHT, (1, 0), -90),
         ):
             if key == k:
-                nx, ny = x + dp[0], y + dp[1]
-                if self._can_move(nx, ny):
-                    self._set_pos(nx, ny)
-                    offset = (TILE_SIZE * dp[0], TILE_SIZE * dp[1])
+                if (self._angle == angle and
+                        self._last_key_down > self._key_rate):
+                    nx, ny = x + dp[0], y + dp[1]
+                    if self._can_move(nx, ny):
+                        self._set_pos(nx, ny)
+                        offset = (TILE_SIZE * dp[0], TILE_SIZE * dp[1])
+                        self._set_angle(angle)
+                        self._last_key_down = 0
+                        return [MoveViewportEvent(offset)]
+                else:
+                    # just turn
                     self._set_angle(angle)
-                    return [MoveViewportEvent(offset)]
 
     def _activate_key(self):
         x, y = self._player_pos
@@ -211,16 +233,25 @@ class GameLevelScene(BaseLevelScene):
                 self._mode = 'walk'
         elif self._level.is_keypad(x, y):
             self._level.press_keypad(x, y, self._roaches)
-        elif self._level.is_on_friend(x, y):
-            friend = self._level.remove_friend(x, y)
+        elif self._level.friend_at(x, y):
+            friend = self._level.friend_at(x, y)
+            self._level.remove_friend(friend)
             self._friends.remove(friend)
             self._add_roach()
+        elif self._level.item_at(x, y):
+            item = self._level.item_at(x, y)
+            self._level.remove_item(item)
+            self._items.remove(item)
         elif self._level.is_exit(x, y):
             next_level = self._level.get_exit_level()
-            return [WorldEvent('set', {'level.name': next_level}), ChangeSceneEvent(GameLevelScene())]
+            return [
+                WorldEvent('set', {'level.name': next_level}),
+                ChangeSceneEvent(GameLevelScene())]
 
-    def _fire_key(self):
-        print('Boom')
+    def _fire_key(self, dt):
+        if self._last_key_down > self._key_rate:
+            self._last_key_down = 0
+            print('Boom')
 
     def _vehicle_management_key(self):
         from .roach_management import RoachesScene
@@ -229,13 +260,25 @@ class GameLevelScene(BaseLevelScene):
     def on_key_down(self, key, mod, unicode):
         x, y = self._player_pos
         if key in (keys.DOWN, keys.UP, keys.LEFT, keys.RIGHT):
-            return self._movement_key(key)
+            self._held_keys.clear()
+            self._held_keys.add(key)
+            # We do this so pressing the key has an instant effect, and can
+            # then be held
+            self._last_key_down = self._key_rate + 0.01
+            return self._movement_key(key, 0.01)
         elif key == keys.C:
             return self._activate_key()
         elif key == keys.X:
-            return self._fire_key()
+            self._held_keys.clear()
+            self._held_keys.add(key)
+            self._last_key_down = self._key_rate + 0.01
+            return self._fire_key(0.01)
         elif key == keys.V:
             return self._change_vehicle()
         elif key == keys.Z:
             return self._vehicle_management_key()
         return super(GameLevelScene, self).on_key_down(key, mod, unicode)
+
+    def on_key_up(self, key, mode):
+        self._held_keys.discard(key)
+        self._last_key_down = 0