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

gates of morning now has a unique map 

git-svn-id: http://svn.net-core.org/repos/t-engine4@791 51575b47-30f0-44d4-a5cc-537603b46e54
parent e937b5d5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
game/engine/Shader.lua
+ 33
− 10
View file @ b59b896e
......@@ -31,10 +31,33 @@ _M.progs = {}
function _M:init(name, args)
self.args = args or {}
self.name = name
self.totalname = self:makeTotalName()
print("[SHADER] making shader from", name, " into ", self.totalname)
if core.shader.active() then self:loaded() end
end
function _M:makeTotalName()
local str = {}
for k, v in pairs(self.args) do
if type(v) == "number" then
str[#str+1] = v
elseif type(v) == "table" then
if v.texture then
if v.is3d then str[#str+1] = k.."=tex3d("..v.texture..")"
else str[#str+1] = k.."=tex3d("..v.texture..")" end
elseif #v == 2 then
str[#str+1] = k.."=vec2("..v[1]..","..v[2]..")"
elseif #v == 3 then
str[#str+1] = k.."=vec3("..v[1]..","..v[2]..","..v[3]..")"
elseif #v == 4 then
str[#str+1] = k.."=vec4("..v[1]..","..v[2]..","..v[3]..","..v[4]..")"
end
end
end
return self.name.."["..table.concat(str,",").."]"
end
--- Serialization
function _M:save()
return class.save(self, {
......@@ -83,38 +106,38 @@ function _M:createProgram(def)
end
function _M:loaded()
if _M.progs[self.name] then
self.shad = _M.progs[self.name]
print("[SHADER] using cached shader "..self.name)
if _M.progs[self.totalname] then
self.shad = _M.progs[self.totalname]
print("[SHADER] using cached shader "..self.totalname)
else
print("[SHADER] Loading from /data/gfx/shaders/"..self.name..".lua")
local f, err = loadfile("/data/gfx/shaders/"..self.name..".lua")
if not f and err then error(err) end
setfenv(f, setmetatable(self.args or {}, {__index=_G}))
local def = f()
_M.progs[self.name] = self:createProgram(def)
_M.progs[self.totalname] = self:createProgram(def)
for k, v in pairs(def.args) do
if type(v) == "number" then
print("[SHADER] setting param", k, v)
_M.progs[self.name]:paramNumber(k, v)
_M.progs[self.totalname]:paramNumber(k, v)
elseif type(v) == "table" then
if v.texture then
print("[SHADER] setting texture param", k, v.texture)
_M.progs[self.name]:paramTexture(k, v.texture, v.is3d)
_M.progs[self.totalname]:paramTexture(k, v.texture, v.is3d)
elseif #v == 2 then
print("[SHADER] setting vec2 param", k, v[1], v[2])
_M.progs[self.name]:paramNumber2(k, v[1], v[2])
_M.progs[self.totalname]:paramNumber2(k, v[1], v[2])
elseif #v == 3 then
print("[SHADER] setting vec3 param", k, v[1], v[2], v[3])
_M.progs[self.name]:paramNumber3(k, v[1], v[2], v[3])
_M.progs[self.totalname]:paramNumber3(k, v[1], v[2], v[3])
elseif #v == 4 then
print("[SHADER] setting vec4 param", k, v[1], v[2], v[3], v[4])
_M.progs[self.name]:paramNumber4(k, v[1], v[2], v[3], v[4])
_M.progs[self.totalname]:paramNumber4(k, v[1], v[2], v[3], v[4])
end
end
end
end
self.shad = _M.progs[self.name]
self.shad = _M.progs[self.totalname]
end
game/modules/tome/class/Game.lua
+ 1
− 1
View file @ b59b896e
......@@ -529,7 +529,7 @@ function _M:setupCommands()
self.key:addCommands{
[{"_d","ctrl"}] = function()
if config.settings.tome.cheat then
self:changeLevel(1, "wilderness-arda-fareast")
self:changeLevel(1, "town-gates-of-morning")
end
end,
}
......
game/modules/tome/data/maps/towns/gates-of-morning.lua
+ 60
− 46
View file @ b59b896e
......@@ -17,18 +17,18 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
defineTile(' ', "FLOOR")
quickEntity('M', {always_remember = true, show_tooltip=true, name='Sun Wall', display='^', color=colors.GOLD, back_color=colors.CRIMSON, image="terrain/mountain.png", tint=colors.GOLD, block_move=true})
quickEntity('<', {show_tooltip=true, name='into the wild', display='<', color=colors.WHITE, change_level=1, change_zone="wilderness-arda-fareast"})
quickEntity('S', {name='brick roof top', display='#', color=colors.RED, block_move=true, block_sight=true, image="terrain/wood_wall1.png"})
quickEntity('s', {name='brick roof', display='#', color=colors.RED, block_move=true, block_sight=true, image="terrain/wood_wall1.png"})
quickEntity('t', {name='brick roof chimney', display='#', color=colors.LIGHT_RED, block_move=true, block_sight=true, image="terrain/wood_wall1.png"})
quickEntity('#', {name='wall', display='#', color=colors.WHITE, block_move=true, block_sight=true, image="terrain/wood_wall1.png"})
quickEntity('C', {name='dark pit', display='#', color=colors.LIGHT_DARK, block_move=true, block_sight=true})
quickEntity('T', {name='tree', display='#', color=colors.LIGHT_GREEN, block_move=true, block_sight=true, image="terrain/tree.png"})
quickEntity(' ', {name='forest', display='#', color=colors.GREEN, block_move=true, block_sight=true, image="terrain/tree.png"})
quickEntity('V', {name='river', display='~', color=colors.BLUE, block_move=true, image="terrain/river.png"})
quickEntity('P', {name='palm tree', display='#', color=colors.LIGHT_GREEN, back_color={r=163,g=149,b=42}, image="terrain/palmtree.png", block_move=true})
quickEntity('~', {name='river', display='~', color=colors.BLUE, block_move=true, image="terrain/river.png"})
quickEntity('O', {name='cooblestone road', display='.', color=colors.WHITE, image="terrain/stone_road1.png"})
quickEntity('.', {name='road', display='.', color=colors.WHITE, image="terrain/stone_road1.png"})
quickEntity(',', {name='dirt', display='.', color=colors.LIGHT_UMBER, image="terrain/sand.png"})
quickEntity(':', {name='sand', display='.', color={r=203,g=189,b=72}, back_color={r=163,g=149,b=42}, image="terrain/sand.png", can_encounter="desert", equilibrium_level=-10})
quickEntity('-', {name='grass', display='.', color=colors.LIGHT_GREEN, image="terrain/grass.png"})
quickEntity('^', {name='hills', display='^', color=colors.SLATE, image="terrain/mountain.png", block_move=true, block_sight=true})
......@@ -50,45 +50,59 @@ quickEntity('c', {show_tooltip=true, name="Closed store", display='*', color=col
quickEntity('d', {show_tooltip=true, name="Closed store", display='*', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"})
quickEntity('e', {show_tooltip=true, name="Closed store", display='*', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"})
startx = 76
starty = 36
startx = 0
starty = 27
endx = 0
endy = 27
return {
[[ ]],
[[ ,,,,,,,,,,,,,,,,,, ]],
[[ ,,,,,------------------,,,,,,,,, ]],
[[ ,,,------TTTTTTTTTTTTTTTT----------,,,, ]],
[[ ,,----TTTTTT--------------TTTTTTTTTT-----,,,,, ]],
[[ ,,---TTTT..................----------TTTTT------,, ]],
[[ ,---TTT....--ssssssss-..---..........-----TTTTTT---,,, ]],
[[ ,--TTT...-----SSSSSSSS--.----------,,.....------TTT----,, ]],
[[ ,,--TT...-,,,,--ssssssss-..-sssssssssss,---......---TTTT--T,, ]],
[[ ,,---TT..-------,,##9#####-.--sssssssssss-,-------...----TT--TT, ]],
[[ ,--- T..--sssSsss,,,,------.--StSStSSSStS--,------.-....--TT--TT,^]],
[[ ,--TTT...---ssstSSS---,,,----.--sssssssssss---,---...----..--TT--T^^]],
[[ ,--TT...-----sssssss--,,-,,---.--sssssssssss---,-...-------..--TT-^^^]],
[[ ,-TT..---,,,,###6###,,,---,,--.--###########----..----------..--T^^^^]],
[[ ,-T..,,,,----,,,,,,,,------,,-.--###b###e###-....,---sssss---.--T^^ ]],
[[ ,--T.,sssssss----,-----------,,.-----.-----....-,--,,-StSSS---.-T^^^ ]],
[[ ,--TT.-StStSSS---,-----ssssss--..-----.--....--,,,,,,-,sssss---.-T^^^ ]],
[[ ,-TT-.-sssssss---,-----SSSSSS--.------.-..--,,,-ssss--,#####---.-T^^ ]],
[[ ,--T-..-##5####----,----ssssss-..........--ssss,-ssss--,------...-^^^ ^]],
[[ ,- OOOO--OOOOO----,----#c##4#-.---.,----,-SStS,-SSSS--,-----..---^^ ^]],
[[<OO ,-T-OssOOOO---OOOOOOOOO--OOOO--.-T-.-sss--,ssss,-ssss---,---..--T^^ ]],
[[ OOOOOOOOSt.---------ssss-OOOO--OOOO---.-StS--,#0##,-ssss---,---.---^^ ^]],
[[ ,,-T--.ss.-sssss---ssss,---------OOOO.-sss---,,,,,-####--,---..-T^^ ^ ^ ]],
[[ ,,-T--.##.-SStSS---####,------------OO-###-ssssss-,,,---,----.--T^^ ^ ]],
[[ ,,-TT-....-sssss--,,,,,,-------------OO-,--SSSSSt-ss-,-,---...-T^^ ^ ^ ]],
[[ ,,--TT---..#2###-,sssss,-SSSSSSSS-----OO,--ssssss-tS--,.....---^^ ^^ ^]],
[[ ,,--T----..,,,,,-StSSS,-ssssssss------OOO-#1##a#-ss....-----T^^ ^^]],
[[ ,,--TT----..----,sssss,-##7#####--------OO,.,,.,-##.----TTTT^^ ^ ^^ ]],
[[ ,,,--TTTT--..---,##3##-,--,.,---------...OOOOOOOOOOOTTTTT--^^^ ^^ ^^ ]],
[[ ,,,---- --..........,-,,---,--.......-------TTTTTO-----,,^^^^^^^^^^^ ]],
[[ ,, ,,---TT----------.....-......-------TTTTTTT----O,,,,, ^^^^^^^ ]],
[[ ,, ,,--TTTTTTTTTT-----...------TTTTTTT------,,,,OOO ]],
[[ ,,, ,----------TTTTT-----TTTTTT------,,,,,, OOO ]],
[[ ,, ,,,,,,,,,,-----TTTTTT-----,,,,,, OO ]],
[[ ,,, ,,,,,------,,,,, OOOO ]],
[[ ,, ,,,,,, OOOOOOO ]],
[[ OOO@OOO<]],
}
return [[
MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMMMMMMMMMMM
MMMMMMMMMMMMMM MMMMMMMMMMMMMMMMMMMM
MMMMMMMMMMMM MMMMMMMMM
MMMMMMMMMM ### MMMMMM
MMMMMMMMM ##### MMMMM
MMMMMMMM ##### MMMMM
MMMMMMM #4O5# MMMMM
MMMMMM O MMMMM
MMMMMM O MMMM
MMMMMM ##### O MMMM
MMMMMM ###### O MMMMM
MMMMM #####3OOO OO MMMMMM
MMMMM ###### OOOO O MMMMMM
MMMMM ##### OOOOO O MMMMMM
MMMMM OOOO O MMMMMM
MMMMM OOOO MMMMM
MMMM ### O MMMM
MMMM ######### O MMMMM
MMM ######### OOOOOOOOOOOOOOOOMMMM
MMM ####2#### OO MMM
MMMMM O O MMM
MMMMMM O OO MMM
---MMM O OO MMM
----MM OO OO MMM
----MM O OO MM
---MMMM O O M
<---@OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO M
---MMMM O MM
---MMM O MMMMMM
-MMMM O MMMMM
-MMM O MM
MMM O MMM
MMM OO MMMM
MMM TTTTT O MMMMM
MMM TTTT-----------O------- MMMMM
MMMM TT-----~~~---------------------- MMMMM
MMMMMM TT-----~~~~~------------------::----MMMMMM
MMMMMMMMM------~~~~~-------TT-------::P:::::MMMMMM
MMMMMMMMM-------~~~-----TT-T------::::::::::MMMMMM
MMMMMMMMM-------~~------TTTT-----::::::::P:::MMMMM
MMMMMMMMM-----TT~-------TT------:::::P:::::MMMMMMM
MMMMMMMMM---TTTT~--------------::::::::::::MMMMMMM
MMMMMMMMMM--TTT~~------------::::P::::::::::MMMMMM
MMMMMMMMMMM-TT~~-------------::::::::::::P::::MMMM
MMMMMMMMMMMMMM~MMMMMMMMMM----::::P:::P::::::::MMMM
MMMMMMMMMMMMM~~MMMMMMMMMMM--::::::P::::::::::::MMM
MMMMMMMM~~~~~~MMMMMMMMMMMMMM:::::::::::::::::MMMMM
MMMMMMM~~MMMMMMMMMMMMMMMMMMMMMM::::MMMMMMMMMMMMMMM
MMMMMMM~MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM]]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment