Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions backend/dojo_examples/combat_game/src/models/battle.cairo
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
use starknet::ContractAddress;
use combat_game::types::battle_status::BattleStatus;

#[derive(Copy, Drop, Serde, Debug, PartialEq)]
#[derive(Copy, Drop, Serde, Debug, Introspect, PartialEq)]
#[dojo::model]
pub struct Battle {
#[key]
pub id: u256,
pub player1: ContractAddress,
pub player2: ContractAddress,
pub current_turn: ContractAddress,
pub status: u8,
pub status: BattleStatus,
pub winner_id: ContractAddress,
pub battle_type: u8,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub struct BeastStats {
}

#[generate_trait]
impl BeastStatsActions of BeastStatsActionTrait {
pub impl BeastStatsActions of BeastStatsActionTrait {
fn generate_random_beast_stat(beast_id: u16, attribute_id: u16, min: u8, max: u8) -> u16 {
let mut salt: u256 = poseidon_hash_span(
array![beast_id.into(), attribute_id.into(), starknet::get_block_timestamp().into()]
Expand Down
14 changes: 14 additions & 0 deletions backend/dojo_examples/combat_game/src/models/skill.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,20 @@ const FREEZE_SKILL_DAMAGE: u16 = 40;
const SHOCK_SKILL_DAMAGE: u16 = 45;
const DEFAULT_SKILL_DAMAGE: u16 = 30;

pub const SLASH_SKILL_ID: u256 = 1;
pub const BEAM_SKILL_ID: u256 = 2;
pub const WAVE_SKILL_ID: u256 = 3;
pub const PUNCH_SKILL_ID: u256 = 4;
pub const KICK_SKILL_ID: u256 = 5;
pub const BLAST_SKILL_ID: u256 = 6;
pub const CRUSH_SKILL_ID: u256 = 7;
pub const PIERCE_SKILL_ID: u256 = 8;
pub const SMASH_SKILL_ID: u256 = 9;
pub const BURN_SKILL_ID: u256 = 10;
pub const FREEZE_SKILL_ID: u256 = 11;
pub const SHOCK_SKILL_ID: u256 = 12;
pub const DEFAULT_SKILL_ID: u256 = 13;

#[derive(Copy, Drop, Serde, Debug, Introspect, PartialEq)]
#[dojo::model]
pub struct Skill {
Expand Down
Loading