From 38102ce7787515bf5cc33aa17f67e29282a0fa7c Mon Sep 17 00:00:00 2001
From: Stefan Rupp <struppi@struppi.name>
Date: Sun, 19 Apr 2020 00:38:57 +0200
Subject: [PATCH] fixed 2 bugs in last round!

---
 templates/home/index.html     | 17 ++++++++++-------
 templates/shared/_layout.html |  2 ++
 views/player.py               |  2 +-
 wiz_game.py                   |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/templates/home/index.html b/templates/home/index.html
index ee1c4fb..80a7739 100644
--- a/templates/home/index.html
+++ b/templates/home/index.html
@@ -3,19 +3,23 @@
 {% block content %}
 
         <div class="content">
-            <h1><span class="font-semi-bold">Gambling Foo</span> <span class="smaller">A RESTful gaming service</span></h1>
+            <h1><span class="font-semi-bold">Cowiz Gambling Den</span> <span class="smaller">A RESTful gaming service</span></h1>
             <p class="lead">
-                Play a nice game of cards?<br>
+                Play a nice game of cards!<br>
                 <br>
                 <strong>Endpoints</strong>
             <ul>
                 <li>
-                    <strong>Shuffle Card Deck</strong><br>
-                    <a href="/api/shuffle">GET /api/shuffle</a>
+                    <strong>Players</strong><br>
+                    <a href="/player/0">Player 1</a>
+                    <a href="/player/1">Player 2</a>
+                    <a href="/player/2">Player 3</a>
+                    <a href="/player/3">Player 4</a>
+                    <a href="/player/4">Player 5</a>
+                    <a href="/player/5">Player 6</a>
                 </li>
                 <li>
-                    <strong>Movies by director</strong><br>
-                    <a href="/api/director/cameron">GET /api/director/{director_name}</a>
+                Spam Bacon Sausage + Spam
                 </li>
 <!--
                 <li>
@@ -39,7 +43,6 @@
             </p>
 
             <p class="disclaimer">
-                Spam Bacon Sausage + Spam
                 Spam Spam Spam Spam Spam
                   Spam Baked Beans Spam
                   Spam Spam + Spam
diff --git a/templates/shared/_layout.html b/templates/shared/_layout.html
index 895388e..a66260f 100644
--- a/templates/shared/_layout.html
+++ b/templates/shared/_layout.html
@@ -34,6 +34,7 @@
                 <div>{% block content %}{% endblock %}</div>
             </div>
         </div>
+<!--
         <div class="row">
             <div class="links">
                 <ul>
@@ -51,6 +52,7 @@
                 Copyright &copy; Talk Python Training
             </div>
         </div>
+-->
     </div>
 </div>
 
diff --git a/views/player.py b/views/player.py
index f223b49..c8fe823 100644
--- a/views/player.py
+++ b/views/player.py
@@ -19,7 +19,7 @@ def show(req, resp, player: str):
 
     #active_player = the_game.active_player
     prev_player = the_game.get_prev_player()
-    if tcard.value == 'Z' and tcolor == '-':
+    if tcard and tcard.value == 'Z' and tcolor == '-':
         choose_trump_color = True
     else:
         choose_trump_color = False
diff --git a/wiz_game.py b/wiz_game.py
index beec352..51b97c2 100644
--- a/wiz_game.py
+++ b/wiz_game.py
@@ -130,7 +130,7 @@ class WizGame:
         high_player, high_card = cards[0]
 
         for player, card in cards[1:]:
-            if get_higher_card(high_card, card, self.trump_card.color):
+            if get_higher_card(high_card, card, self.trump_card.color if self.trump_card else '-'):
                 high_card = card
                 high_player = player
         return high_player, high_card
@@ -198,6 +198,6 @@ class WizGame:
             return self.start_player-1
 
 
-p = ["p1", "p2", "p3", "p4"]
+p = ["Astrid", "Stephan", "Patrice", "struppi"]
 the_game = WizGame(p)