From 5f6cb5a11f869c0de79c898213088c6fb179d33b Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 2 Jun 2013 21:15:04 +0000
Subject: [PATCH] reorganize stuff into maj eyal object list
git-svn-id: http://svn.net-core.org/repos/t-engine4@6816 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/general/objects/objects-maj-eyal.lua | 5 ++++-
game/modules/tome/data/general/objects/objects.lua | 5 -----
game/modules/tome/data/zones/crypt-kryl-feijan/objects.lua | 2 +-
game/modules/tome/data/zones/flooded-cave/objects.lua | 2 +-
game/modules/tome/data/zones/keepsake-meadow/objects.lua | 2 +-
game/modules/tome/data/zones/paradox-plane/objects.lua | 2 +-
game/modules/tome/data/zones/temporal-rift/objects.lua | 2 +-
7 files changed, 9 insertions(+), 11 deletions(-)
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 d88d3b6967..01650b612b 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 85e095ef4a..0a1ffaa491 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 122395e061..4bf9e46e88 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 f405a9f7ee..448a4ecff0 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 91a1a80642..2c3c9a45ac 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 0d2e00a622..e4b0b61338 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 a88f38f624..93f9e7b7cb 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},
--
GitLab