diff --git a/package-lock.json b/package-lock.json
index db37d2f..a417591 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "effort-v1.3.3",
- "version": "1.3.3",
+ "version": "1.3.4.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/src/config/experiment.js b/src/config/experiment.js
index f29311b..31e36ba 100644
--- a/src/config/experiment.js
+++ b/src/config/experiment.js
@@ -6,14 +6,14 @@ import { deepCopy } from "../lib/utils";
// create copy of default settings
let exptBlock1 = deepCopy(defaultBlockSettings);
-exptBlock1.probs = ["100%", "100%", "50%", "50%"];
+exptBlock1.probs = ["100%", "100%"];
exptBlock1.counterbalance = true;
-exptBlock1.get_subset = true;
+exptBlock1.get_subset = false;
exptBlock1.value = [3, 5, 7];
exptBlock1.effort = [50, 100, 200]; // default vals were: 100, 120, 150
exptBlock1.keys = ["q", "p", "m"];
-exptBlock1.get_reward = [true, true, true, false];
-exptBlock1.num_breaks = 3;
+exptBlock1.get_reward = [true, true];
+exptBlock1.num_breaks = 2;
// debug settings where there are only 2 trials in main task block
//exptBlock1.probs = ["100%"];
diff --git a/src/config/main.js b/src/config/main.js
index 9240972..2d64478 100644
--- a/src/config/main.js
+++ b/src/config/main.js
@@ -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
diff --git a/src/config/practice.js b/src/config/practice.js
index 7e2cc98..10fc2e2 100644
--- a/src/config/practice.js
+++ b/src/config/practice.js
@@ -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];
@@ -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];
@@ -30,12 +28,11 @@ practiceBlock2.get_reward = [true, true];
let practiceBlock3 = deepCopy(defaultBlockSettings);
practiceBlock3.is_practice = true;
-practiceBlock3.probs = ["50%"];
practiceBlock3.value = [1, 5];
practiceBlock3.effort = [20, 200];
practiceBlock3.high_effort = [false, true];
practiceBlock3.keys = ["q", "p"];
-practiceBlock3.get_reward = [false, true];
+practiceBlock3.get_reward = [true, true];
practiceBlock3.quiz_attempts = 1;
practiceBlock3.max_attempts = 5;
diff --git a/src/language/en_us.json b/src/language/en_us.json
index 9ce218e..5d88a9e 100644
--- a/src/language/en_us.json
+++ b/src/language/en_us.json
@@ -47,10 +47,6 @@
"green_balloon_pump_bonus": "If you continue to pump the GREEN balloon after it hits the spike within the 25 seconds time limit, the bigger the balloon will get and the more bonus points you will earn. If you pump the GREEN balloon and it does not reach the spike within the 25 seconds time limit, you will earn some of the points for pumping the balloon. (Example: If the total possible points you can earn for a balloon is 2 points and you pump the balloon halfway to the spike, you will earn 1 point.) ",
"green_balloon_variable_points_pumps": "For the GREEN balloon, the number of pumps needed and the number of points you could win can change on each round. The number of pumps and points are listed below the GREEN balloon.",
"blue_balloon_constant_points_pumps": "For the BLUE balloon, the potential win will always stay the same (1 point), and it will always require 20 pumps.",
- "reward_prob_variable": "For some rounds, the chances that you will win points for either balloon are 50% (even after popping the balloon). ",
- "reward_prob_certain": "In other rounds the chances of winning will be 100%.",
- "prob_display_location": "The probability at which you will receive points for a trial will appear at the bottom of the screen.",
- "reward_prob_display_event": "The chances of winning points on that round, and the number of points possible to win, will be shown to you while you choose which balloon to inflate.",
"pump_keys": "Press the Q key to pump the balloon on the left. Press the P key to pump the balloon on the right.",
"choice_locked_in": "Once you have chosen a balloon, you can only pump that balloon.",
"ready": "The experiment will start now. Press next when ready!",
@@ -68,15 +64,13 @@
"any_questions": "Do you have any questions?",
"prompt": {
"more_pumps": "1. Which balloon requires more pumps? BLUE or GREEN?",
- "reward_certainty_reach_spike": "2. True or False: You will ALWAYS get points once you reach the spike.",
- "bonus_blue": "3. True or False: You can get bonus points on the BLUE balloon.",
- "bonus_green": "4. True or False: You can get bonus points on the GREEN 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 BLUE balloon.",
+ "bonus_green": "3. True or False: You can get bonus points on the GREEN 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:",
- "shown_probability": "1. You will be shown the probability of earning points for a round.",
"shown_blue_green_on_screen": "2. You will be shown a BLUE balloon and a GREEN balloon on the screen.",
"job": "3. Your job is to choose which balloon to pump up.",
"blue_req_20": "4. The BLUE balloon will ALWAYS require 20 pumps to reach the spike and can give 1 point.",
diff --git a/src/timelines/taskBlock.js b/src/timelines/taskBlock.js
index 4688566..beba469 100644
--- a/src/timelines/taskBlock.js
+++ b/src/timelines/taskBlock.js
@@ -16,7 +16,7 @@ const taskBlock = (blockSettings) => {
let timeline = startingOpts.map((opt) => taskTrial(blockSettings, blockDetails, opt))
if (blockSettings.num_breaks > 0) {
- let breakInterval = Math.floor(timeline.length / (blockSettings.num_breaks + 1))
+ let breakInterval = Math.floor(36 / (blockSettings.num_breaks + 1))
for (let iBreak = 1; iBreak < blockSettings.num_breaks + 1; iBreak++) {
timeline.splice(iBreak * breakInterval, 0, breakTrial(iBreak))
}
diff --git a/src/timelines/taskTrial.js b/src/timelines/taskTrial.js
index a0aaee0..ca6df33 100644
--- a/src/timelines/taskTrial.js
+++ b/src/timelines/taskTrial.js
@@ -27,7 +27,7 @@ const taskTrial = (blockSettings, blockDetails, opts) => {
let timeline = [
// show condition
fixation(300),
- rewardProbability(1000, blockSettings, opts, trialDetails),
+ //rewardProbability(1000, blockSettings, opts, trialDetails),
//frameSpike(700, blockSettings, opts, trialDetails),
//costBenefits(1500, blockSettings, opts, trialDetails),
choice(6000, blockSettings, opts, trialDetails),
diff --git a/src/trials/instructions.js b/src/trials/instructions.js
index e4adab8..67f7f89 100644
--- a/src/trials/instructions.js
+++ b/src/trials/instructions.js
@@ -75,21 +75,9 @@ const realPracticeScreenOne = baseStimulus(
true
);
-const realPracticeScreenTwo = baseStimulus(
- `
-