Misc fixes and DB updates
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
-- Attach druid's gore spell script
|
||||
DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_dru_skull_bash');
|
||||
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
|
||||
(106839, 'spell_dru_skull_bash');
|
||||
@@ -0,0 +1,4 @@
|
||||
-- Attach ferocious bite script
|
||||
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dru_ferocious_bite';
|
||||
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
|
||||
(22568,'spell_dru_ferocious_bite');
|
||||
@@ -0,0 +1,11 @@
|
||||
-- Add SL maps to tele locations
|
||||
SET @TELE_START_ID = 1683;
|
||||
|
||||
DELETE FROM `game_tele` WHERE `id` BETWEEN @TELE_START_ID+0 AND @TELE_START_ID+5;
|
||||
INSERT INTO `game_tele` (`id`,`position_x`,`position_y`,`position_z`,`orientation`,`map`,`name`) VALUES
|
||||
(@TELE_START_ID+0,2583,-2521,3308,0,2222,'Maldraxxus'),
|
||||
(@TELE_START_ID+1,-2943,-4871,6705,0,2222,'Bastion'),
|
||||
(@TELE_START_ID+2,-6926,883,5669,0,2222,'Ardenweald'),
|
||||
(@TELE_START_ID+3,-2628,6036,4116,0,2222,'Revendreth'),
|
||||
(@TELE_START_ID+4,4611,6796,4869,2,2222,'TheMaw'),
|
||||
(@TELE_START_ID+5,-1834,1542,5275,4.712388,2222,'Oribos');
|
||||
@@ -0,0 +1,11 @@
|
||||
-- Remove old unused spell scripts
|
||||
DELETE FROM `spell_script_names` WHERE `ScriptName` IN
|
||||
('spell_pal_aura_mastery',
|
||||
'spell_pal_aura_mastery_immune',
|
||||
'spell_pal_avenging_wrath',
|
||||
'spell_pal_exorcism_and_holy_wrath_damage',
|
||||
'spell_pal_eye_for_an_eye',
|
||||
'spell_pal_righteous_defense',
|
||||
'spell_pal_sacred_shield',
|
||||
'spell_pal_shield_of_the_righteous',
|
||||
'spell_pal_seal_of_righteousness');
|
||||
@@ -0,0 +1,2 @@
|
||||
-- Delete initial Hunter Pet creation spells
|
||||
DELETE FROM `playercreateinfo_cast_spell` WHERE `spell` IN (79597,79598,79593,79602,79600,79603,79599,79595,79594,79601,79596,153724);
|
||||
Reference in New Issue
Block a user