Merge branch 'master' of git.niax.co.uk:comp3001

graingert · Jan 11, 2012 · b4e0e77 · b4e0e77
2 parents 04fbd80 + e02a179
commit b4e0e77
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/webapp/conquest/models.py b/webapp/conquest/models.py
@@ -305,6 +305,10 @@ def attack_action(self, request):
                 old_owner_data = self.basegameplayer_set.filter('play_index', old_owner).get()
                 old_owner_data.eliminated = True
                 old_owner_data.put()
+                if self.basegameplayer_set.filter('eliminate =', True).count(2) <= 1:
+                    action.new_state = 'finished'
+                    self.state = 'finished'
+
 
         action.origin = origin
         action.destination = destination

diff --git a/webapp/static/play.css b/webapp/static/play.css
@@ -36,6 +36,6 @@ ul#player-list {
 	box-shadow: 3px 3px 4px #000;
 }
 
-
+.debug {display:none}
 .avatar {padding-top:6px; padding-left:5px;}
 .nickname {}
diff --git a/webapp/templates/play.html b/webapp/templates/play.html
@@ -20,7 +20,7 @@
 {% endblock %}
 
 {% block sidebar %}
-<div class="block"> 
+<div class="block debug"> 
 	<h3>Debug</h3>
 <dl>
 	<dt>Game State</dt>