Redesign Windwall ego

The old one had odd interactions when a projectile caused the block.

game/modules/tome/class/Object.lua

@@ -1834,6 +1834,8 @@ function _M:getTextualDesc(compare_with, use_actor)
 
 		compare_fields(w, compare_with, field, "slow_projectiles", "%+d%%", "Slows Projectiles: ")
 
+		compare_fields(w, compare_with, field, "shield_windwall", "%+d", "Bonus block near projectiles: ")
+
 		compare_fields(w, compare_with, field, "paradox_reduce_anomalies", "%+d", "Reduces paradox anomalies(equivalent to willpower): ")
 
 		compare_fields(w, compare_with, field, "damage_backfire", "%+d%%", "Damage Backlash: ", nil, true)

game/modules/tome/class/interface/Combat.lua

@@ -2496,6 +2496,22 @@ function _M:combatShieldBlock()
 	if combat2 then block = block + (combat2.block or 0) end
 
 	if self:attr("block_bonus") then block = block + self:attr("block_bonus") end
+	if self:attr("shield_windwall") then
+		local found = false
+
+		local grids = core.fov.circle_grids(self.x, self.y, 10, true)
+		for x, yy in pairs(grids) do for y, _ in pairs(grids[x]) do
+			local i = 0
+			local p = game.level.map(x, y, engine.Map.PROJECTILE+i)
+			while p do
+				if p.src and p.src:reactionToward(self) >= 0 then return end  
+				i = i + 1
+				p = game.level.map(x, y, engine.Map.PROJECTILE+i)
+				found = true
+			end end end
+
+		if found then block = block + self:attr("shield_windwall") end
+	end
 	return block
 end
 

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

@@ -380,45 +380,8 @@ newEntity{
 		inc_stats = {
 			[Stats.STAT_WIL] = resolvers.mbonus_material(5, 1),
 		},
-	},
-	on_block = {
-		desc=function(self, who, special)
-			local dam = special.shield_windwall(who)
-			return ("Blasts a radius 10 area dealing #YELLOW#%d#LAST# physical damage to enemies and destroying any hostile projectiles"):format(dam)
-		end,
-		shield_windwall=function(who)
-			local dam = math.max(15, math.floor(who:combatStatScale(who:combatMindpower(), 1, 150)))
-			return dam
-		end,
-		fct=function(self, who, target, type, dam, eff, special)
-			if who.turn_procs and who.turn_procs.shield_windwall then return end
-			who.turn_procs.shield_windwall = true
-			local DamageType = require "engine.DamageType"
-			local dam = special.shield_windwall(who)
-			who:project({type="ball", radius=10, friendlyfire=false, selffire=false}, who.x, who.y, DamageType.PHYSICAL, dam)
-			game.level.map:particleEmitter(who.x, who.y, 10, "shout",
-				{additive=true, life=10, size=3, distorion_factor=0.0, radius=10, nb_circles=4, rm=0.8, rM=1, gm=0, gM=0, bm=0.8, bM=1.0, am=0.4, aM=0.6})
-
-			local grids = core.fov.circle_grids(who.x, who.y, 10, true)
-			for x, yy in pairs(grids) do for y, _ in pairs(grids[x]) do
-				local i = 0
-				local p = game.level.map(x, y, engine.Map.PROJECTILE+i)
-				while p do
-					if p.src and p.src:reactionToward(who) >= 0 then return end
-					if p.name then 
-						game.logPlayer(who, "#GREEN#"..p.name .. "is blown away!#LAST#")
-					else
-						game.logPlayer(who, "#GREEN#A projectile is blown away!!#LAST#")
-					end
-					
-					p:terminate(x, y)
-					game.level:removeEntity(p, true)
-					p.dead = true
-   
-					i = i + 1
-					p = game.level.map(x, y, engine.Map.PROJECTILE+i)
-				end end end
-		end,
+		slow_projectiles = resolvers.mbonus_material(30, 10),
+		shield_windwall = resolvers.mbonus_material(100, 10),
 	},
 }