summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/001-2_Tulimshar/_import.txt1
-rw-r--r--npc/009-2_Hurnscald/_import.txt1
-rw-r--r--npc/018-3_Cave/_mobs.txt2
-rw-r--r--npc/020-2_Nivalis/_import.txt1
-rw-r--r--npc/021-2_Tulimshar/_import.txt1
-rw-r--r--npc/025-1_Woodland_Swamp/_mobs.txt2
-rw-r--r--[-rwxr-xr-x]npc/028-1/_import.txt0
-rw-r--r--[-rwxr-xr-x]npc/028-1/_mobs.txt9
-rw-r--r--[-rwxr-xr-x]npc/028-1/_warps.txt1
-rw-r--r--[-rwxr-xr-x]npc/028-3/_import.txt0
-rw-r--r--[-rwxr-xr-x]npc/028-3/_mobs.txt0
-rw-r--r--[-rwxr-xr-x]npc/028-3/_warps.txt0
-rw-r--r--[-rwxr-xr-x]npc/_import.txt0
-rw-r--r--[-rwxr-xr-x]npc/easter/2010/eggs.txt0
14 files changed, 8 insertions, 10 deletions
diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt
index 6b8f78b6..b9e81f22 100644
--- a/npc/001-2_Tulimshar/_import.txt
+++ b/npc/001-2_Tulimshar/_import.txt
@@ -2,6 +2,7 @@ map: 001-2.gat
npc: npc/001-2_Tulimshar/_mobs.txt
npc: npc/001-2_Tulimshar/_warps.txt
npc: npc/001-2_Tulimshar/casino.txt
+npc: npc/001-2_Tulimshar/mapflags.txt
npc: npc/001-2_Tulimshar/phaet.txt
npc: npc/001-2_Tulimshar/shops.txt
npc: npc/001-2_Tulimshar/troupe_leader.txt
diff --git a/npc/009-2_Hurnscald/_import.txt b/npc/009-2_Hurnscald/_import.txt
index 2e6af506..8b3dd0dc 100644
--- a/npc/009-2_Hurnscald/_import.txt
+++ b/npc/009-2_Hurnscald/_import.txt
@@ -7,6 +7,7 @@ npc: npc/009-2_Hurnscald/doctor.txt
npc: npc/009-2_Hurnscald/drunks.txt
npc: npc/009-2_Hurnscald/inspector.txt
npc: npc/009-2_Hurnscald/kfahr.txt
+npc: npc/009-2_Hurnscald/mapflags.txt
npc: npc/009-2_Hurnscald/misc.txt
npc: npc/009-2_Hurnscald/nicholas.txt
npc: npc/009-2_Hurnscald/nurse.txt
diff --git a/npc/018-3_Cave/_mobs.txt b/npc/018-3_Cave/_mobs.txt
index 30e9579d..c5699a01 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 PinkFlower 1014,1,60000,30000,Mob018-3::On1014
+018-3.gat,28,157,3,2 monster Flower 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/020-2_Nivalis/_import.txt b/npc/020-2_Nivalis/_import.txt
index 159d1e61..ea665c20 100644
--- a/npc/020-2_Nivalis/_import.txt
+++ b/npc/020-2_Nivalis/_import.txt
@@ -2,4 +2,5 @@ map: 020-2.gat
npc: npc/020-2_Nivalis/_mobs.txt
npc: npc/020-2_Nivalis/_warps.txt
npc: npc/020-2_Nivalis/furquest.txt
+npc: npc/020-2_Nivalis/mapflags.txt
npc: npc/020-2_Nivalis/shops.txt
diff --git a/npc/021-2_Tulimshar/_import.txt b/npc/021-2_Tulimshar/_import.txt
index 0cd9f7ea..028c104f 100644
--- a/npc/021-2_Tulimshar/_import.txt
+++ b/npc/021-2_Tulimshar/_import.txt
@@ -3,4 +3,5 @@ npc: npc/021-2_Tulimshar/_mobs.txt
npc: npc/021-2_Tulimshar/_warps.txt
npc: npc/021-2_Tulimshar/bakery.txt
npc: npc/021-2_Tulimshar/government_building.txt
+npc: npc/021-2_Tulimshar/mapflags.txt
npc: npc/021-2_Tulimshar/workshop.txt
diff --git a/npc/025-1_Woodland_Swamp/_mobs.txt b/npc/025-1_Woodland_Swamp/_mobs.txt
index b6b9c02f..2d6e3105 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 Pink Flower 1014,34,20000,5000,Mob025-1::On1014
+025-1.gat,73,61,106,83 monster Flower 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/_import.txt b/npc/028-1/_import.txt
index f00c9f7a..f00c9f7a 100755..100644
--- a/npc/028-1/_import.txt
+++ b/npc/028-1/_import.txt
diff --git a/npc/028-1/_mobs.txt b/npc/028-1/_mobs.txt
index acab9cd6..45a97279 100755..100644
--- a/npc/028-1/_mobs.txt
+++ b/npc/028-1/_mobs.txt
@@ -5,8 +5,8 @@
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 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,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,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
@@ -25,11 +25,6 @@ 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 399491fe..74d3cd30 100755..100644
--- a/npc/028-1/_warps.txt
+++ b/npc/028-1/_warps.txt
@@ -1,3 +1,2 @@
// 028-1 warps
-028-1.gat,114,122 warp To028-3 -1,-1,028-3.gat,33,78
diff --git a/npc/028-3/_import.txt b/npc/028-3/_import.txt
index 16bcb2fb..16bcb2fb 100755..100644
--- a/npc/028-3/_import.txt
+++ b/npc/028-3/_import.txt
diff --git a/npc/028-3/_mobs.txt b/npc/028-3/_mobs.txt
index 1daa99ed..1daa99ed 100755..100644
--- a/npc/028-3/_mobs.txt
+++ b/npc/028-3/_mobs.txt
diff --git a/npc/028-3/_warps.txt b/npc/028-3/_warps.txt
index dd0e452c..dd0e452c 100755..100644
--- a/npc/028-3/_warps.txt
+++ b/npc/028-3/_warps.txt
diff --git a/npc/_import.txt b/npc/_import.txt
index 2a19bc45..2a19bc45 100755..100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
diff --git a/npc/easter/2010/eggs.txt b/npc/easter/2010/eggs.txt
index 0b1af508..0b1af508 100755..100644
--- a/npc/easter/2010/eggs.txt
+++ b/npc/easter/2010/eggs.txt