Skip to content

Commit cd5bee7

Browse files
XfurrySchmoozerd
authored andcommitted
[2757] Add placeholder for world map ebon hold
1 parent 5066697 commit cd5bee7

10 files changed

Lines changed: 94 additions & 3 deletions

File tree

VC100/100ScriptDev2.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@
299299
<ClCompile Include="..\scripts\eastern_kingdoms\molten_core\instance_molten_core.cpp" />
300300
<ClCompile Include="..\scripts\eastern_kingdoms\molten_core\molten_core.cpp" />
301301
<ClCompile Include="..\scripts\eastern_kingdoms\scarlet_enclave\ebon_hold.cpp" />
302+
<ClCompile Include="..\scripts\eastern_kingdoms\scarlet_enclave\world_map_ebon_hold.cpp" />
302303
<ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_arcanist_doan.cpp" />
303304
<ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_headless_horseman.cpp" />
304305
<ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_herod.cpp" />
@@ -682,6 +683,7 @@
682683
<ClInclude Include="..\scripts\eastern_kingdoms\karazhan\karazhan.h" />
683684
<ClInclude Include="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.h" />
684685
<ClInclude Include="..\scripts\eastern_kingdoms\molten_core\molten_core.h" />
686+
<ClInclude Include="..\scripts\eastern_kingdoms\scarlet_enclave\world_map_ebon_hold.h" />
685687
<ClInclude Include="..\scripts\eastern_kingdoms\scarlet_monastery\scarlet_monastery.h" />
686688
<ClInclude Include="..\scripts\eastern_kingdoms\scholomance\scholomance.h" />
687689
<ClInclude Include="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.h" />

VC100/100ScriptDev2.vcxproj.filters

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,9 @@
567567
<ClCompile Include="..\scripts\eastern_kingdoms\scarlet_enclave\ebon_hold.cpp">
568568
<Filter>scripts\eastern_kingdoms\scarlet_enclave</Filter>
569569
</ClCompile>
570+
<ClCompile Include="..\scripts\eastern_kingdoms\scarlet_enclave\world_map_ebon_hold.cpp">
571+
<Filter>scripts\eastern_kingdoms\scarlet_enclave</Filter>
572+
</ClCompile>
570573
<ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_arcanist_doan.cpp">
571574
<Filter>scripts\eastern_kingdoms\scarlet_monastery</Filter>
572575
</ClCompile>
@@ -1689,6 +1692,9 @@
16891692
<ClInclude Include="..\scripts\eastern_kingdoms\molten_core\molten_core.h">
16901693
<Filter>scripts\eastern_kingdoms\molten_core</Filter>
16911694
</ClInclude>
1695+
<ClInclude Include="..\scripts\eastern_kingdoms\scarlet_enclave\world_map_ebon_hold.h">
1696+
<Filter>scripts\eastern_kingdoms\scarlet_enclave</Filter>
1697+
</ClInclude>
16921698
<ClInclude Include="..\scripts\eastern_kingdoms\scarlet_monastery\scarlet_monastery.h">
16931699
<Filter>scripts\eastern_kingdoms\scarlet_monastery</Filter>
16941700
</ClInclude>

VC90/90ScriptDev2.vcproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,14 @@
810810
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\ebon_hold.cpp"
811811
>
812812
</File>
813+
<File
814+
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\world_map_ebon_hold.cpp"
815+
>
816+
</File>
817+
<File
818+
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\world_map_ebon_hold.h"
819+
>
820+
</File>
813821
</Filter>
814822
<Filter
815823
Name="scarlet_monastery"

scripts/eastern_kingdoms/scarlet_enclave/ebon_hold.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ EndContentData */
3232

3333
#include "precompiled.h"
3434
#include "escort_ai.h"
35+
#include "world_map_ebon_hold.h"
3536

