From d2b18c292a3a59f785a1eb27208f7379065f6317 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sat, 14 Aug 2010 16:06:23 +0000 Subject: * Quest log kill count now updated properly. (Added from topic 253813) * More battleground editing, and some bug fixes. - * ALL BATTLEGROUNDS ARE NOW ACTIVE BY DEFAULT. PLEASE CONTINUE TESTING * - Rewrote the Badge Exchange NPC in bg_common.txt, is official now. - Other changes to the bg_common folder, including disabled GM NPC. - Completely rewrote Flavius for the most part, from ground up. - Moved old Flavius battlegrounds to /custom/battleground folder. - Restored original bg_common, and KVM to /custom/battleground - Fixed wall bugs in Tierra Gorge, and added an oninit to the timers. - Other minor tweaks to both Tierra Gorge and KVM scripts. - Fixed the pseudo-cooldown on KVM not working properly, I hope. - Added global time2str function which will be used later in Endless tower. * Applied Epoque's mapflag clean up, which removes flags from scripts. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14374 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/1-1/swordman.txt | 13 ++++--------- npc/jobs/1-1/thief.txt | 5 ----- npc/jobs/2-2/crusader.txt | 7 ------- npc/jobs/2-2/monk.txt | 7 ------- npc/jobs/2-2/rogue.txt | 5 ----- npc/jobs/2-2/sage.txt | 5 ----- 6 files changed, 4 insertions(+), 38 deletions(-) (limited to 'npc/jobs') diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt index dce01d9b6..7f8793f0c 100644 --- a/npc/jobs/1-1/swordman.txt +++ b/npc/jobs/1-1/swordman.txt @@ -398,10 +398,10 @@ job_sword1,193,168,0 script Test Hall Staff#swd_9 45,1,3,{ // Pitfalls (Set 1) //============================================================ -job_sword1,65,117,0 warp ÇÔÁ¤01-01 1,1,job_sword1,10,245 -job_sword1,98,27,0 warp ÇÔÁ¤02-01 1,1,job_sword1,11,207 -job_sword1,161,27,0 warp ÇÔÁ¤02-02 1,1,job_sword1,11,207 -job_sword1,239,117,0 warp ÇÔÁ¤03-01 1,1,job_sword1,11,169 +job_sword1,65,117,0 warp ����01-01 1,1,job_sword1,10,245 +job_sword1,98,27,0 warp ����02-01 1,1,job_sword1,11,207 +job_sword1,161,27,0 warp ����02-02 1,1,job_sword1,11,207 +job_sword1,239,117,0 warp ����03-01 1,1,job_sword1,11,169 job_sword1,16,251,0 script 1_blank_1_a::SwdTrap1 -1,0,1,{ OnTouch: @@ -646,8 +646,3 @@ job_sword1,200,63,0,0 monster Fabre 1184,2,60000,30000,0 //============================================================ // mapflag //============================================================ -job_sword1 mapflag nomemo -job_sword1 mapflag noteleport -job_sword1 mapflag nosave SavePoint -job_sword1 mapflag nopenalty -job_sword1 mapflag nobranch diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt index 6ac5b9911..088c14f08 100644 --- a/npc/jobs/1-1/thief.txt +++ b/npc/jobs/1-1/thief.txt @@ -537,8 +537,3 @@ job_thief1,0,0,0,0 monster Spore 1014,30,0,0,0 //============================================================ // mapflag //============================================================ -job_thief1 mapflag nomemo -job_thief1 mapflag noteleport -job_thief1 mapflag nosave SavePoint -job_thief1 mapflag nopenalty -job_thief1 mapflag nobranch diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index 295a79009..e7c32988e 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -1461,13 +1461,6 @@ OnStop: //============================================================ // mapflag //============================================================ -job_cru mapflag nomemo -job_cru mapflag noteleport -job_cru mapflag nosave SavePoint -job_cru mapflag nopenalty -job_cru mapflag nobranch -job_cru mapflag noexp -job_cru mapflag noloot //============================================================ // Old changelog diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index b3c5121b7..be224b989 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -2609,13 +2609,6 @@ job_monk,0,0,0,0 monster Thief Bug Larva 1051,20,0,0,0 //============================================================ // mapflag //============================================================ -monk_test mapflag nomemo -monk_test mapflag noteleport -monk_test mapflag nosave SavePoint -monk_test mapflag nopenalty -monk_test mapflag nobranch -monk_test mapflag noexp -monk_test mapflag noloot //============================================================ // Old changelog diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 43d8bebbc..8598a42b1 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -2015,11 +2015,6 @@ in_rogue,399,286,1 script switch#rogreset 88,{ //============================================================ // mapflag //============================================================ -in_rogue mapflag nomemo -in_rogue mapflag noteleport -in_rogue mapflag nosave SavePoint -in_rogue mapflag nopenalty -in_rogue mapflag nobranch //============================================================ // Old changelog diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 0a4ed575a..6320e60d9 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -2893,11 +2893,6 @@ OnTimer9000: //============================================================ // Mapflag //============================================================ -job_sage mapflag nomemo -job_sage mapflag noteleport -job_sage mapflag nosave SavePoint -job_sage mapflag nopenalty -job_sage mapflag nobranch //============================================================ // Old changelog -- cgit v1.2.3-70-g09d2