Skip to content
Snippets Groups Projects
Commit a0586dd5 authored by DarkGod's avatar DarkGod
Browse files

Merge branch 'damtype_proc_display' into 'master' 

Damtype proc display

Long story short, made it display when it procs, not just whenever. I feel like that's more interesting to see, and it was brought up several times.
parents e7bfbdb6 d10458cc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
game/modules/tome/data/damage_types.lua
+ 78
− 50
View file @ a0586dd5
......@@ -1996,29 +1996,35 @@ newDamageType{
useImplicitCrit(src, state)
local target = game.level.map(x, y, Map.ACTOR)
if target then
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% gloom chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
if rng.percent(dam) then
local check = math.max(src:combatAttack(), src:combatSpellpower(), src:combatMindpower())
if not src:checkHit(check, target:combatMentalResist()) then return end
local effect = rng.range(1, 3)
if effect == 1 then
-- confusion
if target:canBe("confusion") and not target:hasEffect(target.EFF_GLOOM_CONFUSED) then
target:setEffect(target.EFF_GLOOM_CONFUSED, 2, {power=25, no_ct_effect=true} )
end
elseif effect == 2 then
-- stun
if target:canBe("stun") and not target:hasEffect(target.EFF_GLOOM_STUNNED) then
target:setEffect(target.EFF_GLOOM_STUNNED, 2, {no_ct_effect=true})
end
elseif effect == 3 then
-- slow
if target:canBe("slow") and not target:hasEffect(target.EFF_GLOOM_SLOW) then
target:setEffect(target.EFF_GLOOM_SLOW, 2, {power=0.3, no_ct_effect=true})
local check = math.max(src:combatAttack(), src:combatSpellpower(), src:combatMindpower())
if not src:checkHit(check, target:combatMentalResist()) then return end
local effect = rng.range(1, 3)
local name
if effect == 1 then
-- confusion
if target:canBe("confusion") and not target:hasEffect(target.EFF_GLOOM_CONFUSED) then
target:setEffect(target.EFF_GLOOM_CONFUSED, 2, {power=25, no_ct_effect=true} )
end
name = "confusion"
elseif effect == 2 then
-- stun
if target:canBe("stun") and not target:hasEffect(target.EFF_GLOOM_STUNNED) then
target:setEffect(target.EFF_GLOOM_STUNNED, 2, {no_ct_effect=true})
end
name = "stun"
elseif effect == 3 then
-- slow
if target:canBe("slow") and not target:hasEffect(target.EFF_GLOOM_SLOW) then
target:setEffect(target.EFF_GLOOM_SLOW, 2, {power=0.3, no_ct_effect=true})
end
name = "slow'"
end
game:delayedLogDamage(src, target, 0, ("%s<gloom %s>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", name), false)
else
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% gloom chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
end
end
end
end,
}
......@@ -2044,12 +2050,14 @@ newDamageType{
useImplicitCrit(src, state)
local target = game.level.map(x, y, Map.ACTOR)
if target then
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% dark numbing chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
if rng.percent(dam) then
local check = math.max(src:combatAttack(), src:combatSpellpower(), src:combatMindpower())
local reduction = 15
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% damage reduction>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", reduction), false)
target:setEffect(target.EFF_ITEM_NUMBING_DARKNESS, 4, {reduce = reduction, apply_power=check, no_ct_effect=true})
end
else
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% dark numbing chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
end
end
end,
}
......@@ -2081,11 +2089,15 @@ newDamageType{
return
end
game:delayedLogDamage(src, target, 0, ("%s<temporal energize>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#"), false)
local energy = (game.energy_to_act * 0.1)
src.energy.value = src.energy.value + energy
--game.logSeen(target, "Time seems to bend and quicken energizing %s!", src.name:capitalize())
src.turn_procs.item_temporal_energize = 1 + (src.turn_procs.item_temporal_energize or 0)
else
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% chance to energize>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
end
end,
}
......@@ -2111,12 +2123,14 @@ newDamageType{
useImplicitCrit(src, state)
local target = game.level.map(x, y, Map.ACTOR)
if target then
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% corrode armour chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
if rng.percent(dam) then
local check = math.max(src:combatAttack(), src:combatSpellpower(), src:combatMindpower())
--local param = { atk=dam/3, armor=dam/3, defense=dam/3, src=src, apply_power = check, no_ct_effect=true }
target:setEffect(target.EFF_ITEM_ACID_CORRODE, 5, {pct = 0.3, no_ct_effect = true, apply_power = check})
end
game:delayedLogDamage(src, target, 0, ("%s<30%% armour corrode>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
local check = math.max(src:combatAttack(), src:combatSpellpower(), src:combatMindpower())
--local param = { atk=dam/3, armor=dam/3, defense=dam/3, src=src, apply_power = check, no_ct_effect=true }
target:setEffect(target.EFF_ITEM_ACID_CORRODE, 5, {pct = 0.3, no_ct_effect = true, apply_power = check})
else
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% corrode armour chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
end
end
end,
}
......@@ -2143,16 +2157,18 @@ newDamageType{
useImplicitCrit(src, state)
local target = game.level.map(x, y, Map.ACTOR)
if target then
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% blind chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
if rng.percent(dam) then
if target:canBe("blind") then
local check = math.max(src:combatAttack(), src:combatSpellpower(), src:combatMindpower())
target:setEffect(target.EFF_BLINDED, 4, {apply_power=(check), no_ct_effect=true})
if target:canBe("blind") then
game:delayedLogDamage(src, target, 0, ("%s<blinding light>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#"), false)
local check = math.max(src:combatAttack(), src:combatSpellpower(), src:combatMindpower())
target:setEffect(target.EFF_BLINDED, 4, {apply_power=(check), no_ct_effect=true})
else
--game.logSeen(target, "%s resists the blinding light!", target.name:capitalize())
end
else
--game.logSeen(target, "%s resists the blinding light!", target.name:capitalize())
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% blind chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
end
end
end
end,
}
......@@ -2178,14 +2194,16 @@ newDamageType{
useImplicitCrit(src, state)
local target = game.level.map(x, y, Map.ACTOR)
if target then
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% daze chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
if rng.percent(dam) then
if target:canBe("stun") then
local check = math.max(src:combatAttack(), src:combatSpellpower(), src:combatMindpower())
game:delayedLogDamage(src, target, 0, ("%s<lightning daze>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#"), false)
if target:canBe("stun") then
local check = math.max(src:combatAttack(), src:combatSpellpower(), src:combatMindpower())
game:onTickEnd(function() target:setEffect(target.EFF_DAZED, 4, {apply_power=check, no_ct_effect=true}) end) --onTickEnd to avoid breaking the daze
end
else
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% daze chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
end
end
end
end,
}
......@@ -2210,12 +2228,16 @@ newDamageType{
useImplicitCrit(src, state)
local target = game.level.map(x, y, Map.ACTOR)
if target then
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% disease chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
if rng.percent(dam) and target:canBe("disease") then
local check = math.max(src:combatSpellpower(), src:combatMindpower(), src:combatAttack())
local disease_power = math.min(30, dam / 2)
target:setEffect(target.EFF_ITEM_BLIGHT_ILLNESS, 5, {reduce = disease_power})
end
if rng.percent(dam) then
if target:canBe("disease") then
game:delayedLogDamage(src, target, 0, ("%s<blight disease>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#"), false)
local check = math.max(src:combatSpellpower(), src:combatMindpower(), src:combatAttack())
local disease_power = math.min(30, dam / 2)
target:setEffect(target.EFF_ITEM_BLIGHT_ILLNESS, 5, {reduce = disease_power})
end
else
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% disease chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
end
end
end,
}
......@@ -2269,9 +2291,9 @@ newDamageType{
useImplicitCrit(src, state)
local target = game.level.map(x, y, Map.ACTOR)
if target then
game:delayedLogDamage(src, target, 0, ("%s(slow %d%%%%)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
target:setEffect(target.EFF_SLOW, 3, {power= math.min(60, dam / 100), no_ct_effect=true})
-- target:setEffect(target.EFF_SLOW, 3, {power= math.min(0.6, dam / 100), no_ct_effect=true})
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% slow>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
-- target:setEffect(target.EFF_SLOW, 3, {power= math.min(60, dam / 100), no_ct_effect=true})
target:setEffect(target.EFF_SLOW, 3, {power= math.min(0.6, dam / 100), no_ct_effect=true})
end
end,
}
......@@ -2298,10 +2320,12 @@ newDamageType{
useImplicitCrit(src, state)
local target = game.level.map(x, y, Map.ACTOR)
if target then
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% scour chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
if rng.percent(dam) then
target:setEffect(target.EFF_ITEM_ANTIMAGIC_SCOURED, 3, {pct = 0.2, no_ct_effect=true})
end
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% scouring>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", 20), false)
target:setEffect(target.EFF_ITEM_ANTIMAGIC_SCOURED, 3, {pct = 0.2, no_ct_effect=true})
else
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% scour chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
end
end
end,
}
......@@ -3231,8 +3255,12 @@ newDamageType{
local target = game.level.map(x, y, engine.Map.ACTOR)
if not target then return end
if game.party:hasMember(src) and game.party:findMember{type="garkul spirit"} then return end
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% orc summon chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
if not rng.percent(dam) then return end
if not rng.percent(dam) then
game:delayedLogDamage(src, target, 0, ("%s<%d%%%% orc summon chance>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
return
end
game:delayedLogDamage(src, target, 0, ("%s<orc summon>#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#"), false)
-- Find space
local x, y = util.findFreeGrid(src.x, src.y, 5, true, {[engine.Map.ACTOR]=true})
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment