contextual modifier parsingcontextual_modifier_parsing

1 files changed, 3 insertions, 9 deletions

diff --git a/src/openvic-simulation/military/LeaderTrait.cpp b/src/openvic-simulation/military/LeaderTrait.cpp
index 7835636..e00deec 100644
--- a/src/openvic-simulation/military/LeaderTrait.cpp
+++ b/src/openvic-simulation/military/LeaderTrait.cpp
@@ -1,5 +1,6 @@
 #include "LeaderTrait.hpp"
 
+#include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/modifier/ModifierManager.hpp"
 
 using namespace OpenVic;
@@ -32,17 +33,10 @@ bool LeaderTraitManager::load_leader_traits_file(ModifierManager const& modifier
 		return expect_dictionary_reserve_length(
 			leader_traits,
 			[this, &modifier_manager, type](std::string_view trait_identifier, ast::NodeCPtr value) -> bool {
-				using enum Modifier::modifier_type_t;
-
-				static const string_set_t allowed_modifiers = {
-					"attack", "defence leader", "morale", "organisation", "reconnaissance",
-					"speed", "attrition", "experience", "reliability"
-				};
-
 				ModifierValue modifiers;
 
-				bool ret = modifier_manager.expect_whitelisted_modifier_value(
-					move_variable_callback(modifiers), LEADER, allowed_modifiers
+				bool ret = NodeTools::expect_dictionary(
+					modifier_manager.expect_leader_modifier(modifiers)
 				)(value);
 
 				ret &= add_leader_trait(trait_identifier, type, std::move(modifiers));