[adonthell-wastesedge-commits] Release_0-3-1 37d1b1d 089/237: Fixed the mess I made yesterday. Sorry.

[Kai Sterker]

tag: Release_0-3-1
commit 37d1b1d60f0f4cb1f03a86c17596520f7f8a2410
Author: adondev <adondev>
Commit: adondev <adondev>

    Fixed the mess I made yesterday. Sorry.
---
 scripts/events/1st_to_2nd.py           |   14 +++++++-------
 scripts/events/1st_to_fellnir.py       |   11 +++++------
 scripts/events/1st_to_frostbloom.py    |   13 +++++++------
 scripts/events/1st_to_player.py        |   11 +++++------
 scripts/events/1st_to_silverhair.py    |   33 ++++++++++++++++----------------
 scripts/events/2nd_to_illig.py         |   11 +++++------
 scripts/events/2nd_to_oliver.py        |   12 ++++++------
 scripts/events/2nd_to_redwyne.py       |   12 ++++++------
 scripts/events/action_alch_table.py    |    3 +--
 scripts/events/action_clock.py         |    3 +--
 scripts/events/barn_to_cellar.py       |   14 +++++++-------
 scripts/events/cellar_to_alek.py       |   12 ++++++------
 scripts/events/cellar_to_bath.py       |   12 ++++++------
 scripts/events/cellar_to_dwarfs.py     |   26 ++++++++++++-------------
 scripts/events/cellar_to_storage.py    |   12 ++++++------
 scripts/events/common_to_1st.py        |   14 +++++++-------
 scripts/events/common_to_cellar.py     |   14 +++++++-------
 scripts/events/common_to_kitchen.py    |   14 +++++++-------
 scripts/events/common_to_parlor.py     |   14 +++++++-------
 scripts/events/guards_ground_to_1st.py |   13 ++++++-------
 scripts/events/inn_to_yard.py          |   19 +++++++++---------
 scripts/events/kitchen_to_cellar.py    |   14 +++++++-------
 scripts/events/open_inn_door.py        |    3 +--
 scripts/events/yard_to_guards.py       |   13 ++++++-------
 scripts/events/yard_to_kitchen.py      |   14 +++++++-------
 25 files changed, 161 insertions(+), 170 deletions(-)

diff --git a/scripts/events/1st_to_2nd.py b/scripts/events/1st_to_2nd.py
index abd5cc6..8252ea3 100755
--- a/scripts/events/1st_to_2nd.py
+++ b/scripts/events/1st_to_2nd.py
@@ -1,8 +1,8 @@
-def run ():
-    mychar = characters [name]
+mychar = characters [name]
+
+# 1st floor to 2nd floor
+if mychar.submap() == 9:
+    events.switch_submap (mychar, 14, 4, 2, STAND_SOUTH)
+else:
+    events.switch_submap (mychar, 9, 6, 2, STAND_SOUTH)
 
-    # -- 1st floor to 2nd floor
-    if mychar.submap() == 9:
-        events.switch_submap (mychar, 14, 4, 2, STAND_SOUTH)
-    else:
-        events.switch_submap (mychar, 9, 6, 2, STAND_SOUTH)
diff --git a/scripts/events/1st_to_fellnir.py b/scripts/events/1st_to_fellnir.py
index 03788a3..4a19fa8 100755
--- a/scripts/events/1st_to_fellnir.py
+++ b/scripts/events/1st_to_fellnir.py
@@ -1,8 +1,7 @@
-def run ():
-    p = characters [name]
+p = characters [name]
 
-    if p.submap () == 9:
-        events.switch_submap (p, 10, 1, 3, STAND_EAST)
-    else:
-        events.switch_submap (p, 9, 8, 2, STAND_WEST)
+if p.submap () == 9:
+  events.switch_submap (p, 10, 1, 3, STAND_EAST)
+else:
+  events.switch_submap (p, 9, 8, 2, STAND_WEST)
 
