summaryrefslogtreecommitdiff
path: root/npc/jobs/1-1
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-08-14 16:06:23 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-08-14 16:06:23 +0000
commitd2b18c292a3a59f785a1eb27208f7379065f6317 (patch)
treef2f09bc53aac7f4208b4c6aaa94e29df5c354a4b /npc/jobs/1-1
parentb1ca3ed2ab319fa5a81e24cad92fa2c9801e8806 (diff)
downloadhercules-d2b18c292a3a59f785a1eb27208f7379065f6317.tar.gz
hercules-d2b18c292a3a59f785a1eb27208f7379065f6317.tar.bz2
hercules-d2b18c292a3a59f785a1eb27208f7379065f6317.tar.xz
hercules-d2b18c292a3a59f785a1eb27208f7379065f6317.zip
* 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
Diffstat (limited to 'npc/jobs/1-1')
-rw-r--r--npc/jobs/1-1/swordman.txt13
-rw-r--r--npc/jobs/1-1/thief.txt5
2 files changed, 4 insertions, 14 deletions
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