Skip to content

Commit 8e51995

Browse files
NeatElvesxfurry
NeatElves
authored and
xfurry
committed
[2649] Drop some gameobjects scripts - will be handled by DB
Signed-off-by: Xfurry <xfurry@scriptdev2.com>
1 parent 4c4cd64 commit 8e51995

6 files changed

Lines changed: 12 additions & 154 deletions

File tree

‎scripts/world/go_scripts.cpp‎

Lines changed: 1 addition & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -17,44 +17,25 @@
1717
/* ScriptData
1818
SDName: GO_Scripts
1919
SD%Complete: 100
20-
SDComment: Quest support: 5088, 5097, 5098, 5381, 6481, 10990, 10991, 10992, 12557, 14092/14076. Barov_journal->Teaches spell 26089
20+
SDComment: Quest support: 5097, 5098, 10990, 10991, 10992, 12557, 14092/14076. Barov_journal->Teaches spell 26089
2121
SDCategory: Game Objects
2222
EndScriptData */
2323

2424
/* ContentData
25-
go_cat_figurine (the "trap" version of GO, two different exist)
2625
go_barov_journal
2726
go_ethereum_prison
2827
go_ethereum_stasis
2928
go_mysterious_snow_mound
30-
go_resonite_cask
31-
go_sacred_fire_of_life
3229
go_shrine_of_the_birds
3330
go_tele_to_dalaran_crystal
3431
go_tele_to_violet_stand
3532
go_andorhal_tower
3633
go_scourge_enclosure
3734
go_lab_work_reagents
38-
go_hand_of_iruxos_crystal
3935
EndContentData */
4036

4137
#include "precompiled.h"
4238

43-
/*######
44-
## go_cat_figurine
45-
######*/
46-
47-
enum
48-
{
49-
SPELL_SUMMON_GHOST_SABER = 5968,
50-
};
51-
52-
bool GOUse_go_cat_figurine(Player* pPlayer, GameObject* pGo)
53-
{
54-
pPlayer->CastSpell(pPlayer, SPELL_SUMMON_GHOST_SABER, true);
55-
return false;
56-
}
57-
5839
/*######
5940
## go_barov_journal
6041
######*/
@@ -156,26 +137,6 @@ bool GOUse_go_ethereum_stasis(Player* pPlayer, GameObject* pGo)
156137
return false;
157138
}
158139

159-
/*######
160-
## go_gilded_brazier
161-
######*/
162-
163-
enum
164-
{
165-
NPC_STILLBLADE = 17716,
166-
};
167-
168-
bool GOUse_go_gilded_brazier(Player* pPlayer, GameObject* pGO)
169-
{
170-
if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER)
171-
{
172-
if (Creature* pCreature = pPlayer->SummonCreature(NPC_STILLBLADE, 8087.632f, -7542.740f, 151.568f, 0.122f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000))
173-
pCreature->AI()->AttackStart(pPlayer);
174-
}
175-
176-
return true;
177-
}
178-
179140
/*######
180141
## go_jump_a_tron
181142
######*/
@@ -224,40 +185,6 @@ bool GOUse_go_mysterious_snow_mound(Player* pPlayer, GameObject* pGo)
224185
return true;
225186
}
226187

227-
/*######
228-
## go_resonite_cask
229-
######*/
230-
231-
enum
232-
{
233-
NPC_GOGGEROC = 11920
234-
};
235-
236-
bool GOUse_go_resonite_cask(Player* pPlayer, GameObject* pGO)
237-
{
238-
if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER)
239-
pGO->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000);
240-
241-
return false;
242-
}
243-
244-
/*######
245-
## go_sacred_fire_of_life
246-
######*/
247-
248-
enum
249-
{
250-
NPC_ARIKARA = 10882,
251-
};
252-
253-
bool GOUse_go_sacred_fire_of_life(Player* pPlayer, GameObject* pGO)
254-
{
255-
if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER)
256-
pPlayer->SummonCreature(NPC_ARIKARA, -5008.338f, -2118.894f, 83.657f, 0.874f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
257-
258-
return true;
259-
}
260-
261188
/*######
262189
## go_shrine_of_the_birds
263190
######*/
@@ -329,24 +256,6 @@ bool GOUse_go_tele_to_violet_stand(Player* pPlayer, GameObject* pGo)
329256
return true;
330257
}
331258

