aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--THANKS10
-rw-r--r--src/game/CreatureAISelector.cpp12
-rw-r--r--src/game/SpellEffects.cpp8
3 files changed, 17 insertions, 13 deletions
diff --git a/THANKS b/THANKS
index 840a818d3f9..0e3f4f83242 100644
--- a/THANKS
+++ b/THANKS
@@ -56,4 +56,12 @@ fukifat, imbecile, Nafsih, Meldanor, Turok, Naturamen, Themris, Sundark,
Azuritus, jotapdiez, EnderGT, Curuad, oc_redfox, rockzOr, Darkshines,
BlackYoghurt, McLovin, Gyullo, kaxap, Hawthorne, nanouniko, new001, Opterman,
Typhoon, Cleave, HiZed, The_Game_Master, Athor, Veras, Menia, Jolan, BlackOne,
-johnholiver, Spp, Drevi, kb_z.
+johnholiver, Spp, Drevi, kb_z, Tartalo, Shendor, Demonx, Taliesin, defacer,
+SoulForge, Jackpoz, Cass, QuaLiT1, exul182, sunwell, AniRB, clotza, Tommassino,
+dracula70, alexsot, RedSonja, Cnillidan, Proofzor, aqs999, Sony, amsjunior123,
+Sisif, Joshh, alex_1983, arez, RammboNr5, Insider, bodompelle, lobuz, Azazel,
+footman, elron103, make_the_king, destros, MetaphysicalDrama, disassebler,
+Malcrom, Vladmimír Lipták, retriman, hyriuu, Smakapotatis, PainKiller,
+bkhorizon, n0n4m3, Chesterfield, Frankir, Wowka321, Morpheux, p0wer,
+Ouden, toshik, laise, yavi, Splinter, Syntec, Arthas, denyde, unholy,
+Vaughner, blackmanos, edrinn.
diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp
index 83975c0fc7d..4421eef7ee2 100644
--- a/src/game/CreatureAISelector.cpp
+++ b/src/game/CreatureAISelector.cpp
@@ -75,18 +75,6 @@ namespace FactorySelector
ai_factory = ai_registry.GetRegistryItem("CritterAI");
}
- if(!ai_factory)
- {
- for (uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i)
- {
- if(creature->m_spells[i])
- {
- ai_factory = ai_registry.GetRegistryItem("CombatAI");
- break;
- }
- }
- }
-
// select by permit check
if(!ai_factory)
{
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index b579cb198af..fdfe43ecab6 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -5686,6 +5686,14 @@ void Spell::EffectScriptEffect(uint32 effIndex)
unitTarget->CastSpell(unitTarget,67729,false); //Explode
break;
}
+ case 66545: //Summon Memory
+ {
+ uint8 uiRandom = urand(0,25);
+ uint32 uiSpells[26] = {66704,66705,66706,66707,66709,66710,66711,66712,66713,66714,66715,66708,66708,66691,66692,66694,66695,66696,66697,66698,66699,66700,66701,66702,66703,66543};
+
+ m_caster->CastSpell(m_caster,uiSpells[uiRandom],true);
+ break;
+ }
}
break;
}