pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-22 16:28:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Resolves issues with improper genders and textures on spells. (#1533)

Browse Source 
* [Bug Fix] Resolves issues with improper genders and textures on spells.
Spells will now properly understand their expected gender and texture.
Logic is based on what I saw in a stock PEQ database, can be adjusted if need be.
Any feedback is helpful.

* Made use of GetRaceGenderDefaultHeight() and added all races to their proper conditions.

* Formatting.
This commit is contained in:
Kinglykrab
2021-09-12 23:40:07 -04:00
committed by GitHub
parent 38a86edc70
commit 7b1b05a35c
2 changed files with 105 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spell_effects.cpp
+45 -29
View File
@@ -1445,37 +1445,53 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
}
// Racial Illusions
else {
SendIllusionPacket
(
spell.base[i],
Mob::GetDefaultGender(spell.base[i], GetGender()),
spell.base2[i],
spell.max[i]
auto gender_id = (
spell.max[i] > 0 &&
(
spell.max[i] != 3 ||
spell.base2[i] == 0
) ?
(spell.max[i] - 1) :
Mob::GetDefaultGender(spell.base[i], GetGender())
);
if(spell.base[i] == OGRE){
SendAppearancePacket(AT_Size, 9);
}
else if(spell.base[i] == TROLL){
SendAppearancePacket(AT_Size, 8);
}
else if(spell.base[i] == VAHSHIR || spell.base[i] == BARBARIAN){
SendAppearancePacket(AT_Size, 7);
}
else if(spell.base[i] == HALF_ELF || spell.base[i] == WOOD_ELF || spell.base[i] == DARK_ELF || spell.base[i] == FROGLOK){
SendAppearancePacket(AT_Size, 5);
}
else if(spell.base[i] == DWARF){
SendAppearancePacket(AT_Size, 4);
}
else if(spell.base[i] == HALFLING || spell.base[i] == GNOME){
SendAppearancePacket(AT_Size, 3);
}
else if(spell.base[i] == WOLF) {
SendAppearancePacket(AT_Size, 2);
}
else{
SendAppearancePacket(AT_Size, 6);
auto race_size = GetRaceGenderDefaultHeight(
spell.base[i],
gender_id
);
if (spell.max[i] > 0) {
if (spell.base2[i] == 0) {
SendIllusionPacket(
spell.base[i],
gender_id
);
} else {
if (spell.max[i] != 3) {
SendIllusionPacket(
spell.base[i],
gender_id,
spell.base2[i],
spell.max[i]
);
} else {
SendIllusionPacket(
spell.base[i],
gender_id,
spell.base2[i],
spell.base2[i]
);
}
}
} else {
SendIllusionPacket(
spell.base[i],
gender_id,
spell.base2[i],
spell.max[i]
);
}
SendAppearancePacket(AT_Size, race_size);
}
for (int x = EQ::textures::textureBegin; x <= EQ::textures::LastTintableTexture; x++) {