diff --git a/assets/config.csv b/assets/config.csv index a36f9dd..2564dd9 100644 --- a/assets/config.csv +++ b/assets/config.csv @@ -159,7 +159,7 @@ "Localized Strings","GuildRoleNotAllowedSuccess","Removed %s from the allowed roles!" "Localized Strings","GuildRoleRemoveFailure","I wasn't able to remove %s from %s!" "Localized Strings","GuildRoleRemoveInfo","Removes a role from you! Just remember to spell it right!" -"Localized Strings","GuildRoleRemoveNotAllowed","You're not allowed to add %s!" +"Localized Strings","GuildRoleRemoveNotAllowed","You're not allowed to remove %s!" "Localized Strings","GuildRoleRemoveSuccess","Removed %s from %s!" "Localized Strings","HelpBuilderInfo","Emit help for all commands as formatted HTML" "Localized Strings","HelpDisplay","You can get help with a specific command by typing `!help command`! General Commands: `boop, roll, choose, help, info, vote, results, showpoll, wolfram, cplus, java, beans, role, bet, yeet`" @@ -198,7 +198,7 @@ "Localized Strings","RaffleEndFailure","I don't think there's one going!" "Localized Strings","RaffleEndInfo","" "Localized Strings","RaffleEndSuccess","You ended the raffle!" -"Localized Strings","RaffleInfo","Raffle is a super command!\n\t`raffle start \"# of beans\"` will start a raffle with an entrance fee of the number of beans! Defaults to 100.\n\t`raffle end` will stop the raffle!\n\t`raffle spin` will choose a winner, you can only win once!\n\t`raffle join` will add you to the raffle!" +"Localized Strings","RaffleInfo","Raffle is a super command!\n\t`raffle start \""# of beans\""` will start a raffle with an entrance fee of the number of beans! Defaults to 100.\n\t`raffle end` will stop the raffle!\n\t`raffle spin` will choose a winner, you can only win once!\n\t`raffle join` will add you to the raffle!" "Localized Strings","RaffleJoinFailure","You can't join again!" "Localized Strings","RaffleJoinInfo","" "Localized Strings","RaffleJoinSuccess","You joined the raffle! Good luck!" @@ -212,7 +212,7 @@ "Localized Strings","RatingInfo","'0' is fully sfw (Derpi and e621 searches are disabled)\n'1' is filtered (kitty auto appends a sfw tag on any searches)\n'2' is nsfw (any search will go through). Some other words are supported for setting filter as well." "Localized Strings","RatingInvalid","Invalid content rating" "Localized Strings","RatingWarning","Warning: NSFW may slip through, images are only based on tags on their respective sites!" -"Localized Strings","RemindInfo","`remind \"# of mins\" \"reminder\"` I'll remind you to do something!" +"Localized Strings","RemindInfo","`remind \""# of mins\"" \""reminder\""` I'll remind you to do something!" "Localized Strings","RoleChanged","Changed %s to role `%s`!" "Localized Strings","RoleError","You aren't allowed to do that! You must have the KittyRole '%' or higher!" "Localized Strings","RoleInfo","Will show the current role you have, Admins can change others roles with input of 'role x @y' with x being blacklist, general, mod, or admin.\nBlacklist will not allow the user to interact with kitty anymore, general mod and admin will give the user access to those commands." diff --git a/assets/dance/default/defaultDance 0.png b/assets/dance/default/defaultDance 0.png new file mode 100644 index 0000000..eda14d8 Binary files /dev/null and b/assets/dance/default/defaultDance 0.png differ diff --git a/assets/dance/default/defaultDance 1.png b/assets/dance/default/defaultDance 1.png new file mode 100644 index 0000000..5ea9e56 Binary files /dev/null and b/assets/dance/default/defaultDance 1.png differ diff --git a/assets/dance/default/defaultDance 10.png b/assets/dance/default/defaultDance 10.png new file mode 100644 index 0000000..6d5edde Binary files /dev/null and b/assets/dance/default/defaultDance 10.png differ diff --git a/assets/dance/default/defaultDance 100.png b/assets/dance/default/defaultDance 100.png new file mode 100644 index 0000000..f3d24ac Binary files /dev/null and b/assets/dance/default/defaultDance 100.png differ diff --git a/assets/dance/default/defaultDance 101.png b/assets/dance/default/defaultDance 101.png new file mode 100644 index 0000000..4c02388 Binary files /dev/null and b/assets/dance/default/defaultDance 101.png differ diff --git a/assets/dance/default/defaultDance 102.png b/assets/dance/default/defaultDance 102.png new file mode 100644 index 0000000..323fa79 Binary files /dev/null and b/assets/dance/default/defaultDance 102.png differ diff --git a/assets/dance/default/defaultDance 103.png b/assets/dance/default/defaultDance 103.png new file mode 100644 index 0000000..c3fc686 Binary files /dev/null and b/assets/dance/default/defaultDance 103.png differ diff --git a/assets/dance/default/defaultDance 104.png b/assets/dance/default/defaultDance 104.png new file mode 100644 index 0000000..45945ef Binary files /dev/null and b/assets/dance/default/defaultDance 104.png differ diff --git a/assets/dance/default/defaultDance 105.png b/assets/dance/default/defaultDance 105.png new file mode 100644 index 0000000..e7b3049 Binary files /dev/null and b/assets/dance/default/defaultDance 105.png differ diff --git a/assets/dance/default/defaultDance 106.png b/assets/dance/default/defaultDance 106.png new file mode 100644 index 0000000..a9a1ceb Binary files /dev/null and b/assets/dance/default/defaultDance 106.png differ diff --git a/assets/dance/default/defaultDance 107.png b/assets/dance/default/defaultDance 107.png new file mode 100644 index 0000000..eb2c161 Binary files /dev/null and b/assets/dance/default/defaultDance 107.png differ diff --git a/assets/dance/default/defaultDance 108.png b/assets/dance/default/defaultDance 108.png new file mode 100644 index 0000000..aac6c55 Binary files /dev/null and b/assets/dance/default/defaultDance 108.png differ diff --git a/assets/dance/default/defaultDance 109.png b/assets/dance/default/defaultDance 109.png new file mode 100644 index 0000000..c3faffd Binary files /dev/null and b/assets/dance/default/defaultDance 109.png differ diff --git a/assets/dance/default/defaultDance 11.png b/assets/dance/default/defaultDance 11.png new file mode 100644 index 0000000..b0b77dd Binary files /dev/null and b/assets/dance/default/defaultDance 11.png differ diff --git a/assets/dance/default/defaultDance 110.png b/assets/dance/default/defaultDance 110.png new file mode 100644 index 0000000..4d11b8b Binary files /dev/null and b/assets/dance/default/defaultDance 110.png differ diff --git a/assets/dance/default/defaultDance 111.png b/assets/dance/default/defaultDance 111.png new file mode 100644 index 0000000..730c7e9 Binary files /dev/null and b/assets/dance/default/defaultDance 111.png differ diff --git a/assets/dance/default/defaultDance 112.png b/assets/dance/default/defaultDance 112.png new file mode 100644 index 0000000..17043ac Binary files /dev/null and b/assets/dance/default/defaultDance 112.png differ diff --git a/assets/dance/default/defaultDance 113.png b/assets/dance/default/defaultDance 113.png new file mode 100644 index 0000000..3d9db58 Binary files /dev/null and b/assets/dance/default/defaultDance 113.png differ diff --git a/assets/dance/default/defaultDance 114.png b/assets/dance/default/defaultDance 114.png new file mode 100644 index 0000000..4c079af Binary files /dev/null and b/assets/dance/default/defaultDance 114.png differ diff --git a/assets/dance/default/defaultDance 115.png b/assets/dance/default/defaultDance 115.png new file mode 100644 index 0000000..40d5b98 Binary files /dev/null and b/assets/dance/default/defaultDance 115.png differ diff --git a/assets/dance/default/defaultDance 116.png b/assets/dance/default/defaultDance 116.png new file mode 100644 index 0000000..3a11d6a Binary files /dev/null and b/assets/dance/default/defaultDance 116.png differ diff --git a/assets/dance/default/defaultDance 117.png b/assets/dance/default/defaultDance 117.png new file mode 100644 index 0000000..8430c5f Binary files /dev/null and b/assets/dance/default/defaultDance 117.png differ diff --git a/assets/dance/default/defaultDance 12.png b/assets/dance/default/defaultDance 12.png new file mode 100644 index 0000000..fc53d06 Binary files /dev/null and b/assets/dance/default/defaultDance 12.png differ diff --git a/assets/dance/default/defaultDance 13.png b/assets/dance/default/defaultDance 13.png new file mode 100644 index 0000000..4e0cf5d Binary files /dev/null and b/assets/dance/default/defaultDance 13.png differ diff --git a/assets/dance/default/defaultDance 14.png b/assets/dance/default/defaultDance 14.png new file mode 100644 index 0000000..ad2b209 Binary files /dev/null and b/assets/dance/default/defaultDance 14.png differ diff --git a/assets/dance/default/defaultDance 15.png b/assets/dance/default/defaultDance 15.png new file mode 100644 index 0000000..64e2137 Binary files /dev/null and b/assets/dance/default/defaultDance 15.png differ diff --git a/assets/dance/default/defaultDance 16.png b/assets/dance/default/defaultDance 16.png new file mode 100644 index 0000000..748bd9d Binary files /dev/null and b/assets/dance/default/defaultDance 16.png differ diff --git a/assets/dance/default/defaultDance 17.png b/assets/dance/default/defaultDance 17.png new file mode 100644 index 0000000..ea97b3e Binary files /dev/null and b/assets/dance/default/defaultDance 17.png differ diff --git a/assets/dance/default/defaultDance 18.png b/assets/dance/default/defaultDance 18.png new file mode 100644 index 0000000..b13b1eb Binary files /dev/null and b/assets/dance/default/defaultDance 18.png differ diff --git a/assets/dance/default/defaultDance 19.png b/assets/dance/default/defaultDance 19.png new file mode 100644 index 0000000..718e574 Binary files /dev/null and b/assets/dance/default/defaultDance 19.png differ diff --git a/assets/dance/default/defaultDance 2.png b/assets/dance/default/defaultDance 2.png new file mode 100644 index 0000000..217171b Binary files /dev/null and b/assets/dance/default/defaultDance 2.png differ diff --git a/assets/dance/default/defaultDance 20.png b/assets/dance/default/defaultDance 20.png new file mode 100644 index 0000000..8e1c2b5 Binary files /dev/null and b/assets/dance/default/defaultDance 20.png differ diff --git a/assets/dance/default/defaultDance 21.png b/assets/dance/default/defaultDance 21.png new file mode 100644 index 0000000..63dc7b9 Binary files /dev/null and b/assets/dance/default/defaultDance 21.png differ diff --git a/assets/dance/default/defaultDance 22.png b/assets/dance/default/defaultDance 22.png new file mode 100644 index 0000000..015bc5f Binary files /dev/null and b/assets/dance/default/defaultDance 22.png differ diff --git a/assets/dance/default/defaultDance 23.png b/assets/dance/default/defaultDance 23.png new file mode 100644 index 0000000..9a112cf Binary files /dev/null and b/assets/dance/default/defaultDance 23.png differ diff --git a/assets/dance/default/defaultDance 24.png b/assets/dance/default/defaultDance 24.png new file mode 100644 index 0000000..4084fec Binary files /dev/null and b/assets/dance/default/defaultDance 24.png differ diff --git a/assets/dance/default/defaultDance 25.png b/assets/dance/default/defaultDance 25.png new file mode 100644 index 0000000..f728ed1 Binary files /dev/null and b/assets/dance/default/defaultDance 25.png differ diff --git a/assets/dance/default/defaultDance 26.png b/assets/dance/default/defaultDance 26.png new file mode 100644 index 0000000..30b0bbe Binary files /dev/null and b/assets/dance/default/defaultDance 26.png differ diff --git a/assets/dance/default/defaultDance 27.png b/assets/dance/default/defaultDance 27.png new file mode 100644 index 0000000..dbc94e0 Binary files /dev/null and b/assets/dance/default/defaultDance 27.png differ diff --git a/assets/dance/default/defaultDance 28.png b/assets/dance/default/defaultDance 28.png new file mode 100644 index 0000000..06d1740 Binary files /dev/null and b/assets/dance/default/defaultDance 28.png differ diff --git a/assets/dance/default/defaultDance 29.png b/assets/dance/default/defaultDance 29.png new file mode 100644 index 0000000..08308e1 Binary files /dev/null and b/assets/dance/default/defaultDance 29.png differ diff --git a/assets/dance/default/defaultDance 3.png b/assets/dance/default/defaultDance 3.png new file mode 100644 index 0000000..8291299 Binary files /dev/null and b/assets/dance/default/defaultDance 3.png differ diff --git a/assets/dance/default/defaultDance 30.png b/assets/dance/default/defaultDance 30.png new file mode 100644 index 0000000..5091cd9 Binary files /dev/null and b/assets/dance/default/defaultDance 30.png differ diff --git a/assets/dance/default/defaultDance 31.png b/assets/dance/default/defaultDance 31.png new file mode 100644 index 0000000..b15e872 Binary files /dev/null and b/assets/dance/default/defaultDance 31.png differ diff --git a/assets/dance/default/defaultDance 32.png b/assets/dance/default/defaultDance 32.png new file mode 100644 index 0000000..8617384 Binary files /dev/null and b/assets/dance/default/defaultDance 32.png differ diff --git a/assets/dance/default/defaultDance 33.png b/assets/dance/default/defaultDance 33.png new file mode 100644 index 0000000..0e189ca Binary files /dev/null and b/assets/dance/default/defaultDance 33.png differ diff --git a/assets/dance/default/defaultDance 34.png b/assets/dance/default/defaultDance 34.png new file mode 100644 index 0000000..4169887 Binary files /dev/null and b/assets/dance/default/defaultDance 34.png differ diff --git a/assets/dance/default/defaultDance 35.png b/assets/dance/default/defaultDance 35.png new file mode 100644 index 0000000..02b638c Binary files /dev/null and b/assets/dance/default/defaultDance 35.png differ diff --git a/assets/dance/default/defaultDance 36.png b/assets/dance/default/defaultDance 36.png new file mode 100644 index 0000000..cbd5e19 Binary files /dev/null and b/assets/dance/default/defaultDance 36.png differ diff --git a/assets/dance/default/defaultDance 37.png b/assets/dance/default/defaultDance 37.png new file mode 100644 index 0000000..90ecfe7 Binary files /dev/null and b/assets/dance/default/defaultDance 37.png differ diff --git a/assets/dance/default/defaultDance 38.png b/assets/dance/default/defaultDance 38.png new file mode 100644 index 0000000..8744694 Binary files /dev/null and b/assets/dance/default/defaultDance 38.png differ diff --git a/assets/dance/default/defaultDance 39.png b/assets/dance/default/defaultDance 39.png new file mode 100644 index 0000000..f9003c9 Binary files /dev/null and b/assets/dance/default/defaultDance 39.png differ diff --git a/assets/dance/default/defaultDance 4.png b/assets/dance/default/defaultDance 4.png new file mode 100644 index 0000000..41af7da Binary files /dev/null and b/assets/dance/default/defaultDance 4.png differ diff --git a/assets/dance/default/defaultDance 40.png b/assets/dance/default/defaultDance 40.png new file mode 100644 index 0000000..5b331ff Binary files /dev/null and b/assets/dance/default/defaultDance 40.png differ diff --git a/assets/dance/default/defaultDance 41.png b/assets/dance/default/defaultDance 41.png new file mode 100644 index 0000000..5e928d0 Binary files /dev/null and b/assets/dance/default/defaultDance 41.png differ diff --git a/assets/dance/default/defaultDance 42.png b/assets/dance/default/defaultDance 42.png new file mode 100644 index 0000000..8825cbf Binary files /dev/null and b/assets/dance/default/defaultDance 42.png differ diff --git a/assets/dance/default/defaultDance 43.png b/assets/dance/default/defaultDance 43.png new file mode 100644 index 0000000..515758b Binary files /dev/null and b/assets/dance/default/defaultDance 43.png differ diff --git a/assets/dance/default/defaultDance 44.png b/assets/dance/default/defaultDance 44.png new file mode 100644 index 0000000..ca0a5f3 Binary files /dev/null and b/assets/dance/default/defaultDance 44.png differ diff --git a/assets/dance/default/defaultDance 45.png b/assets/dance/default/defaultDance 45.png new file mode 100644 index 0000000..afb67de Binary files /dev/null and b/assets/dance/default/defaultDance 45.png differ diff --git a/assets/dance/default/defaultDance 46.png b/assets/dance/default/defaultDance 46.png new file mode 100644 index 0000000..635efea Binary files /dev/null and b/assets/dance/default/defaultDance 46.png differ diff --git a/assets/dance/default/defaultDance 47.png b/assets/dance/default/defaultDance 47.png new file mode 100644 index 0000000..abbe1ed Binary files /dev/null and b/assets/dance/default/defaultDance 47.png differ diff --git a/assets/dance/default/defaultDance 48.png b/assets/dance/default/defaultDance 48.png new file mode 100644 index 0000000..50306e6 Binary files /dev/null and b/assets/dance/default/defaultDance 48.png differ diff --git a/assets/dance/default/defaultDance 49.png b/assets/dance/default/defaultDance 49.png new file mode 100644 index 0000000..52e47d9 Binary files /dev/null and b/assets/dance/default/defaultDance 49.png differ diff --git a/assets/dance/default/defaultDance 5.png b/assets/dance/default/defaultDance 5.png new file mode 100644 index 0000000..3ec5b5c Binary files /dev/null and b/assets/dance/default/defaultDance 5.png differ diff --git a/assets/dance/default/defaultDance 50.png b/assets/dance/default/defaultDance 50.png new file mode 100644 index 0000000..062f2b1 Binary files /dev/null and b/assets/dance/default/defaultDance 50.png differ diff --git a/assets/dance/default/defaultDance 51.png b/assets/dance/default/defaultDance 51.png new file mode 100644 index 0000000..328c840 Binary files /dev/null and b/assets/dance/default/defaultDance 51.png differ diff --git a/assets/dance/default/defaultDance 52.png b/assets/dance/default/defaultDance 52.png new file mode 100644 index 0000000..2a2ab3e Binary files /dev/null and b/assets/dance/default/defaultDance 52.png differ diff --git a/assets/dance/default/defaultDance 53.png b/assets/dance/default/defaultDance 53.png new file mode 100644 index 0000000..c5d7cfe Binary files /dev/null and b/assets/dance/default/defaultDance 53.png differ diff --git a/assets/dance/default/defaultDance 54.png b/assets/dance/default/defaultDance 54.png new file mode 100644 index 0000000..54dc473 Binary files /dev/null and b/assets/dance/default/defaultDance 54.png differ diff --git a/assets/dance/default/defaultDance 55.png b/assets/dance/default/defaultDance 55.png new file mode 100644 index 0000000..b3e434b Binary files /dev/null and b/assets/dance/default/defaultDance 55.png differ diff --git a/assets/dance/default/defaultDance 56.png b/assets/dance/default/defaultDance 56.png new file mode 100644 index 0000000..ac8abc9 Binary files /dev/null and b/assets/dance/default/defaultDance 56.png differ diff --git a/assets/dance/default/defaultDance 57.png b/assets/dance/default/defaultDance 57.png new file mode 100644 index 0000000..5621750 Binary files /dev/null and b/assets/dance/default/defaultDance 57.png differ diff --git a/assets/dance/default/defaultDance 58.png b/assets/dance/default/defaultDance 58.png new file mode 100644 index 0000000..6776f4d Binary files /dev/null and b/assets/dance/default/defaultDance 58.png differ diff --git a/assets/dance/default/defaultDance 59.png b/assets/dance/default/defaultDance 59.png new file mode 100644 index 0000000..158cf4b Binary files /dev/null and b/assets/dance/default/defaultDance 59.png differ diff --git a/assets/dance/default/defaultDance 6.png b/assets/dance/default/defaultDance 6.png new file mode 100644 index 0000000..3bba71a Binary files /dev/null and b/assets/dance/default/defaultDance 6.png differ diff --git a/assets/dance/default/defaultDance 60.png b/assets/dance/default/defaultDance 60.png new file mode 100644 index 0000000..893184f Binary files /dev/null and b/assets/dance/default/defaultDance 60.png differ diff --git a/assets/dance/default/defaultDance 61.png b/assets/dance/default/defaultDance 61.png new file mode 100644 index 0000000..e2366b8 Binary files /dev/null and b/assets/dance/default/defaultDance 61.png differ diff --git a/assets/dance/default/defaultDance 62.png b/assets/dance/default/defaultDance 62.png new file mode 100644 index 0000000..1852bd3 Binary files /dev/null and b/assets/dance/default/defaultDance 62.png differ diff --git a/assets/dance/default/defaultDance 63.png b/assets/dance/default/defaultDance 63.png new file mode 100644 index 0000000..800599f Binary files /dev/null and b/assets/dance/default/defaultDance 63.png differ diff --git a/assets/dance/default/defaultDance 64.png b/assets/dance/default/defaultDance 64.png new file mode 100644 index 0000000..93a7c2c Binary files /dev/null and b/assets/dance/default/defaultDance 64.png differ diff --git a/assets/dance/default/defaultDance 65.png b/assets/dance/default/defaultDance 65.png new file mode 100644 index 0000000..f05173c Binary files /dev/null and b/assets/dance/default/defaultDance 65.png differ diff --git a/assets/dance/default/defaultDance 66.png b/assets/dance/default/defaultDance 66.png new file mode 100644 index 0000000..cd053f0 Binary files /dev/null and b/assets/dance/default/defaultDance 66.png differ diff --git a/assets/dance/default/defaultDance 67.png b/assets/dance/default/defaultDance 67.png new file mode 100644 index 0000000..eb113cf Binary files /dev/null and b/assets/dance/default/defaultDance 67.png differ diff --git a/assets/dance/default/defaultDance 68.png b/assets/dance/default/defaultDance 68.png new file mode 100644 index 0000000..19a5f4f Binary files /dev/null and b/assets/dance/default/defaultDance 68.png differ diff --git a/assets/dance/default/defaultDance 69.png b/assets/dance/default/defaultDance 69.png new file mode 100644 index 0000000..6391a85 Binary files /dev/null and b/assets/dance/default/defaultDance 69.png differ diff --git a/assets/dance/default/defaultDance 7.png b/assets/dance/default/defaultDance 7.png new file mode 100644 index 0000000..d4c72c4 Binary files /dev/null and b/assets/dance/default/defaultDance 7.png differ diff --git a/assets/dance/default/defaultDance 70.png b/assets/dance/default/defaultDance 70.png new file mode 100644 index 0000000..8a2e084 Binary files /dev/null and b/assets/dance/default/defaultDance 70.png differ diff --git a/assets/dance/default/defaultDance 71.png b/assets/dance/default/defaultDance 71.png new file mode 100644 index 0000000..b5c62f3 Binary files /dev/null and b/assets/dance/default/defaultDance 71.png differ diff --git a/assets/dance/default/defaultDance 72.png b/assets/dance/default/defaultDance 72.png new file mode 100644 index 0000000..f82392e Binary files /dev/null and b/assets/dance/default/defaultDance 72.png differ diff --git a/assets/dance/default/defaultDance 73.png b/assets/dance/default/defaultDance 73.png new file mode 100644 index 0000000..cb9beaa Binary files /dev/null and b/assets/dance/default/defaultDance 73.png differ diff --git a/assets/dance/default/defaultDance 74.png b/assets/dance/default/defaultDance 74.png new file mode 100644 index 0000000..a66c345 Binary files /dev/null and b/assets/dance/default/defaultDance 74.png differ diff --git a/assets/dance/default/defaultDance 75.png b/assets/dance/default/defaultDance 75.png new file mode 100644 index 0000000..de487a9 Binary files /dev/null and b/assets/dance/default/defaultDance 75.png differ diff --git a/assets/dance/default/defaultDance 76.png b/assets/dance/default/defaultDance 76.png new file mode 100644 index 0000000..5f7850f Binary files /dev/null and b/assets/dance/default/defaultDance 76.png differ diff --git a/assets/dance/default/defaultDance 77.png b/assets/dance/default/defaultDance 77.png new file mode 100644 index 0000000..7c2a8ba Binary files /dev/null and b/assets/dance/default/defaultDance 77.png differ diff --git a/assets/dance/default/defaultDance 78.png b/assets/dance/default/defaultDance 78.png new file mode 100644 index 0000000..1cd8ac6 Binary files /dev/null and b/assets/dance/default/defaultDance 78.png differ diff --git a/assets/dance/default/defaultDance 79.png b/assets/dance/default/defaultDance 79.png new file mode 100644 index 0000000..4339dc3 Binary files /dev/null and b/assets/dance/default/defaultDance 79.png differ diff --git a/assets/dance/default/defaultDance 8.png b/assets/dance/default/defaultDance 8.png new file mode 100644 index 0000000..1975b53 Binary files /dev/null and b/assets/dance/default/defaultDance 8.png differ diff --git a/assets/dance/default/defaultDance 80.png b/assets/dance/default/defaultDance 80.png new file mode 100644 index 0000000..c5cd9ee Binary files /dev/null and b/assets/dance/default/defaultDance 80.png differ diff --git a/assets/dance/default/defaultDance 81.png b/assets/dance/default/defaultDance 81.png new file mode 100644 index 0000000..fabdd3e Binary files /dev/null and b/assets/dance/default/defaultDance 81.png differ diff --git a/assets/dance/default/defaultDance 82.png b/assets/dance/default/defaultDance 82.png new file mode 100644 index 0000000..b0fbe98 Binary files /dev/null and b/assets/dance/default/defaultDance 82.png differ diff --git a/assets/dance/default/defaultDance 83.png b/assets/dance/default/defaultDance 83.png new file mode 100644 index 0000000..76a6dad Binary files /dev/null and b/assets/dance/default/defaultDance 83.png differ diff --git a/assets/dance/default/defaultDance 84.png b/assets/dance/default/defaultDance 84.png new file mode 100644 index 0000000..fb7acd8 Binary files /dev/null and b/assets/dance/default/defaultDance 84.png differ diff --git a/assets/dance/default/defaultDance 85.png b/assets/dance/default/defaultDance 85.png new file mode 100644 index 0000000..74a8c6d Binary files /dev/null and b/assets/dance/default/defaultDance 85.png differ diff --git a/assets/dance/default/defaultDance 86.png b/assets/dance/default/defaultDance 86.png new file mode 100644 index 0000000..0f15a55 Binary files /dev/null and b/assets/dance/default/defaultDance 86.png differ diff --git a/assets/dance/default/defaultDance 87.png b/assets/dance/default/defaultDance 87.png new file mode 100644 index 0000000..06b2be2 Binary files /dev/null and b/assets/dance/default/defaultDance 87.png differ diff --git a/assets/dance/default/defaultDance 88.png b/assets/dance/default/defaultDance 88.png new file mode 100644 index 0000000..0410c9b Binary files /dev/null and b/assets/dance/default/defaultDance 88.png differ diff --git a/assets/dance/default/defaultDance 89.png b/assets/dance/default/defaultDance 89.png new file mode 100644 index 0000000..a5ad029 Binary files /dev/null and b/assets/dance/default/defaultDance 89.png differ diff --git a/assets/dance/default/defaultDance 9.png b/assets/dance/default/defaultDance 9.png new file mode 100644 index 0000000..77c0324 Binary files /dev/null and b/assets/dance/default/defaultDance 9.png differ diff --git a/assets/dance/default/defaultDance 90.png b/assets/dance/default/defaultDance 90.png new file mode 100644 index 0000000..4cb7907 Binary files /dev/null and b/assets/dance/default/defaultDance 90.png differ diff --git a/assets/dance/default/defaultDance 91.png b/assets/dance/default/defaultDance 91.png new file mode 100644 index 0000000..b945210 Binary files /dev/null and b/assets/dance/default/defaultDance 91.png differ diff --git a/assets/dance/default/defaultDance 92.png b/assets/dance/default/defaultDance 92.png new file mode 100644 index 0000000..8864c73 Binary files /dev/null and b/assets/dance/default/defaultDance 92.png differ diff --git a/assets/dance/default/defaultDance 93.png b/assets/dance/default/defaultDance 93.png new file mode 100644 index 0000000..527bc56 Binary files /dev/null and b/assets/dance/default/defaultDance 93.png differ diff --git a/assets/dance/default/defaultDance 94.png b/assets/dance/default/defaultDance 94.png new file mode 100644 index 0000000..c72733b Binary files /dev/null and b/assets/dance/default/defaultDance 94.png differ diff --git a/assets/dance/default/defaultDance 95.png b/assets/dance/default/defaultDance 95.png new file mode 100644 index 0000000..5cccd0a Binary files /dev/null and b/assets/dance/default/defaultDance 95.png differ diff --git a/assets/dance/default/defaultDance 96.png b/assets/dance/default/defaultDance 96.png new file mode 100644 index 0000000..e02d3c3 Binary files /dev/null and b/assets/dance/default/defaultDance 96.png differ diff --git a/assets/dance/default/defaultDance 97.png b/assets/dance/default/defaultDance 97.png new file mode 100644 index 0000000..be6692e Binary files /dev/null and b/assets/dance/default/defaultDance 97.png differ diff --git a/assets/dance/default/defaultDance 98.png b/assets/dance/default/defaultDance 98.png new file mode 100644 index 0000000..2ba8bb4 Binary files /dev/null and b/assets/dance/default/defaultDance 98.png differ diff --git a/assets/dance/default/defaultDance 99.png b/assets/dance/default/defaultDance 99.png new file mode 100644 index 0000000..c0f84e3 Binary files /dev/null and b/assets/dance/default/defaultDance 99.png differ diff --git a/src/commands/general/CommandDefaultDance.java b/src/commands/general/CommandDefaultDance.java new file mode 100644 index 0000000..312fc64 --- /dev/null +++ b/src/commands/general/CommandDefaultDance.java @@ -0,0 +1,71 @@ +package commands.general; + +import java.io.File; +import java.io.IOException; +import javax.imageio.ImageIO; +import core.Command; +import core.LocStrings; +import dataStructures.KittyChannel; +import dataStructures.KittyGuild; +import dataStructures.KittyRating; +import dataStructures.KittyRole; +import dataStructures.KittyUser; +import dataStructures.Response; +import dataStructures.UserInput; +import utils.ImageOverlayBuilder; +import utils.ImageUtils; + +public class CommandDefaultDance extends Command +{ + // Required constructor + public CommandDefaultDance(KittyRole level, KittyRating rating) { super(level, rating); } + + private static Long num = 0l; + + @Override + public String getHelpText() { return LocStrings.stub("DefaultDanceInfo"); } + + // Called when the command is run! + @Override + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + { + String name = null; + File dancerFile = null; + File danceeFile = null; + + synchronized(num) + { + name = "defaultDance_" + num + ".gif"; + ++num; + } + + try + { + KittyUser person = null; + + if(input.mentions == null) + person = user; + else + person = input.mentions[0]; + + String yeeteeFilename = ImageUtils.downloadFromURL(person.avatarID, ".png"); + if(yeeteeFilename == null) + return; + + danceeFile = new File(yeeteeFilename); + ImageOverlayBuilder builder = new ImageOverlayBuilder("assets/dance/default/", "defaultDance ", 118, 18); + builder.overlay(ImageIO.read(danceeFile), name); + } + catch (IOException e) + { + e.printStackTrace(); + } + + dancerFile = new File (name); + res.sendFile(dancerFile, "gif"); + + // Thread cleanup... + ImageUtils.blockingFileDelete(dancerFile); + ImageUtils.blockingFileDelete(danceeFile); + } +} diff --git a/src/commands/guildrole/SubCommandAdd.java b/src/commands/guildrole/SubCommandAdd.java index 2c153b5..c5761d3 100644 --- a/src/commands/guildrole/SubCommandAdd.java +++ b/src/commands/guildrole/SubCommandAdd.java @@ -22,21 +22,21 @@ public class SubCommandAdd extends SubCommand String formatted = ""; for(int i = 0; i < roles.length; i++) { - role = roles[i].trim(); + role = roles[i].trim().toLowerCase(); if(guild.roleList.contains(role)) { if(guild.control.addRole(user.discordID, role)) { - formatted += String.format(LocStrings.stub("GuildRoleAddSuccess"), role, user.name); + formatted += String.format(LocStrings.stub("GuildRoleAddSuccess"), role, user.name) + "\n"; } else { - formatted += String.format(LocStrings.stub("GuildRoleAddFailure"), role, user.name); + formatted += String.format(LocStrings.stub("GuildRoleAddFailure"), role, user.name) + "\n"; } } else { - formatted += String.format(LocStrings.stub("GuildRoleAddNotAllowed"), role); + formatted += String.format(LocStrings.stub("GuildRoleAddNotAllowed"), role) + "\n"; } } return new SubCommandFormattable(formatted); diff --git a/src/commands/guildrole/SubCommandList.java b/src/commands/guildrole/SubCommandList.java index a4d9b92..44086da 100644 --- a/src/commands/guildrole/SubCommandList.java +++ b/src/commands/guildrole/SubCommandList.java @@ -29,6 +29,6 @@ public class SubCommandList extends SubCommand roles += "\n"; roles += guild.roleList.get(i); } - return new SubCommandFormattable(String.format(LocStrings.stub("GuildRoleListOutput"), roles)); + return new SubCommandFormattable(String.format(LocStrings.stub("GuildRoleListOutput") + "\n", roles)); } } \ No newline at end of file diff --git a/src/commands/guildrole/SubCommandRemove.java b/src/commands/guildrole/SubCommandRemove.java index 84555c5..93df3f5 100644 --- a/src/commands/guildrole/SubCommandRemove.java +++ b/src/commands/guildrole/SubCommandRemove.java @@ -12,23 +12,29 @@ public class SubCommandRemove extends SubCommand @Override public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) { - String role = input.args.split(" ")[0]; + String [] roles = input.args.split(","); + String role; String formatted = ""; - if(guild.roleList.contains(role)) + for(int i = 0; i < roles.length; i ++) { - if(guild.control.removeRole(user.discordID, role)) + role = roles[i].trim().toLowerCase(); + if(guild.roleList.contains(role)) { - formatted += (String.format(LocStrings.stub("GuildRoleRemoveSuccess"), role, user.name)); + if(guild.control.removeRole(user.discordID, role)) + { + formatted += (String.format(LocStrings.stub("GuildRoleRemoveSuccess"), role, user.name)) + "\n"; + } + else + { + formatted += (String.format(LocStrings.stub("GuildRoleRemoveFailure"), role, user.name)) + "\n"; + } } else { - formatted += (String.format(LocStrings.stub("GuildRoleRemoveFailure"), role, user.name)); + formatted += (String.format(LocStrings.stub("GuildRoleRemoveNotAllowed"), role)) + "\n"; } } - else - { - formatted += (String.format(LocStrings.stub("GuildRoleRemoveNotAllowed"), role)); - } + return new SubCommandFormattable(formatted); }