From 2164720f551bc4516cf60d794ca26f8796860515 Mon Sep 17 00:00:00 2001 From: samuray22 Date: Mon, 12 Nov 2007 13:47:54 +0000 Subject: * Deleted unused variables in some Job Quest (2-1 & 2-2). -Thanks to Ai4rei git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11726 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/jobs/2-1/assassin.txt | 7 +++---- npc/jobs/2-1/hunter.txt | 5 ++--- npc/jobs/2-1/knight.txt | 5 ++--- npc/jobs/2-1/priest.txt | 4 ++-- npc/jobs/2-2/crusader.txt | 6 +++--- npc/jobs/2-2/dancer.txt | 4 ++-- npc/jobs/2-2/monk.txt | 4 ++-- npc/jobs/2-2/rogue.txt | 8 ++------ npc/jobs/2-2/sage.txt | 4 ++-- 10 files changed, 22 insertions(+), 27 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 333e55baf..addc9b5e5 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,8 @@ Date Added ====== 2007/11/13 + * Deleted unused variables in some Job Quest (2-1 & 2-2). [Samuray22] + -Thanks to Ai4rei * Corrected a minor error respect to the header in Star Gladiator Quest. [Samuray22] * Updated Star Gladiator Quest to the Aegis Standards. [Samuray22] - Bug testing required. diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index ab6c3cbc4..6398d565f 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 2.7 +//= 2.8a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -35,6 +35,7 @@ //= 2.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 2.7 Several bugfixes with the help of Samuray22 and Barron-Monster. [L0ne_W0lf] //= 2.8 Removed duplicate warps. [L0ne_W0lf] +//= 2.8a Deleted unused variables. [Samuray22] //============================================================ in_moc_16,19,33,1 script Guildsman#asn 55,{ @@ -590,8 +591,7 @@ OnTouch: next; mes "[Assassin 'Khai']"; mes "Fill out the application form with your name and job level."; - next; - set name,PcName; + next set joblvl,JobLevel; mes "[Assassin 'Khai']"; mes "" + strcharinfo(0) + "?"; @@ -1895,7 +1895,6 @@ OnTouch: mes "Please give me"; mes "one second..."; next; - set name,PcName; mapannounce "in_moc_16","Those involved with the testing of " + strcharinfo(0) + ", please gather before me.",bc_map; mes "[Guildmaster]"; mes "Those involved with the testing of " + strcharinfo(0) + ", please gather before me."; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 6f5491115..3f2e9f6b5 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -5,7 +5,7 @@ //= Converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.9 +//= 2.9a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -41,6 +41,7 @@ //= 2.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 2.8 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf] //= 2.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 2.9a Deleted unused variables. [Samuray22] //============================================================ // Notices in the old Hunter Guild. @@ -218,7 +219,6 @@ L_AskQuestions: mes "[Hunter Sherin]"; mes "I just want to know how you think about life, and why you want to become a Hunter, so there's no need to be nervous."; next; - set knight_t,0; mes "[Hunter Sherin]"; mes "Well then,"; mes "let's begin."; @@ -402,7 +402,6 @@ L_AskQuestions: mes "Welcome back...!"; mes "Well, let's start with the interview. This time, carefully think about the answers to each question."; next; - set knight_t,0; mes "[Hunter Sherin]"; mes "Well then,"; mes "let's begin."; diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index a64d60a7c..76651d257 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -5,7 +5,7 @@ //= Converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.6 +//= 2.7 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -32,6 +32,7 @@ //= 2.5 Fixes a small bug with making claymores. [L0ne_W0lf] //= Corrected usages of killmonster and killmonsterall. //= 2.6 Corrected an improper areawarp destination. [L0ne_W0lf] +//= 2.7 Deleted unused variables. [Samuray22] //============================================================ prt_in,88,101,4 script Chivalry Captain#knt 56,{ @@ -1848,7 +1849,6 @@ L_AskQuestions: mes "Well then,"; mes "let's begin!"; next; - set knight_t,0; mes "[Lady Amy]"; mes "You are a Knight and you are looking for a party in Morroc."; mes "How would you go about doing so?"; @@ -2255,7 +2255,6 @@ prt_in,87,92,4 script Sir Gray#knt 119,{ mes "everyone else's"; mes "test?"; next; - set knight_t,0; mes "[Sir Gray]"; mes "Then shall"; mes "we begin mine?"; diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index db8a64825..082c9a6d5 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -5,7 +5,7 @@ //= Converted by: kobra_k88. //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.4 +//= 2.4a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -26,6 +26,7 @@ //= 2.3 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf] //= 2.3a More bug fixes. [L0ne_W0lf] //= 2.4 Changed Marthilda to Mathilda. [L0ne_W0llf] +//= 2.4a Deleted unused variables. [Samuray22] //========================================================== prt_church,16,41,4 script High Bishop#prst 60,{ @@ -1549,7 +1550,6 @@ OnTouch: close; } else if (BaseClass == Job_Acolyte) { - set name,PcName; mes "[Baphomet]"; mes "Greetings."; next; diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index 588650ba1..d3c17ec83 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -4,7 +4,7 @@ //= Made by: Black Dragon //= Converted by: Shin //===== Current Version: ===================================== -//= 2.9 +//= 2.9a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -27,6 +27,7 @@ //= 2.7 Fixed Some variables like ".@item", and changed to "@item". [Samuray22] //= 2.8 Fixed a little minor bug. [Samuray22] //= 2.9 Minor fixes, typos, an incorrect answer. Thanks to yyCC. [L0ne_W0lf] +//= 2.9a Deleted unused variables. [Samuray22] //============================================================ @@ -505,8 +506,7 @@ prt_church,95,127,3 script Crusader 745,{ mes "Listen carefully, and"; mes "choose the correct answer."; next; -C_Questions: - set .@cru_t,0; +C_Questions: set .@cru_m,rand(1,3); if (.@cru_m == 1) { mes "[Gabriel Valentine]"; diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index 0dfe76990..d568f5f39 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -4,7 +4,7 @@ //= Kalen - Original jAthena //= Fredzilla - Converted, Lupus //===== Current Version: ===================================== -//= 3.2 +//= 3.2a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -13,6 +13,7 @@ //===== Additional Comments: ================================= //= 3.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" +//= 3.2a Deleted unused variables. [Samuray22] //============================================================ comodo,180,153,4 script Sonotora#1 90,{ @@ -151,7 +152,6 @@ job_duncer,43,93,4 script Aile#da 724,{ next; if (select("Fill out the application.:I'll pass.") == 1) { if (JobLevel > 39) { - set name,PcName; cutin "job_dancer_eir02",2; mes "[Aile]"; mes "Good choice!!"; diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 47bd038eb..2f031c4f9 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Dino9021, Edited / Translated by Celest //===== Current Version: ===================================== -//= 2.3 +//= 2.3a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 2.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 2.3a Deleted unused variables. [Samuray22] //============================================================ prt_monk,59,247,1 script Guarding Monk#mk 120,6,2,{ @@ -1950,7 +1951,6 @@ prt_monk,199,169,3 script Door Keeper#mk 746,{ close; } else if (MONK_Q > 14 && MONK_Q < 25) { - set name,PcName; mes "[Keeper Chorip]"; mes "Is your name " + strcharinfo(0) + "?"; next; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index f29337fe1..1e1cf0569 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 2.4 +//= 2.4a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== Additional Comments: ================================= //= 2.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" +//= 2.4a Deleted unused variables. [Samuray22] //============================================================ morocc,100,104,1 script Thug#rg 118,{ @@ -967,7 +968,6 @@ OnTouch: mes "Who would dare"; mes "intrude my territory?"; next; - set rogue_t,0; switch(select("My father:Aragham:Aragon:Legolas")) { case 1: mes "[" + strcharinfo(0) + "]"; @@ -1038,8 +1038,6 @@ OnTouch: mes "Who would dare"; mes "intrude my territory?"; next; - set name,PcName; - set rogue_t,0; switch(select("My father:Aragham:Aragon:Legolas")) { case 1: mes "[" + strcharinfo(0) + "]"; @@ -1110,8 +1108,6 @@ OnTouch: mes "Who would dare"; mes "intrude my territory?"; next; - set name,PcName; - set rogue_t,0; switch(select("Anntonio:Aragham:Antonio:Hollgrehenn")) { case 1: mes "[" + strcharinfo(0) + "]"; diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index e22eab91f..ccf7bf69a 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -5,7 +5,7 @@ //= Unknown Translator (1.0) //= Darkchild (1.2) //===== Current Version: ===================================== -//= 2.3 +//= 2.4a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -18,6 +18,7 @@ //= 2.2b ANotehr smaLL bugfix, pointed out by Cara. [L0ne_W0lf] //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 2.4 Fixes bug with first room monsters not being reset. [L0ne_W0lf] +//= 2.4a Deleted unused variables. [Samuray22] //============================================================ yuno_in02,38,61,5 script Dean of the Academy#sa 743,{ @@ -991,7 +992,6 @@ L_AskQuestions: mes "Each correct answer will give you 5 points. When your score reaches 80 points, you pass the test."; next; set sage_m2,rand(1,3); - set sage_t,0; mes "[Claytos Verdo]"; mes "Okay, there's no need to wait."; mes "Answer immediately, or I'll fail you again."; -- cgit v1.2.3-70-g09d2