From 4ed220db8fd09c695e8827871e3032f7b1678112 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 1 Jun 2011 19:44:31 +0000
Subject: [PATCH] The Trapped! quest can only happen in some places now
git-svn-id: http://svn.net-core.org/repos/t-engine4@3532 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../tome/data/general/encounters/maj-eyal.lua | 3 +-
.../tome/data/maps/wilderness/eyal.lua | 39 ++++++++-
tiled-maps/eyal2.tmx | 82 ++++++++++---------
3 files changed, 84 insertions(+), 40 deletions(-)
diff --git a/game/modules/tome/data/general/encounters/maj-eyal.lua b/game/modules/tome/data/general/encounters/maj-eyal.lua
index 4df36c2726..2ba8948c75 100644
--- a/game/modules/tome/data/general/encounters/maj-eyal.lua
+++ b/game/modules/tome/data/general/encounters/maj-eyal.lua
@@ -44,7 +44,8 @@ newEntity{
type = "hostile", subtype = "special", unique = true,
level_range = {10, 20},
rarity = 7,
- coords = {{ x=0, y=0, w=100, h=100}},
+ min_level = 6,
+ on_world_encounter = "merchant-quest",
on_encounter = function(self, who)
who:runStop()
engine.ui.Dialog:yesnoPopup("Encounter", "You find a hidden trap door, and hear cries for help from within...", function(ok)
diff --git a/game/modules/tome/data/maps/wilderness/eyal.lua b/game/modules/tome/data/maps/wilderness/eyal.lua
index 224682ee3a..a1d3f893ef 100644
--- a/game/modules/tome/data/maps/wilderness/eyal.lua
+++ b/game/modules/tome/data/maps/wilderness/eyal.lua
@@ -428,6 +428,36 @@ addSpot({12, 14}, "world-encounter", "brotherhood-alchemist")
addSpot({35, 28}, "world-encounter", "brotherhood-alchemist")
addSpot({64, 10}, "world-encounter", "brotherhood-alchemist")
addSpot({74, 32}, "world-encounter", "brotherhood-alchemist")
+addSpot({32, 21}, "world-encounter", "lost-merchant")
+addSpot({33, 21}, "world-encounter", "lost-merchant")
+addSpot({34, 21}, "world-encounter", "lost-merchant")
+addSpot({35, 21}, "world-encounter", "lost-merchant")
+addSpot({36, 21}, "world-encounter", "lost-merchant")
+addSpot({37, 21}, "world-encounter", "lost-merchant")
+addSpot({32, 22}, "world-encounter", "lost-merchant")
+addSpot({33, 22}, "world-encounter", "lost-merchant")
+addSpot({34, 22}, "world-encounter", "lost-merchant")
+addSpot({35, 22}, "world-encounter", "lost-merchant")
+addSpot({36, 22}, "world-encounter", "lost-merchant")
+addSpot({37, 22}, "world-encounter", "lost-merchant")
+addSpot({32, 23}, "world-encounter", "lost-merchant")
+addSpot({33, 23}, "world-encounter", "lost-merchant")
+addSpot({34, 23}, "world-encounter", "lost-merchant")
+addSpot({35, 23}, "world-encounter", "lost-merchant")
+addSpot({36, 23}, "world-encounter", "lost-merchant")
+addSpot({37, 23}, "world-encounter", "lost-merchant")
+addSpot({32, 24}, "world-encounter", "lost-merchant")
+addSpot({33, 24}, "world-encounter", "lost-merchant")
+addSpot({34, 24}, "world-encounter", "lost-merchant")
+addSpot({35, 24}, "world-encounter", "lost-merchant")
+addSpot({36, 24}, "world-encounter", "lost-merchant")
+addSpot({37, 24}, "world-encounter", "lost-merchant")
+addSpot({32, 25}, "world-encounter", "lost-merchant")
+addSpot({33, 25}, "world-encounter", "lost-merchant")
+addSpot({34, 25}, "world-encounter", "lost-merchant")
+addSpot({35, 25}, "world-encounter", "lost-merchant")
+addSpot({36, 25}, "world-encounter", "lost-merchant")
+addSpot({37, 25}, "world-encounter", "lost-merchant")
-- addZone section
addZone({5, 1, 82, 43}, "zonename", "Maj'Eyal")
@@ -441,7 +471,14 @@ addZone({64, 52, 66, 53}, "zonename", "Tar'Eyal")
addZone({11, 87, 16, 94}, "zonename", "Tar'Eyal")
addZone({40, 43, 66, 47}, "zonename", "Maj'Eyal")
addZone({57, 23, 62, 40}, "world-encounter", "lumberjack-cursed")
-addZone({18, 10, 31, 35}, "world-encounter", "merchant-quest")
+addZone({8, 14, 12, 22}, "world-encounter", "merchant-quest")
+addZone({2, 3, 14, 12}, "world-encounter", "merchant-quest")
+addZone({23, 1, 30, 9}, "world-encounter", "merchant-quest")
+addZone({37, 5, 50, 9}, "world-encounter", "merchant-quest")
+addZone({56, 8, 65, 13}, "world-encounter", "merchant-quest")
+addZone({65, 21, 72, 27}, "world-encounter", "merchant-quest")
+addZone({69, 3, 77, 17}, "world-encounter", "merchant-quest")
+addZone({30, 28, 35, 33}, "world-encounter", "merchant-quest")
-- ASCII map section
return {
diff --git a/tiled-maps/eyal2.tmx b/tiled-maps/eyal2.tmx
index 5c7cc2f6d6..764aefad2e 100644
--- a/tiled-maps/eyal2.tmx
+++ b/tiled-maps/eyal2.tmx
@@ -676,14 +676,56 @@
</properties>
</object>
</objectgroup>
- <objectgroup name="addZone#pops" width="170" height="100" visible="0">
+ <objectgroup name="addZone#pops" width="170" height="100">
<object name="Lumjberjack quest" x="1837" y="747" width="174" height="551">
<properties>
<property name="subtype" value=""lumberjack-cursed""/>
<property name="type" value=""world-encounter""/>
</properties>
</object>
- <object name="Trapped merchant quest" x="577" y="329" width="432" height="801">
+ <object name="Trapped merchant quest" x="267" y="459" width="138" height="271">
+ <properties>
+ <property name="subtype" value=""merchant-quest""/>
+ <property name="type" value=""world-encounter""/>
+ </properties>
+ </object>
+ <object name="Trapped merchant quest" x="77" y="101" width="382" height="305">
+ <properties>
+ <property name="subtype" value=""merchant-quest""/>
+ <property name="type" value=""world-encounter""/>
+ </properties>
+ </object>
+ <object name="Trapped merchant quest" x="747" y="41" width="240" height="263">
+ <properties>
+ <property name="subtype" value=""merchant-quest""/>
+ <property name="type" value=""world-encounter""/>
+ </properties>
+ </object>
+ <object name="Trapped merchant quest" x="1197" y="163" width="428" height="145">
+ <properties>
+ <property name="subtype" value=""merchant-quest""/>
+ <property name="type" value=""world-encounter""/>
+ </properties>
+ </object>
+ <object name="Trapped merchant quest" x="1803" y="259" width="298" height="185">
+ <properties>
+ <property name="subtype" value=""merchant-quest""/>
+ <property name="type" value=""world-encounter""/>
+ </properties>
+ </object>
+ <object name="Trapped merchant quest" x="2089" y="689" width="234" height="203">
+ <properties>
+ <property name="subtype" value=""merchant-quest""/>
+ <property name="type" value=""world-encounter""/>
+ </properties>
+ </object>
+ <object name="Trapped merchant quest" x="2221" y="103" width="266" height="465">
+ <properties>
+ <property name="subtype" value=""merchant-quest""/>
+ <property name="type" value=""world-encounter""/>
+ </properties>
+ </object>
+ <object name="Trapped merchant quest" x="973" y="909" width="172" height="167">
<properties>
<property name="subtype" value=""merchant-quest""/>
<property name="type" value=""world-encounter""/>
@@ -883,42 +925,6 @@
<property name="type" value=""world-encounter""/>
</properties>
</object>
- <object name="Lost merchant quest" x="264" y="103" width="270" height="222">
- <properties>
- <property name="subtype" value=""lost-merchant""/>
- <property name="type" value=""world-encounter""/>
- </properties>
- </object>
- <object name="Lost merchant quest" x="676" y="38" width="310" height="262">
- <properties>
- <property name="subtype" value=""lost-merchant""/>
- <property name="type" value=""world-encounter""/>
- </properties>
- </object>
- <object name="Lost merchant quest" x="1250" y="68" width="310" height="262">
- <properties>
- <property name="subtype" value=""lost-merchant""/>
- <property name="type" value=""world-encounter""/>
- </properties>
- </object>
- <object name="Lost merchant quest" x="1791" y="263" width="310" height="262">
- <properties>
- <property name="subtype" value=""lost-merchant""/>
- <property name="type" value=""world-encounter""/>
- </properties>
- </object>
- <object name="Lost merchant quest" x="2056" y="878" width="310" height="262">
- <properties>
- <property name="subtype" value=""lost-merchant""/>
- <property name="type" value=""world-encounter""/>
- </properties>
- </object>
- <object name="Lost merchant quest" x="887" y="910" width="258" height="194">
- <properties>
- <property name="subtype" value=""lost-merchant""/>
- <property name="type" value=""world-encounter""/>
- </properties>
- </object>
<object name="Lost merchant quest" x="1034" y="683" width="171" height="135">
<properties>
<property name="subtype" value=""lost-merchant""/>
--
GitLab