Index: game/modules/tome/dialogs/LevelupDialog.lua =================================================================== --- game/modules/tome/dialogs/LevelupDialog.lua (revision 6280) +++ game/modules/tome/dialogs/LevelupDialog.lua (working copy) @@ -834,7 +834,7 @@ end elseif stat_id == self.actor.STAT_STR then text:add("Physical power: ", color, ("%0.2f"):format(diff), dc, true) - text:add("Max encumberance: ", color, ("%0.2f"):format(diff * 1.8), dc, true) + text:add("Max encumbrance: ", color, ("%0.2f"):format(diff * 1.8), dc, true) text:add("Physical save: ", color, ("%0.2f"):format(diff * 0.35), dc, true) elseif stat_id == self.actor.STAT_CUN then text:add("Crit. chance: ", color, ("%0.2f"):format(diff * 0.3), dc, true) Index: game/modules/tome/class/Object.lua =================================================================== --- game/modules/tome/class/Object.lua (revision 6280) +++ game/modules/tome/class/Object.lua (working copy) @@ -892,7 +892,7 @@ compare_fields(w, compare_with, field, "disarm_bonus", "%+d", "Trap disarming bonus: ") compare_fields(w, compare_with, field, "inc_stealth", "%+d", "Stealth bonus: ") - compare_fields(w, compare_with, field, "max_encumber", "%+d", "Maximum encumberance: ") + compare_fields(w, compare_with, field, "max_encumber", "%+d", "Maximum encumbrance: ") compare_fields(w, compare_with, field, "combat_physresist", "%+d", "Physical save: ") compare_fields(w, compare_with, field, "combat_spellresist", "%+d", "Spell save: ") @@ -1249,7 +1249,7 @@ if self.charm_on_use then ret:add(true, "When used:", true) for i, d in ipairs(self.charm_on_use) do - ret:add(tostring(d[1]), "% chances to ", d[2](self, game.player), ".", true) + ret:add(tostring(d[1]), "% chance to ", d[2](self, game.player), ".", true) end end Index: game/modules/tome/class/Player.lua =================================================================== --- game/modules/tome/class/Player.lua (revision 6280) +++ game/modules/tome/class/Player.lua (working copy) @@ -1030,7 +1030,7 @@ elseif enc > max * 0.9 then color = "#ff8a00#" elseif enc > max * 0.75 then color = "#fcff00#" end - return ("%s - %sEncumberance %d/%d"):format(title, color, enc, max) + return ("%s - %sEncumbrance %d/%d"):format(title, color, enc, max) end end Index: game/modules/tome/data/damage_types.lua =================================================================== --- game/modules/tome/data/damage_types.lua (revision 6280) +++ game/modules/tome/data/damage_types.lua (working copy) @@ -1425,7 +1425,7 @@ -- Confusion newDamageType{ - name = "% chances to confuse", type = "RANDOM_CONFUSION", + name = "% chance to confuse", type = "RANDOM_CONFUSION", projector = function(src, x, y, type, dam) if _G.type(dam) == "number" then dam = {dam=dam} end local target = game.level.map(x, y, Map.ACTOR) @@ -1440,7 +1440,7 @@ } newDamageType{ - name = "% chances to cause a gloom effect", type = "RANDOM_GLOOM", + name = "% chance to cause a gloom effect", type = "RANDOM_GLOOM", projector = function(src, x, y, type, dam) local target = game.level.map(x, y, Map.ACTOR) if target and rng.percent(dam) then @@ -1468,7 +1468,7 @@ -- gBlind newDamageType{ - name = "% chances to blind", type = "RANDOM_BLIND", + name = "% chance to blind", type = "RANDOM_BLIND", projector = function(src, x, y, type, dam) if _G.type(dam) == "number" then dam = {dam=dam} end local target = game.level.map(x, y, Map.ACTOR) Index: game/modules/tome/data/timed_effects/mental.lua =================================================================== --- game/modules/tome/data/timed_effects/mental.lua (revision 6280) +++ game/modules/tome/data/timed_effects/mental.lua (working copy) @@ -2247,7 +2247,7 @@ newEffect{ name = "WILD_SUMMON", image = "talents/wild_summon.png", desc = "Wild Summon", - long_desc = function(self, eff) return ("%d%% chances to get a more powerful summon."):format(eff.chance) end, + long_desc = function(self, eff) return ("%d%% chance to get a more powerful summon."):format(eff.chance) end, type = "mental", subtype = { summon=true }, status = "beneficial", Index: game/modules/tome/data/talents/cunning/poisons.lua =================================================================== --- game/modules/tome/data/talents/cunning/poisons.lua (revision 6280) +++ game/modules/tome/data/talents/cunning/poisons.lua (working copy) @@ -67,7 +67,7 @@ Level 4: Crippling Poison Level 5: Stoning Poison New poisons can also be learned from special teachers in the world. - Also increases the effectiveness of your poisons by %d%%. (The effect varies for each poison). + Also increases the effectiveness of your poisons by %d%%. (The effect varies for each poison.) Coating your weapons in poisons does not break stealth. You may only have two poisons active at once. Every time you hit a creature with one of your weapons, you have a %d%% chance to randomly apply one of your active poisons. @@ -153,7 +153,7 @@ return true end, info = function(self, t) - return ([[Reduce the duration of all poisons on the target by 50%%, but increases their damage by %d%%. + return ([[Reduces the duration of all poisons on the target by 50%%, but increases their damage by %d%%. The effect increases with your Cunning.]]): format(100 + self:combatTalentStatDamage(t, "cun", 40, 250)) end, @@ -191,7 +191,7 @@ end end, info = function(self, t) - return ([[When you kill a creature, all the poisons affecting it will have %d%% chances to spread to adjacent foes.]]):format(20 + self:getTalentLevelRaw(t) * 8) + return ([[When you kill a creature, all the poisons affecting it will have a %d%% chance to spread to adjacent foes.]]):format(20 + self:getTalentLevelRaw(t) * 8) end, } @@ -282,7 +282,7 @@ info = function(self, t) return ([[Coat your weapons with a numbing poison, inflicting %d nature damage per turn for %d turns. Poisoned creatures will deal %d%% less damage. - The effects scales with your Cunning.]]): + The effects scale with your Cunning.]]): format(damDesc(self, DamageType.NATURE, t.getDOT(self, t)), t.getDuration(self, t), t.getEffect(self, t)) end, } @@ -316,7 +316,7 @@ info = function(self, t) return ([[Coat your weapons with an insidious poison, inflicting %d nature damage per turn for %d turns. Poisoned creatures have their healing reduced by %d%%. - The effects scales with your Cunning.]]): + The effects scale with your Cunning.]]): format(damDesc(self, DamageType.NATURE, t.getDOT(self, t)), t.getDuration(self, t), t.getEffect(self, t)) end, } @@ -349,7 +349,7 @@ end, info = function(self, t) return ([[Coat your weapons with a crippling poison, inflicting %d nature damage per turn for %d turns. - Every time a poisoned creature tries to use a talent, it will have %d%% chances to fail and lose a turn. + Every time a poisoned creature tries to use a talent, it will have a %d%% chance to fail and lose a turn. The damage scales with your Cunning.]]): format(damDesc(self, DamageType.NATURE, t.getDOT(self, t)), t.getDuration(self, t), t.getEffect(self, t)) end, Index: game/modules/tome/data/talents/spells/storm.lua =================================================================== --- game/modules/tome/data/talents/spells/storm.lua (revision 6280) +++ game/modules/tome/data/talents/spells/storm.lua (working copy) @@ -175,7 +175,7 @@ local ressistpen = t.getResistPenalty(self, t) local daze = t.getDaze(self, t) return ([[Surround yourself with a Tempest, increasing all your lightning damage by %d%% and ignoring %d%% lightning resistance of your targets. - Your Lightning and Chain Lightning spells also gain %d%% chances to daze and your Thunderstorm spell %d%% chances to daze.]]) + Your Lightning and Chain Lightning spells also gain a %d%% chance to daze, and your Thunderstorm spell gains a %d%% chance to daze.]]) :format(damageinc, ressistpen, daze, daze / 2) end, } Index: game/modules/tome/data/talents/gifts/malleable-body.lua =================================================================== --- game/modules/tome/data/talents/gifts/malleable-body.lua (revision 6280) +++ game/modules/tome/data/talents/gifts/malleable-body.lua (working copy) @@ -93,8 +93,8 @@ self:attr("ignore_direct_crits", -15) end, info = function(self, t) - return ([[Your body internal organs are melted together, making it much harder to gain critical hits. - All direct critical hits (physical, mental, spells) against you have %d%% chances to instead do their normal damage.]]): + return ([[Your body's internal organs are melted together, making it much harder to suffer critical hits. + All direct critical hits (physical, mental, spells) against you have a %d%% chance to instead do their normal damage.]]): format(self:getTalentLevelRaw(t) * 15) end, } Index: game/modules/tome/data/talents/gifts/slime.lua =================================================================== --- game/modules/tome/data/talents/gifts/slime.lua (revision 6280) +++ game/modules/tome/data/talents/gifts/slime.lua (working copy) @@ -104,7 +104,7 @@ return true end, info = function(self, t) - return ([[Your skin drips with acid, damaging all that hit you for %0.2f acid damage and giving %d%% chances to disarm them for 3 turns.]]):format(damDesc(self, DamageType.ACID, self:combatTalentMindDamage(t, 10, 50)), 5 + self:getTalentLevel(t) * 2) + return ([[Your skin drips with acid, damaging all that hit you for %0.2f acid damage and giving a %d%% chance to disarm them for 3 turns.]]):format(damDesc(self, DamageType.ACID, self:combatTalentMindDamage(t, 10, 50)), 5 + self:getTalentLevel(t) * 2) end, } Index: game/modules/tome/data/talents/gifts/ooze.lua =================================================================== --- game/modules/tome/data/talents/gifts/ooze.lua (revision 6280) +++ game/modules/tome/data/talents/gifts/ooze.lua (working copy) @@ -80,7 +80,7 @@ return true end, info = function(self, t) - return ([[Your body is more like that of an ooze. When you get hit you have %d%% chances to split and create a Bloated Ooze with as much health as you have taken damage (up to %d). + return ([[Your body is more like that of an ooze. When you get hit you have a %d%% chance to split and create a Bloated Ooze with as much health as you have taken damage (up to %d). All damage you take will be split equaly between you and your Bloated Oozes. You may have up to %d Oozes active at any time (based on your Cunning).]]): format(t.getChance(self, t), t.getMax(self, t)) Index: game/modules/tome/data/talents/gifts/mucus.lua =================================================================== --- game/modules/tome/data/talents/gifts/mucus.lua (revision 6280) +++ game/modules/tome/data/talents/gifts/mucus.lua (working copy) @@ -230,10 +230,10 @@ end, info = function(self, t) - return ([[Your mucus is brought to near sentience, each turn there %d%% chances that a random spot of your mucus will spawn a Mucus Ooze. + return ([[Your mucus is brought to near sentience. Each turn there is a %d%% chance that a random spot of your mucus will spawn a Mucus Ooze. Mucus Oozes will attack any of your foes by spitting slime at them. You may have up to %d Oozes active at any time (based on your Cunning). - Any time you deal a mental critical all your Mucus Oozes remaining time will increase by 2. + Any time you deal a mental critical, all your Mucus Oozes' remaining time will increase by 2. The effect will increase with your Mindpower.]]): format(t.getChance(self, t), t.getMax(self, t)) end, Index: game/modules/tome/data/talents/uber/dex.lua =================================================================== --- game/modules/tome/data/talents/uber/dex.lua (revision 6280) +++ game/modules/tome/data/talents/uber/dex.lua (working copy) @@ -26,7 +26,7 @@ on_unlearn = function(self, t) self:attr("bump_swap_speed_divide", -10) end, - require = { special={desc="Have had at least 6 party members at the same time.", fct=function(self) + require = { special={desc="Have had at least 6 party members at the same time", fct=function(self) return self:attr("huge_party") end} }, info = function(self, t) @@ -56,7 +56,7 @@ uberTalent{ name = "Windblade", mode = "activated", - require = { special={desc="Dealt over 50000 damage with dual wielded weapons.", fct=function(self) return self.damage_log and self.damage_log.weapon.dualwield and self.damage_log.weapon.dualwield >= 50000 end} }, + require = { special={desc="Have dealt over 50000 damage with dual wielded weapons", fct=function(self) return self.damage_log and self.damage_log.weapon.dualwield and self.damage_log.weapon.dualwield >= 50000 end} }, cooldown = 20, radius = 2, range = 1, @@ -87,7 +87,7 @@ uberTalent{ name = "Windtouched Speed", mode = "passive", - require = { special={desc="Know at least 20 talent levels of equilibrium using talents.", fct=function(self) return knowRessource(self, "equilibrium", 20) end} }, + require = { special={desc="Know at least 20 talent levels of equilibrium-using talents", fct=function(self) return knowRessource(self, "equilibrium", 20) end} }, on_learn = function(self, t) self:attr("global_speed_add", 0.15) self:attr("avoid_pressure_traps", 1) @@ -108,7 +108,7 @@ uberTalent{ name = "Giant Leap", mode = "activated", - require = { special={desc="Dealt over 50000 damage with any weapon or unarmed.", fct=function(self) return + require = { special={desc="Have dealt over 50000 damage with any weapon or unarmed", fct=function(self) return self.damage_log and ( (self.damage_log.weapon.twohanded and self.damage_log.weapon.twohanded >= 50000) or (self.damage_log.weapon.shield and self.damage_log.weapon.shield >= 50000) or @@ -164,11 +164,11 @@ uberTalent{ name = "Crafty Hands", mode = "passive", - require = { special={desc="Know Imbue Item to level 5.", fct=function(self) + require = { special={desc="Know Imbue Item to level 5", fct=function(self) return self:getTalentLevelRaw(self.T_IMBUE_ITEM) >= 5 end} }, info = function(self, t) - return ([[You are very crafty, you can now also embed gems into your helm and belt.]]) + return ([[You are very crafty. You can now also embed gems into your helm and belt.]]) :format() end, } @@ -178,7 +178,7 @@ mode = "sustained", cooldown = 10, tactical = { ESCAPE = 1 }, - require = { special={desc="Having been knocked around at least 50 times.", fct=function(self) return self:attr("knockback_times") and self:attr("knockback_times") >= 50 end} }, + require = { special={desc="Have been knocked around at least 50 times", fct=function(self) return self:attr("knockback_times") and self:attr("knockback_times") >= 50 end} }, activate = function(self, t) local ret = {} self:talentTemporaryValue(ret, "knockback_on_hit", 1) @@ -201,7 +201,7 @@ no_energy = "fake", cooldown = 20, range = archery_range, - require = { special={desc="Dealt over 50000 damage with ranged weapons.", fct=function(self) return self.damage_log and self.damage_log.weapon.archery and self.damage_log.weapon.archery >= 50000 end} }, + require = { special={desc="Have dealt over 50000 damage with ranged weapons", fct=function(self) return self.damage_log and self.damage_log.weapon.archery and self.damage_log.weapon.archery >= 50000 end} }, tactical = { ATTACK = { weapon = 3 }, DISABLE = 3 }, requires_target = true, on_pre_use = function(self, t, silent) if not self:hasArcheryWeapon() then if not silent then game.logPlayer(self, "You require a bow or sling for this talent.") end return false end return true end, @@ -219,7 +219,7 @@ end, info = function(self, t) return ([[You fire a shot straight at your enemy's vital areas, wounding them terribly. - Enemies hit by this shot will take 450%% weapon damage, and will be stunned and crippled (Losing 50%% physical, magical and mental attack speeds) for five turns, due to the incredibly disabling impact of the shot. + Enemies hit by this shot will take 450%% weapon damage, and will be stunned and crippled (losing 50%% physical, magical and mental attack speeds) for five turns, due to the incredibly disabling impact of the shot. The stun and cripple chances increase with your Accuracy.]]):format() end, } Index: game/modules/tome/data/talents/uber/mag.lua =================================================================== --- game/modules/tome/data/talents/uber/mag.lua (revision 6280) +++ game/modules/tome/data/talents/uber/mag.lua (working copy) @@ -20,7 +20,7 @@ uberTalent{ name = "Spectral Shield", mode = "passive", - require = { special={desc="Block talent, have cast at least 100 spells and a block value over 200.", fct=function(self) + require = { special={desc="Know the Block talent, and have cast 100 spells, and have a block value over 200", fct=function(self) return self:knowTalent(self.T_BLOCK) and self:getTalentFromId(self.T_BLOCK).getBlockValue(self) >= 200 and self.talent_kind_log and self.talent_kind_log.spell and self.talent_kind_log.spell >= 100 end} }, on_learn = function(self, t) @@ -38,7 +38,7 @@ uberTalent{ name = "Aether Permeation", mode = "passive", - require = { special={desc="At least 25% arcane damage reduction and having been exposed to the void of space.", fct=function(self) + require = { special={desc="Have at least 25% arcane damage reduction, and have been exposed to the void of space", fct=function(self) return (game.state.birth.ignore_prodigies_special_reqs or self:attr("planetary_orbit")) and self:combatGetResist(DamageType.ARCANE) >= 25 end} }, on_learn = function(self, t) @@ -59,7 +59,7 @@ uberTalent{ name = "Mystical Cunning", image = "talents/vulnerability_poison.png", mode = "passive", - require = { special={desc="Know either traps or poisons.", fct=function(self) + require = { special={desc="Know either traps or poisons", fct=function(self) return self:knowTalent(self.T_VILE_POISONS) or self:knowTalent(self.T_TRAP_MASTERY) end} }, on_learn = function(self, t) @@ -93,7 +93,7 @@ uberTalent{ name = "Temporal Form", cooldown = 30, - require = { special={desc="Cast over 1000 spells and visited an out-of-time zone", fct=function(self) return + require = { special={desc="Have cast over 1000 spells and visited an out-of-time zone", fct=function(self) return self.talent_kind_log and self.talent_kind_log.spell and self.talent_kind_log.spell >= 1000 and (game.state.birth.ignore_prodigies_special_reqs or self:attr("temporal_touched")) end} }, no_energy = true, @@ -107,9 +107,9 @@ end, info = function(self, t) return ([[You can wrap temporal threads around you, assuming the form of a telugoroth for 10 turns. - While in this form, you gain pinning, bleeding, blindness and stun immunity, 30%% temporal resistance, your temporal damage bonus is set to your current highest damage bonus + 30%%, all damage you deal becomes temporal, and 20%% temporal resistance penetration. + While in this form, you gain pinning, bleeding, blindness and stun immunity, 30%% temporal resistance, your temporal damage bonus is set to your current highest damage bonus + 30%%, all damage you deal becomes temporal, and you gain 20%% temporal resistance penetration. You also are able to cast two anomalies: Anomaly Rearrange and Anomaly Temporal Storm. - Transforming in this form will increase your paradox by 600, and revert it back at the end of the effect.]]) + Transforming to this form will increase your paradox by 600, and revert it back at the end of the effect.]]) :format() end, } @@ -123,7 +123,7 @@ self.alchemy_golem:learnTalentType("corruption/reaving-combat", true) end end, - require = { special={desc="Have summoned at least 100 creatures affected by this talent (alchemist golem count as 100).", fct=function(self) + require = { special={desc="Have summoned at least 100 creatures affected by this talent (alchemist golem count as 100)", fct=function(self) return self:attr("summoned_times") and self:attr("summoned_times") >= 100 end} }, info = function(self, t) @@ -151,7 +151,7 @@ - Ghoul Rot ghoul: Rend - Bloated Oozes: Bone Shield - Mucus Oozes: Virulent Disease - - Other race or object-based summons might be affected, too. + - Other race- or object-based summons might be affected, too. ]]):format() end, } @@ -190,7 +190,7 @@ name = "Cauterize", mode = "passive", cooldown = 12, - require = { special={desc="Received at least 50000 fire damage and have cast at least 1000 spells.", fct=function(self) return + require = { special={desc="Have received at least 50000 fire damage, and have cast at least 1000 spells", fct=function(self) return self.talent_kind_log and self.talent_kind_log.spell and self.talent_kind_log.spell >= 1000 and self.damage_intake_log and self.damage_intake_log[DamageType.FIRE] and self.damage_intake_log[DamageType.FIRE] >= 50000 end} }, trigger = function(self, t, value) @@ -200,9 +200,9 @@ return true end, info = function(self, t) - return ([[Your inner flame is strong, each time you receive a blow that would kill you your body is wreathed in flames. - The flames will cauterize the wound, fully absorbing all damage done this turn but they will continue to burn for 8 turns. + return ([[Your inner flame is strong. Each time you receive a blow that would kill you, your body is wreathed in flames. + The flames will cauterize the wound, fully absorbing all damage done this turn, but they will continue to burn for 8 turns. Each turn 10% of the damage absorbed will be dealt by the flames (this will bypass resistance and affinity). - Warning, this has a cooldown.]]) + Warning: this has a cooldown.]]) end, } Index: game/modules/tome/data/talents/uber/cun.lua =================================================================== --- game/modules/tome/data/talents/uber/cun.lua (revision 6280) +++ game/modules/tome/data/talents/uber/cun.lua (working copy) @@ -81,7 +81,7 @@ uberTalent{ name = "Endless Woes", mode = "passive", - require = { special={desc="Dealt over 50000 acid, blight, darkness, mind or temporal damage", fct=function(self) return + require = { special={desc="Have dealt over 50000 acid, blight, darkness, mind or temporal damage", fct=function(self) return self.damage_log and ( (self.damage_log[DamageType.ACID] and self.damage_log[DamageType.ACID] >= 50000) or (self.damage_log[DamageType.BLIGHT] and self.damage_log[DamageType.BLIGHT] >= 50000) or @@ -108,11 +108,11 @@ end, info = function(self, t) return ([[Surround yourself with a malevolent aura. - Any acid damage you do has 20%% chances to apply a lasting acid, that deals %d%% of the initial damage for 5 turns and reduces accuracy by %d. - Any blight damage you do has 20%% chances to cause a random disease, that deals %d%% of the initial damage for 5 turns and reducing a stat by %d. - Any darkness damage you do has 20%% chances to blind the target for 5 turns. - Any temporal damage you do has 20%% chances to slow (30%%) the target for 5 turns. - Any mind damage you do has 20%% chances to confuse (20%%) the target for 5 turns. + Any acid damage you do has a 20%% chance to apply a lasting acid, that deals %d%% of the initial damage for 5 turns and reduces accuracy by %d. + Any blight damage you do has a 20%% chance to cause a random disease, that deals %d%% of the initial damage for 5 turns and reduces a stat by %d. + Any darkness damage you do has a 20%% chance to blind the target for 5 turns. + Any temporal damage you do has a 20%% chance to slow (30%%) the target for 5 turns. + Any mind damage you do has a 20% chance to confuse (20%%) the target for 5 turns. This only triggers for hits over 150 damage. Values increase with your Cunning.]]) :format(self:getCun() / 2.5, self:getCun() / 2, self:getCun() / 2.5, self:getCun() / 2) @@ -122,7 +122,7 @@ uberTalent{ name = "Secrets of Telos", mode = "passive", - require = { special={desc="Possess Telos Top Half, Telos Bottom Half, Telos Staff Crystal.", fct=function(self) + require = { special={desc="Possess Telos Top Half, Telos Bottom Half, and Telos Staff Crystal", fct=function(self) local o1 = self:findInAllInventoriesBy("define_as", "GEM_TELOS") local o2 = self:findInAllInventoriesBy("define_as", "TELOS_TOP_HALF") local o3 = self:findInAllInventoriesBy("define_as", "TELOS_BOTTOM_HALF") @@ -157,7 +157,7 @@ name = "Elemental Surge", mode = "passive", cooldown = 12, - require = { special={desc="Dealt over 50000 arcane, fire, cold, lightning, light or nature damage", fct=function(self) return + require = { special={desc="Have dealt over 50000 arcane, fire, cold, lightning, light or nature damage", fct=function(self) return self.damage_log and ( (self.damage_log[DamageType.ARCANE] and self.damage_log[DamageType.ARCANE] >= 50000) or (self.damage_log[DamageType.FIRE] and self.damage_log[DamageType.FIRE] >= 50000) or @@ -275,7 +275,7 @@ uberTalent{ name = "Tricks of the Trade", mode = "passive", - require = { special={desc="Sided with the Assassin Lord.", fct=function(self) return game.state.birth.ignore_prodigies_special_reqs or (self:isQuestStatus("lost-merchant", engine.Quest.COMPLETED, "evil")) end} }, + require = { special={desc="Have sided with the Assassin Lord", fct=function(self) return game.state.birth.ignore_prodigies_special_reqs or (self:isQuestStatus("lost-merchant", engine.Quest.COMPLETED, "evil")) end} }, on_learn = function(self, t) if self:knowTalentType("cunning/stealth") then self:setTalentTypeMastery("cunning/stealth", self:getTalentTypeMastery("cunning/stealth") + 0.2) Index: game/modules/tome/data/talents/uber/const.lua =================================================================== --- game/modules/tome/data/talents/uber/const.lua (revision 6280) +++ game/modules/tome/data/talents/uber/const.lua (working copy) @@ -39,7 +39,7 @@ name = "Bloodspring", mode = "passive", cooldown = 12, - require = { special={desc="Let Melinda be sacrificed", fct=function(self) return game.state.birth.ignore_prodigies_special_reqs or (self:hasQuest("kryl-feijan-escape") and self:hasQuest("kryl-feijan-escape"):isStatus(engine.Quest.FAILED)) end} }, + require = { special={desc="Have let Melinda be sacrificed", fct=function(self) return game.state.birth.ignore_prodigies_special_reqs or (self:hasQuest("kryl-feijan-escape") and self:hasQuest("kryl-feijan-escape"):isStatus(engine.Quest.FAILED)) end} }, trigger = function(self, t) -- Add a lasting map effect game.level.map:addEffect(self, @@ -80,7 +80,7 @@ cooldown = 20, sustain_stamina = 10, tactical = { CLOSEIN = 2, ESCAPE = 2 }, - require = { special={desc="Know at least 20 levels of stamina using talents", fct=function(self) return knowRessource(self, "stamina", 20) end} }, + require = { special={desc="Know at least 20 levels of stamina-using talents", fct=function(self) return knowRessource(self, "stamina", 20) end} }, activate = function(self, t) local ret = {} self:talentTemporaryValue(ret, "move_stamina_instead_of_energy", 20) @@ -98,7 +98,7 @@ uberTalent{ name = "Armour of Shadows", mode = "passive", - require = { special={desc="Dealt over 50000 darkness damage", fct=function(self) return + require = { special={desc="Have dealt over 50000 darkness damage", fct=function(self) return self.damage_log and ( (self.damage_log[DamageType.DARKNESS] and self.damage_log[DamageType.DARKNESS] >= 50000) ) @@ -131,7 +131,7 @@ uberTalent{ name = "Fungal Blood", - require = { special={desc="Be able to use infusions.", fct=function(self) return not self.inscription_restrictions or self.inscription_restrictions['inscriptions/infusions'] end} }, + require = { special={desc="Be able to use infusions", fct=function(self) return not self.inscription_restrictions or self.inscription_restrictions['inscriptions/infusions'] end} }, tactical = { HEAL = function(self) return not self:hasEffect(self.EFF_FUNGAL_BLOOD) and 0 or math.ceil(self:hasEffect(self.EFF_FUNGAL_BLOOD).power / 150) end }, on_pre_use = function(self, t) return self:hasEffect(self.EFF_FUNGAL_BLOOD) and self:hasEffect(self.EFF_FUNGAL_BLOOD).power > 0 and not self:attr("undead") end, trigger = function(self, t) @@ -156,7 +156,7 @@ uberTalent{ name = "Corrupted Shell", mode = "passive", - require = { special={desc="Received at least 50000 blight damage and destroyed Zigur with the Grand Corruptor.", fct=function(self) return + require = { special={desc="Have received at least 50000 blight damage and destroyed Zigur with the Grand Corruptor.", fct=function(self) return (self.damage_intake_log and self.damage_intake_log[DamageType.BLIGHT] and self.damage_intake_log[DamageType.BLIGHT] >= 50000) and (game.state.birth.ignore_prodigies_special_reqs or ( self:hasQuest("anti-antimagic") and Index: game/modules/tome/data/talents/uber/str.lua =================================================================== --- game/modules/tome/data/talents/uber/str.lua (revision 6280) +++ game/modules/tome/data/talents/uber/str.lua (working copy) @@ -29,7 +29,7 @@ self:attr("show_gloves_combat", -1) end, info = function(self, t) - return ([[Each time you make a melee attack, you have 100%% chances to do an additional unarmed strike, if using weapons. This is instead a 60%% chance if you are already fighting unarmed.]]) + return ([[Each time you make a melee attack, you have a 100%% chance to do an additional unarmed strike, if using weapons. This is instead a 60%% chance if you are already fighting unarmed.]]) :format() end, } @@ -37,7 +37,7 @@ uberTalent{ name = "You Shall Be My Weapon!", short_name="TITAN_S_SMASH", image = "talents/titan_s_smash.png", mode = "activated", - require = { special={desc="Be of at least size category 'huge' (also required to use it).", fct=function(self) return self.size_category and self.size_category >= 5 end} }, + require = { special={desc="Be of at least size category 'huge' (also required to use it)", fct=function(self) return self.size_category and self.size_category >= 5 end} }, requires_target = true, tactical = { ATTACK = 4 }, on_pre_use = function(self, t) return self.size_category and self.size_category >= 5 end, @@ -75,7 +75,7 @@ uberTalent{ name = "Massive Blow", mode = "activated", - require = { special={desc="Dug at least 30 walls/trees/... and dealt over 50000 damage with a two handed weapon.", fct=function(self) return + require = { special={desc="Have dug at least 30 walls/trees/... and dealt over 50000 damage with a two-handed weapon", fct=function(self) return self.dug_times and self.dug_times >= 30 and self.damage_log and self.damage_log.weapon.twohanded and self.damage_log.weapon.twohanded >= 50000 end} }, @@ -109,7 +109,7 @@ uberTalent{ name = "Steamroller", mode = "passive", - require = { special={desc="Know the Rush talent.", fct=function(self) return self:knowTalent(self.T_RUSH) end} }, + require = { special={desc="Know the Rush talent", fct=function(self) return self:knowTalent(self.T_RUSH) end} }, info = function(self, t) return ([[When you rush, the creature you rush to is marked. If you kill it in the next two turns, your rush cooldown is reset. Each time this effect triggers, you gain a stacking +20%% damage buff, up to 100%%.]]) @@ -123,7 +123,7 @@ requires_target = true, range = 5, tactical = { ATTACK = 4, CLOSEIN = 2 }, - require = { special={desc="Dealt over 50000 light or fire damage", fct=function(self) return + require = { special={desc="Have dealt over 50000 light or fire damage", fct=function(self) return self.damage_log and ( (self.damage_log[DamageType.FIRE] and self.damage_log[DamageType.FIRE] >= 50000) or (self.damage_log[DamageType.LIGHT] and self.damage_log[DamageType.LIGHT] >= 50000) @@ -145,7 +145,7 @@ uberTalent{ name = "I Can Carry The World!", short_name = "NO_FATIGUE", mode = "passive", - require = { special={desc="Be able to use massive armours.", fct=function(self) return self:getTalentLevelRaw(self.T_ARMOUR_TRAINING) >= 3 end} }, + require = { special={desc="Be able to use massive armours", fct=function(self) return self:getTalentLevelRaw(self.T_ARMOUR_TRAINING) >= 3 end} }, info = function(self, t) return ([[You are strong; fatigue and physical exertion mean nothing to you. Fatigue is permanently set to 0.]]) @@ -156,7 +156,7 @@ uberTalent{ name = "Legacy of the Naloren", mode = "passive", - require = { special={desc="Side wih Slasul and kill Ukllmswwik.", fct=function(self) + require = { special={desc="Have sided wih Slasul and killed Ukllmswwik", fct=function(self) if game.state.birth.ignore_prodigies_special_reqs then return true end local q = self:hasQuest("temple-of-creation") return q and not q:isCompleted("kill-slasul") and q:isCompleted("kill-drake") @@ -172,8 +172,8 @@ require("engine.ui.Dialog"):simplePopup("Legacy of the Naloren", "Slasul will be happy to know your faith in his cause. You should return to speak to him.") end, info = function(self, t) - return ([[You sided with Slasul and helped him vanquish Ukllmswwik. You are now able to breathe underwater with ease. - You also learnt to use tridents and other exotic weapons easily (gains 5 levels of Exotic Weapon Mastery), and can Spit Poison as nagas do.]]) + return ([[You have sided with Slasul and helped him vanquish Ukllmswwik. You are now able to breathe underwater with ease. + You have also learnt to use tridents and other exotic weapons easily (gaining 5 levels of Exotic Weapon Mastery), and can Spit Poison as nagas do.]]) :format() end, } Index: game/modules/tome/data/talents/uber/wil.lua =================================================================== --- game/modules/tome/data/talents/uber/wil.lua (revision 6280) +++ game/modules/tome/data/talents/uber/wil.lua (working copy) @@ -41,7 +41,7 @@ mode = "passive", cooldown = 15, getDamage = function(self, t) return math.max(100 + self:combatSpellpower() * 5, 100 + self:combatMindpower() * 5) end, - require = { special={desc="Witness a meteoric crash", fct=function(self) return game.state.birth.ignore_prodigies_special_reqs or self:attr("meteoric_crash") end} }, + require = { special={desc="Have witnessed a meteoric crash", fct=function(self) return game.state.birth.ignore_prodigies_special_reqs or self:attr("meteoric_crash") end} }, trigger = function(self, t, target) self:startTalentCooldown(t) local terrains = t.terrains or mod.class.Grid:loadList("/data/general/grids/lava.lua") @@ -182,7 +182,7 @@ cooldown = 7, trigger = function(self, t) self:startTalentCooldown(t) - game.logSeen(self, "#LIGHT_BLUE#%s unbreakable will shrugs off the effect!", self.name:capitalize()) + game.logSeen(self, "#LIGHT_BLUE#%s's unbreakable will shrugs off the effect!", self.name:capitalize()) return true end, info = function(self, t) @@ -211,7 +211,7 @@ info = function(self, t) return ([[Your will is a shield against the assault of crazy arcane users. Each time you take damage from a spell, you punish the spellcaster with %0.2f mind damage. - Also, they will suffer a 35%% spell failure chance for the duration of the spell cooldown they used on you.]]) + Also, they will suffer a 35%% spell failure chance for the cooldown duration of the spell they used on you.]]) :format(damDesc(self, DamageType.MIND, 20 + self:getWil() * 2)) end, } @@ -222,7 +222,7 @@ require = { }, cooldown = 20, tactical = { BUFF = 2 }, - require = { special={desc="Dealt over 50000 mind damage", fct=function(self) return + require = { special={desc="Have dealt over 50000 mind damage", fct=function(self) return self.damage_log and ( (self.damage_log[DamageType.MIND] and self.damage_log[DamageType.MIND] >= 50000) ) Index: game/modules/tome/data/general/grids/basic.lua =================================================================== --- game/modules/tome/data/general/grids/basic.lua (revision 6280) +++ game/modules/tome/data/general/grids/basic.lua (working copy) @@ -253,7 +253,7 @@ block_sense = true, block_esp = true, is_door = true, - door_player_check = "This door seems to have been sealed off, you think you can open it.", + door_player_check = "This door seems to have been sealed off. You think you can open it.", door_opened = "DOOR_OPEN", } newEntity{ base = "DOOR_VAULT", define_as = "DOOR_VAULT_HORIZ", image = "terrain/granite_door1.png", add_displays = {class.new{image="terrain/granite_wall3.png", z=18, display_y=-1}}, door_opened = "DOOR_HORIZ_OPEN"} @@ -367,7 +367,7 @@ block_sense = true, block_esp = true, force_clone = true, - door_player_stop = "This door seems to have been sealed off, you need to find a way to open it.", + door_player_stop = "This door seems to have been sealed off. You need to find a way to open it.", is_door = true, door_opened = "GENERIC_LEVER_DOOR_OPEN", on_lever_change = function(self, x, y, who, val, oldval) @@ -392,7 +392,7 @@ always_remember = true, is_door = true, door_closed = "GENERIC_LEVER_DOOR", - door_player_stop = "This door seems to have been sealed off, you need to find a way to close it.", + door_player_stop = "This door seems to have been sealed off. You need to find a way to close it.", on_lever_change = function(self, x, y, who, val, oldval) local toggle = game.level.map.attrs(x, y, "lever_toggle") local trigger = game.level.map.attrs(x, y, "lever_action")