Skip to content

Hide powermarks until the answer is revealed #139

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
geoffrey-wu merged 2 commits into from
Mar 10, 2023
Merged

Hide powermarks until the answer is revealed #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6382287
Hide powermarks until the answer is revealed
BLCRAFT210 Mar 10, 2023
ff96262
Fix lint errors
BLCRAFT210 Mar 10, 2023
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
13 changes: 12 additions & 1 deletion client/multiplayer/room.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ let validCategories = [];
let validSubcategories = [];

let maxPacketNumber = 24;
let powermarkPosition = 0;

// Do not escape room name as that is how it is stored on the server.
const ROOM_NAME = location.pathname.substring(13);
Expand Down Expand Up @@ -130,10 +131,18 @@ socket.onmessage = function (event) {

case 'update-answer':
document.getElementById('answer').innerHTML = 'ANSWER: ' + data.answer;
question = (document.getElementById('question').innerHTML);
if (powermarkPosition)
question = question.slice(0, powermarkPosition) + '(*) ' + question.slice(powermarkPosition);
powerParts = question.split('(*)');
document.getElementById('question').innerHTML = `${powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : powerParts[0]}`;
break;

case 'update-question':
document.getElementById('question').innerHTML += data.word + ' ';
if (data.word === '(*)')
powermarkPosition = document.getElementById('question').innerHTML.length;
else
document.getElementById('question').innerHTML += data.word + ' ';
break;

case 'year-range':
Expand Down Expand Up @@ -351,6 +360,7 @@ const socketOnNext = (message) => {
document.getElementById('next').classList.remove('btn-success');
document.getElementById('next').innerHTML = 'Skip';
document.getElementById('question').innerHTML = '';
powermarkPosition = 0;
document.getElementById('answer').innerHTML = '';
document.getElementById('buzz').innerHTML = 'Buzz';
document.getElementById('buzz').disabled = false;
Expand All @@ -370,6 +380,7 @@ const socketOnStart = (message) => {
logEvent(message.username, 'started the game');

document.getElementById('question').innerHTML = '';
powermarkPosition = 0;
document.getElementById('answer').innerHTML = '';
document.getElementById('buzz').innerHTML = 'Buzz';
document.getElementById('buzz').disabled = false;
Expand Down
13 changes: 11 additions & 2 deletions client/singleplayer/tossups.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ let validSubcategories;
let currentlyBuzzing = false;
let packetNumber = -1;
let paused = false;
let powermarkPosition = 0;

// WARNING: 0-indexed (instead of 1-indexed, like in multiplayer)
let questionNumber = 0;
Expand Down Expand Up @@ -196,6 +197,7 @@ async function next() {
document.getElementById('set-name-info').innerHTML = setName;

paused = false;
powermarkPosition = 0;
readQuestion(new Date().getTime());
}

Expand Down Expand Up @@ -224,7 +226,10 @@ function pause() {
function readQuestion(expectedReadTime) {
if (!currentlyBuzzing && questionTextSplit.length > 0) {
const word = questionTextSplit.shift();
document.getElementById('question').innerHTML += word + ' ';
if (word === '(*)')
powermarkPosition = document.getElementById('question').innerHTML.length;
else
document.getElementById('question').innerHTML += word + ' ';

// calculate time needed before reading next word
let time = Math.log(word.length) + 1;
Expand Down Expand Up @@ -257,7 +262,11 @@ function reveal() {

function revealQuestion() {
document.getElementById('answer').innerHTML = 'ANSWER: ' + questions[questionNumber].answer;
document.getElementById('question').innerHTML += questionTextSplit.join(' ');
let question = (document.getElementById('question').innerHTML);
if (powermarkPosition)
question = question.slice(0, powermarkPosition) + '(*) ' + question.slice(powermarkPosition);
const powerParts = (question + questionTextSplit.join(' ')).split('(*)');
document.getElementById('question').innerHTML = `${powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : powerParts[0]}`;

document.getElementById('buzz').disabled = true;
document.getElementById('buzz').innerHTML = 'Buzz';
Expand Down