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

Misc fixes and DB updates

Browse Source
This commit is contained in:
hondacrx
2021-02-24 19:00:12 -05:00
parent ac4e96bad7
commit fc3ecd460a
9 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Spells/SpellAuraConst.cs
+1 -1
View File
@@ -350,7 +350,7 @@ namespace Framework.Constants
PhaseGroup = 326, // Phase Related
PhaseAlwaysVisible = 327, // NYI - sets PhaseShiftFlags::AlwaysVisible
TriggerSpellOnPowerPct = 328,
ModPowerGainPct = 329, // Nyi
ModPowerGainPct = 329,
CastWhileWalking = 330,
ForceWeather = 331,
OverrideActionbarSpells = 332,
Source/Game/Handlers/MiscHandler.cs
+5 -9
View File
@@ -821,19 +821,15 @@ namespace Game
AdventureJournalDataResponse response = new AdventureJournalDataResponse();
response.OnLevelUp = adventureJournalUpdateSuggestions.OnLevelUp;
int count = 0;
foreach (var adventureJournal in CliDB.AdventureJournalStorage.Values)
{
if (count >= 7)
break;
if (_player.MeetPlayerCondition(adventureJournal.PlayerConditionID))
{
AdventureJournalDataInfo dataInfo;
dataInfo.AdventureJournalID = (int)adventureJournal.Id;
dataInfo.Priority = adventureJournal.PriorityMax;
response.AdventureJournalDatas.Add(dataInfo);
count++;
AdventureJournalData adventureJournalData;
adventureJournalData.AdventureJournalID = (int)adventureJournal.Id;
adventureJournalData.Priority = adventureJournal.PriorityMax;
response.AdventureJournalDatas.Add(adventureJournalData);
}
}
Source/Game/Networking/Packets/MiscPackets.cs
+5 -5
View File
@@ -1366,15 +1366,15 @@ namespace Game.Networking.Packets
_worldPacket.WriteBit(OnLevelUp);
_worldPacket.FlushBits();
_worldPacket.WriteInt32(AdventureJournalDatas.Count);
foreach (var dataInfo in AdventureJournalDatas)
foreach (var adventureJournal in AdventureJournalDatas)
{
_worldPacket.WriteInt32(dataInfo.AdventureJournalID);
_worldPacket.WriteInt32(dataInfo.Priority);
_worldPacket.WriteInt32(adventureJournal.AdventureJournalID);
_worldPacket.WriteInt32(adventureJournal.Priority);
}
}
public bool OnLevelUp;
public List<AdventureJournalDataInfo> AdventureJournalDatas = new List<AdventureJournalDataInfo>();
public List<AdventureJournalData> AdventureJournalDatas = new List<AdventureJournalData>();
}
//Structs
@@ -1412,7 +1412,7 @@ namespace Game.Networking.Packets
public ObjectGuid PersonalGUID;
}
struct AdventureJournalDataInfo
struct AdventureJournalData
{
public int AdventureJournalID;
public int Priority;
Source/Game/Spells/SpellEffects.cs
-20
View File
@@ -214,26 +214,6 @@ namespace Game.Spells
}
break;
}
case SpellFamilyNames.Warlock:
{
break;
}
case SpellFamilyNames.Priest:
{
break;
}
case SpellFamilyNames.Druid:
{
// Ferocious Bite
if (m_caster.IsTypeId(TypeId.Player) && m_spellInfo.SpellFamilyFlags[3].HasAnyFlag(0x1000u))
{
// converts each extra point of energy ( up to 25 energy ) into additional damage
int energy = -(m_caster.ModifyPower(PowerType.Energy, -25));
// 25 energy = 100% more damage
MathFunctions.AddPct(ref damage, energy * 4);
}
break;
}
case SpellFamilyNames.Deathknight:
{
// Blood Boil - bonus for diseased targets