From 084599e0929f422c34a6f94a89e2aa2be50f995a Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 23 Feb 2012 00:33:27 +0000
Subject: [PATCH] Wearing the bindings of eternal night will prevent the use of
infusions and wild-gifts Bindings of eternal night now reduces light and fire
resists and grants blight and darkness resist Undead can no longer learn the
harmony tree
git-svn-id: http://svn.net-core.org/repos/t-engine4@4912 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Actor.lua | 11 +++++--
game/modules/tome/data/birth/races/undead.lua | 1 +
game/modules/tome/data/talents.lua | 1 +
.../modules/tome/data/talents/gifts/gifts.lua | 30 +++++++++----------
game/modules/tome/data/talents/misc/misc.lua | 2 +-
game/modules/tome/data/talents/misc/npcs.lua | 2 +-
.../zones/ancient-elven-ruins/objects.lua | 6 ++--
.../tome/data/zones/sandworm-lair/objects.lua | 4 +--
8 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index f2da6d4457..d2f51d38bb 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -416,12 +416,12 @@ function _M:act()
end
end
end
-
+
-- clear grappling
if self:hasEffect(self.EFF_GRAPPLING) and self.stamina < 1 and not self:hasEffect(self.EFF_ADRENALINE_SURGE) then
self:removeEffect(self.EFF_GRAPPLING)
end
-
+
-- disable spell sustains
if self:attr("spell_failure") then
for tid, _ in pairs(self.sustain_talents) do
@@ -2484,6 +2484,11 @@ function _M:preUseTalent(ab, silent, fake)
if not silent then game.logSeen(self, "The spell fizzles.") end
return false
end
+ -- Nature is forbidden to undead (just wild-gifts for now)
+ if ab.is_nature and self:attr("forbid_nature") and (ab.mode ~= "sustained" or not self:isTalentActive(ab.id)) then
+ if not silent then game.logSeen(self, "%s is too disconnected from Nature to use %s.", self.name:capitalize(), ab.name) end
+ return false
+ end
if ab.is_inscription and self.inscription_restrictions and not self.inscription_restrictions[ab.type[1]] then
if not silent then game.logSeen(self, "%s is unable to use this kind of inscription.", self.name:capitalize()) end
@@ -2931,7 +2936,7 @@ function _M:getTalentFullDescription(t, addlevel, config)
if t.no_energy and type(t.no_energy) == "boolean" and t.no_energy == true then uspeed = "instant" end
d:add({"color",0x6f,0xff,0x83}, "Usage Speed: ", {"color",0xFF,0xFF,0xFF}, uspeed, true)
end
- if t.is_spell then
+ if t.is_spell then
d:add({"color",0x6f,0xff,0x83}, "Is Spell: ", {"color",0xFF,0xFF,0xFF}, "true", true)
end
end
diff --git a/game/modules/tome/data/birth/races/undead.lua b/game/modules/tome/data/birth/races/undead.lua
index 7d3b9c7414..54dbfee2c9 100644
--- a/game/modules/tome/data/birth/races/undead.lua
+++ b/game/modules/tome/data/birth/races/undead.lua
@@ -60,6 +60,7 @@ newBirthDescriptor{
starting_level = 4, starting_level_force_down = true,
starting_quest = "start-undead",
undead = 1,
+ forbid_nature = 1,
inscription_restrictions = { ["inscriptions/runes"] = true, ["inscriptions/taints"] = true, },
resolvers.inscription("RUNE:_SHIELDING", {cooldown=14, dur=5, power=100}),
resolvers.inscription("RUNE:_PHASE_DOOR", {cooldown=7, range=10}),
diff --git a/game/modules/tome/data/talents.lua b/game/modules/tome/data/talents.lua
index 220fc3bf2c..c419bb1342 100644
--- a/game/modules/tome/data/talents.lua
+++ b/game/modules/tome/data/talents.lua
@@ -26,6 +26,7 @@ Talents.newTalent = function(self, t)
if engine.interface.ActorTalents.talents_types_def[t.type[1]].generic then t.generic = true end
if engine.interface.ActorTalents.talents_types_def[t.type[1]].no_silence then t.no_silence = true end
if engine.interface.ActorTalents.talents_types_def[t.type[1]].is_spell then t.is_spell = true end
+ if engine.interface.ActorTalents.talents_types_def[t.type[1]].is_nature then t.is_nature = true end
if engine.interface.ActorTalents.talents_types_def[t.type[1]].is_unarmed then t.is_unarmed = true end
if t.tactical then
diff --git a/game/modules/tome/data/talents/gifts/gifts.lua b/game/modules/tome/data/talents/gifts/gifts.lua
index ae7ef4a6f2..20a8ff2f02 100644
--- a/game/modules/tome/data/talents/gifts/gifts.lua
+++ b/game/modules/tome/data/talents/gifts/gifts.lua
@@ -18,21 +18,21 @@
-- darkgod@te4.org
-- Wild Gifts
-newTalentType{ allow_random=true, type="wild-gift/call", name = "call of the wild", generic = true, description = "Be at one with nature." }
-newTalentType{ allow_random=true, type="wild-gift/harmony", name = "harmony", generic = true, description = "Nature heals and cleans you." }
-newTalentType{ allow_random=true, type="wild-gift/antimagic", name = "antimagic", generic = true, description = "The way to combat magic, or even nullify it.\nUsing a magical device or a spell will put all antimagic talents on cooldown for a few turns." }
-newTalentType{ allow_random=true, type="wild-gift/summon-melee", name = "summoning (melee)", description = "The art of calling creatures to your aid." }
-newTalentType{ allow_random=true, type="wild-gift/summon-distance", name = "summoning (distance)", description = "The art of calling creatures to your aid." }
-newTalentType{ allow_random=true, type="wild-gift/summon-utility", name = "summoning (utility)", description = "The art of calling creatures to your aid." }
-newTalentType{ allow_random=true, type="wild-gift/summon-augmentation", name = "summoning (augmentation)", description = "The art of calling creatures to your aid." }
-newTalentType{ allow_random=true, type="wild-gift/summon-advanced", name = "summoning (advanced)", description = "The art of calling creatures to your aid." }
-newTalentType{ allow_random=true, type="wild-gift/slime", name = "slime aspect", generic = true, description = "Through dedicated consumption of slime mold juice, you have gained an affinity with slime molds." }
-newTalentType{ allow_random=true, type="wild-gift/sand-drake", name = "sand drake aspect", description = "Take on the defining aspects of a Sand Drake." }
-newTalentType{ allow_random=true, type="wild-gift/fire-drake", name = "fire drake aspect", description = "Take on the defining aspects of a Fire Drake." }
-newTalentType{ allow_random=true, type="wild-gift/cold-drake", name = "cold drake aspect", description = "Take on the defining aspects of a Cold Drake." }
-newTalentType{ allow_random=true, type="wild-gift/storm-drake", name = "storm drake aspect", description = "Take on the defining aspects of a Storm Drake." }
-newTalentType{ allow_random=true, type="wild-gift/earthen-power", name = "earthen power", description = "Dwarves have learned to imbue their shields with the power of stone itself." }
-newTalentType{ allow_random=true, type="wild-gift/earthen-vines", name = "earthen vines", description = "Control the stone itself and bring it alive in the form of dreadful vines." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/call", name = "call of the wild", generic = true, description = "Be at one with nature." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/harmony", name = "harmony", generic = true, description = "Nature heals and cleans you." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/antimagic", name = "antimagic", generic = true, description = "The way to combat magic, or even nullify it.\nUsing a magical device or a spell will put all antimagic talents on cooldown for a few turns." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/summon-melee", name = "summoning (melee)", description = "The art of calling creatures to your aid." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/summon-distance", name = "summoning (distance)", description = "The art of calling creatures to your aid." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/summon-utility", name = "summoning (utility)", description = "The art of calling creatures to your aid." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/summon-augmentation", name = "summoning (augmentation)", description = "The art of calling creatures to your aid." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/summon-advanced", name = "summoning (advanced)", description = "The art of calling creatures to your aid." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/slime", name = "slime aspect", generic = true, description = "Through dedicated consumption of slime mold juice, you have gained an affinity with slime molds." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/sand-drake", name = "sand drake aspect", description = "Take on the defining aspects of a Sand Drake." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/fire-drake", name = "fire drake aspect", description = "Take on the defining aspects of a Fire Drake." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/cold-drake", name = "cold drake aspect", description = "Take on the defining aspects of a Cold Drake." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/storm-drake", name = "storm drake aspect", description = "Take on the defining aspects of a Storm Drake." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/earthen-power", name = "earthen power", description = "Dwarves have learned to imbue their shields with the power of stone itself." }
+newTalentType{ allow_random=true, is_nature=true, type="wild-gift/earthen-vines", name = "earthen vines", description = "Control the stone itself and bring it alive in the form of dreadful vines." }
-- Generic requires for gifts based on talent level
gifts_req1 = {
diff --git a/game/modules/tome/data/talents/misc/misc.lua b/game/modules/tome/data/talents/misc/misc.lua
index 354f8c996d..0404e1bc63 100644
--- a/game/modules/tome/data/talents/misc/misc.lua
+++ b/game/modules/tome/data/talents/misc/misc.lua
@@ -20,7 +20,7 @@
-- race & classes
newTalentType{ type="base/class", name = "class", hide = true, description = "The basic talents defining a class." }
newTalentType{ type="base/race", name = "race", hide = true, description = "The various racial bonuses a character can have." }
-newTalentType{ type="inscriptions/infusions", name = "infusions", hide = true, description = "Infusions are not class abilities, you must find them or learn them from other people." }
+newTalentType{ is_nature = true, type="inscriptions/infusions", name = "infusions", hide = true, description = "Infusions are not class abilities, you must find them or learn them from other people." }
newTalentType{ is_spell=true, no_silence=true, type="inscriptions/runes", name = "runes", hide = true, description = "Runes are not class abilities, you must find them or learn them from other people." }
newTalentType{ is_spell=true, no_silence=true, type="inscriptions/taints", name = "taints", hide = true, description = "Taints are not class abilities, you must find them or learn them from other people." }
diff --git a/game/modules/tome/data/talents/misc/npcs.lua b/game/modules/tome/data/talents/misc/npcs.lua
index 9fb4b7367c..4c63d87440 100644
--- a/game/modules/tome/data/talents/misc/npcs.lua
+++ b/game/modules/tome/data/talents/misc/npcs.lua
@@ -24,7 +24,7 @@ newTalentType{ type="technique/other", name = "other", hide = true, description
newTalentType{ no_silence=true, is_spell=true, type="chronomancy/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
newTalentType{ no_silence=true, is_spell=true, type="spell/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
newTalentType{ no_silence=true, is_spell=true, type="corruption/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
-newTalentType{ type="wild-gift/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
+newTalentType{ is_nature=true, type="wild-gift/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
newTalentType{ type="other/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
newTalentType{ type="undead/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
diff --git a/game/modules/tome/data/zones/ancient-elven-ruins/objects.lua b/game/modules/tome/data/zones/ancient-elven-ruins/objects.lua
index 1998d32215..fb904edbf4 100644
--- a/game/modules/tome/data/zones/ancient-elven-ruins/objects.lua
+++ b/game/modules/tome/data/zones/ancient-elven-ruins/objects.lua
@@ -48,8 +48,9 @@ newEntity{ base = "BASE_MUMMY_WRAPPING", define_as = "BINDINGS_ETERNAL_NIGHT",
inc_stats = { [Stats.STAT_WIL] = 5, [Stats.STAT_MAG] = 5, },
resists = {
[DamageType.BLIGHT] = 30,
- [DamageType.LIGHT] = 30,
- [DamageType.FIRE] = 30,
+ [DamageType.DARKNESS] = 30,
+ [DamageType.LIGHT] = -30,
+ [DamageType.FIRE] = -30,
},
on_melee_hit={[DamageType.BLIGHT] = 10},
life_regen = 0.3,
@@ -57,6 +58,7 @@ newEntity{ base = "BASE_MUMMY_WRAPPING", define_as = "BINDINGS_ETERNAL_NIGHT",
poison_immune = 1,
disease_immune = 1,
undead = 1,
+ forbid_nature = 1,
},
max_power = 80, power_regen = 1,
diff --git a/game/modules/tome/data/zones/sandworm-lair/objects.lua b/game/modules/tome/data/zones/sandworm-lair/objects.lua
index 99d4529861..022792d2d8 100644
--- a/game/modules/tome/data/zones/sandworm-lair/objects.lua
+++ b/game/modules/tome/data/zones/sandworm-lair/objects.lua
@@ -49,9 +49,9 @@ newEntity{
if who:knowTalentType("wild-gift/harmony") then
who:setTalentTypeMastery("wild-gift/harmony", who:getTalentTypeMastery("wild-gift/harmony") + 0.1)
- elseif who:knowTalentType("wild-gift/harmony") == false then
+ elseif who:knowTalentType("wild-gift/harmony") == false and not who:attr("forbid_nature") then
who:learnTalentType("wild-gift/harmony", true)
- else
+ elseif not who:attr("forbid_nature") then
who:learnTalentType("wild-gift/harmony", false)
end
-- Make sure a previous amulet didnt bug it out
--
GitLab