Skip to content
Snippets Groups Projects
Commit 04b545aa authored by dg's avatar dg
Browse files

sandwalls

git-svn-id: http://svn.net-core.org/repos/t-engine4@2368 51575b47-30f0-44d4-a5cc-537603b46e54
parent 3d26b061
No related branches found
No related tags found
No related merge requests found
Showing
with 122 additions and 47 deletions
......@@ -106,23 +106,33 @@ function _M:niceTileRoundwall3d(level, i, j, g, nt)
local g7 = level.map:checkEntity(i-1, j-1, Map.TERRAIN, "type") or "wall"
local g9 = level.map:checkEntity(i+1, j-1, Map.TERRAIN, "type") or "wall"
-- Full
if g1==s and g2==s and g3==s and g4==s and g6==s and g7==s and g8==s and g9==s then self:replace(i, j, self:getTile(nt.inner))
-- Corners
elseif g4~=s and g7~=s and g8~=s then self:replace(i, j, self:getTile(nt.wall7))
elseif g4~=s and g1~=s and g2~=s then self:replace(i, j, self:getTile(nt.wall1))
elseif g2~=s and g3~=s and g6~=s then self:replace(i, j, self:getTile(nt.wall3))
elseif g6~=s and g9~=s and g8~=s then self:replace(i, j, self:getTile(nt.wall9))
-- Pillar
if g2 ~= s and g8 ~= s and g4 ~= s and g6 ~= s then self:replace(i, j, self:getTile(nt.pillar_small))
elseif g8 ~= s and g4 == s and g6 == s and g7 == s and g9 == s then self:replace(i, j, self:getTile(nt.hole8))
elseif g2 ~= s and g4 == s and g6 == s and g1 == s and g3 == s then self:replace(i, j, self:getTile(nt.hole2))
elseif g8 ~= s and g4 ~= s and g6 ~= s then self:replace(i, j, self:getTile(nt.pillar8))
elseif g2 ~= s and g4 ~= s and g6 ~= s then self:replace(i, j, self:getTile(nt.pillar2))
elseif g4 ~= s and g8 ~= s and g2 ~= s then self:replace(i, j, self:getTile(nt.pillar4))
elseif g6 ~= s and g8 ~= s and g2 ~= s then self:replace(i, j, self:getTile(nt.pillar6))
-- Sides
elseif g4==s and g6==s and g8~=s then self:replace(i, j, self:getTile(nt.wall8))
elseif g4==s and g6==s and g2~=s then self:replace(i, j, self:getTile(nt.wall2))
elseif g8==s and g2==s and g4~=s then self:replace(i, j, self:getTile(nt.wall4))
elseif g8==s and g2==s and g6~=s then self:replace(i, j, self:getTile(nt.wall6))
-- Inner corners
elseif g4==s and g7~=s and g8==s then self:replace(i, j, self:getTile(nt.inner_wall3))
elseif g4==s and g1~=s and g2==s then self:replace(i, j, self:getTile(nt.inner_wall9))
elseif g2==s and g3~=s and g6==s then self:replace(i, j, self:getTile(nt.inner_wall7))
elseif g6==s and g9~=s and g8==s then self:replace(i, j, self:getTile(nt.inner_wall1))
elseif g2 ~= s and g6 ~= s and g4 == s and g1 == s then self:replace(i, j, self:getTile(nt.wall19d))
elseif g2 ~= s and g4 ~= s and g6 == s and g3 == s then self:replace(i, j, self:getTile(nt.wall37d))
elseif g8 ~= s and g6 ~= s and g4 == s and g7 == s then self:replace(i, j, self:getTile(nt.wall73d))
elseif g8 ~= s and g4 ~= s and g6 == s and g9 == s then self:replace(i, j, self:getTile(nt.wall91d))
elseif g8 ~= s and g4 == s and g7 == s then self:replace(i, j, self:getTile(nt.wall7d))
elseif g8 ~= s and g6 == s and g9 == s then self:replace(i, j, self:getTile(nt.wall9d))
elseif g2 ~= s and g4 == s and g1 == s then self:replace(i, j, self:getTile(nt.wall1d))
elseif g2 ~= s and g6 == s and g3 == s then self:replace(i, j, self:getTile(nt.wall3d))
-- Top
elseif g2 ~= s and g8 ~= s then self:replace(i, j, self:getTile(nt.wall82))
elseif g8 ~= s and g4 ~= s then self:replace(i, j, self:getTile(nt.wall7))
elseif g8 ~= s and g6 ~= s then self:replace(i, j, self:getTile(nt.wall9))
elseif g8 ~= s then self:replace(i, j, self:getTile(nt.wall8))
-- Bottom
elseif g2 ~= s and g4 ~= s then self:replace(i, j, self:getTile(nt.wall1))
elseif g2 ~= s and g6 ~= s then self:replace(i, j, self:getTile(nt.wall3))
elseif g2 ~= s then self:replace(i, j, self:getTile(nt.wall2))
elseif nt.inner then self:replace(i, j, self:getTile(nt.inner))
end
end
......
......@@ -83,41 +83,56 @@ newEntity{
game.level:addEntity(sand)
return nil, sand, true
end,
-- [[
nice_tiler = { method="roundwall3d",
inner={"SANDWALL", 10, 1, 6},
wall8={"SANDWALL_8", 100, 1, 6},
wall2={"SANDWALL_2", 100, 1, 3},
wall4={"SANDWALL_4", 100, 1, 1},
wall6={"SANDWALL_6", 100, 1, 1},
wall1={"SANDWALL_1", 100, 1, 2},
wall3={"SANDWALL_3", 100, 1, 3},
wall7={"SANDWALL_7", 100, 1, 3},
wall9={"SANDWALL_9", 100, 1, 3},
inner_wall1={"SANDWALL_1_INNER", 100, 1, 1},
inner_wall3={"SANDWALL_3_INNER", 100, 1, 1},
inner_wall7={"SANDWALL_7_INNER", 100, 1, 1},
inner_wall9={"SANDWALL_9_INNER", 100, 1, 1},
-- north_south="SANDWALL_NORTH_SOUTH",
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},
},
--]]
}
for i = 1, 6 do
newEntity{ base = "SANDWALL", define_as = "SANDWALL"..i, image = "terrain/sandwall_5_"..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}
end
for i = 1, 3 do newEntity{ base = "SANDWALL", define_as = "SANDWALL_2"..i, image = "terrain/sand.png", add_displays = {class.new{image = "terrain/sandwall_2_"..i..".png"}}, nice_tiler = false} end
newEntity{ base = "SANDWALL", define_as = "SANDWALL_41", image = "terrain/sand.png", add_displays = {class.new{image = "terrain/sandwall_4_1.png"}}, nice_tiler = false}
newEntity{ base = "SANDWALL", define_as = "SANDWALL_61", image = "terrain/sand.png", add_displays = {class.new{image = "terrain/sandwall_6_1.png"}}, nice_tiler = false}
for i = 1, 3 do newEntity{ base = "SANDWALL", define_as = "SANDWALL_3"..i, image = "terrain/sand.png", add_displays = {class.new{image = "terrain/sandwall_3_"..i..".png"}}, nice_tiler = false} end
for i = 1, 2 do newEntity{ base = "SANDWALL", define_as = "SANDWALL_1"..i, image = "terrain/sand.png", add_displays = {class.new{image = "terrain/sandwall_1_"..i..".png"}}, nice_tiler = false} end
for i = 1, 3 do 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} end
for i = 1, 3 do 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} end
newEntity{ base = "SANDWALL", define_as = "SANDWALL_7_INNER1", image = "terrain/sand.png", add_displays = {class.new{image = "terrain/sandwall_7i_1.png"}}, nice_tiler = false}
newEntity{ base = "SANDWALL", define_as = "SANDWALL_9_INNER1", image = "terrain/sand.png", add_displays = {class.new{image = "terrain/sandwall_9i_1.png"}}, nice_tiler = false}
newEntity{ base = "SANDWALL", define_as = "SANDWALL_1_INNER1", image = "terrain/sand.png", add_displays = {class.new{image = "terrain/sandwall_1i_1.png"}}, nice_tiler = false}
newEntity{ base = "SANDWALL", define_as = "SANDWALL_3_INNER1", image = "terrain/sand.png", add_displays = {class.new{image = "terrain/sandwall_3i_1.png"}}, nice_tiler = false}
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{
......@@ -131,8 +146,58 @@ newEntity{
block_sight = true,
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},
},
}
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{
define_as = "PALMTREE",
type = "wall", subtype = "sand",
......
game/modules/tome/data/gfx/shockbolt/terrain/sand.png

7.88 KiB | W: | H:

game/modules/tome/data/gfx/shockbolt/terrain/sand.png

7.52 KiB | W: | H:

game/modules/tome/data/gfx/shockbolt/terrain/sand.png
game/modules/tome/data/gfx/shockbolt/terrain/sand.png
game/modules/tome/data/gfx/shockbolt/terrain/sand.png
game/modules/tome/data/gfx/shockbolt/terrain/sand.png
  • 2-up
  • Swipe
  • Onion skin
game/modules/tome/data/gfx/shockbolt/terrain/sandwall_19d_1.png

8.63 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_1_1.png

8.7 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_1_2.png

9 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_1_3.png

8.7 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_1_4.png

8.54 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_1d_1.png

8.62 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_2_1.png

8.7 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_2h_1.png

8.75 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_2p_1.png

8.51 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_37d_1.png

8.61 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_3_1.png

8.69 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_3_2.png

8.97 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_3d_1.png

7.56 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_5_1.png

8.66 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_5_2.png

8.89 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_5_3.png

8.87 KiB

game/modules/tome/data/gfx/shockbolt/terrain/sandwall_5_4.png

9.15 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment