summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorremoitnane <remoit(DOT)nane(AT)gmail(DOT)com>2010-07-05 00:54:56 -0700
committerJared Adams <jaxad0127@gmail.com>2010-07-06 01:08:12 -0600
commit919215c676c72cfe6c4b6b1635dfdead372db5b2 (patch)
treea0a07f338b6480bd4e68cf4e89160b614ad2ba97
parent51766deba57c598ca3c6f48ecb3a5d416e9f78d9 (diff)
downloadserverdata-919215c676c72cfe6c4b6b1635dfdead372db5b2.tar.gz
serverdata-919215c676c72cfe6c4b6b1635dfdead372db5b2.tar.bz2
serverdata-919215c676c72cfe6c4b6b1635dfdead372db5b2.tar.xz
serverdata-919215c676c72cfe6c4b6b1635dfdead372db5b2.zip
Designate towns by map flag and prevent Bee self-destruction therein
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
-rw-r--r--db/mob_skill_db.txt2
-rw-r--r--npc/001-1_Tulimshar/_import.txt2
-rw-r--r--npc/001-1_Tulimshar/mapflags.txt (renamed from npc/001-1_Tulimshar/nodrop.txt)1
-rw-r--r--npc/009-1_Hurnscald/_import.txt2
-rw-r--r--npc/009-1_Hurnscald/mapflags.txt (renamed from npc/009-1_Hurnscald/nodrop.txt)1
-rw-r--r--npc/020-1_Nivalis/_import.txt2
-rw-r--r--npc/020-1_Nivalis/mapflags.txt (renamed from npc/020-1_Nivalis/nodrop.txt)1
-rw-r--r--npc/021-1_Tulimshar/_import.txt2
-rw-r--r--npc/021-1_Tulimshar/mapflags.txt (renamed from npc/021-1_Tulimshar/nodrop.txt)1
-rw-r--r--npc/022-1_Tulimshar/_import.txt2
-rw-r--r--npc/022-1_Tulimshar/mapflags.txt (renamed from npc/022-1_Tulimshar/nodrop.txt)1
11 files changed, 11 insertions, 6 deletions
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 36233ee1..02ed67da 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -74,4 +74,4 @@
//-- 1010,Snake@TF_POISON,attack,54,3,10000,0,500,yes,target,always,1,,,,,,
1014,PinkFlower@NPC_SUMMONSLAVE,attack,198,1,200,2000,0,no,self,myhpltmaxrate,99,1049,,,,,
1049,Bee@NPC_POISON,attack,178,20,1000,0,500,yes,target,always,0,,10,,,,
-1049,Bee@NPC_SELFDESTRUCTION,attack,175,1,1000,0,500,yes,self,always,0,30,,,,,
+1049,Bee@NPC_SELFDESTRUCTION,attack,175,1,1000,0,500,yes,self,notintown,0,30,,,,,
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt
index b33bbee9..daacf8da 100644
--- a/npc/001-1_Tulimshar/_import.txt
+++ b/npc/001-1_Tulimshar/_import.txt
@@ -12,9 +12,9 @@ npc: npc/001-1_Tulimshar/entertainer.txt
npc: npc/001-1_Tulimshar/guards.txt
npc: npc/001-1_Tulimshar/guide.txt
npc: npc/001-1_Tulimshar/luca.txt
+npc: npc/001-1_Tulimshar/mapflags.txt
npc: npc/001-1_Tulimshar/merchant.txt
npc: npc/001-1_Tulimshar/monster_guide.txt
-npc: npc/001-1_Tulimshar/nodrop.txt
npc: npc/001-1_Tulimshar/rewards_master.txt
npc: npc/001-1_Tulimshar/sandra.txt
npc: npc/001-1_Tulimshar/soul-menhir.txt
diff --git a/npc/001-1_Tulimshar/nodrop.txt b/npc/001-1_Tulimshar/mapflags.txt
index c2b7d27c..ba066398 100644
--- a/npc/001-1_Tulimshar/nodrop.txt
+++ b/npc/001-1_Tulimshar/mapflags.txt
@@ -1 +1,2 @@
001-1.gat mapflag no_player_drops
+001-1.gat mapflag town
diff --git a/npc/009-1_Hurnscald/_import.txt b/npc/009-1_Hurnscald/_import.txt
index 0215765d..0e2273ee 100644
--- a/npc/009-1_Hurnscald/_import.txt
+++ b/npc/009-1_Hurnscald/_import.txt
@@ -2,8 +2,8 @@ map: 009-1.gat
npc: npc/009-1_Hurnscald/_mobs.txt
npc: npc/009-1_Hurnscald/_warps.txt
npc: npc/009-1_Hurnscald/jack.txt
+npc: npc/009-1_Hurnscald/mapflags.txt
npc: npc/009-1_Hurnscald/milly.txt
-npc: npc/009-1_Hurnscald/nodrop.txt
npc: npc/009-1_Hurnscald/old_man.txt
npc: npc/009-1_Hurnscald/old_woman.txt
npc: npc/009-1_Hurnscald/sabine.txt
diff --git a/npc/009-1_Hurnscald/nodrop.txt b/npc/009-1_Hurnscald/mapflags.txt
index aa52e64f..f435d5d7 100644
--- a/npc/009-1_Hurnscald/nodrop.txt
+++ b/npc/009-1_Hurnscald/mapflags.txt
@@ -1 +1,2 @@
009-1.gat mapflag no_player_drops
+009-1.gat mapflag town
diff --git a/npc/020-1_Nivalis/_import.txt b/npc/020-1_Nivalis/_import.txt
index 14b986c0..4b64cf8d 100644
--- a/npc/020-1_Nivalis/_import.txt
+++ b/npc/020-1_Nivalis/_import.txt
@@ -1,6 +1,6 @@
map: 020-1.gat
npc: npc/020-1_Nivalis/_mobs.txt
npc: npc/020-1_Nivalis/_warps.txt
-npc: npc/020-1_Nivalis/nodrop.txt
+npc: npc/020-1_Nivalis/mapflags.txt
npc: npc/020-1_Nivalis/soul-menhir.txt
npc: npc/020-1_Nivalis/startrek.txt
diff --git a/npc/020-1_Nivalis/nodrop.txt b/npc/020-1_Nivalis/mapflags.txt
index efbe07f7..203cf649 100644
--- a/npc/020-1_Nivalis/nodrop.txt
+++ b/npc/020-1_Nivalis/mapflags.txt
@@ -1 +1,2 @@
020-1.gat mapflag no_player_drops
+020-1.gat mapflag town
diff --git a/npc/021-1_Tulimshar/_import.txt b/npc/021-1_Tulimshar/_import.txt
index a6c83cc9..f7eaa32a 100644
--- a/npc/021-1_Tulimshar/_import.txt
+++ b/npc/021-1_Tulimshar/_import.txt
@@ -5,7 +5,7 @@ npc: npc/021-1_Tulimshar/bakery.txt
npc: npc/021-1_Tulimshar/eurni.txt
npc: npc/021-1_Tulimshar/gate_guards.txt
npc: npc/021-1_Tulimshar/inac.txt
-npc: npc/021-1_Tulimshar/nodrop.txt
+npc: npc/021-1_Tulimshar/mapflags.txt
npc: npc/021-1_Tulimshar/north_shops.txt
npc: npc/021-1_Tulimshar/royal_guards.txt
npc: npc/021-1_Tulimshar/weellos.txt
diff --git a/npc/021-1_Tulimshar/nodrop.txt b/npc/021-1_Tulimshar/mapflags.txt
index 6b5aec19..3719ed0f 100644
--- a/npc/021-1_Tulimshar/nodrop.txt
+++ b/npc/021-1_Tulimshar/mapflags.txt
@@ -1 +1,2 @@
021-1.gat mapflag no_player_drops
+021-1.gat mapflag town
diff --git a/npc/022-1_Tulimshar/_import.txt b/npc/022-1_Tulimshar/_import.txt
index fb9d2b7f..6830d589 100644
--- a/npc/022-1_Tulimshar/_import.txt
+++ b/npc/022-1_Tulimshar/_import.txt
@@ -4,4 +4,4 @@ npc: npc/022-1_Tulimshar/_warps.txt
npc: npc/022-1_Tulimshar/dock.txt
npc: npc/022-1_Tulimshar/elanore.txt
npc: npc/022-1_Tulimshar/ferry_master.txt
-npc: npc/022-1_Tulimshar/nodrop.txt
+npc: npc/022-1_Tulimshar/mapflags.txt
diff --git a/npc/022-1_Tulimshar/nodrop.txt b/npc/022-1_Tulimshar/mapflags.txt
index 90a30043..f1b0444b 100644
--- a/npc/022-1_Tulimshar/nodrop.txt
+++ b/npc/022-1_Tulimshar/mapflags.txt
@@ -1 +1,2 @@
022-1.gat mapflag no_player_drops
+022-1.gat mapflag town