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

Core/Spells: Fix cloning spells

Browse Source 
Closes #1162
This commit is contained in:
ille
2011-04-08 23:16:57 +03:00
committed by Shocker
parent 5f4337f7e9
commit a2bcb9425c
2 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+5 -2
View File
@@ -3448,14 +3448,17 @@ void AuraEffect::HandleAuraCloneCaster(AuraApplication const * aurApp, uint8 mod
if (apply) if (apply)
{ {
Unit * caster = GetCaster(); Unit * caster = GetCaster();
if (!caster) if (!caster || caster == target)
return; return;
// Set display id (probably for portrait?) // What must be cloned? at least display and scale
target->SetDisplayId(caster->GetDisplayId()); target->SetDisplayId(caster->GetDisplayId());
target->SetCreatorGUID(caster->GetGUID());
//target->SetFloatValue(OBJECT_FIELD_SCALE_X, caster->GetFloatValue(OBJECT_FIELD_SCALE_X)); // we need retail info about how scaling is handled (aura maybe?)
target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_MIRROR_IMAGE); target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_MIRROR_IMAGE);
} }
else else
{ {
target->SetCreatorGUID(0);
target->SetDisplayId(target->GetNativeDisplayId()); target->SetDisplayId(target->GetNativeDisplayId());
target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_MIRROR_IMAGE); target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_MIRROR_IMAGE);
} }
src/server/game/Spells/SpellEffects.cpp
+45 -6
View File
@@ -4402,13 +4402,52 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
return; return;
} }
case 45204: // Clone Me! case 45204: // Clone Me!
case 41055: // Copy Weapon case 45785: // Sinister Reflection Clone
case 45206: // Copy Off-hand Weapon case 49889: // Mystery of the Infinite: Future You's Mirror Image Aura
unitTarget->CastSpell(m_caster, damage, false); case 50218: // The Cleansing: Your Inner Turmoil's Mirror Image Aura
case 51719: // Altar of Quetz'lun: Material You's Mirror Image Aura
case 57528: // Nightmare Figment Mirror Image
case 69828: // Halls of Reflection Clone
m_caster->CastSpell(unitTarget, damage, true);
break; break;
case 45205: // Copy Offhand Weapon case 41055: // Copy Weapon
case 41054: // Copy Weapon case 63416:
m_caster->CastSpell(unitTarget, damage, false); case 69891:
m_caster->CastSpell(unitTarget, damage, true);
if (unitTarget->GetTypeId() == TYPEID_PLAYER)
break;
if (m_caster->GetTypeId() == TYPEID_PLAYER)
{
if (Item * mainItem = m_caster->ToPlayer()->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND))
unitTarget->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, mainItem->GetEntry());
}
else
unitTarget->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, m_caster->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID));
break;
case 45206: // Copy Off-hand Weapon
case 69892:
m_caster->CastSpell(unitTarget, damage, true);
if (unitTarget->GetTypeId() == TYPEID_PLAYER)
break;
if (m_caster->GetTypeId() == TYPEID_PLAYER)
{
if (Item * offItem = m_caster->ToPlayer()->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
unitTarget->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, offItem->GetEntry());
}
else
unitTarget->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, m_caster->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1));
break;
case 57593: // Copy Ranged Weapon
m_caster->CastSpell(unitTarget, damage, true);
if (unitTarget->GetTypeId() == TYPEID_PLAYER)
break;
if (m_caster->GetTypeId() == TYPEID_PLAYER)
{
if (Item * rangedItem = m_caster->ToPlayer()->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED))
unitTarget->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, rangedItem->GetEntry());
}
else
unitTarget->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, m_caster->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2));
break; break;
case 55693: // Remove Collapsing Cave Aura case 55693: // Remove Collapsing Cave Aura
if (!unitTarget) if (!unitTarget)