Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

SQL: Rename SQL after recent PR merge

Browse Source
This commit is contained in:
Vincent-Michael
2014-09-06 03:09:33 +02:00
parent 123b6199c2
commit 76f1d5f221
3 changed files with 51 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
sql/updates/world/2014_XX_XX_XX_trinity_string.sql → sql/updates/world/2014_09_06_02_trinity_string.sql
View File

46
src/server/game/Entities/Player/Player.cpp
View File

@@ -5887,32 +5887,30 @@ float Player::OCTRegenMPPerSpirit()
void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply)
{
float oldRating = m_baseRatingValue[cr];
m_baseRatingValue[cr]+=(apply ? value : -value);
m_baseRatingValue[cr] += (apply ? value : -value);
// explicit affected values
if (cr == CR_HASTE_MELEE || cr == CR_HASTE_RANGED || cr == CR_HASTE_SPELL)
float const mult = GetRatingMultiplier(cr);
float const oldVal = oldRating * mult;
float const newVal = m_baseRatingValue[cr] * mult;
switch (cr)
{
float const mult = GetRatingMultiplier(cr);
float const oldVal = oldRating * mult;
float const newVal = m_baseRatingValue[cr] * mult;
switch (cr)
{
case CR_HASTE_MELEE:
ApplyAttackTimePercentMod(BASE_ATTACK, oldVal, false);
ApplyAttackTimePercentMod(OFF_ATTACK, oldVal, false);
ApplyAttackTimePercentMod(BASE_ATTACK, newVal, true);
ApplyAttackTimePercentMod(OFF_ATTACK, newVal, true);
break;
case CR_HASTE_RANGED:
ApplyAttackTimePercentMod(RANGED_ATTACK, oldVal, false);
ApplyAttackTimePercentMod(RANGED_ATTACK, newVal, true);
break;
case CR_HASTE_SPELL:
ApplyCastTimePercentMod(oldVal, false);
ApplyCastTimePercentMod(newVal, true);
break;
default: // shut up compiler warnings
break;
}
case CR_HASTE_MELEE:
ApplyAttackTimePercentMod(BASE_ATTACK, oldVal, false);
ApplyAttackTimePercentMod(OFF_ATTACK, oldVal, false);
ApplyAttackTimePercentMod(BASE_ATTACK, newVal, true);
ApplyAttackTimePercentMod(OFF_ATTACK, newVal, true);
break;
case CR_HASTE_RANGED:
ApplyAttackTimePercentMod(RANGED_ATTACK, oldVal, false);
ApplyAttackTimePercentMod(RANGED_ATTACK, newVal, true);
break;
case CR_HASTE_SPELL:
ApplyCastTimePercentMod(oldVal, false);
ApplyCastTimePercentMod(newVal, true);
break;
default:
break;
}
UpdateRating(cr);

63
src/server/scripts/Events/childrens_week.cpp
View File

@@ -27,7 +27,7 @@ enum Orphans
ORPHAN_BLOOD_ELF = 22817,
ORPHAN_DRAENEI = 22818,
ORPHAN_HUMAN = 14305,
ORPHAN_ORCISH = 14444,
ORPHAN_ORCISH = 14444
};
enum Texts
@@ -68,7 +68,7 @@ enum Texts
TEXT_ELDER_KEKEK_1 = 1,
TEXT_ALEXSTRASZA_2 = 2,
TEXT_KRASUS_8 = 8,
TEXT_KRASUS_8 = 8
};
enum Quests
@@ -99,7 +99,7 @@ enum Quests
QUEST_NOW_WHEN_I_GROW_UP = 11975,
QUEST_HOME_OF_THE_BEAR_MEN = 13930,
QUEST_THE_DRAGON_QUEEN_ORACLE = 13954,
QUEST_THE_DRAGON_QUEEN_WOLVAR = 13955,
QUEST_THE_DRAGON_QUEEN_WOLVAR = 13955
};
enum Areatriggers
@@ -120,7 +120,7 @@ enum Areatriggers
NPC_SPOREGGAR_CW_TRIGGER = 22829,
NPC_THRONE_OF_ELEMENTS_CW_TRIGGER = 22839,
NPC_SILVERMOON_01_CW_TRIGGER = 22866,
NPC_KRASUS = 27990,
NPC_KRASUS = 27990
};
enum Misc
@@ -128,7 +128,7 @@ enum Misc
SPELL_SNOWBALL = 21343,
SPELL_ORPHAN_OUT = 58818,
DISPLAY_INVISIBLE = 11686,
DISPLAY_INVISIBLE = 11686
};
uint64 getOrphanGUID(Player* player, uint32 orphan)
@@ -163,13 +163,12 @@ class npc_winterfin_playmate : public CreatureScript
orphanGUID = 0;
}
void Reset()
void Reset() override
{
Initialize();
}
void MoveInLineOfSight(Unit* who) override
{
if (!phase && who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -182,7 +181,7 @@ class npc_winterfin_playmate : public CreatureScript
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -241,7 +240,7 @@ class npc_winterfin_playmate : public CreatureScript
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_winterfin_playmateAI(creature);
}
@@ -270,7 +269,7 @@ class npc_snowfall_glade_playmate : public CreatureScript
orphanGUID = 0;
}
void Reset()
void Reset() override
{
Initialize();
}
@@ -289,7 +288,7 @@ class npc_snowfall_glade_playmate : public CreatureScript
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -347,7 +346,7 @@ class npc_snowfall_glade_playmate : public CreatureScript
uint64 orphanGUID;
};
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_snowfall_glade_playmateAI(pCreature);
}
@@ -377,7 +376,7 @@ class npc_the_biggest_tree : public CreatureScript
orphanGUID = 0;
}
void Reset()
void Reset() override
{
Initialize();
}
@@ -395,7 +394,7 @@ class npc_the_biggest_tree : public CreatureScript
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -442,7 +441,7 @@ class npc_the_biggest_tree : public CreatureScript
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_the_biggest_treeAI(creature);
}
@@ -471,7 +470,7 @@ class npc_high_oracle_soo_roo : public CreatureScript
orphanGUID = 0;
}
void Reset()
void Reset() override
{
Initialize();
}
@@ -490,7 +489,7 @@ class npc_high_oracle_soo_roo : public CreatureScript
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -539,7 +538,7 @@ class npc_high_oracle_soo_roo : public CreatureScript
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_high_oracle_soo_rooAI(creature);
}
@@ -568,13 +567,12 @@ class npc_elder_kekek : public CreatureScript
orphanGUID = 0;
}
void Reset()
void Reset() override
{
Initialize();
}
void MoveInLineOfSight(Unit* who) override
{
if (!phase && who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -587,7 +585,7 @@ class npc_elder_kekek : public CreatureScript
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -635,7 +633,7 @@ class npc_elder_kekek : public CreatureScript
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_elder_kekekAI(creature);
}
@@ -665,7 +663,7 @@ class npc_the_etymidian : public CreatureScript
orphanGUID = 0;
}
void Reset()
void Reset() override
{
Initialize();
}
@@ -683,7 +681,7 @@ class npc_the_etymidian : public CreatureScript
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -739,7 +737,7 @@ class npc_the_etymidian : public CreatureScript
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_the_etymidianAI(creature);
}
@@ -768,7 +766,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript
orphanGUID = 0;
}
void Reset()
void Reset() override
{
Initialize();
}
@@ -791,7 +789,6 @@ class npc_alexstraza_the_lifebinder : public CreatureScript
}
void MoveInLineOfSight(Unit* who) override
{
if (!phase && who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -813,7 +810,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!phase)
return;
@@ -908,7 +905,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_alexstraza_the_lifebinderAI(creature);
}
@@ -923,7 +920,7 @@ class at_bring_your_orphan_to : public AreaTriggerScript
public:
at_bring_your_orphan_to() : AreaTriggerScript("at_bring_your_orphan_to") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* trigger)
bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) override
{
if (player->isDead() || !player->HasAura(SPELL_ORPHAN_OUT))
return false;
@@ -986,7 +983,6 @@ class npc_cw_area_trigger : public CreatureScript
}
void MoveInLineOfSight(Unit* who) override
{
if (who && me->GetDistance2d(who) < 20.0f)
if (Player* player = who->ToPlayer())
@@ -1061,7 +1057,7 @@ class npc_cw_area_trigger : public CreatureScript
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_cw_area_triggerAI(creature);
}
@@ -1083,7 +1079,6 @@ class npc_grizzlemaw_cw_trigger : public CreatureScript
}
void MoveInLineOfSight(Unit* who) override
{
if (who && who->GetDistance2d(me) < 10.0f)
if (Player* player = who->ToPlayer())
@@ -1096,7 +1091,7 @@ class npc_grizzlemaw_cw_trigger : public CreatureScript
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_grizzlemaw_cw_triggerAI(creature);
}