[adonthell-wastesedge-commits] Release_0-3-1 9a51967 079/237: Continued map.

[Kai Sterker]

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

    Continued map.
---
 gfx/mapobjects/terrains/Makefile.am                    |    6 +++++-
 gfx/mapobjects/terrains/road_sandy.mobj                |  Bin 0 -> 597 bytes
 gfx/mapobjects/terrains/road_sandy_to_grass_bot.mobj   |  Bin 0 -> 878 bytes
 gfx/mapobjects/terrains/road_sandy_to_grass_left.mobj  |  Bin 0 -> 802 bytes
 gfx/mapobjects/terrains/road_sandy_to_grass_right.mobj |  Bin 0 -> 856 bytes
 gfx/mapobjects/terrains/road_sandy_to_grass_top.mobj   |  Bin 0 -> 879 bytes
 gfx/mapobjects/terrains/road_to_stone_bot-left.mobj    |  Bin 0 -> 4225 bytes
 gfx/mapobjects/terrains/road_to_stone_left.mobj        |  Bin 0 -> 4293 bytes
 maps/test.map                                          |  Bin 2463 -> 2561 
bytes
 scripts/events/yard_to_guards.py                       |    2 +-
 scripts/init.py                                        |    4 ++--
 scripts/schedules/keyboard_control.py                  |    5 ++++-
 scripts/schedules/talan.py                             |    2 +-
 13 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/gfx/mapobjects/terrains/Makefile.am 
b/gfx/mapobjects/terrains/Makefile.am
index 4b33e70..bb8c38f 100755
--- a/gfx/mapobjects/terrains/Makefile.am
+++ b/gfx/mapobjects/terrains/Makefile.am
@@ -1,6 +1,10 @@
 pkgdatadir = $(gamedatadir)/gfx/mapobjects/terrains
 
 pkgdata_DATA = grass1.mobj grass2.mobj ground-stone-1.mobj ground-stone2.mobj \
-       hay-bot.mobj hay.mobj stoneflower.mobj stone_ground.mobj 
tree_ground.mobj
+       hay-bot.mobj hay.mobj stoneflower.mobj stone_ground.mobj 
tree_ground.mobj \
+       road_sandy.mobj road_sandy_to_grass_bot.mobj 
road_sandy_to_grass_top.mobj \
+       road_sandy_to_grass_left.mobj road_sandy_to_grass_right.mobj \
+       road_to_stone_bot-left.mobj road_to_stone_left.mobj 
grass_medium-height_front.mobj \
+       grass_medium-height.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/terrains/road_sandy.mobj 
b/gfx/mapobjects/terrains/road_sandy.mobj
new file mode 100644
index 0000000..6c5c108
Binary files /dev/null and b/gfx/mapobjects/terrains/road_sandy.mobj differ
diff --git a/gfx/mapobjects/terrains/road_sandy_to_grass_bot.mobj 
b/gfx/mapobjects/terrains/road_sandy_to_grass_bot.mobj
new file mode 100644
index 0000000..d3e8ab7
Binary files /dev/null and 
b/gfx/mapobjects/terrains/road_sandy_to_grass_bot.mobj differ
diff --git a/gfx/mapobjects/terrains/road_sandy_to_grass_left.mobj 
b/gfx/mapobjects/terrains/road_sandy_to_grass_left.mobj
new file mode 100644
index 0000000..e2f4110
Binary files /dev/null and 
b/gfx/mapobjects/terrains/road_sandy_to_grass_left.mobj differ
diff --git a/gfx/mapobjects/terrains/road_sandy_to_grass_right.mobj 
b/gfx/mapobjects/terrains/road_sandy_to_grass_right.mobj
new file mode 100644
index 0000000..752a299
Binary files /dev/null and 
b/gfx/mapobjects/terrains/road_sandy_to_grass_right.mobj differ
diff --git a/gfx/mapobjects/terrains/road_sandy_to_grass_top.mobj 
b/gfx/mapobjects/terrains/road_sandy_to_grass_top.mobj
new file mode 100644
index 0000000..bbc2cfd
Binary files /dev/null and 
b/gfx/mapobjects/terrains/road_sandy_to_grass_top.mobj differ
diff --git a/gfx/mapobjects/terrains/road_to_stone_bot-left.mobj 
b/gfx/mapobjects/terrains/road_to_stone_bot-left.mobj
new file mode 100644
index 0000000..c6c6dbb
Binary files /dev/null and 
b/gfx/mapobjects/terrains/road_to_stone_bot-left.mobj differ
diff --git a/gfx/mapobjects/terrains/road_to_stone_left.mobj 
b/gfx/mapobjects/terrains/road_to_stone_left.mobj
new file mode 100644
index 0000000..69650d0
Binary files /dev/null and b/gfx/mapobjects/terrains/road_to_stone_left.mobj 
differ
diff --git a/maps/test.map b/maps/test.map
index 71be683..6a74ac4 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/events/yard_to_guards.py b/scripts/events/yard_to_guards.py
index a366df9..4f1ac1e 100644
--- a/scripts/events/yard_to_guards.py
+++ b/scripts/events/yard_to_guards.py
@@ -4,4 +4,4 @@ mychar = characters [name]
 if mychar.submap () == 0:
     events.switch_submap (mychar, 18, 7, 3, STAND_WEST)
 else:
-    events.switch_submap (mychar, 0, 13, 24, STAND_EAST)
+    events.switch_submap (mychar, 0, 13, 23, STAND_EAST)
diff --git a/scripts/init.py b/scripts/init.py
index 2bf463b..c5b1798 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -554,7 +554,7 @@ if retval < 5:
         ev.thisown = C
         ev.submap = 0
         ev.x = 12
-        ev.y = 24
+        ev.y = 23
         ev.set_script ("yard_to_guards")
         lm.add_event (ev)
 
@@ -616,7 +616,7 @@ if retval < 5:
         talan.set_dialogue ("dialogues/talan_start")
         talan.load ("talan.mchar")
         talan.set_map (map_engine.get_landmap ())
-        talan.jump_to (0, 11, 20)
+        talan.jump_to (0, 11, 19)
         talan.set_action ("action_talk")
         talan.stand_north ()
         talan.set_schedule ("talan")
diff --git a/scripts/schedules/keyboard_control.py 
b/scripts/schedules/keyboard_control.py
index 2b8ce7c..11ffd10 100755
--- a/scripts/schedules/keyboard_control.py
+++ b/scripts/schedules/keyboard_control.py
@@ -25,9 +25,10 @@ def open_gate ():
 
         # Update squares walkability
         sm = map_engine.get_landmap ().get_submap (0)
+        sm.get_square (6, 17).set_walkable_south (0)
+        sm.get_square (7, 17).set_walkable_south (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 ():
@@ -44,6 +45,8 @@ def close_gate ():
 
         # Update squares walkability
         sm = map_engine.get_landmap ().get_submap (0)
+        sm.get_square (6, 17).set_walkable_south (1)
+        sm.get_square (7, 17).set_walkable_south (1)
         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)
diff --git a/scripts/schedules/talan.py b/scripts/schedules/talan.py
index 67dea0a..3abed94 100755
--- a/scripts/schedules/talan.py
+++ b/scripts/schedules/talan.py
@@ -34,7 +34,7 @@ elif todo == 1:
     # Choose where to move, if destination is already occupied we'll
     # fall into the wait state (0) again automatically next time
     if myself.posy () == 17:
-        myself.set_goal (11, 20, STAND_NORTH)
+        myself.set_goal (11, 19, STAND_NORTH)
     else:
         myself.set_goal (11, 17, STAND_SOUTH)