@@ -193,7 +192,7 @@ export const Consumable = ({ selected = false, consumable: cons, ...props }: Con
if(game.stats.money >= price) {
dispatch({type: 'stat', payload: {stat: 'money', amount: -price}})
dispatch({type: 'shop-remove', payload: {card: {selected, consumable: cons, ...props}}})
- useConsumable(game, dispatch, cons)
+ useConsumable(game, dispatch, cons, true)
}
}}>
}
{!props.flipped &&
BUY
diff --git a/src/components/Joker.tsx b/src/components/Joker.tsx
index c13e924..2bdb875 100644
--- a/src/components/Joker.tsx
+++ b/src/components/Joker.tsx
@@ -124,7 +124,7 @@ export const Joker = ({id, joker, edition, selected = false, ...props}: JokerIns
} else {
dispatch({type: 'select', payload: {card: self}})
}
- }} onMouseDown={mouseDown} />
+ }} onMouseDown={props.shopMode ? () => {} : mouseDown} />
{props.debuffed &&
diff --git a/src/components/JokerInfo.ts b/src/components/JokerInfo.ts
index 0a7c529..3b115f4 100644
--- a/src/components/JokerInfo.ts
+++ b/src/components/JokerInfo.ts
@@ -32,8 +32,103 @@ export const Jokers: JokerType[] = [
cost: 2,
rarity: 'Common',
activation: [Activation.Independent]
- },
- {
+ }, {
+ name: 'Greedy Joker',
+ description: 'Played cards with \n{orange}Diamond/ suit give \n{red}+3/ Mult when scored',
+ cost: 5,
+ rarity: 'Common',
+ activation: [Activation.OnScored]
+ }, {
+ name: 'Lusty Joker',
+ description: 'Played cards with \n{red}Heart/ suit give \n{red}+3/ Mult when scored',
+ cost: 5,
+ rarity: 'Common',
+ activation: [Activation.OnScored]
+ }, {
+ name: 'Wrathful Joker',
+ description: 'Played cards with \n{dark-purple}Spade/ suit give \n{red}+3/ Mult when scored',
+ cost: 5,
+ rarity: 'Common',
+ activation: [Activation.OnScored]
+ }, {
+ name: 'Gluttonous Joker',
+ description: 'Played cards with \n{blue}Club/ suit give \n{red}+3/ Mult when scored',
+ cost: 5,
+ rarity: 'Common',
+ activation: [Activation.OnScored]
+ }, {
+ name: 'Jolly Joker',
+ description: '{red}+8/ Mult if played hand\n contains a /{orange}Pair',
+ cost: 3,
+ rarity: 'Common',
+ activation: [Activation.Independent]
+ }, {
+ name: 'Zany Joker',
+ description: '{red}+12/ Mult if played\n hand contains a\n {orange}Three of a Kind',
+ cost: 4,
+ rarity: 'Common',
+ activation: [Activation.Independent]
+ }, {
+ name: 'Mad Joker',
+ description: '{red}+10/ Mult if played\nhand contains a\n {orange}Two Pair',
+ cost: 4,
+ rarity: 'Common',
+ activation: [Activation.Independent]
+ }, {
+ name: 'Crazy Joker',
+ description: '{red}+12/ Mult if played\nhand contains a\n {orange}Straight',
+ cost: 4,
+ rarity: 'Common',
+ activation: [Activation.Independent]
+ }, {
+ name: 'Droll Joker',
+ description: '{red}+10/ Mult if played\nhand contains a\n {orange}Flush',
+ cost: 4,
+ rarity: 'Common',
+ activation: [Activation.Independent]
+ }, {
+ name: 'Sly Joker',
+ description: '{blue}+50/ Chips if played\n hand contains a\n{orange}Pair',
+ cost: 3,
+ rarity: 'Common',
+ activation: [Activation.Independent]
+ }, {
+ name: 'Wily Joker',
+ description: '{blue}+100/ Chips if played\n hand contains a\n{orange}Three of a Kind',
+ cost: 4,
+ rarity: 'Common',
+ activation: [Activation.Independent]
+ }, {
+ name: 'Clever Joker',
+ description: '{blue}+80/ Chips if played\n hand contains a\n{orange}Two Pair',
+ cost: 4,
+ rarity: 'Common',
+ activation: [Activation.Independent]
+ }, {
+ name: 'Devious Joker',
+ description: '{blue}+100/ Chips if played\n hand contains a\n{orange}Straight',
+ cost: 4,
+ rarity: 'Common',
+ activation: [Activation.Independent]
+ }, {
+ name: 'Crafty Joker',
+ description: '{blue}+80/ Chips if played\n hand contains a\n{orange}Flush',
+ cost: 4,
+ rarity: 'Common',
+ activation: [Activation.Independent]
+ }, {
+ name: 'Half Joker',
+ description: '{red}+20/ Mult if played\n hand contains /{orange}3\n or fewer cards',
+ cost: 5,
+ rarity: 'Common',
+ activation: [Activation.Independent]
+ }
+
+
+
+
+
+ ,{
name: 'Baseball Card',
description: '{green}Uncommon/Jokers each\ngive/{red-invert}X1.5/Mult',
cost: 8,
diff --git a/src/components/UseConsumable.ts b/src/components/UseConsumable.ts
index 2650465..7fffc3a 100644
--- a/src/components/UseConsumable.ts
+++ b/src/components/UseConsumable.ts
@@ -7,7 +7,7 @@ const suits = Object.keys(Suit).filter(k => isNaN(Number(k))).map(s => s as keyo
const ranks = Object.keys(Rank).filter(r => isNaN(Number(r))).map(r => r as keyof typeof Rank)
const enhancements = Object.keys(Enhancement).filter(e => isNaN(Number(e))).map(e => e as keyof typeof Enhancement)
-export const useConsumable = (game: GameState, dispatch: React.Dispatch, consumable: ConsumableType) => {
+export const useConsumable = (game: GameState, dispatch: React.Dispatch, consumable: ConsumableType, instant?: boolean) => {
if(game.cards.submitted.length === 0) {
if(consumable.type === 'Planet') {
levelHand({hand: consumable.hand!})
@@ -191,7 +191,9 @@ export const useConsumable = (game: GameState, dispatch: React.Dispatch
- for(let i = 0; i < Math.min(2, game.stats.consumableSize - game.cards.consumables.length + 1); i++) {
+ let n = Math.min(2, game.stats.consumableSize - game.cards.consumables.length)
+ if(game.cards.consumables.find(c => c.consumable.name === 'The Emperor')) { n++ }
+ for(let i = 0; i < n; i++) {
tarot = validTarots[Math.floor(Random.next() * validTarots.length)]
dispatch({type: 'addCard', payload: {card: tarot}})
validTarots = validTarots.filter(c => c.name !== tarot.name)
@@ -290,6 +292,6 @@ export const useConsumable = (game: GameState, dispatch: React.Dispatch