summaryrefslogtreecommitdiff
path: root/npc/functions
diff options
context:
space:
mode:
Diffstat (limited to 'npc/functions')
-rw-r--r--npc/functions/scoreboards.txt5
-rw-r--r--npc/functions/seasons.txt3
2 files changed, 7 insertions, 1 deletions
diff --git a/npc/functions/scoreboards.txt b/npc/functions/scoreboards.txt
index 66389fdf3..ebc1b151c 100644
--- a/npc/functions/scoreboards.txt
+++ b/npc/functions/scoreboards.txt
@@ -23,7 +23,10 @@ function script ScoreboardsReload {
if (season() == SUMMER || season() == AUTUMN) {
.@nb = query_sql("SELECT c.name, i.count2 FROM `quest` AS i, `char` AS c WHERE i.quest_id=305 AND i.char_id=c.char_id AND i.count1="+(gettime(GETTIME_YEAR)-2000)+" ORDER BY i.count2 DESC LIMIT 10", $@ched_name$, $@ched_value);
}
- if (season() == WINTER || season() == AUTUMN) {
+ if (season() == AUTUMN || season() == WINTER) {
+ .@nb = query_sql("SELECT c.name, i.count2 FROM `quest` AS i, `char` AS c WHERE i.quest_id="+SQuest_Autumn+" AND i.char_id=c.char_id ORDER BY i.count2 DESC LIMIT 5", $@hasn_name$, $@hasn_value);
+ }
+ if (season() == WINTER || season() == SPRING) {
.@nb = query_sql("SELECT c.name, i.count2 FROM `quest` AS i, `char` AS c WHERE i.quest_id="+SQuest_Christmas+" AND i.char_id=c.char_id ORDER BY i.count2 DESC LIMIT 5", $@xmas_box_name$, $@xmas_box_value);
.@nb = query_sql("SELECT c.name, i.count3 FROM `quest` AS i, `char` AS c WHERE i.quest_id="+SQuest_Christmas+" AND i.char_id=c.char_id ORDER BY i.count3 DESC LIMIT 5", $@xmas_gp_name$, $@xmas_gp_value);
}
diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt
index d2ed85264..fa3b5c5bd 100644
--- a/npc/functions/seasons.txt
+++ b/npc/functions/seasons.txt
@@ -384,6 +384,9 @@ OnWinterStart:
end;
OnWinterEnd:
+ // Hasan's rewards can't be claimed anymore. Delete that from all players.
+ DelQuestFromEveryPlayer(SQuest_Autumn);
+
delmonsterdrop(WaterFairy, GingerBreadMan);
delmonsterdrop(RedMushroom, GingerBreadMan);
delmonsterdrop(Duck, GingerBreadMan);