From d37536486518360af972a650571ba127f63c39f1 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Mon, 28 Apr 2014 02:19:27 +0200
Subject: [PATCH] plop
---
game/modules/tome/data/talents/corruptions/blood.lua | 4 ++--
game/modules/tome/data/timed_effects/magical.lua | 6 ++++++
src/web.c | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/game/modules/tome/data/talents/corruptions/blood.lua b/game/modules/tome/data/talents/corruptions/blood.lua
index c9841d1de4..8f123b7e8c 100644
--- a/game/modules/tome/data/talents/corruptions/blood.lua
+++ b/game/modules/tome/data/talents/corruptions/blood.lua
@@ -100,8 +100,8 @@ newTalent{
end,
action = function(self, t)
local tg = self:getTalentTarget(t)
- local grids = self:project(tg, self.x, self.y, DamageType.BLOOD_BOIL, self:spellCrit(self:combatTalentSpellDamage(t, 28, 190)))
- game.level.map:particleEmitter(self.x, self.y, tg.radius, "ball_blood", {radius=tg.radius})
+ self:project(tg, self.x, self.y, DamageType.BLOOD_BOIL, self:spellCrit(self:combatTalentSpellDamage(t, 28, 190)))
+ game.level.map:particleEmitter(self.x, self.y, tg.radius, "circle", {oversize=1, a=180, appear=8, limit_life=8, speed=-3, img="blood_circle", radius=tg.radius})
game:playSoundNear(self, "talents/slime")
return true
end,
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index 3131703aac..fbecab633e 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -1019,6 +1019,12 @@ newEffect{
on_timeout = function(self, eff)
DamageType:get(DamageType.ACID).projector(eff.src or self, self.x, self.y, DamageType.ACID, eff.dam)
end,
+ activate = function(self, eff)
+ eff.particle = self:addParticles(Particles.new("circle", 1, {base_rot=0, oversize=0.7, a=255, appear=8, speed=0, img="blight_worms", radius=0}))
+ end,
+ deactivate = function(self, eff)
+ self:removeParticles(eff.particle)
+ end,
}
newEffect{
diff --git a/src/web.c b/src/web.c
index 21cf4d183a..3fc21d0eb5 100644
--- a/src/web.c
+++ b/src/web.c
@@ -393,7 +393,7 @@ void te4_web_init(lua_State *L) {
auxiliar_newclass(L, "web{view}", view_reg);
luaL_openlib(L, "core.webview", weblib, 0);
lua_pushstring(L, "kind");
- lua_pushstring(L, "awesomium");
+ lua_pushstring(L, "cef3");
lua_settable(L, -3);
lua_settop(L, 0);
}
--
GitLab