Skip to content

Commit 01c3e07

Browse files
SchmoozerdSchmoozerd
committed
[1908] Remove obsolete placeholder boss_gatewatcher_gyrokill.cpp
Remove obsolete placeholder boss_gatewatcher_gyrokill.cpp Boss is handled in Acid for long time. Also fix gossip related to quest 11464, Thanks to nerdrage for research git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1908 5f9c896b-1e26-0410-94da-f77f675e2462
1 parent b6927cd commit 01c3e07

9 files changed

Lines changed: 21 additions & 58 deletions

File tree

‎Makefile.am‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp \
572572
scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp \
573573
scripts/outland/tempest_keep/the_eye/the_eye.cpp \
574574
scripts/outland/tempest_keep/the_eye/the_eye.h \
575-
scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp \
576575
scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp \
577576
scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp \
578577
scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp \

‎VC100/100ScriptDev2.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,6 @@
676676
<ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_void_reaver.cpp" />
677677
<ClCompile Include="..\scripts\outland\tempest_keep\the_eye\instance_the_eye.cpp" />
678678
<ClCompile Include="..\scripts\outland\tempest_keep\the_eye\the_eye.cpp" />
679-
<ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_gyrokill.cpp" />
680679
<ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_ironhand.cpp" />
681680
<ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\boss_nethermancer_sepethrea.cpp" />
682681
<ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\boss_pathaleon_the_calculator.cpp" />

‎VC100/100ScriptDev2.vcxproj.filters‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1683,9 +1683,6 @@
16831683
<ClCompile Include="..\scripts\outland\tempest_keep\the_eye\the_eye.cpp">
16841684
<Filter>scripts\outland\tempest_keep\the_eye</Filter>
16851685
</ClCompile>
1686-
<ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_gyrokill.cpp">
1687-
<Filter>scripts\outland\tempest_keep\the_mechanar</Filter>
1688-
</ClCompile>
16891686
<ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_ironhand.cpp">
16901687
<Filter>scripts\outland\tempest_keep\the_mechanar</Filter>
16911688
</ClCompile>

‎VC80/80ScriptDev2.vcproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2867,10 +2867,6 @@
28672867
<Filter
28682868
Name="the_mechanar"
28692869
>
2870-
<File
2871-
RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_gyrokill.cpp"
2872-
>
2873-
</File>
28742870
<File
28752871
RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_ironhand.cpp"
28762872
>

‎VC90/90ScriptDev2.vcproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2866,10 +2866,6 @@
28662866
<Filter
28672867
Name="the_mechanar"
28682868
>
2869-
<File
2870-
RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_gyrokill.cpp"
2871-
>
2872-
</File>
28732869
<File
28742870
RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_ironhand.cpp"
28752871
>

‎scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎sql/Updates/Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,4 +203,5 @@ pkgdata_DATA = \
203203
r1890_scriptdev2.sql \
204204
r1891_mangos.sql \
205205
r1899_mangos.sql \
206-
r1899_scriptdev2.sql
206+
r1899_scriptdev2.sql \
207+
r1908_scriptdev2.sql

‎sql/Updates/r1908_scriptdev2.sql‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
DELETE FROM script_texts WHERE entry BETWEEN -1554005 AND -1554000;
2+
INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
3+
(-1554000,'REUSE_ME',0,0,0,0,'REUSE_ME'),
4+
(-1554001,'REUSE_ME',0,0,0,0,'REUSE_ME'),
5+
(-1554002,'REUSE_ME',0,0,0,0,'REUSE_ME'),
6+
(-1554003,'REUSE_ME',0,0,0,0,'REUSE_ME'),
7+
(-1554004,'REUSE_ME',0,0,0,0,'REUSE_ME'),
8+
(-1554005,'REUSE_ME',0,0,0,0,'REUSE_ME');
9+
10+
DELETE FROM gossip_texts WHERE entry=-3000102;
11+
INSERT INTO gossip_texts (entry,content_default,comment) VALUES
12+
(-3000102,'Pay up, Harry!','silvermoon harry GOSSIP_ITEM_PAYING');

‎sql/scriptdev2_script_full.sql‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1739,12 +1739,12 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen
17391739

17401740
-- -1 554 000 THE MECHANAR
17411741
INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
1742-
(-1554000,'I predict a painful death.',11101,1,0,0,'gyro SAY_AGGRO'),
1743-
(-1554001,'Measure twice; cut once!',11104,1,0,0,'gyro SAY_SAW_ATTACK1'),
1744-
(-1554002,'If my division is correct, you should be quite dead.',11105,1,0,0,'gyro SAY_SAW_ATTACK2'),
1745-
(-1554003,'Your strategy was flawed!',11102,1,0,0,'gyro SAY_SLAY1'),
1746-
(-1554004,'Yes, the only logical outcome.',11103,1,0,0,'gyro SAY_SLAY2'),
1747-
(-1554005,'An unforseen... contingency',11106,1,0,0,'gyro SAY_DEATH'),
1742+
(-1554000,'REUSE_ME',0,0,0,0,'REUSE_ME'),
1743+
(-1554001,'REUSE_ME',0,0,0,0,'REUSE_ME'),
1744+
(-1554002,'REUSE_ME',0,0,0,0,'REUSE_ME'),
1745+
(-1554003,'REUSE_ME',0,0,0,0,'REUSE_ME'),
1746+
(-1554004,'REUSE_ME',0,0,0,0,'REUSE_ME'),
1747+
(-1554005,'REUSE_ME',0,0,0,0,'REUSE_ME'),
17481748

17491749
(-1554006,'You have approximately five seconds to live.',11109,1,0,0,'ironhand SAY_AGGRO_1'),
17501750
(-1554007,'With the precise angle and velocity...',11112,1,0,0,'ironhand SAY_HAMMER_1'),
@@ -3354,7 +3354,7 @@ INSERT INTO gossip_texts (entry,content_default,comment) VALUES
33543354
-- -3 000 100 GENERAL MAPS (not instance maps)
33553355
INSERT INTO gossip_texts (entry,content_default,comment) VALUES
33563356
(-3000101,'Taruk send me to collect what you owe.','silvermoon harry GOSSIP_ITEM_GAMBLING_DEBT'),
3357-
(-3000102,'Here\'s the money.','silvermoon harry GOSSIP_ITEM_PAYING'),
3357+
(-3000102,'Pay up, Harry!','silvermoon harry GOSSIP_ITEM_PAYING'),
33583358
(-3000103,'I am ready to travel to you village now.','rainspeaker GOSSIP_ITEM_READY'),
33593359
(-3000104,'<Check for pulse...>','mosswalker victim GOSSIP_ITEM_PULSE'),
33603360
(-3000105,'Ezekiel said that you might have a certain book...','dirty larry GOSSIP_ITEM_BOOK'),

0 commit comments

Comments
 (0)