diff options
author | shennetsind <ind@henn.et> | 2013-02-16 23:24:02 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-02-16 23:24:02 -0200 |
commit | a09f772cbda173d1e0182ba3686a5b84d9df5c8d (patch) | |
tree | 6a218186d307a838d22c3cda852ce9306168df06 /npc/re/jobs/3-1/guillotine_cross.txt | |
parent | b8379d2dc56197dc970db8bf1c0ba60ae4835819 (diff) | |
parent | fb8352aca63a5e5641df67be49a5c907f434d28e (diff) | |
download | hercules-a09f772cbda173d1e0182ba3686a5b84d9df5c8d.tar.gz hercules-a09f772cbda173d1e0182ba3686a5b84d9df5c8d.tar.bz2 hercules-a09f772cbda173d1e0182ba3686a5b84d9df5c8d.tar.xz hercules-a09f772cbda173d1e0182ba3686a5b84d9df5c8d.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'npc/re/jobs/3-1/guillotine_cross.txt')
-rw-r--r-- | npc/re/jobs/3-1/guillotine_cross.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 4f350460a..7fa6177a3 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Muad_Dib //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN r16945+ //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.0a Added 'npcskill' command. [Euphy] //= 1.0b Moved warps to separate file. [Euphy] //= 1.1 Fixed some minor bugs. [Euphy] +//= 1.2 Moved "Girl" NPC off ve_fild05. [Euphy] //============================================================ que_job01,75,96,3 script Guild Member#3rdgc01 997,{ @@ -2646,7 +2647,7 @@ ra_in01,175,196,3 script Oresa Rava#3rdgc13 866,{ } } -ve_fild05,327,308,3 script Girl#3rdgc14 466,{ +ve_fild02,330,384,3 script Girl#3rdgc14 466,{ if (job_3rd_gc > 14 && job_3rd_gc < 18) { mes "[Renzak]"; if (job_3rd_gc == 15) { @@ -2744,7 +2745,7 @@ OnTouch: } else { mes "You don't have to come here."; close2; - warp "ve_fild05",341,303; + warp "ve_fild02",330,379; set $@3rdgc_room02, 0; } end; @@ -2752,7 +2753,7 @@ OnTimer900000: mapannounce "job3_guil03","Renzak : Withdraw!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0 end; OnTimer901000: - mapwarp "job3_guil03","ve_fild05",341,303; + mapwarp "job3_guil03","ve_fild02",330,379; end; OnTimer902000: donpcevent "#3rdgc_event_master::OnReset"; @@ -3444,7 +3445,7 @@ job3_guil03,111,51,7 script Priest from Rachel 928,{ mes "Who are you?"; mes "Get out of here."; close2; - warp "ve_fild05",341,303; + warp "ve_fild02",330,379; end; OnInit: OnDisable: @@ -3471,7 +3472,7 @@ OnTimer40000: mapannounce "job3_guil03","Renzak : Don't lag!",bc_map,"0x4d4dff"; //FW_NORMAL 12 0 0 end; OnTimer60000: - mapwarp "job3_guil03","ve_fild05",341,303; + mapwarp "job3_guil03","ve_fild02",330,379; end; OnTimer61000: donpcevent "#3rdgc_guard::OnStop"; @@ -3902,7 +3903,7 @@ job3_guil03,1,8,0 script #GMhelper02_gc 844,{ donpcevent "#3rdgc_event01::OnEnable"; set $@3rdgc_room02, 0; close2; - mapwarp "job3_guil03","ve_fild05",341,303; + mapwarp "job3_guil03","ve_fild02",330,379; end; } case 2: |