summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/functions/clear_vars.txt4
-rw-r--r--npc/functions/global_event_handler.txt4
-rw-r--r--npc/functions/scoreboards.txt28
3 files changed, 8 insertions, 28 deletions
diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt
index 76f75054..116cd163 100644
--- a/npc/functions/clear_vars.txt
+++ b/npc/functions/clear_vars.txt
@@ -61,7 +61,9 @@ function script ClearVariables {
//Alchemist - 6+7 (War Quest - Swords again?)
/* Update skill list */
- // Orum
+ // Morgan & Orum
+ if (QL_MORGAN >= 2)
+ learnskill SKILL_CONFRINGO;
if (OrumQuest >= 37)
learnskill SKILL_HELORP;
if (OrumQuest >= 38)
diff --git a/npc/functions/global_event_handler.txt b/npc/functions/global_event_handler.txt
index f611e997..89df294c 100644
--- a/npc/functions/global_event_handler.txt
+++ b/npc/functions/global_event_handler.txt
@@ -35,10 +35,10 @@ OnPCDieEvent:
// Cleanup: Retain chat logs for 24~48 hours
// Cleanup: Retain item logs for 2 months
-OnClock0500:
+OnClock0501:
query_sql("DELETE FROM `picklog` WHERE `time` < '"+sqldate(0, -2)+"'");
query_sql("DELETE FROM `zenylog` WHERE `time` < '"+sqldate(0, -2)+"'");
-OnClock1700:
+OnClock1701:
if (gettime(GETTIME_DAYOFMONTH) > 1)
query_sql("DELETE FROM `chatlog` WHERE `time` < '"+sqldate(-1)+"'");
end;
diff --git a/npc/functions/scoreboards.txt b/npc/functions/scoreboards.txt
index f7d5ddaf..dc21758d 100644
--- a/npc/functions/scoreboards.txt
+++ b/npc/functions/scoreboards.txt
@@ -164,30 +164,8 @@ function script HallOfGame {
// Main script handler for scoreboards
- script @scoreboard NPC_HIDDEN,{
end;
-OnHour00:
-OnHour01:
-OnHour02:
-OnHour03:
-OnHour04:
-OnHour05:
-OnHour06:
-OnHour07:
-OnHour08:
-OnHour09:
-OnHour10:
-OnHour11:
-OnHour12:
-OnHour13:
-OnHour14:
-OnHour15:
-OnHour16:
-OnHour17:
-OnHour18:
-OnHour19:
-OnHour20:
-OnHour21:
-OnHour22:
-OnHour23:
+OnClock0500:
+OnClock1700:
OnInit:
consolemes(CONSOLEMES_DEBUG, "Reloading scoreboards...");
.@nb = query_sql("select name, zeny from `char` ORDER BY zeny DESC LIMIT 15", $@hofortune_name$, $@hofortune_value);
@@ -207,7 +185,7 @@ OnCall:
do {
clear;
mes l("The Mana World - Legacy");
- mesc l("All scoreboards are updated hourly."), 1;
+ mesc l("All scoreboards are updated at 05:00 and 17:00 servertime."), 1;
mes "";
select
l("Hall Of Fortune"),