X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=3c8f09da72ff02bd96584ae4297cfc053c6499e7;hb=ac4f9e2337229827418b191743c1182cc5eae4d1;hp=0dced0da0a612b1c10248c3ba8f9eef52e057a72;hpb=cd0fee3d91d70525d7d4f434985abad6ea73faf0;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 0dced0d..3c8f09d 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -1,5 +1,5 @@
from plomrogue.errors import GameError, PlayError
-from plomrogue.mapping import YX
+from plomrogue.mapping import YX, FovMap
from plomrogue.misc import quote
import random
@@ -26,7 +26,9 @@ class Thing(ThingBase):
portable = False
protection = '.'
commandable = False
+ cookable = False
carried = False
+ consumable = False
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -48,7 +50,6 @@ class Thing(ThingBase):
def lower_msg_by_volume(msg, volume, largest_audible_distance,
url_limits = []):
- import random
factor = largest_audible_distance / 4
lowered_msg = ''
in_url = False
@@ -71,10 +72,11 @@ class Thing(ThingBase):
largest_audible_distance = 20
obstacles = [t.position for t in self.game.things if t.blocks_sound]
+ targets = [t.position for t in self.game.things if t.type_ == 'Player']
sound_blockers = self.game.get_sound_blockers()
- dijkstra_map = DijkstraMap(sound_blockers, obstacles, self.game.maps,
- self.position, largest_audible_distance,
- self.game.get_map)
+ dijkstra_map = DijkstraMap(targets, sound_blockers, obstacles,
+ self.game.maps, self.position,
+ largest_audible_distance, self.game.get_map)
url_limits = []
for m in re.finditer('https?://[^\s]+', msg):
url_limits += [m.start(), m.end()]
@@ -93,7 +95,17 @@ class Thing(ThingBase):
lowered_nick = lower_msg_by_volume(name, volume,
largest_audible_distance)
symbol = ''
- if listener.fov_test(self.position[0], self.position[1]):
+ # if listener.fov_test(self.position[0], self.position[1]):
+ # TODO: We might want to only show chat faces of players that are
+ # in the listener's FOV. However, if we do a fov_test here,
+ # this might set up a listener._fov where previously there was None,
+ # with ._fov = None serving to Game.send_gamestate() as an indicator
+ # that map view data for listener might be subject to change and
+ # therefore needs to be re-sent. If we generate an un-set ._fov
+ # here, this inhibits send_gamestate() from sending new map view
+ # data to listener. We need to re-structure this whole process
+ # if we want to use a FOV test on listener here.
+ if listener_distance < largest_audible_distance / 2:
self.game.io.send('CHATFACE %s' % self.id_, c_id)
if self.type_ == 'Player' and hasattr(self, 'thing_char'):
symbol = '/@' + self.thing_char
@@ -117,8 +129,8 @@ class ThingSpawner(Thing):
def proceed(self):
for t in [t for t in self.game.things
if t != self and t.position == self.position]:
- return
- self.game.add_thing(self.child_type, self.position)
+ return None
+ return self.game.add_thing(self.child_type, self.position)
@@ -136,24 +148,75 @@ class Thing_SpawnPoint(Thing):
symbol_hint = 's'
portable = True
name = 'username'
+ temporary = False
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.created_at = datetime.datetime.now()
+
+ def proceed(self):
+ super().proceed()
+ if self.temporary and datetime.datetime.now() >\
+ self.created_at + datetime.timedelta(minutes=10):
+ self.game.remove_thing(self)
+
+
+
+class ThingInstallable(Thing):
+ portable = True
+ installable = True
+
+ def install(self):
+ self.portable = False
+
+ def uninstall(self):
+ self.portable = True
+
+
+
+class Thing_SignSpawner(ThingSpawner):
+ child_type = 'Sign'
+
+
+
+class Thing_Sign(ThingInstallable):
+ symbol_hint = '?'
+ design_size = YX(16, 36)
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.design = 'x' * self.design_size.y * self.design_size.x
class Thing_DoorSpawner(ThingSpawner):
child_type = 'Door'
+ def proceed(self):
+ door = super().proceed()
+ if door:
+ key = self.game.add_thing('DoorKey', self.position)
+ key.door = door
+
+
+
+class Thing_DoorKey(Thing):
+ portable = True
+ symbol_hint = 'k'
+
+
-class Thing_Door(Thing):
+class Thing_Door(ThingInstallable):
symbol_hint = 'D'
blocks_movement = False
- portable = True
- installable = True
+ locked = False
def open(self):
self.blocks_movement = False
self.blocks_light = False
self.blocks_sound = False
+ self.locked = False
del self.thing_char
def close(self):
@@ -162,11 +225,23 @@ class Thing_Door(Thing):
self.blocks_sound = True
self.thing_char = '#'
- def install(self):
- self.portable = False
+ def lock(self):
+ self.locked = True
+ self.thing_char = 'L'
- def uninstall(self):
- self.portable = True
+
+
+class Thing_Psychedelic(Thing):
+ symbol_hint = 'P'
+ portable = True
+ cookable = True
+ consumable = True
+
+
+
+class Thing_PsychedelicSpawner(ThingSpawner):
+ symbol_hint = 'P'
+ child_type = 'Psychedelic'
@@ -176,22 +251,22 @@ class Thing_Bottle(Thing):
full = True
thing_char = '~'
spinnable = True
+ cookable = True
+ consumable = True
def empty(self):
self.thing_char = '_'
self.full = False
def spin(self):
- import random
all_players = [t for t in self.game.things if t.type_ == 'Player']
# TODO: refactor with ThingPlayer.prepare_multiprocessible_fov_stencil
# and ThingPlayer.fov_test
- fov_map_class = self.game.map_geometry.fov_map_class
fov_radius = 12
light_blockers = self.game.get_light_blockers()
obstacles = [t.position for t in self.game.things if t.blocks_light]
- fov = fov_map_class(light_blockers, obstacles, self.game.maps,
- self.position, fov_radius, self.game.get_map)
+ fov = FovMap(light_blockers, obstacles, self.game.maps,
+ self.position, fov_radius, self.game.get_map)
fov.init_terrain()
visible_players = []
for p in all_players:
@@ -215,6 +290,8 @@ class Thing_Hat(Thing):
portable = True
design = ' +--+ ' + ' | | ' + '======'
spinnable = True
+ cookable = True
+ design_size = YX(3, 6)
def spin(self):
new_design = ''
@@ -265,6 +342,7 @@ class Thing_MusicPlayer(Thing):
next_song_start = datetime.datetime.now()
playlist_index = -1
playing = True
+ cookable = True
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -294,10 +372,11 @@ class Thing_MusicPlayer(Thing):
msg_lines += ['HELP â show this help']
msg_lines += ['ON/OFF â toggle playback on/off']
msg_lines += ['REWIND â return to start of playlist']
- msg_lines += ['LIST â list programmed songs, durations']
- msg_lines += ['SKIP â to skip to next song']
+ msg_lines += ['LIST â list programmed item, durations']
+ msg_lines += ['REMOVE â remove current item']
+ msg_lines += ['SKIP â to skip to next item']
msg_lines += ['REPEAT â toggle playlist repeat on/off']
- msg_lines += ['ADD LENGTH SONG â add SONG to playlist, with LENGTH in format "minutes:seconds", i.e. something like "0:47" or "11:02"']
+ msg_lines += ['ADD LENGTH ITEM â add ITEM to playlist, with LENGTH in format "minutes:seconds" (something like "0:47" or "11:02")']
return msg_lines
elif command == 'LIST':
msg_lines += ['playlist:']
@@ -387,9 +466,24 @@ class Thing_BottleDeposit(Thing):
+class Thing_Stimulant(Thing):
+ symbol_hint = 'e'
+ cookable = True
+ portable = True
+ consumable = True
+
+
+
+class Thing_StimulantSpawner(ThingSpawner):
+ symbol_hint = 'e'
+ child_type = 'Stimulant'
+
+
+
class Thing_Cookie(Thing):
symbol_hint = 'c'
portable = True
+ consumable = True
def __init__(self, *args, **kwargs):
import string
@@ -408,9 +502,30 @@ class Thing_CookieSpawner(Thing):
+class Thing_Crate(Thing):
+ portable = True
+ symbol_hint = 'C'
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.content = []
+
+ def accept(self, thing):
+ self.content += [thing]
+
+ def remove_from_crate(self, thing):
+ self.content.remove(thing)
+
+
+
+class Thing_CrateSpawner(ThingSpawner):
+ child_type = 'Crate'
+ symbol_hint = 'C'
+
+
+
class ThingAnimate(Thing):
- blocks_movement = True
- drunk = 0
+ energy = 50
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -439,19 +554,10 @@ class ThingAnimate(Thing):
task = self.next_task[0]
self.next_task = [None]
task.check()
+ task.todo += max(0, -self.energy * 10)
return task
def proceed(self):
- self.drunk -= 1
- if self.drunk == 0:
- for c_id in self.game.sessions:
- if self.game.sessions[c_id]['thing_id'] == self.id_:
- # TODO: refactor with self.send_msg
- self.game.io.send('DEFAULT_COLORS', c_id)
- self.game.io.send('CHAT "You sober up."', c_id)
- self.invalidate('fov')
- break
- self.game.changed = True
if self.task is None:
self.task = self.get_next_task()
return
@@ -467,12 +573,11 @@ class ThingAnimate(Thing):
self.task = self.get_next_task()
def prepare_multiprocessible_fov_stencil(self):
- fov_map_class = self.game.map_geometry.fov_map_class
fov_radius = 3 if self.drunk > 0 else 12
light_blockers = self.game.get_light_blockers()
obstacles = [t.position for t in self.game.things if t.blocks_light]
- self._fov = fov_map_class(light_blockers, obstacles, self.game.maps,
- self.position, fov_radius, self.game.get_map)
+ self._fov = FovMap(light_blockers, obstacles, self.game.maps,
+ self.position, fov_radius, self.game.get_map)
def multiprocessible_fov_stencil(self):
self._fov.init_terrain()
@@ -487,9 +592,6 @@ class ThingAnimate(Thing):
self.multiprocessible_fov_stencil()
return self._fov
- def fov_stencil_make(self):
- self._fov.make()
-
def fov_test(self, big_yx, little_yx):
test_position = self.fov_stencil.target_yx(big_yx, little_yx)
if self.fov_stencil.inside(test_position):
@@ -558,11 +660,73 @@ class ThingAnimate(Thing):
class Thing_Player(ThingAnimate):
symbol_hint = '@'
+ drunk = 0
+ tripping = 0
+ need_for_toilet = 0
+ standing = True
+ dancing = 0
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.carrying = None
+ def proceed(self):
+ super().proceed()
+ if self.drunk >= 0:
+ self.drunk -= 1
+ if self.tripping >= 0:
+ self.tripping -= 1
+ if self.need_for_toilet > 0:
+ terrain = self.game.maps[self.position[0]][self.position[1]]
+ if terrain in self.game.terrains:
+ terrain_type = self.game.terrains[terrain]
+ if 'toilet' in terrain_type.tags:
+ self.send_msg('CHAT "You use the toilet. What a relief!"')
+ self.need_for_toilet = 0
+ if self.need_for_toilet > 0:
+ if random.random() > 0.9999:
+ self.need_for_toilet += 1
+ self.game.changed = True
+ if 100000 * random.random() < self.need_for_toilet:
+ self.send_msg('CHAT "You need to go to a toilet."')
+ if self.need_for_toilet > 100:
+ self.send_msg('CHAT "You pee into your pants. Eww!"')
+ self.need_for_toilet = 0
+ self.game.changed = True
+ if self.drunk == 0:
+ self.send_msg('CHAT "You sober up."')
+ self.invalidate('fov')
+ self.game.changed = True
+ if self.tripping == 0:
+ self.send_msg('DEFAULT_COLORS')
+ self.send_msg('CHAT "You sober up."')
+ self.game.changed = True
+ elif self.tripping > 0 and self.tripping % 250 == 0:
+ self.send_msg('RANDOM_COLORS')
+ self.game.changed = True
+ if random.random() > 0.9999:
+ if self.standing:
+ self.energy -= 1
+ else:
+ self.energy += 1
+ if self.energy < 0 and self.standing and self.energy % 5 == 0:
+ self.send_msg('CHAT "All that walking or standing uses up '
+ 'your energy, which makes you slower. Find a'
+ ' place to sit or lie down to regain it."')
+ self.game.changed = True
+ if self.dancing and random.random() > 0.99 and not self.next_task[0]:
+ self.dancing -= 1
+ direction = random.choice(self.game.map_geometry.directions)
+ self.set_next_task('MOVE', [direction])
+ if random.random() > 0.9:
+ self.energy -= 1
+ self.game.changed = True
+ if 1000000 * random.random() < self.energy - 50:
+ self.send_msg('CHAT "Your body tries to '
+ 'dance off its energy surplus."')
+ self.dancing += 50
+ self.game.changed = True
+
def send_msg(self, msg):
for c_id in self.game.sessions:
if self.game.sessions[c_id]['thing_id'] == self.id_:
@@ -582,6 +746,9 @@ class Thing_Player(ThingAnimate):
self.game.players_hat_chars[self.name] += c
def get_cookie_chars(self):
+ chars = ' #' # default
if self.name in self.game.players_hat_chars:
- return self.game.players_hat_chars[self.name]
- return ' #' # default
+ chars = self.game.players_hat_chars[self.name]
+ chars_split = list(chars)
+ chars_split.sort()
+ return ''.join(chars_split)