SFTtech · TheJJ · Feb 6, 2017 · Dec 29, 2016 · Dec 29, 2016 · Dec 29, 2016
diff --git a/libopenage/gamestate/resource.cpp b/libopenage/gamestate/resource.cpp
@@ -62,11 +62,30 @@ bool ResourceBundle::has(const ResourceBundle& amount) const {
 }
 
 bool ResourceBundle::deduct(const ResourceBundle& amount) {
-	if (*this >= amount) {
+	if (this->has(amount)) {
 		*this -= amount;
 		return true;
 	}
 	return false;
 }
 
 } // openage
+
+namespace std {
+
+string to_string(const openage::game_resource &res) {
+	switch (res) {
+	case openage::game_resource::wood:
+		return "wood";
+	case openage::game_resource::food:
+		return "food";
+	case openage::game_resource::gold:
+		return "gold";
+	case openage::game_resource::stone:
+		return "stone";
+	default:
+		return "unknown";
+	}
+}
+
+} // namespace std
diff --git a/libopenage/gamestate/resource.h b/libopenage/gamestate/resource.h
@@ -41,6 +41,10 @@ class ResourceBundle {
 
 	bool has(const ResourceBundle& amount) const;
 
+	/**
+	 * If amount can't be deducted return false, else deduct the given amount
+	 * and return true.
+	 */
 	bool deduct(const ResourceBundle& amount);
 
 	double& operator[] (const game_resource res) { return value[(int) res]; }
@@ -49,7 +53,7 @@ class ResourceBundle {
 	// Getters
 
 	double get(const game_resource res) const { return value[(int) res]; }
-	double get(int index) const { return value[index]; }
+	double get(const int index) const { return value[index]; }
 
 private:
 	double value[(int) game_resource::RESOURCE_TYPE_COUNT];
@@ -59,6 +63,8 @@ class ResourceBundle {
 
 namespace std {
 
+std::string to_string(const openage::game_resource &res);
+
 /**
  * hasher for game resource
  */

diff --git a/libopenage/unit/CMakeLists.txt b/libopenage/unit/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_sources(libopenage
 	ability.cpp
 	action.cpp
+	attribute.cpp
+	attributes.cpp
 	command.cpp
 	producer.cpp
 	selection.cpp

diff --git a/libopenage/unit/ability.cpp b/libopenage/unit/ability.cpp
@@ -12,17 +12,17 @@
 namespace openage {
 
 bool UnitAbility::has_hitpoints(Unit &target) {
-	return target.has_attribute(attr_type::hitpoints) &&
-	       target.get_attribute<attr_type::hitpoints>().current > 0;
+	return target.has_attribute(attr_type::damaged) &&
+	       target.get_attribute<attr_type::damaged>().hp > 0;
 }
 
 bool UnitAbility::is_damaged(Unit &target) {
-	return target.has_attribute(attr_type::hitpoints) &&
-	       target.get_attribute<attr_type::hitpoints>().current < target.get_attribute<attr_type::hitpoints>().max;
+	return target.has_attribute(attr_type::damaged) && target.has_attribute(attr_type::hitpoints) &&
+	       target.get_attribute<attr_type::damaged>().hp < target.get_attribute<attr_type::hitpoints>().hp;
 }
 
 bool UnitAbility::has_resource(Unit &target) {
-	return target.has_attribute(attr_type::resource) &&
+	return target.has_attribute(attr_type::resource) && !target.has_attribute(attr_type::worker) &&
 	       target.get_attribute<attr_type::resource>().amount > 0;
 }
 
@@ -224,7 +224,7 @@ bool GatherAbility::can_invoke(Unit &to_modify, const Command &cmd) {
 		Unit &target = *cmd.unit();
 		return &to_modify != &target &&
 		       to_modify.location &&
-		       to_modify.has_attribute(attr_type::gatherer) &&
+		       to_modify.has_attribute(attr_type::worker) &&
 		       has_resource(target);
 	}
 	return false;