Merge branch 'misc174' into 'master'

Misc 1.7.4



See merge request !723

@@ -133,8 +133,8 @@ function _M:trigger(x, y, who)
 	else
 		local tname = who:getName()
 		local str =self.message
-		str = str:gsub("@target@", tname)
-		str = str:gsub("@Target@", tname:capitalize())
+		str = str:noun_sub("@target@", tname)
+		str = str:noun_sub("@Target@", tname:capitalize())
 		game.logSeen(who, "%s", str)
 	end
 	local known, del = false, false

@@ -612,14 +612,10 @@ local function archery_projectile(tx, ty, tg, self, tmp)
 	end
 	
 	-- Siege Arrows
-	if hitted and ammo and ammo.siege_impact and (not self.shattering_impact_last_turn or self.shattering_impact_last_turn < game.turn) then
+	if hitted and ammo and ammo.siege_impact then
 		local dam = dam * ammo.siege_impact
-		local invuln = target.invulnerable
-		game.logSeen(target, "The shattering blow creates a shockwave!")
-		target.invulnerable = 1 -- Target already hit, don't damage it twice
-		self:project({type="ball", radius=1, friendlyfire=false}, target.x, target.y, DamageType.PHYSICAL, dam)
-		target.invulnerable = invuln
-		self.shattering_impact_last_turn = game.turn
+		game.logSeen(target, "The siege arrow creates a shockwave!")
+		self:project({type="ball", radius=1, friendlyfire=false, act_exclude={[target.uid]=true}}, target.x, target.y, DamageType.PHYSICAL, dam)
 	end
 
 	if self ~= target then

