Changeset 668 for trunk/game/scripts/gamemodel.py

Timestamp:

11/17/10 21:44:05 (9 years ago)

Author:

technomage

Message:

Ticket #269: Patch by Technomage.

• Working prototype of the redesigned DialogueEngine? for the upcoming Techdemo2 release; major redesign of the existing DialogueEngine? and YAML dialogue file syntax.
• Moved the redesigned DialogueEngine? class to the more descriptive dialogueengine.py module; the DialogueEngine? is now a singleton object and provides all functionality through class methods and attributes, and thus should not be instantiated
• Abstracted the data structures used to store dialogue data away from the YAML data structures; the relevant classes are stored in the dialogue.py module
• Abstracted the dialogue commands/actions from the DialogueEngine? code to make modifications and maintenance of dialogue logic easier; the relevant classes are stored in the dialogueactions.py module
• The PyYAML loader has been replaced with a more robust YamlDialogueParser? class (see the dialogueparsers.py module) that interfaces with the new dialogue data structure classes and supports the new YAML dialogue file syntax; an OldYamlDialogueParser? class is provided to support reading the old Techdemo1 syntax
• Removed the existing dialogue validator; runtime dialogue validation is not yet implemented
• Added the convert_dialogue script, which converts dialogue files in the old Techdemo1 format to the new format; all existing dialogue files have been converted to work with the new parser
• Added two support modules for the new classes and script: ordereddict.py, which provides a Python 2.7-like OrderedDict? class for Python versions 2.4-2.6; optionparser.py, which is a simplified command-line option parser for writing scripts as an alternative to argparse and optparse
• Updated the dialogue_demo.py script to work with the new DialogueEngine?
• fixes[s:trac, t:269]

Location:

trunk

Files:

• . (modified) (1 prop)
• game/scripts/gamemodel.py (modified) (3 diffs)

trunk

@@ -4 +4 @@
 .settings
 Thumbs.db
+
+.externalToolBuilders
+
+.cproject

@@ -4 +4 @@
 .settings
 Thumbs.db
+
+.externalToolBuilders
+
+.cproject

trunk/game/scripts/gamemodel.py

@@ -19 +19 @@
 import sys
 import os.path
+import logging
 from copy import deepcopy
 
@@ -31 +32 @@
 from common.utils import parseBool
 from inventory import Inventory
+from scripts.dialogueparser import YamlDialogueParser, DialogueFormatError
 
 try:
@@ -732 +734 @@
         """Searches the dialogue directory for dialogues """
         files = locateFiles("*.yaml", self.dialogues_directory)
-        for dialogue_file in files:
-            dialogue_file = os.path.relpath(dialogue_file).replace("\\", "/")
-            dialogues = yaml.load_all(file(dialogue_file, "r"))
-            for dialogue in dialogues:
-                self.dialogues[dialogue["NPC"]] = dialogue
+        dialogue_parser = YamlDialogueParser()
+        for dialogue_filepath in files:
+            dialogue_filepath = os.path.relpath(dialogue_filepath) \
+                                .replace("\\", "/")
+            # Note Technomage 2010-11-13: the new DialogueEngine uses its own
+            #     parser now, YamlDialogueParser.
+#            dialogues = yaml.load_all(file(dialogue_file, "r"))
+            with file(dialogue_filepath, 'r') as dialogue_file:
+                try:
+                    dialogue = dialogue_parser.load(dialogue_file)
+                except DialogueFormatError as error:
+                    logging.error('unable to load dialogue file {0}: {1}'
+                                  .format(dialogue_filepath, error))
+                else:
+                    self.dialogues[dialogue.npc_name] = dialogue
+            # Note Technomage 2010-11-13: the below code is used to load
+            #     multiple dialogues from a single file. Is this functionality
+            #     used/necessary?
+#            for dialogue in dialogues:
+#                self.dialogues[dialogue["NPC"]] = dialogue

@@ -4 +4 @@
 .settings
 Thumbs.db
+
+.externalToolBuilders
+
+.cproject