From 1d21915e69fe87b58f37d787b72c790895da0dac Mon Sep 17 00:00:00 2001 From: zaaarf Date: Thu, 21 Sep 2023 13:21:20 +0200 Subject: feat: created Unit struct this looks horrid but what can you do --- src/openvic-simulation/units/Unit.cpp | 210 ++++++++++++++++++++++++++++++++++ src/openvic-simulation/units/Unit.hpp | 170 +++++++++++++++++++++++++++ 2 files changed, 380 insertions(+) create mode 100644 src/openvic-simulation/units/Unit.cpp create mode 100644 src/openvic-simulation/units/Unit.hpp (limited to 'src/openvic-simulation') diff --git a/src/openvic-simulation/units/Unit.cpp b/src/openvic-simulation/units/Unit.cpp new file mode 100644 index 0000000..a466049 --- /dev/null +++ b/src/openvic-simulation/units/Unit.cpp @@ -0,0 +1,210 @@ +#include "Unit.hpp" +#include +#include +#include "types/IdentifierRegistry.hpp" +#include "types/fixed_point/FixedPoint.hpp" +#include + +#define SUPER_ARGS icon, sprite, active, type, floating_flag, priority, max_strength, \ + default_organisation, maximum_speed, weighted_value, build_time, build_cost, supply_consumption, \ + supply_cost, supply_consumption_score +#define FOR_SUPER(cat) identifier, cat, SUPER_ARGS + + +using namespace OpenVic; + +Unit::Unit(std::string_view identifier, UnitCategory category, UNIT_PARAMS) : HasIdentifier { identifier }, + category { category }, icon { icon }, sprite { sprite }, active { active }, type { type }, + floating_flag { floating_flag }, priority { priority }, max_strength { max_strength }, + default_organisation { default_organisation }, maximum_speed { maximum_speed }, weighted_value { weighted_value }, + build_time { build_time }, build_cost { build_cost }, supply_consumption { supply_consumption }, supply_cost { supply_cost }, + supply_consumption_score { supply_consumption_score } {} + +Unit::icon_t Unit::get_icon() const { + return icon; +} + +Unit::sprite_t Unit::get_sprite() const { + return sprite; +} + +bool Unit::is_active() const { + return active; +} + +UnitType Unit::get_type() const { + return type; +} + +bool Unit::has_floating_flag() const { + return floating_flag; +} + +uint32_t Unit::get_priority() const { + return priority; +} + +uint32_t Unit::get_max_strength() const { + return max_strength; +} + +uint32_t Unit::get_default_organisation() const { + return default_organisation; +} + +uint32_t Unit::get_maximum_speed() const { + return maximum_speed; +} + +uint32_t Unit::get_build_time() const { + return build_time; +} + +fixed_point_t Unit::get_weighted_value() const { + return weighted_value; +} + +std::map Unit::get_build_cost() const { + return build_cost; +} + +fixed_point_t Unit::get_supply_consumption() const { + return supply_consumption; +} + +std::map Unit::get_supply_cost() const { + return supply_cost; +} + +uint32_t Unit::get_supply_consumption_score() const { + return supply_consumption_score; +} + +LandUnit::LandUnit(std::string_view identifier, UNIT_PARAMS, LAND_PARAMS) : Unit { FOR_SUPER(UnitCategory::LAND) }, + reconnaisance { reconnaisance }, attack { attack }, defence { defence }, discipline { discipline }, support { support }, + maneuver { maneuver }, siege { siege } {} + +uint32_t LandUnit::get_reconnaisance() const { + return reconnaisance; +} + +uint32_t LandUnit::get_attack() const { + return attack; +} + +uint32_t LandUnit::get_defence() const { + return defence; +} + +uint32_t LandUnit::get_discipline() const { + return discipline; +} + +uint32_t LandUnit::get_support() const { + return support; +} + +uint32_t LandUnit::get_maneuver() const { + return maneuver; +} + +uint32_t LandUnit::get_siege() const { + return siege; +} + +NavalUnit::NavalUnit(std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS) : Unit { FOR_SUPER(UnitCategory::NAVAL) }, + naval_icon { naval_icon }, sail { sail }, transport { transport }, move_sound { move_sound }, select_sound { select_sound }, + colonial_points { colonial_points }, build_overseas { build_overseas }, min_port_level { min_port_level }, + limit_per_port { limit_per_port }, hull { hull }, gun_power { gun_power }, fire_range { fire_range }, evasion { evasion }, + torpedo_attack { torpedo_attack } {}; + +NavalUnit::icon_t NavalUnit::get_naval_icon() const { + return naval_icon; +} + +bool NavalUnit::can_sail() const { + return sail; +} + +bool NavalUnit::is_transport() const { + return transport; +} + +NavalUnit::sound_t NavalUnit::get_move_sound() const { + return move_sound; +} + +NavalUnit::sound_t NavalUnit::get_select_sound() const { + return select_sound; +} + +uint32_t NavalUnit::get_colonial_points() const { + return colonial_points; +} + +bool NavalUnit::can_build_overseas() const { + return build_overseas; +} + +uint32_t NavalUnit::get_min_port_level() const { + return min_port_level; +} + +int32_t NavalUnit::get_limit_per_port() const { + return limit_per_port; +} + +uint32_t NavalUnit::get_hull() const { + return hull; +} + +uint32_t NavalUnit::get_gun_power() const { + return gun_power; +} + +fixed_point_t NavalUnit::get_fire_range() const { + return fire_range; +} + +uint32_t NavalUnit::get_evasion() const { + return evasion; +} + +uint32_t NavalUnit::get_torpedo_attack() const { + return torpedo_attack; +} + +UnitManager::UnitManager() : units { "units " } {}; + +bool UnitManager::_check_superclass_parameters(const std::string_view identifier, UnitCategory cat, UNIT_PARAMS) { + if (identifier.empty()) { + Logger::error("Invalid religion identifier - empty!"); + return false; + } + + //TODO check that icon and sprite exist + + return true; +} + +bool UnitManager::add_land_unit(const std::string_view identifier, UnitCategory cat, UNIT_PARAMS, LAND_PARAMS) { + if (!_check_superclass_parameters(FOR_SUPER(cat))) { + return false; + } + + return units.add_item( + LandUnit { identifier, SUPER_ARGS, reconnaisance, attack, defence, discipline, support, maneuver, siege } + ); +} + +bool UnitManager::add_naval_unit(const std::string_view identifier, UnitCategory cat, UNIT_PARAMS, NAVY_PARAMS) { + if (!_check_superclass_parameters(FOR_SUPER(cat))) { + return false; + } + + //TODO: check that icon and sounds exist + + return units.add_item( + NavalUnit { identifier, SUPER_ARGS, naval_icon, sail, transport, move_sound, select_sound, colonial_points, build_overseas, min_port_level, limit_per_port, hull, gun_power, fire_range, evasion, torpedo_attack } + ); +} \ No newline at end of file diff --git a/src/openvic-simulation/units/Unit.hpp b/src/openvic-simulation/units/Unit.hpp new file mode 100644 index 0000000..aa14f5a --- /dev/null +++ b/src/openvic-simulation/units/Unit.hpp @@ -0,0 +1,170 @@ +#pragma once + +#include +#include +#include +#include "economy/Good.hpp" +#include "types/IdentifierRegistry.hpp" +#include "types/fixed_point/FixedPoint.hpp" + +#define UNIT_PARAMS Unit::icon_t icon, Unit::sprite_t sprite, bool active, UnitType type, bool floating_flag, uint32_t priority,\ + uint32_t max_strength, uint32_t default_organisation,uint32_t maximum_speed, fixed_point_t weighted_value, \ + uint32_t build_time, std::map build_cost, fixed_point_t supply_consumption, \ + std::map supply_cost, uint32_t supply_consumption_score +#define LAND_PARAMS uint32_t reconnaisance, uint32_t attack, uint32_t defence, uint32_t discipline, uint32_t support, \ + uint32_t maneuver, uint32_t siege +#define NAVY_PARAMS Unit::icon_t naval_icon, bool sail, bool transport, Unit::sound_t move_sound, Unit::sound_t select_sound, \ + uint32_t colonial_points, bool build_overseas, uint32_t min_port_level, int32_t limit_per_port, \ + uint32_t hull, uint32_t gun_power, fixed_point_t fire_range, uint32_t evasion, uint32_t torpedo_attack + +namespace OpenVic { + enum UnitCategory { + NAVAL, + LAND + }; + + enum UnitType { + INFANTRY, //guard, infantry, irregular + CAVALRY, //cavalry, cuirassier, dragoon, hussar, plane + SUPPORT, //artillery + SPECIAL, //engineer, tank + TRANSPORT, //clipper transport, steam transport + LIGHT_SHIP, //commerce raider, cruiser, frigate + BIG_SHIP //battleship, dreadnought, ironclad, manowar, monitor + }; + + struct Unit : HasIdentifier { + using icon_t = uint32_t; + using sprite_t = std::string; + using sound_t = std::string; + + private: + const icon_t icon; + const UnitCategory category; //type + const sprite_t sprite; + const bool active; + const UnitType type; //unit_type + const bool floating_flag; + + const uint32_t priority; + const uint32_t max_strength; + const uint32_t default_organisation; + const uint32_t maximum_speed; + const fixed_point_t weighted_value; + + const uint32_t build_time; + const std::map build_cost; + const fixed_point_t supply_consumption; + const std::map supply_cost; + const uint32_t supply_consumption_score; + + protected: + Unit(std::string_view identifier, UnitCategory category, UNIT_PARAMS); + + public: + Unit(Unit&&) = default; + + icon_t get_icon() const; + UnitCategory get_category() const; + sprite_t get_sprite() const; + bool is_active() const; + UnitType get_type() const; + bool has_floating_flag() const; + + uint32_t get_priority() const; + uint32_t get_max_strength() const; + uint32_t get_default_organisation() const; + uint32_t get_maximum_speed() const; + fixed_point_t get_weighted_value() const; + + uint32_t get_build_time() const; + std::map get_build_cost() const; + fixed_point_t get_supply_consumption() const; + std::map get_supply_cost() const; + uint32_t get_supply_consumption_score() const; + }; + + struct LandUnit : Unit { + friend struct UnitManager; + + private: + const uint32_t reconnaisance; + const uint32_t attack; + const uint32_t defence; + const uint32_t discipline; + const uint32_t support; + const uint32_t maneuver; + const uint32_t siege; + + LandUnit(std::string_view identifier, UNIT_PARAMS, LAND_PARAMS); + + public: + LandUnit(LandUnit&&) = default; + + uint32_t get_reconnaisance() const; + uint32_t get_attack() const; + uint32_t get_defence() const; + uint32_t get_discipline() const; + uint32_t get_support() const; + uint32_t get_maneuver() const; + uint32_t get_siege() const; + }; + + struct NavalUnit : Unit { + friend struct UnitManager; + + private: + const icon_t naval_icon; + const bool sail; + const bool transport; + const sound_t move_sound; + const sound_t select_sound; + const uint32_t colonial_points; //some + const bool build_overseas; //can_build_overseas + const uint32_t min_port_level; + const int32_t limit_per_port; //-1 is unlimited + + const uint32_t hull; + const uint32_t gun_power; + const fixed_point_t fire_range; + const uint32_t evasion; + const uint32_t torpedo_attack; + + NavalUnit(std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS); + + public: + NavalUnit(NavalUnit&&) = default; + + icon_t get_naval_icon() const; + bool can_sail() const; + bool is_transport() const; + sound_t get_move_sound() const; + sound_t get_select_sound() const; + uint32_t get_colonial_points() const; + bool can_build_overseas() const; + uint32_t get_min_port_level() const; + int32_t get_limit_per_port() const; + + uint32_t get_hull() const; + uint32_t get_gun_power() const; + fixed_point_t get_fire_range() const; + uint32_t get_evasion() const; + uint32_t get_torpedo_attack() const; + }; + + struct UnitManager { + private: + IdentifierRegistry units; + + bool _check_superclass_parameters(const std::string_view identifier, UnitCategory cat, UNIT_PARAMS); + + public: + UnitManager(); + + bool add_land_unit(const std::string_view identifier, UnitCategory cat, UNIT_PARAMS, LAND_PARAMS); + bool add_naval_unit(const std::string_view identifier, UnitCategory cat, UNIT_PARAMS, NAVY_PARAMS); + IDENTIFIER_REGISTRY_ACCESSORS(Unit, unit) + + //TODO - bool load_unit_file(ast::NodeCPtr root); + }; +} \ No newline at end of file -- cgit v1.2.3-56-ga3b1