[adonthell-wastesedge-commits] Release_0-3-1 89ba59b 024/237: Continued map rooms.

[Kai Sterker]

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

    Continued map rooms.
    Added the opening gate.
---
 Makefile.am                                      |    2 +-
 character.data                                   |  Bin 544 -> 586 bytes
 gfx/mapobjects/exteriors/Makefile.am             |    2 +-
 gfx/mapobjects/exteriors/gate-back.mobj          |  Bin 0 -> 2897 bytes
 gfx/mapobjects/exteriors/gate-fore.mobj          |  Bin 0 -> 2915 bytes
 gfx/mapobjects/floorings/Makefile.am             |    4 +-
 gfx/mapobjects/floorings/terracotta-tiles-1.mobj |  Bin 0 -> 1107 bytes
 gfx/mapobjects/floorings/terracotta-tiles-2.mobj |  Bin 0 -> 1153 bytes
 gfx/mapobjects/floorings/terracotta-tiles-3.mobj |  Bin 0 -> 1128 bytes
 gfx/mapobjects/floorings/woodenplanks_2_1.mobj   |  Bin 0 -> 1160 bytes
 gfx/mapobjects/floorings/woodenplanks_2_2.mobj   |  Bin 0 -> 1150 bytes
 gfx/mapobjects/walls/cellar/cellar-br-lf.mobj    |  Bin 2732 -> 2732 bytes
 mapengine.data                                   |  Bin 274 -> 56 bytes
 maps/test.map                                    |  Bin 1204 -> 1641 bytes
 quest.data                                       |  Bin 32 -> 64 bytes
 save.data                                        |  Bin 75 -> 0 bytes
 scripts/events/1st_to_fellnir.py                 |   28 ++
 scripts/events/1st_to_frostbloom.py              |   28 ++
 scripts/events/1st_to_player.py                  |   28 ++
 scripts/events/1st_to_silverhair.py              |   28 ++
 scripts/events/2nd_to_illig.py                   |   28 ++
 scripts/events/2nd_to_oliver.py                  |   28 ++
 scripts/events/2nd_to_redwyne.py                 |   28 ++
 scripts/events/Makefile.am                       |    6 +-
 scripts/events/cellar_to_alek.py                 |   28 ++
 scripts/events/cellar_to_bath.py                 |   28 ++
 scripts/events/cellar_to_dwarfs.py               |   28 ++
 scripts/events/cellar_to_storage.py              |   28 ++
 scripts/events/common_to_kitchen.py              |   38 +--
 scripts/events/common_to_parlor.py               |   38 +--
 scripts/events/inn_to_yard.py                    |   42 +--
 scripts/events/kitchen_to_common.py              |   22 --
 scripts/events/kitchen_to_yard.py                |   22 --
 scripts/events/parlor_to_common.py               |   22 --
 scripts/events/yard_to_inn.py                    |   24 --
 scripts/events/yard_to_kitchen.py                |   39 +--
 scripts/init.py                                  |  334 +++++++++++++++++++++-
 scripts/schedules/keyboard_control.py            |   47 ++-
 38 files changed, 789 insertions(+), 161 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 80db1ac..3274b31 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = audio gfx maps scripts
 
 pkgdatadir = $(gamedatadir)
 
-pkgdata_DATA = gamename.txt character.data mapengine.data quest.data save.data
+pkgdata_DATA = gamename.txt character.data mapengine.data quest.data
 
 EXTRA_DIST = $(pkgdata_DATA)
 
diff --git a/character.data b/character.data
index 3df4ee7..b718e78 100755
Binary files a/character.data and b/character.data differ
diff --git a/gfx/mapobjects/exteriors/Makefile.am 
b/gfx/mapobjects/exteriors/Makefile.am
index 263b284..6231549 100755
--- a/gfx/mapobjects/exteriors/Makefile.am
+++ b/gfx/mapobjects/exteriors/Makefile.am
@@ -1,5 +1,5 @@
 pkgdatadir = $(gamedatadir)/gfx/mapobjects/exteriors
 
