[adonthell-wastesedge-commits] Release_0-3-1 52a5f4c 038/237: Completed map and connections.

[Kai Sterker]

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

    Completed map and connections.
---
 gfx/mapobjects/stairs/Makefile.am                 |    5 +-
 gfx/mapobjects/stairs/red-carpet-front_back.mobj  |  Bin 0 -> 124 bytes
 gfx/mapobjects/stairs/red-carpet-front_bl-tr.mobj |  Bin 0 -> 313 bytes
 gfx/mapobjects/stairs/red-carpet-front_br-tl.mobj |  Bin 0 -> 320 bytes
 gfx/mapobjects/stairs/red-carpet-front_tl-br.mobj |  Bin 0 -> 1204 bytes
 gfx/mapobjects/stairs/red-carpet-front_tr-bl.mobj |  Bin 0 -> 1213 bytes
 gfx/mapobjects/walls/Makefile.am                  |    4 +-
 gfx/mapobjects/walls/window_back.mobj             |  Bin 0 -> 1113 bytes
 gfx/mapobjects/walls/window_front.mobj            |  Bin 0 -> 1549 bytes
 gfx/mapobjects/walls/window_left.mobj             |  Bin 0 -> 236 bytes
 gfx/mapobjects/walls/window_right.mobj            |  Bin 0 -> 239 bytes
 gfx/mapobjects/walls/window_round_front.mobj      |  Bin 0 -> 1351 bytes
 maps/test.map                                     |  Bin 1690 -> 1792 bytes
 scripts/events/1st_to_2nd.py                      |   10 +++
 scripts/events/1st_to_fellnir.py                  |    2 +-
 scripts/events/1st_to_frostbloom.py               |    2 +-
 scripts/events/1st_to_player.py                   |    2 +-
 scripts/events/1st_to_silverhair.py               |    4 +-
 scripts/events/2nd_to_oliver.py                   |    2 +-
 scripts/events/Makefile.am                        |    3 +-
 scripts/events/barn_to_cellar.py                  |   10 +++
 scripts/events/cellar_to_dwarfs.py                |    1 +
 scripts/events/common_to_1st.py                   |   10 +++
 scripts/events/common_to_cellar.py                |   10 +++
 scripts/events/kitchen_to_cellar.py               |   10 +++
 scripts/init.py                                   |   94 +++++++++++++++++++--
 scripts/modules/events.py                         |    3 +
 scripts/modules/schedules.py                      |   20 ++++-
 scripts/schedules/erek.py                         |    2 +-
 scripts/schedules/keyboard_control.py             |    4 +-
 scripts/schedules/oliver.py                       |   10 ++-
 scripts/schedules/sarin.py                        |    2 +-
 scripts/schedules/silverhair.py                   |    2 +-
 33 files changed, 187 insertions(+), 25 deletions(-)

diff --git a/gfx/mapobjects/stairs/Makefile.am 
b/gfx/mapobjects/stairs/Makefile.am
index 7d7ec6b..63f3f19 100755
--- a/gfx/mapobjects/stairs/Makefile.am
+++ b/gfx/mapobjects/stairs/Makefile.am
@@ -1,6 +1,9 @@
 pkgdatadir = $(gamedatadir)/gfx/mapobjects/stairs
 
 pkgdata_DATA = red-carpet_bl-tr.mobj red-carpet_br-tl.mobj \
