gamestate: Handle ApplyEffect in activity system.

Author: heinezen

libopenage/gamestate/api/definitions.h

@@ -157,29 +157,31 @@ static const auto EFFECT_TYPE_LOOKUP = datastructure::create_const_map<nyan::fqo
  * Maps API resistance types to internal effect types.
  */
 static const auto RESISTANCE_TYPE_LOOKUP = datastructure::create_const_map<nyan::fqon_t, effect_t>(
-	std::pair("engine.resistance.type.ContinuousFlatAttributeChangeDecrease",
+	std::pair("engine.resistance.continuous.flat_attribute_change.type.FlatAttributeChangeDecrease",
               effect_t::CONTINUOUS_FLAC_DECREASE),
-	std::pair("engine.resistance.type.ContinuousFlatAttributeChangeIncrease",
+	std::pair("engine.resistance.continuous.flat_attribute_change.type.FlatAttributeChangeIncrease",
               effect_t::CONTINUOUS_FLAC_INCREASE),
-	std::pair("engine.resistance.type.Lure",
+	std::pair("engine.resistance.continuous.type.Lure",
               effect_t::CONTINUOUS_LURE),
-	std::pair("engine.resistance.type.ContinuousTimeRelativeAttributeChangeDecrease",
+	std::pair("engine.resistance.continuous.type.TimeRelativeAttributeChangeDecrease",
               effect_t::CONTINUOUS_TRAC_DECREASE),
-	std::pair("engine.resistance.type.ContinuousTimeRelativeAttributeChangeIncrease",
+	std::pair("engine.resistance.continuous.type.TimeRelativeAttributeChangeIncrease",
               effect_t::CONTINUOUS_TRAC_INCREASE),
-	std::pair("engine.resistance.type.ContinuousTimeRelativeProgressChangeDecrease",
+	std::pair("engine.resistance.continuous.type.TimeRelativeProgressChangeDecrease",
               effect_t::CONTINUOUS_TRPC_DECREASE),
-	std::pair("engine.resistance.type.ContinuousTimeRelativeProgressChangeIncrease",
+	std::pair("engine.resistance.continuous.type.TimeRelativeProgressChangeIncrease",
               effect_t::CONTINUOUS_TRPC_INCREASE),
-	std::pair("engine.resistance.type.Convert",
+	std::pair("engine.resistance.discrete.type.Convert",
               effect_t::DISCRETE_CONVERT),
-	std::pair("engine.resistance.type.DiscreteFlatAttributeChangeDecrease",
+	std::pair("engine.resistance.discrete.convert.type.AoE2Convert", // TODO: Remove from API
+              effect_t::DISCRETE_CONVERT),
+	std::pair("engine.resistance.discrete.flat_attribute_change.type.FlatAttributeChangeDecrease",
               effect_t::DISCRETE_FLAC_DECREASE),
-	std::pair("engine.resistance.type.DiscreteFlatAttributeChangeIncrease",
+	std::pair("engine.resistance.discrete.flat_attribute_change.type.FlatAttributeChangeIncrease",
               effect_t::DISCRETE_FLAC_INCREASE),
-	std::pair("engine.resistance.type.MakeHarvestable",
+	std::pair("engine.resistance.discrete.type.MakeHarvestable",
               effect_t::DISCRETE_MAKE_HARVESTABLE),
-	std::pair("engine.resistance.type.SendToContainer",
+	std::pair("engine.resistance.discrete.type.SendToContainer",
               effect_t::DISCRETE_SEND_TO_CONTAINER));
 
 
@@ -243,6 +245,8 @@ static const auto ACTIVITY_NODE_DEFS = datastructure::create_const_map<std::stri
  * TODO: Expand this to include all systems.
  */
 static const auto ACTIVITY_TASK_SYSTEM_DEFS = datastructure::create_const_map<std::string, system::system_id_t>(
+	std::pair("engine.ability.type.ApplyDiscreteEffect",
+              system::system_id_t::APPLY_EFFECT),
 	std::pair("engine.ability.type.Idle",
               system::system_id_t::IDLE),
 	std::pair("engine.ability.type.Move",
@@ -254,6 +258,8 @@ static const auto ACTIVITY_TASK_SYSTEM_DEFS = datastructure::create_const_map<st
 static const auto ACTIVITY_CONDITIONS = datastructure::create_const_map<std::string, activity::condition_t>(
 	std::pair("engine.util.activity.condition.type.CommandInQueue",
               std::function(gamestate::activity::command_in_queue)),
+	std::pair("engine.util.activity.condition.type.NextCommandApplyEffect",
+              std::function(gamestate::activity::next_command_apply_effect)),
 	std::pair("engine.util.activity.condition.type.NextCommandIdle",
               std::function(gamestate::activity::next_command_idle)),
 	std::pair("engine.util.activity.condition.type.NextCommandMove",

libopenage/gamestate/system/activity.cpp

@@ -19,6 +19,7 @@
 #include "gamestate/component/internal/activity.h"
 #include "gamestate/component/types.h"
 #include "gamestate/game_entity.h"
+#include "gamestate/system/apply_effect.h"
 #include "gamestate/system/idle.h"
 #include "gamestate/system/move.h"
 #include "util/fixed_point.h"
@@ -125,6 +126,9 @@ const time::time_t Activity::handle_subsystem(const time::time_t &start_time,
                                               const std::shared_ptr<openage::gamestate::GameState> &state,
                                               system_id_t system_id) {
 	switch (system_id) {
+	case system_id_t::APPLY_EFFECT:
+		return ApplyEffect::apply_effect(entity, state, entity, start_time);
+		break;
 	case system_id_t::IDLE:
 		return Idle::idle(entity, start_time);
 		break;

libopenage/gamestate/system/apply_effect.cpp

@@ -26,7 +26,7 @@ const time::time_t ApplyEffect::apply_effect(const std::shared_ptr<gamestate::Ga
 	auto effects_component = std::dynamic_pointer_cast<component::ApplyEffect>(
 		effector->get_component(component::component_t::APPLY_EFFECT));
 	auto effect_ability = effects_component->get_ability();
-	auto batches = effect_ability.get_set("ApplyEffect.batches");
+	auto batches = effect_ability.get_set("ApplyDiscreteEffect.batches");
 
 	auto resistance_component = std::dynamic_pointer_cast<component::Resistance>(
 		resistor->get_component(component::component_t::RESISTANCE));
@@ -48,7 +48,7 @@ const time::time_t ApplyEffect::apply_effect(const std::shared_ptr<gamestate::Ga
 			auto effect_obj = effect_ability.get_view()->get_object(effect_obj_val->get_name());
 			auto effect_type = api::APIEffect::get_type(effect_obj);
 
-			if (effects.contains(effect_type)) {
+			if (not effects.contains(effect_type)) {
 				effects.emplace(effect_type, std::vector<nyan::Object>{});
 			}
 
@@ -63,7 +63,7 @@ const time::time_t ApplyEffect::apply_effect(const std::shared_ptr<gamestate::Ga
 		auto resistance_obj = resistance_ability.get_view()->get_object(resistance_obj_val->get_name());
 		auto resistance_type = api::APIResistance::get_effect_type(resistance_obj);
 
-		if (resistances.contains(resistance_type)) {
+		if (not resistances.contains(resistance_type)) {
 			resistances.emplace(resistance_type, std::vector<nyan::Object>{});
 		}
 
@@ -77,7 +77,7 @@ const time::time_t ApplyEffect::apply_effect(const std::shared_ptr<gamestate::Ga
 		auto effect_type = effect.first;
 		auto effect_objs = effect.second;
 
-		if (!resistances.contains(effect_type)) {
+		if (not resistances.contains(effect_type)) {
 			continue;
 		}
 
@@ -119,9 +119,9 @@ const component::attribute_value_t ApplyEffect::get_applied_discrete_flac(const
 	component::attribute_value_t max_change = component::attribute_value_t::max_value();
 
 	for (auto &effect : effects) {
-		auto change_amount = effect.get_object("FlatAttributeChange.value");
+		auto change_amount = effect.get_object("FlatAttributeChange.change_value");
 		auto min_change_amount = effect.get_optional<nyan::Object>("FlatAttributeChange.min_change_value");
-		auto max_change_amount = effect.get_optional<nyan::Object>("FlatAttributeChange.max_change_value");
+		auto max_change_amount = effect.get_optional<nyan::Object, true>("max_change_value");
 
 		// Get value from change amount
 		// TODO: Ensure that the attribute is the same for all effects
@@ -149,9 +149,7 @@ const component::attribute_value_t ApplyEffect::get_applied_discrete_flac(const
 	//       idea: move effect type to Effect object and make Resistance.resistances a dict.
 
 	for (auto &resistance : resistances) {
-		auto block_amount = resistance.get_object("FlatAttributeChange.value");
-		auto min_block_amount = resistance.get_optional<nyan::Object>("FlatAttributeChange.min_change_value");
-		auto max_block_amount = resistance.get_optional<nyan::Object>("FlatAttributeChange.max_change_value");
+		auto block_amount = resistance.get_object("FlatAttributeChange.block_value");
 
 		// Get value from block amount
 		// TODO: Ensure that the attribute is the same attribute used in the effects

libopenage/gamestate/system/types.h

@@ -1,4 +1,4 @@
-// Copyright 2023-2023 the openage authors. See copying.md for legal info.
+// Copyright 2023-2024 the openage authors. See copying.md for legal info.
 
 #pragma once
 
@@ -11,6 +11,8 @@ namespace openage::gamestate::system {
 enum class system_id_t {
 	NONE,
 
+	APPLY_EFFECT,
+
 	IDLE,
 
 	MOVE_COMMAND,