gamestate: Allow fractional values for attributes.

Author: heinezen

libopenage/gamestate/component/api/live.cpp

@@ -1,12 +1,10 @@
-// Copyright 2021-2023 the openage authors. See copying.md for legal info.
+// Copyright 2021-2024 the openage authors. See copying.md for legal info.
 
 #include "live.h"
 
-#include <optional>
-
-#include "curve/discrete.h"
 #include "curve/iterator.h"
 #include "curve/map_filter_iterator.h"
+#include "curve/segmented.h"
 #include "gamestate/component/types.h"
 
 
@@ -18,20 +16,22 @@ component_t Live::get_type() const {
 
 void Live::add_attribute(const time::time_t &time,
                          const nyan::fqon_t &attribute,
-                         std::shared_ptr<curve::Discrete<int64_t>> starting_values) {
-	this->attribute_values.insert(time, attribute, starting_values);
+                         std::shared_ptr<curve::Segmented<attribute_value_t>> starting_values) {
+	this->attributes.insert(time, attribute, starting_values);
 }
 
 void Live::set_attribute(const time::time_t &time,
                          const nyan::fqon_t &attribute,
-                         int64_t value) {
-	auto attribute_value = this->attribute_values.at(time, attribute);
-
-	if (attribute_value) {
-		(**attribute_value)->set_last(time, value);
+                         attribute_value_t value) {
+	auto attribute_iterator = this->attributes.at(time, attribute);
+	if (attribute_iterator) {
+		auto attribute_curve = **attribute_iterator;
+		auto current_value = attribute_curve->get(time);
+		attribute_curve->set_last_jump(time, current_value, value);
 	}
 	else {
-		// TODO: fail here
+		throw Error(MSG(err) << "Attribute not found: " << attribute);
 	}
 }
+
 } // namespace openage::gamestate::component

libopenage/gamestate/component/api/live.h

@@ -13,7 +13,14 @@
 #include "time/time.h"
 
 
-namespace openage::gamestate::component {
+namespace openage {
+
+namespace curve {
+template <typename T>
+class Segmented;
+} // namespace curve
+
+namespace gamestate::component {
 class Live final : public APIComponent {
 public:
 	using APIComponent::APIComponent;
@@ -29,7 +36,7 @@ class Live final : public APIComponent {
 	 */
 	void add_attribute(const time::time_t &time,
 	                   const nyan::fqon_t &attribute,
-	                   std::shared_ptr<curve::Discrete<int64_t>> starting_values);
+	                   std::shared_ptr<curve::Segmented<attribute_value_t>> starting_values);
 
 	/**
 	 * Set the value of an attribute at a given time.
@@ -40,16 +47,17 @@ class Live final : public APIComponent {
 	 */
 	void set_attribute(const time::time_t &time,
 	                   const nyan::fqon_t &attribute,
-	                   int64_t value);
+	                   attribute_value_t value);
 
 private:
 	using attribute_storage_t = curve::UnorderedMap<nyan::fqon_t,
-	                                                std::shared_ptr<curve::Discrete<int64_t>>>;
+	                                                std::shared_ptr<curve::Segmented<attribute_value_t>>>;
 
 	/**
 	 * Map of attribute values by attribute type.
 	 */
-	attribute_storage_t attribute_values;
+	attribute_storage_t attributes;
 };
 
-} // namespace openage::gamestate::component
+} // namespace gamestate::component
+} // namespace openage

libopenage/gamestate/component/types.h

@@ -2,9 +2,16 @@
 
 #pragma once
 
+#include "util/fixed_point.h"
+
 
 namespace openage::gamestate::component {
 
+/**
+ * Type for attribute values.
+ */
+using attribute_value_t = util::FixedPoint<int64_t, 16>;
+
 /**
  * Types of components.
  */

libopenage/gamestate/entity_factory.cpp

@@ -197,11 +197,12 @@ void EntityFactory::init_components(const std::shared_ptr<openage::event::EventL
 
 				live->add_attribute(time::TIME_MIN,
 				                    attribute.get_name(),
-				                    std::make_shared<curve::Discrete<int64_t>>(loop,
-				                                                               0,
-				                                                               "",
-				                                                               nullptr,
-				                                                               start_value));
+				                    std::make_shared<curve::Segmented<component::attribute_value_t>>(
+										loop,
+										0,
+										"",
+										nullptr,
+										start_value));
 			}
 		}
 		else if (ability_parent == "engine.ability.type.Activity") {