plop

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

game/modules/tome/data/achievements/quests.lua

@@ -50,7 +50,7 @@ newAchievement{
 	desc = [[Killed Golbug the Destroyer.]],
 }
 newAchievement{
-	name = "Race through fire", id = "MOUNT_DOOM_SUCCESS",
+	name = "Race through fire", id = "CHARRED_SCAR_SUCCESS",
 	desc = [[Raced through the fires of the Charred Scar to stop the Sorcerers.]],
 }
 newAchievement{

game/modules/tome/data/maps/zones/eruan-last.lua

@@ -20,7 +20,7 @@
 defineTile('.', "SAND")
 defineTile('#', "PALMTREE")
 defineTile('~', "DEEP_WATER")
-defineTile('&', "MOUNT_DOOM_PORTAL")
+defineTile('&', "CHARRED_SCAR_PORTAL")
 defineTile('s', "SAND", nil, "SUN_PALADIN_GUREN")
 
 subGenerator{

game/modules/tome/data/quests/high-peak.lua

@@ -100,7 +100,7 @@ function end_end_combat(self)
 	end
 end
 
-function failed_mount_doom(self, level)
+function failed_charred_scar(self, level)
 	local aeryn = game.zone:makeEntityByName(level, "actor", "FALLEN_SUN_PALADIN_AERYN")
 	game.zone:addEntity(level, aeryn, "actor", level.default_down.x, level.default_down.y)
 	game.logPlayer(game.player, "#LIGHT_RED#As you enter the level you hear a familiar voice.")

game/modules/tome/data/zones/charred-scar/npcs.lua

@@ -125,7 +125,7 @@ newEntity{
 	open_door = true,
 
 	autolevel = "warrior",
-	ai = "dumb_talented_simple", ai_state = { ai_target="mount_doom_target", talent_in=2, },
+	ai = "dumb_talented_simple", ai_state = { ai_target="charred_scar_target", talent_in=2, },
 	energy = { mod=1 },
 	stats = { str=20, dex=8, mag=6, con=16 },
 }

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

@@ -19,23 +19,3 @@
 
 load("/data/general/objects/objects-far-east.lua")
 load("/data/general/objects/lore-sunwall.lua")
-
--- Artifact, droped (and used!) by Bill the Stone Troll
-
-newEntity{ base = "BASE_GREATMAUL",
-	define_as = "GREATMAUL_BILL_TRUNK",
-	name = "Bill's Tree Trunk", unique=true,
-	desc = [[This is a big nasty looking tree trunk that Bill was using as a weapon. It could still serve this purpose, should you be strong enough to wield it!]],
-	require = { stat = { str=25 }, },
-	cost = 5,
-	combat = {
-		dam = 30,
-		apr = 7,
-		physcrit = 1.5,
-		dammod = {str=1.3},
-		damrange = 1.7,
-	},
-
-	wielder = {
-	},
-}

game/modules/tome/data/zones/high-peak/zone.lua

@@ -66,7 +66,7 @@ return {
 		if level.level == 15 then
 			local mtdm = game.player:hasQuest("charred-scar")
 			if not mtdm or mtdm:isCompleted("not-stopped") then
-				game.player:hasQuest("high-peak"):failed_mount_doom(level)
+				game.player:hasQuest("high-peak"):failed_charred_scar(level)
 			end
 		end
 	end,