* allow entity:load to pass a modifier function

* add sandworms to the sandworm lair


git-svn-id: http://svn.net-core.org/repos/t-engine4@324 51575b47-30f0-44d4-a5cc-537603b46e54

game/engine/Entity.lua

@@ -165,8 +165,10 @@ end
 --- Loads a list of entities from a definition file
 -- @param file the file to load from
 -- @param no_default if true then no default values will be assigned
+-- @param res the table to load into, defaults to a new one
+-- @param mod an optional function to which will be passed each entity as they are created. Can be used to adjust some values on the fly
 -- @usage MyEntityClass:loadList("/data/my_entities_def.lua")
-function _M:loadList(file, no_default, res)
+function _M:loadList(file, no_default, res, mod)
 	no_default = no_default and true or false
 	res = res or {}
 
@@ -205,14 +207,16 @@ function _M:loadList(file, no_default, res)
 
 			local e = self.new(t, no_default)
 
+			if mod then mod(e) end
+
 			res[#res+1] = e
 			if t.define_as then res[t.define_as] = e end
 		end,
-		load = function(f)
-			self:loadList(f, no_default, res)
+		load = function(f, new_mod)
+			self:loadList(f, no_default, res, new_mod or mod)
 		end,
-		loadList = function(f)
-			return self:loadList(f, no_default)
+		loadList = function(f, new_mod)
+			return self:loadList(f, no_default, nil, new_mod or mod)
 		end,
 	}, {__index=_G}))
 	f()

game/modules/tome/data/damage_types.lua

@@ -309,3 +309,19 @@ newDamageType{
 		end
 	end,
 }
