Merge pull request #6578 from NoahTheDuke/nb/fix-publics

Fix public agendas being facedown
mtgred · Aug 31, 2022 · 4c5a321 · 4c5a321
2 parents c27fe04 + 2d0053b
commit 4c5a321
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/src/clj/game/core/diffs.clj b/src/clj/game/core/diffs.clj
@@ -159,19 +159,19 @@
 (declare cards-summary)
 
 (defn card-summary [card state side]
-  (if (not (is-public? card side))
+  (if (is-public? card side)
     (-> (cond-> card
           (:host card) (-> (dissoc-in [:host :hosted])
                            (update :host card-summary state side))
           (:hosted card) (update :hosted cards-summary state side))
-        (private-card))
+        (playable? state side)
+        (card-abilities-summary state side)
+        (select-non-nil-keys card-keys))
     (-> (cond-> card
           (:host card) (-> (dissoc-in [:host :hosted])
                            (update :host card-summary state side))
           (:hosted card) (update :hosted cards-summary state side))
-        (playable? state side)
-        (card-abilities-summary state side)
-        (select-non-nil-keys card-keys))))
+        (private-card))))
 
 (defn cards-summary [cards state side]
   (when (seq cards)

diff --git a/src/clj/web/lobby.clj b/src/clj/web/lobby.clj
@@ -154,7 +154,7 @@
               players-blocked-user?
               (-> (mapcat get-blocked-list (map :user (:players lobby)))
                   (set)
-                  (contains? (str/lower-case (:username user))))]
+                  (contains? (str/lower-case (:username user ""))))]
           (not (or user-blocked-players? players-blocked-user?))))
       lobbies)))
 

diff --git a/src/cljc/game/core/card.cljc b/src/cljc/game/core/card.cljc
@@ -316,7 +316,7 @@
 (defn facedown?
   "Checks if the specified card is facedown."
   [card]
-  (or (when (not (condition-counter? card))
+  (or (when-not (condition-counter? card)
         (= (get-zone card) #?(:clj [:rig :facedown]
                               :cljs ["rig" "facedown"])))
       (:facedown card)))
@@ -456,7 +456,8 @@
                   (not (in-set-aside? card)))
              (and (or (installed? card)
                       (:host card))
-                  (not (facedown? card)))
+                  (or (faceup? card)
+                      (not (facedown? card))))
              (in-discard? card))
          ;; public corp cards:
          ;; * installed and rezzed
@@ -467,7 +468,7 @@
                       (:host card))
                   (or (operation? card)
                       (condition-counter? card)
-                      (rezzed? card)))
+                      (faceup? card)))
              (and (in-discard? card)
                   (faceup? card)))))))
 

diff --git a/src/cljs/nr/gameboard/board.cljs b/src/cljs/nr/gameboard/board.cljs
@@ -609,13 +609,13 @@
 
 (defn draw-facedown?
   "Returns true if the installed card should be drawn face down."
-  [{:keys [facedown host] :as card}]
-  (if (corp? card)
-    (and (not (operation? card))
-         (not (condition-counter? card))
-         (not (faceup? card))
-         (not= (:side host) "Runner"))
-    facedown))
+  [{:keys [host] :as card}]
+  (or (facedown? card)
+      (and (corp? card)
+           (not (or (operation? card)
+                    (condition-counter? card)
+                    (faceup? card)
+                    (= (:side host) "Runner"))))))
 
 (defn card-view
   [{:keys [zone code type abilities counter