diff options
author | Jesusaves <cpntb1@ymail.com> | 2018-12-15 22:27:21 -0200 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2018-12-15 22:27:21 -0200 |
commit | 8c44eb3887549bacbede2026e66e20c7fa624297 (patch) | |
tree | e73d2425c809ef5771cc5bf0cd5d3181ebf66717 /npc | |
parent | 50b14fe88a2b71c81f1f3f41ae00ab3c2f193ca5 (diff) | |
download | serverdata-8c44eb3887549bacbede2026e66e20c7fa624297.tar.gz serverdata-8c44eb3887549bacbede2026e66e20c7fa624297.tar.bz2 serverdata-8c44eb3887549bacbede2026e66e20c7fa624297.tar.xz serverdata-8c44eb3887549bacbede2026e66e20c7fa624297.zip |
Final bugfixes for Christmas - I hope.
Diffstat (limited to 'npc')
-rw-r--r-- | npc/019-4-1/chief.txt | 6 | ||||
-rw-r--r-- | npc/commands/event.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/npc/019-4-1/chief.txt b/npc/019-4-1/chief.txt index 605f056c3..a4223c122 100644 --- a/npc/019-4-1/chief.txt +++ b/npc/019-4-1/chief.txt @@ -31,7 +31,7 @@ mes("5."+.@name$[4]+" ("+.@value[4]+")"); next; - .@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.count2 DESC LIMIT 5", .@name$, .@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", .@name$, .@value); mes "##B"+l("Top 5 - Golbarez Seasonal Quest")+"##b"; mes("1."+.@name$[0]+" ("+.@value[0]+" GP)"); @@ -63,7 +63,7 @@ L_Reward: inventoryplace NPCEyes, 5, Iten, 1; .@q1=getq2(SQuest_Christmas); .@q2=getq3(SQuest_Christmas); - setq SQuest_Christmas, 0, 0, 0; + setq1 SQuest_Christmas, 0; /* Handle Christmas Quest Rewards */ /* The top 5 gets special rewards! */ @@ -84,7 +84,7 @@ L_Reward: getitem XmasGift, 1; if (strcharinfo(0) == .@name$[0]) - mesc l("You gained a @@ for the #1 place on the event. Remember to feed it @@, or it may run away from you.", getitemlink(Milk)); + mesc l("You gained a @@ for the #1 place on the event. Remember to feed it @@, or it may run away from you.", getitemlink(CattyCat), getitemlink(Milk)); ///////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////// diff --git a/npc/commands/event.txt b/npc/commands/event.txt index 24e29ea3d..de91dfb01 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -155,7 +155,7 @@ function script GlobalEventMenu { debugmes "Snakes are now dropping Pearls."; */ break; - case 4: + case 4: logmes "Enabled CHRISTMAS event.", LOGMES_ATCOMMAND; query_sql("DELETE FROM `quest` WHERE `quest_id` = '"+SQuest_Christmas+"'"); sChristmas(); break; |