diff --git a/CREDITS b/CREDITS
index 3aaa5996029e829a7b0e1c5dff6360598c8e3b0d..eb860f07ac2ecc7409726950b4ed334fa1a37043 100644
--- a/CREDITS
+++ b/CREDITS
@@ -28,6 +28,7 @@ Lore:
Graphics:
- Shockbolt (Raymond Gaustadnes) http://shockbolt.deviantart.com
- Rexorcorum (Assen Kanev)
+- Suslik (Alex Sannikov) for his awesome shaders
Musics:
- "A lomos del dragón blanco" by Carlos Saura (http://www.jamendo.com/en/artist/carlosaura)
@@ -39,6 +40,7 @@ Fonts:
- INSULA, USENET: http://www.dafont.com/fr/apostrophic-labs.d128
- SVBasicManual: http://www.dafont.com/fr/johan-winge.d757 // http://home.student.uu.se/j/jowi4905/fonts/
- FSEX300: http://www.fixedsysexcelsior.com/
+- square: Wouter van Oortmerssen: http://strlen.com/square
Others:
- The good people at lua.org who made the world a better place
diff --git a/game/engines/default/data/font/square.ttf b/game/engines/default/data/font/square.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..d9509772d09a59e4626e469cc732eab8e7a2bfc9
Binary files /dev/null and b/game/engines/default/data/font/square.ttf differ
diff --git a/game/engines/default/engine/Entity.lua b/game/engines/default/engine/Entity.lua
index f7116e0ac194a9a650f4578d00d97d0d85e02a60..741095c4f3ca9e03b5d0d400d14358c8de134236 100644
--- a/game/engines/default/engine/Entity.lua
+++ b/game/engines/default/engine/Entity.lua
@@ -191,6 +191,7 @@ end
--- Removes a particles emitter following the entity
function _M:removeParticles(ps)
+ if not ps then return end
self.__particles[ps] = nil
ps:dieDisplay()
if self.x and self.y and game.level and game.level.map then
@@ -682,7 +683,7 @@ function _M:addTemporaryValue(prop, v, noupdate)
end
elseif type(v) == "string" then
-- Only last works on strings
- if method == "last" then
+ if true or method == "last" then
base["__tlast_"..prop] = base["__tlast_"..prop] or {[-1] = base[prop]}
local b = base["__tlast_"..prop]
b[id] = v
@@ -780,7 +781,7 @@ function _M:removeTemporaryValue(prop, id, noupdate)
end
elseif type(v) == "string" then
-- Only last works on strings
- if method == "last" then
+ if true or method == "last" then
base["__tlast_"..prop] = base["__tlast_"..prop] or {}
local b = base["__tlast_"..prop]
b[id] = nil
diff --git a/game/engines/default/engine/Game.lua b/game/engines/default/engine/Game.lua
index 45a010365a844740bc1be2ada0e1ff4cea69a772..dcec459fdf6700145e6fd44073056a00fbbe53b9 100644
--- a/game/engines/default/engine/Game.lua
+++ b/game/engines/default/engine/Game.lua
@@ -21,6 +21,7 @@ require "engine.class"
require "engine.Mouse"
require "engine.DebugConsole"
require "engine.dialogs.ShowErrorStack"
+local Shader = require "engine.Shader"
--- Represent a game
-- A module should subclass it and initialize anything it needs to play inside
@@ -32,8 +33,6 @@ module(..., package.seeall, class.make)
function _M:init(keyhandler)
self.key = keyhandler
self.level = nil
- self.log = function() end
- self.logSeen = function() end
self.w, self.h, self.fullscreen = core.display.size()
self.dialogs = {}
self.save_name = ""
@@ -49,6 +48,9 @@ function _M:init(keyhandler)
self:defaultMouseCursor()
end
+function _M:log() end
+function _M:logSeen() end
+
--- Default mouse cursor
function _M:defaultMouseCursor()
local UIBase = require "engine.ui.Base"
@@ -239,6 +241,8 @@ function _M:tick()
end
end
+ Shader:cleanup()
+
if self.cleanSounds then self:cleanSounds() end
self:onTickEndExecute()
diff --git a/game/engines/default/engine/GameEnergyBased.lua b/game/engines/default/engine/GameEnergyBased.lua
index 4b7c97b1ff191c4fd5eaa1a5e92e5ae58b7cc9d4..fb306cf82c9c789b00c8ec93fac9017d85aac8aa 100644
--- a/game/engines/default/engine/GameEnergyBased.lua
+++ b/game/engines/default/engine/GameEnergyBased.lua
@@ -90,7 +90,7 @@ end
--- Run tick on a level
function _M:tickLevel(level)
- local i, e
+ local i, e = 1, nil
local arr = level.e_array
if level.last_iteration then
@@ -105,7 +105,7 @@ function _M:tickLevel(level)
-- print("=====LEVEL", level.level, level.sublevel_id, "resuming tick loop at ", i, arr[i].name)
end
- for i = 1, #arr do
+ for i = i, #arr do
e = arr[i]
if e and e.act and e.energy then
if e.actBase and e.energyBase then
diff --git a/game/engines/default/engine/Map.lua b/game/engines/default/engine/Map.lua
index 9823ac71498b14cfd85789fe408a180ca14a35df..2e54bc5ff3ee682d7cb88cb4e4ccae8da717f75c 100644
--- a/game/engines/default/engine/Map.lua
+++ b/game/engines/default/engine/Map.lua
@@ -1007,6 +1007,7 @@ function _M:addEffect(src, x, y, duration, damtype, dam, radius, dir, angle, ove
table.insert(self.effects, e)
self.changed = true
+ return e
end
--- Display the overlay effects, called by self:display()
@@ -1041,7 +1042,9 @@ function _M:processEffects()
elseif act and e.src and e.src.reactionToward and (e.src:reactionToward(act) >= 0) and not ((type(e.friendlyfire) == "number" and rng.percent(e.friendlyfire)) or (type(e.friendlyfire) ~= "number" and e.friendlyfire)) then
-- Otherwise hit
else
+ e.src.__project_source = e -- intermediate projector source
DamageType:get(e.damtype).projector(e.src, lx, ly, e.damtype, e.dam)
+ e.src.__project_source = nil
end
end
end
diff --git a/game/engines/default/engine/Particles.lua b/game/engines/default/engine/Particles.lua
index 36c8e22c17094dce0a78f850d1f9b574b318a70b..e321be0d8d3c83af87bdd73fcfb1961a7c6a04f9 100644
--- a/game/engines/default/engine/Particles.lua
+++ b/game/engines/default/engine/Particles.lua
@@ -60,6 +60,7 @@ function _M:loaded()
local _
setfenv(f, setmetatable(t, {__index=_G}))
_, _ , _, gl, _ = f()
+ setmetatable(t, nil)
if t.use_shader then self.shader = t.use_shader end
if t.alterscreen then islast = true end
diff --git a/game/engines/default/engine/Projectile.lua b/game/engines/default/engine/Projectile.lua
index 26732cc668a7aa28dffb3188e526e72766ad449c..cdf7b38333b92c3a1f86c219092e30ac547069df 100644
--- a/game/engines/default/engine/Projectile.lua
+++ b/game/engines/default/engine/Projectile.lua
@@ -205,6 +205,7 @@ function _M:act()
if self.project then
local x, y, act, stop = self.src:projectDoMove(self.project.def.typ, self.project.def.x, self.project.def.y, self.x, self.y, self.project.def.start_x, self.project.def.start_y)
if x and y then self:move(x, y) end
+ if self.src then self.src.__project_source = self end -- intermediate projector source
if act then self.src:projectDoAct(self.project.def.typ, self.project.def.tg, self.project.def.damtype, self.project.def.dam, self.project.def.particles, self.x, self.y, self.tmp_proj) end
if stop then
local block, hit, hit_radius = false, true, true
@@ -219,9 +220,11 @@ function _M:act()
end
self.src:projectDoStop(self.project.def.typ, self.project.def.tg, self.project.def.damtype, self.project.def.dam, self.project.def.particles, self.x, self.y, self.tmp_proj, radius_x, radius_y, self)
end
+ if self.src then self.src.__project_source = nil end -- intermediate projector source
elseif self.homing then
self:moveDirection(self.homing.target.x, self.homing.target.y)
self.homing.count = self.homing.count - 1
+ if self.src then self.src.__project_source = self end -- intermediate projector source
if (self.x == self.homing.target.x and self.y == self.homing.target.y) or self.homing.count <= 0 then
game.level:removeEntity(self, true)
self.dead = true
@@ -229,18 +232,21 @@ function _M:act()
else
self.homing.on_move(self, self.src)
end
+ if self.src then self.src.__project_source = nil end -- intermediate projector source
end
end
-
return true
end
--- Something moved in the same spot as us, hit ?
function _M:on_move(x, y, target)
+ self.src.__project_source = self -- intermediate projector source
if self.project and self.project.def.typ.line then self.src:projectDoAct(self.project.def.typ, self.project.def.tg, self.project.def.damtype, self.project.def.dam, self.project.def.particles, self.x, self.y, self.tmp_proj) end
if self.project and self.project.def.typ.stop_block then
+
self.src:projectDoStop(self.project.def.typ, self.project.def.tg, self.project.def.damtype, self.project.def.dam, self.project.def.particles, self.x, self.y, self.tmp_proj, self.x, self.y, self)
end
+ self.src.__project_source = nil
end
--- Premature end
@@ -255,7 +261,7 @@ function _M:makeProject(src, display, def, do_move, do_act, do_stop)
local name = def.tg.name
if def.tg.talent then
speed = src:getTalentProjectileSpeed(def.tg.talent) or speed
- name = def.tg.talent.name
+ name = name or def.tg.talent.name
def.tg.talent_id = def.tg.talent.id
def.tg.talent = nil
end
diff --git a/game/engines/default/engine/Shader.lua b/game/engines/default/engine/Shader.lua
index f3520d73ed1b0073af4188287cf476b3229255c1..c1f4e800bffae841228fea80e0d15a9381156f8d 100644
--- a/game/engines/default/engine/Shader.lua
+++ b/game/engines/default/engine/Shader.lua
@@ -31,7 +31,16 @@ _M.progsreset = {}
loadNoDelay = true
function core.shader.allow(kind)
- return config.settings['shaders_kind_'..kind]
+ return config.settings['shaders_kind_'..kind] and core.shader.active(4)
+end
+
+function _M:cleanup()
+ local time = os.time()
+ local todel = {}
+ for name, s in pairs(self.progs) do
+ if s.dieat < time then todel[name] = true end
+ end
+ for name, _ in pairs(todel) do self.progs[name] = nil end
end
--- Make a shader
@@ -65,11 +74,14 @@ function _M:init(name, args)
end
end
-function _M:makeTotalName()
+function _M:makeTotalName(add)
local str = {}
- for k, v in pairs(self.args) do
+ local args = self.args
+ if add then args = table.clone(add) table.merge(args, self.args) end
+ for k, v in pairs(args) do
+ if type(v) == "function" then v = v(self) end
if type(v) == "number" then
- str[#str+1] = v
+ str[#str+1] = k.."="..tostring(v)
elseif type(v) == "table" then
if v.texture then
if v.is3d then str[#str+1] = k.."=tex3d("..v.texture..")"
@@ -83,6 +95,7 @@ function _M:makeTotalName()
end
end
end
+ table.sort(str)
return self.name.."["..table.concat(str,",").."]"
end
@@ -135,12 +148,12 @@ function _M:createProgram(def)
end
function _M:loaded()
- if _M.progs[self.totalname] then
- self.shad = _M.progs[self.totalname]
+ if _M.progs[self.totalname] and not _M.progsreset[self.totalname] then
-- print("[SHADER] using cached shader "..self.totalname)
- self.shad = _M.progs[self.totalname]
+ self.shad = _M.progs[self.totalname].shad
+ _M.progs[self.totalname].dieat = os.time() + 120
else
- print("[SHADER] Loading from /data/gfx/shaders/"..self.name..".lua")
+-- print("[SHADER] Loading from /data/gfx/shaders/"..self.name..".lua")
local f, err = loadfile("/data/gfx/shaders/"..self.name..".lua")
if not f and err then error(err) end
setfenv(f, setmetatable(self.args or {}, {__index=_G}))
@@ -153,10 +166,19 @@ function _M:loaded()
if not core.shader.allow(def.require_kind) then return end
end
- _M.progs[self.totalname] = self:createProgram(def)
- _M.progsreset[self.totalname] = def.resetargs
+ if def.resetargs then
+ self.totalname = self:makeTotalName(def.resetargs)
+ end
+-- print("[SHADER] Loaded shader with totalname", self.totalname)
+
+ if not _M.progs[self.totalname] then
+ _M.progs[self.totalname] = {shad=self:createProgram(def), dieat=def.resetargs and (os.time() + 3) or (os.time() + 120)}
+ _M.progsreset[self.totalname] = def.resetargs
+ else
+ _M.progs[self.totalname].dieat = def.resetargs and (os.time() + 3) or (os.time() + 120)
+ end
- self.shad = _M.progs[self.totalname]
+ self.shad = _M.progs[self.totalname].shad
if self.shad then
for k, v in pairs(def.args) do
self:setUniform(k, v)
diff --git a/game/engines/default/engine/Trap.lua b/game/engines/default/engine/Trap.lua
index 3af64cfe1dd2f0917ad1dbaf0b79a0a3f3cc5498..3443301ed9e877c39ca49a69c4d662230a66f058 100644
--- a/game/engines/default/engine/Trap.lua
+++ b/game/engines/default/engine/Trap.lua
@@ -135,7 +135,9 @@ function _M:trigger(x, y, who)
game.logSeen(who, "%s", str)
end
local known, del = false, false
+ if self.summoner then self.summoner.__project_source = self end -- intermediate projector source
if self.triggered then known, del = self:triggered(x, y, who) end
+ if self.summoner then self.summoner.__project_source = nil end
if known then
self:setKnown(who, true)
game.level.map:updateMap(x, y)
diff --git a/game/engines/default/engine/dialogs/VideoOptions.lua b/game/engines/default/engine/dialogs/VideoOptions.lua
index 5feeb6280c0cb523017a302d97d7d75834de6c71..f3bf46da6009fa06cb12ef1e4e2805a1c9f3a567 100644
--- a/game/engines/default/engine/dialogs/VideoOptions.lua
+++ b/game/engines/default/engine/dialogs/VideoOptions.lua
@@ -141,7 +141,7 @@ function _M:generateList()
end,}
local zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text=string.toTString"Activates volumetric shaders.\nThis option allows for volumetricion effects (like deep starfields). Enabling it will severely reduce performance when shaders are displayed.\n\n#LIGHT_RED#You must restart the game for it to take effect.#WHITE#"}
- list[#list+1] = { zone=zone, name=string.toTString"#GOLD##{bold}#OpenGL Shaders: Volumetricions#WHITE##{normal}#", status=function(item)
+ list[#list+1] = { zone=zone, name=string.toTString"#GOLD##{bold}#OpenGL Shaders: Volumetric#WHITE##{normal}#", status=function(item)
return tostring(config.settings.shaders_kind_volumetric and "enabled" or "disabled")
end, fct=function(item)
config.settings.shaders_kind_volumetric = not config.settings.shaders_kind_volumetric
diff --git a/game/engines/default/engine/interface/ActorProject.lua b/game/engines/default/engine/interface/ActorProject.lua
index 207280f1202ea96b488c59baf264e24bc23ba7fc..a5a341e95d511c900dd75f0b870656c4456f188d 100644
--- a/game/engines/default/engine/interface/ActorProject.lua
+++ b/game/engines/default/engine/interface/ActorProject.lua
@@ -194,7 +194,7 @@ function _M:project(t, x, y, damtype, dam, particles)
elseif act and self.reactionToward and (self:reactionToward(act) >= 0) and not ((type(typ.friendlyfire) == "number" and rng.percent(typ.friendlyfire)) or (type(typ.friendlyfire) ~= "number" and typ.friendlyfire)) then
-- Otherwise hit
else
- if type(damtype) == "function" then if damtype(px, py, tg, self) then stop=true break end
+ if type(damtype) == "function" then if damtype(px, py, t, self) then stop=true break end
else DamageType:get(damtype).projector(self, px, py, damtype, dam, tmp, nil) end
if particles then
game.level.map:particleEmitter(px, py, 1, particles.type, particles.args)
@@ -311,6 +311,7 @@ function _M:projectile(t, x, y, damtype, dam, particles)
game.zone:addEntity(game.level, proj, "projectile", typ.start_x, typ.start_y)
self:check("on_projectile_fired", proj, typ, x, y, damtype, dam, particles)
+ return proj
end
-- @param typ a target type table
diff --git a/game/engines/default/engine/interface/ActorTalents.lua b/game/engines/default/engine/interface/ActorTalents.lua
index e4b0a7b2aa170d636161468f12e4c131f9cd7694..8d338d374cdaf57000964944b7be593eb9add8a2 100644
--- a/game/engines/default/engine/interface/ActorTalents.lua
+++ b/game/engines/default/engine/interface/ActorTalents.lua
@@ -138,14 +138,15 @@ function _M:useTalent(id, who, force_level, ignore_cd, force_target, silent, no_
end
if not self:preUseTalent(ab, silent) then return end
local old_level
- local old_target
-
+ local old_target, old_target_set = nil, false
+
if force_level then old_level = who.talents[id]; who.talents[id] = force_level end
- if force_target then old_target = rawget(who, "getTarget"); who.getTarget = function(a) return force_target.x, force_target.y, not force_target.__no_self and force_target end end
+ if ab.onAIGetTarget and not who.player then old_target_set = true; old_target = rawget(who, "getTarget"); who.getTarget = function() return ab.onAIGetTarget(self, ab) end end
+ if force_target and not old_target then old_target_set = true; old_target = rawget(who, "getTarget"); who.getTarget = function(a) return force_target.x, force_target.y, not force_target.__no_self and force_target end end
self.__talent_running = ab
local ok, ret, special = xpcall(function() return ab.action(who, ab) end, debug.traceback)
self.__talent_running = nil
- if force_target then who.getTarget = old_target end
+ if old_target_set then who.getTarget = old_target end
if force_level then who.talents[id] = old_level end
if not ok then error(ret) end
@@ -186,7 +187,8 @@ function _M:useTalent(id, who, force_level, ignore_cd, force_target, silent, no_
local old_level
if force_level then old_level = who.talents[id]; who.talents[id] = force_level end
local ret = ab.activate(who, ab)
- if ret == true then ret = {} end -- fix for badly coded talents
+ if not ret or ret == true then ret = {} end -- fix for badly coded talents
+ ret.name = ret.name or ab.name
if force_level then who.talents[id] = old_level end
if not self:postUseTalent(ab, ret) then return end
diff --git a/game/engines/default/engine/interface/ActorTemporaryEffects.lua b/game/engines/default/engine/interface/ActorTemporaryEffects.lua
index 7a58d713da01f0864d390e2a209dcd792af2eee7..a057bafaea5b5ca87751af53578805c1704dde2b 100644
--- a/game/engines/default/engine/interface/ActorTemporaryEffects.lua
+++ b/game/engines/default/engine/interface/ActorTemporaryEffects.lua
@@ -73,9 +73,11 @@ function _M:timedEffects(filter)
todel[#todel+1] = eff
else
if def.on_timeout then
+ if p.src then p.src.__project_source = p end -- intermediate projector source
if def.on_timeout(self, p) then
todel[#todel+1] = eff
end
+ if p.src then p.src.__project_source = nil end
end
end
p.dur = p.dur - def.decrease
@@ -103,6 +105,7 @@ function _M:setEffect(eff_id, dur, p, silent)
if not p[k] then p[k] = e end
end
p.dur = dur
+ p.effect_id = eff_id
self:check("on_set_temporary_effect", eff_id, _M.tempeffect_def[eff_id], p)
if p.dur <= 0 then return self:removeEffect(eff_id) end
diff --git a/game/engines/default/engine/interface/WorldAchievements.lua b/game/engines/default/engine/interface/WorldAchievements.lua
index bcb07fb1e70b722d4c80853bcfe7c7f43cb042a3..d81da6e97a483fc5e0aa4c1a830fd1116c99a8e9 100644
--- a/game/engines/default/engine/interface/WorldAchievements.lua
+++ b/game/engines/default/engine/interface/WorldAchievements.lua
@@ -68,6 +68,25 @@ function _M:loadAchievements()
end
end
+--[[
+function _M:achievementsDumpCSV()
+ local f = fs.open("/achvs.csv", "w")
+ f:write('"id","name","desc","earned","unearned"\n')
+ for i, a in ipairs(self.achiev_defs) do
+ f:write(('"%s","%s","%s","earned_%s.jpg","unearned_%s.jpg"\n'):
+ format(
+ "TOME_"..a.id,
+ a.name:gsub('\\', '\\\\'):gsub('"', '\\"'),
+ a.desc:gsub('\\', '\\\\'):gsub('"', '\\"'),
+ a.id:lower(),
+ a.id:lower()
+ )
+ )
+ end
+ f:close()
+end
+]]
+
function _M:getAchievementFromId(id)
return self.achiev_defs[id]
end
diff --git a/game/engines/default/engine/ui/ImageList.lua b/game/engines/default/engine/ui/ImageList.lua
index 84c93c2128adf6b66945460a0421fe3f079ed7bf..957dc85705cf458a73de043ccf195ff64e3b2d9e 100644
--- a/game/engines/default/engine/ui/ImageList.lua
+++ b/game/engines/default/engine/ui/ImageList.lua
@@ -99,7 +99,7 @@ function _M:generate()
self.sel_j = util.bound(self.scroll + math.floor(by / (self.tile_h + self.padding)), 1, self.max)
self.sel_i = util.bound(1 + math.floor(bx / (self.tile_w + self.padding)), 1, self.nb_w)
- if button == "left" and event == "button" then self:onUse(button) end
+ if (button == "left" or button == "right") and event == "button" then self:onUse(button) end
self:onSelect()
end)
self.key:addBinds{
@@ -176,7 +176,7 @@ function _M:onUse(button, forcectrl)
if not (forcectrl == true or (forcectrl == nil and core.key.modState("ctrl"))) then self:clearSelection() end
item.selected = not item.selected
end
- self.fct(item)
+ self.fct(item, button)
end
end
diff --git a/game/engines/default/engine/ui/ListColumns.lua b/game/engines/default/engine/ui/ListColumns.lua
index b15acb8b428c8ba1b7d8e5db455ae9e2a4a0023c..7ab1860142111c1d4e7884bc32642efdedd14069 100644
--- a/game/engines/default/engine/ui/ListColumns.lua
+++ b/game/engines/default/engine/ui/ListColumns.lua
@@ -90,6 +90,9 @@ function _M:generate()
end
function _M:setupInput()
+ self.prev_sel = 0
+ self.mouse_pos = { x = 0, y = 0 }
+
self.mouse:reset()
self.key:reset()
local colx = 0
diff --git a/game/engines/default/engine/utils.lua b/game/engines/default/engine/utils.lua
index 07ca96e91ca9cdc719c774e32da7be657f0510b0..48c236a74dfca02db2012a4d6fa1622e4efb62e7 100644
--- a/game/engines/default/engine/utils.lua
+++ b/game/engines/default/engine/utils.lua
@@ -24,6 +24,16 @@ function math.decimals(v, nb)
return math.floor(v * nb) / nb
end
+-- Rounds to nearest multiple
+-- (round away from zero): math.round(4.65, 0.1)=4.7, math.round(-4.475, 0.01) = -4.48
+-- num = rouding multiplier to compensate for numerical rounding (default 1000000 for 6 digits accuracy)
+function math.round(v, mult, num)
+ mult = mult or 1
+ num = num or 1000000
+ v, mult = v*num, mult*num
+ return v >= 0 and math.floor((v + mult/2)/mult) * mult/num or math.ceil((v - mult/2)/mult) * mult/num
+end
+
function lpeg.anywhere (p)
return lpeg.P{ p + 1 * lpeg.V(1) }
end
@@ -336,12 +346,14 @@ end
function string.his_her(actor)
if actor.female then return "her"
+ elseif actor.neuter then return "it"
else return "his"
end
end
function string.his_her_self(actor)
if actor.female then return "herself"
+ elseif actor.neuter then return "itself"
else return "himself"
end
end
@@ -722,6 +734,8 @@ function core.display.virtualImage(path, data)
virtualimages[path] = data
end
+if not core.game.getFrameTime then core.game.getFrameTime = core.game.getTime end
+
local oldloadimage = core.display.loadImage
function core.display.loadImage(path)
if virtualimages[path] then return core.display.loadImageMemory(virtualimages[path]) end
diff --git a/game/loader/pre-init.lua b/game/loader/pre-init.lua
index c333d72a2cdf125e71e4f3a9a30265ea7f094f60..184feb32464e19656ba2bd1d09341f6a8002ba6d 100644
--- a/game/loader/pre-init.lua
+++ b/game/loader/pre-init.lua
@@ -152,9 +152,9 @@ end
function string.unserialize(str)
local f, err = loadstring(str)
- if not f then print("[UNSERIALIZE] error", err, str) return nil end
+ if not f then print("[UNSERIALIZE] error", err) return nil end
local t = {}
setfenv(f, setmetatable(t, {__index={_G=t}}))
local ok, err = pcall(f)
- if ok then return setmetatable(t, nil) else print("[UNSERIALIZE] error", err, str) return nil end
+ if ok then return setmetatable(t, nil) else print("[UNSERIALIZE] error", err) return nil end
end
diff --git a/game/modules/tome/ai/escort.lua b/game/modules/tome/ai/escort.lua
index 2e28aa8b214c580c3f7ef460f75d99df08cca8b0..37b1416d675f9874bd6df3990962c727c9167678 100644
--- a/game/modules/tome/ai/escort.lua
+++ b/game/modules/tome/ai/escort.lua
@@ -43,7 +43,8 @@ newAI("escort_quest", function(self)
if not self.ai_state.fleeing_msg then
self.ai_state.fleeing_msg = true
local enemy = self.ai_target.actor
- self:doEmote(("Help! %s to the %s!"):format(string.capitalize(enemy.name), game.level.map:compassDirection(enemy.x-self.x, enemy.y-self.y) or "???"))
+ local dir = game.level.map:compassDirection(enemy.x-self.x, enemy.y-self.y)
+ self:doEmote("Help!"..(dir and (" %s to the %s!"):format(self:canSee(enemy) and string.capitalize(enemy.name) or "Something", dir) or ""))
end
else
self:runAI("move_escort")
diff --git a/game/modules/tome/ai/tactical.lua b/game/modules/tome/ai/tactical.lua
index b5cfc0e284301689bbf4956da8d63ec9bbe5b1ae..3cadfb7a8006c5cb65afa6746397bac58dfda122 100644
--- a/game/modules/tome/ai/tactical.lua
+++ b/game/modules/tome/ai/tactical.lua
@@ -54,18 +54,32 @@ newAI("use_tactical", function(self)
-- Find available talents
print("============================== TACTICAL AI", self.name)
local avail = {}
+ local _
local ok = false
- local ax, ay = self:aiSeeTargetPos(self.ai_target.actor)
- local target_dist = self.ai_target.actor and core.fov.distance(self.x, self.y, ax, ay)
- local hate = self.ai_target.actor and (self:reactionToward(self.ai_target.actor) < 0)
- local has_los = self.ai_target.actor and self:hasLOS(ax, ay)
+ local aitarget = self.ai_target.actor
+ local ax, ay = self:aiSeeTargetPos(aitarget)
+ local target_dist = aitarget and core.fov.distance(self.x, self.y, ax, ay)
+ local hate = aitarget and (self:reactionToward(aitarget) < 0)
+ local has_los = aitarget and self:hasLOS(ax, ay)
local self_compassion = (self.ai_state.self_compassion == false and 0) or self.ai_state.self_compassion or 5
local ally_compassion = (self.ai_state.ally_compassion == false and 0) or self.ai_state.ally_compassion or 1
for tid, lvl in pairs(self.talents) do
+ local aitarget = aitarget
+ local ax, ay = ax, ay
+ local target_dist = target_dist
local t = self:getTalentFromId(tid)
+
+ if t.onAIGetTarget then
+ _, _, aitarget = t.onAIGetTarget(self, t)
+ if aitarget then
+ ax, ay = self:aiSeeTargetPos(aitarget)
+ target_dist = aitarget and core.fov.distance(self.x, self.y, ax, ay)
+ end
+ end
+
local t_avail = false
- print(self.name, self.uid, "tactical ai talents testing", t.name, tid)
- if t.tactical then
+ print(self.name, self.uid, "tactical ai talents testing", t.name, tid, "on target", aitarget and aitarget.name)
+ if t.tactical and aitarget then
local tg = self:getTalentTarget(t)
local default_tg = {type=util.getval(t.direct_hit, self, t) and "hit" or "bolt"}
-- Only assume range... some talents may no require LOS, etc
@@ -88,7 +102,7 @@ newAI("use_tactical", function(self)
local self_hit = {}
local typ = engine.Target:getType(tg or default_tg)
if tg or self:getTalentRequiresTarget(t) then
- local target_actor = self.ai_target.actor or self
+ local target_actor = aitarget or self
self:project(typ, ax, ay, function(px, py)
local act = game.level.map(px, py, engine.Map.ACTOR)
if act and not act.dead then
@@ -107,7 +121,7 @@ newAI("use_tactical", function(self)
end
-- Evaluate the tactical weights and weight functions
for tact, val in pairs(t.tactical) do
- if type(val) == "function" then val = val(self, t, self.ai_target.actor) or 0 end
+ if type(val) == "function" then val = val(self, t, aitarget) or 0 end
-- Handle damage_types and resistances
local nb_foes_hit, nb_allies_hit, nb_self_hit = 0, 0, 0
if type(val) == "table" then
@@ -151,7 +165,7 @@ newAI("use_tactical", function(self)
val = val * (self.ai_talents and self.ai_talents[t.id] or 1) * (1 + lvl / 5)
-- Update the weight by the dummy projection data
-- Also force scaling if the talent requires a target (stand-in for canProject)
- if self:getTalentRequiresTarget(t) or nb_foes_hit > 0 or nb_allies_hit > 0 or nb_self_hit > 0 then
+ if tact ~= "special" and (self:getTalentRequiresTarget(t) or nb_foes_hit > 0 or nb_allies_hit > 0 or nb_self_hit > 0) then
val = val * (nb_foes_hit - ally_compassion * nb_allies_hit - self_compassion * nb_self_hit)
end
-- Only take values greater than 0... allows the ai_talents to turn talents off
@@ -323,17 +337,17 @@ newAI("use_tactical", function(self)
end
-- Attacks
- if avail.attack and self.ai_target.actor then
+ if avail.attack and aitarget then
-- Use the foe/ally ratio from the best attack talent
table.sort(avail.attack, function(a,b) return a.val > b.val end)
want.attack = avail.attack[1].val
end
- if avail.disable and self.ai_target.actor then
+ if avail.disable and aitarget then
-- Use the foe/ally ratio from the best disable talent
table.sort(avail.disable, function(a,b) return a.val > b.val end)
want.disable = (want.attack or 0) + avail.disable[1].val
end
- if avail.attackarea and self.ai_target.actor then
+ if avail.attackarea and aitarget then
-- Use the foe/ally ratio from the best attackarea talent
table.sort(avail.attackarea, function(a,b) return a.val > b.val end)
want.attackarea = avail.attackarea[1].val
@@ -344,6 +358,8 @@ newAI("use_tactical", function(self)
want.buff = math.max(0.01, want.attack + 0.5)
end
+ if avail.special then want.special = avail.special[1].val end
+
print("Tactical ai report for", self.name)
local res = {}
for k, v in pairs(want) do
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 4721f288bb0761c4f6490a1c8e4eb93ec0eef11c..8ad14eee0f18faf1d5ba6460860c502fd7dd3b17 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -412,7 +412,7 @@ function _M:actBase()
-- Break mind links
if self:isTalentActive(self.T_MIND_LINK) then
local p = self:isTalentActive(self.T_MIND_LINK)
- if p.target.dead or not p.target:hasEffect(p.target.EFF_MIND_LINK_TARGET) or not game.level:hasEntity(p.target) then
+ if not p.target or p.target.dead or not p.target:hasEffect(p.target.EFF_MIND_LINK_TARGET) or not game.level:hasEntity(p.target) then
self:forceUseTalent(self.T_MIND_LINK, {ignore_energy=true})
end
end
@@ -453,7 +453,7 @@ function _M:actBase()
local decay = self:getFeedbackDecay()
if self:knowTalent(self.T_BIOFEEDBACK) then
local t = self:getTalentFromId(self.T_BIOFEEDBACK)
- self:heal(decay * t.getHealRatio(self, t))
+ self:heal(decay * t.getHealRatio(self, t), self)
end
if self:hasEffect(self.EFF_FEEDBACK_LOOP) then
self:incFeedback(decay)
@@ -1046,7 +1046,7 @@ function _M:move(x, y, force)
local grids = core.fov.circle_grids(self.x, self.y, 1, true)
for x, yy in pairs(grids) do for y, _ in pairs(yy) do
local trap = game.level.map(x, y, Map.TRAP)
- if trap and not trap:knownBy(self) and self:checkHit(power, trap.detect_power) then
+ if trap and not trap:knownBy(self) and self:canSee(trap) and self:checkHit(power, trap.detect_power) then
trap:setKnown(self, true)
game.level.map:updateMap(x, y)
game.logPlayer(self, "You have found a trap (%s)!", trap:getName())
@@ -1536,11 +1536,13 @@ function _M:onHeal(value, src)
eff.src:heal(value * eff.pct, src)
eff.src.heal_leech_active = nil
eff.src:incEquilibrium(-eff.eq)
- if eff.src == self then
- game.logSeen(self, "%s heal is doubled!", self.name)
- else
- game.logSeen(self, "%s steals %s heal!", eff.src.name:capitalize(), self.name)
- return 0
+ if not self.resting then
+ if eff.src == self then
+ game:delayedLogMessage(self, self, "healing_nexus"..(self.uid or ""), "#YELLOW_GREEN##Source#'s healing is amplified!")
+ else
+ game:delayedLogMessage(eff.src, self, "healing_nexus"..(eff.src.uid or ""), "#YELLOW_GREEN##Source# steals healing from #Target#!")
+ return 0
+ end
end
end
@@ -1553,12 +1555,13 @@ function _M:onHeal(value, src)
end
-- Solipsism healing
+ local psi_heal = 0
if self:knowTalent(self.T_SOLIPSISM) then
local t = self:getTalentFromId(self.T_SOLIPSISM)
local ratio = t.getConversionRatio(self, t)
- local psi_increase = value * ratio
- self:incPsi(psi_increase)
- value = value - psi_increase
+ psi_heal = value * ratio
+ self:incPsi(psi_heal)
+ value = value - psi_heal
end
-- Must be last!
@@ -1569,15 +1572,25 @@ function _M:onHeal(value, src)
end
-- print("[HEALING]", self.uid, self.name, "for", value)
- if not self.resting and value >= 1 and game.level.map.seens(self.x, self.y) then
- local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
- game.flyers:add(sx, sy, 30, rng.float(-3, -2), (rng.range(0,2)-1) * 0.5, tostring(math.ceil(value)), {255,255,0})
+ if not self.resting and value + psi_heal >= 1 then
+ if game.level.map.seens(self.x, self.y) then
+ local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
+ game.flyers:add(sx, sy, 30, rng.float(-3, -2), (rng.range(0,2)-1) * 0.5, tostring(math.ceil(value)), {255,255,0})
+ end
+ if psi_heal > 0 then
+ game:delayedLogDamage(src or self, self, -value-psi_heal, ("#LIGHT_GREEN#%d healing #LAST##AQUAMARINE#(%d psi heal)#LAST#"):format(value, psi_heal), false)
+ else
+ game:delayedLogDamage(src or self, self, -value, ("#LIGHT_GREEN#%d healing#LAST#"):format(value), false)
+ end
end
return value
end
--- Called before taking a hit, it's the chance to check for shields
function _M:onTakeHit(value, src, death_note)
+ src = src or {}
+ if value <=0 then return 0 end
+ local tal
-- update hate_baseline
if self.knowTalent and self:knowTalent(self.T_HATE_POOL) then
local t = self:getTalentFromId(self.T_HATE_POOL)
@@ -1630,9 +1643,11 @@ function _M:onTakeHit(value, src, death_note)
if self:attr("retribution") then
-- Absorb damage into the retribution
- if value / 2 <= self.retribution_absorb then
- self.retribution_absorb = self.retribution_absorb - (value / 2)
- value = value / 2
+ local absorb = math.min(value/2, self.retribution_absorb)
+ game:delayedLogDamage(src, self, 0, ("#SLATE#(%d absorbed)#LAST#"):format(absorb), false)
+ if absorb < self.retribution_absorb then
+ self.retribution_absorb = self.retribution_absorb - absorb
+ value = value - absorb
else
value = value - self.retribution_absorb
self.retribution_absorb = 0
@@ -1650,7 +1665,7 @@ function _M:onTakeHit(value, src, death_note)
end
end
- if self:isTalentActive(self.T_DISPLACE_DAMAGE) and rng.percent(self:callTalent(self.T_DISPLACE_DAMAGE, "getchance")) then
+ if value > 0 and self:isTalentActive(self.T_DISPLACE_DAMAGE) and rng.percent(self:callTalent(self.T_DISPLACE_DAMAGE, "getchance")) then
-- find available targets
local tgts = {}
local grids = core.fov.circle_grids(self.x, self.y, self:callTalent(self.T_DISPLACE_DAMAGE,"getrange"), true)
@@ -1663,13 +1678,15 @@ function _M:onTakeHit(value, src, death_note)
local a = rng.table(tgts)
if a then
- game.logSeen(self, "Some of the damage has been displaced onto %s!", a.name:capitalize())
+ local displace = value/2
+ game:delayedLogMessage(self, a, "displace_damage"..(a.uid or ""), "#PINK##Source# displaces some damage onto #Target#!")
+ game:delayedLogDamage(self, a, displace, ("#PINK#%d displaced#LAST#"):format(displace), false)
a:takeHit(value / 2, self)
value = value / 2
end
end
- if self:knowTalent(self.T_MITOSIS) and self:isTalentActive(self.T_MITOSIS) then
+ if value > 0 and self:knowTalent(self.T_MITOSIS) and self:isTalentActive(self.T_MITOSIS) then
local t = self:getTalentFromId(self.T_MITOSIS)
local chance = t.getChance(self, t)
local perc = math.min(1, 3 * value / self.life)
@@ -1688,6 +1705,7 @@ function _M:onTakeHit(value, src, death_note)
end
end
if #acts > 0 then
+ game:delayedLogMessage(self, nil, "mitosis_damage", "#DARK_GREEN##Source# shares damage with %s oozes!", string.his_her(self))
value = value / (#acts+1)
for _, act in ipairs(acts) do
act.resists.all = act.resists.all - 50
@@ -1697,10 +1715,11 @@ function _M:onTakeHit(value, src, death_note)
end
end
- if self:attr("time_shield") then
+ if value > 0 and self:attr("time_shield") then
-- Absorb damage into the time shield
self.time_shield_absorb = self.time_shield_absorb or 0
- if value <= self.time_shield_absorb then
+ game:delayedLogDamage(src, self, 0, ("#STEEL_BLUE#(%d to time)#LAST#"):format(math.min(value, self.time_shield_absorb)), false)
+ if value < self.time_shield_absorb then
self.time_shield_absorb = self.time_shield_absorb - value
value = 0
else
@@ -1715,7 +1734,7 @@ function _M:onTakeHit(value, src, death_note)
end
end
- if self:attr("damage_shield") then
+ if value > 0 and self:attr("damage_shield") then
-- Phased attack?
local adjusted_value = value
if src and src.attr and src:attr("damage_shield_penetrate") then
@@ -1735,13 +1754,17 @@ function _M:onTakeHit(value, src, death_note)
else
if reflection > 0 then reflect_damage = self.damage_shield_absorb end
value = adjusted_value - self.damage_shield_absorb
+ adjusted_value = self.damage_shield_absorb
self.damage_shield_absorb = 0
end
+ game:delayedLogDamage(src, self, 0, ("#SLATE#(%d absorbed)#LAST#"):format(adjusted_value), false)
if reflection and reflect_damage and reflection > 0 and reflect_damage > 0 and src.y and src.x and not src.dead then
local a = game.level.map(src.x, src.y, Map.ACTOR)
if a and self:reactionToward(a) < 0 then
- a:takeHit(math.ceil(reflect_damage * reflection), self)
- game.logSeen(self, "The damage shield reflects %d damage back to %s!", math.ceil(reflect_damage * reflection), a.name:capitalize())
+ local reflected = reflect_damage * reflection
+ a:takeHit(reflected, self)
+ game:delayedLogDamage(self, src, reflected, ("#SLATE#%d reflected#LAST#"):format(reflected), false)
+ game:delayedLogMessage(self, src, "reflection" ,"#CRIMSON##Source# reflects damage back to #Target#!#LAST#")
end
end
-- If we are at the end of the capacity, release the time shield damage
@@ -1751,23 +1774,31 @@ function _M:onTakeHit(value, src, death_note)
end
end
- if self:attr("displacement_shield") then
+ if value > 0 and self:attr("displacement_shield") then
-- Absorb damage into the displacement shield
if rng.percent(self.displacement_shield_chance) then
- if value <= self.displacement_shield then
- game.logSeen(self, "The displacement shield teleports the damage to %s!", self.displacement_shield_target.name)
- self.displacement_shield = self.displacement_shield - value
- self.displacement_shield_target:takeHit(value, src)
+ game:delayedLogMessage(self, src, "displacement_shield"..(self.displacement_shield_target.uid or ""), "#CRIMSON##Source# teleports some damage to #Target#!")
+ local displaced = math.min(value, self.displacement_shield)
+ self.displacement_shield_target:takeHit(displaced, src)
+ game:delayedLogDamage(src, self, 0, ("#CRIMSON#(%d teleported)#LAST#"):format(displaced), false)
+ game:delayedLogDamage(src, self.displacement_shield_target, displaced, ("#CRIMSON#%d teleported#LAST#"):format(displaced), false)
+ if displaced < self.displacement_shield then
+ self.displacement_shield = self.displacement_shield - displaced
value = 0
else
self:removeEffect(self.EFF_DISPLACEMENT_SHIELD)
+ value = value - displaced
end
end
end
- if self:attr("disruption_shield") then
+ if value > 0 and self:attr("disruption_shield") then
local mana = self:getMaxMana() - self:getMana()
local mana_val = value * self:attr("disruption_shield")
+ local converted = math.min(value, mana / self:attr("disruption_shield"))
+ game:delayedLogMessage(self, nil, "disruption_shield", "#LIGHT_BLUE##Source# converts damage to mana!")
+ game:delayedLogDamage(src, self, 0, ("#LIGHT_BLUE#(%d converted)#LAST#"):format(converted), false)
+
-- We have enough to absorb the full hit
if mana_val <= mana then
self:incMana(mana_val)
@@ -1775,6 +1806,10 @@ function _M:onTakeHit(value, src, death_note)
return 0
-- Or the shield collapses in a deadly arcane explosion
else
+ self:incMana(mana)
+ self.disruption_shield_absorb = self.disruption_shield_absorb + mana / self:attr("disruption_shield")
+ value = value - mana / self:attr("disruption_shield")
+
local dam = self.disruption_shield_absorb
-- Deactivate without loosing energy
@@ -1786,13 +1821,15 @@ function _M:onTakeHit(value, src, death_note)
end
end
- if self:isTalentActive(self.T_BONE_SHIELD) and value > 0 then
+ if value > 0 and self:isTalentActive(self.T_BONE_SHIELD) then
local t = self:getTalentFromId(self.T_BONE_SHIELD)
if t.absorb(self, t, self:isTalentActive(self.T_BONE_SHIELD)) then
+ game:delayedLogDamage(src, self, 0, ("#SLATE#(%d to bones)#LAST#"):format(value), false)
value = 0
end
end
+ if value <=0 then return 0 end
if self.knowTalent and (self:knowTalent(self.T_SEETHE) or self:knowTalent(self.T_GRIM_RESOLVE)) then
if not self:hasEffect(self.EFF_CURSED_FORM) then
self:setEffect(self.EFF_CURSED_FORM, 1, { increase=0 })
@@ -1801,17 +1838,23 @@ function _M:onTakeHit(value, src, death_note)
self.tempeffect_def[self.EFF_CURSED_FORM].do_onTakeHit(self, eff, value)
end
- if self:isTalentActive(self.T_DEFLECTION) then
- local t = self:getTalentFromId(self.T_DEFLECTION)
- value = t.do_onTakeHit(self, t, self:isTalentActive(self.T_DEFLECTION), value)
+ if value > 0 then
+ tal = self:isTalentActive(self.T_DEFLECTION)
+ if tal then
+ local oldval = value
+ value = self:callTalent(self.T_DEFLECTION, "do_onTakeHit", tal, value)
+ if value ~= oldval then
+ game:delayedLogDamage(src, self, 0, ("#SLATE#(%d deflected)#LAST#"):format(oldval - value), false)
+ end
+ end
end
-
- if self:hasEffect(self.EFF_RAMPAGE) then
+
+ if value > 0 and self:hasEffect(self.EFF_RAMPAGE) then
local eff = self:hasEffect(self.EFF_RAMPAGE)
value = self.tempeffect_def[self.EFF_RAMPAGE].do_onTakeHit(self, eff, value)
end
- if self:hasEffect(self.EFF_BECKONED) then
+ if value > 0 and self:hasEffect(self.EFF_BECKONED) then
local eff = self:hasEffect(self.EFF_BECKONED)
value = self.tempeffect_def[self.EFF_BECKONED].do_onTakeHit(self, eff, value)
end
@@ -1826,13 +1869,14 @@ function _M:onTakeHit(value, src, death_note)
end
-- Frozen: absorb some damage into the iceblock
- if self:attr("encased_in_ice") then
+ if value > 0 and self:attr("encased_in_ice") then
local eff = self:hasEffect(self.EFF_FROZEN)
local absorb = 0.4
if src and src.attr then
absorb = absorb - absorb * (util.bound(src:attr("iceblock_pierce") or 0, 0, 100)) / 100
end
eff.hp = eff.hp - value * absorb
+ game:delayedLogDamage(src or {}, self, 0, ("#STEEL_BLUE#(%d to ice)#LAST#"):format(value*absorb), nil)
value = value * (1 - absorb)
if eff.hp < 0 and not eff.begone then
game:onTickEnd(function() self:removeEffect(self.EFF_FROZEN) end)
@@ -1846,6 +1890,7 @@ function _M:onTakeHit(value, src, death_note)
value = t.doDismissalOnHit(self, value, src, t)
end
+ if value <= 0 then return 0 end
-- Feedback pool: Stores damage as energy to use later
if self:getMaxFeedback() > 0 and src ~= self and src ~= self.summoner then
local ratio = self:callTalent(self.T_FEEDBACK_POOL, "getFeedbackRatio")
@@ -1867,17 +1912,15 @@ function _M:onTakeHit(value, src, death_note)
-- Resonance Field, must be called after Feedback gains
if self:attr("resonance_field") then
- if value / 2 <= self.resonance_field_absorb then
- self.resonance_field_absorb = self.resonance_field_absorb - (value / 2)
- value = value / 2
+ local absorb = math.min(value/2, self.resonance_field_absorb)
+ game:delayedLogDamage(src, self, 0, ("#SLATE#(%d resonance)#LAST#"):format(absorb), false)
+ if absorb < self.resonance_field_absorb then
+ self.resonance_field_absorb = self.resonance_field_absorb - absorb
else
- value = value - self.resonance_field_absorb
- self.resonance_field_absorb = 0
- end
- if self.resonance_field_absorb <= 0 then
game.logPlayer(self, "Your resonance field crumbles under the damage!")
self:removeEffect(self.EFF_RESONANCE_FIELD)
end
+ value = value - absorb
end
if self:hasEffect(self.EFF_CAUTERIZE) then
@@ -1889,7 +1932,7 @@ function _M:onTakeHit(value, src, death_note)
end
-- Reduce sleep durations
- if self:attr("sleep") then
+ if value > 0 and self:attr("sleep") then
local effs = {}
for eff_id, p in pairs(self.tmp) do
local e = self.tempeffect_def[eff_id]
@@ -1932,7 +1975,7 @@ function _M:onTakeHit(value, src, death_note)
end
-- Adds hate
- if self:knowTalent(self.T_HATE_POOL) then
+ if value > 0 and self:knowTalent(self.T_HATE_POOL) then
local hateGain = 0
local hateMessage
@@ -1955,7 +1998,8 @@ function _M:onTakeHit(value, src, death_note)
end
end
end
- if src and (src.hate_per_powerful_hit or 0) > 0 and src.knowTalent and src:knowTalent(src.T_HATE_POOL) then
+
+ if value > 0 and src and (src.hate_per_powerful_hit or 0) > 0 and src.knowTalent and src:knowTalent(src.T_HATE_POOL) then
local hateGain = 0
local hateMessage
@@ -1974,17 +2018,21 @@ function _M:onTakeHit(value, src, death_note)
end
-- Bloodlust!
- if src and src.knowTalent and src:knowTalent(src.T_BLOODLUST) then
+ if value > 0 and src and src.knowTalent and src:knowTalent(src.T_BLOODLUST) then
src:setEffect(src.EFF_BLOODLUST, 1, {})
end
- if self:knowTalent(self.T_RAMPAGE) then
+ if value > 0 and self:knowTalent(self.T_RAMPAGE) then
local t = self:getTalentFromId(self.T_RAMPAGE)
t:onTakeHit(self, value / self.max_life)
end
if self:attr("unstoppable") then
- if value > self.life then value = self.life - 1 end
+ if value > self.life then
+ game:delayedLogDamage(src, self, 0, ("#RED#(%d refused)#LAST#"):format(value - self.life - 1), false)
+ value = self.life - 1
+ game:delayedLogMessage(self, nil, "unstoppable", "#RED##Source# is unstoppable!")
+ end
end
-- Split ?
@@ -2003,7 +2051,7 @@ function _M:onTakeHit(value, src, death_note)
a:removeAllMOs()
a.x, a.y = nil, nil
game.zone:addEntity(game.level, a, "actor", x, y)
- game.logSeen(self, "%s is split in two!", self.name:capitalize())
+ game.logSeen(self, "%s splits in two!", self.name:capitalize())
value = value / 2
end
end
@@ -2021,10 +2069,14 @@ function _M:onTakeHit(value, src, death_note)
damage_to_psi = self:getPsi()
self:incPsi(-damage_to_psi)
end
- game.logSeen(self, "%s's mind suffers #YELLOW#%d psi#LAST# damage from the attack.", self.name:capitalize(), damage_to_psi*psi_damage_resist)
+ local mindcolor = DamageType:get(DamageType.MIND).text_color or "#aaaaaa#"
+ game:delayedLogMessage(self, nil, "Solipsism hit", mindcolor.."#Source# converts some damage to Psi!")
+ game:delayedLogDamage(src, self, damage_to_psi*psi_damage_resist, ("%s%d %s#LAST#"):format(mindcolor, damage_to_psi*psi_damage_resist, "to psi"), false)
+
value = value - damage_to_psi
end
+ if value <= 0 then return 0 end
-- VITALITY?
if self:knowTalent(self.T_VITALITY) and self.life > self.max_life /2 and self.life - value <= self.max_life/2 then
local t = self:getTalentFromId(self.T_VITALITY)
@@ -2032,13 +2084,14 @@ function _M:onTakeHit(value, src, death_note)
end
-- Daunting Presence?
- if self:isTalentActive(self.T_DAUNTING_PRESENCE) and value > (self.max_life / 20) then
+ if value > (self.max_life / 20) and self:isTalentActive(self.T_DAUNTING_PRESENCE) then
local t = self:getTalentFromId(self.T_DAUNTING_PRESENCE)
t.do_daunting_presence(self, t)
end
-- Shield of Light
- if value > 0 and self:isTalentActive(self.T_SHIELD_OF_LIGHT) then
+ tal = self:isTalentActive(self.T_SHIELD_OF_LIGHT)
+ if tal then
if value <= 2 then
drain = value
else
@@ -2046,19 +2099,23 @@ function _M:onTakeHit(value, src, death_note)
end
if self:getPositive() >= drain then
self:incPositive(- drain)
- self:heal(self:combatTalentSpellDamage(self.T_SHIELD_OF_LIGHT, 5, 25), self)
+ self:heal(self:combatTalentSpellDamage(self.T_SHIELD_OF_LIGHT, 5, 25), tal)
end
end
-- Second Life
- if self:isTalentActive(self.T_SECOND_LIFE) and value >= self.life then
- local sl = self:callTalent(self.T_SECOND_LIFE,"getLife")
- value = 0
- self.life = sl
- game.logSeen(self, "%s has been saved by a blast of positive energy!", self.name:capitalize())
- self:forceUseTalent(self.T_SECOND_LIFE, {ignore_energy=true})
+ if value >= self.life then
+ tal = self:isTalentActive(self.T_SECOND_LIFE)
+ if tal then
+ local sl = self:callTalent(self.T_SECOND_LIFE,"getLife")
+ value = 0
+ self.life = sl
+ game.logSeen(self, "#YELLOW#%s has been saved by a blast of positive energy!#LAST#", self.name:capitalize())
+ game:delayedLogDamage(tal, self, -sl, ("#LIGHT_GREEN#%d healing#LAST#"):format(sl), false)
+ self:forceUseTalent(self.T_SECOND_LIFE, {ignore_energy=true})
+ end
end
-
+
-- Shade's reform
if value >= self.life and self.ai_state and self.ai_state.can_reform then
local t = self:getTalentFromId(self.T_SHADOW_REFORM)
@@ -2072,12 +2129,13 @@ function _M:onTakeHit(value, src, death_note)
end
end
+ if value <= 0 then return 0 end
-- Vim leech
if self:knowTalent(self.T_LEECH) and src.hasEffect and src:hasEffect(src.EFF_VIMSENSE) then
local vt = self:getTalentFromId(self.T_LEECH)
self:incVim(vt.getVim(self, vt))
- self:heal(vt.getHeal(self, vt))
- game.logPlayer(self, "#AQUAMARINE#You leech a part of %s's vim.", src.name:capitalize())
+ self:heal(vt.getHeal(self, vt), src)
+ if self.player then src:logCombat(src, "#AQUAMARINE#You leech a part of #Target#'s vim.") end
end
-- Invisible on hit
@@ -2117,11 +2175,24 @@ function _M:onTakeHit(value, src, death_note)
end
-- Life leech
- if value > 0 and src and not src.dead and src:attr("life_leech_chance") and rng.percent(src.life_leech_chance) then
+ if value > 0 and src and not src.dead and src.attr and src:attr("life_leech_chance") and rng.percent(src.life_leech_chance) then
local leech = math.min(value, self.life) * src.life_leech_value / 100
if leech > 0 then
- src:heal(leech)
- game.logSeen(src, "#CRIMSON#%s leeches life from its victim!", src.name:capitalize())
+ src:heal(leech, self)
+ game:delayedLogMessage(src, self, "life_leech"..self.uid, "#CRIMSON##Source# leeches life from #Target#!")
+ end
+ end
+
+ -- Flat damage cap
+ if self.flat_damage_cap and self.max_life and death_note and death_note.damtype then
+ local cap = nil
+ if self.flat_damage_cap.all then cap = self.flat_damage_cap.all end
+ if self.flat_damage_cap[death_note.damtype] then cap = self.flat_damage_cap[death_note.damtype] end
+ if cap and cap > 0 then
+ local ignored = math.max(0, value - cap * self.max_life / 100)
+ if ignored > 0 then game:delayedLogDamage(src, self, 0, ("#LIGHT_GREY#(%d resilience)#LAST#"):format(ignored), false) end
+ value = value - ignored
+ print("[TAKE HIT] after flat damage cap", value)
end
end
@@ -2129,7 +2200,7 @@ function _M:onTakeHit(value, src, death_note)
if self:triggerHook(hd) then value = hd.value end
-- Resource leech
- if value > 0 and src and src:attr("resource_leech_chance") and rng.percent(src.resource_leech_chance) then
+ if value > 0 and src and src.attr and src:attr("resource_leech_chance") and rng.percent(src.resource_leech_chance) then
local leech = src.resource_leech_value
src:incMana(leech)
src:incVim(leech * 0.5)
@@ -2139,7 +2210,7 @@ function _M:onTakeHit(value, src, death_note)
src:incStamina(leech * 0.65)
src:incHate(leech * 0.2)
src:incPsi(leech * 0.2)
- game.logSeen(src, "#CRIMSON#%s leeches energies from its victim!", src.name:capitalize())
+ game:delayedLogMessage(src, self, "resource_leech", "#CRIMSON##Source# leeches energies from #Target#!")
end
if self:knowTalent(self.T_DRACONIC_BODY) then
@@ -2348,9 +2419,9 @@ function _M:die(src, death_note)
end
local effStalked = self:hasEffect(self.EFF_STALKED)
- if effStalked and not effStalked.source.dead and effStalked.source:hasEffect(self.EFF_STALKER) then
- local t = effStalked.source:getTalentFromId(effStalked.source.T_STALK)
- t.on_targetDied(effStalked.source, t, self)
+ if effStalked and not effStalked.src.dead and effStalked.src:hasEffect(self.EFF_STALKER) then
+ local t = effStalked.src:getTalentFromId(effStalked.src.T_STALK)
+ t.on_targetDied(effStalked.src, t, self)
end
if src and src.hasEffect and src:hasEffect(self.EFF_PREDATOR) then
@@ -3257,6 +3328,20 @@ function _M:unlearnItemTalent(o, tid, level)
end
end
+function _M:checkPool(tid, pid)
+ if tid == pid then return end
+ if not self:knowTalent(pid) then
+ self:learnTalent(pid, true)
+ else
+ if not self.resource_pool_refs[pid] or not next(self.resource_pool_refs[pid]) then
+ self.resource_pool_refs[pid] = self.resource_pool_refs[pid] or {}
+ self.resource_pool_refs[pid][pid] = 1 -- Make it never unlearnable
+ end
+ end
+ self.resource_pool_refs[pid] = self.resource_pool_refs[pid] or {}
+ self.resource_pool_refs[pid][tid] = (self.resource_pool_refs[pid][tid] or 0) + 1
+end
+
--- Actor learns a resource pool
-- @param talent a talent definition table
function _M:learnPool(t)
@@ -3264,53 +3349,44 @@ function _M:learnPool(t)
-- if tt.mana_regen and self.mana_regen == 0 then self.mana_regen = 0.5 end
- if t.type[1]:find("^spell/") and not self:knowTalent(self.T_MANA_POOL) and (t.mana or t.sustain_mana) then
- self:learnTalent(self.T_MANA_POOL, true)
- self.resource_pool_refs[self.T_MANA_POOL] = (self.resource_pool_refs[self.T_MANA_POOL] or 0) + 1
+ if t.type[1]:find("^spell/") and (t.mana or t.sustain_mana) then
+ self:checkPool(t.id, self.T_MANA_POOL)
end
- if t.type[1]:find("^wild%-gift/") and not self:knowTalent(self.T_EQUILIBRIUM_POOL) and (t.equilibrium or t.sustain_equilibrium) then
- self:learnTalent(self.T_EQUILIBRIUM_POOL, true)
- self.resource_pool_refs[self.T_EQUILIBRIUM_POOL] = (self.resource_pool_refs[self.T_EQUILIBRIUM_POOL] or 0) + 1
+ if t.type[1]:find("^wild%-gift/") and (t.equilibrium or t.sustain_equilibrium) then
+ self:checkPool(t.id, self.T_EQUILIBRIUM_POOL)
end
- if (t.type[1]:find("^technique/") or t.type[1]:find("^cunning/")) and not self:knowTalent(self.T_STAMINA_POOL) and (t.stamina or t.sustain_stamina) then
- self:learnTalent(self.T_STAMINA_POOL, true)
- self.resource_pool_refs[self.T_STAMINA_POOL] = (self.resource_pool_refs[self.T_STAMINA_POOL] or 0) + 1
+ if (t.type[1]:find("^technique/") or t.type[1]:find("^cunning/")) and (t.stamina or t.sustain_stamina) then
+ self:checkPool(t.id, self.T_STAMINA_POOL)
end
- if t.type[1]:find("^corruption/") and not self:knowTalent(self.T_VIM_POOL) and (t.vim or t.sustain_vim) then
- self:learnTalent(self.T_VIM_POOL, true)
- self.resource_pool_refs[self.T_VIM_POOL] = (self.resource_pool_refs[self.T_VIM_POOL] or 0) + 1
+ if t.type[1]:find("^corruption/") and (t.vim or t.sustain_vim) then
+ self:checkPool(t.id, self.T_VIM_POOL)
end
- if t.type[1]:find("^celestial/") and (t.positive or t.sustain_positive) and not self:knowTalent(self.T_POSITIVE_POOL) then
- self:learnTalent(self.T_POSITIVE_POOL, true)
- self.resource_pool_refs[self.T_POSITIVE_POOL] = (self.resource_pool_refs[self.T_POSITIVE_POOL] or 0) + 1
+ if t.type[1]:find("^celestial/") and (t.positive or t.sustain_positive) then
+ self:checkPool(t.id, self.T_POSITIVE_POOL)
end
- if t.type[1]:find("^celestial/") and (t.negative or t.sustain_negative) and not self:knowTalent(self.T_NEGATIVE_POOL) then
- self:learnTalent(self.T_NEGATIVE_POOL, true)
- self.resource_pool_refs[self.T_NEGATIVE_POOL] = (self.resource_pool_refs[self.T_NEGATIVE_POOL] or 0) + 1
+ if t.type[1]:find("^celestial/") and (t.negative or t.sustain_negative) then
+ self:checkPool(t.id, self.T_NEGATIVE_POOL)
end
- if t.type[1]:find("^cursed/") and not self:knowTalent(self.T_HATE_POOL) and t.hate then
- self:learnTalent(self.T_HATE_POOL, true)
- self.resource_pool_refs[self.T_HATE_POOL] = (self.resource_pool_refs[self.T_HATE_POOL] or 0) + 1
+ if t.type[1]:find("^cursed/") and t.hate then
+ self:checkPool(t.id, self.T_HATE_POOL)
end
- if t.type[1]:find("^chronomancy/") and not self:knowTalent(self.T_PARADOX_POOL) then
- self:learnTalent(self.T_PARADOX_POOL, true)
- self.resource_pool_refs[self.T_PARADOX_POOL] = (self.resource_pool_refs[self.T_PARADOX_POOL] or 0) + 1
+ if t.type[1]:find("^chronomancy/") then
+ self:checkPool(t.id, self.T_PARADOX_POOL)
end
- if t.type[1]:find("^psionic/") and not (t.type[1]:find("^psionic/feedback") or t.type[1]:find("^psionic/discharge")) and not self:knowTalent(self.T_PSI_POOL) then
- self:learnTalent(self.T_PSI_POOL, true)
- self.resource_pool_refs[self.T_PSI_POOL] = (self.resource_pool_refs[self.T_PSI_POOL] or 0) + 1
+ if t.type[1]:find("^psionic/") and not (t.type[1]:find("^psionic/feedback") or t.type[1]:find("^psionic/discharge")) then
+ self:checkPool(t.id, self.T_PSI_POOL)
end
- if t.type[1]:find("^psionic/feedback") or t.type[1]:find("^psionic/discharge") and not self:knowTalent(self.T_FEEDBACK_POOL) then
- self:learnTalent(self.T_FEEDBACK_POOL, true)
+ if t.type[1]:find("^psionic/feedback") or t.type[1]:find("^psionic/discharge") then
+ self:checkPool(t.id, self.T_FEEDBACK_POOL)
end
-- If we learn an archery talent, also learn to shoot
- if t.type[1]:find("^technique/archery") and not self:knowTalent(self.T_SHOOT) then
- self:learnTalent(self.T_SHOOT, true)
- self.resource_pool_refs[self.T_SHOOT] = (self.resource_pool_refs[self.T_SHOOT] or 0) + 1
+ if t.type[1]:find("^technique/archery") then
+ self:checkPool(t.id, self.T_SHOOT)
+ self:checkPool(t.id, self.T_RELOAD)
end
- if t.type[1]:find("^technique/archery") and not self:knowTalent(self.T_RELOAD) then
- self:learnTalent(self.T_RELOAD, true)
- self.resource_pool_refs[self.T_RELOAD] = (self.resource_pool_refs[self.T_RELOAD] or 0) + 1
+ -- If we learn an unharmed talent, learn to use it too
+ if tt.is_unarmed then
+ self:checkPool(t.id, self.T_EMPTY_HAND)
end
self:recomputeRegenResources()
@@ -3324,6 +3400,8 @@ end
function _M:unlearnTalent(t_id, nb, no_unsustain, extra)
if not engine.interface.ActorTalents.unlearnTalent(self, t_id, nb) then return false end
+ nb = nb or 1
+
local t = _M.talents_def[t_id]
for event, store in pairs(sustainCallbackCheck) do
@@ -3343,9 +3421,12 @@ function _M:unlearnTalent(t_id, nb, no_unsustain, extra)
end
-- Check the various pools
- for key, num_refs in pairs(self.resource_pool_refs) do
- if num_refs == 0 then
- self:unlearnTalent(key)
+ for pid, refs in pairs(self.resource_pool_refs) do
+ if refs[t_id] then
+ refs[t_id] = refs[t_id] - nb
+ if refs[t_id] <= 0 then refs[t_id] = nil end
+
+ if not next(refs) then self:unlearnTalent(pid, 1) end
end
end
@@ -3354,7 +3435,7 @@ function _M:unlearnTalent(t_id, nb, no_unsustain, extra)
self:recomputeRegenResources()
- if t.is_spell then self:attr("has_arcane_knowledge", -(nb or 1)) end
+ if t.is_spell then self:attr("has_arcane_knowledge", -nb) end
-- If we learn mindslayer things we learn telekinetic grasp & beyond the flesh
if t.autolearn_mindslayer then
@@ -3763,6 +3844,10 @@ function _M:preUseTalent(ab, silent, fake)
if ab.is_teleport and self:attr("encased_in_ice") then return false end
end
+
+ -- Special checks -- AI
+ if not self.player and ab.on_pre_use_ai and not (ab.mode == "sustained" and self:isTalentActive(ab.id)) and not ab.on_pre_use_ai(self, ab, silent, fake) then return false end
+
if not silent then
-- Allow for silent talents
if ab.message ~= nil then
@@ -4021,7 +4106,7 @@ function _M:postUseTalent(ab, ret, silent)
self:project(tg, self.x, self.y, function(px, py)
local target = game.level.map(px, py, Map.ACTOR)
if target and self:reactionToward(target) >= 0 then
- target:heal(self:attr("heal_on_nature_summon"))
+ target:heal(self:attr("heal_on_nature_summon"), self)
end
end)
end
@@ -4036,7 +4121,7 @@ function _M:postUseTalent(ab, ret, silent)
local t = rng.tableRemove(tids)
if not t then break end
self.talents_cd[t.id] = self:attr("random_talent_cooldown_on_use_turns")
- game.log("%s talent '%s%s' is disrupted by the mind parasite.", self.name:capitalize(), (t.display_entity and t.display_entity:getDisplayString() or ""), t.name)
+ game.logSeen(self, "%s talent '%s%s' is disrupted by the mind parasite.", self.name:capitalize(), (t.display_entity and t.display_entity:getDisplayString() or ""), t.name)
end
end
@@ -4154,17 +4239,17 @@ function _M:getTalentFullDescription(t, addlevel, config, fake_mastery)
d:add(true)
end
if not config.ignore_ressources then
- if t.mana then d:add({"color",0x6f,0xff,0x83}, "Mana cost: ", {"color",0x7f,0xff,0xd4}, ""..(util.getval(t.mana, self, t) * (100 + 2 * self:combatFatigue()) / 100), true) end
- if t.stamina then d:add({"color",0x6f,0xff,0x83}, "Stamina cost: ", {"color",0xff,0xcc,0x80}, ""..(util.getval(t.stamina, self, t) * (100 + self:combatFatigue()) / 100), true) end
- if t.equilibrium then d:add({"color",0x6f,0xff,0x83}, "Equilibrium cost: ", {"color",0x00,0xff,0x74}, ""..(util.getval(t.equilibrium, self, t)), true) end
- if t.vim then d:add({"color",0x6f,0xff,0x83}, "Vim cost: ", {"color",0x88,0x88,0x88}, ""..(util.getval(t.vim, self, t)), true) end
- if t.positive then d:add({"color",0x6f,0xff,0x83}, "Positive energy cost: ", {"color",255, 215, 0}, ""..(util.getval(t.positive, self, t) * (100 + self:combatFatigue()) / 100), true) end
- if t.negative then d:add({"color",0x6f,0xff,0x83}, "Negative energy cost: ", {"color", 127, 127, 127}, ""..(util.getval(t.negative, self, t) * (100 + self:combatFatigue()) / 100), true) end
- if t.hate then d:add({"color",0x6f,0xff,0x83}, "Hate cost: ", {"color", 127, 127, 127}, ""..(util.getval(t.hate, self, t) * (100 + 2 * self:combatFatigue()) / 100), true) end
- if t.paradox then d:add({"color",0x6f,0xff,0x83}, "Paradox cost: ", {"color", 176, 196, 222}, ("%0.2f"):format(util.getval(t.paradox, self, t) * (1 + (self.paradox / 300))), true) end
- if t.psi then d:add({"color",0x6f,0xff,0x83}, "Psi cost: ", {"color",0x7f,0xff,0xd4}, ""..(util.getval(t.psi, self, t) * (100 + 2 * self:combatFatigue()) / 100), true) end
- if t.feedback then d:add({"color",0x6f,0xff,0x83}, "Feedback cost: ", {"color",0xFF, 0xFF, 0x00}, ""..(util.getval(t.feedback, self, t) * (100 + 2 * self:combatFatigue()) / 100), true) end
- if t.fortress_energy then d:add({"color",0x6f,0xff,0x83}, "Fortress Energy cost: ", {"color",0x00,0xff,0xa0}, ""..(t.fortress_energy), true) end
+ if t.mana then d:add({"color",0x6f,0xff,0x83}, "Mana cost: ", {"color",0x7f,0xff,0xd4}, ""..math.round(util.getval(t.mana, self, t) * (100 + 2 * self:combatFatigue()) / 100, 0.1), true) end
+ if t.stamina then d:add({"color",0x6f,0xff,0x83}, "Stamina cost: ", {"color",0xff,0xcc,0x80}, ""..math.round(util.getval(t.stamina, self, t) * (100 + self:combatFatigue()) / 100, 0.1), true) end
+ if t.equilibrium then d:add({"color",0x6f,0xff,0x83}, "Equilibrium cost: ", {"color",0x00,0xff,0x74}, ""..math.round(util.getval(t.equilibrium, self, t), 0.1), true) end
+ if t.vim then d:add({"color",0x6f,0xff,0x83}, "Vim cost: ", {"color",0x88,0x88,0x88}, ""..math.round(util.getval(t.vim, self, t), 0.1), true) end
+ if t.positive then d:add({"color",0x6f,0xff,0x83}, "Positive energy cost: ", {"color",255, 215, 0}, ""..math.round(util.getval(t.positive, self, t) * (100 + self:combatFatigue()) / 100, 0.1), true) end
+ if t.negative then d:add({"color",0x6f,0xff,0x83}, "Negative energy cost: ", {"color", 127, 127, 127}, ""..math.round(util.getval(t.negative, self, t) * (100 + self:combatFatigue()) / 100, 0.1), true) end
+ if t.hate then d:add({"color",0x6f,0xff,0x83}, "Hate cost: ", {"color", 127, 127, 127}, ""..math.round(util.getval(t.hate, self, t) * (100 + 2 * self:combatFatigue()) / 100, 0.1), true) end
+ if t.paradox then d:add({"color",0x6f,0xff,0x83}, "Paradox cost: ", {"color", 176, 196, 222}, ("%0.1f"):format(util.getval(t.paradox, self, t) * (1 + (self.paradox / 300))), true) end
+ if t.psi then d:add({"color",0x6f,0xff,0x83}, "Psi cost: ", {"color",0x7f,0xff,0xd4}, ""..math.round(util.getval(t.psi, self, t) * (100 + 2 * self:combatFatigue()) / 100, 0.1), true) end
+ if t.feedback then d:add({"color",0x6f,0xff,0x83}, "Feedback cost: ", {"color",0xFF, 0xFF, 0x00}, ""..math.round(util.getval(t.feedback, self, t) * (100 + 2 * self:combatFatigue()) / 100, 0.1), true) end
+ if t.fortress_energy then d:add({"color",0x6f,0xff,0x83}, "Fortress Energy cost: ", {"color",0x00,0xff,0xa0}, ""..math.round(t.fortress_energy, 0.1), true) end
if t.sustain_mana then d:add({"color",0x6f,0xff,0x83}, "Sustain mana cost: ", {"color",0x7f,0xff,0xd4}, ""..(util.getval(t.sustain_mana, self, t)), true) end
if t.sustain_stamina then d:add({"color",0x6f,0xff,0x83}, "Sustain stamina cost: ", {"color",0xff,0xcc,0x80}, ""..(util.getval(t.sustain_stamina, self, t)), true) end
@@ -4173,14 +4258,14 @@ function _M:getTalentFullDescription(t, addlevel, config, fake_mastery)
if t.sustain_positive then d:add({"color",0x6f,0xff,0x83}, "Sustain positive energy cost: ", {"color",255, 215, 0}, ""..(util.getval(t.sustain_positive, self, t)), true) end
if t.sustain_negative then d:add({"color",0x6f,0xff,0x83}, "Sustain negative energy cost: ", {"color", 127, 127, 127}, ""..(util.getval(t.sustain_negative, self, t)), true) end
if t.sustain_hate then d:add({"color",0x6f,0xff,0x83}, "Sustain hate cost: ", {"color", 127, 127, 127}, ""..(util.getval(t.sustain_hate, self, t)), true) end
- if t.sustain_paradox then d:add({"color",0x6f,0xff,0x83}, "Sustain paradox cost: ", {"color", 176, 196, 222}, ("%0.2f"):format(util.getval(t.sustain_paradox, self, t)), true) end
+ if t.sustain_paradox then d:add({"color",0x6f,0xff,0x83}, "Sustain paradox cost: ", {"color", 176, 196, 222}, ("%0.1f"):format(util.getval(t.sustain_paradox, self, t)), true) end
if t.sustain_psi then d:add({"color",0x6f,0xff,0x83}, "Sustain psi cost: ", {"color",0x7f,0xff,0xd4}, ""..(util.getval(t.sustain_psi, self, t)), true) end
if t.sustain_feedback then d:add({"color",0x6f,0xff,0x83}, "Sustain feedback cost: ", {"color",0xFF, 0xFF, 0x00}, ""..(util.getval(t.sustain_feedback, self, t)), true) end
self:triggerHook{"Actor:getTalentFullDescription:ressources", str=d, t=t, addlevel=addlevel, config=config, fake_mastery=fake_mastery}
end
if t.mode ~= "passive" then
- if self:getTalentRange(t) > 1 then d:add({"color",0x6f,0xff,0x83}, "Range: ", {"color",0xFF,0xFF,0xFF}, ("%0.2f"):format(self:getTalentRange(t)), true)
+ if self:getTalentRange(t) > 1 then d:add({"color",0x6f,0xff,0x83}, "Range: ", {"color",0xFF,0xFF,0xFF}, ("%0.1f"):format(self:getTalentRange(t)), true)
else d:add({"color",0x6f,0xff,0x83}, "Range: ", {"color",0xFF,0xFF,0xFF}, "melee/personal", true)
end
if not config.ignore_ressources then
@@ -4385,7 +4470,7 @@ function _M:suffocate(value, src, death_message)
return false, true
end
---- Can the actor see the target actor
+-- Can the actor see the target actor (or other entity)
-- This does not check LOS or such, only the actual ability to see it.<br/>
-- Check for telepathy, invisibility, stealth, ...
function _M:canSeeNoCache(actor, def, def_pct)
@@ -4415,7 +4500,7 @@ function _M:canSeeNoCache(actor, def, def_pct)
end
-- Check for stealth. Checks against the target cunning and level
- if actor:attr("stealth") and actor ~= self then
+ if actor ~= self and actor.attr and actor:attr("stealth") then
local def = self:combatSeeStealth()
local hit, chance = self:checkHitOld(def, actor:attr("stealth") + (actor:attr("inc_stealth") or 0), 0, 100)
if not hit then
@@ -4424,7 +4509,7 @@ function _M:canSeeNoCache(actor, def, def_pct)
end
-- Check for invisibility. This is a "simple" checkHit between invisible and see_invisible attrs
- if actor:attr("invisible") and actor ~= self then
+ if actor ~= self and actor.attr and actor:attr("invisible") then
-- Special case, 0 see invisible, can NEVER see invisible things
local def = self:combatSeeInvisible()
if def <= 0 then return false, 0 end
@@ -4569,6 +4654,8 @@ local save_for_effects = {
--- Adjust temporary effects
function _M:on_set_temporary_effect(eff_id, e, p)
+ p.getName = self.tempeffect_def[eff_id].getName
+ p.resolveSource = self.tempeffect_def[eff_id].resolveSource
if p.apply_power and (save_for_effects[e.type] or p.apply_save) then
local save = 0
p.maximum = p.dur
@@ -4669,7 +4756,7 @@ function _M:on_project_acquire(tx, ty, who, t, x, y, damtype, dam, particles, is
else
dir = "to the "..dir.."!"
end
- game.logSeen(self, "%s deflects the projectile from %s %s", self.name:capitalize(), who.name, dir)
+ self:logCombat(who, "#Source# deflects the projectile from #Target# %s", dir)
return true
end
end
diff --git a/game/modules/tome/class/FortressPC.lua b/game/modules/tome/class/FortressPC.lua
index f4e8d3e2575212832339dc675042cccdcded2100..13ebd56ac445f2b6929ec3ab4aebf211b9bddf3b 100644
--- a/game/modules/tome/class/FortressPC.lua
+++ b/game/modules/tome/class/FortressPC.lua
@@ -170,7 +170,7 @@ function _M:moveModActor(x, y, force)
local grids = core.fov.circle_grids(self.x, self.y, 1, true)
for x, yy in pairs(grids) do for y, _ in pairs(yy) do
local trap = game.level.map(x, y, Map.TRAP)
- if trap and not trap:knownBy(self) and self:checkHit(power, trap.detect_power) then
+ if trap and not trap:knownBy(self) and self:canSee(trap) and self:checkHit(power, trap.detect_power) then
trap:setKnown(self, true)
game.level.map:updateMap(x, y)
game.logPlayer(self, "You have found a trap (%s)!", trap:getName())
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 16d4a47d4b7c0a7f2f4a83f353ea6360283cf4e9..73fb116c591ff27b3cc75981be0c20feeab131ba 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -94,6 +94,7 @@ end
function _M:runReal()
self.delayed_log_damage = {}
+ self.delayed_log_messages = {}
self.calendar = Calendar.new("/data/calendar_allied.lua", "Today is the %s %s of the %s year of the Age of Ascendancy of Maj'Eyal.\nThe time is %02d:%02d.", 122, 167, 11)
self.uiset:activate()
@@ -1132,6 +1133,7 @@ function _M:tick()
end
-- Check damages to log
+ self:displayDelayedLogMessages()
self:displayDelayedLogDamage()
if self.tick_loopback then
@@ -1144,28 +1146,129 @@ function _M:tick()
-- if self.on_tick_end and #self.on_tick_end > 0 then return true end
end
+-- Game Log management functions:
+-- logVisible to determine if a message should be visible to the player
+-- logMessage to add a message to the display
+-- delayedLogMessage to queue an actor-specific message for display at the end of the current game tick
+-- displayDelayedLogMessages() to display the queued messages (before combat damage messages)
+-- delayedLogDamage to queue a combat (damage) message for display at the end of the current game tick
+-- displayDelayedLogDamage to display the queued combat messages
+
+-- output a message to the log based on the visibility of an actor to the player
+function _M.logSeen(e, style, ...)
+ if e and e.player or (not e.dead and e.x and e.y and game.level and game.level.map.seens(e.x, e.y) and game.player:canSee(e)) then game.log(style, ...) end
+end
+
+-- determine whether an action between 2 actors should produce a message in the log and if the player
+-- can identify them
+-- output: src, srcSeen: source display?, identify?
+-- tgt, tgtSeen: target display?, identify?
+-- output: Visible? and srcSeen (source is identified by the player), tgtSeen(target is identified by the player)
+function _M:logVisible(source, target)
+ -- target should display if it's the player, an actor in a seen tile, or a non-actor without coordinates
+ local tgt = target and (target.player or (target.__is_actor and game.level.map.seens(target.x, target.y)) or (not target.__is_actor and not target.x))
+ local tgtSeen = tgt and (target.player or game.player:canSee(target)) or false
+ local src, srcSeen = false, false
+-- local srcSeen = src and (not source.x or (game.player:canSee(source) and game.player:canSee(target)))
+ -- Special cases
+ if not source.x then -- special case: unpositioned source uses target parameters (for timed effects on target)
+ if tgtSeen then
+ src, srcSeen = tgt, tgtSeen
+ else
+ src, tgt = nil, nil
+ end
+ else -- source should display if it's the player or an actor in a seen tile, or same as target for non-actors
+ src = source.player or (source.__is_actor and game.level.map.seens(source.x, source.y)) or (not source.__is_actor and tgt)
+ srcSeen = src and game.player:canSee(source) or false
+ end
+
+ return src or tgt or false, srcSeen, tgtSeen
+end
+
+-- Generate a message (string) for the log with possible source and target,
+-- highlighting the player and taking visibility into account
+-- srcSeen, tgtSeen = can player see(identify) the source, target?
+-- style text message to display, may contain:
+-- #source#|#Source# -> <displayString>..self.name|self.name:capitalize()
+-- #target#|#Target# -> target.name|target.name:capitalize()
+function _M:logMessage(source, srcSeen, target, tgtSeen, style, ...)
+ style = style:format(...)
+ local srcname = "something"
+ local Dstring
+ if source.player then
+ srcname = source.name.."(YOU)"
+ elseif srcSeen then
+ srcname = engine.Entity.check(source, "getName") or source.name or "unknown"
+ end
+ if srcname ~= "something" then Dstring = source.__is_actor and source.getDisplayString and source:getDisplayString() end
+ style = style:gsub("#source#", srcname)
+ style = style:gsub("#Source#", (Dstring or "")..srcname:capitalize())
+ if target then
+ local tgtname = "something"
+ if target.player then
+ tgtname = target.name.."(YOU)"
+ elseif tgtSeen then
+ tgtname = engine.Entity.check(target, "getName") or target.name or "unknown"
+ end
+ style = style:gsub("#target#", tgtname)
+ style = style:gsub("#Target#", tgtname:capitalize())
+ end
+ return style
+end
+
+-- log an entity-specific message for display later with displayDelayedLogDamage
+-- only one message (processed with logMessage) will be logged for each source and label
+-- useful to avoid spamming repeated messages
+-- target is optional and is used only to resolve the msg
+function _M:delayedLogMessage(source, target, label, msg, ...)
+ local visible, srcSeen, tgtSeen = self:logVisible(source, target)
+ if visible then
+ self.delayed_log_messages[source] = self.delayed_log_messages[source] or {}
+ local src = self.delayed_log_messages[source]
+ src[label] = self:logMessage(source, srcSeen, target, tgtSeen, msg, ...)
+ end
+end
+
+-- display the delayed log messages
+function _M:displayDelayedLogMessages()
+ if not self.uiset or not self.uiset.logdisplay then return end
+ for src, msgs in pairs(self.delayed_log_messages) do
+ for label, msg in pairs(msgs) do
+ game.uiset.logdisplay(self:logMessage(src, true, nil, nil, msg))
+ end
+ end
+ self.delayed_log_messages = {}
+end
+
+-- Note: There can be up to a 1 tick delay in displaying log information
function _M:displayDelayedLogDamage()
+ if not self.uiset or not self.uiset.logdisplay then return end
for src, tgts in pairs(self.delayed_log_damage) do
for target, dams in pairs(tgts) do
if #dams.descs > 1 then
- self.logSeen(target, "%s%s hits %s for %s damage (total %0.2f).", src:getDisplayString(), src.name:capitalize(), target.name, table.concat(dams.descs, ", "), dams.total)
+ game.uiset.logdisplay(self:logMessage(src, dams.srcSeen, target, dams.tgtSeen, "#Source# hits #Target# for %s (%0.0f total damage)%s.", table.concat(dams.descs, ", "), dams.total, dams.healing<0 and (" #LIGHT_GREEN#[%0.0f healing]#LAST#"):format(-dams.healing) or ""))
else
- self.logSeen(target, "%s%s hits %s for %s damage.", src:getDisplayString(), src.name:capitalize(), target.name, table.concat(dams.descs, ", "))
+ if dams.healing >= 0 then
+ game.uiset.logdisplay(self:logMessage(src, dams.srcSeen, target, dams.tgtSeen, "#Source# hits #Target# for %s damage.", table.concat(dams.descs, ", ")))
+ elseif src == target then
+ game.uiset.logdisplay(self:logMessage(src, dams.srcSeen, target, dams.tgtSeen, "#Source# receives %s.", table.concat(dams.descs, ", ")))
+ else
+ game.uiset.logdisplay(self:logMessage(src, dams.srcSeen, target, dams.tgtSeen, "#Target# receives %s from #Source#.", table.concat(dams.descs, ", ")))
+ end
end
-
local rsrc = src.resolveSource and src:resolveSource() or src
local rtarget = target.resolveSource and target:resolveSource() or target
local x, y = target.x or -1, target.y or -1
local sx, sy = self.level.map:getTileToScreen(x, y)
if target.dead then
- if self.level.map.seens(x, y) and (rsrc == self.player or rtarget == self.player or self.party:hasMember(rsrc) or self.party:hasMember(rtarget)) then
+ if dams.tgtSeen and (rsrc == self.player or rtarget == self.player or self.party:hasMember(rsrc) or self.party:hasMember(rtarget)) then
self.flyers:add(sx, sy, 30, (rng.range(0,2)-1) * 0.5, rng.float(-2.5, -1.5), ("Kill (%d)!"):format(dams.total), {255,0,255}, true)
- game.logSeen(target, "#{bold}#%s%s killed %s!#{normal}#", src:getDisplayString(), src.name:capitalize(), target.name)
+ self:delayedLogMessage(target, nil, "death", self:logMessage(src, dams.srcSeen, target, dams.tgtSeen, "#{bold}##Source# killed #Target#!#{normal}#"))
end
- else
- if self.level.map.seens(x, y) and (rsrc == self.player or self.party:hasMember(rsrc)) then
+ elseif dams.total > 0 or dams.healing == 0 then
+ if dams.tgtSeen and (rsrc == self.player or self.party:hasMember(rsrc)) then
self.flyers:add(sx, sy, 30, (rng.range(0,2)-1) * 0.5, rng.float(-3, -2), tostring(-math.ceil(dams.total)), {0,255,dams.is_crit and 200 or 0}, dams.is_crit)
- elseif self.level.map.seens(x, y) and (rtarget == self.player or self.party:hasMember(rtarget)) then
+ elseif dams.tgtSeen and (rtarget == self.player or self.party:hasMember(rtarget)) then
self.flyers:add(sx, sy, 30, (rng.range(0,2)-1) * 0.5, -rng.float(-3, -2), tostring(-math.ceil(dams.total)), {255,dams.is_crit and 200 or 0,0}, dams.is_crit)
end
end
@@ -1176,17 +1279,27 @@ function _M:displayDelayedLogDamage()
self.delayed_log_damage = {}
end
+-- log and collate combat damage for later display with displayDelayedLogDamage
function _M:delayedLogDamage(src, target, dam, desc, crit)
- self.delayed_log_damage[src] = self.delayed_log_damage[src] or {}
- self.delayed_log_damage[src][target] = self.delayed_log_damage[src][target] or {total=0, descs={}}
- local t = self.delayed_log_damage[src][target]
- t.descs[#t.descs+1] = desc
- t.total = t.total + dam
- t.is_crit = t.is_crit or crit
+ src = src.__project_source or src -- assign message to indirect damage source if available
+ local visible, srcSeen, tgtSeen = self:logVisible(src, target)
+ if visible then -- only log damage the player is aware of
+ self.delayed_log_damage[src] = self.delayed_log_damage[src] or {}
+ self.delayed_log_damage[src][target] = self.delayed_log_damage[src][target] or {total=0, healing=0, descs={}}
+ local t = self.delayed_log_damage[src][target]
+ t.descs[#t.descs+1] = desc
+ if dam>=0 then
+ t.total = t.total + dam
+ else
+ t.healing = t.healing + dam
+ end
+ t.is_crit = t.is_crit or crit
+ t.srcSeen = srcSeen
+ t.tgtSeen = tgtSeen
+ end
end
--- Called every game turns
--- Does nothing, you can override it
function _M:onTurn()
if self.zone then
if self.zone.on_turn then self.zone:on_turn() end
@@ -1656,7 +1769,7 @@ do return end
local menu
local l = {
"resume",
- "achievements",
+ { "Show Achievements", function() self:unregisterDialog(menu) self:registerDialog(require("mod.dialogs.ShowAchievements").new("Tales of Maj'Eyal Achievements", self.player)) end },
{ "Show known Lore", function() self:unregisterDialog(menu) self:registerDialog(require("mod.dialogs.ShowLore").new("Tales of Maj'Eyal Lore", self.party)) end },
{ "Show ingredients", function() self:unregisterDialog(menu) self:registerDialog(require("mod.dialogs.ShowIngredients").new(self.party)) end },
"highscores",
diff --git a/game/modules/tome/class/Grid.lua b/game/modules/tome/class/Grid.lua
index 2b5009b24435c33ec5169db06c5cbd0ddf05fcc0..bd55114a1e36f716d52393a64bef105df78ca11e 100644
--- a/game/modules/tome/class/Grid.lua
+++ b/game/modules/tome/class/Grid.lua
@@ -22,9 +22,12 @@ require "engine.Grid"
local Map = require "engine.Map"
local Dialog = require "engine.ui.Dialog"
local DamageType = require "engine.DamageType"
+local Combat = require "mod.class.interface.Combat"
module(..., package.seeall, class.inherit(engine.Grid))
+_M.logCombat = Combat.logCombat
+
function _M:init(t, no_default)
engine.Grid.init(self, t, no_default)
@@ -123,17 +126,43 @@ function _M:on_move(x, y, who, forced)
end
end
+function _M:resolveSource()
+ if self.summoner_gain_exp and self.summoner then
+ return self.summoner:resolveSource()
+ else
+ return self
+ end
+end
+
+-- Gets the full name of the grid
+function _M:getName()
+ local name = self.name or "spot"
+ if self.summoner and self.summoner.name then
+ return self.summoner.name:capitalize().."'s "..name
+ else
+ return name
+ end
+end
+
function _M:tooltip(x, y)
local tstr
+ local dist = nil
+ if game.player.x and game.player.y then dist = tstring{" (range: ", {"font", "italic"}, {"color", "LIGHT_GREEN"}, tostring(core.fov.distance(game.player.x, game.player.y, x, y)), {"color", "LAST"}, {"font", "normal"}, ")"} end
if self.show_tooltip then
local name = ((self.show_tooltip == true) and self.name or self.show_tooltip)
if self.desc then
- tstr = tstring{{"uid", self.uid}, name, true, self.desc, true}
+ tstr = tstring{{"uid", self.uid}, name}
+ if dist then tstr:merge(dist) end
+ tstr:add(true, self.desc, true)
else
- tstr = tstring{{"uid", self.uid}, name, true}
+ tstr = tstring{{"uid", self.uid}, name}
+ if dist then tstr:merge(dist) end
+ tstr:add(true)
end
else
- tstr = tstring{{"uid", self.uid}, self.name, true}
+ tstr = tstring{{"uid", self.uid}, self.name}
+ if dist then tstr:merge(dist) end
+ tstr:add(true)
end
if game.level.entrance_glow and self.change_zone and not game.visited_zones[self.change_zone] then
@@ -147,6 +176,7 @@ function _M:tooltip(x, y)
if self:attr("air_level") and self:attr("air_level") < 0 then tstr:add({"color", "LIGHT_BLUE"}, "Special breathing method required", {"color", "LAST"}, true) end
if self:attr("dig") then tstr:add({"color", "LIGHT_UMBER"}, "Diggable", {"color", "LAST"}, true) end
if game.level.map.attrs(x, y, "no_teleport") then tstr:add({"color", "VIOLET"}, "Cannot teleport to this place", {"color", "LAST"}, true) end
+
if config.settings.cheat then
tstr:add(true, tostring(rawget(self, "type")), " / ", tostring(rawget(self, "subtype")))
diff --git a/game/modules/tome/class/MapEffects.lua b/game/modules/tome/class/MapEffects.lua
new file mode 100644
index 0000000000000000000000000000000000000000..72ca171bdb4cea39f3e6a160f474dfd031ef52f2
--- /dev/null
+++ b/game/modules/tome/class/MapEffects.lua
@@ -0,0 +1,47 @@
+-- TE4 - T-Engine 4
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+local Map = require "engine.Map"
+
+local function getEffectName(self)
+ local name = self.name or self.damtype and engine.DamageType.dam_def[self.damtype].name.." area effect" or "area effect"
+ if self.src then
+ return self.src.name.."'s "..name
+ else
+ return name
+ end
+end
+
+local function resolveSource(self)
+ if self.src and self.src.resolveSource then
+ return self.src:resolveSource()
+ else
+ return self
+ end
+end
+
+local addEffect = Map.addEffect
+Map.addEffect = function (...)
+ local e = addEffect(...)
+ if e then
+ e.getName = getEffectName
+ e.resolveSource = resolveSource
+ end
+ return e
+end
diff --git a/game/modules/tome/class/NPC.lua b/game/modules/tome/class/NPC.lua
index 24dc91125c617cd09a1e6a0be45e02b43ec5d549..5e4bb8c3805a26531127dfec69670d35aed1b746 100644
--- a/game/modules/tome/class/NPC.lua
+++ b/game/modules/tome/class/NPC.lua
@@ -537,7 +537,7 @@ function _M:aiCanPass(x, y)
local check_dir = sides[side]
local sx, sy = util.coordAddDir(target.x, target.y, check_dir)
if target:canMove(sx, sy) and target:move(sx, sy) then
- game.logSeen(target, "%s shoves %s forward.", self.name:capitalize(), target.name)
+ self:logCombat(target, "#Source# shoves #Target# forward.")
target.shove_pressure = nil
target._last_shove_pressure = nil
break
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index 9daf94f15646efb0f0d3f4059abf0735e958f189..6722137755d2e0f03da78504d8193ece413bb72b 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -27,6 +27,7 @@ require "engine.interface.ObjectIdentify"
local Stats = require("engine.interface.ActorStats")
local Talents = require("engine.interface.ActorTalents")
local DamageType = require("engine.DamageType")
+local Combat = require("mod.class.interface.Combat")
module(..., package.seeall, class.inherit(
engine.Object,
@@ -37,6 +38,8 @@ module(..., package.seeall, class.inherit(
_M.projectile_class = "mod.class.Projectile"
+_M.logCombat = Combat.logCombat
+
function _M:init(t, no_default)
t.encumber = t.encumber or 0
@@ -237,6 +240,16 @@ function _M:getDisplayColor()
end
end
+function _M:resolveSource()
+ if self.summoner_gain_exp and self.summoner then
+ return self.summoner:resolveSource()
+ elseif self.summoner_gain_exp and self.src then
+ return self.src:resolveSource()
+ else
+ return self
+ end
+end
+
--- Gets the full name of the object
function _M:getName(t)
t = t or {}
@@ -256,6 +269,10 @@ function _M:getName(t)
end)
end
+ if not t.no_add_name and self.__tagged then
+ name = name .. " #ORANGE#="..self.__tagged.."=#LAST#"
+ end
+
if not t.do_color then
if qty == 1 or t.no_count then return name
else return qty.." "..name
@@ -298,6 +315,28 @@ function _M:getShortName(t)
end
end
+function _M:descAccuracyBonus(desc, weapon)
+ local _, kind = game.player:isAccuracyEffect(weapon)
+ if not kind then return end
+
+ local showpct = function(v, mult)
+ return ("+%0.1f%%"):format(v * mult)
+ end
+
+ local m = weapon.accuracy_effect_scale or 1
+ if kind == "sword" then
+ desc:add("Accuracy bonus: ", {"color","LIGHT_GREEN"}, showpct(0.4, m), {"color","LAST"}, " crit.pwr / acc", true)
+ elseif kind == "axe" then
+ desc:add("Accuracy bonus: ", {"color","LIGHT_GREEN"}, showpct(0.2, m), {"color","LAST"}, " crit / acc", true)
+ elseif kind == "mace" then
+ desc:add("Accuracy bonus: ", {"color","LIGHT_GREEN"}, showpct(0.1, m), {"color","LAST"}, " dam / acc", true)
+ elseif kind == "staff" then
+ desc:add("Accuracy bonus: ", {"color","LIGHT_GREEN"}, showpct(4, m), {"color","LAST"}, " procs dam / acc", true)
+ elseif kind == "knife" then
+ desc:add("Accuracy bonus: ", {"color","LIGHT_GREEN"}, showpct(0.5, m), {"color","LAST"}, " APR / acc", true)
+ end
+end
+
--- Gets the full textual desc of the object without the name and requirements
function _M:getTextualDesc(compare_with)
compare_with = compare_with or {}
@@ -479,6 +518,8 @@ function _M:getTextualDesc(compare_with)
if t and t.name then desc:add("Mastery: ", {"color","GOLD"}, t.name, {"color","LAST"}, true) end
end
+ self:descAccuracyBonus(desc, combat)
+
if combat.wil_attack then
desc:add("Accuracy is based on willpower for this weapon.", true)
end
diff --git a/game/modules/tome/class/Party.lua b/game/modules/tome/class/Party.lua
index e8d8adb38476c9692cfed57c3b47ce6a96277666..bdae458c801120684f0f5e3384b60c684fd34ab9 100644
--- a/game/modules/tome/class/Party.lua
+++ b/game/modules/tome/class/Party.lua
@@ -354,7 +354,7 @@ function _M:giveOrder(actor, order)
local x, y, act = game.player:getTarget({type="hit", range=10})
if act then
actor:setTarget(act)
- game.logPlayer(game.player, "%s targets %s.", actor.name:capitalize(), act.name)
+ game.player:logCombat(act, "%s targets #Target#.", actor.name:capitalize())
end
end)
local ok, err = coroutine.resume(co)
@@ -431,3 +431,4 @@ function _M:findInAllPartyInventoriesBy(prop, value)
if o then return mem, o, item, inven_id end
end
end
+_M.findInAllInventoriesBy = _M.findInAllPartyInventoriesBy
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 82a10eeec4360fb122e27fa4b25b75116ca5c321..cacf9364f9e785fa9c7a707aa1e9d1364ab3f5c0 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -734,29 +734,43 @@ function _M:automaticTalents()
if self.no_automatic_talents then return end
self:attr("_forbid_sounds", 1)
+ local uses = {}
for tid, c in pairs(self.talents_auto) do
local t = self.talents_def[tid]
local spotted = spotHostiles(self)
if (t.mode ~= "sustained" or not self.sustain_talents[tid]) and not self.talents_cd[tid] and self:preUseTalent(t, true, true) and (not t.auto_use_check or t.auto_use_check(self, t)) then
if (c == 1) or (c == 2 and #spotted <= 0) or (c == 3 and #spotted > 0) then
if c ~= 2 then
- self:useTalent(tid)
+ uses[#uses+1] = {name=t.name, no_energy=t.no_energy == true and 0 or 1, cd=self:getTalentCooldown(t) or 0, fct=function() self:useTalent(tid) end}
else
if not self:attr("blind") then
- self:useTalent(tid,nil,nil,nil,self)
+ uses[#uses+1] = {name=t.name, no_energy=t.no_energy == true and 0 or 1, cd=self:getTalentCooldown(t) or 0, fct=function() self:useTalent(tid,nil,nil,nil,self) end}
end
end
end
if c == 4 and #spotted > 0 then
for fid, foe in pairs(spotted) do
if foe.x >= self.x-1 and foe.x <= self.x+1 and foe.y >= self.y-1 and foe.y <= self.y+1 then
- self:useTalent(tid)
- break
+ uses[#uses+1] = {name=t.name, no_energy=t.no_energy == true and 0 or 1, cd=self:getTalentCooldown(t) or 0, fct=function() self:useTalent(tid) end}
end
end
end
end
end
+ table.sort(uses, function(a, b)
+ if a.no_energy < b.no_energy then return true
+ elseif a.no_energy > b.no_energy then return false
+ else
+ if a.cd > b.cd then return true
+ else return false
+ end
+ end
+ end)
+ table.print(uses)
+ for _, use in ipairs(uses) do
+ use.fct()
+ if use.no_energy == 1 then break end
+ end
self:attr("_forbid_sounds", -1)
end
@@ -1035,7 +1049,12 @@ function _M:doDrop(inven, item, on_done, nb)
local o = self:getInven(inven) and self:getInven(inven)[item]
if o and o.plot then
- game.logPlayer(self, "You can not drop %s.", o:getName{do_colour=true})
+ game.logPlayer(self, "You can not drop %s (plot item).", o:getName{do_colour=true})
+ return
+ end
+
+ if o and o.__tagged then
+ game.logPlayer(self, "You can not drop %s (tagged).", o:getName{do_colour=true})
return
end
@@ -1055,7 +1074,7 @@ function _M:doDrop(inven, item, on_done, nb)
game.logPlayer(self, "You can not destroy %s.", o:getName{do_colour=true})
end
end
- end, "Cancel", "Destroy")
+ end, "Cancel", "Destroy", true)
return
end
if nb == nil or nb >= self:getInven(inven)[item]:getNumber() then
@@ -1409,7 +1428,7 @@ function _M:useOrbPortal(portal)
local spotted = spotHostiles(self)
if #spotted > 0 then
local dir = game.level.map:compassDirection(spotted[1].x - self.x, spotted[1].y - self.y)
- game.logPlayer(self, "You can not use the Orb with foes in sight (%s to the %s%s)", spotted[1].actor.name, dir, game.level.map:isOnScreen(spotted[1].x, spotted[1].y) and "" or " - offscreen")
+ self:logCombat(spotted[1].actor, "You can not use the Orb with foes watching (#Target# to the %s%s)",dir, game.level.map:isOnScreen(spotted[1].x, spotted[1].y) and "" or " - offscreen")
return
end
if portal.on_preuse then portal:on_preuse(self) end
diff --git a/game/modules/tome/class/Projectile.lua b/game/modules/tome/class/Projectile.lua
index 419dba34bfba1bc378136c559d0e6bacef6ee8ee..a52c91a259bda5d689e2062a9a40fc7b31d53fd0 100644
--- a/game/modules/tome/class/Projectile.lua
+++ b/game/modules/tome/class/Projectile.lua
@@ -19,9 +19,12 @@
require "engine.class"
require "engine.Projectile"
+local Combat = require "mod.class.interface.Combat"
module(..., package.seeall, class.inherit(engine.Projectile))
+_M.logCombat = Combat.logCombat
+
function _M:init(t, no_default)
engine.Projectile.init(self, t, no_default)
end
@@ -68,3 +71,21 @@ function _M:tooltip(x, y)
end
return tstr
end
+
+function _M:resolveSource()
+ if self.src then
+ return self.src:resolveSource()
+ else
+ return self
+ end
+end
+
+--gets the full name of the projectile
+function _M:getName()
+ local name = self.name or "projectile"
+ if self.src and self.src.name then
+ return self.src.name:capitalize().."'s "..name
+ else
+ return name
+ end
+end
diff --git a/game/modules/tome/class/Trap.lua b/game/modules/tome/class/Trap.lua
index 64c798da3046388b5461fe8e684b2eae7fe4aa8a..757f00a2c3381358c8669433bf5cac974ff2fd34 100644
--- a/game/modules/tome/class/Trap.lua
+++ b/game/modules/tome/class/Trap.lua
@@ -21,12 +21,14 @@ require "engine.class"
require "engine.Trap"
require "engine.interface.ActorProject"
require "engine.interface.ObjectIdentify"
+require "mod.class.interface.Combat"
local Faction = require "engine.Faction"
module(..., package.seeall, class.inherit(
engine.Trap,
engine.interface.ObjectIdentify,
- engine.interface.ActorProject
+ engine.interface.ActorProject,
+ mod.class.interface.Combat
))
_M.projectile_class = "mod.class.Projectile"
@@ -47,14 +49,26 @@ function _M:combatSpellpower() return mod.class.interface.Combat:rescaleCombatSt
function _M:combatMindpower() return mod.class.interface.Combat:rescaleCombatStats(self.wil) end
function _M:combatAttack() return mod.class.interface.Combat:rescaleCombatStats(self.dex) end
---- Gets the full name of the object
+function _M:resolveSource()
+ if self.summoner_gain_exp and self.summoner then
+ return self.summoner:resolveSource()
+ else
+ return self
+ end
+end
+
+-- Gets the full name of the trap
function _M:getName()
- local name = self.name
+ local name = self.name or "trap"
if not self:isIdentified() and self:getUnidentifiedName() then name = self:getUnidentifiedName() end
- return name
+ if self.summoner and self.summoner.name then
+ return self.summoner.name:capitalize().."'s "..name
+ else
+ return name
+ end
end
---- Returns a tooltip for the trap
+-- Returns a tooltip for the trap
function _M:tooltip()
if self:knownBy(game.player) then
local res = tstring{{"uid", self.uid}, self:getName()}
@@ -121,18 +135,9 @@ end
--- Trigger the trap
function _M:trigger(x, y, who)
engine.Trap.trigger(self, x, y, who)
-
if who.runStop then who:runStop("trap") end
end
-function _M:resolveSource()
- if self.summoner_gain_exp and self.summoner then
- return self.summoner:resolveSource()
- else
- return self
- end
-end
-
--- Identify the trap
function _M:identify(id)
self.identified = id
diff --git a/game/modules/tome/class/World.lua b/game/modules/tome/class/World.lua
index a28fc511d5c06e3dc019ca8955ddadfe152d86ab..8c5705c71ea5436d3aba700164e900fb364aed95 100644
--- a/game/modules/tome/class/World.lua
+++ b/game/modules/tome/class/World.lua
@@ -55,8 +55,12 @@ function _M:gainAchievement(id, src, ...)
if game.difficulty == game.DIFFICULTY_EASY and not a.tutorial then return end
if game.permadeath == game.PERMADEATH_INFINITE then id = "EXPLORATION_"..id end
+ if game.difficulty == game.DIFFICULTY_NORMAL and game.permadeath == game.PERMADEATH_ONE then id = "NORMAL_ROGUELIKE_"..id end
+ if game.difficulty == game.DIFFICULTY_NIGHTMARE and game.permadeath == game.PERMADEATH_MANY then id = "NIGHTMARE_ADVENTURE_".. id end
if game.difficulty == game.DIFFICULTY_NIGHTMARE and game.permadeath == game.PERMADEATH_ONE then id = "NIGHTMARE_"..id end
+ if game.difficulty == game.DIFFICULTY_INSANE and game.permadeath == game.PERMADEATH_MANY then id = "INSANE_ADVENTURE_"..id end
if game.difficulty == game.DIFFICULTY_INSANE and game.permadeath == game.PERMADEATH_ONE then id = "INSANE_"..id end
+ if game.difficulty == game.DIFFICULTY_MADNESS and game.permadeath == game.PERMADEATH_MANY then id = "MADNESS_ADVENTURE_"..id end
if game.difficulty == game.DIFFICULTY_MADNESS and game.permadeath == game.PERMADEATH_ONE then id = "MADNESS_"..id end
local knew = self.achieved[id]
diff --git a/game/modules/tome/class/WorldNPC.lua b/game/modules/tome/class/WorldNPC.lua
index 5d532df1ea516792a22b71e71c03ff6293fefcbc..3a4c7df7668bb63df8e01fc40eb5b9f1e411f690 100644
--- a/game/modules/tome/class/WorldNPC.lua
+++ b/game/modules/tome/class/WorldNPC.lua
@@ -152,7 +152,7 @@ end
function _M:takePowerHit(val, src)
self.unit_power = (self.unit_power or 0) - val
if self.unit_power <= 0 then
- game.logSeen(self, "%s kills %s.", src.name:capitalize(), self.name)
+ self.logCombat(src, self, "#Source# kills #Target#.")
self:die(src)
end
end
@@ -174,11 +174,11 @@ function _M:encounterAttack(target, x, y)
end
if self.unit_power <= 0 then
- game.logSeen(self, "%s kills %s.", target.name:capitalize(), self.name)
+ self:logCombat(target, "#Target# kills #Source#.")
self:die(target)
end
if target.unit_power <= 0 then
- game.logSeen(target, "%s kills %s.", self.name:capitalize(), target.name)
+ self:logCombat(target, "#Source# kills #Target#.")
target:die(src)
end
end
diff --git a/game/modules/tome/class/interface/ActorInscriptions.lua b/game/modules/tome/class/interface/ActorInscriptions.lua
index 4f68a5d4ad31badce6066022485ad5d97982a827..3b81af2978b8dc538046c537bf0dd113d032f83d 100644
--- a/game/modules/tome/class/interface/ActorInscriptions.lua
+++ b/game/modules/tome/class/interface/ActorInscriptions.lua
@@ -67,7 +67,7 @@ function _M:setInscription(id, name, data, cooldown, vocal, src, bypass_max_same
end
if not id then
if vocal then
- game.logPlayer(self, "You are have no more inscription slots.")
+ game.logPlayer(self, "You have no more inscription slots.")
end
-- Replace chat
if self.player and src then
diff --git a/game/modules/tome/class/interface/Archery.lua b/game/modules/tome/class/interface/Archery.lua
index 5b8927e3884fc3d199aec4ee670801bff4d5b24d..4b8d23b094df3c728ab5a8234eb12678d45454ff 100644
--- a/game/modules/tome/class/interface/Archery.lua
+++ b/game/modules/tome/class/interface/Archery.lua
@@ -221,7 +221,11 @@ local function archery_projectile(tx, ty, tg, self, tmp)
dam = dam * mult
print("[ATTACK ARCHERY] after mult", dam)
-
+ if self:isAccuracyEffect(ammo, "mace") then
+ local bonus = 1 + self:getAccuracyEffect(ammo, atk, def, 0.001, 0.1)
+ print("[ATTACK] mace accuracy bonus", atk, def, "=", bonus)
+ dam = dam * bonus
+ end
local hd = {"Combat:archeryDamage", hitted=hitted, target=target, weapon=weapon, ammo=ammo, damtype=damtype, mult=1, dam=dam}
if self:triggerHook(hd) then
@@ -229,7 +233,7 @@ local function archery_projectile(tx, ty, tg, self, tmp)
end
print("[ATTACK ARCHERY] after hook", dam)
- if crit then game.logSeen(self, "#{bold}#%s performs a critical strike!#{normal}#", self.name:capitalize()) end
+ if crit then self:logCombat(target, "#{bold}##Source# performs a ranged critical strike against #Target#!#{normal}#") end
-- Damage conversion?
-- Reduces base damage but converts it into another damage type
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index 703263f18b392769cdab791540565b4d554332f3..8ea1ce96d98f142098730f96a9aaa87554beff9a 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -112,7 +112,7 @@ function _M:attackTarget(target, damtype, mult, noenergy, force_unharmed)
if self:isTalentActive(self.T_STEALTH) and target:canSee(self) then
self:useTalent(self.T_STEALTH)
self.changed = true
- game.logPlayer(self, "%s notices you at the last moment!", target.name:capitalize())
+ if self.player then self:logCombat(target, "#Target# notices you at the last moment!") end
end
if target:isTalentActive(target.T_INTUITIVE_SHOTS) and rng.percent(target:callTalent(target.T_INTUITIVE_SHOTS, "getChance")) then
@@ -324,6 +324,18 @@ function _M:checkEvasion(target)
return rng.percent(evasion)
end
+function _M:getAccuracyEffect(weapon, atk, def, scale, max)
+ max = max or 10000000
+ scale = scale or 1
+ return math.min(max, math.max(0, atk - def) * scale * (weapon.accuracy_effect_scale or 1))
+end
+
+function _M:isAccuracyEffect(weapon, kind)
+ if not weapon then return false, "none" end
+ local eff = weapon.accuracy_effect or weapon.talented
+ return eff == kind, eff
+end
+
--- Attacks with one weapon
function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
damtype = damtype or (weapon and weapon.damtype) or DamageType.PHYSICAL
@@ -377,26 +389,37 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
local crit = false
local evaded = false
if repelled then
- game.logSeen(target, "%s repels an attack from %s.", target.name:capitalize(), self.name)
+ self:logCombat(target, "#Target# repels an attack from #Source#.")
elseif self:checkEvasion(target) then
evaded = true
- game.logSeen(target, "%s evades %s.", target.name:capitalize(), self.name)
+ self:logCombat(target, "#Target# evades #Source#.")
elseif self:checkHit(atk, def) and (self:canSee(target) or self:attr("blind_fight") or rng.chance(3)) then
local pres = util.bound(target:combatArmorHardiness() / 100, 0, 1)
if target.knowTalent and target:hasEffect(target.EFF_DUAL_WEAPON_DEFENSE) then
- local deflect = math.max(dam, target:callTalent(target.T_DUAL_WEAPON_DEFENSE, "doDeflect"))
+ local deflect = math.min(dam, target:callTalent(target.T_DUAL_WEAPON_DEFENSE, "doDeflect"))
if deflect > 0 then
- game.logSeen(target, "%s parries %d damage from %s's attack.", target.name:capitalize(), deflect, self.name:capitalize())
+-- self:logCombat(target, "#Target# parries %d damage from #Source#'s attack.", deflect)
+ game:delayedLogDamage(self, target, 0, ("%s(%d parried#LAST#)"):format(DamageType:get(damtype).text_color or "#aaaaaa#", deflect), false)
dam = math.max(dam - deflect,0)
print("[ATTACK] after DUAL_WEAPON_DEFENSE", dam)
end
end
- if target.knowTalent and target:hasEffect(target.EFF_GESTURE_OF_GUARDING) then
- local deflected = math.min(dam, target:callTalent(target.T_GESTURE_OF_GUARDING, "doGuard"))
- game.logSeen(target, "%s dismisses %d damage from %s's attack with a sweeping gesture.", target.name:capitalize(), deflected, self.name:capitalize())
- dam = dam - deflected
+ if target.knowTalent and target:hasEffect(target.EFF_GESTURE_OF_GUARDING) and not target:attr("encased_in_ice") then
+ local deflected = math.min(dam, target:callTalent(target.T_GESTURE_OF_GUARDING, "doGuard")) or 0
+-- if deflected > 0 then self:logCombat(target, "#Target# dismisses %d damage from #Source#'s attack with a sweeping gesture.", deflected) end
+ if deflected > 0 then
+ game:delayedLogDamage(self, target, 0, ("%s(%d gestured#LAST#)"):format(DamageType:get(damtype).text_color or "#aaaaaa#", deflected), false)
+ dam = dam - deflected
+ end
print("[ATTACK] after GESTURE_OF_GUARDING", dam)
end
+
+ if self:isAccuracyEffect(weapon, "knife") then
+ local bonus = 1 + self:getAccuracyEffect(weapon, atk, def, 0.005, 0.25)
+ print("[ATTACJ] dagger accuracy bonus", atk, def, "=", bonus, "previous", apr)
+ apr = apr * bonus
+ end
+
print("[ATTACK] raw dam", dam, "versus", armor, pres, "with APR", apr)
armor = math.max(0, armor - apr)
dam = math.max(dam * pres - armor, 0) + (dam * (1 - pres))
@@ -409,6 +432,12 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
dam = dam * mult
print("[ATTACK] after mult", dam)
+ if self:isAccuracyEffect(weapon, "mace") then
+ local bonus = 1 + self:getAccuracyEffect(weapon, atk, def, 0.001, 0.1)
+ print("[ATTACK] mace accuracy bonus", atk, def, "=", bonus)
+ dam = dam * bonus
+ end
+
if target:hasEffect(target.EFF_COUNTERSTRIKE) then
dam = dam * 2
local eff = target.tmp[target.EFF_COUNTERSTRIKE]
@@ -424,7 +453,7 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
print("[ATTACK] after inc by type", dam)
end
- if crit then game.logSeen(self, "#{bold}#%s performs a critical strike!#{normal}#", self.name:capitalize()) end
+ if crit then self:logCombat(target, "#{bold}##Source# performs a melee critical strike against #Target#!#{normal}#") end
-- Phasing, percent of weapon damage bypasses shields
-- It's done like this because onTakeHit has no knowledge of the weapon
@@ -474,9 +503,7 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
hitted = true
else
- local srcname = game.level.map.seens(self.x, self.y) and self.name:capitalize() or "Something"
- game.logSeen(target, "%s misses %s.", srcname, target.name)
-
+ self:logCombat(target, "#Source# misses #Target#.")
target:fireTalentCheck("callbackOnMeleeMiss", self)
end
@@ -495,6 +522,13 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
target:setEffect(target.EFF_OFFGUARD, tier_diff, {}, reapplied)
end
]]
+
+ if self:isAccuracyEffect(weapon, "staff") then
+ local bonus = 1 + self:getAccuracyEffect(weapon, atk, def, 0.04, 2)
+ print("[ATTACK] staff accuracy bonus", atk, def, "=", bonus)
+ self.__global_accuracy_damage_bonus = bonus
+ end
+
-- handle stalk targeting for hits (also handled in Actor for turn end effects)
if hitted and target ~= self then
if effStalker then
@@ -888,23 +922,24 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
if hitted then game.level.map:particleEmitter(target.x, target.y, 1, "melee_attack", {color=target.blood_color}) end
self.turn_procs.weapon_type = nil
+ self.__global_accuracy_damage_bonus = nil
return self:combatSpeed(weapon), hitted
end
_M.weapon_talents = {
- sword = Talents.T_WEAPONS_MASTERY,
- axe = Talents.T_WEAPONS_MASTERY,
- mace = Talents.T_WEAPONS_MASTERY,
- knife = Talents.T_KNIFE_MASTERY,
- whip = Talents.T_EXOTIC_WEAPONS_MASTERY,
- trident = Talents.T_EXOTIC_WEAPONS_MASTERY,
- bow = Talents.T_BOW_MASTERY,
- sling = Talents.T_SLING_MASTERY,
- staff = Talents.T_STAFF_MASTERY,
- mindstar =Talents.T_PSIBLADES,
- dream = Talents.T_DREAM_CRUSHER,
- unarmed = Talents.T_UNARMED_MASTERY,
+ sword = "T_WEAPONS_MASTERY",
+ axe = "T_WEAPONS_MASTERY",
+ mace = "T_WEAPONS_MASTERY",
+ knife = "T_KNIFE_MASTERY",
+ whip = "T_EXOTIC_WEAPONS_MASTERY",
+ trident = "T_EXOTIC_WEAPONS_MASTERY",
+ bow = "T_BOW_MASTERY",
+ sling = "T_SLING_MASTERY",
+ staff = "T_STAFF_MASTERY",
+ mindstar ="T_PSIBLADES",
+ dream = "T_DREAM_CRUSHER",
+ unarmed = "T_UNARMED_MASTERY",
}
--- Static!
@@ -961,26 +996,28 @@ end
--- Fake denotes a check not actually being made, used by character sheets etc.
function _M:combatDefenseBase(fake)
local add = 0
- if self:hasDualWeapon() and self:knowTalent(self.T_DUAL_WEAPON_DEFENSE) then
- add = add + self:callTalent(self.T_DUAL_WEAPON_DEFENSE,"getDefense")
- end
- if not fake then
- add = add + (self:checkOnDefenseCall("defense") or 0)
- end
- if self:knowTalent(self.T_TACTICAL_EXPERT) then
- local t = self:getTalentFromId(self.T_TACTICAL_EXPERT)
- add = add + t.do_tact_update(self, t)
- end
- if self:knowTalent(self.T_CORRUPTED_SHELL) then
- add = add + self:getCon() / 3
- end
- if self:knowTalent(self.T_STEADY_MIND) then
- local t = self:getTalentFromId(self.T_STEADY_MIND)
- add = add + t.getDefense(self, t)
- end
- if self:isTalentActive(Talents.T_SURGE) then
- local t = self:getTalentFromId(self.T_SURGE)
- add = add + t.getDefenseChange(self, t)
+ if not self:attr("encased_in_ice") then
+ if self:hasDualWeapon() and self:knowTalent(self.T_DUAL_WEAPON_DEFENSE) then
+ add = add + self:callTalent(self.T_DUAL_WEAPON_DEFENSE,"getDefense")
+ end
+ if not fake then
+ add = add + (self:checkOnDefenseCall("defense") or 0)
+ end
+ if self:knowTalent(self.T_TACTICAL_EXPERT) then
+ local t = self:getTalentFromId(self.T_TACTICAL_EXPERT)
+ add = add + t.do_tact_update(self, t)
+ end
+ if self:knowTalent(self.T_CORRUPTED_SHELL) then
+ add = add + self:getCon() / 3
+ end
+ if self:knowTalent(self.T_STEADY_MIND) then
+ local t = self:getTalentFromId(self.T_STEADY_MIND)
+ add = add + t.getDefense(self, t)
+ end
+ if self:isTalentActive(Talents.T_SURGE) then
+ local t = self:getTalentFromId(self.T_SURGE)
+ add = add + t.getDefenseChange(self, t)
+ end
end
local d = math.max(0, self.combat_def + (self:getDex() - 10) * 0.35 + (self:getLck() - 50) * 0.4)
local mult = 1
@@ -1547,6 +1584,12 @@ function _M:physicalCrit(dam, weapon, target, atk, def, add_chance, crit_power_a
crit_power_add = crit_power_add + self:callTalent(self.T_SHADOWSTRIKE,"getMultiplier")
end
+ if self:isAccuracyEffect(weapon, "axe") then
+ local bonus = self:getAccuracyEffect(weapon, atk, def, 0.2, 10)
+ print("[PHYS CRIT %] axe accuracy bonus", atk, def, "=", bonus)
+ chance = chance + bonus
+ end
+
chance = util.bound(chance, 0, 100)
print("[PHYS CRIT %]", chance)
@@ -1554,6 +1597,13 @@ function _M:physicalCrit(dam, weapon, target, atk, def, add_chance, crit_power_a
if target:hasEffect(target.EFF_OFFGUARD) then
crit_power_add = crit_power_add + 0.1
end
+
+ if self:isAccuracyEffect(weapon, "sword") then
+ local bonus = self:getAccuracyEffect(weapon, atk, def, 0.004, 0.25)
+ print("[PHYS CRIT %] sword accuracy bonus", atk, def, "=", bonus)
+ crit_power_add = crit_power_add + bonus
+ end
+
self.turn_procs.is_crit = "physical"
self.turn_procs.crit_power = (1.5 + crit_power_add + (self.combat_critical_power or 0) / 100)
dam = dam * (1.5 + crit_power_add + (self.combat_critical_power or 0) / 100)
@@ -2142,7 +2192,7 @@ end
function _M:grappleSizeCheck(target)
size = target.size_category - self.size_category
if size > 1 then
- game.logSeen(target, "%s fails because %s is too big!", self.name:capitalize(), target.name:capitalize())
+ self:logCombat(target, "#Source#'s grapple fails because #Target# is too big!")
return true
else
return false
@@ -2179,3 +2229,11 @@ function _M:startGrapple(target)
end
end
+-- Display Combat log messages, highlighting the player and taking LOS and visibility into account
+-- #source#|#Source# -> <displayString> self.name|self.name:capitalize()
+-- #target#|#Target# -> target.name|target.name:capitalize()
+function _M:logCombat(target, style, ...)
+ if not game.uiset or not game.uiset.logdisplay then return end
+ local visible, srcSeen, tgtSeen = game:logVisible(self, target) -- should a message be displayed?
+ if visible then game.uiset.logdisplay(game:logMessage(self, srcSeen, target, tgtSeen, style, ...)) end
+end
diff --git a/game/modules/tome/class/interface/WorldAchievements.lua b/game/modules/tome/class/interface/WorldAchievements.lua
index 28f4ebc3159572cdbb6f9cc4005e44384506a3ba..ef1506ae10c80188e555b115b69c13de6e402bd8 100644
--- a/game/modules/tome/class/interface/WorldAchievements.lua
+++ b/game/modules/tome/class/interface/WorldAchievements.lua
@@ -23,6 +23,17 @@ local WA = require "engine.interface.WorldAchievements"
--- Handles achievements in a world
module(..., package.seeall, class.inherit(class.make{}, WA))
+-- Duplicate from Game.lua because Game.lua is not loaded yet
+local DIFFICULTY_EASY = 1
+local DIFFICULTY_NORMAL = 2
+local DIFFICULTY_NIGHTMARE = 3
+local DIFFICULTY_INSANE = 4
+local DIFFICULTY_MADNESS = 5
+local PERMADEATH_INFINITE = 1
+local PERMADEATH_MANY = 2
+local PERMADEATH_ONE = 3
+
+
--- Make a new achievement with a name and desc
function _M:newAchievement(t)
t.id = t.id or t.name
@@ -31,24 +42,64 @@ function _M:newAchievement(t)
WA.newAchievement(self, t)
if not t.no_difficulty_duplicate then
+ -- Normal
+ local t2 = table.clone(t)
+ t2.id = "NORMAL_ROGUELIKE_"..t2.id
+ t2.name = t2.name.." (Roguelike)"
+ t2.difficulty = DIFFICULTY_NORMAL
+ t2.permadeath = PERMADEATH_ONE
+ WA.newAchievement(self, t2)
+
+ -- Exploration
local t2 = table.clone(t)
t2.id = "EXPLORATION_"..t2.id
t2.name = t2.name.." (Exploration mode)"
+ t2.permadeath = PERMADEATH_INFINITE
+ WA.newAchievement(self, t2)
+
+ -- Nightmare
+ local t2 = table.clone(t)
+ t2.id = "NIGHTMARE_ADVENTURE_"..t2.id
+ t2.name = t2.name.." (Nightmare (Adventure) difficulty)"
+ t2.difficulty = DIFFICULTY_NIGHTMARE
+ t2.permadeath = PERMADEATH_MANY
WA.newAchievement(self, t2)
local t2 = table.clone(t)
t2.id = "NIGHTMARE_"..t2.id
- t2.name = t2.name.." (Nightmare difficulty)"
+ t2.name = t2.name.." (Nightmare (Roguelike) difficulty)"
+ t2.difficulty = DIFFICULTY_NIGHTMARE
+ t2.permadeath = PERMADEATH_ONE
+ WA.newAchievement(self, t2)
+
+ -- Insane
+ local t2 = table.clone(t)
+ t2.id = "INSANE_ADVENTURE_"..t2.id
+ t2.name = t2.name.." (Insane (Adventure) difficulty)"
+ t2.difficulty = DIFFICULTY_INSANE
+ t2.permadeath = PERMADEATH_MANY
WA.newAchievement(self, t2)
local t2 = table.clone(t)
t2.id = "INSANE_"..t2.id
- t2.name = t2.name.." (Insane difficulty)"
+ t2.name = t2.name.." (Insane (Roguelike) difficulty)"
+ t2.difficulty = DIFFICULTY_INSANE
+ t2.permadeath = PERMADEATH_ONE
+ WA.newAchievement(self, t2)
+
+ -- Madness
+ local t2 = table.clone(t)
+ t2.id = "MADNESS_ADVENTURE_"..t2.id
+ t2.name = t2.name.." (Madness (Adventure) difficulty)"
+ t2.difficulty = DIFFICULTY_MADNESS
+ t2.permadeath = PERMADEATH_MANY
WA.newAchievement(self, t2)
local t2 = table.clone(t)
t2.id = "MADNESS_"..t2.id
- t2.name = t2.name.." (Madness difficulty)"
+ t2.name = t2.name.." (Madness (Roguelike) difficulty)"
+ t2.difficulty = DIFFICULTY_MADNESS
+ t2.permadeath = PERMADEATH_ONE
WA.newAchievement(self, t2)
end
end
diff --git a/game/modules/tome/class/uiset/Classic.lua b/game/modules/tome/class/uiset/Classic.lua
index 9760e4164a167495cad3ace1a881d4a2a8cd110f..5d0e0c37183f947202c589f78f3c17c523f317ac 100644
--- a/game/modules/tome/class/uiset/Classic.lua
+++ b/game/modules/tome/class/uiset/Classic.lua
@@ -90,7 +90,7 @@ function _M:activate()
game.uiset.logdisplay(...) else game.uiset.logdisplay(style, ...) end
if game.uiset.show_userchat then game.uiset.logdisplay.changed = old end
end
- game.logSeen = function(e, style, ...) if e and e.x and e.y and game.level.map.seens(e.x, e.y) then game.log(style, ...) end end
+-- game.logSeen = function(e, style, ...) if e and e.player or (not e.dead and e.x and e.y and game.level and game.level.map.seens(e.x, e.y) and game.player:canSee(e)) then game.log(style, ...) end end
game.logPlayer = function(e, style, ...) if e == game.player or e == game.party then game.log(style, ...) end end
end
diff --git a/game/modules/tome/class/uiset/Minimalist.lua b/game/modules/tome/class/uiset/Minimalist.lua
index f663f8282c4e65772c0dc91e547b9b0bd36ab001..133a08337760b262d759b329058afd774623502f 100644
--- a/game/modules/tome/class/uiset/Minimalist.lua
+++ b/game/modules/tome/class/uiset/Minimalist.lua
@@ -144,6 +144,7 @@ local portrait_unsel = {core.display.loadImage("/data/gfx/ui/party-portrait-unse
local portrait_lev = {core.display.loadImage("/data/gfx/ui/party-portrait-lev.png"):glTexture()}
local portrait_unsel_lev = {core.display.loadImage("/data/gfx/ui/party-portrait-unselect-lev.png"):glTexture()}
+local pf_bg_x, pf_bg_y = 0, 0
local pf_bg = {core.display.loadImage("/data/gfx/ui/playerframe/back.png"):glTexture()}
local pf_shadow = {core.display.loadImage("/data/gfx/ui/playerframe/shadow.png"):glTexture()}
local pf_defend = {core.display.loadImage("/data/gfx/ui/playerframe/defend.png"):glTexture()}
@@ -177,6 +178,16 @@ local hk7 = {core.display.loadImage("/data/gfx/ui/hotkeys/hotkey_7.png"):glTextu
local hk8 = {core.display.loadImage("/data/gfx/ui/hotkeys/hotkey_8.png"):glTexture()}
local hk9 = {core.display.loadImage("/data/gfx/ui/hotkeys/hotkey_9.png"):glTexture()}
+_M:triggerHook{"UISet:Minimalist:Load", alterlocal=function(k, v)
+ local i = 1
+ while true do
+ local kk, _ = debug.getlocal(4, i)
+ if not kk then break end
+ if kk == k then debug.setlocal(4, i, v) break end
+ i = i + 1
+ end
+end }
+
function _M:init()
UISet.init(self)
@@ -383,7 +394,7 @@ function _M:activate()
game.uiset.logdisplay(...) else game.uiset.logdisplay(style, ...) end
if game.uiset.show_userchat then game.uiset.logdisplay.changed = old end
end
- game.logSeen = function(e, style, ...) if e and e.x and e.y and game.level and game.level.map.seens(e.x, e.y) then game.log(style, ...) end end
+-- game.logSeen = function(e, style, ...) if e and e.player or (not e.dead and e.x and e.y and game.level and game.level.map.seens(e.x, e.y) and game.player:canSee(e)) then game.log(style, ...) end end
game.logPlayer = function(e, style, ...) if e == game.player or e == game.party then game.log(style, ...) end end
self:boundPlaces()
@@ -1546,7 +1557,7 @@ function _M:displayPlayer(scale, bx, by)
if not game.player then return end
pf_shadow[1]:toScreenFull(0, 0, pf_shadow[6], pf_shadow[7], pf_shadow[2], pf_shadow[3])
- pf_bg[1]:toScreenFull(0, 0, pf_bg[6], pf_bg[7], pf_bg[2], pf_bg[3])
+ pf_bg[1]:toScreenFull(pf_bg_x, pf_bg_y, pf_bg[6], pf_bg[7], pf_bg[2], pf_bg[3])
player:toScreen(nil, 22, 22, 40, 40)
if (not config.settings.tome.actor_based_movement_mode and self or player).bump_attack_disabled then
diff --git a/game/modules/tome/data/birth/classes/adventurer.lua b/game/modules/tome/data/birth/classes/adventurer.lua
index 94ce4c9d3406df421668e8cff93d4d47d0721f73..abd43ef9b52ca599f655be129ba08692940f36ef 100644
--- a/game/modules/tome/data/birth/classes/adventurer.lua
+++ b/game/modules/tome/data/birth/classes/adventurer.lua
@@ -94,6 +94,8 @@ newBirthDescriptor{
{type="weapon", subtype="staff", name="elm staff", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
+ {type="armor", subtype="hands", name="iron gauntlets", autoreq=true, ego_chance=-1000, ego_chance=-1000},
+ {type="armor", subtype="hands", name="rough leather gloves", ego_chance=-1000, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", ego_chance=-1000, ego_chance=-1000},
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000},
{type="scroll", subtype="rune", name="manasurge rune", ego_chance=-1000, ego_chance=-1000},
diff --git a/game/modules/tome/data/birth/classes/warrior.lua b/game/modules/tome/data/birth/classes/warrior.lua
index 39c280a3125881a217e0931c38d10360102bbb84..3763dce91b72dab8c63fced7ac98713575e8a086 100644
--- a/game/modules/tome/data/birth/classes/warrior.lua
+++ b/game/modules/tome/data/birth/classes/warrior.lua
@@ -305,12 +305,8 @@ newBirthDescriptor{
[ActorTalents.T_DOUBLE_STRIKE] = 1,
[ActorTalents.T_WEAPON_COMBAT] = 1,
[ActorTalents.T_ARMOUR_TRAINING] = 1,
-
- -- base monk attack
- [ActorTalents.T_EMPTY_HAND] = 1,
},
copy = {
- combat = { physspeed = 0.6, sound = "actions/melee", sound_miss="actions/melee_miss" },
resolvers.equip{ id=true,
{type="armor", subtype="hands", name="iron gauntlets", autoreq=true, ego_chance=-1000, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000, ego_chance=-1000},
diff --git a/game/modules/tome/data/birth/descriptors.lua b/game/modules/tome/data/birth/descriptors.lua
index 88bcc7a948e7aaf8f85cacad1d62c03a1b0ce323..18703b8fa7708330d6f714628858db05e893733e 100644
--- a/game/modules/tome/data/birth/descriptors.lua
+++ b/game/modules/tome/data/birth/descriptors.lua
@@ -78,7 +78,7 @@ newBirthDescriptor{
mana_regen = 0,
max_level = 50,
- money = 10,
+ money = 15,
resolvers.equip{ id=true,
{type="lite", subtype="lite", name="brass lantern", ignore_material_restriction=true, ego_chance=-1000},
},
diff --git a/game/modules/tome/data/chats/alchemist-last-hope.lua b/game/modules/tome/data/chats/alchemist-last-hope.lua
index bd662fdac891ce19e58837964060c9fd69bfa5ec..92122934f2fd8e982e8e710f0198b8d7c42fc058 100644
--- a/game/modules/tome/data/chats/alchemist-last-hope.lua
+++ b/game/modules/tome/data/chats/alchemist-last-hope.lua
@@ -553,7 +553,7 @@ It's strange what death can do to people, how it can take over their minds. Some
game.nicer_tiles:updateAround(game.level, spot.x, spot.y)
game.state:locationRevealAround(spot.x, spot.y)
end)
- game.log("He points the location of the graveyard on your map.")
+ game.log("He points out the location of the graveyard on your map.")
player:grantQuest("grave-necromancer")
end},
}
diff --git a/game/modules/tome/data/chats/shertul-fortress-butler.lua b/game/modules/tome/data/chats/shertul-fortress-butler.lua
index 866ce4a1df0a760de6cfadd4b3958057152df2c2..0a269e4ea711d75cfa4acf7ad14cbe868607d701 100644
--- a/game/modules/tome/data/chats/shertul-fortress-butler.lua
+++ b/game/modules/tome/data/chats/shertul-fortress-butler.lua
@@ -29,7 +29,7 @@ Welcome, master.]],
{"You asked me to come, about a farportal?", jump="farportal", cond=function() return q:isCompleted("farportal") and not q:isCompleted("farportal-spawn") end},
{"You asked me to come, about the rod of recall?", jump="recall", cond=function() return q:isCompleted("recall") and not q:isCompleted("recall-done") end},
{"Would it be possible for my Transmogrification Chest to automatically extract gems?", jump="transmo-gems", cond=function(npc, player) return not q:isCompleted("transmo-chest-extract-gems") and q:isCompleted("transmo-chest") and player:knowTalent(player.T_EXTRACT_GEMS) end},
- {"Is there any training facilities?", jump="training", cond=function() return not q:isCompleted("training") end},
+ {"Are there any training facilities?", jump="training", cond=function() return not q:isCompleted("training") end},
{"I find your appearance unsettling. Any way you can change it?", jump="changetile", cond=function() return q:isCompleted("recall-done") end},
{"What are you, and what is this place?", jump="what", cond=isNotSet"what", action=set"what"},
{"Master? I am not your mas...", jump="master", cond=isNotSet"master", action=set"master"},
diff --git a/game/modules/tome/data/chats/shertul-fortress-caldizar.lua b/game/modules/tome/data/chats/shertul-fortress-caldizar.lua
index 1ba5d3905cfab067b7471617ed49bce8b094b23f..6f8c9b10e4164defb083911559f34cad49ebd5e5 100644
--- a/game/modules/tome/data/chats/shertul-fortress-caldizar.lua
+++ b/game/modules/tome/data/chats/shertul-fortress-caldizar.lua
@@ -18,9 +18,9 @@
-- darkgod@te4.org
local has_staff = false
-local o, item, inven_id = player:findInAllInventoriesBy("define_as", "STAFF_ABSORPTION")
+local carry, o, item, inven_id = game.party:findInAllInventoriesBy("define_as", "STAFF_ABSORPTION")
if o then has_staff = true end
-local o, item, inven_id = player:findInAllInventoriesBy("define_as", "STAFF_ABSORPTION_AWAKENED")
+local carry, o, item, inven_id = game.party:findInAllInventoriesBy("define_as", "STAFF_ABSORPTION_AWAKENED")
if o then has_staff = true end
local speak
diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua
index 0f9b85d5f9fdc0551e9b77b3668b84c4960ab3aa..1cd1458b6b7849d68d5fe7d0d7e61ccafee79ff5 100644
--- a/game/modules/tome/data/damage_types.lua
+++ b/game/modules/tome/data/damage_types.lua
@@ -81,6 +81,11 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
end
print("[PROJECTOR] after difficulty dam", dam)
+ if src.__global_accuracy_damage_bonus then
+ dam = dam * src.__global_accuracy_damage_bonus
+ print("[PROJECTOR] after staff accuracy damage bonus", dam)
+ end
+
-- Daze
if src:attr("dazed") then
dam = dam * 0.5
@@ -92,20 +97,26 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
t.on_damage(target, t, type)
end
+ local lastdam = dam
-- Item-granted damage ward talent
if target:hasEffect(target.EFF_WARD) then
local e = target.tempeffect_def[target.EFF_WARD]
dam = e.absorb(type, dam, target.tmp[target.EFF_WARD], target, src)
+ game:delayedLogDamage(src, target, 0, ("%s(%d warded)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", lastdam-dam), false)
end
-- Block talent from shields
- if target:attr("block") then
+ if dam > 0 and target:attr("block") then
local e = target.tempeffect_def[target.EFF_BLOCKING]
+ lastdam = dam
dam = e.do_block(type, dam, target.tmp[target.EFF_BLOCKING], target, src)
+ if lastdam - dam > 0 then game:delayedLogDamage(src, target, 0, ("%s(%d blocked)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", lastdam-dam), false) end
end
- if target.isTalentActive and target:isTalentActive(target.T_FORGE_SHIELD) then
+ if dam > 0 and target.isTalentActive and target:isTalentActive(target.T_FORGE_SHIELD) then
local t = target:getTalentFromId(target.T_FORGE_SHIELD)
+ lastdam = dam
dam = t.doForgeShield(type, dam, t, target, src)
+ if lastdam - dam > 0 then game:delayedLogDamage(src, target, 0, ("%s(%d blocked)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", lastdam-dam), false) end
end
-- Increases damage
@@ -164,7 +175,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
game:onTickEnd(function() src:removeEffect(src.EFF_FROZEN) end)
eff.begone = game.turn
else
- game:delayedLogDamage(src, {name="Iceblock", x=src.x, y=src.y}, dam, ("%s%d %s#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", math.ceil(dam), DamageType:get(type).name))
+ game:delayedLogDamage(src, eff.ice, dam, ("%s%d %s#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", math.ceil(dam), DamageType:get(type).name))
if eff.begone and eff.begone < game.turn and eff.hp < 0 then
game.logSeen(src, "%s forces the iceblock to shatter.", src.name:capitalize())
src:removeEffect(src.EFF_FROZEN)
@@ -174,14 +185,15 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
end
-- dark vision increases damage done in creeping dark
- if src and game.level.map:checkAllEntities(x, y, "creepingDark") then
+ if src and src ~= target and game.level.map:checkAllEntities(x, y, "creepingDark") then
local dark = game.level.map:checkAllEntities(x, y, "creepingDark")
if dark.summoner == src and dark.damageIncrease > 0 and not dark.projecting then
- game.logPlayer(src, "You strike in the darkness. (+%d damage)", (dam * dark.damageIncrease / 100))
+ local source = src.__project_source or src
dam = dam + (dam * dark.damageIncrease / 100)
+ game:delayedLogMessage(source, target, "dark_strike"..(source.uid or ""), "#Source# strikes #Target# in the darkness (%+d%%%%%%%% damage).", dark.damageIncrease) -- resolve %% 3 levels deep
end
end
-
+ lastdam = dam
-- Static reduce damage for psionic kinetic shield
if target.isTalentActive and target:isTalentActive(target.T_KINETIC_SHIELD) then
local t = target:getTalentFromId(target.T_KINETIC_SHIELD)
@@ -212,15 +224,23 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
local t = target:getTalentFromId(target.T_CHARGED_SHIELD)
dam = t.css_on_damage(target, t, type, dam)
end
-
+ if dam ~= lastdam then
+ game:delayedLogDamage(src, target, 0, ("%s(%d to psi shield)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", lastdam-dam), false)
+ end
+ lastdam = dam
if type ~= DamageType.PHYSICAL and target.knowTalent and target:knowTalent(target.T_STONE_FORTRESS) and target:hasEffect(target.EFF_DWARVEN_RESILIENCE) then
dam = math.max(0, dam - target:combatArmor() * (50 + target:getTalentLevel(target.T_STONE_FORTRESS) * 10) / 100)
end
+ if dam ~= lastdam then
+ game:delayedLogDamage(src, target, 0, ("%s(%d to armor)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", lastdam-dam), false)
+ end
-- Damage Smearing
- if type ~= DamageType.TEMPORAL and target:hasEffect(target.EFF_DAMAGE_SMEARING) then
+ if dam > 0 and type ~= DamageType.TEMPORAL and target:hasEffect(target.EFF_DAMAGE_SMEARING) then
local smear = dam
+ local type = DamageType.TEMPORAL
target:setEffect(target.EFF_SMEARED, 6, {src=src, power=smear/6, no_ct_effect=true})
+ game:delayedLogDamage(src, target, 0, ("%s(%d smeared)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dam), false)
dam = 0
end
@@ -248,7 +268,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
local pen = 0
if src.resists_pen then pen = (src.resists_pen.all or 0) + (src.resists_pen[type] or 0) end
local dominated = target:hasEffect(target.EFF_DOMINATED)
- if dominated and dominated.source == src then pen = pen + (dominated.resistPenetration or 0) end
+ if dominated and dominated.src == src then pen = pen + (dominated.resistPenetration or 0) end
if target:attr("sleep") and src.attr and src:attr("night_terror") then pen = pen + src:attr("night_terror") end
local res = target:combatGetResist(type)
pen = util.bound(pen, 0, 100)
@@ -273,34 +293,28 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
end
-- Static reduce damage
- if target.isTalentActive and target:isTalentActive(target.T_ANTIMAGIC_SHIELD) then
+ if dam > 0 and target.isTalentActive and target:isTalentActive(target.T_ANTIMAGIC_SHIELD) then
local t = target:getTalentFromId(target.T_ANTIMAGIC_SHIELD)
+ lastdam = dam
dam = t.on_damage(target, t, type, dam)
+ if lastdam - dam > 0 then game:delayedLogDamage(src, target, 0, ("%s(%d antimagic)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", lastdam - dam), false) end
end
- if target.isTalentActive and target:isTalentActive(target.T_ENERGY_DECOMPOSITION) then
+ if dam > 0 and target.isTalentActive and target:isTalentActive(target.T_ENERGY_DECOMPOSITION) then
local t = target:getTalentFromId(target.T_ENERGY_DECOMPOSITION)
+ lastdam = dam
dam = t.on_damage(target, t, type, dam)
+ if lastdam - dam > 0 then game:delayedLogDamage(src, target, 0, ("%s(%d dissipated)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", lastdam - dam), false) end
end
-- Flat damage reduction ("armour")
- if target.flat_damage_armor then
+ if dam > 0 and target.flat_damage_armor then
local dec = (target.flat_damage_armor.all or 0) + (target.flat_damage_armor[type] or 0)
+ if dec > 0 then game:delayedLogDamage(src, target, 0, ("%s(%d reduction)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", dec), false) end
dam = math.max(0, dam - dec)
print("[PROJECTOR] after flat damage armor", dam)
end
- -- Flat damage cap
- if target.flat_damage_cap and target.max_life then
- local cap = nil
- if target.flat_damage_cap.all then cap = target.flat_damage_cap.all end
- if target.flat_damage_cap[type] then cap = target.flat_damage_cap[type] end
- if cap and cap > 0 then
- dam = math.max(math.min(dam, cap * target.max_life / 100), 0)
- print("[PROJECTOR] after flat damage cap", dam)
- end
- end
-
-- roll with it damage reduction
if type == DamageType.PHYSICAL and target:knowTalent(target.T_ROLL_WITH_IT) and not target:attr("never_move") then
dam = dam * target:callTalent(target.T_ROLL_WITH_IT, "getMult")
@@ -367,18 +381,23 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
-- Log damage for later
if not DamageType:get(type).hideMessage then
- local srcname = src.x and src.y and game.level.map.seens(src.x, src.y) and src.name:capitalize() or "Something"
- if src.turn_procs and src.turn_procs.is_crit then
- game:delayedLogDamage(src, target, dam, ("#{bold}#%s%d %s#{normal}##LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", math.ceil(dam), DamageType:get(type).name), true)
- else
- game:delayedLogDamage(src, target, dam, ("%s%d %s#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", math.ceil(dam), DamageType:get(type).name), false)
+ local visible, srcSeen, tgtSeen = game:logVisible(src, target)
+ if visible then -- don't log damage that the player doesn't know about
+ local source = src.__project_source or src
+ if src.turn_procs and src.turn_procs.is_crit then
+ game:delayedLogDamage(source, target, dam, ("#{bold}#%s%d %s#{normal}##LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", math.ceil(dam), DamageType:get(type).name), true)
+ else
+ game:delayedLogDamage(source, target, dam, ("%s%d %s#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", math.ceil(dam), DamageType:get(type).name), false)
+ end
end
end
- if src.attr and src:attr("martyrdom") and not no_martyr then
+ if dam > 0 and src.attr and src:attr("martyrdom") and not no_martyr then
+ game:delayedLogMessage(src, target, "martyrdom", "#CRIMSON##Source# damages %s through Martyrdom!", string.his_her_self(src))
DamageType.defaultProjector(target, src.x, src.y, type, dam * src.martyrdom / 100, tmp, true)
end
if target.attr and target:attr("reflect_damage") and not no_martyr and src.x and src.y then
+ game:delayedLogMessage(target, src, "reflect_damage"..(src.uid or ""), "#CRIMSON##Source# reflects damage back to #Target#!")
DamageType.defaultProjector(target, src.x, src.y, type, dam * target.reflect_damage / 100, tmp, true)
end
@@ -411,8 +430,8 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
-- damage affinity healing
if not target.dead and affinity_heal > 0 then
- target:heal(affinity_heal)
- game.logSeen(target, "%s is healed by the %s%s#LAST# damage!", target.name:capitalize(), DamageType:get(type).text_color or "#aaaaaa#", DamageType:get(type).name)
+ target:heal(affinity_heal, src)
+ game:delayedLogMessage(target, nil, "Affinity"..type, "#Source##LIGHT_GREEN# HEALS#LAST# from "..(DamageType:get(type).text_color or "#aaaaaa#")..DamageType:get(type).name.."#LAST# damage!")
end
if dam > 0 and src.damage_log and src.damage_log.weapon then
@@ -710,7 +729,7 @@ newDamageType{
-- Temporal + Stun
newDamageType{
- name = "temporalstun", type = "TEMPORALSTUN",
+ name = "temporal stun", type = "TEMPORALSTUN",
projector = function(src, x, y, type, dam)
DamageType:get(DamageType.TEMPORAL).projector(src, x, y, DamageType.TEMPORAL, dam)
local target = game.level.map(x, y, Map.ACTOR)
@@ -741,7 +760,7 @@ newDamageType{
-- Break stealth
newDamageType{
- name = "break stealth", type = "BREAK_STEALTH",
+ name = "illumination", type = "BREAK_STEALTH",
projector = function(src, x, y, type, dam)
-- Dont lit magically unlit grids
local a = game.level.map(x, y, Map.ACTOR)
@@ -753,7 +772,7 @@ newDamageType{
-- Silence
newDamageType{
- name = "SILENCE", type = "SILENCE",
+ name = "silence", type = "SILENCE",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target then
@@ -788,7 +807,7 @@ newDamageType{
-- Silence
newDamageType{
- name = "% chance to silence target", type = "RANDOM_SILENCE",
+ name = "silence", type = "RANDOM_SILENCE",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and rng.percent(dam) then
@@ -883,7 +902,7 @@ newDamageType{
end,
}
newDamageType{
- name = "fireburn", type = "GOLEM_FIREBURN",
+ name = "fire burn", type = "GOLEM_FIREBURN",
projector = function(src, x, y, type, dam)
local realdam = 0
local target = game.level.map(x, y, Map.ACTOR)
@@ -905,12 +924,12 @@ newDamageType{
-- Darkness + Stun
newDamageType{
- name = "darkstun", type = "DARKSTUN",
+ name = "darkness", type = "DARKSTUN",
projector = function(src, x, y, type, dam)
DamageType:get(DamageType.DARKNESS).projector(src, x, y, DamageType.DARKNESS, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target then
- -- Set on fire!
+ -- try to stun
if target:canBe("stun") then
target:setEffect(target.EFF_STUNNED, 4, {apply_power=src:combatSpellpower()})
else
@@ -922,7 +941,7 @@ newDamageType{
-- Darkness but not over minions
newDamageType{
- name = "minions darkness", type = "MINION_DARKNESS",
+ name = "darkness", type = "MINION_DARKNESS",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and (not target.necrotic_minion or target.summoner ~= src) then
@@ -933,7 +952,7 @@ newDamageType{
-- Fore but not over minions
newDamageType{
- name = "firey no friends", type = "FIRE_FRIENDS",
+ name = "fire", type = "FIRE_FRIENDS",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and target.summoner ~= src then
@@ -944,7 +963,7 @@ newDamageType{
-- Cold + Stun
newDamageType{
- name = "coldstun", type = "COLDSTUN",
+ name = "cold", type = "COLDSTUN",
projector = function(src, x, y, type, dam)
DamageType:get(DamageType.COLD).projector(src, x, y, DamageType.COLD, dam)
local target = game.level.map(x, y, Map.ACTOR)
@@ -988,7 +1007,7 @@ newDamageType{
-- Cold damage + freeze ground
newDamageType{
- name = "coldnevermove", type = "COLDNEVERMOVE",
+ name = "cold ground", type = "COLDNEVERMOVE",
projector = function(src, x, y, type, dam)
if _G.type(dam) == "number" then dam = {dam=dam, dur=4} end
DamageType:get(DamageType.COLD).projector(src, x, y, DamageType.COLD, dam.dam)
@@ -1088,7 +1107,7 @@ newDamageType{
-- Lightning damage + daze chance
newDamageType{
- name = "lightning daze", type = "LIGHTNING_DAZE", text_color = "#ROYAL_BLUE#",
+ name = "lightning", type = "LIGHTNING_DAZE", text_color = "#ROYAL_BLUE#",
projector = function(src, x, y, type, dam)
if _G.type(dam) == "number" then dam = {dam=dam, daze=25} end
dam.daze = dam.daze or 25
@@ -1111,7 +1130,7 @@ newDamageType{
-- Cold/physical damage + repulsion; checks for spell power against physical resistance
newDamageType{
- name = "wave", type = "WAVE",
+ name = "cold repulsion", type = "WAVE",
projector = function(src, x, y, type, dam)
local srcx, srcy = dam.x, dam.y
local base = dam
@@ -1137,7 +1156,7 @@ newDamageType{
-- Fireburn damage + repulsion; checks for spell power against physical resistance
newDamageType{
- name = "fire knockback", type = "FIREKNOCKBACK",
+ name = "fire repulsion", type = "FIREKNOCKBACK",
projector = function(src, x, y, type, dam, tmp)
local target = game.level.map(x, y, Map.ACTOR)
if _G.type(dam) ~= "table" then dam = {dam=dam, dist=3} end
@@ -1158,7 +1177,7 @@ newDamageType{
-- Fireburn damage + repulsion; checks for mind power against physical resistance
newDamageType{
- name = "fire knockback mind", type = "FIREKNOCKBACK_MIND",
+ name = "burning repulsion", type = "FIREKNOCKBACK_MIND",
projector = function(src, x, y, type, dam, tmp)
local target = game.level.map(x, y, Map.ACTOR)
if _G.type(dam) ~= "table" then dam = {dam=dam, dist=3} end
@@ -1179,7 +1198,7 @@ newDamageType{
-- Darkness damage + repulsion; checks for spell power against mental resistance
newDamageType{
- name = "darkness knockback", type = "DARKKNOCKBACK",
+ name = "darkness repulsion", type = "DARKKNOCKBACK",
projector = function(src, x, y, type, dam, tmp)
local target = game.level.map(x, y, Map.ACTOR)
if _G.type(dam) ~= "table" then dam = {dam=dam, dist=3} end
@@ -1200,7 +1219,7 @@ newDamageType{
-- Physical damage + repulsion; checks for spell power against physical resistance
newDamageType{
- name = "spell knockback", type = "SPELLKNOCKBACK",
+ name = "physical repulsion", type = "SPELLKNOCKBACK",
projector = function(src, x, y, type, dam, tmp)
local target = game.level.map(x, y, Map.ACTOR)
local realdam = 0
@@ -1223,7 +1242,7 @@ newDamageType{
-- Physical damage + repulsion; checks for mind power against physical resistance
newDamageType{
- name = "mind knockback", type = "MINDKNOCKBACK",
+ name = "physical repulsion", type = "MINDKNOCKBACK",
projector = function(src, x, y, type, dam, tmp)
local target = game.level.map(x, y, Map.ACTOR)
tmp = tmp or {}
@@ -1243,7 +1262,7 @@ newDamageType{
-- Physical damage + repulsion; checks for attack power against physical resistance
newDamageType{
- name = "physknockback", type = "PHYSKNOCKBACK",
+ name = "physical repulsion", type = "PHYSKNOCKBACK",
projector = function(src, x, y, type, dam, tmp)
local target = game.level.map(x, y, Map.ACTOR)
tmp = tmp or {}
@@ -1264,7 +1283,7 @@ newDamageType{
-- Fear check + repulsion; checks for mind power against physical resistance
newDamageType{
- name = "fear knockback", type = "FEARKNOCKBACK",
+ name = "fear repulsion", type = "FEARKNOCKBACK",
projector = function(src, x, y, type, dam, tmp)
local target = game.level.map(x, y, Map.ACTOR)
tmp = tmp or {}
@@ -1299,9 +1318,9 @@ newDamageType{
end,
}
--- Inferno: fire and maybe remove suff
+-- Inferno: fire and maybe remove stuff
newDamageType{
- name = "inferno", type = "INFERNO",
+ name = "cleansing fire", type = "INFERNO",
projector = function(src, x, y, type, dam)
local realdam = DamageType:get(DamageType.FIRE).projector(src, x, y, DamageType.FIRE, dam)
local target = game.level.map(x, y, Map.ACTOR)
@@ -1378,7 +1397,7 @@ newDamageType{
-- Physical damage + bleeding % of it
newDamageType{
- name = "physical + bleeding", type = "PHYSICALBLEED",
+ name = "physical bleed", type = "PHYSICALBLEED",
projector = function(src, x, y, type, dam)
local realdam = DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam)
local target = game.level.map(x, y, Map.ACTOR)
@@ -1390,7 +1409,7 @@ newDamageType{
-- Slime damage
newDamageType{
- name = "slime", type = "SLIME", text_color = "#LIGHT_GREEN#",
+ name = "nature slow", type = "SLIME", text_color = "#LIGHT_GREEN#",
projector = function(src, x, y, type, dam)
if _G.type(dam) == "number" then dam = {dam=dam, power=0.15} end
DamageType:get(DamageType.NATURE).projector(src, x, y, DamageType.NATURE, dam.dam)
@@ -1487,7 +1506,7 @@ newDamageType{
-- Confusion
newDamageType{
- name = "% chance to confuse", type = "RANDOM_CONFUSION",
+ name = "confusion", type = "RANDOM_CONFUSION",
projector = function(src, x, y, type, dam)
if _G.type(dam) == "number" then dam = {dam=dam} end
local target = game.level.map(x, y, Map.ACTOR)
@@ -1502,7 +1521,7 @@ newDamageType{
}
newDamageType{
- name = "% chance to cause a gloom effect", type = "RANDOM_GLOOM",
+ name = "gloom", type = "RANDOM_GLOOM",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and rng.percent(dam) then
@@ -1530,7 +1549,7 @@ newDamageType{
-- gBlind
newDamageType{
- name = "% chance to blind", type = "RANDOM_BLIND",
+ name = "blinding", type = "RANDOM_BLIND",
projector = function(src, x, y, type, dam)
if _G.type(dam) == "number" then dam = {dam=dam} end
local target = game.level.map(x, y, Map.ACTOR)
@@ -1546,7 +1565,7 @@ newDamageType{
-- Physical + Blind
newDamageType{
- name = "sand", type = "SAND",
+ name = "blinding physical", type = "SAND",
projector = function(src, x, y, type, dam)
DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam.dam)
local target = game.level.map(x, y, Map.ACTOR)
@@ -1562,7 +1581,7 @@ newDamageType{
-- Physical + Pinned
newDamageType{
- name = "pinning", type = "PINNING",
+ name = "physical pinning", type = "PINNING",
projector = function(src, x, y, type, dam)
DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam.dam)
local target = game.level.map(x, y, Map.ACTOR)
@@ -1578,7 +1597,7 @@ newDamageType{
-- Drain Exp
newDamageType{
- name = "drain experience", type = "DRAINEXP",
+ name = "regressive blight", type = "DRAINEXP",
projector = function(src, x, y, type, dam)
if _G.type(dam) == "number" then dam = {dam=dam} end
local realdam = DamageType:get(DamageType.BLIGHT).projector(src, x, y, DamageType.BLIGHT, dam.dam)
@@ -1586,7 +1605,7 @@ newDamageType{
if target then
if target:checkHit((dam.power_check or src.combatSpellpower)(src), (dam.resist_check or target.combatMentalResist)(target), 0, 95, 15) then
target:gainExp(-dam.dam*2)
- game.logSeen(target, "%s drains experience from %s!", src.name:capitalize(), target.name)
+ src:logCombat(target, "#Source# drains experience from #Target#!")
else
game.logSeen(target, "%s resists!", target.name:capitalize())
end
@@ -1597,14 +1616,14 @@ newDamageType{
-- Drain Life
newDamageType{
- name = "drain life", type = "DRAINLIFE", text_color = "#DARK_GREEN#",
+ name = "draining blight", type = "DRAINLIFE", text_color = "#DARK_GREEN#",
projector = function(src, x, y, type, dam)
if _G.type(dam) == "number" then dam = {dam=dam, healfactor=0.4} end
local target = game.level.map(x, y, Map.ACTOR) -- Get the target first to make sure we heal even on kill
local realdam = DamageType:get(DamageType.BLIGHT).projector(src, x, y, DamageType.BLIGHT, dam.dam)
if target and realdam > 0 then
src:heal(realdam * dam.healfactor)
- game.logSeen(target, "%s drains life from %s!", src.name:capitalize(), target.name)
+ src:logCombat(target, "#Source# drains life from #Target#!")
end
return realdam
end,
@@ -1612,7 +1631,7 @@ newDamageType{
-- Drain Vim
newDamageType{
- name = "drain vim", type = "DRAIN_VIM",
+ name = "enervating blight", type = "DRAIN_VIM",
projector = function(src, x, y, type, dam)
if _G.type(dam) == "number" then dam = {dam=dam, vim=0.2} end
local target = game.level.map(x, y, Map.ACTOR)
@@ -1630,7 +1649,7 @@ newDamageType{
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and target:attr("demon") then
- target:heal(dam)
+ target:heal(dam, src)
return -dam
elseif target then
DamageType:get(DamageType.FIRE).projector(src, x, y, DamageType.FIRE, dam)
@@ -1641,11 +1660,11 @@ newDamageType{
-- Retch: heal undead; damage living
newDamageType{
- name = "retch", type = "RETCH",
+ name = "purging blight", type = "RETCH",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
- if target and (target:attr("undead") or target.retch_heal) then
- target:heal(dam * 1.5)
+ if target and (target:attr("undead") or target:attr(retch_heal)) then
+ target:heal(dam * 1.5, src)
if src.callTalent then
if rng.percent(src:callTalent(src.T_RETCH, "getPurgeChance")) then
@@ -1692,7 +1711,7 @@ newDamageType{
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and not target:attr("undead") and not target:attr("demon") then
- target:heal(dam / 2)
+ target:heal(dam / 2, src)
elseif target then
DamageType:get(DamageType.LIGHT).projector(src, x, y, DamageType.LIGHT, dam)
end
@@ -1713,7 +1732,7 @@ newDamageType{
}
newDamageType{
- name = "healing power", type = "HEALING_POWER",
+ name = "healing light", type = "HEALING_POWER",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and not target:attr("undead") then
@@ -1745,7 +1764,7 @@ newDamageType{
-- Corrupted blood, blight damage + potential diseases
newDamageType{
- name = "corrupted blood", type = "CORRUPTED_BLOOD", text_color = "#DARK_GREEN#",
+ name = "infective blight", type = "CORRUPTED_BLOOD", text_color = "#DARK_GREEN#",
projector = function(src, x, y, type, dam)
if _G.type(dam) == "number" then dam = {dam=dam} end
DamageType:get(DamageType.BLIGHT).projector(src, x, y, DamageType.BLIGHT, dam.dam)
@@ -1759,7 +1778,7 @@ newDamageType{
-- blood boiled, blight damage + slow
newDamageType{
- name = "blood boil", type = "BLOOD_BOIL",
+ name = "hindering_blight", type = "BLOOD_BOIL",
projector = function(src, x, y, type, dam)
DamageType:get(DamageType.BLIGHT).projector(src, x, y, DamageType.BLIGHT, dam)
local target = game.level.map(x, y, Map.ACTOR)
@@ -1796,7 +1815,7 @@ newDamageType{
-- Physical Damage/Cut Split
newDamageType{
- name = "split bleed", type = "SPLIT_BLEED",
+ name = "physical bleed", type = "SPLIT_BLEED",
projector = function(src, x, y, type, dam)
DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam / 2)
DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam / 12)
@@ -1811,7 +1830,7 @@ newDamageType{
-- Temporal/Physical damage
newDamageType{
- name = "matter", type = "MATTER",
+ name = "temporal shear", type = "MATTER",
projector = function(src, x, y, type, dam)
DamageType:get(DamageType.TEMPORAL).projector(src, x, y, DamageType.TEMPORAL, dam / 2)
DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam / 2)
@@ -1820,7 +1839,7 @@ newDamageType{
-- Temporal/Darkness damage
newDamageType{
- name = "void", type = "VOID", text_color = "#GREY#",
+ name = "temporal darkness", type = "VOID", text_color = "#GREY#",
projector = function(src, x, y, type, dam)
DamageType:get(DamageType.TEMPORAL).projector(src, x, y, DamageType.TEMPORAL, dam / 2)
DamageType:get(DamageType.DARKNESS).projector(src, x, y, DamageType.DARKNESS, dam / 2)
@@ -1864,7 +1883,7 @@ newDamageType{
}
newDamageType{
- name = "repulsion", type = "REPULSION",
+ name = "physical repulsion", type = "REPULSION",
projector = function(src, x, y, type, dam, tmp)
local target = game.level.map(x, y, Map.ACTOR)
tmp = tmp or {}
@@ -1909,7 +1928,7 @@ newDamageType{
-- Mosses
newDamageType{
- name = "grasping moss", type = "GRASPING_MOSS",
+ name = "pinning nature", type = "GRASPING_MOSS",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and src:reactionToward(target) < 0 then
@@ -1925,7 +1944,7 @@ newDamageType{
}
newDamageType{
- name = "nourishing moss", type = "NOURISHING_MOSS",
+ name = "healing nature", type = "NOURISHING_MOSS",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and src:reactionToward(target) < 0 then
@@ -1936,7 +1955,7 @@ newDamageType{
}
newDamageType{
- name = "slippery moss", type = "SLIPPERY_MOSS",
+ name = "impeding nature", type = "SLIPPERY_MOSS",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and src:reactionToward(target) < 0 then
@@ -1947,7 +1966,7 @@ newDamageType{
}
newDamageType{
- name = "hallucinogenic moss", type = "HALLUCINOGENIC_MOSS",
+ name = "confounding nature", type = "HALLUCINOGENIC_MOSS",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and src:reactionToward(target) < 0 then
@@ -1979,7 +1998,7 @@ newDamageType{
}
newDamageType{
- name = "shiftingshadows", type = "SHIFTINGSHADOWS",
+ name = "defensive darkness", type = "SHIFTINGSHADOWS",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target then
@@ -1993,7 +2012,7 @@ newDamageType{
}
newDamageType{
- name = "blazinglight", type = "BLAZINGLIGHT",
+ name = "blazing light", type = "BLAZINGLIGHT",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target then
@@ -2008,7 +2027,7 @@ newDamageType{
}
newDamageType{
- name = "warding", type = "WARDING",
+ name = "prismatic repulsion", type = "WARDING",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target then
@@ -2030,7 +2049,7 @@ newDamageType{
}
newDamageType{
- name = "mindslow", type = "MINDSLOW",
+ name = "mind slow", type = "MINDSLOW",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target then
@@ -2042,7 +2061,7 @@ newDamageType{
-- Freezes target, checks for physresistance
newDamageType{
- name = "mindfreeze", type = "MINDFREEZE",
+ name = "mind freeze", type = "MINDFREEZE",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target then
@@ -2074,7 +2093,7 @@ newDamageType{
-- Temporal + Stat damage
newDamageType{
- name = "reverse aging", type = "CLOCK",
+ name = "regressive temporal", type = "CLOCK",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target then
@@ -2088,7 +2107,7 @@ newDamageType{
-- Temporal Over Time
newDamageType{
- name = "wasting", type = "WASTING", text_color = "#LIGHT_STEEL_BLUE#",
+ name = "wasting temporal", type = "WASTING", text_color = "#LIGHT_STEEL_BLUE#",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
local dur = 3
@@ -2097,7 +2116,7 @@ newDamageType{
local init_dam = dam * perc / 100
if init_dam > 0 then DamageType:get(DamageType.TEMPORAL).projector(src, x, y, DamageType.TEMPORAL, init_dam) end
if target then
- -- Set on fire!
+ -- Set wasting effect
dam = dam - init_dam
target:setEffect(target.EFF_WASTING, dur, {src=src, power=dam / dur, no_ct_effect=true})
end
@@ -2120,7 +2139,7 @@ newDamageType{
}
newDamageType{
- name = "rethread", type = "RETHREAD",
+ name = "debilitating temporal", type = "RETHREAD",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
local chance = rng.range(1, 4)
@@ -2170,7 +2189,7 @@ newDamageType{
}
newDamageType{
- name = "devour life", type = "DEVOUR_LIFE",
+ name = "draining physical", type = "DEVOUR_LIFE",
projector = function(src, x, y, type, dam)
if _G.type(dam) == "number" then dam = {dam=dam} end
local target = game.level.map(x, y, Map.ACTOR) -- Get the target first to make sure we heal even on kill
@@ -2181,16 +2200,16 @@ newDamageType{
-- cannot be reduced
local temp = src.healing_factor
src.healing_factor = 1
- src:heal(heal)
+ src:heal(heal, target)
src.healing_factor = temp
- game.logSeen(target, "%s consumes %d life from %s!", src.name:capitalize(), heal, target.name)
+ src:logCombat(target, "#Source# consumes %d life from #Target#!", heal)
end
end,
hideMessage=true,
}
newDamageType{
- name = "chronoslow", type = "CHRONOSLOW",
+ name = "temporal slow", type = "CHRONOSLOW",
projector = function(src, x, y, type, dam)
DamageType:get(DamageType.TEMPORAL).projector(src, x, y, DamageType.TEMPORAL, dam.dam)
local target = game.level.map(x, y, Map.ACTOR)
@@ -2233,7 +2252,7 @@ newDamageType{
}
newDamageType{
- name = "manaworm", type = "MANAWORM",
+ name = "manaworm arcane", type = "MANAWORM",
projector = function(src, x, y, type, dam)
local realdam = DamageType:get(DamageType.ARCANE).projector(src, x, y, DamageType.ARCANE, dam)
local target = game.level.map(x, y, Map.ACTOR)
@@ -2252,7 +2271,7 @@ newDamageType{
}
newDamageType{
- name = "void blast", type = "VOID_BLAST",
+ name = "arcane blast", type = "VOID_BLAST",
projector = function(src, x, y, type, dam)
local realdam = DamageType:get(DamageType.ARCANE).projector(src, x, y, DamageType.ARCANE, dam)
local target = game.level.map(x, y, Map.ACTOR)
@@ -2285,7 +2304,7 @@ newDamageType{
-- Darkness damage + speed reduction + minion damage inc
newDamageType{
- name = "rigor mortis", type = "RIGOR_MORTIS",
+ name = "decaying darkness", type = "RIGOR_MORTIS",
projector = function(src, x, y, type, dam, tmp)
local target = game.level.map(x, y, Map.ACTOR)
if target then
@@ -2297,7 +2316,7 @@ newDamageType{
}
newDamageType{
- name = "abyssal shroud", type = "ABYSSAL_SHROUD",
+ name = "abyssal darkness", type = "ABYSSAL_SHROUD",
projector = function(src, x, y, type, dam)
--make it dark
game.level.map.remembers(x, y, false)
@@ -2320,7 +2339,7 @@ newDamageType{
}
newDamageType{
- name = "% chance to summon an orc spirit", type = "GARKUL_INVOKE",
+ name = "Garkul spirit", type = "GARKUL_INVOKE",
projector = function(src, x, y, type, dam)
if not rng.percent(dam) then return end
local target = game.level.map(x, y, engine.Map.ACTOR)
@@ -2413,7 +2432,7 @@ newDamageType{
-- Generic apply temporary effect
newDamageType{
- name = "temp effect", type = "TEMP_EFFECT",
+ name = "special effect", type = "TEMP_EFFECT",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target then
@@ -2428,7 +2447,7 @@ newDamageType{
}
newDamageType{
- name = "manaburn", type = "MANABURN", text_color = "#PURPLE#",
+ name = "manaburn arcane", type = "MANABURN", text_color = "#PURPLE#",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target then
@@ -2472,7 +2491,7 @@ newDamageType{
-- Distortion; Includes knockback, penetrate, stun, and explosion paramters
newDamageType{
- name = "distortion", type = "DISTORTION",
+ name = "distorting physical", type = "DISTORTION",
projector = function(src, x, y, type, dam, tmp)
local target = game.level.map(x, y, Map.ACTOR)
if not target then return end
@@ -2580,7 +2599,7 @@ newDamageType{
newDamageType{
- name = "mucus", type = "MUCUS",
+ name = "natural mucus", type = "MUCUS",
projector = function(src, x, y, type, dam, tmp)
local target = game.level.map(x, y, Map.ACTOR)
if target and not target.turn_procs.mucus then
@@ -2601,7 +2620,7 @@ newDamageType{
}
newDamageType{
- name = "acid disarm", type = "ACID_DISARM", text_color = "#GREEN#",
+ name = "disarming acid", type = "ACID_DISARM", text_color = "#GREEN#",
projector = function(src, x, y, type, dam)
if _G.type(dam) == "number" then dam = {chance=25, dam=dam} end
local realdam = DamageType:get(DamageType.ACID).projector(src, x, y, DamageType.ACID, dam.dam)
diff --git a/game/modules/tome/data/general/grids/lava.lua b/game/modules/tome/data/general/grids/lava.lua
index e636daa9f48dc0f084d997aa83a8b28ffafb5fe0..c5d24bd8270fd4991c4aa8f05d01f7b7dfd7c81a 100644
--- a/game/modules/tome/data/general/grids/lava.lua
+++ b/game/modules/tome/data/general/grids/lava.lua
@@ -32,7 +32,8 @@ newEntity{
on_stand = function(self, x, y, who)
local DT = engine.DamageType
local dam = DT:get(DT.FIRE).projector(self, x, y, DT.FIRE, rng.range(self.mindam, self.maxdam))
- if dam > 0 then game.logPlayer(who, "The lava burns you!") end
+ self.x, self.y = x, y
+ if dam > 0 and who.player then self:logCombat(who, "#Source# burns #Target#!") end
end,
nice_tiler = { method="replace", base={"LAVA_FLOOR", 100, 1, 16}},
nice_editer = lava_editer,
diff --git a/game/modules/tome/data/general/grids/water.lua b/game/modules/tome/data/general/grids/water.lua
index 986ceebabce2490ced46b86a177ea1a68b4b228f..1884bebabc94f6b2df82bd1b036d3559d08aeda8 100644
--- a/game/modules/tome/data/general/grids/water.lua
+++ b/game/modules/tome/data/general/grids/water.lua
@@ -168,7 +168,8 @@ newEntity{
local DT = engine.DamageType
local dam = DT:get(DT.POISON).projector(self, x, y, DT.POISON, rng.range(self.mindam, self.maxdam))
- if dam > 0 then game.logPlayer(who, "The water poisons you!") end
+ self.x, self.y = x, y
+ if dam > 0 and who.player then self:logCombat(who, "#Source# poisons #Target#!") end
end,
combatAttack = function(self) return rng.range(self.mindam, self.maxdam) end,
nice_tiler = { method="replace", base={"POISON_DEEP_WATER", 100, 1, 6}},
diff --git a/game/modules/tome/data/general/npcs/horror.lua b/game/modules/tome/data/general/npcs/horror.lua
index 70c5fe3f621d5730fca58c8924c17c0dc9bfd44e..33c8bb659b119f90348af7e1757f555c05c2e657 100644
--- a/game/modules/tome/data/general/npcs/horror.lua
+++ b/game/modules/tome/data/general/npcs/horror.lua
@@ -271,7 +271,7 @@ newEntity{ base = "BASE_NPC_HORROR", define_as = "BASE_NPC_ELDRICTH_EYE",
on_die = function(self, src)
if not self.summoner or not self.summoner.is_headless_horror then return end
- game.logSeen(self, "#AQUAMARINE#As %s falls %s seems to weaken!", self.name, self.summoner.name)
+ self:logCombat(self.summoner, "#AQUAMARINE#As #Source# falls #Target# seems to weaken!")
local damtype = next(self.resists)
self.summoner.resists.all = (self.summoner.resists.all or 0) - 30
self.summoner.resists[damtype] = nil
@@ -891,7 +891,7 @@ newEntity{ base="BASE_NPC_HORROR", define_as = "GRGGLCK_TENTACLE",
on_die = function(self, who)
if self.summoner and not self.summoner.dead and who then
- game.logSeen(self, "#AQUAMARINE#As %s falls you notice that %s seems to shudder in pain!", self.name, self.summoner.name)
+ self:logCombat(self.summoner, "#AQUAMARINE#As #Source# falls you notice that #Target# seems to shudder in pain!")
if self.summoner.is_grgglck then
self.summoner:takeHit(self.max_life, who)
else
diff --git a/game/modules/tome/data/general/npcs/plant.lua b/game/modules/tome/data/general/npcs/plant.lua
index 3764c2b71d65569b7dd052eb0d91d99539961ef6..2b7af09c3200c167f02da3ef51e05866b30f652c 100644
--- a/game/modules/tome/data/general/npcs/plant.lua
+++ b/game/modules/tome/data/general/npcs/plant.lua
@@ -50,7 +50,7 @@ newEntity{ base = "BASE_NPC_PLANT",
combat = { dam=5, atk=15, apr=10 },
resolvers.talents{
[Talents.T_CONSTRICT]={base=1, every=5},
- [Talents.T_SPIT_POISON]={base=2, every=5, max=2},
+ [Talents.T_SPIT_POISON]={base=1, every=5, max=3},
},
}
diff --git a/game/modules/tome/data/general/npcs/swarm.lua b/game/modules/tome/data/general/npcs/swarm.lua
index 9b10443722635eb97603b3c40ace825cba365b53..74c33b83019cda78ef551df57ed1779bfcbdf881 100644
--- a/game/modules/tome/data/general/npcs/swarm.lua
+++ b/game/modules/tome/data/general/npcs/swarm.lua
@@ -32,6 +32,7 @@ newEntity{
sound_moam = {"creatures/swarm/mswarm_%d", 1, 4},
sound_die = "creatures/swarm/mswarm_die",
sound_random = {"creatures/swarm/mswarm_%d", 1, 4},
+ combat = {sound={"creatures/swarm/mswarm_%d", 1, 4}, sound_miss={"creatures/swarm/mswarm_%d", 1, 4}},
ai = "dumb_talented_simple", ai_state = { ai_move="move_complex", talent_in=1, },
stats = { str=1, dex=20, mag=3, con=1 },
global_speed_base = 2,
diff --git a/game/modules/tome/data/general/objects/2htridents.lua b/game/modules/tome/data/general/objects/2htridents.lua
index 5ef2e9ef8bcb19edd19631653734ca7a87a82a8a..df7568c415e7cad04ecf71eb47cf0ce7e90f83bc 100644
--- a/game/modules/tome/data/general/objects/2htridents.lua
+++ b/game/modules/tome/data/general/objects/2htridents.lua
@@ -29,7 +29,7 @@ newEntity{
trident_rarity = 5, -- Special rarity field, converted to "rarity" when needed
metallic = true,
no_rust = true,
- combat = { talented = "trident", damrange = 1.6, physspeed = 1, sound = {"actions/melee", pitch=0.6, vol=1.2}, sound_miss = {"actions/melee", pitch=0.6, vol=1.2} },
+ combat = { talented = "trident", accuracy_effect = "mace", damrange = 1.6, physspeed = 1, sound = {"actions/melee", pitch=0.6, vol=1.2}, sound_miss = {"actions/melee", pitch=0.6, vol=1.2} },
desc = [[A two-handed massive trident.
Tridents require the exotic weapons mastery talent to use correctly.]],
twohanded = true,
diff --git a/game/modules/tome/data/general/objects/boss-artifacts.lua b/game/modules/tome/data/general/objects/boss-artifacts.lua
index b4a9416aec31fe67c2fe1f4872a7546bca1ff3a3..7fb255bcc38b211384825ab25aafd37f789fa78f 100644
--- a/game/modules/tome/data/general/objects/boss-artifacts.lua
+++ b/game/modules/tome/data/general/objects/boss-artifacts.lua
@@ -1482,7 +1482,7 @@ newEntity{ base = "BASE_LONGBOW",
who:project(tg, a.x, a.y, engine.DamageType.LIGHTNING_DAZE, {daze=40, dam = rng.avg(1,3) * (40+ who:getMag() * 1.5)} )
game.level.map:particleEmitter(who.x, who.y, math.max(math.abs(a.x-who.x), math.abs(a.y-who.y)), "lightning", {tx=a.x-who.x, ty=a.y-who.y})
game:playSoundNear(self, "talents/lightning")
- game.logSeen(who, "#GOLD#A bolt of lightning fires from %s's bow, striking %s!", who.name:capitalize(), a.name:capitalize())
+ who:logCombat(a, "#GOLD#A bolt of lightning fires from #Source#'s bow, striking #Target#!")
end
end,
on_wear = function(self, who)
diff --git a/game/modules/tome/data/general/objects/bows.lua b/game/modules/tome/data/general/objects/bows.lua
index dc0ef8639a8aa66cebcc2aeecf735916db6e3b96..8373e90546096d09ef3185d8432fedfdf940b29b 100644
--- a/game/modules/tome/data/general/objects/bows.lua
+++ b/game/modules/tome/data/general/objects/bows.lua
@@ -28,7 +28,7 @@ newEntity{
moddable_tile = resolvers.moddable_tile("bow"),
encumber = 4,
rarity = 7,
- combat = { talented = "bow", sound = "actions/arrow", sound_miss = "actions/arrow",},
+ combat = { talented = "bow", accuracy_effect = "axe", sound = "actions/arrow", sound_miss = "actions/arrow",},
require = { talent = { Talents.T_SHOOT }, },
archery_kind = "bow",
archery = "bow",
@@ -109,7 +109,7 @@ newEntity{
encumber = 3,
rarity = 7,
combat = {
- talented = "bow",
+ talented = "bow", accuracy_effect = "axe",
damrange = 1.4,
},
proj_image = resolvers.image_material("arrow", "wood"),
diff --git a/game/modules/tome/data/general/objects/gauntlets.lua b/game/modules/tome/data/general/objects/gauntlets.lua
index e5fa053f976af39763991ffec9affa32401cc572..19d2fa5f0dddeec2394c669fe0cd28e1a265e6bc 100644
--- a/game/modules/tome/data/general/objects/gauntlets.lua
+++ b/game/modules/tome/data/general/objects/gauntlets.lua
@@ -44,6 +44,7 @@ newEntity{ base = "BASE_GAUNTLETS",
wielder = {
combat_armor = 1,
combat = {
+ accuracy_effect = "mace",
dam = resolvers.rngavg(7, 12),
apr = 3,
physcrit = 2,
@@ -62,6 +63,7 @@ newEntity{ base = "BASE_GAUNTLETS",
wielder = {
combat_armor = 2,
combat = {
+ accuracy_effect = "mace",
dam = resolvers.rngavg(16, 22),
apr = 9,
physcrit = 8,
@@ -80,6 +82,7 @@ newEntity{ base = "BASE_GAUNTLETS",
wielder = {
combat_armor = 3,
combat = {
+ accuracy_effect = "mace",
dam = resolvers.rngavg(25, 32),
apr = 15,
physcrit = 10,
diff --git a/game/modules/tome/data/general/objects/gloves.lua b/game/modules/tome/data/general/objects/gloves.lua
index 6d2d70eb3642bad9f533c6ac2a5b5875765a0cca..3c9a2fba706133a3cd9dfd702a8b4a65d6affa17 100644
--- a/game/modules/tome/data/general/objects/gloves.lua
+++ b/game/modules/tome/data/general/objects/gloves.lua
@@ -42,6 +42,7 @@ newEntity{ base = "BASE_GLOVES",
wielder = {
combat_armor = 1,
combat = {
+ accuracy_effect = "axe",
dam = resolvers.rngavg(5, 8),
apr = 1,
physcrit = 1,
@@ -59,6 +60,7 @@ newEntity{ base = "BASE_GLOVES",
wielder = {
combat_armor = 2,
combat = {
+ accuracy_effect = "axe",
dam = resolvers.rngavg(14, 18),
apr = 3,
physcrit = 3,
@@ -76,6 +78,7 @@ newEntity{ base = "BASE_GLOVES",
wielder = {
combat_armor = 3,
combat = {
+ accuracy_effect = "axe",
dam = resolvers.rngavg(23, 28),
apr = 5,
physcrit = 5,
diff --git a/game/modules/tome/data/general/objects/shields.lua b/game/modules/tome/data/general/objects/shields.lua
index c8b9a7a7c4371237e16f31000bc6016904e92a56..a65b4fbbbe97e634a598dbb01a098cc335ce080e 100644
--- a/game/modules/tome/data/general/objects/shields.lua
+++ b/game/modules/tome/data/general/objects/shields.lua
@@ -32,7 +32,7 @@ newEntity{
desc = [[Handheld deflection devices]],
require = { talent = { {Talents.T_ARMOUR_TRAINING,2} }, },
randart_able = "/data/general/objects/random-artifacts/shields.lua",
- special_combat = { talented="shield", damrange = 1.2 },
+ special_combat = { talented="shield", accuracy_effect="staff", damrange = 1.2 },
egos = "/data/general/objects/egos/shield.lua", egos_chance = { prefix=resolvers.mbonus(40, 5), suffix=resolvers.mbonus(40, 5) },
}
diff --git a/game/modules/tome/data/general/objects/slings.lua b/game/modules/tome/data/general/objects/slings.lua
index d56a027a10fd7a29a96c09506ebc8b409f308ba3..53405ff96e2cce29b59d31038f608b2abf4a9969 100644
--- a/game/modules/tome/data/general/objects/slings.lua
+++ b/game/modules/tome/data/general/objects/slings.lua
@@ -27,7 +27,7 @@ newEntity{
moddable_tile = resolvers.moddable_tile("sling"),
encumber = 4,
rarity = 7,
- combat = { talented = "sling", sound = "actions/sling", sound_miss = "actions/sling", },
+ combat = { talented = "sling", accuracy_effect = "mace", sound = "actions/sling", sound_miss = "actions/sling", },
archery_kind = "sling",
archery = "sling",
require = { talent = { Talents.T_SHOOT }, },
@@ -107,7 +107,7 @@ newEntity{
display = "{", color=colors.UMBER, image = resolvers.image_material("shot", "metal"),
encumber = 3,
rarity = 7,
- combat = { talented = "sling", damrange = 1.2},
+ combat = { talented = "sling", accuracy_effect = "mace", damrange = 1.2},
proj_image = resolvers.image_material("shot_s", "metal"),
archery_ammo = "sling",
desc = [[Shots are used with slings to pummel your foes to death.]],
diff --git a/game/modules/tome/data/general/objects/whips.lua b/game/modules/tome/data/general/objects/whips.lua
index 768b6b3e58706d3493c60ac662d5c1ef17e72147..3004bd4a295a1844ccc3de68b9712e669b8450f4 100644
--- a/game/modules/tome/data/general/objects/whips.lua
+++ b/game/modules/tome/data/general/objects/whips.lua
@@ -27,7 +27,7 @@ newEntity{
encumber = 3,
rarity = 5,
metallic = true,
- combat = { talented = "whip", damrange = 1.1, physspeed = 0.8, sound = "actions/whip_hit", sound_miss = "actions/whip_miss",},
+ combat = { talented = "whip", accuracy_effect = "sword", damrange = 1.1, physspeed = 0.8, sound = "actions/whip_hit", sound_miss = "actions/whip_miss",},
desc = [[Sharp, long and deadly.]],
randart_able = "/data/general/objects/random-artifacts/generic.lua",
egos = "/data/general/objects/egos/weapon.lua", egos_chance = { prefix=resolvers.mbonus(40, 5), suffix=resolvers.mbonus(40, 5) },
diff --git a/game/modules/tome/data/general/objects/world-artifacts-far-east.lua b/game/modules/tome/data/general/objects/world-artifacts-far-east.lua
index e0f0302ee44cb22a0618b37d56b6ce1c9fca77dd..431bfe354fcbe39eabec47fbeb759bae1410fa3f 100644
--- a/game/modules/tome/data/general/objects/world-artifacts-far-east.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts-far-east.lua
@@ -38,19 +38,21 @@ newEntity{ base = "BASE_SCROLL", define_as = "JEWELER_TOME", subtype="tome", no_
end,
}
+--[=[
newEntity{ base = "BASE_GEM", define_as = "ANCIENT_STORM_SAPHIR",
power_source = {unknown=true},
unique = true,
- unided_name = "strange saphir",
- name = "Ancient Storm Saphir", subtype = "blue", image = "object/ancient_storm_saphir.png",
+ unided_name = "strange sapphire",
+ name = "Ancient Storm Sapphire", subtype = "blue", image = "object/ancient_storm_saphir.png",
color = colors.ROYAL_BLUE,
level_range = {30, 50},
- desc = [[This seemingly normal saphir seems to be charged with the destructive power of a raging storm.]],
+ desc = [[This seemingly normal sapphire seems to be charged with the destructive power of a raging storm.]],
rarity = 300,
cost = 0,
material_level = 4,
identified = false,
}
+]=]
-- Not a random drop, used by the quest started above
newEntity{ base = "BASE_SCROLL", define_as = "JEWELER_SUMMON", subtype="tome", no_unique_lore=true,
diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua
index ce73a892c12d639b3744f6354093443bebb4c07e..fdc7e23c638d828745b11d21d9fc155491b5207b 100644
--- a/game/modules/tome/data/general/objects/world-artifacts.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts.lua
@@ -1258,10 +1258,10 @@ newEntity{ base = "BASE_HELM", define_as = "HELM_KROLTAR",
self:specialSetAdd({"wielder","combat_spellresist"}, 15)
self:specialSetAdd({"wielder","combat_mentalresist"}, 15)
self:specialSetAdd({"wielder","combat_physresist"}, 15)
- game.logPlayer(who, "#GOLD#As the Kroltar helm approches the scale mail, they begin to emit fumes and fires.")
+ game.logPlayer(who, "#GOLD#As the helm of Kroltar approaches the your scale armour, they begin to fume and emit fire.")
end,
on_set_broken = function(self, who)
- game.logPlayer(who, "#GOLD#The funes and fires disappear.")
+ game.logPlayer(who, "#GOLD#The fumes and fire fade away.")
end,
}
@@ -1595,7 +1595,7 @@ newEntity{ base = "BASE_CLOTH_ARMOR",
on_melee_hit={[DamageType.TEMPORAL] = 10},
},
max_power = 25, power_regen = 1,
- use_talent = { id = Talents.T_DAMAGE_SMEARING, level = 3, power = 25 },
+ use_talent = { id = Talents.T_DAMAGE_SMEARING, level = 1, power = 25 },
}
newEntity{ base = "BASE_GEM", define_as = "GEM_TELOS",
@@ -3455,7 +3455,7 @@ newEntity{ base = "BASE_WHIP",
who:project(blast, x, y, engine.DamageType.LIGHTNING, rng.avg(dam / 3, dam, 3))
game.level.map:particleEmitter(x, y, radius, "ball_lightning", {radius=blast.radius})
game:playSoundNear(self, "talents/lightning")
- game.logSeen(who, "%s strikes %s, sending out an arc of lightning!", who.name:capitalize(), target.name)
+ who:logCombat(target, "#Source# strikes #Target#, sending out an arc of lightning!")
return {id=true, used=true}
end
},
@@ -3793,7 +3793,7 @@ newEntity{ base = "BASE_LONGSWORD",
if not who:checkHit(who:combatMindpower(), target:combatMentalResist()) then return end
if eff == "stun" then target:setEffect(target.EFF_MADNESS_STUNNED, 3, {mindResistChange=-25})
elseif eff == "malign" then target:setEffect(target.EFF_MALIGNED, 3, {resistAllChange=10})
- elseif eff == "agony" then target:setEffect(target.EFF_AGONY, 5, { source=who, damage=40, mindpower=40, range=10, minPercent=10, duration=5})
+ elseif eff == "agony" then target:setEffect(target.EFF_AGONY, 5, { src=who, damage=40, mindpower=40, range=10, minPercent=10, duration=5})
elseif eff == "confusion" then target:setEffect(target.EFF_CONFUSED, 3, {power=60})
elseif eff == "silence" then target:setEffect(target.EFF_SILENCED, 3, {})
end
@@ -3830,7 +3830,7 @@ newEntity{ base = "BASE_LONGSWORD",
if not rng.percent(20) then return end
if not who:checkHit(who:combatMindpower(), target:combatMentalResist()) then return end
target:setEffect(target.EFF_WEAKENED_MIND, 2, {power=5})
- game.logSeen(who, "Anima's eye glares at %s, piercing their mind!", target.name:capitalize())
+ who:logCombat(target, "Anmalice focuses its mind-piercing eye on #Target#!")
end)
end,
on_takeoff = function(self, who)
@@ -3842,7 +3842,7 @@ newEntity{ base = "BASE_LONGSWORD",
else
game.logPlayer(who, "#CRIMSON#As you tear the tentacles from your arm, horrible images enter your mind!")
who:setEffect(who.EFF_WEAKENED_MIND, 15, {power=25})
- who:setEffect(who.EFF_AGONY, 5, { source=who, damage=15, mindpower=40, range=10, minPercent=10, duration=5})
+ who:setEffect(who.EFF_AGONY, 5, { src=who, damage=15, mindpower=40, range=10, minPercent=10, duration=5})
end
self.wielder.combat_mentalresist = -30
end,
@@ -3871,7 +3871,7 @@ newEntity{ base = "BASE_LONGSWORD", define_as="MORRIGOR",
physcrit = 7,
dammod = {str=0.6, mag=0.6},
special_on_hit = {desc="deal magical damage", fct=function(combat, who, target)
- local tg = {type="ball", range=0, radius=0, selffire=false}
+ local tg = {type="ball", range=1, radius=0, selffire=false}
who:project(tg, target.x, target.y, engine.DamageType.ARCANE, who:getMag()*0.5)
who:project(tg, target.x, target.y, engine.DamageType.DARKNESS, who:getMag()*0.5)
end},
@@ -3950,9 +3950,9 @@ newEntity{ base = "BASE_WHIP", define_as = "HYDRA_BITE",
o.running = 1
if tries >= 100 or #tgts==1 then twohits=nil end
if twohits then
- game.logSeen(who, "%s's three headed flail lashes at %s and %s!",who.name:capitalize(), target1.name:capitalize(),target2.name:capitalize())
+ who:logCombat(target1, "#Source#'s three headed flail lashes at #Target#%s!",who:canSee(target2) and (" and %s"):format(target2.name:capitalize()) or "")
else
- game.logSeen(who, "%s's three headed flail lashes at %s!",who.name:capitalize(), target1.name:capitalize())
+ who:logCombat(target1, "#Source#'s three headed flail lashes at #Target#!")
end
who:attackTarget(target1, engine.DamageType.PHYSICAL, 0.4, true)
if twohits then who:attackTarget(target2, engine.DamageType.PHYSICAL, 0.4, true) end
@@ -4462,7 +4462,7 @@ newEntity{ base = "BASE_GREATSWORD", -- Thanks Alex!
dam = 48,
apr = 12,
physcrit = 11,
- dammod = {str=1.4},
+ dammod = {str=1.3},
physspeed=1.8,
},
wielder = {
@@ -4482,14 +4482,14 @@ newEntity{ base = "BASE_GREATSWORD", -- Thanks Alex!
local size = self.worn_by.size_category-3
local str = self.worn_by:getStr()
- self.combat.physspeed=util.bound(1.8-(str-10)*0.02-size*0.1, 0.70, 1.8)
+ self.combat.physspeed=util.bound(1.8-(str-10)*0.02-size*0.1, 0.80, 1.8)
end,
on_wear = function(self, who)
self.worn_by = who
local size = self.worn_by.size_category-3
local str = self.worn_by:getStr()
- self.combat.physspeed=util.bound(1.8-(str-10)*0.02-size*0.1, 0.70, 1.8)
+ self.combat.physspeed=util.bound(1.8-(str-10)*0.02-size*0.1, 0.80, 1.8)
end,
on_takeoff = function(self, who)
self.worn_by = nil
@@ -4976,7 +4976,7 @@ newEntity{ base = "BASE_SHIELD", --Thanks SageAcrin!
who:project(burst, target.x, target.y, engine.DamageType.ICE, 30)
game.level.map:particleEmitter(who.x, who.y, burst.radius, "breath_cold", {radius=burst.radius, tx=target.x-who.x, ty=target.y-who.y})
- game.logSeen(who, "A burst of chilling water launches from %s's shield to %s!", who.name:capitalize(), target.name:capitalize())
+ who:logCombat(target, "A wave of icy water bursts out from #Source#'s shield towards #Target#!")
end
end,
}
@@ -5506,12 +5506,12 @@ newEntity{ base = "BASE_TOOL_MISC", --Thanks Alex!
self.wielder.combat_spellspeed = self.wielder.combat_spellspeed - direction * 0.04
self.wielder.combat_mindspeed = self.wielder.combat_mindspeed - direction * 0.04
- if self.wielder.resists.all == -10 then
+ if self.wielder.resists.all <= -10 then
self.wielder.inc_damage.all = 10
game.logPlayer(who, "#GOLD#As the final sands drop into place, you feel a surge of power.")
self.finished=true
end
- if self.wielder.resists.all == 10 then
+ if self.wielder.resists.all >= 10 then
self.wielder.flat_damage_armor.all = 10
game.logPlayer(who, "#GOLD#As the final sands drop into place, you suddenly feel safer.")
self.finished=true
diff --git a/game/modules/tome/data/gfx/particles/meleestorm.lua b/game/modules/tome/data/gfx/particles/meleestorm.lua
index 668d290010d5352ec69e7195a80796e519434e66..e15db43aa2682b7146c51b463299ebe20376dd87 100644
--- a/game/modules/tome/data/gfx/particles/meleestorm.lua
+++ b/game/modules/tome/data/gfx/particles/meleestorm.lua
@@ -31,7 +31,7 @@ return {
return {
trail = 0,
life = 8,
- size = 80, sizev = 8 * radius, sizea = 0,
+ size = 90, sizev = 12 * radius, sizea = 0,
x = 0, xv = 0, xa = 0,
y = 0, yv = 0, ya = 0,
diff --git a/game/modules/tome/data/gfx/particles/meleestorm2.lua b/game/modules/tome/data/gfx/particles/meleestorm2.lua
new file mode 100644
index 0000000000000000000000000000000000000000..1040827bb1b511233eb064674f6ed3ecc4a4c710
--- /dev/null
+++ b/game/modules/tome/data/gfx/particles/meleestorm2.lua
@@ -0,0 +1,50 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+local rot = rng.range(0,359)
+local img = img or "spinningwinds_black"
+local radius = radius or 1
+
+use_shader = {type="spinningwinds2", ellipsoidalFactor={1,1}, time_factor=2000, noup=0.0, verticalIntensityAdjust=-3.0}
+base_size = 64
+
+local first = true
+return {
+ system_rotation = rot, system_rotationv = 0,
+ generator = function()
+ return {
+ trail = 0,
+ life = 8,
+ size = 90, sizev = 12 * radius, sizea = 0,
+
+ x = 0, xv = 0, xa = 0,
+ y = 0, yv = 0, ya = 0,
+ dir = 0, dirv = dirv, dira = 0,
+ vel = 0, velv = 0, vela = 0,
+
+ r = 1, rv = 0, ra = 0,
+ g = 1, gv = 0, ga = 0,
+ b = 1, bv = 0, ba = 0,
+ a = 1, av = -0.05, aa = 0,
+ }
+end, },
+function(self)
+ if first then self.ps:emit(1) first = false end
+end,
+1, "particles_images/"..img
diff --git a/game/modules/tome/data/gfx/particles/shader_ring_rotating.lua b/game/modules/tome/data/gfx/particles/shader_ring_rotating.lua
index efa58dccb1c95b7c471e5110f079a86956a57838..ecf3da4dce7ce8817eefdea4d0242c1b5dde0a9a 100644
--- a/game/modules/tome/data/gfx/particles/shader_ring_rotating.lua
+++ b/game/modules/tome/data/gfx/particles/shader_ring_rotating.lua
@@ -40,7 +40,7 @@ return {
r = 1, rv = 0, ra = 0,
g = 1, gv = 0, ga = 0,
b = 1, bv = 0, ba = 0,
- a = 1, av = 0, aa = 0,
+ a = a or 1, av = 0, aa = 0,
}
end, },
function(self)
diff --git a/game/modules/tome/data/gfx/particles/shader_shield_temp.lua b/game/modules/tome/data/gfx/particles/shader_shield_temp.lua
new file mode 100644
index 0000000000000000000000000000000000000000..b194295b2bd270631b918fade91221eb14bc4409
--- /dev/null
+++ b/game/modules/tome/data/gfx/particles/shader_shield_temp.lua
@@ -0,0 +1,52 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+base_size = 64
+
+local r = 1
+local g = 1
+local b = 1
+local a = a or 1
+local first = false
+
+return { generator = function()
+ return {
+ trail = 0,
+ life = life or 15,
+ size = 2*38 * (size_factor or 1), sizev = sizev or 0, sizea = sizea or 0,
+
+ x = (x or 0) * 64, xv = 0, xa = 0,
+ y = (y or 0) * 64, yv = 0, ya = 0,
+ dir = 0, dirv = dirv, dira = 0,
+ vel = 0, velv = 0, vela = 0,
+
+ r = r, rv = 0, ra = 0,
+ g = g, gv = 0, ga = 0,
+ b = b, bv = 0, ba = 0,
+ a = a, av = -0.2 / life, aa = -0.002,
+ }
+end, },
+function(self)
+ if not first then
+ self.ps:emit(1)
+ first = true
+ end
+end,
+1,
+"particles_images/"..(img or "runicshield_purple")
diff --git a/game/modules/tome/data/gfx/particles_images/healarcane.png b/game/modules/tome/data/gfx/particles_images/healarcane.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b7a8d2c22bbbc382cb3ae21d2bc08c495ea9761
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/healarcane.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/healcelestial.png b/game/modules/tome/data/gfx/particles_images/healcelestial.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3b56b012dd7d2290bee93a037b72b4070cd5f7d
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/healcelestial.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/healdark.png b/game/modules/tome/data/gfx/particles_images/healdark.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d2b241bf2e404aba8e676081862bd39dbe99c1b
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/healdark.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/healgreen.png b/game/modules/tome/data/gfx/particles_images/healgreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..340edd859e56ba3ed3a7693ea9f0acff3f907712
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/healgreen.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/healparadox.png b/game/modules/tome/data/gfx/particles_images/healparadox.png
new file mode 100644
index 0000000000000000000000000000000000000000..687f6f87c06695928461c997b1c79f7803b9fde8
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/healparadox.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/runicshield.png b/game/modules/tome/data/gfx/particles_images/runicshield.png
new file mode 100644
index 0000000000000000000000000000000000000000..e50a6ae9da01273204d6ddd19677b99a56eb1cec
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/runicshield.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/runicshield_dark.png b/game/modules/tome/data/gfx/particles_images/runicshield_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5716f39c425ff960c9e5192c027722d849f78d96
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/runicshield_dark.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/runicshield_purple.png b/game/modules/tome/data/gfx/particles_images/runicshield_purple.png
new file mode 100644
index 0000000000000000000000000000000000000000..71343af9f13cc7f8f96599f0994992394921eb56
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/runicshield_purple.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/runicshield_teal.png b/game/modules/tome/data/gfx/particles_images/runicshield_teal.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7c0e2bdfd0457a7c7755eb5b5dd3f19087e0a61
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/runicshield_teal.png differ
diff --git a/game/modules/tome/data/gfx/particles_images/runicshield_yellow.png b/game/modules/tome/data/gfx/particles_images/runicshield_yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dfd738960d4445b314fc31b807a332754ab9a1e
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/runicshield_yellow.png differ
diff --git a/game/modules/tome/data/gfx/shaders/distort.frag b/game/modules/tome/data/gfx/shaders/distort.frag
index f352d906cbefeda5fe9e56639d08391792323d70..40c2b87e04d2d563a915f7e41cb1ce5caafa7bc2 100644
--- a/game/modules/tome/data/gfx/shaders/distort.frag
+++ b/game/modules/tome/data/gfx/shaders/distort.frag
@@ -1,16 +1,16 @@
-uniform sampler2D tex;
-uniform float tick;
-uniform sampler2D mainfbo;
-uniform vec2 texSize;
-uniform float power;
-uniform float power_time;
-uniform float power_amp;
-uniform float blacken;
-
-void main(void)
-{
- float distortionPower = power * (abs(cos(tick / power_time)) * power_amp + 1 - power_amp);
- vec4 distortionColor = texture2D(tex, gl_TexCoord[0].xy);
- vec2 distortionOffset = vec2(distortionColor.r - 0.5f, distortionColor.g - 0.5f) * distortionPower;
- gl_FragColor = texture2D(mainfbo, gl_FragCoord.xy / texSize.xy + distortionOffset.xy) * (1.0 - length(distortionOffset) * blacken);
-}
+uniform sampler2D tex;
+uniform float tick;
+uniform sampler2D mainfbo;
+uniform vec2 texSize;
+uniform float power;
+uniform float power_time;
+uniform float power_amp;
+uniform float blacken;
+
+void main(void)
+{
+ float distortionPower = power * (abs(cos(tick / power_time)) * power_amp + 1.0 - power_amp);
+ vec4 distortionColor = texture2D(tex, gl_TexCoord[0].xy);
+ vec2 distortionOffset = vec2(distortionColor.r - 0.5, distortionColor.g - 0.5) * distortionPower;
+ gl_FragColor = texture2D(mainfbo, gl_FragCoord.xy / texSize.xy + distortionOffset.xy) * (1.0 - length(distortionOffset) * blacken);
+}
diff --git a/game/modules/tome/data/gfx/shaders/fireball.frag b/game/modules/tome/data/gfx/shaders/fireball.frag
index 176ce1940559671b573da269a0e71360e346f8bf..4bc1c8c4571526823c6b3862a2a1366a201ef8c0 100644
--- a/game/modules/tome/data/gfx/shaders/fireball.frag
+++ b/game/modules/tome/data/gfx/shaders/fireball.frag
@@ -1,230 +1,230 @@
-uniform sampler2D tex;
-uniform float tick;
-uniform float time_factor;
-
-
-vec4 permute( vec4 x ) {
-
- return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
-
-}
-
-vec4 taylorInvSqrt( vec4 r ) {
-
- return 1.79284291400159 - 0.85373472095314 * r;
-
-}
-
-float snoise( vec3 v ) {
-
- const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
- const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
-
- // First corner
-
- vec3 i = floor( v + dot( v, C.yyy ) );
- vec3 x0 = v - i + dot( i, C.xxx );
-
- // Other corners
-
- vec3 g = step( x0.yzx, x0.xyz );
- vec3 l = 1.0 - g;
- vec3 i1 = min( g.xyz, l.zxy );
- vec3 i2 = max( g.xyz, l.zxy );
-
- vec3 x1 = x0 - i1 + 1.0 * C.xxx;
- vec3 x2 = x0 - i2 + 2.0 * C.xxx;
- vec3 x3 = x0 - 1. + 3.0 * C.xxx;
-
- // Permutations
-
- i = mod( i, 289.0 );
- vec4 p = permute( permute( permute(
- i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
- + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
- + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
-
- // Gradients
- // ( N*N points uniformly over a square, mapped onto an octahedron.)
-
- float n_ = 1.0 / 7.0; // N=7
-
- vec3 ns = n_ * D.wyz - D.xzx;
-
- vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
-
- vec4 x_ = floor( j * ns.z );
- vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
-
- vec4 x = x_ *ns.x + ns.yyyy;
- vec4 y = y_ *ns.x + ns.yyyy;
- vec4 h = 1.0 - abs( x ) - abs( y );
-
- vec4 b0 = vec4( x.xy, y.xy );
- vec4 b1 = vec4( x.zw, y.zw );
-
-
- vec4 s0 = floor( b0 ) * 2.0 + 1.0;
- vec4 s1 = floor( b1 ) * 2.0 + 1.0;
- vec4 sh = -step( h, vec4( 0.0 ) );
-
- vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
- vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
-
- vec3 p0 = vec3( a0.xy, h.x );
- vec3 p1 = vec3( a0.zw, h.y );
- vec3 p2 = vec3( a1.xy, h.z );
- vec3 p3 = vec3( a1.zw, h.w );
-
- // Normalise gradients
-
- vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
- p0 *= norm.x;
- p1 *= norm.y;
- p2 *= norm.z;
- p3 *= norm.w;
-
- // Mix final noise value
-
- vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
- m = m * m;
- return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
- dot( p2, x2 ), dot( p3, x3 ) ) );
-
-}
-
-vec2 snoise2(vec3 pos)
-{
- return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
-}
-
-float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
-{
- //firewall
- float delta = 0;
-// pos.y += (1.0 - pos.y) * 0.5;
- //pos.y += 0.5;
- pos.y /= stretchMult;
- pos *= freqMult;
- pos.y += currTime * scrollSpeed;
-// pos.y -= currTime * 3.0;
-
-
- delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
-
- return delta;
-}
-vec4 GetFireColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult)
-{
- float delta = GetFireDelta(currTime, pos, freqMult, stretchMult, 3.0, 0.5);
- delta *= min(1.0, max(0.0, 1.0 * (1.0 - pos.y)));
- delta *= min(1.0, max(0.0, 1.0 * (0.0 + pos.y)));
- vec2 displacedPoint = pos + vec2(0, delta * ampMult);
- displacedPoint.y = min(0.99, displacedPoint.y);
- displacedPoint.y = max(0.01, displacedPoint.y);
-
- return texture2D(tex, displacedPoint);
-}
-
-vec4 GetCheckboardColor(vec2 pos)
-{
- vec4 col = vec4(0.0, 0.0, 0.0, 0.0);
- if(pos.x > 0.0 && pos.x < 1.0 && pos.y > 0.0 && pos.y < 1.0)
- {
- if(mod(pos.x, 0.1) < 0.05 ^^ mod(pos.y, 0.1) < 0.05)
- col = vec4(pos.x, pos.y, 0.0, 1.0);
- else
- col = vec4(0.0, 0.0, 0.0, 1.0);
- }
- return col;
-}
-
-vec4 GetFireBallColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius1, float radius2, vec2 velocity, float paletteCoord)
-{
- float pi = 3.141593;
- vec2 velocityDir = vec2(1, 0);
- if(length(velocity) > 0)
- velocityDir = velocity / length(velocity);
- vec2 velocityPerp = vec2(-velocityDir.y, velocityDir.x);
-
- float ang = atan(dot(pos, velocityPerp), dot(pos, velocityDir));
- vec4 fireballColor = vec4(0.0, 0.0, 0.0, 0.0);
- if(length(pos) < radius1)
- {
- float sinAlpha = length(pos) / radius1;
- float alpha = 0.0;
- alpha = asin(sinAlpha);
-
- vec2 sphericalProjectedCoord = vec2(0.5, 0.5) + pos * (alpha / (3.141592 / 2.0)) / length(pos);
- //fireballColor = GetCheckboardColor(sphericalProjectedCoord);
- float delta = GetFireDelta(currTime, sphericalProjectedCoord, freqMult * 0.1, 1.0, 0.0, 1.5) * (1.0 - pow(length(pos) / radius1, 3.0)) * 0.5;
-
- float verticalPos = 0.99 - delta * delta;
- verticalPos = min(0.99, verticalPos);
- verticalPos = max(0.01, verticalPos);
-
- fireballColor = texture2D(tex, vec2(0.75, verticalPos));
- fireballColor.a = 1.0;
- }else
- {
- float dist = (length(pos) - radius1) / (radius2 - radius1);
-
-
- vec2 polarPos = vec2(ang, dist);
-
- float dstAng = (1.0 - pow(1.0 - abs(polarPos.x / pi), 4.0)) * pi;
- if(polarPos.x < 0.0) dstAng = -dstAng;
-
- polarPos.x = dstAng + (polarPos.x - dstAng) * exp(-polarPos.y * 2.0);
- polarPos.y *= 0.15 + 1.4 * pow(abs(polarPos.x) / pi, 2.0);
- //polarPos.y *= exp(-(1.0 - pow(abs(polarPos.x) / pi, 2.0)) * 2.0);
-
- //polarPos.x = (1.0 - pow(1.0 - abs(polarPos.x / pi), 1.0)) * pi;
- //polarPos.x *= 2.0 - 1.0 * exp(-(1.0 - pow(1.0 - abs(polarPos.x) / pi, 3.0)) * 5.0 * polarPos.y);
- //polarPos.x *= 1.0 + 1.0 * exp(-abs(polarPos.x));//0.1 + 0.9 * (1.0 - pow(1.0 - abs(polarPos.x) / pi, 0.5));
-
-
- vec2 planarPos = vec2((polarPos.x + pi) / (2.0 * pi), 1.0 - polarPos.y * 1.0);
-
- if(planarPos.y > 0.0)
- {
- //return GetCheckboardColor(planarPos);
-
- float delta =
- GetFireDelta(currTime, planarPos, freqMult, stretchMult, 2.5, 0.5) * (1.0 - planarPos.x) +
- GetFireDelta(currTime, vec2(planarPos.x - 1.0, planarPos.y), freqMult, stretchMult, 2.5, 0.5) * planarPos.x;
-
- delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
- delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
-
- float verticalPos = planarPos.y + delta * ampMult;
- verticalPos = min(0.99, verticalPos);
- verticalPos = max(0.01, verticalPos);
-
- fireballColor = texture2D(tex, vec2(0.25, verticalPos));
- }
- }
- return fireballColor;
-}
-
-void main(void)
-{
- vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
-
- //on-hit wobbling effect
- float radiusLen = length(radius);
-
-
- float ballRadius = 0.1;
- float coronaWidth = 0.05;
-
- vec4 c;
- c = GetFireBallColor(tick / time_factor + 0.0 , radius, 6, 15.0, 1, 2, ballRadius, ballRadius + coronaWidth, vec2(1, 0), 0.75);
- c.a *= gl_Color.a;
-
- gl_FragColor = c;
-}
+uniform sampler2D tex;
+uniform float tick;
+uniform float time_factor;
+
+
+vec4 permute( vec4 x ) {
+
+ return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
+
+}
+
+vec4 taylorInvSqrt( vec4 r ) {
+
+ return 1.79284291400159 - 0.85373472095314 * r;
+
+}
+
+float snoise( vec3 v ) {
+
+ const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
+ const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
+
+ // First corner
+
+ vec3 i = floor( v + dot( v, C.yyy ) );
+ vec3 x0 = v - i + dot( i, C.xxx );
+
+ // Other corners
+
+ vec3 g = step( x0.yzx, x0.xyz );
+ vec3 l = 1.0 - g;
+ vec3 i1 = min( g.xyz, l.zxy );
+ vec3 i2 = max( g.xyz, l.zxy );
+
+ vec3 x1 = x0 - i1 + 1.0 * C.xxx;
+ vec3 x2 = x0 - i2 + 2.0 * C.xxx;
+ vec3 x3 = x0 - 1. + 3.0 * C.xxx;
+
+ // Permutations
+
+ i = mod( i, 289.0 );
+ vec4 p = permute( permute( permute(
+ i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
+ + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
+ + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
+
+ // Gradients
+ // ( N*N points uniformly over a square, mapped onto an octahedron.)
+
+ float n_ = 1.0 / 7.0; // N=7
+
+ vec3 ns = n_ * D.wyz - D.xzx;
+
+ vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
+
+ vec4 x_ = floor( j * ns.z );
+ vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
+
+ vec4 x = x_ *ns.x + ns.yyyy;
+ vec4 y = y_ *ns.x + ns.yyyy;
+ vec4 h = 1.0 - abs( x ) - abs( y );
+
+ vec4 b0 = vec4( x.xy, y.xy );
+ vec4 b1 = vec4( x.zw, y.zw );
+
+
+ vec4 s0 = floor( b0 ) * 2.0 + 1.0;
+ vec4 s1 = floor( b1 ) * 2.0 + 1.0;
+ vec4 sh = -step( h, vec4( 0.0 ) );
+
+ vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
+ vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
+
+ vec3 p0 = vec3( a0.xy, h.x );
+ vec3 p1 = vec3( a0.zw, h.y );
+ vec3 p2 = vec3( a1.xy, h.z );
+ vec3 p3 = vec3( a1.zw, h.w );
+
+ // Normalise gradients
+
+ vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
+ p0 *= norm.x;
+ p1 *= norm.y;
+ p2 *= norm.z;
+ p3 *= norm.w;
+
+ // Mix final noise value
+
+ vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
+ m = m * m;
+ return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
+ dot( p2, x2 ), dot( p3, x3 ) ) );
+
+}
+
+vec2 snoise2(vec3 pos)
+{
+ return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
+}
+
+float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
+{
+ //firewall
+ float delta = 0.0;
+// pos.y += (1.0 - pos.y) * 0.5;
+ //pos.y += 0.5;
+ pos.y /= stretchMult;
+ pos *= freqMult;
+ pos.y += currTime * scrollSpeed;
+// pos.y -= currTime * 3.0;
+
+
+ delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
+
+ return delta;
+}
+vec4 GetFireColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult)
+{
+ float delta = GetFireDelta(currTime, pos, freqMult, stretchMult, 3.0, 0.5);
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - pos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + pos.y)));
+ vec2 displacedPoint = pos + vec2(0, delta * ampMult);
+ displacedPoint.y = min(0.99, displacedPoint.y);
+ displacedPoint.y = max(0.01, displacedPoint.y);
+
+ return texture2D(tex, displacedPoint);
+}
+
+vec4 GetCheckboardColor(vec2 pos)
+{
+ vec4 col = vec4(0.0, 0.0, 0.0, 0.0);
+ if(pos.x > 0.0 && pos.x < 1.0 && pos.y > 0.0 && pos.y < 1.0)
+ {
+ if(mod(pos.x, 0.1) < 0.05 ^^ mod(pos.y, 0.1) < 0.05)
+ col = vec4(pos.x, pos.y, 0.0, 1.0);
+ else
+ col = vec4(0.0, 0.0, 0.0, 1.0);
+ }
+ return col;
+}
+
+vec4 GetFireBallColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius1, float radius2, vec2 velocity, float paletteCoord)
+{
+ float pi = 3.141593;
+ vec2 velocityDir = vec2(1.0, 0.0);
+ if(length(velocity) > 0.0)
+ velocityDir = velocity / length(velocity);
+ vec2 velocityPerp = vec2(-velocityDir.y, velocityDir.x);
+
+ float ang = atan(dot(pos, velocityPerp), dot(pos, velocityDir));
+ vec4 fireballColor = vec4(0.0, 0.0, 0.0, 0.0);
+ if(length(pos) < radius1)
+ {
+ float sinAlpha = length(pos) / radius1;
+ float alpha = 0.0;
+ alpha = asin(sinAlpha);
+
+ vec2 sphericalProjectedCoord = vec2(0.5, 0.5) + pos * (alpha / (3.141592 / 2.0)) / length(pos);
+ //fireballColor = GetCheckboardColor(sphericalProjectedCoord);
+ float delta = GetFireDelta(currTime, sphericalProjectedCoord, freqMult * 0.1, 1.0, 0.0, 1.5) * (1.0 - pow(length(pos) / radius1, 3.0)) * 0.5;
+
+ float verticalPos = 0.99 - delta * delta;
+ verticalPos = min(0.99, verticalPos);
+ verticalPos = max(0.01, verticalPos);
+
+ fireballColor = texture2D(tex, vec2(0.75, verticalPos));
+ fireballColor.a = 1.0;
+ }else
+ {
+ float dist = (length(pos) - radius1) / (radius2 - radius1);
+
+
+ vec2 polarPos = vec2(ang, dist);
+
+ float dstAng = (1.0 - pow(1.0 - abs(polarPos.x / pi), 4.0)) * pi;
+ if(polarPos.x < 0.0) dstAng = -dstAng;
+
+ polarPos.x = dstAng + (polarPos.x - dstAng) * exp(-polarPos.y * 2.0);
+ polarPos.y *= 0.15 + 1.4 * pow(abs(polarPos.x) / pi, 2.0);
+ //polarPos.y *= exp(-(1.0 - pow(abs(polarPos.x) / pi, 2.0)) * 2.0);
+
+ //polarPos.x = (1.0 - pow(1.0 - abs(polarPos.x / pi), 1.0)) * pi;
+ //polarPos.x *= 2.0 - 1.0 * exp(-(1.0 - pow(1.0 - abs(polarPos.x) / pi, 3.0)) * 5.0 * polarPos.y);
+ //polarPos.x *= 1.0 + 1.0 * exp(-abs(polarPos.x));//0.1 + 0.9 * (1.0 - pow(1.0 - abs(polarPos.x) / pi, 0.5));
+
+
+ vec2 planarPos = vec2((polarPos.x + pi) / (2.0 * pi), 1.0 - polarPos.y * 1.0);
+
+ if(planarPos.y > 0.0)
+ {
+ //return GetCheckboardColor(planarPos);
+
+ float delta =
+ GetFireDelta(currTime, planarPos, freqMult, stretchMult, 2.5, 0.5) * (1.0 - planarPos.x) +
+ GetFireDelta(currTime, vec2(planarPos.x - 1.0, planarPos.y), freqMult, stretchMult, 2.5, 0.5) * planarPos.x;
+
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
+
+ float verticalPos = planarPos.y + delta * ampMult;
+ verticalPos = min(0.99, verticalPos);
+ verticalPos = max(0.01, verticalPos);
+
+ fireballColor = texture2D(tex, vec2(0.25, verticalPos));
+ }
+ }
+ return fireballColor;
+}
+
+void main(void)
+{
+ vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
+
+ //on-hit wobbling effect
+ float radiusLen = length(radius);
+
+
+ float ballRadius = 0.1;
+ float coronaWidth = 0.05;
+
+ vec4 c;
+ c = GetFireBallColor(tick / time_factor + 0.0 , radius, 6.0, 15.0, 1.0, 2.9, ballRadius, ballRadius + coronaWidth, vec2(1.0, 0.0), 0.75);
+ c.a *= gl_Color.a;
+
+ gl_FragColor = c;
+}
diff --git a/game/modules/tome/data/gfx/shaders/fireboom.frag b/game/modules/tome/data/gfx/shaders/fireboom.frag
index 5441c3fcedf680b4eb2748a3cff67466186435f4..ee6d00572629dc8fb66f996e261031ea12ceb590 100644
--- a/game/modules/tome/data/gfx/shaders/fireboom.frag
+++ b/game/modules/tome/data/gfx/shaders/fireboom.frag
@@ -1,250 +1,250 @@
-uniform sampler2D tex;
-uniform float tick;
-uniform float tick_start;
-uniform float time_factor;
-uniform float ellipsoidalFactor; //1 is perfect circle, >1 is ellipsoidal
-uniform float oscillationSpeed; //oscillation between ellipsoidal and spherical form
-
-vec4 permute( vec4 x ) {
-
- return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
-
-}
-
-vec4 taylorInvSqrt( vec4 r ) {
-
- return 1.79284291400159 - 0.85373472095314 * r;
-
-}
-
-float snoise( vec3 v ) {
-
- const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
- const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
-
- // First corner
-
- vec3 i = floor( v + dot( v, C.yyy ) );
- vec3 x0 = v - i + dot( i, C.xxx );
-
- // Other corners
-
- vec3 g = step( x0.yzx, x0.xyz );
- vec3 l = 1.0 - g;
- vec3 i1 = min( g.xyz, l.zxy );
- vec3 i2 = max( g.xyz, l.zxy );
-
- vec3 x1 = x0 - i1 + 1.0 * C.xxx;
- vec3 x2 = x0 - i2 + 2.0 * C.xxx;
- vec3 x3 = x0 - 1. + 3.0 * C.xxx;
-
- // Permutations
-
- i = mod( i, 289.0 );
- vec4 p = permute( permute( permute(
- i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
- + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
- + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
-
- // Gradients
- // ( N*N points uniformly over a square, mapped onto an octahedron.)
-
- float n_ = 1.0 / 7.0; // N=7
-
- vec3 ns = n_ * D.wyz - D.xzx;
-
- vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
-
- vec4 x_ = floor( j * ns.z );
- vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
-
- vec4 x = x_ *ns.x + ns.yyyy;
- vec4 y = y_ *ns.x + ns.yyyy;
- vec4 h = 1.0 - abs( x ) - abs( y );
-
- vec4 b0 = vec4( x.xy, y.xy );
- vec4 b1 = vec4( x.zw, y.zw );
-
-
- vec4 s0 = floor( b0 ) * 2.0 + 1.0;
- vec4 s1 = floor( b1 ) * 2.0 + 1.0;
- vec4 sh = -step( h, vec4( 0.0 ) );
-
- vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
- vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
-
- vec3 p0 = vec3( a0.xy, h.x );
- vec3 p1 = vec3( a0.zw, h.y );
- vec3 p2 = vec3( a1.xy, h.z );
- vec3 p3 = vec3( a1.zw, h.w );
-
- // Normalise gradients
-
- vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
- p0 *= norm.x;
- p1 *= norm.y;
- p2 *= norm.z;
- p3 *= norm.w;
-
- // Mix final noise value
-
- vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
- m = m * m;
- return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
- dot( p2, x2 ), dot( p3, x3 ) ) );
-
-}
-
-vec2 snoise2(vec3 pos)
-{
- return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
-}
-
-/*float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
-{
- //firewall
- float delta = 0;
-// pos.y += (1.0 - pos.y) * 0.5;
- //pos.y += 0.5;
- pos.y /= stretchMult;
- pos *= freqMult;
- pos.y += currTime * scrollSpeed;
-// pos.y -= currTime * 3.0;
-
-
- delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
-
- return delta;
-}*/
-
-float GetLavaDelta(float currTime, vec2 pos, float freqMult, float evolutionSpeed)
-{
- float delta = 0;
- pos *= freqMult;
-
- delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 0.2;
- delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.1;
-
- return delta;
-}
-
-vec4 GetCheckboardColor(vec2 pos)
-{
- vec4 col = vec4(0.0, 0.0, 0.0, 0.0);
- /*if(pos.x > 0.0 && pos.x < 1.0 && pos.y > 0.0 && pos.y < 1.0)
- {
- if(mod(pos.x, 0.1) < 0.05 ^ mod(pos.y, 0.1) < 0.05)
-// col = vec4(pos.x, pos.y, 0.0, 1.0);
- col = vec4(1.0, 1.0, 1.0, 1.0);
- else
- col = vec4(0.0, 0.0, 0.0, 1.0);
- }*/
- return col;
-}
-
-vec4 GetShockwaveColor(float currTime, vec2 pos, float radius1, float radius2)
-{
- vec4 shockwaveColor = vec4(0.0, 0.0, 0.0, 0.0);
-
- float ratio = (length(pos) - radius1) / (radius2 - radius1);
- if(ratio > 0.0 && ratio < 1.0)
- {
- shockwaveColor = vec4(.7, .6, .5, pow(ratio, 5.0) * (1.0 - ratio) * 10.0);
- }
- return shockwaveColor;
-}
-
-vec4 GetExplosionColor(float currTime, vec2 pos, float radius1, float radius2, float density, float stage, float paletteCoord)
-{
- vec4 fireballColor = vec4(0.0, 0.0, 0.0, 0.0);
- float pi = 3.141592;
-
- vec2 sphericalProjectedCoord = vec2(0.0, 0.0);
- float currRadius = radius2;
- float delta;
- float alpha = 0;
- float ratio = 0;
-
- int i = 0;
- for(i = 0; i < 10; i++)
- {
- float sinAlpha = length(pos) / currRadius;
- if(abs(sinAlpha) < 1.0)
- {
- alpha = asin(sinAlpha);
-
- sphericalProjectedCoord = vec2(0.5, 0.5) + pos * (alpha / (pi / 2.0)) / length(pos) * 0.1;
- //fireballColor = GetCheckboardColor(sphericalProjectedCoord);
- delta = GetLavaDelta(currTime, sphericalProjectedCoord, 9.0, 2.0);
-
- ratio = 1.0 / (1.0 + exp(delta * 3.0 + 0.5));
- //ratio = exp(-pow(delta, 1.0) * 10.0);
- float newRadius = radius2 + (radius1 - radius2) * ratio;
- if(abs(newRadius - currRadius) < 0.001)
- {
- break;
- }else
- {
- currRadius = currRadius + 0.2 * (newRadius - currRadius);
- }
- }else
- {
- return vec4(0.0, 0.0, 0.0, 0.0);
- }
- }
- float antialiasingMult = max(0.0, min(1.0, (1.0 - alpha / (pi / 2.0)) * 10.0));
- /*fireballColor = GetCheckboardColor(sphericalProjectedCoord);
- fireballColor.r = 1.0 / 30.0 * i;*/
- vec3 normalVector = vec3(pos.x, pos.y, 0);
- normalVector.z = -sqrt(radius2 * radius2 - dot(pos, pos));
- normalVector = normalize(normalVector);
-
- vec3 lightVector = normalize(vec3(-1, 1, 1));
- float light = 0.2; //ambient
- light += max(0, -0.8 * dot(normalVector, lightVector));
- //light += max(0, reflect(lightVector, normalVector) * vec3(0, 0, 1));
-
-
- float verticalPos = 0.01 + (1.0 - stage) * 0.7 + ratio;
- verticalPos = min(0.99, verticalPos);
- verticalPos = max(0.01, verticalPos);
-
- fireballColor = texture2D(tex, vec2(0.75, verticalPos));
- fireballColor.rgb *= light;
- fireballColor.a = 1.0 - exp(-cos(alpha) * density);
- //fireballColor.a = min(1.0, fireballColor.a * antialiasingMult);
- return fireballColor;
-}
-
-void main(void)
-{
- /*float delta = GetLavaDelta(tick / time_factor, gl_TexCoord[0].xy, 2.0, 1.0);
- float ratio = 1.0 - exp(-delta * delta * 20.0);
- gl_FragColor = vec4(1, 1, 1, ratio);
- return;*/
- vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
-
- radius.x *= (1.0 + ellipsoidalFactor) * 0.5 + (ellipsoidalFactor - 1.0) * 0.5 * pow(cos(tick / time_factor * oscillationSpeed), 2.0);
-
- //on-hit wobbling effect
- float radiusLen = length(radius);
-
- float explosionStage = (1.0 + sin(tick / time_factor * 20.0)) * 0.5;
-
- float ballRadius = 0.3 * ((tick - tick_start) / ((30.0 - 19.0) / 30.0 * 1000.0));
- float reliefDepth = 0.05;
- vec4 explosionColor = GetExplosionColor(tick / time_factor + 0.0 , radius, ballRadius - reliefDepth, ballRadius, 4.0, explosionStage, 0.75);
-
- float shockwaveRadius = 0.25;
- float shockwaveWidth = mix(0.05, 0.25, min(1.0, ((tick - tick_start) / ((30.0 - 19.0) / 30.0 * 1000.0))));
- vec4 shockwaveColor = GetShockwaveColor(tick / time_factor, radius, shockwaveRadius, shockwaveRadius + shockwaveWidth);
-
- gl_FragColor = shockwaveColor * shockwaveColor.a + explosionColor * (1.0 - shockwaveColor.a);
-}
+uniform sampler2D tex;
+uniform float tick;
+uniform float tick_start;
+uniform float time_factor;
+uniform float ellipsoidalFactor; //1 is perfect circle, >1 is ellipsoidal
+uniform float oscillationSpeed; //oscillation between ellipsoidal and spherical form
+
+vec4 permute( vec4 x ) {
+
+ return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
+
+}
+
+vec4 taylorInvSqrt( vec4 r ) {
+
+ return 1.79284291400159 - 0.85373472095314 * r;
+
+}
+
+float snoise( vec3 v ) {
+
+ const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
+ const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
+
+ // First corner
+
+ vec3 i = floor( v + dot( v, C.yyy ) );
+ vec3 x0 = v - i + dot( i, C.xxx );
+
+ // Other corners
+
+ vec3 g = step( x0.yzx, x0.xyz );
+ vec3 l = 1.0 - g;
+ vec3 i1 = min( g.xyz, l.zxy );
+ vec3 i2 = max( g.xyz, l.zxy );
+
+ vec3 x1 = x0 - i1 + 1.0 * C.xxx;
+ vec3 x2 = x0 - i2 + 2.0 * C.xxx;
+ vec3 x3 = x0 - 1. + 3.0 * C.xxx;
+
+ // Permutations
+
+ i = mod( i, 289.0 );
+ vec4 p = permute( permute( permute(
+ i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
+ + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
+ + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
+
+ // Gradients
+ // ( N*N points uniformly over a square, mapped onto an octahedron.)
+
+ float n_ = 1.0 / 7.0; // N=7
+
+ vec3 ns = n_ * D.wyz - D.xzx;
+
+ vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
+
+ vec4 x_ = floor( j * ns.z );
+ vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
+
+ vec4 x = x_ *ns.x + ns.yyyy;
+ vec4 y = y_ *ns.x + ns.yyyy;
+ vec4 h = 1.0 - abs( x ) - abs( y );
+
+ vec4 b0 = vec4( x.xy, y.xy );
+ vec4 b1 = vec4( x.zw, y.zw );
+
+
+ vec4 s0 = floor( b0 ) * 2.0 + 1.0;
+ vec4 s1 = floor( b1 ) * 2.0 + 1.0;
+ vec4 sh = -step( h, vec4( 0.0 ) );
+
+ vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
+ vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
+
+ vec3 p0 = vec3( a0.xy, h.x );
+ vec3 p1 = vec3( a0.zw, h.y );
+ vec3 p2 = vec3( a1.xy, h.z );
+ vec3 p3 = vec3( a1.zw, h.w );
+
+ // Normalise gradients
+
+ vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
+ p0 *= norm.x;
+ p1 *= norm.y;
+ p2 *= norm.z;
+ p3 *= norm.w;
+
+ // Mix final noise value
+
+ vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
+ m = m * m;
+ return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
+ dot( p2, x2 ), dot( p3, x3 ) ) );
+
+}
+
+vec2 snoise2(vec3 pos)
+{
+ return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
+}
+
+/*float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
+{
+ //firewall
+ float delta = 0;
+// pos.y += (1.0 - pos.y) * 0.5;
+ //pos.y += 0.5;
+ pos.y /= stretchMult;
+ pos *= freqMult;
+ pos.y += currTime * scrollSpeed;
+// pos.y -= currTime * 3.0;
+
+
+ delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
+
+ return delta;
+}*/
+
+float GetLavaDelta(float currTime, vec2 pos, float freqMult, float evolutionSpeed)
+{
+ float delta = 0.0;
+ pos *= freqMult;
+
+ delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 0.2;
+ delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.1;
+
+ return delta;
+}
+
+vec4 GetCheckboardColor(vec2 pos)
+{
+ vec4 col = vec4(0.0, 0.0, 0.0, 0.0);
+ /*if(pos.x > 0.0 && pos.x < 1.0 && pos.y > 0.0 && pos.y < 1.0)
+ {
+ if(mod(pos.x, 0.1) < 0.05 ^ mod(pos.y, 0.1) < 0.05)
+// col = vec4(pos.x, pos.y, 0.0, 1.0);
+ col = vec4(1.0, 1.0, 1.0, 1.0);
+ else
+ col = vec4(0.0, 0.0, 0.0, 1.0);
+ }*/
+ return col;
+}
+
+vec4 GetShockwaveColor(float currTime, vec2 pos, float radius1, float radius2)
+{
+ vec4 shockwaveColor = vec4(0.0, 0.0, 0.0, 0.0);
+
+ float ratio = (length(pos) - radius1) / (radius2 - radius1);
+ if(ratio > 0.0 && ratio < 1.0)
+ {
+ shockwaveColor = vec4(.7, .6, .5, pow(ratio, 5.0) * (1.0 - ratio) * 10.0);
+ }
+ return shockwaveColor;
+}
+
+vec4 GetExplosionColor(float currTime, vec2 pos, float radius1, float radius2, float density, float stage, float paletteCoord)
+{
+ vec4 fireballColor = vec4(0.0, 0.0, 0.0, 0.0);
+ float pi = 3.141592;
+
+ vec2 sphericalProjectedCoord = vec2(0.0, 0.0);
+ float currRadius = radius2;
+ float delta;
+ float alpha = 0.0;
+ float ratio = 0.0;
+
+ int i = 0;
+ for(i = 0; i < 10; i++)
+ {
+ float sinAlpha = length(pos) / currRadius;
+ if(abs(sinAlpha) < 1.0)
+ {
+ alpha = asin(sinAlpha);
+
+ sphericalProjectedCoord = vec2(0.5, 0.5) + pos * (alpha / (pi / 2.0)) / length(pos) * 0.1;
+ //fireballColor = GetCheckboardColor(sphericalProjectedCoord);
+ delta = GetLavaDelta(currTime, sphericalProjectedCoord, 9.0, 2.0);
+
+ ratio = 1.0 / (1.0 + exp(delta * 3.0 + 0.5));
+ //ratio = exp(-pow(delta, 1.0) * 10.0);
+ float newRadius = radius2 + (radius1 - radius2) * ratio;
+ if(abs(newRadius - currRadius) < 0.001)
+ {
+ break;
+ }else
+ {
+ currRadius = currRadius + 0.2 * (newRadius - currRadius);
+ }
+ }else
+ {
+ return vec4(0.0, 0.0, 0.0, 0.0);
+ }
+ }
+ float antialiasingMult = max(0.0, min(1.0, (1.0 - alpha / (pi / 2.0)) * 10.0));
+ /*fireballColor = GetCheckboardColor(sphericalProjectedCoord);
+ fireballColor.r = 1.0 / 30.0 * i;*/
+ vec3 normalVector = vec3(pos.x, pos.y, 0);
+ normalVector.z = -sqrt(radius2 * radius2 - dot(pos, pos));
+ normalVector = normalize(normalVector);
+
+ vec3 lightVector = normalize(vec3(-1, 1, 1));
+ float light = 0.2; //ambient
+ light += max(0.0, -0.8 * dot(normalVector, lightVector));
+ //light += max(0, reflect(lightVector, normalVector) * vec3(0, 0, 1));
+
+
+ float verticalPos = 0.01 + (1.0 - stage) * 0.7 + ratio;
+ verticalPos = min(0.99, verticalPos);
+ verticalPos = max(0.01, verticalPos);
+
+ fireballColor = texture2D(tex, vec2(0.75, verticalPos));
+ fireballColor.rgb *= light;
+ fireballColor.a = 1.0 - exp(-cos(alpha) * density);
+ //fireballColor.a = min(1.0, fireballColor.a * antialiasingMult);
+ return fireballColor;
+}
+
+void main(void)
+{
+ /*float delta = GetLavaDelta(tick / time_factor, gl_TexCoord[0].xy, 2.0, 1.0);
+ float ratio = 1.0 - exp(-delta * delta * 20.0);
+ gl_FragColor = vec4(1, 1, 1, ratio);
+ return;*/
+ vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
+
+ radius.x *= (1.0 + ellipsoidalFactor) * 0.5 + (ellipsoidalFactor - 1.0) * 0.5 * pow(cos(tick / time_factor * oscillationSpeed), 2.0);
+
+ //on-hit wobbling effect
+ float radiusLen = length(radius);
+
+ float explosionStage = (1.0 + sin(tick / time_factor * 20.0)) * 0.5;
+
+ float ballRadius = 0.3 * ((tick - tick_start) / ((30.0 - 19.0) / 30.0 * 1000.0));
+ float reliefDepth = 0.05;
+ vec4 explosionColor = GetExplosionColor(tick / time_factor + 0.0 , radius, ballRadius - reliefDepth, ballRadius, 4.0, explosionStage, 0.75);
+
+ float shockwaveRadius = 0.25;
+ float shockwaveWidth = mix(0.05, 0.25, min(1.0, ((tick - tick_start) / ((30.0 - 19.0) / 30.0 * 1000.0))));
+ vec4 shockwaveColor = GetShockwaveColor(tick / time_factor, radius, shockwaveRadius, shockwaveRadius + shockwaveWidth);
+
+ gl_FragColor = shockwaveColor * shockwaveColor.a + explosionColor * (1.0 - shockwaveColor.a);
+}
diff --git a/game/modules/tome/data/gfx/shaders/fireboom.lua b/game/modules/tome/data/gfx/shaders/fireboom.lua
index e7bcea92726bd31748b47f98b194610918b616fa..61921860e9e7e73d2b9f64f4b3ae8a4f09997786 100644
--- a/game/modules/tome/data/gfx/shaders/fireboom.lua
+++ b/game/modules/tome/data/gfx/shaders/fireboom.lua
@@ -27,7 +27,6 @@ return {
oscillationSpeed = oscillationSpeed or 1.0, --oscillation between ellipsoidal and spherical form
},
resetargs = {
- tick_start = function() return core.game.getTime() end,
+ tick_start = function() return core.game.getFrameTime() end,
},
- clone = false,
}
diff --git a/game/modules/tome/data/gfx/shaders/flamehands.frag b/game/modules/tome/data/gfx/shaders/flamehands.frag
index 97cd0ce7236748bdbee1f4a977d7758902794754..9d09e362226d50dbaf441dc5a35bcbb92d5517f5 100644
--- a/game/modules/tome/data/gfx/shaders/flamehands.frag
+++ b/game/modules/tome/data/gfx/shaders/flamehands.frag
@@ -1,219 +1,219 @@
-uniform sampler2D tex;
-uniform float tick;
-uniform float time_factor;
-
-
-vec4 permute( vec4 x ) {
-
- return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
-
-}
-
-vec4 taylorInvSqrt( vec4 r ) {
-
- return 1.79284291400159 - 0.85373472095314 * r;
-
-}
-
-float snoise( vec3 v ) {
-
- const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
- const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
-
- // First corner
-
- vec3 i = floor( v + dot( v, C.yyy ) );
- vec3 x0 = v - i + dot( i, C.xxx );
-
- // Other corners
-
- vec3 g = step( x0.yzx, x0.xyz );
- vec3 l = 1.0 - g;
- vec3 i1 = min( g.xyz, l.zxy );
- vec3 i2 = max( g.xyz, l.zxy );
-
- vec3 x1 = x0 - i1 + 1.0 * C.xxx;
- vec3 x2 = x0 - i2 + 2.0 * C.xxx;
- vec3 x3 = x0 - 1. + 3.0 * C.xxx;
-
- // Permutations
-
- i = mod( i, 289.0 );
- vec4 p = permute( permute( permute(
- i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
- + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
- + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
-
- // Gradients
- // ( N*N points uniformly over a square, mapped onto an octahedron.)
-
- float n_ = 1.0 / 7.0; // N=7
-
- vec3 ns = n_ * D.wyz - D.xzx;
-
- vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
-
- vec4 x_ = floor( j * ns.z );
- vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
-
- vec4 x = x_ *ns.x + ns.yyyy;
- vec4 y = y_ *ns.x + ns.yyyy;
- vec4 h = 1.0 - abs( x ) - abs( y );
-
- vec4 b0 = vec4( x.xy, y.xy );
- vec4 b1 = vec4( x.zw, y.zw );
-
-
- vec4 s0 = floor( b0 ) * 2.0 + 1.0;
- vec4 s1 = floor( b1 ) * 2.0 + 1.0;
- vec4 sh = -step( h, vec4( 0.0 ) );
-
- vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
- vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
-
- vec3 p0 = vec3( a0.xy, h.x );
- vec3 p1 = vec3( a0.zw, h.y );
- vec3 p2 = vec3( a1.xy, h.z );
- vec3 p3 = vec3( a1.zw, h.w );
-
- // Normalise gradients
-
- vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
- p0 *= norm.x;
- p1 *= norm.y;
- p2 *= norm.z;
- p3 *= norm.w;
-
- // Mix final noise value
-
- vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
- m = m * m;
- return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
- dot( p2, x2 ), dot( p3, x3 ) ) );
-
-}
-
-vec2 snoise2(vec3 pos)
-{
- return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
-}
-
-float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
-{
- //firewall
- float delta = 0;
-// pos.y += (1.0 - pos.y) * 0.5;
- //pos.y += 0.5;
- pos.y /= stretchMult;
- pos *= freqMult;
- pos.y += currTime * scrollSpeed;
-// pos.y -= currTime * 3.0;
-
-
- delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
-
- return delta;
-}
-vec4 GetFireColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult)
-{
- float delta = GetFireDelta(currTime, pos, freqMult, stretchMult, 3.0, 0.5);
- delta *= min(1.0, max(0.0, 1.0 * (1.0 - pos.y)));
- delta *= min(1.0, max(0.0, 1.0 * (0.0 + pos.y)));
- vec2 displacedPoint = pos + vec2(0, delta * ampMult);
- displacedPoint.y = min(0.99, displacedPoint.y);
- displacedPoint.y = max(0.01, displacedPoint.y);
-
- return texture2D(tex, displacedPoint);
-}
-
-vec4 GetCheckboardColor(vec2 pos)
-{
- vec4 col = vec4(0.0, 0.0, 0.0, 0.0);
- if(pos.x > 0.0 && pos.x < 1.0 && pos.y > 0.0 && pos.y < 1.0)
- {
- if(mod(pos.x, 0.1) < 0.05 ^^ mod(pos.y, 0.1) < 0.05)
- col = vec4(pos.x, pos.y, 0.0, 1.0);
- else
- col = vec4(0.0, 0.0, 0.0, 1.0);
- }
- return col;
-}
-
-vec4 GetFireCandleColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius, float flameHeight, float paletteCoord)
-{
- float pi = 3.141593;
-
- vec4 fireballColor = vec4(0.0, 0.0, 0.0, 0.0);
- if(length(pos) < radius)
- {
- float ang = atan(pos.x, pos.y);
-
- float sinAlpha = length(pos) / radius;
- float alpha = 0.0;
- alpha = asin(sinAlpha);
-
- vec2 sphericalProjectedCoord = vec2(0.5, 0.5) + pos * (alpha / (3.141592 / 2.0)) / length(pos);
- //fireballColor = GetCheckboardColor(sphericalProjectedCoord);
- float delta = GetFireDelta(currTime, sphericalProjectedCoord, freqMult * 0.3, 1.0, 0.0, 1.5) * (1.0 - pow(length(pos) / radius, 3.0)) * 0.5;
-
- float verticalPos = 0.99 - delta * delta;
- verticalPos = min(0.99, verticalPos);
- verticalPos = max(0.01, verticalPos);
-
- fireballColor = texture2D(tex, vec2(0.75, verticalPos));
- fireballColor.a = 1.0;
- }else
- {
- float bottomPos = 0;
-
- pos.x += cos(pos.y * 20.0 + currTime * 20.0) * 0.05 * (1.0 - pow(1.0 - max(0.0, min((-radius - pos.y) * 2.0, 1.0)), 2.0));
- if(abs(pos.x) < radius)
- {
- bottomPos = -sqrt(radius * radius - pos.x * pos.x);
-// float ratio = (pos.y - bottomPos) / (bottomPos * (flameHeight / radius) - bottomPos);
- float ratio = (pos.y - bottomPos) / (bottomPos - flameHeight - radius - bottomPos) * (1.0 + 0.5 * pow(abs(pos.x) / radius, 4.0));
-
- vec2 planarPos = vec2(pos.x / radius, 1.0 - ratio);
- planarPos.x *= 1.0 + (1.0 - planarPos.y) * 2.5;
- planarPos.x = planarPos.x / 2.0 + 0.5;
-
- if(planarPos.x > 0.0 && planarPos.x < 1.0 && planarPos.y > 0.0 && planarPos.y < 1.0)
- {
- float delta = GetFireDelta(currTime, planarPos, freqMult * 0.2, 0.6, 1.0, 0.2);
- delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
- delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
-
- float verticalPos = pow(planarPos.y, 0.7) + delta * 1.0;
- verticalPos = min(0.99, verticalPos);
- verticalPos = max(0.01, verticalPos);
-
- //fireballColor = GetCheckboardColor(planarPos);
- fireballColor = texture2D(tex, vec2(0.25, verticalPos));
- }
- }
- }
- return fireballColor;
-}
-
-void main(void)
-{
- vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.8);
-
- //on-hit wobbling effect
- float radiusLen = length(radius);
-
-
- float ballRadius = 0.1;
- float flameHeight = 0.6;
-
- vec4 c;
- c = GetFireCandleColor(tick / time_factor + 0.0 , radius, 2, 3.0, 1, 2, ballRadius, flameHeight, 0.75);
- c.a *= gl_Color.a;
- //c.a += 0.5;
-
- gl_FragColor = c;
-}
+uniform sampler2D tex;
+uniform float tick;
+uniform float time_factor;
+
+
+vec4 permute( vec4 x ) {
+
+ return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
+
+}
+
+vec4 taylorInvSqrt( vec4 r ) {
+
+ return 1.79284291400159 - 0.85373472095314 * r;
+
+}
+
+float snoise( vec3 v ) {
+
+ const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
+ const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
+
+ // First corner
+
+ vec3 i = floor( v + dot( v, C.yyy ) );
+ vec3 x0 = v - i + dot( i, C.xxx );
+
+ // Other corners
+
+ vec3 g = step( x0.yzx, x0.xyz );
+ vec3 l = 1.0 - g;
+ vec3 i1 = min( g.xyz, l.zxy );
+ vec3 i2 = max( g.xyz, l.zxy );
+
+ vec3 x1 = x0 - i1 + 1.0 * C.xxx;
+ vec3 x2 = x0 - i2 + 2.0 * C.xxx;
+ vec3 x3 = x0 - 1. + 3.0 * C.xxx;
+
+ // Permutations
+
+ i = mod( i, 289.0 );
+ vec4 p = permute( permute( permute(
+ i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
+ + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
+ + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
+
+ // Gradients
+ // ( N*N points uniformly over a square, mapped onto an octahedron.)
+
+ float n_ = 1.0 / 7.0; // N=7
+
+ vec3 ns = n_ * D.wyz - D.xzx;
+
+ vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
+
+ vec4 x_ = floor( j * ns.z );
+ vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
+
+ vec4 x = x_ *ns.x + ns.yyyy;
+ vec4 y = y_ *ns.x + ns.yyyy;
+ vec4 h = 1.0 - abs( x ) - abs( y );
+
+ vec4 b0 = vec4( x.xy, y.xy );
+ vec4 b1 = vec4( x.zw, y.zw );
+
+
+ vec4 s0 = floor( b0 ) * 2.0 + 1.0;
+ vec4 s1 = floor( b1 ) * 2.0 + 1.0;
+ vec4 sh = -step( h, vec4( 0.0 ) );
+
+ vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
+ vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
+
+ vec3 p0 = vec3( a0.xy, h.x );
+ vec3 p1 = vec3( a0.zw, h.y );
+ vec3 p2 = vec3( a1.xy, h.z );
+ vec3 p3 = vec3( a1.zw, h.w );
+
+ // Normalise gradients
+
+ vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
+ p0 *= norm.x;
+ p1 *= norm.y;
+ p2 *= norm.z;
+ p3 *= norm.w;
+
+ // Mix final noise value
+
+ vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
+ m = m * m;
+ return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
+ dot( p2, x2 ), dot( p3, x3 ) ) );
+
+}
+
+vec2 snoise2(vec3 pos)
+{
+ return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
+}
+
+float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
+{
+ //firewall
+ float delta = 0.0;
+// pos.y += (1.0 - pos.y) * 0.5;
+ //pos.y += 0.5;
+ pos.y /= stretchMult;
+ pos *= freqMult;
+ pos.y += currTime * scrollSpeed;
+// pos.y -= currTime * 3.0;
+
+
+ delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
+
+ return delta;
+}
+vec4 GetFireColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult)
+{
+ float delta = GetFireDelta(currTime, pos, freqMult, stretchMult, 3.0, 0.5);
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - pos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + pos.y)));
+ vec2 displacedPoint = pos + vec2(0, delta * ampMult);
+ displacedPoint.y = min(0.99, displacedPoint.y);
+ displacedPoint.y = max(0.01, displacedPoint.y);
+
+ return texture2D(tex, displacedPoint);
+}
+
+vec4 GetCheckboardColor(vec2 pos)
+{
+ vec4 col = vec4(0.0, 0.0, 0.0, 0.0);
+ if(pos.x > 0.0 && pos.x < 1.0 && pos.y > 0.0 && pos.y < 1.0)
+ {
+ if(mod(pos.x, 0.1) < 0.05 ^^ mod(pos.y, 0.1) < 0.05)
+ col = vec4(pos.x, pos.y, 0.0, 1.0);
+ else
+ col = vec4(0.0, 0.0, 0.0, 1.0);
+ }
+ return col;
+}
+
+vec4 GetFireCandleColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius, float flameHeight, float paletteCoord)
+{
+ float pi = 3.141593;
+
+ vec4 fireballColor = vec4(0.0, 0.0, 0.0, 0.0);
+ if(length(pos) < radius)
+ {
+ float ang = atan(pos.x, pos.y);
+
+ float sinAlpha = length(pos) / radius;
+ float alpha = 0.0;
+ alpha = asin(sinAlpha);
+
+ vec2 sphericalProjectedCoord = vec2(0.5, 0.5) + pos * (alpha / (3.141592 / 2.0)) / length(pos);
+ //fireballColor = GetCheckboardColor(sphericalProjectedCoord);
+ float delta = GetFireDelta(currTime, sphericalProjectedCoord, freqMult * 0.3, 1.0, 0.0, 1.5) * (1.0 - pow(length(pos) / radius, 3.0)) * 0.5;
+
+ float verticalPos = 0.99 - delta * delta;
+ verticalPos = min(0.99, verticalPos);
+ verticalPos = max(0.01, verticalPos);
+
+ fireballColor = texture2D(tex, vec2(0.75, verticalPos));
+ fireballColor.a = 1.0;
+ }else
+ {
+ float bottomPos = 0.0;
+
+ pos.x += cos(pos.y * 20.0 + currTime * 20.0) * 0.05 * (1.0 - pow(1.0 - max(0.0, min((-radius - pos.y) * 2.0, 1.0)), 2.0));
+ if(abs(pos.x) < radius)
+ {
+ bottomPos = -sqrt(radius * radius - pos.x * pos.x);
+// float ratio = (pos.y - bottomPos) / (bottomPos * (flameHeight / radius) - bottomPos);
+ float ratio = (pos.y - bottomPos) / (bottomPos - flameHeight - radius - bottomPos) * (1.0 + 0.5 * pow(abs(pos.x) / radius, 4.0));
+
+ vec2 planarPos = vec2(pos.x / radius, 1.0 - ratio);
+ planarPos.x *= 1.0 + (1.0 - planarPos.y) * 2.5;
+ planarPos.x = planarPos.x / 2.0 + 0.5;
+
+ if(planarPos.x > 0.0 && planarPos.x < 1.0 && planarPos.y > 0.0 && planarPos.y < 1.0)
+ {
+ float delta = GetFireDelta(currTime, planarPos, freqMult * 0.2, 0.6, 1.0, 0.2);
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
+
+ float verticalPos = pow(planarPos.y, 0.7) + delta * 1.0;
+ verticalPos = min(0.99, verticalPos);
+ verticalPos = max(0.01, verticalPos);
+
+ //fireballColor = GetCheckboardColor(planarPos);
+ fireballColor = texture2D(tex, vec2(0.25, verticalPos));
+ }
+ }
+ }
+ return fireballColor;
+}
+
+void main(void)
+{
+ vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.8);
+
+ //on-hit wobbling effect
+ float radiusLen = length(radius);
+
+
+ float ballRadius = 0.1;
+ float flameHeight = 0.6;
+
+ vec4 c;
+ c = GetFireCandleColor(tick / time_factor + 0.0 , radius, 2.0, 3.0, 1.0, 2.0, ballRadius, flameHeight, 0.75);
+ c.a *= gl_Color.a;
+ //c.a += 0.5;
+
+ gl_FragColor = c;
+}
diff --git a/game/modules/tome/data/gfx/shaders/flamewings.lua b/game/modules/tome/data/gfx/shaders/flamewings.lua
index 89900241b496f78a449829517320d7a0bae2adc8..4595a6254c22581ccdcf36a1441a53fbd8af8d51 100644
--- a/game/modules/tome/data/gfx/shaders/flamewings.lua
+++ b/game/modules/tome/data/gfx/shaders/flamewings.lua
@@ -29,7 +29,7 @@ return {
flap = flap or 0.0,
},
resetargs = {
- tick_start = function() return core.game.getTime() end,
+ tick_start = function() return core.game.getFrameTime() end,
},
clone = false,
}
diff --git a/game/modules/tome/data/gfx/shaders/healing.frag b/game/modules/tome/data/gfx/shaders/healing.frag
new file mode 100644
index 0000000000000000000000000000000000000000..d9a020e558d9d81b435101b166519c69595335dd
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/healing.frag
@@ -0,0 +1,134 @@
+uniform sampler2D tex;
+uniform float tick;
+uniform float tick_start;
+uniform float time_factor;
+uniform float noup;
+uniform float circleRotationSpeed;
+uniform float circleDescendSpeed;
+
+uniform float beamsCount;
+uniform vec4 beamColor1;
+uniform vec4 beamColor2;
+uniform vec4 circleColor;
+
+vec2 Rotate(vec2 point, float ang)
+{
+ return vec2(
+ point.x * cos(ang) - point.y * sin(ang),
+ point.x * sin(ang) + point.y * cos(ang));
+}
+
+vec4 Uberblend(vec4 col0, vec4 col1)
+{
+// return vec4((1.0 - col0.a) * (col1.rgb) + col0.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+// return vec4((1.0 - col1.a) * (col0.rgb) + col1.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+ return vec4(
+ (1.0 - col0.a) * (1.0 - col1.a) * (col0.rgb * col0.a + col1.rgb * col1.a) / (col0.a + col1.a + 1e-1) +
+ (1.0 - col0.a) * (0.0 + col1.a) * (col1.rgb) +
+ (0.0 + col0.a) * (1.0 - col1.a) * (col0.rgb * (1.0 - col1.a) + col1.rgb * col1.a) +
+ (0.0 + col0.a) * (0.0 + col1.a) * (col1.rgb),
+ min(1.0, col0.a + col1.a));
+}
+
+void main(void)
+{
+ float baseRadius = 0.35;
+
+ float beamWidth = 0.025;
+ float beamHeight = 1.0;
+ float beamDescend = 0.5;
+ float scaledTime = 25.0 * tick / time_factor;
+ float firstBeamNum = floor(scaledTime);
+
+ float verticalAngle = 0.2;
+
+
+ vec2 spritePoint = (gl_TexCoord[0].xy - vec2(0.5, 1.0)).xy * vec2(1.0, -1.0);
+
+
+ float topCirclePos = 1.0 - verticalAngle * baseRadius;
+ float bottomCirclePos = verticalAngle * baseRadius;
+
+ float posScale = 0.0;
+ if(circleDescendSpeed > 0.0)
+ posScale = clamp(1.0 - (tick - tick_start) / time_factor * circleDescendSpeed, 0.0, 1.0);
+ vec3 planePoint = vec3(0.0, topCirclePos * posScale + bottomCirclePos * (1.0 - posScale), 0.0);
+
+ vec2 planarPoint = vec2(spritePoint.x, (spritePoint.y - planePoint.y) / verticalAngle);
+
+ vec4 resultColor = vec4(0.0, 0.0, 0.0, 0.0);
+
+ float circleIntersection = (spritePoint.y - planePoint.y) / verticalAngle;
+
+ vec4 circleColorSample = vec4(0.0, 0.0, 0.0, 0.0);
+ if(!((noup == 1.0 && planarPoint.y > 0.0) || (noup == 2.0 && planarPoint.y < 0.0)))
+ {
+ if(length(planarPoint) < 0.5)
+ {
+ planarPoint = Rotate(planarPoint, scaledTime * 0.1 * circleRotationSpeed);
+ circleColorSample = texture2D(tex, planarPoint + vec2(0.5, 0.5)) * circleColor;
+ circleColorSample.a *= (1.0 - posScale);
+ //resultColor.rgb *= resultColor.a;
+ //resultColor.rgb = circleColor.rgb;
+ }
+ }
+
+ vec4 beamFrontColor = vec4(0.0, 0.0, 0.0, 0.0);
+ vec4 beamRearColor = vec4(0.0, 0.0, 0.0, 0.0);
+
+ float beamTime;
+
+ int i;
+ int ibeamsCount = (int)beamsCount;
+ for(i = 0; i < ibeamsCount; i++)
+ {
+ float beamIndex = floor(scaledTime) - float(i);
+ float beamPhase = (scaledTime - beamIndex) / float(ibeamsCount);
+ float beamVerticalOffset = 0.02;
+ float heightPhase = 1.0 - pow(1.0 - beamPhase, 3.0);
+ float height = beamHeight * (1.0 - heightPhase) * (1.0 - 2.0 * verticalAngle * baseRadius - beamVerticalOffset) + heightPhase * 0.1;
+
+ float beamColorScale = sin(beamIndex * 20.0) * 0.5 + 0.5;
+ float beamAng = (sin(beamIndex * 10.0) + sin(beamIndex * 7.0)) * 3.14159265;
+ if((sin(beamAng) > 0.0) && noup == 1.0) continue;
+ if((sin(beamAng) <= 0.0) && noup == 2.0) continue;
+
+
+ vec3 beamBase = vec3(cos(beamAng), (sin(beamAng) + 1.0) * verticalAngle, sin(beamAng)) * baseRadius * beamPhase +
+ vec3(0.0, height * 0.5 + beamVerticalOffset, 0.0);
+
+ float zMult = (1.0 - (sin(beamAng) + 1.0) / 2.0) * 0.5 + 0.5;
+
+ vec2 screenDelta = spritePoint - beamBase.xy;
+ vec4 beamColor = vec4(zMult, zMult, zMult, 1.0) * (beamColor1 * beamColorScale + beamColor2 * (1.0 - beamColorScale));
+
+ float verticalScale = clamp(screenDelta.y / height + 0.5, 0.0, 1.0);
+ beamColor.a *=
+ (1.0 - pow(clamp(2.0 * abs(screenDelta.x / beamWidth ), 0.0, 1.0), 2.0)) *
+ (1.0 - pow(1.0 - verticalScale, 4.0)) * (1.0 - pow(verticalScale, 1.0)) *
+ (1.0 - pow((1.0 - beamPhase), 8.0)) * (1.0 - pow(beamPhase, 2.0)) * 4.0;
+ beamColor.rgb *= beamColor.a;
+
+ if(beamBase.z > circleIntersection)
+ beamRearColor += beamColor;
+ else
+ beamFrontColor += beamColor;
+ }
+ beamRearColor.rgb /= (beamRearColor.a + 1e-5);
+ beamFrontColor.rgb /= (beamFrontColor.a + 1e-5);
+ //if(beamColorSample.a > 1.0) beamColorSample /= beamColorSample.a;
+
+ beamRearColor.r = clamp(beamRearColor.r, 0.0, 0.99);
+ beamRearColor.g = clamp(beamRearColor.g, 0.0, 0.99);
+ beamRearColor.b = clamp(beamRearColor.b, 0.0, 0.99);
+ beamRearColor.a = clamp(beamRearColor.a, 0.0, 0.99);
+
+ beamFrontColor.r = clamp(beamFrontColor.r, 0.0, 0.99);
+ beamFrontColor.g = clamp(beamFrontColor.g, 0.0, 0.99);
+ beamFrontColor.b = clamp(beamFrontColor.b, 0.0, 0.99);
+ beamFrontColor.a = clamp(beamFrontColor.a, 0.0, 0.99);
+
+ resultColor = Uberblend(Uberblend(beamRearColor, circleColorSample), beamFrontColor);
+ resultColor.a *= gl_Color.a;
+ gl_FragColor = resultColor;
+}
diff --git a/game/modules/tome/data/gfx/shaders/healing.lua b/game/modules/tome/data/gfx/shaders/healing.lua
new file mode 100644
index 0000000000000000000000000000000000000000..6288b8b3779da6260c7d398c47389096022a8580
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/healing.lua
@@ -0,0 +1,38 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+return {
+ frag = "healing",
+ vert = nil,
+ args = {
+ tex = { texture = 0 },
+ time_factor = time_factor or 1000,
+ beamColor1 = beamColor1 or {0x50/255, 0x9e/255, 0x01/255, 1.0},
+ beamColor2 = beamColor2 or {0xa7/255, 0xe8/255, 0x01/255, 1.0},
+ circleColor = circleColor or {1.0, 1.0, 1.0, 1.0},
+ circleRotationSpeed = circleRotationSpeed or 1,
+ circleDescendSpeed = circleDescendSpeed or 0,
+ beamsCount = beamsCount or 20,
+ noup = noup or 0,
+ },
+ resetargs = circleDescendSpeed and {
+ tick_start = function() return core.game.getFrameTime() end,
+ },
+ clone = false,
+}
diff --git a/game/modules/tome/data/gfx/shaders/lightning.frag b/game/modules/tome/data/gfx/shaders/lightning.frag
index d6bcde63e67367f92af77a6db1a035d203bd175e..dc4ee56a98be92c86a9d42605275e49e32a22633 100644
--- a/game/modules/tome/data/gfx/shaders/lightning.frag
+++ b/game/modules/tome/data/gfx/shaders/lightning.frag
@@ -1,10 +1,10 @@
-uniform sampler2D tex;
-uniform vec3 color1;
-uniform vec3 color2;
-
-void main(void)
-{
- gl_FragColor = texture2D(tex, gl_TexCoord[0].xy);
- gl_FragColor.rgb = mix(color1, color2, 1-gl_FragColor.a);
- gl_FragColor *= gl_Color;
-}
+uniform sampler2D tex;
+uniform vec3 color1;
+uniform vec3 color2;
+
+void main(void)
+{
+ gl_FragColor = texture2D(tex, gl_TexCoord[0].xy);
+ gl_FragColor.rgb = mix(color1, color2, 1.0 - gl_FragColor.a);
+ gl_FragColor *= gl_Color;
+}
diff --git a/game/modules/tome/data/gfx/shaders/runicshield.frag b/game/modules/tome/data/gfx/shaders/runicshield.frag
new file mode 100644
index 0000000000000000000000000000000000000000..fbea99d92651575369cf3a6893dc4736339ab300
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/runicshield.frag
@@ -0,0 +1,256 @@
+uniform sampler2D tex;
+uniform float tick;
+uniform float aadjust;
+uniform vec4 bubbleColor;
+uniform vec4 auraColor;
+uniform float time_factor;
+
+uniform vec3 impact_color;
+uniform vec2 impact;
+uniform float impact_tick;
+uniform float impact_time;
+uniform float llpow;
+
+uniform float ellipsoidalFactor; //1 is perfect circle, >1 is ellipsoidal
+uniform float oscillationSpeed; //oscillation between ellipsoidal and spherical form
+uniform float antialiasingRadius; //1.0 is no antialiasing, 0.0 - fully smoothed(looks worse)
+uniform float shieldIntensity; //physically affects shield layer thickness
+
+uniform float wobblingPower;
+uniform float wobblingSpeed;
+
+uniform float auraWidth;
+
+uniform float scrollingSpeed;
+
+vec4 permute( vec4 x ) {
+
+ return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
+
+}
+
+vec4 taylorInvSqrt( vec4 r ) {
+
+ return 1.79284291400159 - 0.85373472095314 * r;
+
+}
+
+float snoise( vec3 v ) {
+
+ const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
+ const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
+
+ // First corner
+
+ vec3 i = floor( v + dot( v, C.yyy ) );
+ vec3 x0 = v - i + dot( i, C.xxx );
+
+ // Other corners
+
+ vec3 g = step( x0.yzx, x0.xyz );
+ vec3 l = 1.0 - g;
+ vec3 i1 = min( g.xyz, l.zxy );
+ vec3 i2 = max( g.xyz, l.zxy );
+
+ vec3 x1 = x0 - i1 + 1.0 * C.xxx;
+ vec3 x2 = x0 - i2 + 2.0 * C.xxx;
+ vec3 x3 = x0 - 1. + 3.0 * C.xxx;
+
+ // Permutations
+
+ i = mod( i, 289.0 );
+ vec4 p = permute( permute( permute(
+ i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
+ + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
+ + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
+
+ // Gradients
+ // ( N*N points uniformly over a square, mapped onto an octahedron.)
+
+ float n_ = 1.0 / 7.0; // N=7
+
+ vec3 ns = n_ * D.wyz - D.xzx;
+
+ vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
+
+ vec4 x_ = floor( j * ns.z );
+ vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
+
+ vec4 x = x_ *ns.x + ns.yyyy;
+ vec4 y = y_ *ns.x + ns.yyyy;
+ vec4 h = 1.0 - abs( x ) - abs( y );
+
+ vec4 b0 = vec4( x.xy, y.xy );
+ vec4 b1 = vec4( x.zw, y.zw );
+
+
+ vec4 s0 = floor( b0 ) * 2.0 + 1.0;
+ vec4 s1 = floor( b1 ) * 2.0 + 1.0;
+ vec4 sh = -step( h, vec4( 0.0 ) );
+
+ vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
+ vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
+
+ vec3 p0 = vec3( a0.xy, h.x );
+ vec3 p1 = vec3( a0.zw, h.y );
+ vec3 p2 = vec3( a1.xy, h.z );
+ vec3 p3 = vec3( a1.zw, h.w );
+
+ // Normalise gradients
+
+ vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
+ p0 *= norm.x;
+ p1 *= norm.y;
+ p2 *= norm.z;
+ p3 *= norm.w;
+
+ // Mix final noise value
+
+ vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
+ m = m * m;
+ return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
+ dot( p2, x2 ), dot( p3, x3 ) ) );
+
+}
+
+vec2 snoise2(vec3 pos)
+{
+ return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
+}
+
+float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
+{
+ //firewall
+ float delta = 0;
+// pos.y += (1.0 - pos.y) * 0.5;
+ //pos.y += 0.5;
+ pos.y /= stretchMult;
+ pos *= freqMult;
+ pos.y += currTime * scrollSpeed;
+// pos.y -= currTime * 3.0;
+
+
+ delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
+
+ return delta;
+}
+
+struct RingIntersection
+{
+ vec4 color;
+ float depth;
+};
+
+
+vec4 Uberblend(vec4 col0, vec4 col1)
+{
+// return vec4((1.0 - col0.a) * (col1.rgb) + col0.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+// return vec4((1.0 - col1.a) * (col0.rgb) + col1.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+ return vec4(
+ (1.0 - col0.a) * (1.0 - col1.a) * (col0.rgb * col0.a + col1.rgb * col1.a) / (col0.a + col1.a + 1e-1) +
+ (1.0 - col0.a) * (0.0 + col1.a) * (col1.rgb) +
+ (0.0 + col0.a) * (1.0 - col1.a) * (col0.rgb * (1.0 - col1.a) + col1.rgb * col1.a) +
+ (0.0 + col0.a) * (0.0 + col1.a) * (col1.rgb),
+ min(1.0, col0.a + col1.a));
+}
+
+vec4 GetFireRingColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius1, float radius2, float scrollSpeed, float paletteCoord)
+{
+ float pi = 3.141592;
+ float ang = atan(pos.y, pos.x) + pi;
+
+ vec2 planarPos = vec2(ang / (2.0 * pi), 1.0 - (length(pos) - radius1) / (radius2 - radius1));
+ planarPos.y = pow(abs(planarPos.y), power);
+
+ float delta =
+ GetFireDelta(currTime, planarPos + vec2(currTime * scrollSpeed, 0.0), freqMult, stretchMult, 2.5, 0.5) * (1.0 - planarPos.x) +
+ GetFireDelta(currTime, vec2(planarPos.x + currTime * scrollSpeed - 1.0, planarPos.y), freqMult, stretchMult, 2.5, 0.5) * planarPos.x;
+
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
+
+ float verticalPos = planarPos.y + delta * ampMult;
+ verticalPos = min(0.99, verticalPos);
+ verticalPos = max(0.01, verticalPos);
+
+ vec4 result;
+ result.rgb = vec3(1.0, 1.0, 1.0);
+ result.a = verticalPos;
+ return result;
+}
+
+void main(void)
+{
+ vec2 radius = vec2(0.5, 0.5) - gl_TexCoord[0].xy;
+ //radius.x *= ellispoidalFactor; //for simple ellipsoid
+ //comment next line for regular spherical shield
+ radius.x *= (1.0 + ellipsoidalFactor) * 0.5 + (ellipsoidalFactor - 1.0) * 0.5 * pow(cos(tick / time_factor * oscillationSpeed), 2.0);
+
+ //on-hit wobbling effect
+ float impactColorAffection = 0.0;
+ float impactDuration = tick - impact_tick;
+ if (impactDuration < impact_time * 5.0) //after impact_time * 5.0 the wobble will reduce exp(5.0) times
+ {
+ float impactCosine = dot(impact / length(impact), radius / length(radius));
+ if(impactCosine > 0.0)
+ {
+ radius *= 1.0 +
+ (1.0 + sin(impactDuration * wobblingSpeed)) * 0.5 *
+ exp(-impactDuration / impact_time) *
+ wobblingPower * pow(impactCosine, 5.0);
+
+ impactColorAffection = pow(impactCosine, 2.0);
+ impactColorAffection *= exp(-(1.0 - length(radius) * 2.0) * 2.0);
+ impactColorAffection *= exp(-impactDuration / impact_time);
+ }
+ }
+
+ float radiusLen = length(radius);
+
+ float antialiasingCoef = 1.0;
+
+ float shieldRadius = 0.5 - auraWidth;
+ float innerRadius = 0.5 - auraWidth - 0.05;
+ float outerRadius = 0.5;
+
+ float sinAlpha = radiusLen / (shieldRadius);
+ float alpha = 0.0;
+ vec4 shieldColorSample = vec4(0.0, 0.0, 0.0, 0.0);
+ if(sinAlpha < 1.0)
+ {
+ if(sinAlpha > antialiasingRadius)
+ {
+ antialiasingCoef = (1.0 - sinAlpha) / (1.0 - antialiasingRadius);
+ }
+ alpha = asin(sinAlpha);
+
+ vec2 sphericalProjectedCoord = vec2(0.5, 0.5) + radius * (alpha / (3.141592 / 2.0)) / radiusLen;
+
+ shieldColorSample = texture2D(tex, (sphericalProjectedCoord * 0.3 + vec2(scrollingSpeed * tick / time_factor, 0.0)));
+ shieldColorSample.a = 1.0 - exp(-shieldColorSample.a * shieldIntensity / cos(alpha));
+ //impact adjusts resulting transperency
+ shieldColorSample.a *= aadjust;
+ shieldColorSample *= bubbleColor;
+ }
+
+
+ vec4 auraColorSample = vec4(0.0, 0.0, 0.0, 0.0);
+ if(length(radius) > innerRadius && length(radius) < outerRadius)
+ {
+ auraColorSample = GetFireRingColor(tick / time_factor, radius, 5.0, 50.0, 1.0, 2.0, innerRadius, outerRadius, 0.1, 0.25) * auraColor;
+ }
+
+ float ratio = (radiusLen - innerRadius) / (shieldRadius - innerRadius);
+ ratio = clamp(ratio, 0.0, 1.0);
+
+ vec4 resultColor = shieldColorSample * (1.0 - ratio) + auraColorSample * ratio;
+ //applying shield color
+ resultColor.rgb *= vec3(1.0, 1.0, 1.0) * (1.0 - impactColorAffection) + impact_color * impactColorAffection;
+
+
+ gl_FragColor = resultColor;
+}
diff --git a/game/modules/tome/data/gfx/shaders/runicshield.lua b/game/modules/tome/data/gfx/shaders/runicshield.lua
new file mode 100644
index 0000000000000000000000000000000000000000..57ccebea66a9eaf14c0d9dab9a3e092b6f728b4a
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/runicshield.lua
@@ -0,0 +1,44 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+return {
+ frag = "runicshield",
+ vert = nil,
+ args = {
+ tex = { texture = 0 },
+ bubbleColor = bubbleColor or {1.0, 1.0, 1.0, 1.0},
+ auraColor = auraColor or {1.0, 1.0, 1.0, 1.0},
+ time_factor = time_factor or 4000,
+ aadjust = aadjust or 10,
+ impact = {0, 0},
+ impact_tick = -1000,
+ impact_color = {1.0, 0.3, 1.0},
+ impact_time = 800,
+ llpow = llpow or 2,
+ ellipsoidalFactor = ellipsoidalFactor or 1.0, --1 is perfect circle, >1 is ellipsoidal
+ oscillationSpeed = oscillationSpeed or 0.0, --oscillation between ellipsoidal and spherical form
+ antialiasingRadius = antialiasingRadius or 0.98, --1.0 is no antialiasing, 0.0 - fully smoothed(looks worse)
+ shieldIntensity = shieldIntensity or 0.15, --physically affects shield layer thickness
+ wobblingPower = wobblingPower or 0.2,
+ wobblingSpeed = wobblingSpeed or 0.02,
+ scrollingSpeed = scrollingSpeed or 1.0,
+ auraWidth = auraWidth or 0.1,
+ },
+ clone = false,
+}
diff --git a/game/modules/tome/data/gfx/shaders/shadowfire.frag b/game/modules/tome/data/gfx/shaders/shadowfire.frag
index 48d7501ee2058c2b146bb7835f040aefaaff012c..f374ae5e6cebe6a1cf9923b915eef3f83368f202 100644
--- a/game/modules/tome/data/gfx/shaders/shadowfire.frag
+++ b/game/modules/tome/data/gfx/shaders/shadowfire.frag
@@ -1,181 +1,181 @@
-uniform sampler2D tex;
-uniform float tick;
-uniform float aadjust;
-uniform vec3 color;
-uniform float time_factor;
-
-uniform float ellipsoidalFactor; //1 is perfect circle, >1 is ellipsoidal
-uniform float oscillationSpeed; //oscillation between ellipsoidal and spherical form
-
-uniform float antialiasingRadius; //1.0 is no antialiasing, 0.0 - fully smoothed(looks worse)
-uniform float shieldIntensity; //physically affects shield layer thickness
-
-vec4 permute( vec4 x ) {
-
- return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
-
-}
-
-vec4 taylorInvSqrt( vec4 r ) {
-
- return 1.79284291400159 - 0.85373472095314 * r;
-
-}
-
-float snoise( vec3 v ) {
-
- const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
- const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
-
- // First corner
-
- vec3 i = floor( v + dot( v, C.yyy ) );
- vec3 x0 = v - i + dot( i, C.xxx );
-
- // Other corners
-
- vec3 g = step( x0.yzx, x0.xyz );
- vec3 l = 1.0 - g;
- vec3 i1 = min( g.xyz, l.zxy );
- vec3 i2 = max( g.xyz, l.zxy );
-
- vec3 x1 = x0 - i1 + 1.0 * C.xxx;
- vec3 x2 = x0 - i2 + 2.0 * C.xxx;
- vec3 x3 = x0 - 1. + 3.0 * C.xxx;
-
- // Permutations
-
- i = mod( i, 289.0 );
- vec4 p = permute( permute( permute(
- i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
- + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
- + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
-
- // Gradients
- // ( N*N points uniformly over a square, mapped onto an octahedron.)
-
- float n_ = 1.0 / 7.0; // N=7
-
- vec3 ns = n_ * D.wyz - D.xzx;
-
- vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
-
- vec4 x_ = floor( j * ns.z );
- vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
-
- vec4 x = x_ *ns.x + ns.yyyy;
- vec4 y = y_ *ns.x + ns.yyyy;
- vec4 h = 1.0 - abs( x ) - abs( y );
-
- vec4 b0 = vec4( x.xy, y.xy );
- vec4 b1 = vec4( x.zw, y.zw );
-
-
- vec4 s0 = floor( b0 ) * 2.0 + 1.0;
- vec4 s1 = floor( b1 ) * 2.0 + 1.0;
- vec4 sh = -step( h, vec4( 0.0 ) );
-
- vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
- vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
-
- vec3 p0 = vec3( a0.xy, h.x );
- vec3 p1 = vec3( a0.zw, h.y );
- vec3 p2 = vec3( a1.xy, h.z );
- vec3 p3 = vec3( a1.zw, h.w );
-
- // Normalise gradients
-
- vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
- p0 *= norm.x;
- p1 *= norm.y;
- p2 *= norm.z;
- p3 *= norm.w;
-
- // Mix final noise value
-
- vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
- m = m * m;
- return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
- dot( p2, x2 ), dot( p3, x3 ) ) );
-
-}
-
-vec2 snoise2(vec3 pos)
-{
- return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
-}
-
-
-
-float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
-{
- //firewall
- float delta = 0;
-// pos.y += (1.0 - pos.y) * 0.5;
- //pos.y += 0.5;
- pos.y /= stretchMult;
- pos *= freqMult;
- pos.y += currTime * scrollSpeed;
-
- delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
-
- return delta;
-}
-
-vec4 GetFireColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float textureCoord)
-{
- float delta = GetFireDelta(currTime, pos, freqMult, stretchMult, 3.0, 0.5);
- delta *= min(1.0, max(0.0, 1.0 * (1.0 - pos.y)));
- delta *= min(1.0, max(0.0, 1.0 * (0.0 + pos.y)));
- vec2 displacedPoint = pos + vec2(0, delta * ampMult);
- displacedPoint.y = min(0.99, displacedPoint.y);
- displacedPoint.y = max(0.01, displacedPoint.y);
- displacedPoint.x = textureCoord;
-
- return texture2D(tex, displacedPoint);
-}
-
-void main(void)
-{
- vec2 radius = vec2(0.5, 0.5) - gl_TexCoord[0].xy;
- //radius.x *= ellispoidalFactor; //for simple ellipsoid
- //comment next line for regular spherical shield
- radius.x *= (1.0 + ellipsoidalFactor) * 0.5 + (ellipsoidalFactor - 1.0) * 0.5 * pow(cos(tick / time_factor * oscillationSpeed), 2.0);
-
- //on-hit wobbling effect
- float radiusLen = length(radius);
-
- float antialiasingCoef = 1.0;
-
- float sinAlpha = radiusLen * 2.0;
- float alpha = 0.0;
- if(sinAlpha > 1.0)
- {
- gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
- return;
- }else
- {
- if(sinAlpha > antialiasingRadius)
- {
- antialiasingCoef = (1.0 - sinAlpha) / (1.0 - antialiasingRadius);
- }
- alpha = asin(sinAlpha);
- }
-
- vec2 sphericalProjectedCoord = vec2(0.5, 0.5) + radius * (alpha / (3.141592 / 2.0)) / radiusLen;
-
- vec4 c1 = GetFireColor(tick / time_factor + 0.0 , vec2(sphericalProjectedCoord.y, (-0.2 + 0.0 + sphericalProjectedCoord.x) * 0.8), 1.0, 2.0, 1.0, 0.25);
- vec4 c2 = GetFireColor(tick / time_factor + 10.0, vec2(sphericalProjectedCoord.y, (-0.2 + 1.0 - sphericalProjectedCoord.x) * 0.8), 1.0, 2.0, 1.0, 0.75);
- vec4 c = c1 * c1.a + c2 * (1.0 - c1.a);
-
- c.a = 1.0 - exp(-c.a * shieldIntensity / cos(alpha));
-
- c.a *= aadjust;
- c.a *= min(1.0, c.a) * antialiasingCoef;
-
- gl_FragColor = c;
-}
+uniform sampler2D tex;
+uniform float tick;
+uniform float aadjust;
+uniform vec3 color;
+uniform float time_factor;
+
+uniform float ellipsoidalFactor; //1 is perfect circle, >1 is ellipsoidal
+uniform float oscillationSpeed; //oscillation between ellipsoidal and spherical form
+
+uniform float antialiasingRadius; //1.0 is no antialiasing, 0.0 - fully smoothed(looks worse)
+uniform float shieldIntensity; //physically affects shield layer thickness
+
+vec4 permute( vec4 x ) {
+
+ return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
+
+}
+
+vec4 taylorInvSqrt( vec4 r ) {
+
+ return 1.79284291400159 - 0.85373472095314 * r;
+
+}
+
+float snoise( vec3 v ) {
+
+ const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
+ const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
+
+ // First corner
+
+ vec3 i = floor( v + dot( v, C.yyy ) );
+ vec3 x0 = v - i + dot( i, C.xxx );
+
+ // Other corners
+
+ vec3 g = step( x0.yzx, x0.xyz );
+ vec3 l = 1.0 - g;
+ vec3 i1 = min( g.xyz, l.zxy );
+ vec3 i2 = max( g.xyz, l.zxy );
+
+ vec3 x1 = x0 - i1 + 1.0 * C.xxx;
+ vec3 x2 = x0 - i2 + 2.0 * C.xxx;
+ vec3 x3 = x0 - 1. + 3.0 * C.xxx;
+
+ // Permutations
+
+ i = mod( i, 289.0 );
+ vec4 p = permute( permute( permute(
+ i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
+ + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
+ + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
+
+ // Gradients
+ // ( N*N points uniformly over a square, mapped onto an octahedron.)
+
+ float n_ = 1.0 / 7.0; // N=7
+
+ vec3 ns = n_ * D.wyz - D.xzx;
+
+ vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
+
+ vec4 x_ = floor( j * ns.z );
+ vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
+
+ vec4 x = x_ *ns.x + ns.yyyy;
+ vec4 y = y_ *ns.x + ns.yyyy;
+ vec4 h = 1.0 - abs( x ) - abs( y );
+
+ vec4 b0 = vec4( x.xy, y.xy );
+ vec4 b1 = vec4( x.zw, y.zw );
+
+
+ vec4 s0 = floor( b0 ) * 2.0 + 1.0;
+ vec4 s1 = floor( b1 ) * 2.0 + 1.0;
+ vec4 sh = -step( h, vec4( 0.0 ) );
+
+ vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
+ vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
+
+ vec3 p0 = vec3( a0.xy, h.x );
+ vec3 p1 = vec3( a0.zw, h.y );
+ vec3 p2 = vec3( a1.xy, h.z );
+ vec3 p3 = vec3( a1.zw, h.w );
+
+ // Normalise gradients
+
+ vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
+ p0 *= norm.x;
+ p1 *= norm.y;
+ p2 *= norm.z;
+ p3 *= norm.w;
+
+ // Mix final noise value
+
+ vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
+ m = m * m;
+ return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
+ dot( p2, x2 ), dot( p3, x3 ) ) );
+
+}
+
+vec2 snoise2(vec3 pos)
+{
+ return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
+}
+
+
+
+float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
+{
+ //firewall
+ float delta = 0.0;
+// pos.y += (1.0 - pos.y) * 0.5;
+ //pos.y += 0.5;
+ pos.y /= stretchMult;
+ pos *= freqMult;
+ pos.y += currTime * scrollSpeed;
+
+ delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
+
+ return delta;
+}
+
+vec4 GetFireColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float textureCoord)
+{
+ float delta = GetFireDelta(currTime, pos, freqMult, stretchMult, 3.0, 0.5);
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - pos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + pos.y)));
+ vec2 displacedPoint = pos + vec2(0, delta * ampMult);
+ displacedPoint.y = min(0.99, displacedPoint.y);
+ displacedPoint.y = max(0.01, displacedPoint.y);
+ displacedPoint.x = textureCoord;
+
+ return texture2D(tex, displacedPoint);
+}
+
+void main(void)
+{
+ vec2 radius = vec2(0.5, 0.5) - gl_TexCoord[0].xy;
+ //radius.x *= ellispoidalFactor; //for simple ellipsoid
+ //comment next line for regular spherical shield
+ radius.x *= (1.0 + ellipsoidalFactor) * 0.5 + (ellipsoidalFactor - 1.0) * 0.5 * pow(cos(tick / time_factor * oscillationSpeed), 2.0);
+
+ //on-hit wobbling effect
+ float radiusLen = length(radius);
+
+ float antialiasingCoef = 1.0;
+
+ float sinAlpha = radiusLen * 2.0;
+ float alpha = 0.0;
+ if(sinAlpha > 1.0)
+ {
+ gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
+ return;
+ }else
+ {
+ if(sinAlpha > antialiasingRadius)
+ {
+ antialiasingCoef = (1.0 - sinAlpha) / (1.0 - antialiasingRadius);
+ }
+ alpha = asin(sinAlpha);
+ }
+
+ vec2 sphericalProjectedCoord = vec2(0.5, 0.5) + radius * (alpha / (3.141592 / 2.0)) / radiusLen;
+
+ vec4 c1 = GetFireColor(tick / time_factor + 0.0 , vec2(sphericalProjectedCoord.y, (-0.2 + 0.0 + sphericalProjectedCoord.x) * 0.8), 1.0, 2.0, 1.0, 0.25);
+ vec4 c2 = GetFireColor(tick / time_factor + 10.0, vec2(sphericalProjectedCoord.y, (-0.2 + 1.0 - sphericalProjectedCoord.x) * 0.8), 1.0, 2.0, 1.0, 0.75);
+ vec4 c = c1 * c1.a + c2 * (1.0 - c1.a);
+
+ c.a = 1.0 - exp(-c.a * shieldIntensity / cos(alpha));
+
+ c.a *= aadjust;
+ c.a *= min(1.0, c.a) * antialiasingCoef;
+
+ gl_FragColor = c;
+}
diff --git a/game/modules/tome/data/gfx/shaders/shield.frag b/game/modules/tome/data/gfx/shaders/shield.frag
index 2d62f68be5ee6aac29521bee2258aa4bf3bc2279..a1323570b78704d6bc8d69310cedde1f30025373 100644
--- a/game/modules/tome/data/gfx/shaders/shield.frag
+++ b/game/modules/tome/data/gfx/shaders/shield.frag
@@ -1,91 +1,91 @@
-uniform sampler2D tex;
-uniform float tick;
-uniform float aadjust;
-uniform vec3 color;
-uniform float time_factor;
-
-uniform vec3 impact_color;
-uniform vec2 impact;
-uniform float impact_tick;
-uniform float impact_time;
-uniform float llpow;
-
-uniform float ellipsoidalFactor; //1 is perfect circle, >1 is ellipsoidal
-uniform float oscillationSpeed; //oscillation between ellipsoidal and spherical form
-uniform float antialiasingRadius; //1.0 is no antialiasing, 0.0 - fully smoothed(looks worse)
-uniform float shieldIntensity; //physically affects shield layer thickness
-
-uniform float wobblingPower;
-uniform float wobblingSpeed;
-
-uniform float horizontalScrollingSpeed;
-uniform float verticalScrollingSpeed;
-
-void main(void)
-{
- vec2 radius = vec2(0.5, 0.5) - gl_TexCoord[0].xy;
- //radius.x *= ellispoidalFactor; //for simple ellipsoid
- //comment next line for regular spherical shield
- radius.x *= (1.0 + ellipsoidalFactor) * 0.5 + (ellipsoidalFactor - 1.0) * 0.5 * pow(cos(tick / time_factor * oscillationSpeed), 2.0);
-
- //on-hit wobbling effect
- float impactColorAffection = 0;
- float impactDuration = tick - impact_tick;
- if (impactDuration < impact_time * 5.0) //after impact_time * 5.0 the wobble will reduce exp(5.0) times
- {
- float impactCosine = dot(impact / length(impact), radius / length(radius));
- if(impactCosine > 0.0)
- {
- radius *= 1.0 +
- (1.0 + sin(impactDuration * wobblingSpeed)) * 0.5 *
- exp(-impactDuration / impact_time) *
- wobblingPower * pow(impactCosine, 5.0);
-
- impactColorAffection = pow(impactCosine, 2.0);
- impactColorAffection *= exp(-(1.0 - length(radius) * 2.0) * 2.0);
- impactColorAffection *= exp(-impactDuration / impact_time);
- }
- }
-
- float radiusLen = length(radius);
-
- float antialiasingCoef = 1.0;
-
- float sinAlpha = radiusLen * 2.0;
- float alpha = 0.0;
- if(sinAlpha > 1.0)
- {
- gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
- return;
- }else
- {
- if(sinAlpha > antialiasingRadius)
- {
- antialiasingCoef = (1.0 - sinAlpha) / (1.0 - antialiasingRadius);
- }
- alpha = asin(sinAlpha);
- }
- vec2 sphericalProjectedCoord = vec2(0.5, 0.5) + radius * (alpha / (3.141592 / 2.0)) / radiusLen;
-
- //two scrolling textures
- vec4 c1 = texture2D(tex, (sphericalProjectedCoord + vec2(horizontalScrollingSpeed * tick / time_factor, 0.0)));
- vec4 c2 = texture2D(tex, (sphericalProjectedCoord + vec2(0.0, verticalScrollingSpeed * tick / time_factor)));
- vec4 c = c1 * c2;
-
- //exponential thin layer absorbtion under angle alpha
- //layer thickness is c.a * shieldIntensity
- c.a = 1.0 - exp(-c.a * shieldIntensity / cos(alpha));
-
- //impact adjusts resulting transperency
- c.a *= aadjust;
-
- //applying shield color
- c.rgb *= color * (1.0 - impactColorAffection) + impact_color * impactColorAffection;
-
- //c.rgb += impact_color * impactColorAffection;
-
- //thin layer of gradient transperency to make antialiasing
- c.a *= min(1.0, c.a) * antialiasingCoef;
-
- gl_FragColor = c;
-}
+uniform sampler2D tex;
+uniform float tick;
+uniform float aadjust;
+uniform vec3 color;
+uniform float time_factor;
+
+uniform vec3 impact_color;
+uniform vec2 impact;
+uniform float impact_tick;
+uniform float impact_time;
+uniform float llpow;
+
+uniform float ellipsoidalFactor; //1 is perfect circle, >1 is ellipsoidal
+uniform float oscillationSpeed; //oscillation between ellipsoidal and spherical form
+uniform float antialiasingRadius; //1.0 is no antialiasing, 0.0 - fully smoothed(looks worse)
+uniform float shieldIntensity; //physically affects shield layer thickness
+
+uniform float wobblingPower;
+uniform float wobblingSpeed;
+
+uniform float horizontalScrollingSpeed;
+uniform float verticalScrollingSpeed;
+
+void main(void)
+{
+ vec2 radius = vec2(0.5, 0.5) - gl_TexCoord[0].xy;
+ //radius.x *= ellispoidalFactor; //for simple ellipsoid
+ //comment next line for regular spherical shield
+ radius.x *= (1.0 + ellipsoidalFactor) * 0.5 + (ellipsoidalFactor - 1.0) * 0.5 * pow(cos(tick / time_factor * oscillationSpeed), 2.0);
+
+ //on-hit wobbling effect
+ float impactColorAffection = 0.0;
+ float impactDuration = tick - impact_tick;
+ if (impactDuration < impact_time * 5.0) //after impact_time * 5.0 the wobble will reduce exp(5.0) times
+ {
+ float impactCosine = dot(impact / length(impact), radius / length(radius));
+ if(impactCosine > 0.0)
+ {
+ radius *= 1.0 +
+ (1.0 + sin(impactDuration * wobblingSpeed)) * 0.5 *
+ exp(-impactDuration / impact_time) *
+ wobblingPower * pow(impactCosine, 5.0);
+
+ impactColorAffection = pow(impactCosine, 2.0);
+ impactColorAffection *= exp(-(1.0 - length(radius) * 2.0) * 2.0);
+ impactColorAffection *= exp(-impactDuration / impact_time);
+ }
+ }
+
+ float radiusLen = length(radius);
+
+ float antialiasingCoef = 1.0;
+
+ float sinAlpha = radiusLen * 2.0;
+ float alpha = 0.0;
+ if(sinAlpha > 1.0)
+ {
+ gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
+ return;
+ }else
+ {
+ if(sinAlpha > antialiasingRadius)
+ {
+ antialiasingCoef = (1.0 - sinAlpha) / (1.0 - antialiasingRadius);
+ }
+ alpha = asin(sinAlpha);
+ }
+ vec2 sphericalProjectedCoord = vec2(0.5, 0.5) + radius * (alpha / (3.141592 / 2.0)) / radiusLen;
+
+ //two scrolling textures
+ vec4 c1 = texture2D(tex, (sphericalProjectedCoord + vec2(horizontalScrollingSpeed * tick / time_factor, 0.0)));
+ vec4 c2 = texture2D(tex, (sphericalProjectedCoord + vec2(0.0, verticalScrollingSpeed * tick / time_factor)));
+ vec4 c = c1 * c2;
+
+ //exponential thin layer absorbtion under angle alpha
+ //layer thickness is c.a * shieldIntensity
+ c.a = 1.0 - exp(-c.a * shieldIntensity / cos(alpha));
+
+ //impact adjusts resulting transperency
+ c.a *= aadjust;
+
+ //applying shield color
+ c.rgb *= color * (1.0 - impactColorAffection) + impact_color * impactColorAffection;
+
+ //c.rgb += impact_color * impactColorAffection;
+
+ //thin layer of gradient transperency to make antialiasing
+ c.a *= min(1.0, c.a) * antialiasingCoef;
+
+ gl_FragColor = c;
+}
diff --git a/game/modules/tome/data/gfx/shaders/shockwave.frag b/game/modules/tome/data/gfx/shaders/shockwave.frag
index dd0b042a30354286d2aca7d27bd90119cfb1827b..e496ea3010f313d3602bb9f0cd1e99acfff939b9 100644
--- a/game/modules/tome/data/gfx/shaders/shockwave.frag
+++ b/game/modules/tome/data/gfx/shaders/shockwave.frag
@@ -1,188 +1,188 @@
-uniform sampler2D tex;
-uniform float tick;
-uniform float tick_start;
-uniform float time_factor;
-
-uniform float shockwaveSpeed;
-uniform float shockwaveWidth;
-uniform float flameIntensity;
-
-uniform vec2 ellipsoidalFactor; //(1.0, 1.0) is perfect circle, (2.0, 1.0) is vertical ellipse, (1.0, 2.0) is horizontal ellipse
-
-vec4 permute( vec4 x ) {
-
- return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
-
-}
-
-vec4 taylorInvSqrt( vec4 r ) {
-
- return 1.79284291400159 - 0.85373472095314 * r;
-
-}
-
-float snoise( vec3 v ) {
-
- const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
- const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
-
- // First corner
-
- vec3 i = floor( v + dot( v, C.yyy ) );
- vec3 x0 = v - i + dot( i, C.xxx );
-
- // Other corners
-
- vec3 g = step( x0.yzx, x0.xyz );
- vec3 l = 1.0 - g;
- vec3 i1 = min( g.xyz, l.zxy );
- vec3 i2 = max( g.xyz, l.zxy );
-
- vec3 x1 = x0 - i1 + 1.0 * C.xxx;
- vec3 x2 = x0 - i2 + 2.0 * C.xxx;
- vec3 x3 = x0 - 1. + 3.0 * C.xxx;
-
- // Permutations
-
- i = mod( i, 289.0 );
- vec4 p = permute( permute( permute(
- i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
- + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
- + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
-
- // Gradients
- // ( N*N points uniformly over a square, mapped onto an octahedron.)
-
- float n_ = 1.0 / 7.0; // N=7
-
- vec3 ns = n_ * D.wyz - D.xzx;
-
- vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
-
- vec4 x_ = floor( j * ns.z );
- vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
-
- vec4 x = x_ *ns.x + ns.yyyy;
- vec4 y = y_ *ns.x + ns.yyyy;
- vec4 h = 1.0 - abs( x ) - abs( y );
-
- vec4 b0 = vec4( x.xy, y.xy );
- vec4 b1 = vec4( x.zw, y.zw );
-
-
- vec4 s0 = floor( b0 ) * 2.0 + 1.0;
- vec4 s1 = floor( b1 ) * 2.0 + 1.0;
- vec4 sh = -step( h, vec4( 0.0 ) );
-
- vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
- vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
-
- vec3 p0 = vec3( a0.xy, h.x );
- vec3 p1 = vec3( a0.zw, h.y );
- vec3 p2 = vec3( a1.xy, h.z );
- vec3 p3 = vec3( a1.zw, h.w );
-
- // Normalise gradients
-
- vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
- p0 *= norm.x;
- p1 *= norm.y;
- p2 *= norm.z;
- p3 *= norm.w;
-
- // Mix final noise value
-
- vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
- m = m * m;
- return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
- dot( p2, x2 ), dot( p3, x3 ) ) );
-
-}
-
-vec2 snoise2(vec3 pos)
-{
- return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
-}
-
-float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
-{
- //firewall
- float delta = 0;
-// pos.y += (1.0 - pos.y) * 0.5;
- //pos.y += 0.5;
- pos.y /= stretchMult;
- pos *= freqMult;
- pos.y += currTime * scrollSpeed;
-// pos.y -= currTime * 3.0;
-
- delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
-
- return delta;
-}
-vec4 GetFireColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult)
-{
- float delta = GetFireDelta(currTime, pos, freqMult, stretchMult, 3.0, 0.1);
- delta *= min(1.0, max(0.0, 1.0 * (1.0 - pos.y)));
- delta *= min(1.0, max(0.0, 1.0 * (0.0 + pos.y)));
- vec2 displacedPoint = pos + vec2(0, delta * ampMult);
- displacedPoint.y = min(0.99, displacedPoint.y);
- displacedPoint.y = max(0.01, displacedPoint.y);
-
- return texture2D(tex, displacedPoint);
-}
-
-vec4 GetFireRingColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius1, float radius2, float scrollSpeed, float paletteCoord)
-{
- float pi = 3.141592;
- float ang = atan(pos.y, pos.x) + pi;
-
- vec2 planarPos = vec2(ang / (2.0 * pi), 1.0 - (length(pos) - radius1) / (radius2 - radius1));
- planarPos.y = pow(abs(planarPos.y), power);
-
- float delta =
- GetFireDelta(currTime, planarPos + vec2(currTime * scrollSpeed, 0.0), freqMult, stretchMult, 1.5, 0.5) * (1.0 - planarPos.x) +
- GetFireDelta(currTime, vec2(planarPos.x + currTime * scrollSpeed - 1.0, planarPos.y), freqMult, stretchMult, 1.5, 0.5) * planarPos.x;
-
- delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
- delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
-
- float verticalPos = planarPos.y + delta * ampMult;
- verticalPos = min(0.99, verticalPos);
- verticalPos = max(0.01, verticalPos);
-
- return texture2D(tex, vec2(paletteCoord, verticalPos));
-}
-
-void main(void)
-{
- vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
-
- radius *= ellipsoidalFactor;
-
- float radiusLen = length(radius);
-
-
- float ringRadius = 0.5 * max(0.0, min(1.0, ((tick - tick_start) / time_factor * shockwaveSpeed)));
- float ringWidth = shockwaveWidth / 2.0;
-
- vec2 dir = radius / radiusLen;
-
-
- vec4 c;
- if(radiusLen > ringRadius - ringWidth && radiusLen < ringRadius)
- {
- c = GetFireRingColor(tick / time_factor + 0.0 , radius, 6.0, 15.0, flameIntensity, 1.0, ringRadius, ringRadius - ringWidth, 0.0, 0.5);
- }else
- {
- c = vec4(0.0, 0.0, 0.0, 0.0);
- }
- c.a *= min(1.0, max(0.0, 20.0 * (1.0 - (radiusLen - (ringRadius - ringWidth)) / ringWidth)));
- c.a *= gl_Color.a;
-
-
- gl_FragColor = c;
-}
+uniform sampler2D tex;
+uniform float tick;
+uniform float tick_start;
+uniform float time_factor;
+
+uniform float shockwaveSpeed;
+uniform float shockwaveWidth;
+uniform float flameIntensity;
+
+uniform vec2 ellipsoidalFactor; //(1.0, 1.0) is perfect circle, (2.0, 1.0) is vertical ellipse, (1.0, 2.0) is horizontal ellipse
+
+vec4 permute( vec4 x ) {
+
+ return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
+
+}
+
+vec4 taylorInvSqrt( vec4 r ) {
+
+ return 1.79284291400159 - 0.85373472095314 * r;
+
+}
+
+float snoise( vec3 v ) {
+
+ const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
+ const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
+
+ // First corner
+
+ vec3 i = floor( v + dot( v, C.yyy ) );
+ vec3 x0 = v - i + dot( i, C.xxx );
+
+ // Other corners
+
+ vec3 g = step( x0.yzx, x0.xyz );
+ vec3 l = 1.0 - g;
+ vec3 i1 = min( g.xyz, l.zxy );
+ vec3 i2 = max( g.xyz, l.zxy );
+
+ vec3 x1 = x0 - i1 + 1.0 * C.xxx;
+ vec3 x2 = x0 - i2 + 2.0 * C.xxx;
+ vec3 x3 = x0 - 1. + 3.0 * C.xxx;
+
+ // Permutations
+
+ i = mod( i, 289.0 );
+ vec4 p = permute( permute( permute(
+ i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
+ + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
+ + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
+
+ // Gradients
+ // ( N*N points uniformly over a square, mapped onto an octahedron.)
+
+ float n_ = 1.0 / 7.0; // N=7
+
+ vec3 ns = n_ * D.wyz - D.xzx;
+
+ vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
+
+ vec4 x_ = floor( j * ns.z );
+ vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
+
+ vec4 x = x_ *ns.x + ns.yyyy;
+ vec4 y = y_ *ns.x + ns.yyyy;
+ vec4 h = 1.0 - abs( x ) - abs( y );
+
+ vec4 b0 = vec4( x.xy, y.xy );
+ vec4 b1 = vec4( x.zw, y.zw );
+
+
+ vec4 s0 = floor( b0 ) * 2.0 + 1.0;
+ vec4 s1 = floor( b1 ) * 2.0 + 1.0;
+ vec4 sh = -step( h, vec4( 0.0 ) );
+
+ vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
+ vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
+
+ vec3 p0 = vec3( a0.xy, h.x );
+ vec3 p1 = vec3( a0.zw, h.y );
+ vec3 p2 = vec3( a1.xy, h.z );
+ vec3 p3 = vec3( a1.zw, h.w );
+
+ // Normalise gradients
+
+ vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
+ p0 *= norm.x;
+ p1 *= norm.y;
+ p2 *= norm.z;
+ p3 *= norm.w;
+
+ // Mix final noise value
+
+ vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
+ m = m * m;
+ return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
+ dot( p2, x2 ), dot( p3, x3 ) ) );
+
+}
+
+vec2 snoise2(vec3 pos)
+{
+ return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
+}
+
+float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
+{
+ //firewall
+ float delta = 0.0;
+// pos.y += (1.0 - pos.y) * 0.5;
+ //pos.y += 0.5;
+ pos.y /= stretchMult;
+ pos *= freqMult;
+ pos.y += currTime * scrollSpeed;
+// pos.y -= currTime * 3.0;
+
+ delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
+
+ return delta;
+}
+vec4 GetFireColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult)
+{
+ float delta = GetFireDelta(currTime, pos, freqMult, stretchMult, 3.0, 0.1);
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - pos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + pos.y)));
+ vec2 displacedPoint = pos + vec2(0, delta * ampMult);
+ displacedPoint.y = min(0.99, displacedPoint.y);
+ displacedPoint.y = max(0.01, displacedPoint.y);
+
+ return texture2D(tex, displacedPoint);
+}
+
+vec4 GetFireRingColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius1, float radius2, float scrollSpeed, float paletteCoord)
+{
+ float pi = 3.141592;
+ float ang = atan(pos.y, pos.x) + pi;
+
+ vec2 planarPos = vec2(ang / (2.0 * pi), 1.0 - (length(pos) - radius1) / (radius2 - radius1));
+ planarPos.y = pow(abs(planarPos.y), power);
+
+ float delta =
+ GetFireDelta(currTime, planarPos + vec2(currTime * scrollSpeed, 0.0), freqMult, stretchMult, 1.5, 0.5) * (1.0 - planarPos.x) +
+ GetFireDelta(currTime, vec2(planarPos.x + currTime * scrollSpeed - 1.0, planarPos.y), freqMult, stretchMult, 1.5, 0.5) * planarPos.x;
+
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
+
+ float verticalPos = planarPos.y + delta * ampMult;
+ verticalPos = min(0.99, verticalPos);
+ verticalPos = max(0.01, verticalPos);
+
+ return texture2D(tex, vec2(paletteCoord, verticalPos));
+}
+
+void main(void)
+{
+ vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
+
+ radius *= ellipsoidalFactor;
+
+ float radiusLen = length(radius);
+
+
+ float ringRadius = 0.5 * max(0.0, min(1.0, ((tick - tick_start) / time_factor * shockwaveSpeed)));
+ float ringWidth = shockwaveWidth / 2.0;
+
+ vec2 dir = radius / radiusLen;
+
+
+ vec4 c;
+ if(radiusLen > ringRadius - ringWidth && radiusLen < ringRadius)
+ {
+ c = GetFireRingColor(tick / time_factor + 0.0 , radius, 6.0, 15.0, flameIntensity, 1.0, ringRadius, ringRadius - ringWidth, 0.0, 0.5);
+ }else
+ {
+ c = vec4(0.0, 0.0, 0.0, 0.0);
+ }
+ c.a *= min(1.0, max(0.0, 20.0 * (1.0 - (radiusLen - (ringRadius - ringWidth)) / ringWidth)));
+ c.a *= gl_Color.a;
+
+
+ gl_FragColor = c;
+}
diff --git a/game/modules/tome/data/gfx/shaders/shockwave.lua b/game/modules/tome/data/gfx/shaders/shockwave.lua
index 17a2d827a4fbb443c1729998a27bb30adba8922f..5661495284c28f9951c575f3298ac0ab50909d7e 100644
--- a/game/modules/tome/data/gfx/shaders/shockwave.lua
+++ b/game/modules/tome/data/gfx/shaders/shockwave.lua
@@ -31,7 +31,7 @@ return {
ellipsoidalFactor = {1.0, 1.0}, --1 is perfect circle, >1 is ellipsoidal
},
resetargs = {
- tick_start = function() return core.game.getTime() end,
+ tick_start = function() return core.game.getFrameTime() end,
},
clone = false,
}
diff --git a/game/modules/tome/data/gfx/shaders/spinningwinds.frag b/game/modules/tome/data/gfx/shaders/spinningwinds.frag
index 0d2e3252897bd945afc55d60c77dab62225407a9..83dec3e8c6b4572c232e30fbb8003f13dacae51d 100644
--- a/game/modules/tome/data/gfx/shaders/spinningwinds.frag
+++ b/game/modules/tome/data/gfx/shaders/spinningwinds.frag
@@ -1,281 +1,161 @@
-uniform sampler2D tex;
-uniform float tick;
-uniform float tick_start;
-uniform vec3 color;
-uniform float time_factor;
-
-uniform float shockwaveSpeed;
-uniform float shockwaveWidth;
-uniform float flameIntensity;
-
-uniform float noup;
-
-uniform vec2 ellipsoidalFactor; //(1.0, 1.0) is perfect circle, (2.0, 1.0) is vertical ellipse, (1.0, 2.0) is horizontal ellipse
-
-vec4 permute( vec4 x ) {
-
- return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
-
-}
-
-vec4 taylorInvSqrt( vec4 r ) {
-
- return 1.79284291400159 - 0.85373472095314 * r;
-
-}
-
-float snoise( vec3 v ) {
-
- const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
- const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
-
- // First corner
-
- vec3 i = floor( v + dot( v, C.yyy ) );
- vec3 x0 = v - i + dot( i, C.xxx );
-
- // Other corners
-
- vec3 g = step( x0.yzx, x0.xyz );
- vec3 l = 1.0 - g;
- vec3 i1 = min( g.xyz, l.zxy );
- vec3 i2 = max( g.xyz, l.zxy );
-
- vec3 x1 = x0 - i1 + 1.0 * C.xxx;
- vec3 x2 = x0 - i2 + 2.0 * C.xxx;
- vec3 x3 = x0 - 1. + 3.0 * C.xxx;
-
- // Permutations
-
- i = mod( i, 289.0 );
- vec4 p = permute( permute( permute(
- i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
- + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
- + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
-
- // Gradients
- // ( N*N points uniformly over a square, mapped onto an octahedron.)
-
- float n_ = 1.0 / 7.0; // N=7
-
- vec3 ns = n_ * D.wyz - D.xzx;
-
- vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
-
- vec4 x_ = floor( j * ns.z );
- vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
-
- vec4 x = x_ *ns.x + ns.yyyy;
- vec4 y = y_ *ns.x + ns.yyyy;
- vec4 h = 1.0 - abs( x ) - abs( y );
-
- vec4 b0 = vec4( x.xy, y.xy );
- vec4 b1 = vec4( x.zw, y.zw );
-
-
- vec4 s0 = floor( b0 ) * 2.0 + 1.0;
- vec4 s1 = floor( b1 ) * 2.0 + 1.0;
- vec4 sh = -step( h, vec4( 0.0 ) );
-
- vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
- vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
-
- vec3 p0 = vec3( a0.xy, h.x );
- vec3 p1 = vec3( a0.zw, h.y );
- vec3 p2 = vec3( a1.xy, h.z );
- vec3 p3 = vec3( a1.zw, h.w );
-
- // Normalise gradients
-
- vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
- p0 *= norm.x;
- p1 *= norm.y;
- p2 *= norm.z;
- p3 *= norm.w;
-
- // Mix final noise value
-
- vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
- m = m * m;
- return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
- dot( p2, x2 ), dot( p3, x3 ) ) );
-
-}
-
-vec2 snoise2(vec3 pos)
-{
- return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
-}
-
-float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
-{
- //firewall
- float delta = 0;
-// pos.y += (1.0 - pos.y) * 0.5;
- //pos.y += 0.5;
- pos.y /= stretchMult;
- pos *= freqMult;
- pos.y += currTime * scrollSpeed;
-// pos.y -= currTime * 3.0;
-
-
- delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
-
- return delta;
-}
-
-struct RingIntersection
-{
- vec4 color;
- float depth;
-};
-
-
-vec4 Uberblend(vec4 col0, vec4 col1)
-{
-// return vec4((1.0 - col0.a) * (col1.rgb) + col0.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
-// return vec4((1.0 - col1.a) * (col0.rgb) + col1.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
- return vec4(
- (1.0 - col0.a) * (1.0 - col1.a) * (col0.rgb * col0.a + col1.rgb * col1.a) / (col0.a + col1.a + 1e-1) +
- (1.0 - col0.a) * (0.0 + col1.a) * (col1.rgb) +
- (0.0 + col0.a) * (1.0 - col1.a) * (col0.rgb * (1.0 - col1.a) + col1.rgb * col1.a) +
- (0.0 + col0.a) * (0.0 + col1.a) * (col1.rgb),
- min(1.0, col0.a + col1.a));
-}
-
-RingIntersection GetBladeRingColor(float currTime, vec2 pos, vec3 axis)
-{
- RingIntersection result;
-
- vec3 rayOrigin = vec3(pos, -5.0);
- vec3 rayDir = vec3(0.0, 0.0, 1.0);
-
- vec3 planePoint = vec3(0.0, 0.0, 0.0);
-
- result.depth = 10.0;
- result.color = vec4(0.0, 0.0, 0.0, 0.0);
-
-
-
- float someDelta = GetFireDelta(currTime, vec2(0.5, 0.5), 1.0, 1.0, 0.0, 0.23);
- if(!(someDelta < 10 && someDelta > -10))
- {
- result.depth = -10;
- result.color = vec4(1, 0, 0, 1);
- return result;
- }
-
- vec3 baseIntersection = rayOrigin + rayDir * dot(planePoint - rayOrigin, axis) / dot(axis, rayDir);
-
- for(int i = 0; i < 10; i++)
- {
- vec3 localAxis = axis;
- localAxis.x += sin(someDelta * 1.5 + 100.0 * i) * 0.15;
- localAxis.y += sin(someDelta * 1.7 + 130.0 * i) * 0.15;
- /* localAxis.x += GetFireDelta(currTime, vec2(0.2 * i, 0.5), 1.0, 1.0, 0.0, 0.23) * 0.1;
- localAxis.y += GetFireDelta(currTime, vec2(0.2 * i, 0.5), 1.0, 1.0, 0.0, 0.27) * 0.1;*/
- localAxis /= length(localAxis);
-
- vec3 intersection = rayOrigin + rayDir * dot(planePoint - rayOrigin, localAxis) / dot(localAxis, rayDir);
-
- vec3 tangent0 = cross(axis, vec3(0.0, 1.0, 0.0));
- if(length(tangent0) < 1e-1)
- {
- tangent0 = cross(axis, vec3(1.0, 0.0, 0.0));
- }else
- {
- }
- tangent0 /= length(tangent0);
-
- vec3 tangent1 = cross(tangent0, axis);
-
- vec2 planarPoint = vec2(dot(intersection - planePoint, tangent0), dot(intersection - planePoint, tangent1));
-
- vec2 rotatedPoint;
- /*rotatedPoint.x = planarPoint.x * cos(ang) - planarPoint.y * sin(ang);
- rotatedPoint.y = planarPoint.x * sin(ang) + planarPoint.y * cos(ang);
- rotatedPoint *= 2.0;
- if(length(rotatedPoint) < 0.5 && rotatedPoint.x < 0.0)
- {
- result.color = texture2D(tex, rotatedPoint + vec2(0.5, 0.5));
- result.depth = intersection.z;
- }*/
-
- float fogPhase = currTime * 5.0 + sin(someDelta * 1.5 + 9.0 * i) * 0.5;// + GetFireDelta(currTime, vec2(0.1 * i, 0.5), 1.0, 1.0, 0.0, 0.2) * 0.5;
- fogPhase = clamp(fogPhase - floor(fogPhase), 0.0, 1.0);
-
- float ang = -currTime * 30.0 + (3.14 * 2.0) / 10.0 * i + sin(someDelta * 1.5 + 5.0 * i) * 0.5;// + GetFireDelta(currTime, vec2(0.1 * i, 0.5), 1.0, 1.0, 0.0, 0.2) * 0.5;
- rotatedPoint.x = planarPoint.x * cos(ang) - planarPoint.y * sin(ang);
- rotatedPoint.y = planarPoint.x * sin(ang) + planarPoint.y * cos(ang);
- //rotatedPoint *= 2.0 - fogPhase;
- if(length(rotatedPoint) < 0.5 && rotatedPoint.x < 0.0)
- {
- vec4 airColor = /*vec4(sin(10 * i), sin(20 * i), sin(30 * i), 1.0);*/texture2D(tex, rotatedPoint + vec2(0.5, 0.5));
- airColor.a *= (1.0 - pow(fogPhase, 3.0)) * (1.0 - pow((1.0 - fogPhase), 3.0));
- result.color = Uberblend(result.color, airColor);
- result.depth = intersection.z;
- if(intersection.z < result.depth)
- {
- result.depth = intersection.z;
- }
- //result.color.rgb = vec3(0.5, 0.5, 0.5);//max(result.color.rgb, airColor.rgb);
- //result.color.a = 1.0;//min(1.0, result.color.a + airColor.a);
- }
- }
-
- return result;
-}
-
-
-
-void main(void)
-{
-// gl_FragColor = Uberblend(texture2D(tex, gl_TexCoord[0].xy), texture2D(tex, vec2(gl_TexCoord[0].x - 0.5, gl_TexCoord[0].y))); return;
-// gl_FragColor = texture2D(tex, - gl_TexCoord[0].xy); return;
- vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
-
- radius *= ellipsoidalFactor;
-
- float radiusLen = length(radius);
-
- vec3 axis = vec3(0.4, -0.5, -0.5);
- axis /= length(axis);
- RingIntersection int0 = GetBladeRingColor(tick / time_factor * 0.9 + 10.0, radius, axis);
-
- axis = vec3(-0.6, -0.3, -0.2);
- axis /= length(axis);
- RingIntersection int1 = GetBladeRingColor(tick / time_factor, radius, axis);
-
- if((int0.depth < 0.0 && noup == 2.0) || (int0.depth > 0.0 && noup == 1.0))
- {
- int0.color *= 0.0;
- }
- if((int1.depth < 0.0 && noup == 2.0) || (int1.depth > 0.0 && noup == 1.0))
- {
- int1.color *= 0.0;
- }
- int0.color.rgb *= max(0.0, min(1.0, (0.5 - int0.depth) * 2.0 - 0.5)) * 1.0;
- int1.color.rgb *= max(0.0, min(1.0, (0.5 - int1.depth) * 2.0 - 0.5)) * 1.0;
-
- vec4 resultColor;
- if(int0.depth < int1.depth)
- {
- resultColor = Uberblend(int1.color, int0.color);
- }
- else
- {
- resultColor = Uberblend(int0.color, int1.color);
-// resultColor.rgb = (1.0 - int0.color.a) * (int1.color.rgb) + int0.color.a * (int1.color.rgb * int1.color.a + int0.color.rgb * (1.0 - int1.color.a));
- //resultColor.a = int0.color.a + int1.color.a;
- }
-
- resultColor.a = min(1.0, resultColor.a);
- resultColor.a *= gl_Color.a;
-
-
- gl_FragColor = resultColor;
+uniform sampler2D tex;
+uniform float tick;
+uniform float tick_start;
+uniform vec3 color;
+uniform float time_factor;
+
+uniform float noup;
+
+uniform vec2 ellipsoidalFactor = vec2(1.0, 1.0); //(1.0, 1.0) is perfect circle, (2.0, 1.0) is vertical ellipse, (1.0, 2.0) is horizontal ellipse
+
+
+struct RingIntersection
+{
+ vec4 color;
+ float depth;
+};
+
+
+vec4 Uberblend(vec4 col0, vec4 col1)
+{
+// return vec4((1.0 - col0.a) * (col1.rgb) + col0.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+// return vec4((1.0 - col1.a) * (col0.rgb) + col1.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+ return vec4(
+ (1.0 - col0.a) * (1.0 - col1.a) * (col0.rgb * col0.a + col1.rgb * col1.a) / (col0.a + col1.a + 1e-1) +
+ (1.0 - col0.a) * (0.0 + col1.a) * (col1.rgb) +
+ (0.0 + col0.a) * (1.0 - col1.a) * (col0.rgb * (1.0 - col1.a) + col1.rgb * col1.a) +
+ (0.0 + col0.a) * (0.0 + col1.a) * (col1.rgb),
+ min(1.0, col0.a + col1.a));
+}
+
+RingIntersection GetBladeRingColor(float currTime, vec2 pos, vec3 axis)
+{
+ RingIntersection result;
+
+ vec3 rayOrigin = vec3(pos, -5.0);
+ vec3 rayDir = vec3(0.0, 0.0, 1.0);
+
+ vec3 planePoint = vec3(0.0, 0.0, 0.0);
+
+ result.depth = 10.0;
+ result.color = vec4(0.0, 0.0, 0.0, 0.0);
+
+ vec3 baseIntersection = rayOrigin + rayDir * dot(planePoint - rayOrigin, axis) / dot(axis, rayDir);
+
+ vec3 localAxis = axis;
+ localAxis /= length(localAxis);
+
+ vec3 intersection = rayOrigin + rayDir * dot(planePoint - rayOrigin, localAxis) / dot(localAxis, rayDir);
+
+ vec3 tangent0 = cross(axis, vec3(0.0, 1.0, 0.0));
+ if(length(tangent0) < 1e-1)
+ {
+ tangent0 = cross(axis, vec3(1.0, 0.0, 0.0));
+ }else
+ {
+ }
+ tangent0 /= length(tangent0);
+
+ vec3 tangent1 = cross(tangent0, axis);
+
+ vec2 planarPoint = vec2(dot(intersection - planePoint, tangent0), dot(intersection - planePoint, tangent1));
+
+ vec2 rotatedPoint;
+
+ /*float fogPhase = currTime * 5.0 + sin(someDelta * 1.5 + 9.0 * i) * 0.5;// + GetFireDelta(currTime, vec2(0.1 * i, 0.5), 1.0, 1.0, 0.0, 0.2) * 0.5;
+ fogPhase = clamp(fogPhase - floor(fogPhase), 0.0, 1.0);*/
+
+ float ang = -currTime * 30.0 + sin(currTime * 20.0) * 0.5;// + GetFireDelta(currTime, vec2(0.1 * i, 0.5), 1.0, 1.0, 0.0, 0.2) * 0.5;
+ rotatedPoint.x = planarPoint.x * cos(ang) - planarPoint.y * sin(ang);
+ rotatedPoint.y = planarPoint.x * sin(ang) + planarPoint.y * cos(ang);
+ if(length(rotatedPoint) < 0.5 && rotatedPoint.x < 0.0)
+ {
+ vec4 airColor = /*vec4(sin(10 * i), sin(20 * i), sin(30 * i), 1.0);*/texture2D(tex, rotatedPoint + vec2(0.5, 0.5));
+ //airColor.a *= (1.0 - pow(fogPhase, 3.0)) * (1.0 - pow((1.0 - fogPhase), 3.0));
+ result.color = airColor;
+ result.depth = intersection.z;
+ }
+
+ return result;
+}
+
+const int ringsCount = 1;
+
+void main(void)
+{
+// gl_FragColor = Uberblend(texture2D(tex, gl_TexCoord[0].xy), texture2D(tex, vec2(gl_TexCoord[0].x - 0.5, gl_TexCoord[0].y))); return;
+// gl_FragColor = texture2D(tex, - gl_TexCoord[0].xy); return;
+ vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
+
+ radius *= ellipsoidalFactor;
+
+ float radiusLen = length(radius);
+
+ RingIntersection ints[10];
+
+ for (int intersectionIndex = 0; intersectionIndex < 8; intersectionIndex++)
+ {
+ float phase = 0.0;//tick_start * 100.0f;
+ vec3 axis = vec3(
+ sin(phase * 1.0 + float(intersectionIndex + 1) * 1.0),
+ sin(phase * 2.0 + float(intersectionIndex + 1) * 2.0),
+ sin(phase * 3.0 + float(intersectionIndex + 1) * 3.0));
+ axis /= length(axis);
+ ints[intersectionIndex] = GetBladeRingColor(tick / time_factor/* * (float(intersectionIndex) * 0.1 + 1.0)*/ + float(intersectionIndex) * 10.1, radius, axis);
+ /*ints[intersectionIndex].color.rgb = vec3(sin(intersectionIndex * 10.0), sin(intersectionIndex * 20.0), sin(intersectionIndex * 30.0)) * 0.5 + vec3(0.5, 0.5, 0.5); ints[intersectionIndex].color.rgb = vec3(sin(intersectionIndex * 10.0), sin(intersectionIndex * 20.0), sin(intersectionIndex * 30.0)) * 0.5 + vec3(0.5, 0.5, 0.5);
+ ints[intersectionIndex].color.a = 1.0;*/
+ }
+/* vec3 axis = vec3(0.4, -0.5, -0.5);
+ axis /= length(axis);
+ ints[0] = GetBladeRingColor(tick / time_factor * 0.9 + 10.0, radius, axis);
+
+ axis = vec3(-0.6, -0.3, -0.2);
+ axis /= length(axis);
+ ints[1] = GetBladeRingColor(tick / time_factor, radius, axis);
+
+ axis = vec3(-0.4, 0.3, 0.2);
+ axis /= length(axis);
+ ints[2] = GetBladeRingColor(tick / time_factor, radius, axis);
+
+ ints[3].color.a = 0.0;
+ ints[3].depth = 100.0;*/
+
+ int intersectionIndex = 0;
+ for (int intersectionIndex = 0; intersectionIndex < 8; intersectionIndex++)
+ {
+ if((ints[intersectionIndex].depth < 0.0 && noup == 2.0) || (ints[intersectionIndex].depth > 0.0 && noup == 1.0))
+ {
+ ints[intersectionIndex].color *= 0.0;
+ }
+ ints[intersectionIndex].color.rgb *= max(0.0, min(1.0, (0.5 - ints[intersectionIndex].depth) * 2.0 - 0.5)) * 1.0;
+ }
+
+ int i, j;
+ for(i = 0; i < 8; i++)
+ {
+ for(j = i + 1; j < 8; j++)
+ {
+ if(ints[i].depth < ints[j].depth)
+ {
+ RingIntersection tmp = ints[j];
+ ints[j] = ints[i];
+ ints[i] = tmp;
+ }
+ }
+ }
+
+ vec4 resultColor = vec4(0.0, 0.0, 0.0, 0.0);
+ for(i = 0; i < 8; i++)
+ {
+ resultColor = Uberblend(resultColor, ints[i].color);
+ }
+
+ resultColor.a = clamp(resultColor.a, 0.0, 1.0);
+ resultColor.r = clamp(resultColor.r, 0.0, 1.0);
+ resultColor.g = clamp(resultColor.g, 0.0, 1.0);
+ resultColor.b = clamp(resultColor.b, 0.0, 1.0);
+ resultColor.a *= gl_Color.a;
+
+
+ gl_FragColor = resultColor;
}
\ No newline at end of file
diff --git a/game/modules/tome/data/gfx/shaders/spinningwinds.lua b/game/modules/tome/data/gfx/shaders/spinningwinds.lua
index 2b8a4379410f71167154229aeb1f5910e630ee61..b8d180d2fee59ab98f873d4f7ed4f982fd5c7af2 100644
--- a/game/modules/tome/data/gfx/shaders/spinningwinds.lua
+++ b/game/modules/tome/data/gfx/shaders/spinningwinds.lua
@@ -25,7 +25,6 @@ return {
time_factor = time_factor or 4000,
ellipsoidalFactor = ellipsoidalFactor or {1,1}, --1 is perfect circle, >1 is ellipsoidal
noup = noup or 0,
- verticalIntensityAdjust = verticalIntensityAdjust or 0,
},
clone = false,
}
diff --git a/game/modules/tome/data/gfx/shaders/spinningwinds2.frag b/game/modules/tome/data/gfx/shaders/spinningwinds2.frag
new file mode 100644
index 0000000000000000000000000000000000000000..2c63cbe9a1ba8b8bda8c902fc7b9438633e618f1
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/spinningwinds2.frag
@@ -0,0 +1,281 @@
+uniform sampler2D tex;
+uniform float tick;
+uniform float tick_start;
+uniform vec3 color;
+uniform float time_factor;
+
+uniform float shockwaveSpeed;
+uniform float shockwaveWidth;
+uniform float flameIntensity;
+
+uniform float noup;
+
+uniform vec2 ellipsoidalFactor = vec2(1.0, 1.0); //(1.0, 1.0) is perfect circle, (2.0, 1.0) is vertical ellipse, (1.0, 2.0) is horizontal ellipse
+
+vec4 permute( vec4 x ) {
+
+ return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
+
+}
+
+vec4 taylorInvSqrt( vec4 r ) {
+
+ return 1.79284291400159 - 0.85373472095314 * r;
+
+}
+
+float snoise( vec3 v ) {
+
+ const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
+ const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
+
+ // First corner
+
+ vec3 i = floor( v + dot( v, C.yyy ) );
+ vec3 x0 = v - i + dot( i, C.xxx );
+
+ // Other corners
+
+ vec3 g = step( x0.yzx, x0.xyz );
+ vec3 l = 1.0 - g;
+ vec3 i1 = min( g.xyz, l.zxy );
+ vec3 i2 = max( g.xyz, l.zxy );
+
+ vec3 x1 = x0 - i1 + 1.0 * C.xxx;
+ vec3 x2 = x0 - i2 + 2.0 * C.xxx;
+ vec3 x3 = x0 - 1. + 3.0 * C.xxx;
+
+ // Permutations
+
+ i = mod( i, 289.0 );
+ vec4 p = permute( permute( permute(
+ i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
+ + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
+ + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
+
+ // Gradients
+ // ( N*N points uniformly over a square, mapped onto an octahedron.)
+
+ float n_ = 1.0 / 7.0; // N=7
+
+ vec3 ns = n_ * D.wyz - D.xzx;
+
+ vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
+
+ vec4 x_ = floor( j * ns.z );
+ vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
+
+ vec4 x = x_ *ns.x + ns.yyyy;
+ vec4 y = y_ *ns.x + ns.yyyy;
+ vec4 h = 1.0 - abs( x ) - abs( y );
+
+ vec4 b0 = vec4( x.xy, y.xy );
+ vec4 b1 = vec4( x.zw, y.zw );
+
+
+ vec4 s0 = floor( b0 ) * 2.0 + 1.0;
+ vec4 s1 = floor( b1 ) * 2.0 + 1.0;
+ vec4 sh = -step( h, vec4( 0.0 ) );
+
+ vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
+ vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
+
+ vec3 p0 = vec3( a0.xy, h.x );
+ vec3 p1 = vec3( a0.zw, h.y );
+ vec3 p2 = vec3( a1.xy, h.z );
+ vec3 p3 = vec3( a1.zw, h.w );
+
+ // Normalise gradients
+
+ vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
+ p0 *= norm.x;
+ p1 *= norm.y;
+ p2 *= norm.z;
+ p3 *= norm.w;
+
+ // Mix final noise value
+
+ vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
+ m = m * m;
+ return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
+ dot( p2, x2 ), dot( p3, x3 ) ) );
+
+}
+
+vec2 snoise2(vec3 pos)
+{
+ return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
+}
+
+float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
+{
+ //firewall
+ float delta = 0.0;
+// pos.y += (1.0 - pos.y) * 0.5;
+ //pos.y += 0.5;
+ pos.y /= stretchMult;
+ pos *= freqMult;
+ pos.y += currTime * scrollSpeed;
+// pos.y -= currTime * 3.0;
+
+
+ delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
+
+ return delta;
+}
+
+struct RingIntersection
+{
+ vec4 color;
+ float depth;
+};
+
+
+vec4 Uberblend(vec4 col0, vec4 col1)
+{
+// return vec4((1.0 - col0.a) * (col1.rgb) + col0.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+// return vec4((1.0 - col1.a) * (col0.rgb) + col1.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+ return vec4(
+ (1.0 - col0.a) * (1.0 - col1.a) * (col0.rgb * col0.a + col1.rgb * col1.a) / (col0.a + col1.a + 1e-1) +
+ (1.0 - col0.a) * (0.0 + col1.a) * (col1.rgb) +
+ (0.0 + col0.a) * (1.0 - col1.a) * (col0.rgb * (1.0 - col1.a) + col1.rgb * col1.a) +
+ (0.0 + col0.a) * (0.0 + col1.a) * (col1.rgb),
+ min(1.0, col0.a + col1.a));
+}
+
+RingIntersection GetBladeRingColor(float currTime, vec2 pos, vec3 axis)
+{
+ RingIntersection result;
+
+ vec3 rayOrigin = vec3(pos, -5.0);
+ vec3 rayDir = vec3(0.0, 0.0, 1.0);
+
+ vec3 planePoint = vec3(0.0, 0.0, 0.0);
+
+ result.depth = 10.0;
+ result.color = vec4(0.0, 0.0, 0.0, 0.0);
+
+
+
+ float someDelta = GetFireDelta(currTime, vec2(0.5, 0.5), 1.0, 1.0, 0.0, 0.23);
+ if(!(someDelta < 10 && someDelta > -10))
+ {
+ result.depth = -10;
+ result.color = vec4(1, 0, 0, 1);
+ return result;
+ }
+
+ vec3 baseIntersection = rayOrigin + rayDir * dot(planePoint - rayOrigin, axis) / dot(axis, rayDir);
+
+ for(int i = 0; i < 10; i++)
+ {
+ vec3 localAxis = axis;
+ localAxis.x += sin(someDelta * 1.5 + 100.0 * i) * 0.15;
+ localAxis.y += sin(someDelta * 1.7 + 130.0 * i) * 0.15;
+ /* localAxis.x += GetFireDelta(currTime, vec2(0.2 * i, 0.5), 1.0, 1.0, 0.0, 0.23) * 0.1;
+ localAxis.y += GetFireDelta(currTime, vec2(0.2 * i, 0.5), 1.0, 1.0, 0.0, 0.27) * 0.1;*/
+ localAxis /= length(localAxis);
+
+ vec3 intersection = rayOrigin + rayDir * dot(planePoint - rayOrigin, localAxis) / dot(localAxis, rayDir);
+
+ vec3 tangent0 = cross(axis, vec3(0.0, 1.0, 0.0));
+ if(length(tangent0) < 1e-1)
+ {
+ tangent0 = cross(axis, vec3(1.0, 0.0, 0.0));
+ }else
+ {
+ }
+ tangent0 /= length(tangent0);
+
+ vec3 tangent1 = cross(tangent0, axis);
+
+ vec2 planarPoint = vec2(dot(intersection - planePoint, tangent0), dot(intersection - planePoint, tangent1));
+
+ vec2 rotatedPoint;
+ /*rotatedPoint.x = planarPoint.x * cos(ang) - planarPoint.y * sin(ang);
+ rotatedPoint.y = planarPoint.x * sin(ang) + planarPoint.y * cos(ang);
+ rotatedPoint *= 2.0;
+ if(length(rotatedPoint) < 0.5 && rotatedPoint.x < 0.0)
+ {
+ result.color = texture2D(tex, rotatedPoint + vec2(0.5, 0.5));
+ result.depth = intersection.z;
+ }*/
+
+ float fogPhase = currTime * 5.0 + sin(someDelta * 1.5 + 9.0 * i) * 0.5;// + GetFireDelta(currTime, vec2(0.1 * i, 0.5), 1.0, 1.0, 0.0, 0.2) * 0.5;
+ fogPhase = clamp(fogPhase - floor(fogPhase), 0.0, 1.0);
+
+ float ang = -currTime * 30.0 + (3.14 * 2.0) / 10.0 * i + sin(someDelta * 1.5 + 5.0 * i) * 0.5;// + GetFireDelta(currTime, vec2(0.1 * i, 0.5), 1.0, 1.0, 0.0, 0.2) * 0.5;
+ rotatedPoint.x = planarPoint.x * cos(ang) - planarPoint.y * sin(ang);
+ rotatedPoint.y = planarPoint.x * sin(ang) + planarPoint.y * cos(ang);
+ //rotatedPoint *= 2.0 - fogPhase;
+ if(length(rotatedPoint) < 0.5 && rotatedPoint.x < 0.0)
+ {
+ vec4 airColor = /*vec4(sin(10 * i), sin(20 * i), sin(30 * i), 1.0);*/texture2D(tex, rotatedPoint + vec2(0.5, 0.5));
+ airColor.a *= (1.0 - pow(fogPhase, 3.0)) * (1.0 - pow((1.0 - fogPhase), 3.0));
+ result.color = Uberblend(result.color, airColor);
+ result.depth = intersection.z;
+ if(intersection.z < result.depth)
+ {
+ result.depth = intersection.z;
+ }
+ //result.color.rgb = vec3(0.5, 0.5, 0.5);//max(result.color.rgb, airColor.rgb);
+ //result.color.a = 1.0;//min(1.0, result.color.a + airColor.a);
+ }
+ }
+
+ return result;
+}
+
+
+
+void main(void)
+{
+// gl_FragColor = Uberblend(texture2D(tex, gl_TexCoord[0].xy), texture2D(tex, vec2(gl_TexCoord[0].x - 0.5, gl_TexCoord[0].y))); return;
+// gl_FragColor = texture2D(tex, - gl_TexCoord[0].xy); return;
+ vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
+
+ radius *= ellipsoidalFactor;
+
+ float radiusLen = length(radius);
+
+ vec3 axis = vec3(0.4, -0.5, -0.5);
+ axis /= length(axis);
+ RingIntersection int0 = GetBladeRingColor(tick / time_factor * 0.9 + 10.0, radius, axis);
+
+ axis = vec3(-0.6, -0.3, -0.2);
+ axis /= length(axis);
+ RingIntersection int1 = GetBladeRingColor(tick / time_factor, radius, axis);
+
+ if((int0.depth < 0.0 && noup == 2.0) || (int0.depth > 0.0 && noup == 1.0))
+ {
+ int0.color *= 0.0;
+ }
+ if((int1.depth < 0.0 && noup == 2.0) || (int1.depth > 0.0 && noup == 1.0))
+ {
+ int1.color *= 0.0;
+ }
+ int0.color.rgb *= max(0.0, min(1.0, (0.5 - int0.depth) * 2.0 - 0.5)) * 1.0;
+ int1.color.rgb *= max(0.0, min(1.0, (0.5 - int1.depth) * 2.0 - 0.5)) * 1.0;
+
+ vec4 resultColor;
+ if(int0.depth < int1.depth)
+ {
+ resultColor = Uberblend(int1.color, int0.color);
+ }
+ else
+ {
+ resultColor = Uberblend(int0.color, int1.color);
+// resultColor.rgb = (1.0 - int0.color.a) * (int1.color.rgb) + int0.color.a * (int1.color.rgb * int1.color.a + int0.color.rgb * (1.0 - int1.color.a));
+ //resultColor.a = int0.color.a + int1.color.a;
+ }
+
+ resultColor.a = min(1.0, resultColor.a);
+ resultColor.a *= gl_Color.a;
+
+
+ gl_FragColor = resultColor;
+}
\ No newline at end of file
diff --git a/game/modules/tome/data/gfx/shaders/spinningwinds2.lua b/game/modules/tome/data/gfx/shaders/spinningwinds2.lua
new file mode 100644
index 0000000000000000000000000000000000000000..1f31b24f200c1103a757b651a93c29c40385091e
--- /dev/null
+++ b/game/modules/tome/data/gfx/shaders/spinningwinds2.lua
@@ -0,0 +1,30 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+return {
+ frag = "spinningwinds2",
+ vert = nil,
+ args = {
+ tex = { texture = 0 },
+ time_factor = time_factor or 4000,
+ ellipsoidalFactor = ellipsoidalFactor or {1,1}, --1 is perfect circle, >1 is ellipsoidal
+ noup = noup or 0,
+ },
+ clone = false,
+}
diff --git a/game/modules/tome/data/gfx/shaders/sunaura.frag b/game/modules/tome/data/gfx/shaders/sunaura.frag
index 3d0a91dda304c95f1d3b1f7ba9c43507c89619fb..be71ef7f2146ff406cbbd32f658d92d6117aa1e2 100644
--- a/game/modules/tome/data/gfx/shaders/sunaura.frag
+++ b/game/modules/tome/data/gfx/shaders/sunaura.frag
@@ -1,231 +1,231 @@
-uniform sampler2D tex;
-uniform float tick;
-uniform float time_factor;
-
-uniform vec2 ellipsoidalFactor; //(1.0, 1.0) is perfect circle, (2.0, 1.0) is vertical ellipse, (1.0, 2.0) is horizontal ellipse
-
-vec4 permute( vec4 x ) {
-
- return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
-
-}
-
-vec4 taylorInvSqrt( vec4 r ) {
-
- return 1.79284291400159 - 0.85373472095314 * r;
-
-}
-
-float snoise( vec3 v ) {
-
- const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
- const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
-
- // First corner
-
- vec3 i = floor( v + dot( v, C.yyy ) );
- vec3 x0 = v - i + dot( i, C.xxx );
-
- // Other corners
-
- vec3 g = step( x0.yzx, x0.xyz );
- vec3 l = 1.0 - g;
- vec3 i1 = min( g.xyz, l.zxy );
- vec3 i2 = max( g.xyz, l.zxy );
-
- vec3 x1 = x0 - i1 + 1.0 * C.xxx;
- vec3 x2 = x0 - i2 + 2.0 * C.xxx;
- vec3 x3 = x0 - 1. + 3.0 * C.xxx;
-
- // Permutations
-
- i = mod( i, 289.0 );
- vec4 p = permute( permute( permute(
- i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
- + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
- + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
-
- // Gradients
- // ( N*N points uniformly over a square, mapped onto an octahedron.)
-
- float n_ = 1.0 / 7.0; // N=7
-
- vec3 ns = n_ * D.wyz - D.xzx;
-
- vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
-
- vec4 x_ = floor( j * ns.z );
- vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
-
- vec4 x = x_ *ns.x + ns.yyyy;
- vec4 y = y_ *ns.x + ns.yyyy;
- vec4 h = 1.0 - abs( x ) - abs( y );
-
- vec4 b0 = vec4( x.xy, y.xy );
- vec4 b1 = vec4( x.zw, y.zw );
-
-
- vec4 s0 = floor( b0 ) * 2.0 + 1.0;
- vec4 s1 = floor( b1 ) * 2.0 + 1.0;
- vec4 sh = -step( h, vec4( 0.0 ) );
-
- vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
- vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
-
- vec3 p0 = vec3( a0.xy, h.x );
- vec3 p1 = vec3( a0.zw, h.y );
- vec3 p2 = vec3( a1.xy, h.z );
- vec3 p3 = vec3( a1.zw, h.w );
-
- // Normalise gradients
-
- vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
- p0 *= norm.x;
- p1 *= norm.y;
- p2 *= norm.z;
- p3 *= norm.w;
-
- // Mix final noise value
-
- vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
- m = m * m;
- return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
- dot( p2, x2 ), dot( p3, x3 ) ) );
-
-}
-
-vec2 snoise2(vec3 pos)
-{
- return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
-}
-
-float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
-{
- //firewall
- float delta = 0;
-// pos.y += (1.0 - pos.y) * 0.5;
- //pos.y += 0.5;
- pos.y /= stretchMult;
- pos *= freqMult;
- pos.y += currTime * scrollSpeed;
-// pos.y -= currTime * 3.0;
-
- delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
- delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
-
- return delta;
-}
-vec4 GetFireColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult)
-{
- float delta = GetFireDelta(currTime, pos, freqMult, stretchMult, 3.0, 0.1);
- delta *= min(1.0, max(0.0, 1.0 * (1.0 - pos.y)));
- delta *= min(1.0, max(0.0, 1.0 * (0.0 + pos.y)));
- vec2 displacedPoint = pos + vec2(0, delta * ampMult);
- displacedPoint.y = min(0.99, displacedPoint.y);
- displacedPoint.y = max(0.01, displacedPoint.y);
-
- return texture2D(tex, displacedPoint);
-}
-
-vec4 GetCheckboardColor(vec2 pos)
-{
- vec4 col = vec4(0.0, 0.0, 0.0, 0.0);
- if(pos.x > 0.0 && pos.x < 1.0 && pos.y > 0.0 && pos.y < 1.0)
- {
- if(mod(pos.x, 0.1) < 0.05 ^^ mod(pos.y, 0.1) < 0.05)
- col = vec4(pos.x, pos.y, 0.0, 1.0);
- else
- col = vec4(0.0, 0.0, 0.0, 1.0);
- }
- return col;
-}
-
-vec4 GetFireRingColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius1, float radius2, float scrollSpeed, float paletteCoord)
-{
- float pi = 3.141592;
- float ang = atan(pos.y, pos.x) + pi;
-
- vec2 planarPos = vec2(ang / (2.0 * pi), 1.0 - (length(pos) - radius1) / (radius2 - radius1));
- planarPos.y = pow(abs(planarPos.y), power);
-
- float delta =
- GetFireDelta(currTime, planarPos + vec2(currTime * scrollSpeed, 0.0), freqMult, stretchMult, 2.5, 0.5) * (1.0 - planarPos.x) +
- GetFireDelta(currTime, vec2(planarPos.x + currTime * scrollSpeed - 1.0, planarPos.y), freqMult, stretchMult, 2.5, 0.5) * planarPos.x;
-
- delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
- delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
-
- float verticalPos = planarPos.y + delta * ampMult;
- verticalPos = min(0.99, verticalPos);
- verticalPos = max(0.01, verticalPos);
-
- return texture2D(tex, vec2(paletteCoord, verticalPos));
-}
-
-vec4 GetSunAuraColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius1, float radius2, float scrollSpeed, float paletteCoord)
-{
- float pi = 3.141592;
- float ang = atan(pos.y, pos.x);
-
- vec2 planarPos = vec2(ang, (length(pos) - radius1) / (radius2 - radius1));
- float distMult = planarPos.y;
-
- planarPos.x += distMult * sin(-currTime * 50.0 + planarPos.y * 20.0 + cos(planarPos.x * 5.0) * 2.0) * 0.1;
-
- float adjust = 5.0 - pow(1.0 - (1.0 - cos(planarPos.x * 4.0)) / 2.0, 10.0) * 4.0
- - pow(1.0 - (1.0 - cos((planarPos.x + pi / 4.0) * 4.0)) / 2.0, 10.0) * 3.5
- - pow(1.0 - (1.0 - cos((planarPos.x + pi / 8.0) * 8.0)) / 2.0, 10.0) * 3.0;
- planarPos.y *= adjust;
-
- planarPos.x = planarPos.x / (2.0 * pi) + 0.5;
- planarPos = 1.0 - planarPos;
- //planarPos.y = pow(abs(planarPos.y), 1.0 + 2.0 * adjust);
- //return GetCheckboardColor(planarPos);
-
- float delta =
- GetFireDelta(currTime, planarPos + vec2(currTime * scrollSpeed, 0.0), freqMult, stretchMult, 2.5, 0.5) * (1.0 - planarPos.x) +
- GetFireDelta(currTime, vec2(planarPos.x + currTime * scrollSpeed - 1.0, planarPos.y), freqMult, stretchMult, 2.5, 0.5) * planarPos.x;
-
- delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
- delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
-
- float verticalPos = planarPos.y + delta * ampMult;
- verticalPos = min(0.99, verticalPos);
- verticalPos = max(0.01, verticalPos);
-
- return texture2D(tex, vec2(paletteCoord, verticalPos));
-}
-
-void main(void)
-{
- vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
-
- radius *= ellipsoidalFactor;
-
- float radiusLen = length(radius);
-
-
- float ringRadius = 0.15;
- float ringOuterWidth = 0.35;
- float ringInnerWidth = 0.05;
-
- vec4 c;
- if(radiusLen > ringRadius - ringInnerWidth && radiusLen < ringRadius)
- {
- c = GetFireRingColor(tick / time_factor + 0.0 , radius, 6.0, 15.0, 1.0, 1.0, ringRadius, ringRadius - ringInnerWidth, 0.0, 0.5);
- }else
- if(radiusLen < ringRadius + ringOuterWidth && radiusLen >= ringRadius)
- {
- c = GetSunAuraColor(tick / time_factor + 10.0 , radius, 6.0, 15.0, 0.5, 1.0, ringRadius, ringRadius + ringOuterWidth, 0.0, 0.5);
- }else
- {
- c = vec4(0.0, 0.0, 0.0, 0.0);
- }
- c.a *= gl_Color.a;
-
-
- gl_FragColor = c;
-}
+uniform sampler2D tex;
+uniform float tick;
+uniform float time_factor;
+
+uniform vec2 ellipsoidalFactor; //(1.0, 1.0) is perfect circle, (2.0, 1.0) is vertical ellipse, (1.0, 2.0) is horizontal ellipse
+
+vec4 permute( vec4 x ) {
+
+ return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
+
+}
+
+vec4 taylorInvSqrt( vec4 r ) {
+
+ return 1.79284291400159 - 0.85373472095314 * r;
+
+}
+
+float snoise( vec3 v ) {
+
+ const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
+ const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
+
+ // First corner
+
+ vec3 i = floor( v + dot( v, C.yyy ) );
+ vec3 x0 = v - i + dot( i, C.xxx );
+
+ // Other corners
+
+ vec3 g = step( x0.yzx, x0.xyz );
+ vec3 l = 1.0 - g;
+ vec3 i1 = min( g.xyz, l.zxy );
+ vec3 i2 = max( g.xyz, l.zxy );
+
+ vec3 x1 = x0 - i1 + 1.0 * C.xxx;
+ vec3 x2 = x0 - i2 + 2.0 * C.xxx;
+ vec3 x3 = x0 - 1. + 3.0 * C.xxx;
+
+ // Permutations
+
+ i = mod( i, 289.0 );
+ vec4 p = permute( permute( permute(
+ i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
+ + i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
+ + i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
+
+ // Gradients
+ // ( N*N points uniformly over a square, mapped onto an octahedron.)
+
+ float n_ = 1.0 / 7.0; // N=7
+
+ vec3 ns = n_ * D.wyz - D.xzx;
+
+ vec4 j = p - 49.0 * floor( p * ns.z *ns.z ); // mod(p,N*N)
+
+ vec4 x_ = floor( j * ns.z );
+ vec4 y_ = floor( j - 7.0 * x_ ); // mod(j,N)
+
+ vec4 x = x_ *ns.x + ns.yyyy;
+ vec4 y = y_ *ns.x + ns.yyyy;
+ vec4 h = 1.0 - abs( x ) - abs( y );
+
+ vec4 b0 = vec4( x.xy, y.xy );
+ vec4 b1 = vec4( x.zw, y.zw );
+
+
+ vec4 s0 = floor( b0 ) * 2.0 + 1.0;
+ vec4 s1 = floor( b1 ) * 2.0 + 1.0;
+ vec4 sh = -step( h, vec4( 0.0 ) );
+
+ vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
+ vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
+
+ vec3 p0 = vec3( a0.xy, h.x );
+ vec3 p1 = vec3( a0.zw, h.y );
+ vec3 p2 = vec3( a1.xy, h.z );
+ vec3 p3 = vec3( a1.zw, h.w );
+
+ // Normalise gradients
+
+ vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
+ p0 *= norm.x;
+ p1 *= norm.y;
+ p2 *= norm.z;
+ p3 *= norm.w;
+
+ // Mix final noise value
+
+ vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
+ m = m * m;
+ return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
+ dot( p2, x2 ), dot( p3, x3 ) ) );
+
+}
+
+vec2 snoise2(vec3 pos)
+{
+ return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
+}
+
+float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
+{
+ //firewall
+ float delta = 0.0;
+// pos.y += (1.0 - pos.y) * 0.5;
+ //pos.y += 0.5;
+ pos.y /= stretchMult;
+ pos *= freqMult;
+ pos.y += currTime * scrollSpeed;
+// pos.y -= currTime * 3.0;
+
+ delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
+ delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
+
+ return delta;
+}
+vec4 GetFireColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult)
+{
+ float delta = GetFireDelta(currTime, pos, freqMult, stretchMult, 3.0, 0.1);
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - pos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + pos.y)));
+ vec2 displacedPoint = pos + vec2(0, delta * ampMult);
+ displacedPoint.y = min(0.99, displacedPoint.y);
+ displacedPoint.y = max(0.01, displacedPoint.y);
+
+ return texture2D(tex, displacedPoint);
+}
+
+vec4 GetCheckboardColor(vec2 pos)
+{
+ vec4 col = vec4(0.0, 0.0, 0.0, 0.0);
+ if(pos.x > 0.0 && pos.x < 1.0 && pos.y > 0.0 && pos.y < 1.0)
+ {
+ if(mod(pos.x, 0.1) < 0.05 ^^ mod(pos.y, 0.1) < 0.05)
+ col = vec4(pos.x, pos.y, 0.0, 1.0);
+ else
+ col = vec4(0.0, 0.0, 0.0, 1.0);
+ }
+ return col;
+}
+
+vec4 GetFireRingColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius1, float radius2, float scrollSpeed, float paletteCoord)
+{
+ float pi = 3.141592;
+ float ang = atan(pos.y, pos.x) + pi;
+
+ vec2 planarPos = vec2(ang / (2.0 * pi), 1.0 - (length(pos) - radius1) / (radius2 - radius1));
+ planarPos.y = pow(abs(planarPos.y), power);
+
+ float delta =
+ GetFireDelta(currTime, planarPos + vec2(currTime * scrollSpeed, 0.0), freqMult, stretchMult, 2.5, 0.5) * (1.0 - planarPos.x) +
+ GetFireDelta(currTime, vec2(planarPos.x + currTime * scrollSpeed - 1.0, planarPos.y), freqMult, stretchMult, 2.5, 0.5) * planarPos.x;
+
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
+
+ float verticalPos = planarPos.y + delta * ampMult;
+ verticalPos = min(0.99, verticalPos);
+ verticalPos = max(0.01, verticalPos);
+
+ return texture2D(tex, vec2(paletteCoord, verticalPos));
+}
+
+vec4 GetSunAuraColor(float currTime, vec2 pos, float freqMult, float stretchMult, float ampMult, float power, float radius1, float radius2, float scrollSpeed, float paletteCoord)
+{
+ float pi = 3.141592;
+ float ang = atan(pos.y, pos.x);
+
+ vec2 planarPos = vec2(ang, (length(pos) - radius1) / (radius2 - radius1));
+ float distMult = planarPos.y;
+
+ planarPos.x += distMult * sin(-currTime * 50.0 + planarPos.y * 20.0 + cos(planarPos.x * 5.0) * 2.0) * 0.1;
+
+ float adjust = 5.0 - pow(1.0 - (1.0 - cos(planarPos.x * 4.0)) / 2.0, 10.0) * 4.0
+ - pow(1.0 - (1.0 - cos((planarPos.x + pi / 4.0) * 4.0)) / 2.0, 10.0) * 3.5
+ - pow(1.0 - (1.0 - cos((planarPos.x + pi / 8.0) * 8.0)) / 2.0, 10.0) * 3.0;
+ planarPos.y *= adjust;
+
+ planarPos.x = planarPos.x / (2.0 * pi) + 0.5;
+ planarPos = 1.0 - planarPos;
+ //planarPos.y = pow(abs(planarPos.y), 1.0 + 2.0 * adjust);
+ //return GetCheckboardColor(planarPos);
+
+ float delta =
+ GetFireDelta(currTime, planarPos + vec2(currTime * scrollSpeed, 0.0), freqMult, stretchMult, 2.5, 0.5) * (1.0 - planarPos.x) +
+ GetFireDelta(currTime, vec2(planarPos.x + currTime * scrollSpeed - 1.0, planarPos.y), freqMult, stretchMult, 2.5, 0.5) * planarPos.x;
+
+ delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
+ delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
+
+ float verticalPos = planarPos.y + delta * ampMult;
+ verticalPos = min(0.99, verticalPos);
+ verticalPos = max(0.01, verticalPos);
+
+ return texture2D(tex, vec2(paletteCoord, verticalPos));
+}
+
+void main(void)
+{
+ vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
+
+ radius *= ellipsoidalFactor;
+
+ float radiusLen = length(radius);
+
+
+ float ringRadius = 0.15;
+ float ringOuterWidth = 0.35;
+ float ringInnerWidth = 0.05;
+
+ vec4 c;
+ if(radiusLen > ringRadius - ringInnerWidth && radiusLen < ringRadius)
+ {
+ c = GetFireRingColor(tick / time_factor + 0.0 , radius, 6.0, 15.0, 1.0, 1.0, ringRadius, ringRadius - ringInnerWidth, 0.0, 0.5);
+ }else
+ if(radiusLen < ringRadius + ringOuterWidth && radiusLen >= ringRadius)
+ {
+ c = GetSunAuraColor(tick / time_factor + 10.0 , radius, 6.0, 15.0, 0.5, 1.0, ringRadius, ringRadius + ringOuterWidth, 0.0, 0.5);
+ }else
+ {
+ c = vec4(0.0, 0.0, 0.0, 0.0);
+ }
+ c.a *= gl_Color.a;
+
+
+ gl_FragColor = c;
+}
diff --git a/game/modules/tome/data/gfx/shaders/unique_glow.frag b/game/modules/tome/data/gfx/shaders/unique_glow.frag
index 3deabe6a37c4f9746c1b82b1d507a0890c0573ad..52e3bdd27d69b62d5bc3eedeba44681ae9f4cd8c 100644
--- a/game/modules/tome/data/gfx/shaders/unique_glow.frag
+++ b/game/modules/tome/data/gfx/shaders/unique_glow.frag
@@ -1,45 +1,45 @@
-uniform vec2 texSize;
-uniform sampler2D tex;
-uniform sampler3D noisevol;
-uniform vec4 color;
-uniform float tick;
-
-int blursize = 7;
-
-void main(void)
-{
- float fTime0_1 = tick / 5000.0;
- vec2 offset = 1.0/texSize;
-
- // Center Pixel
- vec4 sample = vec4(0.0,0.0,0.0,0.0);
- vec4 center = texture2D(tex, vec2(gl_TexCoord[0].st));
- float factor = ((float(blursize)*2.0)+1.0);
- factor = factor*factor;
-
- for(int i = -blursize; i <= blursize; i++)
- {
- for(int j = -blursize; j <= blursize; j++)
- {
- sample += texture2D(tex, vec2(gl_TexCoord[0].xy+vec2(float(i)*offset.x, float(j)*offset.y)));
- }
- }
- sample /= float((blursize*2) * (blursize*2));
-
- float a = 1.0-center.a;
-
- float delta = sample.a;
- // float delta = max(max(sample.r,sample.g),sample.b)/factor;
- float noise = texture3D(noisevol, vec3(gl_TexCoord[0].xy,fTime0_1)).r*2;
- gl_FragColor = mix(center,delta*color*noise,a);
-
- /*
- float delta = sample.a;
- // float delta = max(max(sample.r,sample.g),sample.b)/factor;
- gl_FragColor = mix(center,delta*color,a);
- */
-
- /*
- gl_FragColor = mix(center,sample/factor,a);
- */
-}
+uniform vec2 texSize;
+uniform sampler2D tex;
+uniform sampler3D noisevol;
+uniform vec4 color;
+uniform float tick;
+
+int blursize = 7;
+
+void main(void)
+{
+ float fTime0_1 = tick / 5000.0;
+ vec2 offset = 1.0/texSize;
+
+ // Center Pixel
+ vec4 sample = vec4(0.0,0.0,0.0,0.0);
+ vec4 center = texture2D(tex, vec2(gl_TexCoord[0].st));
+ float factor = ((float(blursize)*2.0)+1.0);
+ factor = factor*factor;
+
+ for(int i = -blursize; i <= blursize; i++)
+ {
+ for(int j = -blursize; j <= blursize; j++)
+ {
+ sample += texture2D(tex, vec2(gl_TexCoord[0].xy+vec2(float(i)*offset.x, float(j)*offset.y)));
+ }
+ }
+ sample /= float((blursize*2.0) * (blursize*2.0));
+
+ float a = 1.0-center.a;
+
+ float delta = sample.a;
+ // float delta = max(max(sample.r,sample.g),sample.b)/factor;
+ float noise = texture3D(noisevol, vec3(gl_TexCoord[0].xy,fTime0_1)).r*2.0;
+ gl_FragColor = mix(center,delta*color*noise,a);
+
+ /*
+ float delta = sample.a;
+ // float delta = max(max(sample.r,sample.g),sample.b)/factor;
+ gl_FragColor = mix(center,delta*color,a);
+ */
+
+ /*
+ gl_FragColor = mix(center,sample/factor,a);
+ */
+}
diff --git a/game/modules/tome/data/gfx/shaders/water.frag b/game/modules/tome/data/gfx/shaders/water.frag
index 0a8eae7f1c3461c3537baa316c5b847e59819d8e..f4af4bd60af862f90de9e2ea55a88c4810259357 100644
--- a/game/modules/tome/data/gfx/shaders/water.frag
+++ b/game/modules/tome/data/gfx/shaders/water.frag
@@ -60,7 +60,7 @@ float col(vec2 coord)
void main(void)
{
- vec2 p = (vec2(gl_FragCoord.x, texSize.y - gl_FragCoord.y) + mapCoord) / texSize.xy, c1 = p, c2 = p;
+ vec2 p = (vec2(gl_FragCoord.x - mapCoord.x, texSize.y - gl_FragCoord.y - mapCoord.y)) / texSize.xy, c1 = p, c2 = p;
float cc1 = col(c1);
c2.x += texSize.x/delta;
diff --git a/game/modules/tome/data/gfx/shockbolt/player/dwarf_female/base_01.png b/game/modules/tome/data/gfx/shockbolt/player/dwarf_female/base_01.png
index 6fccf88dfe356415f8e9aa119b46b7b01dbc0808..2342d9b078c143c16212bd97c61f012b788e7570 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/player/dwarf_female/base_01.png and b/game/modules/tome/data/gfx/shockbolt/player/dwarf_female/base_01.png differ
diff --git a/game/modules/tome/data/maps/vaults/greater-crypt.lua b/game/modules/tome/data/maps/vaults/greater-crypt.lua
index 65403204335e77e9b6cd8932a467bd438172ce67..4e70e489192e1bf5d9a60cf66ea39a8f246c00df 100644
--- a/game/modules/tome/data/maps/vaults/greater-crypt.lua
+++ b/game/modules/tome/data/maps/vaults/greater-crypt.lua
@@ -80,7 +80,7 @@ defineTile('1', mod.class.Grid.new{
end
actor:move(fx, fy, true)
- game.logPlayer(actor, "Something in the floor clicks ominously, and suddenly the world spins around you!")
+ game.logPlayer(actor, "Something in the floor clicks ominously%s", actor.lite > 0 and not actor:attr("blind") and ", and suddenly the world spins around you!" or ".")
local g = game.zone:makeEntityByName(game.level, "terrain", "FLOOR")
if not g then return end
game.zone:addEntity(game.level, g, "terrain", x, y)
@@ -111,8 +111,7 @@ defineTile('2', mod.class.Grid.new{
game.zone:addEntity(game.level, f, "terrain", x, y)
game.nicer_tiles:updateAround(game.level, x, y)
-
- game.logPlayer(actor, "Something in the floor clicks ominously, and the crypt rearranges itself around you!")
+ game.logPlayer(actor, "Something in the floor clicks ominously%s", actor.lite > 0 and not actor:attr("blind") and ", and the crypt rearranges itself around you!" or ".")
end,
}
@@ -164,8 +163,7 @@ defineTile('4', mod.class.Grid.new{
game.zone:addEntity(game.level, f, "terrain", x, y)
game.nicer_tiles:updateAround(game.level, x, y)
- game.logPlayer(actor, "Something underfoot clicks ominously, and the crypt rearranges itself around you!")
-
+ game.logPlayer(actor, "Something in the floor clicks ominously%s", actor.lite > 0 and not actor:attr("blind") and ", and the crypt rearranges itself around you!" or ".")
end,
}
)
diff --git a/game/modules/tome/data/maps/vaults/paladin-vs-vampire.lua b/game/modules/tome/data/maps/vaults/paladin-vs-vampire.lua
index 83f0f47c15a93de96c70722f791acb84019117dd..25c1455a7de71c6aa3389865b0fc50b5346f262b 100644
--- a/game/modules/tome/data/maps/vaults/paladin-vs-vampire.lua
+++ b/game/modules/tome/data/maps/vaults/paladin-vs-vampire.lua
@@ -33,10 +33,12 @@ defineTile('~', mod.class.Grid.new{
on_stand = function(self, x, y, who)
local DT = engine.DamageType
local dam = DT:get(DT.RETCH).projector(self, x, y, DT.RETCH, rng.range(self.mindam, self.maxdam))
- if not who:attr("undead") then game.logPlayer(who, "Dark energies course upwards through the lava.") end
+ self.x, self.y = x, y
+ if who.player and not who:attr("undead") then self:logCombat(who, "#Source# emits dark energies at your feet.") end
if who.dead and not who:attr("undead") then
--add undead
local m = game.zone:makeEntityByName(game.level, "actor", "RISEN_CORPSE")
+ game.logSeen(who, "The corrupted lava reanimates %s's corpse!", who.name:capitalize())
game.zone:addEntity(game.level, m, "actor", x, y)
end
end,
diff --git a/game/modules/tome/data/quests/antimagic.lua b/game/modules/tome/data/quests/antimagic.lua
index 81806409c8049e2bc740eb5de3e3c4589ad0d5a2..7f46dc6ff570a4af83d19978db627d4df9b686ba 100644
--- a/game/modules/tome/data/quests/antimagic.lua
+++ b/game/modules/tome/data/quests/antimagic.lua
@@ -33,7 +33,7 @@ on_status_change = function(self, who, status, sub)
who:setQuestStatus(self.id, engine.Quest.DONE)
local p = game.party:findMember{main=true}
p:attr("forbid_arcane", 1)
- if p:knowTalentType("wild-gift/antimagic") ~= nil then
+ if p:knowTalentType("wild-gift/antimagic") == true then
p:setTalentTypeMastery("wild-gift/antimagic", p:getTalentTypeMastery("wild-gift/antimagic") + 0.1)
else
p:learnTalentType("wild-gift/antimagic", true)
diff --git a/game/modules/tome/data/quests/keepsake.lua b/game/modules/tome/data/quests/keepsake.lua
index eae2b3440b50fff3b08445105a8e16c41d5124f2..2c3b5f346e5887764b2480e442354b8b2207b1fd 100644
--- a/game/modules/tome/data/quests/keepsake.lua
+++ b/game/modules/tome/data/quests/keepsake.lua
@@ -149,8 +149,8 @@ on_caravan_destroyed_chat_over = function(self, who)
game.level.default_down.y = spot.y
-- make yourself mortal again
- game.player:heal(10000)
- game.player:incHate(10000)
+ game.player:heal(game.player.max_life)
+ game.player:incHate(game.player.max_hate)
who.die = who.old_die
who.old_die = nil
@@ -259,9 +259,9 @@ on_berethh_death = function(self, who, berethh)
who:setQuestStatus("keepsake", engine.Quest.DONE)
- local o, item, inven_id = who:findInAllInventoriesBy("define_as", "IRON_ACORN_BASIC")
- if o then
- who:removeObject(inven_id, item, true)
+ local carry, o, item, inven_id = game.party:findInAllInventoriesBy("define_as", "IRON_ACORN_BASIC")
+ if carry and o then
+ carry:removeObject(inven_id, item, true)
o:removed()
local o
@@ -272,9 +272,9 @@ on_berethh_death = function(self, who, berethh)
end
if o then
game.zone:addEntity(game.level, o, "object")
- who:addObject(who.INVEN_INVEN, o)
+ carry:addObject(carry.INVEN_INVEN, o)
o:added()
- who:sortInven()
+ carry:sortInven()
end
end
end
diff --git a/game/modules/tome/data/quests/shertul-fortress.lua b/game/modules/tome/data/quests/shertul-fortress.lua
index df3b11dca0c0124500c9af12ae8f4d8384d33730..14411b2fd9baa42d7f29cfefc8dbfc1ee9ba02b5 100644
--- a/game/modules/tome/data/quests/shertul-fortress.lua
+++ b/game/modules/tome/data/quests/shertul-fortress.lua
@@ -60,7 +60,7 @@ desc = function(self, who)
if self:isCompleted("flight-done") then
desc[#desc+1] = "#LIGHT_GREEN#* You have re-enabled the fortress flight systems. You can now fly around in your fortress!#WHITE#"
else
- desc[#desc+1] = "#SLATE#* The fortress shadow has asked that you find an Ancient Storm Saphir, along with at least 250 energy, to re-enable the fortress flight systems.#WHITE#"
+ desc[#desc+1] = "#SLATE#* The fortress shadow has asked that you find an Ancient Storm Sapphire, along with at least 250 energy, to re-enable the fortress flight systems.#WHITE#"
end
end
if self.shertul_energy > 0 then
@@ -117,7 +117,7 @@ gain_energy = function(self, energy)
-- if self.shertul_energy >= 250 and not self:isCompleted("flight") then
-- game.player:setQuestStatus(self.id, self.COMPLETED, "flight")
-- local Dialog = require "engine.ui.Dialog"
- -- Dialog:simpleLongPopup("Fortress Shadow", "Master, you have sent enough energy to activate the flight systems.\nHowever, one control crystal is broken. You need to find an #GOLD#Ancient Storm Saphir#WHITE#.", 400)
+ -- Dialog:simpleLongPopup("Fortress Shadow", "Master, you have sent enough energy to activate the flight systems.\nHowever, one control crystal is broken. You need to find an #GOLD#Ancient Storm Sapphire#WHITE#.", 400)
-- end
end
diff --git a/game/modules/tome/data/quests/staff-absorption.lua b/game/modules/tome/data/quests/staff-absorption.lua
index a55db0a1d307c94cedabe50437b81d8feedea434..f79454b9e34d92dd4540d412038cea0e894a8154 100644
--- a/game/modules/tome/data/quests/staff-absorption.lua
+++ b/game/modules/tome/data/quests/staff-absorption.lua
@@ -76,10 +76,11 @@ start_ambush = function(self, who)
-- Protect from other hits on the same turn
self:setEffect(self.EFF_DAMAGE_SHIELD, 3, {power=1000000})
+ self:removeEffectsFilter{status="detrimental"}
- local o, item, inven_id = self:findInAllInventoriesBy("define_as", "STAFF_ABSORPTION")
- if o then
- self:removeObject(inven_id, item, true)
+ local carry, o, item, inven_id = game.party:findInAllInventoriesBy("define_as", "STAFF_ABSORPTION")
+ if carry and o then
+ carry:removeObject(inven_id, item, true)
o:removed()
end
diff --git a/game/modules/tome/data/sound/actions/punch1.ogg b/game/modules/tome/data/sound/actions/punch1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..a627234cb74aaf73432d076a0ac7c2f18b3cf581
Binary files /dev/null and b/game/modules/tome/data/sound/actions/punch1.ogg differ
diff --git a/game/modules/tome/data/sound/actions/punch2.ogg b/game/modules/tome/data/sound/actions/punch2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..e04f96785bdba9a3e460b396eaae41f8a438bb3d
Binary files /dev/null and b/game/modules/tome/data/sound/actions/punch2.ogg differ
diff --git a/game/modules/tome/data/sound/actions/punch3.ogg b/game/modules/tome/data/sound/actions/punch3.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..effec0ff03e836a6e685b963e85a624976513b21
Binary files /dev/null and b/game/modules/tome/data/sound/actions/punch3.ogg differ
diff --git a/game/modules/tome/data/sound/actions/punch4.ogg b/game/modules/tome/data/sound/actions/punch4.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..808ea280de7601dba2acb8858b0438c56ed72667
Binary files /dev/null and b/game/modules/tome/data/sound/actions/punch4.ogg differ
diff --git a/game/modules/tome/data/talents/celestial/combat.lua b/game/modules/tome/data/talents/celestial/combat.lua
index d66cd20f7702134ae6d66bd331a385d40963d47d..39ec927da4cfd6e49fe478f51494316a71f35ab1 100644
--- a/game/modules/tome/data/talents/celestial/combat.lua
+++ b/game/modules/tome/data/talents/celestial/combat.lua
@@ -67,7 +67,7 @@ newTalent{
game:playSoundNear(self, "talents/spell_generic")
local target = game.level.map(x, y, Map.ACTOR)
if target then
- target:setEffect(self.EFF_MARTYRDOM, 10, {power=t.getReturnDamage(self, t), apply_power=self:combatSpellpower()})
+ target:setEffect(self.EFF_MARTYRDOM, 10, {src = self, power=t.getReturnDamage(self, t), apply_power=self:combatSpellpower()})
else
return
end
diff --git a/game/modules/tome/data/talents/celestial/guardian.lua b/game/modules/tome/data/talents/celestial/guardian.lua
index 8d4838540e7b7a839323a1c4a1cdd228121292c1..7706e2f95816f42db028834d4071bb1fd54668c8 100644
--- a/game/modules/tome/data/talents/celestial/guardian.lua
+++ b/game/modules/tome/data/talents/celestial/guardian.lua
@@ -160,7 +160,7 @@ newTalent{
if core.shader.active(4) then
ret.particle = self:addParticles(Particles.new("shader_ring_rotating", 1, {toback=true, rotation=0, radius=2, img="flamesgeneric"}, {type="sunaura", time_factor=6000}))
else
- particle = self:addParticles(Particles.new("golden_shield", 1))
+ ret.particle = self:addParticles(Particles.new("golden_shield", 1))
end
return ret
end,
diff --git a/game/modules/tome/data/talents/celestial/light.lua b/game/modules/tome/data/talents/celestial/light.lua
index da3147fb0ea0f8c6b839f0305d81266bb5fe04b3..9b40d85dc16f2a86180297b1ad917b8a595e2b3a 100644
--- a/game/modules/tome/data/talents/celestial/light.lua
+++ b/game/modules/tome/data/talents/celestial/light.lua
@@ -32,6 +32,10 @@ newTalent{
self:attr("allow_on_heal", 1)
self:heal(self:spellCrit(t.getHeal(self, t)), self)
self:attr("allow_on_heal", -1)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true, size_factor=1.5, y=-0.3, img="healcelestial", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0, beamColor1={0xd8/255, 0xff/255, 0x21/255, 1}, beamColor2={0xf7/255, 0xff/255, 0x9e/255, 1}, circleDescendSpeed=3}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false,size_factor=1.5, y=-0.3, img="healcelestial", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0, beamColor1={0xd8/255, 0xff/255, 0x21/255, 1}, beamColor2={0xf7/255, 0xff/255, 0x9e/255, 1}, circleDescendSpeed=3}))
+ end
game:playSoundNear(self, "talents/heal")
return true
end,
diff --git a/game/modules/tome/data/talents/celestial/twilight.lua b/game/modules/tome/data/talents/celestial/twilight.lua
index cc14c56b2e0d92c732815342777646cecc1012b3..1612ad1b4cfd9efd5db8efc755616d6700c41b2b 100644
--- a/game/modules/tome/data/talents/celestial/twilight.lua
+++ b/game/modules/tome/data/talents/celestial/twilight.lua
@@ -222,7 +222,7 @@ newTalent{
target:reactionToward(self) >= 0 or -- No friends
target.size_category > allowed
then
- game.logPlayer(self, "%s resists!", target.name:capitalize())
+ game.logSeen(target, "%s resists!", target.name:capitalize())
return true
end
diff --git a/game/modules/tome/data/talents/chronomancy/age-manipulation.lua b/game/modules/tome/data/talents/chronomancy/age-manipulation.lua
index 9233bd776a44a9c7cba458df1a4e7270c564a0db..7d8beca1c5429ca8845710bf25a0746ecc4cad9a 100644
--- a/game/modules/tome/data/talents/chronomancy/age-manipulation.lua
+++ b/game/modules/tome/data/talents/chronomancy/age-manipulation.lua
@@ -169,7 +169,12 @@ newTalent{
action = function(self, t)
self:attr("allow_on_heal", 1)
self:heal(self:spellCrit(t.getHeal(self, t)), self)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true ,size_factor=1.5, y=-0.3, img="healparadox", life=25}, {type="healing", time_factor=3000, beamsCount=15, noup=2.0, beamColor1={0xb6/255, 0xde/255, 0xf3/255, 1}, beamColor2={0x5c/255, 0xb2/255, 0xc2/255, 1}}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false,size_factor=1.5, y=-0.3, img="healparadox", life=25}, {type="healing", time_factor=3000, beamsCount=15, noup=1.0, beamColor1={0xb6/255, 0xde/255, 0xf3/255, 1}, beamColor2={0x5c/255, 0xb2/255, 0xc2/255, 1}}))
+ end
self:attr("allow_on_heal", -1)
+
local target = self
local effs = {}
diff --git a/game/modules/tome/data/talents/chronomancy/energy.lua b/game/modules/tome/data/talents/chronomancy/energy.lua
index 8e803e69369c9623392c52218195d855a10866bd..32d20c41a36366a9d82f3c2a8029603b063ebc0d 100644
--- a/game/modules/tome/data/talents/chronomancy/energy.lua
+++ b/game/modules/tome/data/talents/chronomancy/energy.lua
@@ -47,7 +47,7 @@ newTalent{
end,
info = function(self, t)
local absorption = t.getAbsorption(self, t)
- return ([[Reduces all incoming energy damage (all except mind and physical damage) by 30%%, up to a maximum of %d.
+ return ([[Partially dissipates all incoming energy damage (all except mind and physical damage), reducing it by 30%%, up to a maximum of %d.
The maximum damage reduction will scale with your Spellpower.]]):format(absorption)
end,
}
diff --git a/game/modules/tome/data/talents/chronomancy/timeline-threading.lua b/game/modules/tome/data/talents/chronomancy/timeline-threading.lua
index 20b6d12d378751c0d9dd6139ede8fa59164f3bb2..b45ed1c68538b08908aec735ca283d88b80b806d 100644
--- a/game/modules/tome/data/talents/chronomancy/timeline-threading.lua
+++ b/game/modules/tome/data/talents/chronomancy/timeline-threading.lua
@@ -114,7 +114,7 @@ newTalent{
target:reactionToward(self) >= 0 or -- No friends
target.size_category > allowed
then
- game.logPlayer(self, "%s resists!", target.name:capitalize())
+ game.logSeen(target, "%s resists!", target.name:capitalize())
return true
end
diff --git a/game/modules/tome/data/talents/cunning/dirty.lua b/game/modules/tome/data/talents/cunning/dirty.lua
index a14d9b0e07e706a6c1e15b1a3a908136c12f6678..45bb0f8b9dd9f90cfdef8cad619fba4c3572063e 100644
--- a/game/modules/tome/data/talents/cunning/dirty.lua
+++ b/game/modules/tome/data/talents/cunning/dirty.lua
@@ -43,7 +43,7 @@ newTalent{
target:setEffect(target.EFF_STUNNED, t.getDuration(self, t), {apply_power=self:combatAttack()})
end
if not target:hasEffect(target.EFF_STUNNED) then
- game.logSeen(target, "%s resists the stun and %s quickly gets back on feet!", target.name:capitalize(), self.name:capitalize())
+ self:logCombat(target, "#Target# resists the stun and #Source# quickly regains its footing!")
self.energy.value = self.energy.value + game.energy_to_act * self:combatSpeed()
end
end
@@ -101,7 +101,7 @@ newTalent{
if hitted and not self.dead and tx == target.x and ty == target.y then
if not self:canMove(tx,ty,true) or not target:canMove(sx,sy,true) then
- game.logSeen(self, "%s and %s cannot switch places due to terrain.",self.name:capitalize(),target.name:capitalize())
+ self:logCombat(target, "Terrain prevents #Source# from switching places with #Target#.")
return false
end
self:setEffect(self.EFF_EVASION, t.getDuration(self, t), {chance=50})
diff --git a/game/modules/tome/data/talents/cunning/traps.lua b/game/modules/tome/data/talents/cunning/traps.lua
index 881f45ff9f16f0ff1ca90341f8bf1a6814b1e99a..1bbb4a794c8e85a8f9ab213236fbc0bc65fab707 100644
--- a/game/modules/tome/data/talents/cunning/traps.lua
+++ b/game/modules/tome/data/talents/cunning/traps.lua
@@ -673,7 +673,7 @@ newTalent{
if target:canBe("knockback") then
target:pull(self.x, self.y, 1)
if target.x ~= ox or target.y ~= oy then
- game.logSeen(target, "%s is pulled toward %s's gravity trap!", target.name:capitalize(), self.summoner.name:capitalize())
+ self.summoner:logCombat(target, "#Target# is pulled towards #Source#'s gravity trap!")
end
end
end
diff --git a/game/modules/tome/data/talents/cursed/cursed-aura.lua b/game/modules/tome/data/talents/cursed/cursed-aura.lua
index f24f4a5dd0643da759ac2ef7cdb7f7871835a454..df43d26209c0be8eea2814206031b6f3717fe0d2 100644
--- a/game/modules/tome/data/talents/cursed/cursed-aura.lua
+++ b/game/modules/tome/data/talents/cursed/cursed-aura.lua
@@ -38,7 +38,7 @@ newTalent{
return { self.EFF_CURSE_OF_CORPSES, self.EFF_CURSE_OF_MADNESS, self.EFF_CURSE_OF_MISFORTUNE, self.EFF_CURSE_OF_NIGHTMARES, self.EFF_CURSE_OF_SHROUDS }
end,
cursePenalty = function(self, t)
- return self:combatTalentLimit(math.max(1, self:getTalentLevel(t)-9), 0, 1, 0.50)
+ return self:combatTalentLimit(math.max(1, self:getTalentLevel(t)-4), 0, 1, 0.64)
end,
-- tests whether or not an item can be cursed (takes into account current talent level unless ignoreLevel = true)
canCurseItem = function(self, t, item, level)
@@ -263,7 +263,7 @@ newTalent{
Level 9 -- tools/totems/torques/wands
level 10 -- ammunition
At level 5, you can activate this talent to surround yourself with an aura that adds 2 levels to a curse of your choosing. (%s chosen)
- Talent levels higher than 10 reduce the negative effects of your curses (currently %d%% reduction).]]):
+ Also, talent levels above 5 reduce the negative effects of your curses (currently %d%% reduction).]]):
format(t.getCursedAuraName(self, t), (1-t.cursePenalty(self, t))*100)
end,
}
diff --git a/game/modules/tome/data/talents/cursed/cursed-form.lua b/game/modules/tome/data/talents/cursed/cursed-form.lua
index 9f1b93b6351beb5afba5ba1f5c4d3f330b7254c9..c7808b2fadefe80c93c76ceead75692143c31274 100644
--- a/game/modules/tome/data/talents/cursed/cursed-form.lua
+++ b/game/modules/tome/data/talents/cursed/cursed-form.lua
@@ -50,7 +50,7 @@ newTalent{
local heal = math.min(t.getRegenRate(self, t), maxHeal)
local temp = self.healing_factor
self.healing_factor = 1
- self:heal(heal)
+ self:heal(heal, t)
self.healing_factor = temp
self.unnatural_body_heal = math.max(0, (self.unnatural_body_heal or 0) - heal)
diff --git a/game/modules/tome/data/talents/cursed/darkness.lua b/game/modules/tome/data/talents/cursed/darkness.lua
index 514873f5ca5d169c5d455011ad65e6b33294ede3..39dbe90df8f4b6196e110f2dc6350cf5bfb9ba40 100644
--- a/game/modules/tome/data/talents/cursed/darkness.lua
+++ b/game/modules/tome/data/talents/cursed/darkness.lua
@@ -202,7 +202,7 @@ newTalent{
end,
createDark = function(summoner, x, y, damage, duration, creep, creepChance, initialCreep)
local e = Object.new{
- name = "creeping dark",
+ name = summoner.name:capitalize() .. "'s creeping dark",
block_sight=true,
canAct = false,
canCreep = true,
@@ -224,7 +224,9 @@ newTalent{
local actor = game.level.map(self.x, self.y, Map.ACTOR)
if actor and actor ~= self.summoner and (not actor.summoner or actor.summoner ~= self.summoner) then
self.projecting = true -- simplest way to indicate that this damage should not be amplified by the in creeping dark bonus
+ self.summoner.__project_source = self -- intermediate projector source
self.summoner:project({type="hit", range=10, talent=self.summoner:getTalentFromId(self.summoner.T_CREEPING_DARKNESS)}, actor.x, actor.y, engine.DamageType.DARKNESS, self.damage)
+ self.summoner.__project_source = nil
self.projecting = false
end
diff --git a/game/modules/tome/data/talents/cursed/endless-hunt.lua b/game/modules/tome/data/talents/cursed/endless-hunt.lua
index 82e4f5535cad4dca34b4ac318464151322fab026..bdda9c69bff431aca3d090687030d41455648134 100644
--- a/game/modules/tome/data/talents/cursed/endless-hunt.lua
+++ b/game/modules/tome/data/talents/cursed/endless-hunt.lua
@@ -59,7 +59,7 @@ newTalent{
local duration = t.getDuration(self, t)
self:setEffect(self.EFF_STALKER, duration, { target=target, bonus = 1 })
- target:setEffect(self.EFF_STALKED, duration, { source=self })
+ target:setEffect(self.EFF_STALKED, duration, {src=self })
game.level.map:particleEmitter(target.x, target.y, 1, "stalked_start")
@@ -123,7 +123,7 @@ newTalent{
local chance = t.getChance(self, t)
local spellpowerChange = t.getSpellpowerChange(self, t)
local mindpowerChange = t.getMindpowerChange(self, t)
- target:setEffect(target.EFF_BECKONED, duration, { source=self, range=range, chance=chance, spellpowerChange=spellpowerChange, mindpowerChange=mindpowerChange })
+ target:setEffect(target.EFF_BECKONED, duration, {src=self, range=range, chance=chance, spellpowerChange=spellpowerChange, mindpowerChange=mindpowerChange })
return true
end,
@@ -169,7 +169,7 @@ newTalent{
local target = effStalker.target
if not target or target.dead then return nil end
- target:setEffect(target.EFF_HARASSED, duration, { source=self, damageChange=targetDamageChange })
+ target:setEffect(target.EFF_HARASSED, duration, {src=self, damageChange=targetDamageChange })
for i = 1, 2 do
if not target.dead and self:attackTarget(target, nil, damageMultipler, true) then
diff --git a/game/modules/tome/data/talents/cursed/fears.lua b/game/modules/tome/data/talents/cursed/fears.lua
index 73d8477e31f8fea9cffce43e51d81d4d13fd4014..3b3d928ad4574060b9192421a4f4d76751d96c8c 100644
--- a/game/modules/tome/data/talents/cursed/fears.lua
+++ b/game/modules/tome/data/talents/cursed/fears.lua
@@ -77,7 +77,7 @@ newTalent{
local effectId = rng.table(effects)
local duration = t.getDuration(self, t)
- local eff = { source=self, duration=duration }
+ local eff = {src=self, duration=duration }
if effectId == target.EFF_PARANOID then
eff.attackChance = t.getParanoidAttackChance(self, t)
eff.mindpower = mindpower
@@ -105,7 +105,7 @@ newTalent{
-- heightened fear
if tHeightenFear and not target:hasEffect(target.EFF_HEIGHTEN_FEAR) then
local turnsUntilTrigger = tHeightenFear.getTurnsUntilTrigger(self, tHeightenFear)
- target:setEffect(target.EFF_HEIGHTEN_FEAR, 1, { source=self, range=self:getTalentRange(tHeightenFear), turns=turnsUntilTrigger, turns_left=turnsUntilTrigger })
+ target:setEffect(target.EFF_HEIGHTEN_FEAR, 1, {src=self, range=self:getTalentRange(tHeightenFear), turns=turnsUntilTrigger, turns_left=turnsUntilTrigger })
end
return effectId
@@ -175,7 +175,7 @@ newTalent{
local range = self:getTalentRange(t)
local turnsUntilTrigger = t.getTurnsUntilTrigger(self, t)
local duration = tInstillFear.getDuration(self, tInstillFear)
- return ([[Heighten the fears of everyone around you. Any foe experiencing at least one fear, who remains in a radius of %d and in sight of you for %d (non-consecutive) turns, will gain a new fear that lasts for %d turns. The target can save versus Mindpower to resist the effect, and each heightened fear reduces the chances of another by 10%%.
+ return ([[Heighten the fears of everyone around you. Any foe you inflict at least one fear upon and who remains in a radius of %d and in sight of you for %d (non-consecutive) turns, will gain a new fear that lasts for %d turns. The target can save versus Mindpower to resist the effect, and each added fear reduces the chances of another by 10%%.
You gain 2 new fears: The Terrified effect causes talents and attacks to fail %d%% of the time. The Distressed effect reduces all saves by %d.
Fear effects improve with your Mindpower.]]):format(range, turnsUntilTrigger, duration,
t.getTerrifiedActionFailureChance(self, t),
@@ -242,7 +242,7 @@ newTalent{
if not actor:canBe("fear") then
game.logSeen(actor, "#F53CBE#%s ignores the panic!", actor.name:capitalize())
elseif actor:checkHit(self:combatMindpower(), actor:combatMentalResist(), 0, 95) then
- actor:setEffect(actor.EFF_PANICKED, duration, {source=self,range=10,chance=chance})
+ actor:setEffect(actor.EFF_PANICKED, duration, {src=self,range=10,chance=chance})
else
game.logSeen(actor, "#F53CBE#%s resists the panic!", actor.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/cursed/force-of-will.lua b/game/modules/tome/data/talents/cursed/force-of-will.lua
index b8d31a3f6e91a4ac24791c463c59937c2ee2ce1b..0dc4fd7324be5865386f66004cdc98d731febb9e 100644
--- a/game/modules/tome/data/talents/cursed/force-of-will.lua
+++ b/game/modules/tome/data/talents/cursed/force-of-will.lua
@@ -46,7 +46,6 @@ local function forceHit(self, t, target, sourceX, sourceY, damage, knockback, kn
local knockbackCount = 0
local blocked = false
while knockback > 0 do
- blocked = true
local x, y, is_corner_blocked = lineFunction:step(true)
if not game.level.map:isBound(x, y) or is_corner_blocked or game.level.map:checkAllEntities(x, y, "block_move", target) then
@@ -54,14 +53,14 @@ local function forceHit(self, t, target, sourceX, sourceY, damage, knockback, kn
local nextTarget = game.level.map(x, y, Map.ACTOR)
if nextTarget then
if knockbackCount > 0 then
- game.logPlayer(self, "%s was blasted %d spaces into %s!", target.name:capitalize(), knockbackCount, nextTarget.name)
+ target:logCombat(nextTarget, "#Source# was blasted %d spaces into #Target#!", knockbackCount)
else
- game.logPlayer(self, "%s was blasted into %s!", target.name:capitalize(), nextTarget.name)
+ target:logCombat(nextTarget, "#Source# was blasted into #Target#!")
end
elseif knockbackCount > 0 then
- game.logPlayer(self, "%s was smashed back %d spaces!", target.name:capitalize(), knockbackCount)
+ game.logSeen(target, "%s was smashed back %d spaces!", target.name:capitalize(), knockbackCount)
else
- game.logPlayer(self, "%s was smashed!", target.name:capitalize())
+ game.logSeen(target, "%s was smashed!", target.name:capitalize())
end
-- take partial damage
@@ -76,6 +75,7 @@ local function forceHit(self, t, target, sourceX, sourceY, damage, knockback, kn
end
knockback = 0
+ blocked = true
else
-- allow move
finalX, finalY = x, y
@@ -85,7 +85,7 @@ local function forceHit(self, t, target, sourceX, sourceY, damage, knockback, kn
end
if not blocked and knockbackCount > 0 then
- game.logPlayer(self, "%s was blasted back %d spaces!", target.name:capitalize())
+ game.logSeen(target, "%s was blasted back %d spaces!", target.name:capitalize(), knockbackCount)
end
if not target.dead and (finalX ~= target.x or finalY ~= target.y) then
@@ -310,7 +310,7 @@ newTalent{
end,
getSecondHitChance = function(self, t) return self:combatTalentScale(self:getTalentLevel(t)-4, 15, 35) end,
action = function(self, t)
- game.logSeen(self, "An unseen force begin to swirl around %s!", self.name)
+ game.logSeen(self, "An unseen force begins to swirl around %s!", self.name)
local duration = t.getDuration(self, t)
local particles = self:addParticles(Particles.new("force_area", 1, { radius = self:getTalentRange(t) }))
diff --git a/game/modules/tome/data/talents/cursed/gestures.lua b/game/modules/tome/data/talents/cursed/gestures.lua
index d4665fe96278b357056358c20f1600bb2aca40b3..60d20e635c5ecc01219f4d1cbdadb2d70f631ddb 100644
--- a/game/modules/tome/data/talents/cursed/gestures.lua
+++ b/game/modules/tome/data/talents/cursed/gestures.lua
@@ -206,7 +206,7 @@ newTalent{
-- Damage reduction handled in _M:attackTargetWith function in mod.class.interface.Combat.lua
getDamageChange = function(self, t, fake)
local test, dam = canUseGestures(self)
- if not test and not fake then return 0 end
+ if (not test or self:attr("encased_in_ice")) and not fake then return 0 end
return t.getGuardPercent(self, t) * dam/100
end,
getCounterAttackChance = function(self, t, fake)
@@ -231,7 +231,7 @@ newTalent{
-- Counterattack handled in _M:attackTargetWith function in mod.class.interface.Combat.lua (requires EFF_GESTURE_OF_GUARDING)
on_hit = function(self, t, who)
if rng.percent(t.getCounterAttackChance(self, t)) and self:isTalentActive(self.T_GESTURE_OF_PAIN) and canUseGestures(self) then
- game.logSeen(self, "#F53CBE#%s lashes back at %s!", self.name:capitalize(), who.name)
+ self:logCombat(who, "#F53CBE##Source# lashes back at #Target#!")
local tGestureOfPain = self:getTalentFromId(self.T_GESTURE_OF_PAIN)
tGestureOfPain.attack(self, tGestureOfPain, who)
end
diff --git a/game/modules/tome/data/talents/cursed/predator.lua b/game/modules/tome/data/talents/cursed/predator.lua
index 71000dafd0164498ad4275cba63a386d7ec19b97..04db0f8a485f5b7199d02de06413edefb9c68eb9 100644
--- a/game/modules/tome/data/talents/cursed/predator.lua
+++ b/game/modules/tome/data/talents/cursed/predator.lua
@@ -57,7 +57,7 @@ newTalent{
if eff and eff.type == target.type and eff.subtype == target.subtype then
return false
end
- if eff then self:removeEffect(self.EFF_PREDATOR) end
+ if eff then self:removeEffect(self.EFF_PREDATOR, true, true) end
self:setEffect(self.EFF_PREDATOR, 1, { type=target.type, subtype=target.subtype, killExperience = 0, subtypeKills = 0, typeKills = 0 })
return true
diff --git a/game/modules/tome/data/talents/cursed/punishments.lua b/game/modules/tome/data/talents/cursed/punishments.lua
index dc3bd2b6b9ba677cfa8160560c795108522c6f72..cad4474b0c6e804c18b60e2627a8847d22f9fc12 100644
--- a/game/modules/tome/data/talents/cursed/punishments.lua
+++ b/game/modules/tome/data/talents/cursed/punishments.lua
@@ -117,7 +117,7 @@ newTalent{
local jumpDuration = t.getJumpDuration(self, t)
local hateGain = t.getHateGain(self, t)
target:setEffect(target.EFF_HATEFUL_WHISPER, duration, {
- source = self,
+ src = self,
damage = damage,
duration = duration,
mindpower = mindpower,
@@ -288,7 +288,7 @@ newTalent{
local mindpower = self:combatMindpower()
local duration = t.getDuration(self, t)
target:setEffect(target.EFF_AGONY, duration, {
- source = self,
+ src = self,
mindpower = mindpower,
damage = damage,
duration = duration,
diff --git a/game/modules/tome/data/talents/cursed/shadows.lua b/game/modules/tome/data/talents/cursed/shadows.lua
index a41883be27767e9bfea88428e78c427e67a47889..af46b974182a523bf41ef8f1795ecdac37ca49a2 100644
--- a/game/modules/tome/data/talents/cursed/shadows.lua
+++ b/game/modules/tome/data/talents/cursed/shadows.lua
@@ -596,7 +596,7 @@ newTalent{
end
if shadowCount > 0 then
- game.logPlayer(self, "#PINK#The shadows converge on %s!", target.name)
+ self:logCombat(target, "#PINK#The shadows converge on #Target#!")
return true
else
game.logPlayer(self, "Their are no shadows to heed the call!")
@@ -617,7 +617,7 @@ newTalent{
end
if shadowCount > 0 then
- game.logPlayer(self, "#PINK#The shadows form around %s!", target.name)
+ self:logCombat(target, "#PINK#The shadows form around #Target#!")
return true
else
game.logPlayer(self, "Their are no shadows to heed the call!")
diff --git a/game/modules/tome/data/talents/cursed/slaughter.lua b/game/modules/tome/data/talents/cursed/slaughter.lua
index 3b09aa9f4fcda5db450a0d85c45fdbce5a2125dd..d065316c845f485ce79d014563e8268b905188e3 100644
--- a/game/modules/tome/data/talents/cursed/slaughter.lua
+++ b/game/modules/tome/data/talents/cursed/slaughter.lua
@@ -186,7 +186,7 @@ newTalent{
and game.level.map:isBound(x, y)
and not game.level.map:checkAllEntities(x, y, "block_move", self) then
blockingTarget:move(x, y, true)
- game.logSeen(self, "%s knocks back %s!", self.name:capitalize(), blockingTarget.name)
+ self:logCombat(blockingTarget, "#Source# knocks back #Target#!")
blocked = false
break
end
@@ -195,7 +195,7 @@ newTalent{
end
if blocked then
- game.logSeen(self, "%s blocks %s!", blockingTarget.name:capitalize(), self.name)
+ self:logCombat(blockingTarget, "#Target# blocks #Source#!")
end
end
@@ -341,7 +341,7 @@ newTalent{
local secondTarget = game.level.map(x, y, Map.ACTOR)
if secondTarget and secondTarget ~= target and self:reactionToward(secondTarget) < 0 then
local damageMultiplier = t.getDamageMultiplier(self, t)
- game.logSeen(self, "%s cleaves through %s!", self.name:capitalize(), secondTarget.name)
+ self:logCombat(secondTarget, "#Source# cleaves through #Target#!")
self:attackTarget(secondTarget, nil, damageMultiplier, true)
inCleave = false
return
diff --git a/game/modules/tome/data/talents/cursed/strife.lua b/game/modules/tome/data/talents/cursed/strife.lua
index 08b066da9684c355128e3ec73e4c9c3474eee475..5665523aa7649d0a26d71682c05e9a43f2d0d6ee 100644
--- a/game/modules/tome/data/talents/cursed/strife.lua
+++ b/game/modules/tome/data/talents/cursed/strife.lua
@@ -54,7 +54,7 @@ newTalent{
local armorChange = t.getArmorChange(self, t)
local defenseChange = t.getDefenseChange(self, t)
local resistPenetration = t.getResistPenetration(self, t)
- target:setEffect(target.EFF_DOMINATED, duration, { source = self, armorChange = armorChange, defenseChange = defenseChange, resistPenetration = resistPenetration, apply_power=self:combatMindpower() })
+ target:setEffect(target.EFF_DOMINATED, duration, {src = self, armorChange = armorChange, defenseChange = defenseChange, resistPenetration = resistPenetration, apply_power=self:combatMindpower() })
-- attack if adjacent
if core.fov.distance(self.x, self.y, x, y) <= 1 then
diff --git a/game/modules/tome/data/talents/gifts/call.lua b/game/modules/tome/data/talents/gifts/call.lua
index 78d6b43e7fc9fcfb7f9ec31da70fa246de153cc0..46baa16467edd9a9bab02564791eb49945a7859e 100644
--- a/game/modules/tome/data/talents/gifts/call.lua
+++ b/game/modules/tome/data/talents/gifts/call.lua
@@ -90,8 +90,12 @@ newTalent{ short_name = "NATURE_TOUCH",
if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
if not target:attr("undead") then
target:attr("allow_on_heal", 1)
- target:heal(self:mindCrit(20 + self:combatTalentMindDamage(t, 20, 500)))
+ target:heal(self:mindCrit(20 + self:combatTalentMindDamage(t, 20, 500)), self)
target:attr("allow_on_heal", -1)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true ,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0}))
+ end
end
game:playSoundNear(self, "talents/heal")
return true
diff --git a/game/modules/tome/data/talents/gifts/fungus.lua b/game/modules/tome/data/talents/gifts/fungus.lua
index 90d25110f1ad589e78fcace2f6c60654d7f65d0b..94fa834e5f6d7bfac6dfb64a426a8dde83ad658a 100644
--- a/game/modules/tome/data/talents/gifts/fungus.lua
+++ b/game/modules/tome/data/talents/gifts/fungus.lua
@@ -99,7 +99,7 @@ newTalent{
action = function(self, t)
local amt = self.life_regen * t.getMult(self, t)
- self:heal(amt)
+ self:heal(amt, t)
game:playSoundNear(self, "talents/heal")
return true
diff --git a/game/modules/tome/data/talents/gifts/harmony.lua b/game/modules/tome/data/talents/gifts/harmony.lua
index 643e638f02b02434443096db36a900fc0fe651ee..7fd108cbfc714a593917e46305ce20c042afb130 100644
--- a/game/modules/tome/data/talents/gifts/harmony.lua
+++ b/game/modules/tome/data/talents/gifts/harmony.lua
@@ -45,7 +45,7 @@ newTalent{
nb = nb + 1
end
end
- self:heal(self:mindCrit(nb * self:combatTalentStatDamage(t, "wil", 20, 60)))
+ self:heal(self:mindCrit(nb * self:combatTalentStatDamage(t, "wil", 20, 60)), self)
self:setEffect(self.EFF_WATERS_OF_LIFE, t.getdur(self,t), {})
game:playSoundNear(self, "talents/spell_generic2")
return true
@@ -53,7 +53,7 @@ newTalent{
info = function(self, t)
return ([[The waters of life flow through you, purifying any poisons or diseases currently affecting you.
For %d turns, all poisons and diseases will heal you instead of damaging you.
- When activated, it also heals you for %d life per diseases or poisons on you.
+ When activated, it also heals you for %d life for each disease or poison you have.
The healing per disease/poison will increase with your Willpower.]]):
format(t.getdur(self,t), self:combatTalentStatDamage(t, "wil", 20, 60))
end,
diff --git a/game/modules/tome/data/talents/gifts/mindstar-mastery.lua b/game/modules/tome/data/talents/gifts/mindstar-mastery.lua
index 9cb5b62276e068c3eef6685750257fe4da04dd92..d75986931efcf115b5089f2619e260d1029dee02 100644
--- a/game/modules/tome/data/talents/gifts/mindstar-mastery.lua
+++ b/game/modules/tome/data/talents/gifts/mindstar-mastery.lua
@@ -169,9 +169,13 @@ newTalent{
if core.fov.distance(self.x, self.y, x, y) > 1 then break end
target:attr("allow_on_heal", 1)
- target:heal(dam)
+ target:heal(dam, t)
target:attr("allow_on_heal", -1)
target:incEquilibrium(-dam / 10)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true ,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0}))
+ end
break
end
diff --git a/game/modules/tome/data/talents/gifts/ooze.lua b/game/modules/tome/data/talents/gifts/ooze.lua
index ff813739a7d97238ec4ab8b5eb5eb3f02e6600d6..aeb948a8467bca786920176ba2a45b9be5562b60 100644
--- a/game/modules/tome/data/talents/gifts/ooze.lua
+++ b/game/modules/tome/data/talents/gifts/ooze.lua
@@ -117,7 +117,7 @@ newTalent{
getDam = function(self, t) return self:combatTalentMindDamage(t, 15, 200) end,
getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 4, 8)) end,
on_pre_use = function(self, t)
- if not game.level then return false end
+ if not game.level or not self.x or not self.y then return false end
for _, coor in pairs(util.adjacentCoords(self.x, self.y)) do
local act = game.level.map(coor[1], coor[2], Map.ACTOR)
if act and act.summoner == self and act.bloated_ooze then
diff --git a/game/modules/tome/data/talents/gifts/sand-drake.lua b/game/modules/tome/data/talents/gifts/sand-drake.lua
index e964fd32f9922d547b634623e993178dcd577a55..4cb3d2a6efd704f444fa74c9f7661b75584c199f 100644
--- a/game/modules/tome/data/talents/gifts/sand-drake.lua
+++ b/game/modules/tome/data/talents/gifts/sand-drake.lua
@@ -39,9 +39,7 @@ newTalent{
local x, y, target = self:getTarget(tg)
if not x or not y or not target then return nil end
if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
-
- game.logSeen(self, "%s tries to swallow %s!", self.name:capitalize(), target.name)
-
+ self:logCombat(target, "#Source# tries to swallow #Target#!")
local hit = self:attackTarget(target, DamageType.NATURE, self:combatTalentWeaponDamage(t, 1, 1.5), true)
if not hit then return true end
@@ -54,7 +52,11 @@ newTalent{
world:gainAchievement("EAT_BOSSES", self, target)
self:incEquilibrium(-target.level - 5)
self:attr("allow_on_heal", 1)
- self:heal(target.level * 2 + 5)
+ self:heal(target.level * 2 + 5, target)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true ,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0}))
+ end
self:attr("allow_on_heal", -1)
else
game.logSeen(target, "%s resists!", target.name:capitalize())
diff --git a/game/modules/tome/data/talents/gifts/storm-drake.lua b/game/modules/tome/data/talents/gifts/storm-drake.lua
index a2932da15fe748568c535f018e31abbee0b540d5..61361ecf8e8cfb363dc9a88fe381a2b8ea2f93db 100644
--- a/game/modules/tome/data/talents/gifts/storm-drake.lua
+++ b/game/modules/tome/data/talents/gifts/storm-drake.lua
@@ -88,7 +88,7 @@ newTalent{
if target.life - dam < 0 then dam = target.life end
target:takeHit(dam, self)
- game:delayedLogDamage(self, target, dam, ("#PURPLE#%d pure damage#LAST#"):format(math.ceil(dam)))
+ game:delayedLogDamage(self, target, dam, ("#PURPLE#%d STATIC#LAST#"):format(math.ceil(dam)))
end, nil, {type="lightning_explosion"})
game:playSoundNear(self, "talents/lightning")
return true
@@ -125,7 +125,7 @@ newTalent{
local movedam = self:mindCrit(self:combatTalentMindDamage(t, 10, 110))
local dam = self:mindCrit(self:combatTalentMindDamage(t, 15, 190))
- local proj = require("engine.Projectile"):makeHoming(
+ local proj = require("mod.class.Projectile"):makeHoming(
self,
{particle="bolt_lightning", trail="lightningtrail"},
{speed=2, name="Tornado", dam=dam, movedam=movedam},
diff --git a/game/modules/tome/data/talents/gifts/summon-melee.lua b/game/modules/tome/data/talents/gifts/summon-melee.lua
index f9d0c06ee697184d4ca43cbd1527b1a23d75f62d..3efd4f78a725fd0cd56c3a8a78b621e675cf77de 100644
--- a/game/modules/tome/data/talents/gifts/summon-melee.lua
+++ b/game/modules/tome/data/talents/gifts/summon-melee.lua
@@ -41,7 +41,8 @@ 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")
- self:project(tg, m.x, m.y, DamageType.TEMP_EFFECT, {foes=true, eff=self.EFF_LOWER_PHYSICAL_RESIST, dur=duration, p={power=self:combatTalentMindDamage(t, 15, 70)}}, {type="flame"})
+ self:project(tg, m.x, m.y, DamageType.TEMP_EFFECT, {foes=true, eff=self.EFF_LOWER_PHYSICAL_RESIST, dur=duration, p={power=self:combatTalentMindDamage(t, 15, 70)}})
+ game.level.map:particleEmitter(m.x, m.y, tg.radius, "shout", {size=4, distorion_factor=0.3, radius=tg.radius, life=30, nb_circles=8, rm=0.8, rM=1, gm=0.8, gM=1, bm=0.1, bM=0.2, am=0.6, aM=0.8})
end,
summonTime = function(self, t) return math.floor(self:combatScale(self:getTalentLevel(t) + self:getTalentLevel(self.T_RESILIENCE), 5, 0, 10, 5)) end,
incStats = function(self, t,fake)
@@ -192,7 +193,7 @@ newTalent{
local p = value * 0.10
if self.summoner and not self.summoner.dead then
self.summoner:incEquilibrium(-p)
- game.logSeen(self, "#GREEN#%s absorbs part of the blow. %s is closer to nature.", self.name:capitalize(), self.summoner.name:capitalize())
+ self:logCombat(self.summoner, "#GREEN##Source# absorbs part of the blow. #Target# is closer to nature.")
end
return value - p
end,
diff --git a/game/modules/tome/data/talents/gifts/summon-utility.lua b/game/modules/tome/data/talents/gifts/summon-utility.lua
index b53e0013bb4ba33bec9c0162a4be3c7938c79bd8..3b562c481cc13097867e50bac8378eb6aafb81a7 100644
--- a/game/modules/tome/data/talents/gifts/summon-utility.lua
+++ b/game/modules/tome/data/talents/gifts/summon-utility.lua
@@ -126,9 +126,13 @@ newTalent{
local target = game.level.map(px, py, Map.ACTOR)
if not target or self:reactionToward(target) < 0 then return end
target:attr("allow_on_heal", 1)
- target:heal(30 + self:combatTalentMindDamage(t, 10, 350))
+ target:heal(30 + self:combatTalentMindDamage(t, 10, 350), m)
target:attr("allow_on_heal", -1)
- end, nil, {type="acid"})
+ if core.shader.active(4) then
+ target:addParticles(Particles.new("shader_shield_temp", 1, {toback=true,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0}))
+ target:addParticles(Particles.new("shader_shield_temp", 1, {toback=false,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0}))
+ end
+ end)
end,
action = function(self, t)
local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
diff --git a/game/modules/tome/data/talents/misc/inscriptions.lua b/game/modules/tome/data/talents/misc/inscriptions.lua
index 073f6ab8ccecf366f0645a19760ce445df01d583..5217b2f9e3b16613bdb5fb6bb5faff359c0759ee 100644
--- a/game/modules/tome/data/talents/misc/inscriptions.lua
+++ b/game/modules/tome/data/talents/misc/inscriptions.lua
@@ -93,8 +93,12 @@ newInscription{
action = function(self, t)
local data = self:getInscriptionData(t.short_name)
self:attr("allow_on_heal", 1)
- self:heal(data.heal + data.inc_stat)
+ self:heal(data.heal + data.inc_stat, t)
self:attr("allow_on_heal", -1)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true , size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false, size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0}))
+ end
return true
end,
info = function(self, t)
@@ -932,7 +936,13 @@ newInscription{
else
target:forceUseTalent(eff[2], {ignore_energy=true})
end
- self:heal(data.heal + data.inc_stat)
+ self:attr("allow_on_heal", 1)
+ self:heal(data.heal + data.inc_stat, t)
+ self:attr("allow_on_heal", -1)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {size_factor=1.5, y=-0.3, img="healdark", life=25}, {type="healing", time_factor=6000, beamsCount=15, noup=2.0, beamColor1={0xcb/255, 0xcb/255, 0xcb/255, 1}, beamColor2={0x35/255, 0x35/255, 0x35/255, 1}}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {size_factor=1.5, y=-0.3, img="healdark", life=25}, {type="healing", time_factor=6000, beamsCount=15, noup=1.0, beamColor1={0xcb/255, 0xcb/255, 0xcb/255, 1}, beamColor2={0x35/255, 0x35/255, 0x35/255, 1}}))
+ end
end
game.level.map:particleEmitter(px, py, 1, "shadow_zone")
@@ -942,7 +952,7 @@ newInscription{
end,
info = function(self, t)
local data = self:getInscriptionData(t.short_name)
- return ([[Activate the taint on a foe, removing %d effects from it and healing you for %d per effects.]]):format(data.effects, data.heal + data.inc_stat)
+ return ([[Activate the taint on a foe, removing %d effects from it and healing you for %d for each effect.]]):format(data.effects, data.heal + data.inc_stat)
end,
short_info = function(self, t)
local data = self:getInscriptionData(t.short_name)
diff --git a/game/modules/tome/data/talents/misc/npcs.lua b/game/modules/tome/data/talents/misc/npcs.lua
index bddd963a71d2f3a0905a262a4d0bcc22b3b8a405..47d16adb7219c2f64e49af7f05e73810aa17e954 100644
--- a/game/modules/tome/data/talents/misc/npcs.lua
+++ b/game/modules/tome/data/talents/misc/npcs.lua
@@ -385,9 +385,11 @@ newTalent{
m.summon_time = filter.lastfor
m.faction = self.faction
+ if not filter.hasloot then m:forgetInven(m.INVEN_INVEN) end
+
game.zone:addEntity(game.level, m, "actor", x, y)
- game.logSeen(self, "%s summons %s!", self.name:capitalize(), m.name)
+ self:logCombat(m, "#Source# summons #Target#!")
-- Apply summon destabilization
if self:hasEffect(self.EFF_SUMMON_DESTABILIZATION) then
@@ -884,7 +886,7 @@ newTalent{
tactical = { DISABLE = { stun = 1, pin = 1 } },
getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7)) end,
action = function(self, t)
- local dur = 2 + self:getTalentLevel(t)
+ local dur = t.getDuration(self,t)
local trap = mod.class.Trap.new{
type = "web", subtype="web", id_by_type=true, unided_name = "sticky web",
display = '^', color=colors.YELLOW, image = "trap/trap_spiderweb_01_64.png",
@@ -896,10 +898,22 @@ newTalent{
temporary = dur * 5,
summoner = self,
faction = false,
+ canAct = false,
+ energy = {value=0},
canTrigger = function(self, x, y, who)
if who.type == "spiderkin" then return false end
return mod.class.Trap.canTrigger(self, x, y, who)
end,
+ act = function(self)
+ self:useEnergy()
+ self.temporary = self.temporary - 1
+ if self.temporary <= 0 then
+ if game.level.map(self.x, self.y, engine.Map.TRAP) == self then
+ game.level.map:remove(self.x, self.y, engine.Map.TRAP)
+ end
+ game.level:removeEntity(self)
+ end
+ end,
triggered = function(self, x, y, who)
if who:canBe("stun") and who:canBe("pin") then
who:setEffect(who.EFF_PINNED, self.pin_dur, {apply_power=self.disarm_power + 5})
@@ -908,12 +922,14 @@ newTalent{
end
return true, true
end
- }
- game.level.map(self.x, self.y, Map.TRAP, trap)
+ }
+ game.level:addEntity(trap)
+ game.zone:addEntity(game.level, trap, "trap", self.x, self.y)
+ trap:setKnown(self, true)
return true
end,
info = function(self, t)
- return ([[Lay an invisible web under you, pinning all non-spiderkin that pass for %d turns.]]):
+ return ([[Lay a concealed web under yourself, pinning all non-spiderkin that pass through it for %d turns.]]):
format(t.getDuration(self, t))
end,
}
@@ -1221,7 +1237,7 @@ newTalent{
game.zone:addEntity(game.level, m, "actor", x, y)
- game.logSeen(self, "%s spawns one of its tentacle!", self.name:capitalize())
+ game.logSeen(self, "%s spawns one of its tentacles!", self.name:capitalize())
end
return true
@@ -1864,6 +1880,10 @@ newTalent{
self:attr("allow_on_heal", 1)
self:heal(self:mindCrit(t.getHeal(self, t)), self)
self:attr("allow_on_heal", -1)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true , size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false, size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0}))
+ end
game:playSoundNear(self, "talents/heal")
return true
end,
diff --git a/game/modules/tome/data/talents/misc/objects.lua b/game/modules/tome/data/talents/misc/objects.lua
index 45aaf1a442944dd09ac52a3b7f32944826025556..6e4038a3d5668d3deaac77429af649e71b73c803 100644
--- a/game/modules/tome/data/talents/misc/objects.lua
+++ b/game/modules/tome/data/talents/misc/objects.lua
@@ -404,8 +404,9 @@ newTalent{
no_npc_use = true,
action = function(self, t)
local o = self:findInAllInventoriesBy("define_as", "MORRIGOR")
- self:onTakeoff(o, true)
- self:onWear(o, true)
+ o.use_talent=nil
+ o.power_regen=nil
+ o.max_power=nil
return true
end,
info = function(self, t)
diff --git a/game/modules/tome/data/talents/misc/races.lua b/game/modules/tome/data/talents/misc/races.lua
index d5f3ae5545885a70a4a5196344cc3fdffd8071a2..22b7ecb74e53c887c844a81792d1bbef38cb1bfd 100644
--- a/game/modules/tome/data/talents/misc/races.lua
+++ b/game/modules/tome/data/talents/misc/races.lua
@@ -493,7 +493,7 @@ newTalent{
return math.max(1, math.floor(self:combatScale(0.04*self:getCon() + self:getTalentLevel(t), 2.4, 1.4, 10, 9)))
end,
action = function(self, t)
- local tg = {type="bolt", range=self:getTalentRange(t), nolock=true, talent=t}
+ local tg = {type="bolt", range=self:getTalentRange(t), nolock=true, simple_dir_request=true, talent=t}
local x, y = self:getTarget(tg)
if not x or not y then return nil end
local _ _, x, y = self:canProject(tg, x, y)
@@ -722,7 +722,11 @@ newTalent{
end
end
self:attr("allow_on_heal", 1)
- self:heal(t.heal(self, t))
+ self:heal(t.heal(self, t), t)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true , size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false, size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0}))
+ end
self:attr("allow_on_heal", -1)
return true
end,
diff --git a/game/modules/tome/data/talents/psionic/absorption.lua b/game/modules/tome/data/talents/psionic/absorption.lua
index e3dc85a98c0613446747b7106eebad300849dc17..01d82cd37f1c044df3f9ef34d5dc31250aa3a28f 100644
--- a/game/modules/tome/data/talents/psionic/absorption.lua
+++ b/game/modules/tome/data/talents/psionic/absorption.lua
@@ -285,7 +285,7 @@ newTalent{
psigain = 2 + 2*dam/mast
dam = 0
else
- psigain = 2 + 2*self.kinspike_shield_absorb/mast
+ psigain = 2 + 2*self.thermspike_shield_absorb/mast
dam = dam - self.thermspike_shield_absorb
self.thermspike_shield_absorb = 0
end
diff --git a/game/modules/tome/data/talents/psionic/distortion.lua b/game/modules/tome/data/talents/psionic/distortion.lua
index 9e3b3cdd30cb51ec0a17aa1537585f64e0885dd5..62a1c26ac7b471bd4e95172846a847362e910c2c 100644
--- a/game/modules/tome/data/talents/psionic/distortion.lua
+++ b/game/modules/tome/data/talents/psionic/distortion.lua
@@ -196,8 +196,9 @@ newTalent{
local e = Object.new{
old_feat = oe,
type = oe.type, subtype = oe.subtype,
- name = "maelstrom", image = oe.image,
+ name = self.name:capitalize().. "'s maelstrom", image = oe.image,
display = oe.display, color=oe.color, back_color=oe.back_color,
+ tooltip = mod.class.Grid.tooltip,
always_remember = true,
temporary = t.getDuration(self, t),
is_maelstrom = true,
@@ -224,11 +225,13 @@ newTalent{
end end
table.sort(tgts, "sqdist")
for i, target in ipairs(tgts) do
+ self.summoner.__project_source = self
if target.actor:canBe("knockback") then
target.actor:pull(self.x, self.y, 1)
- game.logSeen(target.actor, "%s is pulled in by the %s!", target.actor.name:capitalize(), self.name)
+ target.actor.logCombat(self, target.actor, "#Source# pulls #Target# in!")
end
DamageType:get(DamageType.PHYSICAL).projector(self.summoner, target.actor.x, target.actor.y, DamageType.PHYSICAL, self.dam)
+ self.summoner.__project_source = nil
target.actor:setEffect(target.actor.EFF_DISTORTION, 2, {power=self.distortionPower})
end
diff --git a/game/modules/tome/data/talents/psionic/dream-forge.lua b/game/modules/tome/data/talents/psionic/dream-forge.lua
index e4a00088170e865c2e1c344627b51321b60aa814..6afd06c889a0f998bdabb49d0cc821f144a6d002 100644
--- a/game/modules/tome/data/talents/psionic/dream-forge.lua
+++ b/game/modules/tome/data/talents/psionic/dream-forge.lua
@@ -133,7 +133,8 @@ newTalent{
local e = Object.new{
old_feat = oe,
type = oe.type, subtype = oe.subtype,
- name = "forge barrier", image = "terrain/lava/lava_mountain5.png",
+ name = self.name:capitalize().."'s forge barrier",
+ image = "terrain/lava/lava_mountain5.png",
display = '#', color=colors.RED, back_color=colors.DARK_GREY,
shader = "shadow_simulacrum",
shader_args = { color = {0.6, 0.0, 0.0}, base = 0.9, time_factor = 1500 },
@@ -152,8 +153,9 @@ newTalent{
radius = self:getTalentRadius(t),
act = function(self)
local tg = {type="ball", range=0, friendlyfire=false, radius = 1, talent=t, x=self.x, y=self.y,}
+ self.summoner.__project_source = self
self.summoner:project(tg, self.x, self.y, engine.DamageType.DREAMFORGE, self.dam)
-
+ self.summoner.__project_source = nil
self:useEnergy()
self.temporary = self.temporary - 1
if self.temporary <= 0 then
diff --git a/game/modules/tome/data/talents/psionic/dream-smith.lua b/game/modules/tome/data/talents/psionic/dream-smith.lua
index f5c359823819509a4c38180e8a9d06daa444b719..f8ade13f3b2a2dbaf731e00bc4d88af4dbd09ad5 100644
--- a/game/modules/tome/data/talents/psionic/dream-smith.lua
+++ b/game/modules/tome/data/talents/psionic/dream-smith.lua
@@ -161,6 +161,7 @@ newTalent{
if x == px and y == py and self and self.x and self.y then
print("[Dream Hammer Return] Projection from", x, y, "to", self.x, self.y)
local tgr = tg
+ tgr.name = "Hammer Toss"
tgr.x, tgr.y = px, py
self:projectile(tgr, self.x, self.y, function(px, py, tgr, self)
local tmp_target = game.level.map(px, py, engine.Map.ACTOR)
diff --git a/game/modules/tome/data/talents/psionic/feedback.lua b/game/modules/tome/data/talents/psionic/feedback.lua
index 94d88b3b81caf02ac129288fdc0fc81165bc250f..c3300dd717b2973d870d4113ce7d463d8e3f321f 100644
--- a/game/modules/tome/data/talents/psionic/feedback.lua
+++ b/game/modules/tome/data/talents/psionic/feedback.lua
@@ -123,7 +123,7 @@ newTalent{
local inc = "inc"..name:capitalize()
if name == "heal" then
self:attr("allow_on_heal", 1)
- self:heal(self:mindCrit(v), self)
+ self:heal(self:mindCrit(v), t)
self:attr("allow_on_heal", -1)
elseif
self[inc] then self[inc](self, v)
diff --git a/game/modules/tome/data/talents/psionic/possession.lua b/game/modules/tome/data/talents/psionic/possession.lua
index 88a62a83526d4c7c23fd5d36d449bd068135b6fb..793c56cc873b305c97d8c15b655ebcdc030ecd03 100644
--- a/game/modules/tome/data/talents/psionic/possession.lua
+++ b/game/modules/tome/data/talents/psionic/possession.lua
@@ -50,10 +50,9 @@ newTalent{
if not t.allowedTypes(self, t, target.type) then game.logPlayer(self, "You may not possess this kind of creature.") return nil end
-- if target.life > target.max_life * 0.25 then game.logPlayer(self, "You may not possess this creature yet its life is too high.") return nil end
- if target.dead then game.logPlayer(self, "This creature is dead!") return nil end
-
+ if target.dead then game.logPlayer(self, "Your target is dead!") return nil end
if not self:checkHit(self:combatMindpower(), target:combatMentalResist(), 0, 95, 5) then -- or not target:canBe("instakill") then
- game.logPlayer(self, "You fail to shatter %s mind, leaving you unable to possess its body.", target.name)
+ self:logCombat(target, "#Source# fails to shatter #Target#'s mind, preventing its possession.")
return true
end
diff --git a/game/modules/tome/data/talents/psionic/solipsism.lua b/game/modules/tome/data/talents/psionic/solipsism.lua
index 03aeba24ff7ceee94ff3fd1be7e7ab42d49f5c41..2b0883865e43d6f9a2620cf8d626c1f3f3be6af0 100644
--- a/game/modules/tome/data/talents/psionic/solipsism.lua
+++ b/game/modules/tome/data/talents/psionic/solipsism.lua
@@ -189,7 +189,8 @@ newTalent{
print("[Dismissal] ", self.name:capitalize(), " attempting to ignore ", value, "damage from ", src.name:capitalize(), "using", saving_throw, "mental save.")
if self:checkHit(saving_throw, value) then
local dismissed = value * 1/self:mindCrit(2) -- Diminishing returns on high crits
- game.logSeen(self, "%s dismisses %d damage from %s!", self.name:capitalize(), dismissed, src.name:capitalize())
+ game:delayedLogMessage(self, nil, "Dismissal", "#TAN##Source# mentally dismisses some damage!")
+ game:delayedLogDamage(src, self, 0, ("#TAN#(%d dismissed)#LAST#"):format(dismissed))
return value - dismissed
else
return value
diff --git a/game/modules/tome/data/talents/psionic/thought-forms.lua b/game/modules/tome/data/talents/psionic/thought-forms.lua
index 3bf064a55ab2417e56d5c7e5e74386d6b0e4e775..12394a7fab779d785943861505a05c88eff4c23d 100644
--- a/game/modules/tome/data/talents/psionic/thought-forms.lua
+++ b/game/modules/tome/data/talents/psionic/thought-forms.lua
@@ -585,7 +585,7 @@ newTalent{
life = target:addTemporaryValue("max_life", life_bonus),
speed = target:addTemporaryValue("combat_physspeed", t.getControlBonus(self, t)/100),
damage = target:addTemporaryValue("inc_damage", {all=t.getControlBonus(self, t)}),
- target:heal(life_bonus),
+ target:heal(life_bonus, self),
}
return ret
diff --git a/game/modules/tome/data/talents/psionic/trance.lua b/game/modules/tome/data/talents/psionic/trance.lua
index b6365f991d939892ffac9e350b364c5053bb0788..80184aa195c7558a60e6e4ff6a724410816fbf94 100644
--- a/game/modules/tome/data/talents/psionic/trance.lua
+++ b/game/modules/tome/data/talents/psionic/trance.lua
@@ -103,7 +103,7 @@ newTalent{
getLifeRegen = function(self, t) return self:combatTalentMindDamage(t, 10, 50) / 10 end,
activate = function(self, t)
self:attr("allow_on_heal", 1)
- self:heal(self:mindCrit(t.getHeal(self, t)))
+ self:heal(self:mindCrit(t.getHeal(self, t)), self)
self:attr("allow_on_heal", -1)
cancelTrances(self)
@@ -112,10 +112,19 @@ newTalent{
heal_mod = self:addTemporaryValue("healing_factor", t.getHealingModifier(self, t)/100),
regen = self:addTemporaryValue("life_regen", t.getLifeRegen(self, t)),
}
+
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true , size_factor=1.5, y=-0.3, img="healcelestial", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0, beamColor1={0xd8/255, 0xff/255, 0x21/255, 1}, beamColor2={0xf7/255, 0xff/255, 0x9e/255, 1}, circleDescendSpeed=3}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false, size_factor=1.5, y=-0.3, img="healcelestial", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0, beamColor1={0xd8/255, 0xff/255, 0x21/255, 1}, beamColor2={0xf7/255, 0xff/255, 0x9e/255, 1}, circleDescendSpeed=3}))
+ ret.particle1 = self:addParticles(Particles.new("shader_shield", 1, {toback=true, size_factor=1.5, y=-0.3, img="healcelestial"}, {type="healing", time_factor=4000, noup=2.0, beamColor1={0xd8/255, 0xff/255, 0x21/255, 1}, beamColor2={0xf7/255, 0xff/255, 0x9e/255, 1}, circleColor={0,0,0,0}, beamsCount=5}))
+ ret.particle2 = self:addParticles(Particles.new("shader_shield", 1, {toback=false, size_factor=1.5, y=-0.3, img="healcelestial"}, {type="healing", time_factor=4000, noup=1.0, beamColor1={0xd8/255, 0xff/255, 0x21/255, 1}, beamColor2={0xf7/255, 0xff/255, 0x9e/255, 1}, circleColor={0,0,0,0}, beamsCount=5}))
+ end
return ret
end,
deactivate = function(self, t, p)
+ self:removeParticles(p.particle1)
+ self:removeParticles(p.particle2)
self:removeTemporaryValue("healing_factor", p.heal_mod)
self:removeTemporaryValue("life_regen", p.regen)
return true
diff --git a/game/modules/tome/data/talents/spells/advanced-golemancy.lua b/game/modules/tome/data/talents/spells/advanced-golemancy.lua
index e4bb6f492e4bd56f6654b90f30d680f949a1abb7..af6974753f4656d52a882849c77c0408957b5029 100644
--- a/game/modules/tome/data/talents/spells/advanced-golemancy.lua
+++ b/game/modules/tome/data/talents/spells/advanced-golemancy.lua
@@ -43,8 +43,12 @@ newTalent{
golem.life = golem.life - power -- Direct hit, bypass all checks
golem.changed = true
self:attr("allow_on_heal", 1)
- self:heal(power)
+ self:heal(power, golem)
self:attr("allow_on_heal", -1)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true , size_factor=1.5, y=-0.3, img="healarcane", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0, beamColor1={0x8e/255, 0x2f/255, 0xbb/255, 1}, beamColor2={0xe7/255, 0x39/255, 0xde/255, 1}, circleDescendSpeed=4}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false, size_factor=1.5, y=-0.3, img="healarcane", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0, beamColor1={0x8e/255, 0x2f/255, 0xbb/255, 1}, beamColor2={0xe7/255, 0x39/255, 0xde/255, 1}, circleDescendSpeed=4}))
+ end
game:playSoundNear(self, "talents/arcane")
return true
end,
diff --git a/game/modules/tome/data/talents/spells/aegis.lua b/game/modules/tome/data/talents/spells/aegis.lua
index f5577f705d281ac79dac6493031e2ec9946c1f13..b42bbf6b14cd8affab9bdee0204c95081ff88e4a 100644
--- a/game/modules/tome/data/talents/spells/aegis.lua
+++ b/game/modules/tome/data/talents/spells/aegis.lua
@@ -32,6 +32,10 @@ newTalent{
self:attr("allow_on_heal", 1)
self:heal(self:spellCrit(t.getHeal(self, t)), self)
self:attr("allow_on_heal", -1)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true , size_factor=1.5, y=-0.3, img="healarcane", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0, beamColor1={0x8e/255, 0x2f/255, 0xbb/255, 1}, beamColor2={0xe7/255, 0x39/255, 0xde/255, 1}, circleDescendSpeed=4}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false, size_factor=1.5, y=-0.3, img="healarcane", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0, beamColor1={0x8e/255, 0x2f/255, 0xbb/255, 1}, beamColor2={0xe7/255, 0x39/255, 0xde/255, 1}, circleDescendSpeed=4}))
+ end
game:playSoundNear(self, "talents/heal")
return true
end,
diff --git a/game/modules/tome/data/talents/spells/aether.lua b/game/modules/tome/data/talents/spells/aether.lua
index a783f57458212696035e626b1a0815b5761dfcbf..a1a4fe1ed32e499d0e10870400ed57679c0dce18 100644
--- a/game/modules/tome/data/talents/spells/aether.lua
+++ b/game/modules/tome/data/talents/spells/aether.lua
@@ -98,8 +98,10 @@ newTalent{
self.list.i = util.boundWrap(self.list.i + 1, 1, #self.list)
local tg = {type="beam", x=self.x, y=self.y, range=self.rad, selffire=self.summoner:spellFriendlyFire()}
+ self.summoner.__project_source = self
self.summoner:project(tg, x, y, engine.DamageType.ARCANE_SILENCE, {dam=self.dam, chance=25}, nil)
self.summoner:project(tg, self.x, self.y, engine.DamageType.ARCANE, self.dam/10, nil)
+ self.summoner.__project_source = nil
local _ _, x, y = self:canProject(tg, x, y)
game.level.map:particleEmitter(self.x, self.y, math.max(math.abs(x-self.x), math.abs(y-self.y)), "mana_beam", {tx=x-self.x, ty=y-self.y})
end,
@@ -152,7 +154,7 @@ newTalent{
local list = {}
self:project(tg, x, y, function(px, py) list[#list+1] = {x=px, y=py} end)
- self:setEffect(self.EFF_AETHER_BREACH, t.getNb(self, t), {list=list, level=game.zone.short_name.."-"..game.level.level, dam=self:spellCrit(t.getDamage(self, t))})
+ self:setEffect(self.EFF_AETHER_BREACH, t.getNb(self, t), {src = self, list=list, level=game.zone.short_name.."-"..game.level.level, dam=self:spellCrit(t.getDamage(self, t))})
game:playSoundNear(self, "talents/arcane")
return true
@@ -190,7 +192,7 @@ newTalent{
end,
info = function(self, t)
return ([[Fill yourself with aether forces, completely surrounding your body for %d turns.
- While active, you can only cast arcane or aether spells, your cooldown for them is divived by 3, your arcane damage is increased by 25%%, your Disruption Shield can be used at any time, and your maximum mana is increased by 33%%.]]):
+ While active, you can only cast arcane or aether spells, your cooldown for them is divided by 3, your arcane damage is increased by 25%%, your Disruption Shield can be used at any time, and your maximum mana is increased by 33%%.]]):
format(t.getNb(self, t))
end,
}
@@ -216,7 +218,7 @@ newTalent{
resist = self:addTemporaryValue("resists_pen", {[DamageType.ARCANE] = t.getResistPenalty(self, t)}),
}
if core.shader.active(4) then
- ret.particle = self:addParticles(Particles.new("shader_ring_rotating", 1, {toback=true, rotation=0, radius=2, img="arcanegeneric"}, {type="sunaura", time_factor=5000}))
+ ret.particle = self:addParticles(Particles.new("shader_ring_rotating", 1, {toback=true, rotation=0, radius=2, img="arcanegeneric", a=0.7}, {type="sunaura", time_factor=5000}))
-- particle = self:addParticles(Particles.new("shader_ring_rotating", 1, {radius=1.1}, {type="flames", hide_center=0, time_factor=1700, zoom=0.3, npow=1, color1={0.6, 0.3, 0.8, 1}, color2={0.8, 0, 0.8, 1}, xy={self.x, self.y}}))
else
ret.particle = self:addParticles(Particles.new("ultrashield", 1, {rm=180, rM=220, gm=10, gM=50, bm=190, bM=220, am=120, aM=200, radius=0.4, density=100, life=8, instop=20}))
diff --git a/game/modules/tome/data/talents/spells/air.lua b/game/modules/tome/data/talents/spells/air.lua
index 08182eb01955675a0b02fa0aa90907b3b253faa1..378890a1e8f79c5ed158abeb4c3bb534848df42d 100644
--- a/game/modules/tome/data/talents/spells/air.lua
+++ b/game/modules/tome/data/talents/spells/air.lua
@@ -70,7 +70,7 @@ newTalent{
reflectable = true,
requires_target = true,
getDamage = function(self, t) return self:combatTalentSpellDamage(t, 10, 250) end,
- getTargetCount = function(self, t) return 3 + self:getTalentLevelRaw(t) end,
+ getTargetCount = function(self, t) return math.floor(self:combatTalentScale(t, 4, 8, "log")) end,
action = function(self, t)
local tg = {type="bolt", range=self:getTalentRange(t), talent=t}
local fx, fy = self:getTarget(tg)
diff --git a/game/modules/tome/data/talents/spells/arcane.lua b/game/modules/tome/data/talents/spells/arcane.lua
index 5b7823bd07983808b249fe14a30ebe2c35ec41ec..3ef402d1981a7db89d5217aa76db4d4fd4caf43f 100644
--- a/game/modules/tome/data/talents/spells/arcane.lua
+++ b/game/modules/tome/data/talents/spells/arcane.lua
@@ -178,7 +178,8 @@ newTalent{
local particle
if core.shader.active(4) then
- particle = self:addParticles(Particles.new("shader_shield", 1, {size_factor=1.3, img="shield6"}, {type="shield", ellipsoidalFactor=1.05, shieldIntensity=0.1, time_factor=-2500, color={0.8, 0.1, 1.0}, impact_color = {0, 1, 0}, impact_time=800}))
+-- particle = self:addParticles(Particles.new("shader_shield", 1, {size_factor=1.3, img="shield6"}, {type="shield", ellipsoidalFactor=1.05, shieldIntensity=0.1, time_factor=-2500, color={0.8, 0.1, 1.0}, impact_color = {0, 1, 0}, impact_time=800}))
+ particle = self:addParticles(Particles.new("shader_shield", 1, {size_factor=1.4, img="runicshield"}, {type="runicshield", shieldIntensity=0.14, ellipsoidalFactor=1, scrollingSpeed=-1, time_factor=12000, bubbleColor={0.8, 0.1, 1.0, 1.0}, auraColor={0.85, 0.3, 1.0, 1}}))
else
particle = self:addParticles(Particles.new("disruption_shield", 1))
end
diff --git a/game/modules/tome/data/talents/spells/explosives.lua b/game/modules/tome/data/talents/spells/explosives.lua
index a38d594ac0812a575e4f623c7e4eece16ee36e9b..398dc82be51f126e9cab487d3346d91f011f8fa2 100644
--- a/game/modules/tome/data/talents/spells/explosives.lua
+++ b/game/modules/tome/data/talents/spells/explosives.lua
@@ -120,7 +120,7 @@ newTalent{
end
end)
- if ammo.alchemist_bomb and ammo.alchemist_bomb.leech then self:heal(math.min(self.max_life * ammo.alchemist_bomb.leech / 100, dam_done)) end
+ if ammo.alchemist_bomb and ammo.alchemist_bomb.leech then self:heal(math.min(self.max_life * ammo.alchemist_bomb.leech / 100, dam_done), ammo) end
local _ _, x, y = self:canProject(tg, x, y)
game.level.map:particleEmitter(x, y, tg.radius, particle, {radius=tg.radius, grids=grids, tx=x, ty=y})
@@ -173,7 +173,7 @@ newTalent{
require = spells_req3,
mode = "passive",
points = 5,
- getRadius = function(self, t) return math.floor(self:combatTalentScale(t, 2, 6, 0.5, 0, 0, true)) end,
+ getRadius = function(self, t) return math.max(1, math.floor(self:combatTalentScale(t, 2, 6, 0.5, 0, 0, true))) end,
minmax = function(self, t, grids)
local theoretical_nb = (2 * t.getRadius(self, t) + 1)^1.94 -- Maximum grids hit vs. talent level
if grids then
diff --git a/game/modules/tome/data/talents/spells/fire-alchemy.lua b/game/modules/tome/data/talents/spells/fire-alchemy.lua
index 720d4c15db55fcad9d341877703e05660fad3c18..06d2ef73ee660022b676da07c396e3f60b33a837 100644
--- a/game/modules/tome/data/talents/spells/fire-alchemy.lua
+++ b/game/modules/tome/data/talents/spells/fire-alchemy.lua
@@ -131,7 +131,7 @@ newTalent{
getDamage = function(self, t) return self:combatTalentSpellDamage(t, 5, 120) end,
action = function(self, t)
-- Add a lasting map effect
- game.level.map:addEffect(self,
+ local ef = game.level.map:addEffect(self,
self.x, self.y, t.getDuration(self, t),
DamageType.FIRE_FRIENDS, t.getDamage(self, t),
3,
@@ -144,6 +144,7 @@ newTalent{
end,
false
)
+ ef.name = "firestorm"
game:playSoundNear(self, "talents/fire")
return true
end,
@@ -195,7 +196,7 @@ newTalent{
local a, id = rng.table(tgts)
table.remove(tgts, id)
- self:projectile(tg, a.x, a.y, DamageType.FIRE, self:spellCrit(t.getFireDamageInSight(self, t)), {type="flame"})
+ self:projectile(table.clone(tg), a.x, a.y, DamageType.FIRE, self:spellCrit(t.getFireDamageInSight(self, t)), {type="flame"})
game:playSoundNear(self, "talents/fire")
end
end,
diff --git a/game/modules/tome/data/talents/spells/golem.lua b/game/modules/tome/data/talents/spells/golem.lua
index 9369ee76ba9d22ade851a1d4f3237fb133689142..87bbc9b71a72d28fac3daaa3e4b4efb93a7ed185 100644
--- a/game/modules/tome/data/talents/spells/golem.lua
+++ b/game/modules/tome/data/talents/spells/golem.lua
@@ -124,7 +124,7 @@ newTalent{
if self:reactionToward(target) < 0 then
if self.ai_target then self.ai_target.target = target end
target:setTarget(self)
- game.logSeen(self, "%s provokes %s to attack it.", self.name:capitalize(), target.name)
+ self:logCombat(target, "#Source# provokes #Target# to attack it.")
end
end)
return true
@@ -419,7 +419,7 @@ newTalent{
table.sort(tgts, "sqdist")
for i, target in ipairs(tgts) do
target.actor:pull(self.x, self.y, tg.radius)
- game.logSeen(target.actor, "%s is pulled by %s!", target.actor.name:capitalize(), self.name)
+ self:logCombat(target.actor, "#Target# is pulled toward #Source#!")
DamageType:get(DamageType.ARCANE).projector(self, target.actor.x, target.actor.y, DamageType.ARCANE, t.getDamage(self, t))
end
return true
diff --git a/game/modules/tome/data/talents/spells/golemancy.lua b/game/modules/tome/data/talents/spells/golemancy.lua
index 9a6b02f9354b123c3397e756c67a73650c103442..d9e1f7d60048ac7e21a79411f17d3c3cdafe5be1 100644
--- a/game/modules/tome/data/talents/spells/golemancy.lua
+++ b/game/modules/tome/data/talents/spells/golemancy.lua
@@ -246,8 +246,12 @@ newTalent{
end
for i = 1, 2 do self:removeObject(self:getInven("QUIVER"), 1) end
self.alchemy_golem:attr("allow_on_heal", 1)
- self.alchemy_golem:heal(t.getHeal(self, t))
+ self.alchemy_golem:heal(t.getHeal(self, t), self)
self.alchemy_golem:attr("allow_on_heal", -1)
+ if core.shader.active(4) then
+ self.alchemy_golem:addParticles(Particles.new("shader_shield_temp", 1, {toback=true , size_factor=1.5, y=-0.3, img="healarcane", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0, beamColor1={0x8e/255, 0x2f/255, 0xbb/255, 1}, beamColor2={0xe7/255, 0x39/255, 0xde/255, 1}, circleDescendSpeed=4}))
+ self.alchemy_golem:addParticles(Particles.new("shader_shield_temp", 1, {toback=false, ize_factor=1.5, y=-0.3, img="healarcane", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0, beamColor1={0x8e/255, 0x2f/255, 0xbb/255, 1}, beamColor2={0xe7/255, 0x39/255, 0xde/255, 1}, circleDescendSpeed=4}))
+ end
-- resurrect the golem
elseif not self:hasEffect(self.EFF_GOLEM_MOUNT) then
@@ -431,7 +435,7 @@ newTalent{
local _, _, tgt = e:getTarget()
if e:reactionToward(self) < 0 and tgt == self and rng.percent(chance) then
e:setTarget(golem)
- game.logSeen(e, "%s focuses on %s.", e.name:capitalize(), golem.name)
+ golem:logCombat(e, "#Target# focuses on #Source#.")
end
end
end
diff --git a/game/modules/tome/data/talents/spells/necrosis.lua b/game/modules/tome/data/talents/spells/necrosis.lua
index a9dcb6a6177ab77ce5cf0b06315ca13a946cd732..c21e63e34022e11857655d10c3b3c3e4dc1e5aea 100644
--- a/game/modules/tome/data/talents/spells/necrosis.lua
+++ b/game/modules/tome/data/talents/spells/necrosis.lua
@@ -135,6 +135,10 @@ newTalent{
self:attr("allow_on_heal", 1)
self:heal(maxdrain)
self:attr("allow_on_heal", -1)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {size_factor=1.5, y=-0.3, img="healdark", life=25}, {type="healing", time_factor=6000, beamsCount=15, noup=2.0, beamColor1={0xcb/255, 0xcb/255, 0xcb/255, 1}, beamColor2={0x35/255, 0x35/255, 0x35/255, 1}}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {size_factor=1.5, y=-0.3, img="healdark", life=25}, {type="healing", time_factor=6000, beamsCount=15, noup=1.0, beamColor1={0xcb/255, 0xcb/255, 0xcb/255, 1}, beamColor2={0x35/255, 0x35/255, 0x35/255, 1}}))
+ end
game:playSoundNear(self, "talents/ice")
return true
end,
diff --git a/game/modules/tome/data/talents/spells/stone-alchemy.lua b/game/modules/tome/data/talents/spells/stone-alchemy.lua
index a19ac9b75a82d63cc2805aaa94c233e88c80a817..8bc52a0e70b098cd4e2ae15707fc58158b6c3ebe 100644
--- a/game/modules/tome/data/talents/spells/stone-alchemy.lua
+++ b/game/modules/tome/data/talents/spells/stone-alchemy.lua
@@ -174,7 +174,7 @@ newTalent{
return
end
- local tg = {type="bolt", range=self:getTalentRange(t), nolock=true, talent=t}
+ local tg = {type="bolt", range=self:getTalentRange(t), nolock=true, talent=t, simple_dir_request=true}
local x, y = self:getTarget(tg)
if not x or not y then return nil end
local _ _, x, y = self:canProject(tg, x, y)
diff --git a/game/modules/tome/data/talents/techniques/2hweapon.lua b/game/modules/tome/data/talents/techniques/2hweapon.lua
index 47cd01958b276864652bdd852805d400e3c4633d..1eb37151a0323a06a3efbd26b42f0b4d67c92362 100644
--- a/game/modules/tome/data/talents/techniques/2hweapon.lua
+++ b/game/modules/tome/data/talents/techniques/2hweapon.lua
@@ -49,7 +49,6 @@ newTalent{
end
end)
- self:addParticles(Particles.new("meleestorm", 1, {}))
self:addParticles(Particles.new("meleestorm", 1, {}))
return true
diff --git a/game/modules/tome/data/talents/techniques/dualweapon.lua b/game/modules/tome/data/talents/techniques/dualweapon.lua
index 646ffea61ac91d681b71c5bda096e18c9431d4b1..fad1d29f4043affaba81619b4db896d55f8478e2 100644
--- a/game/modules/tome/data/talents/techniques/dualweapon.lua
+++ b/game/modules/tome/data/talents/techniques/dualweapon.lua
@@ -95,7 +95,7 @@ newTalent{
cooldown = 10,
sustain_stamina = 20,
tactical = { BUFF = 2 },
- on_pre_use = function(self, t, silent) if not self:hasDualWeapon() then if not silent then game.logPlayer(self, "You require a two weapons to use this talent.") end return false end return true end,
+ on_pre_use = function(self, t, silent) if not self:hasDualWeapon() then if not silent then game.logPlayer(self, "You require two weapons to use this talent.") end return false end return true end,
getApr = function(self, t) return self:combatScale(self:getTalentLevel(t) * self:getDex(), 4, 0, 25, 500, 0.75) end,
activate = function(self, t)
local weapon, offweapon = self:hasDualWeapon()
@@ -164,7 +164,7 @@ newTalent{
require = techs_dex_req1,
requires_target = true,
tactical = { ATTACK = { weapon = 1 }, DISABLE = { stun = 2 } },
- on_pre_use = function(self, t, silent) if not self:hasDualWeapon() then if not silent then game.logPlayer(self, "You require a two weapons to use this talent.") end return false end return true end,
+ on_pre_use = function(self, t, silent) if not self:hasDualWeapon() then if not silent then game.logPlayer(self, "You require two weapons to use this talent.") end return false end return true end,
getStunDuration = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7)) end,
action = function(self, t)
local weapon, offweapon = self:hasDualWeapon()
@@ -212,7 +212,7 @@ newTalent{
require = techs_dex_req2,
requires_target = true,
tactical = { ATTACK = { weapon = 4 } },
- on_pre_use = function(self, t, silent) if not self:hasDualWeapon() then if not silent then game.logPlayer(self, "You require a two weapons to use this talent.") end return false end return true end,
+ on_pre_use = function(self, t, silent) if not self:hasDualWeapon() then if not silent then game.logPlayer(self, "You require two weapons to use this talent.") end return false end return true end,
action = function(self, t)
local weapon, offweapon = self:hasDualWeapon()
if not weapon then
@@ -245,7 +245,7 @@ newTalent{
require = techs_dex_req3,
requires_target = true,
tactical = { ATTACKAREA = { weapon = 1, cut = 1 } },
- on_pre_use = function(self, t, silent) if not self:hasDualWeapon() then if not silent then game.logPlayer(self, "You require a two weapons to use this talent.") end return false end return true end,
+ on_pre_use = function(self, t, silent) if not self:hasDualWeapon() then if not silent then game.logPlayer(self, "You require two weapons to use this talent.") end return false end return true end,
cutdur = function(self,t) return math.floor(self:combatTalentScale(t, 4, 8)) end,
cutPower = function(self, t)
local main, off = self:hasDualWeapon()
@@ -314,7 +314,7 @@ newTalent{
target = function(self, t)
return {type="ball", radius=self:getTalentRadius(t), range=self:getTalentRange(t)}
end,
- on_pre_use = function(self, t, silent) if not self:hasDualWeapon() then if not silent then game.logPlayer(self, "You require a two weapons to use this talent.") end return false end return true end,
+ on_pre_use = function(self, t, silent) if not self:hasDualWeapon() then if not silent then game.logPlayer(self, "You require two weapons to use this talent.") end return false end return true end,
action = function(self, t)
local weapon, offweapon = self:hasDualWeapon()
if not weapon then
@@ -330,8 +330,7 @@ newTalent{
end
end)
- self:addParticles(Particles.new("meleestorm", 1, {}))
- self:addParticles(Particles.new("meleestorm", 1, {}))
+ self:addParticles(Particles.new("meleestorm2", 1, {}))
return true
end,
diff --git a/game/modules/tome/data/talents/techniques/excellence.lua b/game/modules/tome/data/talents/techniques/excellence.lua
index d7cc9b2e7e5f6a9717a562ee320d34ce5817f913..1b16e345efaf17dd5aa554fbea0db8d249ffabc5 100644
--- a/game/modules/tome/data/talents/techniques/excellence.lua
+++ b/game/modules/tome/data/talents/techniques/excellence.lua
@@ -26,13 +26,23 @@ newTalent{
stamina = 20,
range = archery_range,
require = techs_dex_req_high1,
- no_npc_use = true,
+ onAIGetTarget = function(self, t)
+ local tgts = {}
+ self:project({type="ball", radius=self:getTalentRange(t)}, self.x, self.y, function(px, py)
+ local tgt = game.level.map(px, py, Map.PROJECTILE)
+ if tgt and (not tgt.src or self:reactionToward(tgt.src) < 0) then tgts[#tgts+1] = {x=px, y=py, tgt=tgt, dist=core.fov.distance(self.x, self.y, px, py)} end
+ end)
+ table.sort(tgts, function(a, b) return a.dist < b.dist end)
+ if #tgts > 0 then return tgts[1].x, tgts[1].y, tgts[1].tgt end
+ end,
+ on_pre_use_ai = function(self, t, silent) return t.onAIGetTarget(self, t) and true or false end,
on_pre_use = function(self, t, silent) if not self:hasArcheryWeapon() then if not silent then game.logPlayer(self, "You require a bow or sling for this talent.") end return false end return true end,
requires_target = true,
getNb = function(self, t) return math.floor(self:combatTalentScale(t, 1, 5, "log")) end,
target = function(self, t)
return {type="bolt", range=self:getTalentRange(t), scan_on=engine.Map.PROJECTILE, no_first_target_filter=true}
end,
+ tactical = {SPECIAL=10},
action = function(self, t)
for i = 1, t.getNb(self, t) do
local targets = self:archeryAcquireTargets(self:getTalentTarget(t), {one_shot=true, no_energy=true})
@@ -44,7 +54,7 @@ newTalent{
proj:terminate(x, y)
game.level:removeEntity(proj, true)
proj.dead = true
- game.logSeen(self, "%s takes down '%s'.", self.name:capitalize(), proj.name)
+ self:logCombat(proj, "#Source# shoots down '#Target#'.")
end
end
diff --git a/game/modules/tome/data/talents/techniques/pugilism.lua b/game/modules/tome/data/talents/techniques/pugilism.lua
index 177cedc442354fd7a0a0b252a1d7f0646d2faa7f..dc9dcdea0c0435e4e7a697496311f3b688be25b4 100644
--- a/game/modules/tome/data/talents/techniques/pugilism.lua
+++ b/game/modules/tome/data/talents/techniques/pugilism.lua
@@ -167,7 +167,7 @@ newTalent{
requires_target = true,
getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1.0, 1.7) + getStrikingStyle(self, dam) end,
action = function(self, t)
- local tg = {type="hit", range=self:getTalentRange(t)}
+ local tg = {type="bolt", range=self:getTalentRange(t)}
local x, y, target = self:getTarget(tg)
if not x or not y or not target then return nil end
if core.fov.distance(self.x, self.y, x, y) > self:getTalentRange(t) then return nil end
diff --git a/game/modules/tome/data/talents/techniques/unarmed-discipline.lua b/game/modules/tome/data/talents/techniques/unarmed-discipline.lua
index d7903d1e915344330a1ed477535a31ff754526ef..02c2fbf9b65f2858c7d669f8561483862c29547c 100644
--- a/game/modules/tome/data/talents/techniques/unarmed-discipline.lua
+++ b/game/modules/tome/data/talents/techniques/unarmed-discipline.lua
@@ -34,8 +34,7 @@ newTalent{
if not x or not y or not target then return nil end
if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
- local hit = target:checkHit(self:combatAttack(), target:combatDefense(), 0, 95) -- Deprecated checkHit call
-
+ local hit = target:checkHit(self:combatAttack(), target:combatDefense(), 0, 95) and self:checkEvasion(target)
-- Try to knockback !
if hit then
local can = function(target)
@@ -57,7 +56,7 @@ newTalent{
self:buildCombo()
else
- game.logSeen(target, "%s misses %s.", self.name:capitalize(), target.name:capitalize())
+ self:logCombat(target, "#Source# misses #Target#.")
end
return true
@@ -92,26 +91,27 @@ newTalent{
do_throw = function(self, target, t)
local ef = self:hasEffect(self.EFF_DEFENSIVE_GRAPPLING)
if not ef or not rng.percent(self.tempeffect_def.EFF_DEFENSIVE_GRAPPLING.throwchance(self, ef)) then return end
- local hit = self:checkHit(self:combatAttack(), target:combatDefense(), 0, 95) -- Deprecated checkHit call removed
+ local grappled = target:isGrappled(self)
+ local hit = self:checkHit(self:combatAttack(), target:combatDefense(), 0, 95) and (grappled or not self:checkEvasion(target)) -- grappled target can't evade
ef.throws = ef.throws - 1
if ef.throws <= 0 then self:removeEffect(self.EFF_DEFENSIVE_GRAPPLING) end
if hit then
self:project(target, target.x, target.y, DamageType.PHYSICAL, self:physicalCrit(t.getDamageTwo(self, t), nil, target, self:combatAttack(), target:combatDefense()))
-- if grappled stun
- if target:isGrappled(self) and target:canBe("stun") then
+ if grappled and target:canBe("stun") then
target:setEffect(target.EFF_STUNNED, 2, {apply_power=self:combatAttack(), min_dur=1})
- game.logSeen(target, "%s has been slammed into the ground!", target.name:capitalize())
+ self:logCombat(target, "#Source# slams #Target# into the ground!")
-- if not grappled daze
else
- game.logSeen(target, "%s has been thrown to the ground!", target.name:capitalize())
+ self:logCombat(target, "#Source# throws #Target# to the ground!")
-- see if the throw dazes the enemy
if target:canBe("stun") then
target:setEffect(target.EFF_DAZED, 2, {apply_power=self:combatAttack(), min_dur=1})
end
end
else
- game.logSeen(target, "%s misses a defensive throw against %s!", self.name:capitalize(),target.name:capitalize())
+ self:logCombat(target, "#Source# misses a defensive throw against #Target#!", self.name:capitalize(),target.name:capitalize())
end
end,
on_unlearn = function(self, t)
diff --git a/game/modules/tome/data/talents/techniques/unarmed-training.lua b/game/modules/tome/data/talents/techniques/unarmed-training.lua
index 16a8d4513c282b6747714439d9abad9ffc9c9af4..7526a6702fe467f1617234179b1c40c6591380d2 100644
--- a/game/modules/tome/data/talents/techniques/unarmed-training.lua
+++ b/game/modules/tome/data/talents/techniques/unarmed-training.lua
@@ -27,6 +27,23 @@ newTalent{
mode = "passive",
points = 1,
no_unlearn_last = true,
+ on_learn = function(self, t)
+ local fct = function()
+ self.before_empty_hands_combat = self.combat
+ self.combat = table.clone(self.combat, true)
+ self.combat.physspeed = math.min(0.6, self.combat.physspeed or 1000)
+ if not self.combat.sound then self.combat.sound = {"actions/punch%d", 1, 4} end
+ if not self.combat.sound_miss then self.combat.sound_miss = "actions/melee_miss" end
+ end
+ if type(self.combat.dam) == "table" then
+ game:onTickEnd(fct)
+ else
+ fct()
+ end
+ end,
+ on_unlearn = function(self, t)
+ self.combat = self.before_empty_hands_combat
+ end,
getDamage = function(self, t) return self.level * 0.5 end,
info = function(self, t)
local damage = t.getDamage(self, t)
diff --git a/game/modules/tome/data/talents/techniques/weaponshield.lua b/game/modules/tome/data/talents/techniques/weaponshield.lua
index 0da034ecffb22c69f8c01679419ece8532dc35a4..7b009d5bb09d4544717e05d790c17069e6a03e4c 100644
--- a/game/modules/tome/data/talents/techniques/weaponshield.lua
+++ b/game/modules/tome/data/talents/techniques/weaponshield.lua
@@ -264,8 +264,7 @@ newTalent{
end
end)
- self:addParticles(Particles.new("meleestorm", 1, {radius=2}))
- self:addParticles(Particles.new("meleestorm", 1, {radius=2}))
+ self:addParticles(Particles.new("meleestorm2", 1, {radius=2}))
return true
end,
diff --git a/game/modules/tome/data/talents/uber/const.lua b/game/modules/tome/data/talents/uber/const.lua
index bc689faba4f655a6238f84ce78677099968ed9bd..53b2fb49beaefb7280fdffa927db4a3278f2a0b4 100644
--- a/game/modules/tome/data/talents/uber/const.lua
+++ b/game/modules/tome/data/talents/uber/const.lua
@@ -24,9 +24,9 @@ uberTalent{
require = { special={desc="Be close to the draconic world", fct=function(self) return game.state.birth.ignore_prodigies_special_reqs or (self:attr("drake_touched") and self:attr("drake_touched") >= 2) end} },
trigger = function(self, t, value)
if self.life - value < self.max_life * 0.3 and not self:isTalentCoolingDown(t) then
- self:heal(self.max_life * 0.4)
+ self:heal(self.max_life * 0.4, t)
self:startTalentCooldown(t)
- game.logSeen(self,"%s's draconic body hardens and heals!",self.name) --I5
+ game.logSeen(self,"%s's draconic body hardens and heals!",self.name)
end
end,
info = function(self, t)
@@ -148,8 +148,12 @@ uberTalent{
action = function(self, t)
local eff = self:hasEffect(self.EFF_FUNGAL_BLOOD)
self:attr("allow_on_heal", 1)
- self:heal(math.min(eff.power, t.healmax(self,t)))
+ self:heal(math.min(eff.power, t.healmax(self,t)), eff)
self:attr("allow_on_heal", -1)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true , size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0, circleDescendSpeed=3.5}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false, size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0, circleDescendSpeed=3.5}))
+ end
self:removeEffectsFilter({status="detrimental", type="magical"}, 10)
self:removeEffect(self.EFF_FUNGAL_BLOOD)
return true
diff --git a/game/modules/tome/data/talents/uber/dex.lua b/game/modules/tome/data/talents/uber/dex.lua
index 3ea08786b86b980bf6e75937cc17e8d4e02f15c2..2ae67060e97c15bd88c696d3736865e62df28dbe 100644
--- a/game/modules/tome/data/talents/uber/dex.lua
+++ b/game/modules/tome/data/talents/uber/dex.lua
@@ -102,7 +102,6 @@ uberTalent{
end
end)
self:addParticles(Particles.new("meleestorm", 1, {radius=4, img="spinningwinds_blue"}))
- self:addParticles(Particles.new("meleestorm", 1, {radius=4, img="spinningwinds_blue"}))
return true
end,
diff --git a/game/modules/tome/data/talents/uber/wil.lua b/game/modules/tome/data/talents/uber/wil.lua
index 3bc54a9020dcca1828d8265e3753c2fe2febf8db..d63f306e61adbca61cb00a5031c916c247c62067 100644
--- a/game/modules/tome/data/talents/uber/wil.lua
+++ b/game/modules/tome/data/talents/uber/wil.lua
@@ -210,7 +210,7 @@ uberTalent{
require = { special={desc="Antimagic", fct=function(self) return self:knowTalentType("wild-gift/antimagic") end} },
trigger = function(self, t, target, source_t)
self:startTalentCooldown(t)
- game.logSeen(self, "#LIGHT_BLUE#%s punishes %s for casting a spell!", self.name:capitalize(), target.name)
+ self:logCombat(target, "#LIGHT_BLUE##Source# punishes #Target# for casting a spell!", self.name:capitalize(), target.name)
DamageType:get(DamageType.MIND).projector(self, target.x, target.y, DamageType.MIND, 20 + self:getWil() * 2)
local dur = target:getTalentCooldown(source_t)
@@ -220,9 +220,10 @@ uberTalent{
return true
end,
info = function(self, t)
- return ([[Your will is a shield against the assault of crazed arcane users.
+ return ([[Your will is a shield against assaults from crazed arcane users.
Each time that you take damage from a spell, you punish the spellcaster with %0.2f mind damage.
- Also, they will suffer a 35%% spell failure chance for the cooldown duration of the spell they used on you.]])
+ Also, they will suffer a 35%% spell failure chance (with duration equal to the cooldown of the spell they used on you).
+ Note: this talent has a cooldown.]])
:format(damDesc(self, DamageType.MIND, 20 + self:getWil() * 2))
end,
}
diff --git a/game/modules/tome/data/talents/undeads/ghoul.lua b/game/modules/tome/data/talents/undeads/ghoul.lua
index 0888a1feffcca9a452d567414b7722daa9044620..75487928dd37df60f5bbd5d07a5a4ae1b42f48a4 100644
--- a/game/modules/tome/data/talents/undeads/ghoul.lua
+++ b/game/modules/tome/data/talents/undeads/ghoul.lua
@@ -155,7 +155,7 @@ newTalent{
game.zone:addEntity(game.level, m, "actor", target.x, target.y)
game.level.map:particleEmitter(target.x, target.y, 1, "slime")
game:playSoundNear(target, "talents/slime")
- game.logPlayer(game.player, "A #DARK_GREEN#ghoul#LAST# rises from the corpse of %s.", target.name)
+ m:logCombat(target, "A #GREY##Source##LAST# rises from the corpse of #Target#.")
end,
action = function(self, t)
local tg = {type="hit", range=self:getTalentRange(t)}
diff --git a/game/modules/tome/data/talents/undeads/skeleton.lua b/game/modules/tome/data/talents/undeads/skeleton.lua
index 0148f9bf53954c7ca7c45890a3c2162dda51931a..bba24968da5ece273872b74dadcba104a997f70b 100644
--- a/game/modules/tome/data/talents/undeads/skeleton.lua
+++ b/game/modules/tome/data/talents/undeads/skeleton.lua
@@ -94,8 +94,12 @@ newTalent{ short_name = "SKELETON_REASSEMBLE",
end,
action = function(self, t)
self:attr("allow_on_heal", 1)
- self:heal(t.getHeal(self, t), self)
+ self:heal(t.getHeal(self, t), t)
self:attr("allow_on_heal", -1)
+ if core.shader.active(4) then
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true , size_factor=1.5, y=-0.3, img="healdark", life=25}, {type="healing", time_factor=6000, beamsCount=15, noup=2.0, beamColor1={0xcb/255, 0xcb/255, 0xcb/255, 1}, beamColor2={0x35/255, 0x35/255, 0x35/255, 1}}))
+ self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false, size_factor=1.5, y=-0.3, img="healdark", life=25}, {type="healing", time_factor=6000, beamsCount=15, noup=1.0, beamColor1={0xcb/255, 0xcb/255, 0xcb/255, 1}, beamColor2={0x35/255, 0x35/255, 0x35/255, 1}}))
+ end
game:playSoundNear(self, "talents/heal")
return true
end,
diff --git a/game/modules/tome/data/timed_effects.lua b/game/modules/tome/data/timed_effects.lua
index dbd92ff2645b9864c237342163ccccabb7304219..eb3ce93f72af33206e239b19b782e9b9b046d221 100644
--- a/game/modules/tome/data/timed_effects.lua
+++ b/game/modules/tome/data/timed_effects.lua
@@ -33,6 +33,24 @@ local Chat = require "engine.Chat"
local Map = require "engine.Map"
local Level = require "engine.Level"
+local resolveSource = function(self)
+ if self.src then
+ return self.src:resolveSource()
+ else
+ return self
+ end
+end
+
+--gets the full name of the effect
+local getName = function(self)
+ local name = self.effect_id and mod.class.Actor.tempeffect_def[self.effect_id].desc or "effect"
+ if self.src and self.src.name then
+ return name .." from "..self.src.name:capitalize()
+ else
+ return name
+ end
+end
+
local oldNewEffect = TemporaryEffects.newEffect
TemporaryEffects.newEffect = function(self, t)
if not t.image then
@@ -41,7 +59,8 @@ TemporaryEffects.newEffect = function(self, t)
if fs.exists("/data/gfx/"..t.image) then t.display_entity = Entity.new{image=t.image, is_effect=true}
else t.display_entity = Entity.new{image="effects/default.png", is_effect=true} print("===", t.type, t.name)
end
-
+ t.getName = getName
+ t.resolveSource = resolveSource
return oldNewEffect(self, t)
end
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index a56fbe7c2e287531311006b4c460053004ece8bb..44ecbd41141ad70d5ddbd015048126258d67d51a 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -315,8 +315,14 @@ newEffect{
activate = function(self, eff)
eff.pid = self:addTemporaryValue("inc_damage", {all=25})
eff.lid = self:addTemporaryValue("life_regen", eff.regen)
+ if core.shader.active(4) then
+ eff.particle1 = self:addParticles(Particles.new("shader_shield", 1, {toback=true, size_factor=1.5, y=-0.3, img="healarcane"}, {type="healing", time_factor=4000, noup=2.0, beamColor1={0x8e/255, 0x2f/255, 0xbb/255, 1}, beamColor2={0xe7/255, 0x39/255, 0xde/255, 1}, circleColor={0,0,0,0}, beamsCount=5}))
+ eff.particle2 = self:addParticles(Particles.new("shader_shield", 1, {toback=false, size_factor=1.5, y=-0.3, img="healarcane"}, {type="healing", time_factor=4000, noup=1.0, beamColor1={0x8e/255, 0x2f/255, 0xbb/255, 1}, beamColor2={0xe7/255, 0x39/255, 0xde/255, 1}, circleColor={0,0,0,0}, beamsCount=5}))
+ end
end,
deactivate = function(self, eff)
+ self:removeParticles(eff.particle1)
+ self:removeParticles(eff.particle2)
self:removeTemporaryValue("inc_damage", eff.pid)
self:removeTemporaryValue("life_regen", eff.lid)
end,
@@ -446,6 +452,13 @@ newEffect{
parameters = { power=10, target=nil, chance=25 },
on_gain = function(self, err) return "The very fabric of space alters around #target#.", "+Displacement Shield" end,
on_lose = function(self, err) return "The fabric of space around #target# stabilizes to normal.", "-Displacement Shield" end,
+ on_aegis = function(self, eff, aegis)
+ self.displacement_shield = self.displacement_shield + eff.power * aegis / 100
+ if core.shader.active(4) then
+ self:removeParticles(eff.particle)
+ eff.particle = self:addParticles(Particles.new("shader_shield", 1, {size_factor=1.3, img="runicshield"}, {type="runicshield", shieldIntensity=0.14, ellipsoidalFactor=1.2, time_factor=4000, bubbleColor={0.5, 1, 0.2, 1.0}, auraColor={0.4, 1, 0.2, 1}}))
+ end
+ end,
damage_feedback = function(self, eff, src, value)
if eff.particle and eff.particle._shader and eff.particle._shader.shad and src and src.x and src.y then
local r = -rng.float(0.2, 0.4)
@@ -468,9 +481,6 @@ newEffect{
eff.particle = self:addParticles(Particles.new("displacement_shield", 1))
end
end,
- on_aegis = function(self, eff, aegis)
- self.displacement_shield = self.displacement_shield + eff.power * aegis / 100
- end,
on_timeout = function(self, eff)
if not eff.target or eff.target.dead then
eff.target = nil
@@ -498,6 +508,10 @@ newEffect{
on_lose = function(self, err) return "The shield around #target# crumbles.", "-Shield" end,
on_aegis = function(self, eff, aegis)
self.damage_shield_absorb = self.damage_shield_absorb + eff.power * aegis / 100
+ if core.shader.active(4) then
+ self:removeParticles(eff.particle)
+ eff.particle = self:addParticles(Particles.new("shader_shield", 1, {size_factor=1.3, img="runicshield"}, {type="runicshield", shieldIntensity=0.14, ellipsoidalFactor=1.2, time_factor=5000, bubbleColor={0.4, 0.7, 1.0, 1.0}, auraColor={0x21/255, 0x9f/255, 0xff/255, 1}}))
+ end
end,
damage_feedback = function(self, eff, src, value)
if eff.particle and eff.particle._shader and eff.particle._shader.shad and src and src.x and src.y then
@@ -767,8 +781,14 @@ newEffect{
eff.silence = self:addTemporaryValue("silence", 1) -- egg should not cast spells
eff.combat = self.combat
self.combat = nil -- egg shouldn't melee
+ if core.shader.active(4) then
+ eff.particle1 = self:addParticles(Particles.new("shader_shield", 1, {toback=true, size_factor=1.5, y=-0.3, img="healarcane"}, {type="healing", time_factor=2000, noup=2.0, beamColor1={0xff/255, 0xd1/255, 0x22/255, 1}, beamColor2={0xfd/255, 0x94/255, 0x3f/255, 1}, circleColor={0,0,0,0}, beamsCount=12}))
+ eff.particle2 = self:addParticles(Particles.new("shader_shield", 1, {toback=false, size_factor=1.5, y=-0.3, img="healarcane"}, {type="healing", time_factor=2000, noup=1.0, beamColor1={0xff/255, 0xd1/255, 0x22/255, 1}, beamColor2={0xfd/255, 0x94/255, 0x3f/255, 1}, circleColor={0,0,0,0}, beamsCount=12}))
+ end
end,
deactivate = function(self, eff)
+ self:removeParticles(eff.particle1)
+ self:removeParticles(eff.particle2)
self.display = "B"
self.image = eff.old_image
self:removeAllMOs()
@@ -1003,8 +1023,15 @@ newEffect{
end,
activate = function(self, eff)
eff.tmpid = self:addTemporaryValue("life_regen", eff.power)
+ eff.tmpid = self:addTemporaryValue("life_regen", eff.power)
+ if core.shader.active(4) then
+ eff.particle1 = self:addParticles(Particles.new("shader_shield", 1, {toback=true, size_factor=1.5, y=-0.3, img="healcelestial"}, {type="healing", time_factor=4000, noup=2.0, beamColor1={0xd8/255, 0xff/255, 0x21/255, 1}, beamColor2={0xf7/255, 0xff/255, 0x9e/255, 1}, circleColor={0,0,0,0}, beamsCount=5}))
+ eff.particle2 = self:addParticles(Particles.new("shader_shield", 1, {toback=false, size_factor=1.5, y=-0.3, img="healcelestial"}, {type="healing", time_factor=4000, noup=1.0, beamColor1={0xd8/255, 0xff/255, 0x21/255, 1}, beamColor2={0xf7/255, 0xff/255, 0x9e/255, 1}, circleColor={0,0,0,0}, beamsCount=5}))
+ end
end,
deactivate = function(self, eff)
+ self:removeParticles(eff.particle1)
+ self:removeParticles(eff.particle2)
self:removeTemporaryValue("life_regen", eff.tmpid)
end,
}
@@ -1542,12 +1569,12 @@ newEffect{
type = "magical",
subtype = {disease=true, blight=true},
status = "detrimental",
- parameters = {},
+ parameters = {con = 1, dam = 1},
on_gain = function(self, err) return "#Target# is afflicted by a rotting disease!" end,
on_lose = function(self, err) return "#Target# is free from the rotting disease." end,
-- Damage each turn
on_timeout = function(self, eff)
- if self:attr("purify_disease") then self:heal(eff.dam)
+ if self:attr("purify_disease") then self:heal(eff.dam, eff.src)
else DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
end
end,
@@ -1567,12 +1594,12 @@ newEffect{
type = "magical",
subtype = {disease=true, blight=true},
status = "detrimental",
- parameters = {},
+ parameters = {dex = 1, dam = 1},
on_gain = function(self, err) return "#Target# is afflicted by a decrepitude disease!" end,
on_lose = function(self, err) return "#Target# is free from the decrepitude disease." end,
-- Damage each turn
on_timeout = function(self, eff)
- if self:attr("purify_disease") then self:heal(eff.dam)
+ if self:attr("purify_disease") then self:heal(eff.dam, eff.src)
else DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
end
end,
@@ -1592,12 +1619,12 @@ newEffect{
type = "magical",
subtype = {disease=true, blight=true},
status = "detrimental",
- parameters = {},
+ parameters = {str = 1, dam = 1},
on_gain = function(self, err) return "#Target# is afflicted by a weakness disease!" end,
on_lose = function(self, err) return "#Target# is free from the weakness disease." end,
-- Damage each turn
on_timeout = function(self, eff)
- if self:attr("purify_disease") then self:heal(eff.dam)
+ if self:attr("purify_disease") then self:heal(eff.dam, eff.src)
else DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
end
end,
@@ -1622,7 +1649,7 @@ newEffect{
on_lose = function(self, err) return "#Target# is free from the epidemic." end,
-- Damage each turn
on_timeout = function(self, eff)
- if self:attr("purify_disease") then self:heal(eff.dam)
+ if self:attr("purify_disease") then self:heal(eff.dam, eff.src)
else DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
end
end,
@@ -1654,7 +1681,7 @@ newEffect{
-- disease damage
if self:attr("purify_disease") then
- self:heal(eff.dam)
+ self:heal(eff.dam, eff.src)
else
DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
end
@@ -1704,7 +1731,7 @@ newEffect{
on_lose = function(self, err) return "#Target# is free from the ghoul rot." end,
-- Damage each turn
on_timeout = function(self, eff)
- if self:attr("purify_disease") then self:heal(eff.dam)
+ if self:attr("purify_disease") then self:heal(eff.dam, eff.src)
else DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
end
end,
@@ -1939,7 +1966,6 @@ newEffect{
local spot = rng.table(eff.list)
if not spot or not spot.x then return end
-
self:project({type="ball", x=spot.x, y=spot.y, radius=2, selffire=self:spellFriendlyFire()}, spot.x, spot.y, DamageType.ARCANE, eff.dam)
game.level.map:particleEmitter(spot.x, spot.y, 2, "generic_sploom", {rm=150, rM=180, gm=20, gM=60, bm=180, bM=200, am=80, aM=150, radius=2, basenb=120})
@@ -2035,7 +2061,7 @@ newEffect{
on_lose = function(self, err) return "#Target# is no longer poisoned.", "-Vulnerability Poison" end,
-- Damage each turn
on_timeout = function(self, eff)
- if self:attr("purify_poison") then self:heal(eff.power)
+ if self:attr("purify_poison") then self:heal(eff.power, eff.src)
else DamageType:get(DamageType.ARCANE).projector(eff.src, self.x, self.y, DamageType.ARCANE, eff.power)
end
end,
diff --git a/game/modules/tome/data/timed_effects/mental.lua b/game/modules/tome/data/timed_effects/mental.lua
index 18a6a3ec9fb2d7b389b06437e5c43ea549cc5478..6eca73781d1d05bdeab9e3a0b8171f4754b6c925 100644
--- a/game/modules/tome/data/timed_effects/mental.lua
+++ b/game/modules/tome/data/timed_effects/mental.lua
@@ -88,8 +88,8 @@ newEffect{
newEffect{
name = "DOMINANT_WILL", image = "talents/yeek_will.png",
- desc = "Dominated",
- long_desc = function(self, eff) return ("The target's mind has been shattered. Its body remains as a thrall to your mind.") end,
+ desc = "Mental Domination",
+ long_desc = function(self, eff) return ("The target's mind has been shattered. Its body remains as a thrall to %s."):format(eff.src.name:capitalize()) end,
type = "mental",
subtype = { dominate=true },
status = "detrimental",
@@ -359,10 +359,10 @@ newEffect{
status = "beneficial",
parameters = {},
activate = function(self, eff)
- game.logSeen(self, "#F53CBE#%s is being stalked by %s!", eff.target.name:capitalize(), self.name)
+ self:logCombat(eff.target, "#F53CBE##Target# is being stalked by #Source#!")
end,
deactivate = function(self, eff)
- game.logSeen(self, "#F53CBE#%s is no longer being stalked by %s.", eff.target.name:capitalize(), self.name)
+ self:logCombat(eff.target, "#F53CBE##Target# is no longer being stalked by #Source#.")
end,
on_timeout = function(self, eff)
if not eff.target or eff.target.dead or not eff.target:hasEffect(eff.target.EFF_STALKED) then
@@ -375,11 +375,11 @@ newEffect{
name = "STALKED", image = "effects/stalked.png",
desc = "Stalked",
long_desc = function(self, eff)
- local effStalker = eff.source:hasEffect(eff.source.EFF_STALKER)
+ local effStalker = eff.src:hasEffect(eff.src.EFF_STALKER)
if not effStalker then return "Being stalked." end
- local t = self:getTalentFromId(eff.source.T_STALK)
+ local t = self:getTalentFromId(eff.src.T_STALK)
local desc = ([[Being stalked by %s. Stalker bonus level %d: +%d attack, +%d%% melee damage, +%0.2f hate/turn prey was hit.]]):format(
- eff.source.name, effStalker.bonus, t.getAttackChange(eff.source, t, effStalker.bonus), t.getStalkedDamageMultiplier(eff.source, t, effStalker.bonus) * 100 - 100, t.getHitHateChange(eff.source, t, effStalker.bonus))
+ eff.src.name, effStalker.bonus, t.getAttackChange(eff.src, t, effStalker.bonus), t.getStalkedDamageMultiplier(eff.src, t, effStalker.bonus) * 100 - 100, t.getHitHateChange(eff.src, t, effStalker.bonus))
if eff.damageChange and eff.damageChange > 0 then
desc = desc..(" Prey damage modifier: %d%%."):format(eff.damageChange)
end
@@ -390,7 +390,7 @@ newEffect{
status = "detrimental",
parameters = {},
activate = function(self, eff)
- local effStalker = eff.source:hasEffect(eff.source.EFF_STALKER)
+ local effStalker = eff.src:hasEffect(eff.src.EFF_STALKER)
eff.particleBonus = effStalker.bonus
eff.particle = self:addParticles(Particles.new("stalked", 1, { bonus = eff.particleBonus }))
end,
@@ -399,10 +399,10 @@ newEffect{
if eff.damageChangeId then self:removeTemporaryValue("inc_damage", eff.damageChangeId) end
end,
on_timeout = function(self, eff)
- if not eff.source or eff.source.dead or not eff.source:hasEffect(eff.source.EFF_STALKER) then
+ if not eff.src or eff.src.dead or not eff.src:hasEffect(eff.src.EFF_STALKER) then
self:removeEffect(self.EFF_STALKED)
else
- local effStalker = eff.source:hasEffect(eff.source.EFF_STALKER)
+ local effStalker = eff.src:hasEffect(eff.src.EFF_STALKER)
if eff.particleBonus ~= effStalker.bonus then
eff.particleBonus = effStalker.bonus
self:removeParticles(eff.particle)
@@ -425,7 +425,7 @@ newEffect{
name = "BECKONED", image = "talents/beckon.png",
desc = "Beckoned",
long_desc = function(self, eff)
- local message = ("The target has been beckoned by %s and is heeding the call. There is a %d%% chance of moving towards the beckoner each turn."):format(eff.source.name, eff.chance)
+ local message = ("The target has been beckoned by %s and is heeding the call. There is a %d%% chance of moving towards the beckoner each turn."):format(eff.src.name, eff.chance)
if eff.spellpowerChangeId and eff.mindpowerChangeId then
message = message..(" (spellpower: %d, mindpower: %d"):format(eff.spellpowerChange, eff.mindpowerChange)
end
@@ -458,7 +458,7 @@ newEffect{
on_timeout = function(self, eff)
end,
do_act = function(self, eff)
- if eff.source.dead then
+ if eff.src.dead then
self:removeEffect(self.EFF_BECKONED)
return
end
@@ -468,7 +468,7 @@ newEffect{
if not eff.timer then
eff.timer = rng.float(0, 100)
end
- if not self:checkHit(eff.source:combatMindpower(), self:combatMentalResist(), 0, 95, 5) then
+ if not self:checkHit(eff.src:combatMindpower(), self:combatMentalResist(), 0, 95, 5) then
eff.timer = eff.timer + eff.chance * 0.5
game.logSeen(self, "#F53CBE#%s struggles against the beckoning.", self.name:capitalize())
else
@@ -478,7 +478,7 @@ newEffect{
if eff.timer > 100 then
eff.timer = eff.timer - 100
- local distance = core.fov.distance(self.x, self.y, eff.source.x, eff.source.y)
+ local distance = core.fov.distance(self.x, self.y, eff.src.x, eff.src.y)
if math.floor(distance) > 1 and distance <= eff.range then
-- in range but not adjacent
@@ -489,7 +489,7 @@ newEffect{
-- custom pull logic (adapted from move_dmap; forces movement, pushes others aside, custom particles)
if not self:attr("never_move") then
- local source = eff.source
+ local source = eff.src
local moveX, moveY = source.x, source.y -- move in general direction by default
if not self:hasLOS(source.x, source.y) then
local a = Astar.new(game.level.map, self)
@@ -579,7 +579,7 @@ newEffect{
newEffect{
name = "DOMINATED", image = "talents/dominate.png",
desc = "Dominated",
- long_desc = function(self, eff) return ("The target is dominated, unable to move and losing %d armor, %d defense and suffering %d%% penetration for damage from its master."):format(-eff.armorChange, -eff.defenseChange, eff.resistPenetration) end,
+ long_desc = function(self, eff) return ("The target has been dominated. It is unable to move and has lost %d armor and %d defense. Attacks from %s gain %d%% damage penetration."):format(-eff.armorChange, -eff.defenseChange, eff.src.name:capitalize(), eff.resistPenetration) end,
type = "mental",
subtype = { dominate=true },
status = "detrimental",
@@ -777,7 +777,7 @@ newEffect{
local damage = math.floor(eff.damage * (eff.turn / eff.duration))
if damage > 0 then
- DamageType:get(DamageType.MIND).projector(eff.source, self.x, self.y, DamageType.MIND, { dam=damage, crossTierChance=25 })
+ DamageType:get(DamageType.MIND).projector(eff.src, self.x, self.y, DamageType.MIND, { dam=damage, crossTierChance=25 })
game:playSoundNear(self, "talents/fire")
end
@@ -803,10 +803,10 @@ newEffect{
on_gain = function(self, err) return "#Target# has heard the hateful whisper!", "+Hateful Whisper" end,
on_lose = function(self, err) return "#Target# no longer hears the hateful whisper.", "-Hateful Whisper" end,
activate = function(self, eff)
- if not eff.source.dead and eff.source:knowTalent(eff.source.T_HATE_POOL) then
- eff.source:incHate(eff.hateGain)
+ if not eff.src.dead and eff.src:knowTalent(eff.src.T_HATE_POOL) then
+ eff.src:incHate(eff.hateGain)
end
- DamageType:get(DamageType.MIND).projector(eff.source, self.x, self.y, DamageType.MIND, { dam=eff.damage, crossTierChance=25 })
+ DamageType:get(DamageType.MIND).projector(eff.src, self.x, self.y, DamageType.MIND, { dam=eff.damage, crossTierChance=25 })
if self.dead then
-- only spread on activate if the target is dead
@@ -851,7 +851,7 @@ newEffect{
for x, yy in pairs(grids) do
for y, _ in pairs(grids[x]) do
local a = game.level.map(x, y, game.level.map.ACTOR)
- if a and eff.source:reactionToward(a) < 0 and self:hasLOS(a.x, a.y) then
+ if a and eff.src:reactionToward(a) < 0 and self:hasLOS(a.x, a.y) then
if not a:hasEffect(a.EFF_HATEFUL_WHISPER) then
targets[#targets+1] = a
end
@@ -862,7 +862,7 @@ newEffect{
if #targets > 0 then
local target = rng.table(targets)
target:setEffect(target.EFF_HATEFUL_WHISPER, eff.duration, {
- source = eff.source,
+ src = eff.src,
duration = eff.duration,
damage = eff.damage,
mindpower = eff.mindpower,
@@ -1031,7 +1031,7 @@ newEffect{
if not eff.timer then
eff.timer = rng.float(0, 100)
end
- if not self:checkHit(eff.source:combatMindpower(), self:combatMentalResist(), 0, 95, 5) then
+ if not self:checkHit(eff.src:combatMindpower(), self:combatMentalResist(), 0, 95, 5) then
eff.timer = eff.timer + eff.attackChance * 0.5
game.logSeen(self, "#F53CBE#%s struggles against the paranoia.", self.name:capitalize())
else
@@ -1047,14 +1047,14 @@ newEffect{
if (self.x ~= x or self.y ~= y) then
local target = game.level.map(x, y, Map.ACTOR)
if target then
- game.logSeen(self, "#F53CBE#%s attacks %s in a fit of paranoia.", self.name:capitalize(), target.name)
- if self:attackTarget(target, nil, 1, false) and target ~= eff.source then
+ self:logCombat(target, "#F53CBE##Source# attacks #Target# in a fit of paranoia.")
+ if self:attackTarget(target, nil, 1, false) and target ~= eff.src then
if not target:canBe("fear") then
game.logSeen(target, "#F53CBE#%s ignores the fear!", target.name:capitalize())
elseif not target:checkHit(eff.mindpower, target:combatMentalResist()) then
- game:logSeen(target, "%s resists the fear!", target.name:capitalize())
+ game.logSeen(target, "%s resists the fear!", target.name:capitalize())
else
- target:setEffect(target.EFF_PARANOID, eff.duration, { source=eff.source, attackChance=eff.attackChance, mindpower=eff.mindpower, duration=eff.duration })
+ target:setEffect(target.EFF_PARANOID, eff.duration, {src=eff.src, attackChance=eff.attackChance, mindpower=eff.mindpower, duration=eff.duration })
end
end
return
@@ -1154,7 +1154,7 @@ newEffect{
if def.subtype and def.subtype.fear then
if not self.dead then
game.logSeen(self, "#F53CBE#%s is struck by fear of the %s effect.", self.name:capitalize(), def.desc)
- eff.source:project({type="hit", x=self.x,y=self.y}, self.x, self.y, DamageType.MIND, { dam=eff.damage,alwaysHit=true,criticals=false,crossTierChance=0 })
+ eff.src:project({type="hit", x=self.x,y=self.y}, self.x, self.y, DamageType.MIND, { dam=eff.damage,alwaysHit=true,criticals=false,crossTierChance=0 })
end
end
end
@@ -1169,7 +1169,7 @@ newEffect{
on_setFearEffect = function(self, e)
local eff = self:hasEffect(self.EFF_HAUNTED)
game.logSeen(self, "#F53CBE#%s is struck by fear of the %s effect.", self.name:capitalize(), util.getval(e.desc, self, e))
- eff.source:project({type="hit", x=self.x,y=self.y}, self.x, self.y, DamageType.MIND, { dam=eff.damage,alwaysHit=true,criticals=false,crossTierChance=0 })
+ eff.src:project({type="hit", x=self.x,y=self.y}, self.x, self.y, DamageType.MIND, { dam=eff.damage,alwaysHit=true,criticals=false,crossTierChance=0 })
end,
}
@@ -1231,7 +1231,7 @@ newEffect{
end,
},
on_timeout = function(self, eff)
- if eff.source.dead then return true end
+ if eff.src.dead then return true end
-- tormentors per turn are pre-calculated in a table, but ordered, so take a random one
local count = rng.tableRemove(eff.counts)
@@ -1243,8 +1243,8 @@ newEffect{
if game.level.map:isBound(x, y) and not game.level.map(x, y, Map.ACTOR) then
local def = self.tempeffect_def[self.EFF_TORMENTED]
local m = require("mod.class.NPC").new(def.npcTormentor)
- m.faction = eff.source.faction
- m.summoner = eff.source
+ m.faction = eff.src.faction
+ m.summoner = eff.src
m.summoner_gain_exp = true
m.summon_time = 3
m.tormentedDamage = eff.damage
@@ -1264,7 +1264,7 @@ newEffect{
newEffect{
name = "PANICKED", image = "talents/panic.png",
desc = "Panicked",
- long_desc = function(self, eff) return ("The target has been panicked by %s, causing them to have a %d%% chance of fleeing in terror instead of acting."):format(eff.source.name, eff.chance) end,
+ long_desc = function(self, eff) return ("The target has been panicked by %s, causing them to have a %d%% chance of fleeing in terror instead of acting."):format(eff.src.name, eff.chance) end,
type = "mental",
subtype = { fear=true },
status = "detrimental",
@@ -1282,13 +1282,13 @@ newEffect{
end,
do_act = function(self, eff)
if not self:enoughEnergy() then return nil end
- if eff.source.dead then return true end
+ if eff.src.dead then return true end
-- apply periodic timer instead of random chance
if not eff.timer then
eff.timer = rng.float(0, 100)
end
- if not self:checkHit(eff.source:combatMindpower(), self:combatMentalResist(), 0, 95, 5) then
+ if not self:checkHit(eff.src:combatMindpower(), self:combatMentalResist(), 0, 95, 5) then
eff.timer = eff.timer + eff.chance * 0.5
game.logSeen(self, "#F53CBE#%s struggles against the panic.", self.name:capitalize())
else
@@ -1297,11 +1297,11 @@ newEffect{
if eff.timer > 100 then
eff.timer = eff.timer - 100
- local distance = core.fov.distance(self.x, self.y, eff.source.x, eff.source.y)
+ local distance = core.fov.distance(self.x, self.y, eff.src.x, eff.src.y)
if distance <= eff.range then
-- in range
if not self:attr("never_move") then
- local sourceX, sourceY = eff.source.x, eff.source.y
+ local sourceX, sourceY = eff.src.x, eff.src.y
local bestX, bestY
local bestDistance = 0
@@ -1325,9 +1325,9 @@ newEffect{
if bestX then
self:move(bestX, bestY, false)
- game.logPlayer(self, "#F53CBE#You panic and flee from %s.", eff.source.name)
+ game.logPlayer(self, "#F53CBE#You panic and flee from %s.", eff.src.name)
else
- game.logSeen(self, "#F53CBE#%s panics and tries to flee from %s.", self.name:capitalize(), eff.source.name)
+ self:logCombat(eff.src, "#F53CBE##Source# panics but fails to flee from #Target#.")
self:useEnergy(game.energy_to_act * self:combatMovementSpeed(bestX, bestY))
end
end
@@ -1830,8 +1830,16 @@ newEffect{
eff.life_regen_id = self:addTemporaryValue("life_regen", eff.regen)
eff.stamina_regen_id = self:addTemporaryValue("stamina_regen", eff.regen /5)
game.logSeen(self, "%s revels in the spilt blood and grows stronger!",self.name:capitalize())
+
+ if core.shader.active(4) then
+ eff.particle1 = self:addParticles(Particles.new("shader_shield", 1, {toback=true, size_factor=1.5, y=-0.3, img="healarcane"}, {type="healing", time_factor=4000, noup=2.0, beamColor1={0xff/255, 0x22/255, 0x22/255, 1}, beamColor2={0xff/255, 0x60/255, 0x60/255, 1}, circleColor={0,0,0,0}, beamsCount=8}))
+ eff.particle2 = self:addParticles(Particles.new("shader_shield", 1, {toback=false, size_factor=1.5, y=-0.3, img="healarcane"}, {type="healing", time_factor=4000, noup=1.0, beamColor1={0xff/255, 0x22/255, 0x22/255, 1}, beamColor2={0xff/255, 0x60/255, 0x60/255, 1}, circleColor={0,0,0,0}, beamsCount=8}))
+ end
end,
deactivate = function(self, eff)
+ self:removeParticles(eff.particle1)
+ self:removeParticles(eff.particle2)
+
self:removeTemporaryValue("max_life", eff.life_id)
self:removeTemporaryValue("life_regen", eff.life_regen_id)
self:removeTemporaryValue("stamina_regen", eff.stamina_regen_id)
@@ -1880,9 +1888,9 @@ newEffect{
eff.healid = self:addTemporaryValue("no_life_regen", 1)
end,
deactivate = function(self, eff)
- self:heal(eff.kills * eff.hp_per_kill * self.max_life / 100)
self:removeTemporaryValue("unstoppable", eff.tmpid)
self:removeTemporaryValue("no_life_regen", eff.healid)
+ self:heal(eff.kills * eff.hp_per_kill * self.max_life / 100, eff)
end,
}
@@ -1908,7 +1916,7 @@ newEffect{
if self.life <= 0 then
self.life = 1
self:setEffect(self.EFF_STUNNED, 3, {})
- game.logSeen(self, "%s's increased life wears off and is stunned by the change.", self.name:capitalize())
+ game.logSeen(self, "%s's increased life fades, leaving it stunned by the loss.", self.name:capitalize())
end
end,
}
@@ -2228,9 +2236,9 @@ newEffect{
end
if not eff.incStatsId then
- game.logSeen(self, ("%s is mimicking %s. (no gains)."):format(self.name:capitalize(), eff.target.name))
+ self:logCombat(eff.target, "#Source# is mimicking #Target#. (no gains).")
else
- local desc = ("%s is mimicking %s. ("):format(self.name:capitalize(), eff.target.name)
+ local desc = "#Source# is mimicking #Target#. ("
local first = true
for id, value in pairs(eff.incStats) do
if not first then desc = desc..", " end
@@ -2238,7 +2246,7 @@ newEffect{
desc = desc..("%+d %s"):format(value, Stats.stats_def[id].name:capitalize())
end
desc = desc..")"
- game.logSeen(self, desc)
+ self:logCombat(eff.target, desc)
end
end,
deactivate = function(self, eff)
diff --git a/game/modules/tome/data/timed_effects/other.lua b/game/modules/tome/data/timed_effects/other.lua
index 66a3fe35d600b831f00c3c2c47e72a84195500e8..6f6755f67b2297694cdccdeec595be2adfd95594 100644
--- a/game/modules/tome/data/timed_effects/other.lua
+++ b/game/modules/tome/data/timed_effects/other.lua
@@ -120,6 +120,10 @@ newEffect{
on_lose = function(self, err) return "The fabric of time around #target# stabilizes to normal.", "-Time Shield" end,
on_aegis = function(self, eff, aegis)
self.time_shield_absorb = self.time_shield_absorb + eff.power * aegis / 100
+ if core.shader.active(4) then
+ self:removeParticles(eff.particle)
+ eff.particle = self:addParticles(Particles.new("shader_shield", 1, {size_factor=1.3, img="runicshield"}, {type="runicshield", shieldIntensity=0.14, ellipsoidalFactor=1.2, scrollingSpeed=-2, time_factor=4000, bubbleColor={1, 1, 0.3, 1.0}, auraColor={1, 0.8, 0.2, 1}}))
+ end
end,
damage_feedback = function(self, eff, src, value)
if eff.particle and eff.particle._shader and eff.particle._shader.shad and src and src.x and src.y then
@@ -179,7 +183,7 @@ newEffect{
self:removeParticles(eff.particle)
end,
on_timeout = function(self, eff)
- self:heal(eff.power)
+ self:heal(eff.power, eff)
end,
}
@@ -753,27 +757,28 @@ newEffect{
if math.min(eff.unlockLevel, eff.level) >= 4 and target.type == "humanoid" and rng.percent(def.getReprieveChance(eff.level)) then
if not self:canBe("summon") then return end
- local x, y = target.x, target.y
- local m = require("mod.class.NPC").new(def.npcWalkingCorpse)
- m.faction = self.faction
- m.summoner = self
- m.summoner_gain_exp = true
- m.summon_time = 6
- m:resolve() m:resolve(nil, true)
- m:forceLevelup(math.max(1, self.level - 2))
- game.zone:addEntity(game.level, m, "actor", x, y)
-
- -- Add to the party
- if self.player then
- m.remove_from_party_on_death = true
- game.party:addMember(m, {control="no", type="summon", title="Summon"})
- end
-
- game.level.map:particleEmitter(x, y, 1, "slime")
+ game:onTickEnd(function()
+ local x, y = util.findFreeGrid(target.x, target.y,1)
+ if not x then return end
+ local m = require("mod.class.NPC").new(def.npcWalkingCorpse)
+ m.faction = self.faction
+ m.summoner = self
+ m.summoner_gain_exp = true
+ m.summon_time = 6
+ m:resolve() m:resolve(nil, true)
+ m:forceLevelup(math.max(1, self.level - 2))
+ game.zone:addEntity(game.level, m, "actor", x, y)
+ -- Add to the party
+ if self.player then
+ m.remove_from_party_on_death = true
+ game.party:addMember(m, {control="no", type="summon", title="Summon"})
+ end
- game.logSeen(target, "#F53CBE#The corpse of the %s pulls itself up to fight for you.", target.name)
- game:playSoundNear(who, "talents/slime")
+ game.level.map:particleEmitter(x, y, 1, "slime")
+ game.logSeen(m, "#F53CBE#The corpse of the %s pulls itself up to fight for you.", target.name)
+ game:playSoundNear(who, "talents/slime")
+ end)
return true
else
return false
@@ -883,8 +888,8 @@ newEffect{
on_merge = function(self, old_eff, new_eff) return old_eff end,
doConspirator = function(self, eff, target)
if math.min(eff.unlockLevel, eff.level) >= 3 and self:attr("confused") and target:canBe("confusion") then
- target:setEffect(target.EFF_CONFUSED, 3, {power=50}) -- Make consistent
- game.logSeen(self, "#F53CBE#%s spreads confusion to %s.", self.name:capitalize(), target.name)
+ target:setEffect(target.EFF_CONFUSED, 3, {power=50})
+ self:logCombat(target, "#F53CBE##Source# spreads confusion to #Target#.")
end
end,
}
@@ -1330,7 +1335,7 @@ newEffect{
subtype = { miscellaneous=true },
status = "beneficial",
parameters = {},
- activate = function(self, eff) game.logPlayer(self, "#LIGHT_BLUE#You begin reloading.") end,
+ activate = function(self, eff) game.logSeen(self, "#LIGHT_BLUE#%s begins reloading.", self.name:capitalize()) end,
deactivate = function(self, eff)
end,
on_timeout = function(self, eff)
@@ -1364,8 +1369,8 @@ newEffect{
newEffect{
name = "HEIGHTEN_FEAR", image = "talents/heighten_fear.png",
desc = "Heighten Fear",
- long_desc = function(self, eff) return ("The target is in a state of growing fear. If they spend %d more turns in a range or %d and in sight of the source of this fear (%s), they will be subjected to a new fear."):
- format(eff.turns_left, eff.range, eff.source.name) end,
+ long_desc = function(self, eff) return ("The target is in a state of growing fear. If they spend %d more turns within range %d and in sight of the source of this fear (%s), they will be subjected to a new fear."):
+ format(eff.turns_left, eff.range, eff.src.name) end,
type = "other",
subtype = { fear=true },
status = "detrimental",
@@ -1374,15 +1379,15 @@ newEffect{
cancel_on_level_change = true,
parameters = { },
on_merge = function(self, old_eff, new_eff)
- old_eff.source = new_eff.source
+ old_eff.src = new_eff.src
old_eff.range = new_eff.range
return old_eff
end,
on_timeout = function(self, eff)
local tInstillFear = self:getTalentFromId(self.T_INSTILL_FEAR)
- if tInstillFear.hasEffect(eff.source, tInstillFear, self) then
- if core.fov.distance(self.x, self.y, eff.source.x, eff.source.y) <= eff.range and self:hasLOS(eff.source.x, eff.source.y) then
+ if tInstillFear.hasEffect(eff.src, tInstillFear, self) then
+ if core.fov.distance(self.x, self.y, eff.src.x, eff.src.y) <= eff.range and self:hasLOS(eff.src.x, eff.src.y) then
eff.turns_left = eff.turns_left - 1
end
if eff.turns_left <= 0 then
@@ -1390,7 +1395,7 @@ newEffect{
if rng.percent(eff.chance or 100) then
eff.chance = (eff.chance or 100) - 10
game.logSeen(self, "%s succumbs to heightening fears!", self.name:capitalize())
- tInstillFear.applyEffect(eff.source, tInstillFear, self)
+ tInstillFear.applyEffect(eff.src, tInstillFear, self)
else
game.logSeen(self, "%s feels a little less afraid!", self.name:capitalize())
end
@@ -2186,7 +2191,7 @@ newEffect{
local dead, val = self:takeHit(eff.dam, self, {special_death_msg="burnt to death by cauterize"})
local srcname = self.x and self.y and game.level.map.seens(self.x, self.y) and self.name:capitalize() or "Something"
- game:delayedLogDamage(self, self, val, ("%s%d %s#LAST#"):format(DamageType:get(DamageType.FIRE).text_color or "#aaaaaa#", math.ceil(val), DamageType:get(DamageType.FIRE).name), false)
+ game:delayedLogDamage(eff, self, val, ("%s%d %s#LAST#"):format(DamageType:get(DamageType.FIRE).text_color or "#aaaaaa#", math.ceil(val), DamageType:get(DamageType.FIRE).name), false)
end,
}
diff --git a/game/modules/tome/data/timed_effects/physical.lua b/game/modules/tome/data/timed_effects/physical.lua
index 04c6172ddb31951a465909778e59fdc81f6f4fe3..4012e7412f6ab7dde8feda34c9327e43ef8dc427 100644
--- a/game/modules/tome/data/timed_effects/physical.lua
+++ b/game/modules/tome/data/timed_effects/physical.lua
@@ -86,6 +86,11 @@ newEffect{
end
eff.tmpid = self:addTemporaryValue("life_regen", eff.power)
+ if core.shader.active(4) then
+ eff.particle1 = self:addParticles(Particles.new("shader_shield", 1, {toback=true, size_factor=1.5, y=-0.3, img="healarcane"}, {type="healing", time_factor=4000, noup=2.0, circleColor={0,0,0,0}, beamsCount=9}))
+ eff.particle2 = self:addParticles(Particles.new("shader_shield", 1, {toback=false, size_factor=1.5, y=-0.3, img="healarcane"}, {type="healing", time_factor=4000, noup=1.0, circleColor={0,0,0,0}, beamsCount=9}))
+ end
+
if self:knowTalent(self.T_ANCESTRAL_LIFE) then
local t = self:getTalentFromId(self.T_ANCESTRAL_LIFE)
self.energy.value = self.energy.value + (t.getTurn(self, t) * game.energy_to_act / 100)
@@ -98,13 +103,15 @@ newEffect{
end
end,
deactivate = function(self, eff)
+ self:removeParticles(eff.particle1)
+ self:removeParticles(eff.particle2)
self:removeTemporaryValue("life_regen", eff.tmpid)
end,
}
newEffect{
name = "POISONED", image = "effects/poisoned.png",
- desc = "Poisoned",
+ desc = "Poison",
long_desc = function(self, eff) return ("The target is poisoned, taking %0.2f nature damage per turn."):format(eff.power) end,
type = "physical",
subtype = { poison=true, nature=true }, no_ct_effect = true,
@@ -123,7 +130,7 @@ newEffect{
return old_eff
end,
on_timeout = function(self, eff)
- if self:attr("purify_poison") then self:heal(eff.power)
+ if self:attr("purify_poison") then self:heal(eff.power, eff.src)
else DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
end
end,
@@ -143,7 +150,7 @@ newEffect{
eff.tmpid = self:addTemporaryValue("never_move", 1)
end,
on_timeout = function(self, eff)
- if self:attr("purify_poison") then self:heal(eff.power)
+ if self:attr("purify_poison") then self:heal(eff.power, eff.src)
else DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
end
end,
@@ -166,7 +173,7 @@ newEffect{
eff.healid = self:addTemporaryValue("healing_factor", -eff.heal_factor / 100)
end,
on_timeout = function(self, eff)
- if self:attr("purify_poison") then self:heal(eff.power)
+ if self:attr("purify_poison") then self:heal(eff.power, eff.src)
else DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
end
end,
@@ -187,7 +194,7 @@ newEffect{
on_lose = function(self, err) return "#Target# is no longer poisoned.", "-Crippling Poison" end,
-- Damage each turn
on_timeout = function(self, eff)
- if self:attr("purify_poison") then self:heal(eff.power)
+ if self:attr("purify_poison") then self:heal(eff.power, eff.src)
else DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
end
end,
@@ -211,7 +218,7 @@ newEffect{
on_lose = function(self, err) return "#Target# is no longer poisoned.", "-Numbing Poison" end,
-- Damage each turn
on_timeout = function(self, eff)
- if self:attr("purify_poison") then self:heal(eff.power)
+ if self:attr("purify_poison") then self:heal(eff.power, eff.src)
else DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
end
end,
@@ -235,7 +242,7 @@ newEffect{
on_lose = function(self, err) return "#Target# is no longer poisoned.", "-Stoning Poison" end,
-- Damage each turn
on_timeout = function(self, eff)
- if self:attr("purify_poison") then self:heal(eff.power)
+ if self:attr("purify_poison") then self:heal(eff.power, eff.src)
else DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
end
end,
@@ -585,6 +592,7 @@ newEffect{
self.add_displays = { Entity.new{image='npc/iceblock.png', display=' ', display_on_seen=true } }
eff.added_display = true
end
+ eff.ice = mod.class.Object.new{name = "Iceblock", type = "wall", image='npc/iceblock.png', display = ' '} -- use type Object to facilitate the combat log
self:removeAllMOs()
game.level.map:updateMap(self.x, self.y)
@@ -593,8 +601,8 @@ newEffect{
eff.healid = self:addTemporaryValue("no_healing", 1)
eff.moveid = self:addTemporaryValue("never_move", 1)
eff.frozid = self:addTemporaryValue("frozen", 1)
- eff.defid = self:addTemporaryValue("combat_def", -1000)
- eff.rdefid = self:addTemporaryValue("combat_def_ranged", -1000)
+ eff.defid = self:addTemporaryValue("combat_def", -self:combatDefenseBase()-10)
+ eff.rdefid = self:addTemporaryValue("combat_def_ranged", -self:combatDefenseBase()-10)
eff.sefid = self:addTemporaryValue("negative_status_effect_immune", 1)
self:setTarget(self)
@@ -1214,8 +1222,14 @@ newEffect{
activate = function(self, eff)
eff.regenid = self:addTemporaryValue("life_regen", eff.regen)
eff.healid = self:addTemporaryValue("healing_factor", eff.heal_mod / 100)
+ if core.shader.active(4) then
+ eff.particle1 = self:addParticles(Particles.new("shader_shield", 1, {toback=true, size_factor=1.5, y=-0.3, img="healarcane"}, {type="healing", time_factor=4000, noup=2.0, beamColor1={0xff/255, 0x22/255, 0x22/255, 1}, beamColor2={0xff/255, 0x60/255, 0x60/255, 1}, circleColor={0,0,0,0}, beamsCount=8}))
+ eff.particle2 = self:addParticles(Particles.new("shader_shield", 1, {toback=false, size_factor=1.5, y=-0.3, img="healarcane"}, {type="healing", time_factor=4000, noup=1.0, beamColor1={0xff/255, 0x22/255, 0x22/255, 1}, beamColor2={0xff/255, 0x60/255, 0x60/255, 1}, circleColor={0,0,0,0}, beamsCount=8}))
+ end
end,
deactivate = function(self, eff)
+ self:removeParticles(eff.particle1)
+ self:removeParticles(eff.particle2)
self:removeTemporaryValue("life_regen", eff.regenid)
self:removeTemporaryValue("healing_factor", eff.healid)
end,
@@ -1722,7 +1736,7 @@ newEffect{ -- Note: This effect is cancelled by EFF_DISARMED
name = "DUAL_WEAPON_DEFENSE", image = "talents/dual_weapon_defense.png",
desc = "Parrying",
deflectchance = function(self, eff) -- The last partial deflect has a reduced chance to happen
- if self:hasEffect(self.EFF_DISARMED) then return 0 end
+ if self:attr("encased_in_ice") or self:hasEffect(self.EFF_DISARMED) then return 0 end
return util.bound(eff.deflects>=1 and eff.chance or eff.chance*math.mod(eff.deflects,1),0,100)
end,
long_desc = function(self, eff)
@@ -1777,7 +1791,10 @@ newEffect{
local blocked = dam - amt
local shield = self:hasShield()
if shield then shield:check("on_block", self, src, type, dam, eff) end
- if eff.properties.br then self:heal(blocked) end
+ if eff.properties.br then
+ self:heal(blocked, src)
+ game:delayedLogMessage(self, src, "block_heal", "#CRIMSON##Source# heals from blocking with %s shield!", string.his_her(self))
+ end
if eff.properties.ref and src.life then DamageType.defaultProjector(src, src.x, src.y, type, blocked, tmp, true) end
if (self:knowTalent(self.T_RIPOSTE) or amt == 0) and src.life then src:setEffect(src.EFF_COUNTERSTRIKE, (1 + dur_inc) * (src.global_speed or 1), {power=eff.power, no_ct_effect=true, src=self, crit_inc=crit_inc, nb=nb}) end -- specify duration here to avoid stacking for high speed attackers
return amt
@@ -1800,7 +1817,7 @@ newEffect{
name = "COUNTER_ATTACKING", image = "talents/counter_attack.png",
desc = "Counter Attacking",
counterchance = function(self, eff) --The last partial counter attack has a reduced chance to happen
- if self:hasEffect(self.EFF_DISARMED) then return 0 end
+ if self:attr("encased_in_ice") or self:hasEffect(self.EFF_DISARMED) then return 0 end
return util.bound(eff.counterattacks>=1 and eff.chance or eff.chance*math.mod(eff.counterattacks,1),0,100)
end,
long_desc = function(self, eff)
@@ -1827,7 +1844,7 @@ newEffect{
name = "DEFENSIVE_GRAPPLING", image = "talents/defensive_throw.png",
desc = "Grappling Defensively",
throwchance = function(self, eff) -- the last partial defensive throw has a reduced chance to happen
- if not self:isUnarmed() then return 0 end -- Must be unarmed
+ if not self:isUnarmed() or self:attr("encased_in_ice") then return 0 end -- Must be unarmed
return util.bound(eff.throws>=1 and eff.chance or eff.chance*math.mod(eff.throws,1),0,100)
end,
long_desc = function(self, eff)
diff --git a/game/modules/tome/data/zones/deep-bellow/npcs.lua b/game/modules/tome/data/zones/deep-bellow/npcs.lua
index 038c1563a5933a674bba97db624aff9c1e978e5b..07938b5ff0a0e079fb0cbebcab545d4f26b9461b 100644
--- a/game/modules/tome/data/zones/deep-bellow/npcs.lua
+++ b/game/modules/tome/data/zones/deep-bellow/npcs.lua
@@ -111,17 +111,17 @@ It seems to come from the digestive system of the mouth.]],
for i, actor in ipairs(game.party.m_list) do
if not actor.dead then tgts[#tgts+1] = actor end
end
- self:setTarget(rng.table(tgts))
+ self:setTarget((rng.table(tgts)))
if self.summoner.dead then
self:die()
- game.logSeen(self, "#AQUAMARINE#With the Mouth death its crawler also falls lifeless on the ground!")
+ game.logSeen(self, "#AQUAMARINE#With the Mouth's death its crawler also falls lifeless on the ground!")
end
end,
on_die = function(self, who)
if self.summoner and not self.summoner.dead then
- game.logSeen(self, "#AQUAMARINE#As %s falls you notice that %s seems to shudder in pain!", self.name, self.summoner.name)
+ self:logCombat(self.summoner, "#AQUAMARINE#As #Source# falls you notice that #Target# seems to shudder in pain!")
self.summoner.no_take_hit_achievements = true
self.summoner:takeHit(1000, who)
self.summoner.no_take_hit_achievements = nil
diff --git a/game/modules/tome/data/zones/demon-plane-spell/grids.lua b/game/modules/tome/data/zones/demon-plane-spell/grids.lua
index e3694b5a4411ddbb200bb1724b862957fb06f286..f800e740f0a6c3de3e1d69c7a38a087a969beb49 100644
--- a/game/modules/tome/data/zones/demon-plane-spell/grids.lua
+++ b/game/modules/tome/data/zones/demon-plane-spell/grids.lua
@@ -24,8 +24,9 @@ load("/data/general/grids/lava.lua", function(e) if e.define_as == "LAVA_FLOOR"
local DT = engine.DamageType
local dam = DT:get(DT.DEMONFIRE).projector(game.level.plane_owner, x, y, DT.DEMONFIRE, game.level.demonfire_dam or 1)
if dam then
- if dam > 0 then game.logPlayer(who, "The lava burns you!")
- elseif dam < 0 then game.logPlayer(who, "The lava heals you!") end
+ self.x, self.y = x, y
+ if dam > 0 then self:logCombat(who, "#Source# burns #Target#!")
+ elseif dam < 0 then self:logCombat(who, "#Source# heals #Target#!") end
end
end
end end)
diff --git a/game/modules/tome/data/zones/dreams/grids.lua b/game/modules/tome/data/zones/dreams/grids.lua
index ceef16088c66d7f6e4314113731f5078ef98ede6..c35a8f8c714e8f16595664f7bf47826a373203ad 100644
--- a/game/modules/tome/data/zones/dreams/grids.lua
+++ b/game/modules/tome/data/zones/dreams/grids.lua
@@ -84,7 +84,7 @@ newEntity{
if who and who.summoner and act then
local g = game.zone.grid_list.BAMBOO_HUT_FLOOR:clone()
game.zone:addEntity(game.level, g, "terrain", x, y)
- who:heal(100)
+ who:heal(100, self)
who:removeEffectsFilter{status="detrimental"}
game.logPlayer(who, "You touch the dreamstone and it disappears. You feel better.")
end
diff --git a/game/modules/tome/data/zones/gorbat-pride/npcs.lua b/game/modules/tome/data/zones/gorbat-pride/npcs.lua
index 67fb42ae55fd7b8d73c3f39f652e7505cf70e66a..dfd3e7a2f073d5d1661266e875efbe89a557ab61 100644
--- a/game/modules/tome/data/zones/gorbat-pride/npcs.lua
+++ b/game/modules/tome/data/zones/gorbat-pride/npcs.lua
@@ -22,6 +22,7 @@ load("/data/general/npcs/orc-gorbat.lua", rarity(0))
load("/data/general/npcs/cold-drake.lua", rarity(0))
load("/data/general/npcs/storm-drake.lua", rarity(0))
load("/data/general/npcs/fire-drake.lua", rarity(0))
+load("/data/general/npcs/venom-drake.lua", rarity(0))
load("/data/general/npcs/multihued-drake.lua", rarity(3))
load("/data/general/npcs/all.lua", rarity(4, 35))
diff --git a/game/modules/tome/data/zones/noxious-caldera/npcs.lua b/game/modules/tome/data/zones/noxious-caldera/npcs.lua
index acb26a91c8cae76dc9b546fc4e93844fca60b0fc..dd9b9d417718d3b496a07911a0fd1b224a497371 100644
--- a/game/modules/tome/data/zones/noxious-caldera/npcs.lua
+++ b/game/modules/tome/data/zones/noxious-caldera/npcs.lua
@@ -24,6 +24,7 @@ load("/data/general/npcs/vermin.lua", rarity(3))
load("/data/general/npcs/canine.lua", rarity(1))
load("/data/general/npcs/snake.lua", rarity(0))
load("/data/general/npcs/plant.lua", rarity(0))
+load("/data/general/npcs/venom-drake.lua", rarity(0))
load("/data/general/npcs/faeros.lua", rarity(0))
load("/data/general/npcs/all.lua", rarity(4, 35))
diff --git a/game/modules/tome/data/zones/old-forest/zone.lua b/game/modules/tome/data/zones/old-forest/zone.lua
index c758a98c0f49b9a8e30a8175f42fad172a0580f4..bb8948f3fbd9a742ed34e49dd3c4013e622f95be 100644
--- a/game/modules/tome/data/zones/old-forest/zone.lua
+++ b/game/modules/tome/data/zones/old-forest/zone.lua
@@ -18,7 +18,6 @@
-- darkgod@te4.org
local layout = game.state:alternateZone(short_name, {"CRYSTALINE", 2})
-layout="CRYSTALINE"
local is_crystaline = layout == "CRYSTALINE"
return {
diff --git a/game/modules/tome/data/zones/ruined-dungeon/zone.lua b/game/modules/tome/data/zones/ruined-dungeon/zone.lua
index c865b19759a738c35b262b9e2319284dcca27978..d1071e9d32f14b2256131dea23e6d82aac91a48c 100644
--- a/game/modules/tome/data/zones/ruined-dungeon/zone.lua
+++ b/game/modules/tome/data/zones/ruined-dungeon/zone.lua
@@ -101,7 +101,7 @@ return {
local Dialog = require("engine.ui.Dialog")
local order = ({
- DEFAULT = {"wind", "earth", "fire", "water", "arcane", "nature"},
+ DEFAULT = {"water", "earth", "wind", "nature", "arcane", "fire"},
ALT1 = {"darkness", "blood", "grave", "time", "mind", "blight"},
})[game.zone.clues_layout]
local o = game.level.orbs_touched
diff --git a/game/modules/tome/data/zones/shertul-fortress/grids.lua b/game/modules/tome/data/zones/shertul-fortress/grids.lua
index 9125101958cb4d207988ca436cdc12b9364480da..ac990e373bce3031dd1df2d80a031bcc2e3293bf 100644
--- a/game/modules/tome/data/zones/shertul-fortress/grids.lua
+++ b/game/modules/tome/data/zones/shertul-fortress/grids.lua
@@ -231,7 +231,7 @@ local dcb = function(self)
for damtype, value in pairs(data.damtypes) do if damtype ~= "changed" then
local dt = DamageType:get(damtype)
if dt then
- text[#text+1] = ("%s%s#WHITE#: %d (%d%%)"):format(dt.text_color, dt.name, value, value / data.total * 100)
+ text[#text+1] = ("%s%s#WHITE#: %d (%d%%)"):format(dt.text_color or "#WHITE#", dt.name, value, value / data.total * 100)
end
end end
text = table.concat(text, "\n")
@@ -252,7 +252,7 @@ local dcb = function(self)
shader:paramNumber2("textSize", item._tex_w, item._tex_h)
shader:use(true)
else
- item._tex:toScreenFull(x+2, y+2, item.w, item.h, item._tex_w, item._tex_h)
+ item._tex:toScreenFull(x+2, y+2, item.w, item.h, item._tex_w, item._tex_h, 0, 0, 0, 0.7)
end
item._tex:toScreenFull(x, y, item.w, item.h, item._tex_w, item._tex_h)
if shader then shader:use(false) end
diff --git a/game/modules/tome/dialogs/ShowAchievements.lua b/game/modules/tome/dialogs/ShowAchievements.lua
new file mode 100644
index 0000000000000000000000000000000000000000..2f7218bd12536fcd1977f6b272e57941bf9617c4
--- /dev/null
+++ b/game/modules/tome/dialogs/ShowAchievements.lua
@@ -0,0 +1,79 @@
+-- TE4 - T-Engine 4
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+require "engine.class"
+local Tiles = require "engine.Tiles"
+local ShowAchievements = require "engine.dialogs.ShowAchievements"
+
+module(..., package.seeall, class.inherit(ShowAchievements))
+
+function _M:generateList(kind)
+ local tiles = Tiles.new(16, 16, nil, nil, true)
+ local cache = {}
+
+ -- Makes up the list
+ local list = {}
+ local i = 0
+ local function handle(id, data)
+ local a = world:getAchievementFromId(id)
+ local color = nil
+ if self.player and self.player.achievements and self.player.achievements[id] then
+ color = colors.simple(colors.LIGHT_GREEN)
+ end
+ local img = a.image or "trophy_gold.png"
+ local tex = cache[img]
+ if not tex then
+ local image = tiles:loadImage(img)
+ if image then
+ tex = {image:glTexture()}
+ cache[img] = tex
+ end
+ end
+ if not data.notdone or a.show then
+ if a.show == "full" or not data.notdone then
+ list[#list+1] = { name=a.name, color=color, desc=a.desc, when=data.when, who=data.who, order=a.order, id=id, tex=tex, a=a }
+ elseif a.show == "none" then
+ list[#list+1] = { name="???", color=color, desc="-- Unknown --", when=data.when, who=data.who, order=a.order, id=id, tex=tex, a=a }
+ elseif a.show == "name" then
+ list[#list+1] = { name=a.name, color=color, desc="-- Unknown --", when=data.when, who=data.who, order=a.order, id=id, tex=tex, a=a }
+ else
+ list[#list+1] = { name=a.name, color=color, desc=a.desc, when=data.when, who=data.who, order=a.order, id=id, tex=tex, a=a }
+ end
+ i = i + 1
+ end
+ end
+ if kind == "self" and self.player and self.player.achievements then
+ for id, data in pairs(self.player.achievements) do handle(id, world.achieved[id] or {notdone=true, when="--", who="--"}) end
+ elseif kind == "main" then
+ for id, data in pairs(world.achieved) do
+ local a = world.achiev_defs[id]
+ if a.no_difficulty_duplicate or ((a.difficulty or a.permadeath) and (not a.difficulty or a.difficulty == game.difficulty) and (not a.permadeath or a.permadeath == game.permadeath)) then
+ handle(id, data or {notdone=true, when="--", who="--"})
+ end
+ end
+ elseif kind == "all" then
+ for _, a in ipairs(world.achiev_defs) do
+ if a.no_difficulty_duplicate or ((a.difficulty or a.permadeath) and (not a.difficulty or a.difficulty == game.difficulty) and (not a.permadeath or a.permadeath == game.permadeath)) then
+ handle(a.id, world.achieved[a.id] or {notdone=true, when="--", who="--"})
+ end
+ end
+ end
+ table.sort(list, function(a, b) return a.name < b.name end)
+ self.list = list
+end
diff --git a/game/modules/tome/dialogs/UseItemDialog.lua b/game/modules/tome/dialogs/UseItemDialog.lua
index 709248497b7c393ec1b0e34a17a925d088b69517..9949d65ecfe4ee91ae37fa5378e2f799c80edb28 100644
--- a/game/modules/tome/dialogs/UseItemDialog.lua
+++ b/game/modules/tome/dialogs/UseItemDialog.lua
@@ -100,6 +100,16 @@ function _M:use(item)
elseif act == "toinven" then
self.object.__transmo = false
self.onuse(self.inven, self.item, self.object, false)
+ elseif act == "untag" then
+ self.object.__tagged = nil
+ self.onuse(self.inven, self.item, self.object, false)
+ elseif act == "tag" then
+ local d = require("engine.dialogs.GetText").new("Tag object (tagged objects can not be destroyed or dropped)", "Tag:", 2, 25, function(tag) if tag then
+ self.object.__tagged = tag
+ self.object.__transmo = false
+ self.onuse(self.inven, self.item, self.object, false)
+ end end)
+ game:registerDialog(d)
elseif act == "chat-link" then
profile.chat.uc_ext:sendObjectLink(self.object)
elseif act == "debug-inspect" then
@@ -124,11 +134,13 @@ function _M:generateList()
if not self.object.__transmo and not self.no_use_allowed then if self.object:canUseObject() then list[#list+1] = {name="Use", action="use"} end end
if self.inven == self.actor.INVEN_INVEN and self.object:wornInven() and self.actor:getInven(self.object:wornInven()) then list[#list+1] = {name="Wield/Wear", action="wear"} end
if not self.object.__transmo then if self.inven ~= self.actor.INVEN_INVEN and self.object:wornInven() then list[#list+1] = {name="Take off", action="takeoff"} end end
- if self.inven == self.actor.INVEN_INVEN then list[#list+1] = {name="Drop", action="drop"} end
+ if not self.object.__tagged and self.inven == self.actor.INVEN_INVEN then list[#list+1] = {name="Drop", action="drop"} end
if self.inven == self.actor.INVEN_INVEN and game.party:countInventoryAble() >= 2 then list[#list+1] = {name="Transfer to party", action="transfer"} end
- if self.inven == self.actor.INVEN_INVEN and transmo_chest and self.actor:transmoFilter(self.object) then list[#list+1] = {name=self.actor:transmoGetWord():capitalize().." now", action="transmo"} end
+ if not self.object.__tagged and self.inven == self.actor.INVEN_INVEN and transmo_chest and self.actor:transmoFilter(self.object) then list[#list+1] = {name=self.actor:transmoGetWord():capitalize().." now", action="transmo"} end
if profile.auth and profile.hash_valid then list[#list+1] = {name="Link item in chat", action="chat-link"} end
if config.settings.cheat then list[#list+1] = {name="Lua inspect", action="debug-inspect", color=colors.simple(colors.LIGHT_BLUE)} end
+ if not self.object.__tagged then list[#list+1] = {name="Tag", action="tag"} end
+ if self.object.__tagged then list[#list+1] = {name="Untag", action="untag"} end
self:triggerHook{"UseItemMenu:generate", actor=self.actor, object=self.object, inven=self.inven, item=self.item, menu=list}
diff --git a/game/modules/tome/load.lua b/game/modules/tome/load.lua
index a80f87115b22513aad499ebb47e6c93be8e55b6e..245582d49b2880666e8e332821e038ca10de04cc 100644
--- a/game/modules/tome/load.lua
+++ b/game/modules/tome/load.lua
@@ -30,6 +30,7 @@ local KeyBind = require "engine.KeyBind"
local DamageType = require "engine.DamageType"
local Faction = require "engine.Faction"
local Map = require "engine.Map"
+local MapEffects = require "mod.class.MapEffects" -- This alters Map
local Level = require "engine.Level"
local Tiles = require "engine.Tiles"
local InventoryUI = require "engine.ui.Inventory"
diff --git a/ideas/todo b/ideas/todo
index 8791cc40da3759da8e2b1c853414591f8517cf65..4feaf3063cf969f8faae912693ca7e2151b39500 100644
--- a/ideas/todo
+++ b/ideas/todo
@@ -12,7 +12,7 @@
* kryl'feijan update: can join up with the demon/acolytes => fight a group of adventurer
+* boss spell: lightning that follow slowly
* "male melinda", he lives in derth, picked up a strange rune in the old forest and it embeded on him. he stumbled upon some extremist
ziguranth that mobbed him and will burn him when the player arrives. she can join them or rescue him. later he is back in derth and a potential
love interrest. There must be a way of getting his rune off to use it
-
diff --git a/src/core_lua.c b/src/core_lua.c
index 65cd5d54e49d96b6e5ff30b68391d5898b52922f..988e86de5ceee9f5fdc5697bae14496cbd575d87 100644
--- a/src/core_lua.c
+++ b/src/core_lua.c
@@ -499,6 +499,11 @@ static int lua_get_time(lua_State *L)
lua_pushnumber(L, SDL_GetTicks());
return 1;
}
+static int lua_get_frame_time(lua_State *L)
+{
+ lua_pushnumber(L, cur_frame_tick);
+ return 1;
+}
static int lua_set_realtime(lua_State *L)
{
float freq = luaL_checknumber(L, 1);
@@ -543,6 +548,7 @@ static const struct luaL_Reg gamelib[] =
{"set_current_game", lua_set_current_game},
{"exit_engine", lua_exit_engine},
{"getTime", lua_get_time},
+ {"getFrameTime", lua_get_frame_time},
{"sleep", lua_sleep},
{"setRealtime", lua_set_realtime},
{"setFPS", lua_set_fps},
diff --git a/src/main.c b/src/main.c
index af32f8d158366b38d4aab40f5d6d43a207dc5360..141eb22674c44ac99aa7f2d3f54bac0782805bd6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -75,6 +75,7 @@ int mouse_drag_w = 32, mouse_drag_h = 32;
int mouse_drag_tex = 0, mouse_drag_tex_ref = LUA_NOREF;
int mousex = 0, mousey = 0;
float gamma_correction = 1;
+int cur_frame_tick = 0;
/* The currently requested fps for the program */
int requested_fps = 30;
/* The requested fps for when the program is idle (i.e., doesn't have focus) */
@@ -556,7 +557,7 @@ void on_redraw()
/* Gather our frames per second */
Frames++;
if (!is_waiting()) {
- int t = SDL_GetTicks();
+ int t = cur_frame_tick = SDL_GetTicks();
if (t - T0 >= 1000) {
float seconds = (t - T0) / 1000.0;
float fps = Frames / seconds;
diff --git a/src/main.h b/src/main.h
index 1c119fb9b4de9764a6252fa5362fb0e6472f3366..675cf12148db03105308d0dccd11195f254478b6 100644
--- a/src/main.h
+++ b/src/main.h
@@ -42,6 +42,7 @@ extern bool safe_mode;
extern bool fbo_active;
extern bool multitexture_active;
extern long total_keyframes;
+extern int cur_frame_tick;
extern int g_argc;
extern char **g_argv;
extern char *override_home;
diff --git a/src/shaders.c b/src/shaders.c
index d86802d1310ded16dd2cca46df08683bc6c87c39..6ec59d0dc58a45799d39af399217c047d972bbb7 100644
--- a/src/shaders.c
+++ b/src/shaders.c
@@ -26,6 +26,7 @@
#include "types.h"
#include "script.h"
#include "useshader.h"
+#include "main.h"
#include "shaders.h"
#include "libtcod.h"
@@ -34,7 +35,7 @@ bool shaders_active = TRUE;
void useShader(shader_type *p, int x, int y, int w, int h, float r, float g, float b, float a)
{
glUseProgramObjectARB(p->shader);
- GLfloat t = SDL_GetTicks();
+ GLfloat t = cur_frame_tick;
glUniform1fvARB(p->p_tick, 1, &t);
GLfloat d[4];
d[0] = r;