From 92d4388069af1aca2ba9ca331daafbc4e4cec2e4 Mon Sep 17 00:00:00 2001 From: remoitnane Date: Mon, 26 Jul 2010 21:06:00 -0700 Subject: Clean up and restore some spawns and a lost warp Thanks to JefKve for spotting the original error. Signed-off-by: Jared Adams --- npc/007-1_Woodland/_mobs.txt | 2 +- npc/008-1_Hurnscald_outskirts/_mobs.txt | 2 +- npc/009-1_Hurnscald/_mobs.txt | 2 +- npc/010-1_Woodland/_mobs.txt | 2 +- npc/011-1_Woodland/_mobs.txt | 2 +- npc/012-1_Woodland_Hills/_mobs.txt | 2 +- npc/013-1_Woodland_hills/_mobs.txt | 2 +- npc/014-1_Woodland/_mobs.txt | 2 +- npc/018-1_Woodland_mining_camp/_mobs.txt | 2 +- npc/018-3_Cave/_import.txt | 2 +- npc/018-3_Cave/_mobs.txt | 2 +- npc/025-1_Woodland_Swamp/_mobs.txt | 2 +- npc/028-1/_mobs.txt | 11 ++++++++--- npc/028-1/_warps.txt | 1 + 14 files changed, 21 insertions(+), 15 deletions(-) (limited to 'npc') diff --git a/npc/007-1_Woodland/_mobs.txt b/npc/007-1_Woodland/_mobs.txt index 08181eab..29ad1105 100644 --- a/npc/007-1_Woodland/_mobs.txt +++ b/npc/007-1_Woodland/_mobs.txt @@ -1,6 +1,6 @@ // 007-1 Woodland mobs -007-1.gat,0,0,0,0 monster Flower 1014,17,100000,30000,Mob007-1::On1014 +007-1.gat,0,0,0,0 monster PinkFlower 1014,17,100000,30000,Mob007-1::On1014 007-1.gat,0,0,0,0 monster Spiky Mushroom 1019,15,100000,30000,Mob007-1::On1019 007-1.gat,0,0,0,0 monster Fluffy 1020,25,100000,30000,Mob007-1::On1020 007-1.gat,0,0,0,0 monster Mauve 1029,3,270000,180000,Mob007-1::On1029 diff --git a/npc/008-1_Hurnscald_outskirts/_mobs.txt b/npc/008-1_Hurnscald_outskirts/_mobs.txt index 8385bd5a..12147858 100644 --- a/npc/008-1_Hurnscald_outskirts/_mobs.txt +++ b/npc/008-1_Hurnscald_outskirts/_mobs.txt @@ -1,6 +1,6 @@ // 008-1 Hurnscald outskirts mobs -008-1.gat,0,0,0,0 monster Flower 1014,10,20,0,Mob008-1::On1014 +008-1.gat,0,0,0,0 monster PinkFlower 1014,10,20,0,Mob008-1::On1014 008-1.gat,0,0,0,0 monster Pinkie 1018,18,20,0,Mob008-1::On1018 008-1.gat,0,0,0,0 monster SpikyMushroom 1019,18,20,0,Mob008-1::On1019 008-1.gat,0,0,0,0 monster Fluffy 1020,5,30,0,Mob008-1::On1020 diff --git a/npc/009-1_Hurnscald/_mobs.txt b/npc/009-1_Hurnscald/_mobs.txt index 82cdeac2..5f1fcf89 100644 --- a/npc/009-1_Hurnscald/_mobs.txt +++ b/npc/009-1_Hurnscald/_mobs.txt @@ -1,7 +1,7 @@ // 009-1 Hurnscald mobs 009-1.gat,74,32,2,1 monster Clover patch 1037,1,100000,120000,Mob009-1::On1037 -009-1.gat,29,44,9,13 monster Flower 1014,2,0,250,Mob009-1::On1014 +009-1.gat,29,44,9,13 monster PinkFlower 1014,2,0,250,Mob009-1::On1014 009-1.gat,88,51,15,4 monster Squirrel 1038,2,0,5000,Mob009-1::On1038 009-1.gat,80,38,5,5 monster Squirrel 1038,1,0,5000,Mob009-1::On1038 009-1.gat,0,0,0,0 monster Butterfly 1055,5,30,20,Mob009-1::On1055 diff --git a/npc/010-1_Woodland/_mobs.txt b/npc/010-1_Woodland/_mobs.txt index cf0e6346..87140ff3 100644 --- a/npc/010-1_Woodland/_mobs.txt +++ b/npc/010-1_Woodland/_mobs.txt @@ -2,7 +2,7 @@ 010-1.gat,82,63,19,19 monster Scorpion 1003,1,100000,30000,Mob010-1::On1003 010-1.gat,49,71,31,19 monster Shroom 1019,1,100000,30000,Mob010-1::On1019 -010-1.gat,0,0,0,0 monster Flower 1014,30,50,0,Mob010-1::On1014 +010-1.gat,0,0,0,0 monster PinkFlower 1014,30,50,0,Mob010-1::On1014 010-1.gat,0,0,0,0 monster Fluffy 1020,20,50,0,Mob010-1::On1020 010-1.gat,0,0,0,0 monster SpikyMushroom 1019,45,50,0,Mob010-1::On1019 010-1.gat,0,0,0,0 monster LogHead 1025,40,100,0,Mob010-1::On1025 diff --git a/npc/011-1_Woodland/_mobs.txt b/npc/011-1_Woodland/_mobs.txt index ef9e880c..05ed18ed 100644 --- a/npc/011-1_Woodland/_mobs.txt +++ b/npc/011-1_Woodland/_mobs.txt @@ -1,7 +1,7 @@ // 011-1 Woodland mobs 011-1.gat,0,0,0,0 monster EvilMushroom 1013,30,0,0,Mob011-1::On1013 -011-1.gat,0,0,0,0 monster Flower 1014,20,0,0,Mob011-1::On1014 +011-1.gat,0,0,0,0 monster PinkFlower 1014,20,0,0,Mob011-1::On1014 011-1.gat,0,0,0,0 monster Spiky Mushroom 1019,5,0,0,Mob011-1::On1019 011-1.gat,0,0,0,0 monster Fluffy 1020,1,0,0,Mob011-1::On1020 011-1.gat,0,0,0,0 monster Mouboo 1028,5,0,10,Mob011-1::On1028 diff --git a/npc/012-1_Woodland_Hills/_mobs.txt b/npc/012-1_Woodland_Hills/_mobs.txt index b984d87f..c081df48 100644 --- a/npc/012-1_Woodland_Hills/_mobs.txt +++ b/npc/012-1_Woodland_Hills/_mobs.txt @@ -1,6 +1,6 @@ // 012-1 Woodland Hills mobs -012-1.gat,0,0,0,0 monster Flower 1014,13,0,100,Mob012-1::On1014 +012-1.gat,0,0,0,0 monster PinkFlower 1014,13,0,100,Mob012-1::On1014 012-1.gat,0,0,0,0 monster SpikyMushroom 1019,25,0,10,Mob012-1::On1019 012-1.gat,0,0,0,0 monster Mouboo 1028,20,0,10,Mob012-1::On1028 012-1.gat,0,0,0,0 monster Mauve 1029,5,2700000,1800000,Mob012-1::On1029 diff --git a/npc/013-1_Woodland_hills/_mobs.txt b/npc/013-1_Woodland_hills/_mobs.txt index 849a5018..04bdf4ce 100644 --- a/npc/013-1_Woodland_hills/_mobs.txt +++ b/npc/013-1_Woodland_hills/_mobs.txt @@ -1,6 +1,6 @@ // 013-1 Woodland hills mobs -013-1.gat,0,0,0,0 monster Flower 1014,13,0,100,Mob013-1::On1014 +013-1.gat,0,0,0,0 monster PinkFlower 1014,13,0,100,Mob013-1::On1014 013-1.gat,0,0,0,0 monster SpikyMushroom 1019,12,0,100,Mob013-1::On1019 013-1.gat,0,0,0,0 monster Mouboo 1028,5,0,100,Mob013-1::On1028 013-1.gat,0,0,0,0 monster Mauve 1029,1,270,180,Mob013-1::On1029 diff --git a/npc/014-1_Woodland/_mobs.txt b/npc/014-1_Woodland/_mobs.txt index e6434157..6f530db9 100644 --- a/npc/014-1_Woodland/_mobs.txt +++ b/npc/014-1_Woodland/_mobs.txt @@ -1,7 +1,7 @@ // 014-1 Woodland mobs 014-1.gat,0,0,0,0 monster EvilMushroom 1013,20,0,0,Mob014-1::On1013 -014-1.gat,0,0,0,0 monster Flower 1014,25,0,0,Mob014-1::On1014 +014-1.gat,0,0,0,0 monster PinkFlower 1014,25,0,0,Mob014-1::On1014 014-1.gat,0,0,0,0 monster Spiky Mushroom 1019,15,0,0,Mob014-1::On1019 014-1.gat,0,0,0,0 monster Mouboo 1028,5,0,10,Mob014-1::On1028 014-1.gat,0,0,0,0 monster Mauve 1029,1,270,180,Mob014-1::On1029 diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt index 1212c58e..292e0547 100644 --- a/npc/018-1_Woodland_mining_camp/_mobs.txt +++ b/npc/018-1_Woodland_mining_camp/_mobs.txt @@ -3,7 +3,7 @@ 018-1.gat,136,79,9,41 monster Sea Slime 1033,10,100000,30000,Mob018-1::On1033 018-1.gat,108,87,53,25 monster Log Head 1025,10,100000,30000,Mob018-1::On1025 018-1.gat,116,44,6,7 monster Sea Slime 1033,3,100000,30000,Mob018-1::On1033 -018-1.gat,119,56,13,6 monster Flower 1014,2,100000,30000,Mob018-1::On1014 +018-1.gat,119,56,13,6 monster PinkFlower 1014,2,100000,30000,Mob018-1::On1014 018-1.gat,175,28,17,19 monster Jack O 1022,1,300000,240000,Mob018-1::On1022 018-1.gat,78,59,3,1 monster Yellow Slime 1007,1,100000,30000,Mob018-1::On1007 018-1.gat,57,63,14,7 monster Silk Worm 1035,2,100000,30000,Mob018-1::On1035 diff --git a/npc/018-3_Cave/_import.txt b/npc/018-3_Cave/_import.txt index 74377757..6b1c7de9 100644 --- a/npc/018-3_Cave/_import.txt +++ b/npc/018-3_Cave/_import.txt @@ -2,5 +2,5 @@ map: 018-3.gat npc: npc/018-3_Cave/_mobs.txt npc: npc/018-3_Cave/_warps.txt npc: npc/018-3_Cave/bookcase.txt -npc: npc/018-3_Cave/sword.txt npc: npc/018-3_Cave/evil-obelisk.txt +npc: npc/018-3_Cave/sword.txt diff --git a/npc/018-3_Cave/_mobs.txt b/npc/018-3_Cave/_mobs.txt index c5699a01..30e9579d 100644 --- a/npc/018-3_Cave/_mobs.txt +++ b/npc/018-3_Cave/_mobs.txt @@ -3,7 +3,7 @@ 018-3.gat,48,28,56,17 monster Bat 1017,10,100000,30000,Mob018-3::On1017 018-3.gat,35,144,31,48 monster Evil Mushroom 1013,10,120000,30000,Mob018-3::On1013 018-3.gat,35,65,28,22 monster Spider 1012,20,100000,50000,Mob018-3::On1012 -018-3.gat,28,157,3,2 monster Flower 1014,1,60000,30000,Mob018-3::On1014 +018-3.gat,28,157,3,2 monster PinkFlower 1014,1,60000,30000,Mob018-3::On1014 018-3.gat,99,110,17,39 monster Yellow slime 1007,10,90000,30000,Mob018-3::On1007 018-3.gat,134,140,12,8 monster Maggot 1002,3,80000,40000,Mob018-3::On1002 018-3.gat,132,137,15,25 monster Spider 1012,8,300000,120000,Mob018-3::On1012 diff --git a/npc/025-1_Woodland_Swamp/_mobs.txt b/npc/025-1_Woodland_Swamp/_mobs.txt index 2d6e3105..ec980c3c 100644 --- a/npc/025-1_Woodland_Swamp/_mobs.txt +++ b/npc/025-1_Woodland_Swamp/_mobs.txt @@ -6,7 +6,7 @@ 025-1.gat,55,62,24,13 monster Fluffy 1020,7,30000,12000,Mob025-1::On1020 025-1.gat,38,84,37,31 monster Silkworm 1035,18,40000,300,Mob025-1::On1035 025-1.gat,96,47,63,55 monster Log Head 1025,14,18000,3000,Mob025-1::On1025 -025-1.gat,73,61,106,83 monster Flower 1014,34,20000,5000,Mob025-1::On1014 +025-1.gat,73,61,106,83 monster PinkFlower 1014,34,20000,5000,Mob025-1::On1014 025-1.gat,73,61,107,82 monster Spiky Mushroom 1019,40,90000,500,Mob025-1::On1019 025-1.gat,101,53,55,65 monster Squirrel 1038,18,60000,9000,Mob025-1::On1038 025-1.gat,26,61,15,85 monster Scorpion 1003,12,100000,50000,Mob025-1::On1003 diff --git a/npc/028-1/_mobs.txt b/npc/028-1/_mobs.txt index 45a97279..317b10d1 100644 --- a/npc/028-1/_mobs.txt +++ b/npc/028-1/_mobs.txt @@ -5,9 +5,9 @@ 028-1.gat,93,33,48,32 monster Wisp 1040,8,200000,15000,Mob028-1::On1040 028-1.gat,93,33,46,34 monster Spectre 1042,8,200000,15000,Mob028-1::On1042 028-1.gat,93,33,44,36 monster Poltergeist 1047,8,200000,15000,Mob028-1::On1047 -028-1.gat,35,64,38,9 monster Sea Slime 1017,18,100000,1200,Mob028-1::On1017 -028-1.gat,45,75,22,10 monster Sea Slime 1017,18,100000,1200,Mob028-1::On1017 -028-1.gat,23,101,1,1 monster squirrel 1038,1,300000,50000,Mob028-1::On1038 +028-1.gat,35,64,38,9 monster Sea Slime 1033,18,100000,1200,Mob028-1::On1033 +028-1.gat,45,75,22,10 monster Sea Slime 1033,18,100000,1200,Mob028-1::On1033 +028-1.gat,23,101,1,1 monster Squirrel 1038,1,300000,50000,Mob028-1::On1038 028-1.gat,68,95,71,18 monster Wisp 1040,8,200000,15000,Mob028-1::On1040 028-1.gat,76,100,93,16 monster Spectre 1042,8,200000,15000,Mob028-1::On1042 028-1.gat,104,114,61,14 monster Poltergeist 1047,8,200000,15000,Mob028-1::On1047 @@ -25,6 +25,11 @@ On1019: callfunc "MobPoints"; break; +On1033: + set @mobID, 1033; + callfunc "MobPoints"; + break; + On1038: set @mobID, 1038; callfunc "MobPoints"; diff --git a/npc/028-1/_warps.txt b/npc/028-1/_warps.txt index 74d3cd30..399491fe 100644 --- a/npc/028-1/_warps.txt +++ b/npc/028-1/_warps.txt @@ -1,2 +1,3 @@ // 028-1 warps +028-1.gat,114,122 warp To028-3 -1,-1,028-3.gat,33,78 -- cgit v1.2.3-60-g2f50