comparison Spells.h @ 2333:82851980e3d8

Слияние
author Ritor1
date Wed, 02 Apr 2014 20:53:47 +0600
parents 983b8c995127
children 5d263539bbec
comparison
equal deleted inserted replaced
2332:defd2526c94c 2333:82851980e3d8
215 }; 215 };
216 #pragma pack(pop) 216 #pragma pack(pop)
217 217
218 /* 151 */ 218 /* 151 */
219 #pragma pack(push, 1) 219 #pragma pack(push, 1)
220 struct SpellData 220 class SpellData
221 { 221 {
222 public:
223 SpellData(__int16 innormalMana, __int16 inExpertLevelMana, __int16 inMasterLevelMana, __int16 inMagisterLevelMana,
224 __int16 inNormalLevelRecovery, __int16 inExpertLevelRecovery, __int16 inMasterLevelRecovery, __int16 inMagisterLevelRecovery,
225 __int8 inbaseDamage, __int8 inbonusSkillDamage, __int16 instats);
222 union 226 union
223 { 227 {
224 unsigned __int16 mana_per_skill[4]; 228 unsigned __int16 mana_per_skill[4];
225 struct 229 struct
226 { 230 {
239 unsigned __int16 uExpertLevelRecovery; 243 unsigned __int16 uExpertLevelRecovery;
240 unsigned __int16 uMasterLevelRecovery; 244 unsigned __int16 uMasterLevelRecovery;
241 unsigned __int16 uMagisterLevelRecovery; 245 unsigned __int16 uMagisterLevelRecovery;
242 }; 246 };
243 }; 247 };
244 __int16 field_10; 248 __int8 baseDamage;
249 __int8 bonusSkillDamage;
245 __int16 stats; 250 __int16 stats;
246 // char field_12; 251 // char field_12;
247 // char field_13; 252 // char field_13;
248 // __int16 field_14; 253 // __int16 field_14;
249 }; 254 };
277 extern std::array<std::array<struct SpellBookIconPos, 12>, 9> pIconPos; 282 extern std::array<std::array<struct SpellBookIconPos, 12>, 9> pIconPos;
278 283
279 extern std::array<stru324_spell, 103> stru_4E3ACC; 284 extern std::array<stru324_spell, 103> stru_4E3ACC;
280 extern std::array<SpellData, 100> pSpellDatas; 285 extern std::array<SpellData, 100> pSpellDatas;
281 extern std::array<unsigned int, 25> wand_spell_ids; 286 extern std::array<unsigned int, 25> wand_spell_ids;
287
288 int _43AFE3_calc_spell_damage(int spellId, int spellLevel, signed int skillMastery, int currentHp);