Unity or amalgamated build for skills (#9797)

.github/workflows/analysis_codeql.yml

@@ -47,8 +47,7 @@ jobs:
            # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
            # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
            languages: cpp
-           # Trigger security and quality findings
-           queries: +security-and-quality
+           config-file: tools/ci/codeql_config.yml
 
       # A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
       - name: Variable Parsing - PRE

src/map/CMakeLists.txt

@@ -10,7 +10,9 @@ set( MAP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}  CACHE INTERNAL "" )
 if( BUILD_SERVERS )
 message( STATUS "Creating target map-server" )
 file(GLOB_RECURSE MAP_HEADERS ${MAP_SOURCE_DIR}/*.hpp)
+list(FILTER MAP_HEADERS EXCLUDE REGEX ".*/skills/.*")
 file(GLOB_RECURSE MAP_SOURCES ${MAP_SOURCE_DIR}/*.cpp)
+list(FILTER MAP_SOURCES EXCLUDE REGEX ".*/skills/.*")
 set( DEPENDENCIES common ryml)
 set( LIBRARIES ${GLOBAL_LIBRARIES} ${MYSQL_LIBRARIES} )
 set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ${RA_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS} )

src/map/Makefile.in

@@ -25,7 +25,9 @@ MAP_H = $(shell find ../ -type f -name "*.hpp") \
 	$(shell ls ../config/*.hpp) \
 	../custom/battle_config_struct.inc
 
-MAP_OBJ = $(shell find . -type f -name "*.cpp" | sed -e "s/\.cpp/\.o/g" -e "s/^\.\///")
+MAP_OBJ = $(shell find . -type f -name "*.cpp" \
+			-not -path "./skills/*" \
+			| sed -e "s/\.cpp/\.o/g" -e "s/^\.\///")
 #MAP_OBJ += $(shell ls *.c | sed -e "s/\.c/\.o/g")
 MAP_DIR_OBJ = $(MAP_OBJ:%=obj/%)
 MAP_GEN_DIR_OBJ = $(MAP_OBJ:%=obj-gen/%)

src/map/map-server-generator.vcxproj.filters

@@ -1185,9 +1185,6 @@
     <ClInclude Include="skills/skill_impl.hpp">
       <Filter>Header Files\Skills</Filter>
     </ClInclude>
-    <ClInclude Include="skills/status_skill_impl.hpp">
-      <Filter>Header Files\Skills</Filter>
-    </ClInclude>
     <ClInclude Include="skills/summoner/skill_factory_summoner.hpp">
       <Filter>Header Files\Skills\Summoner</Filter>
     </ClInclude>
@@ -1656,9 +1653,6 @@
     <ClInclude Include="skills/thief/weaponcrush.hpp">
       <Filter>Header Files\Skills\Thief</Filter>
     </ClInclude>
-    <ClInclude Include="skills/weapon_skill_impl.hpp">
-      <Filter>Header Files\Skills</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="skills/acolyte/adoramus.cpp">
@@ -2474,9 +2468,6 @@
     <ClCompile Include="skills/skill_impl.cpp">
       <Filter>Source Files\Skills</Filter>
     </ClCompile>
-    <ClCompile Include="skills/status_skill_impl.cpp">
-      <Filter>Source Files\Skills</Filter>
-    </ClCompile>
     <ClCompile Include="skills/summoner/skill_factory_summoner.cpp">
       <Filter>Source Files\Skills\Summoner</Filter>
     </ClCompile>
@@ -2945,8 +2936,5 @@
     <ClCompile Include="skills/thief/weaponcrush.cpp">
       <Filter>Source Files\Skills\Thief</Filter>
     </ClCompile>
-    <ClCompile Include="skills/weapon_skill_impl.cpp">
-      <Filter>Source Files\Skills</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>

src/map/map-server.vcxproj.filters

@@ -1185,9 +1185,6 @@
     <ClInclude Include="skills/skill_impl.hpp">
       <Filter>Header Files\Skills</Filter>
     </ClInclude>
-    <ClInclude Include="skills/status_skill_impl.hpp">
-      <Filter>Header Files\Skills</Filter>
-    </ClInclude>
     <ClInclude Include="skills/summoner/skill_factory_summoner.hpp">
       <Filter>Header Files\Skills\Summoner</Filter>
     </ClInclude>
@@ -1656,9 +1653,6 @@
     <ClInclude Include="skills/thief/weaponcrush.hpp">
       <Filter>Header Files\Skills\Thief</Filter>
     </ClInclude>
-    <ClInclude Include="skills/weapon_skill_impl.hpp">
-      <Filter>Header Files\Skills</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="skills/acolyte/adoramus.cpp">
@@ -2474,9 +2468,6 @@
     <ClCompile Include="skills/skill_impl.cpp">
       <Filter>Source Files\Skills</Filter>
     </ClCompile>
-    <ClCompile Include="skills/status_skill_impl.cpp">
-      <Filter>Source Files\Skills</Filter>
-    </ClCompile>
     <ClCompile Include="skills/summoner/skill_factory_summoner.cpp">
       <Filter>Source Files\Skills\Summoner</Filter>
     </ClCompile>
@@ -2945,8 +2936,5 @@
     <ClCompile Include="skills/thief/weaponcrush.cpp">
       <Filter>Source Files\Skills\Thief</Filter>
     </ClCompile>
-    <ClCompile Include="skills/weapon_skill_impl.cpp">
-      <Filter>Source Files\Skills</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>

src/map/skill.cpp

@@ -45,7 +45,10 @@
 #include "script.hpp"
 #include "status.hpp"
 #include "unit.hpp"
-#include "./skills/skill_factory.hpp"
+
+// Include .cpp files into the TU to optimize compile time
+// For reference see unity builds or amalgamated builds
+#include "skills/skill_factory.cpp"
 
 using namespace rathena;
 

src/map/skills/acolyte/blazingflameblast.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillBlazingFlameBlast : public WeaponSkillImpl {
 public:

src/map/skills/acolyte/duplelight.hpp

@@ -4,7 +4,6 @@
 #pragma once
 
 #include "../skill_impl.hpp"
-#include "../weapon_skill_impl.hpp"
 
 // AB_DUPLELIGHT_MAGIC
 class SkillDupleLightMagic : public SkillImpl {

src/map/skills/acolyte/effligo.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillEffligo : public WeaponSkillImpl {
 public:

src/map/skills/acolyte/holywater.hpp

@@ -1,5 +1,7 @@
 // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder#pragma once
+// For more information, see LICENCE in the main folder
+
+#pragma once
 
 #include "../skill_impl.hpp"
 

src/map/skills/acolyte/impositiomanus.hpp

@@ -6,7 +6,6 @@
 #include <config/core.hpp>
 
 #include "../skill_impl.hpp"
-#include "../status_skill_impl.hpp"
 
 #ifdef RENEWAL
 class SkillImpositioManus : public SkillImpl {

src/map/skills/acolyte/incagi.hpp

@@ -1,5 +1,7 @@
 // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder#pragma once
+// For more information, see LICENCE in the main folder
+
+#pragma once
 
 #include "../skill_impl.hpp"
 

src/map/skills/acolyte/medialevotum.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillMedialeVotum : public StatusSkillImpl {
 public:

src/map/skills/acolyte/renovatio.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillRenovatio : public StatusSkillImpl {
 public:

src/map/skills/acolyte/skill_factory_acolyte.cpp

@@ -5,71 +5,72 @@
 
 #include <config/core.hpp>
 
-#include "../status_skill_impl.hpp"
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
-#include "adoramus.hpp"
-#include "ancilla.hpp"
-#include "angelus.hpp"
-#include "arbitrium.hpp"
-#include "aspersio.hpp"
-#include "blazingflameblast.hpp"
-#include "blessing.hpp"
-#include "bssacramenti.hpp"
-#include "cantocandidus.hpp"
-#include "clearance.hpp"
-#include "coluceoheal.hpp"
-#include "competentia.hpp"
-#include "convenio.hpp"
-#include "crementia.hpp"
-#include "crucis.hpp"
-#include "cure.hpp"
-#include "decagi.hpp"
-#include "dilectioheal.hpp"
-#include "divinusflos.hpp"
-#include "duplelight.hpp"
-#include "effligo.hpp"
-#include "epiclesis.hpp"
-#include "explosionblaster.hpp"
-#include "firstbrand.hpp"
-#include "framen.hpp"
-#include "gloria.hpp"
-#include "heal.hpp"
-#include "highnessheal.hpp"
-#include "holylight.hpp"
-#include "holywater.hpp"
-#include "impositiomanus.hpp"
-#include "incagi.hpp"
-#include "judex.hpp"
-#include "kyrieeleison.hpp"
-#include "laudaagnus.hpp"
-#include "laudaramus.hpp"
-#include "lexdivina.hpp"
-#include "magnificat.hpp"
-#include "magnusexorcismus.hpp"
-#include "massiveflameblaster.hpp"
-#include "medialevotum.hpp"
-#include "oleumsanctum.hpp"
-#include "oratio.hpp"
-#include "petitio.hpp"
-#include "pneuma.hpp"
-#include "pneumaticusprocella.hpp"
-#include "praefatio.hpp"
-#include "renovatio.hpp"
-#include "reparatio.hpp"
-#include "ruwach.hpp"
-#include "sanctuary.hpp"
-#include "secondfaith.hpp"
-#include "secondflame.hpp"
-#include "secondjudgement.hpp"
-#include "silentium.hpp"
-#include "statusrecovery.hpp"
-#include "suffragium.hpp"
-#include "thirdconsecration.hpp"
-#include "thirdflamebomb.hpp"
-#include "thirdpunish.hpp"
-#include "turnundead.hpp"
-#include "vituperatum.hpp"
+// Include .cpp files into the TU to optimize compile time
+// For reference see unity builds or amalgamated builds
+#include "adoramus.cpp"
+#include "ancilla.cpp"
+#include "angelus.cpp"
+#include "arbitrium.cpp"
+#include "aspersio.cpp"
+#include "blazingflameblast.cpp"
+#include "blessing.cpp"
+#include "bssacramenti.cpp"
+#include "cantocandidus.cpp"
+#include "clearance.cpp"
+#include "coluceoheal.cpp"
+#include "competentia.cpp"
+#include "convenio.cpp"
+#include "crementia.cpp"
+#include "crucis.cpp"
+#include "cure.cpp"
+#include "decagi.cpp"
+#include "dilectioheal.cpp"
+#include "divinusflos.cpp"
+#include "duplelight.cpp"
+#include "effligo.cpp"
+#include "epiclesis.cpp"
+#include "explosionblaster.cpp"
+#include "firstbrand.cpp"
+#include "framen.cpp"
+#include "gloria.cpp"
+#include "heal.cpp"
+#include "highnessheal.cpp"
+#include "holylight.cpp"
+#include "holywater.cpp"
+#include "impositiomanus.cpp"
+#include "incagi.cpp"
+#include "judex.cpp"
+#include "kyrieeleison.cpp"
+#include "laudaagnus.cpp"
+#include "laudaramus.cpp"
+#include "lexdivina.cpp"
+#include "magnificat.cpp"
+#include "magnusexorcismus.cpp"
+#include "massiveflameblaster.cpp"
+#include "medialevotum.cpp"
+#include "oleumsanctum.cpp"
+#include "oratio.cpp"
+#include "petitio.cpp"
+#include "pneuma.cpp"
+#include "pneumaticusprocella.cpp"
+#include "praefatio.cpp"
+#include "renovatio.cpp"
+#include "reparatio.cpp"
+#include "ruwach.cpp"
+#include "sanctuary.cpp"
+#include "secondfaith.cpp"
+#include "secondflame.cpp"
+#include "secondjudgement.cpp"
+#include "silentium.cpp"
+#include "statusrecovery.cpp"
+#include "suffragium.cpp"
+#include "thirdconsecration.cpp"
+#include "thirdflamebomb.cpp"
+#include "thirdpunish.cpp"
+#include "turnundead.cpp"
+#include "vituperatum.cpp"
 
 std::unique_ptr<const SkillImpl> SkillFactoryAcolyte::create(const e_skill skill_id) const {
 	switch( skill_id ){

src/map/skills/acolyte/suffragium.hpp

@@ -6,7 +6,6 @@
 #include <config/core.hpp>
 
 #include "../skill_impl.hpp"
-#include "../status_skill_impl.hpp"
 
 #ifdef RENEWAL
 class SkillSuffragium : public SkillImpl {

src/map/skills/acolyte/vituperatum.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillVituperatum : public StatusSkillImpl {
 public:

src/map/skills/archer/aimedbolt.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillAimedBolt : public WeaponSkillImpl {
 public:

src/map/skills/archer/chargearrow.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "../../battle.hpp"
 

src/map/skills/archer/crescivebolt.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillCresciveBolt : public WeaponSkillImpl {
 public:

src/map/skills/archer/doublestrafe.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 #include "../../battle.hpp"
 
 class SkillDoubleStrafe : public WeaponSkillImpl

src/map/skills/archer/fearbreeze.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillFearBreeze : public StatusSkillImpl {
 public:

src/map/skills/archer/hawkboomerang.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillHawkBoomerang : public WeaponSkillImpl {
 public:

src/map/skills/archer/hawkrush.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillHawkRush : public WeaponSkillImpl {
 public:

src/map/skills/archer/phantasmicarrow.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillPhantasmicArrow : public WeaponSkillImpl {
 public:

src/map/skills/archer/sensitivekeen.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillSensitiveKeen : public WeaponSkillImpl {
 public:

src/map/skills/archer/skill_factory_archer.cpp

@@ -3,62 +3,63 @@
 
 #include "skill_factory_archer.hpp"
 
-#include "../status_skill_impl.hpp"
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
-#include "aimedbolt.hpp"
-#include "anklesnare.hpp"
-#include "arrowshower.hpp"
-#include "arrowstorm.hpp"
-#include "beaststrafing.hpp"
-#include "blastmine.hpp"
-#include "blitzbeat.hpp"
-#include "camouflage.hpp"
-#include "chargearrow.hpp"
-#include "claymoretrap.hpp"
-#include "clusterbomb.hpp"
-#include "cobalttrap.hpp"
-#include "concentration.hpp"
-#include "crescivebolt.hpp"
-#include "deepblindtrap.hpp"
-#include "detect.hpp"
-#include "detonator.hpp"
-#include "doublestrafe.hpp"
-#include "electricshocker.hpp"
-#include "falconassault.hpp"
-#include "fearbreeze.hpp"
-#include "firingtrap.hpp"
-#include "flametrap.hpp"
-#include "flasher.hpp"
-#include "focusedarrowstrike.hpp"
-#include "freezingtrap.hpp"
-#include "galestorm.hpp"
-#include "hawkboomerang.hpp"
-#include "hawkmastery.hpp"
-#include "hawkrush.hpp"
-#include "iceboundtrap.hpp"
-#include "landmine.hpp"
-#include "magentatrap.hpp"
-#include "maizetrap.hpp"
-#include "makingarrow.hpp"
-#include "phantasmicarrow.hpp"
-#include "removetrap.hpp"
-#include "sandman.hpp"
-#include "sensitivekeen.hpp"
-#include "shockwavetrap.hpp"
-#include "skidtrap.hpp"
-#include "solidtrap.hpp"
-#include "springtrap.hpp"
-#include "swifttrap.hpp"
-#include "talkiebox.hpp"
-#include "verduretrap.hpp"
-#include "wargbite.hpp"
-#include "wargdash.hpp"
-#include "wargmastery.hpp"
-#include "wargrider.hpp"
-#include "wargstrike.hpp"
-#include "wildwalk.hpp"
-#include "windwalker.hpp"
+// Include .cpp files into the TU to optimize compile time
+// For reference see unity builds or amalgamated builds
+#include "aimedbolt.cpp"
+#include "anklesnare.cpp"
+#include "arrowshower.cpp"
+#include "arrowstorm.cpp"
+#include "beaststrafing.cpp"
+#include "blastmine.cpp"
+#include "blitzbeat.cpp"
+#include "camouflage.cpp"
+#include "chargearrow.cpp"
+#include "claymoretrap.cpp"
+#include "clusterbomb.cpp"
+#include "cobalttrap.cpp"
+#include "concentration.cpp"
+#include "crescivebolt.cpp"
+#include "deepblindtrap.cpp"
+#include "detect.cpp"
+#include "detonator.cpp"
+#include "doublestrafe.cpp"
+#include "electricshocker.cpp"
+#include "falconassault.cpp"
+#include "fearbreeze.cpp"
+#include "firingtrap.cpp"
+#include "flametrap.cpp"
+#include "flasher.cpp"
+#include "focusedarrowstrike.cpp"
+#include "freezingtrap.cpp"
+#include "galestorm.cpp"
+#include "hawkboomerang.cpp"
+#include "hawkmastery.cpp"
+#include "hawkrush.cpp"
+#include "iceboundtrap.cpp"
+#include "landmine.cpp"
+#include "magentatrap.cpp"
+#include "maizetrap.cpp"
+#include "makingarrow.cpp"
+#include "phantasmicarrow.cpp"
+#include "removetrap.cpp"
+#include "sandman.cpp"
+#include "sensitivekeen.cpp"
+#include "shockwavetrap.cpp"
+#include "skidtrap.cpp"
+#include "solidtrap.cpp"
+#include "springtrap.cpp"
+#include "swifttrap.cpp"
+#include "talkiebox.cpp"
+#include "verduretrap.cpp"
+#include "wargbite.cpp"
+#include "wargdash.cpp"
+#include "wargmastery.cpp"
+#include "wargrider.cpp"
+#include "wargstrike.cpp"
+#include "wildwalk.cpp"
+#include "windwalker.cpp"
 
 std::unique_ptr<const SkillImpl> SkillFactoryArcher::create(const e_skill skill_id) const {
 	switch( skill_id ){

src/map/skills/archer/wargbite.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillWargBite : public WeaponSkillImpl {
 public:

src/map/skills/archer/wargstrike.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillWargStrike : public WeaponSkillImpl {
 public:

src/map/skills/archer/wildwalk.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillWildWalk : public WeaponSkillImpl {
 public:

src/map/skills/gunslinger/bullseye.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "map/battle.hpp"
 

src/map/skills/gunslinger/disarm.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "map/battle.hpp"
 

src/map/skills/gunslinger/dust.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "map/battle.hpp"
 

src/map/skills/gunslinger/fullbuster.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "map/battle.hpp"
 

src/map/skills/gunslinger/piercingshot.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "map/battle.hpp"
 

src/map/skills/gunslinger/rapidshower.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "map/battle.hpp"
 

src/map/skills/gunslinger/skill_factory_gunslinger.cpp

@@ -5,24 +5,25 @@
 
 #include <config/core.hpp>
 
-#include "../status_skill_impl.hpp"
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
-#include "bullseye.hpp"
-#include "cracker.hpp"
-#include "desperado.hpp"
-#include "disarm.hpp"
-#include "dust.hpp"
-#include "fling.hpp"
-#include "fullbuster.hpp"
-#include "gatlingfever.hpp"
-#include "glittering.hpp"
-#include "grounddrift.hpp"
-#include "piercingshot.hpp"
-#include "rapidshower.hpp"
-#include "spreadattack.hpp"
-#include "tracking.hpp"
-#include "tripleaction.hpp"
+// Include .cpp files into the TU to optimize compile time
+// For reference see unity builds or amalgamated builds
+#include "bullseye.cpp"
+#include "cracker.cpp"
+#include "desperado.cpp"
+#include "disarm.cpp"
+#include "dust.cpp"
+#include "fling.cpp"
+#include "fullbuster.cpp"
+#include "gatlingfever.cpp"
+#include "glittering.cpp"
+#include "grounddrift.cpp"
+#include "piercingshot.cpp"
+#include "rapidshower.cpp"
+#include "spreadattack.cpp"
+#include "tracking.cpp"
+#include "tripleaction.cpp"
 
 std::unique_ptr<const SkillImpl> SkillFactoryGunslinger::create(const e_skill skill_id) const {
 	switch (skill_id) {

src/map/skills/gunslinger/spreadattack.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "map/battle.hpp"
 

src/map/skills/gunslinger/tracking.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "map/battle.hpp"
 

src/map/skills/gunslinger/tripleaction.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "map/battle.hpp"
 

src/map/skills/mage/energycoat.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillEnergyCoat : public StatusSkillImpl {
 public:

src/map/skills/mage/skill_factory_mage.cpp

@@ -3,75 +3,76 @@
 
 #include "skill_factory_mage.hpp"
 
-#include "../status_skill_impl.hpp"
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
-#include "allbloom.hpp"
-#include "astralstrike.hpp"
-#include "chainlightning.hpp"
-#include "coldbolt.hpp"
-#include "comet.hpp"
-#include "crimsonarrow.hpp"
-#include "crimsonrock.hpp"
-#include "crystalimpact.hpp"
-#include "deadlyprojection.hpp"
-#include "destructivehurricane.hpp"
-#include "drainlife.hpp"
-#include "earthspike.hpp"
-#include "earthstrain.hpp"
-#include "energycoat.hpp"
-#include "energyconversion.hpp"
-#include "fireball.hpp"
-#include "firebolt.hpp"
-#include "firepillar.hpp"
-#include "firewall.hpp"
-#include "floralflareroad.hpp"
-#include "frostdiver.hpp"
-#include "frostnova.hpp"
-#include "frostymisty.hpp"
-#include "frozenslash.hpp"
-#include "ganbantein.hpp"
-#include "gravitationfield.hpp"
-#include "heavensdrive.hpp"
-#include "hellinferno.hpp"
-#include "icewall.hpp"
-#include "jackfrost.hpp"
-#include "jupitelthunder.hpp"
-#include "lightningbolt.hpp"
-#include "lordofvermilion.hpp"
-#include "meteorstorm.hpp"
-#include "mysteryillusion.hpp"
-#include "napalmbeat.hpp"
-#include "napalmvulcan.hpp"
-#include "quagmire.hpp"
-#include "rainofcrystal.hpp"
-#include "readingspellbook.hpp"
-#include "release.hpp"
-#include "rockdown.hpp"
-#include "safetywall.hpp"
-#include "sense.hpp"
-#include "siennaexecrate.hpp"
-#include "sight.hpp"
-#include "sightblaster.hpp"
-#include "sightrasher.hpp"
-#include "soulexpansion.hpp"
-#include "soulstrike.hpp"
-#include "soulvulcanstrike.hpp"
-#include "stasis.hpp"
-#include "stonecurse.hpp"
-#include "stormcannon.hpp"
-#include "stormgust.hpp"
-#include "strantumtremor.hpp"
-#include "summonfireball.hpp"
-#include "summonlightningball.hpp"
-#include "summonstone.hpp"
-#include "summonwaterball.hpp"
-#include "tetravortex.hpp"
-#include "thunderstorm.hpp"
-#include "tornadostorm.hpp"
-#include "violentquake.hpp"
-#include "waterball.hpp"
-#include "whiteimprison.hpp"
+// Include .cpp files into the TU to optimize compile time
+// For reference see unity builds or amalgamated builds
+#include "allbloom.cpp"
+#include "astralstrike.cpp"
+#include "chainlightning.cpp"
+#include "coldbolt.cpp"
+#include "comet.cpp"
+#include "crimsonarrow.cpp"
+#include "crimsonrock.cpp"
+#include "crystalimpact.cpp"
+#include "deadlyprojection.cpp"
+#include "destructivehurricane.cpp"
+#include "drainlife.cpp"
+#include "earthspike.cpp"
+#include "earthstrain.cpp"
+#include "energycoat.cpp"
+#include "energyconversion.cpp"
+#include "fireball.cpp"
+#include "firebolt.cpp"
+#include "firepillar.cpp"
+#include "firewall.cpp"
+#include "floralflareroad.cpp"
+#include "frostdiver.cpp"
+#include "frostnova.cpp"
+#include "frostymisty.cpp"
+#include "frozenslash.cpp"
+#include "ganbantein.cpp"
+#include "gravitationfield.cpp"
+#include "heavensdrive.cpp"
+#include "hellinferno.cpp"
+#include "icewall.cpp"
+#include "jackfrost.cpp"
+#include "jupitelthunder.cpp"
+#include "lightningbolt.cpp"
+#include "lordofvermilion.cpp"
+#include "meteorstorm.cpp"
+#include "mysteryillusion.cpp"
+#include "napalmbeat.cpp"
+#include "napalmvulcan.cpp"
+#include "quagmire.cpp"
+#include "rainofcrystal.cpp"
+#include "readingspellbook.cpp"
+#include "release.cpp"
+#include "rockdown.cpp"
+#include "safetywall.cpp"
+#include "sense.cpp"
+#include "siennaexecrate.cpp"
+#include "sight.cpp"
+#include "sightblaster.cpp"
+#include "sightrasher.cpp"
+#include "soulexpansion.cpp"
+#include "soulstrike.cpp"
+#include "soulvulcanstrike.cpp"
+#include "stasis.cpp"
+#include "stonecurse.cpp"
+#include "stormcannon.cpp"
+#include "stormgust.cpp"
+#include "strantumtremor.cpp"
+#include "summonfireball.cpp"
+#include "summonlightningball.cpp"
+#include "summonstone.cpp"
+#include "summonwaterball.cpp"
+#include "tetravortex.cpp"
+#include "thunderstorm.cpp"
+#include "tornadostorm.cpp"
+#include "violentquake.cpp"
+#include "waterball.cpp"
+#include "whiteimprison.cpp"
 
 std::unique_ptr<const SkillImpl> SkillFactoryMage::create(const e_skill skill_id) const {
 	switch (skill_id) {

src/map/skills/mercenary/mercenary_bash.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "../../battle.hpp"
 

src/map/skills/mercenary/skill_factory_mercenary.cpp

@@ -3,10 +3,11 @@
 
 #include "skill_factory_mercenary.hpp"
 
-#include "../status_skill_impl.hpp"
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
-#include "mercenary_bash.hpp"
+// Include .cpp files into the TU to optimize compile time
+// For reference see unity builds or amalgamated builds
+#include "mercenary_bash.cpp"
 
 std::unique_ptr<const SkillImpl> SkillFactoryMercenary::create(const e_skill skill_id) const {
 	switch( skill_id ){

src/map/skills/merchant/aciddemonstration.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillAcidDemonstration : public WeaponSkillImpl {
 public:

src/map/skills/merchant/acidterror.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillAcidTerror : public WeaponSkillImpl {
 public:

src/map/skills/merchant/carttermination.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillCartTermination : public WeaponSkillImpl {
 public:

src/map/skills/merchant/crazyuproar.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillCrazyUproar : public StatusSkillImpl {
 public:

src/map/skills/merchant/mammonite.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "../../battle.hpp"
 

src/map/skills/merchant/skill_factory_merchant.cpp

@@ -5,59 +5,60 @@
 
 #include <config/core.hpp>
 
-#include "../status_skill_impl.hpp"
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
-#include "abrbattlewarior.hpp"
-#include "abrdualcannon.hpp"
-#include "abrinfinity.hpp"
-#include "abrmothernet.hpp"
-#include "aciddemonstration.hpp"
-#include "acidterror.hpp"
-#include "adrenalinerush.hpp"
-#include "advancedadrenalinerush.hpp"
-#include "aidberserkpotion.hpp"
-#include "aidcondensedpotion.hpp"
-#include "aidpotion.hpp"
-#include "alchemicalweapon.hpp"
-#include "attackmachine.hpp"
-#include "axestomp.hpp"
-#include "biochemicalhelm.hpp"
-#include "bomb.hpp"
-#include "callhomunculus.hpp"
-#include "cartrevolution.hpp"
-#include "carttermination.hpp"
-#include "changecart.hpp"
-#include "crazyuproar.hpp"
-#include "decoratecart.hpp"
-#include "energycannonade.hpp"
-#include "fullprotection.hpp"
-#include "greed.hpp"
-#include "hammerfall.hpp"
-#include "itemappraisal.hpp"
-#include "mammonite.hpp"
-#include "manufacturemachine.hpp"
-#include "mightysmash.hpp"
-#include "plantcultivation.hpp"
-#include "powerfulswing.hpp"
-#include "powerthrust.hpp"
-#include "preparepotion.hpp"
-#include "rushquake.hpp"
-#include "rushstrike.hpp"
-#include "skill_vending.hpp"
-#include "sparkblaster.hpp"
-#include "summonflora.hpp"
-#include "summonmarinesphere.hpp"
-#include "synthesizedshield.hpp"
-#include "syntheticarmor.hpp"
-#include "triplelaser.hpp"
-#include "twilightalchemy1.hpp"
-#include "twilightalchemy2.hpp"
-#include "twilightalchemy3.hpp"
-#include "upgradeweapon.hpp"
-#include "vaporize.hpp"
-#include "weaponperfection.hpp"
-#include "weaponrepair.hpp"
+// Include .cpp files into the TU to optimize compile time
+// For reference see unity builds or amalgamated builds
+#include "abrbattlewarior.cpp"
+#include "abrdualcannon.cpp"
+#include "abrinfinity.cpp"
+#include "abrmothernet.cpp"
+#include "aciddemonstration.cpp"
+#include "acidterror.cpp"
+#include "adrenalinerush.cpp"
+#include "advancedadrenalinerush.cpp"
+#include "aidberserkpotion.cpp"
+#include "aidcondensedpotion.cpp"
+#include "aidpotion.cpp"
+#include "alchemicalweapon.cpp"
+#include "attackmachine.cpp"
+#include "axestomp.cpp"
+#include "biochemicalhelm.cpp"
+#include "bomb.cpp"
+#include "callhomunculus.cpp"
+#include "cartrevolution.cpp"
+#include "carttermination.cpp"
+#include "changecart.cpp"
+#include "crazyuproar.cpp"
+#include "decoratecart.cpp"
+#include "energycannonade.cpp"
+#include "fullprotection.cpp"
+#include "greed.cpp"
+#include "hammerfall.cpp"
+#include "itemappraisal.cpp"
+#include "mammonite.cpp"
+#include "manufacturemachine.cpp"
+#include "mightysmash.cpp"
+#include "plantcultivation.cpp"
+#include "powerfulswing.cpp"
+#include "powerthrust.cpp"
+#include "preparepotion.cpp"
+#include "rushquake.cpp"
+#include "rushstrike.cpp"
+#include "skill_vending.cpp"
+#include "sparkblaster.cpp"
+#include "summonflora.cpp"
+#include "summonmarinesphere.cpp"
+#include "synthesizedshield.cpp"
+#include "syntheticarmor.cpp"
+#include "triplelaser.cpp"
+#include "twilightalchemy1.cpp"
+#include "twilightalchemy2.cpp"
+#include "twilightalchemy3.cpp"
+#include "upgradeweapon.cpp"
+#include "vaporize.cpp"
+#include "weaponperfection.cpp"
+#include "weaponrepair.cpp"
 
 std::unique_ptr<const SkillImpl> SkillFactoryMerchant::create(const e_skill skill_id) const {
 	switch (skill_id) {

src/map/skills/merchant/triplelaser.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillTripleLaser : public WeaponSkillImpl {
 public:

src/map/skills/ninja/skill_factory_ninja.cpp

@@ -3,8 +3,7 @@
 
 #include "skill_factory_ninja.hpp"
 
-#include "../status_skill_impl.hpp"
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 std::unique_ptr<const SkillImpl> SkillFactoryNinja::create(const e_skill skill_id) const {
 	switch( skill_id ){

src/map/skills/novice/helpangel.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillHelpAngel : public StatusSkillImpl {
 public:

src/map/skills/novice/megasonicblow.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillMegaSonicBlow : public WeaponSkillImpl {
 public:

src/map/skills/novice/overcomingcrisis.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillOvercomingCrisis : public StatusSkillImpl {
 public:

src/map/skills/novice/shieldchainrush.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillShieldChainRush : public WeaponSkillImpl {
 public:

src/map/skills/novice/skill_factory_novice.cpp

@@ -3,20 +3,22 @@
 
 #include "skill_factory_novice.hpp"
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
-#include "doublebowlingbash.hpp"
-#include "groundgravitation.hpp"
-#include "hellsdrive.hpp"
-#include "helpangel.hpp"
-#include "jackfrostnova.hpp"
-#include "jupitelthunderstorm.hpp"
-#include "megasonicblow.hpp"
-#include "meteorstormbuster.hpp"
-#include "napalmvulcanstrike.hpp"
-#include "overcomingcrisis.hpp"
-#include "shieldchainrush.hpp"
-#include "spiralpiercemax.hpp"
+// Include .cpp files into the TU to optimize compile time
+// For reference see unity builds or amalgamated builds
+#include "doublebowlingbash.cpp"
+#include "groundgravitation.cpp"
+#include "hellsdrive.cpp"
+#include "helpangel.cpp"
+#include "jackfrostnova.cpp"
+#include "jupitelthunderstorm.cpp"
+#include "megasonicblow.cpp"
+#include "meteorstormbuster.cpp"
+#include "napalmvulcanstrike.cpp"
+#include "overcomingcrisis.cpp"
+#include "shieldchainrush.cpp"
+#include "spiralpiercemax.cpp"
 
 std::unique_ptr<const SkillImpl> SkillFactoryNovice::create(const e_skill skill_id) const {
 	switch( skill_id ){

src/map/skills/novice/spiralpiercemax.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillSpiralPierceMax : public WeaponSkillImpl {
 public:

src/map/skills/npc/skill_factory_npc.cpp

@@ -3,8 +3,7 @@
 
 #include "skill_factory_npc.hpp"
 
-#include "../status_skill_impl.hpp"
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 std::unique_ptr<const SkillImpl> SkillFactoryNpc::create(const e_skill skill_id) const {
 	switch( skill_id ){

src/map/skills/skill_factory.cpp

@@ -6,20 +6,23 @@
 #include <memory>
 #include <vector>
 
-#include "./acolyte/skill_factory_acolyte.hpp"
-#include "./archer/skill_factory_archer.hpp"
-#include "./custom/skill_factory_custom.hpp"
-#include "./gunslinger/skill_factory_gunslinger.hpp"
-#include "./mage/skill_factory_mage.hpp"
-#include "./mercenary/skill_factory_mercenary.hpp"
-#include "./merchant/skill_factory_merchant.hpp"
-#include "./npc/skill_factory_npc.hpp"
-#include "./ninja/skill_factory_ninja.hpp"
-#include "./novice/skill_factory_novice.hpp"
-#include "./summoner/skill_factory_summoner.hpp"
-#include "./swordman/skill_factory_swordman.hpp"
-#include "./taekwon/skill_factory_taekwon.hpp"
-#include "./thief/skill_factory_thief.hpp"
+// Include .cpp files into the TU to optimize compile time
+// For reference see unity builds or amalgamated builds
+#include "./skill_impl.cpp"
+#include "./acolyte/skill_factory_acolyte.cpp"
+#include "./archer/skill_factory_archer.cpp"
+#include "./custom/skill_factory_custom.cpp"
+#include "./gunslinger/skill_factory_gunslinger.cpp"
+#include "./mage/skill_factory_mage.cpp"
+#include "./mercenary/skill_factory_mercenary.cpp"
+#include "./merchant/skill_factory_merchant.cpp"
+#include "./npc/skill_factory_npc.cpp"
+#include "./ninja/skill_factory_ninja.cpp"
+#include "./novice/skill_factory_novice.cpp"
+#include "./summoner/skill_factory_summoner.cpp"
+#include "./swordman/skill_factory_swordman.cpp"
+#include "./taekwon/skill_factory_taekwon.cpp"
+#include "./thief/skill_factory_thief.cpp"
 
 std::unique_ptr<const SkillImpl> SkillFactoryImpl::create(const e_skill skill_id) const {
 	static const std::vector<std::shared_ptr<SkillFactory>> factories = {

src/map/skills/skill_impl.cpp

@@ -3,7 +3,8 @@
 
 #include "skill_impl.hpp"
 
-#include "../status.hpp"
+#include "map/clif.hpp"
+#include "map/status.hpp"
 
 SkillImpl::SkillImpl(e_skill skill_id){
 	this->skill_id_ = skill_id;
@@ -37,6 +38,37 @@ void SkillImpl::applyAdditionalEffects(block_list*, block_list*, uint16, t_tick,
 	// no-op
 }
 
+StatusSkillImpl::StatusSkillImpl(e_skill skillId, bool end_if_running) : SkillImpl(skillId) {
+	this->end_if_running = end_if_running;
+};
+
+void StatusSkillImpl::castendNoDamageId(block_list *src, block_list *target, uint16 skill_lv, t_tick tick, int32& flag) const
+{
+	sc_type type = skill_get_sc(getSkillId());
+
+	if (type == SC_NONE) {
+		return;
+	}
+
+	if (this->end_if_running) {
+		status_change* tsc = status_get_sc(target);
+
+		if (tsc != nullptr && tsc->hasSCE(type)) {
+			clif_skill_nodamage(src, *target, getSkillId(), skill_lv, status_change_end(target, type));
+			return;
+		}
+	}
+
+	clif_skill_nodamage(src, *target, getSkillId(), skill_lv, sc_start(src, target, type, 100, skill_lv, skill_get_time(getSkillId(), skill_lv)));
+}
+
+WeaponSkillImpl::WeaponSkillImpl(e_skill skill_id) : SkillImpl(skill_id) {
+}
+
+void WeaponSkillImpl::castendDamageId(block_list* src, block_list* target, uint16 skill_lv, t_tick tick, int32& flag) const {
+	skill_attack(BF_WEAPON, src, src, target, getSkillId(), skill_lv, tick, flag);
+}
+
 SkillImplRecursiveDamageSplash::SkillImplRecursiveDamageSplash(e_skill skill_id) : SkillImpl(skill_id){
 }
 

src/map/skills/skill_impl.hpp

@@ -46,6 +46,24 @@ protected:
 	e_skill skill_id_;
 };
 
+class StatusSkillImpl : public SkillImpl
+{
+private:
+	bool end_if_running;
+
+public:
+	StatusSkillImpl(e_skill skillId, bool end_if_running = false);
+
+	virtual void castendNoDamageId(block_list *src, block_list *target, uint16 skill_lv, t_tick tick, int32& flag) const override;
+};
+
+class WeaponSkillImpl : public SkillImpl {
+public:
+	WeaponSkillImpl(e_skill skill_id);
+
+	virtual void castendDamageId(block_list* src, block_list* target, uint16 skill_lv, t_tick tick, int32& flag) const override;
+};
+
 class SkillImplRecursiveDamageSplash : public SkillImpl{
 public:
 	explicit SkillImplRecursiveDamageSplash(e_skill skill_id);

src/map/skills/status_skill_impl.cpp

@@ -1,31 +0,0 @@
-// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#include "status_skill_impl.hpp"
-
-#include "../clif.hpp"
-#include "../status.hpp"
-
-StatusSkillImpl::StatusSkillImpl(e_skill skillId, bool end_if_running) : SkillImpl(skillId) {
-	this->end_if_running = end_if_running;
-};
-
-void StatusSkillImpl::castendNoDamageId(block_list *src, block_list *target, uint16 skill_lv, t_tick tick, int32& flag) const
-{
-	sc_type type = skill_get_sc(getSkillId());
-
-	if (type == SC_NONE) {
-		return;
-	}
-
-	if (this->end_if_running) {
-		status_change* tsc = status_get_sc(target);
-
-		if (tsc != nullptr && tsc->hasSCE(type)) {
-			clif_skill_nodamage(src, *target, getSkillId(), skill_lv, status_change_end(target, type));
-			return;
-		}
-	}
-
-	clif_skill_nodamage(src, *target, getSkillId(), skill_lv, sc_start(src, target, type, 100, skill_lv, skill_get_time(getSkillId(), skill_lv)));
-}

src/map/skills/status_skill_impl.hpp

@@ -1,17 +0,0 @@
-// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#pragma once
-
-#include "skill_impl.hpp"
-
-class StatusSkillImpl : public SkillImpl
-{
-private:
-	bool end_if_running;
-
-public:
-	StatusSkillImpl(e_skill skillId, bool end_if_running = false);
-
-	virtual void castendNoDamageId(block_list *src, block_list *target, uint16 skill_lv, t_tick tick, int32& flag) const override;
-};

src/map/skills/summoner/skill_factory_summoner.cpp

@@ -3,7 +3,7 @@
 
 #include "skill_factory_summoner.hpp"
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 std::unique_ptr<const SkillImpl> SkillFactorySummoner::create(const e_skill skill_id) const {
 	switch( skill_id ){

src/map/skills/swordman/bash.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "../../battle.hpp"
 

src/map/skills/swordman/dragonicaura.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillDragonicAura : public WeaponSkillImpl {
 public:

src/map/skills/swordman/dragonicpierce.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillDragonicPierce : public WeaponSkillImpl {
 public:

src/map/skills/swordman/holycross.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillHolyCross : public WeaponSkillImpl {
 public:

src/map/skills/swordman/imperialcross.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillImperialCross : public WeaponSkillImpl {
 public:

src/map/skills/swordman/pierce.hpp

@@ -5,7 +5,7 @@
 
 #include "map/battle.hpp"
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillPierce : public WeaponSkillImpl {
 public:

src/map/skills/swordman/shieldboomerang.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillShieldBoomerang : public WeaponSkillImpl {
 public:

src/map/skills/swordman/shieldreflect.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillShieldReflect : public StatusSkillImpl {
 public:

src/map/skills/swordman/skill_factory_swordman.cpp

@@ -3,51 +3,52 @@
 
 #include "skill_factory_swordman.hpp"
 
-#include "../status_skill_impl.hpp"
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
-#include "autoberserk.hpp"
-#include "bash.hpp"
-#include "bowlingbash.hpp"
-#include "brandishspear.hpp"
-#include "counterattack.hpp"
-#include "crossrain.hpp"
-#include "dragonicaura.hpp"
-#include "dragonicbreath.hpp"
-#include "dragonicpierce.hpp"
-#include "grandcross.hpp"
-#include "grandjudgement.hpp"
-#include "guardianshield.hpp"
-#include "hackandslasher.hpp"
-#include "holycross.hpp"
-#include "imperialcross.hpp"
-#include "imperialpressure.hpp"
-#include "judgementcross.hpp"
-#include "madnesscrusher.hpp"
-#include "magnum.hpp"
-#include "overslash.hpp"
-#include "pierce.hpp"
-#include "provoke.hpp"
-#include "radiantspear.hpp"
-#include "relax.hpp"
-#include "resistantsouls.hpp"
-#include "sacrifice.hpp"
-#include "selfprovoke.hpp"
-#include "servantweapon.hpp"
-#include "servantweapondemolition.hpp"
-#include "servantweaponphantom.hpp"
-#include "servantweaponsign.hpp"
-#include "shieldboomerang.hpp"
-#include "shieldreflect.hpp"
-#include "shieldshooting.hpp"
-#include "smite.hpp"
-#include "spearboomerang.hpp"
-#include "spearstab.hpp"
-#include "spiralpierce.hpp"
-#include "stormslash.hpp"
-#include "traumaticblow.hpp"
-#include "ultimatesacrifice.hpp"
-#include "vitalstrike.hpp"
+// Include .cpp files into the TU to optimize compile time
+// For reference see unity builds or amalgamated builds
+#include "autoberserk.cpp"
+#include "bash.cpp"
+#include "bowlingbash.cpp"
+#include "brandishspear.cpp"
+#include "counterattack.cpp"
+#include "crossrain.cpp"
+#include "dragonicaura.cpp"
+#include "dragonicbreath.cpp"
+#include "dragonicpierce.cpp"
+#include "grandcross.cpp"
+#include "grandjudgement.cpp"
+#include "guardianshield.cpp"
+#include "hackandslasher.cpp"
+#include "holycross.cpp"
+#include "imperialcross.cpp"
+#include "imperialpressure.cpp"
+#include "judgementcross.cpp"
+#include "madnesscrusher.cpp"
+#include "magnum.cpp"
+#include "overslash.cpp"
+#include "pierce.cpp"
+#include "provoke.cpp"
+#include "radiantspear.cpp"
+#include "relax.cpp"
+#include "resistantsouls.cpp"
+#include "sacrifice.cpp"
+#include "selfprovoke.cpp"
+#include "servantweapon.cpp"
+#include "servantweapondemolition.cpp"
+#include "servantweaponphantom.cpp"
+#include "servantweaponsign.cpp"
+#include "shieldboomerang.cpp"
+#include "shieldreflect.cpp"
+#include "shieldshooting.cpp"
+#include "smite.cpp"
+#include "spearboomerang.cpp"
+#include "spearstab.cpp"
+#include "spiralpierce.cpp"
+#include "stormslash.cpp"
+#include "traumaticblow.cpp"
+#include "ultimatesacrifice.cpp"
+#include "vitalstrike.cpp"
 
 std::unique_ptr<const SkillImpl> SkillFactorySwordman::create(const e_skill skill_id) const {
 	switch( skill_id ){

src/map/skills/swordman/smite.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillSmite : public WeaponSkillImpl {
 public:

src/map/skills/swordman/spearboomerang.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillSpearBoomerang : public WeaponSkillImpl {
 public:

src/map/skills/swordman/spiralpierce.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillSpiralPierce : public WeaponSkillImpl {
 public:

src/map/skills/swordman/stormslash.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillStormSlash : public WeaponSkillImpl {
 public:

src/map/skills/swordman/traumaticblow.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillTraumaticBlow : public WeaponSkillImpl {
 public:

src/map/skills/taekwon/counter.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "map/battle.hpp"
 

src/map/skills/taekwon/downkick.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 #include "map/battle.hpp"
 

src/map/skills/taekwon/eska.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillEska : public StatusSkillImpl {
 public:

src/map/skills/taekwon/eske.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillEske : public StatusSkillImpl {
 public:

src/map/skills/taekwon/eswoo.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillEswoo : public StatusSkillImpl {
 public:

src/map/skills/taekwon/kaahi.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillKaahi : public StatusSkillImpl {
 public:

src/map/skills/taekwon/kaite.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillKaite : public StatusSkillImpl {
 public:

src/map/skills/taekwon/kaizel.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillKaizel : public StatusSkillImpl {
 public:

src/map/skills/taekwon/kaupe.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillKaupe : public StatusSkillImpl {
 public:

src/map/skills/taekwon/skill_factory_taekwon.cpp

@@ -3,64 +3,65 @@
 
 #include "skill_factory_taekwon.hpp"
 
-#include "../status_skill_impl.hpp"
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
-#include "circleofdirectionsandelementals.hpp"
-#include "counter.hpp"
-#include "downkick.hpp"
-#include "eska.hpp"
-#include "eske.hpp"
-#include "esma.hpp"
-#include "estin.hpp"
-#include "estun.hpp"
-#include "eswoo.hpp"
-#include "exorcismofmalicioussoul.hpp"
-#include "feelingthesunmoonandstars.hpp"
-#include "hatredofthesunmoonandstars.hpp"
-#include "highjump.hpp"
-#include "jumpkick.hpp"
-#include "kaahi.hpp"
-#include "kaite.hpp"
-#include "kaizel.hpp"
-#include "kaupe.hpp"
-#include "mission.hpp"
-#include "run.hpp"
-#include "sevenwind.hpp"
-#include "soulgathering.hpp"
-#include "soulofheavenandearth.hpp"
-#include "spiritofrebirth.hpp"
-#include "spiritofthealchemist.hpp"
-#include "spiritoftheartist.hpp"
-#include "spiritoftheassasin.hpp"
-#include "spiritoftheblacksmith.hpp"
-#include "spiritofthecrusader.hpp"
-#include "spiritofthehunter.hpp"
-#include "spiritoftheknight.hpp"
-#include "spiritofthemonk.hpp"
-#include "spiritofthepriest.hpp"
-#include "spiritoftherogue.hpp"
-#include "spiritofthesage.hpp"
-#include "spiritofthesoullinker.hpp"
-#include "spiritofthestargladiator.hpp"
-#include "spiritofthesupernovice.hpp"
-#include "spiritofthewizard.hpp"
-#include "stormkick.hpp"
-#include "talismanofblacktortoise.hpp"
-#include "talismanofbluedragon.hpp"
-#include "talismanoffiveelements.hpp"
-#include "talismanoffourbearinggod.hpp"
-#include "talismanofmagician.hpp"
-#include "talismanofprotection.hpp"
-#include "talismanofredphoenix.hpp"
-#include "talismanofsoulstealing.hpp"
-#include "talismanofwarrior.hpp"
-#include "talismanofwhitetiger.hpp"
-#include "totemoftutelary.hpp"
-#include "turnkick.hpp"
-#include "warmthofthemoon.hpp"
-#include "warmthofthestars.hpp"
-#include "warmthofthesun.hpp"
+// Include .cpp files into the TU to optimize compile time
+// For reference see unity builds or amalgamated builds
+#include "circleofdirectionsandelementals.cpp"
+#include "counter.cpp"
+#include "downkick.cpp"
+#include "eska.cpp"
+#include "eske.cpp"
+#include "esma.cpp"
+#include "estin.cpp"
+#include "estun.cpp"
+#include "eswoo.cpp"
+#include "exorcismofmalicioussoul.cpp"
+#include "feelingthesunmoonandstars.cpp"
+#include "hatredofthesunmoonandstars.cpp"
+#include "highjump.cpp"
+#include "jumpkick.cpp"
+#include "kaahi.cpp"
+#include "kaite.cpp"
+#include "kaizel.cpp"
+#include "kaupe.cpp"
+#include "mission.cpp"
+#include "run.cpp"
+#include "sevenwind.cpp"
+#include "soulgathering.cpp"
+#include "soulofheavenandearth.cpp"
+#include "spiritofrebirth.cpp"
+#include "spiritofthealchemist.cpp"
+#include "spiritoftheartist.cpp"
+#include "spiritoftheassasin.cpp"
+#include "spiritoftheblacksmith.cpp"
+#include "spiritofthecrusader.cpp"
+#include "spiritofthehunter.cpp"
+#include "spiritoftheknight.cpp"
+#include "spiritofthemonk.cpp"
+#include "spiritofthepriest.cpp"
+#include "spiritoftherogue.cpp"
+#include "spiritofthesage.cpp"
+#include "spiritofthesoullinker.cpp"
+#include "spiritofthestargladiator.cpp"
+#include "spiritofthesupernovice.cpp"
+#include "spiritofthewizard.cpp"
+#include "stormkick.cpp"
+#include "talismanofblacktortoise.cpp"
+#include "talismanofbluedragon.cpp"
+#include "talismanoffiveelements.cpp"
+#include "talismanoffourbearinggod.cpp"
+#include "talismanofmagician.cpp"
+#include "talismanofprotection.cpp"
+#include "talismanofredphoenix.cpp"
+#include "talismanofsoulstealing.cpp"
+#include "talismanofwarrior.cpp"
+#include "talismanofwhitetiger.cpp"
+#include "totemoftutelary.cpp"
+#include "turnkick.cpp"
+#include "warmthofthemoon.cpp"
+#include "warmthofthestars.cpp"
+#include "warmthofthesun.cpp"
 
 std::unique_ptr<const SkillImpl> SkillFactoryTaekwon::create(const e_skill skill_id) const {
 	switch (skill_id) {

src/map/skills/thief/counterinstinct.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillCounterInstinct : public StatusSkillImpl {
 public:

src/map/skills/thief/crossimpact.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillCrossImpact : public WeaponSkillImpl {
 public:

src/map/skills/thief/crossripperslasher.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillCrossRipperSlasher : public WeaponSkillImpl {
 public:

src/map/skills/thief/darkclaw.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillDarkClaw : public WeaponSkillImpl {
 public:

src/map/skills/thief/darkillusion.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillDarkIllusion : public WeaponSkillImpl {
 public:

src/map/skills/thief/enchantdeadlypoison.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillEnchantDeadlyPoison : public StatusSkillImpl {
 public:

src/map/skills/thief/envenom.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillEnvenom : public WeaponSkillImpl {
 public:

src/map/skills/thief/eternalslash.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../weapon_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillEternalSlash : public WeaponSkillImpl {
 public:

src/map/skills/thief/hallucinationwalk.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../status_skill_impl.hpp"
+#include "../skill_impl.hpp"
 
 class SkillHallucinationWalk : public StatusSkillImpl {
 public: