Begun work on the draw2playerchoice state. added a new kv pair to the json called draw2counter, which will indicate how many draws a player has left as a result of the draw2 power card
Made several changes on this. First, modified the json dictionary to account for 2 new variables, discardActivity and deckActivity. The view will read these values to determine if the deck and/or the discard pile should be glowed. The appropriate changes in the power card logic in waitingForDraw were made, as well as the draw2 logic in playerChoice. Also began work in earnest on the draw2playerchoice handler. So, to note: anything with the active, discardActiviy, or deckActiviy properties set to 1 should glow.
added logic to control a draw2 card event in playerChoice, as well as correcting the logic of what happens in a swap event, also in playerChoice.
added function swapCards, to perform the swap functionality of a power card
wrote a bunch of pseudocode and comments for implementing the draw2playerchoice state. also wrote some notes about modularizing some of the code, taking repeated actions and making them into functions
created a glowcards method to glow the appropriate cards depending on the card drawn by the user. also created a resetactiveflags method to reset the visibility of the game elements. Also, we must consider a solution to a bug we have related to the draw2playercard state. see line 536 of game.py (in the swapCards method) for details of this error
added translateDivToCard method to pull out the necessary information for the draw2playerchoice state. This function essentially tells you exactly what card, in what position, in what array the player clicked (this information is gotten through the analysis of the div name). Also, added logic to the draw2playerchoice handler where the current card was a number card.
added logic to draw2playerchoice for the draw2 card
finished logic for peek card in draw2cplayerchoice
finished logic for the swap card in draw2playerchoice. logic for that state handler should be laid in now.
Merging Phelans draw2Model changes in
Began adding conditional includes into player Choice stateChanges.js view handler. Need to add more in.
Added pushing states onto the list for swap, but for some reason glow doesn't happen
Fixed glowing issue. Now I need to make cards stop glowing if the user clicks that set. (User wants to swap and then they click one of their cards, only that card should glow and the others should stop)
Merge pull request #14 from EJEHardenberg/model

Model
added swap card instructions to the message field of the json array. also added logic to reset this message.
added logic to the playerstate, when the player has drawn a draw2 card, to make the player's cards inactive. This will prevent the player from clicking on them and entering a draw2 loop.
Dealing with a initialization issue with the HAL database object. Going to deal with it another time
Merge branch 'model' into HAL
Merge branch 'hal' of github.com:EJEHardenberg/softwareEngineeringFinalProject into HAL