diff --git a/scripts/events/1st_to_frostbloom.py 
b/scripts/events/1st_to_frostbloom.py
index 15e89b3..7292261 100755
--- a/scripts/events/1st_to_frostbloom.py
+++ b/scripts/events/1st_to_frostbloom.py
@@ -1,7 +1,8 @@
-def run ():
-    p = characters [name]
+p = characters [name]
+
+if p.submap () == 9:
+  events.switch_submap (p, 11, 4, 3, STAND_WEST)
+else:
+  events.switch_submap (p, 9, 1, 2, STAND_EAST)
+
 
-    if p.submap () == 9:
-      events.switch_submap (p, 11, 4, 3, STAND_WEST)
-    else:
-      events.switch_submap (p, 9, 1, 2, STAND_EAST)
diff --git a/scripts/events/1st_to_player.py b/scripts/events/1st_to_player.py
index 15d5ff3..74885af 100755
--- a/scripts/events/1st_to_player.py
+++ b/scripts/events/1st_to_player.py
@@ -1,8 +1,7 @@
-def run():
-    p = characters [name]
+p = characters [name]
 
-    if p.submap () == 9:
-      events.switch_submap (p, 12, 5, 2, STAND_SOUTH)
-    else:
-      events.switch_submap (p, 9, 7, 3, STAND_NORTH)
+if p.submap () == 9:
+  events.switch_submap (p, 12, 5, 2, STAND_SOUTH)
+else:
+  events.switch_submap (p, 9, 7, 3, STAND_NORTH)
 
diff --git a/scripts/events/1st_to_silverhair.py 
b/scripts/events/1st_to_silverhair.py
index b5e1037..d57200d 100755
--- a/scripts/events/1st_to_silverhair.py
+++ b/scripts/events/1st_to_silverhair.py
@@ -1,21 +1,20 @@
-def run ():
-    p = characters [name]
+p = characters [name]
 
-    if p.submap () == 9:
-        # -- bjarn's door closed
-        free = quests["demo"].get_val("silverhair_free")
+if p.submap () == 9:
+    # -- bjarn's door closed
+    free = quests["demo"].get_val("silverhair_free")
 
-        # -- Jelom not convinced of Silverhair's innocence
-        if not free and p == the_player:
-            # -- we only need that for the dialogue, ...
-            p.set_val ("at_silverhairs_door", 1)
-            p.stand ()
-            p.go_north ()
-            characters["Jelom Rasgar"].launch_action (p)
-            # -- ... so remove it again afterwards
-            p.set_val ("at_silverhairs_door", 0)
-        else:
-            events.switch_submap (p, 13, 5, 2, STAND_SOUTH)
+    # -- Jelom not convinced of Silverhair's innocence
+    if not free and p == the_player:
+        # -- we only need that for the dialogue, ...
+        p.set_val ("at_silverhairs_door", 1)
+        p.stand ()
+        p.go_north ()
+        characters["Jelom Rasgar"].launch_action (p)
+        # -- ... so remove it again afterwards
+        p.set_val ("at_silverhairs_door", 0)
     else:
-        events.switch_submap (p, 9, 1, 6, STAND_NORTH)
+        events.switch_submap (p, 13, 5, 2, STAND_SOUTH)
+else:
+    events.switch_submap (p, 9, 1, 6, STAND_NORTH)
 
diff --git a/scripts/events/2nd_to_illig.py b/scripts/events/2nd_to_illig.py
index 40691c2..e25486f 100755
--- a/scripts/events/2nd_to_illig.py
+++ b/scripts/events/2nd_to_illig.py
@@ -1,8 +1,7 @@
-def run ():
-    p = characters [name]
+p = characters [name]
 
-    if p.submap () == 14:
-      events.switch_submap (p, 17, 6, 2, STAND_SOUTH)
-    else:
-      events.switch_submap (p, 14, 1, 7, STAND_NORTH)
+if p.submap () == 14:
+  events.switch_submap (p, 17, 6, 2, STAND_SOUTH)
+else:
+  events.switch_submap (p, 14, 1, 7, STAND_NORTH)
 
