Merge branch 'master' into cardcount

Author: Arc676

src/nussschale/leafs/endpoint.py

@@ -100,7 +100,7 @@ def get_param_as(self, x: str, type: Type[T]) -> T:
         if type == int:
             if not isinstance(val, str):
                 raise ValueError()
-            val = int(val)
+            return cast(T, int(val))
         elif type == str:
             if not isinstance(val, str):
                 raise ValueError()

src/pages/api.py

@@ -359,6 +359,7 @@ def api_status(ctx: EndpointContext) -> None:
             "allowChoose": allow_choose,
             "allowPick": allow_pick,
             "isSpectator": part.spectator,
+            "isPicker": part.picking,
             "gaps": match.count_gaps()}
 
     # Add the card text to the output, if possible

src/res/css/common/deck.css

@@ -91,3 +91,7 @@
   text-decoration: none !important;
   cursor: pointer;
 }
+
+.grey-card {
+  transform: unset !important;
+}

src/res/css/dark/deck.css

@@ -47,3 +47,8 @@
 .knob-verb {
   background-color: #D90;
 }
+
+.grey-card {
+  filter: grayscale(50%);
+  opacity: 0.5;
+}

src/res/css/light/deck.css

@@ -42,3 +42,8 @@
 .knob-verb {
   background-color: #FB0;
 }
+
+.grey-card {
+  filter: grayscale(50%);
+  opacity: 0.5;
+}

src/res/js/match/match.js

@@ -3,6 +3,7 @@
  *
  * MIT License
  * Copyright (c) 2017-2018 LordKorea
+ * Copyright (c) 2018 Arc676/Alessandro Vinciguerra
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -30,6 +31,7 @@
   let allowChoose = false
   let allowPick = false
   let isSpectator = false
+  let isPicker = false
   let externalUpdateAllowed = true
   let handResolver = new Map([
     ["OBJECT", new Map()],
@@ -64,12 +66,12 @@
     allowChoose = data.allowChoose
     allowPick = data.allowPick
     isSpectator = data.isSpectator
-
     $("#cardcount").html("Selected: " + numSelected + "/" + numGaps);
 
     if (isSpectator) {
       $(".match-hand").addClass("invisible")
     }
+    isPicker = data.isPicker
 
     updateMatchStatement(data.hasCard, data.cardText || "Waiting...")
 
@@ -267,6 +269,8 @@
     } else {
       container.empty().append(createSystemCard())
     }
+
+    $(".hand-set").find(".card-base").toggleClass("grey-card", isPicker)
   }
 
   /**