projects
/
koperkapel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a3e6358
)
Fix enemy respawning. Slow rate a bit
author
Neil
<neil@dip.sun.ac.za>
Sat, 5 Mar 2016 21:07:08 +0000
(23:07 +0200)
committer
Neil
<neil@dip.sun.ac.za>
Sat, 5 Mar 2016 21:18:39 +0000
(23:18 +0200)
koperkapel/gamelib/enemy_generator.py
patch
|
blob
|
history
koperkapel/gamelib/level.py
patch
|
blob
|
history
koperkapel/levels/level1.json
patch
|
blob
|
history
koperkapel/levels/level2.json
patch
|
blob
|
history
diff --git
a/koperkapel/gamelib/enemy_generator.py
b/koperkapel/gamelib/enemy_generator.py
index eaf85d76eb633c9194ef8a08e7842b86979ffe6e..b5a1dd40969f363f9ab25dec2f1f6b1c0a6a8dbc 100644
(file)
--- a/
koperkapel/gamelib/enemy_generator.py
+++ b/
koperkapel/gamelib/enemy_generator.py
@@
-39,6
+39,8
@@
class EnemyGenerator(Actor):
def killed(self, enemy):
if enemy in self._made_enemies:
self._made_enemies.remove(enemy)
def killed(self, enemy):
if enemy in self._made_enemies:
self._made_enemies.remove(enemy)
+ # Delay next respawn so we don't flood the player with enemies
+ self._time_since_last_update = 0
def pause(self):
self.paused = True
def pause(self):
self.paused = True
diff --git
a/koperkapel/gamelib/level.py
b/koperkapel/gamelib/level.py
index aed4cccb880b88b48cd33ba33e6afe0abcba9663..34487af920d67e5ce59f97ddc5b8d0d1bb085fa2 100644
(file)
--- a/
koperkapel/gamelib/level.py
+++ b/
koperkapel/gamelib/level.py
@@
-101,6
+101,8
@@
class Level(object):
def remove_enemy(self, enemy):
self.enemies.remove(enemy)
def remove_enemy(self, enemy):
self.enemies.remove(enemy)
+ for generator in self.enemy_generators:
+ generator.killed(enemy)
def add_enemy(self, enemy, x, y):
"""Add an enemy to an empty floor space near x, y"""
def add_enemy(self, enemy, x, y):
"""Add an enemy to an empty floor space near x, y"""
diff --git
a/koperkapel/levels/level1.json
b/koperkapel/levels/level1.json
index 88c188a315ef1de3391cddc1ba35f7a0d98dbcb7..7ec08b52b4d24e6cebc67b0e72ba57f1d91a5350 100644
(file)
--- a/
koperkapel/levels/level1.json
+++ b/
koperkapel/levels/level1.json
@@
-4390,7
+4390,7
@@
{
"type": "roach",
"pos": [18, 8],
{
"type": "roach",
"pos": [18, 8],
- "rate":
1
.0,
+ "rate":
2
.0,
"max": 2
}
]
"max": 2
}
]
diff --git
a/koperkapel/levels/level2.json
b/koperkapel/levels/level2.json
index 99571fd75658e48bfeedb3b6bae06d1e07b82117..4f6dce755097ddebe3d96fb6c859edfa8e2cb1c5 100644
(file)
--- a/
koperkapel/levels/level2.json
+++ b/
koperkapel/levels/level2.json
@@
-7639,7
+7639,7
@@
{
"type": "roach",
"pos": [16, 9],
{
"type": "roach",
"pos": [16, 9],
- "rate":
1
.0,
+ "rate":
2
.0,
"max": 2
}
]
"max": 2
}
]