Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Player: add helper methods GetNativeGender/SetNativeGender/SetGender

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/27886c7f5d6cfc221ea67aab210f96859d725e05)
This commit is contained in:
hondacrx
2021-12-26 19:51:26 -05:00
parent 39dd51370f
commit 6d73a59f63
23 changed files with 69 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Spells/Generic.cs
+3 -3
View File
@@ -758,7 +758,7 @@ namespace Scripts.Spells.Generic
Unit target = GetTarget();
if (target.IsTypeId(TypeId.Player))
{
if (target.GetGender() == Gender.Male)
if (target.GetNativeGender() == Gender.Male)
target.SetDisplayId(ModelIds.GoblinMale);
else
target.SetDisplayId(ModelIds.GoblinFemale);
@@ -1348,7 +1348,7 @@ namespace Scripts.Spells.Generic
Player player = GetHitPlayer();
if (player)
{
Gender gender = player.GetGender();
Gender gender = player.GetNativeGender();
uint spellId = GetSpellInfo().Id;
switch (spellId)
@@ -2240,7 +2240,7 @@ namespace Scripts.Spells.Generic
Player target = GetHitPlayer();
if (target)
{
Gender gender = target.GetGender();
Gender gender = target.GetNativeGender();
if (gender == Gender.Male)
caster.CastSpell(target, SpellIds.OrcDisguiseMale, true);
else
Source/Scripts/Spells/Holiday.cs
+2 -2
View File
@@ -233,7 +233,7 @@ namespace Scripts.Spells.Holiday
Player target = GetHitPlayer();
if (target)
{
Gender gender = target.GetGender();
Gender gender = target.GetNativeGender();
uint spellId = SpellIds.TrickBuff;
switch (RandomHelper.URand(0, 5))
{
@@ -327,7 +327,7 @@ namespace Scripts.Spells.Holiday
Unit target = GetHitUnit();
uint spellId;
bool female = target.GetGender() == Gender.Female;
bool female = target.GetNativeGender() == Gender.Female;
switch (GetSpellInfo().Id)
{
Source/Scripts/Spells/Items.cs
+3 -3
View File
@@ -1739,9 +1739,9 @@ namespace Scripts.Spells.Items
switch (RandomHelper.URand(1, 2))
{
// Flip Out - ninja
case 1: spellId = (caster.GetGender() == Gender.Male ? SpellIds.FlipOutMale : SpellIds.FlipOutFemale); break;
case 1: spellId = (caster.GetNativeGender() == Gender.Male ? SpellIds.FlipOutMale : SpellIds.FlipOutFemale); break;
// Yaaarrrr - pirate
case 2: spellId = (caster.GetGender() == Gender.Male ? SpellIds.YaaarrrrMale : SpellIds.YaaarrrrFemale); break;
case 2: spellId = (caster.GetNativeGender() == Gender.Male ? SpellIds.YaaarrrrMale : SpellIds.YaaarrrrFemale); break;
}
caster.CastSpell(caster, spellId, true);
}
@@ -3186,7 +3186,7 @@ namespace Scripts.Spells.Items
if (target)
{
target.HandleEmoteCommand(Emote.OneshotTrain);
EmotesTextSoundRecord soundEntry = Global.DB2Mgr.GetTextSoundEmoteFor((uint)TextEmotes.Train, target.GetRace(), target.GetGender(), target.GetClass());
EmotesTextSoundRecord soundEntry = Global.DB2Mgr.GetTextSoundEmoteFor((uint)TextEmotes.Train, target.GetRace(), target.GetNativeGender(), target.GetClass());
if (soundEntry != null)
target.PlayDistanceSound(soundEntry.SoundId);
}
Source/Scripts/Spells/Quest.cs
+1 -1
View File
@@ -820,7 +820,7 @@ namespace Scripts.Spells.Quest
Player target = GetHitPlayer();
if (target)
{
target.CastSpell(target, target.GetGender() == Gender.Male ? SpellIds.MaleDisguise : SpellIds.FemaleDisguise, true);
target.CastSpell(target, target.GetNativeGender() == Gender.Male ? SpellIds.MaleDisguise : SpellIds.FemaleDisguise, true);
target.CastSpell(target, SpellIds.GenericDisguise, true);
}
}
Source/Scripts/World/GameObject.cs
+1 -1
View File
@@ -914,7 +914,7 @@ namespace Scripts.World.GameObjects
Creature target = ScriptedAI.GetClosestCreatureWithEntry(player, CreatureIds.OuthouseBunny, 3.0f);
if (target)
{
target.GetAI().SetData(1, (uint)player.GetGender());
target.GetAI().SetData(1, (uint)player.GetNativeGender());
me.CastSpell(target, SpellIds.IndisposedIii);
}
me.CastSpell(player, SpellIds.Indisposed);