From 1bb1e16719f3c7f0137855bd25e1fae874e4a924 Mon Sep 17 00:00:00 2001
From: kbulgrien <kbulgrien@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Fri, 21 Nov 2008 07:46:17 +0000
Subject: [PATCH] - Reformat for readability.  No functional change.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10637 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 python/misc/npc_dialog.py | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/python/misc/npc_dialog.py b/python/misc/npc_dialog.py
index 9ab6c8d29..668bd4010 100644
--- a/python/misc/npc_dialog.py
+++ b/python/misc/npc_dialog.py
@@ -105,38 +105,49 @@ import os
 from CFDialog import DialogRule, Dialog
 import cjson
 
-def ruleConnected(character,rule):
+def ruleConnected(character, rule):
         m = character.Map
-        m.TriggerConnected(rule.connected,1)
+        m.TriggerConnected(rule.connected, 1)
+
+npc = Crossfire.WhoAmI()
 event = Crossfire.WhatIsEvent()
 player = Crossfire.WhoIsActivator()
-npc = Crossfire.WhoAmI()
 if (Crossfire.ScriptParameters() != None):
-    filename = os.path.join(Crossfire.DataDirectory(),Crossfire.MapDirectory(),Crossfire.ScriptParameters())
+    filename = os.path.join(Crossfire.DataDirectory(),
+                            Crossfire.MapDirectory(),
+                            Crossfire.ScriptParameters())
     try:
         f = open(filename,'rb')
     except:
         Crossfire.Log(Crossfire.LogDebug, "Error loading NPC dialog %s" % filename)
         raise
     else:
-        Crossfire.Log(Crossfire.LogDebug,"Loading NPC dialog %s" %filename)
-        parameters=cjson.decode(f.read())
+        Crossfire.Log(Crossfire.LogDebug, "Loading NPC dialog %s" % filename)
+        parameters = cjson.decode(f.read())
         f.close()
 else:
     parameters = cjson.decode(event.Message)
 location = parameters["location"];
 speech = Dialog(player, npc, location)
-index=0;
+index = 0;
 
 for jsonRule in parameters["rules"]:
     if (jsonRule.has_key("connected")):
-        rule = DialogRule(jsonRule["match"], jsonRule["pre"], jsonRule["msg"], jsonRule["post"],None,ruleConnected);
+        rule = DialogRule(jsonRule["match"],
+                          jsonRule["pre"],
+                          jsonRule["msg"],
+                          jsonRule["post"],
+                          None,
+                          ruleConnected);
         rule.connected = jsonRule["connected"]
     else:
-        rule = DialogRule(jsonRule["match"], jsonRule["pre"], jsonRule["msg"], jsonRule["post"])
-    speech.addRule(rule,index)
-    index=index+1
-        
+        rule = DialogRule(jsonRule["match"],
+                          jsonRule["pre"],
+                          jsonRule["msg"],
+                          jsonRule["post"])
+    speech.addRule(rule, index)
+    index = index + 1
+
 if speech.speak(Crossfire.WhatIsMessage()) == 0:
     Crossfire.SetReturnValue(1)