Mummy wrappings removed from objects.lua (no "mummy_rarity")

Moved definitions for Bindings of Eternal Night and Crown of Eternal Night back to ancient-elven-ruins/objects.lua.

resolvers.resolveObject: filter.base_list can be a list of objects (matches zone:makeEntity)

Elven ruins mummies will load their zone object list into the appropriate equipment resolvers (so they will always get their mummy wrappings, etc. in any zone where they are loaded).

Greater Mummies get headgear. (This slightly increases the chance to drop the Crown.)

game/modules/tome/data/general/objects/boss-artifacts-maj-eyal.lua

@@ -271,96 +271,6 @@ It is said the Conclave created this weapon for their warmaster during the dark
 	end,
 }
 
-newEntity{ base = "BASE_MUMMY_WRAPPING", define_as = "BINDINGS_ETERNAL_NIGHT",
-	power_source = {arcane=true},
-	unique = true,
-	name = "Bindings of Eternal Night", image = "object/artifact/bindings_of_eternal_night.png",
-	unided_name = "blackened, slithering mummy wrappings",
-	desc = [[Woven through with fell magics of undeath, these bindings suck the light and life out of everything they touch. Any who don them will find themselves suspended in a nightmarish limbo between life and death.]],
-	color = colors.DARK_GREY,
-	level_range = {1, 50},
-	rarity = 300,
-	mummy_rarity = 20,
-	cost = 200,
-	material_level = 3,
-	wielder = {
-		combat_armor = 12,
-		combat_def = 12,
-		inc_stats = { [Stats.STAT_WIL] = 5, [Stats.STAT_MAG] = 5, },
-		resists = {
-			[DamageType.BLIGHT] = 30,
-			[DamageType.DARKNESS] = 30,
-			[DamageType.LIGHT] = -10,
-			[DamageType.FIRE] = -10,
-		},
-		inc_damage={[DamageType.DARKNESS] = 20},
-		on_melee_hit={[DamageType.DARKNESS] = 10},
-		life_regen = 1,
-		lite = -1,
-		poison_immune = 1,
-		disease_immune = 1,
-		undead = 1,
-		forbid_nature = 1,
-	},
-	max_power = 80, power_regen = 1,
-
-	set_list = { {"define_as","CROWN_ETERNAL_NIGHT"} },
-	set_desc = {
-		eternalnight = "A complementing item would be your crowning glory.",
-	},
-	on_set_complete = function(self, who)
-		self.use_talent = { id = "T_ABYSSAL_SHROUD", level = 2, power = 47 }
-	end,
-	on_set_broken = function(self, who)
-		self.use_talent = nil
-	end,
-}
-
-newEntity{ base = "BASE_LEATHER_CAP", define_as = "CROWN_ETERNAL_NIGHT",
-	power_source = {arcane=true},
-	unique = true,
-	name = "Crown of Eternal Night", image = "object/artifact/crown_of_eternal_night.png",
-	unided_name = "blackened crown",
-	desc = [[This crown looks useless, yet you can feel it is woven with fell magics of undeath. Maybe it has a use.]],
-	color = colors.DARK_GREY,
-	level_range = {1, 50},
-	cost = 100,
-	rarity = 400,
---	mummy_rarity = 20,
-	material_level = 3,
-	wielder = {
-		combat_armor = 3,
-		fatigue = 3,
-		inc_damage = {},
-		melee_project = {},
-		flat_damage_armor = {all=10},
-	},
-	max_power = 80, power_regen = 1,
-
-	set_list = { {"define_as","BINDINGS_ETERNAL_NIGHT"} },
-	set_desc = {
-		eternalnight = "You need to find something to bind its powers.",
-	},
-	on_set_complete = function(self, who)
-		self:specialSetAdd({"wielder","lite"}, -1)
-		self:specialSetAdd({"wielder","confusion_immune"}, 0.3)
-		self:specialSetAdd({"wielder","knockback_immune"}, 0.3)
-		self:specialSetAdd({"wielder","combat_mentalresist"}, 15)
-		self:specialSetAdd({"wielder","combat_spellresist"}, 15)
-		self:specialSetAdd({"wielder","flat_damage_armor"}, {all=20})
-		self:specialSetAdd({"wielder","inc_stats"}, {[who.STAT_CUN]=10})
-		self:specialSetAdd({"wielder","melee_project"}, {[engine.DamageType.DARKNESS]=40})
-		self:specialSetAdd({"wielder","inc_damage"}, {[engine.DamageType.DARKNESS]=20})
-		self:specialSetAdd({"wielder","talents_types_mastery"}, {["cunning/stealth"] = 0.1,})
-		self.use_talent = { id = "T_RETCH", level = 2, power = 47 }
-		game.logSeen(who, "#ANTIQUE_WHITE#The Crown of Eternal Night seems to react with the Bindings, you feel tremendous dark power.")
-	end,
-	on_set_broken = function(self, who)
-		game.logPlayer(who, "#ANTIQUE_WHITE#The powerful darkness aura you felt wanes away.")
-		self.use_talent = nil
-	end,
-}
-
 newEntity{ base = "BASE_LITE", define_as = "WINTERTIDE_PHIAL",
 	power_source = {arcane=true},
 	unided_name = "phial filled with darkness", unique = true, image="object/artifact/wintertide_phial.png",

game/modules/tome/data/general/objects/objects.lua

@@ -66,7 +66,6 @@ loadIfNot("/data/general/objects/slings.lua")
 -- Armours
 loadIfNot("/data/general/objects/shields.lua")
 loadIfNot("/data/general/objects/cloth-armors.lua")
-loadIfNot("/data/general/objects/mummy-wrappings.lua")
 loadIfNot("/data/general/objects/light-armors.lua")
 loadIfNot("/data/general/objects/heavy-armors.lua")
 loadIfNot("/data/general/objects/massive-armors.lua")

game/modules/tome/data/zones/ancient-elven-ruins/npcs.lua

@@ -27,6 +27,10 @@ load("/data/general/npcs/all.lua", rarity(4, 35))
 
 local Talents = require("engine.interface.ActorTalents")
 
+-- special object list for mummy-specific items (used when generating for other zones)
+local object_list = require("mod.class.Object"):loadList("/data/zones/ancient-elven-ruins/objects.lua")
+object_list.__ATOMIC = true
+
 -- The boss , no "rarity" field means it will not be randomly generated
 newEntity{ define_as = "GREATER_MUMMY_LORD",
 	allow_infinite_dungeon = true,
@@ -53,14 +57,14 @@ newEntity{ define_as = "GREATER_MUMMY_LORD",
 		OFFHAND = {special=shield_special},
 		BODY = {type="armor", special=function(e) return e.subtype=="mummy" or e.subtype=="heavy" or e.subtype=="massive" end},
 	},
-	equipment = resolvers.equip{
+	resolvers.equip{
 		{type="weapon", subtype="longsword", defined="LONGSWORD_WINTERTIDE", random_art_replace={chance=75}, autoreq=true},
 		{type="armor", subtype="shield", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
-		{type="armor", subtype="mummy", ignore_material_restriction=true, special_rarity="mummy_rarity", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
-		{type="armor", subtype="head", force_drop=true, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true, base_list="mod.class.Object:/data/zones/ancient-elven-ruins/objects.lua"},
+		{type="armor", subtype="mummy", ignore_material_restriction=true, force_drop=true, base_list=object_list, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
+		{type="armor", subtype="head", force_drop=true, ignore_material_restriction=true, base_list=object_list, tome_drops="boss", forbid_power_source={antimagic=true}, autoreq=true},
 	},
 	resolvers.drops{{tome_drops="boss", type="armor", subtype="heavy", forbid_power_source={antimagic=true}, autoreq=true,}},
-	resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
+	resolvers.drops{chance=100, nb=3, {base_list=object_list, tome_drops="boss"} },
 	resolvers.racial("shalore"),
 	resolvers.talents{
 		[Talents.T_ARMOUR_TRAINING]={base=3, every=10, max=5},
@@ -106,7 +110,7 @@ newEntity{ base = "BASE_NPC_MUMMY",
 	resolvers.auto_equip_filters("Berserker"),
 	resolvers.equip{
 		{type="weapon", subtype="greatsword", forbid_power_source={antimagic=true}, autoreq=true},
-		{type="armor", subtype="mummy", ignore_material_restriction=true, special_rarity="mummy_rarity", force_drop=true, forbid_power_source={antimagic=true}, autoreq=true},
+		{type="armor", subtype="mummy", ignore_material_restriction=true, force_drop=true, base_list=object_list, forbid_power_source={antimagic=true}, autoreq=true},
 	},
 	resolvers.talents{
 		[Talents.T_STUNNING_BLOW]={base=2, every=7, max=6},
@@ -129,7 +133,7 @@ newEntity{ base = "BASE_NPC_MUMMY",
 	size_category = 2,
 
 	resolvers.equip{
-		{type="armor", subtype="mummy", ignore_material_restriction=true, special_rarity="mummy_rarity", force_drop=true, forbid_power_source={antimagic=true}, autoreq=true},
+		{type="armor", subtype="mummy", ignore_material_restriction=true, force_drop=true, base_list=object_list, forbid_power_source={antimagic=true}, autoreq=true},
 	},
 	autolevel = "caster",
 	resolvers.talents{
@@ -151,7 +155,7 @@ newEntity{ base = "BASE_NPC_MUMMY",
 	ai_state = { talent_in=4, },
 
 	resolvers.equip{
-		{type="armor", subtype="mummy", ignore_material_restriction=true, special_rarity="mummy_rarity", force_drop=true, forbid_power_source={antimagic=true}, autoreq=true},
+		{type="armor", subtype="mummy", ignore_material_restriction=true, force_drop=true, base_list=object_list, forbid_power_source={antimagic=true}, autoreq=true},
 	},
 	autolevel = "ghoul",
 	resolvers.talents{
@@ -175,17 +179,19 @@ newEntity{ base = "BASE_NPC_MUMMY", define_as = "GREATER_MUMMY",
 	autolevel = "warriormage",
 	ai = "tactical", ai_state = { talent_in=2, ai_move="move_astar", },
 	global_speed_base = 1,
+	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, HEAD=1, },
 	stats = { str=20, dex=10, cun=8, mag=30, wil=20, con=20 },
 	move_others=true,
 	mana_regen = 1,
 	resolvers.auto_equip_filters("Berserker"),
 	resolvers.equip{
 		{type="weapon", subtype="greatsword", forbid_power_source={antimagic=true}, autoreq=true},
-		{type="armor", subtype="mummy", ignore_material_restriction=true, special_rarity="mummy_rarity", force_drop=true, forbid_power_source={antimagic=true}, autoreq=true},
+		{type="armor", subtype="mummy", ignore_material_restriction=true, force_drop=true, base_list=object_list, forbid_power_source={antimagic=true}, autoreq=true},
+		{type="armor", subtype="head", ignore_material_restriction=true, base_list=object_list, forbid_power_source={antimagic=true}, autoreq=true},
 	},
 	resolvers.inscriptions(1, "rune", "attack"),
 	resolvers.inscriptions(1, "rune"),
-	resolvers.drops{nb=2, {tome_drops="store"}, {tome={money=1}}},
+	resolvers.drops{nb=2, {base_list=object_list, tome_drops="store"}, {tome={money=1}}},
 	resolvers.talents{
 		[Talents.T_WEAPONS_MASTERY]={base=3, every=10, max=5},
 		[Talents.T_WEAPON_COMBAT]={base=4, every=10, max=6},

game/modules/tome/data/zones/ancient-elven-ruins/objects.lua

@@ -20,6 +20,9 @@
 load("/data/general/objects/objects-maj-eyal.lua")
 load("/data/general/objects/mummy-wrappings.lua")
 
+local Stats = require "engine.interface.ActorStats"
+--local Talents = require "engine.interface.ActorTalents"
+
 for i = 1, 3 do
 newEntity{ base = "BASE_LORE",
 	define_as = "NOTE"..i,
@@ -28,3 +31,91 @@ newEntity{ base = "BASE_LORE",
 	rarity = false,
 }
 end
+
+newEntity{ base = "BASE_MUMMY_WRAPPING", define_as = "BINDINGS_ETERNAL_NIGHT",
+	power_source = {arcane=true},
+	unique = true,
+	name = "Bindings of Eternal Night", image = "object/artifact/bindings_of_eternal_night.png",
+	unided_name = "blackened, slithering mummy wrappings",
+	desc = [[Woven through with fell magics of undeath, these bindings suck the light and life out of everything they touch. Any who don them will find themselves suspended in a nightmarish limbo between life and death.]],
+	color = colors.DARK_GREY,
+	level_range = {1, 50},
+	rarity = 20, -- not particularly rare, to be loaded only with mummy NPCs
+	cost = 200,
+	material_level = 4,
+	wielder = {
+		combat_armor = 12,
+		combat_def = 12,
+		inc_stats = { [Stats.STAT_WIL] = 5, [Stats.STAT_MAG] = 5, },
+		resists = {
+			[DamageType.BLIGHT] = 30,
+			[DamageType.DARKNESS] = 30,
+			[DamageType.LIGHT] = -10,
+			[DamageType.FIRE] = -10,
+		},
+		inc_damage={[DamageType.DARKNESS] = 20},
+		on_melee_hit={[DamageType.DARKNESS] = 10},
+		life_regen = 1,
+		lite = -1,
+		poison_immune = 1,
+		disease_immune = 1,
+		undead = 1,
+		forbid_nature = 1,
+	},
+	max_power = 80, power_regen = 1,
+
+	set_list = { {"define_as","CROWN_ETERNAL_NIGHT"} },
+	set_desc = {
+		eternalnight = "A complementing item would be your crowning glory.",
+	},
+	on_set_complete = function(self, who)
+		self.use_talent = { id = "T_ABYSSAL_SHROUD", level = 2, power = 47 }
+	end,
+	on_set_broken = function(self, who)
+		self.use_talent = nil
+	end,
+}
+
+newEntity{ base = "BASE_LEATHER_CAP", define_as = "CROWN_ETERNAL_NIGHT",
+	power_source = {arcane=true},
+	unique = true,
+	name = "Crown of Eternal Night", image = "object/artifact/crown_of_eternal_night.png",
+	unided_name = "blackened crown",
+	desc = [[This crown looks useless, yet you can feel it is woven with fell magics of undeath. Maybe it has a use.]],
+	color = colors.DARK_GREY,
+	level_range = {1, 50},
+	cost = 100,
+	rarity = 20, -- not particularly rare, to be loaded only with mummy NPCs
+	material_level = 3,
+	wielder = {
+		combat_armor = 3,
+		fatigue = 3,
+		inc_damage = {},
+		melee_project = {},
+		flat_damage_armor = {all=10},
+	},
+	max_power = 80, power_regen = 1,
+
+	set_list = { {"define_as","BINDINGS_ETERNAL_NIGHT"} },
+	set_desc = {
+		eternalnight = "You need to find something to bind its powers.",
+	},
+	on_set_complete = function(self, who)
+		self:specialSetAdd({"wielder","lite"}, -1)
+		self:specialSetAdd({"wielder","confusion_immune"}, 0.3)
+		self:specialSetAdd({"wielder","knockback_immune"}, 0.3)
+		self:specialSetAdd({"wielder","combat_mentalresist"}, 15)
+		self:specialSetAdd({"wielder","combat_spellresist"}, 15)
+		self:specialSetAdd({"wielder","flat_damage_armor"}, {all=20})
+		self:specialSetAdd({"wielder","inc_stats"}, {[who.STAT_CUN]=10})
+		self:specialSetAdd({"wielder","melee_project"}, {[engine.DamageType.DARKNESS]=40})
+		self:specialSetAdd({"wielder","inc_damage"}, {[engine.DamageType.DARKNESS]=20})
+		self:specialSetAdd({"wielder","talents_types_mastery"}, {["cunning/stealth"] = 0.1,})
+		self.use_talent = { id = "T_RETCH", level = 2, power = 47 }
+		game.logSeen(who, "#ANTIQUE_WHITE#The Crown of Eternal Night seems to react with the Bindings, you feel tremendous dark power.")
+	end,
+	on_set_broken = function(self, who)
+		game.logPlayer(who, "#ANTIQUE_WHITE#The powerful darkness aura you felt wanes away.")
+		self.use_talent = nil
+	end,
+}

game/modules/tome/resolvers.lua

@@ -33,7 +33,7 @@ local Talents = require "engine.interface.ActorTalents"
 --	Objects are added to the game when resolved (affects uniques)
 -- Additional filter fields interpreted by this resolver:
 --		_use_object: object to use (skips random generation)
---		base_list: a specifier to load the entities list from a file, format: <classname>:<file path>
+--		base_list: list of entities or specifier to load the list from a file (format: <classname>:<file path>)
 --		defined: specific name (matching obj.DEFINE_AS) for an object
 --		replace_unique (requires defined): filter to replace specific object if it cannot be generated
 --			set true to use (most) fields from the main filter
@@ -67,13 +67,16 @@ function resolvers.resolveObject(e, filter, do_wear, tries)
 		--print("[resolveObject]", e.name, "filter:", filter) table.print(filter, "\t")
 		local base_list
 		if filter.base_list then -- load the base list defined for makeEntityByName
-			local _, _, class, file = filter.base_list:find("(.*):(.*)")
-			if class and file then
-				base_list = require(class):loadList(file)
-				if base_list then
-					base_list.__real_type = "object"
-				else
-					print("[resolveObject] COULD NOT LOAD base_list:", filter.base_list)
+			if type(filter.base_list) == "table" then base_list = filter.base_list
+			else
+				local _, _, class, file = filter.base_list:find("(.*):(.*)")
+				if class and file then
+					base_list = require(class):loadList(file)
+					if base_list then
+						base_list.__real_type = "object"
+					else
+						print("[resolveObject] COULD NOT LOAD base_list:", filter.base_list)
+					end
 				end
 			end
 			filter.base_list = nil