From 0f2e71ec68ea6093d5ff3461b9f5d14d99d22953 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Tue, 2 Dec 2014 02:11:36 +0100
Subject: [PATCH] moar
---
game/engines/default/engine/Map.lua | 1 +
game/engines/default/engine/Particles.lua | 6 ++++++
game/modules/tome/data/gfx/particles/acidstorm.lua | 1 +
game/modules/tome/data/gfx/particles/firestorm.lua | 1 +
game/modules/tome/data/gfx/particles/knifestorm.lua | 1 +
game/modules/tome/data/gfx/particles/leafstorm.lua | 1 +
game/modules/tome/data/gfx/particles/necrotic-aura.lua | 1 +
7 files changed, 12 insertions(+)
diff --git a/game/engines/default/engine/Map.lua b/game/engines/default/engine/Map.lua
index ef9a5c1ba9..26de64c35f 100644
--- a/game/engines/default/engine/Map.lua
+++ b/game/engines/default/engine/Map.lua
@@ -1172,6 +1172,7 @@ function _M:processEffects()
else e.grids = core.fov.beam_grids(e.x, e.y, e.radius, e.dir, e.angle, true) end
if e.particles then
if e.particles_only_one then
+ e.particles[1]:shiftCustom(self.tile_w * (e.particles[1].x - e.x), self.tile_h * (e.particles[1].y - e.y))
e.particles[1].x = e.x
e.particles[1].y = e.y
else
diff --git a/game/engines/default/engine/Particles.lua b/game/engines/default/engine/Particles.lua
index e555eddf32..c77674ecdb 100644
--- a/game/engines/default/engine/Particles.lua
+++ b/game/engines/default/engine/Particles.lua
@@ -138,3 +138,9 @@ function _M:shift(map, mo)
end
self._adx, self._ady = adx, ady
end
+
+function _M:shiftCustom(dx, dy)
+ if not self.can_shift then return end
+
+ self.ps:shift(dx, dy)
+end
diff --git a/game/modules/tome/data/gfx/particles/acidstorm.lua b/game/modules/tome/data/gfx/particles/acidstorm.lua
index 04b5036d1c..471496cbb3 100644
--- a/game/modules/tome/data/gfx/particles/acidstorm.lua
+++ b/game/modules/tome/data/gfx/particles/acidstorm.lua
@@ -17,6 +17,7 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
+can_shift = true
base_size = 32
return { generator = function()
diff --git a/game/modules/tome/data/gfx/particles/firestorm.lua b/game/modules/tome/data/gfx/particles/firestorm.lua
index 2f15a0871a..041aca5ef5 100644
--- a/game/modules/tome/data/gfx/particles/firestorm.lua
+++ b/game/modules/tome/data/gfx/particles/firestorm.lua
@@ -17,6 +17,7 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
+can_shift = true
base_size = 32
return { generator = function()
diff --git a/game/modules/tome/data/gfx/particles/knifestorm.lua b/game/modules/tome/data/gfx/particles/knifestorm.lua
index ebab0942a6..218a1f3ad2 100644
--- a/game/modules/tome/data/gfx/particles/knifestorm.lua
+++ b/game/modules/tome/data/gfx/particles/knifestorm.lua
@@ -17,6 +17,7 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
+can_shift = true
base_size = 32
return { generator = function()
diff --git a/game/modules/tome/data/gfx/particles/leafstorm.lua b/game/modules/tome/data/gfx/particles/leafstorm.lua
index 737149a9a6..12b1f31584 100644
--- a/game/modules/tome/data/gfx/particles/leafstorm.lua
+++ b/game/modules/tome/data/gfx/particles/leafstorm.lua
@@ -17,6 +17,7 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
+can_shift = true
base_size = 32
return { generator = function()
diff --git a/game/modules/tome/data/gfx/particles/necrotic-aura.lua b/game/modules/tome/data/gfx/particles/necrotic-aura.lua
index 1648ef3582..d856250b6a 100644
--- a/game/modules/tome/data/gfx/particles/necrotic-aura.lua
+++ b/game/modules/tome/data/gfx/particles/necrotic-aura.lua
@@ -17,6 +17,7 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
+can_shift = true
base_size = 32
radius = radius or 3
--
GitLab