Moved EPropertyType to trigger_logic::battle
This commit is contained in:
parent
94af165a63
commit
b17a2f9fdc
5 changed files with 93 additions and 93 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -3599,7 +3599,6 @@ name = "trigger-battle-server"
|
|||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"dashmap 6.1.0",
|
||||
"num_enum",
|
||||
"paste",
|
||||
"serde",
|
||||
"serde_json",
|
||||
|
|
|
@ -6,7 +6,6 @@ version.workspace = true
|
|||
[dependencies]
|
||||
tokio.workspace = true
|
||||
|
||||
num_enum.workspace = true
|
||||
paste.workspace = true
|
||||
serde.workspace = true
|
||||
serde_json.workspace = true
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use std::collections::HashMap;
|
||||
|
||||
use trigger_fileconfig::{AvatarBattleTemplate, AvatarLevelAdvanceTemplate, AvatarPassiveSkillTemplate, NapFileCfg, WeaponLevelTemplate, WeaponStarTemplate, WeaponTemplate};
|
||||
use trigger_logic::skill::EAvatarSkillType;
|
||||
use trigger_logic::{battle::EPropertyType, skill::EAvatarSkillType};
|
||||
use trigger_protocol::{Avatar, DungeonEquipInfo, Equip, Weapon};
|
||||
|
||||
struct AvatarFileCfg<'a> {
|
||||
|
@ -19,95 +19,6 @@ struct WeaponFileCfg<'a> {
|
|||
const BEN_AVATAR_ID: u32 = 1121;
|
||||
const BEN_CORE_PASSIVE_PERCENTAGE: [i32;7] = [40, 46, 52, 60, 66, 72, 80];
|
||||
|
||||
#[repr(u32)]
|
||||
#[derive(num_enum::IntoPrimitive, num_enum::TryFromPrimitive)]
|
||||
pub enum EPropertyType {
|
||||
HpMax = 111,
|
||||
Atk = 121,
|
||||
BreakStun = 122,
|
||||
Def = 131,
|
||||
Crit = 201,
|
||||
CritDmg = 211,
|
||||
Pen = 231,
|
||||
PenValue = 232,
|
||||
SpRecover = 305,
|
||||
ElementMystery = 312,
|
||||
ElementAbnormalPower = 314,
|
||||
AddedDamageRatioPhysics = 315,
|
||||
AddedDamageRatioFire = 316,
|
||||
AddedDamageRatioIce = 317,
|
||||
AddedDamageRatioElec = 318,
|
||||
AddedDamageRatioEther = 319,
|
||||
// battle
|
||||
HpMaxBattle = 1111,
|
||||
AtkBattle = 1121,
|
||||
BreakStunBattle = 1122,
|
||||
DefBattle = 1131,
|
||||
CritBattle = 1201,
|
||||
CritDmgBattle = 1211,
|
||||
PenRatioBattle = 1231,
|
||||
PenDeltaBattle = 1232,
|
||||
SpRecoverBattle = 1305,
|
||||
ElementMysteryBattle = 1312,
|
||||
ElementAbnormalPowerBattle = 1314,
|
||||
AddedDamageRatioPhysicsBattle = 1315,
|
||||
AddedDamageRatioFireBattle = 1316,
|
||||
AddedDamageRatioIceBattle = 1317,
|
||||
AddedDamageRatioElecBattle = 1318,
|
||||
AddedDamageRatioEtherBattle = 1319,
|
||||
// base
|
||||
HpMaxBase = 11101,
|
||||
AtkBase = 12101,
|
||||
BreakStunBase = 12201,
|
||||
DefBase = 13101,
|
||||
CritBase = 20101,
|
||||
CritDmgBase = 21101,
|
||||
PenBase = 23101,
|
||||
PenValueBase = 23201,
|
||||
SpRecoverBase = 30501,
|
||||
ElementMysteryBase = 31201,
|
||||
ElementAbnormalPowerBase = 31401,
|
||||
// ratio
|
||||
HpMaxRatio = 11102,
|
||||
AtkRatio = 12102,
|
||||
BreakStunRatio = 12202,
|
||||
DefRatio = 13102,
|
||||
SpRecoverRatio = 30502,
|
||||
ElementAbnormalPowerRatio = 31402,
|
||||
// delta
|
||||
HpMaxDelta = 11103,
|
||||
AtkDelta = 12103,
|
||||
BreakStunDelta = 12203,
|
||||
DefDelta = 13103,
|
||||
CritDelta = 20103,
|
||||
CritDmgDelta = 21103,
|
||||
PenDelta = 23103,
|
||||
PenValueDelta = 23203,
|
||||
SpRecoverDelta = 30503,
|
||||
ElementMysteryDelta = 31203,
|
||||
ElementAbnormalPowerDelta = 31403,
|
||||
// damage ratios 1/3
|
||||
AddedDamageRatioPhysics1 = 31501,
|
||||
AddedDamageRatioPhysics3 = 31503,
|
||||
AddedDamageRatioFire1 = 31601,
|
||||
AddedDamageRatioFire3 = 31603,
|
||||
AddedDamageRatioIce1 = 31701,
|
||||
AddedDamageRatioIce3 = 31703,
|
||||
AddedDamageRatioElec1 = 31801,
|
||||
AddedDamageRatioElec3 = 31803,
|
||||
AddedDamageRatioEther1 = 31901,
|
||||
AddedDamageRatioEther3 = 31903,
|
||||
// --- custom
|
||||
// growth
|
||||
HpMaxGrowth = 9999_111_0,
|
||||
AtkGrowth = 9999_121_0,
|
||||
DefGrowth = 9999_131_0,
|
||||
// advance
|
||||
HpMaxAdvance = 9999_111_1,
|
||||
AtkAdvance = 9999_121_1,
|
||||
DefAdvance = 9999_131_1,
|
||||
}
|
||||
|
||||
pub fn calculate_for_avatar(
|
||||
avatar_id: u32,
|
||||
filecfg: &'static NapFileCfg,
|
||||
|
|
90
crates/trigger-logic/src/battle.rs
Normal file
90
crates/trigger-logic/src/battle.rs
Normal file
|
@ -0,0 +1,90 @@
|
|||
use num_enum::{IntoPrimitive, TryFromPrimitive};
|
||||
|
||||
#[repr(u32)]
|
||||
#[derive(IntoPrimitive, TryFromPrimitive)]
|
||||
pub enum EPropertyType {
|
||||
HpMax = 111,
|
||||
Atk = 121,
|
||||
BreakStun = 122,
|
||||
Def = 131,
|
||||
Crit = 201,
|
||||
CritDmg = 211,
|
||||
Pen = 231,
|
||||
PenValue = 232,
|
||||
SpRecover = 305,
|
||||
ElementMystery = 312,
|
||||
ElementAbnormalPower = 314,
|
||||
AddedDamageRatioPhysics = 315,
|
||||
AddedDamageRatioFire = 316,
|
||||
AddedDamageRatioIce = 317,
|
||||
AddedDamageRatioElec = 318,
|
||||
AddedDamageRatioEther = 319,
|
||||
// battle
|
||||
HpMaxBattle = 1111,
|
||||
AtkBattle = 1121,
|
||||
BreakStunBattle = 1122,
|
||||
DefBattle = 1131,
|
||||
CritBattle = 1201,
|
||||
CritDmgBattle = 1211,
|
||||
PenRatioBattle = 1231,
|
||||
PenDeltaBattle = 1232,
|
||||
SpRecoverBattle = 1305,
|
||||
ElementMysteryBattle = 1312,
|
||||
ElementAbnormalPowerBattle = 1314,
|
||||
AddedDamageRatioPhysicsBattle = 1315,
|
||||
AddedDamageRatioFireBattle = 1316,
|
||||
AddedDamageRatioIceBattle = 1317,
|
||||
AddedDamageRatioElecBattle = 1318,
|
||||
AddedDamageRatioEtherBattle = 1319,
|
||||
// base
|
||||
HpMaxBase = 11101,
|
||||
AtkBase = 12101,
|
||||
BreakStunBase = 12201,
|
||||
DefBase = 13101,
|
||||
CritBase = 20101,
|
||||
CritDmgBase = 21101,
|
||||
PenBase = 23101,
|
||||
PenValueBase = 23201,
|
||||
SpRecoverBase = 30501,
|
||||
ElementMysteryBase = 31201,
|
||||
ElementAbnormalPowerBase = 31401,
|
||||
// ratio
|
||||
HpMaxRatio = 11102,
|
||||
AtkRatio = 12102,
|
||||
BreakStunRatio = 12202,
|
||||
DefRatio = 13102,
|
||||
SpRecoverRatio = 30502,
|
||||
ElementAbnormalPowerRatio = 31402,
|
||||
// delta
|
||||
HpMaxDelta = 11103,
|
||||
AtkDelta = 12103,
|
||||
BreakStunDelta = 12203,
|
||||
DefDelta = 13103,
|
||||
CritDelta = 20103,
|
||||
CritDmgDelta = 21103,
|
||||
PenDelta = 23103,
|
||||
PenValueDelta = 23203,
|
||||
SpRecoverDelta = 30503,
|
||||
ElementMysteryDelta = 31203,
|
||||
ElementAbnormalPowerDelta = 31403,
|
||||
// damage ratios 1/3
|
||||
AddedDamageRatioPhysics1 = 31501,
|
||||
AddedDamageRatioPhysics3 = 31503,
|
||||
AddedDamageRatioFire1 = 31601,
|
||||
AddedDamageRatioFire3 = 31603,
|
||||
AddedDamageRatioIce1 = 31701,
|
||||
AddedDamageRatioIce3 = 31703,
|
||||
AddedDamageRatioElec1 = 31801,
|
||||
AddedDamageRatioElec3 = 31803,
|
||||
AddedDamageRatioEther1 = 31901,
|
||||
AddedDamageRatioEther3 = 31903,
|
||||
// --- custom
|
||||
// growth
|
||||
HpMaxGrowth = 9999_111_0,
|
||||
AtkGrowth = 9999_121_0,
|
||||
DefGrowth = 9999_131_0,
|
||||
// advance
|
||||
HpMaxAdvance = 9999_111_1,
|
||||
AtkAdvance = 9999_121_1,
|
||||
DefAdvance = 9999_131_1,
|
||||
}
|
|
@ -1,6 +1,7 @@
|
|||
pub mod action_pb;
|
||||
pub mod battle;
|
||||
pub mod item;
|
||||
pub mod quest;
|
||||
pub mod scene;
|
||||
pub mod skill;
|
||||
pub mod template_ext;
|
||||
pub mod template_ext;
|
Loading…
Reference in a new issue