diff --git a/scripts/events/2nd_to_oliver.py b/scripts/events/2nd_to_oliver.py
index 4863971..eb374bb 100755
--- a/scripts/events/2nd_to_oliver.py
+++ b/scripts/events/2nd_to_oliver.py
@@ -1,7 +1,7 @@
-def run ():
-    p = characters [name]
+p = characters [name]
+
+if p.submap () == 14:
+  events.switch_submap (p, 16, 6, 5, STAND_WEST)
+else:
+  events.switch_submap (p, 14, 1, 5, STAND_EAST)
 
-    if p.submap () == 14:
-      events.switch_submap (p, 16, 6, 5, STAND_WEST)
-    else:
-      events.switch_submap (p, 14, 1, 5, STAND_EAST)
diff --git a/scripts/events/2nd_to_redwyne.py b/scripts/events/2nd_to_redwyne.py
index 4a0d086..7bdf1bc 100755
--- a/scripts/events/2nd_to_redwyne.py
+++ b/scripts/events/2nd_to_redwyne.py
@@ -1,7 +1,7 @@
-def run ():
-    p = characters [name]
+p = characters [name]
+
+if p.submap () == 14:
+  events.switch_submap (p, 15, 1, 5, STAND_EAST)
+else:
+  events.switch_submap (p, 14, 2, 5, STAND_WEST)
 
-    if p.submap () == 14:
-      events.switch_submap (p, 15, 1, 5, STAND_EAST)
-    else:
-      events.switch_submap (p, 14, 2, 5, STAND_WEST)
diff --git a/scripts/events/action_alch_table.py 
b/scripts/events/action_alch_table.py
index 5cef48a..8468e03 100644
--- a/scripts/events/action_alch_table.py
+++ b/scripts/events/action_alch_table.py
@@ -1,2 +1 @@
-def run ():
-    the_player.speak ("I'd better not touch this... What if it explodes??")
+the_player.speak ("I'd better not touch this... What if it explodes??")
diff --git a/scripts/events/action_clock.py b/scripts/events/action_clock.py
index f632e69..9e5169b 100644
--- a/scripts/events/action_clock.py
+++ b/scripts/events/action_clock.py
@@ -1,2 +1 @@
-def run ():
-    the_player.speak ("That clock seems to be late!")
+the_player.speak ("That clock seems to be late!")
diff --git a/scripts/events/barn_to_cellar.py b/scripts/events/barn_to_cellar.py
index 64068d9..71fd454 100755
--- a/scripts/events/barn_to_cellar.py
+++ b/scripts/events/barn_to_cellar.py
@@ -1,8 +1,8 @@
-def run ():
-    mychar = characters [name]
+mychar = characters [name]
+
+# Barn to cellar
+if mychar.submap() == 0:
+    events.switch_submap (mychar, 4, 12, 2, STAND_SOUTH)
+else:
+    events.switch_submap (mychar, 0, 24, 11, STAND_SOUTH)
 
-    # Barn to cellar
-    if mychar.submap() == 0:
-        events.switch_submap (mychar, 4, 12, 2, STAND_SOUTH)
-    else:
-        events.switch_submap (mychar, 0, 24, 11, STAND_SOUTH)
diff --git a/scripts/events/cellar_to_alek.py b/scripts/events/cellar_to_alek.py
index 0354f21..10e3408 100755
--- a/scripts/events/cellar_to_alek.py
+++ b/scripts/events/cellar_to_alek.py
@@ -1,7 +1,7 @@
-def run ():
-    p = characters [name]
+p = characters [name]
+
+if p.submap () == 4:
+  events.switch_submap (p, 6, 5, 6 + (p.posy () - 6), STAND_WEST)
+else:
+  events.switch_submap (p, 4, 1, 6 + (p.posy () - 6), STAND_EAST)
 
