diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index f390d3eb..106b157d 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -217,6 +217,11 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string killer_name, in int dmg_type, int dmg_bp) { + if (IsPlayer() && room->IsNewBieBattle()) { + if (dec_hp > 10) { + dec_hp = 10; + } + } real_dmg_out = 0.0f; if (!room->BattleStarted()) { return; diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index 26e48278..48d54161 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -162,6 +162,9 @@ public: hp_ = (hero_meta->GetBasicMeta()->vOrigHealth() * (1 + pHealth / hero_meta->GetBasicMeta()->pBaseHealth()) + vHealthAm) * (1 + vHealthRateSe) * (1 + vHealthRateIn); + if (owner_.Get()->room->IsNewBieBattle() && !owner_.Get()->IsPlayer()) { + hp_ = 50; + } } void RecalcAttack() diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index c2a417a0..2d5de392 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -170,9 +170,11 @@ void Player::Initialize() &xtimer_attacher); } if (room->IsNewBieBattle()) { + #if 0 GetAbility()->AddAttr(kHAT_vAttackRateSe, 5.0f); GetAbility()->AddAttr(kHAT_pDefendRateSe, 2.0f); - GetAbility()->AddAttr(kHAT_vHealthRateSe, 3.0f); + GetAbility()->AddAttr(kHAT_vHealthRateSe, 1.0f); + #endif } }