From 70e42e1ac61c613e196a4dd3a41d497f01fa298a Mon Sep 17 00:00:00 2001 From: Howard Abrams Date: Fri, 27 Jun 2025 20:07:46 -0700 Subject: [PATCH] Fix the 'pre message' that goes with cocktails. --- typeclasses/drinkables.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/typeclasses/drinkables.py b/typeclasses/drinkables.py index 5e02172..173f310 100755 --- a/typeclasses/drinkables.py +++ b/typeclasses/drinkables.py @@ -349,14 +349,13 @@ class Cocktail(Object): drink.db.amount = Cocktail.fill_amount drink.location = owner - pre_msg = details.get("pre") + " " or "" - drink.location.msg(pre_msg + routput("The << bartender ^ barkeep ^ elf >> << passes ^ slides ^ gives ^ hands >> you a |y{0}|n.", drink.name)) + pre_msg = details.get("pre", "") + 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 char = owner.db._sdesc or owner.get_display_name(theroom) - msg = pre_msg + \ - routput("The << bartender ^ barkeep ^ elf >> << passes ^ slides ^ gives ^ hands >> a {0} to {1}.", - drink.db.cocktail_type, char) + msg = routput(pre_msg + " The << bartender ^ barkeep ^ elf >> << passes ^ slides ^ gives ^ hands >> a {0} to {1}.", + drink.db.cocktail_type, char) theroom.msg_contents(msg, exclude=owner) def do_drink(self, drinker):