Skip to content

Commit 3af67a7

Browse files
committed
[3058] Revert [3056]. It can be handled by DB
Thanks to @NeatElves
1 parent faddf52 commit 3af67a7

4 files changed

Lines changed: 1 addition & 30 deletions

File tree

scripts/world/go_scripts.cpp

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ go_tele_to_violet_stand
3131
go_andorhal_tower
3232
go_scourge_enclosure
3333
go_lab_work_reagents
34-
go_cat_figurine
3534
EndContentData */
3635

3736
#include "precompiled.h"
@@ -316,27 +315,6 @@ bool GOUse_go_lab_work_reagents(Player* pPlayer, GameObject* pGo)
316315
return false;
317316
}
318317

319-
/*######
320-
## go_cat_figurine
321-
######*/
322-
323-
enum
324-
{
325-
SPELL_SUMMON_GHOST_SABER = 5968,
326-
};
327-
328-
bool GOUse_go_cat_figurine(Player* pPlayer, GameObject* pGo)
329-
{
330-
if (roll_chance_i(5))
331-
{
332-
pPlayer->CastSpell(pPlayer, SPELL_SUMMON_GHOST_SABER, true, NULL, NULL, pGo->GetObjectGuid());
333-
pGo->SetLootState(GO_JUST_DEACTIVATED);
334-
return true;
335-
}
336-
337-
return false;
338-
}
339-
340318
void AddSC_go_scripts()
341319
{
342320
Script* pNewScript;
@@ -390,9 +368,4 @@ void AddSC_go_scripts()
390368
pNewScript->Name = "go_lab_work_reagents";
391369
pNewScript->pGOUse = &GOUse_go_lab_work_reagents;
392370
pNewScript->RegisterSelf();
393-
394-
pNewScript = new Script;
395-
pNewScript->Name = "go_cat_figurine";
396-
pNewScript->pGOUse = &GOUse_go_cat_figurine;
397-
pNewScript->RegisterSelf();
398371
}

sd2_revision_nr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#ifndef __SD2_REVISION_NR_H__
22
#define __SD2_REVISION_NR_H__
3-
#define SD2_REVISION_NR "3057"
3+
#define SD2_REVISION_NR "3058"
44
#endif // __SD2_REVISION_NR_H__

sql/mangos_scriptname_full.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ UPDATE gameobject_template SET ScriptName='go_andorhal_tower' WHERE entry IN (17
119119
UPDATE gameobject_template SET ScriptName='go_scourge_enclosure' WHERE entry=191548;
120120
UPDATE gameobject_template SET ScriptName='go_veil_skith_cage' WHERE entry IN (185202,185203,185204,185205);
121121
UPDATE gameobject_template SET ScriptName='go_lab_work_reagents' WHERE entry IN (190462, 190473, 190478, 190459);
122-
UPDATE gameobject_template SET ScriptName='go_cat_figurine' WHERE entry=13359;
123122

124123
/* GUARD */
125124
UPDATE creature_template SET ScriptName='guard_azuremyst' WHERE entry=18038;

sql/updates/r3056_mangos.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)