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/jobs/2-2/dancer.txt | 58 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'npc/jobs/2-2/dancer.txt') diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index b52d808fd..88157d40b 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -1,18 +1,16 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Dancer Job Quest //===== By: ================================================== //= Kalen - Original jAthena //= Fredzilla - Converted, Lupus -//===== Current Version: ===================================== -//= 3.7 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Current Version: ===================================== +//= 3.7a +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Dancer classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 3.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= No longer uses function "F_BlockHigh" +//= No longer uses function "F_BlockHigh" //= 3.2a Deleted unused variables. [Samuray22] //= 3.3 Updated waiting room. (Removes global var) [L0ne_W0lf] //= 3.4 Fixed bad variables, bugreport:1685 [Brainstorm] @@ -20,6 +18,7 @@ //= 3.6 Applied Correction bug with for loop. [L0ne_W0lf] //= 3.6a Fixed a little Exploit to bug the quest with a timeout. (bugreport:2252) [Samuray22] //= 3.7 Added Quest Log commands. [Kisuka] +//= 3.7a Fixed a label execution. [Euphy] //============================================================ comodo,180,153,4 script Sonotora#1 90,{ @@ -132,7 +131,7 @@ job_duncer,43,93,4 script Aile#da 724,{ cutin "",255; end; } - if (DANC_Q == 0 && sex == 0 && BaseJob == Job_Archer) { + if (DANC_Q == 0 && Sex == 0 && BaseJob == Job_Archer) { cutin "job_dancer_eir01",2; mes "[Aile]"; mes "Welcome~!"; @@ -208,7 +207,7 @@ job_duncer,43,93,4 script Aile#da 724,{ cutin "",255; end; } - else if (sex == 1) { + else if (Sex == 1) { cutin "job_dancer_eir03",2; mes "[Aile]"; mes "Welco--Mmm?"; @@ -317,7 +316,7 @@ job_duncer,43,93,4 script Aile#da 724,{ mes "tuition fee."; next; cutin "job_dancer_eir01",2; - set zeny,zeny-10000; + set Zeny, Zeny-10000; mes "[Aile]"; mes "Next, go to ^CD6889Bijou^000000, who is in charge of the interviewing process. She will have a couple of things she'll need to ask you."; set DANC_Q,5; @@ -893,7 +892,7 @@ job_duncer,95,93,4 script Bijou#da 101,{ } // Waiting Room -//============================================================ +//============================================================ job_duncer,32,154,1 script Waiting Room#dance 66,{ end; @@ -935,7 +934,7 @@ job_duncer,32,154,1 script Waiting Room#click 66,{ } // Dance Timer -//============================================================ +//============================================================ job_duncer,69,105,0 script Bijou#dance_timer -1,{ OnEnable: initnpctimer; @@ -1288,7 +1287,7 @@ OnEnable: } // Dance Move Triggers -//============================================================ +//============================================================ - script dancestep::StepTrigger -1,1,1,{ OnTouch: donpcevent "Backdancer#1::OnOmg"; @@ -1322,19 +1321,19 @@ OnDisable: } // Backup Dancers -//============================================================ -job_duncer,63,110,4 script Backdancer#1::BackDancer 724,{ +//============================================================ +job_duncer,63,110,4 script Backdancer#1 724,{ end; OnSmile: - Emotion e_no1; + emotion e_no1; donpcevent "Backdancer#2::OnSmile"; donpcevent "Backdancer#3::OnSmile"; donpcevent "Backdancer#4::OnSmile"; end; OnOmg: - Emotion e_omg; + emotion e_omg; donpcevent "Backdancer#2::OnOmg"; donpcevent "Backdancer#3::OnOmg"; donpcevent "Backdancer#4::OnOmg"; @@ -1345,11 +1344,11 @@ job_duncer,66,113,4 script Backdancer#2 724,{ end; OnSmile: - Emotion e_no1; + emotion e_no1; end; OnOmg: - Emotion e_omg; + emotion e_omg; end; } @@ -1357,11 +1356,11 @@ job_duncer,72,113,4 script Backdancer#3 724,{ end; OnSmile: - Emotion e_no1; + emotion e_no1; end; OnOmg: - Emotion e_omg; + emotion e_omg; end; } @@ -1369,17 +1368,17 @@ job_duncer,75,110,4 script Backdancer#4 724,{ end; OnSmile: - Emotion e_no1; + emotion e_no1; end; OnOmg: - Emotion e_omg; + emotion e_omg; end; } -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.1 Removed the warp I left here my accident, added a check for using //= Improved Concentration and arrow shower, people could get away with it //= [Fredzilla] @@ -1389,14 +1388,15 @@ OnOmg: //= along with some optimization. [Fredzilla] //= 1.5 Added Baby Class Support [Fredzilla] //= 1.6 Added a func which prevent advanced classes passing -//= 2nd Job Quests again. It also guides adv classes where -//= to go. [Lupus] +//= 2nd Job Quests again. It also guides adv classes where +//= to go. [Lupus] //= 2.0 Changed numbers to constants. [Vicious] //= 2.1 Script check #1. [Lance] //= 2.2 Fixed unpassable part, thx2 Alis [Lupus] //= 2.3 Updated initnpctimer to attach player to jobDq script [Skotlex] //= 2.4 Attached chrid to be able obtain player's SP on mobs death, optimized a bit [Lupus] //= 2.5 Final fix of chrid issues, changed 'Improved -//= Concentration' to 'Attention Concentrate' [Lupus] +//= Concentration' to 'Attention Concentrate' [Lupus] //= 3.0 Some optimization, typos, added missing dialogues (4Kb lighter) [Lupus] //= 3.1 Implemented JOBLVL as in other quests [Lupus] +//============================================================ -- cgit v1.2.3-60-g2f50