diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp    
index fda8ae5..f686d01 100644    
--- a/src/game/SpellEffects.cpp    
+++ b/src/game/SpellEffects.cpp    
@@ -757,15 +757,16 @@ void Spell::EffectDummy(uint32 i)    
                         if (m_caster->GetTypeId() != TYPEID_PLAYER)    
                             return;    
         
-                    uint32 spell_id = 0;    
-                    switch(urand(1,2))    
+                    uint32 display_id = 0;    
+                    switch(urand(1,5))    
                         {    
-                        // Flip Out - ninja    
-                        case 1: spell_id = (m_caster->getGender() == GENDER_MALE ? 8219 : 8220); break;    
-                        // Yaaarrrr - pirate    
-                        case 2: spell_id = (m_caster->getGender() == GENDER_MALE ? 8221 : 8222); break;    
+                        case 1: display_id = (((Player*)m_caster)->GetTeam() == ALLIANCE ? 729 : 7102); break;    
+                        case 2: display_id = (((Player*)m_caster)->GetTeam() == ALLIANCE ? 203 : 8010); break;    
+                        case 3: display_id = (((Player*)m_caster)->GetTeam() == ALLIANCE ? 736 : 11689); break;    
+                        case 4: display_id = (((Player*)m_caster)->GetTeam() == ALLIANCE ? 522 : 18968); break;    
+                        case 5: display_id = (((Player*)m_caster)->GetTeam() == ALLIANCE ? 524 : 20016); break;    
                         }    
-                    m_caster->CastSpell(m_caster,spell_id,true,NULL);    
+                    m_caster->SetDisplayId(display_id);    
                         return;    
                     }    
                     case 8593:                    // Symbol of life (restore creature to life)

