From 14763c8b32442cb0c01501d270d838c35e5876e9 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Sat, 7 Dec 2013 22:45:27 +0100
Subject: [PATCH] fix lighted golems & typos
---
game/modules/tome/data/general/objects/egos/amulets.lua | 2 +-
.../tome/data/general/objects/egos/totems-powers.lua | 8 ++++----
.../tome/data/general/objects/egos/wands-powers.lua | 4 ++--
game/modules/tome/data/talents/spells/golemancy.lua | 5 +++++
game/modules/tome/data/talents/uber/mag.lua | 2 +-
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/game/modules/tome/data/general/objects/egos/amulets.lua b/game/modules/tome/data/general/objects/egos/amulets.lua
index c388c5cec8..8a174cd928 100644
--- a/game/modules/tome/data/general/objects/egos/amulets.lua
+++ b/game/modules/tome/data/general/objects/egos/amulets.lua
@@ -229,7 +229,7 @@ newEntity{
},
charm_power = resolvers.mbonus_material(70, 30),
charm_power_def = {add=15, max=50, floor=true},
- resolvers.charm("teleports your randomly (rad %d)", 15, function(self, who)
+ resolvers.charm("teleports you randomly (rad %d)", 15, function(self, who)
game.level.map:particleEmitter(who.x, who.y, 1, "teleport")
who:teleportRandom(who.x, who.y, self:getCharmPower(who))
game.level.map:particleEmitter(who.x, who.y, 1, "teleport")
diff --git a/game/modules/tome/data/general/objects/egos/totems-powers.lua b/game/modules/tome/data/general/objects/egos/totems-powers.lua
index 0f9c2146ad..cb8bb9c820 100644
--- a/game/modules/tome/data/general/objects/egos/totems-powers.lua
+++ b/game/modules/tome/data/general/objects/egos/totems-powers.lua
@@ -32,7 +32,7 @@ newEntity{
rarity = 8,
charm_power_def = {add=1, max=5, floor=true},
- resolvers.charm("removes up to %d diseases from the target", 20, function(self, who)
+ resolvers.charm("remove up to %d diseases from the target", 20, function(self, who)
local tg = {default_target=who, type="hit", nowarning=true, range=6 + who:getWil(4), first_target="friend"}
local x, y = who:getTarget(tg)
if not x or not y then return nil end
@@ -72,7 +72,7 @@ newEntity{
rarity = 8,
charm_power_def = {add=1, max=5, floor=true},
- resolvers.charm("removes up to %d poisons from the target", 20, function(self, who)
+ resolvers.charm("remove up to %d poisons from the target", 20, function(self, who)
local tg = {default_target=who, type="hit", nowarning=true, range=6 + who:getWil(4), first_target="friend"}
local x, y = who:getTarget(tg)
if not x or not y then return nil end
@@ -112,7 +112,7 @@ newEntity{
rarity = 6,
charm_power_def = {add=5, max=100, floor=true},
- resolvers.charm(function(self) return ("hardens the skin for 6 turns increasing armour by %d and armour hardiness by %d%%%%"):format(self:getCharmPower(who), 20 + self.material_level * 10) end, 20, function(self, who)
+ resolvers.charm(function(self) return ("harden the skin for 6 turns increasing armour by %d and armour hardiness by %d%%%%"):format(self:getCharmPower(who), 20 + self.material_level * 10) end, 20, function(self, who)
who:setEffect(who.EFF_THORNY_SKIN, 6, {ac=self:getCharmPower(who), hard=20 + self.material_level * 10})
game:playSoundNear(who, "talents/heal")
game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
@@ -127,7 +127,7 @@ newEntity{
rarity = 20,
charm_power_def = {add=50, max=250, floor=true},
- resolvers.charm("heals the target for %d", 35, function(self, who)
+ resolvers.charm("heal the target for %d", 35, function(self, who)
local tg = {default_target=who, type="hit", nowarning=true, range=6 + who:getWil(4), first_target="friend"}
local x, y = who:getTarget(tg)
if not x or not y then return nil end
diff --git a/game/modules/tome/data/general/objects/egos/wands-powers.lua b/game/modules/tome/data/general/objects/egos/wands-powers.lua
index 9f9498da90..49c93ec666 100644
--- a/game/modules/tome/data/general/objects/egos/wands-powers.lua
+++ b/game/modules/tome/data/general/objects/egos/wands-powers.lua
@@ -52,7 +52,7 @@ newEntity{
rarity = 8,
charm_power_def = {add=4, max=15, floor=true},
- resolvers.charm("light the area (rad %d)", 5, function(self, who)
+ resolvers.charm("light the area around you (rad %d)", 5, function(self, who)
who:project({type="ball", range=0, selffire=true, radius=self:getCharmPower(who)}, who.x, who.y, engine.DamageType.LITE, 1)
game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
return {id=true, used=true}
@@ -66,7 +66,7 @@ newEntity{
rarity = 14,
charm_power_def = {add=resolvers.genericlast(function(e) return e.material_level * 8 end), max=100, floor=true},
- resolvers.charm("try to disarm any known traps in a line (disarm power %d)", 15, function(self, who)
+ resolvers.charm("try to disarm traps in a line (disarm power %d)", 15, function(self, who)
local tg = {type="beam", range=2 + who:getMag(2)}
local x, y = who:getTarget(tg)
if not x or not y then return nil end
diff --git a/game/modules/tome/data/talents/spells/golemancy.lua b/game/modules/tome/data/talents/spells/golemancy.lua
index c42b027a20..5de0abe1c5 100644
--- a/game/modules/tome/data/talents/spells/golemancy.lua
+++ b/game/modules/tome/data/talents/spells/golemancy.lua
@@ -210,6 +210,11 @@ newTalent{
on_learn = function(self, t)
if self:getTalentLevelRaw(t) == 1 and not self.innate_alchemy_golem then
t.invoke_golem(self, t)
+ if self:knowTalent(self.T_BLIGHTED_SUMMONING) then
+ local golem = self.alchemy_golem
+ golem:learnTalentType("corruption/reaving-combat", true)
+ golem:learnTalent(golem.T_CORRUPTED_STRENGTH, true, 3)
+ end
end
end,
on_unlearn = function(self, t)
diff --git a/game/modules/tome/data/talents/uber/mag.lua b/game/modules/tome/data/talents/uber/mag.lua
index 19f54428c7..8caeb766c3 100644
--- a/game/modules/tome/data/talents/uber/mag.lua
+++ b/game/modules/tome/data/talents/uber/mag.lua
@@ -195,7 +195,7 @@ uberTalent{
- Jelly: Vimsense
- Minotaur: Life Tap
- Golem: Bone Spear
- - Alchemy Golems: Corrupted Strength and the Reaving Combat tree
+ - Alchemy Golems: Corrupted Strength (level 3) and the Reaving Combat tree
- Ritch: Drain
- Hydra: Blood Spray
- Rimebark: Poison Storm
--
GitLab