Many bugfixes

Author: aedans

client/PIXIBackend.ts

@@ -26,7 +26,7 @@ const PIXIBackend: (app: Application) => BackendFactory = (app: Application) =>
     }
 
     function mouseDownListener(e: any) {
-      if (currentObject == null) {
+      if (currentObject == null && manager.getMonitor().canDragSource(sourceId)) {
         currentObject = reticle;
         initIndex = node.zIndex;
         initVisible = reticle.visible;
@@ -52,17 +52,17 @@ const PIXIBackend: (app: Application) => BackendFactory = (app: Application) =>
         const pos = reticle.parent.toLocal(e);
         if (manager.getMonitor().isDragging()) {
           reticle.position.copyFrom(pos);
-        }
 
-        const matchingTargetIds = Object.keys(targetObjects)
-          .filter((key) => targetObjects[key].getBounds().contains(e.x, e.y) && targetObjects[key].zIndex < 1000)
-          .filter((key) => manager.getRegistry().getTargetType(key) == manager.getMonitor().getItemType());
+          const matchingTargetIds = Object.keys(targetObjects)
+            .filter((key) => targetObjects[key].getBounds().contains(e.x, e.y) && targetObjects[key].zIndex < 1000)
+            .filter((key) => manager.getRegistry().getTargetType(key) == manager.getMonitor().getItemType());
 
-        if (matchingTargetIds.length > 0) {
-          matchingTargetIds.sort((a, b) => targetObjects[b].zIndex - targetObjects[a].zIndex);
-          manager.getActions().hover([matchingTargetIds[0]]);
-        } else {
-          manager.getActions().hover([]);
+          if (matchingTargetIds.length > 0) {
+            matchingTargetIds.sort((a, b) => targetObjects[b].zIndex - targetObjects[a].zIndex);
+            manager.getActions().hover([matchingTargetIds[0]]);
+          } else {
+            manager.getActions().hover([]);
+          }
         }
       }
     }

client/game/BoardCard.tsx

@@ -15,15 +15,21 @@ export default React.forwardRef(function BoardCard(props: GameCardProps, ref: Re
 
   useImperativeHandle(ref, () => cardRef.current);
 
+  const canActivate =
+    !props.state.exhausted &&
+    props.info.hasActivate &&
+    canPayPlan(cache, game, player, plan, { type: "activate", card: props.state });
+
   const [{ isDragging }, drag, dragPreview] = useDrag(
     () => ({
       type: props.info.activateTargets ? "target" : "card",
       item: props.state,
       collect: (monitor) => ({
         isDragging: monitor.isDragging(),
       }),
+      canDrag: () => canActivate
     }),
-    []
+    [canActivate]
   );
 
   useEffect(() => {
@@ -32,11 +38,6 @@ export default React.forwardRef(function BoardCard(props: GameCardProps, ref: Re
     }
   });
 
-  const canActivate =
-    !props.state.exhausted &&
-    props.info.hasActivate &&
-    canPayPlan(cache, game, player, plan, { type: "activate", card: props.state });
-
   function pointerdown(e: any) {
     if (props.state.exhausted || props.info.type != "agent") {
       return;

client/game/GameCard.tsx

@@ -12,7 +12,7 @@ import { useDrop } from "react-dnd";
 import { CardColors, CardState } from "../../common/card.js";
 import { cardHeight, cardWidth, combineColors, isCardPropsEqual } from "../Card.js";
 import { CacheContext, CosmeticContext, HighlightContext, PlanContext } from "./Game.js";
-import { getCard } from "../../common/gameSlice.js";
+import { findCard, getCard } from "../../common/gameSlice.js";
 import { useClientSelector } from "../store.js";
 import { hex } from "../color.js";
 import util from "../../common/util.js";
@@ -58,20 +58,35 @@ export default React.memo(
       () => ({
         accept: "target",
         drop: (state: CardState) => {
-          setPlan((plan) => [
-            ...plan,
-            {
-              type: "play",
-              card: state,
-              action: { id: state.id, target: { id: props.state.id } },
-            },
-          ]);
+          const found = findCard(game, state);
+          if (!found) {
+            return;
+          }
+
+          const info = cache.getCardInfo(game, state);
+          if (
+            (found.zone == "deck" &&
+              info.targets &&
+              util.filter(cache, game, info.targets).some((c) => c.id == props.state.id)) ||
+            (found.zone == "board" &&
+              info.activateTargets &&
+              util.filter(cache, game, info.activateTargets).some((c) => c.id == props.state.id))
+          ) {
+            setPlan((plan) => [
+              ...plan,
+              {
+                type: found.zone == "deck" ? "play" : "activate",
+                card: state,
+                action: { id: state.id, target: { id: props.state.id } },
+              },
+            ]);
+          }
         },
         collect: (monitor) => ({
           isOver: monitor.isOver(),
         }),
       }),
-      []
+      [game, props.state.id]
     );
 
     useEffect(() => {

client/game/Plan.tsx

@@ -7,7 +7,7 @@ import { useTimeShadowFilter } from "../time";
 import { Container } from "@pixi/react";
 import { useClientSelector } from "../store";
 import { AnimatedCardProps } from "../AnimatedCard";
-import { CardState } from "../../common/card";
+import { CardState, CardStateInfo } from "../../common/card";
 
 export default function Plan() {
   const { plan, setPlan } = useContext(PlanContext);
@@ -32,6 +32,13 @@ export default function Plan() {
   const x = 0;
   const y = (targetResolution.height - gameCardHeight) / 2 - cards.length * gameCardHeightDiff;
 
+  const listCards: CardStateInfo[] = [];
+  for (let i = 0; i < cards.length; i++) {
+    if (i >= plan.length) continue;
+    const id = plan[i].type == "activate" ? `activate:${cards[i].state.id}-${turn}` : cards[i].state.id;
+    listCards.push({ info: cards[i].info, state: { ...cards[i].state, id } });
+  }
+
   return (
     <Container filters={[timeShadowFilterRef.current]}>
       <CardList
@@ -42,11 +49,7 @@ export default function Plan() {
         cardWidth={gameCardWidth}
         cardHeight={gameCardHeight}
         card={planCard}
-        cards={cards.flatMap((x, i) => {
-          if (i >= plan.length) return [];
-          const id = plan[i].type == "activate" ? `activate:${x.state.id}-${turn}` : x.state.id;
-          return [{ info: x.info, state: { ...x.state, id } }];
-        })}
+        cards={listCards}
         hoverScale={gameCardZoom}
       />
     </Container>

server/game.ts

@@ -236,6 +236,11 @@ export async function createGame(players: [Player, Player], onEnd: OnGameEnd) {
 
       for (const action of revealedActions) {
         if (action.payload.target) {
+          if (action.type == "game/addCard") {
+            const { player } = findCard(state, action.payload.target)!;
+            revealed[player].add(action.payload.target.id);
+          }
+
           if (action.type == "game/revealCard" && !revealed[toPlayer].has(action.payload.target.id)) {
             const { player, zone, index } = findCard(state, action.payload.target)!;
             revealed[toPlayer].add(action.payload.target.id);