Conversation
…ial in it, theres a bug where a new tutorial deck wont be built but a regular deck will
…, and refactored a bit of code
…ion and how to best present it. Committing the rest of todays work.
…d after a card has been entered
…a more concise description of what they should be doing
…s description(may need to be changed, moved, or modified. Changed \'Tutorial Player\' to \'You\', and made the first card to be selected have a yellow glow
…use every card and build up both paths
…the user will take, added improved instructions, fixed a problem with group cards not working with the state management, and other small fixes
…backup before updating packages again
…ss and changed to CDNJS for animate.css because the direct download wasnt working. Also updated a critical vulnerability in our packages
…s when the tipbox is hovered over. The animation is removed when a button in the tipbox is clicked
…ser to look at the tipBox, made the tipbox animation pause instead of reset so the delay doesnt reset (this may be to be changed to have a better UX)
JaceRiehl
added
the
feature request
… modals are executed. Fixes #272
Changed some wording about how the game concepts relate to computer programming and the Python tutorial.
Fixed <i> tag
Updating Tutorial text
johnanvik
requested changes
May 15, 2018
src/classes/TutorialDeck.js
Outdated
| * @constructor Deck | ||
| */ | ||
| constructor(){ | ||
| //this.initDeck(); |
src/classes/TutorialDeck.js
Outdated
|
|
||
| } | ||
| } | ||
| //this.shuffle(this.cards); |
Collaborator
There was a problem hiding this comment.
I'm guessing this was in the game, but we don't want this in the tutorial. Please remove.
src/classes/TutorialDeck.js
Outdated
| * shuffle function that will psuedo shuffle the contents of the deck into a random order | ||
| * @memberOf Deck | ||
| */ | ||
| shuffle(event) { |
Collaborator
There was a problem hiding this comment.
Dead code for the tutorial?
src/components/Card.vue
Outdated
| classString = classString + ' selected' | ||
| } | ||
|
|
||
| // if () { |
Collaborator
There was a problem hiding this comment.
Commented code to be cleaned up.
src/components/MainComponent.vue
Outdated
| this.$store.commit('addPlayers', {list: this.localPlayers}); | ||
| this.gameStart = true; | ||
| }, | ||
| // submit() { |
src/components/PlayerInfoPanel.vue
Outdated
| }, | ||
| setFact() { | ||
| var num = Math.floor(Math.random() * this.facts.length); | ||
| console.log("Fact in notTut: " + this.facts[num]); |
src/components/Stack.vue
Outdated
| }, | ||
| groupStacks() { | ||
| if(this.$store.getters.getTutorialState){ | ||
| console.log("emitting event in Group"); |
src/components/Stack.vue
Outdated
| this.addToStack() | ||
|
|
||
| this.addToStack(); | ||
| console.log("Adding to stack"); |
Collaborator
Author
|
All of the comments and issues have been addressed. |
johnanvik
approved these changes
May 17, 2018
Collaborator
johnanvik
left a comment
johnanvik
left a comment
There was a problem hiding this comment.
This is really good work!
JaceRiehl
added a commit
that referenced
this pull request
May 22, 2018
* Added a tutorial button * Fixing the code that broke from adding the button * Pressing the tutorial button routes to a tutorial link with the tutorial in it, theres a bug where a new tutorial deck wont be built but a regular deck will * Fixed the previous bug, the tutorial now has its own deck * Added specific deck formation functionality, wrote some documentation, and refactored a bit of code * Attempting to figure out how the tutorial should run in a linear fashion and how to best present it. Committing the rest of todays work. * Got the states correctly configured and the next instruction is played after a card has been entered * Added a Game Objectives button in the tutorial mode to give the user a more concise description of what they should be doing * Added more in depth programming fundamental descriptions to each cards description(may need to be changed, moved, or modified. Changed \'Tutorial Player\' to \'You\', and made the first card to be selected have a yellow glow * Got the Game Objectives modal to display as soon as the page is loaded * Added a potential path for the user to take that teaches them how to use every card and build up both paths * Added highlighting to all cards to be chosen, modified the path that the user will take, added improved instructions, fixed a problem with group cards not working with the state management, and other small fixes * Added a blinking animation to the highlighted cards with a delay * Added animate.css to our package dependencies and commiting for easy backup before updating packages again * Changed blinking animation to a breathing like animation for smoothness and changed to CDNJS for animate.css because the direct download wasnt working. Also updated a critical vulnerability in our packages * Fixed a package dependency that wasnt allowing us to run the dev server * Added a finite bouncing animation for the tipbox to be more in your face * Changed the tip box animation so its infinite and the animation pauses when the tipbox is hovered over. The animation is removed when a button in the tipbox is clicked * Made a new modal appear before entering the game that instructs the user to look at the tipBox, made the tipbox animation pause instead of reset so the delay doesnt reset (this may be to be changed to have a better UX) * Fixed the UI such that the bouncing animation doesnt happen until the modals are executed. Fixes #272 * Update RulesModal.vue Changed some wording about how the game concepts relate to computer programming and the Python tutorial. * Update RulesModal.vue Fixed <i> tag * Updating Tutorial text * Changing font size * Implementing various fixes from pull request. Fixes #277, Fixes #274, Fixes #273 * Minor bug fixes and removing unneeded comments/debugging statements
johnanvik
pushed a commit
that referenced
this pull request
May 29, 2018
* Playing around with the grouping checkbox, i've changed it to a button. Ive tried making it so that it only appears when the values works but its also affected by the bug I was trying to address. May have to reset. * Committing minor changes to the true/false path to work on the tutorial * Have the path decided on the first turn and colour the directed path. * Made the game only allow you to add cards to the path that was chosen. * Made it so group cards can only be used on the chosen side and so that the game ends when someone gets the winning score * Ive fixed a bug with the game not ending when the max score is reached, I think Ive fully fixed the AI (Ive tested it but it might need further testing), fixed the rules to apply with the new rules, removed comments and debugging statements. * Added the ability to add repeat cards to everything except for repeatX cards. Ive made it so they can only have two repeat cards in a stack, this may need to be changed in the future. Fixes #38 and the previous commit Fixes #257 * Fixed the previous commit that makes it only allow two total repeats. * Adding npm-shrinkwrap to the .gitignore, its a substitute for package-lock.json but we dont need it. * Delete npm-shrinkwrap.json * Playing around with the grouping checkbox, i've changed it to a button. Ive tried making it so that it only appears when the values works but its also affected by the bug I was trying to address. May have to reset. * Committing minor changes to the true/false path to work on the tutorial * Have the path decided on the first turn and colour the directed path. * Made the game only allow you to add cards to the path that was chosen. * Made it so group cards can only be used on the chosen side and so that the game ends when someone gets the winning score * Ive fixed a bug with the game not ending when the max score is reached, I think Ive fully fixed the AI (Ive tested it but it might need further testing), fixed the rules to apply with the new rules, removed comments and debugging statements. * Added the ability to add repeat cards to everything except for repeatX cards. Ive made it so they can only have two repeat cards in a stack, this may need to be changed in the future. Fixes #38 and the previous commit Fixes #257 * Fixed the previous commit that makes it only allow two total repeats. * Tutorial (#271) * Added a tutorial button * Fixing the code that broke from adding the button * Pressing the tutorial button routes to a tutorial link with the tutorial in it, theres a bug where a new tutorial deck wont be built but a regular deck will * Fixed the previous bug, the tutorial now has its own deck * Added specific deck formation functionality, wrote some documentation, and refactored a bit of code * Attempting to figure out how the tutorial should run in a linear fashion and how to best present it. Committing the rest of todays work. * Got the states correctly configured and the next instruction is played after a card has been entered * Added a Game Objectives button in the tutorial mode to give the user a more concise description of what they should be doing * Added more in depth programming fundamental descriptions to each cards description(may need to be changed, moved, or modified. Changed \'Tutorial Player\' to \'You\', and made the first card to be selected have a yellow glow * Got the Game Objectives modal to display as soon as the page is loaded * Added a potential path for the user to take that teaches them how to use every card and build up both paths * Added highlighting to all cards to be chosen, modified the path that the user will take, added improved instructions, fixed a problem with group cards not working with the state management, and other small fixes * Added a blinking animation to the highlighted cards with a delay * Added animate.css to our package dependencies and commiting for easy backup before updating packages again * Changed blinking animation to a breathing like animation for smoothness and changed to CDNJS for animate.css because the direct download wasnt working. Also updated a critical vulnerability in our packages * Fixed a package dependency that wasnt allowing us to run the dev server * Added a finite bouncing animation for the tipbox to be more in your face * Changed the tip box animation so its infinite and the animation pauses when the tipbox is hovered over. The animation is removed when a button in the tipbox is clicked * Made a new modal appear before entering the game that instructs the user to look at the tipBox, made the tipbox animation pause instead of reset so the delay doesnt reset (this may be to be changed to have a better UX) * Fixed the UI such that the bouncing animation doesnt happen until the modals are executed. Fixes #272 * Update RulesModal.vue Changed some wording about how the game concepts relate to computer programming and the Python tutorial. * Update RulesModal.vue Fixed <i> tag * Updating Tutorial text * Changing font size * Implementing various fixes from pull request. Fixes #277, Fixes #274, Fixes #273 * Minor bug fixes and removing unneeded comments/debugging statements * Rename .codeclimate.yml to .codeclimate.yml.old This is overriding settings on the website. Seeing what happens without this. * New CodeClimate configuration file * Update .codeclimate.yml Adding back the original plugins Upping the method line limit to 50 Added `markdownlint` * Delete .codeclimate.yml.old * Adding npm-shrinkwrap to the .gitignore, its a substitute for package-lock.json but we dont need it. * Update .travis.yml Trying to fix test coverage * Got the virus modal to appear and give the option of players to infect * Removed merge conflicts * Finished adding virus card and tested it at a system level, and added a panel for showing the user their perks/disabilities * Added Power Outage card functionality * Added the Battery Backup functionality. * Added the Overclock functionality. * Added all of the protection cards. Another random bug and UI fixes or improvements. Fixes #261 * Changed the rules to reflect the new cards, it will probably have to be updated to better reflect how the cards relate to programming. * Seeing if I fixed the travis build * Testing again if travis build works. * Added tests for the new cards and attempting to fix code climate * Attempting to fix code climate again, to see what works. * Last time * The Ai can now use the power outage card * Forgot to change the deck back, fixing build * Added the rest of the cards to the AI and balanced it the best that I can right now. * Changed the scoring system (To be updated later based on feedback). Fixed some bugs. Fixes #291 * Changed the tutorial to have the new layout, changed the deck to reflect the new tutorial path, and the tutorial now works with the new cards * Finishing the updated tutorial * Made it so that the user cant go off script and I fixed a bug that made it so the original game couldnt be played
johnanvik
pushed a commit
that referenced
this pull request
May 30, 2018
* Playing around with the grouping checkbox, i've changed it to a button. Ive tried making it so that it only appears when the values works but its also affected by the bug I was trying to address. May have to reset. * Committing minor changes to the true/false path to work on the tutorial * Have the path decided on the first turn and colour the directed path. * Made the game only allow you to add cards to the path that was chosen. * Made it so group cards can only be used on the chosen side and so that the game ends when someone gets the winning score * Ive fixed a bug with the game not ending when the max score is reached, I think Ive fully fixed the AI (Ive tested it but it might need further testing), fixed the rules to apply with the new rules, removed comments and debugging statements. * Added the ability to add repeat cards to everything except for repeatX cards. Ive made it so they can only have two repeat cards in a stack, this may need to be changed in the future. Fixes #38 and the previous commit Fixes #257 * Fixed the previous commit that makes it only allow two total repeats. * Adding npm-shrinkwrap to the .gitignore, its a substitute for package-lock.json but we dont need it. * Delete npm-shrinkwrap.json * Playing around with the grouping checkbox, i've changed it to a button. Ive tried making it so that it only appears when the values works but its also affected by the bug I was trying to address. May have to reset. * Committing minor changes to the true/false path to work on the tutorial * Have the path decided on the first turn and colour the directed path. * Made the game only allow you to add cards to the path that was chosen. * Made it so group cards can only be used on the chosen side and so that the game ends when someone gets the winning score * Ive fixed a bug with the game not ending when the max score is reached, I think Ive fully fixed the AI (Ive tested it but it might need further testing), fixed the rules to apply with the new rules, removed comments and debugging statements. * Added the ability to add repeat cards to everything except for repeatX cards. Ive made it so they can only have two repeat cards in a stack, this may need to be changed in the future. Fixes #38 and the previous commit Fixes #257 * Fixed the previous commit that makes it only allow two total repeats. * Tutorial (#271) * Added a tutorial button * Fixing the code that broke from adding the button * Pressing the tutorial button routes to a tutorial link with the tutorial in it, theres a bug where a new tutorial deck wont be built but a regular deck will * Fixed the previous bug, the tutorial now has its own deck * Added specific deck formation functionality, wrote some documentation, and refactored a bit of code * Attempting to figure out how the tutorial should run in a linear fashion and how to best present it. Committing the rest of todays work. * Got the states correctly configured and the next instruction is played after a card has been entered * Added a Game Objectives button in the tutorial mode to give the user a more concise description of what they should be doing * Added more in depth programming fundamental descriptions to each cards description(may need to be changed, moved, or modified. Changed \'Tutorial Player\' to \'You\', and made the first card to be selected have a yellow glow * Got the Game Objectives modal to display as soon as the page is loaded * Added a potential path for the user to take that teaches them how to use every card and build up both paths * Added highlighting to all cards to be chosen, modified the path that the user will take, added improved instructions, fixed a problem with group cards not working with the state management, and other small fixes * Added a blinking animation to the highlighted cards with a delay * Added animate.css to our package dependencies and commiting for easy backup before updating packages again * Changed blinking animation to a breathing like animation for smoothness and changed to CDNJS for animate.css because the direct download wasnt working. Also updated a critical vulnerability in our packages * Fixed a package dependency that wasnt allowing us to run the dev server * Added a finite bouncing animation for the tipbox to be more in your face * Changed the tip box animation so its infinite and the animation pauses when the tipbox is hovered over. The animation is removed when a button in the tipbox is clicked * Made a new modal appear before entering the game that instructs the user to look at the tipBox, made the tipbox animation pause instead of reset so the delay doesnt reset (this may be to be changed to have a better UX) * Fixed the UI such that the bouncing animation doesnt happen until the modals are executed. Fixes #272 * Update RulesModal.vue Changed some wording about how the game concepts relate to computer programming and the Python tutorial. * Update RulesModal.vue Fixed <i> tag * Updating Tutorial text * Changing font size * Implementing various fixes from pull request. Fixes #277, Fixes #274, Fixes #273 * Minor bug fixes and removing unneeded comments/debugging statements * Rename .codeclimate.yml to .codeclimate.yml.old This is overriding settings on the website. Seeing what happens without this. * New CodeClimate configuration file * Update .codeclimate.yml Adding back the original plugins Upping the method line limit to 50 Added `markdownlint` * Delete .codeclimate.yml.old * Adding npm-shrinkwrap to the .gitignore, its a substitute for package-lock.json but we dont need it. * Update .travis.yml Trying to fix test coverage * Got the virus modal to appear and give the option of players to infect * Removed merge conflicts * Finished adding virus card and tested it at a system level, and added a panel for showing the user their perks/disabilities * Added Power Outage card functionality * Added the Battery Backup functionality. * Added the Overclock functionality. * Added all of the protection cards. Another random bug and UI fixes or improvements. Fixes #261 * Changed the rules to reflect the new cards, it will probably have to be updated to better reflect how the cards relate to programming. * Seeing if I fixed the travis build * Testing again if travis build works. * Added tests for the new cards and attempting to fix code climate * Attempting to fix code climate again, to see what works. * Last time * The Ai can now use the power outage card * Forgot to change the deck back, fixing build * Added the rest of the cards to the AI and balanced it the best that I can right now. * Changed the scoring system (To be updated later based on feedback). Fixed some bugs. Fixes #291 * Changed the tutorial to have the new layout, changed the deck to reflect the new tutorial path, and the tutorial now works with the new cards * Finishing the updated tutorial * Made it so that the user cant go off script and I fixed a bug that made it so the original game couldnt be played * Fixes #295 * Implemented the changes from the comments on the previous pull request. * Fixes #294 * Dealt with a state Vuex bug and changed Virus and Overclock behaviour. Fixes #297 * Fixes #213 and ive made it so the virus and overclock buttons are properly disabled * Fixes #287
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #267
Fixes #268
Fixes #119
Fixes #251
Overview of changes
Reviewer: @johnanvik