-       red-carpet_tr-bl.mobj red-carpet_tl-br.mobj
+       red-carpet_tr-bl.mobj red-carpet_tl-br.mobj \
+       red-carpet-front_bl-tr.mobj red-carpet-front_back.mobj \
+       red-carpet-front_br-tl.mobj red-carpet-front_tl-br.mobj \
+       red-carpet-front_tr-bl.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/stairs/red-carpet-front_back.mobj 
b/gfx/mapobjects/stairs/red-carpet-front_back.mobj
new file mode 100755
index 0000000..e3a3f67
Binary files /dev/null and b/gfx/mapobjects/stairs/red-carpet-front_back.mobj 
differ
diff --git a/gfx/mapobjects/stairs/red-carpet-front_bl-tr.mobj 
b/gfx/mapobjects/stairs/red-carpet-front_bl-tr.mobj
new file mode 100755
index 0000000..8ea34d0
Binary files /dev/null and b/gfx/mapobjects/stairs/red-carpet-front_bl-tr.mobj 
differ
diff --git a/gfx/mapobjects/stairs/red-carpet-front_br-tl.mobj 
b/gfx/mapobjects/stairs/red-carpet-front_br-tl.mobj
new file mode 100755
index 0000000..e639bc1
Binary files /dev/null and b/gfx/mapobjects/stairs/red-carpet-front_br-tl.mobj 
differ
diff --git a/gfx/mapobjects/stairs/red-carpet-front_tl-br.mobj 
b/gfx/mapobjects/stairs/red-carpet-front_tl-br.mobj
new file mode 100755
index 0000000..3f4f77c
Binary files /dev/null and b/gfx/mapobjects/stairs/red-carpet-front_tl-br.mobj 
differ
diff --git a/gfx/mapobjects/stairs/red-carpet-front_tr-bl.mobj 
b/gfx/mapobjects/stairs/red-carpet-front_tr-bl.mobj
new file mode 100755
index 0000000..7fde97b
Binary files /dev/null and b/gfx/mapobjects/stairs/red-carpet-front_tr-bl.mobj 
differ
diff --git a/gfx/mapobjects/walls/Makefile.am b/gfx/mapobjects/walls/Makefile.am
index 7d18e4b..892c439 100755
--- a/gfx/mapobjects/walls/Makefile.am
+++ b/gfx/mapobjects/walls/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = inside stone cellar
 
 pkgdatadir = $(gamedatadir)/gfx/mapobjects/walls
 
-pkgdata_DATA = painting1.mobj painting2.mobj painting3.mobj
+pkgdata_DATA = painting1.mobj painting2.mobj painting3.mobj \
+       window_right.mobj window_left.mobj window_front.mobj \
+       window_round_front.mobj window_back.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/walls/window_back.mobj 
b/gfx/mapobjects/walls/window_back.mobj
new file mode 100755
index 0000000..91e9bd9
Binary files /dev/null and b/gfx/mapobjects/walls/window_back.mobj differ
diff --git a/gfx/mapobjects/walls/window_front.mobj 
b/gfx/mapobjects/walls/window_front.mobj
new file mode 100755
index 0000000..5dcc178
Binary files /dev/null and b/gfx/mapobjects/walls/window_front.mobj differ
diff --git a/gfx/mapobjects/walls/window_left.mobj 
b/gfx/mapobjects/walls/window_left.mobj
new file mode 100755
index 0000000..85ce80d
Binary files /dev/null and b/gfx/mapobjects/walls/window_left.mobj differ
diff --git a/gfx/mapobjects/walls/window_right.mobj 
b/gfx/mapobjects/walls/window_right.mobj
new file mode 100755
index 0000000..45448b0
Binary files /dev/null and b/gfx/mapobjects/walls/window_right.mobj differ
diff --git a/gfx/mapobjects/walls/window_round_front.mobj 
b/gfx/mapobjects/walls/window_round_front.mobj
new file mode 100755
index 0000000..ce15004
Binary files /dev/null and b/gfx/mapobjects/walls/window_round_front.mobj differ
diff --git a/maps/test.map b/maps/test.map
index 98d55ca..955ecb8 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/events/1st_to_2nd.py b/scripts/events/1st_to_2nd.py
new file mode 100755
index 0000000..71e438d
--- /dev/null
+++ b/scripts/events/1st_to_2nd.py
@@ -0,0 +1,10 @@
+from events import switch_submap
+
+mychar = characters [name]
+
+# 1st floor to 2nd floor
+if mychar.submap() == 9:
+    switch_submap (mychar, 14, 4, 2, STAND_SOUTH)
+else:
+    switch_submap (mychar, 9, 5, 2, STAND_SOUTH)
+
diff --git a/scripts/events/1st_to_fellnir.py b/scripts/events/1st_to_fellnir.py
index c398533..c16c2dc 100755
--- a/scripts/events/1st_to_fellnir.py
+++ b/scripts/events/1st_to_fellnir.py
@@ -5,5 +5,5 @@ p = characters [name]
 if p.submap () == 9:
   switch_submap (p, 10, 1, 3, STAND_EAST)
 else:
