summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/mapflag/nopvp.txt27
-rw-r--r--db/item_misc.txt1
-rw-r--r--db/pet_db.txt30
-rw-r--r--npc/scripts_custom.conf4
-rw-r--r--npc/scripts_mapflags.conf2
5 files changed, 45 insertions, 19 deletions
diff --git a/conf/mapflag/nopvp.txt b/conf/mapflag/nopvp.txt
index 176c3512d..5e7fd83fe 100644
--- a/conf/mapflag/nopvp.txt
+++ b/conf/mapflag/nopvp.txt
@@ -4,6 +4,33 @@
//= v 1.1a
//============================================================
+1@cata mapflag pvp off
+2@cata mapflag pvp off
+1@nyd mapflag pvp off
+2@nyd mapflag pvp off
+1@orcs mapflag pvp off
+2@orcs mapflag pvp off
+1@tower mapflag pvp off
+2@tower mapflag pvp off
+3@tower mapflag pvp off
+4@tower mapflag pvp off
+5@tower mapflag pvp off
+6@tower mapflag pvp off
+
+bat_a01 mapflag pvp off
+bat_a02 mapflag pvp off
+bat_b01 mapflag pvp off
+bat_b02 mapflag pvp off
+bat_c01 mapflag pvp off
+bat_c02 mapflag pvp off
+bat_c03 mapflag pvp off
+
+guild_vs1 mapflag pvp off
+guild_vs2 mapflag pvp off
+guild_vs3 mapflag pvp off
+guild_vs4 mapflag pvp off
+guild_vs5 mapflag pvp off
+
ayo_in01 mapflag pvp off
ayo_in02 mapflag pvp off
alberta_in mapflag pvp off
diff --git a/db/item_misc.txt b/db/item_misc.txt
index 9b2375072..63ef67bed 100644
--- a/db/item_misc.txt
+++ b/db/item_misc.txt
@@ -164,7 +164,6 @@
22,12373,1 //
22,12374,1 //
22,12395,1 //
-22,12395,1 //
// Bundle Of Magic Scroll
23,686,1 // Level 3 Earth Spike
23,687,1 // Level 5 Earth Spike
diff --git a/db/pet_db.txt b/db/pet_db.txt
index d9ffbd364..ce2316c59 100644
--- a/db/pet_db.txt
+++ b/db/pet_db.txt
@@ -5,21 +5,21 @@
//
// 01. MobID Monster ID of the pet.
// 02. Name Name of the monster as defined in the database.
-// 02. JName The display name of the monster when hatched.
-// 03. LureID Pet Tame Item ID.
-// 04. EggID Pet Egg ID.
-// 05. EquipID Pet Accessory ID.
-// 06. FoodID Pet Food ID.
-// 07. Fullness The amount Hunger is decreased every [HungeyDelay] seconds.
-// 08. HungeyDelay The amount of time it takes for hunger to decrease after feeding. (Default: 60 seconds)
-// 09. R_Hungry Amount of Intimacy that is increased when fed.
-// 10. R_Full Amount of Intimacy that is decreased when over-fed.
-// 11. Intimate Amount of Intimacy the pet starts with.
-// 12. Die Amount of Intimacy that is decreased when the pet owner dies.
-// 13. Capture Capture succes rate (10000 = 100%)
-// 14. Speed Pet's walk speed. (Defaul: 150)
-// 15. S_Performance Special Performance. (Yes = 1, No = 0)
-// 16. talk_convert_class Disables pet talk (instead of talking they emote with /!.)
+// 03. JName The display name of the monster when hatched.
+// 04. LureID Pet Tame Item ID.
+// 05. EggID Pet Egg ID.
+// 06. EquipID Pet Accessory ID.
+// 07. FoodID Pet Food ID.
+// 08. Fullness The amount Hunger is decreased every [HungeyDelay] seconds.
+// 09. HungeyDelay The amount of time it takes for hunger to decrease after feeding. (Default: 60 seconds)
+// 10. R_Hungry Amount of Intimacy that is increased when fed.
+// 11. R_Full Amount of Intimacy that is decreased when over-fed.
+// 12. Intimate Amount of Intimacy the pet starts with.
+// 13. Die Amount of Intimacy that is decreased when the pet owner dies.
+// 14. Capture Capture succes rate (10000 = 100%)
+// 15. Speed Pet's walk speed. (Defaul: 150)
+// 16. S_Performance Special Performance. (Yes = 1, No = 0)
+// 17. talk_convert_class Disables pet talk (instead of talking they emote with /!.)
//NOTE: The max value (100%) of attack_rate, defense_rate & change_target_rate is 10000.
//In theory you can use any valid script, but it is run only once upon pet
diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf
index 91f367cf9..c714e42bc 100644
--- a/npc/scripts_custom.conf
+++ b/npc/scripts_custom.conf
@@ -74,8 +74,8 @@
//npc: npc/custom/battleground/bg_common.txt
//npc: npc/custom/battleground/bg_tierra_01.txt
//npc: npc/custom/battleground/bg_tierra_02.txt
-//npc: npc/battleground/bg_flavius_01.txt
-//npc: npc/battleground/bg_flavius_02.txt
+//npc: npc/custom/battleground/bg_flavius_01.txt
+//npc: npc/custom/battleground/bg_flavius_02.txt
//npc: npc/custom/battleground/bg_kvm01.txt
//npc: npc/custom/battleground/bg_kvm02.txt
//npc: npc/custom/battleground/bg_kvm03.txt
diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf
index 011d9e3a3..9ba8cf629 100644
--- a/npc/scripts_mapflags.conf
+++ b/npc/scripts_mapflags.conf
@@ -1,6 +1,7 @@
// --------------------------------------------------------------
// - Map Flags -
// --------------------------------------------------------------
+npc: conf/mapflag/nopvp.txt
npc: conf/mapflag/gvg.txt
npc: conf/mapflag/indoors.txt
npc: conf/mapflag/jail.txt
@@ -11,7 +12,6 @@ npc: conf/mapflag/noicewall.txt
npc: conf/mapflag/noloot.txt
npc: conf/mapflag/nomemo.txt
npc: conf/mapflag/nopenalty.txt
-npc: conf/mapflag/nopvp.txt
npc: conf/mapflag/nosave.txt
npc: conf/mapflag/noteleport.txt
npc: conf/mapflag/noreturn.txt