-pkgdata_DATA = treeleaves.mobj tree.mobj vine.mobj
+pkgdata_DATA = treeleaves.mobj tree.mobj vine.mobj gate-fore.mobj 
gate-back.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/exteriors/gate-back.mobj 
b/gfx/mapobjects/exteriors/gate-back.mobj
new file mode 100755
index 0000000..459e2a9
Binary files /dev/null and b/gfx/mapobjects/exteriors/gate-back.mobj differ
diff --git a/gfx/mapobjects/exteriors/gate-fore.mobj 
b/gfx/mapobjects/exteriors/gate-fore.mobj
new file mode 100755
index 0000000..186f611
Binary files /dev/null and b/gfx/mapobjects/exteriors/gate-fore.mobj differ
diff --git a/gfx/mapobjects/floorings/Makefile.am 
b/gfx/mapobjects/floorings/Makefile.am
index 5ea2ec8..e323c6e 100755
--- a/gfx/mapobjects/floorings/Makefile.am
+++ b/gfx/mapobjects/floorings/Makefile.am
@@ -1,6 +1,8 @@
 pkgdatadir = $(gamedatadir)/gfx/mapobjects/floorings
 
 pkgdata_DATA = woodenplanks.mobj bath-floor2b.mobj bath-floor2a.mobj \
