From cc256e4bdc0c3cb858b993e82f53104113f814c4 Mon Sep 17 00:00:00 2001 From: brianluau Date: Sat, 2 Oct 2010 18:33:10 +0000 Subject: - Added instance, GVG, and BG maps to nopvp.txt (bugreport:4396) and changed /conf/mapflag/nopvp.txt to be loaded first. - Removed a duplicate line in item_misc.txt (bugreport:4453) - Updated script paths to custom BG scripts, follow up to r14374. (bugreport:4443) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14411 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/scripts_custom.conf | 4 ++-- npc/scripts_mapflags.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'npc') 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 -- cgit v1.2.3-70-g09d2