[adonthell-wastesedge-commits] Release_0-3-1 be10dec 068/237: Added guards house interior.

[Kai Sterker]

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

    Added guards house interior.
---
 maps/test.map                          |  Bin 1909 -> 1951 bytes
 scripts/events/Makefile.am             |    3 ++-
 scripts/events/guards_ground_to_1st.py |    7 +++++++
 scripts/events/yard_to_guards.py       |    7 +++++++
 scripts/init.py                        |   34 ++++++++++++++++++++++++++++++--
 5 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/maps/test.map b/maps/test.map
index cb3dde0..1549444 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/events/Makefile.am b/scripts/events/Makefile.am
index 7b0e2a9..36e7fc6 100755
--- a/scripts/events/Makefile.am
+++ b/scripts/events/Makefile.am
@@ -5,6 +5,7 @@ pkgdata_DATA = common_to_kitchen.py common_to_parlor.py 
inn_to_yard.py \
        1st_to_player.py 1st_to_silverhair.py 2nd_to_illig.py 2nd_to_oliver.py \
        2nd_to_redwyne.py cellar_to_alek.py cellar_to_bath.py 
cellar_to_dwarfs.py \
        cellar_to_storage.py common_to_1st.py 1st_to_2nd.py common_to_cellar.py 
\
-       barn_to_cellar.py kitchen_to_cellar.py
+       barn_to_cellar.py kitchen_to_cellar.py yard_to_guards.py \
+       guards_ground_to_1st.py
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/scripts/events/guards_ground_to_1st.py 
b/scripts/events/guards_ground_to_1st.py
new file mode 100644
index 0000000..62e04c8
--- /dev/null
+++ b/scripts/events/guards_ground_to_1st.py
@@ -0,0 +1,7 @@
+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)
diff --git a/scripts/events/yard_to_guards.py b/scripts/events/yard_to_guards.py
new file mode 100644
index 0000000..a366df9
--- /dev/null
+++ b/scripts/events/yard_to_guards.py
@@ -0,0 +1,7 @@
+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, 24, STAND_EAST)
diff --git a/scripts/init.py b/scripts/init.py
index f458ed9..c2c75b1 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -550,6 +550,38 @@ if retval < 5:
         ev.set_script ("kitchen_to_cellar")
         lm.add_event (ev)
 
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 12
+        ev.y = 24
+        ev.set_script ("yard_to_guards")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 18
+        ev.x = 8
+        ev.y = 3
+        ev.set_script ("yard_to_guards")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 18
+        ev.x = 1
+        ev.y = 8
+        ev.set_script ("guards_ground_to_1st")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 19
+        ev.x = 1
+        ev.y = 8
+        ev.set_script ("guards_ground_to_1st")
+        lm.add_event (ev)
+
         # Now setup the characters
         lucia = characters ["Lucia Redwyne"]
         lucia.set_dialogue ("dialogues/lucia_start")
@@ -588,8 +620,6 @@ if retval < 5:
         talan.set_action ("action_talk")
         talan.stand_north ()
         talan.set_schedule ("talan")
-        talan.set_val ("say_something", 0)
-        talan.set_val ("delay", 0)
 
         # -- that's a clone for now
         jelom = characters ["Jelom Rasgar"]