Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,720 Commits 4 Branches 146 Tags
3db9034f4c9bfe532cb2e32fa3abff01c94de3bf
Commit Graph

39720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
megamage
819326f286 *Update some instance script functions. 
--HG--
branch : trunk
 2009-05-16 14:49:30 -05:00
QAston
bb6e0dba89 *Fix lifebloom final heal coefficient - by nesocip 
*Fix aura immunity dispel for spells like Resurrection sickness
*Do not proc auras without spellfamilyflags required for totems.
*Allow more auras to be displayed in client.
*Fix some issues with Cut to the Chase.

--HG--
branch : trunk
 2009-05-16 20:23:56 +02:00
QAston
14daff6d38 *Change amount of passive auras if mod changed for them (this fixes Glyph of vigor apply/remove and some other spells) 
*Backfire damage from unstable affliction is applied to dispeller now
*Correct amount of improved Divine Spirit

--HG--
branch : trunk
 2009-05-16 17:59:36 +02:00
raczman
10ee81ef13 Moved most randomisation functions usage from static version into Map object. 
--HG--
branch : trunk
 2009-05-16 10:50:39 +02:00
Drahy
68a8c72041 * Used trinity sql coding style 
--HG--
branch : trunk
 2009-05-16 02:56:39 +02:00
megamage
9b4d3bf0af [7835] Store structures (with size = uint32) insteed pointer to structure in PetSpellMap. Author: VladimirMangos 
--HG--
branch : trunk
 2009-05-15 16:46:02 -05:00
megamage
f5af5ea9e3 [7834] Mangos string loading code cleanups. Author: VladimirMangos 
* Better integration creature event ai strings.
    * Not inclide in checks as expected max mangos strings range value to range

--HG--
branch : trunk
 2009-05-15 16:41:36 -05:00
megamage
15c78a728e *Skip Mangos ([7833] Implement levelup spells for non-hunter pets. Author: VladimirMangos) 
--HG--
branch : trunk
 2009-05-15 16:36:59 -05:00
megamage
834580f6b2 *Move some Trinity-only functions to the end of file. 
--HG--
branch : trunk
 2009-05-15 16:26:00 -05:00
megamage
5732b8c170 *Remove an unused file. 
--HG--
branch : trunk
 2009-05-15 16:08:28 -05:00
raczman
c66877019e Added MTRand object to Map class. 
This is first step of getting rid of static MTRandTSS object.

--HG--
branch : trunk
 2009-05-15 22:41:13 +02:00
megamage
03cfacb361 *Fix a crash caused by eventai. 
--HG--
branch : trunk
 2009-05-15 14:23:05 -05:00
megamage
c64c834c50 *Fix build. 
--HG--
branch : trunk
 2009-05-15 14:10:31 -05:00
raczman
5d78a9c6bd merge. 
--HG--
branch : trunk
 2009-05-15 21:06:58 +02:00
raczman
ad552d272d Another two memory leaks. 
--HG--
branch : trunk
 2009-05-15 21:06:23 +02:00
megamage
ff7f023ff1 *Merge. 
--HG--
branch : trunk
 2009-05-15 13:57:10 -05:00
megamage
e826b482a5 *Skip not needed tc1 patches 
--HG--
branch : trunk
 2009-05-15 13:53:32 -05:00
megamage
0f3506e90a *Remove not needed TC1 sql. 
--HG--
branch : trunk
 2009-05-15 13:51:58 -05:00
megamage
9f31ecbdec *Skip all unused TC1 revs. 
--HG--
branch : trunk
 2009-05-15 13:50:30 -05:00
megamage
c15bae5871 [7832] Better check at petcreateinfo_spell loading for errors and redundend data. Author: VladimirMangos 
--HG--
branch : trunk
 2009-05-15 13:45:34 -05:00
megamage
a442a9b914 [7831] Prevent have hunter pet with level greater player levels at level changes. Propertly set hunter pet xp values at level update. Author: VladimirMangos 
--HG--
branch : trunk
 2009-05-15 13:44:49 -05:00
megamage
0d715cfd8f *remove UNIT_FLAG2_FORCE_MOVE when loading players. This fix the bug that players cannot stop moving forward. By Bulkin. 
--HG--
branch : trunk
 2009-05-15 13:39:48 -05:00
QAston
4b782ccc1d *Blizzlike calculation of skill required to cast judgement-like spells. 
--HG--
branch : trunk
 2009-05-15 19:40:45 +02:00
X-Savior
f1fd3ad040 *Update some spell/script sql data 
--HG--
branch : trunk
 2009-05-15 19:01:56 +02:00
QAston
02bc76455a *Fix build. 
--HG--
branch : trunk
 2009-05-15 18:30:34 +02:00
QAston
d81352b421 *Allow hots to proc 
--HG--
branch : trunk
 2009-05-15 16:59:27 +02:00
