Skip to content

Commit

Permalink
Changed Quiz to reflect removed probability
Browse files Browse the repository at this point in the history
  • Loading branch information
moblim committed May 23, 2022
1 parent a0239cd commit 15328d4
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/config/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ try {
// then assume it's online in the browser
// with MTurk or Prolific
ONLINE = AT_HOME && !IS_ELECTRON ? true : false;
ONLINE = true;
ONLINE = false;
console.log("ONLINE:", ONLINE);

// note: it _is_ possible to do both firebase & mturk if desired
Expand Down
3 changes: 0 additions & 3 deletions src/config/practice.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { deepCopy } from "../lib/utils";
let practiceBlock1 = deepCopy(defaultBlockSettings);

practiceBlock1.is_practice = true;
practiceBlock1.probs = ["100%"];
practiceBlock1.value = [1, 0];
practiceBlock1.effort = [20, 0];
practiceBlock1.high_effort = [false, false];
Expand All @@ -19,7 +18,6 @@ practiceBlock1.get_reward = [true, true];
let practiceBlock2 = deepCopy(defaultBlockSettings);

practiceBlock2.is_practice = true;
practiceBlock2.probs = ["100%"];
practiceBlock2.value = [0, 5];
practiceBlock2.effort = [0, 200];
practiceBlock2.high_effort = [false, true];
Expand All @@ -30,7 +28,6 @@ practiceBlock2.get_reward = [true, true];
let practiceBlock3 = deepCopy(defaultBlockSettings);

practiceBlock3.is_practice = true;
practiceBlock3.probs = ["100%"];
practiceBlock3.value = [1, 5];
practiceBlock3.effort = [20, 200];
practiceBlock3.high_effort = [false, true];
Expand Down
8 changes: 4 additions & 4 deletions src/language/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
"any_questions": "Do you have any questions?",
"prompt": {
"more_pumps": "1. Which balloon requires more pumps? <span class='text-blue'><b>BLUE</b></span> or <span class='text-green'><b>GREEN</b></span>?",
"bonus_blue": "3. True or False: You can get bonus points on the <span class='text-blue'><b>BLUE</b></span> balloon.",
"bonus_green": "4. True or False: You can get bonus points on the <span class='text-green'><b>GREEN</b></span> balloon.",
"total_shown": "5. True or False: You will be shown your total number of points after each round.",
"points_to_money": "6. True or False: You will receive real money from your total number of points at the end of the task."
"bonus_blue": "2. True or False: You can get bonus points on the <span class='text-blue'><b>BLUE</b></span> balloon.",
"bonus_green": "3. True or False: You can get bonus points on the <span class='text-green'><b>GREEN</b></span> balloon.",
"total_shown": "4. True or False: You will be shown your total number of points after each round.",
"points_to_money": "5. True or False: You will receive real money from your total number of points at the end of the task."
},
"rules": {
"preface": "Summary of Instructions/Rules:",
Expand Down
2 changes: 1 addition & 1 deletion src/trials/instructions.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ const greenPracticeInstructions = () => {
// where both balloons are possible choices
const realPracticeInstructions = () => {
let realPracticeInstructionsArray = [
realPracticeScreenOne,,
realPracticeScreenOne,
realPracticeScreenThree,
realPracticeScreenFour,
];
Expand Down
13 changes: 2 additions & 11 deletions src/trials/quizTrials.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ const blueOrGreen = [

const quizPrompts = [
`${lang.quiz.prompt.more_pumps}`,
`${lang.quiz.prompt.reward_certainty_reach_spike}`,
`${lang.quiz.prompt.bonus_blue}`,
`${lang.quiz.prompt.bonus_green}`,
`${lang.quiz.prompt.total_shown}`,
Expand All @@ -28,7 +27,6 @@ const quizPrompts = [
];

const quizRules = [
`${lang.quiz.rules.shown_probability}`,
`${lang.quiz.rules.shown_blue_green_on_screen}`,
`${lang.quiz.rules.job}`,
`${lang.quiz.rules.blue_req_20}`,
Expand All @@ -55,7 +53,7 @@ const quiz = (blockSettings) => {
prompt: quizPrompts[1],
options: quizOptions(),
required: true,
},
},
{
prompt: quizPrompts[2],
options: quizOptions(),
Expand All @@ -71,11 +69,6 @@ const quiz = (blockSettings) => {
options: quizOptions(),
required: true,
},
{
prompt: quizPrompts[5],
options: quizOptions(),
required: true,
},
];

return {
Expand Down Expand Up @@ -163,7 +156,6 @@ const retakeLoop = (blockSettings) => {
const correctAnswers = [
`${lang.quiz.answer_opts.green}`,
`${lang.quiz.answer_opts.false}`,
`${lang.quiz.answer_opts.false}`,
`${lang.quiz.answer_opts.true}`,
`${lang.quiz.answer_opts.true}`,
`${lang.quiz.answer_opts.true}`,
Expand Down Expand Up @@ -191,8 +183,7 @@ const checkRetake = (blockSettings) => {
const prevAnswers = prevData.answer;

const correctAnswers = [
`${lang.quiz.answer_opts.green}`,
`${lang.quiz.answer_opts.false}`,
`${lang.quiz.answer_opts.green}`,
`${lang.quiz.answer_opts.false}`,
`${lang.quiz.answer_opts.true}`,
`${lang.quiz.answer_opts.true}`,
Expand Down

0 comments on commit 15328d4

Please sign in to comment.