-       bath-floor1b.mobj bath-floor1a.mobj
+       bath-floor1b.mobj bath-floor1a.mobj terracotta-tiles-1.mobj \
+       terracotta-tiles-3.mobj terracotta-tiles-3.mobj woodenplanks_2_1.mobj \
+       woodenplanks_2_2.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/floorings/terracotta-tiles-1.mobj 
b/gfx/mapobjects/floorings/terracotta-tiles-1.mobj
new file mode 100755
index 0000000..d088f7c
Binary files /dev/null and b/gfx/mapobjects/floorings/terracotta-tiles-1.mobj 
differ
diff --git a/gfx/mapobjects/floorings/terracotta-tiles-2.mobj 
b/gfx/mapobjects/floorings/terracotta-tiles-2.mobj
new file mode 100755
index 0000000..633724d
Binary files /dev/null and b/gfx/mapobjects/floorings/terracotta-tiles-2.mobj 
differ
diff --git a/gfx/mapobjects/floorings/terracotta-tiles-3.mobj 
b/gfx/mapobjects/floorings/terracotta-tiles-3.mobj
new file mode 100755
index 0000000..0f68bc4
Binary files /dev/null and b/gfx/mapobjects/floorings/terracotta-tiles-3.mobj 
differ
diff --git a/gfx/mapobjects/floorings/woodenplanks_2_1.mobj 
b/gfx/mapobjects/floorings/woodenplanks_2_1.mobj
new file mode 100755
index 0000000..e48013d
Binary files /dev/null and b/gfx/mapobjects/floorings/woodenplanks_2_1.mobj 
differ
diff --git a/gfx/mapobjects/floorings/woodenplanks_2_2.mobj 
b/gfx/mapobjects/floorings/woodenplanks_2_2.mobj
new file mode 100755
index 0000000..cb889b1
Binary files /dev/null and b/gfx/mapobjects/floorings/woodenplanks_2_2.mobj 
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-br-lf.mobj 
b/gfx/mapobjects/walls/cellar/cellar-br-lf.mobj
index 201a136..f719a4c 100755
Binary files a/gfx/mapobjects/walls/cellar/cellar-br-lf.mobj and 
b/gfx/mapobjects/walls/cellar/cellar-br-lf.mobj differ
diff --git a/mapengine.data b/mapengine.data
index 4b6e221..a5a5375 100755
Binary files a/mapengine.data and b/mapengine.data differ
diff --git a/maps/test.map b/maps/test.map
index a4c7776..ded1925 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/quest.data b/quest.data
index eec2607..764c74f 100755
Binary files a/quest.data and b/quest.data differ
diff --git a/save.data b/save.data
deleted file mode 100755
index f2f9371..0000000
Binary files a/save.data and /dev/null differ
diff --git a/scripts/events/1st_to_fellnir.py b/scripts/events/1st_to_fellnir.py
new file mode 100755
index 0000000..10d36e7
--- /dev/null
+++ b/scripts/events/1st_to_fellnir.py
@@ -0,0 +1,28 @@
+p = characters [name]
+p.set_schedule_active (0)
+p.stand ()
+
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 9:
+  p.jump_to (10, 1, 3, STAND_EAST)
+else:
+  p.jump_to (9, 7, 3, STAND_WEST)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
+p.set_schedule_active (1)
diff --git a/scripts/events/1st_to_frostbloom.py 
b/scripts/events/1st_to_frostbloom.py
new file mode 100755
index 0000000..37a07fb
--- /dev/null
+++ b/scripts/events/1st_to_frostbloom.py
@@ -0,0 +1,28 @@
+p = characters [name]
+p.set_schedule_active (0)
+p.stand ()
+
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 9:
+  p.jump_to (11, 5, 3, STAND_WEST)
+else:
+  p.jump_to (9, 1, 3, STAND_EAST)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
+p.set_schedule_active (1)
diff --git a/scripts/events/1st_to_player.py b/scripts/events/1st_to_player.py
new file mode 100755
index 0000000..6aa42d9
--- /dev/null
+++ b/scripts/events/1st_to_player.py
@@ -0,0 +1,28 @@
+p = characters [name]
+p.set_schedule_active (0)
+p.stand ()
+
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 9:
+  p.jump_to (12, 5, 2, STAND_SOUTH)
+else:
+  p.jump_to (9, 6, 4, STAND_NORTH)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
+p.set_schedule_active (1)
diff --git a/scripts/events/1st_to_silverhair.py 
b/scripts/events/1st_to_silverhair.py
new file mode 100755
index 0000000..41dbaf9
--- /dev/null
+++ b/scripts/events/1st_to_silverhair.py
@@ -0,0 +1,28 @@
+p = characters [name]
+p.set_schedule_active (0)
+p.stand ()
+
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 9:
+  p.jump_to (13, 7, 2, STAND_SOUTH)
+else:
+  p.jump_to (9, 1, 7, STAND_NORTH)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
+p.set_schedule_active (1)
diff --git a/scripts/events/2nd_to_illig.py b/scripts/events/2nd_to_illig.py
new file mode 100755
index 0000000..0897c0e
--- /dev/null
+++ b/scripts/events/2nd_to_illig.py
@@ -0,0 +1,28 @@
+p = characters [name]
+p.set_schedule_active (0)
+p.stand ()
+
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 14:
+  p.jump_to (17, 6, 2, STAND_SOUTH)
+else:
+  p.jump_to (14, 1, 7, STAND_NORTH)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
+p.set_schedule_active (1)
diff --git a/scripts/events/2nd_to_oliver.py b/scripts/events/2nd_to_oliver.py
new file mode 100755
index 0000000..a22c4ff
--- /dev/null
+++ b/scripts/events/2nd_to_oliver.py
@@ -0,0 +1,28 @@
+p = characters [name]
+p.set_schedule_active (0)
+p.stand ()
+
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 14:
+  p.jump_to (16, 5, 5, STAND_WEST)
+else:
+  p.jump_to (14, 1, 5, STAND_EAST)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
+p.set_schedule_active (1)
diff --git a/scripts/events/2nd_to_redwyne.py b/scripts/events/2nd_to_redwyne.py
new file mode 100755
index 0000000..ec09a56
--- /dev/null
+++ b/scripts/events/2nd_to_redwyne.py
@@ -0,0 +1,28 @@
+p = characters [name]
+p.set_schedule_active (0)
+p.stand ()
+
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 14:
+  p.jump_to (15, 1, 5, STAND_EAST)
+else:
+  p.jump_to (14, 2, 5, STAND_WEST)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
+p.set_schedule_active (1)
diff --git a/scripts/events/Makefile.am b/scripts/events/Makefile.am
index a61883a..846a920 100755
--- a/scripts/events/Makefile.am
+++ b/scripts/events/Makefile.am
@@ -1,7 +1,9 @@
 pkgdatadir = $(gamedatadir)/scripts/events
 
 pkgdata_DATA = common_to_kitchen.py common_to_parlor.py inn_to_yard.py \
