Gwelgoroths now have correct lightning atatcks instead of fire attacks (bad copy paste! bad!)

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

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

@@ -73,8 +73,8 @@ function _M:targetMode(v, msg, co, typ)
 		self.target:setActive(false)
 
 		if tostring(old) == "exclusive" then
-			local fct = function(ok)
-				if not ok then
+			local fct = function(notok)
+				if notok then
 					self.target.target.entity = nil
 					self.target.target.x = nil
 					self.target.target.y = nil
@@ -90,9 +90,9 @@ function _M:targetMode(v, msg, co, typ)
 				end
 			end
 			if self.target_warning and self.target.target.x == self.player.x and self.target.target.y == self.player.y then
-				Dialog:yesnoPopup(type(self.target_warning) == "string" and self.target_warning or "Target yourself?", "Are you sure you want to target yourself?", fct)
+				Dialog:yesnoPopup(type(self.target_warning) == "string" and self.target_warning or "Target yourself?", "Are you sure you want to target yourself?", fct, "No", "Yes")
 			else
-				fct(true)
+				fct(false)
 			end
 		end
 	else

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

@@ -24,7 +24,7 @@ newEntity{
 	type = "elemental", subtype = "air",
 	display = "E", color=colors.AQUAMARINE,
 
-	combat = { dam=resolvers.mbonus(40, 15), atk=15, apr=15, dammod={mag=0.8}, damtype=DamageType.FIRE },
+	combat = { dam=resolvers.mbonus(40, 15), atk=15, apr=15, dammod={mag=0.8}, damtype=DamageType.LIGHTNING },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
 
@@ -66,7 +66,7 @@ newEntity{ base = "BASE_NPC_GWELGOROTH",
 	rarity = 3,
 	max_life = resolvers.rngavg(70,80), life_rating = 10,
 	combat_armor = 0, combat_def = 20,
-	on_melee_hit = { [DamageType.FIRE] = resolvers.mbonus(20, 10), },
+	on_melee_hit = { [DamageType.LIGHTNING] = resolvers.mbonus(20, 10), },
 
 	resolvers.talents{
 		[Talents.T_LIGHTNING]=4,
@@ -83,7 +83,7 @@ newEntity{ base = "BASE_NPC_GWELGOROTH",
 	rank = 3,
 	max_life = resolvers.rngavg(70,80),
 	combat_armor = 0, combat_def = 20,
-	on_melee_hit = { [DamageType.FIRE] = resolvers.mbonus(20, 10), },
+	on_melee_hit = { [DamageType.LIGHTNING] = resolvers.mbonus(20, 10), },
 
 	resolvers.talents{
 		[Talents.T_LIGHTNING]=5,

game/modules/tome/data/zones/tempest-peak/objects.lua

@@ -21,6 +21,7 @@ load("/data/general/objects/objects.lua")
 
 newEntity{ base = "BASE_WAND",
 	define_as = "ROD_OF_RECALL",
+	unided_name = "unstable wand",
 	name = "Rod of Recall", color=colors.LIGHT_BLUE, unique=true,
 	desc = "This rod is made entirely of mithril, infused with raw magical energies it can bend space itself.",
 	cost = 100,