ObolSquad/trigger-rs
1
0
Fork 1
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed HDD commissions | Reverted flatc expect #6

Merged
xeon merged 8 commits from :master into master 2025-03-18 21:50:56 +00:00
Conversation 0 Commits 8 Files changed 7 +5
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0f14b2fe74 - Show all commits

4
crates/battle-server/src/logic/property_util.rs
View file

@ -626,6 +626,10 @@ fn remove_custom_properties(properties: &mut HashMap<u32, i32>) {
} }
fn set_battle_properties(properties: &mut HashMap<u32, i32>) { fn set_battle_properties(properties: &mut HashMap<u32, i32>) {
properties.insert(
EPropertyType::Hp.into(),
*properties.get(&EPropertyType::HpMax.into()).unwrap_or(&0),
);
properties.insert( properties.insert(
EPropertyType::HpMaxBattle.into(), EPropertyType::HpMaxBattle.into(),
*properties.get(&EPropertyType::HpMax.into()).unwrap_or(&0), *properties.get(&EPropertyType::HpMax.into()).unwrap_or(&0),

1
crates/trigger-logic/src/battle.rs
View file

@ -3,6 +3,7 @@ use num_enum::{IntoPrimitive, TryFromPrimitive};
#[repr(u32)] #[repr(u32)]
#[derive(IntoPrimitive, TryFromPrimitive)] #[derive(IntoPrimitive, TryFromPrimitive)]
pub enum EPropertyType { pub enum EPropertyType {
Hp = 1,
HpMax = 111, HpMax = 111,
Atk = 121, Atk = 121,
BreakStun = 122, BreakStun = 122,