-       kitchen_to_common.py kitchen_to_yard.py parlor_to_common.py \
-       yard_to_inn.py yard_to_kitchen.py open_inn_door.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
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/scripts/events/cellar_to_alek.py b/scripts/events/cellar_to_alek.py
new file mode 100755
index 0000000..c7df0cf
--- /dev/null
+++ b/scripts/events/cellar_to_alek.py
@@ -0,0 +1,28 @@
+p = characters [name]
+p.set_schedule_active (0)
+p.stand ()
+
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 4:
+  p.jump_to (6, 5, 6 + (p.posy () - 6), STAND_WEST)
+else:
+  p.jump_to (4, 1, 6 + (p.posy () - 6), STAND_EAST)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
+p.set_schedule_active (1)
diff --git a/scripts/events/cellar_to_bath.py b/scripts/events/cellar_to_bath.py
new file mode 100755
index 0000000..31007eb
--- /dev/null
+++ b/scripts/events/cellar_to_bath.py
@@ -0,0 +1,28 @@
+p = characters [name]
+p.set_schedule_active (0)
+p.stand ()
+
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 4:
+  p.jump_to (5, 3, 6, STAND_NORTH)
+else:
+  p.jump_to (4, 2, 6, STAND_SOUTH)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
+p.set_schedule_active (1)
diff --git a/scripts/events/cellar_to_dwarfs.py 
b/scripts/events/cellar_to_dwarfs.py
new file mode 100755
index 0000000..5d32537
--- /dev/null
+++ b/scripts/events/cellar_to_dwarfs.py
@@ -0,0 +1,28 @@
+p = characters [name]
+p.set_schedule_active (0)
+p.stand ()
+
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 4:
+  p.jump_to (7, 1, 6 + (p.posy () - 6), STAND_EAST)
+else:
+  p.jump_to (4, 9, 6 + (p.posy () - 6), STAND_WEST)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
+p.set_schedule_active (1)
diff --git a/scripts/events/cellar_to_storage.py 
b/scripts/events/cellar_to_storage.py
new file mode 100755
index 0000000..4390a58
--- /dev/null
+++ b/scripts/events/cellar_to_storage.py
@@ -0,0 +1,28 @@
+p = characters [name]
+p.set_schedule_active (0)
+p.stand ()
+
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 4:
+  p.jump_to (8, 6, 3 + (p.posy () - 9), STAND_WEST)
+else:
+  p.jump_to (4, 1, 9 + (p.posy () - 3), STAND_EAST)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
+p.set_schedule_active (1)
diff --git a/scripts/events/common_to_kitchen.py 
b/scripts/events/common_to_kitchen.py
index a12c567..ca788bb 100755
--- a/scripts/events/common_to_kitchen.py
+++ b/scripts/events/common_to_kitchen.py
@@ -1,22 +1,28 @@
 p = characters [name]
 p.set_schedule_active (0)
 p.stand ()