-    if p.submap () == 4:
-      events.switch_submap (p, 6, 5, 6 + (p.posy () - 6), STAND_WEST)
-    else:
-      events.switch_submap (p, 4, 1, 6 + (p.posy () - 6), STAND_EAST)
diff --git a/scripts/events/cellar_to_bath.py b/scripts/events/cellar_to_bath.py
index 4aa13b7..e77f371 100755
--- a/scripts/events/cellar_to_bath.py
+++ b/scripts/events/cellar_to_bath.py
@@ -1,7 +1,7 @@
-def run ():
-    p = characters [name]
+p = characters [name]
+
+if p.submap () == 4:
+  events.switch_submap (p, 5, 4, 6, STAND_NORTH)
+else:
+  events.switch_submap (p, 4, 3, 6, STAND_SOUTH)
 
-    if p.submap () == 4:
-        events.switch_submap (p, 5, 4, 6, STAND_NORTH)
-    else:
-        events.switch_submap (p, 4, 3, 6, STAND_SOUTH)
diff --git a/scripts/events/cellar_to_dwarfs.py 
b/scripts/events/cellar_to_dwarfs.py
index 1c9e653..2c180af 100755
--- a/scripts/events/cellar_to_dwarfs.py
+++ b/scripts/events/cellar_to_dwarfs.py
@@ -1,15 +1,15 @@
-def run ():
-    p = characters [name]
+p = characters [name]
 
-    if p.submap () == 4:
-        # -- bjarn's door closed
-        open = quests["demo"].get_val("bjarn_door_open")
-        if open == 0 or open == 1:
-            if p == the_player:
-                characters["Bjarn Fingolson"].launch_action (p)
-                p.stand ()
-                p.go_west ()
-        else:
-            events.switch_submap (p, 7, 1, 6 + (p.posy () - 6), STAND_EAST)
+if p.submap () == 4:
+    # -- bjarn's door closed
+    open = quests["demo"].get_val("bjarn_door_open")
+    if open == 0 or open == 1:
+        if p == the_player:
+            characters["Bjarn Fingolson"].launch_action (p)
+            p.stand ()
+            p.go_west ()
     else:
-        events.switch_submap (p, 4, 9, 6 + (p.posy () - 6), STAND_WEST)
+        events.switch_submap (p, 7, 1, 6 + (p.posy () - 6), STAND_EAST)
+else:
+    events.switch_submap (p, 4, 9, 6 + (p.posy () - 6), STAND_WEST)
+
diff --git a/scripts/events/cellar_to_storage.py 
b/scripts/events/cellar_to_storage.py
index af24e4e..6b9c7ad 100755
--- a/scripts/events/cellar_to_storage.py
+++ b/scripts/events/cellar_to_storage.py
@@ -1,7 +1,7 @@
-def run ():
-    p = characters [name]
+p = characters [name]
+
+if p.submap () == 4:
+  events.switch_submap (p, 8, 6, 3 + (p.posy () - 9), STAND_WEST)
+else:
+  events.switch_submap (p, 4, 1, 9 + (p.posy () - 3), STAND_EAST)
 
-    if p.submap () == 4:
-      events.switch_submap (p, 8, 6, 3 + (p.posy () - 9), STAND_WEST)
-    else:
-      events.switch_submap (p, 4, 1, 9 + (p.posy () - 3), STAND_EAST)
diff --git a/scripts/events/common_to_1st.py b/scripts/events/common_to_1st.py
index a403d81..d02449c 100755
--- a/scripts/events/common_to_1st.py
+++ b/scripts/events/common_to_1st.py
@@ -1,8 +1,8 @@
-def run ():
-    mychar = characters [name]
+mychar = characters [name]
+
+# Common room to 1st floor
+if mychar.submap() == 1:
+    events.switch_submap (mychar, 9, 8, 2, STAND_SOUTH)
+else:
+    events.switch_submap (mychar, 1, 12, 2, STAND_SOUTH)
 
