From 1b35d47257ac860b87e4f35f9adbb860de936f6e Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Tue, 16 Aug 2011 07:41:56 +0000 Subject: [PATCH] typos git-svn-id: http://svn.net-core.org/repos/t-engine4@4159 51575b47-30f0-44d4-a5cc-537603b46e54 --- .../tome/class/interface/TooltipsData.lua | 2 +- .../tome/data/talents/celestial/combat.lua | 2 +- .../tome/data/talents/celestial/light.lua | 2 +- .../tome/data/talents/celestial/sun.lua | 2 +- .../tome/data/talents/corruptions/blight.lua | 8 +++--- .../tome/data/talents/corruptions/blood.lua | 4 +-- .../tome/data/talents/corruptions/bone.lua | 4 +-- .../data/talents/corruptions/corruptions.lua | 2 +- .../data/talents/corruptions/sanguisuge.lua | 2 +- .../data/talents/corruptions/shadowflame.lua | 2 +- .../tome/data/talents/corruptions/vim.lua | 4 +-- .../tome/data/talents/cursed/cursed-form.lua | 4 +-- .../data/talents/cursed/force-of-will.lua | 4 +-- .../tome/data/talents/cursed/primal-magic.lua | 28 +++++++++---------- .../tome/data/talents/cursed/shadows.lua | 2 +- .../talents/psionic/augmented-mobility.lua | 2 +- .../data/talents/techniques/techniques.lua | 2 +- .../data/talents/techniques/weaponshield.lua | 2 +- 18 files changed, 39 insertions(+), 39 deletions(-) diff --git a/game/modules/tome/class/interface/TooltipsData.lua b/game/modules/tome/class/interface/TooltipsData.lua index 40b54023c6..4d3b63db2f 100644 --- a/game/modules/tome/class/interface/TooltipsData.lua +++ b/game/modules/tome/class/interface/TooltipsData.lua @@ -88,7 +88,7 @@ TOOLTIP_VIM = [[#GOLD#Vim#LAST# Vim represents the amount of life energy you control. Each corruption talent requires some. It does not regenerates naturally, you need to drain it from yourself or you victims. Each time you kill a creature you drain 10% of your Willpower as Vim. -Also if you used a Corruption spell that costed Vim to kill a creature, that cost is refunded on death. +Also if you used a Corruption spell that cost Vim to kill a creature, that cost is refunded on death. ]] TOOLTIP_EQUILIBRIUM = [[#GOLD#Equilibrium#LAST# diff --git a/game/modules/tome/data/talents/celestial/combat.lua b/game/modules/tome/data/talents/celestial/combat.lua index 19fe99707a..d15b88c029 100644 --- a/game/modules/tome/data/talents/celestial/combat.lua +++ b/game/modules/tome/data/talents/celestial/combat.lua @@ -108,7 +108,7 @@ newTalent{ info = function(self, t) local damage = t.getDamage(self, t) return ([[In a pure display of power you project a melee attack, doing %d%% damage. - The range will increase with the Strength stat]]): + The range will increase with the Strength stat.]]): format(100 * damage) end, } diff --git a/game/modules/tome/data/talents/celestial/light.lua b/game/modules/tome/data/talents/celestial/light.lua index 2e7bff27ab..76100dba31 100644 --- a/game/modules/tome/data/talents/celestial/light.lua +++ b/game/modules/tome/data/talents/celestial/light.lua @@ -100,7 +100,7 @@ newTalent{ info = function(self, t) local absorb = t.getAbsorb(self, t) return ([[A protective shield forms around you that lasts for up to 10 turns, negating %d damage. - Max damage barrier can absorb will increase with your Magic stat.]]): + The max damage barrier can absorb will increase with your Magic stat.]]): format(absorb) end, } diff --git a/game/modules/tome/data/talents/celestial/sun.lua b/game/modules/tome/data/talents/celestial/sun.lua index 2afa358f96..51a6d5bb84 100644 --- a/game/modules/tome/data/talents/celestial/sun.lua +++ b/game/modules/tome/data/talents/celestial/sun.lua @@ -139,7 +139,7 @@ newTalent{ end, info = function(self, t) local damage = t.getDamage(self, t) - return ([[Fire a beam of Sun flames at your foes, burning all those in line for %0.2f fire damage. + return ([[Fire a beam of Sun flames at your foes, burning all those in a line for %0.2f fire damage. The damage will increase with the Magic stat.]]): format(damDesc(self, DamageType.FIRE, damage)) end, diff --git a/game/modules/tome/data/talents/corruptions/blight.lua b/game/modules/tome/data/talents/corruptions/blight.lua index 3573e70e76..f5a2840a17 100644 --- a/game/modules/tome/data/talents/corruptions/blight.lua +++ b/game/modules/tome/data/talents/corruptions/blight.lua @@ -38,8 +38,8 @@ newTalent{ return true end, info = function(self, t) - return ([[Increasing your spell critical damage multiplier by %d%%. - The damage will increase with your Magic stat.]]): + return ([[Increases your spell critical damage multiplier by %d%%. + The multiplier will increase with your Magic stat.]]): format(self:combatTalentSpellDamage(t, 20, 60)) end, } @@ -131,7 +131,7 @@ newTalent{ end, info = function(self, t) return ([[Infect your target with a corrosive worm that deals %0.2f acid damage per turn for 10 turns. - If the target dies while the worm is inside it will explode doing %0.2f acid damage in a radius of 4. + If the target dies while the worm is inside it will explode, doing %0.2f acid damage in a radius of 4. The damage will increase with Magic stat.]]): format(damDesc(self, DamageType.ACID, self:combatTalentSpellDamage(t, 10, 60)), damDesc(self, DamageType.ACID, self:combatTalentSpellDamage(t, 10, 230))) end, @@ -173,7 +173,7 @@ newTalent{ end, info = function(self, t) return ([[A furious poison storm rages around the caster, poisoning all creatures inside for doing %0.2f nature damage in 6 turns in a radius of %d for %d turns. - Poisoning is cumulative, the longer they stay in they higher the poison they take. + Poisoning is cumulative, the longer they stay in the higher the poison damage they take. The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.NATURE, self:combatTalentSpellDamage(t, 12, 130)), self:getTalentRadius(t), 5 + self:getTalentLevel(t)) end, } diff --git a/game/modules/tome/data/talents/corruptions/blood.lua b/game/modules/tome/data/talents/corruptions/blood.lua index 5bbc5c30f3..fc19953227 100644 --- a/game/modules/tome/data/talents/corruptions/blood.lua +++ b/game/modules/tome/data/talents/corruptions/blood.lua @@ -79,7 +79,7 @@ newTalent{ return true end, info = function(self, t) - return ([[Projects a bolt of corrupted blood doing %0.2f blight damage and healing the caster for half the damage done. + return ([[Project a bolt of corrupted blood doing %0.2f blight damage and healing you for half the damage done. The damage will increase with Magic stat.]]):format(damDesc(self, DamageType.BLIGHT, self:combatTalentSpellDamage(t, 10, 290))) end, } @@ -138,7 +138,7 @@ newTalent{ end, info = function(self, t) return ([[Concentrate on the corruption you bring, increasing your spell critical chance by %d%%. - Each time your spells are critical you enter a blood rage for 5 turns, increasing your blight and acid damage by %d%%. + Each time your spells go critical you enter a blood rage for 5 turns, increasing your blight and acid damage by %d%%. The damage will increase with your Magic stat.]]): format(self:combatTalentSpellDamage(t, 10, 14), self:combatTalentSpellDamage(t, 10, 30)) end, diff --git a/game/modules/tome/data/talents/corruptions/bone.lua b/game/modules/tome/data/talents/corruptions/bone.lua index 0f33eed1f3..a79767ae75 100644 --- a/game/modules/tome/data/talents/corruptions/bone.lua +++ b/game/modules/tome/data/talents/corruptions/bone.lua @@ -41,7 +41,7 @@ newTalent{ return true end, info = function(self, t) - return ([[Conjures up spear of bones doing %0.2f physical damage to all targets in line. + return ([[Conjures up a spear of bones doing %0.2f physical damage to all targets in line. The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.PHYSICAL, self:combatTalentSpellDamage(t, 20, 200))) end, } @@ -151,7 +151,7 @@ newTalent{ return true end, info = function(self, t) - return ([[Bone shields start circling around you. They will each absorb fully one attack. + return ([[Bone shields start circling around you. They will each fully absorb one attack. %d shield(s) will be generated.]]): format(math.floor(self:getTalentLevel(t))) end, diff --git a/game/modules/tome/data/talents/corruptions/corruptions.lua b/game/modules/tome/data/talents/corruptions/corruptions.lua index 84c9c6f0bb..4aaa6a5e85 100644 --- a/game/modules/tome/data/talents/corruptions/corruptions.lua +++ b/game/modules/tome/data/talents/corruptions/corruptions.lua @@ -26,7 +26,7 @@ newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="corrupti newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="corruption/plague", name = "plague", description = "Spread diseases to your foes." } newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="corruption/scourge", name = "scourge", description = "Bring pain and destruction to the world." } newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="corruption/reaving-combat", name = "reaving combat", description = "Enhanced melee combat through the dark arts." } -newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="corruption/blood", name = "blood", description = "Harness the power of blood, both your own and your foes." } +newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="corruption/blood", name = "blood", description = "Harness the power of blood, both your own and your foes'." } newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="corruption/blight", name = "blight", description = "Bring corruption and decay to all who oppose you." } newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="corruption/shadowflame", name = "Shadowflame", description = "Harness the power of the demonic shadowflame." } diff --git a/game/modules/tome/data/talents/corruptions/sanguisuge.lua b/game/modules/tome/data/talents/corruptions/sanguisuge.lua index 374f42984c..98efd37568 100644 --- a/game/modules/tome/data/talents/corruptions/sanguisuge.lua +++ b/game/modules/tome/data/talents/corruptions/sanguisuge.lua @@ -39,7 +39,7 @@ newTalent{ end, info = function(self, t) return ([[Fires a bolt of blight, doing %0.2f blight damage and replenishing 20%% of it as vim energy. - The amount of vim regained depends on the target's rank (higher rank give more vim). + The amount of vim regained depends on the target's rank (higher ranks give more vim). The effect will increase with your Magic stat.]]): format(damDesc(self, DamageType.BLIGHT, self:combatTalentSpellDamage(t, 25, 200))) end, diff --git a/game/modules/tome/data/talents/corruptions/shadowflame.lua b/game/modules/tome/data/talents/corruptions/shadowflame.lua index 01d83d895a..f6290d5f54 100644 --- a/game/modules/tome/data/talents/corruptions/shadowflame.lua +++ b/game/modules/tome/data/talents/corruptions/shadowflame.lua @@ -30,7 +30,7 @@ newTalent{ return true end, info = function(self, t) - return ([[Turn into a wraith, allowing you to walk through walls (but does not prevent suffocation) for %d turns. + return ([[Turn into a wraith, allowing you to walk through walls (but not preventing suffocation) for %d turns. Also increases your defense and armor by %d and %d. The bonuses will increase with your Magic stat.]]): format(4 + self:getTalentLevel(t), self:combatTalentSpellDamage(t, 5, 19), self:combatTalentSpellDamage(t, 5, 15)) diff --git a/game/modules/tome/data/talents/corruptions/vim.lua b/game/modules/tome/data/talents/corruptions/vim.lua index c13626bfbb..7c881186ed 100644 --- a/game/modules/tome/data/talents/corruptions/vim.lua +++ b/game/modules/tome/data/talents/corruptions/vim.lua @@ -70,7 +70,7 @@ newTalent{ info = function(self, t) return ([[Feel the very existence of creatures around you for %d turns in a radius of 10. The evil touch will reduce their blight resistance by %d%% but also make them aware of you. - The damage will increase with Magic stat.]]):format(3 + self:getTalentLevel(t), self:combatTalentSpellDamage(t, 10, 45)) + The resistance will decrease with Magic stat.]]):format(3 + self:getTalentLevel(t), self:combatTalentSpellDamage(t, 10, 45)) end, } @@ -127,7 +127,7 @@ newTalent{ return true end, info = function(self, t) - return ([[Open a dark portal to the target zone, all creatures caught inside will be teleported to your location and you to theirs. + return ([[Open a dark portal to the target zone. All creatures caught inside will be teleported to your location and you to theirs. All creatures(except you) traversing the portal will catch a random disease doing %0.2f blight damage per turn for 6 turns and reducing one of its physical stats (strength, constitution, dexterity) by %d. The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.BLIGHT, self:combatTalentSpellDamage(t, 12, 80)), self:combatTalentSpellDamage(t, 5, 25)) end, diff --git a/game/modules/tome/data/talents/cursed/cursed-form.lua b/game/modules/tome/data/talents/cursed/cursed-form.lua index 3b79f05fad..8012033472 100644 --- a/game/modules/tome/data/talents/cursed/cursed-form.lua +++ b/game/modules/tome/data/talents/cursed/cursed-form.lua @@ -52,7 +52,7 @@ newTalent{ self.unnatural_body_healing_factor = -0.5 self.healing_factor = (self.healing_factor or 1) + self.unnatural_body_healing_factor end - + -- heal local maxHeal = self.unnatural_body_heal or 0 if maxHeal > 0 then @@ -87,7 +87,7 @@ newTalent{ local modifier1, modifier2 = "more", "more" if resist > 0 then modifier1 = "less" end if resist + 18 > 0 then modifier2 = "less" end - return ([[Your body's strength is fed by your hatred. With each kill you regenerate %d life at a rate of %0.1f life per turn. This healing cannot be reduced but most other forms of healing are reduced by 50%%. You also take %d%% %s damage (at 0 Hate) to %d%% %s damage (at 10+ Hate). + return ([[Your body's strength is fed by your hatred. With each kill you regenerate %d life at a rate of %0.1f life per turn. This healing cannot be reduced, but most other forms of healing are reduced by 50%%. You also take %d%% %s damage (at 0 Hate) to %d%% %s damage (at 10+ Hate). Healing from kills improves with the Willpower stat.]]):format(healPerKill, regenRate, math.abs(resist), modifier1, math.abs(resist + 18), modifier2) end, } diff --git a/game/modules/tome/data/talents/cursed/force-of-will.lua b/game/modules/tome/data/talents/cursed/force-of-will.lua index 7b5a980eca..3232f34fdf 100644 --- a/game/modules/tome/data/talents/cursed/force-of-will.lua +++ b/game/modules/tome/data/talents/cursed/force-of-will.lua @@ -197,7 +197,7 @@ newTalent{ end, info = function(self, t) local maxDamage = t.getMaxDamage(self, t) - return ([[Deflect 50%% of incoming damage with the force of your will. You may deflect up to %d damage but first your hate must slowly feed your strength (-0.02 hate regeneration while building strength). + return ([[Deflect 50%% of incoming damage with the force of your will. You may deflect up to %d damage, but first your hate must slowly feed your strength (-0.02 hate regeneration while building strength). The maximum damage deflected increases with the Willpower stat.]]):format(maxDamage) end, } @@ -249,7 +249,7 @@ newTalent{ local power = (1 - (distance / radius)) local localDamage = damage * power local dazeDuration = t.getDazeDuration(self, t) - + forceHit(self, target, blastX, blastY, damage, math.max(0, knockback - distance), 15, power) if target:canBe("stun") then target:setEffect(target.EFF_DAZED, dazeDuration, {src=self}) diff --git a/game/modules/tome/data/talents/cursed/primal-magic.lua b/game/modules/tome/data/talents/cursed/primal-magic.lua index e722970c75..b9ce60a988 100644 --- a/game/modules/tome/data/talents/cursed/primal-magic.lua +++ b/game/modules/tome/data/talents/cursed/primal-magic.lua @@ -63,28 +63,28 @@ newTalent{ self.arcaneBolts = nil return end - + local x, y = target.x, target.y local tg = {type="bolt", range=range, talent=t, display={particle="bolt_fire", trail="firetrail"}} self:projectile(tg, target.x, target.y, DamageType.ARCANE, self.arcaneBolts.damage, nil) - + game:playSoundNear(self, "talents/fire") end, action = function(self, t) local range = self:getTalentRange(t) local damage = t.getDamage(self, t) - + --local tg = {type="bolt", range=range, talent=t, display={particle="bolt_fire", trail="firetrail"}} --local x, y, target = self:getTarget(tg) --if not x or not y or not target or core.fov.distance(self.x, self.y, x, y) > range then return nil end - + self.arcaneBolts = { damage = damage, range = range, duration = 4 } - + return true end, do_arcaneBolts = function(self, t) t.fireArcaneBolt(self, t) - + if self.arcaneBolts then self.arcaneBolts.duration = self.arcaneBolts.duration - 1 if self.arcaneBolts.duration <= 0 then self.arcaneBolts = nil end @@ -92,7 +92,7 @@ newTalent{ end, info = function(self, t) local damage = t.getDamage(self, t) - return ([[Each turn for 4 turns you fire a bolt of arcane energy at your nearest enemy inclicting %d damage. + return ([[Each turn for 4 turns you fire a bolt of arcane energy at your nearest enemy inflicting %d damage. The damage will increase with the Magic stat.]]):format(damDesc(self, DamageType.ARCANE, damage)) end, } @@ -115,17 +115,17 @@ newTalent{ local tg = {type="ball", nolock=true, pass_terrain=false, nowarning=true, range=range, radius=0, requires_knowledge=true} x, y = self:getTarget(tg) if not x then return nil end - + -- Target code does not restrict the target coordinates to the range, it lets the project function do it -- but we cant ... local _ _, x, y = self:canProject(tg, x, y) - + if not self:canMove(x, y) or (self.x == x and self.y == y) then return nil end if not self:canBe("teleport") or game.level.map.attrs(x, y, "no_teleport") then game.logSeen(self, "Your attempt to displace fails!") return true end - + game.level.map:particleEmitter(self.x, self.y, 1, "teleport_out") self:move(x, y, true) game.level.map:particleEmitter(self.x, self.y, 1, "teleport_in") @@ -186,21 +186,21 @@ newTalent{ {type="light_zone"}, nil, self:spellFriendlyFire() ) - + tg = {type="hit", range=10} self:project(tg, self.x, self.y, DamageType.CONFUSION, { dur = 4, dam = 75 }) - + game:playSoundNear(self, "talents/fireflash") - + return true end, info = function(self, t) local damage = t.getDamage(self, t) return ([[Bathes the target in raw magic inflicting %d damage. Such wild magic is difficult to control and if you fail to keep your wits you will be confused for 4 turns. - The damage will increase with the Magic stat]]): + The damage will increase with the Magic stat.]]): format(damDesc(self, DamageType.ARCANE, damage)) end, } diff --git a/game/modules/tome/data/talents/cursed/shadows.lua b/game/modules/tome/data/talents/cursed/shadows.lua index 9f00ce19a2..41aa14fd09 100644 --- a/game/modules/tome/data/talents/cursed/shadows.lua +++ b/game/modules/tome/data/talents/cursed/shadows.lua @@ -569,6 +569,6 @@ newTalent{ local combatAtk = t.getCombatAtk(self, t) local incDamage = t.getIncDamage(self, t) local dominateChance = t.getDominateChance(self, t) - return ([[Instill hate in your shadows strengthening their attacks. They gain %d%% extra accuracy and %d%% extra damage. The fury of their attacks gives them the ability to try to Dominate their foes, increasing all damage taken by that foe for 4 turns. (%d%% chance at range 1)]]):format(combatAtk, incDamage, dominateChance) + return ([[Instill hate in your shadows, strengthening their attacks. They gain %d%% extra accuracy and %d%% extra damage. The fury of their attacks gives them the ability to try to Dominate their foes, increasing all damage taken by that foe for 4 turns. (%d%% chance at range 1)]]):format(combatAtk, incDamage, dominateChance) end, } diff --git a/game/modules/tome/data/talents/psionic/augmented-mobility.lua b/game/modules/tome/data/talents/psionic/augmented-mobility.lua index 34fb70d9c7..8b2d58dff6 100644 --- a/game/modules/tome/data/talents/psionic/augmented-mobility.lua +++ b/game/modules/tome/data/talents/psionic/augmented-mobility.lua @@ -113,7 +113,7 @@ newTalent{ end, info = function(self, t) local range = self:getTalentRange(t) - return ([[You perform a precision, telekinetically-enhanced leap, landing up to %d squares away.]]): + return ([[You perform a precise, telekinetically-enhanced leap, landing up to %d squares away.]]): format(range) end, } diff --git a/game/modules/tome/data/talents/techniques/techniques.lua b/game/modules/tome/data/talents/techniques/techniques.lua index 6c736265fa..478db6e4fd 100644 --- a/game/modules/tome/data/talents/techniques/techniques.lua +++ b/game/modules/tome/data/talents/techniques/techniques.lua @@ -36,7 +36,7 @@ newTalentType{ allow_random=true, type="technique/bloodthirst", name = "bloodthi newTalentType{ allow_random=true, type="technique/field-control", name = "field control", generic = true, description = "Control the battlefield using various techniques." } newTalentType{ allow_random=true, type="technique/combat-techniques-active", name = "combat techniques", description = "Generic combat oriented techniques." } newTalentType{ allow_random=true, type="technique/combat-techniques-passive", name = "combat veteran", description = "Generic combat oriented techniques." } -newTalentType{ allow_random=true, type="technique/combat-training", name = "combat training", generic = true, description = "Teaches to use various armors and improves health." } +newTalentType{ allow_random=true, type="technique/combat-training", name = "combat training", generic = true, description = "Teaches to use various armours, weapons and improves health." } newTalentType{ allow_random=true, type="technique/magical-combat", name = "magical combat", description = "The blending together of magic and melee prowess." } -- Unarmed Combat diff --git a/game/modules/tome/data/talents/techniques/weaponshield.lua b/game/modules/tome/data/talents/techniques/weaponshield.lua index 8409024b1d..a3fe57286e 100644 --- a/game/modules/tome/data/talents/techniques/weaponshield.lua +++ b/game/modules/tome/data/talents/techniques/weaponshield.lua @@ -58,7 +58,7 @@ newTalent{ return true end, info = function(self, t) - return ([[Hits the target with two shield strikes doing %d%% and %d%% shield damage. If it hits second time it stuns target for %d turns + return ([[Hits the target with two shield strikes doing %d%% and %d%% shield damage. If it hits a second time it stuns target for %d turns The damage multiplier increases with your Strength and second strike with Shield Expertise talent level.]]) :format(100 * self:combatTalentWeaponDamage(t, 1, 1.7, self:getTalentLevel(self.T_SHIELD_EXPERTISE)), 100 * self:combatTalentWeaponDamage(t, 1.2, 2.1, self:getTalentLevel(self.T_SHIELD_EXPERTISE)), -- GitLab