josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix typos - i failed so hard :(

Browse Source
This commit is contained in:
joschiwald
2012-06-08 22:25:33 +02:00
parent 7e454b26ac
commit 8ab6d578ce
10 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/world/2012_05_28_01_world_spell_script_names.sql
+2 -2
View File
@@ -39,8 +39,8 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(28833, 'spell_four_horsemen_mark'),
(28834, 'spell_four_horsemen_mark'),
(28835, 'spell_four_horsemen_mark'),
(27831, 'spell_gothic_shadow_bolt_volley'),
(55638, 'spell_gothic_shadow_bolt_volley'),
(27831, 'spell_gothik_shadow_bolt_volley'),
(55638, 'spell_gothik_shadow_bolt_volley'),
(31447, 'spell_mark_of_kazrogal'),
(32960, 'spell_mark_of_kazzak'),
(33654, 'spell_gruul_shatter'),
sql/updates/world/2012_05_28_02_world_spelldifficulty_dbc.sql
+1 -1
View File
@@ -1,6 +1,6 @@
SET @DIFF := xxxx; -- set by TDB team
DELETE FROM `spelldifficulty_dbc` WHERE `id` BETWEEN @DIFF+0 AND @DIFF+2;
INSERT INTO `spelldifficulty_dbc` (`id`,`spelld0`,`spellid1`,`spelld2`,`spellid3`) VALUES
INSERT INTO `spelldifficulty_dbc` (`id`,`spellid0`,`spellid1`,`spellid2`,`spellid3`) VALUES
(@DIFF+0,50811,61547,0,0),
(@DIFF+1,57762,59990,0,0),
(@DIFF+2,57763,61489,0,0);
sql/updates/world/2012_05_28_03_world_conditions.sql
+1 -1
View File
@@ -1,5 +1,5 @@
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` IN (19938,30877);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
(17,0,19938,0,0,1,1,17743,0,0,0,0,'','Awaken Peon'),
(17,0,30877,0,0,31,1,3,17326,0,0,0,'','Tag Murloc');
src/server/game/Spells/Spell.cpp
+1 -20
View File
@@ -5297,29 +5297,10 @@ SpellCastResult Spell::CheckCast(bool strict)
}
}
for (int i = 0; i < MAX_SPELL_EFFECTS; i++)
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
{
switch (m_spellInfo->Effects[i].ApplyAuraName)
{
case SPELL_AURA_DUMMY:
{
//custom check
switch (m_spellInfo->Id)
{
case 44795: // Parachute
{
float x, y, z;
m_caster->GetPosition(x, y, z);
float ground_Z = m_caster->GetMap()->GetHeight(m_caster->GetPhaseMask(), x, y, z);
if (fabs(ground_Z - z) < 0.1f)
return SPELL_FAILED_DONT_REPORT;
break;
}
default:
break;
}
break;
}
case SPELL_AURA_MOD_POSSESS_PET:
{
if (m_caster->GetTypeId() != TYPEID_PLAYER)
src/server/game/Spells/SpellMgr.cpp
+4 -1
View File
@@ -2975,7 +2975,6 @@ void SpellMgr::LoadDbcDataCorrections()
spellInfo->EffectImplicitTargetB[0] = 0;
break;
case 63665: // Charge (Argent Tournament emote on riders)
case 31447: // Mark of Kaz'rogal (needs target selection script)
case 31298: // Sleep (needs target selection script)
case 51904: // Summon Ghouls On Scarlet Crusade (this should use conditions table, script for this spell needs to be fixed)
case 2895: // Wrath of Air Totem rank 1 (Aura)
@@ -3257,6 +3256,10 @@ void SpellMgr::LoadDbcDataCorrections()
case 53313: // Entangling Roots (Rank 8) -- Nature's Grasp Proc
spellInfo->CastingTimeIndex = 1;
break;
case 59414: // Pulsing Shockwave Aura (Loken)
// this flag breaks movement, remove it
spellInfo->AttributesEx &= ~SPELL_ATTR1_CHANNELED_1;
break;
case 61719: // Easter Lay Noblegarden Egg Aura - Interrupt flags copied from aura which this aura is linked with
spellInfo->AuraInterruptFlags = AURA_INTERRUPT_FLAG_HITBYSPELL | AURA_INTERRUPT_FLAG_TAKE_DAMAGE;
break;
src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+9 -7
View File
@@ -18,6 +18,8 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "SpellScript.h"
#include "GridNotifiers.h"
#include "CombatAI.h"
#include "naxxramas.h"
enum Yells
@@ -591,14 +593,14 @@ class mob_gothik_minion : public CreatureScript
}
};
class spell_gothic_shadow_bolt_volley : public SpellScriptLoader
class spell_gothik_shadow_bolt_volley : public SpellScriptLoader
{
public:
spell_gothic_shadow_bolt_volley() : SpellScriptLoader("spell_gothic_shadow_bolt_volley") { }
spell_gothik_shadow_bolt_volley() : SpellScriptLoader("spell_gothik_shadow_bolt_volley") { }
class spell_gothic_shadow_bolt_volley_SpellScript : public SpellScript
class spell_gothik_shadow_bolt_volley_SpellScript : public SpellScript
{
PrepareSpellScript(spell_gothic_shadow_bolt_volley_SpellScript);
PrepareSpellScript(spell_gothik_shadow_bolt_volley_SpellScript);
void FilterTargets(std::list<Unit*>& unitList)
{
@@ -607,13 +609,13 @@ class spell_gothic_shadow_bolt_volley : public SpellScriptLoader
void Register()
{
OnUnitTargetSelect += SpellUnitTargetFn(spell_gothic_shadow_bolt_volley_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnUnitTargetSelect += SpellUnitTargetFn(spell_gothik_shadow_bolt_volley_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
SpellScript* GetSpellScript() const
{
return new spell_gothic_shadow_bolt_volley_SpellScript();
return new spell_gothik_shadow_bolt_volley_SpellScript();
}
};
@@ -621,5 +623,5 @@ void AddSC_boss_gothik()
{
new boss_gothik();
new mob_gothik_minion();
new spell_gothic_shadow_bolt_volley();
new spell_gothik_shadow_bolt_volley();
}
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+5 -3
View File
@@ -19,7 +19,7 @@
/* ScriptData
SDName: Boss Loken
SD%Complete: 60%
SDComment: Missing intro. Aura is not working (59414)
SDComment: Missing intro.
SDCategory: Halls of Lightning
EndScriptData */
@@ -85,7 +85,7 @@ public:
{
m_uiArcLightning_Timer = 15000;
m_uiLightningNova_Timer = 20000;
m_uiResumePulsingShockwave_Timer = 15000;
m_uiResumePulsingShockwave_Timer = 1000;
m_uiHealthAmountModifier = 1;
@@ -112,7 +112,10 @@ public:
Talk(SAY_DEATH);
if (instance)
{
instance->SetData(TYPE_LOKEN, DONE);
instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_PULSING_SHOCKWAVE_AURA);
}
}
void KilledUnit(Unit* /*victim*/)
@@ -130,7 +133,6 @@ public:
{
if (m_uiResumePulsingShockwave_Timer <= uiDiff)
{
//breaks at movement, can we assume when it's time, this spell is casted and also must stop movement?
DoCast(me, SPELL_PULSING_SHOCKWAVE_AURA, true);
DoCast(me, SPELL_PULSING_SHOCKWAVE_N, true);
src/server/scripts/Spells/spell_druid.cpp
+4 -7
View File
@@ -388,7 +388,7 @@ class spell_dru_starfall_dummy : public SpellScriptLoader
void Register()
{
OnUnitTargetSelect += SpellUnitTargetFn(spell_dru_starfall_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnUnitTargetSelect += SpellUnitTargetFn(spell_dru_starfall_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_dru_starfall_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -549,8 +549,7 @@ class spell_dru_savage_roar : public SpellScriptLoader
void AfterApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
int32 bp0 = aurEff->GetAmount(); // todo: check if needed
target->CastCustomSpell(target, DRUID_SAVAGE_ROAR, &bp0, NULL, NULL, true, NULL, aurEff, GetCasterGUID());
target->CastSpell(target, DRUID_SAVAGE_ROAR, true, NULL, aurEff, GetCasterGUID());
}
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
@@ -560,9 +559,8 @@ class spell_dru_savage_roar : public SpellScriptLoader
void Register()
{
// todo: check AuraEffectHandleModes
AfterEffectApply += AuraEffectApplyFn(spell_dru_savage_roar_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_savage_roar_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
AfterEffectApply += AuraEffectApplyFn(spell_dru_savage_roar_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_savage_roar_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -626,7 +624,6 @@ class spell_dru_survival_instincts : public SpellScriptLoader
void Register()
{
// todo: check AuraEffectHandleModes
AfterEffectApply += AuraEffectApplyFn(spell_dru_survival_instincts_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_survival_instincts_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
}
src/server/scripts/Spells/spell_generic.cpp
+11 -6
View File
@@ -239,7 +239,7 @@ class spell_gen_parachute : public SpellScriptLoader
{
PrepareAuraScript(spell_gen_parachute_AuraScript);
bool Validate(SpellInfo const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellMgr->GetSpellInfo(SPELL_PARACHUTE) || !sSpellMgr->GetSpellInfo(SPELL_PARACHUTE_BUFF))
return false;
@@ -252,7 +252,12 @@ class spell_gen_parachute : public SpellScriptLoader
if (target->IsFalling())
{
target->RemoveAurasDueToSpell(SPELL_PARACHUTE);
target->CastSpell(target, SPELL_PARACHUTE_BUFF, true);
float x, y, z;
target->GetPosition(x, y, z);
float groundZ = target->GetMap()->GetHeight(target->GetPhaseMask(), x, y, z);
if (fabs(groundZ - z) > 0.1f)
target->CastSpell(target, SPELL_PARACHUTE_BUFF, true);
}
}
@@ -2864,6 +2869,8 @@ class spell_gen_summon_elemental : public SpellScriptLoader
enum Mounts
{
SPELL_COLD_WEATHER_FLYING = 54197,
// Magic Broom
SPELL_MAGIC_BROOM_60 = 42680,
SPELL_MAGIC_BROOM_100 = 42683,
@@ -2953,7 +2960,7 @@ class spell_gen_mount : public SpellScriptLoader
// Triggered spell id dependent on riding skill and zone
bool canFly = false;
uint32 vmap = GetVirtualMapForMapAndZone(target->GetMapId(), target->GetZoneId());
if (vmap == 530 || (vmap == 571 && target->HasSpell(54197)))
if (vmap == 530 || (vmap == 571 && target->HasSpell(SPELL_COLD_WEATHER_FLYING)))
canFly = true;
float x, y, z;
@@ -2998,9 +3005,7 @@ class spell_gen_mount : public SpellScriptLoader
if (mount)
{
// Prevent stacking of mounts and client crashes upon dismounting
//target->RemoveAurasByType(SPELL_AURA_MOUNTED, 0, GetHitAura());
PreventHitAura();
target->CastSpell(target, mount, true);
}
}
src/server/scripts/Spells/spell_shaman.cpp
+4 -4
View File
@@ -713,7 +713,7 @@ class spell_sha_sentry_totem : public SpellScriptLoader
{
PrepareAuraScript(spell_sha_sentry_totem_AuraScript);
bool Validate(SpellInfo const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellMgr->GetSpellInfo(SHAMAN_BIND_SIGHT))
return false;
@@ -732,9 +732,9 @@ class spell_sha_sentry_totem : public SpellScriptLoader
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (GetCaster)
if (Player* caster = GetCaster()->ToPlayer())
caster->StopCastingBindSight();
if (Unit* caster = GetCaster())
if (caster->GetTypeId() == TYPEID_PLAYER)
caster->ToPlayer()->StopCastingBindSight();
}
void Register()