pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 10:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Post merge adjustments

Browse Source
This commit is contained in:
Akkadius 2018-12-17 01:51:43 -06:00
parent 0681e6dbb2
commit 07ab96b883
1 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
zone/mob.cpp
View File

@ -40,81 +40,82 @@ extern EntityList entity_list;
extern Zone* zone; extern Zone* zone;
extern WorldServer worldserver; extern WorldServer worldserver;
Mob::Mob(const char* in_name, Mob::Mob(
const char* in_lastname, const char *in_name,
int32 in_cur_hp, const char *in_lastname,
int32 in_max_hp, int32 in_cur_hp,
uint8 in_gender, int32 in_max_hp,
uint16 in_race, uint8 in_gender,
uint8 in_class, uint16 in_race,
bodyType in_bodytype, uint8 in_class,
uint8 in_deity, bodyType in_bodytype,
uint8 in_level, uint8 in_deity,
uint32 in_npctype_id, uint8 in_level,
float in_size, uint32 in_npctype_id,
float in_runspeed, float in_size,
const glm::vec4& position, float in_runspeed,
uint8 in_light, const glm::vec4 &position,
uint8 in_texture, uint8 in_light,
uint8 in_helmtexture, uint8 in_texture,
uint16 in_ac, uint8 in_helmtexture,
uint16 in_atk, uint16 in_ac,
uint16 in_str, uint16 in_atk,
uint16 in_sta, uint16 in_str,
uint16 in_dex, uint16 in_sta,
uint16 in_agi, uint16 in_dex,
uint16 in_int, uint16 in_agi,
uint16 in_wis, uint16 in_int,
uint16 in_cha, uint16 in_wis,
uint8 in_haircolor, uint16 in_cha,
uint8 in_beardcolor, uint8 in_haircolor,
uint8 in_eyecolor1, // the eyecolors always seem to be the same, maybe left and right eye? uint8 in_beardcolor,
uint8 in_eyecolor2, uint8 in_eyecolor1, // the eyecolors always seem to be the same, maybe left and right eye?
uint8 in_hairstyle, uint8 in_eyecolor2,
uint8 in_luclinface, uint8 in_hairstyle,
uint8 in_beard, uint8 in_luclinface,
uint32 in_drakkin_heritage, uint8 in_beard,
uint32 in_drakkin_tattoo, uint32 in_drakkin_heritage,
uint32 in_drakkin_details, uint32 in_drakkin_tattoo,
EQEmu::TintProfile in_armor_tint, uint32 in_drakkin_details,
uint8 in_aa_title, EQEmu::TintProfile in_armor_tint,
uint8 in_see_invis, // see through invis/ivu uint8 in_aa_title,
uint8 in_see_invis_undead, uint8 in_see_invis, // see through invis/ivu
uint8 in_see_hide, uint8 in_see_invis_undead,
uint8 in_see_improved_hide, uint8 in_see_hide,
int32 in_hp_regen, uint8 in_see_improved_hide,
int32 in_mana_regen, int32 in_hp_regen,
uint8 in_qglobal, int32 in_mana_regen,
uint8 in_maxlevel, uint8 in_qglobal,
uint32 in_scalerate, uint8 in_maxlevel,
uint8 in_armtexture, uint32 in_scalerate,
uint8 in_bracertexture, uint8 in_armtexture,
uint8 in_handtexture, uint8 in_bracertexture,
uint8 in_legtexture, uint8 in_handtexture,
uint8 in_feettexture uint8 in_legtexture,
) : uint8 in_feettexture
attack_timer(2000), ) :
attack_dw_timer(2000), attack_timer(2000),
ranged_timer(2000), attack_dw_timer(2000),
tic_timer(6000), ranged_timer(2000),
mana_timer(2000), tic_timer(6000),
spellend_timer(0), mana_timer(2000),
rewind_timer(30000), spellend_timer(0),
bindwound_timer(10000), rewind_timer(30000),
stunned_timer(0), bindwound_timer(10000),
spun_timer(0), stunned_timer(0),
bardsong_timer(6000), spun_timer(0),
gravity_timer(1000), bardsong_timer(6000),
viral_timer(0), gravity_timer(1000),
m_FearWalkTarget(-999999.0f, -999999.0f, -999999.0f), viral_timer(0),
flee_timer(FLEE_CHECK_TIMER), m_FearWalkTarget(-999999.0f, -999999.0f, -999999.0f),
m_Position(position), flee_timer(FLEE_CHECK_TIMER),
tmHidden(-1), m_Position(position),
mitigation_ac(0), tmHidden(-1),
m_specialattacks(eSpecialAttacks::None), mitigation_ac(0),
attack_anim_timer(1000), m_specialattacks(eSpecialAttacks::None),
position_update_melee_push_timer(500), attack_anim_timer(1000),
hate_list_cleanup_timer(6000) position_update_melee_push_timer(500),
hate_list_cleanup_timer(6000)
{ {
mMovementManager = &MobMovementManager::Get(); mMovementManager = &MobMovementManager::Get();
mMovementManager->AddMob(this); mMovementManager->AddMob(this);
@ -122,8 +123,6 @@ Mob::Mob(const char* in_name,
targeted = 0; targeted = 0;
currently_fleeing = false; currently_fleeing = false;
currently_fleeing = false;
AI_Init(); AI_Init();
SetMoving(false); SetMoving(false);
moved = false; moved = false;
@ -161,6 +160,7 @@ Mob::Mob(const char* in_name,
// neotokyo: sanity check // neotokyo: sanity check
if (runspeed < 0 || runspeed > 20) { if (runspeed < 0 || runspeed > 20) {
runspeed = 1.25f; runspeed = 1.25f;
}
// clients -- todo movement this doesn't take into account gm speed we need to fix that. // clients -- todo movement this doesn't take into account gm speed we need to fix that.
@ -393,7 +393,7 @@ Mob::Mob(const char* in_name,
rooted = false; rooted = false;
charmed = false; charmed = false;
has_virus = false; has_virus = false;
for (i = 0; i < MAX_SPELL_TRIGGER * 2; i++) { for (int i = 0; i < MAX_SPELL_TRIGGER * 2; i++) {
viral_spells[i] = 0; viral_spells[i] = 0;
} }