332-
enum
333-
{
334-
NPC_ZELEMAR_THE_WRATHFULL = 17830,
335-
SAY_AGGRO = -1000579
336-
};
337-
338-
float Position[4] = {-327.99f, 221.74f, -20.31f, 3.87f};
339-
340-
bool GOUse_go_blood_filled_orb(Player* pPlayer, GameObject* pGo)
341-
{
342-
if (Creature* pZelemar = pGo->SummonCreature(NPC_ZELEMAR_THE_WRATHFULL, Position[0], Position[1], Position[2], Position[3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000))
343-
{
344-
DoScriptText(SAY_AGGRO, pZelemar);
345-
pZelemar->AI()->AttackStart(pPlayer);
346-
}
347-
return false;
348-
}
349-
350259
/*######
351260
## go_andorhal_tower
352261
######*/
@@ -448,39 +357,10 @@ bool GOUse_go_lab_work_reagents(Player* pPlayer, GameObject* pGo)
448357
return false;
449358
}
450359

451-
/*######
452-
## go_hand_of_iruxos_crystal
453-
######*/
454-
455-
/* TODO
456-
* Actually this script is extremely vague, but as long as there is no valid information
457-
* hidden in some dark places, this will be the best we can do here :(
458-
* Do not consider this a well proven script.
459-
*/
460-
461-
enum
462-
{
463-
// QUEST_HAND_OF_IRUXOS = 5381,
464-
NPC_IRUXOS = 11876,
465-
};
466-
467-
bool GOUse_go_hand_of_iruxos_crystal(Player* pPlayer, GameObject* pGo)
468-
{
469-
if (Creature* pIruxos = pGo->SummonCreature(NPC_IRUXOS, 0.0f, 0.0f, 0.0f, pPlayer->GetOrientation() + M_PI_F, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000))
470-
pIruxos->AI()->AttackStart(pPlayer);
471-
472-
return false;
473-
}
474-
475360
void AddSC_go_scripts()
476361
{
477362
Script* pNewScript;
478363

479-
pNewScript = new Script;
480-
pNewScript->Name = "go_cat_figurine";
481-
pNewScript->pGOUse = &GOUse_go_cat_figurine;
482-
pNewScript->RegisterSelf();
483-
484364
pNewScript = new Script;
485365
pNewScript->Name = "go_barov_journal";
486366
pNewScript->pGOUse = &GOUse_go_barov_journal;
@@ -496,11 +376,6 @@ void AddSC_go_scripts()
496376
pNewScript->pGOUse = &GOUse_go_ethereum_stasis;
497377
pNewScript->RegisterSelf();
498378

499-
pNewScript = new Script;
500-
pNewScript->Name = "go_gilded_brazier";
501-
pNewScript->pGOUse = &GOUse_go_gilded_brazier;
502-
pNewScript->RegisterSelf();
503-
504379
pNewScript = new Script;
505380
pNewScript->Name = "go_jump_a_tron";
506381
pNewScript->pGOUse = &GOUse_go_jump_a_tron;
@@ -511,16 +386,6 @@ void AddSC_go_scripts()
511386
pNewScript->pGOUse = &GOUse_go_mysterious_snow_mound;
512387
pNewScript->RegisterSelf();
513388

514-
pNewScript = new Script;
515-
pNewScript->Name = "go_resonite_cask";
516-
pNewScript->pGOUse = &GOUse_go_resonite_cask;
517-
pNewScript->RegisterSelf();
518-
519-
pNewScript = new Script;
520-
pNewScript->Name = "go_sacred_fire_of_life";
521-
pNewScript->pGOUse = &GOUse_go_sacred_fire_of_life;
522-
pNewScript->RegisterSelf();
523-
524389
pNewScript = new Script;
525390
pNewScript->Name = "go_shrine_of_the_birds";
526391
pNewScript->pGOUse = &GOUse_go_shrine_of_the_birds;
@@ -536,11 +401,6 @@ void AddSC_go_scripts()
536401
pNewScript->pGOUse = &GOUse_go_tele_to_violet_stand;
537402
pNewScript->RegisterSelf();
538403

539-
pNewScript = new Script;
540-
pNewScript->Name = "go_blood_filled_orb";
541-
pNewScript->pGOUse = &GOUse_go_blood_filled_orb;
542-
pNewScript->RegisterSelf();
543-
544404
pNewScript = new Script;
545405
pNewScript->Name = "go_andorhal_tower";
546406
pNewScript->pGOUse = &GOUse_go_andorhal_tower;
@@ -555,9 +415,4 @@ void AddSC_go_scripts()
555415
pNewScript->Name = "go_lab_work_reagents";
556416
pNewScript->pGOUse = &GOUse_go_lab_work_reagents;
557417
pNewScript->RegisterSelf();
558-
559-
pNewScript = new Script;
560-
pNewScript->Name = "go_hand_of_iruxos_crystal";
561-
pNewScript->pGOUse = &GOUse_go_hand_of_iruxos_crystal;
562-
pNewScript->RegisterSelf();
563418
}

