From 56b6f8afe1502b268c5b5401626dcba57979ef40 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 10 May 2011 00:24:20 +0000
Subject: [PATCH] typos
git-svn-id: http://svn.net-core.org/repos/t-engine4@3331 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../data/talents/chronomancy/anomalies.lua | 2 +-
.../data/talents/chronomancy/chronomancer.lua | 4 +-
.../tome/data/talents/chronomancy/paradox.lua | 8 +--
.../talents/chronomancy/temporal-archery.lua | 4 +-
.../data/talents/techniques/grappling.lua | 62 +++++++++----------
5 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/game/modules/tome/data/talents/chronomancy/anomalies.lua b/game/modules/tome/data/talents/chronomancy/anomalies.lua
index 3c7c8d520d..3e0b345976 100644
--- a/game/modules/tome/data/talents/chronomancy/anomalies.lua
+++ b/game/modules/tome/data/talents/chronomancy/anomalies.lua
@@ -315,7 +315,7 @@ newTalent{
type = "elemental", subtype = "temporal",
display = "E", color=colors.YELLOW,
name = "Telugoroth", faction = a.faction,
- desc = [[A temporal elemental, rarely encountered except by those who travel through time itself. It's blurred form constantly shifts before your eyes.]],
+ desc = [[A temporal elemental, rarely encountered except by those who travel through time itself. Its blurred form constantly shifts before your eyes.]],
combat = { dam=resolvers.mbonus(40, 15), atk=15, apr=15, dammod={mag=0.8}, damtype=DamageType.TEMPORAL },
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
autolevel = "none",
diff --git a/game/modules/tome/data/talents/chronomancy/chronomancer.lua b/game/modules/tome/data/talents/chronomancy/chronomancer.lua
index fa3e32a79b..325f0f449f 100644
--- a/game/modules/tome/data/talents/chronomancy/chronomancer.lua
+++ b/game/modules/tome/data/talents/chronomancy/chronomancer.lua
@@ -123,8 +123,8 @@ checkBackfire = function(self, x, y)
end
checkTimeline = function(self)
- if self:isTalentActive(self.T_DOOR_TO_THE_PAST) or self:hasEffect(self.EFF_SEE_THE_THREADS) or self:hasEffect(self.EFF_PRECOGNITION) or self:hasEffect(self.EFF_PARADOX_CLONE) or self:hasEffect(self.EFF_IMMINENT_PARADOX_CLONE) then
- game.logPlayer(self, "The timeline is to fractured right now to use this ability.")
+ if self:isTalentActive(self.T_DOOR_TO_THE_PAST) or self:hasEffect(self.EFF_SEE_THREADS) or self:hasEffect(self.EFF_PRECOGNITION) or self:hasEffect(self.EFF_PARADOX_CLONE) or self:hasEffect(self.EFF_IMMINENT_PARADOX_CLONE) then
+ game.logPlayer(self, "The timeline is too fractured right now to use this ability.")
return true
else
return false
diff --git a/game/modules/tome/data/talents/chronomancy/paradox.lua b/game/modules/tome/data/talents/chronomancy/paradox.lua
index f50a2d03f3..48d22c99d0 100644
--- a/game/modules/tome/data/talents/chronomancy/paradox.lua
+++ b/game/modules/tome/data/talents/chronomancy/paradox.lua
@@ -54,7 +54,7 @@ newTalent{
paradox = 10,
cooldown = 15,
tactical = { DEFEND = 2 },
- no_energy = true,
+ no_energy = true,
getAbsorb = function(self, t) return self:combatTalentSpellDamage(t, 30, 470) * getParadoxModifier(self, pm) end,
action = function(self, t)
self:setEffect(self.EFF_DAMAGE_SHUNT, 10, {power=t.getAbsorb(self, t)})
@@ -100,7 +100,7 @@ newTalent{
info = function(self, t)
local duration = t.getDuration(self, t)
local reduction = t.getReduction(self, t)
- return ([[By altering the target's past you change it's present, reducing all of it's resistances by %d%% for %d turns.
+ return ([[By altering the target's past you change its present, reducing all of its resistances by %d%% for %d turns.
The duration and reduction will scale with your Paradox. The reduction will increase with your Magic stat.]]):
format(reduction, duration)
end,
@@ -123,11 +123,11 @@ newTalent{
if checkTimeline(self) == true then
return
end
-
+
local tg = {type="hit", range=self:getTalentRange(t)}
local tx, ty = self:getTarget(tg)
if not tx or not ty then return nil end
-
+
local sex = game.player.female and "she" or "he"
local a = mod.class.NPC.new{}
a:replaceWith(game.player:resolveSource():cloneFull())
diff --git a/game/modules/tome/data/talents/chronomancy/temporal-archery.lua b/game/modules/tome/data/talents/chronomancy/temporal-archery.lua
index a628407af9..4e421111a0 100644
--- a/game/modules/tome/data/talents/chronomancy/temporal-archery.lua
+++ b/game/modules/tome/data/talents/chronomancy/temporal-archery.lua
@@ -38,7 +38,7 @@ newTalent{
end,
info = function(self, t)
local weapon = 100 * (self:combatTalentWeaponDamage(t, 1.1, 1.9) * getParadoxModifier(self, pm))
- return ([[You fire a shot that phases out of time and space allowing it to virtually ignore armor. The shot will deal %d%% weapon damage as temporal damage to it's target.
+ return ([[You fire a shot that phases out of time and space allowing it to virtually ignore armor. The shot will deal %d%% weapon damage as temporal damage to its target.
The damage will scale with your Paradox.]]):
format(damDesc(self, DamageType.TEMPORAL, weapon))
end
@@ -81,7 +81,7 @@ newTalent{
sustain_paradox = 225,
cooldown = 10,
tactical = { BUFF = 2 },
- no_energy = true,
+ no_energy = true,
getPower = function(self, t) return 10 + (self:combatTalentSpellDamage(t, 10, 40)) end,
activate = function(self, t)
local power = t.getPower(self, t)
diff --git a/game/modules/tome/data/talents/techniques/grappling.lua b/game/modules/tome/data/talents/techniques/grappling.lua
index 63d26f0c64..6c4debcc07 100644
--- a/game/modules/tome/data/talents/techniques/grappling.lua
+++ b/game/modules/tome/data/talents/techniques/grappling.lua
@@ -73,54 +73,54 @@ newTalent{
end
end,
action = function(self, t)
-
+
local tg = {type="hit", range=self:getTalentRange(t)}
local x, y, target = self:getTarget(tg)
if not x or not y or not target then return nil end
if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-
+
local grappled = false
-
+
-- force stance change
- if target and not self:isTalentActive(self.T_GRAPPLING_STANCE) then
+ if target and not self:isTalentActive(self.T_GRAPPLING_STANCE) then
self:forceUseTalent(self.T_GRAPPLING_STANCE, {ignore_energy=true, ignore_cd = true})
end
-
+
-- breaks active grapples if the target is not grappled
if target:isGrappled(self) then
grappled = true
else
self:breakGrapples()
end
-
+
-- end the talent without effect if the target is to big
if self:grappleSizeCheck(target) then
return true
end
-
+
-- start the grapple
local hit = self:startGrapple(target)
-
+
local duration = t.getDuration(self, t)
-
+
-- do crushing hold if we know it
if hit and self:knowTalent(self.T_CRUSHING_HOLD) then
- local t = self:getTalentFromId(self.T_CRUSHING_HOLD)
+ local t = self:getTalentFromId(self.T_CRUSHING_HOLD)
if grappled and not target.no_breath and not target.undead and target:canBe("silence") then
target:setEffect(target.EFF_STRANGLE_HOLD, duration, {src=self, power=t.getDamage(self, t) * 1.5})
else
target:setEffect(target.EFF_CRUSHING_HOLD, duration, {src=self, power=t.getDamage(self, t)})
end
-
+
end
-
+
return true
end,
info = function(self, t)
local duration = t.getDuration(self, t)
local power = t.getPower(self, t)
local drain = t.getDrain(self, t)
- return ([[Grapples the target for %d turns. A grappled opponent will be unable to move and it's attack and defense will be reduced by %d. Any movement from the target or you will break the grapple. Maintaining a grapple drains %d stamina per turn.
+ return ([[Grapples the target for %d turns. A grappled opponent will be unable to move and its attack and defense will be reduced by %d. Any movement from the target or you will break the grapple. Maintaining a grapple drains %d stamina per turn.
You may only grapple a single target at a time and using any targeted unarmed talent on a target that you're not grappling will break the grapple.
The grapple attack and defense reduction as well as success chance will scale with the strength stat.
Performing this action will switch your stance to Grappling Stance.]])
@@ -143,40 +143,40 @@ newTalent{
getMaim = function(self, t) return 10 + self:combatTalentStatDamage(t, "str", 5, 20) * (1 + getGrapplingStyle(self, dam)) end,
-- Learn the appropriate stance
action = function(self, t)
-
+
local tg = {type="hit", range=self:getTalentRange(t)}
local x, y, target = self:getTarget(tg)
if not x or not y or not target then return nil end
if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-
+
local grappled = false
-
+
-- breaks active grapples if the target is not grappled
if target:isGrappled(self) then
grappled = true
else
self:breakGrapples()
end
-
+
-- end the talent without effect if the target is to big
if self:grappleSizeCheck(target) then
return true
end
-
+
local hit = self:startGrapple (target)
-
+
-- deal damage and maim if appropriate
if hit then
-
+
if grappled then
self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getDamage(self, t), nil, target))
target:setEffect(target.EFF_MAIMED, t.getDuration(self, t), {power=t.getMaim(self, t)})
else
self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getDamage(self, t), nil, target))
end
-
+
end
-
+
return true
end,
info = function(self, t)
@@ -222,14 +222,14 @@ newTalent{
getSlam = function(self, t) return 20 + self:combatTalentStatDamage(t, "str", 30, 500) * (1 + getGrapplingStyle(self, dam)) end,
-- Learn the appropriate stance
action = function(self, t)
-
+
local tg = {type="hit", range=self:getTalentRange(t)}
local x, y, target = self:getTarget(tg)
if not x or not y or not target then return nil end
if math.floor(core.fov.distance(self.x, self.y, x, y)) > self:getTalentRange(t) then return nil end
-
+
local grappled = false
-
+
-- do the rush
local l = line.new(self.x, self.y, x, y)
local tx, ty = self.x, self.y
@@ -253,18 +253,18 @@ newTalent{
else
self:breakGrapples()
end
-
+
if math.floor(core.fov.distance(self.x, self.y, x, y)) == 1 then
-- end the talent without effect if the target is to big
if self:grappleSizeCheck(target) then
return true
end
-
+
local hit = self:startGrapple (target)
-
+
-- takedown or slam as appropriate
if hit then
-
+
if grappled then
self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getSlam(self, t), nil, target))
if target:checkHit(self:combatAttackStr(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("stun") then
@@ -280,10 +280,10 @@ newTalent{
game.logSeen(target, "%s resists the daze!", target.name:capitalize())
end
end
-
+
end
end
-
+
return true
end,
info = function(self, t)
--
GitLab