From 7b2fea85bbe78a827db9322e96deaf107590ff72 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 22 Jun 2015 13:10:54 +0300 Subject: [PATCH] Black Cat Day implemented on every 13th --- toontown/ai/DistributedBlackCatMgrAI.py | 2 +- toontown/ai/HolidayGlobals.py | 7 +++++++ toontown/toonbase/TTLocalizerEnglish.py | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/toontown/ai/DistributedBlackCatMgrAI.py b/toontown/ai/DistributedBlackCatMgrAI.py index b8080bd0..28642714 100755 --- a/toontown/ai/DistributedBlackCatMgrAI.py +++ b/toontown/ai/DistributedBlackCatMgrAI.py @@ -13,7 +13,7 @@ class DistributedBlackCatMgrAI(DistributedObjectAI): avId = self.air.getAvatarIdFromSender() av = self.air.doId2do.get(avId) - if not av or av.dna.getAnimal() != 'cat' or av.dna.headColor == 0x1a: + if not av or av.getTutorialAck() or av.dna.getAnimal() != 'cat' or av.dna.headColor == 0x1a: return newDNA = ToonDNA() diff --git a/toontown/ai/HolidayGlobals.py b/toontown/ai/HolidayGlobals.py index 31a86620..b6ca1e6a 100644 --- a/toontown/ai/HolidayGlobals.py +++ b/toontown/ai/HolidayGlobals.py @@ -27,6 +27,13 @@ Holidays = { 'startMessage': TTLocalizer.SillySaturdayStart, 'ongoingMessage': TTLocalizer.SillySaturdayOngoing, 'endMessage': TTLocalizer.SillySaturdayEnd + }, + ToontownGlobals.BLACK_CAT_DAY: { + 'startDay': 13, + 'endDay': 13, + 'startMessage': TTLocalizer.BlackCatHolidayStart, + 'ongoingMessage': TTLocalizer.BlackCatHolidayStart, + 'endMessage': TTLocalizer.BlackCatHolidayEnd } } diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 10b6da76..96e871f9 100755 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -7971,7 +7971,7 @@ BankUpgradeHolidayStart = 'Something Toontastic happened to your Jellybean Bank! HalloweenPropsHolidayStart = "It's Halloween in Toontown!" HalloweenPropsHolidayEnd = 'Halloween has ended. Boo!' SpookyPropsHolidayStart = 'Silly Meter spins Toontown into spooky mode!' -BlackCatHolidayStart = 'Create a Black Cat - Today only!' +BlackCatHolidayStart = 'Create a Black Cat - today only!' BlackCatHolidayEnd = 'Black Cat day has ended!' SpookyBlackCatHolidayStart = 'Friday 13th means a Black Cat blast!' LaughingManHolidayStart = 'Today is the day of the Laughing Man!' @@ -8224,7 +8224,7 @@ HolidayNamesInCalendar = {1: ('Summer Fireworks', 'Celebrate Summer with a firew 5: ('Skelecog Invasion', 'Stop the Skelecogs from invading Toontown!'), 6: ('Mr. Hollywood Invasion', 'Stop the Mr. Hollywood Cogs from invading Toontown!'), 8: ('Toon Species Election', 'Vote on the new Toon species! Will it be Goat? Will it be Pig?'), - 9: ('Black Cat Day', 'Happy Halloween! Create a Toontastic Black Cat Toon - Today Only!'), + 9: ('Black Cat Day', 'Create a Toontastic Black Cat Toon - today only!'), 13: ('Trick or Treat', 'Happy Halloween! Trick or treat throughout Toontown to get a nifty Halloween pumpkin head reward!'), 16: ('Grand Prix', 'Grand Prix Monday at Goofy Speedway! To win, collect the most points in three consecutive races!'), 17: ('Fish Bingo', 'Fish Bingo Wednesday! Everyone at the pond works together to complete the card before time runs out.'),