diff --git a/game/modules/tome/data/general/objects/objects-maj-eyal.lua b/game/modules/tome/data/general/objects/objects-maj-eyal.lua index d88d3b6967223ba3d010ab918d65716758c64172..01650b612bb49489f9d39a5847d6c2ad885764c0 100644 --- a/game/modules/tome/data/general/objects/objects-maj-eyal.lua +++ b/game/modules/tome/data/general/objects/objects-maj-eyal.lua @@ -24,5 +24,8 @@ end loadIfNot("/data/general/objects/objects.lua") --- Special lore +-- Lore +loadIfNot("/data/general/objects/lore/spellhunt.lua") +loadIfNot("/data/general/objects/lore/fun.lua") +loadIfNot("/data/general/objects/lore/misc.lua") loadIfNot("/data/general/objects/lore/maj-eyal.lua") diff --git a/game/modules/tome/data/general/objects/objects.lua b/game/modules/tome/data/general/objects/objects.lua index 85e095ef4a152d8846e3a9f4bf92b643cb18f6a3..0a1ffaa491310dc91e0e2676203b2c7ec82f6fb0 100644 --- a/game/modules/tome/data/general/objects/objects.lua +++ b/game/modules/tome/data/general/objects/objects.lua @@ -81,11 +81,6 @@ loadIfNot("/data/general/objects/gauntlets.lua") loadIfNot("/data/general/objects/cloak.lua") loadIfNot("/data/general/objects/leather-belt.lua") --- Lore -loadIfNot("/data/general/objects/lore/spellhunt.lua") -loadIfNot("/data/general/objects/lore/fun.lua") -loadIfNot("/data/general/objects/lore/misc.lua") - -- Artifacts loadIfNot("/data/general/objects/world-artifacts.lua") loadIfNot("/data/general/objects/quest-artifacts.lua") diff --git a/game/modules/tome/data/zones/crypt-kryl-feijan/objects.lua b/game/modules/tome/data/zones/crypt-kryl-feijan/objects.lua index 122395e06138fde248f183a43754745a5728ef57..4bf9e46e884ce40c0280b70e8fcfe1b9603daf2e 100644 --- a/game/modules/tome/data/zones/crypt-kryl-feijan/objects.lua +++ b/game/modules/tome/data/zones/crypt-kryl-feijan/objects.lua @@ -17,7 +17,7 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/objects/objects.lua") +load("/data/general/objects/objects-maj-eyal.lua") local Stats = require "engine.interface.ActorStats" local Talents = require "engine.interface.ActorTalents" diff --git a/game/modules/tome/data/zones/flooded-cave/objects.lua b/game/modules/tome/data/zones/flooded-cave/objects.lua index f405a9f7eedbc07c9f962dcce9ee82787deb3dcb..448a4ecff019dcd3a61df0183d75a0fd8ff272de 100644 --- a/game/modules/tome/data/zones/flooded-cave/objects.lua +++ b/game/modules/tome/data/zones/flooded-cave/objects.lua @@ -22,4 +22,4 @@ local Stats = require "engine.interface.ActorStats" local DamageType = require "engine.DamageType" load("/data/general/objects/2htridents.lua", function(e) e.rarity = e.trident_rarity end) -load("/data/general/objects/objects.lua") +load("/data/general/objects/objects-far-east.lua") diff --git a/game/modules/tome/data/zones/keepsake-meadow/objects.lua b/game/modules/tome/data/zones/keepsake-meadow/objects.lua index 91a1a806423b92feff7773f46fa7d3b21e0eb65b..2c3c9a45acb02a133cd4d412c4dee87c805ff518 100644 --- a/game/modules/tome/data/zones/keepsake-meadow/objects.lua +++ b/game/modules/tome/data/zones/keepsake-meadow/objects.lua @@ -17,7 +17,7 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/objects/objects.lua") +load("/data/general/objects/objects-maj-eyal.lua") newEntity{ base = "BASE_LORE", define_as = "BANDERS_NOTES", diff --git a/game/modules/tome/data/zones/paradox-plane/objects.lua b/game/modules/tome/data/zones/paradox-plane/objects.lua index 0d2e00a6226fd2d9dbd086fb3bd3c9c8991d10b3..e4b0b61338b6bd1a9b82078153f58943681af4c9 100644 --- a/game/modules/tome/data/zones/paradox-plane/objects.lua +++ b/game/modules/tome/data/zones/paradox-plane/objects.lua @@ -17,7 +17,7 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/objects/objects.lua") +load("/data/general/objects/objects-maj-eyal.lua") local Stats = require "engine.interface.ActorStats" local Talents = require "engine.interface.ActorTalents" diff --git a/game/modules/tome/data/zones/temporal-rift/objects.lua b/game/modules/tome/data/zones/temporal-rift/objects.lua index a88f38f62456798b41d6dfe414270a81371218db..93f9e7b7cb588a536c9aa27e96aa25e6727f2292 100644 --- a/game/modules/tome/data/zones/temporal-rift/objects.lua +++ b/game/modules/tome/data/zones/temporal-rift/objects.lua @@ -17,7 +17,7 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/objects/objects.lua") +load("/data/general/objects/objects-maj-eyal.lua") newEntity{ base = "BASE_RUNE", define_as = "RUNE_RIFT", power_source = {arcane=true},