home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor thing addition / removal.
[plomrogue2]
/
plomrogue
/
things.py
diff --git
a/plomrogue/things.py
b/plomrogue/things.py
index 23f66ad4a5bb25b5fe297554992116a338879556..e1a9bd3a2d18b0d8b1b64943b6f055dfd11508e6 100644
(file)
--- a/
plomrogue/things.py
+++ b/
plomrogue/things.py
@@
-96,11
+96,8
@@
class ThingSpawner(Thing):
for t in [t for t in self.game.things
if t != self and t.position == self.position]:
return
for t in [t for t in self.game.things
if t != self and t.position == self.position]:
return
- t = self.game.thing_types[self.child_type](self.game,
- position=self.position)
- self.game.things += [t]
+ self.game.add_thing(self.child_type, self.position)
self.game.changed = True
self.game.changed = True
- self.game.changed_fovs = True
@@
-302,8
+299,7
@@
class Thing_BottleDeposit(Thing):
if self.bottle_counter >= 3:
self.bottle_counter = 0
choice = random.choice(['MusicPlayer', 'Hat'])
if self.bottle_counter >= 3:
self.bottle_counter = 0
choice = random.choice(['MusicPlayer', 'Hat'])
- t = self.game.thing_types[choice](self.game, position=self.position)
- self.game.things += [t]
+ self.game.add_thing(choice, self.position)
msg = 'here is a gift as a reward for ecological consciousness –'
if choice == 'MusicPlayer':
msg += 'pick it up and then use "command thing" on it!'
msg = 'here is a gift as a reward for ecological consciousness –'
if choice == 'MusicPlayer':
msg += 'pick it up and then use "command thing" on it!'
@@
-311,7
+307,6
@@
class Thing_BottleDeposit(Thing):
msg += 'pick it up and then use "(un-)wear" on it!'
self.sound('BOTTLE DEPOSITOR', msg)
self.game.changed = True
msg += 'pick it up and then use "(un-)wear" on it!'
self.sound('BOTTLE DEPOSITOR', msg)
self.game.changed = True
- self.game.changed_fovs = True
def accept(self):
self.bottle_counter += 1
def accept(self):
self.bottle_counter += 1