QAston
4a20e22af3 *Do not proc relentless strikes with slice and dice twice 
*Fix trap radius calculation in some cases-by krz

--HG--
branch : trunk
 2009-05-15 16:51:26 +02:00
QAston
ab195a1031 *Add sqls for latest commit. 
--HG--
branch : trunk
 2009-05-15 18:09:44 +02:00
BroodWyrm
b5b9f28117 *Rewrite Moroes Script to fix reset bug 
--HG--
branch : trunk
 2009-05-15 16:38:48 +02:00
QAston
47d5fc51c5 *Item enchancment/proc patch - original code by Thenecromancer 
-void Player::CastItemCombatSpell(Item *item,Unit* Target, WeaponAttackType attType)
-{
-    if(!item || item->IsBroken())
-        return;
-
-    ItemPrototype const *proto = item->GetProto();
-    if(!proto)
-        return;
+void Player::CastItemCombatSpell(Item *item, CalcDamageInfo *damageInfo, ItemPrototype const * proto)
+{
+    Unit * Target = damageInfo->target;
+    WeaponAttackType attType = damageInfo->attackType;

     if (!Target || Target == this )
         return;

-    for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
-    {
-        _Spell const& spellData = proto->Spells[i];
-
-        // no spell
-        if(!spellData.SpellId )
-            continue;
-
-        // wrong triggering type
-        if(spellData.SpellTrigger != ITEM_SPELLTRIGGER_CHANCE_ON_HIT)
-            continue;
-
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellData.SpellId);
-        if(!spellInfo)
-        {
-            sLog.outError("WORLD: unknown Item spellid %i", spellData.SpellId);
-            continue;
-        }
-
-        // not allow proc extra attack spell at extra attack
-        if( m_extraAttacks && IsSpellHaveEffect(spellInfo,SPELL_EFFECT_ADD_EXTRA_ATTACKS) )
-            return;
-
-        float chance = spellInfo->procChance;
-
-        if(spellData.SpellPPMRate)
-        {
-            uint32 WeaponSpeed = GetAttackTime(attType);
-            chance = GetPPMProcChance(WeaponSpeed, spellData.SpellPPMRate, spellInfo);
-        }
-        else if(chance > 100.0f)
-        {
-            chance = GetWeaponProcChance();
-        }
-
-        if (roll_chance_f(chance))
-            CastSpell(Target, spellInfo->Id, true, item);
+    // Can do effect if any damage done to target
+    if (damageInfo->damage)
+    {
+        for (int i = 0; i < 5; i++)
+        {
+            _Spell const& spellData = proto->Spells[i];
+
+            // no spell
+            if(!spellData.SpellId )
+                continue;
+
+            // wrong triggering type
+            if(spellData.SpellTrigger != ITEM_SPELLTRIGGER_CHANCE_ON_HIT)
+                continue;
+
+            SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellData.SpellId);
+            if(!spellInfo)
+            {
+                sLog.outError("WORLD: unknown Item spellid %i", spellData.SpellId);
+                continue;
+            }
+
+            // not allow proc extra attack spell at extra attack
+            if( m_extraAttacks && IsSpellHaveEffect(spellInfo,SPELL_EFFECT_ADD_EXTRA_ATTACKS) )
+                return;
+
+            float chance = spellInfo->procChance;
+
+            if(spellData.SpellPPMRate)
+            {
+                uint32 WeaponSpeed = GetAttackTime(attType);
+                chance = GetPPMProcChance(WeaponSpeed, spellData.SpellPPMRate, spellInfo);
+            }
+            else if(chance > 100.0f)
+            {
+                chance = GetWeaponProcChance();
+            }
+
+            if (roll_chance_f(chance))
+                CastSpell(Target, spellInfo->Id, true, item);
+        }
     }

     // item combat enchantments
@@ -6993,6 +6993,21 @@
             if(pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL)
                 continue;

+            SpellEnchantProcEntry const* entry =  spellmgr.GetSpellEnchantProcEvent(enchant_id);
+
+            if (entry && entry->procEx)
+            {
+                // Check hit/crit/dodge/parry requirement
+                if((entry->procEx & damageInfo->procEx) == 0)
+                    continue;
+            }
+            else
+            {
+                // Can do effect if any damage done to target
+                if (!(damageInfo->damage))
+                    continue;
+            }
+
             SpellEntry const *spellInfo = sSpellStore.LookupEntry(pEnchant->spellid[s]);
             if (!spellInfo)
             {
@@ -7001,6 +7016,18 @@
             }

             float chance = pEnchant->amount[s] != 0 ? float(pEnchant->amount[s]) : GetWeaponProcChance();
+
+            if (entry && entry->PPMChance)
+            {
+                uint32 WeaponSpeed = GetAttackTime(attType);
+                chance = GetPPMProcChance(WeaponSpeed, entry->PPMChance, spellInfo);
+            }
+            else if (entry && entry->customChance)
+                chance = entry->customChance;
+
+            // Apply spell mods
+            ApplySpellMod(pEnchant->spellid[s],SPELLMOD_CHANCE_OF_SUCCESS,chance);
+
             if (roll_chance_f(chance))
             {
                 if(IsPositiveSpell(pEnchant->spellid[s]))
@@ -7012,6 +7039,7 @@
     }
 }

