From c440eb273ff4dfeaccf62949629d8a4a606e72bf Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Fri, 21 Jun 2013 22:43:54 +0200 Subject: Run 'make maps' for map changes and additions in and around Tulimshar. Updated submodule pointer. --- world/map/npc/002-3/_import.txt | 9 +++------ world/map/npc/002-3/_mobs.txt | 31 +------------------------------ world/map/npc/002-3/_warps.txt | 6 ++++-- 3 files changed, 8 insertions(+), 38 deletions(-) (limited to 'world/map/npc/002-3') diff --git a/world/map/npc/002-3/_import.txt b/world/map/npc/002-3/_import.txt index 2f37b959..83f6f548 100644 --- a/world/map/npc/002-3/_import.txt +++ b/world/map/npc/002-3/_import.txt @@ -1,11 +1,8 @@ -// Map 002-3: Desert Mines +// Map 002-3: Tulimshar Mining Camp // This file is generated automatically. All manually changes will be removed when running the Converter. map: 002-3.gat npc: npc/002-3/_mobs.txt npc: npc/002-3/_warps.txt -npc: npc/002-3/mine_triggerone.txt -npc: npc/002-3/mine_triggerthree.txt -npc: npc/002-3/mine_triggertwo.txt -npc: npc/002-3/naem.txt +npc: npc/002-3/merchant.txt +npc: npc/002-3/mining_camp_barrier.txt npc: npc/002-3/nathan.txt -npc: npc/002-3/underground_palace_barrier.txt diff --git a/world/map/npc/002-3/_mobs.txt b/world/map/npc/002-3/_mobs.txt index dbd06f59..4bbf4acf 100644 --- a/world/map/npc/002-3/_mobs.txt +++ b/world/map/npc/002-3/_mobs.txt @@ -1,37 +1,8 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Desert Mines mobs +// Tulimshar Mining Camp mobs -002-3.gat,39,37,15,11|monster|CaveMaggot|1056,5,100000,30000,Mob002-3::On1056 -002-3.gat,91,41,17,20|monster|IceGoblin|1058,3,100000,30000,Mob002-3::On1058 -002-3.gat,71,35,25,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056 -002-3.gat,69,100,8,5|monster|IceGoblin|1058,2,100000,30000,Mob002-3::On1058 -002-3.gat,68,57,26,24|monster|AngryScorpion|1057,5,100000,30000,Mob002-3::On1057 -002-3.gat,49,58,4,15|monster|AngryScorpion|1057,5,100000,30000,Mob002-3::On1057 -002-3.gat,38,76,15,22|monster|AngryScorpion|1057,4,100000,30000,Mob002-3::On1057 -002-3.gat,58,78,6,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056 -002-3.gat,89,68,11,32|monster|AngryScorpion|1057,4,100000,30000,Mob002-3::On1057 -002-3.gat,84,93,19,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056 -002-3.gat,72,77,21,14|monster|IceGoblin|1058,3,100000,30000,Mob002-3::On1058 -002-3.gat,67,91,11,12|monster|AngryScorpion|1057,4,100000,30000,Mob002-3::On1057 -002-3.gat,58,95,6,13|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056 -002-3.gat,63,100,2,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-3::On1057 002-3.gat,0,0,0|script|Mob002-3|-1,{ -On1056: - set @mobID, 1056; - callfunc "MobPoints"; - end; - -On1057: - set @mobID, 1057; - callfunc "MobPoints"; - end; - -On1058: - set @mobID, 1058; - callfunc "MobPoints"; - end; - end; } diff --git a/world/map/npc/002-3/_warps.txt b/world/map/npc/002-3/_warps.txt index 4f7f2198..e7ed3d83 100644 --- a/world/map/npc/002-3/_warps.txt +++ b/world/map/npc/002-3/_warps.txt @@ -1,4 +1,6 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Desert Mines warps +// Tulimshar Mining Camp warps -002-3.gat,37,29|warp|To Outside|-1,-1,002-1.gat,20,97 +002-3.gat,22,87|warp|To Beach|-1,-1,043-1.gat,85,55 +002-3.gat,85,51|warp|To Sand Storm Upper|-1,-1,002-1.gat,79,101 +002-3.gat,51,36|warp|To Sand Storm|-1,-1,002-1.gat,20,96 -- cgit v1.2.3-60-g2f50