Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JON-469: Remove suit modifiers #5

Merged
merged 1 commit into from
Nov 1, 2024
Merged

JON-469: Remove suit modifiers #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions src/constants/modifiers.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ const MULTI_MODIFIER_1_ID: u32 = 604;
const MULTI_MODIFIER_2_ID: u32 = 605;
const MULTI_MODIFIER_3_ID: u32 = 606;
const MULTI_MODIFIER_4_ID: u32 = 607;
const SUIT_CLUB_MODIFIER_ID: u32 = 608;
const SUIT_DIAMONDS_MODIFIER_ID: u32 = 609;
const SUIT_HEARTS_MODIFIER_ID: u32 = 610;
const SUIT_SPADES_MODIFIER_ID: u32 = 611;

fn POINTS_MODIFIER_1() -> EffectCard {
EffectCard {
Expand Down Expand Up @@ -99,46 +95,6 @@ fn MULTI_MODIFIER_4() -> EffectCard {
}
}

fn SUIT_CLUB_MODIFIER() -> EffectCard {
EffectCard {
id: SUIT_CLUB_MODIFIER_ID,
price: 300,
probability: 12,
type_effect_card: TypeEffectCard::Modifier,
effect_id: SUIT_CLUBS_MODIFIER_EFFECT_ID,
}
}

fn SUIT_DIAMONDS_MODIFIER() -> EffectCard {
EffectCard {
id: SUIT_DIAMONDS_MODIFIER_ID,
price: 300,
probability: 12,
type_effect_card: TypeEffectCard::Modifier,
effect_id: SUIT_DIAMONDS_MODIFIER_EFFECT_ID,
}
}

fn SUIT_HEARTS_MODIFIER() -> EffectCard {
EffectCard {
id: SUIT_HEARTS_MODIFIER_ID,
price: 300,
probability: 12,
type_effect_card: TypeEffectCard::Modifier,
effect_id: SUIT_HEARTS_MODIFIER_EFFECT_ID,
}
}

fn SUIT_SPADES_MODIFIER() -> EffectCard {
EffectCard {
id: SUIT_SPADES_MODIFIER_ID,
price: 300,
probability: 12,
type_effect_card: TypeEffectCard::Modifier,
effect_id: SUIT_SPADES_MODIFIER_EFFECT_ID,
}
}

fn modifiers_ids_all() -> Array<u32> {
array![
POINTS_MODIFIER_1_ID,
Expand All @@ -149,9 +105,5 @@ fn modifiers_ids_all() -> Array<u32> {
MULTI_MODIFIER_2_ID,
MULTI_MODIFIER_3_ID,
MULTI_MODIFIER_4_ID,
SUIT_CLUB_MODIFIER_ID,
SUIT_DIAMONDS_MODIFIER_ID,
SUIT_HEARTS_MODIFIER_ID,
SUIT_SPADES_MODIFIER_ID
]
}
5 changes: 2 additions & 3 deletions src/constants/packs.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use jokers_of_neon::constants::card::{JOKER_CARD, NEON_JOKER_CARD};
use jokers_of_neon::constants::modifiers::{modifiers_ids_all, SUIT_HEARTS_MODIFIER_ID};
use jokers_of_neon::constants::modifiers::modifiers_ids_all;
use jokers_of_neon::constants::specials::{
specials_ids_all, SPECIAL_ALL_CARDS_TO_HEARTS_ID, common_specials_ids, uncommon_specials_ids, rare_specials_ids,
epic_specials_ids, legendary_specials_ids
Expand Down Expand Up @@ -187,12 +187,11 @@ fn LOVERS_BLISTER_PACK() -> BlisterPack {
cards: array![
hearts_ace.span(),
array![SPECIAL_ALL_CARDS_TO_HEARTS_ID].span(),
array![SUIT_HEARTS_MODIFIER_ID].span(),
array![CardTrait::generate_id(Value::Ace, Suit::Hearts)].span(),
heart_cards.span(),
]
.span(),
probs: array![100, 1, 10, 29, 60].span(),
probs: array![100, 1, 29, 70].span(),
}
}

Expand Down
10 changes: 0 additions & 10 deletions src/store.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ use jokers_of_neon::constants::modifiers::{
POINTS_MODIFIER_1_ID, POINTS_MODIFIER_1, POINTS_MODIFIER_2_ID, POINTS_MODIFIER_2, POINTS_MODIFIER_3_ID,
POINTS_MODIFIER_3, POINTS_MODIFIER_4_ID, POINTS_MODIFIER_4, MULTI_MODIFIER_1_ID, MULTI_MODIFIER_1,
MULTI_MODIFIER_2_ID, MULTI_MODIFIER_2, MULTI_MODIFIER_3_ID, MULTI_MODIFIER_3, MULTI_MODIFIER_4_ID, MULTI_MODIFIER_4,
SUIT_CLUB_MODIFIER_ID, SUIT_CLUB_MODIFIER, SUIT_DIAMONDS_MODIFIER_ID, SUIT_DIAMONDS_MODIFIER,
SUIT_HEARTS_MODIFIER_ID, SUIT_HEARTS_MODIFIER, SUIT_SPADES_MODIFIER_ID, SUIT_SPADES_MODIFIER,
};
use jokers_of_neon::constants::packs::{
BASIC_BLISTER_PACK, ADVANCED_BLISTER_PACK, JOKER_BLISTER_PACK, SPECIALS_BLISTER_PACK, MODIFIER_BLISTER_PACK,
Expand Down Expand Up @@ -183,14 +181,6 @@ impl StoreImpl of StoreTrait {
MULTI_MODIFIER_3()
} else if id == MULTI_MODIFIER_4_ID {
MULTI_MODIFIER_4()
} else if id == SUIT_CLUB_MODIFIER_ID {
SUIT_CLUB_MODIFIER()
} else if id == SUIT_DIAMONDS_MODIFIER_ID {
SUIT_DIAMONDS_MODIFIER()
} else if id == SUIT_HEARTS_MODIFIER_ID {
SUIT_HEARTS_MODIFIER()
} else if id == SUIT_SPADES_MODIFIER_ID {
SUIT_SPADES_MODIFIER()
} else {
INVALID_EFFECT_CARD()
}
Expand Down
6 changes: 2 additions & 4 deletions src/tests/test_game_play_beast.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ mod test_play_beast_special_cards {
SEVEN_DIAMONDS_ID, FIVE_CLUBS_ID, KING_CLUBS_ID, SIX_HEARTS_ID, FOUR_CLUBS_ID, JACK_CLUBS_ID, JACK_HEARTS_ID,
KING_DIAMONDS_ID, SEVEN_CLUBS_ID, SEVEN_HEARTS_ID, ACE_SPADES_ID
};
use jokers_of_neon::constants::modifiers::{SUIT_CLUB_MODIFIER_ID, MULTI_MODIFIER_1_ID};
use jokers_of_neon::constants::modifiers::MULTI_MODIFIER_1_ID;
use jokers_of_neon::constants::specials::{
SPECIAL_LUCKY_SEVEN_ID, SPECIAL_INCREASE_LEVEL_PAIR_ID, SPECIAL_MULTI_FOR_CLUB_ID, SPECIAL_MULTI_FOR_HEART_ID,
SPECIAL_POINTS_FOR_FIGURES_ID, SPECIAL_MULTI_FOR_DIAMOND_ID, SPECIAL_MULTI_FOR_SPADE_ID, SPECIAL_NEON_BONUS_ID,
Expand Down Expand Up @@ -98,8 +98,6 @@ mod test_play_beast_special_cards {
FOUR_CLUBS_ID,
JACK_HEARTS_ID,
KING_DIAMONDS_ID,
SUIT_CLUB_MODIFIER_ID,
SUIT_CLUB_MODIFIER_ID,
MULTI_MODIFIER_1_ID
];
mock_current_hand_cards_ids(ref store, game.id, hand_cards_ids);
Expand Down Expand Up @@ -320,7 +318,7 @@ mod test_play_beast_modifier_cards {
KING_SPADES_ID, TWO_SPADES_ID, TWO_DIAMONDS_ID, TWO_CLUBS_ID, FOUR_DIAMONDS_ID, FOUR_HEARTS_ID
};
use jokers_of_neon::constants::modifiers::{
SUIT_CLUB_MODIFIER_ID, MULTI_MODIFIER_1_ID, POINTS_MODIFIER_4_ID, MULTI_MODIFIER_4_ID, POINTS_MODIFIER_2_ID,
MULTI_MODIFIER_1_ID, POINTS_MODIFIER_4_ID, MULTI_MODIFIER_4_ID, POINTS_MODIFIER_2_ID,
MULTI_MODIFIER_3_ID,
};
use jokers_of_neon::models::data::beast::{
Expand Down
Loading