From e7060f2c473ce914a4b221f1c607dc1f75b44bf5 Mon Sep 17 00:00:00 2001 From: tux9th Date: Wed, 22 Jan 2014 18:33:39 +0100 Subject: run 'make maps' for client-data changes related to adding new mobs. --- world/map/data/043-3.wlk | Bin 22504 -> 22504 bytes world/map/data/043-4.wlk | Bin 0 -> 40004 bytes world/map/data/resnametable.txt | 1 + world/map/npc/021-3/_mobs.txt | 7 +++++ world/map/npc/043-3/_warps.txt | 1 + world/map/npc/043-4/_import.txt | 5 ++++ world/map/npc/043-4/_mobs.txt | 60 ++++++++++++++++++++++++++++++++++++++++ world/map/npc/043-4/_warps.txt | 4 +++ world/map/npc/_import.txt | 1 + 9 files changed, 79 insertions(+) create mode 100644 world/map/data/043-4.wlk create mode 100644 world/map/npc/043-4/_import.txt create mode 100644 world/map/npc/043-4/_mobs.txt create mode 100644 world/map/npc/043-4/_warps.txt diff --git a/world/map/data/043-3.wlk b/world/map/data/043-3.wlk index 1a17b2f9..c03892d6 100644 Binary files a/world/map/data/043-3.wlk and b/world/map/data/043-3.wlk differ diff --git a/world/map/data/043-4.wlk b/world/map/data/043-4.wlk new file mode 100644 index 00000000..5771960b Binary files /dev/null and b/world/map/data/043-4.wlk differ diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index 4868fb22..fcc03b15 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -92,6 +92,7 @@ 042-2.gat#042-2.wlk# 043-1.gat#043-1.wlk# 043-3.gat#043-3.wlk# +043-4.gat#043-4.wlk# 044-1.gat#044-1.wlk# 044-3.gat#044-3.wlk# 045-1.gat#045-1.wlk# diff --git a/world/map/npc/021-3/_mobs.txt b/world/map/npc/021-3/_mobs.txt index 368aed44..178a48d4 100644 --- a/world/map/npc/021-3/_mobs.txt +++ b/world/map/npc/021-3/_mobs.txt @@ -12,6 +12,8 @@ 021-3.gat,79,98,33,31|monster|BlackScorpion|1009,4,100000,1800000,Mob021-3::On1009 021-3.gat,52,53,2,17|monster|Snake|1010,2,40000,50000,Mob021-3::On1010 021-3.gat,93,31,28,22|monster|SeaSlime|1033,6,100000,30000,Mob021-3::On1033 +021-3.gat,149,129,2,15|monster|Troll|1054,2,600000,100000,Mob021-3::On1054 +021-3.gat,28,52,3,20|monster|Troll|1054,2,600000,100000,Mob021-3::On1054 021-3.gat,0,0,0|script|Mob021-3|-1, @@ -31,6 +33,11 @@ On1033: callfunc "MobPoints"; end; +On1054: + set @mobID, 1054; + callfunc "MobPoints"; + end; + On1056: set @mobID, 1056; callfunc "MobPoints"; diff --git a/world/map/npc/043-3/_warps.txt b/world/map/npc/043-3/_warps.txt index 862ecc3a..11506fb8 100644 --- a/world/map/npc/043-3/_warps.txt +++ b/world/map/npc/043-3/_warps.txt @@ -2,3 +2,4 @@ // Sandy Dungeon Level 1 warps 043-3.gat,32,36|warp|To Beach|0,-1,043-1.gat,52,39 +043-3.gat,77,30|warp|To Lower Level|-1,-1,043-4.gat,47,67 diff --git a/world/map/npc/043-4/_import.txt b/world/map/npc/043-4/_import.txt new file mode 100644 index 00000000..567f0636 --- /dev/null +++ b/world/map/npc/043-4/_import.txt @@ -0,0 +1,5 @@ +// Map 043-4: Sandy Dungeon Level 2 +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 043-4.gat +npc: npc/043-4/_mobs.txt +npc: npc/043-4/_warps.txt diff --git a/world/map/npc/043-4/_mobs.txt b/world/map/npc/043-4/_mobs.txt new file mode 100644 index 00000000..dcf4bd0e --- /dev/null +++ b/world/map/npc/043-4/_mobs.txt @@ -0,0 +1,60 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Sandy Dungeon Level 2 mobs + +043-4.gat,139,163,7,6|monster|Terranite|1062,2,180000,90000,Mob043-4::On1062 +043-4.gat,133,45,14,16|monster|UndeadTroll|1117,3,100000,50000,Mob043-4::On1117 +043-4.gat,91,139,11,10|monster|UndeadTroll|1117,2,100000,50000,Mob043-4::On1117 +043-4.gat,35,120,10,11|monster|UndeadTroll|1117,2,100000,50000,Mob043-4::On1117 +043-4.gat,43,143,12,11|monster|UndeadWitch|1116,1,120000,60000,Mob043-4::On1116 +043-4.gat,102,153,9,9|monster|UndeadWitch|1116,2,120000,60000,Mob043-4::On1116 +043-4.gat,142,159,14,12|monster|UndeadWitch|1116,1,120000,60000,Mob043-4::On1116 +043-4.gat,150,33,16,15|monster|UndeadWitch|1116,1,120000,60000,Mob043-4::On1116 +043-4.gat,103,54,8,23|monster|UndeadTroll|1117,2,100000,50000,Mob043-4::On1117 +043-4.gat,47,38,20,10|monster|Troll|1054,7,100000,50000,Mob043-4::On1054 +043-4.gat,98,85,8,15|monster|Snake|1010,5,100000,50000,Mob043-4::On1010 +043-4.gat,104,57,15,27|monster|Troll|1054,7,100000,50000,Mob043-4::On1054 +043-4.gat,89,64,9,11|monster|BlackScorpion|1009,5,100000,50000,Mob043-4::On1009 +043-4.gat,143,46,32,28|monster|Troll|1054,7,100000,50000,Mob043-4::On1054 +043-4.gat,161,98,12,11|monster|BlackScorpion|1009,6,100000,50000,Mob043-4::On1009 +043-4.gat,162,82,15,15|monster|Snake|1010,6,100000,50000,Mob043-4::On1010 +043-4.gat,152,143,11,10|monster|BlackScorpion|1009,6,100000,50000,Mob043-4::On1009 +043-4.gat,159,161,10,8|monster|Snake|1010,6,100000,50000,Mob043-4::On1010 +043-4.gat,98,138,21,21|monster|Troll|1054,5,100000,50000,Mob043-4::On1054 +043-4.gat,41,112,11,10|monster|Troll|1054,3,100000,50000,Mob043-4::On1054 +043-4.gat,39,138,19,17|monster|BlackScorpion|1009,5,100000,50000,Mob043-4::On1009 + + +043-4.gat,0,0,0|script|Mob043-4|-1, +{ +On1009: + set @mobID, 1009; + callfunc "MobPoints"; + end; + +On1010: + set @mobID, 1010; + callfunc "MobPoints"; + end; + +On1054: + set @mobID, 1054; + callfunc "MobPoints"; + end; + +On1062: + set @mobID, 1062; + callfunc "MobPoints"; + end; + +On1116: + set @mobID, 1116; + callfunc "MobPoints"; + end; + +On1117: + set @mobID, 1117; + callfunc "MobPoints"; + end; + + end; +} diff --git a/world/map/npc/043-4/_warps.txt b/world/map/npc/043-4/_warps.txt new file mode 100644 index 00000000..b51c766b --- /dev/null +++ b/world/map/npc/043-4/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Sandy Dungeon Level 2 warps + +043-4.gat,47,68|warp|To Upper Level|-1,-1,043-3.gat,77,31 diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt index 136e81b6..70de0525 100644 --- a/world/map/npc/_import.txt +++ b/world/map/npc/_import.txt @@ -94,6 +94,7 @@ import: npc/042-1/_import.txt import: npc/042-2/_import.txt import: npc/043-1/_import.txt import: npc/043-3/_import.txt +import: npc/043-4/_import.txt import: npc/044-1/_import.txt import: npc/044-3/_import.txt import: npc/045-1/_import.txt -- cgit v1.2.3-60-g2f50