diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua index f75e01582bf25aa83d396f3025e428dff57c3bcf..68b2a16b7e9d17c426051abaa0a87a8403be93c7 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 610f749820bd6301342b4d8d5b475cdd32736e91..30b220ac87cbcd20c76b3a11f747d23eb878ebef 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 ca854c042d04940a7a219e79ae9b16a619051e61..d61406751d81cf4e1f045bdbb70b2be11c814bd2 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 46ded40ee0891891529814d7c315e316d53ce542..814848443cdb6d3aa1300dca086aea351319f2a8 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 b65a4c85da649a62305a009401a9d34f6842e68d..3c38b6e5a2da77a13064dd3ead43348b73b034ff 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 03321f3ed0a9dd3582bd6b69fb33b62e1974e53e..7c5ef3237ceeaf8c827804df623940f1101447ee 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 9348c5a476e69902d8025dbe231b901b0cb52d73..10886e6de07012afa9c4369c3517e496e4d6ec1b 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;