3637
/*######
3738
## npc_a_special_surprise
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/* Copyright (C) 2006 - 2012 ScriptDev2 <http://www.scriptdev2.com/>
2+
* This program is free software; you can redistribute it and/or modify
3+
* it under the terms of the GNU General Public License as published by
4+
* the Free Software Foundation; either version 2 of the License, or
5+
* (at your option) any later version.
6+
*
7+
* This program is distributed in the hope that it will be useful,
8+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
* GNU General Public License for more details.
11+
*
12+
* You should have received a copy of the GNU General Public License
13+
* along with this program; if not, write to the Free Software
14+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15+
*/
16+
17+
/* ScriptData
18+
SDName: world_map_ebon_hold
19+
SD%Complete: 0
20+
SDComment:
21+
SDCategory: Ebon Hold
22+
EndScriptData */
23+
24+
#include "precompiled.h"
25+
#include "world_map_ebon_hold.h"
26+
27+
world_map_ebon_hold::world_map_ebon_hold(Map* pMap) : ScriptedInstance(pMap),
28+
m_uiBattleEncounter(0)
29+
{
30+
Initialize();
31+
}
32+
33+
void world_map_ebon_hold::Initialize() {}
34+
35+
36+
InstanceData* GetInstance_world_map_ebon_hold(Map* pMap)
37+
{
38+
return new world_map_ebon_hold(pMap);
39+
}
40+
41+
void AddSC_world_map_ebon_hold()
42+
{
43+
Script* pNewScript;
44+
45+
pNewScript = new Script;
46+
pNewScript->Name = "world_map_ebon_hold";
47+
pNewScript->GetInstanceData = &GetInstance_world_map_ebon_hold;
48+
pNewScript->RegisterSelf();
49+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* Copyright (C) 2006 - 2012 ScriptDev2 <http://www.scriptdev2.com/>
2+
* This program is free software licensed under GPL version 2
3+
* Please see the included DOCS/LICENSE.TXT for more information */
4+
5+
#ifndef DEF_EBON_HOLD_H
6+
#define DEF_EBON_HOLD_H
7+
8+
class MANGOS_DLL_DECL world_map_ebon_hold : public ScriptedInstance
9+
{
10+
public:
11+
world_map_ebon_hold(Map* pMap);
12+
13+
void Initialize() override;
14+
15+
protected:
16+
uint32 m_uiBattleEncounter; // Store state of the battle around "The Light of Dawn"
17+
};
18+
19+
#endif

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 "2756"
3+
#define SD2_REVISION_NR "2757"
44
#endif // __SD2_REVISION_NR_H__

sql/mangos_scriptname_full.sql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,13 @@ UPDATE creature_template SET ScriptName='spell_dummy_npc' WHERE entry IN (
177177
UPDATE gameobject_template SET ScriptName='spell_dummy_go' WHERE entry IN (181616,186949);
178178

179179
/* WORLD MAP SCRIPTS */
180-
DELETE FROM world_template WHERE map IN (0, 1, 530, 571);
180+
DELETE FROM world_template WHERE map IN (0, 1, 530, 571, 609);
181181
INSERT INTO world_template VALUES
182182
(0, 'world_map_eastern_kingdoms'),
183183
(1, 'world_map_kalimdor'),
184184
(530, 'world_map_outland'),
185-
(571, 'world_map_northrend');
185+
(571, 'world_map_northrend'),
186+
(609, 'world_map_ebon_hold');
186187

187188
/* */
188189
/* ZONE */

sql/updates/r2757_mangos.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DELETE FROM world_template WHERE map=609;
2+
INSERT INTO world_template VALUES
3+
(609, 'world_map_ebon_hold');

system/ScriptLoader.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ extern void AddSC_npc_professions();
2626
extern void AddSC_npcs_special();
2727
extern void AddSC_spell_scripts();
2828
extern void AddSC_world_map_scripts();
29+
extern void AddSC_world_map_ebon_hold();
2930

3031
// eastern kingdoms
3132
extern void AddSC_blackrock_depths(); // blackrock_depths
@@ -486,6 +487,7 @@ void AddScripts()
486487
AddSC_npcs_special();
487488
AddSC_spell_scripts();
488489
AddSC_world_map_scripts();
490+
AddSC_world_map_ebon_hold();
489491

490492
// eastern kingdoms
491493
AddSC_blackrock_depths(); // blackrock_depths

0 commit comments

Comments
 (0)