diff --git a/server/gameserver/attrdefine.h b/server/gameserver/attrdefine.h index b749c28f..e67b43b1 100644 --- a/server/gameserver/attrdefine.h +++ b/server/gameserver/attrdefine.h @@ -2,53 +2,53 @@ enum HumanAttrType_e { - kHAT_Begin = 0, - kHAT_Hp = 1, - kHAT_HPRecover = 2, - kHAT_Atk = 3, - kHAT_Def = 4, - kHAT_Speed = 5, - kHAT_ShotRange = 6, - kHAT_ShotSpeed = 7, - kHAT_ReloadSpeed = 8, - kHAT_FireRate = 9, - kHAT_Volume = 10, - kHAT_MaxHp = 11, - kHAT_ShotView = 12, - kHAT_ReloadTime = 14, + kXHAT_Begin = 0, + kXHAT_Hp = 1, + kXHAT_HPRecover = 2, + kXHAT_Atk = 3, + kXHAT_Def = 4, + kXHAT_Speed = 5, + kXHAT_ShotRange = 6, + kXHAT_ShotSpeed = 7, + kXHAT_ReloadSpeed = 8, + kXHAT_FireRate = 9, + kXHAT_Volume = 10, + kXHAT_MaxHp = 11, + kXHAT_ShotView = 12, + kXHAT_ReloadTime = 14, - kHAT_WeaponDmg = 20, - kHAT_WeaponShotSpeed = 21, - kHAT_WeaponReloadTime = 22, - kHAT_WeaponExplosionRange = 23, - kHAT_WeaponExplosionContinueTime = 24, - kHAT_PoisoningReduction = 25, - kHAT_RescueTime = 26, - kHAT_DrugTime = 27, - kHAT_DrugEfficacy = 28, - kHAT_CarOil = 29, - kHAT_WeaponExplosionDealyTime = 30, - kHAT_RecoverHpAdd = 31, - kHAT_SkillTime = 32, - kHAT_WeaponThrowRange = 33, - kHAT_LUCKY = 34, - kHAT_HP_RATE = 39, - kHAT_ATK_RATE = 40, - kHAT_DEF_RATE = 41, - kHAT_CRIT = 42, - kHAT_CRIT_DAMAGE_RATE = 43, - kHAT_DODGE = 44, - kHAT_DODGE_DAMAGE_RATE = 45, - kHAT_HpRecoverPct = 46, - kHAT_BrainLifePct = 47, - kHAT_ReloadTimePct = 48, - kHAT_BulletSpeed = 49, - kHAT_BulletSpeedPct = 50, - kHAT_CoolDownPct = 51, - kHAT_PickUpPct = 52, - kHAT_Shield = 53, - kHAT_Tenacity = 54, - kHAT_End + kXHAT_WeaponDmg = 20, + kXHAT_WeaponShotSpeed = 21, + kXHAT_WeaponReloadTime = 22, + kXHAT_WeaponExplosionRange = 23, + kXHAT_WeaponExplosionContinueTime = 24, + kXHAT_PoisoningReduction = 25, + kXHAT_RescueTime = 26, + kXHAT_DrugTime = 27, + kXHAT_DrugEfficacy = 28, + kXHAT_CarOil = 29, + kXHAT_WeaponExplosionDealyTime = 30, + kXHAT_RecoverHpAdd = 31, + kXHAT_SkillTime = 32, + kXHAT_WeaponThrowRange = 33, + kXHAT_LUCKY = 34, + kXHAT_HP_RATE = 39, + kXHAT_ATK_RATE = 40, + kXHAT_DEF_RATE = 41, + kXHAT_CRIT = 42, + kXHAT_CRIT_DAMAGE_RATE = 43, + kXHAT_DODGE = 44, + kXHAT_DODGE_DAMAGE_RATE = 45, + kXHAT_HpRecoverPct = 46, + kXHAT_BrainLifePct = 47, + kXHAT_ReloadTimePct = 48, + kXHAT_BulletSpeed = 49, + kXHAT_BulletSpeedPct = 50, + kXHAT_CoolDownPct = 51, + kXHAT_PickUpPct = 52, + kXHAT_Shield = 53, + kXHAT_Tenacity = 54, + kXHAT_End }; enum NewHumanAttrType_e diff --git a/server/gameserver/buff/once_chg_attr.cc b/server/gameserver/buff/once_chg_attr.cc index 420fd496..e98b81af 100644 --- a/server/gameserver/buff/once_chg_attr.cc +++ b/server/gameserver/buff/once_chg_attr.cc @@ -24,7 +24,7 @@ void OnceChgAttrBuff::InternalProcOnceChgAttr() return; } switch (meta->_int_buff_param1) { - case kHAT_Hp: + case kXHAT_Hp: { int real_killer_id = 0; std::string real_killer_name; diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 2dee641d..cd8fd439 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -506,7 +506,7 @@ float Bullet::GetAtk() atk *= android->ai->GetAttackRate(); #endif } - float attr_rate = 1 + ability_->GetAttrRate(kHAT_Atk); + float attr_rate = 1 + ability_->GetAttrRate(kXHAT_Atk); if (IsCurrWeapon()) { attr_rate += ability_->GetAttrRate(kHVAT_WeaponDmg); } diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 1e32ecf5..5c72ea19 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -3224,8 +3224,8 @@ float Creature::GetSpeed() if (ruduce > 0.00001f) { ruduce = 1.0f - ruduce; } - addition += GetAbility()->GetAttrAddition(kHAT_Speed); - ruduce = std::max(ruduce, GetAbility()->GetAttrRuduce(kHAT_Speed)); + addition += GetAbility()->GetAttrAddition(kXHAT_Speed); + ruduce = std::max(ruduce, GetAbility()->GetAttrRuduce(kXHAT_Speed)); float rate = addition - ruduce; finaly_speed *= 1.0f + rate; #ifdef MYDEBUG diff --git a/server/gameserver/mt/Buff.cc b/server/gameserver/mt/Buff.cc index f107ad2e..95afa29e 100644 --- a/server/gameserver/mt/Buff.cc +++ b/server/gameserver/mt/Buff.cc @@ -11,15 +11,15 @@ IMPL_TABLE(mt::Buff) static std::map> attr_buffs; -static std::set ok_buffs{kHAT_Hp, - kHAT_Atk, - kHAT_Def, - kHAT_Speed, - kHAT_ShotRange, - kHAT_FireRate, - kHAT_Volume, - kHAT_CRIT, - kHAT_CRIT_DAMAGE_RATE, +static std::set ok_buffs{kXHAT_Hp, + kXHAT_Atk, + kXHAT_Def, + kXHAT_Speed, + kXHAT_ShotRange, + kXHAT_FireRate, + kXHAT_Volume, + kXHAT_CRIT, + kXHAT_CRIT_DAMAGE_RATE, kHVAT_Dmg, kHVAT_BulletAngle}; @@ -381,7 +381,7 @@ namespace mt { AddCheckAttrBuff(_int_buff_param1, this); switch (_int_buff_param1) { - case kHAT_Hp: + case kXHAT_Hp: { } diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index 9e8e228b..07884d3a 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -933,7 +933,7 @@ float BattleDataContext::CalcDmg(Explosion* e) float BattleDataContext::GetTotalAtk(IBullet* bullet) { - float direct_atk = owner_.Get()->GetAbility()->GetAttrDirect(kHAT_Atk); + float direct_atk = owner_.Get()->GetAbility()->GetAttrDirect(kXHAT_Atk); if (direct_atk > 0.001f) { return direct_atk; } else { @@ -945,20 +945,20 @@ float BattleDataContext::GetTotalAtk(IBullet* bullet) float BattleDataContext::GetMaxHP() { float hp = hero_ability_->GetHP(); - hp += owner_.Get()->GetAbility()->GetAttrAbs(kHAT_Hp); - hp *= 1.0f + owner_.Get()->GetAbility()->GetAttrRate(kHAT_Hp); - hp *= 1.0f + owner_.Get()->GetAbility()->GetAttrAddition(kHAT_Hp) - - owner_.Get()->GetAbility()->GetAttrRuduce(kHAT_Hp); + hp += owner_.Get()->GetAbility()->GetAttrAbs(kXHAT_Hp); + hp *= 1.0f + owner_.Get()->GetAbility()->GetAttrRate(kXHAT_Hp); + hp *= 1.0f + owner_.Get()->GetAbility()->GetAttrAddition(kXHAT_Hp) - + owner_.Get()->GetAbility()->GetAttrRuduce(kXHAT_Hp); return hp; } float BattleDataContext::GetDef() { float def = hero_ability_->GetDef(); - def += owner_.Get()->GetAbility()->GetAttrAbs(kHAT_Def); - def *= 1.0f + owner_.Get()->GetAbility()->GetAttrRate(kHAT_Def); - def *= 1.0f + owner_.Get()->GetAbility()->GetAttrAddition(kHAT_Def) - - owner_.Get()->GetAbility()->GetAttrRuduce(kHAT_Def); + def += owner_.Get()->GetAbility()->GetAttrAbs(kXHAT_Def); + def *= 1.0f + owner_.Get()->GetAbility()->GetAttrRate(kXHAT_Def); + def *= 1.0f + owner_.Get()->GetAbility()->GetAttrAddition(kXHAT_Def) - + owner_.Get()->GetAbility()->GetAttrRuduce(kXHAT_Def); return def; } @@ -968,10 +968,10 @@ float BattleDataContext::GetHeroTotalAtk() if (owner_.Get() && owner_.Get()->IsAndroid() && owner_.Get()->room->IsNewerMap()) { atk /= 2.0f; } - atk += owner_.Get()->GetAbility()->GetAttrAbs(kHAT_Atk); - atk *= 1.0f + owner_.Get()->GetAbility()->GetAttrRate(kHAT_Atk); - atk *= 1.0f + owner_.Get()->GetAbility()->GetAttrAddition(kHAT_Atk) - - owner_.Get()->GetAbility()->GetAttrRuduce(kHAT_Atk); + atk += owner_.Get()->GetAbility()->GetAttrAbs(kXHAT_Atk); + atk *= 1.0f + owner_.Get()->GetAbility()->GetAttrRate(kXHAT_Atk); + atk *= 1.0f + owner_.Get()->GetAbility()->GetAttrAddition(kXHAT_Atk) - + owner_.Get()->GetAbility()->GetAttrRuduce(kXHAT_Atk); return atk; } @@ -1200,7 +1200,7 @@ float BattleDataContext::GetBrainLifePct() float BattleDataContext::GetSkillCdPct() { - return hero_ability_->GetSkillCdPct() + owner_.Get()->GetAbility()->GetAttrAddition(kHAT_SkillTime); + return hero_ability_->GetSkillCdPct() + owner_.Get()->GetAbility()->GetAttrAddition(kXHAT_SkillTime); } float BattleDataContext::GetRescueTimePct()