comparison Player.h @ 1611:8e99b4a7176f

Слияние
author Ritor1
date Sat, 14 Sep 2013 10:28:23 +0600
parents 4b79ff62df3a
children 434b796cdfd3
comparison
equal deleted inserted replaced
1610:fa0e700bcc80 1611:8e99b4a7176f
516 int GetActualResistance(enum CHARACTER_ATTRIBUTE_TYPE a2); 516 int GetActualResistance(enum CHARACTER_ATTRIBUTE_TYPE a2);
517 void SetRecoveryTime(signed int sRecoveryTime); 517 void SetRecoveryTime(signed int sRecoveryTime);
518 void RandomizeName(); 518 void RandomizeName();
519 unsigned int GetMajorConditionIdx(); 519 unsigned int GetMajorConditionIdx();
520 int GetParameterBonus(int player_parameter); 520 int GetParameterBonus(int player_parameter);
521 int _48EA46_calc_special_bonus_by_items(int a2); 521 int GetSpecialItemBonus(int enchantmentId);
522 int GetItemsBonus(enum CHARACTER_ATTRIBUTE_TYPE attr, int a3); 522 int GetItemsBonus(enum CHARACTER_ATTRIBUTE_TYPE attr, bool a3 = false);
523 int GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2); 523 int GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2);
524 int GetActualSkillLevel(PLAYER_SKILL_TYPE uSkillType); 524 int GetActualSkillLevel(PLAYER_SKILL_TYPE uSkillType);
525 int GetSkillBonus(enum CHARACTER_ATTRIBUTE_TYPE a2); 525 int GetSkillBonus(enum CHARACTER_ATTRIBUTE_TYPE a2);
526 enum CHARACTER_RACE GetRace(); 526 enum CHARACTER_RACE GetRace();
527 PLAYER_SEX GetSexByVoice(); 527 PLAYER_SEX GetSexByVoice();
582 void EquipBody(ITEM_EQUIP_TYPE uEquipType); 582 void EquipBody(ITEM_EQUIP_TYPE uEquipType);
583 583
584 unsigned int GetMultiplierForSkillLevel(unsigned int skillValue, int mult1, int mult2, int mult3, int mult4); 584 unsigned int GetMultiplierForSkillLevel(unsigned int skillValue, int mult1, int mult2, int mult3, int mult4);
585 int CalculateMeleeDmgToEnemyWithWeapon( ItemGen * weapon, unsigned int uTargetActorID , bool addOneDice); 585 int CalculateMeleeDmgToEnemyWithWeapon( ItemGen * weapon, unsigned int uTargetActorID , bool addOneDice);
586 bool WearsItemAnyWhere(int item_id); 586 bool WearsItemAnyWhere(int item_id);
587 float GetArmorRecoveryMultiplierFromSkillLevel( unsigned char armour_skill_type, float param2, float param3, float param4, float param5 );
587 588
588 bool IsWeak(); 589 bool IsWeak();
589 bool IsDead(); 590 bool IsDead();
590 bool IsEradicated(); 591 bool IsEradicated();
591 bool IsZombie(); 592 bool IsZombie();