Able to have set for EntityEffect

Author: Chi-EEE

.vscode/settings.json

@@ -7,6 +7,7 @@
         "system_error": "cpp",
         "xlocale": "cpp",
         "vector": "cpp",
-        "unordered_map": "cpp"
+        "unordered_map": "cpp",
+        "optional": "cpp"
     }
 }

src/arena/logic/ArenaType.h

@@ -141,7 +141,6 @@ namespace arena::logic {
     private:
         Value value;
     };
-    typedef std::shared_ptr<ArenaType> pArenaType;
 }
 
 #endif

src/arena/logic/Entity.cpp

@@ -1,8 +1,10 @@
 #include "Entity.h"
 
 namespace arena::logic {
-	tl::expected<Entity, std::string> Entity::create(pEntityData entity_data, Image entity_image)
-	{
+	tl::expected<Entity, std::string> Entity::create(
+		pEntityData entity_data,
+		Image entity_image
+	) {
 		EntityDataManager& entity_data_manager = EntityDataManager::getInstance();
 		std::vector<std::shared_ptr<Entity>> spawn_entities;
 		bool spawn_entity_immediately = !entity_data->getSpawnCharacter().empty() && !entity_data->getSpawnPauseTime();
@@ -20,17 +22,6 @@ namespace arena::logic {
 		return Entity(entity_data, entity_image, spawn_entities);
 	}
 
-	Entity::Entity(pEntityData entity_data, Image image, std::vector<std::shared_ptr<Entity>> spawn_entities) : entity_data(entity_data), image(image), spawn_entities(spawn_entities)
-	{
-		float scale = (this->entity_data->getScale() / 100.0f);
-		float entity_width = (this->image.get_width() * scale) * Global::scale;
-		float entity_height = (this->image.get_height() * scale) * Global::scale;
-
-		this->size = { entity_width, entity_height };
-
-		this->rect = SkRect::MakeXYWH(0, 0, this->size.x, this->size.y);
-	}
-
 	void Entity::setPosition(SkV2 position)
 	{
 		this->position = position;
@@ -73,11 +64,18 @@ namespace arena::logic {
 		Canvas entity_canvas(this->size.x, this->size.y);
 		entity_canvas.draw_image(this->image, SkRect{0, 0, this->size.x, this->size.y}, nullptr);
 
-		SkPaint paint;
+		// Damage
+		/*SkPaint paint;
 		paint.setBlendMode(SkBlendMode::kPlus);
 		paint.setColor(SK_ColorRED);
-		entity_canvas.draw_rect(SkRect{ 0, 0, this->size.x, this->size.y }, paint);
+		entity_canvas.draw_rect(SkRect{ 0, 0, this->size.x, this->size.y }, paint);*/
 
+		// Freeze
+		/*SkPaint paint;
+		paint.setBlendMode(SkBlendMode::kPlus);
+		paint.setColor(SkColorSetARGB(255, 0, 90, 255));
+		entity_canvas.draw_rect(SkRect{ 0, 0, this->size.x, this->size.y }, paint);*/
+		
 		SkPaint normal;
 		normal.setBlendMode(SkBlendMode::kDstIn);
 		entity_canvas.draw_image(this->image, SkRect{0, 0, this->size.x, this->size.y}, & normal);
@@ -112,4 +110,13 @@ namespace arena::logic {
 	{
 
 	}
+
+	Entity::Entity(pEntityData entity_data, Image image, std::vector<std::shared_ptr<Entity>> spawn_entities) : entity_data(entity_data), image(image), spawn_entities(spawn_entities)
+	{
+		float scale = (this->entity_data->getScale() / 100.0f);
+		float entity_width = (this->image.get_width() * scale) * Global::scale;
+		float entity_height = (this->image.get_height() * scale) * Global::scale;
+		this->size = { entity_width, entity_height };
+		this->rect = SkRect::MakeXYWH(0, 0, this->size.x, this->size.y);
+	}
 }

src/arena/logic/Entity.h

@@ -4,6 +4,8 @@
 #pragma once
 
 #include <filesystem>
+#include <unordered_set>
+#include <vector>
 
 #include "../../canvas/ImageLoader.h"
 #include "../../canvas/Drawable.h"
@@ -14,6 +16,8 @@
 
 #include "../../utils/Global.hpp"
 
+#include "EntityEffect.h"
+
 using namespace arena::data;
 using namespace csv;
 using namespace canvas;
@@ -22,7 +26,10 @@ namespace arena::logic {
 	class Entity : public Drawable
 	{
 	public:
-        static tl::expected<Entity, std::string> create(pEntityData entity_data, Image image);
+		static tl::expected<Entity, std::string> create(
+			pEntityData entity_data, 
+			Image entity_image
+		); 
 		void setPosition(SkV2 position);
 		void draw(Canvas& canvas);
 		void draw_shadow(Canvas& canvas);
@@ -37,8 +44,15 @@ namespace arena::logic {
 		Image image;
 
 		std::vector<std::shared_ptr<Entity>> spawn_entities;
+
+		std::unordered_set<EntityEffect, EntityEffectHasher> non_stackable_effects;
+		std::vector<EntityEffect> stackable_effects;
 	private:
-		Entity(pEntityData entity_data, Image image, std::vector<std::shared_ptr<Entity>> spawn_entities);
+		Entity(
+			pEntityData entity_data, 
+			Image image, 
+			std::vector<std::shared_ptr<Entity>> spawn_entities
+		);
 	};
 	typedef std::shared_ptr<Entity> pEntity;
 }

src/arena/logic/EntityEffect.h

@@ -0,0 +1,74 @@
+#ifndef ENTITYEFFECT_H
+#define ENTITYEFFECT_H
+
+#pragma once
+
+#include <string>
+
+namespace arena::logic {
+
+	class EntityEffect
+	{
+	public:
+		enum Value
+		{
+			Empty,
+			Damage,
+			Heal,
+			Freeze,
+			Rage,
+			Clone,
+		};
+
+		EntityEffect() = default;
+		constexpr EntityEffect(Value value) : value(value) { }
+
+		constexpr operator Value() const { return value; }
+		explicit operator bool() const = delete;
+		constexpr bool operator==(EntityEffect a) const { return value == a.value; }
+		constexpr bool operator!=(EntityEffect a) const { return value != a.value; }
+
+		std::string add_effect() const
+		{
+			switch (value)
+			{
+			case EntityEffect::Damage:
+			{
+				break;
+			}
+			case EntityEffect::Heal:
+			{
+				break; // 0, 6, 191, 0
+			}
+			case EntityEffect::Clone:
+			{
+				break;
+			}
+			case EntityEffect::Freeze:
+			{
+				break;
+			}
+			case EntityEffect::Rage:
+			{
+				break;
+			}
+			default:
+			{
+				break;
+			}
+			}
+		}
+	private:
+		Value value;
+	};
+
+	struct EntityEffectHasher {
+		std::size_t operator()(const arena::logic::EntityEffect::Value& value) const
+		{
+			return std::hash<int>()(value);
+		}
+	};
+}
+
+
+#endif