Changeset 469

Timestamp:

01/31/10 22:21:09 (10 years ago)

Author:

zenbitz

Message:

change to so we have give/get

Location:

trunk/game/scripts

Files:

• dialogue.py (modified) (1 diff)
• dialoguevalidator.py (modified) (1 diff)
• gui/dialoguegui.py (modified) (2 diffs)

trunk/game/scripts/dialogue.py

@@ -245 +245 @@
                 self.callbacks["get_stuff"](state, command.get("get_stuff"))
 
-            elif command.get("take_stuff"):
-                self.callbacks["take_stuff"](state, command.get("take_stuff"))
+            elif command.get("give_stuff"):
+                self.callbacks["give_stuff"](state, command.get("give_stuff"))
 
             elif command.get("dialogue"):

trunk/game/scripts/dialoguevalidator.py

@@ -122 +122 @@
                             action + " node")
                     #TODO: verify quest
-                elif action in ("get_stuff", "take_stuff"):
+                elif action in ("get_stuff", "give_stuff"):
                     if not isinstance(entry[action], types.StringType):
                         raise DialogueFormatException(\

trunk/game/scripts/gui/dialoguegui.py

@@ -59 +59 @@
                 print "You've now have the %s" % thing
 
-        def take_stuff(state,thing):
+        def give_stuff(state,thing):
             if state['pc'].inventory.has(thing):
                 state['pc'].inventory.takeItem(thing)
@@ -78 +78 @@
             'set_value'     : set_value,
             'start_quest'   : start_quest,
-            'take_stuff'    : take_stuff
+            'give_stuff'    : give_stuff
         }