Mostly planning

server/character_data.hpp

@@ -38,9 +38,8 @@ struct CharacterData {
 	int mapIndex = 0;
 	Vector2 position = {0.0,0.0};
 	Vector2 motion = {0.0,0.0};
-	BBox bbox = {0,0,0,0};
 
-	//statistics
+	//base statistics
 	int level = 0;
 	int exp = 0;
 	int maxHP = 0;
@@ -55,7 +54,17 @@ struct CharacterData {
 	float evasion = 0.0;
 	float luck = 0.0;
 
-	//TODO: equipment and items
+	//TODO: equipment
+	//TODO: items
+	//TODO: buffs
+	//TODO: debuffs
+
+	//active gameplay members
+	//NOTE: these are lost when unloaded
+	BBox bbox = {0,0,0,0};
+	bool inCombat = false;
+	int atbGauge = 0;
+	//TODO: stored command
 };
 
 #endif

server/combat_instance.hpp

@@ -28,6 +28,13 @@
 #include <list>
 
 struct CombatInstance {
+	//TODO: metadata
+
+	//world position
+	int mapIndex = 0;
+	Vector2 position = {0.0,0.0};
+	Vector2 motion = {0.0,0.0};
+
 	std::list<CharacterData*> characterList;
 	std::list<EnemyData> enemyList;
 

server/enemy_data.hpp

@@ -29,8 +29,6 @@ struct EnemyData {
 	std::string handle;
 	std::string avatar;
 
-	//TODO: attached lua scripts
-
 	//statistics
 	int level = 0;
 	int exp = 0;
@@ -45,6 +43,16 @@ struct EnemyData {
 	float accuracy = 0.0;
 	float evasion = 0.0;
 	float luck = 0.0;
+
+	//TODO: equipment
+	//TODO: items
+	//TODO: buffs
+	//TODO: debuffs
+
+	//active gameplay members
+	//NOTE: these are lost when unloaded
+	int tableIndex;
+	int atbGauge = 0;
 };
 
 #endif