From 0f9654d0fe2e0b83c6420bd84013308ecb8a97ff Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 1 Apr 2011 22:13:03 +0000
Subject: [PATCH] Weapon Combat renamed to Combat Accuracy
git-svn-id: http://svn.net-core.org/repos/t-engine4@3134 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Player.lua | 2 ++
.../tome/data/talents/techniques/combat-techniques.lua | 2 +-
game/modules/tome/data/talents/techniques/combat-training.lua | 4 ++--
game/modules/tome/dialogs/PartyOrder.lua | 4 +++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 9cedcf584c..aa0ea13fb9 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -799,6 +799,8 @@ function _M:quickSwitchWeapons()
local oh1, oh2 = self.inven[self.INVEN_OFFHAND], self.inven[self.INVEN_QS_OFFHAND]
local pf1, pf2 = self.inven[self.INVEN_PSIONIC_FOCUS], self.inven[self.INVEN_QS_PSIONIC_FOCUS]
+ if not mh1 or not mh2 or not oh1 or not oh2 then return end
+
local mhset1, mhset2 = {}, {}
local ohset1, ohset2 = {}, {}
local pfset1, pfset2 = {}, {}
diff --git a/game/modules/tome/data/talents/techniques/combat-techniques.lua b/game/modules/tome/data/talents/techniques/combat-techniques.lua
index a2075a1bca..a43a64dfc3 100644
--- a/game/modules/tome/data/talents/techniques/combat-techniques.lua
+++ b/game/modules/tome/data/talents/techniques/combat-techniques.lua
@@ -31,7 +31,7 @@ newTalent{
tactical = { BUFF = 1 },
activate = function(self, t)
return {
- speed = self:addTemporaryValue("combat_physspeed", self:combatSpeed() - 1 / (1 + 0.08 * 1.3)),
+ speed = self:addTemporaryValue("combat_physspeed", self:combatSpeed() + 1 / (1 + 0.08 * 1.3)),
atk = self:addTemporaryValue("combat_atk", 4 + (self:getTalentLevel(t) * self:getDex()) / 15),
crit = self:addTemporaryValue("combat_physcrit", 4 + (self:getTalentLevel(t) * self:getDex()) / 25),
}
diff --git a/game/modules/tome/data/talents/techniques/combat-training.lua b/game/modules/tome/data/talents/techniques/combat-training.lua
index a663c1dc93..6f2845d995 100644
--- a/game/modules/tome/data/talents/techniques/combat-training.lua
+++ b/game/modules/tome/data/talents/techniques/combat-training.lua
@@ -70,7 +70,7 @@ newTalent{
}
newTalent{
- name = "Weapon Combat",
+ name = "Combat Accuracy", short_name = "WEAPON_COMBAT",
type = {"technique/combat-training", 1},
points = 10,
require = { level=function(level) return (level - 1) * 2 end },
@@ -78,7 +78,7 @@ newTalent{
getAttack = function(self, t) return self:getTalentLevel(t) * 5 end,
info = function(self, t)
local attack = t.getAttack(self, t)
- return ([[Increases accuracy of melee and ranged weapons by %d.]]):
+ return ([[Increases accuracy of unarmed, melee and ranged weapons by %d.]]):
format(attack)
end,
}
diff --git a/game/modules/tome/dialogs/PartyOrder.lua b/game/modules/tome/dialogs/PartyOrder.lua
index 8b22b5e044..391763ad30 100644
--- a/game/modules/tome/dialogs/PartyOrder.lua
+++ b/game/modules/tome/dialogs/PartyOrder.lua
@@ -61,7 +61,9 @@ function _M:generateList()
local list = {}
for o, _ in pairs(self.def.orders) do
- list[#list+1] = {name=orders[o][2](self.actor), order=o, sort=orders[o][1]}
+ if orders[o] then
+ list[#list+1] = {name=orders[o][2](self.actor), order=o, sort=orders[o][1]}
+ end
end
table.sort(list, function(a,b) return a.sort < b.sort end)
--
GitLab