Final move of files to a better place. Only thing in the root is very common stuff.

src/ai/ai.hpp

@@ -5,7 +5,7 @@
 #include <limits>
 #include <optional>
 #include <nlohmann/json.hpp>
-#include "config.hpp"
+#include "game/config.hpp"
 #include "goap.hpp"
 
 namespace ai {

src/ai/goap.hpp

@@ -5,7 +5,7 @@
 #include <limits>
 #include <optional>
 #include <nlohmann/json.hpp>
-#include "config.hpp"
+#include "game/config.hpp"
 
 namespace ai {
   // ZED: I don't know if this is the best place for this

src/algos/matrix.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "shiterator.hpp"
+#include "algos/shiterator.hpp"
 
 namespace matrix {
   using Row = shiterator::BaseRow<int>;

src/algos/maze.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include "algos/matrix.hpp"
-#include "map.hpp"
+#include "game/map.hpp"
 
 namespace maze {
 

src/algos/pathing.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "point.hpp"
+#include "algos/point.hpp"
 #include "algos/matrix.hpp"
 #include <functional>
 

src/algos/shiterator.hpp

@@ -6,7 +6,7 @@
 #include <numeric>
 #include <algorithm>
 #include <fmt/core.h>
-#include "point.hpp"
+#include "algos/point.hpp"
 #include "algos/rand.hpp"
 #include "dbc.hpp"
 

src/algos/spatialmap.hpp

@@ -1,9 +1,9 @@
 #pragma once
 #include <vector>
 #include <unordered_map>
-#include "map.hpp"
-#include "dinkyecs.hpp"
-#include "point.hpp"
+#include "game/map.hpp"
+#include "algos/dinkyecs.hpp"
+#include "algos/point.hpp"
 
 struct CollisionData {
   DinkyECS::Entity entity = DinkyECS::NONE;

src/boss/fight.cpp

@@ -1,7 +1,7 @@
 #define FSM_DEBUG 1
 #include "boss/fight.hpp"
 #include "boss/system.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include <iostream>
 #include "algos/rand.hpp"
 #include "events.hpp"

src/boss/fight.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "simplefsm.hpp"
-#include "dinkyecs.hpp"
+#include "algos/simplefsm.hpp"
+#include "algos/dinkyecs.hpp"
 #include "boss/ui.hpp"
 #include "events.hpp"
 #include "combat/battle.hpp"

src/boss/system.cpp

@@ -1,7 +1,7 @@
 #include "boss/system.hpp"
 #include <fmt/core.h>
-#include "components.hpp"
-#include "game_level.hpp"
+#include "game/components.hpp"
+#include "game/level.hpp"
 #include "ai/ai.hpp"
 #include "combat/battle.hpp"
 

src/boss/system.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 #include <memory>
 #include "boss/fight.hpp"
 

src/boss/ui.cpp

@@ -1,9 +1,9 @@
 #include "boss/ui.hpp"
 #include "graphics/scene.hpp"
 #include "constants.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include <fmt/xchar.h>
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "gui/guecstra.hpp"
 #include "events.hpp"
 

src/combat/battle.cpp

@@ -1,4 +1,4 @@
-#include "rituals.hpp"
+#include "game/rituals.hpp"
 #include "combat/battle.hpp"
 
 namespace combat {

src/combat/battle.hpp

@@ -1,9 +1,9 @@
 #pragma once
-#include "rituals.hpp"
-#include "config.hpp"
-#include "dinkyecs.hpp"
+#include "game/rituals.hpp"
+#include "game/config.hpp"
+#include "algos/dinkyecs.hpp"
 #include <optional>
-#include "components.hpp"
+#include "game/components.hpp"
 #include <unordered_map>
 
 namespace combat {

src/combat/combat.cpp

@@ -1,4 +1,4 @@
-#include "components.hpp"
+#include "game/components.hpp"
 #include "algos/rand.hpp"
 
 namespace components {

src/game/autowalker.cpp

@@ -1,8 +1,8 @@
-#include "autowalker.hpp"
+#include "game/autowalker.hpp"
 #include "ai/ai_debug.hpp"
 #include "gui/ritual_ui.hpp"
-#include "game_level.hpp"
-#include "systems.hpp"
+#include "game/level.hpp"
+#include "game/systems.hpp"
 
 struct InventoryStats {
   int healing = 0;

src/game/components.cpp

@@ -1,6 +1,6 @@
-#include "components.hpp"
+#include "game/components.hpp"
 
-#include "point.hpp"
+#include "algos/point.hpp"
 
 namespace components {
   static ComponentMap MAP;

src/game/components.hpp

@@ -1,8 +1,8 @@
 #pragma once
-#include "config.hpp"
+#include "game/config.hpp"
 #include "constants.hpp"
-#include "dinkyecs.hpp"
-#include "point.hpp"
+#include "algos/dinkyecs.hpp"
+#include "algos/point.hpp"
 #include <SFML/Graphics/Rect.hpp>
 #include <SFML/Graphics/Shader.hpp>
 #include <SFML/Graphics/Sprite.hpp>
@@ -10,7 +10,7 @@
 #include <SFML/System/Vector2.hpp>
 #include <functional>
 #include <optional>
-#include "json_mods.hpp"
+#include "game/json_mods.hpp"
 #include "ai/goap.hpp"
 #include <array>
 

src/game/config.cpp

@@ -1,4 +1,4 @@
-#include "config.hpp"
+#include "game/config.hpp"
 #include "dbc.hpp"
 #include <fmt/core.h>
 

src/game/inventory.cpp

@@ -1,4 +1,4 @@
-#include "inventory.hpp"
+#include "game/inventory.hpp"
 
 namespace inventory {
   bool Model::add(const std::string in_slot, DinkyECS::Entity ent) {

src/game/inventory.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 #include <unordered_map>
 
 // BUG: this should have a bool for "permanent" or "constant" so that

src/game/level.cpp

@@ -1,10 +1,9 @@
-#include "game_level.hpp"
-#include "components.hpp"
-#include "worldbuilder.hpp"
+#include "game/level.hpp"
+#include "game/components.hpp"
+#include "game/worldbuilder.hpp"
 #include "constants.hpp"
-#include "systems.hpp"
-#include "components.hpp"
-#include "rituals.hpp"
+#include "game/systems.hpp"
+#include "game/rituals.hpp"
 #include "graphics/textures.hpp"
 #include <list>
 

src/game/level.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 #include "boss/ui.hpp"
 #include "graphics/lights.hpp"
-#include "map.hpp"
+#include "game/map.hpp"
 #include <memory>
 #include "algos/spatialmap.hpp"
 

src/game/map.cpp

@@ -1,4 +1,4 @@
-#include "map.hpp"
+#include "game/map.hpp"
 #include "dbc.hpp"
 #include "algos/rand.hpp"
 #include <vector>

src/game/map.hpp

@@ -5,7 +5,7 @@
 #include <random>
 #include <algorithm>
 #include <fmt/core.h>
-#include "point.hpp"
+#include "algos/point.hpp"
 #include "graphics/lights.hpp"
 #include "algos/pathing.hpp"
 #include "algos/matrix.hpp"

src/game/rituals.cpp

@@ -1,4 +1,4 @@
-#include "rituals.hpp"
+#include "game/rituals.hpp"
 #include "ai/ai_debug.hpp"
 #include "ai/ai.hpp"
 

src/game/rituals.hpp

@@ -1,8 +1,8 @@
 #pragma once
 #include "ai/goap.hpp"
 #include "ai/ai.hpp"
-#include "config.hpp"
-#include "components.hpp"
+#include "game/config.hpp"
+#include "game/components.hpp"
 
 namespace ritual {
   using JunkItem = std::string;

src/game/sound.cpp

@@ -1,7 +1,7 @@
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "dbc.hpp"
 #include <fmt/core.h>
-#include "config.hpp"
+#include "game/config.hpp"
 
 namespace sound {
   static SoundManager SMGR;

src/game/systems.cpp

@@ -1,4 +1,4 @@
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include <fmt/core.h>
 #include <string>
 #include <cmath>
@@ -7,16 +7,16 @@
 #include "dbc.hpp"
 #include "graphics/lights.hpp"
 #include "events.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "ai/ai.hpp"
 #include "ai/ai_debug.hpp"
-#include "shiterator.hpp"
-#include "rituals.hpp"
+#include "algos/shiterator.hpp"
+#include "game/rituals.hpp"
 #include "combat/battle.hpp"
 #include <iostream>
 #include "graphics/shaders.hpp"
-#include "inventory.hpp"
-#include "game_level.hpp"
+#include "game/inventory.hpp"
+#include "game/level.hpp"
 #include "events.hpp"
 #include "graphics/animation.hpp"
 

src/game/systems.hpp

@@ -1,9 +1,9 @@
 #pragma once
-#include "components.hpp"
+#include "game/components.hpp"
 #include <SFML/Graphics/RenderTexture.hpp>
-#include "map.hpp"
+#include "game/map.hpp"
 #include "algos/spatialmap.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 
 namespace System {
   using namespace components;

src/game/worldbuilder.cpp

@@ -1,13 +1,13 @@
-#include "worldbuilder.hpp"
+#include "game/worldbuilder.hpp"
 #include "algos/rand.hpp"
 #include <fmt/core.h>
 #include <iostream>
-#include "components.hpp"
-#include "rituals.hpp"
+#include "game/components.hpp"
+#include "game/rituals.hpp"
 #include "algos/maze.hpp"
 #include "graphics/textures.hpp"
-#include "inventory.hpp"
-#include "systems.hpp"
+#include "game/inventory.hpp"
+#include "game/systems.hpp"
 #include "graphics/animation.hpp"
 
 using namespace fmt;

src/game/worldbuilder.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "map.hpp"
-#include "dinkyecs.hpp"
-#include "components.hpp"
+#include "game/map.hpp"
+#include "algos/dinkyecs.hpp"
+#include "game/components.hpp"
 #include "algos/spatialmap.hpp"
 
 class WorldBuilder {

src/graphics/animation.cpp

@@ -5,8 +5,8 @@
 #include "algos/rand.hpp"
 #include <iostream>
 #include <fstream>
-#include "sound.hpp"
-#include "components.hpp"
+#include "game/sound.hpp"
+#include "game/components.hpp"
 
 constexpr float SUB_FRAME_SENSITIVITY = 0.999f;
 

src/graphics/animation.hpp

@@ -10,9 +10,9 @@
 #include <functional>
 #include "graphics/easing.hpp"
 #include <fmt/core.h>
-#include "json_mods.hpp"
+#include "game/json_mods.hpp"
 #include <source_location>
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 
 namespace animation {
 

src/graphics/camera.cpp

@@ -1,7 +1,7 @@
 #include "graphics/camera.hpp"
 #include <unordered_map>
-#include "components.hpp"
-#include "config.hpp"
+#include "game/components.hpp"
+#include "game/config.hpp"
 #include <algorithm>
 #include <iostream>
 #include <cstdlib>

src/graphics/lights.hpp

@@ -1,11 +1,11 @@
 #pragma once
 #include <array>
 #include "dbc.hpp"
-#include "point.hpp"
+#include "algos/point.hpp"
 #include <algorithm>
 #include "algos/matrix.hpp"
 #include "algos/pathing.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 
 namespace lighting {
   using components::LightSource;

src/graphics/palette.cpp

@@ -1,6 +1,6 @@
 #include <fmt/core.h>
 #include "graphics/palette.hpp"
-#include "config.hpp"
+#include "game/config.hpp"
 #include "dbc.hpp"
 
 namespace palette {

src/graphics/raycaster.cpp

@@ -7,9 +7,9 @@
 #include <fmt/core.h>
 #include <memory>
 #include <numbers>
-#include "components.hpp"
+#include "game/components.hpp"
 #include "graphics/textures.hpp"
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/animation.hpp"
 

src/graphics/raycaster.hpp

@@ -3,7 +3,7 @@
 #include <SFML/Graphics.hpp>
 #include <SFML/System/Clock.hpp>
 #include "algos/spatialmap.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "graphics/textures.hpp"
 
 using matrix::Matrix;

src/graphics/scene.hpp

@@ -8,7 +8,7 @@
 #include "graphics/camera.hpp"
 #include <functional>
 #include "graphics/animation.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 
 namespace scene {
   using std::shared_ptr;

src/graphics/shaders.cpp

@@ -2,7 +2,7 @@
 #include <SFML/Graphics/Image.hpp>
 #include "dbc.hpp"
 #include <fmt/core.h>
-#include "config.hpp"
+#include "game/config.hpp"
 #include "constants.hpp"
 #include <memory>
 

src/graphics/textures.cpp

@@ -2,7 +2,7 @@
 #include <SFML/Graphics/Image.hpp>
 #include "dbc.hpp"
 #include <fmt/core.h>
-#include "config.hpp"
+#include "game/config.hpp"
 #include "constants.hpp"
 #include <memory>
 #include <filesystem>

src/gui/backend.cpp

@@ -1,8 +1,8 @@
 #include "backend.hpp"
 #include "graphics/shaders.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "graphics/textures.hpp"
-#include "config.hpp"
+#include "game/config.hpp"
 #include "graphics/palette.hpp"
 
 namespace sfml {

src/gui/combat_ui.cpp

@@ -1,8 +1,8 @@
 #include "constants.hpp"
-#include "rituals.hpp"
+#include "game/rituals.hpp"
 #include <fmt/xchar.h>
 #include "gui/guecstra.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "gui/combat_ui.hpp"
 
 namespace gui {

src/gui/debug_ui.cpp

@@ -4,7 +4,7 @@
 #include <optional>
 #include <fmt/core.h>
 #include <fmt/xchar.h>
-#include "components.hpp"
+#include "game/components.hpp"
 
 namespace gui {
   using namespace guecs;

src/gui/debug_ui.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <SFML/Graphics/Font.hpp>
 #include <guecs/ui.hpp>

src/gui/dnd_loot.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "simplefsm.hpp"
+#include "algos/simplefsm.hpp"
 #include <guecs/ui.hpp>
 #include "gui/status_ui.hpp"
 #include "gui/loot_ui.hpp"

src/gui/event_router.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "events.hpp"
 #include "events.hpp"
-#include "simplefsm.hpp"
+#include "algos/simplefsm.hpp"
 #include <SFML/Graphics.hpp>
 
 namespace gui {

src/gui/fsm.cpp

@@ -3,15 +3,15 @@
 #include <chrono>
 #include <numeric>
 #include <functional>
-#include "components.hpp"
+#include "game/components.hpp"
 #include <numbers>
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include "events.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "graphics/shaders.hpp"
 #include <fmt/xchar.h>
 #include "gui/guecstra.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "boss/system.hpp"
 
 namespace gui {

src/gui/fsm.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "constants.hpp"
-#include "simplefsm.hpp"
+#include "algos/simplefsm.hpp"
 #include "gui/debug_ui.hpp"
 #include "gui/main_ui.hpp"
 #include "gui/combat_ui.hpp"

src/gui/guecstra.cpp

@@ -1,5 +1,5 @@
 #include "gui/guecstra.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 
 namespace guecs {
 

src/gui/guecstra.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "components.hpp"
+#include "game/components.hpp"
 #include "events.hpp"
 #include <guecs/ui.hpp>
 #include "graphics/textures.hpp"

src/gui/loot_ui.cpp

@@ -1,8 +1,8 @@
 #include "gui/loot_ui.hpp"
 #include "constants.hpp"
 #include <fmt/xchar.h>
-#include "systems.hpp"
-#include "game_level.hpp"
+#include "game/systems.hpp"
+#include "game/level.hpp"
 
 namespace gui {
   using namespace guecs;

src/gui/loot_ui.hpp

@@ -4,7 +4,7 @@
 #include <SFML/Graphics/Font.hpp>
 #include <guecs/ui.hpp>
 #include "events.hpp"
-#include "inventory.hpp"
+#include "game/inventory.hpp"
 
 namespace gui {
   class LootUI {

src/gui/main_ui.cpp

@@ -1,9 +1,9 @@
 #include "gui/main_ui.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include <fmt/xchar.h>
 #include "graphics/animation.hpp"
 #include "constants.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "ai/ai.hpp"
 
 namespace gui {

src/gui/map_view.cpp

@@ -2,16 +2,16 @@
 #include <functional>
 #include <string>
 #include "dbc.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include "algos/rand.hpp"
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include "algos/rand.hpp"
 #include <codecvt>
 #include <iostream>
 #include <fmt/xchar.h>
 #include <fstream>
 #include "graphics/palette.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 
 constexpr const int MAP_WIDTH=13;
 constexpr const int MAP_HEIGHT=13;

src/gui/map_view.hpp

@@ -3,8 +3,8 @@
 #include "algos/matrix.hpp"
 #include <guecs/ui.hpp>
 #include <string>
-#include "dinkyecs.hpp"
-#include "map.hpp"
+#include "algos/dinkyecs.hpp"
+#include "game/map.hpp"
 
 namespace gui {
   class MapViewUI {

src/gui/mini_map.cpp

@@ -2,9 +2,9 @@
 #include <functional>
 #include <string>
 #include "dbc.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include "algos/rand.hpp"
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include "algos/rand.hpp"
 #include <codecvt>
 #include <iostream>

src/gui/overlay_ui.cpp

@@ -3,7 +3,7 @@
 #include "constants.hpp"
 #include "events.hpp"
 #include <optional>
-#include "game_level.hpp"
+#include "game/level.hpp"
 
 namespace gui {
   using namespace guecs;

src/gui/ritual_ui.cpp

@@ -1,9 +1,9 @@
 #include "gui/ritual_ui.hpp"
 #include <guecs/ui.hpp>
 #include "algos/rand.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "events.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 
 namespace gui {
   namespace ritual {

src/gui/ritual_ui.hpp

@@ -3,8 +3,8 @@
 #include <deque>
 #include "graphics/textures.hpp"
 #include <guecs/ui.hpp>
-#include "rituals.hpp"
-#include "simplefsm.hpp"
+#include "game/rituals.hpp"
+#include "algos/simplefsm.hpp"
 #include "graphics/animation.hpp"
 
 namespace gui {

src/gui/status_ui.cpp

@@ -1,12 +1,12 @@
 #include "gui/status_ui.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include <guecs/ui.hpp>
 #include "algos/rand.hpp"
 #include <fmt/xchar.h>
 #include "gui/guecstra.hpp"
-#include "systems.hpp"
-#include "inventory.hpp"
-#include "game_level.hpp"
+#include "game/systems.hpp"
+#include "game/inventory.hpp"
+#include "game/level.hpp"
 
 namespace gui {
   using namespace guecs;

src/main.cpp

@@ -1,12 +1,12 @@
 #include "gui/fsm.hpp"
 #include "graphics/textures.hpp"
-#include "sound.hpp"
-#include "autowalker.hpp"
+#include "game/sound.hpp"
+#include "game/autowalker.hpp"
 #include "ai/ai.hpp"
 #include <iostream>
 #include "graphics/shaders.hpp"
 #include "gui/backend.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "graphics/camera.hpp"
 
 int main(int argc, char* argv[]) {

src/meson.build

@@ -33,15 +33,15 @@ sources = files(
   'storyboard/ui.cpp',
 
   # graphics
-  'graphics/textures.cpp',
-  'graphics/palette.cpp',
-  'graphics/shaders.cpp',
-  'graphics/scene.cpp',
   'graphics/animation.cpp',
-  'graphics/lights.cpp',
-  'graphics/raycaster.cpp',
-  'graphics/easing.cpp',
   'graphics/camera.cpp',
+  'graphics/easing.cpp',
+  'graphics/lights.cpp',
+  'graphics/palette.cpp',
+  'graphics/raycaster.cpp',
+  'graphics/scene.cpp',
+  'graphics/shaders.cpp',
+  'graphics/textures.cpp',
 
   # algos
   'algos/matrix.cpp',
@@ -52,16 +52,16 @@ sources = files(
   'algos/stats.cpp',
 
   # game
-  'systems.cpp',
-  'worldbuilder.cpp',
-  'rituals.cpp',
-  'inventory.cpp',
-  'autowalker.cpp',
-  'components.cpp',
-  'game_level.cpp',
-  'config.cpp',
-  'map.cpp',
-  'sound.cpp',
+  'game/worldbuilder.cpp',
+  'game/map.cpp',
+  'game/level.cpp',
+  'game/inventory.cpp',
+  'game/autowalker.cpp',
+  'game/rituals.cpp',
+  'game/sound.cpp',
+  'game/systems.cpp',
+  'game/components.cpp',
+  'game/config.cpp',
 
   # root
   'dbc.cpp',

src/storyboard/ui.cpp

@@ -1,7 +1,7 @@
 #include "storyboard/ui.hpp"
-#include "components.hpp"
-#include "sound.hpp"
-#include "config.hpp"
+#include "game/components.hpp"
+#include "game/sound.hpp"
+#include "game/config.hpp"
 #include <chrono>
 #include <iostream>
 #include <locale>

src/storyboard/ui.hpp

@@ -3,7 +3,7 @@
 #include <guecs/ui.hpp>
 #include "graphics/camera.hpp"
 #include <SFML/Audio/Sound.hpp>
-#include "components.hpp"
+#include "game/components.hpp"
 
 namespace storyboard {
 

tests/ai.cpp

@@ -3,7 +3,7 @@
 #include "ai/ai.hpp"
 #include "ai/ai_debug.hpp"
 #include <iostream>
-#include "rituals.hpp"
+#include "game/rituals.hpp"
 
 using namespace dbc;
 using namespace nlohmann;

tests/animation.cpp

@@ -1,15 +1,15 @@
 #include <catch2/catch_test_macros.hpp>
 #include "graphics/textures.hpp"
-#include "dinkyecs.hpp"
-#include "config.hpp"
+#include "algos/dinkyecs.hpp"
+#include "game/config.hpp"
 #include <iostream>
 #include <memory>
 #include <chrono>
 #include <thread>
 #include "algos/rand.hpp"
 #include "graphics/animation.hpp"
-#include "sound.hpp"
-#include "components.hpp"
+#include "game/sound.hpp"
+#include "game/components.hpp"
 
 using namespace components;
 using namespace textures;

tests/battle.cpp

@@ -1,14 +1,14 @@
 #include <catch2/catch_test_macros.hpp>
 #include <iostream>
 #include <set>
-#include "rituals.hpp"
+#include "game/rituals.hpp"
 #include "combat/battle.hpp"
-#include "simplefsm.hpp"
-#include "dinkyecs.hpp"
+#include "algos/simplefsm.hpp"
+#include "algos/dinkyecs.hpp"
 #include "boss/system.hpp"
 #include "gui/backend.hpp"
-#include "game_level.hpp"
-#include "components.hpp"
+#include "game/level.hpp"
+#include "game/components.hpp"
 #include "ai/ai.hpp"
 #include "graphics/palette.hpp"
 

tests/components.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
-#include "components.hpp"
-#include "dinkyecs.hpp"
-#include "config.hpp"
+#include "game/components.hpp"
+#include "algos/dinkyecs.hpp"
+#include "game/config.hpp"
 #include <iostream>
 
 using namespace components;

tests/config.cpp

@@ -1,5 +1,5 @@
 #include <catch2/catch_test_macros.hpp>
-#include "config.hpp"
+#include "game/config.hpp"
 #include <iostream>
 
 TEST_CASE("confirm basic config loader ops", "[config]") {

tests/dinkyecs.cpp

@@ -1,5 +1,5 @@
 #include <catch2/catch_test_macros.hpp>
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 #include <iostream>
 #include <fmt/core.h>
 

tests/fsm.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "simplefsm.hpp"
+#include "algos/simplefsm.hpp"
 
 using namespace fmt;
 using std::string;

tests/inventory.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "inventory.hpp"
+#include "game/inventory.hpp"
 
 using namespace fmt;
 

tests/lighting.cpp

@@ -2,10 +2,10 @@
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
 #include <fstream>
-#include "map.hpp"
-#include "game_level.hpp"
+#include "game/map.hpp"
+#include "game/level.hpp"
 #include "graphics/lights.hpp"
-#include "point.hpp"
+#include "algos/point.hpp"
 
 using namespace lighting;
 

tests/loot.cpp

@@ -1,8 +1,8 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "components.hpp"
-#include "dinkyecs.hpp"
+#include "game/components.hpp"
+#include "algos/dinkyecs.hpp"
 
 using namespace fmt;
 using namespace components;

tests/map.cpp

@@ -2,9 +2,9 @@
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
 #include <fstream>
-#include "map.hpp"
-#include "game_level.hpp"
-#include "systems.hpp"
+#include "game/map.hpp"
+#include "game/level.hpp"
+#include "game/systems.hpp"
 #include <cmath>
 #include "graphics/textures.hpp"
 

tests/matrix.cpp

@@ -1,13 +1,13 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "config.hpp"
+#include "game/config.hpp"
 #include "algos/matrix.hpp"
 #include "algos/rand.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include <nlohmann/json.hpp>
 #include <fstream>
-#include "map.hpp"
+#include "game/map.hpp"
 #include <memory>
 #include "graphics/textures.hpp"
 

tests/pathing.cpp

@@ -5,11 +5,11 @@
 #include "algos/pathing.hpp"
 #include "algos/matrix.hpp"
 #include "ai/ai.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include <chrono>
 #include <thread>
 #include "algos/rand.hpp"
-#include "systems.hpp"
+#include "game/systems.hpp"
 
 using namespace fmt;
 using namespace nlohmann;

tests/rituals.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <iostream>
-#include "rituals.hpp"
-#include "simplefsm.hpp"
+#include "game/rituals.hpp"
+#include "algos/simplefsm.hpp"
 
 TEST_CASE("ritual::Engine basic tests", "[rituals]") {
   ritual::Engine re("assets/rituals.json");

tests/save.cpp

@@ -1,13 +1,13 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "dinkyecs.hpp"
-#include "components.hpp"
+#include "algos/dinkyecs.hpp"
+#include "game/components.hpp"
 #include "save.hpp"
 #include <optional>
 #include <iostream>
-#include "map.hpp"
-#include "worldbuilder.hpp"
+#include "game/map.hpp"
+#include "game/worldbuilder.hpp"
 #include "tser.hpp"
 
 using namespace fmt;

tests/sound.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "sound.hpp"
+#include "game/sound.hpp"
 
 using namespace fmt;
 

tests/spatialmap.cpp

@@ -2,7 +2,7 @@
 #include <fmt/core.h>
 #include <string>
 #include "algos/spatialmap.hpp"
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 #include "algos/rand.hpp"
 #include <limits>
 #include <fmt/core.h>

tests/systems.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include <cmath>
 #include <numbers>
 

tests/textures.cpp

@@ -3,7 +3,7 @@
 #include <string>
 #include "graphics/textures.hpp"
 #include "constants.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 
 using namespace fmt;
 

tools/animator.cpp

@@ -1,5 +1,5 @@
 #define FSM_DEBUG 1
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "ai/ai.hpp"
 #include <iostream>
 #include "graphics/shaders.hpp"

tools/arena.cpp

@@ -1,11 +1,11 @@
 #include "graphics/textures.hpp"
-#include "sound.hpp"
-#include "autowalker.hpp"
+#include "game/sound.hpp"
+#include "game/autowalker.hpp"
 #include "ai/ai.hpp"
 #include <iostream>
 #include "graphics/shaders.hpp"
 #include "gui/backend.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "boss/system.hpp"
 #include "events.hpp"
 #include "constants.hpp"

tools/arena_ui.cpp

@@ -1,5 +1,5 @@
 #include "arena_ui.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include <fmt/xchar.h>
 
 namespace arena {

tools/arena_ui.hpp

@@ -3,7 +3,7 @@
 #include <SFML/Graphics/Font.hpp>
 #include "guecs.hpp"
 #include "graphics/textures.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include <SFML/System/Clock.hpp>
 
 // aspect ratio of art is 3/2 so 1.5

tools/icongen.cpp

@@ -3,9 +3,9 @@
 #include <SFML/Graphics.hpp>
 #include <SFML/Graphics/RenderWindow.hpp>
 #include "constants.hpp"
-#include "config.hpp"
+#include "game/config.hpp"
 #include <filesystem>
-#include "shiterator.hpp"
+#include "algos/shiterator.hpp"
 #include <functional>
 #include <iostream>
 #include "graphics/textures.hpp"

tools/storyboard.cpp

@@ -1,6 +1,6 @@
 #include "gui/fsm.hpp"
 #include "graphics/textures.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include <iostream>
 #include "graphics/shaders.hpp"
 #include "constants.hpp"