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

Misc Fixes

Browse Source
This commit is contained in:
hondacrx
2017-10-04 12:32:33 -04:00
parent 911e039571
commit e45c13a8dc
8 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/DataStorage/DB2Manager.cs
+1 -1
View File
@@ -499,7 +499,7 @@ namespace Game.DataStorage
public string GetBroadcastTextValue(BroadcastTextRecord broadcastText, LocaleConstant locale = LocaleConstant.enUS, Gender gender = Gender.Male, bool forceGender = false)
{
if (gender == Gender.Female && (forceGender || broadcastText.FemaleText.HasString(SharedConst.DefaultLocale)))
if ((gender == Gender.Female || gender == Gender.None) && (forceGender || broadcastText.FemaleText.HasString(SharedConst.DefaultLocale)))
{
if (broadcastText.FemaleText.HasString(locale))
return broadcastText.FemaleText[locale];
Game/DataStorage/Structs/F_Records.cs
+1
View File
@@ -98,5 +98,6 @@ namespace Game.DataStorage
return EnemyMask == 0 && FriendMask == 0;
}
public bool IsContestedGuardFaction() { return Flags.HasAnyFlag((ushort)FactionTemplateFlags.ContestedGuard); }
public bool ShouldSparAttack() { return Flags.HasAnyFlag((ushort)FactionTemplateFlags.EnemySpar); }
}
}