[Cleanup] "equipped" not "equiped", "dual" not "duel". (#3149)

* [Cleanup] "equipped" not "equiped", "dual" not "duel".

# Notes
- These are spelled incorrectly.

* Update spdat.h

* Formatting further.

* Update api_service.cpp
This commit is contained in:
Alex King
2023-03-27 17:55:37 -04:00
committed by GitHub
parent 99f8e6cef5
commit 26c267db1b
15 changed files with 293 additions and 296 deletions
+55 -58
View File
@@ -131,36 +131,40 @@ Mob::Mob(
mMovementManager = &MobMovementManager::Get();
mMovementManager->AddMob(this);
targeted = 0;
targeted = 0;
currently_fleeing = false;
AI_Init();
SetMoving(false);
moved = false;
turning = false;
m_RewindLocation = glm::vec3();
moved = false;
turning = false;
m_RewindLocation = glm::vec3();
m_RelativePosition = glm::vec4();
name[0] = 0;
name[0] = 0;
orig_name[0] = 0;
clean_name[0] = 0;
lastname[0] = 0;
if (in_name) {
strn0cpy(name, in_name, 64);
strn0cpy(orig_name, in_name, 64);
}
if (in_lastname) {
strn0cpy(lastname, in_lastname, 64);
}
current_hp = in_cur_hp;
current_hp = in_cur_hp;
max_hp = in_max_hp;
base_hp = in_max_hp;
gender = in_gender;
race = in_race;
base_gender = in_gender;
base_race = in_race;
use_model = in_usemodel;
use_model = in_usemodel;
class_ = in_class;
bodytype = in_bodytype;
orig_bodytype = in_bodytype;
@@ -185,8 +189,7 @@ Mob::Mob(
fearspeed = 0.625f;
base_fearspeed = 25;
// npcs
}
else {
} else {
base_walkspeed = base_runspeed * 100 / 265;
walkspeed = ((float) base_walkspeed) * 0.025f;
base_fearspeed = base_runspeed * 100 / 127;
@@ -200,7 +203,6 @@ Mob::Mob(
m_PlayerState = 0;
// sanity check
if (runspeed < 0 || runspeed > 20) {
runspeed = 1.25f;
@@ -220,38 +222,33 @@ Mob::Mob(
feettexture = in_feettexture;
multitexture = (armtexture || bracertexture || handtexture || legtexture || feettexture);
haircolor = in_haircolor;
beardcolor = in_beardcolor;
eyecolor1 = in_eyecolor1;
eyecolor2 = in_eyecolor2;
hairstyle = in_hairstyle;
luclinface = in_luclinface;
beard = in_beard;
drakkin_heritage = in_drakkin_heritage;
drakkin_tattoo = in_drakkin_tattoo;
drakkin_details = in_drakkin_details;
attack_speed = 0;
attack_delay = 0;
slow_mitigation = 0;
findable = false;
trackable = true;
has_shieldequiped = false;
has_twohandbluntequiped = false;
has_twohanderequipped = false;
has_duelweaponsequiped = false;
can_facestab = false;
has_numhits = false;
has_MGB = false;
has_ProjectIllusion = false;
SpellPowerDistanceMod = 0;
last_los_check = false;
haircolor = in_haircolor;
beardcolor = in_beardcolor;
eyecolor1 = in_eyecolor1;
eyecolor2 = in_eyecolor2;
hairstyle = in_hairstyle;
luclinface = in_luclinface;
beard = in_beard;
drakkin_heritage = in_drakkin_heritage;
drakkin_tattoo = in_drakkin_tattoo;
drakkin_details = in_drakkin_details;
attack_speed = 0;
attack_delay = 0;
slow_mitigation = 0;
findable = false;
trackable = true;
has_shield_equipped = false;
has_two_hand_blunt_equipped = false;
has_two_hander_equipped = false;
has_dual_weapons_equipped = false;
can_facestab = false;
has_numhits = false;
has_MGB = false;
has_ProjectIllusion = false;
SpellPowerDistanceMod = 0;
last_los_check = false;
if (in_aa_title > 0) {
aa_title = in_aa_title;
}
else {
aa_title = 0xFF;
}
aa_title = in_aa_title > 0 ? in_aa_title : 0xFF;
AC = in_ac;
ATK = in_atk;
@@ -428,24 +425,24 @@ Mob::Mob(
permarooted = (runspeed > 0) ? false : true;
pause_timer_complete = false;
ForcedMovement = 0;
roamer = false;
rooted = false;
charmed = false;
ForcedMovement = 0;
roamer = false;
rooted = false;
charmed = false;
weaponstance.enabled = false;
weaponstance.spellbonus_enabled = false; //Set when bonus is applied
weaponstance.itembonus_enabled = false; //Set when bonus is applied
weaponstance.aabonus_enabled = false; //Controlled by function TogglePassiveAA
weaponstance.enabled = false;
weaponstance.spellbonus_enabled = false; //Set when bonus is applied
weaponstance.itembonus_enabled = false; //Set when bonus is applied
weaponstance.aabonus_enabled = false; //Controlled by function TogglePassiveAA
weaponstance.spellbonus_buff_spell_id = 0;
weaponstance.itembonus_buff_spell_id = 0;
weaponstance.aabonus_buff_spell_id = 0;
weaponstance.itembonus_buff_spell_id = 0;
weaponstance.aabonus_buff_spell_id = 0;
pStandingPetOrder = SPO_Follow;
pseudo_rooted = false;
nobuff_invisible = 0;
see_invis = 0;
see_invis = 0;
innate_see_invis = GetSeeInvisibleLevelFromNPCStat(in_see_invis);
see_invis_undead = GetSeeInvisibleLevelFromNPCStat(in_see_invis_undead);
@@ -492,19 +489,19 @@ Mob::Mob(
}
for (int i = 0; i < MAX_APPEARANCE_EFFECTS; i++) {
appearance_effects_id[i] = 0;
appearance_effects_id[i] = 0;
appearance_effects_slot[i] = 0;
}
emoteid = 0;
endur_upkeep = false;
degenerating_effects = false;
PrimaryAggro = false;
AssistAggro = false;
npc_assist_cap = 0;
PrimaryAggro = false;
AssistAggro = false;
npc_assist_cap = 0;
use_double_melee_round_dmg_bonus = false;
dw_same_delay = 0;
dw_same_delay = 0;
queue_wearchange_slot = -1;
@@ -7141,4 +7138,4 @@ int Mob::DispatchZoneControllerEvent(
}
return ret;
}
}