-    # Common room to 1st floor
-    if mychar.submap() == 1:
-        events.switch_submap (mychar, 9, 8, 2, STAND_SOUTH)
-    else:
-        events.switch_submap (mychar, 1, 12, 2, STAND_SOUTH)
diff --git a/scripts/events/common_to_cellar.py 
b/scripts/events/common_to_cellar.py
index 74bddb9..822d313 100755
--- a/scripts/events/common_to_cellar.py
+++ b/scripts/events/common_to_cellar.py
@@ -1,8 +1,8 @@
-def run ():
-    mychar = characters [name]
+mychar = characters [name]
+
+# Common room to cellar
+if mychar.submap() == 1:
+    events.switch_submap (mychar, 4, 6, 2, STAND_SOUTH)
+else:
+    events.switch_submap (mychar, 1, 9, 2, STAND_SOUTH)
 
-    # Common room to cellar
-    if mychar.submap() == 1:
-        events.switch_submap (mychar, 4, 6, 2, STAND_SOUTH)
-    else:
-        events.switch_submap (mychar, 1, 9, 2, STAND_SOUTH)
diff --git a/scripts/events/common_to_kitchen.py 
b/scripts/events/common_to_kitchen.py
index 5ba3352..139e1bb 100755
--- a/scripts/events/common_to_kitchen.py
+++ b/scripts/events/common_to_kitchen.py
@@ -1,8 +1,8 @@
-def run ():
-    mychar = characters [name]
+mychar = characters [name]
+
+# Common room to Kitchen
+if mychar.submap() == 1:
+    events.switch_submap (mychar, 3, 1, 2, STAND_SOUTH)
+else:
+    events.switch_submap (mychar, 1, 1, 7, STAND_NORTH)
 
-    # Common room to Kitchen
-    if mychar.submap() == 1:
-        events.switch_submap (mychar, 3, 1, 2, STAND_SOUTH)
-    else:
-        events.switch_submap (mychar, 1, 1, 7, STAND_NORTH)
diff --git a/scripts/events/common_to_parlor.py 
b/scripts/events/common_to_parlor.py
index b5219d3..b2b32a1 100755
--- a/scripts/events/common_to_parlor.py
+++ b/scripts/events/common_to_parlor.py
@@ -1,8 +1,8 @@
-def run ():
-    mychar = characters [name]
+mychar = characters [name]
+
+# -- From Common Room to Parlour
+if mychar.submap () == 1:
+    events.switch_submap (mychar, 2, 1, 4, STAND_EAST)
+else:
+    events.switch_submap (mychar, 1, 13, 4, STAND_WEST)
 
-    # -- From Common Room to Parlour
-    if mychar.submap () == 1:
-        events.switch_submap (mychar, 2, 1, 4, STAND_EAST)
-    else:
-        events.switch_submap (mychar, 1, 13, 4, STAND_WEST)
diff --git a/scripts/events/guards_ground_to_1st.py 
b/scripts/events/guards_ground_to_1st.py
index 38079c8..62e04c8 100644
--- a/scripts/events/guards_ground_to_1st.py
+++ b/scripts/events/guards_ground_to_1st.py
@@ -1,8 +1,7 @@
-def run ():
-    mychar = characters [name]
+mychar = characters [name]
 
-    # -- From Guards ground to 1st floor
-    if mychar.submap () == 18:
-        events.switch_submap (mychar, 19, 2, 8, STAND_EAST)
-    else:
-        events.switch_submap (mychar, 18, 2, 8, STAND_EAST)
+# -- From Guards ground to 1st floor
+if mychar.submap () == 18:
+    events.switch_submap (mychar, 19, 2, 8, STAND_EAST)
+else:
+    events.switch_submap (mychar, 18, 2, 8, STAND_EAST)
diff --git a/scripts/events/inn_to_yard.py b/scripts/events/inn_to_yard.py
index 839de2d..287a465 100755
--- a/scripts/events/inn_to_yard.py
+++ b/scripts/events/inn_to_yard.py
@@ -1,12 +1,11 @@
-def run ():
-    mychar = characters [name]
+mychar = characters [name]
 
