From 13e91fd1e86bee30f00961c54b075b449c4fc0f5 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 11 Sep 2011 21:37:19 +0000
Subject: [PATCH] Buffed the Void Star Fixed cursed items
git-svn-id: http://svn.net-core.org/repos/t-engine4@4370 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/interface/ActorInventory.lua | 2 ++
game/modules/tome/class/Object.lua | 2 +-
.../tome/data/general/objects/egos/curses-beneficial.lua | 6 +++---
.../modules/tome/data/talents/spells/advanced-golemancy.lua | 3 ++-
game/modules/tome/data/zones/abashed-expanse/objects.lua | 5 +++++
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/game/engines/default/engine/interface/ActorInventory.lua b/game/engines/default/engine/interface/ActorInventory.lua
index 8c60c39532..0cd774e26e 100644
--- a/game/engines/default/engine/interface/ActorInventory.lua
+++ b/game/engines/default/engine/interface/ActorInventory.lua
@@ -151,6 +151,8 @@ function _M:pickupFloor(i, vocal, no_sort)
elseif not prepickup then
if vocal then game.logSeen(self, "%s has no room for: %s.", self.name:capitalize(), o:getName{do_color=true}) end
return
+ elseif prepickup == "skip" then
+ return
else
return true
end
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index 7c7aeba7be..4132bd2490 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -1096,7 +1096,7 @@ end
--- Called when trying to pickup
function _M:on_prepickup(who, idx)
if self.quest and who ~= game.party:findMember{main=true} then
- return true
+ return "skip"
end
if who.player and self.lore then
game.level.map:removeObject(who.x, who.y, idx)
diff --git a/game/modules/tome/data/general/objects/egos/curses-beneficial.lua b/game/modules/tome/data/general/objects/egos/curses-beneficial.lua
index 7e27df806f..cee6e4a681 100644
--- a/game/modules/tome/data/general/objects/egos/curses-beneficial.lua
+++ b/game/modules/tome/data/general/objects/egos/curses-beneficial.lua
@@ -105,7 +105,7 @@ newEntity{
apply = function(item, who, power)
item.wielder = item.wielder or {}
item.wielder.resists = item.wielder.resists or {}
- item.wielder.resists[DamageType.DARKNESS] = (item.wielder.resists[DamageType.ARCANE] or 0) + math.ceil(25 * power)
+ item.wielder.resists[DamageType.ARCANE] = (item.wielder.resists[DamageType.ARCANE] or 0) + math.ceil(25 * power)
end,
}
newEntity{
@@ -135,14 +135,14 @@ newEntity{
name="gift of seeking", level = 2, weighting = 3,
apply = function(item, who, power)
item.wielder = item.wielder or {}
- item.wielder.combat_atk = (item.wielder.hate_regen or 0) + math.ceil(12 * power)
+ item.wielder.combat_atk = (item.wielder.combat_atk or 0) + math.ceil(12 * power)
end,
}
newEntity{
name="gift of rending", level = 2, weighting = 3,
apply = function(item, who, power)
item.wielder = item.wielder or {}
- item.wielder.combat_apr = (item.wielder.hate_regen or 0) + math.ceil(10 * power)
+ item.wielder.combat_apr = (item.wielder.combat_apr or 0) + math.ceil(10 * power)
end,
}
newEntity{
diff --git a/game/modules/tome/data/talents/spells/advanced-golemancy.lua b/game/modules/tome/data/talents/spells/advanced-golemancy.lua
index 345d3844f5..5c83a719a0 100644
--- a/game/modules/tome/data/talents/spells/advanced-golemancy.lua
+++ b/game/modules/tome/data/talents/spells/advanced-golemancy.lua
@@ -141,7 +141,8 @@ newTalent{
end,
info = function(self, t)
return ([[Increases your golem's life, mana and stamina regeneration rates by %0.2f.
- At level 1, 3 and 5 the golem also gains a new rune slot.]]):
+ At level 1, 3 and 5 the golem also gains a new rune slot.
+ Even without this talent, Golems start with three rune slots]]):
format(self:getTalentLevelRaw(t))
end,
}
diff --git a/game/modules/tome/data/zones/abashed-expanse/objects.lua b/game/modules/tome/data/zones/abashed-expanse/objects.lua
index 1e44633a89..ba6a58753b 100644
--- a/game/modules/tome/data/zones/abashed-expanse/objects.lua
+++ b/game/modules/tome/data/zones/abashed-expanse/objects.lua
@@ -19,6 +19,8 @@
load("/data/general/objects/objects-maj-eyal.lua")
+local Talents = require "engine.interface.ActorTalents"
+
newEntity{ base = "BASE_LITE", define_as = "VOID_STAR",
power_source = {arcane=true},
unique = true,
@@ -43,4 +45,7 @@ newEntity{ base = "BASE_LITE", define_as = "VOID_STAR",
},
lite = 2,
},
+
+ max_power = 70, power_regen = 1,
+ use_talent = { id = Talents.T_ECHOES_FROM_THE_VOID, level = 2, power = 70 },
}
--
GitLab