Changed Blighted Soil to reduce diseases resistance and grant all attacks made b…

…y the creature has a 40% chance to infect the target with a random disease


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

@@ -189,6 +189,7 @@ function _M:dumpToJSON(js, bypass, nosub)
 	if self:isUnarmed() then
 		local mean, dam = self.combat, self.combat
 		local d = {}
+		c.barehand = {}
 		c.barehand[#c.barehand+1] = d
 		if mean and dam then
 			d.accuracy = string.format("%d", self:combatAttack(mean))
@@ -200,6 +201,7 @@ function _M:dumpToJSON(js, bypass, nosub)
 		if mean and mean.range then d.range = mean.range end
 	end
 	if self:getInven(self.INVEN_OFFHAND) then
+		c.offhand = {}
 		for i, o in ipairs(self:getInven(self.INVEN_OFFHAND)) do
 			local offmult = self:getOffHandMult(o.combat)
 			local mean, dam = o.combat, o.combat

@@ -412,6 +412,14 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
 			src.turn_procs.is_crit = nil
 		end
 
+		if src.turn_procs and not src.turn_procs.blighted_soil and src:attr("blighted_soil") and rng.percent(src:attr("blighted_soil")) then
+			local tid = rng.table{src.EFF_ROTTING_DISEASE, src.EFF_DECREPITUDE_DISEASE, src.EFF_DECREPITUDE_DISEASE}
+			if not target:hasEffect(tid) then
+				local l = game.zone:level_adjust_level(game.level, game.zone, "object")
+				local p = math.ceil(4 + l / 2)
+				target:setEffect(tid, 8, {str=p, con=p, dex=p, dam=5 + l / 2, src=src})
+			end
+		end
 
 		return dam + add_dam
 	end

@@ -38,7 +38,7 @@ else
 	level.map:particleEmitter(x, y, 3, "ultrashield", {rm=50, rM=80, gm=80, gM=100, bm=30, bM=60, am=220, aM=250, radius=3, density=1, life=14, instop=17})
 end
 
-local on_stand = function(self, x, y, who) if who.life and who.life < who.max_life then who:setEffect(who.EFF_BLIGHTED_SOIL, 1, {}) end end
+local on_stand = function(self, x, y, who) who:setEffect(who.EFF_BLIGHTED_SOIL, 1, {}) end
 
 local grids = core.fov.circle_grids(x, y, 3, "do not block")
 for x, yy in pairs(grids) do for y, _ in pairs(yy) do

@@ -116,7 +116,7 @@ newTalent{
 		local dam = t.getDamage(self, t)
 		return ([[You focus the aether into a spinning beam of arcane energies doing %0.2f arcane damage and having 25%% chance to silence the creatures.
 		The beam will also damage its epicenter each turn for 10%% of the damage (but it will not silence).
-		THe beam spins with incredible speed (1600%%).
+		The beam spins with incredible speed (1600%%).
 		The damage will increase with Spellpower.]]):
 		format(damDesc(self, DamageType.ARCANE, dam))
 	end,

@@ -78,19 +78,10 @@ floorEffect{
 
 floorEffect{
 	desc = "Blighted Soil", image = "talents/blightzone.png",
-	long_desc = "The target is walking on blighted soil, reducing diseases resistance by 30% and giving a chance to be infected with a random disease.",
+	long_desc = "The target is walking on blighted soil, reducing diseases resistance by 60% and giving all attacks a 40% chance to infect the target with a random disease (can only happen once per turn).",
 	activate = function(self, eff)
-		self:effectTemporaryValue(eff, "disease_immune", -0.3)
-	end,
-	on_timeout = function(self, eff)
-		if rng.chance(10) then
-			local tid = rng.table{self.EFF_ROTTING_DISEASE, self.EFF_DECREPITUDE_DISEASE, self.EFF_DECREPITUDE_DISEASE}
-			if not self:hasEffect(tid) then
-				local l = game.zone:level_adjust_level(game.level, game.zone, "object")
-				local p = math.ceil(4 + l / 2)
-				self:setEffect(tid, 8, {str=p, con=p, dex=p, dam=5 + l / 2, src=self})
-			end
-		end
+		self:effectTemporaryValue(eff, "disease_immune", -0.6)
+		self:effectTemporaryValue(eff, "blighted_soil", 40)
 	end,
 }
 

@@ -58,7 +58,7 @@ function _M:init(title, actor, filter, action, on_select)
 				local bi = self.actor:getInven(ui.inven)
 				local ws = self.actor:getInven(wear_o:wornInven())
 				local os = self.actor:getObjectOffslot(wear_o)
-				if (ws and ws.id == bi.id) or (os and self.actor:getInven(os).id == bi.id) then
+				if bi and (ws and ws.id == bi.id) or (os and self.actor:getInven(os).id == bi.id) then
 					self.actor:doTakeoff(ui.inven, ui.item, ui:getItem(), true) 
 				end
 			end