Skip to content

Commit

Permalink
Merge pull request #139 from ubclaunchpad/#138-ui-bugs
Browse files Browse the repository at this point in the history
Fixed the UI related bugs
  • Loading branch information
rmcreyes authored Apr 14, 2020
2 parents 42cd395 + ae8bab6 commit 646695c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
10 changes: 5 additions & 5 deletions src/events.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"choices": [
"LoremIpsum"
],
"hasBottomBoxBorder": false,
"hasBottomBoxBorder": true,
"hasInnerFill": true,
"gamePlayMode": "Comics"
},
Expand All @@ -90,7 +90,7 @@
"choices": [
"DarnIt"
],
"hasBottomBoxBorder": false,
"hasBottomBoxBorder": true,
"hasInnerFill": true,
"gamePlayMode": "Comics"
},
Expand All @@ -100,7 +100,7 @@
"choices": [
"BlockPartyCancelled"
],
"hasBottomBoxBorder": false,
"hasBottomBoxBorder": true,
"hasInnerFill": true,
"gamePlayMode": "Comics"
},
Expand Down Expand Up @@ -149,7 +149,7 @@
},
"StormTheWallEvent": {
"prompt": "Wanna Storm the Wall bro?",
"imgPath": "StormTheWallEvent/stormTheWall",
"imgPath": "StormTheWallEvent/stormTheWall.png",
"choices": [
"ScaleWall",
"CantReachTopShelf"
Expand Down Expand Up @@ -220,4 +220,4 @@
"hasInnerFill": true,
"gamePlayMode": "GameOver"
}
}
}
11 changes: 4 additions & 7 deletions src/minigames.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
{
"EssayWrite":
{
"EssayWrite": {
"build": "essay_write",
"winStatChanges": [0, 1, 0],
"loseStatChanges": [0, -1, 0],
"prompt": "Click to write your essay!"
},
"SquirrelJump":
{
"SquirrelJump": {
"build": "squirrel_jump",
"winStatChanges": [10, 0.5, 0],
"loseStatChanges": [-20, -0.5, 0],
"prompt": "Jump over all the squirrels!"
"prompt": "Click to jump over all the squirrels!"
},
"ToiletPaperCatch":
{
"ToiletPaperCatch": {
"build": "toilet_paper_catch",
"winStatChanges": [10, 0, 10],
"loseStatChanges": [-10, -0, -10],
Expand Down

0 comments on commit 646695c

Please sign in to comment.