Shatur now have awesome tree-stores

git-svn-id: http://svn.net-core.org/repos/t-engine4@4184 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/data/maps/towns/shatur.lua

@@ -46,12 +46,12 @@ ssssssssssssssssssssssssssssssssssssssssssssssssss
 ssssssssssssssssssssssssssssssssssssssssssssssssss
 ssssssssssssssssssssssssssssssssssssssssssssssssss
 ssssssssssssssssssssssssssssssssssssssssssssssssss
-sssssssssssssssssssss4sssssss3--ssssssssssssssssss
+ssssssssssssssssssss-4-sssss-3--ssssssssssssssssss
 sssssssssssssssssssss--ssssss----sssssssssssssssss
 sssssssssssssssssssss---sssss----sssssssssssssssss
 ssssssssssssssssssssss----sss----sssssssssssssssss
-ssssssssssssss2--ssssss---ss--ssssssssssssssssssss
-sssssssssssssss---sssssss-ss-sssssssssssssssssssss
+sssssssssssss-2--ssssss---ss--ssssssssssssssssssss
+ssssssssssssss----sssssss-ss-sssssssssssssssssssss
 ssssssssssssssss----sssss----sssssssssssssssssssss
 sssssssssssssssss---sssss----ssssssss--sssssssssss
 ssssssssssssssss----------ss-sssssss--ssssssssssss
@@ -69,8 +69,8 @@ sssssssssssssssss~~~~~~~__~~~~ssssssssssssssssssss
 ~ttttt~~~~~~~ttttttttttt..tttttttt~~~~~~~~~~~~~~~~
 tttttttttttttttttttttttt..tttttttttt~~~~~~~~~~~~~~
 ttttttttttttttttttttttt...ttttttttttttt~~~~~~~~~~~
-tttttttttttttt..ttttttt.....tttt.7ttttttt~~~~~~~~~
-ttttttttttttt5....tttt......t....ttttttttttttttttt
+ttttttttttttt.5.ttttttt.....tttt.7.tttttt~~~~~~~~~
+ttttttttttttt.....tttt......t......ttttttttttttttt
 ttttttttttttttttt.............tttttttttttttttttttt
 ttttttttttttttttttt...t......ttttttttttttttttttttt
 ttttttttttttttttttttttt.......tttttttttttttttttttt
@@ -78,8 +78,8 @@ tttttttttttttttttttttt....ttt..ttttttttttttttttttt
 ttttttttttttttttttttt..tt.ttt....ttttttttttttttttt
 ttttttttttttttttttttt..tt.ttt.....tttttttttttttttt
 ttttttttttttttttttt....tt..tttt.......tttttttttttt
-ttttttttttttt.........tttt.tttttt.....tttttttttttt
-ttttttttttttt6.......ttttt.ttttttttttttttttttttttt
+ttttttttttttt.6.......tttt.tttttt.....tttttttttttt
+ttttttttttttt........ttttt.ttttttttttttttttttttttt
 tttttttttttttttttttttttttt.ttttttttttttttttttttttt
 tttttttttttttttttttttttttt..tttttttttttttttttttttt
 ttttttttttttttttttttttttttt.tttttttttttttttttttttt
@@ -90,4 +90,4 @@ ttttttttttttttttttttttttttttt.tttttttttttttttttttt
 ttttttttttttttttttttttttttttt..ttttttttttttttttttt
 tttttttttttttttttttttttttttttt.ttttttttttttttttttt
 tttttttttttttttttttttttttttttt.ttttttttttttttttttt
-tttttttttttttttttttttttttttttt<ttttttttttttttttttt]]
\ No newline at end of file
+tttttttttttttttttttttttttttttt<ttttttttttttttttttt]]

game/modules/tome/data/zones/town-shatur/grids.lua

@@ -20,7 +20,11 @@
 load("/data/general/grids/basic.lua")
 load("/data/general/grids/forest.lua")
 load("/data/general/grids/water.lua")
