Don't update resource postion of the other player
Merge branch 'master' into win-condition
Don't win if the other player is on the base
Refractor of the winner state
Fix conflict