Merge branch 'master' into master

4 files changed, 100 insertions, 32 deletions

diff --git a/bot/resources/evergreen/py_topics.yaml b/bot/resources/evergreen/py_topics.yaml
index 1e53429a..f3b2eaa3 100644
--- a/bot/resources/evergreen/py_topics.yaml
+++ b/bot/resources/evergreen/py_topics.yaml
@@ -3,8 +3,6 @@
 # python-general
 267624335836053506:
     - What's your favorite PEP?
-    - What's your current text editor/IDE, and what functionality do you like about it the most when programming in Python?
-    - What functionality is your text editor/IDE missing for programming Python?
     - What parts of your life has Python automated, if any?
     - Which Python project are you the most proud of making?
     - What made you want to learn Python?
@@ -16,23 +14,34 @@
     - What feature do you think should be added to Python?
     - Has Python helped you in school? If so, how?
     - What was the first thing you created with Python?
+    - What is your favorite Python package?
+    - What standard library module is really underrated?
+    - Have you published any packages on PyPi? If so, what are they?
+    - What are you currently working on in Python?
+    - What's your favorite script and how has it helped you in day to day activities?
+    - When you were first learning, what is something that stumped you?
+    - When you were first learning, what is a resource you wish you had?
+    - What is something you know now, that you wish you knew when starting out?
+    - What is something simple that you still error on today?
+
+# algos-and-data-structs
+650401909852864553:
+    -
 
 # async
 630504881542791169:
     - Are there any frameworks you wish were async?
     - How have coroutines changed the way you write Python?
+    - What is your favorite async library?
 
 # c-extensions
 728390945384431688:
     -
 
-# computer-science
-650401909852864553:
-    -
-
 # databases
 342318764227821568:
     - Where do you get your best data?
+    - What is your preferred database and for what use?
 
 # data-science
 366673247892275221:
@@ -45,11 +54,18 @@
     - What feature would you be the most interested in making?
     - What feature would you like to see added to the library? what feature in the library do you think is redundant?
     - Do you think there's a way in which Discord could handle bots better?
+    - What's one feature you wish more developers had in their bots?
+
+# editors-ides
+813178633006350366:
+    - What's your current text editor/IDE, and what functionality do you like about it the most when programming in Python?
+    - What functionality is your text editor/IDE missing for programming Python?
 
 # esoteric-python
 470884583684964352:
     - What's a common part of programming we can make harder?
     - What are the pros and cons of messing with __magic__()?
+    - What's your favorite Python hack?
 
 # game-development
 660625198390837248:
@@ -57,7 +73,7 @@
 
 # microcontrollers
 545603026732318730:
-    -
+    - What is your favorite version of the Raspberry Pi?
 
 # networking
 716325106619777044:
@@ -67,23 +83,40 @@
 366674035876167691:
     - If you could wish for a library involving net-sec, what would it be?
 
-# software-testing
-463035728335732738:
+# software-design
+782713858615017503:
     -
 
 # tools-and-devops
 463035462760792066:
     - What editor would you recommend to a beginner? Why?
     - What editor would you recommend to be the most efficient? Why?
+    - How often do you use GitHub Actions and workflows to automate your repositories?
+    - What's your favorite app on GitHub?
+
+# unit-testing
+463035728335732738:
+    -
 
 # unix
 491523972836360192:
-    -
+    - What's your favorite Bash command?
+    - What's your most used Bash command?
+    - How often do you update your Unix machine?
+    - How often do you upgrade on production?
 
 # user-interfaces
 338993628049571840:
     - What's the most impressive Desktop Application you've made with Python so far?
+    - Have you ever made your own GUI? If so, how?
+    - Do you perfer Command Line Interfaces (CLI) or Graphic User Interfaces (GUI)?
+    - What's your favorite CLI (Command Line Interface) or TUI (Terminal Line Interface)?
+    - What's your best GUI project?
 
 # web-development
 366673702533988363:
     - How has Python helped you in web development?