+
+-- Physical + Blind
+newDamageType{
+	name = "sand", type = "SAND",
+	projector = function(src, x, y, type, dam)
+		DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam)
+		local target = game.level.map(x, y, Map.ACTOR)
+		if target then
+			if target:checkHit(src:combatAttackStr(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("blind") then
+				target:setEffect(target.EFF_BLINDED, dam.dur, {})
+			else
+				game.logSeen(target, "%s resists the sandstorm!", target.name:capitalize())
+			end
+		end
+	end,
+}

game/modules/tome/data/general/npcs/sandworm.lua

+local Talents = require("engine.interface.ActorTalents")
+
+newEntity{
+	define_as = "BASE_NPC_SANDWORM",
+	type = "vermin", subtype = "sandworm",
+	display = "w", color=colors.YELLOW,
+	level_range = {12, 18},
+	body = { INVEN = 10 },
+
+	max_life = 40, life_rating = 5,
+	max_stamina = 85,
+	max_mana = 85,
+	resists = { [DamageType.FIRE] = 30, [DamageType.COLD] = -30 },
+
+	autolevel = "warrior",
+	ai = "dumb_talented_simple", ai_state = { talent_in=3, },
+	stats = { str=15, dex=7, mag=3, con=3 },
+	combat_armor = 1, combat_def = 1,
+}
+
+newEntity{ base = "BASE_NPC_SANDWORM",
+	name = "sandworm",
+	desc = [[A huge worm coloured as the sand it inhabits. It seems quite unhappy about you being in its lair..]],
+	rarity = 4,
+}
+
+newEntity{ base = "BASE_NPC_SANDWORM",
+	name = "sandworm destroyer",
+	desc = [[A huge worm coloured as the sand it inhabits. This particular sandworm seems to have been bred for one purpose only, the eradication of everything that is non-sandworm, such as ... you.]],
+	rarity = 6,
+
+	talents = resolvers.talents{
+		[Talents.T_STAMINA_POOL]=1,
+		[Talents.T_STUN]=2,
+		[Talents.T_KNOCKBACK]=2,
+	},
+}
+
+newEntity{ base = "BASE_NPC_SANDWORM",
+	name = "sand-drake",
+	desc = [[This unholy creature looks like a wingless dragon in shape but ressembles a sandworm in color.]],
+	rarity = 8,
+
+	talents = resolvers.talents{
+		[Talents.T_STAMINA_POOL]=1,
+		[Talents.T_SAND_BREATH]=3,
+		[Talents.T_KNOCKBACK]=2,
+	},
+}

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

@@ -246,3 +246,25 @@ newTalent{
 		return ([[Summon allies.]])
 	end,
 }
+
+newTalent{
+	name = "Sand Breath",
+	type = {"other/other",1},
+	points = 5,
+	cooldown = 4,
+	tactical = {
+		ATTACKAREA = 10,
+	},
+	range = 4,
+	action = function(self, t)
+		local tg = {type="cone", range=0, radius=4 + self:getTalentLevelRaw(t), friendlyfire=false, talent=t}
+		local x, y = self:getTarget(tg)
+		if not x or not y then return nil end
+		self:project(tg, x, y, DamageType.SAND, {dur=2+self:getTalentLevelRaw(t), dam=10 + self:getStr() * 0.3 * self:getTalentLevel(t)}, {type="flame"})
+		return true
+	end,
+	info = function(self, t)
+		return ([[You breath sand in a frontal cone. Any target caught in the area will take %0.2f physical damage and be blinded over %d turns.
+		The damage will increase with the Strength stat]]):format(10 + self:getStr() * 0.3 * self:getTalentLevel(t), 2+self:getTalentLevelRaw(t))
+	end,
+}

game/modules/tome/data/zones/sandworm-lair/npcs.lua

---load("/data/general/npcs/vermin.lua")
---load("/data/general/npcs/ooze.lua")
---load("/data/general/npcs/jelly.lua")
---load("/data/general/npcs/sandworm.lua")
+-- Load some various npc types but up their rarity to make some sandworms are the norm
+load("/data/general/npcs/vermin.lua", function(e) if e.rarity then e.rarity = e.rarity * 2 end end)
+load("/data/general/npcs/ooze.lua", function(e) if e.rarity then e.rarity = e.rarity * 2 end end)
+load("/data/general/npcs/jelly.lua", function(e) if e.rarity then e.rarity = e.rarity * 2 end end)
+load("/data/general/npcs/sandworm.lua")
 
 local Talents = require("engine.interface.ActorTalents")
 
@@ -13,7 +14,7 @@ newEntity{ define_as = "SANDWORM_TUNNELER",
 	display = "w", color=colors.GREEN,
 	desc = [[This sandworm seems to not care about your presence at all and simply continues digging its way through the sand.
 	Maybe following it is the only way to move around here...]],
-	level_range = {12, 18}, exp_worth = 2,
+	level_range = {12, 18}, exp_worth = 0,
 	max_life = 10000,
 	faction = "sandworm burrowers",
 	energy = {mod=1},
@@ -24,34 +25,38 @@ newEntity{ define_as = "SANDWORM_TUNNELER",
 	ai = "sandworm_tunneler", ai_state = {},
 }
 
--- The boss of trollshaws, no "rarity" field means it will not be randomly generated
+-- The boss of the sandworm lair, no "rarity" field means it will not be randomly generated
 newEntity{ define_as = "SANDWORM_QUEEN",
 	type = "vermin", subtype = "sandworm", unique = true,
 	name = "Sandworm Queen",
 	display = "w", color=colors.VIOLET,
-	desc = [[]],
+	desc = [[Before you stands the queen of the sandworms. Massive and bloated she slugs toward you, calling for her offspring!]],
 	level_range = {12, 18}, exp_worth = 2,
-	max_life = 200, life_rating = 17, fixed_rating = true,
+	max_life = 150, life_rating = 17, fixed_rating = true,
 	max_stamina = 85,
-	max_mana = 200,
+	max_mana = 85,
 	stats = { str=25, dex=10, cun=8, mag=20, wil=20, con=20 },
 
-	resists = { [DamageType.FIRE] = -50 },
+	resists = { [DamageType.FIRE] = 30, [DamageType.COLD] = -30 },
 
-	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
+	body = { INVEN = 10, BODY=1 },
 
 	resolvers.drops{chance=100, nb=1, {defined="TOME_OF_IMPROVEMENT"}, },
 	resolvers.drops{chance=100, nb=5, {ego_chance=100} },
 
 	talents = resolvers.talents{
-		[Talents.T_STAMINA_POOL]=1, [Talents.T_STUN]=2,
-
+		[Talents.T_STAMINA_POOL]=1,
 		[Talents.T_MANA_POOL]=1,
-		[Talents.T_ICE_STORM]=1,
-		[Talents.T_TIDAL_WAVE]=1,
-		[Talents.T_FREEZE]=2,
+		[Talents.T_SUMMON]=1,
+		[Talents.T_CRAWL_POISON]=5,
+		[Talents.T_CRAWL_ACID]=3,
+		[Talents.T_SAND_BREATH]=4,
 	},
 
-	autolevel = "caster",
+	summon = {
+		{type="vermin", subtype="sandworm", number=4, hasxp=false},
+	},
+
+	autolevel = "warrior",
 	ai = "dumb_talented_simple", ai_state = { talent_in=3, },
 }

game/modules/tome/data/zones/sandworm-lair/objects.lua

@@ -4,13 +4,13 @@ load("/data/general/objects/objects.lua")
 newEntity{
 	define_as = "TOME_OF_IMPROVEMENT",
 	type = "scroll", subtype = "tome",
-	name = "Tome of Improvemend", unique=true,
+	name = "Tome of Improvement", unique=true,
 	display = "?", color=colors.VIOLET,
 	desc = [[This very rare tome of power contains magic words that can make the user stronger, wiser, more able, ...]],
 	cost = 4000,
 
 	use_simple = { name="increase talent and stat points", use = function(self, who)
-		game.logPlayer(who, "#00FFFF#You read the tome alound and feel its magic change you!")
+		game.logPlayer(who, "#00FFFF#You read the tome alound and feel its magic changing you!")
 		who.unused_stats = who.unused_stats + 3
 		who.unused_talents = who.unused_talents + 2
 		game.logPlayer(who, "You have %d stat point(s) to spend. Press G to use them.", who.unused_stats)