-load("/data/general/grids/mountain.lua", function(e) if e.image == "terrain/rocky_ground.png" then e.image = "terrain/snowy_grass.png" end end)
+load("/data/general/grids/mountain.lua", function(e)
+	if e.image == "terrain/rocky_ground.png" then
+		e.image = "terrain/snowy_grass.png"
+	end
+end)
 
 newEntity{ base = "FLOOR", define_as = "COBBLESTONE",
 	name="cobblestone road",

game/modules/tome/data/zones/town-shatur/traps.lua

@@ -21,36 +21,60 @@ load("/data/general/traps/store.lua")
 
 newEntity{ base = "BASE_STORE", define_as = "HEAVY_ARMOR_STORE",
 	name="Armoury",
-	display='2', color=colors.UMBER,
+	display='2', color=colors.UMBER, image = "invis.png",
+	add_displays={engine.Entity.new{
+		z=18, image="terrain/large_tree_house.png", display_on_seen=true, display_on_remember=true, display_h=3.5, display_y=-2, display_w=2, display_x=-0.5,
+		add_mos = {{image="store/tree_plate_sign.png", display_y=-0.3}},
+	}},
 	resolvers.store("HEAVY_ARMOR", "thalore"),
 }
 
 newEntity{ base = "BASE_STORE", define_as = "LIGHT_ARMOR_STORE",
 	name="Tanner",
-	display='2', color=colors.UMBER,
+	display='2', color=colors.UMBER, image = "invis.png",
+	add_displays={engine.Entity.new{
+		z=18, image="terrain/large_tree_house.png", display_on_seen=true, display_on_remember=true, display_h=3.5, display_y=-2, display_w=2, display_x=-0.5,
+		add_mos = {{image="store/tree_leather_sign.png", display_y=-0.3}},
+	}},
 	resolvers.store("LIGHT_ARMOR", "thalore"),
 }
 
 newEntity{ base = "BASE_STORE", define_as = "SWORD_WEAPON_STORE",
 	name="Swordsmith",
-	display='3', color=colors.UMBER,
+	display='3', color=colors.UMBER, image = "invis.png",
+	add_displays={engine.Entity.new{
+		z=18, image="terrain/large_snow_tree_house.png", display_on_seen=true, display_on_remember=true, display_h=3.5, display_y=-2, display_w=2, display_x=-0.5,
+		add_mos = {{image="store/tree_sword_sign.png", display_y=-0.3}},
+	}},
 	resolvers.store("SWORD_WEAPON", "thalore"),
 }
 
 newEntity{ base = "BASE_STORE", define_as = "MAUL_WEAPON_STORE",
 	name="Nature's Punch",
-	display='3', color=colors.UMBER,
+	display='3', color=colors.UMBER, image = "invis.png",
+	add_displays={engine.Entity.new{
+		z=18, image="terrain/large_snow_tree_house.png", display_on_seen=true, display_on_remember=true, display_h=3.5, display_y=-2, display_w=2, display_x=-0.5,
+		add_mos = {{image="store/tree_mace_sign.png", display_y=-0.3}},
+	}},
 	resolvers.store("MAUL_WEAPON", "thalore"),
 }
 
 newEntity{ base = "BASE_STORE", define_as = "ARCHER_WEAPON_STORE",
 	name="Silent Hunter",
-	display='3', color=colors.UMBER,
+	display='3', color=colors.UMBER, image = "invis.png",
+	add_displays={engine.Entity.new{
+		z=18, image="terrain/large_snow_tree_house.png", display_on_seen=true, display_on_remember=true, display_h=3.5, display_y=-2, display_w=2, display_x=-0.5,
+		add_mos = {{image="store/tree_bow_sign.png", display_y=-0.3}},
+	}},
 	resolvers.store("ARCHER_WEAPON", "thalore"),
 }
 
 newEntity{ base = "BASE_STORE", define_as = "HERBALIST",
 	name="Herbalist",
-	display='4', color=colors.LIGHT_BLUE,
+	display='4', color=colors.LIGHT_BLUE,image = "invis.png",
+	add_displays={engine.Entity.new{
+		z=18, image="terrain/large_tree_house.png", display_on_seen=true, display_on_remember=true, display_h=3.5, display_y=-2, display_w=2, display_x=-0.5,
+		add_mos = {{image="store/tree_leaves_sign.png", display_y=-0.3}},
+	}},
 	resolvers.store("POTION", "thalore"),
 }

tiled-maps/shatur.tmx

@@ -171,7 +171,7 @@
  </tileset>
  <layer name="Terrain" width="50" height="50">
   <data encoding="base64" compression="zlib">
-   eJztlEkOgzAMRVlziR6DM3AAVpyz8+XaRapGURL7O4MNyuJJRUzvxSn7NE37YDAYgDyI8/cvm0PbNQfluAVo+3I8j9xBuVrquDE8Yq4W3NH9418X+20Jzh6xtI9K5oJ2aPSGjim4+8pCA8cJ+S9ZaMitLXd2lkDdrLZIvKzMZvW4ONZOa1DLO8Tv8OnpUHIv1SF5X6lL+A7uPWhHSRP6fBRpB9rSyn9xzI7fsfR5rf0XgrAjpMXacZ9PuSMdtXoQJwncjtKeHg1Ih7Sp5TrPEWLXvCv0SBqeTL9UB3WvFinnHNrO3B5qJkfiqPPINcTOaTtyG/xjbqMl0A5rLSk39Nvcq0vyXc25aXW8BGtpbe+UzFDboVbHmVq0HcZMxkysc6aOM7VoO4yOP9fKz/sAzPqkSQ==
+   eJztlMkNgzAQRTnTRMqgBgrgRJ3ZmwtIjmRZXuaPl5lEc3hCCLDfs53s0zTthmEYANvBw11Tz+/umnpHCyXHLUDal+L5yx0lVy0d59w3gkfMVdq95myEHdLu3B4t5whpadEh0Rs6pqCeKw0NFCfkt6ShIbe21L3TBOqmtYXjpWVvVo+LYx20Bq28Q/wOn5EONd+WOjjz1bqEc1C/QTtqmtDxUbgdaEsv/8UxO7733PF6+y8Fwo6QHmtHHb/kjnS06kGcOFA7antGNCAd3Cau35PgN0eIvfMujNWzg+KXei/3TJKUVw5pZ2qP5nVvuU/SbtyG2DNpR2qDf09t1ATaoa0l5Yb+N4/qOud5gR45N8kOdC21nZ2admmHlnso7WF7YnuiGdsTfdie6ONfOq6Nx/sAbjSjdw==
   </data>
  </layer>
 </map>