Added new world artifacts

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

game/engines/default/engine/interface/ObjectActivable.lua

@@ -56,10 +56,10 @@ function _M:getUseDesc()
 	end
 end
 
-function _M:useObject(who)
+function _M:useObject(who, ...)
 	if self.use_power then
 		if self.power >= self.use_power.power then
-			local ret, no_power = self.use_power.use(self, who)
+			local ret, no_power = self.use_power.use(self, who, ...)
 			if not no_power then self.power = self.power - self.use_power.power end
 			return ret
 		else
@@ -70,7 +70,7 @@ function _M:useObject(who)
 			end
 		end
 	elseif self.use_simple then
-		local ret = self.use_simple.use(self, who)
+		local ret = self.use_simple.use(self, who, ...)
 		return ret
 	elseif self.use_talent then
 		if not self.use_talent.power or self.power >= self.use_talent.power then

game/modules/tome/class/Game.lua

@@ -547,7 +547,7 @@ function _M:setupCommands()
 				self.player:incStat("str", 100) self.player:incStat("dex", 100) self.player:incStat("mag", 100) self.player:incStat("wil", 100) self.player:incStat("cun", 100) self.player:incStat("con", 100)
 				self.player:learnTalent(self.player.T_HEAVY_ARMOUR_TRAINING, true) self.player:learnTalent(self.player.T_MASSIVE_ARMOUR_TRAINING, true)
 				for i, e in ipairs(self.zone.object_list) do
-					if e.unique then -- and e.rarity then
+					if e.unique and e.define_as ~= "VOICE_SARUMAN" then -- and e.rarity then
 						local a = self.zone:finishEntity(self.level, "object", e)
 						a:identify(true)
 						self.zone:addEntity(self.level, a, "object", self.player.x, self.player.y)

game/modules/tome/class/Object.lua

@@ -87,7 +87,7 @@ function _M:use(who, typ, inven, item)
 	if typ == "use" then
 		who:useEnergy(game.energy_to_act * (inven.use_speed or 1))
 		if self.use_sound then game:playSoundNear(who, self.use_sound) end
-		return self:useObject(who)
+		return self:useObject(who, inven, item)
 	end
 end
 

game/modules/tome/data/general/objects/world-artifacts.lua

@@ -638,6 +638,78 @@ newEntity{ base = "BASE_CLOTH_ARMOR",
 	},
 }
 
+newEntity{ base = "BASE_GEM",
+	unique = true,
+	unided_name = "scintillating white crystal",
+	name = "Saruman's Staff Crystal", subtype = "multi-hued",
+	color = colors.WHITE, image="object/diamond.png",
+	level_range = {35, 45},
+	desc = [[A closer look at this pure white crystal reveals that it is really a plethora of colors swirling and scintillating]],
+	rarity = 240,
+	cost = 200,
+	material_level = 5,
+	carrier = {
+		confusion_immune = 0.8,
+		fear_immune = 0.7,
+		resists={[DamageType.MIND] = 35,},
+	},
+	imbue_powers = {
+		inc_stats = { [Stats.STAT_STR] = 5, [Stats.STAT_DEX] = 5, [Stats.STAT_MAG] = 5, [Stats.STAT_WIL] = 5, [Stats.STAT_CUN] = 5, [Stats.STAT_CUN] = 5, },
+		lite = 2,
+	},
+
+	max_power = 1, power_regen = 1,
+	use_power = { name = "combine with a staff", power = 1, use = function(self, who, gem_inven, gem_item)
+		who:showInventory("Fuse with which staff?", who:getInven("INVEN"), function(o) return o.type == "weapon" and o.subtype == "staff" and not o.egoed and not o.unique end, function(o, item)
+			local voice = game.zone:makeEntityByName(game.level, "object", "VOICE_SARUMAN")
+			if voice then
+				local oldname = o:getName{do_color=true}
+
+				-- Remove the gem
+				who:removeObject(gem_inven, gem_item)
+				who:sortInven(gem_inven)
+
+				-- Change the staff
+				voice.combat = o.combat
+				voice.combat.dam = voice.combat.dam * 1.4
+				voice.combat.damtype = engine.DamageType.ARCANE
+				voice:identify(true)
+				o:replaceWith(voice)
+				who:sortInven()
+
+				who.changed = true
+				game.logPlayer(who, "You fix the crystal on the %s and create the %s.", oldname, o:getName{do_color=true})
+			else
+				game.logPlayer(who, "The fusing fails!")
+			end
+		end)
+	end },
+}
+
+-- The staff that goes with the crystal above, it will not be generated randomly it is created by the crystal
+newEntity{ base = "BASE_STAFF", define_as = "VOICE_SARUMAN",
+	unique = true,
+	name = "Voice of Saruman",
+	unided_name = "scintillating white staff",
+	color = colors.VIOLET,
+	rarity = false,
+	desc = [[A closer look at this pure white staff reveals that it is really a plethora of colors swirling and scintillating. Although Saruman's power was weakened at the end of the third age, this staff still is a force to be reckoned with.]],
+	cost = 500,
+	material_level = 5,
+
+	require = { stat = { mag=45 }, },
+	-- This is replaced by the creation process
+	combat = { dam = 1, },
+	wielder = {
+		combat_spellpower = 30,
+		max_mana = 100,
+		inc_stats = { [Stats.STAT_MAG] = 6, [Stats.STAT_WIL] = 5, [Stats.STAT_CUN] = 4 },
+		lite = 1,
+
+		inc_damage = { all=7 },
+	},
+}
+
 --[=[
 newEntity{
 	unique = true,