+
 void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 cast_count, uint32 glyphIndex)
 {
     ItemPrototype const* proto = item->GetProto();

--HG--
branch : trunk
 2009-05-15 16:37:22 +02:00
QAston
a796012723 *Merge some fixes from tc1 
--HG--
branch : trunk
 2009-05-15 18:00:50 +02:00
Anubisss
ad92f5e210 *Fix Glyph of Ice Block. 
*Thanks QAston for the help in the SpellFamilyMask.

--HG--
branch : trunk
 2009-05-15 17:58:06 +02:00
Anubisss
e6cd40a619 *Implement GetSpellCooldowns() for get m_spellCooldowns(Player's map of spell CDs). 
--HG--
branch : trunk
 2009-05-15 17:54:10 +02:00
BroodWyrm
7549076a38 *Rewrite Moroes Script to fix reset bug 
--HG--
branch : trunk
 2009-05-15 16:52:59 +02:00
QAston
ae461a4158 *Fix Cheat Death. 
--HG--
branch : trunk
 2009-05-15 15:33:23 +02:00
raczman
419c448bc9 Fix one forgotten memory leak. 
--HG--
branch : trunk
 2009-05-14 23:48:41 +02:00
Genars & Aokromes
80a6d723f5 New server options to block adding GMs to friends by players and to block inviting GMs to parties 
--HG--
branch : trunk
 2009-05-14 23:07:17 +02:00
Genars & Aokromes
854e791c2f New server options to block adding GMs to friends by players and to block inviting GMs to parties 
--HG--
branch : trunk
 2009-05-14 23:07:17 +02:00
megamage
662dbb9744 *Fix a typo that cause crash. Thanks to Drahy. 
--HG--
branch : trunk
 2009-05-14 20:02:10 -05:00
megamage
c50e1fc4b6 *Merge. 
--HG--
branch : trunk
 2009-05-14 16:52:01 -05:00
megamage
047cc95388 *Add some distance check functions. By VladimirMangos. 
--HG--
branch : trunk
 2009-05-14 16:50:47 -05:00
Drahy
baa7545346 * Finally updated world_spell_full (contains spell_linked_spell, spell_script_target, spell_required and spell_proc_event) 
* Please everyone to add patches also to full sqls in the future

--HG--
branch : trunk
 2009-05-14 22:57:47 +02:00
megamage
811eee356d [7825] Fixed typo in comment and var. name. Author: BombermaG 
--HG--
branch : trunk
 2009-05-14 15:38:20 -05:00
megamage
5823e2c471 [7824] Implement use ArmorDamageModifier bonus for armor Author: DiSlord 
--HG--
branch : trunk
 2009-05-14 15:37:56 -05:00
megamage
1390440f14 [7823] Fix ScalingStatValue field size in item_template table. Author: DiSlord 
--HG--
branch : trunk
 2009-05-14 15:37:28 -05:00
megamage
9831dab114 [7822] Avoid declined names form show in case disabled config option with russian client at non-russian realm. Author: Foks 
--HG--
branch : trunk
 2009-05-14 11:59:15 -05:00
megamage
d3839aaaf0 [7821] Fixed typo in comment and var. name. Author: KAPATEJIb 
--HG--
branch : trunk
 2009-05-14 11:58:35 -05:00
megamage
c6407a8b4c [7820] Fixed typo in [7819] that not allow correct work non-scalling item stats. Author: VladimirMangos 
--HG--
branch : trunk
 2009-05-14 11:58:01 -05:00
megamage
43b84c7b07 Code style and cleanups in item equip checks. Author: VladimirMangos 
--HG--
branch : trunk
 2009-05-14 11:57:25 -05:00
megamage
8782d2d31a [7819] Correct use item ScalingStatValues data (ScalingStatValues.dbc): Author: DiSlord 
- ScalingStatDistribution stats multiplier
     - Armor bonus from ssv
     - Damage from ssv
     - Feral AP from ssv
     - Feral AP from ssv dps bonus
    Use item->StatsCount in apply mods
    Not allow equip item if level > ScalingStatDistribution->maxlevel field

    TODO find more info about ScalingStatValuesEntry->spellBonus

--HG--
branch : trunk
 2009-05-14 11:56:51 -05:00