aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarpten <vertozor@gmail.com>2015-05-15 15:57:03 +0200
committerWarpten <vertozor@gmail.com>2015-05-15 15:57:03 +0200
commit7a5bc9e1fe457f0c77cdfecefa5bd42525105c3e (patch)
treee8e957eff11983c8bec371cef16125ca61f86a79
parent1447875cac0fefd58ae3ad27e6b3fa2134a714c0 (diff)
Scripts/RubySanctum: Fix a mathematical mistake.
SQL: Do not use MAX(Id), hardcode it.
-rw-r--r--sql/updates/world/2015_05_15_00_world.sql5
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp6
2 files changed, 5 insertions, 6 deletions
diff --git a/sql/updates/world/2015_05_15_00_world.sql b/sql/updates/world/2015_05_15_00_world.sql
index 3c96f23c970..37e28807fec 100644
--- a/sql/updates/world/2015_05_15_00_world.sql
+++ b/sql/updates/world/2015_05_15_00_world.sql
@@ -5,10 +5,9 @@ INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(75880, "spell_halion_spawn_living_embers");
DELETE FROM `spelleffect_dbc` WHERE `EffectSpellId` IN (75880, 75881);
-SET @MaxEffectEntry := (SELECT MAX(Id) + 1 FROM `spelleffect_dbc`);
INSERT INTO `spelleffect_dbc` (`Id`, `EffectSpellId`, `EffectIndex`, `Effect`, `EffectImplicitTargetA`, `EffectImplicitTargetB`, `EffectRadiusIndex`, `EffectRadiusIndexMax`, `EffectMiscValue`, `EffectMiscValueB`) VALUES
-(@MaxEffectEntry + 0, 75880, 0, 77, 22, 7, 12, 12, 0, 0),
-(@MaxEffectEntry + 1, 75881, 0, 28, 18, 0, 12, 12, 40055, 64);
+(155915, 75880, 0, 77, 22, 7, 12, 12, 0, 0),
+(155916, 75881, 0, 28, 18, 0, 12, 12, 40055, 64);
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=75880;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index 840de70c22a..bc719c7701b 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -1009,9 +1009,9 @@ class npc_meteor_strike_initial : public CreatureScript
float randomAdjustment = frand(static_cast<float>(M_PI / 14), static_cast<float>(13 * M_PI / 14));
float angle[4];
angle[0] = me->GetAngle(ownerPos);
- angle[1] = angle[0] - randomAdjustment;
- angle[2] = angle[0] + randomAdjustment;
- angle[3] = angle[0] - static_cast<float>(M_PI);
+ angle[1] = angle[0] + randomAdjustment;
+ angle[2] = angle[0] + static_cast<float>(M_PI);
+ angle[3] = angle[2] + randomAdjustment;
_meteorList.clear();
for (uint8 i = 0; i < 4; i++)