diff options
author | offl <offl@users.noreply.github.com> | 2021-08-31 23:51:35 +0300 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-03-14 23:51:23 +0100 |
commit | 94840f791c49e35b4e80e3cbff3158c4edca6704 (patch) | |
tree | 2f2852987da8bffd3662c8a0b1fc987aaa009b9e /src | |
parent | 318e0e24066fc89a1d07a993fc19a5a9dd3a6fd4 (diff) |
DB/GameObject: Update Toy Train Set
(cherry picked from commit fd9d04062c129049a134768ec15d09402c3fa95a)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 43 | ||||
-rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 2 |
2 files changed, 0 insertions, 45 deletions
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 0d337e8d798..bb5f8fe4629 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -26,7 +26,6 @@ go_tele_to_violet_stand go_soulwell go_amberpine_outhouse go_veil_skith_cage -go_toy_train_set go_bells EndContentData */ @@ -681,47 +680,6 @@ public: } }; -enum ToyTrainSpells -{ - SPELL_TOY_TRAIN_PULSE = 61551, -}; - -class go_toy_train_set : public GameObjectScript -{ - public: - go_toy_train_set() : GameObjectScript("go_toy_train_set") { } - - struct go_toy_train_setAI : public GameObjectAI - { - go_toy_train_setAI(GameObject* go) : GameObjectAI(go), _pulseTimer(3 * IN_MILLISECONDS) { } - - void UpdateAI(uint32 diff) override - { - if (diff < _pulseTimer) - _pulseTimer -= diff; - else - { - me->CastSpell(nullptr, SPELL_TOY_TRAIN_PULSE, true); - _pulseTimer = 6 * IN_MILLISECONDS; - } - } - - // triggered on wrecker'd - void DoAction(int32 /*action*/) override - { - me->Delete(); - } - - private: - uint32 _pulseTimer; - }; - - GameObjectAI* GetAI(GameObject* go) const override - { - return new go_toy_train_setAI(go); - } -}; - /*#### ## go_brewfest_music ####*/ @@ -1240,7 +1198,6 @@ void AddSC_go_scripts() new go_frostblade_shrine(); new go_midsummer_bonfire(); new go_midsummer_ribbon_pole(); - new go_toy_train_set(); new go_brewfest_music(); new go_midsummer_music(); new go_darkmoon_faire_music(); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index e62d7cdcdf6..2458f9f171d 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2113,7 +2113,6 @@ enum TrainWrecker GO_TOY_TRAIN = 193963, SPELL_TOY_TRAIN_PULSE = 61551, SPELL_WRECK_TRAIN = 62943, - ACTION_WRECKED = 1, EVENT_DO_JUMP = 1, EVENT_DO_FACING = 2, EVENT_DO_WRECK = 3, @@ -2189,7 +2188,6 @@ class npc_train_wrecker : public CreatureScript if (GameObject* target = VerifyTarget()) { me->CastSpell(target, SPELL_WRECK_TRAIN, false); - target->AI()->DoAction(ACTION_WRECKED); _timer = 2 * IN_MILLISECONDS; _nextAction = EVENT_DO_DANCE; } |