From a4a9f2cf4ecd99158d5225a8355069724a0be6cb Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 29 Jul 2012 23:12:36 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@5394 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/gfx/particles/shader_shield.lua | 2 +-
game/modules/tome/data/gfx/shaders/shield.frag | 2 ++
.../modules/tome/data/talents/spells/stone-alchemy.lua | 10 ++++++++++
ideas/bearscape.lua | 2 +-
ideas/lost-land-poosh.lua | 2 +-
5 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/game/modules/tome/data/gfx/particles/shader_shield.lua b/game/modules/tome/data/gfx/particles/shader_shield.lua
index d50e5d57fc..489c1bc010 100644
--- a/game/modules/tome/data/gfx/particles/shader_shield.lua
+++ b/game/modules/tome/data/gfx/particles/shader_shield.lua
@@ -28,7 +28,7 @@ return { generator = function()
return {
trail = 0,
life = 10,
- size = 38, sizev = 0, sizea = 0,
+ size = 38 * (size_factor or 1), sizev = 0, sizea = 0,
x = 0, xv = 0, xa = 0,
y = 0, yv = 0, ya = 0,
diff --git a/game/modules/tome/data/gfx/shaders/shield.frag b/game/modules/tome/data/gfx/shaders/shield.frag
index 1e255718ba..905187a5ac 100644
--- a/game/modules/tome/data/gfx/shaders/shield.frag
+++ b/game/modules/tome/data/gfx/shaders/shield.frag
@@ -44,6 +44,8 @@ void main(void)
c.a *= aadjust;
+ if (l <= 1.0) c.a = max(0.15, c.a);
+
c.rgb *= color;
gl_FragColor = c;
}
diff --git a/game/modules/tome/data/talents/spells/stone-alchemy.lua b/game/modules/tome/data/talents/spells/stone-alchemy.lua
index c06a91b700..1e47251e05 100644
--- a/game/modules/tome/data/talents/spells/stone-alchemy.lua
+++ b/game/modules/tome/data/talents/spells/stone-alchemy.lua
@@ -73,6 +73,16 @@ newTalent{
mana = 5,
no_npc_use = true,
no_unlearn_last = true,
+ on_learn = function(self, t)
+ if not self:knowTalent(self.T_CREATE_ALCHEMIST_GEMS) then
+ self:learnTalent(self.T_CREATE_ALCHEMIST_GEMS, true)
+ end
+ end,
+ on_unlearn = function(self, t)
+ if self:getTalentLevelRaw(t) == 0 and self:knowTalent(self.T_CREATE_ALCHEMIST_GEMS) then
+ self:unlearnTalent(self.T_CREATE_ALCHEMIST_GEMS)
+ end
+ end,
action = function(self, t)
local d d = self:showEquipInven("Try to extract gems from which metallic item?", function(o) return o.metallic and (o.material_level or 1) <= self:getTalentLevelRaw(t) end, function(o, inven, item)
if not o then return end
diff --git a/ideas/bearscape.lua b/ideas/bearscape.lua
index a0b42fd42a..70a79d2abd 100644
--- a/ideas/bearscape.lua
+++ b/ideas/bearscape.lua
@@ -83,7 +83,7 @@ game:onLevelLoad("wilderness-1", function(wzone, level)
noise = "fbm_perlin",
floor = "GRASS",
wall = "TREE",
- up = "GRASS_UP4",
+ up = "GRASS",
down = "GRASS_DOWN6",
door = "GRASS",
do_ponds = {
diff --git a/ideas/lost-land-poosh.lua b/ideas/lost-land-poosh.lua
index 54b527956b..c527572b22 100644
--- a/ideas/lost-land-poosh.lua
+++ b/ideas/lost-land-poosh.lua
@@ -89,7 +89,7 @@ game:onLevelLoad("wilderness-1", function(wzone, level)
noise = "fbm_perlin",
floor = "JUNGLE_GRASS",
wall = "JUNGLE_TREE",
- up = "JUNGLE_GRASS_UP4",
+ up = "JUNGLE_GRASS",
down = "JUNGLE_GRASS_DOWN6",
door = "JUNGLE_GRASS",
do_ponds = {
--
GitLab