Mercurial > mm7

comparison Player.h @ 135:9b0d651821f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Party creation screen: sorcerer class icon fixed
author Nomad
date Mon, 11 Feb 2013 20:23:55 +0200
parents 1c471f3629fb
children 49728858c35e
comparison
equal deleted inserted replaced
131:3ee983b8082b 135:9b0d651821f1
58 }; 58 };
59 59
60 /* 328 */ 60 /* 328 */
61 enum PLAYER_SKILL_TYPE 61 enum PLAYER_SKILL_TYPE
62 { 62 {
63 PLAYER_SKILL_STAFF = 0x0, 63 PLAYER_SKILL_STAFF = 0,
64 PLAYER_SKILL_SWORD = 0x1, 64 PLAYER_SKILL_SWORD = 1,
65 PLAYER_SKILL_DAGGER = 0x2, 65 PLAYER_SKILL_DAGGER = 2,
66 PLAYER_SKILL_AXE = 0x3, 66 PLAYER_SKILL_AXE = 3,
67 PLAYER_SKILL_SPEAR = 0x4, 67 PLAYER_SKILL_SPEAR = 4,
68 PLAYER_SKILL_BOW = 0x5, 68 PLAYER_SKILL_BOW = 5,
69 PLAYER_SKILL_MACE = 0x6, 69 PLAYER_SKILL_MACE = 6,
70 PLAYER_SKILL_BLASTER = 0x7, 70 PLAYER_SKILL_BLASTER = 7,
71 PLAYER_SKILL_SHIELD = 0x8, 71 PLAYER_SKILL_SHIELD = 8,
72 PLAYER_SKILL_LEATHER = 0x9, 72 PLAYER_SKILL_LEATHER = 9,
73 PLAYER_SKILL_CHAIN = 0xA, 73 PLAYER_SKILL_CHAIN = 10,
74 PLAYER_SKILL_PLATE = 0xB, 74 PLAYER_SKILL_PLATE = 11,
75 PLAYER_SKILL_FIRE = 0xC, 75 PLAYER_SKILL_FIRE = 12,
76 PLAYER_SKILL_AIR = 0xD, 76 PLAYER_SKILL_AIR = 13,
77 PLAYER_SKILL_WATER = 0xE, 77 PLAYER_SKILL_WATER = 14,
78 PLAYER_SKILL_EARTH = 0xF, 78 PLAYER_SKILL_EARTH = 15,
79 PLAYER_SKILL_SPIRIT = 0x10, 79 PLAYER_SKILL_SPIRIT = 16,
80 PLAYER_SKILL_MIND = 0x11, 80 PLAYER_SKILL_MIND = 0x11,
81 PLAYER_SKILL_BODY = 0x12, 81 PLAYER_SKILL_BODY = 18,
82 PLAYER_SKILL_LIGHT = 0x13, 82 PLAYER_SKILL_LIGHT = 0x13,
83 PLAYER_SKILL_DARK = 0x14, 83 PLAYER_SKILL_DARK = 0x14,
84 PLAYER_SKILL_ITEM_ID = 0x15, 84 PLAYER_SKILL_ITEM_ID = 0x15,
85 PLAYER_SKILL_MERCHANT = 0x16, 85 PLAYER_SKILL_MERCHANT = 0x16,
86 PLAYER_SKILL_REPAIR = 0x17, 86 PLAYER_SKILL_REPAIR = 0x17,
87 PLAYER_SKILL_BODYBUILDING = 0x18, 87 PLAYER_SKILL_BODYBUILDING = 0x18,
88 PLAYER_SKILL_MEDITATION = 0x19, 88 PLAYER_SKILL_MEDITATION = 0x19,
89 PLAYER_SKILL_PERCEPTION = 0x1A, 89 PLAYER_SKILL_PERCEPTION = 0x1A,
90 PLAYER_SKILL_DIPLOMACY = 0x1B, 90 PLAYER_SKILL_DIPLOMACY = 0x1B,
91 PLAYER_SKILL_TIEVERY = 0x1C, 91 PLAYER_SKILL_TIEVERY = 0x1C,
92 PLAYER_SKILL_TRAP_DISARM = 0x1D, 92 PLAYER_SKILL_TRAP_DISARM = 29,
93 PLAYER_SKILL_DODGE = 0x1E, 93 PLAYER_SKILL_DODGE = 0x1E,
94 PLAYER_SKILL_UNARMED = 0x1F, 94 PLAYER_SKILL_UNARMED = 0x1F,
95 PLAYER_SKILL_MONSTER_ID = 0x20, 95 PLAYER_SKILL_MONSTER_ID = 0x20,
96 PLAYER_SKILL_ARMSMASTER = 0x21, 96 PLAYER_SKILL_ARMSMASTER = 33,
97 PLAYER_SKILL_STEALING = 0x22, 97 PLAYER_SKILL_STEALING = 34,
98 PLAYER_SKILL_ALCHEMY = 0x23, 98 PLAYER_SKILL_ALCHEMY = 35,
99 PLAYER_SKILL_LEARNING = 0x24, 99 PLAYER_SKILL_LEARNING = 0x24,
100 }; 100 };
101 101
102 /* 329 */ 102 /* 329 */
103 enum PLAYER_CLASS_TYPE 103 enum PLAYER_CLASS_TYPE: unsigned __int8
104 { 104 {
105 PLAYER_CLASS_KNIGHT = 0x0, 105 PLAYER_CLASS_KNIGHT = 0,
106 PLAYER_CLASS_THEIF = 0x4, 106 PLAYER_CLASS_THEIF = 4,
107 PLAYER_CLASS_BOUNTY_HUNTER = 0x7, 107 PLAYER_CLASS_BOUNTY_HUNTER = 0x7,
108 PLAYER_CLASS_MONK = 0x8, 108 PLAYER_CLASS_MONK = 0x8,
109 PLAYER_CLASS_PALADIN = 0xC, 109 PLAYER_CLASS_PALADIN = 0xC,
110 PLAYER_CLASS_SHOOTER = 0x10, 110 PLAYER_CLASS_SHOOTER = 0x10,
111 PLAYER_CLASS_RANGER = 0x14, 111 PLAYER_CLASS_RANGER = 0x14,
112 PLAYER_CLASS_CLERIC = 0x18, 112 PLAYER_CLASS_CLERIC = 24,
113 PLAYER_CLASS_PRIEST_OF_MOON = 0x1B, 113 PLAYER_CLASS_PRIEST_OF_MOON = 0x1B,
114 PLAYER_CLASS_DRUID = 0x1C, 114 PLAYER_CLASS_DRUID = 28,
115 PLAYER_CLASS_SORCERER = 0x20, 115 PLAYER_CLASS_31 = 31,
116 PLAYER_CLASS_LICH = 0x23, 116 PLAYER_CLASS_SORCERER = 32,
117 PLAYER_CLASS_LICH = 35,
117 }; 118 };
118 119
119 120
120 121
121 122
363 int GetSkillBonus(enum CHARACTER_ATTRIBUTE_TYPE a2); 364 int GetSkillBonus(enum CHARACTER_ATTRIBUTE_TYPE a2);
364 enum CHARACTER_RACE GetRace(); 365 enum CHARACTER_RACE GetRace();
365 int GetSexByVoice(); 366 int GetSexByVoice();
366 void SetInitialStats(); 367 void SetInitialStats();
367 int SetSexByVoice(); 368 int SetSexByVoice();
368 void Reset(unsigned __int8 uClass); 369 void Reset(PLAYER_CLASS_TYPE classType);
369 enum PLAYER_SKILL_TYPE GetSkillIdxByOrder(signed int order); 370 enum PLAYER_SKILL_TYPE GetSkillIdxByOrder(signed int order);
370 void DecreaseAttribute(int eAttribute); 371 void DecreaseAttribute(int eAttribute);
371 int IncreaseAttribute(int eAttribute); 372 int IncreaseAttribute(int eAttribute);
372 void Player::Zero(); 373 void Player::Zero();
373 __int16 GetStatColor(unsigned int uStat); 374 __int16 GetStatColor(unsigned int uStat);
416 bool Recover(signed int a2); 417 bool Recover(signed int a2);
417 bool CanCastSpell(unsigned int uRequiredMana); 418 bool CanCastSpell(unsigned int uRequiredMana);
418 419
419 inline bool Dead() {return pConditions[Condition::Condition_Dead] != 0;} 420 inline bool Dead() {return pConditions[Condition::Condition_Dead] != 0;}
420 inline bool Eradicated() {return pConditions[Condition::Condition_Eradicated] != 0;} 421 inline bool Eradicated() {return pConditions[Condition::Condition_Eradicated] != 0;}
422 inline bool Zombie() {return pConditions[Condition::Condition_Zombie] != 0;}
421 423
422 424
423 425
424 __int64 pConditions[20]; 426 __int64 pConditions[20];
425 unsigned __int64 uExperience; 427 unsigned __int64 uExperience;
426 char pName[16]; 428 char pName[16];
427 PLAYER_SEX uSex; 429 PLAYER_SEX uSex;
428 unsigned __int8 uClass; 430 PLAYER_CLASS_TYPE classType;
429 unsigned __int8 uFace; 431 unsigned __int8 uFace;
430 char field_BB; 432 char field_BB;
431 unsigned __int16 uMight; 433 unsigned __int16 uMight;
432 unsigned __int16 uMightBonus; 434 unsigned __int16 uMightBonus;
433 unsigned __int16 uIntelligence; 435 unsigned __int16 uIntelligence;