From 9c2cec16023964444b4204f29c290fcccb708e96 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 31 Oct 2010 01:44:03 +0000
Subject: [PATCH] plop
git-svn-id: http://svn.net-core.org/repos/t-engine4@1715 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/Zone.lua | 3 ++-
.../tome/data/maps/wilderness/maj-eyal.lua | 18 ++++++++++++++++--
game/modules/tome/data/quests/antimagic.lua | 2 +-
game/modules/tome/data/quests/east-portal.lua | 2 +-
game/modules/tome/data/quests/high-peak.lua | 2 +-
.../tome/data/quests/lumberjack-cursed.lua | 2 +-
.../tome/data/quests/mage-apprentice.lua | 4 ++--
.../tome/data/quests/master-jeweler.lua | 2 +-
game/modules/tome/data/quests/orc-hunt.lua | 2 +-
game/modules/tome/data/quests/orc-pride.lua | 8 ++++----
.../tome/data/quests/pre-charred-scar.lua | 2 +-
.../tome/data/quests/spydric-infestation.lua | 2 +-
game/modules/tome/data/quests/west-portal.lua | 4 ++--
13 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/game/engines/default/engine/Zone.lua b/game/engines/default/engine/Zone.lua
index ff0763d6fd..3d629d7f29 100644
--- a/game/engines/default/engine/Zone.lua
+++ b/game/engines/default/engine/Zone.lua
@@ -22,7 +22,7 @@ local Savefile = require "engine.Savefile"
local Dialog = require "engine.ui.Dialog"
local Map = require "engine.Map"
local Astar = require "engine.Astar"
-local print = function() end
+--local print = function() end
--- Defines a zone: a set of levels, with depth, nps, objects, level generator, ...
module(..., package.seeall, class.make)
@@ -155,6 +155,7 @@ function _M:checkFilter(e, filter)
if not filter then return true end
if filter.ignore and self:checkFilter(e, filter.ignore) then return false end
+ print("Checking filter", filter.type, filter.subtype)
if filter.type and filter.type ~= e.type then return false end
if filter.subtype and filter.subtype ~= e.subtype then return false end
if filter.name and filter.name ~= e.name then return false end
diff --git a/game/modules/tome/data/maps/wilderness/maj-eyal.lua b/game/modules/tome/data/maps/wilderness/maj-eyal.lua
index 845da38f16..7d58f4b6d6 100644
--- a/game/modules/tome/data/maps/wilderness/maj-eyal.lua
+++ b/game/modules/tome/data/maps/wilderness/maj-eyal.lua
@@ -119,8 +119,22 @@ addSpot({8, 25}, "hostile", "random")
addSpot({9, 25}, "hostile", "random")
addSpot({8, 26}, "hostile", "random")
addSpot({9, 26}, "hostile", "random")
-addSpot({35, 29})
-addSpot({54, 14})
+addSpot({67, 16}, "zone-pop", "reknor")
+addSpot({155, 47}, "zone-pop", "eruan")
+addSpot({150, 55}, "zone-pop", "valley-moon-caverns")
+addSpot({147, 54}, "zone-pop", "gorbat-pride")
+addSpot({140, 51}, "zone-pop", "rak-shor-pride")
+addSpot({162, 28}, "zone-pop", "ardhungol")
+addSpot({59, 16}, "zone-pop", "lumberjack-town")
+addSpot({50, 23}, "zone-pop", "telmur")
+addSpot({168, 8}, "zone-pop", "vor-pride")
+addSpot({167, 8}, "zone-pop", "vor-armoury")
+addSpot({132, 10}, "zone-pop", "grushnak-pride")
+addSpot({165, 52}, "zone-pop", "briagh")
+addSpot({163, 31}, "zone-pop", "ruined-gates-of-morning")
+addSpot({50, 9}, "zone-pop", "antimagic")
+addSpot({10, 18}, "zone-pop", "angolwen")
+addSpot({12, 18}, "zone-pop", "angolwen-portal")
-- addZone section
addZone({0, 0, 73, 40}, "zonename", "Maj'Eyal")
diff --git a/game/modules/tome/data/quests/antimagic.lua b/game/modules/tome/data/quests/antimagic.lua
index d94c8ab03d..0d5d938188 100644
--- a/game/modules/tome/data/quests/antimagic.lua
+++ b/game/modules/tome/data/quests/antimagic.lua
@@ -36,7 +36,7 @@ on_grant = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.level
- local spot = level:pickSpot{type="quest-pop", "antimagic"}
+ local spot = level:pickSpot{type="zone-pop", subtype="antimagic"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
game.logPlayer(game.player, "He points in the direction of the thaloren forest near the Daikara.")
diff --git a/game/modules/tome/data/quests/east-portal.lua b/game/modules/tome/data/quests/east-portal.lua
index 13fb95c851..5c6b47bc05 100644
--- a/game/modules/tome/data/quests/east-portal.lua
+++ b/game/modules/tome/data/quests/east-portal.lua
@@ -134,7 +134,7 @@ open_orthanc = function(self, player)
}
g:resolve() g:resolve(nil, true)
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "telmur"}
+ local spot = level:pickSpot{type="zone-pop", subtype="telmur"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
game.logPlayer(game.player, "Tannen points the location of Telmur on your map.")
diff --git a/game/modules/tome/data/quests/high-peak.lua b/game/modules/tome/data/quests/high-peak.lua
index baea3265cd..9daf4fdb67 100644
--- a/game/modules/tome/data/quests/high-peak.lua
+++ b/game/modules/tome/data/quests/high-peak.lua
@@ -107,7 +107,7 @@ function failed_charred_scar(self, level)
game.logPlayer(game.player, "#LIGHT_RED#Fallen Sun Paladin Aeryn: '%s YOU BROUGHT ONLY DESTRUCTION TO THE SUNWALL! YOU WILL PAY!'", game.player.name:upper())
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "ruined-gates-of-morning"}
+ local spot = level:pickSpot{type="zone-pop", subtype="ruined-gates-of-morning"}
local wild = game.memory_levels["wilderness-1"].map(spot.x, spot.y, engine.Map.TERRAIN)
wild.name = "Ruins of the Gates of Morning"
wild.desc = "The sunwall was destroyed while you were trapped in the High Peak."
diff --git a/game/modules/tome/data/quests/lumberjack-cursed.lua b/game/modules/tome/data/quests/lumberjack-cursed.lua
index 371c0324ae..d26f2a9118 100644
--- a/game/modules/tome/data/quests/lumberjack-cursed.lua
+++ b/game/modules/tome/data/quests/lumberjack-cursed.lua
@@ -39,7 +39,7 @@ on_grant = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.level
- local spot = level:pickSpot{type="quest-pop", "lumberjack-town"}
+ local spot = level:pickSpot{type="zone-pop", subtype="lumberjack-town"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
game.logPlayer(game.player, "He points in the direction of the Riljek forest to the north.")
diff --git a/game/modules/tome/data/quests/mage-apprentice.lua b/game/modules/tome/data/quests/mage-apprentice.lua
index 9bd4d6d6f1..3942cae33f 100644
--- a/game/modules/tome/data/quests/mage-apprentice.lua
+++ b/game/modules/tome/data/quests/mage-apprentice.lua
@@ -122,9 +122,9 @@ access_angolwen = function(self, player)
g:resolve() g:resolve(nil, true)
p:resolve() p:resolve(nil, true)
local level = game.level
- local spot = level:pickSpot{type="quest-pop", "angolwen"}
+ local spot = level:pickSpot{type="zone-pop", subtype="angolwen"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
- spot = level:pickSpot{type="quest-pop", "angolwen-portal"}
+ spot = level:pickSpot{type="zone-pop", subtype="angolwen-portal"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
game:setAllowedBuild("mage", true)
diff --git a/game/modules/tome/data/quests/master-jeweler.lua b/game/modules/tome/data/quests/master-jeweler.lua
index 97890bce3c..d2185110fe 100644
--- a/game/modules/tome/data/quests/master-jeweler.lua
+++ b/game/modules/tome/data/quests/master-jeweler.lua
@@ -64,7 +64,7 @@ start_search = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "valley-moon-caverns"}
+ local spot = level:pickSpot{type="zone-pop", subtype="valley-moon-caverns"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
who:setQuestStatus(self.id, engine.Quest.COMPLETED, "search-valley")
diff --git a/game/modules/tome/data/quests/orc-hunt.lua b/game/modules/tome/data/quests/orc-hunt.lua
index d75c242c1b..53b75beb83 100644
--- a/game/modules/tome/data/quests/orc-hunt.lua
+++ b/game/modules/tome/data/quests/orc-hunt.lua
@@ -38,7 +38,7 @@ on_grant = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "reknor"}
+ local spot = level:pickSpot{type="zone-pop", subtype="reknor"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
game.logPlayer(game.player, "The elder points the mines on your map, to the north on the western side of the misty mountains.")
end
diff --git a/game/modules/tome/data/quests/orc-pride.lua b/game/modules/tome/data/quests/orc-pride.lua
index 6de037b44a..f8f125e016 100644
--- a/game/modules/tome/data/quests/orc-pride.lua
+++ b/game/modules/tome/data/quests/orc-pride.lua
@@ -69,7 +69,7 @@ on_grant = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "rak-shor-pride"}
+ local spot = level:pickSpot{type="zone-pop", subtype="rak-shor-pride"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
-- Reveal entrances
@@ -82,7 +82,7 @@ on_grant = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "vor-pride"}
+ local spot = level:pickSpot{type="zone-pop", subtype="vor-pride"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
-- Reveal entrances
@@ -95,7 +95,7 @@ on_grant = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "gorbat-pride"}
+ local spot = level:pickSpot{type="zone-pop", subtype="gorbat-pride"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
-- Reveal entrances
@@ -108,7 +108,7 @@ on_grant = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "grushnak-pride"}
+ local spot = level:pickSpot{type="zone-pop", subtype="grushnak-pride"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
game.logPlayer(game.player, "Aeryn points the known locations on your map.")
diff --git a/game/modules/tome/data/quests/pre-charred-scar.lua b/game/modules/tome/data/quests/pre-charred-scar.lua
index 5672481cef..c750f29409 100644
--- a/game/modules/tome/data/quests/pre-charred-scar.lua
+++ b/game/modules/tome/data/quests/pre-charred-scar.lua
@@ -40,7 +40,7 @@ on_grant = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "eruan"}
+ local spot = level:pickSpot{type="zone-pop", subtype="eruan"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
game.logPlayer(game.player, "Aeryn explained where the orcs were spotted.")
end
diff --git a/game/modules/tome/data/quests/spydric-infestation.lua b/game/modules/tome/data/quests/spydric-infestation.lua
index c32d6f44a1..be85cee9c8 100644
--- a/game/modules/tome/data/quests/spydric-infestation.lua
+++ b/game/modules/tome/data/quests/spydric-infestation.lua
@@ -40,7 +40,7 @@ on_grant = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "ardhungol"}
+ local spot = level:pickSpot{type="zone-pop", subtype="ardhungol"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
game.logPlayer(game.player, "High Sun Paladin Aeryn marks the location of Ardhungol on your map.")
end
diff --git a/game/modules/tome/data/quests/west-portal.lua b/game/modules/tome/data/quests/west-portal.lua
index 5352eeee0e..63d20b5793 100644
--- a/game/modules/tome/data/quests/west-portal.lua
+++ b/game/modules/tome/data/quests/west-portal.lua
@@ -52,7 +52,7 @@ on_grant = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "vor-armoury"}
+ local spot = level:pickSpot{type="zone-pop", subtype="vor-armoury"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
game.logPlayer(game.player, "Zemekkys points the location of Vor Armoury on your map.")
@@ -69,7 +69,7 @@ wyrm_lair = function(self, who)
}
g:resolve() g:resolve(nil, true)
local level = game.memory_levels["wilderness-1"]
- local spot = level:pickSpot{type="quest-pop", "briagh"}
+ local spot = level:pickSpot{type="zone-pop", subtype="briagh"}
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
game.logPlayer(game.player, "Zemekkys points the location of Briagh lair on your map.")
--
GitLab