Completed Game State Conditions. Updated other conditions with game

parameter and local variables
closes #23
addresses #19
addresses #20
addresses #21
addresses #22
addresses #24
addresses #25