-    # -- Close the inn door.
-    if mychar.submap () == 0:
-        map_engine.get_landmap ().get_mapobject (0).get_animation 
(0).next_frame ()
+# Close the inn door.
+if mychar.submap () == 0:
+    map_engine.get_landmap ().get_mapobject (0).get_animation (0).next_frame ()
 
-    # -- From Common Room to Yard
-    if mychar.submap () == 1:
-        events.switch_submap (mychar, 0, 18, 14, STAND_SOUTH)
-    else:
-        events.switch_submap (mychar, 1, 13, 7, STAND_NORTH)
+# -- From Common Room to Yard
+if mychar.submap () == 1:
+    events.switch_submap (mychar, 0, 18, 14, STAND_SOUTH)
+else:
+    events.switch_submap (mychar, 1, 13, 7, STAND_NORTH)
diff --git a/scripts/events/kitchen_to_cellar.py 
b/scripts/events/kitchen_to_cellar.py
index 649731f..a6e276d 100755
--- a/scripts/events/kitchen_to_cellar.py
+++ b/scripts/events/kitchen_to_cellar.py
@@ -1,8 +1,8 @@
-def run ():
-    mychar = characters [name]
+mychar = characters [name]
+
+# Kitchen to cellar
+if mychar.submap() == 3:
+    events.switch_submap (mychar, 4, 3, 12, STAND_NORTH)
+else:
+    events.switch_submap (mychar, 3, 6, 5, STAND_NORTH)
 
-    # Kitchen to cellar
-    if mychar.submap() == 3:
-        events.switch_submap (mychar, 4, 3, 12, STAND_NORTH)
-    else:
-        events.switch_submap (mychar, 3, 6, 5, STAND_NORTH)
diff --git a/scripts/events/open_inn_door.py b/scripts/events/open_inn_door.py
index 62af06b..c3533b9 100755
--- a/scripts/events/open_inn_door.py
+++ b/scripts/events/open_inn_door.py
@@ -1,2 +1 @@
-def run ():
-    map_engine.get_landmap ().get_mapobject (0).get_animation (0).next_frame ()
+map_engine.get_landmap ().get_mapobject (0).get_animation (0).next_frame ()
diff --git a/scripts/events/yard_to_guards.py b/scripts/events/yard_to_guards.py
index f7b62d3..4f1ac1e 100644
--- a/scripts/events/yard_to_guards.py
+++ b/scripts/events/yard_to_guards.py
@@ -1,8 +1,7 @@
-def run ():
-    mychar = characters [name]
+mychar = characters [name]
 
-    # -- From Yard to Guards house
-    if mychar.submap () == 0:
-        events.switch_submap (mychar, 18, 7, 3, STAND_WEST)
-    else:
-        events.switch_submap (mychar, 0, 13, 23, STAND_EAST)
+# -- From Yard to Guards house
+if mychar.submap () == 0:
+    events.switch_submap (mychar, 18, 7, 3, STAND_WEST)
+else:
+    events.switch_submap (mychar, 0, 13, 23, STAND_EAST)
diff --git a/scripts/events/yard_to_kitchen.py 
b/scripts/events/yard_to_kitchen.py
index 0986e51..63caaa5 100755
--- a/scripts/events/yard_to_kitchen.py
+++ b/scripts/events/yard_to_kitchen.py
@@ -1,8 +1,8 @@
-def run ():
-    mychar = characters [name]
+mychar = characters [name]
+
+# -- From Yard to Kitchen
+if mychar.submap () == 0:
+    events.switch_submap (mychar, 3, 6, 3, STAND_WEST)
+else:
+    events.switch_submap (mychar, 0, 12, 14, STAND_EAST)
 
-    # -- From Yard to Kitchen
-    if mychar.submap () == 0:
-        events.switch_submap (mychar, 3, 6, 3, STAND_WEST)
-    else:
-        events.switch_submap (mychar, 0, 12, 14, STAND_EAST)