Feature/status debuffs

.clang-format

@@ -8,7 +8,7 @@ DerivePointerAlignment: false
 PointerAlignment: Left
 
 # Less-compact, but more Git friendly style options.
-AlignAfterOpenBracket: AlwaysBreak
+AlignAfterOpenBracket: AldestinationwaysBreak
 BinPackArguments: false
 BinPackParameters: false
 AlignTrailingComments: false

.gitignore

@@ -125,3 +125,6 @@ saves/
 game.sav
 build_web/
 docs/
+
+# clang
+.cache/

app/CMakeLists.txt

@@ -5,6 +5,7 @@ target_include_directories(${PROJECT_NAME}
 
 # Ensure the C++20 standard is available.
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
+set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
 
 # Enforce UTF-8 encoding on MSVC.
 if (MSVC)

app/include/colours.hpp

@@ -1,27 +1,26 @@
-
 #pragma once
 
 #include <libtcod.hpp>
 
 namespace cpprl {
-static constexpr auto WHITE = tcod::ColorRGB{200, 200, 200};
-static constexpr auto RED = tcod::ColorRGB{255, 0, 0};
-static constexpr auto DARK_RED = tcod::ColorRGB{191, 0, 0};
-static constexpr auto BLACK = tcod::ColorRGB{40, 42, 54};
-static constexpr auto BLACK_DARK = tcod::ColorRGB{18, 19, 18};
-static constexpr auto GREY = tcod::ColorRGB{128, 128, 128};
-static constexpr auto GREEN = tcod::ColorRGB{0, 255, 0};
-static constexpr auto DARK_GREEN = tcod::ColorRGB{0, 191, 0};
-static constexpr auto BLUE = tcod::ColorRGB{0, 0, 255};
-static constexpr auto DARK_BLUE = tcod::ColorRGB{0, 0, 191};
-static constexpr auto TEAL = tcod::ColorRGB{0, 128, 128};
-static constexpr auto DARK_GREY = tcod::ColorRGB{64, 64, 64};
-static constexpr auto LIGHT_BLUE = tcod::ColorRGB{0, 128, 255};
+  static constexpr auto WHITE = tcod::ColorRGB{200, 200, 200};
+  static constexpr auto RED = tcod::ColorRGB{255, 0, 0};
+  static constexpr auto DARK_RED = tcod::ColorRGB{191, 0, 0};
+  static constexpr auto BLACK = tcod::ColorRGB{40, 42, 54};
+  static constexpr auto BLACK_DARK = tcod::ColorRGB{18, 19, 18};
+  static constexpr auto GREY = tcod::ColorRGB{128, 128, 128};
+  static constexpr auto GREEN = tcod::ColorRGB{0, 255, 0};
+  static constexpr auto DARK_GREEN = tcod::ColorRGB{0, 191, 0};
+  static constexpr auto BLUE = tcod::ColorRGB{0, 0, 255};
+  static constexpr auto DARK_BLUE = tcod::ColorRGB{0, 0, 191};
+  static constexpr auto TEAL = tcod::ColorRGB{0, 128, 128};
+  static constexpr auto DARK_GREY = tcod::ColorRGB{64, 64, 64};
+  static constexpr auto LIGHT_BLUE = tcod::ColorRGB{0, 128, 255};
 
-static constexpr auto BAR_TEXT = WHITE;
-static constexpr auto INVALID = tcod::ColorRGB{0xFF, 0xFF, 0x00};
-static constexpr auto IMPOSSIBLE = tcod::ColorRGB(0x80, 0x80, 0x80);
-static constexpr auto ERROR = tcod::ColorRGB(0xFF, 0x40, 0x40);
-static constexpr auto HEALTH_RECOVERED = tcod::ColorRGB(0x0, 0xFF, 0x0);
+  static constexpr auto BAR_TEXT = WHITE;
+  static constexpr auto INVALID = tcod::ColorRGB{0xFF, 0xFF, 0x00};
+  static constexpr auto IMPOSSIBLE = tcod::ColorRGB(0x80, 0x80, 0x80);
+  static constexpr auto ERROR = tcod::ColorRGB(0xFF, 0x40, 0x40);
+  static constexpr auto HEALTH_RECOVERED = tcod::ColorRGB(0x0, 0xFF, 0x0);
 
-}  // namespace cpprl
+}

app/include/combat_system.hpp

@@ -1,28 +1,29 @@
-#ifndef INCLUDE_COMBAT_SYSTEM_HPP_
-#define INCLUDE_COMBAT_SYSTEM_HPP_
+#pragma once
 
-#include "components.hpp"
+#include <components/status_condition.hpp>
+#include <components/identity.hpp>
+#include <core/types.hpp>
+#include <core/event.hpp>
 #include "game_entity.hpp"
+#include "libtcod.hpp"
+
+extern SupaRL::Coordinator g_coordinator;
 
 namespace cpprl::combat_system {
-inline auto handle_attack = [](Entity& attacker, Entity& target) -> int {
-  int damage = attacker.get_attack_component().get_damage() -
-               target.get_defense_component().get_defense();
-  if (damage > 0) {
-    target.get_defense_component().take_damage(damage);
-    return damage;
-  }
-  return 0;
-};
+  inline auto handle_attack = [](Entity& attacker, Entity& target) -> void {
+    auto attack_event = SupaRL::Event(SupaRL::Events::Combat::ATTACK);
+    attack_event.set_param<>(SupaRL::Events::Combat::ATTACKER, attacker.get_id());
+    attack_event.set_param<>(SupaRL::Events::Combat::DEFENDER, target.get_id());
+    g_coordinator.send_event(attack_event);
+  };
 
-inline auto handle_spell = [](int power, Entity& target) -> int {
-  int damage = power - target.get_defense_component().get_defense();
-  if (damage > 0) {
-    target.get_defense_component().take_damage(damage);
-    return damage;
-  }
-  return 0;
-};
+  inline auto handle_spell = [](int power, Entity& target) -> void {
+    auto spell_event = SupaRL::Event(SupaRL::Events::Combat::SPELL);
+    spell_event.set_param<>(SupaRL::Events::Combat::Spell::TARGET, target.get_id());
+    spell_event.set_param<>(SupaRL::Events::Combat::Spell::POWER, power);
+    g_coordinator.send_event(spell_event);
+  };
 }
 
-#endif  // INCLUDE_COMBAT_SYSTEM_HPP_
+
+