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

fixes atatchements

parent e6f53c63
No related branches found
No related tags found
No related merge requests found
Showing
with 38 additions and 29 deletions
......@@ -106,7 +106,7 @@ newBirthDescriptor{
stats = { mag=4, wil=3, con=2, },
birth_example_particles = {
function(actor) if core.shader.active(4) then actor:addParticles(Particles.new("shadowfire", 1)) end end,
function(actor) if core.shader.active(4) then actor:addParticles(Particles.new("shader_wings", 1, {infinite=1, img="bloodwings", flap=28, a=0.6})) end
function(actor) if core.shader.active(4) then local x, y = actor:attachementSpot("back", true) actor:addParticles(Particles.new("shader_wings", 1, {infinite=1, x=x, y=y, img="bloodwings", flap=28, a=0.6})) end
end,
},
talents_types = {
......
......@@ -127,11 +127,10 @@ newBirthDescriptor{
stats = { mag=5, wil=3, cun=1, },
birth_example_particles = {
function(actor)
if core.shader.active(4) then local x, y = actor:attachementSpot("back", true) actor:addParticles(Particles.new("shader_wings", 1, {x=y, y=y, infinite=1}))
if core.shader.active(4) then local x, y = actor:attachementSpot("back", true) actor:addParticles(Particles.new("shader_wings", 1, {x=x, y=y, infinite=1}))
else actor:addParticles(Particles.new("wildfire", 1))
end
end,
--[[
function(actor)
if core.shader.active(4) then actor: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={0,0}}))
else actor: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}))
......@@ -155,7 +154,6 @@ newBirthDescriptor{
else actor:addParticles(Particles.new("tempest", 1))
end
end,
]]
},
talents_types = {
["spell/arcane"]={true, 0.3},
......@@ -242,7 +240,7 @@ newBirthDescriptor{
birth_example_particles = {
"necrotic-aura",
function(actor)
if core.shader.active(4) then actor:addParticles(Particles.new("shader_wings", 1, {infinite=1, img="darkwings"}))
if core.shader.active(4) then local x, y = actor:attachementSpot("back", true) actor:addParticles(Particles.new("shader_wings", 1, {x=x, y=y, infinite=1, img="darkwings"}))
end
end,
function(actor)
......
......@@ -115,12 +115,12 @@ newBirthDescriptor{
"#GOLD#Life per level:#LIGHT_BLUE# +2",
},
birth_example_particles = {
function(actor) if core.shader.active(4) then actor:addParticles(Particles.new("shader_wings", 1, {life=18, fade=-0.006, deploy_speed=14})) end end,
function(actor) if core.shader.active(4) then actor:addParticles(Particles.new("shader_wings", 1, {img="lightningwings", life=18, fade=-0.006, deploy_speed=14})) end end,
function(actor) if core.shader.active(4) then actor:addParticles(Particles.new("shader_wings", 1, {img="poisonwings", life=18, fade=-0.006, deploy_speed=14})) end end,
function(actor) if core.shader.active(4) then actor:addParticles(Particles.new("shader_wings", 1, {img="acidwings", life=18, fade=-0.006, deploy_speed=14})) end end,
function(actor) if core.shader.active(4) then actor:addParticles(Particles.new("shader_wings", 1, {img="sandwings", life=18, fade=-0.006, deploy_speed=14})) end end,
function(actor) if core.shader.active(4) then actor:addParticles(Particles.new("shader_wings", 1, {img="icewings", life=18, fade=-0.006, deploy_speed=14})) end end,
function(actor) if core.shader.active(4) then local x, y = actor:attachementSpot("back", true) actor:addParticles(Particles.new("shader_wings", 1, {x=x, y=y, life=18, fade=-0.006, deploy_speed=14})) end end,
function(actor) if core.shader.active(4) then local x, y = actor:attachementSpot("back", true) actor:addParticles(Particles.new("shader_wings", 1, {x=x, y=y, img="lightningwings", life=18, fade=-0.006, deploy_speed=14})) end end,
function(actor) if core.shader.active(4) then local x, y = actor:attachementSpot("back", true) actor:addParticles(Particles.new("shader_wings", 1, {x=x, y=y, img="poisonwings", life=18, fade=-0.006, deploy_speed=14})) end end,
function(actor) if core.shader.active(4) then local x, y = actor:attachementSpot("back", true) actor:addParticles(Particles.new("shader_wings", 1, {x=x, y=y, img="acidwings", life=18, fade=-0.006, deploy_speed=14})) end end,
function(actor) if core.shader.active(4) then local x, y = actor:attachementSpot("back", true) actor:addParticles(Particles.new("shader_wings", 1, {x=x, y=y, img="sandwings", life=18, fade=-0.006, deploy_speed=14})) end end,
function(actor) if core.shader.active(4) then local x, y = actor:attachementSpot("back", true) actor:addParticles(Particles.new("shader_wings", 1, {x=x, y=y, img="icewings", life=18, fade=-0.006, deploy_speed=14})) end end,
},
power_source = {nature=true, technique=true},
stats = { str=5, wil=3, con=1, },
......
......@@ -26,15 +26,16 @@ local b = 1
local a = a or 1
local infinite = infinite
local nb = 0
local size_factor = size_factor or 1.5
return { generator = function()
return {
trail = 0,
life = life or 10,
size = 64 * (size_factor or 1), sizev = 0, sizea = 0,
size = 32 * size_factor, sizev = 0, sizea = 0,
x = (x or 0) * 32, xv = 0, xa = 0,
y = (y or -0.781) * 32, yv = 0, ya = 0,
y = ((y or 0) - 0.4) * 32, yv = 0, ya = 0,
dir = 0, dirv = dirv, dira = 0,
vel = 0, velv = 0, vela = 0,
......
game/modules/tome/data/gfx/particles_images/arcanegeneric.png

6.77 KiB | W: | H:

game/modules/tome/data/gfx/particles_images/arcanegeneric.png

12.2 KiB | W: | H:

game/modules/tome/data/gfx/particles_images/arcanegeneric.png
game/modules/tome/data/gfx/particles_images/arcanegeneric.png
game/modules/tome/data/gfx/particles_images/arcanegeneric.png
game/modules/tome/data/gfx/particles_images/arcanegeneric.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -225,7 +225,8 @@ newTalent{
local particle
if core.shader.active(4) then
particle = self:addParticles(Particles.new("shader_wings", 1, {infinite=1, img="bloodwings", flap=28, a=0.6}))
local bx, by = self:attachementSpot("back", true)
particle = self:addParticles(Particles.new("shader_wings", 1, {infinite=1, x=bx, y=by, img="bloodwings", flap=28, a=0.6}))
end
local ret = {
vim = self:addTemporaryValue("vim_regen", -5),
......
......@@ -174,7 +174,8 @@ newTalent{
game:playSoundNear(self, "talents/breath")
if core.shader.active(4) then
self:addParticles(Particles.new("shader_wings", 1, {img="icewings", life=18, fade=-0.006, deploy_speed=14}))
local bx, by = self:attachementSpot("back", true)
self:addParticles(Particles.new("shader_wings", 1, {img="icewings", x=bx, y=by, life=18, fade=-0.006, deploy_speed=14}))
end
return true
end,
......
......@@ -81,7 +81,8 @@ newTalent{
game:playSoundNear(self, "talents/breath")
if core.shader.active(4) then
self:addParticles(Particles.new("shader_wings", 1, {life=18, fade=-0.006, deploy_speed=14}))
local bx, by = self:attachementSpot("back", true)
self:addParticles(Particles.new("shader_wings", 1, {life=18, x=bx, y=by, fade=-0.006, deploy_speed=14}))
end
return true
end,
......@@ -171,7 +172,8 @@ newTalent{
game.level.map:particleEmitter(self.x, self.y, tg.radius, "breath_fire", {radius=tg.radius, tx=x-self.x, ty=y-self.y})
if core.shader.active(4) then
self:addParticles(Particles.new("shader_wings", 1, {life=18, fade=-0.006, deploy_speed=14}))
local bx, by = self:attachementSpot("back", true)
self:addParticles(Particles.new("shader_wings", 1, {life=18, x=bx, y=by, fade=-0.006, deploy_speed=14}))
end
game:playSoundNear(self, "talents/breath")
return true
......
......@@ -123,7 +123,8 @@ newTalent{
game:playSoundNear(self, "talents/breath")
if core.shader.active(4) then
self:addParticles(Particles.new("shader_wings", 1, {img="poisonwings", life=18, fade=-0.006, deploy_speed=14}))
local bx, by = self:attachementSpot("back", true)
self:addParticles(Particles.new("shader_wings", 1, {img="poisonwings", x=bx, y=by, life=18, fade=-0.006, deploy_speed=14}))
end
return true
end,
......
......@@ -159,7 +159,8 @@ newTalent{
game:playSoundNear(self, "talents/breath")
if core.shader.active(4) then
self:addParticles(Particles.new("shader_wings", 1, {img="sandwings", life=18, fade=-0.006, deploy_speed=14}))
local bx, by = self:attachementSpot("back", true)
self:addParticles(Particles.new("shader_wings", 1, {img="sandwings", x=bx, y=by, life=18, fade=-0.006, deploy_speed=14}))
end
return true
end,
......
......@@ -212,7 +212,8 @@ newTalent{
if core.shader.active(4) then
self:addParticles(Particles.new("shader_wings", 1, {img="lightningwings", life=18, fade=-0.006, deploy_speed=14}))
local bx, by = self:attachementSpot("back", true)
self:addParticles(Particles.new("shader_wings", 1, {img="lightningwings", x=bx, y=by, life=18, fade=-0.006, deploy_speed=14}))
end
game:playSoundNear(self, "talents/breath")
return true
......
......@@ -184,7 +184,8 @@ newTalent{
game:playSoundNear(self, "talents/breath")
if core.shader.active(4) then
self:addParticles(Particles.new("shader_wings", 1, {img="acidwings", life=18, fade=-0.006, deploy_speed=14}))
local bx, by = self:attachementSpot("back", true)
self:addParticles(Particles.new("shader_wings", 1, {img="acidwings", x=bx, y=by, life=18, fade=-0.006, deploy_speed=14}))
end
return true
end,
......
......@@ -210,16 +210,17 @@ newTalent{
game:playSoundNear(self, "talents/arcane")
local particle
if core.shader.active(4) then
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
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}))
end
return {
local ret = {
dam = self:addTemporaryValue("inc_damage", {[DamageType.ARCANE] = t.getDamageIncrease(self, t)}),
resist = self:addTemporaryValue("resists_pen", {[DamageType.ARCANE] = t.getResistPenalty(self, t)}),
particle = particle,
}
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}))
-- 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}))
end
return ret
end,
deactivate = function(self, t, p)
self:removeParticles(p.particle)
......
......@@ -331,7 +331,8 @@ newTalent{
game:playSoundNear(self, "talents/spell_generic2")
local particle
if core.shader.active(4) then
particle = self:addParticles(Particles.new("shader_wings", 1, {infinite=1, img="darkwings"}))
local bx, by = self:attachementSpot("back", true)
particle = self:addParticles(Particles.new("shader_wings", 1, {infinite=1, x=bx, y=by, img="darkwings"}))
end
local ret = {
chance = self:addTemporaryValue("life_leech_chance", chance),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment