diff --git a/assets/images/hat/mario.png b/assets/images/hat/mario.png new file mode 100644 index 00000000..7a359aa7 Binary files /dev/null and b/assets/images/hat/mario.png differ diff --git a/assets/images/hat/superhero.png b/assets/images/hat/superhero.png new file mode 100644 index 00000000..2c4dfa3e Binary files /dev/null and b/assets/images/hat/superhero.png differ diff --git a/assets/images/hat/yoda.png b/assets/images/hat/yoda.png new file mode 100644 index 00000000..2d0b5d7a Binary files /dev/null and b/assets/images/hat/yoda.png differ diff --git a/assets/json/hat.json b/assets/json/hat.json index 09d1092a..6164f54e 100644 --- a/assets/json/hat.json +++ b/assets/json/hat.json @@ -78,5 +78,20 @@ "file": "witch.png", "comment": "Whatcha got in that cauldron, {{user}}?", "commentMe": "Ahahahaha! Want a taste of my potion?" + }, + "mario": { + "file": "mario.png", + "comment": "It's-a-you, Mario!", + "commentMe": "It's-a-me, Mario!" + }, + "yoda": { + "file": "yoda.png", + "comment": "May the force be with you.", + "commentMe": "May the force be with... Me." + }, + "superhero": { + "file": "superhero.png", + "comment": "What's your superpower, {{user}}?", + "commentMe": "Oh my! You know my secret identity!" } } diff --git a/assets/json/holiday-list.json b/assets/json/holiday-list.json index 7de086cf..a8453819 100644 --- a/assets/json/holiday-list.json +++ b/assets/json/holiday-list.json @@ -55,5 +55,26 @@ "month": 3, "day": 17, "activity": "Make sure you wear green today!" + }, + { + "name": "Star Wars Day", + "hat": "yoda", + "month": 5, + "day": 4, + "activity": "May the fourth be with you." + }, + { + "name": "Batman Day", + "hat": "superhero", + "month": 9, + "day": 15, + "activity": "I'm Batman." + }, + { + "name": "Mario Day", + "hat": "mario", + "month": 3, + "day": 10, + "activity": "It's-a-me, Mario!" } ] diff --git a/commands/edit-avatar/hat.js b/commands/edit-avatar/hat.js index 4d2875df..5b699117 100644 --- a/commands/edit-avatar/hat.js +++ b/commands/edit-avatar/hat.js @@ -39,6 +39,16 @@ module.exports = class HatCommand extends Command { name: 'Becel', url: 'https://www.becel.ca/en-ca', reason: 'Becel Hat Image' + }, + { + name: 'Nintendo', + url: 'https://www.nintendo.com/', + reason: 'Mario Hat Image' + }, + { + name: 'Star Wars', + url: 'https://www.starwars.com/', + reason: 'Yoda Hat Image' } ], args: [ diff --git a/package.json b/package.json index dd704e19..dd456b8b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "159.4.1", + "version": "159.4.2", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": { diff --git a/structures/AvatarChanger.js b/structures/AvatarChanger.js index 6d8bfb81..2add817a 100644 --- a/structures/AvatarChanger.js +++ b/structures/AvatarChanger.js @@ -71,7 +71,8 @@ module.exports = class AvatarChanger { name: 'Thanksgiving', hat: 'pilgrim', month: day.getUTCMonth(), - day: day.getUTCDate() + day: day.getUTCDate(), + activity: 'Happy Thanksgiving!' }; } return false;