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

Core/DataStores: Fixed db2 structures after 7.3.5

Browse Source
This commit is contained in:
hondacrx
2018-03-13 15:43:03 -04:00
parent 2199e07955
commit 0ab3b8e8cd
97 changed files with 3139 additions and 1707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Reputation/ReputationManager.cs
+6 -6
View File
@@ -91,7 +91,7 @@ namespace Game
if (factionEntry == null)
return 0;
ulong raceMask = _player.getRaceMask();
long raceMask = _player.getRaceMask();
uint classMask = _player.getClassMask();
for (var i = 0; i < 4; i++)
{
@@ -149,7 +149,7 @@ namespace Game
if (factionEntry == null)
return 0;
ulong raceMask = _player.getRaceMask();
long raceMask = _player.getRaceMask();
uint classMask = _player.getClassMask();
for (int i = 0; i < 4; i++)
{
@@ -297,9 +297,9 @@ namespace Game
// check for sub-factions that receive spillover
var flist = Global.DB2Mgr.GetFactionTeamList(factionEntry.Id);
// if has no sub-factions, check for factions with same parent
if (flist == null && factionEntry.ParentFactionID != 0 && factionEntry.ParentFactionModOut != 0.0f)
if (flist == null && factionEntry.ParentFactionID != 0 && factionEntry.ParentFactionMod[1] != 0.0f)
{
spillOverRepOut *= factionEntry.ParentFactionModOut;
spillOverRepOut *= factionEntry.ParentFactionMod[1];
FactionRecord parent = CliDB.FactionStorage.LookupByKey(factionEntry.ParentFactionID);
if (parent != null)
{
@@ -323,9 +323,9 @@ namespace Game
FactionRecord factionEntryCalc = CliDB.FactionStorage.LookupByKey(id);
if (factionEntryCalc != null)
{
if (factionEntryCalc == factionEntry || GetRank(factionEntryCalc) > (ReputationRank)factionEntryCalc.ParentFactionCapIn)
if (factionEntryCalc == factionEntry || GetRank(factionEntryCalc) > (ReputationRank)factionEntryCalc.ParentFactionMod[0])
continue;
int spilloverRep = (int)(spillOverRepOut * factionEntryCalc.ParentFactionModIn);
int spilloverRep = (int)(spillOverRepOut * factionEntryCalc.ParentFactionMod[0]);
if (spilloverRep != 0 || !incremental)
res = SetOneFactionReputation(factionEntryCalc, spilloverRep, incremental);
}