From c8f2f67e15e471037d115b26cdba88e6bee3c217 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 31 Jul 2020 10:37:22 -0300
Subject: Hall of Academics

---
 npc/027-0/enrique.txt         |  6 +++++-
 npc/functions/scoreboards.txt | 29 ++++++++++++++++++++++++++---
 npc/functions/util.txt        |  2 +-
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/npc/027-0/enrique.txt b/npc/027-0/enrique.txt
index 52189c6e3..5bef3fe19 100644
--- a/npc/027-0/enrique.txt
+++ b/npc/027-0/enrique.txt
@@ -18,7 +18,8 @@
             l("What is the Academy?"),
             l("What are Magic Skill Points?"),
             l("What are Research Points"),
-            l("What is the Scholar Rank?");
+            l("What is the Scholar Rank?"),
+            l("Who are the most famous scholars?");
         mes "";
         switch (@menu) {
         case 1:
@@ -64,6 +65,9 @@
             mesn;
             mesq l("It is something not yet fully implemented.");
             break;
+        case 6:
+            HallOfAcademic();
+            break;
         }
     } while (@menu != 1);
     close;
diff --git a/npc/functions/scoreboards.txt b/npc/functions/scoreboards.txt
index cd665674f..f6e7c875a 100644
--- a/npc/functions/scoreboards.txt
+++ b/npc/functions/scoreboards.txt
@@ -16,6 +16,7 @@ function	script	ScoreboardsReload	{
 	.@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);
+	.@nb = query_sql("SELECT c.name, i.value FROM `char_reg_num_db` AS i, `char` AS c WHERE i.key='ACADEMIC_RANK' AND i.char_id=c.char_id ORDER BY i.value DESC LIMIT 10", $@hoa_name$, $@hoa_value);
 
     // Seasonal Scoreboards
     if (season() == SUMMER || season() == AUTUMN) {
@@ -328,6 +329,23 @@ function	script	HallOfAurora	{
     return;
 }
 
+
+function	script	HallOfAcademic	{
+    mes "";
+	mes l("##BHall Of Academics: TOP10##b");
+	mesf("1. %s (%s)",  $@hoa_name$[0], academicrank($@hoa_value[0]));
+	mesf("2. %s (%s)",  $@hoa_name$[1], academicrank($@hoa_value[1]));
+	mesf("3. %s (%s)",  $@hoa_name$[2], academicrank($@hoa_value[2]));
+	mesf("4. %s (%s)",  $@hoa_name$[3], academicrank($@hoa_value[3]));
+	mesf("5. %s (%s)",  $@hoa_name$[4], academicrank($@hoa_value[4]));
+	mesf("6. %s (%s)",  $@hoa_name$[5], academicrank($@hoa_value[5]));
+	mesf("7. %s (%s)",  $@hoa_name$[6], academicrank($@hoa_value[6]));
+	mesf("8. %s (%s)",  $@hoa_name$[7], academicrank($@hoa_value[7]));
+	mesf("9. %s (%s)",  $@hoa_name$[8], academicrank($@hoa_value[8]));
+	mesf("10. %s (%s)", $@hoa_name$[9], academicrank($@hoa_value[9]));
+    return;
+}
+
 // Hall of AFK
 function	script	HallOfAFK	{
     mes "";
@@ -603,6 +621,7 @@ OnCall:
             l("Hall Of AF King"),
             rif(season() == SUMMER || season() == AUTUMN, l("Hall Of Ched")),
             l("Hall Of Fame"),
+            l("Hall Of Academics"),
             l("2018 Event Winners"),
             l("2019 Event Winners"),
             l("2020 Event Winners"),
@@ -671,18 +690,22 @@ OnCall:
             next;
             break;
         case 13:
-            HallOf2018();
+            HallOfAcademic();
             next;
             break;
         case 14:
-            HallOf2019();
+            HallOf2018();
             next;
             break;
         case 15:
-            HallOf2020();
+            HallOf2019();
             next;
             break;
         case 16:
+            HallOf2020();
+            next;
+            break;
+        case 17:
             HallOfGame();
             next;
             break;
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 33d071ded..56a790f6d 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -881,7 +881,7 @@ function	script	mercrank	{
     }
 }
 function	script	academicrank	{
-    switch (ACADEMIC_RANK) {
+    switch (getarg(0, ACADEMIC_RANK)) {
         case 7: return l("Sage");
         case 6: return l("Ph.D");
         case 5: return l("Doctor");
-- 
cgit v1.2.3-60-g2f50