-i = 0
-while i < 60:
-  map_engine.mainloop ()
-  screen_transition (i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i + (gametime_frames_to_do () * 2)
 
-p.jump_to (3, 1, 2, STAND_SOUTH)
-i=60
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
 
-while i > 0:
-  map_engine.mainloop ()
-  screen_transition(i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i - (gametime_frames_to_do () * 2)
-  
+if p.submap () == 1:
+  p.jump_to (3, 1, 2, STAND_SOUTH)
+else:
+  p.jump_to (1, 1, 7, STAND_NORTH)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
 p.set_schedule_active (1)
diff --git a/scripts/events/common_to_parlor.py 
b/scripts/events/common_to_parlor.py
index e394154..1a6b5c1 100755
--- a/scripts/events/common_to_parlor.py
+++ b/scripts/events/common_to_parlor.py
@@ -1,22 +1,28 @@
 p = characters [name]
 p.set_schedule_active (0)
 p.stand ()
-i = 0
-while i < 60:
-  map_engine.mainloop ()
-  screen_transition (i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i + (gametime_frames_to_do () * 2)
 
-p.jump_to (2, 1, 4, STAND_EAST)
-i=60
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
 
-while i > 0:
-  map_engine.mainloop ()
-  screen_transition(i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i - (gametime_frames_to_do () * 2)
-  
+if p.submap () == 1:
+  p.jump_to (2, 1, 4, STAND_EAST)
+else:
+  p.jump_to (1, 13, 4, STAND_WEST)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
 p.set_schedule_active (1)
diff --git a/scripts/events/inn_to_yard.py b/scripts/events/inn_to_yard.py
index 5c87815..0049508 100755
--- a/scripts/events/inn_to_yard.py
+++ b/scripts/events/inn_to_yard.py
@@ -1,22 +1,32 @@
 p = characters [name]
 p.set_schedule_active (0)
 p.stand ()
-i = 0
-while i < 60:
-  map_engine.mainloop ()
-  screen_transition (i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i + (gametime_frames_to_do () * 2)
 
-p.jump_to (0, 18, 14, STAND_SOUTH)
-i=60
+# Close the inn door.
+if p.submap () == 0:
+  map_engine.get_landmap ().get_mapobject (0).get_animation (0).next_frame ()
 
-while i > 0:
-  map_engine.mainloop ()
-  screen_transition(i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i - (gametime_frames_to_do () * 2)
-  
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
+
+if p.submap () == 1:
+  p.jump_to (0, 18, 14, STAND_SOUTH)
+else:
+  p.jump_to (1, 13, 7, STAND_NORTH)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
 p.set_schedule_active (1)
diff --git a/scripts/events/kitchen_to_common.py 
b/scripts/events/kitchen_to_common.py
deleted file mode 100755
index a035593..0000000
--- a/scripts/events/kitchen_to_common.py
+++ /dev/null
@@ -1,22 +0,0 @@
-p = characters [name]
-p.set_schedule_active (0)
-p.stand ()
-i = 0
-while i < 60:
-  map_engine.mainloop ()
-  screen_transition (i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i + (gametime_frames_to_do () * 2)
-
-p.jump_to (1, 1, 7, STAND_NORTH)
-i=60
-
-while i > 0:
-  map_engine.mainloop ()
-  screen_transition(i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i - (gametime_frames_to_do () * 2)
-  
-p.set_schedule_active (1)
diff --git a/scripts/events/kitchen_to_yard.py 
b/scripts/events/kitchen_to_yard.py
deleted file mode 100755
index fd9259c..0000000
--- a/scripts/events/kitchen_to_yard.py
+++ /dev/null
@@ -1,22 +0,0 @@
-p = characters [name]
-p.set_schedule_active (0)
-p.stand ()
-i = 0
-while i < 60:
-  map_engine.mainloop ()
-  screen_transition (i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i + (gametime_frames_to_do () * 2)
-
-p.jump_to (0, 12, 14, STAND_EAST)
-i=60
-
-while i > 0:
-  map_engine.mainloop ()
-  screen_transition(i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i - (gametime_frames_to_do () * 2)
-  
-p.set_schedule_active (1)
diff --git a/scripts/events/parlor_to_common.py 
b/scripts/events/parlor_to_common.py
deleted file mode 100755
index 8bc1144..0000000
--- a/scripts/events/parlor_to_common.py
+++ /dev/null
@@ -1,22 +0,0 @@
-p = characters [name]
-p.set_schedule_active (0)
-p.stand ()
-i = 0
-while i < 60:
-  map_engine.mainloop ()
-  screen_transition (i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i + (gametime_frames_to_do () * 2)
-
-p.jump_to (1, 13, 4, STAND_WEST)
-i=60
-
-while i > 0:
-  map_engine.mainloop ()
-  screen_transition(i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i - (gametime_frames_to_do () * 2)
-  
-p.set_schedule_active (1)
diff --git a/scripts/events/yard_to_inn.py b/scripts/events/yard_to_inn.py
deleted file mode 100755
index eff20b2..0000000
--- a/scripts/events/yard_to_inn.py
+++ /dev/null
@@ -1,24 +0,0 @@
-map_engine.get_landmap ().get_mapobject (0).get_animation (0).next_frame ()
-
-p = characters [name]
-p.set_schedule_active (0)
-p.stand ()
-i = 0
-while i < 60:
-  map_engine.mainloop ()
-  screen_transition (i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i + (gametime_frames_to_do () * 2)
-
-p.jump_to (1, 13, 7, STAND_NORTH)
-i=60
-
-while i > 0:
-  map_engine.mainloop ()
-  screen_transition (i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i - (gametime_frames_to_do () * 2)
-  
-p.set_schedule_active (1)
diff --git a/scripts/events/yard_to_kitchen.py 
b/scripts/events/yard_to_kitchen.py
index 12e3291..c51599c 100755
--- a/scripts/events/yard_to_kitchen.py
+++ b/scripts/events/yard_to_kitchen.py
@@ -1,22 +1,29 @@
 p = characters [name]
 p.set_schedule_active (0)
 p.stand ()
-i = 0
-while i < 60:
-  map_engine.mainloop ()
-  screen_transition (i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i + (gametime_frames_to_do () * 2)
 
-p.jump_to (3, 6, 3, STAND_WEST)
-i=60
+if p == the_player:
+  i = 0
+  while i < 60:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i + (gametime_frames_to_do () * 2)
 
-while i > 0:
-  map_engine.mainloop ()
-  screen_transition(i * 2)
-  screen_show ()
-  gametime_update ()
-  i = i - (gametime_frames_to_do () * 2)
-  
+if p.submap () == 0:
+  p.jump_to (3, 6, 3, STAND_WEST)
+else:
+  p.jump_to (0, 12, 14, STAND_EAST)
+
+if p == the_player:
+  i=60
+  while i > 0:
+    map_engine.mainloop ()
+    screen_transition (i * 2)
+    screen_show ()
+    gametime_update ()
+    i = i - (gametime_frames_to_do () * 2)
+    
 p.set_schedule_active (1)
+
diff --git a/scripts/init.py b/scripts/init.py
index 0fbcbdb..d11eb75 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -141,7 +141,339 @@ del bag_o
 
 audio_pause_music ()
 
+retval = 1
+
 if retval < 5: 
-    if retval == 1: gamedata_load(0)
+    if retval == 1:
+        gamedata_load (0)
+
+        # Creates the context for the game start
+        map_engine.load_map ("test.map")
+        lm = map_engine.get_landmap ()
+        the_player.load ("player.mchar")
+        the_player.set_map (lm)
+        the_player.jump_to (0, 11, 18, STAND_EAST)
+        the_player.set_schedule ("keyboard_control")
+        map_engine.set_mapview_schedule ("center_player")
+        
+        # Now add a few events...
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 18
+        ev.y = 13
+        ev.set_script ("inn_to_yard")
+        lm.add_event (ev)
+        
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 1
+        ev.x = 13
+        ev.y = 8
+        ev.set_script ("inn_to_yard")
+        lm.add_event (ev)
+        
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 1
+        ev.x = 14
+        ev.y = 4
+        ev.set_script ("common_to_parlor")
+        lm.add_event (ev)
+        
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 2
+        ev.x = 0
+        ev.y = 4
+        ev.set_script ("common_to_parlor")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 1
+        ev.x = 1
+        ev.y = 8
+        ev.set_script ("common_to_kitchen")
+        lm.add_event (ev)
+        
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 3
+        ev.x = 1
+        ev.y = 1
+        ev.set_script ("common_to_kitchen")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 3
+        ev.x = 7
+        ev.y = 3
+        ev.set_script ("yard_to_kitchen")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 11
+        ev.y = 14
+        ev.set_script ("yard_to_kitchen")
+        lm.add_event (ev)
+
+        ev = leave_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 18
+        ev.y = 14
+        ev.dir = WALK_NORTH
+        ev.set_script ("open_inn_door")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 4
+        ev.x = 2
+        ev.y = 5
+        ev.set_script ("cellar_to_bath")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 5
+        ev.x = 3
+        ev.y = 7
+        ev.set_script ("cellar_to_bath")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 4
+        ev.x = 0
+        ev.y = 6
+        ev.set_script ("cellar_to_alek")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 4
+        ev.x = 0
+        ev.y = 7
+        ev.set_script ("cellar_to_alek")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 6
+        ev.x = 6
+        ev.y = 6
+        ev.set_script ("cellar_to_alek")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 6
+        ev.x = 6
+        ev.y = 7
+        ev.set_script ("cellar_to_alek")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 4
+        ev.x = 0
+        ev.y = 9
+        ev.set_script ("cellar_to_storage")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 4
+        ev.x = 0
+        ev.y = 10
+        ev.set_script ("cellar_to_storage")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 8
+        ev.x = 7
+        ev.y = 3
+        ev.set_script ("cellar_to_storage")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 8
+        ev.x = 7
+        ev.y = 4
+        ev.set_script ("cellar_to_storage")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 4
+        ev.x = 10
+        ev.y = 6
+        ev.set_script ("cellar_to_dwarfs")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 4
+        ev.x = 10
+        ev.y = 7
+        ev.set_script ("cellar_to_dwarfs")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 7
+        ev.x = 0
+        ev.y = 6
+        ev.set_script ("cellar_to_dwarfs")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 7
+        ev.x = 0
+        ev.y = 7
+        ev.set_script ("cellar_to_dwarfs")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 9
+        ev.x = 8
+        ev.y = 3
+        ev.set_script ("1st_to_fellnir")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 10
+        ev.x = 0
+        ev.y = 3
+        ev.set_script ("1st_to_fellnir")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 9
+        ev.x = 0
+        ev.y = 3
+        ev.set_script ("1st_to_frostbloom")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 11
+        ev.x = 6
+        ev.y = 3
+        ev.set_script ("1st_to_frostbloom")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 9
+        ev.x = 6
+        ev.y = 5
+        ev.set_script ("1st_to_player")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 12
+        ev.x = 5
+        ev.y = 1
+        ev.set_script ("1st_to_player")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 9
+        ev.x = 1
+        ev.y = 8
+        ev.set_script ("1st_to_silverhair")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 13
+        ev.x = 7
+        ev.y = 1
+        ev.set_script ("1st_to_silverhair")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 14
+        ev.x = 3
+        ev.y = 5
+        ev.set_script ("2nd_to_redwyne")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 15
+        ev.x = 0
+        ev.y = 5
+        ev.set_script ("2nd_to_redwyne")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 14
+        ev.x = 0
+        ev.y = 5
+        ev.set_script ("2nd_to_oliver")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 16
+        ev.x = 6
+        ev.y = 5
+        ev.set_script ("2nd_to_oliver")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 14
+        ev.x = 1
+        ev.y = 8
+        ev.set_script ("2nd_to_illig")
+        lm.add_event (ev)
+
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 17
+        ev.x = 6
+        ev.y = 1
+        ev.set_script ("2nd_to_illig")
+        lm.add_event (ev)
+
+        # Now setup the characters
+        lucia = characters ["Lucia Redwyne"]
+        lucia.set_dialogue ("dialogues/lucia_start")
+        lucia.load ("lucia.mchar")
+        lucia.set_map (map_engine.get_landmap ())
+        lucia.jump_to (3, 4, 2)
+        lucia.set_action ("action_talk")
+        lucia.stand_south ()
+        
+        orloth = characters ["Orloth Redwyne"]
+        orloth.set_dialogue ("dialogues/orloth_start")
+        orloth.load ("orloth.mchar")
+        orloth.set_map (map_engine.get_landmap ())
+        orloth.jump_to (1, 2, 2)
+        orloth.set_action ("action_talk")
+        orloth.stand_south ()
+
+        # Once we want to generate the data context files,
+        # just call gamedata::save (1) and copy the .data files
+        # to the game's root directory.
+
     audio_play_background (1)
     map_engine.run()
diff --git a/scripts/schedules/keyboard_control.py 
b/scripts/schedules/keyboard_control.py
index 813be85..8b67adf 100755
--- a/scripts/schedules/keyboard_control.py
+++ b/scripts/schedules/keyboard_control.py
@@ -8,6 +8,52 @@ def on_menu_close (retval, player):
     if retval == 5:
         map_engine.quit ()
 
+# Opens the gate
+def open_gate ():
+    # Get the mapobjects
+    gate_fore = map_engine.get_landmap ().get_mapobject (90)
+    gate_back = map_engine.get_landmap ().get_mapobject (89)
+
+    # Only open the gate if it's closed...
+    if (gate_fore.get_animation (0).currentframe () == 0):
+        # Plays the gate back animation
+        gate_back.get_animation (0).next_frame ()
+        # Plays the gate fore animation
+        gate_fore.get_animation (0).next_frame ()
+
+        # Update squares walkability
+        sm = map_engine.get_landmap ().get_submap (0)
+        sm.get_square (6, 18).set_walkable_west (1)
+        sm.get_square (6, 19).set_walkable_west (1)
+        sm.get_square (6, 20).set_walkable_west (1)
+
+# Close the gate
+def close_gate ():
+    # Get the mapobjects
+    gate_fore = map_engine.get_landmap ().get_mapobject (90)
+    gate_back = map_engine.get_landmap ().get_mapobject (89)
+
+    # Only close the gate if it's opened
+    if (gate_fore.get_animation (0).currentframe () == 4):
+        # Plays the gate back animation
+        gate_back.get_animation (0).next_frame ()
+        # Plays the gate fore animation
+        gate_fore.get_animation (0).next_frame ()
+
+        # Update squares walkability
+        sm = map_engine.get_landmap ().get_submap (0)
+        sm.get_square (6, 18).set_walkable_west (0)
+        sm.get_square (6, 19).set_walkable_west (0)
+        sm.get_square (6, 20).set_walkable_west (0)
+
+#print "%d %d %d" % (myself.submap (), myself.posx (), myself.posy ())
+
+if input_has_been_pushed (SDLK_o):
+    open_gate ()
+
+if input_has_been_pushed (SDLK_c):
+    close_gate ()
+
 # -- react to the action key
 if input_has_been_pushed (SDLK_SPACE):
     # -- see whether a character(/object) is next to the player
@@ -46,7 +92,6 @@ elif input_is_pushed (SDLK_DOWN): myself.go_south ()
 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):
     if myself.submap () < map_engine.get_landmap ().nbr_of_submaps () - 1: