Scripts/Spells: Ultrasafe Transporter: Toshley's Station (#23537)

* Scripts/Spells: Ultrasafe Transporter: Toshley's Station

* Rename 9999_99_99_99_world.sql to 2019_06_29_01_world.sql

3 files changed, 69 insertions, 53 deletions

diff --git a/sql/updates/world/3.3.5/2019_06_29_01_world.sql b/sql/updates/world/3.3.5/2019_06_29_01_world.sql
new file mode 100644
index 00000000000..7e5afdfc8e0
--- /dev/null
+++ b/sql/updates/world/3.3.5/2019_06_29_01_world.sql
@@ -0,0 +1,2 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_ultrasafe_transporter';
+INSERT INTO `spell_script_names` VALUES (36941,'spell_item_ultrasafe_transporter');
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index b916528e5f6..cef576371d1 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -1080,51 +1080,6 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/)
             }
             return;
         }
-        // Ultrasafe Transporter: Toshley's Station
-        case 36941:
-        {
-            if (roll_chance_i(50))                        // 50% success
-            {
-                int32 rand_eff = urand(1, 7);
-                switch (rand_eff)
-                {
-                    case 1:
-                        // soul split - evil
-                        m_caster->CastSpell(m_caster, 36900, true);
-                        break;
-                    case 2:
-                        // soul split - good
-                        m_caster->CastSpell(m_caster, 36901, true);
-                        break;
-                    case 3:
-                        // Increase the size
-                        m_caster->CastSpell(m_caster, 36895, true);
-                        break;
-                    case 4:
-                        // Decrease the size
-                        m_caster->CastSpell(m_caster, 36893, true);
-                        break;
-                    case 5:
-                    // Transform
-                    {
-                        if (m_caster->ToPlayer()->GetTeam() == ALLIANCE)
-                            m_caster->CastSpell(m_caster, 36897, true);
-                        else
-                            m_caster->CastSpell(m_caster, 36899, true);
-                        break;
-                    }
-                    case 6:
-                        // chicken
-                        m_caster->CastSpell(m_caster, 36940, true);
-                        break;
-                    case 7:
-                        // evil twin
-                        m_caster->CastSpell(m_caster, 23445, true);
-                        break;
-                }
-            }
-            return;
-        }
     }
 }
 
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index df563075c72..2ffeecfbc6d 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -1720,16 +1720,74 @@ class spell_item_scroll_of_recall : public SpellScript
     }
 };
 
-// 36890 - Dimensional Ripper - Area 52
-enum DimensionalRipperArea52
+enum TransporterSpells
+{
+    SPELL_EVIL_TWIN                         = 23445,
+    SPELL_TRANSPORTER_MALFUNCTION_SMALLER   = 36893,
+    SPELL_TRANSPORTER_MALFUNCTION_BIGGER    = 36895,
+    SPELL_TRANSPORTER_MALFUNCTION_CHICKEN   = 36940,
+    SPELL_TRANSFORM_HORDE                   = 36897,
+    SPELL_TRANSFORM_ALLIANCE                = 36899,
+    SPELL_SOUL_SPLIT_EVIL                   = 36900,
+    SPELL_SOUL_SPLIT_GOOD                   = 36901
+};
+
+// 36941 - Ultrasafe Transporter: Toshley's Station
+class spell_item_ultrasafe_transporter : public SpellScript
 {
-    SPELL_TRANSPORTER_MALFUNCTION    = 36895,
-    SPELL_TRANSFORM_HORDE            = 36897,
-    SPELL_TRANSFORM_ALLIANCE         = 36899,
-    SPELL_SOUL_SPLIT_EVIL            = 36900,
-    SPELL_SOUL_SPLIT_GOOD            = 36901
+    PrepareSpellScript(spell_item_ultrasafe_transporter);
+
+    bool Load() override
+    {
+        return GetCaster()->GetTypeId() == TYPEID_PLAYER;
+    }
+
+    void HandleScript(SpellEffIndex /* effIndex */)
+    {
+        if (!roll_chance_i(50)) // 50% success
+            return;
+
+        Unit* caster = GetCaster();
+
+        uint32 spellId = 0;
+        switch (urand(0, 6))
+        {
+            case 0:
+                spellId = SPELL_TRANSPORTER_MALFUNCTION_SMALLER;
+                break;
+            case 1:
+                spellId = SPELL_TRANSPORTER_MALFUNCTION_BIGGER;
+                break;
+            case 2:
+                spellId = SPELL_SOUL_SPLIT_EVIL;
+                break;
+            case 3:
+                spellId = SPELL_SOUL_SPLIT_GOOD;
+                break;
+            case 4:
+                if (caster->ToPlayer()->GetTeamId() == TEAM_ALLIANCE)
+                    spellId = SPELL_TRANSFORM_HORDE;
+                else
+                    spellId = SPELL_TRANSFORM_ALLIANCE;
+                break;
+            case 5:
+                spellId = SPELL_TRANSPORTER_MALFUNCTION_CHICKEN;
+                break;
+            case 6:
+                spellId = SPELL_EVIL_TWIN;
+                break;
+        }
+
+        caster->CastSpell(caster, spellId, true);
+    }
+
+    void Register() override
+    {
+        OnEffectHitTarget += SpellEffectFn(spell_item_ultrasafe_transporter::HandleScript, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS);
+    }
 };
 
+// 36890 - Dimensional Ripper - Area 52
 class spell_item_dimensional_ripper_area52 : public SpellScript
 {
     PrepareSpellScript(spell_item_dimensional_ripper_area52);
@@ -1750,7 +1808,7 @@ class spell_item_dimensional_ripper_area52 : public SpellScript
         switch (urand(0, 3))
         {
             case 0:
-                spellId = SPELL_TRANSPORTER_MALFUNCTION;
+                spellId = SPELL_TRANSPORTER_MALFUNCTION_BIGGER;
                 break;
             case 1:
                 spellId = SPELL_SOUL_SPLIT_EVIL;
@@ -4124,6 +4182,7 @@ void AddSC_item_spell_scripts()
     RegisterAuraScript(spell_item_power_circle);
     RegisterSpellScript(spell_item_savory_deviate_delight);
     RegisterSpellScript(spell_item_scroll_of_recall);
+    RegisterSpellScript(spell_item_ultrasafe_transporter);
     RegisterSpellScript(spell_item_dimensional_ripper_area52);
     RegisterAuraScript(spell_item_unsated_craving);
     RegisterAuraScript(spell_item_shadows_fate);