Mercurial > mm7
diff Player.h @ 1039:682ba1c83fd3
Merge
author | Nomad |
---|---|
date | Thu, 23 May 2013 03:32:36 +0200 |
parents | 7f8be9f9769e |
children | 4430136083a6 |
line wrap: on
line diff
--- a/Player.h Thu May 23 03:29:29 2013 +0200 +++ b/Player.h Thu May 23 03:32:36 2013 +0200 @@ -184,6 +184,7 @@ CHARACTER_ATTRIBUTE_RANGED_DAMAGE_BONUS = 0x1E, CHARACTER_ATTRIBUTE_RANGED_DAMAGE_MIN = 0x1F, CHARACTER_ATTRIBUTE_RANGED_DAMAGE_MAX = 0x20, + CHARACTER_ATTRIBUTE_RESIST_SPIRIT = 0x21 }; /* 328 */ @@ -491,7 +492,7 @@ char *GetRangedDamageString(); bool CanTrainToNextLevel(); unsigned int GetExperienceDisplayColor(); - int CalculateIncommingDamage(int resistance, signed int type); + int CalculateIncommingDamage(DAMAGE_TYPE dmg_type, int amount); ITEM_EQUIP_TYPE GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot); PLAYER_SKILL_TYPE GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot); bool IsUnarmed(); @@ -501,7 +502,7 @@ bool StealFromShop(struct ItemGen *a2, int a3, int a4, int a5, int *a6); int StealFromActor(unsigned int uActorID, int _steal_perm, int reputation); void Heal(int amount); - int ReceiveDamage(signed int type, int resistance); + int ReceiveDamage(signed int amount, DAMAGE_TYPE dmg_type); int _48DCF6(int a2, struct Actor *pActor); unsigned int GetSpellSchool(unsigned int uSpellID); int GetAttackRecoveryTime(bool bRangedAttack); @@ -516,7 +517,7 @@ void SetRecoveryTime(signed int sRecoveryTime); void RandomizeName(); unsigned int GetMajorConditionIdx(); - int _48EA1B_get_static_effect(int a2); + int GetParameterBonus(int player_parameter); int _48EA46_calc_special_bonus_by_items(int a2); int GetItemsBonus(enum CHARACTER_ATTRIBUTE_TYPE attr, int a3); int GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2); @@ -571,7 +572,7 @@ int GetBuyingPrice(unsigned int uRealValue, float price_multiplier); int GetPriceSell(int uRealValue, float price_multiplier); int _4B807C(float a2); - int _4B8040_condition_time(unsigned int uCondition); + int GetConditionDayOfWeek(unsigned int uCondition); bool _43EEF3(); void SalesProcess(unsigned int inventory_idnx, int item_index, int _2devent_idx);//0x4BE2DD bool Recover(signed int a2);