diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index bdb9291e4fd..88b134108e9 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -10,12 +10,6 @@ SET(trinityscript_LIB_SRCS
include/sc_creature.h
include/sc_gossip.h
include/sc_instance.h
- scripts/areatrigger/areatrigger_scripts.cpp
- scripts/boss/boss_emeriss.cpp
- scripts/boss/boss_lethon.cpp
- scripts/boss/boss_taerar.cpp
- scripts/boss/boss_ysondre.cpp
- scripts/creature/mob_generic_creature.cpp
scripts/creature/simple_ai.cpp
scripts/creature/simple_ai.h
scripts/eastern_kingdoms/alterac_mountains.cpp
@@ -44,11 +38,9 @@ SET(trinityscript_LIB_SRCS
scripts/examples/example_escort.cpp
scripts/examples/example_gossip_codebox.cpp
scripts/examples/example_misc.cpp
- scripts/go/go_scripts.cpp
scripts/guard/guard_ai.cpp
scripts/guard/guard_ai.h
scripts/guard/guards.cpp
- scripts/item/item_scripts.cpp
scripts/kalimdor/ashenvale.cpp
scripts/kalimdor/azshara.cpp
scripts/kalimdor/azuremyst_isle.cpp
@@ -78,10 +70,6 @@ SET(trinityscript_LIB_SRCS
scripts/northrend/zuldrak.cpp
scripts/npc/npc_escortAI.cpp
scripts/npc/npc_escortAI.h
- scripts/npc/npc_innkeeper.cpp
- scripts/npc/npc_professions.cpp
- scripts/npc/npcs_special.cpp
- scripts/npc/npc_taxi.cpp
scripts/outland/blades_edge_mountains.cpp
scripts/outland/boss_doomlord_kazzak.cpp
scripts/outland/boss_doomwalker.cpp
@@ -508,6 +496,18 @@ SET(trinityscript_LIB_SRCS
scripts/zone/ulduar/ulduar/boss_yoggsaron.cpp
scripts/zone/ulduar/ulduar/def_ulduar.h
scripts/zone/ulduar/ulduar/instance_ulduar.cpp
+ scripts/world/areatrigger_scripts.cpp
+ scripts/world/boss_emeriss.cpp
+ scripts/world/boss_lethon.cpp
+ scripts/world/boss_taerar.cpp
+ scripts/world/boss_ysondre.cpp
+ scripts/world/go_scripts.cpp
+ scripts/world/item_scripts.cpp
+ scripts/world/mob_generic_creature.cpp
+ scripts/world/npc_innkeeper.cpp
+ scripts/world/npc_professions.cpp
+ scripts/world/npcs_special.cpp
+ scripts/world/npc_taxi.cpp
system.cpp
)
diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index e4a32705566..5518d35f66f 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -363,41 +363,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -519,14 +487,6 @@
>
-
-
-
-
@@ -543,14 +503,6 @@
>
-
-
-
-
@@ -677,22 +629,6 @@
RelativePath="..\scripts\npc\npc_escortAI.h"
>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2795,6 +2723,58 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -516,14 +484,6 @@
>
-
-
-
-
@@ -540,14 +500,6 @@
>
-
-
-
-
@@ -674,22 +626,6 @@
RelativePath="..\scripts\npc\npc_escortAI.h"
>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2792,6 +2720,58 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* ScriptData
-SDName: Item_Test
-SD%Complete: 100
-SDComment: Used for Testing Item Scripts
-SDCategory: Items
-EndScriptData */
-
-#include "precompiled.h"
-
-extern void LoadDatabase();
-
-bool ItemUse_item_test(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
-{
- LoadDatabase();
- return true;
-}
-
-void AddSC_item_test()
-{
- Script *newscript;
-
- newscript = new Script;
- newscript->Name="item_test";
- newscript->pItemUse = &ItemUse_item_test;
- newscript->RegisterSelf();
-}
-
diff --git a/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp b/src/bindings/scripts/scripts/world/areatrigger_scripts.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp
rename to src/bindings/scripts/scripts/world/areatrigger_scripts.cpp
diff --git a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp b/src/bindings/scripts/scripts/world/boss_emeriss.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/boss/boss_emeriss.cpp
rename to src/bindings/scripts/scripts/world/boss_emeriss.cpp
diff --git a/src/bindings/scripts/scripts/boss/boss_lethon.cpp b/src/bindings/scripts/scripts/world/boss_lethon.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/boss/boss_lethon.cpp
rename to src/bindings/scripts/scripts/world/boss_lethon.cpp
diff --git a/src/bindings/scripts/scripts/boss/boss_taerar.cpp b/src/bindings/scripts/scripts/world/boss_taerar.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/boss/boss_taerar.cpp
rename to src/bindings/scripts/scripts/world/boss_taerar.cpp
diff --git a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp b/src/bindings/scripts/scripts/world/boss_ysondre.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/boss/boss_ysondre.cpp
rename to src/bindings/scripts/scripts/world/boss_ysondre.cpp
diff --git a/src/bindings/scripts/scripts/go/go_scripts.cpp b/src/bindings/scripts/scripts/world/go_scripts.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/go/go_scripts.cpp
rename to src/bindings/scripts/scripts/world/go_scripts.cpp
diff --git a/src/bindings/scripts/scripts/item/item_scripts.cpp b/src/bindings/scripts/scripts/world/item_scripts.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/item/item_scripts.cpp
rename to src/bindings/scripts/scripts/world/item_scripts.cpp
diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/world/mob_generic_creature.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
rename to src/bindings/scripts/scripts/world/mob_generic_creature.cpp
diff --git a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp b/src/bindings/scripts/scripts/world/npc_innkeeper.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/npc/npc_innkeeper.cpp
rename to src/bindings/scripts/scripts/world/npc_innkeeper.cpp
diff --git a/src/bindings/scripts/scripts/npc/npc_professions.cpp b/src/bindings/scripts/scripts/world/npc_professions.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/npc/npc_professions.cpp
rename to src/bindings/scripts/scripts/world/npc_professions.cpp
diff --git a/src/bindings/scripts/scripts/npc/npc_taxi.cpp b/src/bindings/scripts/scripts/world/npc_taxi.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/npc/npc_taxi.cpp
rename to src/bindings/scripts/scripts/world/npc_taxi.cpp
diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/world/npcs_special.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/npc/npcs_special.cpp
rename to src/bindings/scripts/scripts/world/npcs_special.cpp