Set the default map position of new characters to a value that makes more sense. Implemented new basic attribute system on account server. Removed attribute modifiers, unified basic and derived attributes, storing attributes in a vector, renamed some attribute identifiers, removed identifiers for derived attributes that aren't needed yet.

1 files changed, 10 insertions, 17 deletions

diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp
index a372906c..1c456175 100644
--- a/src/game-server/itemmanager.cpp
+++ b/src/game-server/itemmanager.cpp
@@ -87,25 +87,18 @@ ItemManager::ItemManager(std::string const &itemReferenceFile)
         Modifiers modifiers;
         modifiers.element = XML::getProperty(node, "element", 0);
         modifiers.lifetime = XML::getProperty(node, "lifetime", 0);
-        modifiers.baseAttributes[ATT_STRENGTH]     = XML::getProperty(node, "strength",     0);
-        modifiers.baseAttributes[ATT_AGILITY]      = XML::getProperty(node, "agility",      0);
-        modifiers.baseAttributes[ATT_VITALITY]     = XML::getProperty(node, "vitality",     0);
-        modifiers.baseAttributes[ATT_INTELLIGENCE] = XML::getProperty(node, "intelligence", 0);
-        modifiers.baseAttributes[ATT_DEXTERITY]    = XML::getProperty(node, "dexterity",    0);
-        modifiers.baseAttributes[ATT_LUCK]    = XML::getProperty(node, "luck",    0);
-/**        modifiers.baseAttributes[ATT_WILLPOWER]         = XML::getProperty(node, "willpower",         0);
-        modifiers.baseAttributes[ATT_CHARISMA]         = XML::getProperty(node, "charisma",         0);*/
-        modifiers.derivedAttributes[ATT_HP_MAXIMUM]     = XML::getProperty(node, "hp",     0);
-        modifiers.derivedAttributes[ATT_PHYSICAL_ATTACK_MINIMUM]   = XML::getProperty(node, "attack",   0);
-        modifiers.derivedAttributes[ATT_PHYSICAL_DEFENCE]  = XML::getProperty(node, "defence",  0);
-        modifiers.derivedAttributes[ATT_MAGIC]    = XML::getProperty(node, "magic",    0);
-        modifiers.derivedAttributes[ATT_ACCURACY] = XML::getProperty(node, "accuracy", 0);
-        modifiers.derivedAttributes[ATT_SPEED]    = XML::getProperty(node, "speed",    0);
-/**        modifiers.hp = XML::getProperty(node, "hp", 0);
-        modifiers.mp = XML::getProperty(node, "mp", 0);*/
+        modifiers.attributes[BASE_ATTR_STRENGTH]     = XML::getProperty(node, "strength",     0);
+        modifiers.attributes[BASE_ATTR_AGILITY]      = XML::getProperty(node, "agility",      0);
+        modifiers.attributes[BASE_ATTR_VITALITY]     = XML::getProperty(node, "vitality",     0);
+        modifiers.attributes[BASE_ATTR_INTELLIGENCE] = XML::getProperty(node, "intelligence", 0);
+        modifiers.attributes[BASE_ATTR_DEXTERITY]    = XML::getProperty(node, "dexterity",    0);
+        modifiers.attributes[BASE_ATTR_WILLPOWER]    = XML::getProperty(node, "willpower",    0);
+        modifiers.attributes[BASE_ATTR_CHARISMA]     = XML::getProperty(node, "charisma",     0);
+        modifiers.attributes[DERIVED_ATTR_HP_MAXIMUM]         = XML::getProperty(node, "hp",          0);
+        modifiers.attributes[DERIVED_ATTR_PHYSICAL_ATTACK_MINIMUM]   = XML::getProperty(node, "attack",   0);
+        modifiers.attributes[DERIVED_ATTR_PHYSICAL_DEFENCE]  = XML::getProperty(node, "defence",      0);
         modifiers.range = XML::getProperty(node, "range", 0);
         modifiers.weaponType = XML::getProperty(node, "weapon_type", 0);
-/**        modifiers.beingStateEffect = XML::getProperty(node, "status_effect", 0);*/
 
         ItemClass *item = new ItemClass(id, itemType);
         item->setWeight(weight);