summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsamuray22 <samuray22@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-06 05:43:21 +0000
committersamuray22 <samuray22@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-06 05:43:21 +0000
commitad95c2ba955e42d74afffbb6b9b333f69a3f1b1e (patch)
tree493d02d74e378d8012f4c9456cb4d6d4af2f0c31
parent90a72671b0768a73e32d832f29a828bbb00e2477 (diff)
downloadhercules-ad95c2ba955e42d74afffbb6b9b333f69a3f1b1e.tar.gz
hercules-ad95c2ba955e42d74afffbb6b9b333f69a3f1b1e.tar.bz2
hercules-ad95c2ba955e42d74afffbb6b9b333f69a3f1b1e.tar.xz
hercules-ad95c2ba955e42d74afffbb6b9b333f69a3f1b1e.zip
* Fixed a little Error with a label on Hall Of Fame. (bugreport:722)
* Fixed another typo error in Novice Training Ground. (bugreport:740) * Fixed a typo error in duplicates of Mr.Smile Quest. (bugreport:749) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12018 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/custom/Lance/FR_HallOfFame.c32
-rw-r--r--npc/jobs/novice/novice.txt5
-rw-r--r--npc/quests/mrsmile.txt5
4 files changed, 29 insertions, 17 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 5b600c94a..f45158610 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
Date Added
======
+2008/01/06
+ * Fixed a little Error with a label on Hall Of Fame. (bugreport:722) [Samuray22]
+ * Fixed another typo error in Novice Training Ground. (bugreport:740)
+ * Fixed a typo error in duplicates of Mr.Smile Quest. (bugreport:749)
2008/01/05
* Rev. 12014 Updated Kunlun NPCs and warps. [L0ne_W0lf]
- Didn't update the Kunlun 'Power' npcs
diff --git a/npc/custom/Lance/FR_HallOfFame.c b/npc/custom/Lance/FR_HallOfFame.c
index 6cd2b5f13..071b22b72 100644
--- a/npc/custom/Lance/FR_HallOfFame.c
+++ b/npc/custom/Lance/FR_HallOfFame.c
@@ -5,7 +5,7 @@
//= [Lance]
//= Idea from emilylee78
//===== Version =============================================
-//= 2.3 FINAL
+//= 2.4 FINAL
//===== Compatible With =====================================
//= eAthena SVN and Freya SVN
//===== Description =========================================
@@ -31,9 +31,11 @@
//= 2.1 - Typo.. again.. T_T [Lance]
//= 2.2 - Minor updates and added Jury [Lance]
//= 2.3 - Utilizing eAthena's new scripting engine [Lance]
+//= 2.4 - Minor bug fix with event script label (bugport:722) [Samura22]
//===========================================================
prontera,0,0,0 script OnPCLoginEvent -1,{
+OnPCLoginEvent:
callfunc "HallOfFameInit";
end;
@@ -91,6 +93,7 @@ OnClock0000:
}
prontera,0,0,0 script PCLogoutEvent -1,{
+OnPCLogoutEvent:
callfunc "HallOfFameInit";
end;
}
@@ -219,31 +222,34 @@ L_End:
function script hallOfFameNewEntry {
- if(getarg(0) == 0 || getarg(1) != $HoF_LadderName$[getarg(0) - 1]) {
+ if(getarg(0) == 0) goto L_New_Entry;
+ else if(getarg(1) != $HoF_LadderName$[getarg(0) - 1]) goto L_New_Entry;
+ return;
+
+L_New_Entry:
set @startPos, getarg(0);
copyarray @HoF_LadderNameB$[0], $HoF_LadderName$[@startPos], $HoF_totalCount;
copyarray @HoF_LadderBLevelB[0], $HoF_LadderBLevel[@startPos], $HoF_totalCount;
copyarray @HoF_LadderJLevelB[0], $HoF_LadderJLevel[@startPos], $HoF_totalCount;
copyarray @HoF_LadderZenyB[0], $HoF_LadderZeny[@startPos], $HoF_totalCount;
- set $HoF_LadderName$[@startPos], getarg(1);
- set $HoF_LadderBLevel[@startPos], getarg(2);
- set $HoF_LadderJLevel[@startPos], getarg(3);
- set $HoF_LadderZeny[@startPos], getarg(4);
+ setarray $HoF_LadderName$[@startPos], getarg(1);
+ setarray $HoF_LadderBLevel[@startPos], getarg(2);
+ setarray $HoF_LadderJLevel[@startPos], getarg(3);
+ setarray $HoF_LadderZeny[@startPos], getarg(4);
set @startPos, @startPos + 1;
- set @limitPos, $HoF_totalCount - @startPos;
+ set @limitPos, $HoF_totalCount - @startPos + 1;
copyarray $HoF_LadderName$[@startPos], @HoF_LadderNameB$[0], @limitPos;
copyarray $HoF_LadderBLevel[@startPos], @HoF_LadderBLevelB[0], @limitPos;
copyarray $HoF_LadderJLevel[@startPos], @HoF_LadderJLevelB[0], @limitPos;
copyarray $HoF_LadderZeny[@startPos], @HoF_LadderZenyB[0], @limitPos;
announce "[Hall of Fame] " + getarg(1) + " has made his/herself onto the No. " + @startPos + " ranking in Hall of Fame!", bc_all;
- }
- return;
+ return;
}
function script printHallOfFame {
if(getarg(0) == 1) {
mes "[Hall of Fame] - Last Week's Rankings";
- for(set @loop, 0; @loop < $HoF_totalCount; set @loop, @loop + 1){
+ for(set @loop, 0; @loop <= $HoF_totalCount; set @loop, @loop + 1){
mes "^ff0000";
mes "Position No. " + (@loop + 1) + ":^0000ff";
mes "+================================+";
@@ -255,7 +261,7 @@ function script printHallOfFame {
}
} else {
mes "[Hall of Fame] - Current Rankings";
- for(set @loop, 0; @loop < $HoF_totalCount; set @loop, @loop + 1){
+ for(set @loop, 0; @loop <= $HoF_totalCount; set @loop, @loop + 1){
mes "^ff0000";
mes "Position No. " + (@loop + 1) + ":^0000ff";
mes "+================================+";
@@ -269,7 +275,7 @@ function script printHallOfFame {
return;
}
-prontera,180,200,4 script Jury 109,{
+prontera,164,134,2 script Jury 109,{
mes "[Jury]";
mes "Good day. Would you like to view the Hall of Fame?";
next;
@@ -294,4 +300,4 @@ L_QUIT:
mes "Have a nice day then.";
close;
-} \ No newline at end of file
+}
diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index 64233dbf1..a2e91bb3e 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Dr.Evil & MasterOfMuppets
//===== Current Version: =====================================
-//= 1.7b
+//= 1.7c
//===== Compatible With: =====================================
//= eAthena SVN 3422+(Requires jA Script System)
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.7 Now Kafra Tickets are given at correct NPC/Actions [Lupus]
//= 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]
//============================================================
//====================================================================
@@ -2916,7 +2917,7 @@ L_cancel:
set NOV_3_ARCHER,NOV_3_ARCHER+1;break;
case 3: set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;
set NOV_3_THIEF,NOV_3_THIEF+1;
- set NOV_3_MERCHANT,NOV_3_MERCHAN+1;
+ set NOV_3_MERCHANT,NOV_3_MERCHANT+1;
}
mes "[Hanson]";
mes "You happened to pick up";
diff --git a/npc/quests/mrsmile.txt b/npc/quests/mrsmile.txt
index e3d7f5eda..27ca632cc 100644
--- a/npc/quests/mrsmile.txt
+++ b/npc/quests/mrsmile.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88, Akaru
//===== Current Version: =====================================
-//= 1.4
+//= 1.4a
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -11,6 +11,7 @@
//= Trade Clover, Fluff and Jellopy for a Mr. Smile mask.
//===== Additional Comments: =================================
//= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.4a Fixed a little Typo error in duplicates. (bugreport:749) [Samuray22]
//============================================================
prontera,157,187,4 script Smile Assistance#prt::SmileHelper 92,{
@@ -99,7 +100,7 @@ aldebaran,136,135,4 duplicate(SmileHelper) Smile Assistance#alde 92
geffen,119,107,4 duplicate(SmileHelper) Smile Assistance#gef 92
alberta,113,53,4 duplicate(SmileHelper) Smile Assistance#alb 92
payon,186,104,5 duplicate(SmileHelper) Smile Assistance#pay 92
-izlude,129,118,4 duplicate(SmileHelper) Smile Assistance:iz 92
+izlude,129,118,4 duplicate(SmileHelper) Smile Assistance#iz 92
//============================================================
// Old changelog