crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the requirements, assuming player can always say anything. 

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13162 282e977c-c81d-0410-88c4-b93c2d0d6712
master
ryo_saeba 2010-05-10 17:20:36 +00:00
parent 08b27fb27e
commit b66dcbeb89
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/CFDialog.py
View File

@ -126,13 +126,12 @@ import os
import CFItemBroker import CFItemBroker
class DialogRule: class DialogRule:
def __init__(self, keywords, presemaphores, messages, postsemaphores, suggested_response = None, required_response = None): def __init__(self, keywords, presemaphores, messages, postsemaphores, suggested_response = None):
self.__keywords = keywords self.__keywords = keywords
self.__presems = presemaphores self.__presems = presemaphores
self.__messages = messages self.__messages = messages
self.__postsems = postsemaphores self.__postsems = postsemaphores
self.__suggestions = suggested_response self.__suggestions = suggested_response
self.__requirements = required_response
# The keyword is a string. Multiple keywords may be defined in the string # The keyword is a string. Multiple keywords may be defined in the string
# by delimiting them with vertical bar (|) characters. "*" is a special # by delimiting them with vertical bar (|) characters. "*" is a special
@ -166,11 +165,6 @@ class DialogRule:
def getSuggests(self): def getSuggests(self):
return self.__suggestions return self.__suggestions
# Return the required responses to this rule, this is like a suggestion,
# except that no other response will make sense in context (eg, a yes/no question)
def getRequires(self):
return self.__requirements
# This is a subclass of the generic dialog rule that we use for determining whether to # This is a subclass of the generic dialog rule that we use for determining whether to
# 'include' additional rules. # 'include' additional rules.
class IncludeRule(DialogRule): class IncludeRule(DialogRule):
@ -222,13 +216,10 @@ class Dialog:
message = message.replace('$you', self.__character.QueryName()) message = message.replace('$you', self.__character.QueryName())
Crossfire.NPCSay(self.__speaker, message); Crossfire.NPCSay(self.__speaker, message);
if rule.getRequires() == None:
if rule.getSuggests() != None: if rule.getSuggests() != None:
for reply in rule.getSuggests(): for reply in rule.getSuggests():
Crossfire.AddReply(reply[0], reply[1]) Crossfire.AddReply(reply[0], reply[1])
Crossfire.GetPrivateDictionary()[key] = rule.getSuggests() Crossfire.GetPrivateDictionary()[key] = rule.getSuggests()
else:
self.__speaker.Say(rule.getRequires())
self.setConditions(rule) self.setConditions(rule)
# change the player's text if found # change the player's text if found