-  switch_submap (p, 9, 7, 3, STAND_WEST)
+  switch_submap (p, 9, 7, 2, STAND_WEST)
 
diff --git a/scripts/events/1st_to_frostbloom.py 
b/scripts/events/1st_to_frostbloom.py
index ff454e7..deb209e 100755
--- a/scripts/events/1st_to_frostbloom.py
+++ b/scripts/events/1st_to_frostbloom.py
@@ -5,6 +5,6 @@ p = characters [name]
 if p.submap () == 9:
   switch_submap (p, 11, 5, 3, STAND_WEST)
 else:
-  switch_submap (p, 9, 1, 3, STAND_EAST)
+  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 2ac5ccd..bb1e57c 100755
--- a/scripts/events/1st_to_player.py
+++ b/scripts/events/1st_to_player.py
@@ -5,5 +5,5 @@ p = characters [name]
 if p.submap () == 9:
   switch_submap (p, 12, 5, 2, STAND_SOUTH)
 else:
-  switch_submap (p, 9, 6, 4, STAND_NORTH)
+  switch_submap (p, 9, 6, 3, STAND_NORTH)
 
diff --git a/scripts/events/1st_to_silverhair.py 
b/scripts/events/1st_to_silverhair.py
index 6b6e437..4359dc7 100755
--- a/scripts/events/1st_to_silverhair.py
+++ b/scripts/events/1st_to_silverhair.py
@@ -3,7 +3,7 @@ from events import switch_submap
 p = characters [name]
 
 if p.submap () == 9:
-  switch_submap (p, 13, 7, 2, STAND_SOUTH)
+  switch_submap (p, 13, 6, 2, STAND_SOUTH)
 else:
-  switch_submap (p, 9, 1, 7, STAND_NORTH)
+  switch_submap (p, 9, 1, 6, STAND_NORTH)
 
diff --git a/scripts/events/2nd_to_oliver.py b/scripts/events/2nd_to_oliver.py
index 2544644..dc563e3 100755
--- a/scripts/events/2nd_to_oliver.py
+++ b/scripts/events/2nd_to_oliver.py
@@ -3,7 +3,7 @@ from events import switch_submap
 p = characters [name]
 
 if p.submap () == 14:
-  switch_submap (p, 16, 5, 5, STAND_WEST)
+  switch_submap (p, 16, 6, 5, STAND_WEST)
 else:
   switch_submap (p, 14, 1, 5, STAND_EAST)
 
diff --git a/scripts/events/Makefile.am b/scripts/events/Makefile.am
index 846a920..7b0e2a9 100755
--- a/scripts/events/Makefile.am
+++ b/scripts/events/Makefile.am
@@ -4,6 +4,7 @@ pkgdata_DATA = common_to_kitchen.py common_to_parlor.py 
inn_to_yard.py \
        yard_to_kitchen.py open_inn_door.py 1st_to_fellnir.py 
1st_to_frostbloom.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
+       cellar_to_storage.py common_to_1st.py 1st_to_2nd.py common_to_cellar.py 
\
+       barn_to_cellar.py kitchen_to_cellar.py
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/scripts/events/barn_to_cellar.py b/scripts/events/barn_to_cellar.py
new file mode 100755
index 0000000..a000f16
--- /dev/null
+++ b/scripts/events/barn_to_cellar.py
@@ -0,0 +1,10 @@
+from events import switch_submap
+
+mychar = characters [name]
+
+# Barn to cellar
+if mychar.submap() == 0:
+    switch_submap (mychar, 4, 12, 2, STAND_SOUTH)
+else:
+    switch_submap (mychar, 0, 24, 11, STAND_SOUTH)
+
diff --git a/scripts/events/cellar_to_dwarfs.py 
b/scripts/events/cellar_to_dwarfs.py
index d7adf8e..1b0da3f 100755
--- a/scripts/events/cellar_to_dwarfs.py
+++ b/scripts/events/cellar_to_dwarfs.py
@@ -8,6 +8,7 @@ if p.submap () == 4:
     if open == 0 or open == 1:
         if p == the_player:
             characters["Bjarn Fingolson"].launch_action (p)