+    - What tools do you use for web development?
+    - What is your favorite API library?
+    - What do you use for your frontend?
+    - What does your stack look like?
diff --git a/bot/resources/evergreen/python_facts.txt b/bot/resources/evergreen/python_facts.txt
new file mode 100644
index 00000000..0abd971b
--- /dev/null
+++ b/bot/resources/evergreen/python_facts.txt
@@ -0,0 +1,3 @@
+Python was named after Monty Python, a British Comedy Troupe, which Guido van Rossum likes.
+If you type `import this` in the Python REPL, you'll get a poem about the philosophies about Python. (check it out by doing !zen in <#267659945086812160>)
+If you type `import antigravity` in the Python REPL, you'll be directed to an [xkcd comic](https://xkcd.com/353/) about how easy Python is.
diff --git a/bot/resources/evergreen/starter.yaml b/bot/resources/evergreen/starter.yaml
index 53c89364..949220f9 100644
--- a/bot/resources/evergreen/starter.yaml
+++ b/bot/resources/evergreen/starter.yaml
@@ -20,3 +20,14 @@
 - If you had $100 bill in your Easter Basket, what would you do with it?
 - What would you do if you know you could succeed at anything you chose to do?
 - If you could take only three things from your house, what would they be?
+- What's the best pastry?
+- What's your favourite kind of soup?
+- What is the most useless talent that you have?
+- Would you rather fight 100 duck sized horses or one horse sized duck?
+- What is your favourite color?
+- What's your favourite type of weather?
+- Tea or coffee? What about milk?
+- Do you speak a language other than English?
+- What is your favorite TV show?
+- What is your favorite media genre?
+- How many years have you spent coding?
diff --git a/bot/resources/evergreen/trivia_quiz.json b/bot/resources/evergreen/trivia_quiz.json
index 8f0a4114..a4225eb1 100644
--- a/bot/resources/evergreen/trivia_quiz.json
+++ b/bot/resources/evergreen/trivia_quiz.json
@@ -2,36 +2,51 @@
   "retro": [
     {
       "id": 1,
-      "hints": ["It is not a mainline Mario Game, although the plumber is present.", "It is not a mainline Zelda Game, although Link is present."],
+      "hints": [
+        "It is not a mainline Mario Game, although the plumber is present.",
+        "It is not a mainline Zelda Game, although Link is present."
+      ],
       "question": "What is the best selling game on the Nintendo GameCube?",
       "answer": "Super Smash Bros"
     },
     {
       "id": 2,
-      "hints": ["It was released before the 90's.", "It was released after 1980."],
+      "hints": [
+        "It was released before the 90's.",
+        "It was released after 1980."
+      ],
       "question": "What year was Tetris released?",
       "answer": "1984"
     },
     {
       "id": 3,
-      "hints": ["The occupation was in construction", "He appeared as this kind of worker in 1981's Donkey Kong"],
+      "hints": [
+        "The occupation was in construction",
+        "He appeared as this kind of worker in 1981's Donkey Kong"
+      ],
       "question": "What was Mario's original occupation?",
       "answer": "Carpenter"
     },
     {
       "id": 4,
-      "hints": ["It was revealed in the Nintendo Character Guide in 1993.", "His last name has to do with eating Mario's enemies."],
+      "hints": [
+        "It was revealed in the Nintendo Character Guide in 1993.",
+        "His last name has to do with eating Mario's enemies."
+      ],
       "question": "What is Yoshi's (from Mario Bros.) full name?",
       "answer": "Yoshisaur Munchakoopas"
     },
     {
       "id": 5,
-      "hints": ["The game was released in 1990.", "It was released on the SNES."],
+      "hints": [
+        "The game was released in 1990.",
+        "It was released on the SNES."
+      ],
       "question": "What was the first game Yoshi appeared in?",
       "answer": "Super Mario World"
     }
   ],
-  "general":[
+  "general": [
     {
       "id": 100,
       "question": "Name \"the land of a thousand lakes\"",
@@ -114,7 +129,7 @@
       "id": 113,
       "question": "What's the name of the tallest waterfall in the world.",
       "answer": "Angel Falls",
-      "info": "Angel Falls (Salto Ángel) in Venezuela is the highest waterfall in the world. The falls are 3230 feet in height, with an uninterrupted drop of 2647 feet. Angel Falls is located on a tributary of the Rio Caroni."
+      "info": "Angel Falls (Salto \u00c1ngel) in Venezuela is the highest waterfall in the world. The falls are 3230 feet in height, with an uninterrupted drop of 2647 feet. Angel Falls is located on a tributary of the Rio Caroni."
     },
     {
       "id": 114,
@@ -180,7 +195,7 @@
       "id": 124,
       "question": "When did the Second World War end?",
       "answer": "1945",
-      "info": "World War 2 ended with the unconditional surrender of the Axis powers. On 8 May 1945, the Allies accepted Germany's surrender, about a week after Adolf Hitler had committed suicide. VE Day – Victory in Europe celebrates the end of the Second World War on 8 May 1945."
+      "info": "World War 2 ended with the unconditional surrender of the Axis powers. On 8 May 1945, the Allies accepted Germany's surrender, about a week after Adolf Hitler had committed suicide. VE Day \u2013 Victory in Europe celebrates the end of the Second World War on 8 May 1945."
     },
     {
       "id": 125,
@@ -190,63 +205,69 @@
     },
     {
       "id": 126,
-      "question": "What's the name of the largest river in the world?",
-      "answer": "Nile",
-      "info": "The Nile, which is about 6,650 km (4,130 mi) long, is an \"international\" river as its drainage basin covers eleven countries, namely, Tanzania, Uganda, Rwanda, Burundi, the Democratic Republic of the Congo, Kenya, Ethiopia, Eritrea, South Sudan, Republic of the Sudan and Egypt."
-    },
-    {
-      "id": 127,
       "question": "Which is the smallest planet in the Solar System?",
       "answer": "Mercury",
       "info": "Mercury is the smallest planet in our solar system. It's just a little bigger than Earth's moon. It is the closest planet to the sun, but it's actually not the hottest. Venus is hotter."
     },
     {
-      "id": 128,
+      "id": 127,
       "question": "What is the smallest country?",
       "answer": "Vatican City",
       "info": "With an area of 0.17 square miles (0.44 km2) and a population right around 1,000, Vatican City is the smallest country in the world, both in terms of size and population."
     },
     {
-      "id": 129,
+      "id": 128,
       "question": "What's the name of the largest bird?",
       "answer": "Ostrich",
       "info": "The largest living bird, a member of the Struthioniformes, is the ostrich (Struthio camelus), from the plains of Africa and Arabia. A large male ostrich can reach a height of 2.8 metres (9.2 feet) and weigh over 156 kilograms (344 pounds)."
     },
     {
-      "id": 130,
+      "id": 129,
       "question": "What does the acronym GPRS stand for?",
       "answer": "General Packet Radio Service",
       "info": "General Packet Radio Service (GPRS) is a packet-based mobile data service on the global system for mobile communications (GSM) of 3G and 2G cellular communication systems. It is a non-voice, high-speed and useful packet-switching technology intended for GSM networks."
     },
     {
-      "id": 131,
+      "id": 130,
       "question": "In what country is the Ebro river located?",
       "answer": "Spain",
       "info": "The Ebro river is located in Spain. It is 930 kilometers long and it's the second longest river that ends on the Mediterranean Sea."
     },
     {
-      "id": 132,
+      "id": 131,
       "question": "What year was the IBM PC model 5150 introduced into the market?",
       "answer": "1981",
       "info": "The IBM PC was introduced into the market in 1981. It used the Intel 8088, with a clock speed of 4.77 MHz, along with the MDA and CGA as a video card."
     },
     {
-      "id": 133,
+      "id": 132,
       "question": "What's the world's largest urban area?",
       "answer": "Tokyo",
       "info": "Tokyo is the most populated city in the world, with a population of 37 million people. It is located in Japan."
     },
     {
-      "id": 134,
+      "id": 133,
       "question": "How many planets are there in the Solar system?",
       "answer": "8",
       "info": "In the Solar system, there are 8 planets: Mercury, Venus, Earth, Mars, Jupiter, Saturn, Uranus and Neptune. Pluto isn't considered a planet in the Solar System anymore."
     },
     {
-      "id": 135,
+      "id": 134,
       "question": "What is the capital of Iraq?",
       "answer": "Baghdad",
       "info": "Baghdad is the capital of Iraq. It has a population of 7 million people."
+    },
+    {
+      "id": 135,
+      "question": "The United Nations headquarters is located at which city?",
+      "answer": "New York",
+      "info": "The United Nations is headquartered in New York City in a complex designed by a board of architects led by Wallace Harrison and built by the architectural firm Harrison & Abramovitz. The complex has served as the official headquarters of the United Nations since its completion in 1951."
+    },
+    {
+      "id": 136,
+      "question": "At what year did Christopher Columbus discover America?",
+      "answer": "1492",
+      "info": "The explorer Christopher Columbus made four trips across the Atlantic Ocean from Spain: in 1492, 1493, 1498 and 1502. He was determined to find a direct water route west from Europe to Asia, but he never did. Instead, he stumbled upon the Americas"
     }
   ]
 }