‎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 "2648"
3+
#define SD2_REVISION_NR "2649"
44
#endif // __SD2_REVISION_NR_H__

‎sql/mangos_scriptname_full.sql‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,26 +98,20 @@ UPDATE creature_template SET ScriptName='boss_lethon' WHERE entry=14888;
9898
UPDATE creature_template SET ScriptName='npc_spirit_shade' WHERE entry=15261;
9999

100100
/* GO */
101-
UPDATE gameobject_template SET ScriptName='go_cat_figurine' WHERE entry=13873;
102101
UPDATE gameobject_template SET ScriptName='go_barov_journal' WHERE entry=180794;
103102
UPDATE gameobject_template SET ScriptName='go_ethereum_prison' WHERE entry BETWEEN 184418 AND 184431;
104103
UPDATE gameobject_template SET ScriptName='go_ethereum_stasis' WHERE entry BETWEEN 185465 AND 185467;
105104
UPDATE gameobject_template SET ScriptName='go_ethereum_stasis' WHERE entry=184595;
106105
UPDATE gameobject_template SET ScriptName='go_ethereum_stasis' WHERE entry BETWEEN 185461 AND 185464;
107-
UPDATE gameobject_template SET ScriptName='go_gilded_brazier' WHERE entry=181956;
108106
UPDATE gameobject_template SET ScriptName='go_jump_a_tron' WHERE entry=183146;
109107
UPDATE gameobject_template SET ScriptName='go_mysterious_snow_mound' WHERE entry=195308;
110-
UPDATE gameobject_template SET ScriptName='go_resonite_cask' WHERE entry=178145;
111-
UPDATE gameobject_template SET ScriptName='go_sacred_fire_of_life' WHERE entry=175944;
112108
UPDATE gameobject_template SET ScriptName='go_shrine_of_the_birds' WHERE entry IN (185547,185553,185551);
113109
UPDATE gameobject_template SET ScriptName='go_tele_to_dalaran_crystal' WHERE entry=191230;
114110
UPDATE gameobject_template SET ScriptName='go_tele_to_violet_stand' WHERE entry=191229;
115-
UPDATE gameobject_template SET ScriptName='go_blood_filled_orb' WHERE entry=182024;
116111
UPDATE gameobject_template SET ScriptName='go_andorhal_tower' WHERE entry IN (176094,176095,176096,176097);
117112
UPDATE gameobject_template SET ScriptName='go_scourge_enclosure' WHERE entry=191548;
118113
UPDATE gameobject_template SET ScriptName='go_veil_skith_cage' WHERE entry IN (185202,185203,185204,185205);
119114
UPDATE gameobject_template SET ScriptName='go_lab_work_reagents' WHERE entry IN (190462, 190473, 190478, 190459);
120-
UPDATE gameobject_template SET ScriptName='go_hand_of_iruxos_crystal' WHERE entry=176581;
121115

122116
/* GUARD */
123117
UPDATE creature_template SET ScriptName='guard_azuremyst' WHERE entry=18038;

‎sql/scriptdev2_script_full.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen
606606
(-1000577,'This is far enough. I can make it on my own from here.',0,0,0,0,'Lurgglbr - SAY_END_1'),
607607
(-1000578,'Thank you for helping me $r. Please tell the king I am back.',0,0,0,0,'Lurgglbr - SAY_END_2'),
608608

609-
(-1000579,'Insolent fool! You thought to steal Zelemar\'s blood? You shall pay with your own!',0,1,0,0,'Zelemar the Wrathful - Aggro'),
609+
(-1000579,'REUSE ME',0,0,0,0,'REUSE ME'),
610610

611611
(-1000580,'Sleep now, young one ...',0,0,0,0,'Raelorasz SAY_SLEEP'),
612612
(-1000581,'A wonderful specimen.',0,0,0,0,'Raeloarsz SAY_SPECIMEN'),

‎sql/updates/r2649_mangos.sql‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
UPDATE gameobject_template SET ScriptName='' WHERE entry=13873;
2+
UPDATE gameobject_template SET ScriptName='' WHERE entry=181956;
3+
UPDATE gameobject_template SET ScriptName='' WHERE entry=178145;
4+
UPDATE gameobject_template SET ScriptName='' WHERE entry=175944;
5+
UPDATE gameobject_template SET ScriptName='' WHERE entry=182024;
6+
UPDATE gameobject_template SET ScriptName='' WHERE entry=176581;

‎sql/updates/r2649_scriptdev2.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DELETE FROM script_texts WHERE entry IN (-1000579);
2+
INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
3+
(-1000579,'REUSE ME',0,0,0,0,'REUSE ME');

0 commit comments

Comments
 (0)