+            p.stand ()
             p.go_west ()
     else:
         switch_submap (p, 7, 1, 6 + (p.posy () - 6), STAND_EAST)
diff --git a/scripts/events/common_to_1st.py b/scripts/events/common_to_1st.py
new file mode 100755
index 0000000..e2ecd12
--- /dev/null
+++ b/scripts/events/common_to_1st.py
@@ -0,0 +1,10 @@
+from events import switch_submap
+
+mychar = characters [name]
+
+# Common room to 1st floor
+if mychar.submap() == 1:
+    switch_submap (mychar, 9, 7, 2, STAND_SOUTH)
+else:
+    switch_submap (mychar, 1, 12, 2, STAND_SOUTH)
+
diff --git a/scripts/events/common_to_cellar.py 
b/scripts/events/common_to_cellar.py
new file mode 100755
index 0000000..325c85b
--- /dev/null
+++ b/scripts/events/common_to_cellar.py
@@ -0,0 +1,10 @@
+from events import switch_submap
+
+mychar = characters [name]
+
+# Common room to cellar
+if mychar.submap() == 1:
+    switch_submap (mychar, 4, 6, 2, STAND_SOUTH)
+else:
+    switch_submap (mychar, 1, 9, 2, STAND_SOUTH)
+
diff --git a/scripts/events/kitchen_to_cellar.py 
b/scripts/events/kitchen_to_cellar.py
new file mode 100755
index 0000000..f13f844
--- /dev/null
+++ b/scripts/events/kitchen_to_cellar.py
@@ -0,0 +1,10 @@
+from events import switch_submap
+
+mychar = characters [name]
+
+# Kitchen to cellar
+if mychar.submap() == 3:
+    switch_submap (mychar, 4, 3, 12, STAND_NORTH)
+else:
+    switch_submap (mychar, 3, 6, 5, STAND_NORTH)
+
diff --git a/scripts/init.py b/scripts/init.py
index 6ecfda4..1471e6d 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -346,7 +346,7 @@ if retval < 5:
         ev.thisown = C
         ev.submap = 9
         ev.x = 8
-        ev.y = 3
+        ev.y = 2
         ev.set_script ("1st_to_fellnir")
         lm.add_event (ev)
 
@@ -362,7 +362,7 @@ if retval < 5:
         ev.thisown = C
         ev.submap = 9
         ev.x = 0
-        ev.y = 3
+        ev.y = 2
         ev.set_script ("1st_to_frostbloom")
         lm.add_event (ev)
 
@@ -378,7 +378,7 @@ if retval < 5:
         ev.thisown = C
         ev.submap = 9
         ev.x = 6
-        ev.y = 5
+        ev.y = 4
         ev.set_script ("1st_to_player")
         lm.add_event (ev)
 
@@ -394,14 +394,14 @@ if retval < 5:
         ev.thisown = C
         ev.submap = 9
         ev.x = 1
-        ev.y = 8
+        ev.y = 7
         ev.set_script ("1st_to_silverhair")
         lm.add_event (ev)
 
         ev = enter_event ()
         ev.thisown = C
         ev.submap = 13
-        ev.x = 7
+        ev.x = 6
         ev.y = 1
         ev.set_script ("1st_to_silverhair")
         lm.add_event (ev)
@@ -433,7 +433,7 @@ if retval < 5:
         ev = enter_event ()
         ev.thisown = C
         ev.submap = 16
-        ev.x = 6
+        ev.x = 7
         ev.y = 5
         ev.set_script ("2nd_to_oliver")
         lm.add_event (ev)
