diff --git a/game/modules/tome/ai/sandworm_tunneler.lua b/game/modules/tome/ai/sandworm_tunneler.lua
index 70be7e8f5f1b8b8671ef36af0904bb166d232c4e..0c17874fb0b9b1a070dd74f91dbda4b5517c9989 100644
--- a/game/modules/tome/ai/sandworm_tunneler.lua
+++ b/game/modules/tome/ai/sandworm_tunneler.lua
@@ -64,7 +64,7 @@ local function tunnel(self, x1, y1, x2, y2)
end
nx, ny = x1 + xdir, y1 + ydir
end
- print(feat, "try pos", nx, ny, "dir", coord_to_dir[xdir][ydir])
+-- print(feat, "try pos", nx, ny, "dir", coord_to_dir[xdir][ydir])
return nx, ny
end
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 1d7a933b6abdd6e781293aa2a10b9f304e99bdd1..aa5423438968a247c8e6d32c778fb7514f84ad7f 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -91,6 +91,7 @@ function _M:run()
self:setFlyingText(self.flyers)
self.minimap_bg, self.minimap_bg_w, self.minimap_bg_h = core.display.loadImage("/data/gfx/ui/minimap.png"):glTexture()
self.icons = { display_x = game.w * 0.5 - 14, display_y = game.h * 0.8 + 3, w = 12, h = game.h * 0.2}
+ self.nicer_tiles = NicerTiles.new()
self:createSeparators()
self.log = function(style, ...) if type(style) == "number" then self.logdisplay(...) self.flash(style, ...) else self.logdisplay(style, ...) self.flash(self.flash.NEUTRAL, style, ...) end end
@@ -436,8 +437,7 @@ function _M:changeLevel(lev, zone, keep_old_lev, force_down)
self.zone:getLevel(self, lev, old_lev)
-- Post process walls
- local nt = NicerTiles.new()
- nt:postProcessLevelTiles(self.level)
+ self.nicer_tiles:postProcessLevelTiles(self.level)
-- Check if we need to switch the current guardian
self.state:zoneCheckBackupGuardian()
@@ -723,13 +723,11 @@ function _M:setupCommands()
if add then for i, e in ipairs(add) do print(" -", e.image) end end
end end,
[{"_f","ctrl"}] = function() if config.settings.cheat then
- local nt = NicerTiles.new()
- nt:handle(self.level, game.player.x, game.player.y)
- nt:replaceAll(self.level)
+ self.nicer_tiles:handle(self.level, game.player.x, game.player.y)
+ self.nicer_tiles:replaceAll(self.level)
end end,
[{"_g","ctrl"}] = function() if config.settings.cheat then
- local nt = NicerTiles.new()
- nt:postProcessLevelTiles(self.level)
+ self.nicer_tiles:postProcessLevelTiles(self.level)
end end,
}
diff --git a/game/modules/tome/class/NicerTiles.lua b/game/modules/tome/class/NicerTiles.lua
index 45d05bba948abddcb54ded6428bf23a49d18f27f..43b99aafa65a50ae7e6a9baf1ff11ef517cd4854 100644
--- a/game/modules/tome/class/NicerTiles.lua
+++ b/game/modules/tome/class/NicerTiles.lua
@@ -61,9 +61,12 @@ function _M:replaceAll(level)
local r = self.repl[i]
level.map(r[1], r[2], Map.TERRAIN, r[3])
end
+ self.repl = {}
end
function _M:postProcessLevelTiles(level)
+ if not Map.tiles.nicer_tiles then return end
+
for i = 0, level.map.w - 1 do for j = 0, level.map.h - 1 do
self:handle(level, i, j)
end end
@@ -71,6 +74,16 @@ function _M:postProcessLevelTiles(level)
self:replaceAll(level)
end
+function _M:updateAround(level, x, y)
+ if not Map.tiles.nicer_tiles then return end
+
+ for i = x-1, x+1 do for j = y-1, y+1 do
+ self:handle(level, i, j)
+ end end
+
+ self:replaceAll(level)
+end
+
--- Make walls have a pseudo 3D effect
function _M:niceTileWall3d(level, i, j, g, nt)
local s = level.map:checkEntity(i, j, Map.TERRAIN, "block_move") and true or false
diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua
index ad8e96caef3f50767f0d79647b4468000fdc019c..3ed3680732157f47c3798fc9a4dbb5cdaa73f950 100644
--- a/game/modules/tome/data/damage_types.lua
+++ b/game/modules/tome/data/damage_types.lua
@@ -151,7 +151,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
target:removeTemporaryValue("threaded")
end
end]]
-
+
if target.knowTalent and target:knowTalent(target.T_RESOLVE) then local t = target:getTalentFromId(target.T_RESOLVE) t.on_absorb(target, t, type, dam) end
if not target.dead and dam > 0 and type == DamageType.MIND and src and src.knowTalent and src:knowTalent(src.T_MADNESS) then
@@ -754,6 +754,7 @@ newDamageType{
local newfeat_name, newfeat, silence = feat.dig, nil, false
if type(feat.dig) == "function" then newfeat_name, newfeat, silence = feat.dig(src, x, y, feat) end
game.level.map(x, y, Map.TERRAIN, newfeat or game.zone.grid_list[newfeat_name])
+ game.nicer_tiles:updateAround(game.level, x, y)
if not silence then
game.logSeen({x=x,y=y}, "%s turns into %s.", feat.name:capitalize(), (newfeat or game.zone.grid_list[newfeat_name]).name)
end
@@ -1219,7 +1220,7 @@ newDamageType{
dam = dam - init_dam
target:setEffect(target.EFF_WASTING, dur, {src=src, power=dam / dur})
end
- return init_dam
+ return init_dam
end,
}
diff --git a/game/modules/tome/data/general/grids/sand.lua b/game/modules/tome/data/general/grids/sand.lua
index 09548244384eae47132aeb5d81722a017c8e1760..30e23dbef2a91b56da58d321ca37f98592761d9f 100644
--- a/game/modules/tome/data/general/grids/sand.lua
+++ b/game/modules/tome/data/general/grids/sand.lua
@@ -60,6 +60,7 @@ newEntity{
game.level.map(self.x, self.y, engine.Map.TERRAIN, self.old_feat)
game.level:removeEntity(self)
game.logSeen(self, "The unstable sand tunnel collapses!")
+ game.nicer_tiles:updateAround(game.level, self.x, self.y)
local a = game.level.map(self.x, self.y, engine.Map.ACTOR)
if a then
@@ -111,28 +112,28 @@ newEntity{
}
local i = 1
-newEntity{ base = "SANDWALL", define_as = "SANDWALL"..i, image = "terrain/sandwall_5_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_2"..i, image = "terrain/sandwall_2_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_1"..i, image = "terrain/sandwall_1_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_3"..i, image = "terrain/sandwall_3_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_NORTH_SOUTH"..i, image = "terrain/sandwall_2_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_7"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_9"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_1D"..i, image = "terrain/sandwall_1d_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_3D"..i, image = "terrain/sandwall_3d_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_7D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7d_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_9D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9d_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_19D"..i, image = "terrain/sandwall_19d_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_37D"..i, image = "terrain/sandwall_37d_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_73D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_73d_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_91D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_91d_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_PILLAR_2"..i, image = "terrain/sandwall_2p_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_PILLAR_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8p_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_PILLAR_4"..i, image = "terrain/sandwall_1_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_PILLAR_6"..i, image = "terrain/sandwall_3_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_HOLE_2"..i, image = "terrain/sandwall_2h_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL", define_as = "SANDWALL_HOLE_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8h_1.png", z=18, display_y=-1}}, nice_tiler = false}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL"..i, image = "terrain/sandwall_5_"..i..".png"}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_2"..i, image = "terrain/sandwall_2_"..i..".png"}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_1"..i, image = "terrain/sandwall_1_"..i..".png"}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_3"..i, image = "terrain/sandwall_3_"..i..".png"}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_NORTH_SOUTH"..i, image = "terrain/sandwall_2_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_7"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_9"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_1D"..i, image = "terrain/sandwall_1d_"..i..".png"}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_3D"..i, image = "terrain/sandwall_3d_"..i..".png"}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_7D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7d_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_9D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9d_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_19D"..i, image = "terrain/sandwall_19d_"..i..".png"}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_37D"..i, image = "terrain/sandwall_37d_"..i..".png"}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_73D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_73d_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_91D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_91d_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_PILLAR_2"..i, image = "terrain/sandwall_2p_"..i..".png"}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_PILLAR_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8p_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_PILLAR_4"..i, image = "terrain/sandwall_1_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_PILLAR_6"..i, image = "terrain/sandwall_3_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_HOLE_2"..i, image = "terrain/sandwall_2h_"..i..".png"}
+newEntity{ base = "SANDWALL", define_as = "SANDWALL_HOLE_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8h_1.png", z=18, display_y=-1}}}
newEntity{
@@ -147,55 +148,55 @@ newEntity{
air_level = -10,
dig = "SAND",
nice_tiler = { method="roundwall3d",
- inner={"SANDWALL", 100, 1, 1},
- wall8={"SANDWALL_8", 100, 1, 1},
- wall2={"SANDWALL_2", 100, 1, 1},
- wall82={"SANDWALL_NORTH_SOUTH", 100, 1, 1},
- wall1={"SANDWALL_1", 100, 1, 1},
- wall3={"SANDWALL_3", 100, 1, 1},
- wall7={"SANDWALL_7", 100, 1, 1},
- wall9={"SANDWALL_9", 100, 1, 1},
- wall1d={"SANDWALL_1D", 100, 1, 1},
- wall3d={"SANDWALL_3D", 100, 1, 1},
- wall7d={"SANDWALL_7D", 100, 1, 1},
- wall9d={"SANDWALL_9D", 100, 1, 1},
- wall19d={"SANDWALL_19D", 100, 1, 1},
- wall37d={"SANDWALL_37D", 100, 1, 1},
- wall73d={"SANDWALL_73D", 100, 1, 1},
- wall91d={"SANDWALL_91D", 100, 1, 1},
- hole2={"SANDWALL_HOLE_2", 100, 1, 1},
- hole8={"SANDWALL_HOLE_8", 100, 1, 1},
- pillar2={"SANDWALL_PILLAR_2", 100, 1, 1},
- pillar8={"SANDWALL_PILLAR_8", 100, 1, 1},
- pillar4={"SANDWALL_PILLAR_4", 100, 1, 1},
- pillar6={"SANDWALL_PILLAR_6", 100, 1, 1},
- pillar_small={"SANDWALL_PILLAR_SMALL", 100, 1, 1},
+ inner={"SANDWALL_STABLE", 100, 1, 1},
+ wall8={"SANDWALL_STABLE_8", 100, 1, 1},
+ wall2={"SANDWALL_STABLE_2", 100, 1, 1},
+ wall82={"SANDWALL_STABLE_NORTH_SOUTH", 100, 1, 1},
+ wall1={"SANDWALL_STABLE_1", 100, 1, 1},
+ wall3={"SANDWALL_STABLE_3", 100, 1, 1},
+ wall7={"SANDWALL_STABLE_7", 100, 1, 1},
+ wall9={"SANDWALL_STABLE_9", 100, 1, 1},
+ wall1d={"SANDWALL_STABLE_1D", 100, 1, 1},
+ wall3d={"SANDWALL_STABLE_3D", 100, 1, 1},
+ wall7d={"SANDWALL_STABLE_7D", 100, 1, 1},
+ wall9d={"SANDWALL_STABLE_9D", 100, 1, 1},
+ wall19d={"SANDWALL_STABLE_19D", 100, 1, 1},
+ wall37d={"SANDWALL_STABLE_37D", 100, 1, 1},
+ wall73d={"SANDWALL_STABLE_73D", 100, 1, 1},
+ wall91d={"SANDWALL_STABLE_91D", 100, 1, 1},
+ hole2={"SANDWALL_STABLE_HOLE_2", 100, 1, 1},
+ hole8={"SANDWALL_STABLE_HOLE_8", 100, 1, 1},
+ pillar2={"SANDWALL_STABLE_PILLAR_2", 100, 1, 1},
+ pillar8={"SANDWALL_STABLE_PILLAR_8", 100, 1, 1},
+ pillar4={"SANDWALL_STABLE_PILLAR_4", 100, 1, 1},
+ pillar6={"SANDWALL_STABLE_PILLAR_6", 100, 1, 1},
+ pillar_small={"SANDWALL_STABLE_PILLAR_SMALL", 100, 1, 1},
},
}
local i = 1
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE"..i, image = "terrain/sandwall_5_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_2"..i, image = "terrain/sandwall_2_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_1"..i, image = "terrain/sandwall_1_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_3"..i, image = "terrain/sandwall_3_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_NORTH_SOUTH"..i, image = "terrain/sandwall_2_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_7"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_9"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_1D"..i, image = "terrain/sandwall_1d_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_3D"..i, image = "terrain/sandwall_3d_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_7D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7d_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_9D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9d_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_19D"..i, image = "terrain/sandwall_19d_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_37D"..i, image = "terrain/sandwall_37d_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_73D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_73d_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_91D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_91d_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_PILLAR_2"..i, image = "terrain/sandwall_2p_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_PILLAR_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8p_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_PILLAR_4"..i, image = "terrain/sandwall_1_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_PILLAR_6"..i, image = "terrain/sandwall_3_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9_1.png", z=18, display_y=-1}}, nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_HOLE_2"..i, image = "terrain/sandwall_2h_"..i..".png", nice_tiler = false}
-newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_HOLE_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8h_1.png", z=18, display_y=-1}}, nice_tiler = false}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE"..i, image = "terrain/sandwall_5_"..i..".png"}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_2"..i, image = "terrain/sandwall_2_"..i..".png"}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_1"..i, image = "terrain/sandwall_1_"..i..".png"}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_3"..i, image = "terrain/sandwall_3_"..i..".png"}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_NORTH_SOUTH"..i, image = "terrain/sandwall_2_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_7"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_9"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_1D"..i, image = "terrain/sandwall_1d_"..i..".png"}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_3D"..i, image = "terrain/sandwall_3d_"..i..".png"}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_7D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7d_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_9D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9d_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_19D"..i, image = "terrain/sandwall_19d_"..i..".png"}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_37D"..i, image = "terrain/sandwall_37d_"..i..".png"}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_73D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_73d_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_91D"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_91d_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_PILLAR_2"..i, image = "terrain/sandwall_2p_"..i..".png"}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_PILLAR_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8p_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_PILLAR_4"..i, image = "terrain/sandwall_1_"..i..".png", add_displays = {class.new{image="terrain/sandwall_7_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_PILLAR_6"..i, image = "terrain/sandwall_3_"..i..".png", add_displays = {class.new{image="terrain/sandwall_9_1.png", z=18, display_y=-1}}}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_HOLE_2"..i, image = "terrain/sandwall_2h_"..i..".png"}
+newEntity{ base = "SANDWALL_STABLE", define_as = "SANDWALL_STABLE_HOLE_8"..i, image = "terrain/sandwall_5_"..i..".png", add_displays = {class.new{image="terrain/sandwall_8h_1.png", z=18, display_y=-1}}}
newEntity{