Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Started adding parsing to pose.

Browse source
This commit is contained in:
Griatch 2015-09-26 11:04:02 +02:00
parent bd39f1548e
commit 35583daed2
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
evennia/contrib/rpsystem.py
View file

@ -70,7 +70,7 @@ from evennia.utils.utils import lazy_property
# The prefix is the (single-character) symbol used to find the start # The prefix is the (single-character) symbol used to find the start
# of a object reference, such as /tall (note that # of a object reference, such as /tall (note that
# the system will understand multi-word references). # the system will understand multi-word references like '/a tall man' too).
_PREFIX = "/" _PREFIX = "/"
# The num_sep is the (single-character) symbol used to separate the # The num_sep is the (single-character) symbol used to separate the
@ -150,6 +150,8 @@ def _dummy_process(text, *args, **kwargs):
return text return text
# emoting mechanisms
def ordered_permutation_regex(sentence): def ordered_permutation_regex(sentence):
""" """
@ -596,7 +598,7 @@ class CmdPose(Command): # set current pose and default pose
pose = self.args pose = self.args
target = self.target target = self.target
if not pose and not self.reset: if not pose and not self.reset:
caller.msg("Usage: pose <pose-text> OR pose default <pose-text> OR pose reset") caller.msg("Usage: pose <pose-text> OR pose obj = <pose-text>")
return return
if not pose.endswith("."): if not pose.endswith("."):
@ -626,7 +628,13 @@ class CmdPose(Command): # set current pose and default pose
caller.msg("Default pose is now '%s %s'." % (target_name, pose)) caller.msg("Default pose is now '%s %s'." % (target_name, pose))
return return
else: else:
target.db.pose = pose # set the pose. We do one-time ref->sdesc mapping here.
parsed, mapping = parse_sdescs_and_recogs(caller, caller.location.contents, pose)
print mapping
mapping = dict((ref, obj.sdesc.get() if hasattr(obj, "sdesc") else obj.key)
for ref, obj in mapping.iteritems())
parsed = parsed.format(**mapping)
target.db.pose = parsed
caller.msg("Pose will read '%s %s'." % (target_name, pose)) caller.msg("Pose will read '%s %s'." % (target_name, pose))
@ -994,16 +1002,9 @@ class ContribRPObject(DefaultObject):
except AttributeError: except AttributeError:
recog = None recog = None
sdesc = recog or (hasattr(self, "sdesc") and self.sdesc.get()) or self.key sdesc = recog or (hasattr(self, "sdesc") and self.sdesc.get()) or self.key
pose = " %s" % self.db.pose or "" if kwargs.get("pose", False) else "" pose = " %s" % ((self.db.pose or "") if kwargs.get("pose", False) else "")
return "%s%s%s" % (sdesc, idstr, pose) return "%s%s%s" % (sdesc, idstr, pose)
class ContribRPRoom(DefaultRoom):
"""
Rooms don't have sdescs nor poses of their own, so we just modify
`return_appearance` here to make sure it properly displays poses
of objects in the room.
"""
def return_appearance(self, looker): def return_appearance(self, looker):
""" """
This formats a description. It is the hook a 'look' command This formats a description. It is the hook a 'look' command
@ -1037,6 +1038,12 @@ class ContribRPRoom(DefaultRoom):
string += "\n " + "\n ".join(users + things) string += "\n " + "\n ".join(users + things)
return string return string
class ContribRPRoom(ContribRPObject):
"""
Dummy inheritance for rooms.
"""
pass
class ContribRPCharacter(DefaultCharacter, ContribRPObject): class ContribRPCharacter(DefaultCharacter, ContribRPObject):
""" """
@ -1079,6 +1086,7 @@ class ContribRPCharacter(DefaultCharacter, ContribRPObject):
except AttributeError: except AttributeError:
recog = None recog = None
sdesc = recog or (hasattr(self, "sdesc") and self.sdesc.get()) or self.key sdesc = recog or (hasattr(self, "sdesc") and self.sdesc.get()) or self.key
print "get_display_name:", self,sdesc, self.db.pose
pose = " %s" % self.db.pose or "" if kwargs.get("pose", False) else "" pose = " %s" % self.db.pose or "" if kwargs.get("pose", False) else ""
return "{c%s{n%s%s" % (sdesc, idstr, pose) return "{c%s{n%s%s" % (sdesc, idstr, pose)