From e3afdc2af4c5e50c79237ee092e25f39b7428e47 Mon Sep 17 00:00:00 2001 From: Michieru Date: Thu, 24 Oct 2013 12:10:43 +0200 Subject: Update to last rAthena npc. Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt --- npc/pre-re/jobs/1-1/acolyte.txt | 14 +++++++------- npc/pre-re/jobs/1-1/archer.txt | 14 +++++++------- npc/pre-re/jobs/1-1/mage.txt | 30 ++++++++++++++++++------------ npc/pre-re/jobs/1-1/merchant.txt | 26 ++++++++++++-------------- npc/pre-re/jobs/1-1/swordman.txt | 32 +++++++++++++++----------------- npc/pre-re/jobs/1-1/thief.txt | 14 ++++++-------- npc/pre-re/jobs/novice/novice.txt | 23 ++++++++++------------- 7 files changed, 75 insertions(+), 78 deletions(-) (limited to 'npc/pre-re/jobs') diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index 7b46a6029..f69d4556a 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -1,13 +1,13 @@ //===== Hercules Script ====================================== //= Acolyte Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.2 -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Acolyte classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added function calls for Priest Quest. //= 1.2 Fixed Marthilda, Yosuke bugs. [Lupus] @@ -17,8 +17,8 @@ //= 1.5 Now saves/restores all quest skills [Lupus] //= 1.6 Merged back JFunc [Lupus] //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= No longer uses function "F_ToHigh" -//= Proper dialog for Priest job quest is unused (for now.) +//= No longer uses function "F_ToHigh" +//= Proper dialog for Priest job quest is unused (for now.) //= 1.7a Functions now make use of proper priest quest dialog [L0ne_W0lf] //= 1.8 Removed an Unnecessary "set job_acolyte_q,0;" [Samuray22] //= 1.8a More bug fixes care of Crashy. [L0ne_W0lf] @@ -26,7 +26,7 @@ //= 2.0 Fixed High Acolytesnot being given holy light. [L0ne_W0lf] //= 2.1 Added Quest Log commands. [L0ne_W0lf] //= 2.2 Fixed an issue with completequest by adding checkquest. [Kisuka] -//============================================================ +//============================================================ prt_church,184,41,4 script Cleric#aco 60,{ if (Upper == 1) { diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index 5018bc48f..1b928ff13 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -1,13 +1,13 @@ //===== Hercules Script ====================================== //= Archer Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.9 -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Archer classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] @@ -15,12 +15,12 @@ //= 1.5 Now saves/restores all quest skills [Lupus] //= 1.6 Merged back JFunc [Lupus] //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= Arrow reward is now equal to the type sof trunks brought. -//= No longer uses function "F_ToHigh" +//= Arrow reward is now equal to the type sof trunks brought. +//= No longer uses function "F_ToHigh" //= 1.7a Fixed minor dialogue bug at Grade==25 [Lupus] //= 1.8 Fixed mistake in condition check. [L0ne_W0lf] //= 1.9 Added Quest Log commands. [L0ne_W0lf] -//============================================================ +//============================================================ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ if (Upper == 1) { diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 22aab9052..df53e3440 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -1,15 +1,13 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Mage Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== -//= 1.9 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Current Version: ===================================== +//= 2.0 +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Mage classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Fixed input ingridients bug [Lupus] //= 1.2 Added instant job change for High Novice [Lupus] @@ -18,11 +16,12 @@ //= 1.5 Now saves/restores all quest skills [Lupus] //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus] //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= No longer uses function "F_ToHigh" +//= No longer uses function "F_ToHigh" //= 1.7a Fixed a "If" in the quest. (bugreport:489) [Samuray22] //= 1.8 Added Quest Log commands. [L0ne_W0lf] //= 1.9 Fixed an issue with completequest by adding checkquest. [Kisuka] -//============================================================ +//= 2.0 Moved "Dollshoi" and "Ponka-Hontas" NPCs. [Euphy] +//============================================================ geffen_in,164,124,4 script Mage Guildsman 123,{ if (Upper == 1) { @@ -86,7 +85,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ } if (job_magician_q == 0) { mes "Wanna be a Mage, eh...?"; - if (sex) + if (Sex) mes "Hey, look at you! You're kinda cute~! Not my type though..."; else { mes "Oooh, you're such a hot babe~!"; @@ -231,7 +230,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ case 2: mes "[Mage Guildsman]"; mes "Wanna be a Mage, eh?"; - if (sex) + if (Sex) mes "For a cutie like you, I'd be happy to explain the requirements!"; else mes "I'd be happy to explain the requirements for a pretty girl like you!"; @@ -596,6 +595,13 @@ geffen_in,164,112,4 script Mixing Machine 111,{ close; } +// The Morroc Solution and Payon Solution traders +// are also used in the Sage skill quests, and have +// been moved to npc/quests/mage_solution.txt. +// +// pay_arche,122,100,0 script Dollshoi 88,{} +// moc_ruins,91,150,0 script Ponka-Hontas 93,{} + geffen_in,177,112,4 script Bookshelf 111,{ mes "[Guide Book]"; mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care."; diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 93d502794..531c47df3 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -1,15 +1,13 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Merchant Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.3 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Merchant classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] @@ -20,7 +18,7 @@ //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus] //= 1.7 Updated to use Free Ticket for Kafra [Lupus] //= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= No longer uses function "F_ToHigh" +//= No longer uses function "F_ToHigh" //= 1.9 Bugfixes, thanks to Barron-Monster. [L0ne_W0lf] //= 1.9a Added a missing next; (Barron-Monster) [L0ne_W0lf] //= 1.9b Typo. "nextl" -> "next;" (Barron-Monster) [L0ne_W0lf] @@ -28,7 +26,7 @@ //= 2.1 Fixed mistake in condition check. [L0ne_W0lf] //= 2.2 Added Quest Log commands. [L0ne_W0lf] //= 2.3 Fixed an issue with completequest by adding checkquest. [Kisuka] -//============================================================ +//============================================================ alberta_in,53,43,6 script Merchant#mer 86,{ if (Upper == 1) { @@ -135,7 +133,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "Please return when you have earned the 500 zeny that you need to become a Merchant."; close; } - set zeny,zeny-500; + set Zeny, Zeny-500; mes "Ah yes...!"; mes "Now your"; mes "membership"; @@ -171,7 +169,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "[Chief Mahnsoo]"; mes "*Ahem* Aaaaand let me give you a little bit of money for delivering that message to Blossom for me."; mes "I hope you'll help me again next time~"; - set zeny,zeny+200; + set Zeny, Zeny+200; set quest_alb_01,2; } else { @@ -343,7 +341,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "[Chief Mahnsoo]"; if (Zeny >= 1000) { set job_merchant_q,2; - set zeny,zeny-1000; + set Zeny, Zeny-1000; mes "Alright~"; mes "That's 1,000 zeny."; mes "Excellent, excellent."; @@ -357,7 +355,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "[Chief Mahnsoo]"; if (Zeny >= 500) { set job_merchant_q,1; - set zeny,zeny-500; + set Zeny, Zeny-500; mes "Let's see..."; mes "That's 500 Zeny. Although I don't think splitting payment is a good idea for any Merchant, it's alright since you're still learning."; } @@ -1060,7 +1058,7 @@ prontera,248,42,0 script Kafra Employee#mer 116,{ cutin "",255; end; } - set zeny,zeny-600; + set Zeny, Zeny-600; set RESRVPTS, RESRVPTS + 37; cutin "",255; warp "izlude",94,103; diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt index 36ddc9d21..0887b2027 100644 --- a/npc/pre-re/jobs/1-1/swordman.txt +++ b/npc/pre-re/jobs/1-1/swordman.txt @@ -1,19 +1,17 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Swordsman Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.3 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Swordman classes //= Uses Job_sword1 as opposed to sword_1-1 -> sword_3-1. //= EXPLOITABLE in a sense because while the sword_x-1 maps //= are marked as "inside" by the client, job_sword1 is not. //= giving players FREE camera rotation while doing the job quest. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] @@ -27,15 +25,15 @@ //= 1.7 changed location from its clone to the original [Lupus] //= 1.7.1 Fixed warp on timeout [KarLaeda] //= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= Removed "green" traps, quest is no longer timed. -//= No longer uses function "F_ToHigh" +//= Removed "green" traps, quest is no longer timed. +//= No longer uses function "F_ToHigh" //= 1.9 Dialog is official, but the Script is now custom as far as maps go. [L0ne_W0lf] //= 1.9b Fixed usage of wrong jobchange func messing up baby classes [ultramage] //= 2.0 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf] //= 2.1 Fixed mistake in condition check. [L0ne_W0lf] //= 2.2 Warp portals dont end with ; [Yommy] //= 2.3 Added Quest Log commands. [L0ne_W0lf] -//============================================================ +//============================================================ izlude_in,74,172,4 script Swordman#swd_1 119,{ if (Upper == 1) { @@ -296,7 +294,7 @@ izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{ } // Examination Courses NPCs -//============================================================ +//============================================================ // 1-1 job_sword1,230,245,2 script Medic#swd_1 105,{ callfunc "F_JobSwdMedic","1st"; @@ -322,7 +320,7 @@ job_sword1,223,167,2 script Mae#swd_1_success 92,{ } // Examination Course Functions -//============================================================ +//============================================================ function script F_JobSwdMedic { percentheal 100,0; mes "[Medic]"; @@ -366,7 +364,7 @@ OnTouch: } // Examination Course 1 -//============================================================ +//============================================================ job_sword1,223,243,0 warp checkp1-2#swd_1 1,1,job_sword1,11,206 job_sword1,223,205,0 warp checkp2-3#swd_1 1,1,job_sword1,11,168 @@ -396,7 +394,7 @@ job_sword1,193,168,0 script Test Hall Staff#swd_9 45,1,3,{ } // Pitfalls (Set 1) -//============================================================ +//============================================================ job_sword1,65,117,0 warp pitfall01-01 1,1,job_sword1,10,245 job_sword1,98,27,0 warp pitfall02-01 1,1,job_sword1,11,207 job_sword1,161,27,0 warp pitfall02-02 1,1,job_sword1,11,207 @@ -463,7 +461,7 @@ job_sword1,181,239,0 duplicate(SwdTrap1) 1_blank_14_c -1,1,0 job_sword1,193,245,0 warp 1_rest 1,3,job_sword1,215,244 // Pitfalls (Set 2) -//============================================================ +//============================================================ job_sword1,56,212,0 script 2_blank_1_a::SwdTrap2 -1,40,0,{ OnTouch: switch(rand(1,5)) { @@ -508,7 +506,7 @@ job_sword1,155,201,0 duplicate(SwdTrap2) 2_blank_9_a -1,40,0 job_sword1,181,201,0 duplicate(SwdTrap2) 2_blank_9_b -1,2,0 // Pitfalls (Set 3) -//============================================================ +//============================================================ job_sword1,17,174,0 script 3_blank_1_a::SwdTrap3 -1,2,0,{ OnTouch: switch(rand(1,5)) { @@ -621,7 +619,7 @@ job_sword1,177,163,0 duplicate(SwdTrap3) 3_blank_30_b -1,0,2 job_sword1,181,163,0 duplicate(SwdTrap3) 3_blank_30_c -1,2,0 // Monsters (all three courses) -//============================================================ +//============================================================ job_sword1,0,0,0,0 monster Chonchon 1183,20,0,0,0 job_sword1,35,79,0,0 monster Fabre 1184,3,60000,30000,0 job_sword1,50,108,0,0 monster Fabre 1184,3,60000,30000,0 diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt index aa5c6a108..e1e34b144 100644 --- a/npc/pre-re/jobs/1-1/thief.txt +++ b/npc/pre-re/jobs/1-1/thief.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Thief Job Quest //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Job quest for Thief classes @@ -14,11 +12,11 @@ //= 1.1 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] //= 1.4 Optimised and moved first checker to Jfunc1-1 [massdriller] -//= Fixed possible EXP abuse [Lupus] +//= Fixed possible EXP abuse [Lupus] //= 1.5 Now saves/restores all quest skills [Lupus] //= 1.6 Merged back JFunc [Lupus] 1.6a typos //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= No longer uses function "F_ToHigh" +//= No longer uses function "F_ToHigh" //= 1.8 Added Quest Log commands. [L0ne_W0lf] //============================================================ @@ -52,7 +50,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{ } else { mes "[Thief Guide]"; - if (sex) + if (Sex) mes "Hey, dude."; else mes "Hey, baby~"; @@ -61,7 +59,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{ } else { mes "[Thief Guide]"; - if (sex) + if (Sex) mes "Hey, dude."; else mes "Hey, baby."; @@ -445,7 +443,7 @@ moc_prydb1,42,133,2 script Comrade 118,{ next; mes "[Brad]"; mes "Here is a small subsidy for a Newbie like you. Spend it whereever you want. Alright then, I'll see you around~"; - set zeny,zeny+.@money_thief; + set Zeny, Zeny+.@money_thief; close; } } diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt index c88795463..909ba2d88 100644 --- a/npc/pre-re/jobs/novice/novice.txt +++ b/npc/pre-re/jobs/novice/novice.txt @@ -1,15 +1,13 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Ep 10+ Novice Training Grounds -//===== By: ================================================== +//===== By: ================================================== //= Dr.Evil & MasterOfMuppets -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.4 -//===== Compatible With: ===================================== -//= rAthena SVN 3422+(Requires jA Script System) -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Novice Training Grounds -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.7D Added confirm character name thing on receptionist. [Kisuka] //= 1.8 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= NPCs are not backwards compatable, and will remove @@ -23,7 +21,7 @@ //= 2.3 Added fix to Hanson from GM-windsor- and Saithis. [L0ne_W0lf] //= 2.3a Correct a wrong variable name. (bugreport:2293) [Samuray22] //= 2.4 Corrected an error in Hanson. (bugreport:2374) [L0ne_W0lf] -//============================================================ +//============================================================ // Bulletin Board new_1-1,66,114,4 script Bulletin Board#nv 111,{ @@ -924,7 +922,6 @@ new_1-2,115,111,3 script Item Tutor#nv 726,{ } } else if (nov_get_item04 < 10) { - enable_items; mes "[Alice]"; mes "^666666*Yawn~*^000000"; mes "This is so boring."; @@ -4281,11 +4278,11 @@ new_3-3,0,0,0,0 monster Fabre 1184,5,0,0,0 new_4-3,0,0,0,0 monster Fabre 1184,5,0,0,0 new_5-3,0,0,0,0 monster Fabre 1184,5,0,0,0 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.0 Added the New Novice Training Grounds, a big thanks [MasterOfMuppets] -//= to Dr.Evil who did 90% of the work =) +//= to Dr.Evil who did 90% of the work =) //= 1.0b Temp measure to stop exploits. [Vicious] //= 1.2 Removed Duplicates [Silent] //= 1.3 Removed Duplicates [Toms] @@ -4296,4 +4293,4 @@ new_5-3,0,0,0,0 monster Fabre 1184,5,0,0,0 //= 1.7a a bit of optimization [Lupus] //= 1.7b Corrected a little Typo Error. (bugreport:728) [Samuray22] //= 1.7C Corrected another Typo Error. (bugreport:740) [Samuray22] -//============================================================ +//============================================================ -- cgit v1.2.3-60-g2f50