@@ -454,6 +454,86 @@ if retval < 5:
         ev.set_script ("2nd_to_illig")
         lm.add_event (ev)
 
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 1
+        ev.x = 12
+        ev.y = 1
+        ev.set_script ("common_to_1st")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 9
+        ev.x = 7
+        ev.y = 1
+        ev.set_script ("common_to_1st")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 9
+        ev.x = 5
+        ev.y = 1
+        ev.set_script ("1st_to_2nd")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 14
+        ev.x = 4
+        ev.y = 1
+        ev.set_script ("1st_to_2nd")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 1
+        ev.x = 9
+        ev.y = 1
+        ev.set_script ("common_to_cellar")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 4
+        ev.x = 6
+        ev.y = 1
+        ev.set_script ("common_to_cellar")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 4
+        ev.x = 12
+        ev.y = 1
+        ev.set_script ("barn_to_cellar")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 24
+        ev.y = 10
+        ev.set_script ("barn_to_cellar")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 3
+        ev.x = 6
+        ev.y = 6
+        ev.set_script ("kitchen_to_cellar")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 4
+        ev.x = 3
+        ev.y = 13
+        ev.set_script ("kitchen_to_cellar")
+        lm.add_event (ev)
+
         # Now setup the characters
         lucia = characters ["Lucia Redwyne"]
         lucia.set_dialogue ("dialogues/lucia_start")
@@ -530,7 +610,7 @@ if retval < 5:
         sarin.set_dialogue ("dialogues/sarin_start")
         sarin.load ("servant2.mchar")
         sarin.set_map (map_engine.get_landmap ())
-        sarin.jump_to (13, 7, 3)
+        sarin.jump_to (13, 5, 3)
         sarin.set_action ("action_talk")
         sarin.stand_west ()
         sarin.set_schedule ("sarin")
diff --git a/scripts/modules/events.py b/scripts/modules/events.py
index 0c65e1e..017d19e 100755
--- a/scripts/modules/events.py
+++ b/scripts/modules/events.py
@@ -52,9 +52,12 @@ def switch_submap (mychar, x, y, submap, dir):
 
     # -- comparing mychar and player directly does not work (???)
     if mychar.get_name () == gamedata_player ().get_name ():
+        mychar.set_schedule_active (0)
+        mychar.stand ()
         fade_out ()
         mychar.jump_to (x, y, submap, dir)
         fade_in ()
+        mychar.set_schedule_active (1)
     else:
         mychar.jump_to (x, y, submap, dir)
 
diff --git a/scripts/modules/schedules.py b/scripts/modules/schedules.py
index aa11564..7a71ada 100755
--- a/scripts/modules/schedules.py
+++ b/scripts/modules/schedules.py
@@ -45,10 +45,17 @@ def simple_goto_xy (mychar, goal_x, goal_y):
 
 # -- try to walk in the direction that leads to the goal
 def go_north_south (mychar, dist_x, dist_y, count):
+###   Continue current movment if moving
+##    if mychar.offx () or mychar.offy ():
+##        if mychar.currentmove () == WALK_NORTH:
+##            mychar.go_north ()
+##        elif mychar.currentmove () == WALK_SOUTH:
+##            mychar.go_south ()
+##        return
 
     # -- All four directions blocked -> wait a turn
     if count >= 4: return
-
+        
     # -- try to approach goal in y direction first,
     #    if blocked, try x direction, and if that's not
     #    possible then walk back
@@ -62,7 +69,14 @@ def go_north_south (mychar, dist_x, dist_y, count):
 
 # -- try to walk in the direction that leads to the goal
 def go_east_west (mychar, dist_x, dist_y, count):
-
+###   Continue current movment if moving
+##    if mychar.offx () or mychar.offy ():
+##        if mychar.currentmove () == WALK_WEST:
+##            mychar.go_west ()
+##        elif mychar.currentmove () == WALK_EAST:
+##            mychar.go_east ()
+##        return
+    
     # -- All four directions blocked -> wait a turn
     if count >= 4: return
 
@@ -179,4 +193,4 @@ class bubble (win_container):
         y = (mychar.posy () - view.posy () - mychar.base_y ()) * MAPSQUARE_SIZE
         y = y + mychar.offy () - view.offy () - 40 + self.offy
 
