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

add unpassed obstacle #32

Merged
merged 2 commits into from
Nov 5, 2024
Merged

add unpassed obstacle #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95690f7
add unpassed obstacle
dpinones Nov 4, 2024
7b35ad3
add assert owner
dpinones Nov 4, 2024
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
8 changes: 8 additions & 0 deletions src/models/data/events.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,3 +292,11 @@ struct PlayerHealed {
current_hp: u32,
}

#[derive(Copy, Drop, Serde)]
#[dojo::event]
#[dojo::model]
struct ObstacleAttack {
#[key]
player: ContractAddress,
attack: u32
}
3 changes: 2 additions & 1 deletion src/models/status/game/game.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ enum GameSubState {
DRAFT_SPECIALS,
DRAFT_DECK,
DRAFT_ADVENTURER,
DRAFT_ADVENTURER_CARDS
DRAFT_ADVENTURER_CARDS,
UNPASSED_OBSTACLE
}

#[derive(Serde, Copy, Drop, IntrospectPacked, PartialEq)]
Expand Down
36 changes: 26 additions & 10 deletions src/models/status/round/challenge.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use jokers_of_neon::{
game_deck::{GameDeckStore, GameDeckImpl},
events::{
ChallengeCompleted, ItemChallengeCompleted, PlayGameOverEvent, ModifierCardSuitEvent,
SpecialModifierSuitEvent
SpecialModifierSuitEvent, ObstacleAttack
},
poker_hand::PokerHand
},
Expand Down Expand Up @@ -96,12 +96,13 @@ impl ChallengeImpl of ChallengeTrait {
emit!(world, (challenge_player));
ChallengePlayerStore::set(@challenge_player, world);
if challenge_player.plays.is_zero() {
let challenge_attack = 5 * game.level;
game
.current_player_hp =
if game.current_player_hp <= 5 * game.level {
if game.current_player_hp <= challenge_attack {
0
} else {
game.current_player_hp - 5 * game.level
game.current_player_hp - challenge_attack
};

if game.current_player_hp.is_zero() {
Expand All @@ -110,12 +111,11 @@ impl ChallengeImpl of ChallengeTrait {
game.state = GameState::FINISHED;
return;
}
challenge_player.discards = game.max_discard;
challenge_player.plays = game.max_hands;

ChallengePlayerStore::set(@challenge_player, world);
emit!(world, (challenge_player));
emit!(world, ObstacleAttack { player: game.owner, attack: challenge_attack });
game.substate = GameSubState::UNPASSED_OBSTACLE;
GameStore::set(@game, world);
return;
}

let mut cards = array![];
Expand Down Expand Up @@ -144,10 +144,26 @@ impl ChallengeImpl of ChallengeTrait {

let game_deck = GameDeckStore::get(world, game_id);
if game_deck.round_len.is_zero() && _player_has_empty_hand(ref store, @game) {
let play_game_over_event = PlayGameOverEvent { player: get_caller_address(), game_id: game.id };
emit!(world, (play_game_over_event));
game.state = GameState::FINISHED;
let challenge_attack = 5 * game.level;
game
.current_player_hp =
if game.current_player_hp <= challenge_attack {
0
} else {
game.current_player_hp - challenge_attack
};

if game.current_player_hp.is_zero() {
let play_game_over_event = PlayGameOverEvent { player: get_caller_address(), game_id: game.id };
emit!(world, (play_game_over_event));
game.state = GameState::FINISHED;
return;
}

emit!(world, ObstacleAttack { player: game.owner, attack: challenge_attack });
game.substate = GameSubState::UNPASSED_OBSTACLE;
GameStore::set(@game, world);
return;
}
}
}
Expand Down
22 changes: 22 additions & 0 deletions src/systems/game_system.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ trait IGameSystem {
fn use_adventurer(ref world: IWorldDispatcher, game_id: u32, adventurer_id: u32);
fn skip_adventurer(ref world: IWorldDispatcher, game_id: u32);
fn select_aventurer_cards(ref world: IWorldDispatcher, game_id: u32, cards_index: Array<u32>);
fn skip_unpassed_obstacle(ref world: IWorldDispatcher, game_id: u32);
}

mod errors {
Expand All @@ -43,6 +44,7 @@ mod errors {
const WRONG_SUBSTATE_SELECT_REWARD: felt252 = 'Wrong substate SELECT_REWARD';
const WRONG_SUBSTATE_DRAFT_ADVENTURER: felt252 = 'Wrong substate SELECT_ADVENTURE';
const WRONG_SUBSTATE_ADVENTURER_CARDS: felt252 = 'Wrong substate SELECT_ADV_CARDS';
const WRONG_SUBSTATE_UNPASSED_OBSTABLE: felt252 = 'Wrong substate UNPASSED_OBST';
}

#[dojo::contract]
Expand Down Expand Up @@ -157,6 +159,7 @@ mod game_system {
let mut game = store.get_game(game_id);

assert(game.owner.is_non_zero(), errors::GAME_NOT_FOUND);
assert(game.owner == get_caller_address(), errors::CALLER_NOT_OWNER);
assert(game.state == GameState::IN_GAME, errors::GAME_NOT_IN_GAME);
assert(game.substate == GameSubState::CREATE_LEVEL, errors::WRONG_SUBSTATE_CREATE_LEVEL);

Expand All @@ -175,6 +178,7 @@ mod game_system {

let game = store.get_game(game_id);
assert(game.owner.is_non_zero(), errors::GAME_NOT_FOUND);
assert(game.owner == get_caller_address(), errors::CALLER_NOT_OWNER);
assert(game.state == GameState::IN_GAME, errors::GAME_NOT_IN_GAME);

match game.substate {
Expand All @@ -189,6 +193,7 @@ mod game_system {

let game = store.get_game(game_id);
assert(game.owner.is_non_zero(), errors::GAME_NOT_FOUND);
assert(game.owner == get_caller_address(), errors::CALLER_NOT_OWNER);
assert(game.state == GameState::IN_GAME, errors::GAME_NOT_IN_GAME);

match game.substate {
Expand All @@ -203,6 +208,7 @@ mod game_system {

let game = store.get_game(game_id);
assert(game.owner.is_non_zero(), errors::GAME_NOT_FOUND);
assert(game.owner == get_caller_address(), errors::CALLER_NOT_OWNER);
assert(game.substate == GameSubState::BEAST, errors::WRONG_SUBSTATE_BEAST);

BeastTrait::end_turn(world, game_id);
Expand All @@ -211,6 +217,7 @@ mod game_system {
fn create_reward(ref world: IWorldDispatcher, game_id: u32, reward_index: u8) {
let mut game = GameStore::get(world, game_id);
assert(game.owner.is_non_zero(), errors::GAME_NOT_FOUND);
assert(game.owner == get_caller_address(), errors::CALLER_NOT_OWNER);
assert(game.substate == GameSubState::CREATE_REWARD, errors::WRONG_SUBSTATE_REWARD);

let reward: RewardType = (*RewardStore::get(world, game_id).rewards_ids.at(reward_index.into())).into();
Expand Down Expand Up @@ -255,6 +262,7 @@ mod game_system {
fn select_reward(ref world: IWorldDispatcher, game_id: u32, cards_index: Array<u32>) {
let mut game = GameStore::get(world, game_id);
assert(game.owner.is_non_zero(), errors::GAME_NOT_FOUND);
assert(game.owner == get_caller_address(), errors::CALLER_NOT_OWNER);
assert(
game.substate == GameSubState::REWARD_SPECIALS || game.substate == GameSubState::REWARD_CARDS_PACK,
errors::WRONG_SUBSTATE_SELECT_REWARD
Expand Down Expand Up @@ -414,6 +422,20 @@ mod game_system {
store.set_game(game);
}

fn skip_unpassed_obstacle(ref world: IWorldDispatcher, game_id: u32) {
let mut game = GameStore::get(world, game_id);
assert(game.owner.is_non_zero(), errors::GAME_NOT_FOUND);
assert(game.owner == get_caller_address(), errors::CALLER_NOT_OWNER);
assert(
game.substate == GameSubState::UNPASSED_OBSTACLE,
errors::WRONG_SUBSTATE_UNPASSED_OBSTABLE
);
let mut store = StoreTrait::new(world);
game.substate = GameSubState::CREATE_LEVEL;
store.set_game(game);
self.create_level(game_id)
}

fn discard_effect_card(ref world: IWorldDispatcher, game_id: u32, card_index: u32) {
let mut store: Store = StoreTrait::new(world);
let game = store.get_game(game_id);
Expand Down
Loading