From 4645b8178a42339afa64839e4c13308dcd0aeb80 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 28 Mar 2011 16:43:21 +0000
Subject: [PATCH] hophop
git-svn-id: http://svn.net-core.org/repos/t-engine4@3089 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../tome/data/general/encounters/maj-eyal.lua | 21 +++++++++++++++++++
.../tome/data/zones/ring-of-blood/npcs.lua | 9 ++++++++
2 files changed, 30 insertions(+)
diff --git a/game/modules/tome/data/general/encounters/maj-eyal.lua b/game/modules/tome/data/general/encounters/maj-eyal.lua
index c122c46517..e0a48ecb88 100644
--- a/game/modules/tome/data/general/encounters/maj-eyal.lua
+++ b/game/modules/tome/data/general/encounters/maj-eyal.lua
@@ -253,3 +253,24 @@ newEntity{
return true
end,
}
+
+newEntity{
+ name = "Ring of Blood",
+ type = "harmless", subtype = "special", unique = true,
+ immediate = {"world-encounter", "maj-eyal"},
+ on_encounter = function(self, who)
+ local x, y = self:findSpot(who)
+ if not x then return end
+
+ local g = mod.class.Grid.new{
+ show_tooltip=true,
+ name="Ring of Blood",
+ display='>', color=colors.CRIMSON,
+ notice = true,
+ change_level=1, change_zone="ring-of-blood"
+ }
+ g:resolve() g:resolve(nil, true)
+ game.zone:addEntity(game.level, g, "terrain", x, y)
+ return true
+ end,
+}
diff --git a/game/modules/tome/data/zones/ring-of-blood/npcs.lua b/game/modules/tome/data/zones/ring-of-blood/npcs.lua
index 7625aacd0b..1e70e37961 100644
--- a/game/modules/tome/data/zones/ring-of-blood/npcs.lua
+++ b/game/modules/tome/data/zones/ring-of-blood/npcs.lua
@@ -41,6 +41,7 @@ newEntity{ define_as = "RING_MASTER",
stats = { str=16, dex=12, cun=14, mag=25, con=16 },
instakill_immune = 1,
move_others=true,
+ psi_regen = 4,
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, PSIONIC_FOCUS = 1, QS_PSIONIC_FOCUS = 1 },
resolvers.equip{ {type="weapon", subtype="greatsword", auto_req=true}, {type="armor", subtype="light", autoreq=true}, },
@@ -50,9 +51,17 @@ newEntity{ define_as = "RING_MASTER",
{type="weapon", subtype="greatsword", autoreq=true},
},
resolvers.talents{
+ [Talents.T_UNITY]={base=7, every=4, max=10},
+ [Talents.T_QUICKENED]={base=3, every=2, max=6},
+ [Talents.T_WAYIST]={base=3, every=4, max=5},
+ [Talents.T_MINDHOOK]={base=3, every=7, max=5},
+ [Talents.T_TELEKINETIC_LEAP]={base=3, every=7, max=5},
[Talents.T_KINETIC_AURA]={base=3, every=7, max=5},
[Talents.T_CHARGED_AURA]={base=3, every=7, max=5},
[Talents.T_KINETIC_SHIELD]={base=3, every=7, max=5},
+ [Talents.T_KINETIC_LEECH]={base=5, every=7, max=7},
+ [Talents.T_TELEKINETIC_SMASH]={base=5, every=7, max=8},
+ [Talents.T_AUGMENTATION]={base=3, every=7, max=5},
[Talents.T_WEAPONS_MASTERY]={base=4, every=3, max=10},
[Talents.T_WEAPON_COMBAT]={base=4, every=3, max=10},
},
--
GitLab