Skip to content

Commit

Permalink
moved the chests, pushing and forking before i really change things -SM
Browse files Browse the repository at this point in the history
  • Loading branch information
ShaneMcKeon committed Aug 21, 2024
1 parent 91f0bcd commit b7bb52c
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 9 deletions.
1 change: 1 addition & 0 deletions habit.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
system.tex = load_textures(system.w, varargin{:});

%% instructions

[onset, output] = instructions(system, 1);

%% start timing and data collection
Expand Down
4 changes: 2 additions & 2 deletions private/feedback.m
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
% reach back in time and find the previous choice event
choice = record(t.i-2).output,
if choice.score
msg = 'REWARD!'
msg = 'REWARD!';
else
msg = 'NO REWARD!'
msg = 'NO REWARD!';
end

% TODO: find chosen direction using choice.key
Expand Down
8 changes: 4 additions & 4 deletions private/load_events.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@

i=i+1;
timing(i).event_name = 'isi';
timing(i).dur = 2;
timing(i).dur = 4;
timing(i).cross_color = [0,0,255];%blue
timing(i).func = @fixation;
timing(i).onset=0; % as soon as choice ends
timing(i).i = i;

i=i+1;
timing(i).event_name = 'feedback';
timing(i).dur = 2;
timing(i).dur = 3;
timing(i).func = @feedback;
timing(i).onset=timing(i-1).dur
timing(i).onset=timing(i-1).dur;
timing(i).i = i;

i=i+1;
timing(i).event_name = 'iti';
timing(i).dur = 3;
timing(i).cross_color = [255,255,255]; % white
timing(i).func = @fixation;
timing(i).onset=timing(i-1).dur
timing(i).onset=timing(i-1).dur;
timing(i).i = i;

end
1 change: 1 addition & 0 deletions private/load_textures.m
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
fprintf('# loading textures\n');
imgs = [dir('out/imgs/*.png')];


avatar_sprites = {'astronaut', 'shark','lizard_blue', 'alient_green'};
well_sprites = {'chest_sprites', 'wellcoin_sprites'};
for f = imgs'
Expand Down
7 changes: 4 additions & 3 deletions private/setup_pos.m
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
function pos = setup_pos(w, varargin);
% TODO: use screen size?
pos.left.x=10;
% 2024-08-21 changed x coordinates so that the chests are centered - SM
pos.left.x=180;
pos.left.y=400;

pos.up.x=200;
pos.up.x=380;
pos.up.y=200;

pos.right.x=400;
pos.right.x=580;
pos.right.y=400;
Binary file removed resources/public/imgs/ocean_border.jpg
Binary file not shown.
Binary file added resources/public/imgs/ocean_border.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b7bb52c

Please sign in to comment.