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, 60 insertions, 41 deletions

diff --git a/src/defines.h b/src/defines.h
index 7635ca5c..c1ad4fb0 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -85,7 +85,7 @@ enum
 /**
  * Points to give to a brand new character
  */
-    POINTS_TO_DISTRIBUTES_AT_LVL1 = 60,
+    POINTS_TO_DISTRIBUTES_AT_LVL1 = 70,
 
     // Screen Related
 /**
@@ -286,57 +286,76 @@ enum BeingState
 };
 
 /**
- * Base attributes of a Being.
+ * Stats every being needs
  */
-enum
+enum BeingStats
 {
-    ATT_STRENGTH = 0,
-    ATT_AGILITY,
-    ATT_VITALITY,
-    ATT_INTELLIGENCE,
-    ATT_DEXTERITY,
-    ATT_LUCK,
-/**    ATT_WILLPOWER,
-    ATT_CHARISMA,*/
-    NB_BASE_ATTRIBUTES
+    BASE_ATTR_STRENGTH = 0,    // Basic attributes
+    BASE_ATTR_AGILITY,
+    BASE_ATTR_DEXTERITY,
+    BASE_ATTR_VITALITY,
+    BASE_ATTR_INTELLIGENCE,
+    BASE_ATTR_WILLPOWER,
+    BASE_ATTR_CHARISMA,
+    NB_BASE_ATTRIBUTES,
+
+    ATTR_EFF_STRENGTH = NB_BASE_ATTRIBUTES,    // modified basic attributes
+    ATTR_EFF_AGILITY,
+    ATTR_EFF_DEXTERITY,
+    ATTR_EFF_VITALITY,
+    ATTR_EFF_INTELLIGENCE,
+    ATTR_EFF_WILLPOWER,
+    ATTR_EFF_CHARISMA,
+    NB_EFFECTIVE_ATTRIBUTES = ATTR_EFF_CHARISMA,
+
+    DERIVED_ATTR_HP_MAXIMUM = NB_EFFECTIVE_ATTRIBUTES,    // Computed stats
+    DERIVED_ATTR_PHYSICAL_ATTACK_MINIMUM,
+    DERIVED_ATTR_PHYSICAL_ATTACK_FLUCTUATION,
+    DERIVED_ATTR_PHYSICAL_DEFENCE,
+    // add new computed statistics when they are needed
+    NB_ATTRIBUTES_BEING
 };
+
+
 /**
- * Character skills
+ * Player character specific stats
  */
-enum WeaponSkills
+enum CharacterStats
 {
-    SKILL_WEAPON_UNARMED = 0,
-    SKILL_WEAPON_SWORD,
-    SKILL_WEAPON_AXE,
-    SKILL_WEAPON_POLEARM,
-    SKILL_WEAPON_JAVELIN,
-    SKILL_WEAPON_WHIP,
-    SKILL_WEAPON_DAGGER,
-    SKILL_WEAPON_STAFF,
-    SKILL_WEAPON_BOW,
-    SKILL_WEAPON_CROSSBOW,
-    SKILL_WEAPON_THROWN,
-    NB_WEAPONSKILLS
+    CHAR_SKILL_WEAPON_UNARMED = NB_ATTRIBUTES_BEING,
+    CHAR_SKILL_WEAPON_SWORD,
+    CHAR_SKILL_WEAPON_AXE,
+    CHAR_SKILL_WEAPON_POLEARM,
+    CHAR_SKILL_WEAPON_JAVELIN,
+    CHAR_SKILL_WEAPON_WHIP,
+    CHAR_SKILL_WEAPON_DAGGER,
+    CHAR_SKILL_WEAPON_STAFF,
+    CHAR_SKILL_WEAPON_BOW,
+    CHAR_SKILL_WEAPON_CROSSBOW,
+    CHAR_SKILL_WEAPON_THROWN,
+    NB_CHAR_WEAPONSKILLS,
+
+    CHAR_SKILL_MAGIC_IAMJUSTAPLACEHOLDER = NB_CHAR_WEAPONSKILLS,
+    NB_CHAR_MAGICSKILLS,
+
+    CHAR_SKILL_CRAFT_IAMJUSTAPLACEHOLDER = NB_CHAR_MAGICSKILLS,
+    NB_CHAR_CRAFTSKILLS,
+
+    CHAR_SKILL_IAMJUSTAPLACEHOLDER = NB_CHAR_CRAFTSKILLS,
+    NB_CHAR_OTHERSKILLS,
+
+    NB_ATTRIBUTES_CHAR = NB_CHAR_OTHERSKILLS
 };
 
-enum MagicSkills
-{
-    SKILL_MAGIC_IAMJUSTAPLACEHOLDER = NB_WEAPONSKILLS,
-    NB_MAGICSKILLS
-};
 
-enum CraftSkills
+/**
+ * Monster-specific stats
+ */
+enum MonsterStats
 {
-    SKILL_CRAFT_IAMJUSTAPLACEHOLDER = NB_MAGICSKILLS,
-    NB_CRAFTSKILLS
+    MONSTER_SKILL_WEAPON = NB_ATTRIBUTES_BEING,
+    NB_ATTRIBUTES_CONTROLLED
 };
 
-enum OtherSkills
-{
-    SKILL_IAMJUSTAPLACEHOLDER = NB_CRAFTSKILLS,
-    NB_OTHERSKILLS
-}
-
-static const NB_CHARACTER_SKILLS = NB_OTHERSKILLS;
 
 #endif // _TMWSERV_DEFINES_H_