Skip to content

Add "math" and "science" categories to the .quiz command (and more in desc) #726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 62 commits into from
May 16, 2021
Merged

Add "math" and "science" categories to the .quiz command (and more in desc) #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
4c3312a
Add 30 math questions and 30 science questions to trivia_quiz.json
Objectivitix May 7, 2021
93331ac
Merge pull request #1 from Objectivitix/Objectivitix-patch-1
Objectivitix May 7, 2021
113a20a
Implement the math and science questions, added a dynamic_id checker
Objectivitix May 7, 2021
9e6004f
fix NameError, add some forgotten imports
Objectivitix May 7, 2021
fc80051
Merge pull request #2 from Objectivitix/Objectivitix-patch-1
Objectivitix May 7, 2021
0913bf2
Add dynamically generated science questions
Objectivitix May 7, 2021
c940d96
Add dynamic question formatters and its constants
Objectivitix May 7, 2021
75847f0
Merge pull request #3 from Objectivitix/Objectivitix-patch-1
Objectivitix May 7, 2021
b80588d
Fix lint failures: adding docstrings, removing whitespace
Objectivitix May 7, 2021
c742604
Fix wrong import order lint failure
Objectivitix May 7, 2021
c586312
Merge branch 'main' into main
Objectivitix May 7, 2021
92dd10e
fixed weird 8-space indents on lines 556-558
Objectivitix May 7, 2021
1854cd4
use random.sample for more concise expression on line 66
Objectivitix May 9, 2021
961e3f7
use dict.get for retrieving a default value instead of a condition
Objectivitix May 9, 2021
c57a855
use `operator` module instead of lambda functions
Objectivitix May 9, 2021
bfc7c43
lint failure fix, imported in alphabetical order
Objectivitix May 9, 2021
6648099
use binary formatting instead of `bin()` in function
Objectivitix May 9, 2021
8b0eb4a
delete `bin()`s
Objectivitix May 9, 2021
f8e5ec9
add space at the end of string on line 435
Objectivitix May 9, 2021
9d5ea92
remove redundant `description` kwarg pass
Objectivitix May 9, 2021
af70930
use walrus so dict lookup is only performed once
Objectivitix May 9, 2021
17aee21
changed error embed color to `bot.constants.Colours.soft_red`
Objectivitix May 9, 2021
84f2b87
add a space at end of string on line 245
Objectivitix May 9, 2021
21282d5
reverted all undesired black formatting changes
Objectivitix May 9, 2021
675d2a0
fix lint failure; add a newline at line 444
Objectivitix May 9, 2021
2cd8c03
fix another linting fail regarding newlines in docstrings
Objectivitix May 9, 2021
9c1dc83
docstring tweaks; consistency and imperative mood
Objectivitix May 9, 2021
cb49ea2
did some changes per the new reviews and suggestions
Objectivitix May 9, 2021
1f0231d
add gold colour
Objectivitix May 9, 2021
a3cf147
use gold colour from constants.py for consistency
Objectivitix May 9, 2021
5320a38
minor tweaks as suggested by vcokltfre
Objectivitix May 9, 2021
7bbf7b1
fixed no description embed error
Objectivitix May 9, 2021
2e58fca
reduce default no of questions to 7, add actual content to "Remaining…
Objectivitix May 10, 2021
119f084
fix bug where remaining questions go up instead of down
Objectivitix May 10, 2021
f22cebc
increase readability, fix lint failure
Objectivitix May 10, 2021
d2e1d52
forgot to increment by one, fixed
Objectivitix May 10, 2021
1012c8b
final minor refinery as requested by vcokltfre
Objectivitix May 10, 2021
d7e3937
Update bot/exts/evergreen/trivia_quiz.py
Objectivitix May 10, 2021
f8ea21f
remove redundant parentheses
Objectivitix May 10, 2021
5f92427
apply some changes suggested by Shivansh-007
Objectivitix May 10, 2021
f01a0f3
Merge branch 'main' into main
Objectivitix May 10, 2021
6040e35
make vartol stricter when it's a generated question
Objectivitix May 10, 2021
aab59b1
lint failure fixes
Objectivitix May 10, 2021
3f03885
fix original copy paste error in math question
Objectivitix May 11, 2021
fa0f365
add one more correct answer to science (q328)
Objectivitix May 11, 2021
d2754ce
made comment more precise as described by decorator-factory
Objectivitix May 11, 2021
5241fc8
change weird google docs unicode to standard ones
Objectivitix May 11, 2021
91db03e
fix copy paste error
Objectivitix May 11, 2021
febe3e7
fix unicode corruption errors by encoding to utf-8
Objectivitix May 11, 2021
8ee99da
fix ANOTHER copy paste error
Objectivitix May 12, 2021
4448f0d
add one more possible answer to math q208
Objectivitix May 12, 2021
358e564
fix inconsistency of hexadecimal letter cases in Colours class
Objectivitix May 12, 2021
4430760
0 as an input to `questions` would now also raise an error
Objectivitix May 12, 2021
cb3b7a3
make the error embed change accordingly if DQL constant is modified
Objectivitix May 12, 2021
8f4911a
quality-of-life refinery
Objectivitix May 12, 2021
7df1d38
fix 4th copy paste error
Objectivitix May 12, 2021
b125a1a
change the unsolvable math question to a linalg question
Objectivitix May 13, 2021
62345be
implement decorator-factory's changes
Objectivitix May 13, 2021
b090b15
add a docstring to the dataclass
Objectivitix May 13, 2021
cf513eb
fix the QuizEntry dataclass
Objectivitix May 13, 2021
aa3a386
delete trailing whitespace after docstring
Objectivitix May 13, 2021
07b5f29
Merge branch 'main' into main
Objectivitix May 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions bot/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,19 +140,20 @@ class Client(NamedTuple):


class Colours:
blue = 0x0279fd
bright_green = 0x01d277
dark_green = 0x1f8b4c
orange = 0xe67e22
pink = 0xcf84e0
purple = 0xb734eb
soft_green = 0x68c290
soft_orange = 0xf9cb54
soft_red = 0xcd6d6d
yellow = 0xf9f586
blue = 0x0279FD
bright_green = 0x01D277
dark_green = 0x1F8B4C
orange = 0xE67E22
pink = 0xCF84E0
purple = 0xB734EB
soft_green = 0x68C290
soft_orange = 0xF9CB54
soft_red = 0xCD6D6D
yellow = 0xF9F586
python_blue = 0x4B8BBE
python_yellow = 0xFFD43B
grass_green = 0x66ff00
grass_green = 0x66FF00
gold = 0xE6C200

easter_like_colours = [
(255, 247, 0),
Expand All @@ -179,7 +180,7 @@ class Emojis:
envelope = "\U0001F4E8"
trashcan = environ.get("TRASHCAN_EMOJI", "<:trashcan:637136429717389331>")
ok_hand = ":ok_hand:"
hand_raised = "\U0001f64b"
hand_raised = "\U0001F64B"

dice_1 = "<:dice_1:755891608859443290>"
dice_2 = "<:dice_2:755891608741740635>"
Expand Down
Loading