Mercurial > parpg-source

diff dialogueactions.py @ 160:75c0b728ccf3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further work on the scripting system.
author KarstenBock@gmx.net
date Sun, 13 Nov 2011 17:19:14 +0100
parents b46afa76d2ef
children
line wrap: on
line diff
--- a/dialogueactions.py	Sun Nov 13 13:37:24 2011 +0100
+++ b/dialogueactions.py	Sun Nov 13 17:19:14 2011 +0100
@@ -94,7 +94,6 @@
         @type kwargs: dict of objects
         """
         DialogueAction.__init__(self, *args, **kwargs)
-        self.npc_id = args[0]
     
     def __call__(self, game_state):
         """
@@ -104,7 +103,7 @@
             game state.
         @type game_state: dict of objects
         """
-        npc_id = self.npc_id
+        npc_id = game_state["npc"].general.identifier
         # NOTE Technomage 2010-11-13: This print statement seems overly
         #     verbose, so I'm logging it as an INFO message instead.
 #        print("You've met {0}!".format(npc_id))