summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/006-9/ctrl.txt10
-rw-r--r--npc/functions/hub.txt2
-rw-r--r--npc/functions/scoreboards.txt44
3 files changed, 43 insertions, 13 deletions
diff --git a/npc/006-9/ctrl.txt b/npc/006-9/ctrl.txt
index b533a6820..1a3861c6e 100644
--- a/npc/006-9/ctrl.txt
+++ b/npc/006-9/ctrl.txt
@@ -30,9 +30,17 @@ OnTouch:
if (Zeny < .price) close;
next;
mesc l("Begin?");
- if (askyesno() == ASK_NO || Zeny < .price) {
+ menuint
+ l("Yes"), ASK_YES,
+ l("No"), ASK_NO,
+ l("Scoreboards"), -1;
+ mes "";
+ if (@menuret == ASK_NO || Zeny < .price) {
closeclientdialog;
close;
+ } else if (@menuret < 0) {
+ HallOfBloodbath();
+ close;
}
Zeny-=.price;
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index f836da910..add706461 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -179,7 +179,7 @@ function script HUB_Logout {
}
}
// Died or logged out at Candor Survival
- if (.@mapa$ == "006-9") {
+ if (.@mapa$ == "006-9" && $@SURVIVAL_CANDOR) {
.@score = gettimetick(2)-$@SURVIVAL_CANDOR;
if (.@score > SCANDORPTS) {
SCANDORPTS=.@score;
diff --git a/npc/functions/scoreboards.txt b/npc/functions/scoreboards.txt
index f280dc6a4..5d10c6697 100644
--- a/npc/functions/scoreboards.txt
+++ b/npc/functions/scoreboards.txt
@@ -13,6 +13,7 @@ function script ScoreboardsReload {
.@nb = query_sql("select char_name, command from `atcommandlog` ORDER BY atcommand_id DESC LIMIT 15", $@hogm_name$, $@hogm_value$);
.@nb = query_sql("select name, guild_lv from `guild` WHERE `guild_id`!=1 ORDER BY guild_lv DESC LIMIT 5", $@hoguild_name$, $@hoguild_value);
.@nb = query_sql("SELECT c.name, i.value FROM `char_reg_num_db` AS i, `char` AS c WHERE i.key='CRAZYPOINTS' AND i.char_id=c.char_id ORDER BY i.value DESC LIMIT 10", $@cfefe_name$, $@cfefe_value);
+ .@nb = query_sql("SELECT c.name, i.value FROM `char_reg_num_db` AS i, `char` AS c WHERE i.key='SCANDORPTS' AND i.char_id=c.char_id ORDER BY i.value DESC LIMIT 10", $@blood_name$, $@blood_value);
.@nb = query_sql("SELECT c.name, i.value FROM `char_reg_num_db` AS i, `char` AS c WHERE i.key='UDTRANK' AND i.char_id=c.char_id ORDER BY i.value DESC LIMIT 10", $@udt_name$, $@udt_value);
.@nb = query_sql("SELECT c.name, i.value FROM `char_reg_num_db` AS i, `char` AS c WHERE i.key='AFKING' AND i.char_id=c.char_id ORDER BY i.value DESC LIMIT 10", $@afk_name$, $@afk_value);
.@nb = query_sql("SELECT c.name, i.value FROM `char_reg_num_db` AS i, `char` AS c WHERE i.key='HONOR' AND i.char_id=c.char_id ORDER BY i.value DESC LIMIT 10", $@hof_name$, $@hof_value);
@@ -235,6 +236,22 @@ function script HallOfCandor {
return;
}
+function script HallOfBloodbath {
+ mes "";
+ mes l("##BHall Of Candor's Bloodbath: TOP 10##b");
+ mes("1."+$@blood_name$[0]+" ("+FuzzyTime(gettimetick(2)-$@blood_value[0])+")");
+ mes("2."+$@blood_name$[1]+" ("+FuzzyTime(gettimetick(2)-$@blood_value[1])+")");
+ mes("3."+$@blood_name$[2]+" ("+FuzzyTime(gettimetick(2)-$@blood_value[2])+")");
+ mes("4."+$@blood_name$[3]+" ("+FuzzyTime(gettimetick(2)-$@blood_value[3])+")");
+ mes("5."+$@blood_name$[4]+" ("+FuzzyTime(gettimetick(2)-$@blood_value[4])+")");
+ mes("6."+$@blood_name$[5]+" ("+FuzzyTime(gettimetick(2)-$@blood_value[5])+")");
+ mes("7."+$@blood_name$[6]+" ("+FuzzyTime(gettimetick(2)-$@blood_value[6])+")");
+ mes("8."+$@blood_name$[7]+" ("+FuzzyTime(gettimetick(2)-$@blood_value[7])+")");
+ mes("9."+$@blood_name$[8]+" ("+FuzzyTime(gettimetick(2)-$@blood_value[8])+")");
+ mes("10."+$@blood_name$[9]+" ("+FuzzyTime(gettimetick(2)-$@blood_value[9])+")");
+ return;
+}
+
function script HallOfUDT {
mes "";
mes l("##BHall Of UDT Challenge: TOP 10##b");
@@ -795,6 +812,7 @@ OnCall:
l("Hall Of GM Commands"),
l("Hall Of Guilds"),
l("Hall Of Crazyfefe Battle"),
+ l("Hall Of Candor Bloodbath"),
l("Hall Of Doppelganger Arena"),
l("Hall Of AF King"),
l("Hall Of Deaths"),
@@ -843,18 +861,22 @@ OnCall:
next;
break;
case 9:
- HallOfUDT();
+ HallOfBloodbath();
next;
break;
case 10:
- HallOfAFK();
+ HallOfUDT();
next;
break;
case 11:
- HallOfDeath();
+ HallOfAFK();
next;
break;
case 12:
+ HallOfDeath();
+ next;
+ break;
+ case 13:
mes b(l("Top 10 - Summer Ched's Event"));
mes("1."+$@ched_name$[0]+" ("+$@ched_value[0]+")");
mes("2."+$@ched_name$[1]+" ("+$@ched_value[1]+")");
@@ -868,37 +890,37 @@ OnCall:
mes("10."+$@ched_name$[9]+" ("+$@ched_value[9]+")");
next;
break;
- case 13:
+ case 14:
mes l("Hero: ")+$MOST_HEROIC$;
mes "";
HallOfHonor();
next;
break;
- case 14:
+ case 15:
HallOfAcademic();
next;
break;
- case 15:
+ case 16:
HallOf2018();
next;
break;
- case 16:
+ case 17:
HallOf2019();
next;
break;
- case 17:
+ case 18:
HallOf2020();
next;
break;
- case 18:
+ case 19:
HallOf2021();
next;
break;
- case 19:
+ case 20:
HallOf2022();
next;
break;
- case 20:
+ case 21:
HallOfGame();
next;
break;