diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 0305c4fc6ca5689c7a14dfd1157832ee84716edf..6756c19ce197e10cc99949b9480452a7fbe09fa5 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -3196,7 +3196,7 @@ end
--- Paradox checks
function _M:getModifiedParadox()
local will_modifier = 1 + (self:getTalentLevel(self.T_PARADOX_MASTERY)/10) or 0
- local modified_paradox = math.max(0, self:getParadox() - (self:getWil() * will_modifier))
+ local modified_paradox = math.max(0, self:getParadox() - ((self:getWil() + (self:attr("paradox_reduce_fails") or 0)) * will_modifier))
return modified_paradox
end
diff --git a/game/modules/tome/class/NPC.lua b/game/modules/tome/class/NPC.lua
index caebde0940f0dcac0d2691b78fb9f603cd0b4b13..5939a76d2fef93aa8f88c8ba91d6976749562906 100644
--- a/game/modules/tome/class/NPC.lua
+++ b/game/modules/tome/class/NPC.lua
@@ -304,7 +304,7 @@ function _M:die(src, death_note)
return
end
- if self.rank >= 4 and game.state:allowRodRecall() then
+ if self.rank >= 4 and game.state:allowRodRecall() and not self:attr("no_rod_recall") then
local rod = game.zone:makeEntityByName(game.level, "object", "ROD_OF_RECALL")
if rod then
game.zone:addEntity(game.level, rod, "object", self.x, self.y)
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index 8aaa3c56c1145889457c5e36331be56b6251c5fb..c3e41ed31bfb839823f7b82057bd848ce679a9b9 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -996,6 +996,8 @@ function _M:getTextualDesc(compare_with)
compare_fields(w, compare_with, field, "slow_projectiles", "%+d%%", "Slows Projectiles: ")
+ compare_fields(w, compare_with, field, "paradox_reduce_fails", "%+d", "Reduces paradox failures(equivalent to willpower): ")
+
if w.undead then
desc:add("The wearer is treated as an undead.", true)
end
diff --git a/game/modules/tome/data/factions.lua b/game/modules/tome/data/factions.lua
index c22dd4af52abe016842209b1bc1a208a2ee7a7d1..14fb279e0ec3295152c4ff5e6455e262b658258c 100644
--- a/game/modules/tome/data/factions.lua
+++ b/game/modules/tome/data/factions.lua
@@ -94,3 +94,4 @@ engine.Faction:add{ shortname="merchant-caravan", name="Merchant Caravan", react
engine.Faction:add{ name="Point Zero Onslaught", reaction={}, }
engine.Faction:add{ name="Point Zero Guardians", reaction={}, }
engine.Faction:setInitialReaction("point-zero-onslaught", "point-zero-guardians", -100, true)
+engine.Faction:setInitialReaction("enemies", "point-zero-guardians", -100, true)
diff --git a/game/modules/tome/data/maps/towns/point-zero.lua b/game/modules/tome/data/maps/towns/point-zero.lua
index 0c6a8975d1cf1de66db2891c7985bd5436f2ce03..a18648ebd9d898c637ab7babb18ff4e1a5de8474 100644
--- a/game/modules/tome/data/maps/towns/point-zero.lua
+++ b/game/modules/tome/data/maps/towns/point-zero.lua
@@ -121,6 +121,9 @@ addSpot({0, 41}, "pop", "foes")
addSpot({0, 42}, "pop", "foes")
addSpot({0, 43}, "pop", "foes")
addSpot({0, 44}, "pop", "foes")
+addSpot({24, 32}, "pop", "player-attack")
+addSpot({25, 32}, "pop", "player-attack")
+addSpot({26, 36}, "pop", "defiler")
-- addZone section
addZone({23, 25, 23, 28}, "particle", "house_flamebeam")
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index 429a95a4a8c140a64eb8fcf521e0d9959e5785aa..d673f66f7e90ebcbf465d9d2d3b1f7029c5125ca 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -2179,3 +2179,21 @@ newEffect{
game.level.map:updateMap(self.x, self.y)
end,
}
+
+newEffect{
+ name = "KEEPER_OF_REALITY", image = "effects/continuum_destabilization.png",
+ desc = "Keepers of Reality Rally Call",
+ long_desc = function(self, eff) return "The keepers of reality have called upon all to defend Point Zero. Life increased by 5000, damage by 300%." end,
+ type = "magical",
+ subtype = { temporal=true },
+ status = "beneficial",
+ cancel_on_level_change = true,
+ parameters = { },
+ activate = function(self, eff)
+ self:effectTemporaryValue(eff, "max_life", 5000)
+ self:heal(5000)
+ self:effectTemporaryValue(eff, "inc_damage", {all=300})
+ end,
+ deactivate = function(self, eff)
+ end,
+}
diff --git a/game/modules/tome/data/zones/town-point-zero/npcs.lua b/game/modules/tome/data/zones/town-point-zero/npcs.lua
index e77d1116e03e22f7927a95ff4a7ea5280bb04a8c..de5998ac8b80503242498ff381e69defccb3201e 100644
--- a/game/modules/tome/data/zones/town-point-zero/npcs.lua
+++ b/game/modules/tome/data/zones/town-point-zero/npcs.lua
@@ -47,51 +47,6 @@ newEntity{
stats = { str=12, dex=8, mag=6, con=10 },
}
-newEntity{ base = "BASE_NPC_POINT_ZERO_TOWN",
- name = "POINT_ZERO guard", color=colors.LIGHT_UMBER,
- desc = [[A stern-looking guard, he will not let you disturb the town.]],
- level_range = {1, nil}, exp_worth = 1,
- rarity = 3,
- max_life = resolvers.rngavg(70,80),
- resolvers.equip{
- {type="weapon", subtype="longsword", autoreq=true},
- {type="armor", subtype="shield", autoreq=true},
- },
- combat_armor = 2, combat_def = 0,
- resolvers.talents{ [Talents.T_RUSH]=1, [Talents.T_PERFECT_STRIKE]=1, },
-}
-
-newEntity{ base = "BASE_NPC_POINT_ZERO_TOWN",
- name = "halfling slinger", color=colors.UMBER,
- subtype = "halfling",
- desc = [[A Halfling, with a sling. Beware.]],
- level_range = {1, nil}, exp_worth = 1,
- rarity = 3,
- max_life = resolvers.rngavg(50,60),
- resolvers.talents{ [Talents.T_SHOOT]=1, },
- ai_state = { talent_in=2, },
- autolevel = "slinger",
- resolvers.equip{ {type="weapon", subtype="sling", autoreq=true}, {type="ammo", subtype="shot", autoreq=true} },
-}
-
-newEntity{ base = "BASE_NPC_POINT_ZERO_TOWN",
- name = "human farmer", color=colors.WHITE,
- desc = [[A weather-worn Human farmer.]],
- level_range = {1, nil}, exp_worth = 1,
- rarity = 1,
- max_life = resolvers.rngavg(30,40),
- combat_armor = 2, combat_def = 0,
-}
-
-newEntity{ base = "BASE_NPC_POINT_ZERO_TOWN",
- name = "halfling gardener", color=colors.WHITE,
- subtype = "halfling",
- desc = [[A Halfling, he seems to be looking for plants.]],
- level_range = {1, nil}, exp_worth = 1,
- rarity = 1,
- max_life = resolvers.rngavg(30,40),
-}
-
newEntity{ base = "BASE_NPC_POINT_ZERO_TOWN", define_as = "DEFENDER_OF_REALITY",
name = "guardian of reality", color=colors.YELLOW,
image = resolvers.rngtable{"npc/humanoid_elf_star_crusader.png", "npc/humanoid_elf_anorithil.png"},
@@ -241,3 +196,48 @@ newEntity{ base = "BASE_NPC_POINT_ZERO_TOWN", define_as = "ZEMEKKYS",
},
resolvers.sustains_at_birth(),
}
+
+newEntity{ define_as = "TEMPORAL_DEFILER",
+ type = "horror", subtype = "temporal", unique = true,
+ name = "Temporal Defiler",
+ display = "h", color=colors.VIOLET,
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/horror_temporal_temporal_defiler.png", display_h=2, display_y=-1}}},
+ desc = [[A huge slender metallic monstrosity with long claws in place of fingers, and razor-sharp teeth., it seems to seek something here.]],
+ level_range = {50, nil}, exp_worth = 0.1,
+ max_life = 1500, life_rating = 35, fixed_rating = true,
+ stats = { str=20, dex=10, cun=8, mag=10, con=20 },
+ rank = 4,
+ size_category = 4,
+ infravision = 10,
+ instakill_immune = 1,
+ move_others=true,
+
+ global_speed_base = 1.2,
+ autolevel = "rogue",
+ ai = "dumb_talented_simple", ai_state = { ai_move="move_complex", talent_in=2, },
+ combat_armor = 10, combat_def = 10,
+ combat = { dam=resolvers.levelup(resolvers.rngavg(25,100), 1, 1.2), atk=resolvers.rngavg(25,100), apr=25, dammod={dex=1.1} },
+
+ body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
+ resolvers.drops{chance=100, nb=1, {defined="TIME_SHARD"} },
+ resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
+
+ inc_damage = {all = -30},
+
+ resolvers.talents{
+ [Talents.T_PERFECT_AIM]={base=3, every=7, max=5},
+ [Talents.T_SPIN_FATE]={base=5, every=7, max=8},
+ [Talents.T_STEALTH]={base=3, every=7, max=5},
+ [Talents.T_SHADOWSTRIKE]={base=3, every=7, max=5},
+ [Talents.T_UNSEEN_ACTIONS]={base=3, every=7, max=5},
+ },
+
+ resolvers.inscriptions(1, "rune"),
+ resolvers.inscriptions(1, "infusion"),
+
+ resolvers.sustains_at_birth(),
+
+ on_die = function(self, who)
+ game.player:resolveSource():setQuestStatus("start-point-zero", engine.Quest.COMPLETED, "saved")
+ end,
+}
diff --git a/game/modules/tome/data/zones/town-point-zero/objects.lua b/game/modules/tome/data/zones/town-point-zero/objects.lua
index 3510600acde19d32a787286f1a680259583fc781..f407a12a321b0ee4720208f945a4cc8a1d7e6226 100644
--- a/game/modules/tome/data/zones/town-point-zero/objects.lua
+++ b/game/modules/tome/data/zones/town-point-zero/objects.lua
@@ -18,3 +18,26 @@
-- darkgod@te4.org
load("/data/general/objects/objects-maj-eyal.lua")
+
+local Stats = require "engine.interface.ActorStats"
+local Talents = require "engine.interface.ActorTalents"
+
+newEntity{ base = "BASE_TOOL_MISC",
+ power_source = {arcane=true},
+ define_as = "TIME_SHARD",
+ unique = true,
+ name = "Shard of Crystalized Time", color = colors.YELLOW,
+ unided_name = "glowing shard", image = "object/artifact/time_shard.png",
+ desc = [[]],
+ level_range = {5, 12},
+ rarity = false,
+ cost = 10,
+ material_level = 1,
+ metallic = false,
+ wielder = {
+ inc_stats = { [Stats.STAT_WIL] = 4, [Stats.STAT_CON] = 2, },
+ combat_def = 5,
+ inc_damage = { [DamageType.TEMPORAL] = 7 },
+ paradox_reduce_fails = 25,
+ },
+}
diff --git a/game/modules/tome/data/zones/town-point-zero/zone.lua b/game/modules/tome/data/zones/town-point-zero/zone.lua
index 67e9b914143d4988fd600e3b672fbe7eaaf98e3e..4a44c8ce7bca7b0ca6ac62f0fcb1bad2c30dbf28 100644
--- a/game/modules/tome/data/zones/town-point-zero/zone.lua
+++ b/game/modules/tome/data/zones/town-point-zero/zone.lua
@@ -93,6 +93,7 @@ return {
local g = game.level.map(z.x1, z.y1, engine.Map.TERRAIN):cloneFull()
g.name = "temporal beam endpoint"
g:removeAllMOs()
+ g.nice_tiler = nil
g.exit = {x=z.x2, y=z.y2}
g.block_move = function(self, x, y, who, act)
if not act or not who or not who.player then return false end
@@ -111,6 +112,7 @@ return {
local g = game.level.map(z.x2, z.y2, engine.Map.TERRAIN):cloneFull()
g.name = "temporal beam endpoint"
g:removeAllMOs()
+ g.nice_tiler = nil
g.exit = {x=z.x1, y=z.y1}
g.block_move = function(self, x, y, who, act)
if not act or not who or not who.player then return false end
diff --git a/game/modules/tome/data/zones/unhallowed-morass/grids.lua b/game/modules/tome/data/zones/unhallowed-morass/grids.lua
index f93eb12344f6d1a169e37afd7a7963204819aad5..6ae1a83cf262e5a7a8554b41dd21ac06c9e721d6 100644
--- a/game/modules/tome/data/zones/unhallowed-morass/grids.lua
+++ b/game/modules/tome/data/zones/unhallowed-morass/grids.lua
@@ -41,6 +41,26 @@ newEntity{
desc = [[The rift leads to an other part of the morass.]],
change_level = 1,
change_zone = "town-point-zero",
+ change_level_check = function()
+ game:onLevelLoad("town-point-zero-1", function(zone, level)
+ game:onTickEnd(function()
+ local npc = game.zone:makeEntityByName(level, "actor", "TEMPORAL_DEFILER")
+ local spot = level:pickSpot{type="pop", subtype="defiler"}
+ game.zone:addEntity(level, npc, "actor", spot.x, spot.y)
+ npc:setTarget(game.player)
+
+ local spot = level:pickSpot{type="pop", subtype="player-attack"}
+ game.player:move(spot.x, spot.y, true)
+ require("engine.ui.Dialog"):simpleLongPopup("Point Zero", "The rift has brought you back to Point Zero, and the source of the disturbances.\nA temporal defiler is attacking the town, all the Keepers in range are atatcking it!", 400)
+
+ for uid, e in pairs(game.level.entities) do
+ if e.faction == "keepers-of-reality" or e.faction == "point-zero-guardians" then
+ e:setEffect(e.EFF_KEEPER_OF_REALITY, 20, {})
+ end
+ end
+ end)
+ end)
+ end,
}
local rift_editer = { method="sandWalls_def", def="rift"}
diff --git a/game/modules/tome/data/zones/unhallowed-morass/npcs.lua b/game/modules/tome/data/zones/unhallowed-morass/npcs.lua
index 1d775c16fd66ec6dd93f5af792cb0c6a9208fa78..0d167c6f3601dee13ba8bae556489ed80c03cb3d 100644
--- a/game/modules/tome/data/zones/unhallowed-morass/npcs.lua
+++ b/game/modules/tome/data/zones/unhallowed-morass/npcs.lua
@@ -99,8 +99,8 @@ newEntity{ base = "BASE_NPC_SPIDER",
},
}
-newEntity{ base = "BASE_NPC_SPIDER",
- name = "weaver queen", color=colors.WHITE,
+newEntity{ base = "BASE_NPC_SPIDER", define_as = "WEAVER_QUEEN",
+ name = "Weaver Queen", color=colors.WHITE,
resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/spiderkin_spider_weaver_queen.png", display_h=2, display_y=-1}}},
desc = [[A large white spider.]],
level_range = {7, nil}, exp_worth = 1,
@@ -111,13 +111,12 @@ newEntity{ base = "BASE_NPC_SPIDER",
tier1 = true,
size_category = 4,
instakill_immune = 1,
+ no_rod_recall = 1,
combat_armor = 3, combat_def = 4,
combat = { dam=resolvers.levelup(8, 1, 0.9), atk=15, apr=3, damtype=DamageType.CLOCK, },
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
- resolvers.drops{chance=100, nb=1, {defined="TIMESHARD"} },
- resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
talent_cd_reduction = {[Talents.T_RETHREAD]=-10},
@@ -136,51 +135,8 @@ newEntity{ base = "BASE_NPC_SPIDER",
on_die = function(self, who)
game.player:resolveSource():setQuestStatus("start-point-zero", engine.Quest.COMPLETED, "morass")
- require("engine.ui.Dialog"):simplePopup("As you vanquish the queen you notice a temporal thread that seems to have been controlling her. It seems to go through a rift.")
+ require("engine.ui.Dialog"):simplePopup("Weaver Queen", "As you vanquish the queen you notice a temporal thread that seems to have been controlling her. It seems to go through a rift.")
local rift = game.zone:makeEntityByName(game.level, "terrain", "RIFT_HOME")
game.zone:addEntity(game.level, rift, "terrain", self.x, self.y)
end,
}
-
---[=[
-newEntity{ base="BASE_NPC_LOSGOROTH", define_as = "SPACIAL_DISTURBANCE",
- unique = true,
- name = "Spacial Disturbance",
- color=colors.VIOLET,
- resolvers.nice_tile{image="invis.png"},
- resolvers.generic(function(e) if engine.Map.tiles.nicer_tiles then e:addParticles(engine.Particles.new("wormhole", 1, {image="shockbolt/npc/elemental_losgoroth_space_disturbance", speed=1})) end end),
- desc = [[A hole in the fabric of space, it seems to be the source of the expanse unstability.]],
- killer_message = "and folded out of existence",
- level_range = {7, nil}, exp_worth = 2,
- max_life = 150, life_rating = 10, fixed_rating = true,
- mana_regen = 7,
- stats = { str=10, dex=10, cun=12, mag=20, con=10 },
- rank = 4,
- tier1 = true,
- size_category = 4,
- infravision = 10,
- instakill_immune = 1,
- can_pass = {pass_void=0},
-
- body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
- resolvers.drops{chance=100, nb=1, {defined="VOID_STAR"} },
- resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
-
- resolvers.talents{
- [Talents.T_VOID_BLAST]={base=1, every=7, max=7},
- [Talents.T_MANATHRUST]={base=1, every=7, max=7},
- [Talents.T_PHASE_DOOR]=2,
- },
- resolvers.inscriptions(1, {"manasurge rune"}),
-
- autolevel = "caster",
- ai = "tactical", ai_state = { talent_in=1, ai_move="move_astar", },
- ai_tactic = resolvers.tactic"ranged",
-
- on_die = function(self, who)
- local q = game.player:hasQuest("start-archmage")
- if q then q:stabilized() end
- game.player:resolveSource():setQuestStatus("start-archmage", engine.Quest.COMPLETED, "abashed")
- end,
-}
-]=]
diff --git a/game/modules/tome/data/zones/unhallowed-morass/zone.lua b/game/modules/tome/data/zones/unhallowed-morass/zone.lua
index 1d2fd1036076799295177b81e7e19da19a1acd15..4386f3fdf9c88aea1c1255e034d22edcb41c5222 100644
--- a/game/modules/tome/data/zones/unhallowed-morass/zone.lua
+++ b/game/modules/tome/data/zones/unhallowed-morass/zone.lua
@@ -24,7 +24,7 @@ return {
max_level = 3,
decay = {300, 800},
actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
- width = 60, height = 60,
+ width = 50, height = 50,
all_remembered = true,
all_lited = true,
tier1 = true,
@@ -38,7 +38,7 @@ return {
map = {
class = "engine.generator.map.Cavern",
zoom = 25,
- min_floor = 1100,
+ min_floor = 900,
floor = "VOID",
wall = "SPACETIME_RIFT",
up = "VOID",
diff --git a/tiled-maps/point-zero.tmx b/tiled-maps/point-zero.tmx
index 273c1941bf4ea0d67ce11c230ed263588a6aa1bf..af7e1268b73762967fe348fc49cdaebac4083281 100644
--- a/tiled-maps/point-zero.tmx
+++ b/tiled-maps/point-zero.tmx
@@ -366,6 +366,18 @@
<property name="type" value=""pop""/>
</properties>
</object>
+ <object name="Player pop quest" x="792" y="1029" width="22" height="20">
+ <properties>
+ <property name="subtype" value=""player-attack""/>
+ <property name="type" value=""pop""/>
+ </properties>
+ </object>
+ <object name="Defiler pop quest" x="837" y="1159" width="22" height="20">
+ <properties>
+ <property name="subtype" value=""defiler""/>
+ <property name="type" value=""pop""/>
+ </properties>
+ </object>
</objectgroup>
<objectgroup color="#ff00ff" name="addZone#particles" width="50" height="50">
<object name="Highways" x="743" y="814" width="19" height="97">