Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions client/play/mp/MultiplayerTossupBonusClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ export const MultiplayerClientMixin = (ClientClass) => class extends ClientClass
buzzedIn,
canBuzz,
currentQuestionType,
fixedDifficulties,
isPermanent,
isVerified,
ownerId,
Expand Down Expand Up @@ -180,6 +181,10 @@ export const MultiplayerClientMixin = (ClientClass) => class extends ClientClass
}
}

if (fixedDifficulties) {
document.getElementById('difficulties').querySelectorAll('input').forEach(input => { input.disabled = true; });
}

for (const userId of Object.keys(players)) {
const teamId = players[userId].teamId;
players[userId].celerity = players[userId].celerity.correct.average;
Expand Down
7 changes: 7 additions & 0 deletions server/multiplayer/ServerMultiplayerRoomMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const ServerMultiplayerRoomMixin = (RoomClass) => class extends RoomClass {
this.ownerId = ownerId;
this.isPermanent = isPermanent;
this.isVerified = isVerified;
this.fixedDifficulties = false;
this.checkAnswer = checkAnswer;
this.getPacketCount = getNumPackets;

Expand Down Expand Up @@ -148,6 +149,7 @@ const ServerMultiplayerRoomMixin = (RoomClass) => class extends RoomClass {
canBuzz: this.settings.rebuzz || !this.buzzes.includes(userId),
currentQuestionType: this.currentQuestionType,
isPermanent: this.isPermanent,
fixedDifficulties: this.fixedDifficulties,
isVerified: this.isVerified,
mode: this.mode,
ownerId: this.ownerId,
Expand Down Expand Up @@ -277,6 +279,11 @@ const ServerMultiplayerRoomMixin = (RoomClass) => class extends RoomClass {
super.setCategories({ userId, username }, { categories, subcategories, alternateSubcategories, percentView, categoryPercents });
}

setDifficulties ({ userId, username }, { difficulties }) {
if (this.fixedDifficulties || !this.allowed(userId)) { return; }
super.setDifficulties({ userId, username }, { difficulties });
}

setMode ({ userId, username }, { mode }) {
if (this.isPermanent || !this.allowed(userId)) { return; }
if (this.mode !== MODE_ENUM.SET_NAME && this.mode !== MODE_ENUM.RANDOM) { return; }
Expand Down
12 changes: 9 additions & 3 deletions server/multiplayer/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,23 @@ export const PERMANENT_ROOMS = [
{
name: 'msquizbowl',
categories: CATEGORIES,
subcategories: SUBCATEGORIES
subcategories: SUBCATEGORIES,
difficulties: [1],
fixedDifficulties: true
},
{
name: 'hsquizbowl',
categories: CATEGORIES,
subcategories: SUBCATEGORIES
subcategories: SUBCATEGORIES,
difficulties: [2, 3],
fixedDifficulties: true
},
{
name: 'collegequizbowl',
categories: CATEGORIES,
subcategories: SUBCATEGORIES
subcategories: SUBCATEGORIES,
difficulties: [7, 8, 9],
fixedDifficulties: true
},
{
name: 'literature',
Expand Down
14 changes: 10 additions & 4 deletions server/multiplayer/handle-wss-connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,22 @@ const DOMPurify = createDOMPurify(window);
export const tossupBonusRooms = {};
const connectionsByIp = new Map();
for (const room of PERMANENT_ROOMS) {
const { name, categories, subcategories } = room;
tossupBonusRooms[name] = new ServerTossupBonusRoom(
const { name, categories, subcategories, difficulties, fixedDifficulties = false } = room;
const r = new ServerTossupBonusRoom(
name, Symbol('unique permanent room owner'), true, new CategoryManager(categories, subcategories), false
);
if (difficulties) { r.query.difficulties = difficulties; }
r.fixedDifficulties = fixedDifficulties;
tossupBonusRooms[name] = r;
}
for (const room of VERIFIED_ROOMS) {
const { name, categories, subcategories } = room;
tossupBonusRooms[name] = new ServerTossupBonusRoom(
const { name, categories, subcategories, difficulties, fixedDifficulties = false } = room;
const r = new ServerTossupBonusRoom(
name, Symbol('unique verified room owner'), true, new CategoryManager(categories, subcategories), true
);
if (difficulties) { r.query.difficulties = difficulties; }
r.fixedDifficulties = fixedDifficulties;
tossupBonusRooms[name] = r;
}

/**
Expand Down
Loading