From e33a330129364b4bd632b2fd531a996b8c57cefb Mon Sep 17 00:00:00 2001 From: hop311 Date: Wed, 17 Jan 2024 22:24:39 +0000 Subject: Parse missing variables, Logger counting, misc cleanup --- src/openvic-simulation/military/Deployment.cpp | 15 ++++++++------- src/openvic-simulation/military/Deployment.hpp | 4 ++-- src/openvic-simulation/military/Unit.cpp | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) (limited to 'src/openvic-simulation/military') diff --git a/src/openvic-simulation/military/Deployment.cpp b/src/openvic-simulation/military/Deployment.cpp index da860ad..d4a092b 100644 --- a/src/openvic-simulation/military/Deployment.cpp +++ b/src/openvic-simulation/military/Deployment.cpp @@ -7,9 +7,9 @@ using namespace OpenVic::NodeTools; Leader::Leader( std::string_view new_name, Unit::type_t new_type, Date new_date, LeaderTrait const* new_personality, - LeaderTrait const* new_background, fixed_point_t new_prestige + LeaderTrait const* new_background, fixed_point_t new_prestige, std::string_view new_picture ) : name { new_name }, type { new_type }, date { new_date }, personality { new_personality }, background { new_background }, - prestige { new_prestige } {} + prestige { new_prestige }, picture { new_picture } {} Regiment::Regiment(std::string_view new_name, Unit const* new_type, Province const* new_home) : name { new_name }, type { new_type }, home { new_home } {} @@ -76,9 +76,10 @@ bool DeploymentManager::load_oob_file( LeaderTrait const* leader_personality = nullptr; LeaderTrait const* leader_background = nullptr; fixed_point_t leader_prestige = 0; + std::string_view picture {}; bool ret = expect_dictionary_keys( - "name", ONE_EXACTLY, expect_string(assign_variable_callback(leader_name)), + "name", ONE_EXACTLY, expect_identifier_or_string(assign_variable_callback(leader_name)), "date", ONE_EXACTLY, expect_identifier_or_string(expect_date_str(assign_variable_callback(leader_date))), "type", ONE_EXACTLY, expect_identifier(UnitManager::expect_type_str(assign_variable_callback(leader_type))), "personality", ONE_EXACTLY, game_manager.get_military_manager().get_leader_trait_manager() @@ -86,7 +87,7 @@ bool DeploymentManager::load_oob_file( "background", ONE_EXACTLY, game_manager.get_military_manager().get_leader_trait_manager() .expect_leader_trait_identifier(assign_variable_callback_pointer(leader_background)), "prestige", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(leader_prestige)), - "picture", ZERO_OR_ONE, success_callback + "picture", ZERO_OR_ONE, expect_identifier_or_string(assign_variable_callback(picture)) )(node); if (!leader_personality->is_personality_trait()) { @@ -104,7 +105,7 @@ bool DeploymentManager::load_oob_file( ret = false; } leaders.emplace_back( - leader_name, leader_type, leader_date, leader_personality, leader_background, leader_prestige + leader_name, leader_type, leader_date, leader_personality, leader_background, leader_prestige, picture ); return ret; }, @@ -134,7 +135,7 @@ bool DeploymentManager::load_oob_file( army_regiments.emplace_back(regiment_name, regiment_type, regiment_home); return ret; }, - /* another paradox gem, tested in game and they don't lead the army or even show up */ + /* Another paradox gem, tested in game and they don't lead the army or even show up */ "leader", ZERO_OR_MORE, success_callback )(node); armies.emplace_back(army_name, army_location, std::move(army_regiments)); @@ -160,7 +161,7 @@ bool DeploymentManager::load_oob_file( navy_ships.emplace_back(ship_name, ship_type); return ret; }, - /* another paradox gem, tested in game and they don't lead the army or even show up */ + /* Another paradox gem, tested in game and they don't lead the army or even show up */ "leader", ZERO_OR_MORE, success_callback )(node); navies.emplace_back(navy_name, navy_location, std::move(navy_ships)); diff --git a/src/openvic-simulation/military/Deployment.hpp b/src/openvic-simulation/military/Deployment.hpp index 2aef314..a952823 100644 --- a/src/openvic-simulation/military/Deployment.hpp +++ b/src/openvic-simulation/military/Deployment.hpp @@ -1,6 +1,5 @@ #pragma once -#include #include #include #include @@ -22,11 +21,12 @@ namespace OpenVic { LeaderTrait const* PROPERTY(personality); LeaderTrait const* PROPERTY(background); fixed_point_t PROPERTY(prestige); + std::string PROPERTY(picture); public: Leader( std::string_view new_name, Unit::type_t new_type, Date new_date, LeaderTrait const* new_personality, - LeaderTrait const* new_background, fixed_point_t new_prestige + LeaderTrait const* new_background, fixed_point_t new_prestige, std::string_view new_picture ); }; diff --git a/src/openvic-simulation/military/Unit.cpp b/src/openvic-simulation/military/Unit.cpp index 9981c86..d0f6435 100644 --- a/src/openvic-simulation/military/Unit.cpp +++ b/src/openvic-simulation/military/Unit.cpp @@ -104,10 +104,10 @@ bool UnitManager::load_unit_file(GoodManager const& good_manager, ast::NodeCPtr } key_map_t key_map; - // shared + /* Shared dictionary entries */ ret &= add_key_map_entries(key_map, "icon", ONE_EXACTLY, expect_uint(assign_variable_callback(icon)), - "type", ONE_EXACTLY, success_callback, + "type", ONE_EXACTLY, success_callback, /* Already loaded above using expect_key */ "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(unit_type)), -- cgit v1.2.3-56-ga3b1