From f79e5b0e8e2939b2e8939a0cf1aba682e6877ba9 Mon Sep 17 00:00:00 2001 From: Streusel Date: Wed, 13 Feb 2013 15:57:29 -0800 Subject: -Removed leftover 'case 1:' causing error --- npc/cities/alberta.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index 7f9bbe01d..3909d63b2 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -67,11 +67,11 @@ alberta,131,139,2 script Drunken Old Man 54,{ mes "Wh-what are you"; mes "staring at? Get lost!!"; next; - if(select("Say nothing.","Leave him alone.") ==1) { + if(select("Say nothing.","Leave him alone.") == 1) { mes "[Deagle]"; mes "Hahahaha ^666666*hiccup*^000000... You've got some nerve. I may look worthless now, but I used to be a sailor on the 'Going Mary.'"; next; - if(select("Never heard of it.","Really? No kidding!") ==1) { + if(select("Never heard of it.","Really? No kidding!") == 1) { mes "[Deagle]"; mes "Never heard of it?! Everybody knows th'notorious pirate ship 'Going Mary!' ^666666*Hiccup~*^000000"; next; @@ -228,7 +228,7 @@ alb2trea,39,50,6 script Fisk#a2t 100,{ mes "[Fisk]"; mes "So you wanna head back to the mainland in Alberta, eh?"; next; - if(select("Yes please.","I changed my mind.")==1) + if(select("Yes please.","I changed my mind.") == 1) warp "alberta",192,169; close; } @@ -251,7 +251,7 @@ alberta,195,151,2 script Paul 86,{ mes "fee is only"; mes "200 Zeny."; next; - if(select("Sign me up!","Uh, no thanks.") ==1) { + if(select("Sign me up!","Uh, no thanks.") == 1) { if (Zeny < 200) { mes "[Paul]"; mes "It seems you don't have the money, my friend. But please come back when you're able to pay."; @@ -295,8 +295,7 @@ alberta,190,173,4 script Phelix 85,{ } mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?"; next; - if(select("Red Potions please.","Carrots please.") ==1) { - case 1: + if(select("Red Potions please.","Carrots please.") == 1) { mes "[Phelix]"; mes "Alright..."; mes "Let's see"; -- cgit v1.2.3-60-g2f50 From a849f62a06db7c976a50db41373bd3fc6bcadb45 Mon Sep 17 00:00:00 2001 From: Streusel Date: Wed, 13 Feb 2013 16:53:09 -0800 Subject: -Updated Job NPC's to allow Baby Novice to change into other Baby 1-1 classes -Updated Job npc's to use callfunc --- npc/re/jobs/1-1/acolyte.txt | 4 ++-- npc/re/jobs/1-1/archer.txt | 4 ++-- npc/re/jobs/1-1/mage.txt | 2 +- npc/re/jobs/1-1/merchant.txt | 2 +- npc/re/jobs/1-1/swordman.txt | 2 +- npc/re/jobs/1-1/thief.txt | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt index 4808879be..1ae78385c 100644 --- a/npc/re/jobs/1-1/acolyte.txt +++ b/npc/re/jobs/1-1/acolyte.txt @@ -61,7 +61,7 @@ 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) { + if(Class != Job_Novice && Class != Job_Baby) { mes "[Father Mareusis]"; if(Class == 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?"; @@ -85,7 +85,7 @@ prt_church,184,41,4 script Cleric#aco 60,{ next; mes "[Father Mareusis]"; mes "Always remember to be thankful to God, who takes care of us all the time. In chaos and times of difficulty, face your hardships with unwavering faith."; - jobchange Job_Acolyte; + callfunc "Job_Change",Job_Acolyte; getitem 1545,1; // N_Mace next; mes "[Father Mareusis]"; diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index 86560b9ed..6803bb46e 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -61,7 +61,7 @@ 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) { + if(Class != Job_Novice && Class != Job_Baby) { mes "[Archer Guildsman]"; if(Class == Job_Archer) { mes "Haha, you are kidding me.."; @@ -90,7 +90,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ mes "[Archer Guildsman]"; mes "Congratulations! You are now an Archer! Also, we hope that you actively participate in many programs for the revival of the Archer Guild."; mes "Ah, items have arrived from the Production Department. Here, take these! These are all yours!"; - jobchange Job_Archer; + callfunc "Job_Change",Job_Archer; getitem 1742,1; // N_Composite_Bow getitem 12004,1; // Arrow_Container getitem 12009,1; // Silver_Arrow_Container diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt index ee5eba7fd..6cc92b6e7 100644 --- a/npc/re/jobs/1-1/mage.txt +++ b/npc/re/jobs/1-1/mage.txt @@ -52,7 +52,7 @@ geffen_in,164,124,4 script Mage Guildsman#mage 123,{ close; } } - if(Class != Job_Novice) { + if(Class != Job_Novice && Class != Job_Baby) { mes "[Mage Guildsman]"; if(Class == Job_Mage) { mes "Hey, haven't you realized? You're already a Mage, silly!"; diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt index a010af556..7dd41b452 100644 --- a/npc/re/jobs/1-1/merchant.txt +++ b/npc/re/jobs/1-1/merchant.txt @@ -57,7 +57,7 @@ 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) { + if(Class != Job_Novice && Class != Job_Baby) { mes "[Guildsman Mahnsoo]"; if(Class == Job_Merchant) { mes ".....? Sorry? What are you saying?"; diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt index cd01ecb28..32605d47e 100644 --- a/npc/re/jobs/1-1/swordman.txt +++ b/npc/re/jobs/1-1/swordman.txt @@ -80,7 +80,7 @@ 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) { + if(Class != Job_Novice && Class != Job_Baby) { mes "[Swordman Guildsman]"; if(Class == Job_Swordman) { mes "You are already an excellent Swordman, aren't you?"; diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt index 5bf41fa87..4de378804 100644 --- a/npc/re/jobs/1-1/thief.txt +++ b/npc/re/jobs/1-1/thief.txt @@ -65,7 +65,7 @@ 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) { + if(Class != Job_Novice && Class != Job_Baby) { if(Class == Job_Thief) { mes "[Thief Guildsman]"; mes "Hey~ if you have any trouble, get it out to me anytime, huh?"; @@ -169,7 +169,7 @@ moc_prydb1,42,133,2 script Thief Guildsman#thief 118,{ mes "[Commander of Thief Guild]"; mes "'"+strcharinfo(0)+".'"; mes "'For those who are ready, the moonlight shall open the way. Now you are fully ready, I now officially allow you to become a member of the Thief Guild.'"; - jobchange Job_Thief; + callfunc "Job_Change",Job_Thief; set q_job_thief,0; getitem 13041,1; // N_Main_Gauche next; @@ -189,7 +189,7 @@ moc_prydb1,42,133,2 script Thief Guildsman#thief 118,{ mes "See you again."; close; } - if(Class != Job_Novice) { + if(Class != Job_Novice && Class != Job_Baby) { if(Class == Job_Thief) { mes "[Brad]"; mes "I don't have any special events now. So go on your way and come back later."; -- cgit v1.2.3-60-g2f50 From 24ffcb5e44e16bf423d22b146502fef835aab725 Mon Sep 17 00:00:00 2001 From: Streusel Date: Wed, 13 Feb 2013 16:57:34 -0800 Subject: -Changed versions --- npc/re/jobs/1-1/acolyte.txt | 3 ++- npc/re/jobs/1-1/archer.txt | 3 ++- npc/re/jobs/1-1/mage.txt | 3 ++- npc/re/jobs/1-1/merchant.txt | 3 ++- npc/re/jobs/1-1/swordman.txt | 3 ++- npc/re/jobs/1-1/thief.txt | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt index 1ae78385c..6bc00e86e 100644 --- a/npc/re/jobs/1-1/acolyte.txt +++ b/npc/re/jobs/1-1/acolyte.txt @@ -3,12 +3,13 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== 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] //============================================================ prt_church,184,41,4 script Cleric#aco 60,{ if (Upper == 1) { diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index 6803bb46e..4d98bbe49 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -3,11 +3,12 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Description: ========================================= //= Job Change to Archer Class //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] +//= 1.1 Added Baby Job compatibility [Streusel] //============================================================ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ if (Upper == 1) { diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt index 6cc92b6e7..a25ec5635 100644 --- a/npc/re/jobs/1-1/mage.txt +++ b/npc/re/jobs/1-1/mage.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Job Change to Mage Class //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] +//= 1.1 Added Baby Job compatibility [Streusel] //============================================================ geffen_in,164,124,4 script Mage Guildsman#mage 123,{ if (Upper == 1) { diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt index 7dd41b452..0edefd1ac 100644 --- a/npc/re/jobs/1-1/merchant.txt +++ b/npc/re/jobs/1-1/merchant.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Job Change to Merchant Class //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] +//= 1.1 Added Baby Job compatibility [Streusel] //============================================================ alberta_in,53,43,6 script Merchant#mer 86,{ if (Upper == 1) { diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt index 32605d47e..168b32b2e 100644 --- a/npc/re/jobs/1-1/swordman.txt +++ b/npc/re/jobs/1-1/swordman.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Job Change to Swordman Class //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] +//= 1.1 Added Baby Job compatibility [Streusel] //============================================================ izlude_in,74,172,4 script Swordman#swd 119,{ if (Upper == 1) { diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt index 4de378804..b23846b5f 100644 --- a/npc/re/jobs/1-1/thief.txt +++ b/npc/re/jobs/1-1/thief.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Job Change to Thief Class //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] +//= 1.1 Added Baby Job compatibility [Streusel] //============================================================ moc_prydb1,39,129,2 script Thief Guide#thief 69,{ if (Upper == 1) { -- cgit v1.2.3-60-g2f50