-
-
+
+
-
- {card.baseVP}
-
-
-
{name}
+
+
+
+ {name}
+
+
{card.expansion && (
{card.expansion}
)}
+
+ {card.baseVP}
+
+
+
+ {rarityLabel}
+ · {romanize(card.numInDeck)}
@@ -221,10 +247,7 @@ const Card: React.FC<{ name: CardName; usedForCritter?: boolean }> = ({
-
- {rarityLabel}
- · {romanize(card.numInDeck)}
-
+
diff --git a/src/components/CardPayment.tsx b/src/components/CardPayment.tsx
index 95f32d52..79eaa633 100644
--- a/src/components/CardPayment.tsx
+++ b/src/components/CardPayment.tsx
@@ -3,7 +3,12 @@ import { Field, useField } from "formik";
import { Card as CardModel } from "../model/card";
import { Player } from "../model/player";
-import { ResourceType, CardName, GameInputPlayCard } from "../model/types";
+import {
+ ResourceType,
+ CardName,
+ GameInputPlayCard,
+ ExpansionType,
+} from "../model/types";
import { ResourceTypeIcon, Description } from "./common";
import styles from "../styles/CardPayment.module.css";
@@ -95,6 +100,7 @@ const OptionToUseAssociatedCard: React.FC<{
const [_field, meta, helpers] = useField(name);
const card = CardModel.fromName(cardName);
const hasUnusedAssociatedCard =
+ card.expansion !== ExpansionType.LEGENDS &&
card.associatedCard &&
viewingPlayer.hasUnusedByCritterConstruction(card.associatedCard);
const hasUnusedEvertree = viewingPlayer.hasUnusedByCritterConstruction(
@@ -102,8 +108,9 @@ const OptionToUseAssociatedCard: React.FC<{
);
const canUseAssociatedCard =
card.isCritter && (hasUnusedAssociatedCard || hasUnusedEvertree);
+
if (!canUseAssociatedCard) {
- return <>;
+ return null;
}
const isChecked = !!meta.value;
@@ -231,6 +238,32 @@ const CardToDungeonForm: React.FC<{
) : null;
};
+const CardToUpgradeForm: React.FC<{
+ name: string;
+ cardName: CardName;
+ viewingPlayer: Player;
+}> = ({ name, cardName }) => {
+ const card = CardModel.fromName(cardName);
+ if (card.expansion !== ExpansionType.LEGENDS || !card.upgradeableCard) {
+ return null;
+ }
+
+ return (
+
+
+
+ );
+};
+
const CardPayment: React.FC<{
name: string;
resetPaymentOptions: (state: "DEFAULT" | "COST" | "ZERO") => void;
@@ -247,7 +280,9 @@ const CardPayment: React.FC<{
resetPaymentOptions={resetPaymentOptions}
/>
)}
-
+ {clientOptions.paymentOptions.resources && (
+
+ )}
{clientOptions.card && (
+ {clientOptions.card && (
+
+ )}
);
};
diff --git a/src/components/GameBuilder.tsx b/src/components/GameBuilder.tsx
index bd65912c..0f2e172d 100644
--- a/src/components/GameBuilder.tsx
+++ b/src/components/GameBuilder.tsx
@@ -110,6 +110,10 @@ const GameBuilder: React.FC = () => {
{"Pearlbrook"}
+
Settings
diff --git a/src/components/GameInputPlayCard.tsx b/src/components/GameInputPlayCard.tsx
index c6cd7ca1..29863eba 100644
--- a/src/components/GameInputPlayCard.tsx
+++ b/src/components/GameInputPlayCard.tsx
@@ -3,7 +3,7 @@ import { useField } from "formik";
import styles from "../styles/gameBoard.module.css";
-import { CardName, ResourceType } from "../model/types";
+import { CardName, ExpansionType, ResourceType } from "../model/types";
import { Player } from "../model/player";
import { Card as CardModel } from "../model/card";
@@ -22,6 +22,9 @@ const GameInputPlayCard: React.FC<{
overrides: any = {}
) => {
const card = CardModel.fromName(cardName);
+ const canUpgradeCard =
+ card.expansion == ExpansionType.LEGENDS &&
+ viewingPlayer.hasCardInCity(card.upgradeableCard!);
const canUseAssociatedCard =
card.isCritter &&
card.associatedCard &&
@@ -34,16 +37,20 @@ const GameInputPlayCard: React.FC<{
paymentOptions: {
cardToUse: null,
cardToDungeon: null,
+ cardToUpgrade: canUpgradeCard ? card.upgradeableCard : null,
useAssociatedCard: state === "DEFAULT" ? canUseAssociatedCard : false,
- resources: {
- [ResourceType.BERRY]: 0,
- [ResourceType.TWIG]: 0,
- [ResourceType.RESIN]: 0,
- [ResourceType.PEBBLE]: 0,
- ...((state === "DEFAULT" && !canUseAssociatedCard) || state === "COST"
- ? card.baseCost
- : {}),
- },
+ resources: canUpgradeCard
+ ? null
+ : {
+ [ResourceType.BERRY]: 0,
+ [ResourceType.TWIG]: 0,
+ [ResourceType.RESIN]: 0,
+ [ResourceType.PEBBLE]: 0,
+ ...((state === "DEFAULT" && !canUseAssociatedCard) ||
+ state === "COST"
+ ? card.baseCost
+ : {}),
+ },
},
});
};
diff --git a/src/components/Players.tsx b/src/components/Players.tsx
index a294e298..6e47b6d5 100644
--- a/src/components/Players.tsx
+++ b/src/components/Players.tsx
@@ -11,7 +11,7 @@ import {
import { PlayerJSON, GameStateJSON } from "../model/jsonTypes";
import { Player } from "../model/player";
import { GameState } from "../model/gameState";
-import { GameBlock } from "./common";
+import { GameBlock, LegendaryCardIcon } from "./common";
import { PlayerCity } from "./gameBoard";
import {
InfoIconSvg,
@@ -237,6 +237,19 @@ const PlayerStatus: React.FC<{
{"WORKERS"}
diff --git a/src/components/ViewerUI.tsx b/src/components/ViewerUI.tsx
index b5337fd3..1bd724ba 100644
--- a/src/components/ViewerUI.tsx
+++ b/src/components/ViewerUI.tsx
@@ -22,6 +22,11 @@ const ViewerUI: React.FC<{
{player.adornmentsInHand.map((name, idx) => (
))}
+ {player.legendsInHand.map((name, idx) => (
+
+
+
+ ))}