Skip to content

Adding new impl in store.cairo and solving all todo comments #189

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

Merged
coxmars merged 1 commit into from
Aug 17, 2025
Merged

Adding new impl in store.cairo and solving all todo comments #189

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
2 changes: 2 additions & 0 deletions backend/dojo_examples/combat_game/src/constants.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ pub const NOT_VERY_EFFECTIVE: u8 = 50;
pub const FAVORED_ATTACK_MULTIPLIER: u8 = 120;
pub const NORMAL_ATTACK_MULTIPLIER: u8 = 100;

// Base battle experience
pub const BASE_BATTLE_EXPERIENCE: u16 = 10;
1 change: 1 addition & 0 deletions backend/dojo_examples/combat_game/src/lib.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ mod types {
mod helpers {
pub mod pseudo_random;
pub mod timestamp;
pub mod experience_utils;
}

pub mod utils {
Expand Down
18 changes: 8 additions & 10 deletions backend/dojo_examples/combat_game/src/store.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use dojo::{model::ModelStorage, world::WorldStorage};
use core::num::traits::zero::Zero;
use combat_game::{
constants::SECONDS_PER_DAY,
constants::{BASE_BATTLE_EXPERIENCE, SECONDS_PER_DAY},
models::{
player::Player, beast::{Beast, BeastTrait}, skill, skill::{Skill, SkillTrait},
beast_skill::BeastSkill, beast_stats::{BeastStats, BeastStatsActionTrait},
Expand All @@ -11,6 +11,7 @@ use combat_game::{
beast_type::BeastType, skill::SkillType, status_condition::StatusCondition,
battle_status::BattleStatus,
},
helpers::experience_utils::ExperienceCalculatorImpl,
};

use starknet::ContractAddress;
Expand Down Expand Up @@ -314,17 +315,14 @@ pub impl StoreImpl of StoreTrait {
beast.experience += exp_amount;

// Check if level up is needed
// TODO: ExperienceCalculatorTrait is not implemented
// let exp_needed = ExperienceTrrait::calculate_exp_needed_for_level(beast.level);
let exp_needed = 10;
let exp_needed = ExperienceCalculatorImpl::calculate_exp_needed_for_level(beast.level);
let level_up_occurred = beast.experience >= exp_needed;

if level_up_occurred {
// Calculate remaining exp
// TODO: ExperienceCalculatorTrait is not implemented
// beast.experience);
// beast.experience = ExperienceTrrait::remaining_exp_after_level_up(beast.level,
beast.experience = 5;
beast.experience = ExperienceCalculatorImpl::remaining_exp_after_level_up(
beast.level, beast.experience,
);
beast.level += 1;

// Update beast stats
Expand Down Expand Up @@ -410,8 +408,8 @@ pub impl StoreImpl of StoreTrait {
// Update player stats
self.update_player_battle_result(won: true);

// TODO: Define base experience for winning a game
self.award_battle_experience(attacker_beast_id, 1);
// Award experience for winning a game
self.award_battle_experience(attacker_beast_id, BASE_BATTLE_EXPERIENCE);
}

// Save changes
Expand Down
Loading