REPLACE INTO `game_event` (`entry`, `start_time`, `end_time`, `occurence`, `length`, `holiday`, `description`) VALUES (999, '2009-09-15 19:00:00', '2010-12-31 05:00:00', 43200, 1440, 0, 'Cataclysm');    
DELETE FROM `game_event_creature` WHERE `event` = 999;    
DELETE FROM `game_event_gameobject` WHERE `event` = 999;    
REPLACE INTO `item_template` (`entry`, `class`, `subclass`, `unk0`, `name`, `displayid`, `Quality`, `Flags`, `BuyCount`, `BuyPrice`, `SellPrice`, `InventoryType`, `AllowableClass`, `AllowableRace`, `ItemLevel`, `RequiredLevel`, `RequiredSkill`, `RequiredSkillRank`, `requiredspell`, `requiredhonorrank`, `RequiredCityRank`, `RequiredReputationFaction`, `RequiredReputationRank`, `maxcount`, `stackable`, `ContainerSlots`, `StatsCount`, `stat_type1`, `stat_value1`, `stat_type2`, `stat_value2`, `stat_type3`, `stat_value3`, `stat_type4`, `stat_value4`, `stat_type5`, `stat_value5`, `stat_type6`, `stat_value6`, `stat_type7`, `stat_value7`, `stat_type8`, `stat_value8`, `stat_type9`, `stat_value9`, `stat_type10`, `stat_value10`, `ScalingStatDistribution`, `ScalingStatValue`, `dmg_min1`, `dmg_max1`, `dmg_type1`, `dmg_min2`, `dmg_max2`, `dmg_type2`, `armor`, `holy_res`, `fire_res`, `nature_res`, `frost_res`, `shadow_res`, `arcane_res`, `delay`, `ammo_type`, `RangedModRange`, `spellid_1`, `spelltrigger_1`, `spellcharges_1`, `spellppmRate_1`, `spellcooldown_1`, `spellcategory_1`, `spellcategorycooldown_1`, `spellid_2`, `spelltrigger_2`, `spellcharges_2`, `spellppmRate_2`, `spellcooldown_2`, `spellcategory_2`, `spellcategorycooldown_2`, `spellid_3`, `spelltrigger_3`, `spellcharges_3`, `spellppmRate_3`, `spellcooldown_3`, `spellcategory_3`, `spellcategorycooldown_3`, `spellid_4`, `spelltrigger_4`, `spellcharges_4`, `spellppmRate_4`, `spellcooldown_4`, `spellcategory_4`, `spellcategorycooldown_4`, `spellid_5`, `spelltrigger_5`, `spellcharges_5`, `spellppmRate_5`, `spellcooldown_5`, `spellcategory_5`, `spellcategorycooldown_5`, `bonding`, `description`, `PageText`, `LanguageID`, `PageMaterial`, `startquest`, `lockid`, `Material`, `sheath`, `RandomProperty`, `RandomSuffix`, `block`, `itemset`, `MaxDurability`, `area`, `Map`, `BagFamily`, `TotemCategory`, `socketColor_1`, `socketContent_1`, `socketColor_2`, `socketContent_2`, `socketColor_3`, `socketContent_3`, `socketBonus`, `GemProperties`, `RequiredDisenchantSkill`, `ArmorDamageModifier`, `Duration`, `ItemLimitCategory`, `HolidayId`, `ScriptName`, `DisenchantID`, `FoodType`, `minMoneyLoot`, `maxMoneyLoot`) VALUES (999999, 4, 0, 0, 'Cataclysm', 18059, 1, 65600, 1, 0, 0, 0, -1, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8213, 0, 0, 0, 3600, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, -1, 1, '', 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 86400, 0, 0, '', 0, 0, 0, 0);    
REPLACE INTO `creature_template` (`entry`, `heroic_entry`, `modelid_A`, `modelid_A2`, `modelid_H`, `modelid_H2`, `name`, `subname`, `IconName`, `minlevel`, `maxlevel`, `minhealth`, `maxhealth`, `minmana`, `maxmana`, `armor`, `faction_A`, `faction_H`, `npcflag`, `speed`, `scale`, `rank`, `mindmg`, `maxdmg`, `dmgschool`, `attackpower`, `baseattacktime`, `rangeattacktime`, `unit_flags`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `minrangedmg`, `maxrangedmg`, `rangedattackpower`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `spell1`, `spell2`, `spell3`, `spell4`, `PetSpellDataId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `InhabitType`, `unk16`, `unk17`, `RacialLeader`, `RegenHealth`, `equipment_id`, `mechanic_immune_mask`, `flags_extra`, `ScriptName`) VALUES (999998, 0, 20016, 0, 1314, 0, 'Goblins', '', 'Cataclysm', 85, 85, 10000, 10000, 0, 0, 1187, 35, 35, 4225, 1.08, 1, 0, 29, 43, 0, 11, 1500, 1500, 4608, 0, 0, 0, 0, 23, 34, 9, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EventAI', 0, 1, 1.05, 1, 0, 1, 196, 0, 2, '');    
REPLACE INTO `creature_template` (`entry`, `heroic_entry`, `modelid_A`, `modelid_A2`, `modelid_H`, `modelid_H2`, `name`, `subname`, `IconName`, `minlevel`, `maxlevel`, `minhealth`, `maxhealth`, `minmana`, `maxmana`, `armor`, `faction_A`, `faction_H`, `npcflag`, `speed`, `scale`, `rank`, `mindmg`, `maxdmg`, `dmgschool`, `attackpower`, `baseattacktime`, `rangeattacktime`, `unit_flags`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `minrangedmg`, `maxrangedmg`, `rangedattackpower`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `spell1`, `spell2`, `spell3`, `spell4`, `PetSpellDataId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `InhabitType`, `unk16`, `unk17`, `RacialLeader`, `RegenHealth`, `equipment_id`, `mechanic_immune_mask`, `flags_extra`, `ScriptName`) VALUES (999997, 0, 524, 0, 1314, 0, 'Worgen', '', 'Cataclysm', 85, 85, 10000, 10000, 0, 0, 1187, 35, 35, 4225, 1.08, 1, 0, 29, 43, 0, 11, 1500, 1500, 4608, 0, 0, 0, 0, 23, 34, 9, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EventAI', 0, 1, 1.05, 1, 0, 1, 196, 0, 2, '');    
DELETE FROM `npc_vendor` WHERE (`entry`=999997);    
INSERT INTO `npc_vendor` (entry, item, maxcount, incrtime, ExtendedCost) VALUES     
(999997, 999999, 0, 0, 0);    
DELETE FROM `npc_vendor` WHERE (`entry`=999998);    
INSERT INTO `npc_vendor` (entry, item, maxcount, incrtime, ExtendedCost) VALUES     
(999998, 999999, 0, 0, 0);    
DELETE FROM `creature` WHERE `id`=999998;    
INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`sp    awndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`) VALUES    
(6701453, 999998, 1, 1, 1, 0, 196, 1619.84, -4392.85, 10.5175, 4.15812, 25, 0, 0, 10000, 0, 0, 0),    
(6701454, 999998, 1, 1, 1, 0, 196, -1098.71, -4.26405, 140.992, 5.75488, 25, 0, 0, 10000, 0, 0, 0),    
(6701459, 999998, 0, 1, 1, 0, 196, 1602.48, 232.369, -52.151, 4.73172, 25, 0, 0, 10000, 0, 0, 0),    
(6701548, 999998, 571, 1, 1, 0, 196, 5800.83, 633.665, 647.52, 4.01845, 25, 0, 0, 10000, 0, 0, 0);    
DELETE FROM `creature` WHERE `id`=999997;    
INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`sp    awndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`) VALUES    
(6701450, 999997, 0, 1, 1, 0, 196, -8827.07, 628.567, 94.0457, 3.941, 25, 0, 0, 10000, 0, 0, 0),    
(6701451, 999997, 0, 1, 1, 0, 196, -4911.63, -977.133, 501.446, 2.2414, 25, 0, 0, 10000, 0, 0, 0),    
(6701452, 999997, 1, 1, 1, 0, 196, 9947.84, 2495.28, 1317.45, 4.36834, 25, 0, 0, 10000, 0, 0, 0),    
(6701460, 999997, 530, 1, 1, 0, 196, -1871.86, 5425.08, -10.4634, 3.64905, 25, 0, 0, 10000, 0, 0, 0);    

REPLACE INTO game_event_creature VALUES (6701453,999);    
REPLACE INTO game_event_creature VALUES (6701454,999);    
REPLACE INTO game_event_creature VALUES (6701459,999);    
REPLACE INTO game_event_creature VALUES (6701548,999);    
REPLACE INTO game_event_creature VALUES (6701450,999);    
REPLACE INTO game_event_creature VALUES (6701451,999);    
REPLACE INTO game_event_creature VALUES (6701452,999);    
REPLACE INTO game_event_creature VALUES (6701460,999);