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/units') 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 From f68f60efec1b1bad7d0b33fedff82fbfb9d6ebaa Mon Sep 17 00:00:00 2001 From: zaaarf Date: Fri, 22 Sep 2023 15:32:27 +0200 Subject: feat: implemenet most of the unit loading function --- src/openvic-simulation/units/Unit.cpp | 105 +++++++++++++++++++++++++++++++--- src/openvic-simulation/units/Unit.hpp | 13 +++-- 2 files changed, 103 insertions(+), 15 deletions(-) (limited to 'src/openvic-simulation/units') diff --git a/src/openvic-simulation/units/Unit.cpp b/src/openvic-simulation/units/Unit.cpp index a466049..1b02efe 100644 --- a/src/openvic-simulation/units/Unit.cpp +++ b/src/openvic-simulation/units/Unit.cpp @@ -1,17 +1,15 @@ #include "Unit.hpp" -#include -#include -#include "types/IdentifierRegistry.hpp" -#include "types/fixed_point/FixedPoint.hpp" -#include +#include "GameManager.hpp" +#include "dataloader/NodeTools.hpp" -#define SUPER_ARGS icon, sprite, active, type, floating_flag, priority, max_strength, \ +#define EXTRA_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 +#define FOR_SUPER(cat) identifier, cat, EXTRA_ARGS using namespace OpenVic; +using namespace OpenVic::NodeTools; Unit::Unit(std::string_view identifier, UnitCategory category, UNIT_PARAMS) : HasIdentifier { identifier }, category { category }, icon { icon }, sprite { sprite }, active { active }, type { type }, @@ -193,7 +191,7 @@ bool UnitManager::add_land_unit(const std::string_view identifier, UnitCategory } return units.add_item( - LandUnit { identifier, SUPER_ARGS, reconnaisance, attack, defence, discipline, support, maneuver, siege } + LandUnit { identifier, EXTRA_ARGS, reconnaisance, attack, defence, discipline, support, maneuver, siege } ); } @@ -205,6 +203,95 @@ bool UnitManager::add_naval_unit(const std::string_view identifier, UnitCategory //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 } + NavalUnit { identifier, EXTRA_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 } ); +} + +bool UnitManager::load_unit_file(ast::NodeCPtr root) { + return NodeTools::expect_dictionary([this](std::string_view key, ast::NodeCPtr value) -> bool { + //TODO: enum parsing, or use set of strings? probably the latter + //TODO: need to get GameManager to access GoodsManager and call the expect_goods_map + + Unit::icon_t icon; + UnitCategory category; + Unit::sprite_t sprite; + bool active, floating_flag; + UnitType type; + uint32_t priority, max_strength, default_organisation, maximum_speed, build_time, supply_consumption_score; + fixed_point_t weighted_value, supply_consumption; + std::map build_cost, supply_cost; + + //shared + bool ret = expect_dictionary_keys( + "icon", ONE_EXACTLY, expect_uint(assign_variable_callback(icon)), + //"type", ONE_EXACTLY, expect_string(assign_variable_callback(category)), + "sprite", ONE_EXACTLY, expect_string(assign_variable_callback(sprite)), + "active", ONE_EXACTLY, expect_bool(assign_variable_callback(active)), + //"unit_type", ONE_EXACTLY, expect_string(assign_variable_callback(type)), + "floating_flag", ONE_EXACTLY, expect_bool(assign_variable_callback(floating_flag)), + "priority", ONE_EXACTLY, expect_uint(assign_variable_callback(priority)), + "max_strength", ONE_EXACTLY, expect_uint(assign_variable_callback(max_strength)), + "default_organisation", ONE_EXACTLY, expect_uint(assign_variable_callback(default_organisation)), + "maximum_speed", ONE_EXACTLY, expect_uint(assign_variable_callback(maximum_speed)), + "weighted_value", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(weighted_value)), + "build_time", ONE_EXACTLY, expect_uint(assign_variable_callback(build_time)), + //"build_cost", ONE_EXACTLY, goods_manager.expect_goods_map(assign_variable_callback(build_cost)), + "supply_consumption", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(supply_consumption)), + //"supply_cost", ONE_EXACTLY, goods_manager.expect_goods_map(assign_variable_callback(supply_cost)), + "supply_consumption_score", ONE_EXACTLY, expect_uint(assign_variable_callback(supply_consumption_score)) + )(value); + + if (category == UnitCategory::LAND) { + uint32_t reconnaisance, attack, defence, discipline, support, maneuver, siege; + + ret &= expect_dictionary_keys( + "reconnaisance", ONE_EXACTLY, expect_uint(assign_variable_callback(reconnaisance)), + "attack", ONE_EXACTLY, expect_uint(assign_variable_callback(attack)), + "defence", ONE_EXACTLY, expect_uint(assign_variable_callback(defence)), + "discipline", ONE_EXACTLY, expect_uint(assign_variable_callback(discipline)), + "support", ONE_EXACTLY, expect_uint(assign_variable_callback(support)), + "maneuver", ONE_EXACTLY, expect_uint(assign_variable_callback(maneuver)), + "siege", ONE_EXACTLY, expect_uint(assign_variable_callback(siege)) + )(value); + + ret &= add_land_unit( + key, category, EXTRA_ARGS, + reconnaisance, attack, defence, discipline, support, maneuver, siege + ); + + return ret; + } else if (category == UnitCategory::NAVAL) { + Unit::icon_t naval_icon; + bool sail = false, transport = false, build_overseas; + Unit::sound_t move_sound, select_sound; + uint32_t min_port_level, hull, gun_power, evasion, colonial_points = 0, torpedo_attack = 0; //probably? + int32_t limit_per_port; + fixed_point_t fire_range; + + ret &= expect_dictionary_keys( + "naval_icon", ONE_EXACTLY, expect_uint(assign_variable_callback(naval_icon)), + "sail", ZERO_OR_ONE, expect_bool(assign_variable_callback(sail)), + "transport", ZERO_OR_ONE, expect_bool(assign_variable_callback(transport)), + "move_sound", ONE_EXACTLY, expect_string(assign_variable_callback(move_sound)), + "select_sound", ONE_EXACTLY, expect_string(assign_variable_callback(select_sound)), + "colonial_points", ZERO_OR_ONE, expect_uint(assign_variable_callback(colonial_points)), + "can_build_overseas", ONE_EXACTLY, expect_bool(assign_variable_callback(build_overseas)), + "min_port_level", ONE_EXACTLY, expect_uint(assign_variable_callback(min_port_level)), + "limit_per_port", ONE_EXACTLY, expect_int(assign_variable_callback(limit_per_port)), + "hull", ONE_EXACTLY, expect_uint(assign_variable_callback(hull)), + "gun_power", ONE_EXACTLY, expect_uint(assign_variable_callback(gun_power)), + "fire_range", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(fire_range)), + "evasion", ONE_EXACTLY, expect_uint(assign_variable_callback(evasion)), + "torpedo_attack", ZERO_OR_ONE, expect_uint(assign_variable_callback(torpedo_attack)) + )(value); + + ret &= add_naval_unit( + key, category, EXTRA_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 + ); + + return ret; + } else return false; + })(root); } \ No newline at end of file diff --git a/src/openvic-simulation/units/Unit.hpp b/src/openvic-simulation/units/Unit.hpp index aa14f5a..b105afc 100644 --- a/src/openvic-simulation/units/Unit.hpp +++ b/src/openvic-simulation/units/Unit.hpp @@ -3,9 +3,10 @@ #include #include #include -#include "economy/Good.hpp" -#include "types/IdentifierRegistry.hpp" -#include "types/fixed_point/FixedPoint.hpp" +#include "openvic-simulation/economy/Good.hpp" +#include "openvic-simulation/types/IdentifierRegistry.hpp" +#include "openvic-simulation/types/fixed_point/FixedPoint.hpp" +#include "openvic-simulation/dataloader/NodeTools.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, \ @@ -35,8 +36,8 @@ namespace OpenVic { struct Unit : HasIdentifier { using icon_t = uint32_t; - using sprite_t = std::string; - using sound_t = std::string; + using sprite_t = std::string_view; + using sound_t = std::string_view; private: const icon_t icon; @@ -165,6 +166,6 @@ namespace OpenVic { 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); + bool load_unit_file(ast::NodeCPtr root); }; } \ No newline at end of file -- cgit v1.2.3-56-ga3b1 From e91e2670abfd4976883c7a5d654d1f5469b4ac7a Mon Sep 17 00:00:00 2001 From: zaaarf Date: Fri, 22 Sep 2023 16:14:22 +0200 Subject: feat: removed enum, passed goods manager --- src/openvic-simulation/GameManager.cpp | 4 +- src/openvic-simulation/GameManager.hpp | 16 ++++-- src/openvic-simulation/dataloader/Dataloader.cpp | 19 ++++++- src/openvic-simulation/dataloader/Dataloader.hpp | 2 + src/openvic-simulation/units/Unit.cpp | 70 ++++++++++++------------ src/openvic-simulation/units/Unit.hpp | 62 ++++++++++----------- 6 files changed, 97 insertions(+), 76 deletions(-) (limited to 'src/openvic-simulation/units') diff --git a/src/openvic-simulation/GameManager.cpp b/src/openvic-simulation/GameManager.cpp index 4c8b55f..5067a65 100644 --- a/src/openvic-simulation/GameManager.cpp +++ b/src/openvic-simulation/GameManager.cpp @@ -1,11 +1,13 @@ #include "GameManager.hpp" #include "openvic-simulation/utility/Logger.hpp" +#include "units/Unit.hpp" using namespace OpenVic; GameManager::GameManager(state_updated_func_t state_updated_callback) - : clock { [this]() { tick(); }, [this]() { update_state(); } }, + : unit_manager { good_manager }, + clock { [this]() { tick(); }, [this]() { update_state(); } }, state_updated { state_updated_callback } {} void GameManager::set_needs_update() { diff --git a/src/openvic-simulation/GameManager.hpp b/src/openvic-simulation/GameManager.hpp index 70d8cf0..fa61eaf 100644 --- a/src/openvic-simulation/GameManager.hpp +++ b/src/openvic-simulation/GameManager.hpp @@ -1,10 +1,14 @@ #pragma once -#include "GameAdvancementHook.hpp" -#include "economy/Good.hpp" -#include "map/Map.hpp" -#include "politics/Ideology.hpp" -#include "politics/Issue.hpp" +#include "openvic-simulation/GameAdvancementHook.hpp" +#include "openvic-simulation/economy/Good.hpp" +#include "openvic-simulation/map/Map.hpp" +#include "openvic-simulation/politics/Ideology.hpp" +#include "openvic-simulation/politics/Issue.hpp" +#include "openvic-simulation/GameAdvancementHook.hpp" +#include "openvic-simulation/economy/Good.hpp" +#include "openvic-simulation/map/Map.hpp" +#include "openvic-simulation/units/Unit.hpp" namespace OpenVic { struct GameManager { @@ -16,7 +20,7 @@ namespace OpenVic { PopManager pop_manager; IdeologyManager ideology_manager; IssueManager issue_manager; - + UnitManager unit_manager; GameAdvancementHook clock; private: diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index d0d9506..55dbf8a 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -1,4 +1,5 @@ #include "Dataloader.hpp" +#include #include #include @@ -6,6 +7,7 @@ #include "openvic-simulation/GameManager.hpp" #include "openvic-simulation/utility/Logger.hpp" +#include "units/Unit.hpp" using namespace OpenVic; using namespace OpenVic::NodeTools; @@ -150,13 +152,19 @@ bool Dataloader::_load_pop_types(PopManager& pop_manager, fs::path const& pop_ty return pop_manager.load_pop_type_file(file.stem().string(), _parse_defines(file).get_file_node()); } ); - if (!ret) { - Logger::error("Failed to load pop types!"); - } pop_manager.lock_pop_types(); return ret; } +bool Dataloader::_load_units(UnitManager& unit_manager, fs::path const& units_directory) const { + const bool ret = apply_to_files_in_dir(units_directory, ".txt", + [&unit_manager](fs::path const& file) -> bool { + return unit_manager.load_unit_file(_parse_defines(file).get_file_node()); + } + ); + unit_manager.lock_units(); + return ret;} + bool Dataloader::_load_map_dir(GameManager& game_manager, fs::path const& map_directory) const { Map& map = game_manager.map; @@ -260,6 +268,7 @@ bool Dataloader::load_defines(GameManager& game_manager) const { static const fs::path ideology_file = "common/ideologies.txt"; static const fs::path issues_file = "common/issues.txt"; static const fs::path map_directory = "map"; + static const fs::path units_directory = "units"; bool ret = true; @@ -291,6 +300,10 @@ bool Dataloader::load_defines(GameManager& game_manager) const { Logger::error("Failed to load issues!"); ret = false; } + if (!_load_units(game_manager.unit_manager, units_directory)) { + Logger::error("Failed to load units!"); + ret = false; + } if (!_load_map_dir(game_manager, map_directory)) { Logger::error("Failed to load map!"); ret = false; diff --git a/src/openvic-simulation/dataloader/Dataloader.hpp b/src/openvic-simulation/dataloader/Dataloader.hpp index 6741361..9e15102 100644 --- a/src/openvic-simulation/dataloader/Dataloader.hpp +++ b/src/openvic-simulation/dataloader/Dataloader.hpp @@ -5,6 +5,7 @@ #include #include "openvic-simulation/dataloader/NodeTools.hpp" +#include "units/Unit.hpp" namespace OpenVic { namespace fs = std::filesystem; @@ -21,6 +22,7 @@ namespace OpenVic { path_vector_t roots; bool _load_pop_types(PopManager& pop_manager, fs::path const& pop_type_directory) const; + bool _load_units(UnitManager& unit_manager, fs::path const& units_directory) const; bool _load_map_dir(GameManager& game_manager, fs::path const& map_directory) const; public: diff --git a/src/openvic-simulation/units/Unit.cpp b/src/openvic-simulation/units/Unit.cpp index 1b02efe..55ff08d 100644 --- a/src/openvic-simulation/units/Unit.cpp +++ b/src/openvic-simulation/units/Unit.cpp @@ -1,18 +1,15 @@ #include "Unit.hpp" -#include "GameManager.hpp" -#include "dataloader/NodeTools.hpp" +#include -#define EXTRA_ARGS icon, sprite, active, type, floating_flag, priority, max_strength, \ +#define UNIT_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, EXTRA_ARGS - using namespace OpenVic; using namespace OpenVic::NodeTools; -Unit::Unit(std::string_view identifier, UnitCategory category, UNIT_PARAMS) : HasIdentifier { identifier }, - category { category }, icon { icon }, sprite { sprite }, active { active }, type { type }, +Unit::Unit(std::string_view identifier, std::string_view category, UNIT_PARAMS) : HasIdentifier { identifier }, + icon { icon }, category { category }, 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 }, @@ -30,7 +27,7 @@ bool Unit::is_active() const { return active; } -UnitType Unit::get_type() const { +std::string_view Unit::get_type() const { return type; } @@ -78,7 +75,7 @@ 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) }, +LandUnit::LandUnit(std::string_view identifier, UNIT_PARAMS, LAND_PARAMS) : Unit { identifier, "land", UNIT_ARGS }, reconnaisance { reconnaisance }, attack { attack }, defence { defence }, discipline { discipline }, support { support }, maneuver { maneuver }, siege { siege } {} @@ -110,7 +107,7 @@ uint32_t LandUnit::get_siege() const { return siege; } -NavalUnit::NavalUnit(std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS) : Unit { FOR_SUPER(UnitCategory::NAVAL) }, +NavalUnit::NavalUnit(std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS) : Unit { identifier, "naval", UNIT_ARGS }, 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 }, @@ -172,9 +169,9 @@ uint32_t NavalUnit::get_torpedo_attack() const { return torpedo_attack; } -UnitManager::UnitManager() : units { "units " } {}; +UnitManager::UnitManager(GoodManager& game_manager) : good_manager { good_manager }, units { "units " } {}; -bool UnitManager::_check_superclass_parameters(const std::string_view identifier, UnitCategory cat, UNIT_PARAMS) { +bool UnitManager::_check_shared_parameters(const std::string_view identifier, UNIT_PARAMS) { if (identifier.empty()) { Logger::error("Invalid religion identifier - empty!"); return false; @@ -182,41 +179,44 @@ bool UnitManager::_check_superclass_parameters(const std::string_view identifier //TODO check that icon and sprite exist + if (!allowed_unit_types.contains(type)) { + Logger::error("Invalid unit type \"", type, "\" specified!"); + return false; + } + 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))) { +bool UnitManager::add_land_unit(const std::string_view identifier, UNIT_PARAMS, LAND_PARAMS) { + if (!_check_shared_parameters(identifier, UNIT_ARGS)) { return false; } - return units.add_item( - LandUnit { identifier, EXTRA_ARGS, reconnaisance, attack, defence, discipline, support, maneuver, siege } - ); + return units.add_item(LandUnit { + identifier, UNIT_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))) { +bool UnitManager::add_naval_unit(const std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS) { + if (!_check_shared_parameters(identifier, UNIT_ARGS)) { return false; } //TODO: check that icon and sounds exist - return units.add_item( - NavalUnit { identifier, EXTRA_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 } - ); + return units.add_item(NavalUnit { + identifier, UNIT_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 + }); } bool UnitManager::load_unit_file(ast::NodeCPtr root) { return NodeTools::expect_dictionary([this](std::string_view key, ast::NodeCPtr value) -> bool { - //TODO: enum parsing, or use set of strings? probably the latter - //TODO: need to get GameManager to access GoodsManager and call the expect_goods_map - Unit::icon_t icon; - UnitCategory category; + std::string_view category; Unit::sprite_t sprite; bool active, floating_flag; - UnitType type; + std::string_view type; uint32_t priority, max_strength, default_organisation, maximum_speed, build_time, supply_consumption_score; fixed_point_t weighted_value, supply_consumption; std::map build_cost, supply_cost; @@ -224,10 +224,10 @@ bool UnitManager::load_unit_file(ast::NodeCPtr root) { //shared bool ret = expect_dictionary_keys( "icon", ONE_EXACTLY, expect_uint(assign_variable_callback(icon)), - //"type", ONE_EXACTLY, expect_string(assign_variable_callback(category)), + "type", ONE_EXACTLY, expect_string(assign_variable_callback(category)), "sprite", ONE_EXACTLY, expect_string(assign_variable_callback(sprite)), "active", ONE_EXACTLY, expect_bool(assign_variable_callback(active)), - //"unit_type", ONE_EXACTLY, expect_string(assign_variable_callback(type)), + "unit_type", ONE_EXACTLY, expect_string(assign_variable_callback(type)), "floating_flag", ONE_EXACTLY, expect_bool(assign_variable_callback(floating_flag)), "priority", ONE_EXACTLY, expect_uint(assign_variable_callback(priority)), "max_strength", ONE_EXACTLY, expect_uint(assign_variable_callback(max_strength)), @@ -235,13 +235,13 @@ bool UnitManager::load_unit_file(ast::NodeCPtr root) { "maximum_speed", ONE_EXACTLY, expect_uint(assign_variable_callback(maximum_speed)), "weighted_value", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(weighted_value)), "build_time", ONE_EXACTLY, expect_uint(assign_variable_callback(build_time)), - //"build_cost", ONE_EXACTLY, goods_manager.expect_goods_map(assign_variable_callback(build_cost)), + "build_cost", ONE_EXACTLY, good_manager.expect_goods_map(assign_variable_callback(build_cost)), "supply_consumption", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(supply_consumption)), - //"supply_cost", ONE_EXACTLY, goods_manager.expect_goods_map(assign_variable_callback(supply_cost)), + "supply_cost", ONE_EXACTLY, good_manager.expect_goods_map(assign_variable_callback(supply_cost)), "supply_consumption_score", ONE_EXACTLY, expect_uint(assign_variable_callback(supply_consumption_score)) )(value); - if (category == UnitCategory::LAND) { + if (category == "land") { uint32_t reconnaisance, attack, defence, discipline, support, maneuver, siege; ret &= expect_dictionary_keys( @@ -255,12 +255,12 @@ bool UnitManager::load_unit_file(ast::NodeCPtr root) { )(value); ret &= add_land_unit( - key, category, EXTRA_ARGS, + key, UNIT_ARGS, reconnaisance, attack, defence, discipline, support, maneuver, siege ); return ret; - } else if (category == UnitCategory::NAVAL) { + } else if (category == "naval") { Unit::icon_t naval_icon; bool sail = false, transport = false, build_overseas; Unit::sound_t move_sound, select_sound; @@ -286,7 +286,7 @@ bool UnitManager::load_unit_file(ast::NodeCPtr root) { )(value); ret &= add_naval_unit( - key, category, EXTRA_ARGS, + key, UNIT_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 ); diff --git a/src/openvic-simulation/units/Unit.hpp b/src/openvic-simulation/units/Unit.hpp index b105afc..9653526 100644 --- a/src/openvic-simulation/units/Unit.hpp +++ b/src/openvic-simulation/units/Unit.hpp @@ -1,16 +1,20 @@ #pragma once #include +#include #include #include +#include #include "openvic-simulation/economy/Good.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" +#include "openvic-simulation/economy/Good.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, \ +#define UNIT_PARAMS Unit::icon_t icon, Unit::sprite_t sprite, bool active, std::string_view 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 @@ -19,32 +23,17 @@ 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_view; using sound_t = std::string_view; private: + const std::string_view category; const icon_t icon; - const UnitCategory category; //type const sprite_t sprite; const bool active; - const UnitType type; //unit_type + const std::string_view type; const bool floating_flag; const uint32_t priority; @@ -60,16 +49,16 @@ namespace OpenVic { const uint32_t supply_consumption_score; protected: - Unit(std::string_view identifier, UnitCategory category, UNIT_PARAMS); + Unit(std::string_view identifier, std::string_view category, UNIT_PARAMS); public: Unit(Unit&&) = default; icon_t get_icon() const; - UnitCategory get_category() const; + std::string_view get_category() const; sprite_t get_sprite() const; bool is_active() const; - UnitType get_type() const; + std::string_view get_type() const; bool has_floating_flag() const; uint32_t get_priority() const; @@ -120,10 +109,10 @@ namespace OpenVic { 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 colonial_points; + const bool build_overseas; const uint32_t min_port_level; - const int32_t limit_per_port; //-1 is unlimited + const int32_t limit_per_port; const uint32_t hull; const uint32_t gun_power; @@ -155,15 +144,26 @@ namespace OpenVic { struct UnitManager { private: + GoodManager& good_manager; IdentifierRegistry units; - bool _check_superclass_parameters(const std::string_view identifier, UnitCategory cat, UNIT_PARAMS); + bool _check_shared_parameters(const std::string_view identifier, 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); + const std::unordered_set allowed_unit_types { //TODO is this useful? + "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 + }; + + UnitManager(GoodManager& good_manager); + + bool add_land_unit(const std::string_view identifier, UNIT_PARAMS, LAND_PARAMS); + bool add_naval_unit(const std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS); IDENTIFIER_REGISTRY_ACCESSORS(Unit, unit) bool load_unit_file(ast::NodeCPtr root); -- cgit v1.2.3-56-ga3b1 From 8b15eb58d934b8fea4ed1ed44130f9a8957ea761 Mon Sep 17 00:00:00 2001 From: zaaarf Date: Fri, 22 Sep 2023 16:23:00 +0200 Subject: chore: removed hardcoded possible values on unit type --- src/openvic-simulation/units/Unit.cpp | 12 ++++++++---- src/openvic-simulation/units/Unit.hpp | 12 ------------ 2 files changed, 8 insertions(+), 16 deletions(-) (limited to 'src/openvic-simulation/units') diff --git a/src/openvic-simulation/units/Unit.cpp b/src/openvic-simulation/units/Unit.cpp index 55ff08d..63053c1 100644 --- a/src/openvic-simulation/units/Unit.cpp +++ b/src/openvic-simulation/units/Unit.cpp @@ -1,5 +1,4 @@ #include "Unit.hpp" -#include #define UNIT_ARGS icon, sprite, active, type, floating_flag, priority, max_strength, \ default_organisation, maximum_speed, weighted_value, build_time, build_cost, supply_consumption, \ @@ -177,13 +176,18 @@ bool UnitManager::_check_shared_parameters(const std::string_view identifier, UN return false; } - //TODO check that icon and sprite exist + if (sprite.empty()) { + Logger::error("Invalid sprite identifier - empty!"); + return false; + } - if (!allowed_unit_types.contains(type)) { - Logger::error("Invalid unit type \"", type, "\" specified!"); + if (type.empty()) { + Logger::error("Invalid unit type - empty!"); return false; } + //TODO check that icon and sprite exist + return true; } diff --git a/src/openvic-simulation/units/Unit.hpp b/src/openvic-simulation/units/Unit.hpp index 9653526..ccda35e 100644 --- a/src/openvic-simulation/units/Unit.hpp +++ b/src/openvic-simulation/units/Unit.hpp @@ -1,10 +1,8 @@ #pragma once #include -#include #include #include -#include #include "openvic-simulation/economy/Good.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" @@ -150,16 +148,6 @@ namespace OpenVic { bool _check_shared_parameters(const std::string_view identifier, UNIT_PARAMS); public: - const std::unordered_set allowed_unit_types { //TODO is this useful? - "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 - }; - UnitManager(GoodManager& good_manager); bool add_land_unit(const std::string_view identifier, UNIT_PARAMS, LAND_PARAMS); -- cgit v1.2.3-56-ga3b1 From 2714be5146c8ab2e690dbbd2546775b7c9b9e04a Mon Sep 17 00:00:00 2001 From: zaaarf Date: Sat, 23 Sep 2023 13:15:46 +0200 Subject: fix: various fixes, now runs and parses without military-related errors --- src/openvic-simulation/dataloader/Dataloader.cpp | 3 +- src/openvic-simulation/units/Unit.cpp | 134 +++++++++++------------ src/openvic-simulation/units/Unit.hpp | 58 +++++----- 3 files changed, 94 insertions(+), 101 deletions(-) (limited to 'src/openvic-simulation/units') diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index 55dbf8a..7cd955d 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -163,7 +163,8 @@ bool Dataloader::_load_units(UnitManager& unit_manager, fs::path const& units_di } ); unit_manager.lock_units(); - return ret;} + return ret; +} bool Dataloader::_load_map_dir(GameManager& game_manager, fs::path const& map_directory) const { Map& map = game_manager.map; diff --git a/src/openvic-simulation/units/Unit.cpp b/src/openvic-simulation/units/Unit.cpp index 63053c1..0ec4aa1 100644 --- a/src/openvic-simulation/units/Unit.cpp +++ b/src/openvic-simulation/units/Unit.cpp @@ -2,7 +2,10 @@ #define UNIT_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 + supply_cost +#define LAND_ARGS reconnaissance, attack, defence, discipline, support, maneuver, siege +#define NAVY_ARGS naval_icon, sail, transport, capital, move_sound, select_sound, colonial_points, build_overseas, min_port_level, \ + limit_per_port, supply_consumption_score, hull, gun_power, fire_range, evasion, torpedo_attack using namespace OpenVic; using namespace OpenVic::NodeTools; @@ -11,8 +14,7 @@ Unit::Unit(std::string_view identifier, std::string_view category, UNIT_PARAMS) icon { icon }, category { category }, 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 } {} + build_time { build_time }, build_cost { build_cost }, supply_consumption { supply_consumption }, supply_cost { supply_cost } {} Unit::icon_t Unit::get_icon() const { return icon; @@ -46,7 +48,7 @@ uint32_t Unit::get_default_organisation() const { return default_organisation; } -uint32_t Unit::get_maximum_speed() const { +fixed_point_t Unit::get_maximum_speed() const { return maximum_speed; } @@ -70,47 +72,43 @@ 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 { identifier, "land", UNIT_ARGS }, - reconnaisance { reconnaisance }, attack { attack }, defence { defence }, discipline { discipline }, support { support }, + reconnaissance { reconnaissance }, attack { attack }, defence { defence }, discipline { discipline }, support { support }, maneuver { maneuver }, siege { siege } {} -uint32_t LandUnit::get_reconnaisance() const { - return reconnaisance; +fixed_point_t LandUnit::get_reconnaissance() const { + return reconnaissance; } -uint32_t LandUnit::get_attack() const { +fixed_point_t LandUnit::get_attack() const { return attack; } -uint32_t LandUnit::get_defence() const { +fixed_point_t LandUnit::get_defence() const { return defence; } -uint32_t LandUnit::get_discipline() const { +fixed_point_t LandUnit::get_discipline() const { return discipline; } -uint32_t LandUnit::get_support() const { +fixed_point_t LandUnit::get_support() const { return support; } -uint32_t LandUnit::get_maneuver() const { +fixed_point_t LandUnit::get_maneuver() const { return maneuver; } -uint32_t LandUnit::get_siege() const { +fixed_point_t LandUnit::get_siege() const { return siege; } NavalUnit::NavalUnit(std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS) : Unit { identifier, "naval", UNIT_ARGS }, - 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 } {}; + naval_icon { naval_icon }, sail { sail }, transport { transport }, capital { capital }, 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 }, supply_consumption_score { supply_consumption_score }, + 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; @@ -148,6 +146,10 @@ int32_t NavalUnit::get_limit_per_port() const { return limit_per_port; } +uint32_t NavalUnit::get_supply_consumption_score() const { + return supply_consumption_score; +} + uint32_t NavalUnit::get_hull() const { return hull; } @@ -160,7 +162,7 @@ fixed_point_t NavalUnit::get_fire_range() const { return fire_range; } -uint32_t NavalUnit::get_evasion() const { +fixed_point_t NavalUnit::get_evasion() const { return evasion; } @@ -168,7 +170,7 @@ uint32_t NavalUnit::get_torpedo_attack() const { return torpedo_attack; } -UnitManager::UnitManager(GoodManager& game_manager) : good_manager { good_manager }, units { "units " } {}; +UnitManager::UnitManager(GoodManager& good_manager) : good_manager { good_manager }, units { "units " } {}; bool UnitManager::_check_shared_parameters(const std::string_view identifier, UNIT_PARAMS) { if (identifier.empty()) { @@ -196,9 +198,7 @@ bool UnitManager::add_land_unit(const std::string_view identifier, UNIT_PARAMS, return false; } - return units.add_item(LandUnit { - identifier, UNIT_ARGS, reconnaisance, attack, defence, discipline, support, maneuver, siege - }); + return units.add_item(LandUnit { identifier, UNIT_ARGS, LAND_ARGS }); } bool UnitManager::add_naval_unit(const std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS) { @@ -208,92 +208,82 @@ bool UnitManager::add_naval_unit(const std::string_view identifier, UNIT_PARAMS, //TODO: check that icon and sounds exist - return units.add_item(NavalUnit { - identifier, UNIT_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 - }); + return units.add_item(NavalUnit { identifier, UNIT_ARGS, NAVY_ARGS }); } - +//TODO forgot fcking capital flag for naval units bool UnitManager::load_unit_file(ast::NodeCPtr root) { return NodeTools::expect_dictionary([this](std::string_view key, ast::NodeCPtr value) -> bool { Unit::icon_t icon; - std::string_view category; + std::string_view category, type; Unit::sprite_t sprite; - bool active, floating_flag; - std::string_view type; - uint32_t priority, max_strength, default_organisation, maximum_speed, build_time, supply_consumption_score; - fixed_point_t weighted_value, supply_consumption; + bool active = true, floating_flag; + uint32_t priority, max_strength, default_organisation, build_time; + fixed_point_t maximum_speed, weighted_value, supply_consumption; std::map build_cost, supply_cost; //shared - bool ret = expect_dictionary_keys( + bool ret = expect_dictionary_keys(ALLOW_OTHER_KEYS, "icon", ONE_EXACTLY, expect_uint(assign_variable_callback(icon)), - "type", ONE_EXACTLY, expect_string(assign_variable_callback(category)), - "sprite", ONE_EXACTLY, expect_string(assign_variable_callback(sprite)), - "active", ONE_EXACTLY, expect_bool(assign_variable_callback(active)), - "unit_type", ONE_EXACTLY, expect_string(assign_variable_callback(type)), + "type", ONE_EXACTLY, expect_identifier(assign_variable_callback(category)), + "sprite", ONE_EXACTLY, expect_identifier(assign_variable_callback(sprite)), + "active", ZERO_OR_ONE, expect_bool(assign_variable_callback(active)), + "unit_type", ONE_EXACTLY, expect_identifier(assign_variable_callback(type)), "floating_flag", ONE_EXACTLY, expect_bool(assign_variable_callback(floating_flag)), "priority", ONE_EXACTLY, expect_uint(assign_variable_callback(priority)), "max_strength", ONE_EXACTLY, expect_uint(assign_variable_callback(max_strength)), "default_organisation", ONE_EXACTLY, expect_uint(assign_variable_callback(default_organisation)), - "maximum_speed", ONE_EXACTLY, expect_uint(assign_variable_callback(maximum_speed)), + "maximum_speed", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(maximum_speed)), "weighted_value", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(weighted_value)), "build_time", ONE_EXACTLY, expect_uint(assign_variable_callback(build_time)), "build_cost", ONE_EXACTLY, good_manager.expect_goods_map(assign_variable_callback(build_cost)), "supply_consumption", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(supply_consumption)), - "supply_cost", ONE_EXACTLY, good_manager.expect_goods_map(assign_variable_callback(supply_cost)), - "supply_consumption_score", ONE_EXACTLY, expect_uint(assign_variable_callback(supply_consumption_score)) + "supply_cost", ONE_EXACTLY, good_manager.expect_goods_map(assign_variable_callback(supply_cost)) )(value); if (category == "land") { - uint32_t reconnaisance, attack, defence, discipline, support, maneuver, siege; - - ret &= expect_dictionary_keys( - "reconnaisance", ONE_EXACTLY, expect_uint(assign_variable_callback(reconnaisance)), - "attack", ONE_EXACTLY, expect_uint(assign_variable_callback(attack)), - "defence", ONE_EXACTLY, expect_uint(assign_variable_callback(defence)), - "discipline", ONE_EXACTLY, expect_uint(assign_variable_callback(discipline)), - "support", ONE_EXACTLY, expect_uint(assign_variable_callback(support)), - "maneuver", ONE_EXACTLY, expect_uint(assign_variable_callback(maneuver)), - "siege", ONE_EXACTLY, expect_uint(assign_variable_callback(siege)) + fixed_point_t reconnaissance, attack, defence, discipline, support, maneuver, siege; + + ret &= expect_dictionary_keys(ALLOW_OTHER_KEYS, + "reconnaissance", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(reconnaissance)), + "attack", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(attack)), + "defence", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(defence)), + "discipline", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(discipline)), + "support", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(support)), + "maneuver", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(maneuver)), + "siege", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(siege)) )(value); - ret &= add_land_unit( - key, UNIT_ARGS, - reconnaisance, attack, defence, discipline, support, maneuver, siege - ); + ret &= add_land_unit(key, UNIT_ARGS, LAND_ARGS); return ret; } else if (category == "naval") { Unit::icon_t naval_icon; - bool sail = false, transport = false, build_overseas; - Unit::sound_t move_sound, select_sound; - uint32_t min_port_level, hull, gun_power, evasion, colonial_points = 0, torpedo_attack = 0; //probably? + bool sail = false, transport = false, capital = false, build_overseas = false; + Unit::sound_t move_sound, select_sound; //TODO defaults for both + uint32_t min_port_level, supply_consumption_score, hull, gun_power, colonial_points = 0, torpedo_attack = 0; int32_t limit_per_port; - fixed_point_t fire_range; + fixed_point_t fire_range, evasion; - ret &= expect_dictionary_keys( + ret &= expect_dictionary_keys(ALLOW_OTHER_KEYS, "naval_icon", ONE_EXACTLY, expect_uint(assign_variable_callback(naval_icon)), "sail", ZERO_OR_ONE, expect_bool(assign_variable_callback(sail)), "transport", ZERO_OR_ONE, expect_bool(assign_variable_callback(transport)), - "move_sound", ONE_EXACTLY, expect_string(assign_variable_callback(move_sound)), - "select_sound", ONE_EXACTLY, expect_string(assign_variable_callback(select_sound)), + "capital", ZERO_OR_ONE, expect_bool(assign_variable_callback(capital)), + "move_sound", ZERO_OR_ONE, expect_identifier(assign_variable_callback(move_sound)), + "select_sound", ZERO_OR_ONE, expect_identifier(assign_variable_callback(select_sound)), "colonial_points", ZERO_OR_ONE, expect_uint(assign_variable_callback(colonial_points)), - "can_build_overseas", ONE_EXACTLY, expect_bool(assign_variable_callback(build_overseas)), + "can_build_overseas", ZERO_OR_ONE, expect_bool(assign_variable_callback(build_overseas)), "min_port_level", ONE_EXACTLY, expect_uint(assign_variable_callback(min_port_level)), "limit_per_port", ONE_EXACTLY, expect_int(assign_variable_callback(limit_per_port)), + "supply_consumption_score", ONE_EXACTLY, expect_uint(assign_variable_callback(supply_consumption_score)), "hull", ONE_EXACTLY, expect_uint(assign_variable_callback(hull)), "gun_power", ONE_EXACTLY, expect_uint(assign_variable_callback(gun_power)), "fire_range", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(fire_range)), - "evasion", ONE_EXACTLY, expect_uint(assign_variable_callback(evasion)), + "evasion", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(evasion)), "torpedo_attack", ZERO_OR_ONE, expect_uint(assign_variable_callback(torpedo_attack)) )(value); - ret &= add_naval_unit( - key, UNIT_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 - ); + ret &= add_naval_unit(key, UNIT_ARGS, NAVY_ARGS); return ret; } else return false; diff --git a/src/openvic-simulation/units/Unit.hpp b/src/openvic-simulation/units/Unit.hpp index ccda35e..e95650e 100644 --- a/src/openvic-simulation/units/Unit.hpp +++ b/src/openvic-simulation/units/Unit.hpp @@ -1,7 +1,6 @@ #pragma once #include -#include #include #include "openvic-simulation/economy/Good.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" @@ -11,14 +10,15 @@ #define UNIT_PARAMS Unit::icon_t icon, Unit::sprite_t sprite, bool active, std::string_view 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, \ + fixed_point_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 + std::map supply_cost +#define LAND_PARAMS fixed_point_t reconnaissance, fixed_point_t attack, fixed_point_t defence, fixed_point_t discipline, \ + fixed_point_t support, fixed_point_t maneuver, fixed_point_t siege +#define NAVY_PARAMS Unit::icon_t naval_icon, bool sail, bool transport, bool capital, 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 supply_consumption_score, uint32_t hull, uint32_t gun_power, \ + fixed_point_t fire_range, fixed_point_t evasion, uint32_t torpedo_attack namespace OpenVic { struct Unit : HasIdentifier { @@ -37,14 +37,13 @@ namespace OpenVic { const uint32_t priority; const uint32_t max_strength; const uint32_t default_organisation; - const uint32_t maximum_speed; + const fixed_point_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, std::string_view category, UNIT_PARAMS); @@ -62,40 +61,39 @@ namespace OpenVic { 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_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; + const fixed_point_t reconnaissance; + const fixed_point_t attack; + const fixed_point_t defence; + const fixed_point_t discipline; + const fixed_point_t support; + const fixed_point_t maneuver; + const fixed_point_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; + fixed_point_t get_reconnaissance() const; + fixed_point_t get_attack() const; + fixed_point_t get_defence() const; + fixed_point_t get_discipline() const; + fixed_point_t get_support() const; + fixed_point_t get_maneuver() const; + fixed_point_t get_siege() const; }; struct NavalUnit : Unit { @@ -105,17 +103,19 @@ namespace OpenVic { const icon_t naval_icon; const bool sail; const bool transport; + const bool capital; const sound_t move_sound; const sound_t select_sound; const uint32_t colonial_points; const bool build_overseas; const uint32_t min_port_level; const int32_t limit_per_port; + const uint32_t supply_consumption_score; const uint32_t hull; const uint32_t gun_power; const fixed_point_t fire_range; - const uint32_t evasion; + const fixed_point_t evasion; const uint32_t torpedo_attack; NavalUnit(std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS); @@ -126,17 +126,19 @@ namespace OpenVic { icon_t get_naval_icon() const; bool can_sail() const; bool is_transport() const; + bool is_capital() 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_supply_consumption_score() const; uint32_t get_hull() const; uint32_t get_gun_power() const; fixed_point_t get_fire_range() const; - uint32_t get_evasion() const; + fixed_point_t get_evasion() const; uint32_t get_torpedo_attack() const; }; -- cgit v1.2.3-56-ga3b1 From 7720c6e1bcae39187ee75c2e084a9d4f6bd961fe Mon Sep 17 00:00:00 2001 From: zaaarf Date: Sat, 23 Sep 2023 13:29:08 +0200 Subject: chore: converted several types --- src/openvic-simulation/units/Unit.cpp | 42 +++++++++++++++++------------------ src/openvic-simulation/units/Unit.hpp | 40 ++++++++++++++++----------------- 2 files changed, 41 insertions(+), 41 deletions(-) (limited to 'src/openvic-simulation/units') diff --git a/src/openvic-simulation/units/Unit.cpp b/src/openvic-simulation/units/Unit.cpp index 0ec4aa1..ebf4985 100644 --- a/src/openvic-simulation/units/Unit.cpp +++ b/src/openvic-simulation/units/Unit.cpp @@ -40,11 +40,11 @@ uint32_t Unit::get_priority() const { return priority; } -uint32_t Unit::get_max_strength() const { +fixed_point_t Unit::get_max_strength() const { return max_strength; } -uint32_t Unit::get_default_organisation() const { +fixed_point_t Unit::get_default_organisation() const { return default_organisation; } @@ -60,7 +60,7 @@ fixed_point_t Unit::get_weighted_value() const { return weighted_value; } -std::map Unit::get_build_cost() const { +std::map const& Unit::get_build_cost() const { return build_cost; } @@ -68,7 +68,7 @@ fixed_point_t Unit::get_supply_consumption() const { return supply_consumption; } -std::map Unit::get_supply_cost() const { +std::map const& Unit::get_supply_cost() const { return supply_cost; } @@ -130,7 +130,7 @@ NavalUnit::sound_t NavalUnit::get_select_sound() const { return select_sound; } -uint32_t NavalUnit::get_colonial_points() const { +fixed_point_t NavalUnit::get_colonial_points() const { return colonial_points; } @@ -146,15 +146,15 @@ int32_t NavalUnit::get_limit_per_port() const { return limit_per_port; } -uint32_t NavalUnit::get_supply_consumption_score() const { +fixed_point_t NavalUnit::get_supply_consumption_score() const { return supply_consumption_score; } -uint32_t NavalUnit::get_hull() const { +fixed_point_t NavalUnit::get_hull() const { return hull; } -uint32_t NavalUnit::get_gun_power() const { +fixed_point_t NavalUnit::get_gun_power() const { return gun_power; } @@ -166,11 +166,11 @@ fixed_point_t NavalUnit::get_evasion() const { return evasion; } -uint32_t NavalUnit::get_torpedo_attack() const { +fixed_point_t NavalUnit::get_torpedo_attack() const { return torpedo_attack; } -UnitManager::UnitManager(GoodManager& good_manager) : good_manager { good_manager }, units { "units " } {}; +UnitManager::UnitManager(GoodManager& good_manager) : good_manager { good_manager }, units { "units" } {}; bool UnitManager::_check_shared_parameters(const std::string_view identifier, UNIT_PARAMS) { if (identifier.empty()) { @@ -217,8 +217,8 @@ bool UnitManager::load_unit_file(ast::NodeCPtr root) { std::string_view category, type; Unit::sprite_t sprite; bool active = true, floating_flag; - uint32_t priority, max_strength, default_organisation, build_time; - fixed_point_t maximum_speed, weighted_value, supply_consumption; + uint32_t priority, build_time; + fixed_point_t maximum_speed, max_strength, default_organisation, weighted_value, supply_consumption; std::map build_cost, supply_cost; //shared @@ -230,8 +230,8 @@ bool UnitManager::load_unit_file(ast::NodeCPtr root) { "unit_type", ONE_EXACTLY, expect_identifier(assign_variable_callback(type)), "floating_flag", ONE_EXACTLY, expect_bool(assign_variable_callback(floating_flag)), "priority", ONE_EXACTLY, expect_uint(assign_variable_callback(priority)), - "max_strength", ONE_EXACTLY, expect_uint(assign_variable_callback(max_strength)), - "default_organisation", ONE_EXACTLY, expect_uint(assign_variable_callback(default_organisation)), + "max_strength", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(max_strength)), + "default_organisation", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(default_organisation)), "maximum_speed", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(maximum_speed)), "weighted_value", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(weighted_value)), "build_time", ONE_EXACTLY, expect_uint(assign_variable_callback(build_time)), @@ -260,9 +260,9 @@ bool UnitManager::load_unit_file(ast::NodeCPtr root) { Unit::icon_t naval_icon; bool sail = false, transport = false, capital = false, build_overseas = false; Unit::sound_t move_sound, select_sound; //TODO defaults for both - uint32_t min_port_level, supply_consumption_score, hull, gun_power, colonial_points = 0, torpedo_attack = 0; + uint32_t min_port_level; int32_t limit_per_port; - fixed_point_t fire_range, evasion; + fixed_point_t fire_range, evasion, supply_consumption_score, hull, gun_power, colonial_points = 0, torpedo_attack = 0; ret &= expect_dictionary_keys(ALLOW_OTHER_KEYS, "naval_icon", ONE_EXACTLY, expect_uint(assign_variable_callback(naval_icon)), @@ -271,16 +271,16 @@ bool UnitManager::load_unit_file(ast::NodeCPtr root) { "capital", ZERO_OR_ONE, expect_bool(assign_variable_callback(capital)), "move_sound", ZERO_OR_ONE, expect_identifier(assign_variable_callback(move_sound)), "select_sound", ZERO_OR_ONE, expect_identifier(assign_variable_callback(select_sound)), - "colonial_points", ZERO_OR_ONE, expect_uint(assign_variable_callback(colonial_points)), + "colonial_points", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(colonial_points)), "can_build_overseas", ZERO_OR_ONE, expect_bool(assign_variable_callback(build_overseas)), "min_port_level", ONE_EXACTLY, expect_uint(assign_variable_callback(min_port_level)), "limit_per_port", ONE_EXACTLY, expect_int(assign_variable_callback(limit_per_port)), - "supply_consumption_score", ONE_EXACTLY, expect_uint(assign_variable_callback(supply_consumption_score)), - "hull", ONE_EXACTLY, expect_uint(assign_variable_callback(hull)), - "gun_power", ONE_EXACTLY, expect_uint(assign_variable_callback(gun_power)), + "supply_consumption_score", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(supply_consumption_score)), + "hull", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(hull)), + "gun_power", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(gun_power)), "fire_range", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(fire_range)), "evasion", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(evasion)), - "torpedo_attack", ZERO_OR_ONE, expect_uint(assign_variable_callback(torpedo_attack)) + "torpedo_attack", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(torpedo_attack)) )(value); ret &= add_naval_unit(key, UNIT_ARGS, NAVY_ARGS); diff --git a/src/openvic-simulation/units/Unit.hpp b/src/openvic-simulation/units/Unit.hpp index e95650e..c9d3434 100644 --- a/src/openvic-simulation/units/Unit.hpp +++ b/src/openvic-simulation/units/Unit.hpp @@ -9,16 +9,16 @@ #include "openvic-simulation/economy/Good.hpp" #define UNIT_PARAMS Unit::icon_t icon, Unit::sprite_t sprite, bool active, std::string_view type, \ - bool floating_flag, uint32_t priority, uint32_t max_strength, uint32_t default_organisation, \ + bool floating_flag, uint32_t priority, fixed_point_t max_strength, fixed_point_t default_organisation, \ fixed_point_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 #define LAND_PARAMS fixed_point_t reconnaissance, fixed_point_t attack, fixed_point_t defence, fixed_point_t discipline, \ fixed_point_t support, fixed_point_t maneuver, fixed_point_t siege #define NAVY_PARAMS Unit::icon_t naval_icon, bool sail, bool transport, bool capital, 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 supply_consumption_score, uint32_t hull, uint32_t gun_power, \ - fixed_point_t fire_range, fixed_point_t evasion, uint32_t torpedo_attack + Unit::sound_t select_sound, fixed_point_t colonial_points, bool build_overseas, uint32_t min_port_level, \ + int32_t limit_per_port, fixed_point_t supply_consumption_score, fixed_point_t hull, fixed_point_t gun_power, \ + fixed_point_t fire_range, fixed_point_t evasion, fixed_point_t torpedo_attack namespace OpenVic { struct Unit : HasIdentifier { @@ -35,8 +35,8 @@ namespace OpenVic { const bool floating_flag; const uint32_t priority; - const uint32_t max_strength; - const uint32_t default_organisation; + const fixed_point_t max_strength; + const fixed_point_t default_organisation; const fixed_point_t maximum_speed; const fixed_point_t weighted_value; @@ -59,15 +59,15 @@ namespace OpenVic { bool has_floating_flag() const; uint32_t get_priority() const; - uint32_t get_max_strength() const; - uint32_t get_default_organisation() const; + fixed_point_t get_max_strength() const; + fixed_point_t get_default_organisation() const; fixed_point_t get_maximum_speed() const; fixed_point_t get_weighted_value() const; uint32_t get_build_time() const; - std::map get_build_cost() const; + std::map const& get_build_cost() const; fixed_point_t get_supply_consumption() const; - std::map get_supply_cost() const; + std::map const& get_supply_cost() const; }; struct LandUnit : Unit { @@ -106,17 +106,17 @@ namespace OpenVic { const bool capital; const sound_t move_sound; const sound_t select_sound; - const uint32_t colonial_points; + const fixed_point_t colonial_points; const bool build_overseas; const uint32_t min_port_level; const int32_t limit_per_port; - const uint32_t supply_consumption_score; + const fixed_point_t supply_consumption_score; - const uint32_t hull; - const uint32_t gun_power; + const fixed_point_t hull; + const fixed_point_t gun_power; const fixed_point_t fire_range; const fixed_point_t evasion; - const uint32_t torpedo_attack; + const fixed_point_t torpedo_attack; NavalUnit(std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS); @@ -129,17 +129,17 @@ namespace OpenVic { bool is_capital() const; sound_t get_move_sound() const; sound_t get_select_sound() const; - uint32_t get_colonial_points() const; + fixed_point_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_supply_consumption_score() const; + fixed_point_t get_supply_consumption_score() const; - uint32_t get_hull() const; - uint32_t get_gun_power() const; + fixed_point_t get_hull() const; + fixed_point_t get_gun_power() const; fixed_point_t get_fire_range() const; fixed_point_t get_evasion() const; - uint32_t get_torpedo_attack() const; + fixed_point_t get_torpedo_attack() const; }; struct UnitManager { -- cgit v1.2.3-56-ga3b1