From 42c9e3a9f6a1e4011c234fd9757d4509b211d5c4 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 11 Sep 2011 20:53:33 +0000
Subject: [PATCH] Fix weird health bars Extract Gem now works on high end stuff
even in low level zones
git-svn-id: http://svn.net-core.org/repos/t-engine4@4369 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Actor.lua | 2 ++
game/modules/tome/data/general/objects/boss-artifacts.lua | 2 +-
game/modules/tome/data/talents/celestial/chants.lua | 2 +-
.../tome/data/talents/spells/advanced-necrotic-minions.lua | 2 +-
game/modules/tome/data/talents/spells/nightfall.lua | 2 +-
game/modules/tome/data/talents/spells/stone-alchemy.lua | 2 +-
src/core_lua.c | 4 ++--
7 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index f75e01582b..68b2a16b7e 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -244,6 +244,8 @@ end
function _M:actBase()
self.energyBase = self.energyBase - game.energy_to_act
+ if self:attr("no_timeflow") then return end
+
if self:isTalentActive (self.T_DARKEST_LIGHT) and self.positive > self.negative then
self:forceUseTalent(self.T_DARKEST_LIGHT, {ignore_energy=true})
game.logSeen(self, "%s's darkness can no longer hold back the light!", self.name:capitalize())
diff --git a/game/modules/tome/data/general/objects/boss-artifacts.lua b/game/modules/tome/data/general/objects/boss-artifacts.lua
index 610f749820..30b220ac87 100644
--- a/game/modules/tome/data/general/objects/boss-artifacts.lua
+++ b/game/modules/tome/data/general/objects/boss-artifacts.lua
@@ -106,7 +106,7 @@ newEntity{ base = "BASE_AMULET",
newEntity{ base = "BASE_LEATHER_BOOT",
power_source = {nature=true},
define_as = "FROST_TREADS",
- unided_name = "icy covered boots",
+ unided_name = "ice-covered boots",
name = "Frost Treads", unique=true, image="object/artifact/frost_treads.png",
desc = [[A pair of leather boots. Cold to the touch, they radiate a cold blue light.]],
require = { stat = { dex=16 }, },
diff --git a/game/modules/tome/data/talents/celestial/chants.lua b/game/modules/tome/data/talents/celestial/chants.lua
index ca854c042d..d61406751d 100644
--- a/game/modules/tome/data/talents/celestial/chants.lua
+++ b/game/modules/tome/data/talents/celestial/chants.lua
@@ -65,7 +65,7 @@ newTalent{
return ([[Chant the glory of the sun, granting you %d physical and spell save.
In addition it surrounds you with a shield of light, damaging anything that attacks you for %0.2f light damage.
You may only have one Chant active at once.
- The resistance and damage will increase with the Magic stat]]):
+ The saves and damage will increase with the Magic stat]]):
format(saves, damDesc(self, DamageType.LIGHT, damageonmeleehit))
end,
}
diff --git a/game/modules/tome/data/talents/spells/advanced-necrotic-minions.lua b/game/modules/tome/data/talents/spells/advanced-necrotic-minions.lua
index 46ded40ee0..814848443c 100644
--- a/game/modules/tome/data/talents/spells/advanced-necrotic-minions.lua
+++ b/game/modules/tome/data/talents/spells/advanced-necrotic-minions.lua
@@ -331,7 +331,7 @@ newTalent{
return true
end,
info = function(self, t)
- return ([[Sacrifice a bone giant minion. Using it's bones you make a temporary bone shield around you with %d charges.
+ return ([[Sacrifice a bone giant minion. Using its bones you make a temporary bone shield around you with %d charges.
The effect lasts %d turns or until all charges are depleted.
Each charge will fully absorb one attack.]]):
format(t.getBones(self, t), t.getTurns(self, t))
diff --git a/game/modules/tome/data/talents/spells/nightfall.lua b/game/modules/tome/data/talents/spells/nightfall.lua
index b65a4c85da..3c38b6e5a2 100644
--- a/game/modules/tome/data/talents/spells/nightfall.lua
+++ b/game/modules/tome/data/talents/spells/nightfall.lua
@@ -108,7 +108,7 @@ newTalent{
info = function(self, t)
local damage = t.getDamage(self, t)
return ([[Dark fumes erupts from the ground for 5 turns. Any creature entering the circle will receive either a bane of confusion or a bane of blindness.
- Only one bane can effect a creature.
+ Only one bane can affect a creature.
Banes last for %d turns and also deal %0.2f darkness damage.
The damage will increase with the Magic stat]]):
format(4 + math.floor(self:getTalentLevel(t) / 2), damDesc(self, DamageType.DARKNESS, damage))
diff --git a/game/modules/tome/data/talents/spells/stone-alchemy.lua b/game/modules/tome/data/talents/spells/stone-alchemy.lua
index 03321f3ed0..7c5ef3237c 100644
--- a/game/modules/tome/data/talents/spells/stone-alchemy.lua
+++ b/game/modules/tome/data/talents/spells/stone-alchemy.lua
@@ -76,7 +76,7 @@ newTalent{
self:removeObject(inven, item)
local level = o.material_level or 1
- local gem = game.zone:makeEntity(game.level, "object", {type="gem", special=function(e) return not e.unique and e.material_level == level end}, nil, true)
+ local gem = game.zone:makeEntity(game.level, "object", {ingore_material_restriction=true, type="gem", special=function(e) return not e.unique and e.material_level == level end}, nil, true)
if gem then
self:addObject(self.INVEN_INVEN, gem)
game.logPlayer(self, "You extract: %s", gem:getName{do_color=true, do_count=true})
diff --git a/src/core_lua.c b/src/core_lua.c
index 9348c5a476..10886e6de0 100644
--- a/src/core_lua.c
+++ b/src/core_lua.c
@@ -953,7 +953,7 @@ static int gl_draw_quad(lua_State *L)
}
else
{
- tfglBindTexture(GL_TEXTURE_2D, 0);
+ tfglBindTexture(GL_TEXTURE_2D, gl_tex_white);
}
GLfloat texcoords[2*4] = {
@@ -1010,7 +1010,7 @@ static int gl_draw_quad_part(lua_State *L)
}
else
{
- tfglBindTexture(GL_TEXTURE_2D, 0);
+ tfglBindTexture(GL_TEXTURE_2D, gl_tex_white);
}
if (angle < 0) angle = 0;
--
GitLab