tset

game/engines/default/engine/generator/map/RoomsLoader.lua

@@ -140,6 +140,49 @@ function _M:makePod(x, y, radius, room_id, data, floor, wall)
 	return { id="podroom"..room_id, x=x, y=y, cx=x, cy=y }
 end
 
+--- Generates parse data for from an ascii def, for function room generators
+function _M:roomParse(def)
+	local room = { w=def[1]:len(), h=#def, spots={} }
+
+	-- Read the room map
+	for j, line in ipairs(def) do
+		local i = 1
+		for c in line:gmatch(".") do
+			room[i] = room[i] or {}
+
+			if tonumber(c) then
+				c = tonumber(c)
+				room.spots[c] = room.spots[c] or {}
+				room.spots[c][#room.spots[c]+1] = {x=i-1, y=j-1}
+				c = '.'
+			end
+
+			room[i][j] = c
+
+			i = i + 1
+		end
+	end
+	return room
+end
+
+--- Generates map data from an ascii def, for function room generators
+function _M:roomFrom(id, x, y, is_lit, room)
+	for i = 1, room.w do
+		for j = 1, room.h do
+			self.map.room_map[i-1+x][j-1+y].room = id
+			local c = room[i][j]
+			if c == '!' then
+				self.map.room_map[i-1+x][j-1+y].room = nil
+				self.map.room_map[i-1+x][j-1+y].can_open = true
+				self.map(i-1+x, j-1+y, Map.TERRAIN, self:resolve('#'))
+			else
+				self.map(i-1+x, j-1+y, Map.TERRAIN, self:resolve(c))
+			end
+			if is_lit then self.map.lites(i-1+x, j-1+y, true) end
+		end
+	end
+end
+
 --- Generates a room
 function _M:roomGen(room, id, lev, old_lev)
 	if type(room) == 'function' then

game/modules/tome/class/Game.lua

@@ -1589,6 +1589,8 @@ function _M:setupCommands()
 			print("===============")
 		end end,
 		[{"_g","ctrl"}] = function() if config.settings.cheat then
+			game:changeLevel(1, "conclave-vault")
+do return end
 			local npc = game.zone:makeEntity(game.level, "actor", {random_boss = {name_scheme="#rng# the Fearsome", class_filter=function(d) return d.name == "Demonologist" end}}, nil, true)
 			local nx, ny = util.findFreeGrid(game.player.x, game.player.y, 10, true, {[engine.Map.ACTOR]=true})
 			if npc and nx then

game/modules/tome/data/rooms/zones/conclave-vault-ogre-room-1.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2014 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
+
+local def = {
+[[#!!!!!!!!!!#]],
+[[!..........!]],
+[[!.#.#..#.#.!]],
+[[!.#1#..#1#.!]],
+[[!.###..###.!]],
+[[!..........!]],
+[[!.###..###.!]],
+[[!.#1#..#1#.!]],
+[[!.#.#..#.#.!]],
+[[!..........!]],
+[[#!!!!!!!!!!#]],
+}
+
+return function(gen, id)
+	local room = gen:roomParse(def)
+	return { name="conclave-ogre"..room.w.."x"..room.h, w=room.w, h=room.h, generator = function(self, x, y, is_lit)
+
+		gen:roomFrom(id, x, y, is_lit, room)
+
+		for _, spot in ipairs(room.spots[1]) do
+			local e = gen.zone:makeEntity(gen.level, "actor", {type="giant", subtype="ogre"}, nil, true)
+			if e then gen:roomMapAddEntity(x + spot.x, y + spot.y, "actor", e) end
+		end
+	end}
+end

game/modules/tome/data/talents/misc/races.lua

@@ -969,7 +969,7 @@ newTalent{
 }
 
 newTalent{
-	name = "Scar-Scripted Flesh",
+	name = "Scar-Scripted Flesh", short_name = "SCAR_SCRIPTED_FLESH",
 	type = {"race/ogre", 3},
 	require = racial_req3,
 	points = 5,

game/modules/tome/data/timed_effects/other.lua

@@ -2647,4 +2647,32 @@ newEffect{
 	on_timeout = function(self, eff)
 		self:incParadox(eff.paradox)
 	end,
-}
\ No newline at end of file
+}
+
+newEffect{
+	name = "AEONS_STASIS",
+	desc = "Aeons Stasis",
+	long_desc = function(self, eff) return "The target is in temporal stasis." end,
+	type = "other", decrease = 0, no_remove = true,
+	subtype = { temporal=true },
+	status = "beneficial",
+	on_lose = function(self, err) return "#Target#'s is back to the normal timeflow.", "-Aeons Stasis" end,
+	parameters = { },
+	activate = function(self, eff)
+		self:effectTemporaryValue(eff, "status_effect_immune", 1)
+		self:effectTemporaryValue(eff, "invulnerable", 1)
+		self.never_act = true
+	end,
+	deactivate = function(self, eff)
+		self.never_act = nil
+		-- FINISH ME
+	end,
+	on_timeout = function(self, eff)
+		if eff.timeout then
+			eff.timeout = eff.timeout - 1
+			if eff.timeout <= 0 then
+				self:removeEffect(self.EFF_AEONS_STASIS, nil, true)
+			end
+		end
+	end,
+}

game/modules/tome/data/zones/conclave-vault/npcs.lua

@@ -17,123 +17,42 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-load("/data/general/npcs/skeleton.lua", rarity(0))
-load("/data/general/npcs/ghoul.lua", rarity(2))
-load("/data/general/npcs/bone-giant.lua", rarity(8))
+-- load("/data/general/npcs/skeleton.lua", rarity(0))
 
-local Talents = require("engine.interface.ActorTalents")
-
-newEntity{ define_as="SUBJECT_Z",
-	name = "Subject Z", color=colors.VIOLET, display = "p",
-	desc = "This seems to be the 'subject Z' the notes spoke about. He looks human, but this cannot be -- he would be about five thousands years old!",
-	type = "humanoid", subtype = "human",
-	killer_message = "and bloodily smeared across the granite walls",
-	level_range = {10, nil}, exp_worth = 2,
-	rank = 4,
-	autolevel = "roguemage",
-	max_life = 100, life_rating = 12,
-	combat_armor = 0, combat_def = 15,
-	open_door = 1,
-	never_act = true,
-
-	ai = "tactical", ai_state = { talent_in=1, ai_move="move_astar", },
-
-	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1, FINGER=1 },
-
-	see_invisible = 20,
-
-	resolvers.equip{
-		{type="weapon", subtype="dagger", autoreq=true, force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
-		{type="weapon", subtype="dagger", autoreq=true, force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
-		{type="armor", subtype="light", autoreq=true, force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss"},
-		{defined="NIGHT_SONG", random_art_replace={chance=65}, autoreq=true},
-	},
-
-	resolvers.talents{
-		[Talents.T_DUAL_WEAPON_DEFENSE]={base=3, every=8, max=6},
-		[Talents.T_DUAL_WEAPON_TRAINING]={base=3, every=8, max=6},
-		[Talents.T_FLURRY]={base=2, every=8, max=6},
-		[Talents.T_DIRTY_FIGHTING]={base=2, every=8, max=6},
-		[Talents.T_LETHALITY]={base=3, every=8, max=6},
-		[Talents.T_WEAPON_COMBAT]={base=1, every=10, max=4},
-		[Talents.T_KNIFE_MASTERY]={base=1, every=10, max=4},
-		[Talents.T_SHADOW_COMBAT]={base=4, every=8, max=7},
-		[Talents.T_SHADOWSTEP]={base=1, every=6, max=5},
-		[Talents.T_PHASE_DOOR]=3,
-		[Talents.T_SECOND_WIND]={base=4, every=8, max=6},
-		[Talents.T_DARK_TENDRILS]={base=2, every=8, max=5},
-	},
-	resolvers.inscriptions(1, {"manasurge rune"}),
-	resolvers.inscriptions(1, "infusion"),
-
-	resolvers.sustains_at_birth(),
-
-	seen_by = function(self, who)
-		if not game.party:hasMember(who) then return end
-		self.seen_by = nil
-		self.never_act = nil
 
-		local wayist = nil
-		for uid, e in pairs(game.level.entities) do if e.define_as == "YEEK_WAYIST" then wayist = e break end end
-		if not wayist then return end
-		wayist.never_act = nil
-
-		wayist:setTarget(self)
-		self:setTarget(wayist)
-		wayist:doEmote("Sacrifice for the Way!", 60)
-	end,
-
-	on_die = function(self, who)
-		local wayist = nil
-		for uid, e in pairs(game.level.entities) do if e.define_as == "YEEK_WAYIST" then wayist = e break end end
-		if not wayist then return end
+local Talents = require("engine.interface.ActorTalents")
 
-		local p = game.party:findMember{main=true}
-		-- Yeeks really, really, really, hate halflings
-		if p.descriptor.race == "Halfling" then
-			wayist:doEmote("Halfling?! DIE!!!!!", 70)
-			wayist:checkAngered(p, false, -200)
-		elseif p.descriptor.race == "Yeek" then
-			wayist:doEmote("The Way sent you?", 70)
-			wayist.can_talk = "yeek-wayist"
-		else
-			wayist:doEmote("You.. saved me?", 70)
-			wayist.can_talk = "yeek-wayist"
-		end
+newEntity{
+	define_as = "BASE_NPC_OGRE",
+	type = "giant", subtype = "ogre",
+	display = "O", color=colors.WHITE,
+	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1 },
+
+	rank = 2,
+	size_category = 4,
+	infravision = 10,
+	
+	resolvers.racial(),
+
+	autolevel = "warriormage",
+	ai = "dumb_talented_simple", ai_state = { ai_move="move_complex", talent_in=2, },
+	stats = { str=14, mag=14, con=14 },
+	combat = { dammod={str=1, mag=0.5}},
+	combat_armor = 8, combat_def = 6,
+	not_power_source = {antimagic=true},
+
+	on_added_to_level = function(self)
+		self:setEffect(self.EFF_AEONS_STASIS, 1, {})
 	end,
 }
 
-newEntity{ define_as="YEEK_WAYIST",
-	name = "Yeek Wayist", color=colors.VIOLET, display = "y",
-	desc = "This creature is about as tall as a halfling. It is covered in white silky fur and has a disproportionate head. The weirdest thing about it though, its weapon simply float in front of it.",
-	type = "humanoid", subtype = "yeek",
-	level_range = {10, nil},
-	rank = 3,
-	autolevel = "wildcaster",
-	max_life = 100, life_rating = 10,
-	faction = "the-way",
-	combat_armor = 0, combat_def = 0,
-	psi_regen = 5,
-	open_door = 1,
-	never_act = true,
-
-	ai = "tactical", ai_state = { talent_in=1, ai_move="move_astar", },
-
-	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, PSIONIC_FOCUS=1 },
-
-	resolvers.equip{
-		{type="weapon", subtype="greatsword", autoreq=true},
-	},
-
-	resolvers.talents{
-		[Talents.T_KINETIC_SHIELD]=3,
-		[Talents.T_MINDHOOK]=1,
-		[Talents.T_PYROKINESIS]=3,
-		[Talents.T_MINDLASH]=2,
-		[Talents.T_CHARGED_AURA]=2,
-		[Talents.T_TELEKINETIC_SMASH]=2,
-	},
-	resolvers.inscriptions(1, "infusion"),
-
-	resolvers.sustains_at_birth(),
+newEntity{ base = "BASE_NPC_OGRE",
+	name = "yeti cub", color=colors.LIGHT_GREY,
+	desc = [[This humanoid form is coated with a thick white fur.]],
+	level_range = {1, nil}, exp_worth = 1,
+	rarity = 2,
+	rank = 1,
+	max_life = resolvers.rngavg(40,70), life_rating = 8,
+	combat_armor = 1, combat_def = 3,
+	combat = { dam=resolvers.levelup(5, 1, 0.7), atk=0, apr=3 },
 }

game/modules/tome/data/zones/conclave-vault/zone.lua

@@ -35,8 +35,7 @@ return {
 		map = {
 			class = "engine.generator.map.Roomer",
 			nb_rooms = 10,
-			rooms = {"random_room", {"money_vault",5}, {"lesser_vault",8}},
-			lesser_vaults_list = {"circle","rat-nest","skeleton-mage-cabal"},
+			rooms = {"zones/conclave-vault-ogre-room-1"},
 			lite_room_chance = 100,
 			['.'] = "FLOOR",
 			['#'] = "WALL",
@@ -47,7 +46,7 @@ return {
 		},
 		actor = {
 			class = "mod.class.generator.actor.Random",
-			nb_npc = {20, 30},
+			nb_npc = {0, 0},
 		},
 		object = {
 			class = "engine.generator.object.Random",
@@ -61,36 +60,11 @@ return {
 	levels =
 	{
 		[1] = {
-			day_night = true,
 			generator = { map = {
-				class = "engine.generator.map.Town",
-				building_chance = 70,
-				max_building_w = 8, max_building_h = 8,
-				edge_entrances = {6,4},
-				floor = "FLOOR",
-				external_floor = "FLOOR",
-				up = "FLAT_UP_WILDERNESS",
-				wall = "WALL",
-				down = "FLAT_DOWN4",
-				door = "DOOR",
-
-				nb_rooms = false,
-				rooms = false,
 			}, },
 		},
 		[4] = {
-			decay = false,
 			generator = {
-				map = {
-					class = "engine.generator.map.Static",
-					map = "zones/halfling-ruins-last",
-				},
-				actor = {
-					area = {x1=0, x2=49, y1=0, y2=40},
-				},
-				trap = {
-					nb_trap = {0, 0},
-				},
 			},
 		},
 	},
@@ -98,14 +72,4 @@ return {
 		-- Place a lore note on each level
 		game:placeRandomLoreObject("NOTE"..level.level)
 	end,
-	on_enter = function(lev, old_lev, newzone)
-		if newzone then
-			game:onLevelLoad("wilderness-1", function(zone, level)
-				local p = game.party:findMember{main=true}
-				local spot = level:pickSpot{type="zone-pop", subtype="halfling-ruins"}
-				p.wild_x = spot.x
-				p.wild_y = spot.y
-			end)
-		end
-	end,
 }