@@ -2621,7 +2621,9 @@ newDamageType{
 			if target.turn_procs and target.turn_procs.been_retched then
 				mult = 0.5 ^ target.turn_procs.been_retched
 			end
+			src:attr("can_heal_necrotic_minions", 1)
 			target:heal(dam * 1.5 * mult, src)
+			src:attr("can_heal_necrotic_minions", -1)
 			if target.turn_procs then
 				target.turn_procs.been_retched = (target.turn_procs.been_retched or 0) + 1
 			end

@@ -222,14 +222,13 @@ newEntity{
 
 	charm_on_use = {
 		{100, function(self, who) return ("increase the duration of %d beneficial effects by %d"):tformat(self.extending_amt, self.extending_dur) end, function(self, who)
-			local effs = who:effectsFilter(function(eff)
+			local eff_ids = who:effectsFilter(function(eff)
 				if eff.status == "beneficial" and eff.type ~= "other" then return true end
-			end)
-			if #effs <= 0 then return end
-			for i = 1, math.floor(self.extending_amt) do
-				local eff = rng.tableRemove(effs)
+			end, self.extending_amt)
+			for _, eff_id in pairs(eff_ids) do 
+				local eff = who:hasEffect(eff_id)
 				if eff and eff.dur then
-					eff.dur = eff.dur + math.floor(self.extending_amt)
+					eff.dur = eff.dur + math.floor(self.extending_dur)
 				end
 			end
 		end},
@@ -250,14 +249,13 @@ newEntity{
 
 	charm_on_use = {
 		{100, function(self, who) return ("increase the duration of %d beneficial effects by %d"):tformat(self.extending_amt, self.extending_dur) end, function(self, who)
-			local effs = who:effectsFilter(function(eff)
+			local eff_ids = who:effectsFilter(function(eff)
 				if eff.status == "beneficial" and eff.type ~= "other" then return true end
-			end)
-			if #effs <= 0 then return end
-			for i = 1, math.floor(self.extending_amt) do
-				local eff = rng.tableRemove(effs)
+			end, self.extending_amt)
+			for _, eff_id in pairs(eff_ids) do 
+				local eff = who:hasEffect(eff_id)
 				if eff and eff.dur then
-					eff.dur = eff.dur + math.floor(self.extending_amt)
+					eff.dur = eff.dur + math.floor(self.extending_dur)
 				end
 			end
 		end},

@@ -172,15 +172,27 @@ local make_poltergeist = function(type)
         }
         e[#e+1] = resolvers.inscription("IMPLANT:_STEAM_GENERATOR", {cooldown=32, power=10}),
         make_req(el, o, "steamsaw")
+    elseif o.subtype == "whip" and o.slot_forbid == "OFFHAND" then
+        class = "Berserker"
+        e.autolevel = "warrior"
+        e[#e+1] = resolvers.talents{
+            [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=10, max=5},
+        }
 	elseif o.subtype == "whip" then
-		class = "Corruptor"
-		e.autolevel = "caster"
-        e.ai_tactic = resolvers.tactic"ranged"
-		e[#e+1] = resolvers.talents{
-			[Talents.T_CORRUPTED_NEGATION]={base=3, every=12, max=6},
-			[Talents.T_DRAIN]={base=5, every=10, max=7},
-			[Talents.T_BLOOD_GRASP]={base=4, every=5, max=7},
-		}
+        class = "Marauder"
+        e.autolevel = "archer"
+        e[#e+1] = resolvers.talents{
+            [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=10, max=5},
+        }
+        make_req(el, o, "whip")
+    elseif o.subtype == "trident" then
+        class = "Bulwark"
+        e.autolevel = "warrior"
+        e[#e+1] = resolvers.talents{
+            [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=10, max=5},
+            [Talents.T_ARMOUR_TRAINING]=2
+        }
+        make_req(el, o, "shield")
     elseif o.type == "weapon" and o.slot_forbid == "OFFHAND" then
         class = "Berserker"
         e.autolevel = "warrior"

@@ -521,7 +521,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Your passion for singing the praises of the Moons reaches its zenith.
-		Your Hymns now fire shadowy beams that will hit up to %d of your foes within radius 5 for 1 to %0.2f damage, with a 20%% chance of blinding.
+		Your Hymns now fire shadowy beams that will hit up to %d of your foes within radius 5 for %0.2f damage, with a 25%% chance of blinding.
 		This powerful effect will drain %0.1f negative energy each time it fires at at least 1 target; no beam will fire if your negative energy is too low.
 		These values scale with your Spellpower.]]):tformat(t.getTargetCount(self, t), damDesc(self, DamageType.DARKNESS, t.getDamage(self, t)), t.getNegativeDrain(self, t))
 	end,

@@ -152,9 +152,9 @@ newTalent{
 			if self.talents_cd[self.T_SUN_BEAM] <= 0 then self.talents_cd[self.T_SUN_BEAM] = nil end
 		else
 			self:setEffect(self.EFF_SUN_VENGEANCE, 2, {})
-			if self:attr("sun_paladin_avatar") then
-				self:alterTalentCoolingdown(self.T_JUDGEMENT, -6)
-			end
+		end
+		if self:attr("sun_paladin_avatar") then
+			self:alterTalentCoolingdown(self.T_JUDGEMENT, -6)
 		end
 	end,
 	info = function(self, t)

@@ -156,8 +156,13 @@ newTalent{
 		if self:isTalentActive(t.id) then -- always hit enemies while in the Fearscape (affects AI)
 			return {type="ball", nolock=true, pass_terrain=true, nowarning=true, range=20, radius=20, requires_knowledge=false, selffire=false, block_path=false, block_radius=false}
 		else -- always hit the primary target
-			local tgt = self.ai_target.actor
-			return {type="hit", range=self:getTalentRange(t), talent=t, x=tgt and tgt.x, y=tgt and tgt.y}
+			return {type="hit", range=self:getTalentRange(t), talent=t}
+		end
+	end,
+	onAIGetTarget = function(self, t) 
+		if self.ai_target and self.ai_target.actor then
+			local target = self.ai_target.actor
+			return target.x, target.y, target
 		end
 	end,
 	range = 5,
@@ -272,6 +277,7 @@ newTalent{
 		local ret = {
 			target = target,
 			x = self.x, y = self.y,
+			target_x = target.x, target_y = target.y,
 			particle = particle,
 			drain_add = 0,
 		}
@@ -317,7 +323,7 @@ newTalent{
 					self.x, self.y = x1, y1
 				end
 			end
-			local x2, y2 = util.findFreeGrid(p.x, p.y, 20, true, {[Map.ACTOR]=true})
+			local x2, y2 = util.findFreeGrid(p.target_x or p.x, p.target_y or p.y, 20, true, {[Map.ACTOR]=true})
 			if not p.target.dead then
 				if x2 then
 					p.target:move(x2, y2, true)

@@ -607,7 +607,7 @@ newTalent{
 	points = 1,
 	tactical = { ATTACK = {PHYSICAL = 1},
 		DISABLE = function(self, t, target)
-			return target:checkClassification("unliving") and 0 or self:knowTalent(self.T_DART_LAUNCHER_MASTERY) and 2 or {sleep = 1, poison = 1}
+			return self:knowTalent(self.T_DART_LAUNCHER_MASTERY) and 2 or {sleep = 1, poison = 1}
 		end
 	},
 	range = 5,
@@ -636,7 +636,7 @@ newTalent{
 			local target = game.level.map(px, py, engine.Map.ACTOR)
 			if not target then return nil end
 			self:project(tg, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getDamage(self,t)))
-			if target:checkClassification("living") and (self:knowTalent(self.T_DART_LAUNCHER_MASTERY) or target:canBe("sleep") and target:canBe("poison")) then
+			if (self:knowTalent(self.T_DART_LAUNCHER_MASTERY) or target:canBe("sleep") and target:canBe("poison")) then
 				target:setEffect(target.EFF_SEDATED, 4, {src=self, power=t.getSleepPower(self,t), slow=slow, insomnia=20, no_ct_effect=true, apply_power=self:combatAttack()})
 				game.level.map:particleEmitter(target.x, target.y, 1, "generic_charge", {rm=180, rM=200, gm=100, gM=120, bm=30, bM=50, am=70, aM=180})
 			else

@@ -583,7 +583,7 @@ newTalent{
 	name = "Stoning Poison",
 	type = {"cunning/poisons-effects", 1},
 	require = {stat = {cun=40}, level=25},
-	hide = true,
+	type_no_req = true,
 	points = 1,
 	mode = "sustained",
 	cooldown = 10,

@@ -789,7 +789,7 @@ newTalent{
 		return false -- NPC's don't actually use the action function
 	end,
 	action = function(self, t)
-		local chat = Chat.new("trap-priming", t, self, {player=self, trapping_tids=traps_getunlocked(self, t), chat_talent=t})
+		local chat = Chat.new("trap-priming", self, self, {player=self, trapping_tids=traps_getunlocked(self, t), chat_talent=t})
 		local d = chat:invoke()
 		d.key:addBinds{ EXIT = function()
 			self:talentDialogReturn(self.trap_primed, self.trap_primed)

@@ -333,7 +333,7 @@ newTalent{
 	on_arrival = function(self, t, m)
 		local tg = {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
 		local duration = self:callTalent(self.T_GRAND_ARRIVAL,"effectDuration")
-		local slowdown = self:callTalent(self.T_GRAND_ARRIVAL,"slowStrength") / 100 --divide by 100 to change percent to decimal
+		local slowdown = self:callTalent(self.T_GRAND_ARRIVAL,"slowStrength")
 		self:project(tg, m.x, m.y, DamageType.TEMP_EFFECT, {foes=true, eff=self.EFF_SLOW_MOVE, dur=duration, p={power=slowdown}}, {type="flame"})
 	end,
 	summonTime = function(self, t) return math.floor(self:combatScale(self:getTalentLevel(t), 2, 0, 7, 5)) + self:callTalent(self.T_RESILIENCE, "incDur") end,

@@ -132,6 +132,7 @@ newTalent{
 		local oh = self:hasOffWeaponType("mindstar")
 		if mh then apply(mh) end
 		if oh then apply(oh) end
+		return true
 	end,
 	info = function(self, t)
 		return ([[Alter the flow of energies of your equiped mindstars, changing their damage type between nature and mind.]]):tformat()

@@ -102,7 +102,7 @@ newTalent{
 			local nb = 0
 			for eff_id, p in pairs(self.tmp) do
 				local e = self.tempeffect_def[eff_id]
-				if e.type == "magical" and e.status == "detrimental" then nb = nb + 1 end
+				if (e.type == "magical" or e.type == "physical") and e.status == "detrimental" then nb = nb + 1 end
 			end
 			return nb
 		end,
@@ -110,13 +110,7 @@ newTalent{
 			local nb = 0
 			for eff_id, p in pairs(aitarget.tmp) do
 				local e = self.tempeffect_def[eff_id]
-				if e.type == "magical" and e.status == "beneficial" then nb = nb + 1 end
-			end
-			for tid, act in pairs(aitarget.sustain_talents) do
-				if act then
-					local talent = aitarget:getTalentFromId(tid)
-					if talent.is_spell then nb = nb + 1 end
-				end
+				if (e.type == "magical" or e.type == "physical") and e.status == "beneficial" then nb = nb + 1 end
 			end
 			return nb^0.5
 		end},

@@ -4635,6 +4635,7 @@ newEffect{
 	on_lose = function(self, err) return nil, true end,
 	activate = function(self, eff)
 		self:effectTemporaryValue(eff, "generic_damage_penalty", eff.power)
+		self:effectTemporaryValue(eff, "dazzled", 1)
 	end,
 }
 

@@ -35,7 +35,6 @@ return {
 	width = 60, height = 25,
 --	all_remembered = true,
 	all_lited = true,
-	no_worldport = true,
 	persistent = "zone",
 	min_material_level = 2,
 	max_material_level = 3,

@@ -490,8 +490,7 @@ function _M:drawDialog(kind, actor_to_compare)
 	local text = ""
 	local dur_text = ""
 
-	-- if player.__te4_uuid and profile.auth and profile.auth.drupid and not config.settings.disable_all_connectivity and config.settings.tome.upload_charsheet then
-	if true then profile.auth.drupid=1 player.__te4_uuid="jklljkljlk"
+	if player.__te4_uuid and profile.auth and profile.auth.drupid and not config.settings.disable_all_connectivity and config.settings.tome.upload_charsheet then
 		local path = "https://te4.org/characters/"..profile.auth.drupid.."/tome/"..player.__te4_uuid
 		local LinkTxt = ("Online URL: #LIGHT_BLUE##{underline}#%s#{normal}#"):tformat(path)
 		local Link_w, Link_h = self.font:size(LinkTxt)