-        return (x, y)
\ No newline at end of file
+        return (x, y)
diff --git a/scripts/schedules/erek.py b/scripts/schedules/erek.py
index 33ecb80..434d5a3 100755
--- a/scripts/schedules/erek.py
+++ b/scripts/schedules/erek.py
@@ -44,7 +44,7 @@ elif myself.get_val ("leave_bjarn") == 1:
 
     # -- in the Cellar
     elif submap == 4:
-        schedules.simple_goto_xy (myself, 5, 2)
+        schedules.simple_goto_xy (myself, 6, 1)
 
     # -- hopefully in the common room
     else:
diff --git a/scripts/schedules/keyboard_control.py 
b/scripts/schedules/keyboard_control.py
index a53ca9d..2cd8222 100755
--- a/scripts/schedules/keyboard_control.py
+++ b/scripts/schedules/keyboard_control.py
@@ -93,13 +93,13 @@ elif input_is_pushed (SDLK_RIGHT): myself.go_east ()
 elif input_is_pushed (SDLK_LEFT): myself.go_west ()
 
 # Special tip! :)
-elif input_has_been_pushed (SDLK_KP_PLUS):
+elif input_has_been_pushed (SDLK_n):
     if myself.submap () < map_engine.get_landmap ().nbr_of_submaps () - 1:
         myself.jump_to (myself.submap () + 1, 5, 3)
     else:
         myself.jump_to (0, 7, 18)
 
-elif input_has_been_pushed (SDLK_KP_MINUS):
+elif input_has_been_pushed (SDLK_p):
     if myself.submap () > 1:
         myself.jump_to (myself.submap () - 1, 5, 3)
     elif myself.submap () == 1:
diff --git a/scripts/schedules/oliver.py b/scripts/schedules/oliver.py
index cc57dfa..6acdcac 100755
--- a/scripts/schedules/oliver.py
+++ b/scripts/schedules/oliver.py
@@ -39,6 +39,7 @@ elif myself.get_val ("goto_players_room") == 2:
     myself.launch_action (the_player)
     # -- does not make a change
     myself.set_schedule_active (0)
+    the_player.set_schedule_active (0)
 
 # -- leave the player's room and goto the barn
 elif myself.get_val ("goto_barn") == 1:
@@ -50,12 +51,19 @@ elif myself.get_val ("goto_barn") == 1:
 
     # -- First floor
     elif location == 9:
-        schedules.simple_goto_xy (myself, 6, 1)
+        schedules.simple_goto_xy (myself, 7, 1)
 
     # -- Common Room
     elif location == 1:
         schedules.simple_goto_xy (myself, 13, 8)
 
+    # -- Yard
+    elif location == 0:
+        if myself.posx () == 25 and myself.posy () == 15:
+            myself.set_val ("goto_barn", 0)
+        else:
+            schedules.simple_goto_xy (myself, 25, 15)
+
     # -- should be outside the inn!
     else:
         myself.set_val ("goto_barn", 0)
diff --git a/scripts/schedules/sarin.py b/scripts/schedules/sarin.py
index 72cd41f..604733c 100755
--- a/scripts/schedules/sarin.py
+++ b/scripts/schedules/sarin.py
@@ -20,7 +20,7 @@ import random
 
 # -- Borders of the area he should stay in
 min_x = 1
-max_x = 7
+max_x = 6
 min_y = 2
 max_y = 6
 
diff --git a/scripts/schedules/silverhair.py b/scripts/schedules/silverhair.py
index 3f9c0af..4d80201 100755
--- a/scripts/schedules/silverhair.py
+++ b/scripts/schedules/silverhair.py
@@ -46,7 +46,7 @@ if todo == 0:
 
 # -- walk up to the window and wait a little
 elif todo < 0:
-    if schedules.simple_goto_xy (myself, 7, 5) == 1:
+    if schedules.simple_goto_xy (myself, 6, 4) == 1:
         myself.stand_east ()
 
         # -- speak