From 250f58c08932b7b0ed92a3e0153070591899c278 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 19 Aug 2011 19:20:10 +0000
Subject: [PATCH] Minor fixes
git-svn-id: http://svn.net-core.org/repos/t-engine4@4192 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Game.lua | 7 ++-
game/modules/tome/class/interface/Combat.lua | 2 +
.../tome/data/chats/player-inscription.lua | 2 +-
.../tome/data/talents/cunning/ambush.lua | 5 +-
.../tome/data/talents/cursed/fateful-aura.lua | 58 +++++++++----------
.../tome/data/talents/spells/explosives.lua | 4 +-
6 files changed, 43 insertions(+), 35 deletions(-)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 2e222efe57..15ae04c8e5 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -1076,9 +1076,14 @@ function _M:setupCommands()
if fs.exists(file) then grab_list(mod.class.Object:loadList(file)) end
end
+ local tbl = {}
for u, o in pairs(list) do
- print(o.type, o.subtype, o.name, unpack(table.keys(o.power_source or {})))
+ tbl[#tbl+1] = ("--\n%s (%s / %s): %s\n"):format(o.name, o.type, o.subtype, o.desc)
end
+ table.sort(tbl)
+ local f = io.open("list","w")
+ for i, l in ipairs(tbl) do f:write(l) end
+ f:close()
end end,
[{"_f","ctrl"}] = function() if config.settings.cheat then
game.player:learnTalent('T_MULTIPLY',true)
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index fdfd476f38..de726c5f9d 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -104,6 +104,8 @@ function _M:attackTarget(target, damtype, mult, noenergy)
if #types > 0 then
damtype = rng.table(types)
end
+ elseif not damtype and self:attr("force_melee_damage_type") then
+ damtype = self:attr("force_melee_damage_type")
end
local break_stealth = false
diff --git a/game/modules/tome/data/chats/player-inscription.lua b/game/modules/tome/data/chats/player-inscription.lua
index f271e5b5b8..769deb29b3 100644
--- a/game/modules/tome/data/chats/player-inscription.lua
+++ b/game/modules/tome/data/chats/player-inscription.lua
@@ -27,8 +27,8 @@ local answers = {}
for i = 1, player.max_inscriptions do
local name = player.inscriptions[i]
- local t = player:getTalentFromId("T_"..name)
if (not replace_same or replace_same.."_"..i == name) then
+ local t = player:getTalentFromId("T_"..name)
answers[#answers+1] = {t.name, action=function(npc, player)
player:setInscription(i, iname, idata, true, true, {obj=obj}, replace_same)
player:removeObject(inven, item)
diff --git a/game/modules/tome/data/talents/cunning/ambush.lua b/game/modules/tome/data/talents/cunning/ambush.lua
index f211d744e3..423ed9da86 100644
--- a/game/modules/tome/data/talents/cunning/ambush.lua
+++ b/game/modules/tome/data/talents/cunning/ambush.lua
@@ -100,7 +100,7 @@ newTalent{
name = "Ambuscade",
type = {"cunning/ambush", 3},
points = 5,
- cooldown = 10,
+ cooldown = 20,
stamina = 35,
mana = 35,
require = cuns_req_high3,
@@ -152,6 +152,7 @@ newTalent{
m.remove_from_party_on_death = true
m.resists = { [DamageType.LIGHT] = -100, [DamageType.DARKNESS] = 130, all=-30 }
m.inc_damage.all = ((100 + (m.inc_damage.all or 0)) * t.getDam(self, t)) - 100
+ m.force_melee_damage_type = DamageType.DARKNESS
game.zone:addEntity(game.level, m, "actor", x, y)
game.level.map:particleEmitter(x, y, 1, "shadow")
@@ -181,7 +182,7 @@ newTalent{
info = function(self, t)
return ([[You take full control of your own shadow for %d turns.
Your shadow possesses your talents and stats, has %d%% life and deals %d%% damage, -30%% all resistances, -100%% light resistance and 100%% darkness resistance.
- Your shadow is permanently stealthed (%d power)
+ Your shadow is permanently stealthed (%d power) and all melee damage it deals is converted to darkness damage.
If you release control early your shadow will dissipate.]]):
format(t.getDuration(self, t), t.getHealth(self, t) * 100, t.getDam(self, t) * 100, t.getStealthPower(self, t))
end,
diff --git a/game/modules/tome/data/talents/cursed/fateful-aura.lua b/game/modules/tome/data/talents/cursed/fateful-aura.lua
index ca7393e3c8..fd29093dcf 100644
--- a/game/modules/tome/data/talents/cursed/fateful-aura.lua
+++ b/game/modules/tome/data/talents/cursed/fateful-aura.lua
@@ -31,10 +31,10 @@ local function getEffect(list, item, who, level, effectName)
if (not effect.level or effect.level == level)
and (not effect.item_type or effect.item_type == item.type)
and (not effect.item_subtype or effect.item_subtype == item.subtype)
- and (not effect.subclass or effect.subclass == who.descriptor.subclass)
+ and (not effect.subclass or effect.subclass == (who.descriptor and who.descriptor.subclass or who.subtype))
and (not item.uses_special_on_hit or not item.combat or not item.combat.special_on_hit)then
if effectName and effect.name == effectName then return effect end
-
+
weightTotal = weightTotal + (effect.weighting or 1)
effects[#effects + 1] = effect
end
@@ -46,7 +46,7 @@ local function getEffect(list, item, who, level, effectName)
weightTotal = weightTotal + (effect.weighting or 1)
if weight <= weightTotal then return effect end
end
- print("* fateful-aura getEffect failed. count:", #list, "found:", #effects, "weightTotal:", weightTotal, "weight:", weight, "item:", item.name, "type:", item.type, "subtype:", item.subtype, "level:", level, "subclass:", who.descriptor.subclass)
+ print("* fateful-aura getEffect failed. count:", #list, "found:", #effects, "weightTotal:", weightTotal, "weight:", weight, "item:", item.name, "type:", item.type, "subtype:", item.subtype, "level:", level, "subclass:", (who.descriptor and who.descriptor.subclass or who.subtype))
return
end
@@ -59,7 +59,7 @@ local function addEffect(item, effect, who, power)
if effect.apply then
effect.apply(item, who, power)
end
-
+
if item.extra_description then
item.extra_description = item.extra_description..", #F53CBE#"..effect.name.."#LAST#"
else
@@ -85,7 +85,7 @@ newTalent{
if item.quest then return end
if not item:wornInven() then return end
if item.type == "ammo" or item.type == "gem" then return end
-
+
--[[ test to run all code
if not curses_detrimental then curses_detrimental = mod.class.Object:loadList("/data/general/objects/egos/curses-detrimental.lua") end
if not curses_weapon then curses_weapon = mod.class.Object:loadList("/data/general/objects/egos/curses-weapon.lua") end
@@ -108,24 +108,24 @@ newTalent{
if false then return nil end
end
-- end test]]
-
+
-- prevent re-cursion
item.cursed_touch = true
-- add a curse?
if not rng.percent(t.getCurseChance(self, t)) then return end
-
+
-- effect power
local power = 0.3 + (item.material_level or 3) * 0.1
-
+
local level
-
+
-- beneficial
local beneficialEffect
local tDarkGifts = self:getTalentFromId(self.T_DARK_GIFTS)
if tDarkGifts and self:getTalentLevelRaw(tDarkGifts) > 0 then
local tVengefulBlessings = self:getTalentFromId(self.T_VENGEFUL_BLESSINGS)
-
+
local list
if item.type == "weapon" and tVengefulBlessings and self:getTalentLevelRaw(tVengefulBlessings) > 0 and rng.percent(tVengefulBlessings.getChance(self, tVengefulBlessings)) then
if not curses_weapon then curses_weapon = mod.class.Object:loadList("/data/general/objects/egos/curses-weapon.lua") end
@@ -138,10 +138,10 @@ newTalent{
if rng.percent(tDarkGifts.getMajorChance(self, t)) then level = 2 else level = 1 end
power = power * (1 + tDarkGifts.getPowerPercent(self, tDarkGifts) / 100)
end
-
+
beneficialEffect = getEffect(list, item, self, level)
end
-
+
-- detrimental
local detrimentalEffect
local effectName
@@ -149,17 +149,17 @@ newTalent{
if beneficialEffect and beneficialEffect.detrimental then effectName = rng.table(beneficialEffect.detrimental) end -- select a recommended curse
if not curses_detrimental then curses_detrimental = mod.class.Object:loadList("/data/general/objects/egos/curses-detrimental.lua") end
detrimentalEffect = getEffect(curses_detrimental, item, self, level, effectName)
-
+
-- apply the curse
item.cursed = true
item.name = "cursed ".. item.name
item.encumber = item.encumber + 1
-
+
addEffect(item, detrimentalEffect, self, power)
if beneficialEffect then
addEffect(item, beneficialEffect, self, power)
end
-
+
end,
curseFloor = function(self, t, x, y)
local i = 1
@@ -256,7 +256,7 @@ newTalent{
game.logPlayer(self, "You cannot use %s without a cursed weapon in your inventory!", t.name)
return false
end
-
+
-- select the location
local range = self:getTalentRange(t)
local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
@@ -264,7 +264,7 @@ newTalent{
if not tx or not ty then return nil end
local _ _, x, y = self:canProject(tg, tx, ty)
if game.level.map(x, y, Map.ACTOR) or game.level.map:checkEntity(x, y, game.level.map.TERRAIN, "block_move") then return nil end
-
+
-- select the item
local d = self:showInventory("Which weapon will be your sentry?", inven,
function(o)
@@ -274,17 +274,17 @@ newTalent{
d.used_talent = true
d.selected_object = o
d.selected_item = item
-
+
return false
end
-
+
local co = coroutine.running()
d.unload = function(self) coroutine.resume(co, self.used_talent, self.selected_object, d.selected_item) end
local used_talent, o, item = coroutine.yield()
if not used_talent then return nil end
-
+
local result = self:removeObject(inven, item)
-
+
local NPC = require "mod.class.NPC"
local sentry = NPC.new {
type = "construct", subtype = "weapon",
@@ -295,17 +295,17 @@ newTalent{
body = { INVEN = 10, MAINHAND=1, QUIVER=1 },
rank = 2,
size_category = 1,
-
+
autolevel = "warrior",
ai = "summoned", ai_real = "dumb_talented_simple", ai_state = { talent_in=5, },
-
+
max_life = 50, life_rating = 3,
stats = { str=20, dex=20, mag=10, con=10 },
combat = { dam=1, atk=1, apr=1 },
combat_armor = 100, combat_def = 50,
combat_physspeed = 100 / t.getAttackSpeed(self, t),
infravision = 10,
-
+
resists = { all = 75, },
cut_immune = 1,
blind_immune = 1,
@@ -318,7 +318,7 @@ newTalent{
disarm_immune = 1,
never_move = 1,
no_drops = true, -- remove to drop the weapon
-
+
resolvers.talents{
[Talents.T_WEAPON_COMBAT]={base=1, every=5, max=10},
[Talents.T_WEAPONS_MASTERY]={base=1, every=5, max=10},
@@ -330,13 +330,13 @@ newTalent{
summoner_gain_exp=true,
summon_time = t.getDuration(self, t),
summon_quiet = true,
-
+
on_die = function(self, who)
game.logSeen(self, "#F53CBE#%s crumbles to dust.", self.name:capitalize())
end,
}
result = sentry:wearObject(o, true, false)
-
+
sentry:resolve()
sentry:resolve(nil, true)
sentry:forceLevelup(self.level)
@@ -352,9 +352,9 @@ newTalent{
sentry.remove_from_party_on_death = true
game.party:addMember(sentry, { control="no", type="summon", title="Summon"})
end
-
+
game:playSoundNear(self, "talents/spell_generic")
-
+
return true
end,
info = function(self, t)
diff --git a/game/modules/tome/data/talents/spells/explosives.lua b/game/modules/tome/data/talents/spells/explosives.lua
index 7dcb0bb565..9ec9a48308 100644
--- a/game/modules/tome/data/talents/spells/explosives.lua
+++ b/game/modules/tome/data/talents/spells/explosives.lua
@@ -86,7 +86,7 @@ newTalent{
-- Compare theorical AOE zone with actual zone and adjust damage accordingly
if self:knowTalent(self.T_EXPLOSION_EXPERT) then
- local theorical_nb = ({ 9, 25, 45, 77, 109, 145 })[tg.radius]
+ local theorical_nb = ({ 9, 25, 45, 77, 109, 145 })[tg.radius] or 145
local nb = 0
local grids = self:project(tg, x, y, function(tx, ty) end)
for px, ys in pairs(grids) do for py, _ in pairs(ys) do nb = nb + 1 end end
@@ -188,7 +188,7 @@ newTalent{
mode = "passive",
points = 5,
info = function(self, t)
- local theorical_nb = ({ 9, 25, 45, 77, 109, 145 })[1 + self:getTalentLevelRaw(self.T_EXPLOSION_EXPERT)]
+ local theorical_nb = ({ 9, 25, 45, 77, 109, 145 })[1 + self:getTalentLevelRaw(self.T_EXPLOSION_EXPERT)] or 145
local min = 1
local min = (math.log10(min) / (6 - self:getTalentLevelRaw(self.T_EXPLOSION_EXPERT)))
local max = theorical_nb
--
GitLab