From 859b7db3e221b7d74eee7ce176e8c411f635f61d Mon Sep 17 00:00:00 2001 From: Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec> Date: Sun, 11 Jun 2006 06:51:38 +0000 Subject: Completed full save/restore of Quest Skills on the REBIRTHING 8) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7089 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/1-1/acolyte.txt | 5 +++-- npc/jobs/1-1/archer.txt | 5 +++-- npc/jobs/1-1/mage.txt | 5 +++-- npc/jobs/1-1/merchant.txt | 5 +++-- npc/jobs/1-1/swordman.txt | 5 +++-- npc/jobs/1-1/thief.txt | 3 ++- npc/jobs/2-1a/AssassinCross.txt | 5 +++-- npc/jobs/2-1a/HighPriest.txt | 5 +++-- npc/jobs/2-1a/HighWizard.txt | 5 +++-- npc/jobs/2-1a/LordKnight.txt | 5 +++-- npc/jobs/2-1a/Sniper.txt | 5 +++-- npc/jobs/2-1a/WhiteSmith.txt | 5 +++-- npc/jobs/2-2a/Champion.txt | 5 +++-- npc/jobs/2-2a/Clown.txt | 5 +++-- npc/jobs/2-2a/Creator.txt | 5 +++-- npc/jobs/2-2a/Gypsy.txt | 5 +++-- npc/jobs/2-2a/Paladin.txt | 5 +++-- npc/jobs/2-2a/Professor.txt | 5 +++-- npc/jobs/2-2a/Stalker.txt | 5 +++-- 19 files changed, 56 insertions(+), 37 deletions(-) (limited to 'npc/jobs') diff --git a/npc/jobs/1-1/acolyte.txt b/npc/jobs/1-1/acolyte.txt index e34f7bd4c..52a7a4207 100644 --- a/npc/jobs/1-1/acolyte.txt +++ b/npc/jobs/1-1/acolyte.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -15,12 +15,13 @@ //= v1.2a Added instant job change for High Novice [Lupus] //= v1.3 Added Baby Class support [Lupus] //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller] +//= 1.5 Now saves/restores all quest skills [Lupus] //============================================================ // -- Father Mareusis -- prt_church.gat,184,41,4 script Father Mareusis 60,{ - callfunc "F_ToHigh",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"High Priest",156,0,0,0,"Father Mareusis"; + callfunc "F_ToHigh",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"Father Mareusis"; mes "[Father Mareusis]"; if(BaseJob==Job_Novice && job_acolyte_q > 0) goto L_Check; mes "What is it you are looking for?"; diff --git a/npc/jobs/1-1/archer.txt b/npc/jobs/1-1/archer.txt index 87d390105..1f57a5227 100644 --- a/npc/jobs/1-1/archer.txt +++ b/npc/jobs/1-1/archer.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -13,12 +13,13 @@ //= v1.1 Added instant job change for High Novice [Lupus] //= v1.3 Added Baby Class support [Lupus] //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller] +//= 1.5 Now saves/restores all quest skills [Lupus] //============================================================ // -- Archer Guildsman -- payon_in02.gat,64,71,4 script Archer Guildsman 59,{ - callfunc "F_ToHigh",Job_Archer_High,"High Archer",Job_Sniper,"Sniper",147,148,0,0,"Archer Guildsman"; + callfunc "F_ToHigh",Job_Archer_High,"High Archer",Job_Sniper,"Archer Guildsman"; mes "[Archer Guildsman]"; if(BaseJob==Job_Novice && job_archer_q == 1) goto L_Check; mes "Good Day. How may I help you?"; diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt index 8ed741ae2..e6ce82f2b 100644 --- a/npc/jobs/1-1/mage.txt +++ b/npc/jobs/1-1/mage.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -14,12 +14,13 @@ //= v1.2 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller] +//= 1.5 Now saves/restores all quest skills [Lupus] //============================================================ // -- Expert Mage -- geffen_in.gat,164,124,4 script Expert Mage 123,{ - callfunc "F_ToHigh",Job_Mage_High,"High Mage",Job_High_Wizard,"High Wizard",157,0,0,0,"Expert Mage"; + callfunc "F_ToHigh",Job_Mage_High,"High Mage",Job_High_Wizard,"Expert Mage"; if(BaseJob==Job_Novice && job_magician_q >= 1) goto L_BeMage; mes "[Expert Mage]"; diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt index 1d155ef64..cec41e4f3 100644 --- a/npc/jobs/1-1/merchant.txt +++ b/npc/jobs/1-1/merchant.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -14,13 +14,14 @@ //= v1.3 Added Baby Class support [Lupus] //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller] //= 1.5 Changed Prontera->Izlude teleport price to 600 [Lupus] +//= 1.6 Now saves/restores all quest skills [Lupus] //============================================================ // == Guild NPCs == // -- Mahnsoo -- alberta_in.gat,53,43,6 script Chief Mahnsoo 86,{ - callfunc "F_ToHigh",Job_Merchant_High,"Merchant High",Job_Whitesmith,"White Smith",153,154,155,0,"Chief Mahnsoo"; + callfunc "F_ToHigh",Job_Merchant_High,"Merchant High",Job_Whitesmith,"Chief Mahnsoo"; mes "[Chief Mahnsoo]"; if(BaseJob==Job_Novice && job_merchant_q3 == 4) goto L_MakeMerc; if(BaseJob==Job_Novice && job_merchant_q3 == 3) goto L_GiveRecpt; diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt index 2e5c0c63c..76ec9d464 100644 --- a/npc/jobs/1-1/swordman.txt +++ b/npc/jobs/1-1/swordman.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -17,6 +17,7 @@ //= and are limited to 7min to complete the quest [Fredzilla] //= v1.5 Optimised and moved first checker to Jfunc1-1 [massdriller] //= 1.6 Fixed possible EXP abuse [Lupus] +//= 1.7 Now saves/restores all quest skills [Lupus] //============================================================ @@ -55,7 +56,7 @@ izlude_in.gat,62,170,0 script w1039 45,1,1,{ // == Npcs == // -- Master Swordsman -- izlude_in.gat,74,172,5 script Master Swordsman 119,{ - callfunc "F_ToHigh",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Lord Knight",144,145,146,0,"Master Swordsman"; + callfunc "F_ToHigh",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Master Swordsman"; mes "[Master Swordsman]"; if(BaseJob==Job_Novice && job_sword_q == 2) goto L_Done; mes "Welcome to the Swordsman Association! So.. What business brings you to us?"; diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt index 0d1361927..0359458ad 100644 --- a/npc/jobs/1-1/thief.txt +++ b/npc/jobs/1-1/thief.txt @@ -14,6 +14,7 @@ //= 1.3 Added Baby Class support [Lupus] //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller] //= Fixed possible EXP abuse [Lupus] +//= 1.5 Now saves/restores all quest skills [Lupus] //============================================================ @@ -208,7 +209,7 @@ M_Menu: // -- Test Grader -- moc_prydb1.gat,42,133,2 script Comrade Brad 118,{ - callfunc "F_ToHigh",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross",149,150,151,152,"Brad"; + callfunc "F_ToHigh",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Brad"; if(BaseJob == 0) goto L_Novice; if(BaseJob == 6) goto L_Thief; diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt index fb15f3fd2..ba86d01f4 100644 --- a/npc/jobs/2-1a/AssassinCross.txt +++ b/npc/jobs/2-1a/AssassinCross.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== Assassin Cross ==- valkyrie.gat,44,58,6 script Assassin Cross 725,{ - callfunc "F_Rebirth",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross",149,150,151,152; + callfunc "F_Rebirth",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross"; } diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt index 50a79ff24..5b94bc708 100644 --- a/npc/jobs/2-1a/HighPriest.txt +++ b/npc/jobs/2-1a/HighPriest.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== High Priest ==- valkyrie.gat,44,42,6 script High Priest 60,{ - callfunc "F_Rebirth",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"High Priest",156,0,0,0; + callfunc "F_Rebirth",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"High Priest"; } diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt index 17823200a..f50a84f28 100644 --- a/npc/jobs/2-1a/HighWizard.txt +++ b/npc/jobs/2-1a/HighWizard.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== High Wizard ==- valkyrie.gat,44,47,6 script High Wizard 735,{ - callfunc "F_Rebirth",Job_Mage_High,"High Mage",Job_High_Wizard,"High Wizard",157,0,0,0; + callfunc "F_Rebirth",Job_Mage_High,"High Mage",Job_High_Wizard,"High Wizard"; } diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt index 29de26b90..7497e7f50 100644 --- a/npc/jobs/2-1a/LordKnight.txt +++ b/npc/jobs/2-1a/LordKnight.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== Lord Knight ==- valkyrie.gat,44,39,6 script Lord Knight 56,{ - callfunc "F_Rebirth",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Lord Knight",144,145,146,0; + callfunc "F_Rebirth",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Lord Knight"; } diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt index 54764c3b6..77c787726 100644 --- a/npc/jobs/2-1a/Sniper.txt +++ b/npc/jobs/2-1a/Sniper.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== Sniper ==- valkyrie.gat,44,55,6 script Sniper 727,{ - callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Sniper,"Sniper",147,148,0,0; + callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Sniper,"Sniper"; } diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt index 39f00c9e9..0ba61afef 100644 --- a/npc/jobs/2-1a/WhiteSmith.txt +++ b/npc/jobs/2-1a/WhiteSmith.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== White Smith ==- valkyrie.gat,44,51,6 script White Smith 726,{ - callfunc "F_Rebirth",Job_Merchant_High,"Merchant High",Job_Whitesmith,"White Smith",153,154,155,0; + callfunc "F_Rebirth",Job_Merchant_High,"Merchant High",Job_Whitesmith,"White Smith"; } diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt index c104ee0af..17cf9238d 100644 --- a/npc/jobs/2-2a/Champion.txt +++ b/npc/jobs/2-2a/Champion.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== Champion ==- valkyrie.gat,53,42,4 script Champion 52,{ - callfunc "F_Rebirth",Job_Acolyte_High,"Acolyte High",Job_Champion,"Champion",156,0,0,0; + callfunc "F_Rebirth",Job_Acolyte_High,"Acolyte High",Job_Champion,"Champion"; } diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt index 3fabccefb..0caf3b428 100644 --- a/npc/jobs/2-2a/Clown.txt +++ b/npc/jobs/2-2a/Clown.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== Clown ==- valkyrie.gat,53,54,4z script Clown 741,{ - callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Clown,"Clown",147,148,0,0; + callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Clown,"Clown"; } diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt index 6a5e7734c..3f76dbae6 100644 --- a/npc/jobs/2-2a/Creator.txt +++ b/npc/jobs/2-2a/Creator.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== Creator ==- valkyrie.gat,53,50,6 script Creator 122,{ - callfunc "F_Rebirth",Job_Merchant_High,"Merchant High",Job_Creator,"Creator",153,154,155,0; + callfunc "F_Rebirth",Job_Merchant_High,"Merchant High",Job_Creator,"Creator"; } diff --git a/npc/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt index 989a9336a..033b508ef 100644 --- a/npc/jobs/2-2a/Gypsy.txt +++ b/npc/jobs/2-2a/Gypsy.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== Gypsy ==- valkyrie.gat,53,56,4 script Gypsy 101,{ - callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Gypsy,"Gypsy",147,148,0,0; + callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Gypsy,"Gypsy"; } diff --git a/npc/jobs/2-2a/Paladin.txt b/npc/jobs/2-2a/Paladin.txt index f17429f76..d607fb75d 100644 --- a/npc/jobs/2-2a/Paladin.txt +++ b/npc/jobs/2-2a/Paladin.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== Paladin ==- valkyrie.gat,53,39,4 script Paladin 752,{ - callfunc "F_Rebirth",Job_Swordman_High,"Swordman High",Job_Paladin,"Paladin",144,145,146,0; + callfunc "F_Rebirth",Job_Swordman_High,"Swordman High",Job_Paladin,"Paladin"; } diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt index 52f3cb2d6..f1cd8dcba 100644 --- a/npc/jobs/2-2a/Professor.txt +++ b/npc/jobs/2-2a/Professor.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== Professor ==- valkyrie.gat,53,47,4 script Professor 743,{ - callfunc "F_Rebirth",Job_Mage_High,"High Mage",Job_Professor,"Professor",157,0,0,0; + callfunc "F_Rebirth",Job_Mage_High,"High Mage",Job_Professor,"Professor"; } diff --git a/npc/jobs/2-2a/Stalker.txt b/npc/jobs/2-2a/Stalker.txt index 36bd2d37c..83f1a18d7 100644 --- a/npc/jobs/2-2a/Stalker.txt +++ b/npc/jobs/2-2a/Stalker.txt @@ -4,7 +4,7 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -12,9 +12,10 @@ //===== Additional Comments: ================================= //= v1.1 Made all into functions, additional checks, etc. [Lupus] //= v1.2 Made numbers into constants. [Vicious] +//= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ // -== Stalker ==- valkyrie.gat,53,58,4 script Stalker 747,{ - callfunc "F_Rebirth",Job_Thief_High,"Thief High",Job_Stalker,"Stalker",149,150,151,152; + callfunc "F_Rebirth",Job_Thief_High,"Thief High",Job_Stalker,"Stalker"; } -- cgit v1.2.3-70-g09d2