teasy teasy teasy

game/modules/tome/class/FortressPC.lua

@@ -63,6 +63,9 @@ function _M:init(t, no_default)
 	self:learnTalent(self.T_SHERTUL_FORTRESS_ORBIT, true)
 
 	self:addParticles(Particles.new("shertul_fortress_orbiters", 1, {}))
+	if core.shader.active(4) then
+		self:addParticles(Particles.new("shader_shield", 1, {size_factor=1.8, img="shield4"}, {type="shield", ellipsoidalFactor=1.5, shieldIntensity=0.18, color={0xbe/255, 0x3e/255, 0xf9/255}}))
+	end
 	if core.shader.allow("distort") then self:addParticles(Particles.new("shertul_fortress_engine", 1, {})) end
 end
 
@@ -81,14 +84,7 @@ function _M:defineDisplayCallback()
 
 	local ps = self:getParticlesList()
 
-	local f_self = nil
-	local f_danger = nil
-	local f_powerful = nil
-	local f_friend = nil
-	local f_enemy = nil
-	local f_neutral = nil
-
-	self._mo:displayCallback(function(x, y, w, h, zoom, on_map)
+	local fct = function(x, y, w, h, zoom, on_map)
 		local e
 		for i = 1, #ps do
 			e = ps[i]
@@ -99,7 +95,13 @@ function _M:defineDisplayCallback()
 		end
 
 		return true
-	end)
+	end
+
+	if self._mo == self._last_mo or not self._last_mo then
+		self._mo:displayCallback(fct)
+	else
+		self._last_mo:displayCallback(fct)
+	end
 end
 
 function _M:move(x, y, force)

game/modules/tome/data/chats/shertul-fortress-gladium-orb.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+newChat{ id="welcome",
+	text = [[*#LIGHT_GREEN#This orb is used to control the gladium arena.#WHITE#*]],
+	answers = {
+		{"[Go back to the Fortress]", action=function() game:changeLevel(1, "shertul-fortress") end},
+		{"[Leave the orb alone]"},
+	}
+}
+
+return "welcome"

game/modules/tome/data/maps/zones/gladium.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+defineTile("#", "HARDWALL")
+defineTile("1", "HARDWALL")
+defineTile(".", "FLOOR")
+defineTile("&", "HARDGLASSWALL")
+defineTile("*", "GLADIUM_ORB")
+
+startx = 13
+starty = 6
+
+-- ASCII map section
+return [[
+###############
+#...1.....1...#
+#....1...1....#
+#1............#
+#...........&&#
+#...........&.#
+#...1.......&.#
+#...........&*#
+#...........&&#
+#1............#
+#....1...1....#
+#...1.....1...#
+###############]]

game/modules/tome/data/zones/gladium/grids.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+load("/data/general/grids/basic.lua")
+
+newEntity{
+	define_as = "GLADIUM_ORB",
+	name = "Gladium Control Orb", image = "terrain/marble_floor.png", add_displays = {class.new{z=18, image="terrain/pedestal_orb_02.png", display_h=2, display_y=-1}},
+	display = '*', color=colors.PURPLE,
+	notice = true,
+	always_remember = true,
+	block_move = function(self, x, y, e, act, couldpass)
+		if e and e.player and act then
+			local chat = require("engine.Chat").new("shertul-fortress-gladium-orb", self, e, {player=e})
+			chat:invoke()
+		end
+		return true
+	end,
+}
+
+-----------------------------------------
+-- Glass Walls
+-----------------------------------------
+newEntity{
+	define_as = "HARDGLASSWALL",
+	type = "wall", subtype = "floor",
+	name = "glass wall", image = "terrain/hardglasswall.png",
+	display = '#', color=colors.AQUAMARINE, back_color=colors.GREY,
+	z = 3,
+	nice_tiler = { method="wall3d", inner="HARDGLASSWALLF", north="HARDGLASSWALL_NORTH", south="HARDGLASSWALL_SOUTH", north_south="HARDGLASSWALL_NORTH_SOUTH", small_pillar="HARDGLASSWALL_SMALL_PILLAR", pillar_2="HARDGLASSWALL_PILLAR_2", pillar_8="HARDGLASSWALL_PILLAR_8", pillar_4="HARDGLASSWALL_PILLAR_4" },
+	always_remember = true,
+	does_block_move = true,
+	air_level = -20,
+}
+newEntity{ base = "HARDGLASSWALL", define_as = "HARDGLASSWALLF", image = "terrain/marble_floor.png",add_mos={{image = "terrain/glass/wall_glass_middle_01_64.png"}}}
+newEntity{ base = "HARDGLASSWALL", define_as = "HARDGLASSWALL_NORTH", image = "terrain/marble_floor.png",add_mos={{image = "terrain/glass/wall_glass_middle_01_64.png"}}, z = 3, add_displays = {class.new{image="terrain/glass/wall_glass_top_01_64.png", z=18, display_y=-1}}}
+newEntity{ base = "HARDGLASSWALL", define_as = "HARDGLASSWALL_NORTH_SOUTH", image = "terrain/marble_floor.png",add_mos={{image = "terrain/glass/wall_glass_01_64.png"}}, z = 3, add_displays = {class.new{image="terrain/glass/wall_glass_top_01_64.png", z=18, display_y=-1}}}
+newEntity{ base = "HARDGLASSWALL", define_as = "HARDGLASSWALL_SOUTH", image = "terrain/marble_floor.png",add_mos={{image = "terrain/glass/wall_glass_01_64.png"}}, z = 3}
+newEntity{ base = "HARDGLASSWALL_NORTH_SOUTH", define_as = "HARDGLASSWALL_PILLAR_6"}
+newEntity{ base = "HARDGLASSWALL_NORTH_SOUTH", define_as = "HARDGLASSWALL_PILLAR_4"}
+newEntity{ base = "HARDGLASSWALL_NORTH_SOUTH", define_as = "HARDGLASSWALL_SMALL_PILLAR"}
+newEntity{ base = "HARDGLASSWALL_NORTH", define_as = "HARDGLASSWALL_PILLAR_8"}
+newEntity{ base = "HARDGLASSWALL_SOUTH", define_as = "HARDGLASSWALL_PILLAR_2"}

game/modules/tome/data/zones/gladium/npcs.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+load("/data/zones/town-angolwen/npcs.lua", rarity(0))
+load("/data/zones/golem-graveyard/npcs.lua", rarity(0))

game/modules/tome/data/zones/gladium/objects.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+load("/data/general/objects/objects-maj-eyal.lua")

game/modules/tome/data/zones/gladium/traps.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+load("/data/general/traps/elemental.lua")
+load("/data/general/traps/alarm.lua")

game/modules/tome/data/zones/gladium/zone.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+return {
+	name = "Fortress Gladium",
+	level_range = {1, 1},
+	level_scheme = "player",
+	max_level = 1,
+	actor_adjust_level = function(zone, level, e) return zone.base_level end,
+	width = 15, height = 15,
+	all_remembered = true,
+	all_lited = true,
+	no_level_connectivity = true,
+	generator =  {
+		map = {
+			class = "engine.generator.map.Static",
+			map = "zones/gladium",
+		},
+	},
+}