Fix the 'pre message' that goes with cocktails.
This commit is contained in:
parent
cb88d646f9
commit
70e42e1ac6
1 changed files with 4 additions and 5 deletions
|
|
@ -349,14 +349,13 @@ class Cocktail(Object):
|
||||||
drink.db.amount = Cocktail.fill_amount
|
drink.db.amount = Cocktail.fill_amount
|
||||||
drink.location = owner
|
drink.location = owner
|
||||||
|
|
||||||
pre_msg = details.get("pre") + " " or ""
|
pre_msg = details.get("pre", "")
|
||||||
drink.location.msg(pre_msg + routput("The << bartender ^ barkeep ^ elf >> << passes ^ slides ^ gives ^ hands >> you a |y{0}|n.", drink.name))
|
drink.location.msg(routput(pre_msg + " The << bartender ^ barkeep ^ elf >> << passes ^ slides ^ gives ^ hands >> you a |y{0}|n.", drink.name))
|
||||||
|
|
||||||
theroom = drink.location.location
|
theroom = drink.location.location
|
||||||
char = owner.db._sdesc or owner.get_display_name(theroom)
|
char = owner.db._sdesc or owner.get_display_name(theroom)
|
||||||
msg = pre_msg + \
|
msg = routput(pre_msg + " The << bartender ^ barkeep ^ elf >> << passes ^ slides ^ gives ^ hands >> a {0} to {1}.",
|
||||||
routput("The << bartender ^ barkeep ^ elf >> << passes ^ slides ^ gives ^ hands >> a {0} to {1}.",
|
drink.db.cocktail_type, char)
|
||||||
drink.db.cocktail_type, char)
|
|
||||||
theroom.msg_contents(msg, exclude=owner)
|
theroom.msg_contents(msg, exclude=owner)
|
||||||
|
|
||||||
def do_drink(self, drinker):
|
def do_drink(self, drinker):
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue