Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-08-20 08:04:34 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Trivia: Changes to the random category selector (#6971)

Browse Source
This commit is contained in:
Annika
2020-07-06 21:16:57 -07:00
committed by GitHub
parent 4703cb76f3
commit d42e17b7ff
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/chat-plugins/trivia.ts
View File

@@ -32,8 +32,6 @@ const MODES: {[k: string]: string} = {
number: 'Number',
timer: 'Timer',
triumvirate: 'Triumvirate',
tri: 'Triumvirate',
triforce: 'Triumvirate',
};
const LENGTHS: {[k: string]: {cap: number, prizes: number[]}} = {
@@ -1074,6 +1072,7 @@ const commands: ChatCommands = {
if (targets.length < 3) return this.errorReply("Usage: /trivia new [mode], [category], [length]");
let mode: string = toID(targets[0]);
if (['triforce', 'tri'].includes(mode)) mode = 'triumvirate';
const isRandomMode = (mode === 'random');
if (isRandomMode) {
mode = Utils.shuffle(['first', 'number', 'timer', 'triumvirate'])[0];
@@ -1085,7 +1084,8 @@ const commands: ChatCommands = {
const isAll = (category === 'all');
let questions;
if (isRandomCategory) {
const categories = Object.keys(MAIN_CATEGORIES);
const lastCategoryID = toID(triviaData.history?.slice(-1)[0].category).replace("random", "");
const categories = Object.keys(MAIN_CATEGORIES).filter(cat => toID(MAIN_CATEGORIES[cat]) !== lastCategoryID);
const randCategory = categories[Math.floor(Math.random() * categories.length)];
questions = sliceCategory(randCategory);
} else if (isAll) {
@@ -1117,7 +1117,7 @@ const commands: ChatCommands = {
_Trivia = FirstModeTrivia;
} else if (mode === 'number') {
_Trivia = NumberModeTrivia;
} else if (mode === 'triumvirate' || mode === 'tri' || mode === 'triforce') {
} else if (mode === 'triumvirate') {
_Trivia = TriumvirateModeTrivia;
} else {
_Trivia = TimerModeTrivia;