add assert energy (#12)

caravana-studio · Nov 1, 2024 · 8a96664 · 8a96664
1 parent b05fb52
commit 8a96664
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/models/status/round/beast.cairo b/src/models/status/round/beast.cairo
@@ -31,6 +31,7 @@ mod errors {
     const GAME_NOT_IN_GAME: felt252 = 'Game: is not IN_GAME';
     const GAME_NOT_IN_BEAST: felt252 = 'Game: is not BEAST';
     const USE_INVALID_CARD: felt252 = 'Game: use an invalid card';
+    const PLAYER_WITHOUT_ENERGY: felt252 = 'Game: player without energy';
 }
 
 #[generate_trait]
@@ -71,6 +72,11 @@ impl BeastImpl of BeastTrait {
         assert(game.substate == GameSubState::BEAST, errors::GAME_NOT_IN_BEAST);
         assert(cards_index.len() > 0 && cards_index.len() <= game.len_hand, errors::INVALID_CARD_INDEX_LEN);
 
+        let mut player_beast = PlayerBeastStore::get(world, game.id);
+        let mut game_mode_beast = GameModeBeastStore::get(world, game.id);
+
+        assert(player_beast.energy >= game_mode_beast.cost_play, errors::PLAYER_WITHOUT_ENERGY);
+
         let rage_round = RageRoundStore::get(world, game_id);
 
         let attack = play(world, ref game, @cards_index, @modifiers_index);
@@ -85,9 +91,6 @@ impl BeastImpl of BeastTrait {
         };
         BeastStore::set(@beast, world);
 
-        let mut game_mode_beast = GameModeBeastStore::get(world, game.id);
-
-        let mut player_beast = PlayerBeastStore::get(world, game.id);
         player_beast.energy -= game_mode_beast.cost_play;
         PlayerBeastStore::set(@player_beast, world);
 
@@ -157,6 +160,11 @@ impl BeastImpl of BeastTrait {
         assert(game.state == GameState::IN_GAME, errors::GAME_NOT_IN_GAME);
         assert(game.substate == GameSubState::BEAST, errors::GAME_NOT_IN_BEAST);
 
+        let mut game_mode_beast = GameModeBeastStore::get(world, game.id);
+        let mut player_beast = PlayerBeastStore::get(world, game.id);
+
+        assert(player_beast.energy >= game_mode_beast.cost_play, errors::PLAYER_WITHOUT_ENERGY);
+
         let mut cards = array![];
         let mut idx = 0;
         loop {
@@ -184,9 +192,6 @@ impl BeastImpl of BeastTrait {
 
         CurrentHandCardTrait::refresh(world, game.id, cards);
 
-        let mut game_mode_beast = GameModeBeastStore::get(world, game.id);
-
-        let mut player_beast = PlayerBeastStore::get(world, game.id);
         player_beast.energy -= game_mode_beast.cost_discard;
         PlayerBeastStore::set(@player_beast, world);
 

diff --git a/src/models/status/round/challenge.cairo b/src/models/status/round/challenge.cairo
@@ -5,10 +5,9 @@ use jokers_of_neon::constants::{
         CHALLENGE_ROYAL_FLUSH, CHALLENGE_STRAIGHT_FLUSH, CHALLENGE_FIVE_OF_A_KIND, CHALLENGE_FOUR_OF_A_KIND,
         CHALLENGE_FULL_HOUSE, CHALLENGE_FLUSH, CHALLENGE_STRAIGHT, CHALLENGE_THREE_OF_A_KIND, CHALLENGE_DOUBLE_PAIR,
         CHALLENGE_PAIR, CHALLENGE_HIGH_CARD, CHALLENGE_HEARTS, CHALLENGE_CLUBS, CHALLENGE_DIAMONDS, CHALLENGE_SPADES,
-        CHALLENGE_TWO, CHALLENGE_THREE, CHALLENGE_FOUR, CHALLENGE_FIVE, CHALLENGE_SIX, CHALLENGE_SEVEN,
-        CHALLENGE_EIGHT, CHALLENGE_NINE, CHALLENGE_TEN, CHALLENGE_JACK, CHALLENGE_QUEEN, CHALLENGE_KING, CHALLENGE_ACE,
-        CHALLENGE_JOKER, CHALLENGE_500_POINTS, CHALLENGE_1000_POINTS, CHALLENGE_2000_POINTS, CHALLENGE_5000_POINTS,
-        challenges_all
+        CHALLENGE_TWO, CHALLENGE_THREE, CHALLENGE_FOUR, CHALLENGE_FIVE, CHALLENGE_SIX, CHALLENGE_SEVEN, CHALLENGE_EIGHT,
+        CHALLENGE_NINE, CHALLENGE_TEN, CHALLENGE_JACK, CHALLENGE_QUEEN, CHALLENGE_KING, CHALLENGE_ACE, CHALLENGE_JOKER,
+        CHALLENGE_500_POINTS, CHALLENGE_1000_POINTS, CHALLENGE_2000_POINTS, CHALLENGE_5000_POINTS, challenges_all
     },
     specials::SPECIAL_ALL_CARDS_TO_HEARTS_ID,
 };