X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=ab54e306c2a86215565159a10ddda45e57e0e4a7;hb=63971b7bd44431733c22f7632a68e6e81fcdd510;hp=720adc0ec64f0c432ec0f8e9ecbb3d5ecb29a413;hpb=ea5ddf2c37571f3fb0ed486cd4a4294b82c54b54;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 720adc0..ab54e30 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -1,5 +1,7 @@
from plomrogue.errors import GameError, PlayError
from plomrogue.mapping import YX
+from plomrogue.misc import quote
+import random
@@ -21,6 +23,7 @@ class Thing(ThingBase):
portable = False
protection = '.'
commandable = False
+ carried = False
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -38,22 +41,29 @@ class Thing(ThingBase):
def sound(self, name, msg):
from plomrogue.mapping import DijkstraMap
- from plomrogue.misc import quote
+ import re
- def lower_msg_by_volume(msg, volume, largest_audible_distance):
+ def lower_msg_by_volume(msg, volume, largest_audible_distance,
+ url_limits = []):
import random
factor = largest_audible_distance / 4
lowered_msg = ''
+ in_url = False
+ i = 0
for c in msg:
c = c
- while random.random() > volume * factor:
- if c.isupper():
- c = c.lower()
- elif c != '.' and c != ' ':
- c = '.'
- else:
- c = ' '
+ if i in url_limits:
+ in_url = False if in_url else True
+ if not in_url:
+ while random.random() > volume * factor:
+ if c.isupper():
+ c = c.lower()
+ elif c != '.' and c != ' ':
+ c = '.'
+ else:
+ c = ' '
lowered_msg += c
+ i += 1
return lowered_msg
largest_audible_distance = 20
@@ -61,6 +71,9 @@ class Thing(ThingBase):
things = [t for t in self.game.things if t.type_ != 'Player']
dijkstra_map = DijkstraMap(things, 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()]
for c_id in self.game.sessions:
listener = self.game.get_player(c_id)
target_yx = dijkstra_map.target_yx(*listener.position, True)
@@ -71,7 +84,8 @@ class Thing(ThingBase):
continue
volume = 1 / max(1, listener_distance)
lowered_msg = lower_msg_by_volume(msg, volume,
- largest_audible_distance)
+ largest_audible_distance,
+ url_limits)
lowered_nick = lower_msg_by_volume(name, volume,
largest_audible_distance)
self.game.io.send('CHAT ' +
@@ -95,9 +109,7 @@ class ThingSpawner(Thing):
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
@@ -151,11 +163,32 @@ class Thing_Bottle(Thing):
portable = True
full = True
thing_char = '~'
+ spinnable = 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
+ fov = fov_map_class(self.game.things, self.game.maps,
+ self.position, fov_radius, self.game.get_map)
+ fov.init_terrain()
+ visible_players = []
+ for p in all_players:
+ test_position = fov.target_yx(p.position[0], p.position[1])
+ if fov.inside(test_position) and fov[test_position] == '.':
+ visible_players += [p]
+ if len(visible_players) == 0:
+ self.sound('BOTTLE', 'no visible players in spin range')
+ pick = random.choice(visible_players)
+ self.sound('BOTTLE', 'BOTTLE picks: ' + pick.name)
+
class Thing_BottleSpawner(ThingSpawner):
@@ -163,6 +196,28 @@ class Thing_BottleSpawner(ThingSpawner):
+class Thing_Hat(Thing):
+ symbol_hint = 'H'
+ portable = True
+ design = ' +--+ ' + ' | | ' + '======'
+
+
+
+class Thing_HatRemixer(Thing):
+ symbol_hint = 'H'
+
+ def accept(self, hat):
+ import string
+ new_design = ''
+ legal_chars = string.ascii_letters + string.digits + string.punctuation + ' '
+ for i in range(18):
+ new_design += random.choice(list(legal_chars))
+ hat.design = new_design
+ self.sound('HAT REMIXER', 'remixing a hat â¦')
+ self.game.changed = True
+
+
+
import datetime
class Thing_MusicPlayer(Thing):
symbol_hint = 'R'
@@ -170,7 +225,7 @@ class Thing_MusicPlayer(Thing):
portable = True
repeat = True
next_song_start = datetime.datetime.now()
- playlist_index = 0
+ playlist_index = -1
playing = True
def __init__(self, *args, **kwargs):
@@ -182,12 +237,13 @@ class Thing_MusicPlayer(Thing):
if (not self.playing) or len(self.playlist) == 0:
return
if datetime.datetime.now() > self.next_song_start:
- song_data = self.playlist[self.playlist_index]
self.playlist_index += 1
if self.playlist_index == len(self.playlist):
self.playlist_index = 0
if not self.repeat:
self.playing = False
+ return
+ song_data = self.playlist[self.playlist_index]
self.next_song_start = datetime.datetime.now() +\
datetime.timedelta(seconds=song_data[1])
self.sound('MUSICPLAYER', song_data[0])
@@ -198,7 +254,7 @@ class Thing_MusicPlayer(Thing):
if command == 'HELP':
msg_lines += ['available commands:']
msg_lines += ['HELP â show this help']
- msg_lines += ['PLAY â toggle playback on/off']
+ 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']
@@ -217,15 +273,24 @@ class Thing_MusicPlayer(Thing):
msg_lines += ['%s %s:%s â %s' % (selector, minutes, seconds, entry[0])]
i += 1
return msg_lines
- elif command == 'PLAY':
+ elif command == 'ON/OFF':
self.playing = False if self.playing else True
self.game.changed = True
if self.playing:
return ['playing']
else:
return ['paused']
+ elif command == 'REMOVE':
+ if len(self.playlist) == 0:
+ return ['playlist already empty']
+ del self.playlist[max(0, self.playlist_index)]
+ self.playlist_index -= 1
+ if self.playlist_index < -1:
+ self.playlist_index = -1
+ self.game.changed = True
+ return ['removed song']
elif command == 'REWIND':
- self.playlist_index = 0
+ self.playlist_index = -1
self.next_song_start = datetime.datetime.now()
self.game.changed = True
return ['back at start of playlist']
@@ -267,12 +332,14 @@ class Thing_BottleDeposit(Thing):
def proceed(self):
if self.bottle_counter >= 3:
self.bottle_counter = 0
- t = self.game.thing_types['MusicPlayer'](self.game,
- position=self.position)
- self.game.things += [t]
- self.sound('BOTTLE DEPOSITOR',
- 'here is a gift as a reward for ecological consciousness â'
- 'use "command thing" on it to learn more!')
+ choice = random.choice(['MusicPlayer', 'Hat'])
+ 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!'
+ elif choice == 'Hat':
+ msg += 'pick it up and then use "(un-)wear" on it!'
+ self.sound('BOTTLE DEPOSITOR', msg)
self.game.changed = True
def accept(self):
@@ -292,7 +359,12 @@ class ThingAnimate(Thing):
super().__init__(*args, **kwargs)
self.next_task = [None]
self.task = None
+ self.invalidate_map_view()
+
+ def invalidate_map_view(self):
self._fov = None
+ self._visible_terrain = None
+ self._visible_control = None
def set_next_task(self, task_name, args=()):
task_class = self.game.tasks[task_name]
@@ -310,11 +382,12 @@ class ThingAnimate(Thing):
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_map_view()
break
self.game.changed = True
- self._fov = None
if self.task is None:
self.task = self.get_next_task()
return
@@ -358,7 +431,7 @@ class ThingAnimate(Thing):
return True
return False
- def fov_stencil_map(self, map_type='normal'):
+ def fov_stencil_map(self, map_type):
visible_terrain = ''
for yx in self.fov_stencil:
if self.fov_stencil[yx] == '.':
@@ -369,6 +442,20 @@ class ThingAnimate(Thing):
visible_terrain += ' '
return visible_terrain
+ @property
+ def visible_terrain(self):
+ if self._visible_terrain:
+ return self._visible_terrain
+ self._visible_terrain = self.fov_stencil_map('normal')
+ return self._visible_terrain
+
+ @property
+ def visible_control(self):
+ if self._visible_control:
+ return self._visible_control
+ self._visible_control = self.fov_stencil_map('control')
+ return self._visible_control
+
class Thing_Player(ThingAnimate):
@@ -383,3 +470,9 @@ class Thing_Player(ThingAnimate):
if self.game.sessions[c_id]['thing_id'] == self.id_:
self.game.io.send(msg, c_id)
break
+
+ def uncarry(self):
+ t = self.carrying
+ t.carried = False
+ self.carrying = None
+ return t