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/re/jobs/3-2/genetic.txt | 4 +--- npc/re/jobs/3-2/minstrel.txt | 12 +++++------- npc/re/jobs/3-2/royal_guard.txt | 16 +++++++--------- npc/re/jobs/3-2/shadow_chaser.txt | 12 +++++------- npc/re/jobs/3-2/sorcerer.txt | 12 +++++------- npc/re/jobs/3-2/sura.txt | 16 +++++++--------- npc/re/jobs/3-2/wanderer.txt | 14 ++++++-------- 7 files changed, 36 insertions(+), 50 deletions(-) (limited to 'npc/re/jobs/3-2') diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index 5ca20d2d3..44124a1d8 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -4,8 +4,6 @@ //= Muad_Dib, Aeomin //===== Current Version: ===================================== //= 1.3a -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Alchemist / Creator -> Genetic. @@ -1044,4 +1042,4 @@ job3_gen01,23,33,0,0 monster Poison Spore 1428,1,7000,0,0 job3_gen01,21,30,0,0 monster Poison Spore 1428,1,7000,0,0 job3_gen01,26,34,0,0 monster Poison Spore 1428,1,7000,0,0 job3_gen01,23,33,0,0 monster Poison Spore 1428,1,7000,0,0 -job3_gen01,21,30,0,0 monster Poison Spore 1428,1,7000,0,0 +job3_gen01,21,30,0,0 monster Poison Spore 1428,1,7000,0,0 \ No newline at end of file diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt index 5ffc84a06..5ddb5bf5d 100644 --- a/npc/re/jobs/3-2/minstrel.txt +++ b/npc/re/jobs/3-2/minstrel.txt @@ -1,15 +1,13 @@ //===== Hercules Script ====================================== //= Minstrel Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Hercules -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Bard / Clown -> Minstrel. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Masao] //= 1.1 Fix the checking of requirements before job change to Minstel [JayPee] //= 1.2 Optimized. [Euphy] @@ -1917,4 +1915,4 @@ prt_in,94,172,4 script Karian#job_min3 480,{ mes "[Karian]"; mes "How did you get in here?"; close; -} +} \ No newline at end of file diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index 1222c23ed..f98861461 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -1,17 +1,16 @@ //===== Hercules Script ====================================== //= Royal Guard Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== -//= 1.1 -//===== Compatible With: ===================================== -//= Hercules -//===== Description: ========================================= +//===== Current Version: ===================================== +//= 1.2 +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Crusader / Paladin -> Royal Guard. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [brAthena] //= 1.1 Updated script. [Euphy] +//= 1.2 Added GM management function. [Euphy] //============================================================ prt_castle,48,161,3 script Middle-aged Gentleman#rg 57,{ @@ -497,8 +496,8 @@ OnTouch: end; } -/* sec_in02,12,43,3 script sorcereryal 57,1,1,{ + callfunc "F_GM_NPC"; switch(select("Royal Guard:Rune Knight:Sorcerer")) { case 1: mes "1~5"; @@ -538,4 +537,3 @@ sec_in02,12,43,3 script sorcereryal 57,1,1,{ close; } } -*/ diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index 313ce7390..30d10abdb 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -1,15 +1,13 @@ //===== Hercules Script ====================================== //= Shadow Chaser Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Hercules -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Rogue / Stalker -> Shadow Chaser. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [ultragunner, Oshinoke] //= 1.1 Standardized. [Euphy] //= 1.2 Updated dialogue. [Joseph] @@ -2503,4 +2501,4 @@ OnTouch: //============================================================ tur_dun03,0,0,0,0 monster Shadow of Deception 2076,1,1000,0,0 ice_dun02,0,0,0,0 monster Shadow of Illusion 2077,1,1000,0,0 -niflheim,0,0,0,0 monster Shadow of Pleasure 2078,1,1000,0,0 +niflheim,0,0,0,0 monster Shadow of Pleasure 2078,1,1000,0,0 \ No newline at end of file diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt index d2cec9242..de934d394 100644 --- a/npc/re/jobs/3-2/sorcerer.txt +++ b/npc/re/jobs/3-2/sorcerer.txt @@ -1,15 +1,13 @@ //===== Hercules Script ====================================== //= Sorcerer Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Hercules -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Sage / Professor -> Sorcerer. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Masao] //= 1.1 Cleaning. [Euphy] //= 1.2 Updated script, optimized. [Euphy] @@ -417,4 +415,4 @@ gef_tower,113,161,5 script Karacas 754,{ thor_v01,64,252,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#1 836 ice_dun01,274,274,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#2 836 mjo_dun03,200,141,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#3 836 -gon_dun02,195,190,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#4 836 +gon_dun02,195,190,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#4 836 \ No newline at end of file diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index 5a0e8e36a..240b453e2 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -1,18 +1,17 @@ //===== Hercules Script ====================================== //= Sura Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib, Gepard -//===== Current Version: ===================================== -//= 1.2 -//===== Compatible With: ===================================== -//= Hercules -//===== Description: ========================================= +//===== Current Version: ===================================== +//= 1.3 +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Monk / Champion -> Sura. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Masao] //= 1.1 Removed disablenpc which causes players stucked in waitingroom. [Joseph] //= 1.2 Updated script, optimized. [Euphy] +//= 1.3 Added GM management function. [Euphy] //============================================================ ve_in,237,125,0 script King Crab#job_shu 107,{ @@ -829,8 +828,8 @@ sword_1-1,223,167,2 script Master#job_shu 483,{ end; } -/* sword_2-1,1,2,0 script Button Girl#sura 66,{ + callfunc "F_GM_NPC"; switch(select("Turn on arena.:Turn off arena.:Turn on the living room.:Turn on Buddy.:Turn on Gara.:Turn off all.:Close")) { case 1: mes "Turn on arena."; @@ -864,4 +863,3 @@ sword_2-1,1,2,0 script Button Girl#sura 66,{ close; } } -*/ diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index fd3b75f59..3c6e097c6 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -1,15 +1,13 @@ //===== Hercules Script ====================================== //= Wanderer Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib, Meyraw -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Hercules -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Dancer / Gypsy -> Wanderer. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. //= 1.1 Updated dialogue to be more official / accurate. Huge thanks to Muad_Dib! [Masao] //= 1.2 Fixed an endless loop in dialogue. @@ -453,7 +451,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{ mes "[" + strcharinfo(0) + "]"; mes "It felt like hearing mommy's lullaby~ It was so beautiful and moving... You are the best artist of our time."; next; - specialeffect 18; + specialeffect EF_STEAL; mes "[Guitar Song]"; mes "Ha ha ha. I know that well, but it feels good to hear a compliment from you!"; next; @@ -1034,4 +1032,4 @@ xmas,145,127,7 duplicate(#wander_xmas) Spectator#xmas2 712 xmas,148,127,7 duplicate(#wander_xmas) Soy#xmas 714 xmas,149,127,1 duplicate(#wander_xmas) Mimi#xmas 714 xmas,151,127,1 duplicate(#wander_xmas) Spectator#xmas3 716 -xmas,154,129,1 duplicate(#wander_xmas) Spectator#xmas4 797 +xmas,154,129,1 duplicate(#wander_xmas) Spectator#xmas4 797 \ No newline at end of file -- cgit v1.2.3-70-g09d2