projects
/
koperkapel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ctpug.org.za:koperkapel
[koperkapel.git]
/
koperkapel
/
scenes
/
level.py
diff --git
a/koperkapel/scenes/level.py
b/koperkapel/scenes/level.py
index 9c96b8dfeafe44124a526f00c36f88df89598be3..c68ac6dc03731a70269e7d1a5e928ddbafd60531 100644
(file)
--- a/
koperkapel/scenes/level.py
+++ b/
koperkapel/scenes/level.py
@@
-98,7
+98,7
@@
class GameLevelScene(BaseLevelScene):
self._friends = self.actors.add_layer("friendly roaches", level=9)
self._items = self.actors.add_layer("items", level=9)
self._generators = self.actors.add_layer("enemy generators", level=8)
self._friends = self.actors.add_layer("friendly roaches", level=9)
self._items = self.actors.add_layer("items", level=9)
self._generators = self.actors.add_layer("enemy generators", level=8)
- self._enemies = self.actors.add_layer("enemies", level=
7
)
+ self._enemies = self.actors.add_layer("enemies", level=
11
)
self._vehicle = Vehicle.current(world)
self._mode = 'walk'
self._angle = 0 # up
self._vehicle = Vehicle.current(world)
self._mode = 'walk'
self._angle = 0 # up
@@
-365,8
+365,11
@@
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):
def on_key_down(self, key, mod, unicode):
x, y = self._player_pos
if key in (keys.DOWN, keys.UP, keys.LEFT, keys.RIGHT):
+ firing = (keys.X in self._held_keys)
self._held_keys.clear()
self._held_keys.add(key)
self._held_keys.clear()
self._held_keys.add(key)
+ if firing:
+ self._held_keys.add(keys.X)
# 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
# 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