From 003ed2ccc435a3d5ebf2d86f1e94367102aafb20 Mon Sep 17 00:00:00 2001 From: Streusel Date: Sat, 16 Feb 2013 03:13:03 -0800 Subject: -Updated & improved some job scripts -Updated script_commands.txt for update 2bc8562 -Moved Honeymoon Helper to Official coordinates -Updated guides/guides_izlude.txt to fit Honeymoon Helper coordinates --- npc/re/jobs/1-1/acolyte.txt | 10 +++++----- npc/re/jobs/1-1/archer.txt | 7 ++++--- npc/re/jobs/1-1/mage.txt | 8 ++++---- npc/re/jobs/1-1/merchant.txt | 7 ++++--- npc/re/jobs/1-1/swordman.txt | 7 ++++--- npc/re/jobs/1-1/thief.txt | 25 +++++++++++-------------- npc/re/jobs/3-1/guillotine_cross.txt | 15 ++++++++------- 7 files changed, 40 insertions(+), 39 deletions(-) (limited to 'npc/re/jobs') diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt index 6bc00e86e..4ab8837d3 100644 --- a/npc/re/jobs/1-1/acolyte.txt +++ b/npc/re/jobs/1-1/acolyte.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Description: ========================================= //= Job Change to Acolyte Class //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added back the npcs used for the priest quest. //= 1.2 Added Baby Job compatibility [Streusel] +//= 1.3 Rewrote bits [Euphy] //============================================================ prt_church,184,41,4 script Cleric#aco 60,{ if (Upper == 1) { @@ -62,13 +63,12 @@ prt_church,184,41,4 script Cleric#aco 60,{ next; switch(select("Change your job to acolyte.:Ask the requirements to be an acolyte.:Quit it.")) { case 1: - if(Class != Job_Novice && Class != Job_Baby) { + if(BaseJob != Job_Novice) { mes "[Father Mareusis]"; - if(Class == Job_Acolyte) { + if(BaseJob == Job_Acolyte) mes "Are you feeling okay today? I can tell by your attire that you are already an Acolyte. You're not joking around, are you?"; - }else{ + else mes "I'm sorry but it seems you already have your own job, aren't you?"; - } close; }else{ mes "[Father Mareusis]"; diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index 4d98bbe49..8e8bedc5f 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -3,12 +3,13 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Description: ========================================= //= Job Change to Archer Class //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added Baby Job compatibility [Streusel] +//= 1.2 Rewrote bits [Euphy] //============================================================ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ if (Upper == 1) { @@ -62,9 +63,9 @@ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ next; switch(select("I want to be an Archer.:I need the requirements, please.:Nothing, thanks.")) { case 1: - if(Class != Job_Novice && Class != Job_Baby) { + if(BaseJob != Job_Novice) { mes "[Archer Guildsman]"; - if(Class == Job_Archer) { + if(BaseJob == Job_Archer) { mes "Haha, you are kidding me.."; }else{ mes "I feel sorry but only Novices can change their job."; diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt index a25ec5635..b6cc20f2c 100644 --- a/npc/re/jobs/1-1/mage.txt +++ b/npc/re/jobs/1-1/mage.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added Baby Job compatibility [Streusel] +//= 1.2 Rewrote bits [Euphy] //============================================================ geffen_in,164,124,4 script Mage Guildsman#mage 123,{ if (Upper == 1) { @@ -53,9 +54,9 @@ geffen_in,164,124,4 script Mage Guildsman#mage 123,{ close; } } - if(Class != Job_Novice && Class != Job_Baby) { + if(BaseJob != Job_Novice) { mes "[Mage Guildsman]"; - if(Class == Job_Mage) { + if(BaseJob == Job_Mage) { mes "Hey, haven't you realized? You're already a Mage, silly!"; mes "One of these days you'll realize the power inside of you when you can make Fire with your mind!"; }else{ @@ -63,7 +64,6 @@ geffen_in,164,124,4 script Mage Guildsman#mage 123,{ } close; }else{ - mes "[Mage Guildsman]"; mes "Hey?"; next; switch(select("I want to be a Mage:What are the requirements to be a Mage?:Nothing, thanks.")) { diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt index 0edefd1ac..b08cf1a40 100644 --- a/npc/re/jobs/1-1/merchant.txt +++ b/npc/re/jobs/1-1/merchant.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added Baby Job compatibility [Streusel] +//= 1.2 Rewrote bits [Euphy] //============================================================ alberta_in,53,43,6 script Merchant#mer 86,{ if (Upper == 1) { @@ -58,9 +59,9 @@ alberta_in,53,43,6 script Merchant#mer 86,{ next; switch(select("I want to be a merchant.:I want to know more about merchants.:Ask him the requirements to be a merchant.:Nothing.")) { case 1: - if(Class != Job_Novice && Class != Job_Baby) { + if(BaseJob != Job_Novice) { mes "[Guildsman Mahnsoo]"; - if(Class == Job_Merchant) { + if(BaseJob == Job_Merchant) { mes ".....? Sorry? What are you saying?"; mes "You are already a merchant. Oh my.."; mes "Huh?! ...Do I need to laugh right now?!"; diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt index 168b32b2e..db7b62d41 100644 --- a/npc/re/jobs/1-1/swordman.txt +++ b/npc/re/jobs/1-1/swordman.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added Baby Job compatibility [Streusel] +//= 1.2 Rewrote bits [Euphy] //============================================================ izlude_in,74,172,4 script Swordman#swd 119,{ if (Upper == 1) { @@ -81,9 +82,9 @@ izlude_in,74,172,4 script Swordman#swd 119,{ mes "In my opinion, Swordman is the best job ever!"; close; case 2: - if(Class != Job_Novice && Class != Job_Baby) { + if(BaseJob != Job_Novice) { mes "[Swordman Guildsman]"; - if(Class == Job_Swordman) { + if(BaseJob == Job_Swordman) { mes "You are already an excellent Swordman, aren't you?"; mes "Just devote yourself to be a great Swordman."; }else{ diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt index b23846b5f..e0ea4d5a9 100644 --- a/npc/re/jobs/1-1/thief.txt +++ b/npc/re/jobs/1-1/thief.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added Baby Job compatibility [Streusel] +//= 1.2 Rewrote bits [Euphy] //============================================================ moc_prydb1,39,129,2 script Thief Guide#thief 69,{ if (Upper == 1) { @@ -66,30 +67,26 @@ moc_prydb1,39,129,2 script Thief Guide#thief 69,{ mes "If you want to become a Thief, ask the sharp-eyed guy next to me."; close; } - if(Class != Job_Novice && Class != Job_Baby) { - if(Class == Job_Thief) { + if(BaseJob != Job_Novice) { + if(BaseJob == Job_Thief) { mes "[Thief Guildsman]"; mes "Hey~ if you have any trouble, get it out to me anytime, huh?"; close; }else{ + mes "[Thief Guildsman]"; + mes "What the heck...?"; if(Sex) { - mes "[Thief Guildsman]"; - mes "What the heck...?"; - mes "Huh.. you are a "+jobname(Class)+" blockhead...!"; + mes "Huh.. you are a "+jobname(Class)+" you blockhead...!"; next; mes "[Thief Guildsman]"; mes "Hey, brother."; - mes "Why are you here? Go back to your place~ go back~~"; - close; }else{ - mes "[Thief Guildsman]"; - mes "What the heck...?"; next; mes "[Thief Guildsman]"; mes "Hey, lady."; - mes "Why are you here? Go back to your place~ go back~~"; - close; } + mes "Why are you here? Go back to your place~ go back~~"; + close; } } mes "[Thief Guildsman]"; @@ -190,8 +187,8 @@ moc_prydb1,42,133,2 script Thief Guildsman#thief 118,{ mes "See you again."; close; } - if(Class != Job_Novice && Class != Job_Baby) { - if(Class == Job_Thief) { + if(BaseJob != Job_Novice) { + if(BaseJob == Job_Thief) { mes "[Brad]"; mes "I don't have any special events now. So go on your way and come back later."; }else{ 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: -- cgit v1.2.3-60-g2f50