summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-07-16 15:00:09 -0300
committerJesusaves <cpntb1@ymail.com>2019-07-16 15:00:09 -0300
commit43f791b9e0c0a0fe7d01740e3a516d95d7d860ab (patch)
tree6911e94a61d258dbba2b250ce2f44279d37e40fc
parent9691e0c6c462fc1669b937f3216e91ffff5a1ad9 (diff)
downloadserverdata-43f791b9e0c0a0fe7d01740e3a516d95d7d860ab.tar.gz
serverdata-43f791b9e0c0a0fe7d01740e3a516d95d7d860ab.tar.bz2
serverdata-43f791b9e0c0a0fe7d01740e3a516d95d7d860ab.tar.xz
serverdata-43f791b9e0c0a0fe7d01740e3a516d95d7d860ab.zip
Fix rule on Ched and seasons for Ched's Summer: Disregard wrong year
-rw-r--r--npc/003-1/ched.txt2
-rw-r--r--npc/functions/seasons.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/003-1/ched.txt b/npc/003-1/ched.txt
index df51cd581..7e89a7b13 100644
--- a/npc/003-1/ched.txt
+++ b/npc/003-1/ched.txt
@@ -11,7 +11,7 @@
return countitem(CactusCocktail)+countitem(CherryCocktail)+countitem(AppleCocktail);
}
function ScoreSSC {
- .@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 ORDER BY i.count2 DESC LIMIT 10", .@name$, .@value);
+ .@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", .@name$, .@value);
mes "##B"+l("Top 10 - Summer Ched's Event")+"##b";
mes("1."+.@name$[0]+" ("+.@value[0]+")");
diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt
index 812e46553..458611f61 100644
--- a/npc/functions/seasons.txt
+++ b/npc/functions/seasons.txt
@@ -265,7 +265,7 @@ OnSummerEnd:
OnAutumnStart:
// Ched's Quest Winner
- .@nb = query_sql("SELECT c.name FROM `quest` AS i, `char` AS c WHERE i.quest_id="+SQuest_Ched+" AND i.char_id=c.char_id ORDER BY i.count2 DESC LIMIT 1", .@name$);
+ .@nb = query_sql("SELECT c.name FROM `quest` AS i, `char` AS c WHERE i.quest_id="+SQuest_Ched+" AND i.char_id=c.char_id AND i.count1="+(gettime(GETTIME_YEAR)-2000)+" ORDER BY i.count2 DESC LIMIT 1", .@name$);
$@AUTUMN_VICTOR$=.@name$[0];
// Fancy trees