Mercurial > mm7
annotate Player.cpp @ 1688:ece764a4672d
Player::StealFromActor finishing cleanup
| author | Grumpy7 |
|---|---|
| date | Sun, 22 Sep 2013 04:31:34 +0200 |
| parents | 5f01f1ed97f4 |
| children | 133a5f62bc8c |
| rev | line source |
|---|---|
|
1165
29a8defbad9e
temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents:
1116
diff
changeset
|
1 #ifdef _MSC_VER |
|
29a8defbad9e
temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents:
1116
diff
changeset
|
2 #define _CRT_SECURE_NO_WARNINGS |
|
29a8defbad9e
temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents:
1116
diff
changeset
|
3 #endif |
|
29a8defbad9e
temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents:
1116
diff
changeset
|
4 |
| 1016 | 5 #include "stru6.h" |
| 6 | |
| 0 | 7 #include "Player.h" |
| 8 #include "PlayerFrameTable.h" | |
| 9 #include "AudioPlayer.h" | |
| 10 #include "Party.h" | |
| 816 | 11 #include "Log.h" |
| 0 | 12 #include "LOD.h" |
| 13 #include "GUIWindow.h" | |
| 14 #include "Viewport.h" | |
| 15 #include "Actor.h" | |
| 16 #include "Game.h" | |
| 17 #include "Mouse.h" | |
| 18 #include "TurnEngine.h" | |
| 19 #include "Events.h" | |
| 20 #include "Events2D.h" | |
| 21 #include "Outdoor.h" | |
| 22 #include "StorylineTextTable.h" | |
|
81
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
23 #include "Autonotes.h" |
|
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
24 #include "Awards.h" |
| 189 | 25 #include "texts.h" |
| 816 | 26 |
| 0 | 27 #include "mm7_data.h" |
|
828
0f56abdcce94
Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents:
821
diff
changeset
|
28 #include "MM7.h" |
| 1297 | 29 #include "SpriteObject.h" |
| 30 #include "DecalBuilder.h" | |
| 0 | 31 |
| 32 | |
| 33 | |
| 34 | |
| 35 | |
| 36 /* 381 */ | |
| 37 #pragma pack(push, 1) | |
| 290 | 38 struct PlayerCreation_AttributeProps |
| 0 | 39 { |
| 40 unsigned __int8 uBaseValue; | |
| 41 char uMaxValue; | |
| 42 char uDroppedStep; | |
| 43 char uBaseStep; | |
| 44 }; | |
| 45 #pragma pack(pop) | |
| 46 | |
| 47 | |
| 48 #pragma pack(push, 1) | |
| 290 | 49 |
| 50 | |
| 51 | |
| 0 | 52 #pragma pack(pop) |
| 290 | 53 PlayerCreation_AttributeProps StatTable[4][7] = //0x4ED7B0 |
| 54 { | |
| 55 {{11, 25, 1, 1}, {11, 25, 1, 1}, {11, 25, 1, 1}, { 9, 25, 1, 1}, {11, 25, 1, 1}, {11, 25, 1, 1}, {9, 25, 1, 1},}, | |
| 56 {{ 7, 15, 2, 1}, {14, 30, 1, 2}, {11, 25, 1, 1}, { 7, 15, 2, 1}, {14, 30, 1, 2}, {11, 25, 1, 1}, {9, 20, 1, 1},}, | |
| 57 {{14, 30, 1, 2}, { 7, 15, 2, 1}, { 7, 15, 2, 1}, {11, 25, 1, 1}, {11, 25, 1, 1}, {14, 30, 1, 2}, {9, 20, 1, 1},}, | |
| 58 {{14, 30, 1, 2}, {11, 25, 1, 1}, {11, 25, 1, 1}, {14, 30, 1, 2}, { 7, 15, 2, 1}, { 7, 15, 2, 1}, {9, 20, 1, 1}} | |
| 0 | 59 }; |
| 60 | |
| 61 | |
| 62 | |
| 1686 | 63 std::array<int, 5> StealingMasteryBonuses = {0, 100, 200, 300, 500}; //dword_4EDEA0 |
| 64 std::array<int, 5> StealingRandomBonuses = {-200, -100, 0, 100, 200}; //dword_4EDEB4 | |
| 65 std::array<int, 5> StealingEnchantmentBonusForSkill = {0, 2, 4, 6, 10}; //dword_4EDEC4 | |
| 0 | 66 |
| 67 | |
| 68 | |
| 69 // available skills per class ( 9 classes X 37 skills ) | |
| 70 // 0 - not available | |
| 71 // 1 - available | |
| 72 // 2 - primary skill | |
| 73 unsigned char pSkillAvailabilityPerClass[9][37] = // byte[] @ MM7.exe::004ED820 | |
| 74 { | |
| 75 {0, 2, 0, 1, 1, 1, 1, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, | |
| 76 {0, 1, 2, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 2, 1, 0}, | |
| 77 {1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 2, 2, 1, 1, 0, 0, 0}, | |
| 78 {0, 1, 1, 1, 0, 0, 2, 0, 1, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, | |
| 79 {0, 1, 0, 1, 1, 2, 0, 0, 0, 1, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1}, | |
| 80 {0, 1, 1, 2, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0}, | |
| 81 {0, 0, 0, 0, 0, 0, 2, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 2, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}, | |
| 82 {0, 0, 2, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}, | |
| 83 {2, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0} // some of these are started at 4ED94C, but needs to be here | |
| 84 }; | |
| 85 | |
| 86 | |
| 1374 | 87 unsigned char pEquipTypeToBodyAnchor[21] = // 4E8398 |
| 88 { | |
| 89 1, // EQUIP_OFF_HAND | |
| 90 1, // EQUIP_MAIN_HAND | |
| 91 2, // EQUIP_BOW | |
| 92 3, // EQUIP_ARMOUR | |
| 93 0, // EQUIP_SHIELD | |
| 94 4, // EQUIP_HELMET | |
| 95 5, // EQUIP_BELT | |
| 96 6, // EQUIP_CLOAK | |
| 97 7, // EQUIP_GAUNTLETS | |
| 98 8, // EQUIP_BOOTS | |
| 99 10, // EQUIP_RING | |
| 100 9, // EQUIP_AMULET | |
| 101 1, // EQUIP_WAND | |
| 102 0, // EQUIP_REAGENT | |
| 103 0, // EQUIP_POTION | |
| 104 0, // EQUIP_SPELL_SCROLL | |
| 105 0, // EQUIP_BOOK | |
| 106 0, // EQUIP_MESSAGE_SCROLL | |
| 107 0, // EQUIP_GOLD | |
| 108 0, // EQUIP_GEM | |
| 109 0 // EQUIP_NONE | |
| 110 }; | |
| 0 | 111 |
| 112 | |
| 113 unsigned char pBaseHealthByClass[12] = {40, 35, 35, 30, 30, 30, 25, 20, 20, 0, 0, 0}; | |
| 114 unsigned char pBaseManaByClass[12] = { 0, 0, 0, 5, 5, 0, 10, 10, 15, 0, 0, 0}; | |
| 115 unsigned char pBaseHealthPerLevelByClass[36] = {5, 7, 9, 9, 4, 6, 8, 8, 5, 6, 8, 8, 4, 5, 6, 6, 3, 4, 6, 6, 4, 5, 6, 6, 2, 3, 4, 4, 2, 3, 4, 4, 2, 3, 3, 3}; | |
| 116 unsigned char pBaseManaPerLevelByClass[36] = {0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 2, 3, 3, 1, 2, 3, 3, 0, 2, 3, 3, 3, 4, 5, 5, 3, 4, 5, 5, 3, 4, 6, 6}; | |
| 117 | |
| 1325 | 118 unsigned char pConditionAttributeModifier[7][19] = |
| 119 {{100, 100, 100, 120, 50, 200, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Might | |
| 120 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Intelligence | |
| 121 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Willpower | |
| 122 {100, 100, 100, 100, 50, 150, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Endurance | |
| 123 {100, 100, 100, 50, 10, 100, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Accuracy | |
| 124 {100, 100, 100, 120, 20, 120, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Speed | |
| 125 {100, 100, 100, 100, 200, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100}}; //Luck | |
| 126 | |
| 127 unsigned char pAgingAttributeModifier[7][4] = | |
| 128 {{100, 75, 40, 10}, //Might | |
| 129 {100, 150, 100, 10}, //Intelligence | |
| 130 {100, 150, 100, 10}, //Willpower | |
| 131 {100, 75, 40, 10}, //Endurance | |
| 132 {100, 100, 40, 10}, //Accuracy | |
| 133 {100, 100, 40, 10}, //Speed | |
| 134 {100, 100, 100, 100}}; //Luck | |
| 0 | 135 |
| 1684 | 136 unsigned int pAgeingTable[4] = {50, 100, 150, 0xFFFF}; |
| 0 | 137 |
|
1207
96a81634669e
arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents:
1205
diff
changeset
|
138 std::array<unsigned int, 18> pConditionImportancyTable = {{16, 15, 14, 17, 13, 2, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 1, 0}}; |
| 0 | 139 |
| 1036 | 140 short param_to_bonus_table[29] = {500, 400, 350, 300, 275, 250, 225, 200, 175, |
| 0 | 141 150, 125, 100, 75, 50, 40, 35, 30, 25, 21, |
| 1036 | 142 19, 17, 15, 13, 11, 9, 7, 5, 3, 0}; |
| 143 signed int parameter_to_bonus_value[29] = {30, 25, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, -1, -2, -3, -4, -5, -6}; | |
| 0 | 144 |
| 145 | |
| 816 | 146 unsigned short base_recovery_times_per_weapon_type[12] = |
| 147 { | |
| 148 100, // PLAYER_SKILL_STAFF && Unarmed withoud skill | |
| 149 90, // PLAYER_SKILL_SWORD && Unarmed with skill | |
| 150 60, // PLAYER_SKILL_DAGGER | |
| 151 100, // PLAYER_SKILL_AXE | |
| 152 80, // PLAYER_SKILL_SPEAR | |
| 153 100, // PLAYER_SKILL_BOW | |
| 154 80, // PLAYER_SKILL_MACE | |
| 155 30, // PLAYER_SKILL_BLASTER | |
| 156 10, // PLAYER_SKILL_SHIELD | |
| 157 10, // PLAYER_SKILL_LEATHER | |
| 158 20, // PLAYER_SKILL_CHAIN | |
| 159 30 // PLAYER_SKILL_PLATE | |
| 160 }; | |
| 161 | |
| 0 | 162 //----- (00490913) -------------------------------------------------------- |
| 1459 | 163 int PlayerCreation_GetUnspentAttributePointCount() |
| 0 | 164 { |
| 165 signed int v0; // edi@1 | |
| 1273 | 166 int raceId; // ebx@2 |
| 0 | 167 signed int v4; // eax@17 |
| 168 int v5; // edx@18 | |
| 169 signed int v6; // ecx@18 | |
| 1273 | 170 signed int remainingStatPoints; // [sp+Ch] [bp-8h]@1 |
| 171 | |
| 172 remainingStatPoints = 50; | |
| 0 | 173 v0 = 50; |
| 1273 | 174 for (int playerNum = 0; playerNum < 4; playerNum++) |
| 175 { | |
| 176 raceId = pParty->pPlayers[playerNum].GetRace(); | |
| 177 for (int statNum = 0; statNum <= 6; statNum++) | |
| 178 { | |
| 179 switch ( statNum ) | |
| 0 | 180 { |
| 1273 | 181 case 0: |
| 182 v0 = pParty->pPlayers[playerNum].uMight; | |
| 183 break; | |
| 184 case 1: | |
| 185 v0 = pParty->pPlayers[playerNum].uIntelligence; | |
| 186 break; | |
| 187 case 2: | |
| 188 v0 = pParty->pPlayers[playerNum].uWillpower; | |
| 189 break; | |
| 190 case 3: | |
| 191 v0 = pParty->pPlayers[playerNum].uEndurance; | |
| 192 break; | |
| 193 case 4: | |
| 194 v0 = pParty->pPlayers[playerNum].uAccuracy; | |
| 195 break; | |
| 196 case 5: | |
| 197 v0 = pParty->pPlayers[playerNum].uSpeed; | |
| 198 break; | |
| 199 case 6: | |
| 200 v0 = pParty->pPlayers[playerNum].uLuck; | |
| 201 break; | |
| 202 } | |
| 203 v4 = StatTable[raceId][statNum].uBaseValue; | |
| 204 if ( v0 >= v4 ) | |
| 205 { | |
| 206 v5 = StatTable[raceId][statNum].uDroppedStep; | |
| 207 v6 = StatTable[raceId][statNum].uBaseStep; | |
| 0 | 208 } |
| 209 else | |
| 210 { | |
| 1273 | 211 v5 = StatTable[raceId][statNum].uBaseStep; |
| 212 v6 = StatTable[raceId][statNum].uDroppedStep; | |
| 0 | 213 } |
| 1273 | 214 remainingStatPoints += v5 * (v4 - v0) / v6; |
| 215 } | |
| 216 } | |
| 217 return remainingStatPoints; | |
| 0 | 218 } |
| 219 | |
| 220 | |
| 221 | |
| 222 //----- (00427730) -------------------------------------------------------- | |
| 223 bool Player::CanCastSpell(unsigned int uRequiredMana) | |
| 224 { | |
| 1275 | 225 if (sMana >= (signed int)uRequiredMana) |
| 226 { | |
| 227 sMana -= (signed int)uRequiredMana; | |
| 488 | 228 return true; |
| 229 } | |
| 230 | |
| 231 pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0); | |
| 232 return false; | |
| 0 | 233 } |
| 234 | |
| 235 | |
| 236 //----- (004BE2DD) -------------------------------------------------------- | |
| 1014 | 237 void Player::SalesProcess( unsigned int inventory_idnx, int item_index, int _2devent_idx ) |
| 238 { | |
| 0 | 239 float v6; // ST04_4@1 |
| 1014 | 240 signed int item_value; // eax@1 |
| 241 signed int sell_price; // ebx@1 | |
| 242 | |
| 243 item_value =pOwnItems[item_index].GetValue(); | |
| 244 v6 = p2DEvents[ _2devent_idx - 1].fPriceMultiplier; | |
| 245 sell_price = GetPriceSell(item_value, v6); | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
246 if ( pOwnItems[item_index].IsBroken() ) |
| 1014 | 247 sell_price = 1; |
| 248 if ( sell_price < 1 ) | |
| 249 sell_price = 1; | |
| 250 RemoveItemAtInventoryIndex(inventory_idnx); | |
| 251 Party::SetGold(pParty->uNumGold + sell_price); | |
| 0 | 252 } |
| 253 | |
| 254 | |
| 255 | |
| 256 //----- (0043EEF3) -------------------------------------------------------- | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
257 bool Player::NothingOrJustBlastersEquipped() |
| 0 | 258 { |
| 1014 | 259 signed int item_idx; // esi@1 |
| 260 signed int item_id; // esi@1 | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
261 for (int i = 0; i < 16; ++i) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
262 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
263 item_idx = pEquipment.pIndices[i]; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
264 if (item_idx) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
265 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
266 item_id = pOwnItems[item_idx - 1].uItemID; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
267 if ( item_id != ITEM_BLASTER && item_id != ITEM_LASER_RIFLE ) //blaster& blaster rifle |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
268 return false; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
269 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
270 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
271 return true; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
272 } |
| 1014 | 273 |
| 0 | 274 |
| 275 | |
| 276 | |
| 277 //----- (004B8040) -------------------------------------------------------- | |
| 1036 | 278 int Player::GetConditionDayOfWeek( unsigned int uCondition ) |
| 279 { | |
| 280 return (unsigned int)(((signed __int64)((double)this->pConditions[uCondition] * 0.234375) / 60 / 60) / 24) % 7 + 1; | |
| 0 | 281 } |
| 282 | |
| 283 //----- (004B807C) -------------------------------------------------------- | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
284 int Player::GetTempleHealCostModifier(float a2) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
285 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
286 unsigned int conditionIdx; // eax@1 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
287 int conditionTimeMultiplier; // esi@1 |
| 0 | 288 int v6; // eax@8 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
289 signed int result; // qax@13 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
290 signed int baseConditionMultiplier; // [sp+8h] [bp-8h]@4 |
| 1275 | 291 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
292 conditionIdx = GetMajorConditionIdx(); |
| 1275 | 293 if ( conditionIdx >= 14 && conditionIdx <= 16) |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
294 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
295 if ( conditionIdx <= 15 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
296 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
297 baseConditionMultiplier = 5; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
298 } |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
299 if ( conditionIdx == 16 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
300 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
301 baseConditionMultiplier = 10; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
302 } |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
303 conditionTimeMultiplier = GetConditionDayOfWeek(conditionIdx); |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
304 } |
| 1350 | 305 else |
| 306 { | |
| 1275 | 307 conditionTimeMultiplier = 1; |
| 308 baseConditionMultiplier = 1; | |
| 1350 | 309 if (conditionIdx < 14) |
| 310 { | |
| 311 for (int i = 0; i <= 13; i++) | |
| 312 { | |
| 313 v6 = GetConditionDayOfWeek(i); | |
| 314 if ( v6 > conditionTimeMultiplier ) | |
| 315 conditionTimeMultiplier = v6; | |
| 316 } | |
| 317 } | |
| 1275 | 318 } |
| 319 result = (int)((double)conditionTimeMultiplier * (double)baseConditionMultiplier * a2); | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
320 if ( result < 1 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
321 result = 1; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
322 return result; |
| 0 | 323 } |
| 324 | |
| 325 //----- (004B8102) -------------------------------------------------------- | |
| 917 | 326 int Player::GetPriceSell(int uRealValue, float price_multiplier) |
| 0 | 327 { |
| 328 signed int v3; // esi@1 | |
| 329 signed int result; // eax@3 | |
| 330 | |
| 1275 | 331 v3 = (signed int)((signed __int64)((double)uRealValue / (price_multiplier + 2.0)) + uRealValue * GetMerchant() / 100); |
| 917 | 332 if ( v3 > uRealValue ) |
| 333 v3 = uRealValue; | |
| 0 | 334 result = 1; |
| 335 if ( v3 >= 1 ) | |
| 336 result = v3; | |
| 337 return result; | |
| 338 } | |
| 339 | |
| 340 //----- (004B8142) -------------------------------------------------------- | |
| 749 | 341 int Player::GetBuyingPrice(unsigned int uRealValue, float price_multiplier) |
| 342 { | |
| 1275 | 343 uint price = (uint)(((100 - GetMerchant()) * (uRealValue * price_multiplier)) / 100); |
| 749 | 344 |
| 345 if (price < uRealValue) | |
| 346 price = uRealValue; | |
| 347 return price; | |
| 0 | 348 } |
| 349 | |
| 350 //----- (004B8179) -------------------------------------------------------- | |
| 916 | 351 int Player::GetPriceIdentification(float a2) |
| 0 | 352 { |
| 353 signed int v2; // esi@1 | |
| 354 int v3; // ecx@1 | |
| 355 signed int result; // eax@3 | |
| 356 | |
| 1275 | 357 v2 = (signed int)(a2 * 50.0); |
| 0 | 358 v3 = v2 * (100 - GetMerchant()) / 100; |
| 359 if ( v3 < v2 / 3 ) | |
| 360 v3 = v2 / 3; | |
| 361 result = 1; | |
| 362 if ( v3 >= 1 ) | |
| 363 result = v3; | |
| 364 return result; | |
| 365 } | |
| 366 | |
| 367 //----- (004B81C3) -------------------------------------------------------- | |
| 916 | 368 int Player::GetPriceRepair(int a2, float a3) |
| 0 | 369 { |
| 370 signed int v3; // esi@1 | |
| 371 int v4; // ecx@1 | |
| 372 signed int result; // eax@3 | |
| 373 | |
| 1275 | 374 v3 = (signed int)((double)a2 / (6.0 - a3)); |
| 0 | 375 v4 = v3 * (100 - GetMerchant()) / 100; |
| 376 if ( v4 < v3 / 3 ) | |
| 377 v4 = v3 / 3; | |
| 378 result = 1; | |
| 379 if ( v4 >= 1 ) | |
| 380 result = v4; | |
| 381 return result; | |
| 382 } | |
| 383 | |
| 384 //----- (004B8213) -------------------------------------------------------- | |
| 1275 | 385 int Player::GetBaseSellingPrice(int a2, float a3) |
| 386 { | |
| 387 signed int v3; // qax@1 | |
| 388 | |
| 389 v3 = (signed int)((double)a2 / (a3 + 2.0)); | |
| 390 if ( v3 < 1 ) | |
| 391 v3 = 1; | |
| 0 | 392 return v3; |
| 393 } | |
| 394 | |
| 395 //----- (004B8233) -------------------------------------------------------- | |
| 1275 | 396 int Player::GetBaseBuyingPrice(int a2, float a3) |
| 397 { | |
| 398 signed int v3; // qax@1 | |
| 399 | |
| 400 v3 = (signed int)((double)a2 * a3); | |
| 401 if ( v3 < 1 ) | |
| 402 v3 = 1; | |
| 0 | 403 return v3; |
| 404 } | |
| 405 | |
| 406 //----- (004B824B) -------------------------------------------------------- | |
| 1275 | 407 int Player::GetBaseIdentifyPrice(float a2) |
| 408 { | |
| 409 signed int v2; // qax@1 | |
| 410 | |
| 411 v2 = (signed int)(a2 * 50.0); | |
| 412 if ( v2 < 1 ) | |
| 413 v2 = 1; | |
| 0 | 414 return v2; |
| 415 } | |
| 416 | |
| 417 //----- (004B8265) -------------------------------------------------------- | |
| 1275 | 418 int Player::GetBaseRepairPrice(int a2, float a3) |
| 419 { | |
| 420 signed int v3; // qax@1 | |
| 421 | |
| 422 v3 = (signed int)((double)a2 / (6.0 - a3)); | |
| 423 if ( v3 < 1 ) | |
| 424 v3 = 1; | |
| 0 | 425 return v3; |
| 426 } | |
| 427 | |
| 428 | |
| 429 | |
| 430 | |
| 431 | |
| 432 //----- (004B6FF9) -------------------------------------------------------- | |
| 1348 | 433 bool Player::IsPlayerHealableByTemple() |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
434 { |
| 0 | 435 signed int v2; // eax@1 |
| 336 | 436 v2 = (signed int)window_SpeakInHouse->ptr_1C; |
| 1348 | 437 if (this->sHealth >= GetMaxHealth() && this->sMana >= GetMaxMana() && GetMajorConditionIdx() == Condition_Good) |
| 438 { | |
| 439 return false; | |
| 440 } | |
| 441 else | |
| 442 { | |
| 443 if (GetMajorConditionIdx() == Condition_Zombie) | |
| 444 { | |
| 445 if ((v2 == 78 || v2 == 81 || v2 == 82)) | |
| 446 { | |
| 447 return false; | |
| 448 } | |
| 449 else | |
| 450 { | |
| 451 return true; | |
| 452 } | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
453 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
454 else |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
455 { |
| 1348 | 456 return true; |
| 457 } | |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
458 } |
| 0 | 459 } |
| 460 | |
| 461 | |
| 462 | |
| 463 //----- (00421E75) -------------------------------------------------------- | |
| 1012 | 464 unsigned int Player::GetItemIDAtInventoryIndex(int *pitem_index) |
| 465 { | |
| 466 int item_idx; // eax@1 | |
| 467 int inv_index; // eax@3 | |
| 468 | |
| 1351 | 469 |
| 1012 | 470 item_idx = *pitem_index; |
| 471 if ( item_idx >125 || item_idx < 0 ) | |
| 472 { | |
| 473 return 0; | |
| 474 } | |
| 475 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
476 inv_index = this->pInventoryMatrix[item_idx]; |
| 1012 | 477 if ( inv_index < 0 ) |
| 478 { | |
| 479 *pitem_index = -1 - inv_index; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
480 inv_index = this->pInventoryMatrix[-1 - inv_index]; |
| 1012 | 481 } |
| 482 | |
| 483 return inv_index; | |
| 0 | 484 } |
| 485 | |
| 486 | |
| 487 | |
| 488 //----- (004160CA) -------------------------------------------------------- | |
| 1012 | 489 void Player::ItemsEnchant( int enchant_count ) |
| 490 { | |
| 491 int avalible_items; // ebx@1 | |
| 492 int i; // edx@8 | |
| 493 __int16 item_index_tabl[138]; // [sp+Ch] [bp-118h]@1 | |
| 494 | |
| 495 avalible_items = 0; | |
| 496 memset (item_index_tabl,0,sizeof(item_index_tabl)); | |
| 497 | |
| 1349 | 498 for (i = 0; i < 138; ++i) |
| 499 { | |
| 500 if (( pOwnItems[i].uItemID>0)&&(pOwnItems[i].uItemID <= 134)) | |
| 501 item_index_tabl[avalible_items++] = i; | |
| 502 } | |
| 1012 | 503 |
| 504 if ( avalible_items ) | |
| 505 { | |
| 506 if ( enchant_count ) | |
| 507 { | |
| 1349 | 508 for ( i = 0; i < enchant_count; ++i ) |
| 509 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
510 if (!(pInventoryItemList[item_index_tabl[i]].uAttributes&ITEM_ENCHANTED)) |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
511 pInventoryItemList[item_index_tabl[rand() % avalible_items]].uAttributes |= ITEM_ENCHANTED; |
| 1349 | 512 } |
| 0 | 513 } |
| 514 else | |
| 515 { | |
| 1012 | 516 for ( i = 0; i < avalible_items; ++i ) |
| 517 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
518 pInventoryItemList[item_index_tabl[i]].uAttributes |= ITEM_ENCHANTED; |
| 1349 | 519 } |
| 520 } | |
| 521 } | |
| 0 | 522 } |
| 523 | |
| 524 //----- (004948B1) -------------------------------------------------------- | |
| 187 | 525 void Player::PlaySound(PlayerSpeech speech, int a3) |
| 526 { | |
| 1351 | 527 signed int speechCount = 0; // esi@4 |
| 528 signed int expressionCount = 0; // esi@4 | |
| 529 int pickedVariant; // esi@10 | |
| 248 | 530 CHARACTER_EXPRESSION_ID expression; // ebx@17 |
| 1406 | 531 signed int pSoundID; // ecx@19 |
| 1351 | 532 int speechVariantArray[5]; // [sp+Ch] [bp-1Ch]@7 |
| 533 int expressionVariantArray[5]; | |
| 534 unsigned int pickedSoundID; // [sp+30h] [bp+8h]@4 | |
| 535 unsigned int expressionDuration = 0; | |
| 187 | 536 |
| 1351 | 537 pickedSoundID = 0; |
| 203 | 538 if (uVoicesVolumeMultiplier) |
| 0 | 539 { |
| 1351 | 540 for (int i = 0; i < 2; i++) |
| 541 { | |
| 1406 | 542 if ( SoundSetAction[speech][i] ) |
| 543 { | |
| 544 speechVariantArray[speechCount] = SoundSetAction[speech][i]; | |
| 1351 | 545 speechCount++; |
| 546 } | |
| 547 } | |
| 548 if ( speechCount ) | |
| 549 { | |
| 550 pickedVariant = speechVariantArray[rand() % speechCount]; | |
| 551 int numberOfSubvariants = byte_4ECF08[pickedVariant - 1][uVoiceID]; | |
| 552 if (numberOfSubvariants > 0) | |
| 553 { | |
| 554 pickedSoundID = rand() % numberOfSubvariants + 2 * (pickedVariant + 50 * uVoiceID) + 4998; | |
| 1406 | 555 pAudioPlayer->PlaySound((SoundID)pickedSoundID, PID(OBJECT_Player, uActiveCharacter + 39), 0, -1, 0, 0, (int)(pSoundVolumeLevels[uVoicesVolumeMultiplier] * 128.0f), 0); |
| 1351 | 556 } |
| 557 } | |
| 558 } | |
| 559 | |
| 560 for (int i = 0; i < 5; i++) | |
| 561 { | |
| 1406 | 562 if ( SoundSetAction[speech][i + 3] ) |
| 563 { | |
| 564 expressionVariantArray[expressionCount] = SoundSetAction[speech][i + 3]; | |
| 1351 | 565 expressionCount++; |
| 566 } | |
| 567 } | |
| 568 if ( expressionCount ) | |
| 569 { | |
| 570 expression = (CHARACTER_EXPRESSION_ID)expressionVariantArray[rand() % expressionCount]; | |
| 571 if (expression == CHARACTER_EXPRESSION_21 && pickedSoundID ) | |
| 572 { | |
| 1406 | 573 pSoundID = 0; |
| 574 if ( pSoundList->sNumSounds ) | |
| 575 { | |
| 1351 | 576 for (int i = 0; i < pSoundList->sNumSounds; i++) |
| 0 | 577 { |
| 1406 | 578 if (pSoundList->pSounds[i].uSoundID == pickedSoundID) |
| 579 pSoundID = i; | |
| 0 | 580 } |
| 581 } | |
| 1406 | 582 if ( pSoundList->pSounds[pSoundID].pSoundData[0] ) |
| 1351 | 583 expressionDuration = (sLastTrackLengthMS << 7) / 1000; |
| 584 } | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
585 PlayEmotion(expression, expressionDuration); |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
586 } |
| 0 | 587 } |
| 588 // 4948B1: using guessed type int var_1C[5]; | |
| 589 | |
| 590 //----- (00494A25) -------------------------------------------------------- | |
| 187 | 591 void Player::PlayEmotion(CHARACTER_EXPRESSION_ID new_expression, int a3) |
| 592 { | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
593 unsigned int v3 = expression; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
594 if (expression == CHARACTER_EXPRESSION_DEAD || expression == CHARACTER_EXPRESSION_ERADICATED) |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
595 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
596 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
597 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
598 else if (expression == CHARACTER_EXPRESSION_PERTIFIED && new_expression != CHARACTER_EXPRESSION_FALLING) |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
599 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
600 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
601 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
602 else |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
603 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
604 if (expression != CHARACTER_EXPRESSION_SLEEP || new_expression != CHARACTER_EXPRESSION_FALLING) |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
605 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
606 if (v3 >= 2 && v3 <= 11 && v3 != 8 && !(new_expression == CHARACTER_EXPRESSION_DMGRECVD_MINOR || new_expression == CHARACTER_EXPRESSION_DMGRECVD_MODERATE || new_expression == CHARACTER_EXPRESSION_DMGRECVD_MAJOR)) |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
607 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
608 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
609 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
610 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
611 } |
| 0 | 612 this->uExpressionTimePassed = 0; |
| 613 if ( !a3 ) | |
| 614 { | |
| 187 | 615 this->uExpressionTimeLength = 8 * pPlayerFrameTable->pFrames[a3].uAnimLength; |
| 616 } | |
|
1353
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
617 else |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
618 { |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
619 this->uExpressionTimeLength = 0; |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
620 } |
| 187 | 621 expression = new_expression; |
| 0 | 622 viewparams->bRedrawGameUI = 1; |
| 623 } | |
| 624 | |
| 625 //----- (0049327B) -------------------------------------------------------- | |
| 1355 | 626 bool Player::ProfessionOrGuildFlagsCorrect( unsigned int uClass, int a3 ) |
|
1354
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
627 { |
| 135 | 628 if ( this->classType == uClass ) |
| 0 | 629 { |
|
1354
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
630 return true; |
| 0 | 631 } |
| 632 else | |
| 633 { | |
|
1354
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
634 if (!a3) |
|
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
635 { |
|
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
636 return false; |
|
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
637 } |
| 0 | 638 switch ( uClass ) |
| 639 { | |
| 640 case 0x1Au: | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
641 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 65)); |
| 0 | 642 case 0x1Bu: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
643 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 67)); |
| 0 | 644 case 0x22u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
645 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 77)); |
| 0 | 646 case 0x23u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
647 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 79)); |
| 0 | 648 break; |
| 649 default: | |
| 1545 | 650 Error("Should not be able to get here (%u)", uClass); |
| 0 | 651 break; |
| 652 } | |
|
1354
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
653 return false; |
|
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
654 } |
| 0 | 655 } |
| 656 | |
| 657 | |
| 658 //----- (00492C0B) -------------------------------------------------------- | |
| 659 bool Player::CanAct() | |
| 660 { | |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
661 if ( this->IsAsleep() || this->IsParalyzed() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
662 this->IsUnconcious() || this->IsDead() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
663 this->IsPertified() || this->IsEradicated() ) |
| 1355 | 664 return false; |
| 0 | 665 else |
| 1355 | 666 return true; |
| 0 | 667 } |
| 668 | |
| 669 //----- (00492C40) -------------------------------------------------------- | |
| 670 bool Player::CanSteal() | |
| 671 { | |
| 1355 | 672 return GetActualSkillLevel(PLAYER_SKILL_STEALING) != 0; |
| 0 | 673 } |
| 674 | |
| 675 //----- (00492C4E) -------------------------------------------------------- | |
| 676 bool Player::CanEquip_RaceAndAlignmentCheck(unsigned int uItemID) | |
| 677 { | |
|
1357
06926081358f
Player::CanEquip_RaceAndAlignmentCheck fixed 3 missing return values, started using new race and gender functions, moved everything to a switch
Grumpy7
parents:
1356
diff
changeset
|
678 switch (uItemID) |
|
06926081358f
Player::CanEquip_RaceAndAlignmentCheck fixed 3 missing return values, started using new race and gender functions, moved everything to a switch
Grumpy7
parents:
1356
diff
changeset
|
679 { |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
680 case ITEM_RELIC_ETHRICS_STAFF: |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
681 case ITEM_RELIC_OLD_NICK: |
|
1359
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1358
diff
changeset
|
682 case ITEM_RELIC_TWILIGHT: return pParty->IsPartyEvil(); break; |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
683 case ITEM_RELIC_TALEDONS_HELM: |
|
1359
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1358
diff
changeset
|
684 case ITEM_RELIC_JUSTICE: return pParty->IsPartyGood(); break; |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
685 case ITEM_ARTIFACT_ELFBANE: return IsRaceGoblin(); break; |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
686 case ITEM_ARTIFACT_MINDS_EYE: return IsRaceHuman(); break; |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
687 case ITEM_ELVEN_CHAINMAIL: return IsRaceElf(); break; |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
688 case ITEM_FORGE_GAUNTLETS: return IsRaceDwarf(); break; |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
689 case ITEM_ARTIFACT_HEROS_BELT: return IsMale(); break; |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
690 case ITEM_ARTIFACT_LADYS_ESCORT: return IsFemale(); break; |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
691 case ITEM_WETSUIT: return NothingOrJustBlastersEquipped(); break; |
|
1357
06926081358f
Player::CanEquip_RaceAndAlignmentCheck fixed 3 missing return values, started using new race and gender functions, moved everything to a switch
Grumpy7
parents:
1356
diff
changeset
|
692 default: return 1; break; |
|
1356
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
693 } |
|
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
694 } |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
695 |
| 0 | 696 //----- (00492D65) -------------------------------------------------------- |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
697 void Player::SetCondition( unsigned int uConditionIdx, int a3 ) |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
698 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
699 signed int player_sex; // ecx@77 |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
700 signed int remainig_player; // ebx@82 |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
701 int players_before; // [sp+10h] [bp-4h]@2 |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
702 int players_after; // [sp+20h] [bp+Ch]@82 |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
703 |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
704 if ( pConditions[uConditionIdx] ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
705 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
706 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
707 if (!ConditionProcessor::IsPlayerAffected(this, uConditionIdx, a3)) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
708 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
709 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
710 } |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
711 |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
712 switch ( uConditionIdx ) |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
713 { |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
714 case Condition_Cursed: PlaySound(SPEECH_30, 0); break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
715 case Condition_Weak: PlaySound(SPEECH_25, 0); break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
716 case Condition_Sleep: break; //nosound |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
717 case Condition_Fear: PlaySound(SPEECH_26, 0); break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
718 case Condition_Drunk: PlaySound(SPEECH_31, 0); break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
719 case Condition_Insane: PlaySound(SPEECH_29, 0); break; |
| 1014 | 720 case Condition_Poison1: |
| 721 case Condition_Poison2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
722 case Condition_Poison3: PlaySound(SPEECH_27, 0); break; |
| 1014 | 723 case Condition_Disease1: |
| 724 case Condition_Disease2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
725 case Condition_Disease3: PlaySound(SPEECH_28, 0);break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
726 case Condition_Paralyzed: break; //nosound |
| 1014 | 727 case Condition_Unconcious: |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
728 PlaySound(SPEECH_32, 0); |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
729 if ( sHealth > 0 ) |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
730 sHealth = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
731 break; |
| 1014 | 732 case Condition_Dead: |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
733 PlaySound(SPEECH_33, 0); |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
734 if ( sHealth > 0 ) |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
735 sHealth = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
736 if ( sMana > 0 ) |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
737 sMana = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
738 break; |
| 1014 | 739 case Condition_Pertified: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
740 PlaySound(SPEECH_34, 0); |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
741 break; |
| 1014 | 742 case Condition_Eradicated: |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
743 PlaySound(SPEECH_35, 0); |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
744 if (sHealth > 0 ) |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
745 sHealth = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
746 if ( sMana > 0 ) |
| 1014 | 747 sMana = 0; |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
748 break; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
749 case Condition_Zombie: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
750 if ( classType == PLAYER_CLASS_LICH || IsEradicated() || IsZombie() || !IsDead()) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
751 return; |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
752 memset(&pConditions[0], 0, sizeof(pConditions)); |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
753 sHealth = GetMaxHealth(); |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
754 sMana = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
755 player_sex = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
756 uPrevFace = uCurrentFace; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
757 uPrevVoiceID = uVoiceID; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
758 if (IsMale()) |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
759 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
760 uCurrentFace = 23; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
761 uVoiceID = 23; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
762 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
763 else |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
764 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
765 uCurrentFace = 24; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
766 uVoiceID = 24; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
767 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
768 PlaySound(SPEECH_99, 0); |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
769 break; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
770 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
771 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
772 players_before = 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
773 for (int i = 1; i < 5; ++i) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
774 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
775 if ( pPlayers[i]->CanAct() ) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
776 ++players_before; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
777 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
778 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
779 pConditions[uConditionIdx] = 1; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
780 |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
781 remainig_player = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
782 players_after = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
783 for (int i = 1; i < 5; ++i) |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
784 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
785 if ( pPlayers[i]->CanAct() ) |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
786 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
787 remainig_player = i; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
788 ++players_after; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
789 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
790 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
791 if (( players_before == 2 ) && ( players_after == 1 )) |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
792 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
793 pPlayers[remainig_player]->PlaySound(SPEECH_107, 0); |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
794 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
795 return; |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
796 } |
| 0 | 797 |
| 798 //----- (00492528) -------------------------------------------------------- | |
| 799 bool Player::CanFitItem(unsigned int uSlot, unsigned int uItemID) | |
| 800 { | |
| 1363 | 801 Texture *texture; // esi@1 |
| 802 unsigned int slotWidth; // ebx@1 | |
| 803 unsigned int slotHeight; // [sp+1Ch] [bp+Ch]@1 | |
| 804 | |
| 805 texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); | |
| 806 slotWidth = GetSizeInInventorySlots(texture->uTextureWidth); | |
| 807 slotHeight = GetSizeInInventorySlots(texture->uTextureHeight); | |
| 0 | 808 if ( !areWeLoadingTexture ) |
| 809 { | |
| 1363 | 810 texture->Release(); |
| 1006 | 811 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 812 } |
| 1555 | 813 Assert(slotHeight > 0 && slotWidth > 0, "Items should have nonzero dimensions"); |
| 1363 | 814 if ( (slotWidth + uSlot % INVETORYSLOTSWIDTH) <= INVETORYSLOTSWIDTH && (slotHeight + uSlot / INVETORYSLOTSWIDTH) <= INVETORYSLOTSHEIGHT ) |
| 815 { | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
816 for (unsigned int x = 0; x < slotWidth; x++) |
| 1363 | 817 { |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
818 for (unsigned int y = 0; y < slotHeight; y++) |
| 1363 | 819 { |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
820 if (pInventoryMatrix[y * INVETORYSLOTSWIDTH + x + uSlot] != 0) |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
821 { |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
822 return false; |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
823 } |
| 1363 | 824 } |
| 825 } | |
| 826 return true; | |
| 827 } | |
| 828 return false; | |
| 0 | 829 } |
| 830 // 506128: using guessed type int areWeLoadingTexture; | |
| 831 | |
| 832 //----- (004925E6) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
833 int Player::FindFreeInventoryListSlot() |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
834 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
835 for (int i = 0; i < 126; i++ ) |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
836 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
837 if (pInventoryItemList[i].uItemID == 0) |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
838 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
839 return i; |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
840 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
841 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
842 return -1; |
| 0 | 843 } |
| 844 | |
| 845 //----- (00492600) -------------------------------------------------------- | |
| 846 int Player::CreateItemInInventory(unsigned int uSlot, unsigned int uItemID) | |
| 847 { | |
| 848 int result; // eax@8 | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
849 signed int freeSlot; // [sp+8h] [bp-4h]@4 |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
850 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
851 freeSlot = FindFreeInventoryListSlot(); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
852 if ( freeSlot == -1 ) |
| 0 | 853 { |
| 854 if ( uActiveCharacter ) | |
| 201 | 855 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NoRoom, 0); |
|
1366
8f339c3bbdaf
Player::CreateItemInInventory small bugfix from previous change
Grumpy7
parents:
1365
diff
changeset
|
856 return 0; |
| 0 | 857 } |
| 858 else | |
| 859 { | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
860 PutItemArInventoryIndex(uItemID, freeSlot, uSlot); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
861 result = freeSlot + 1; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
862 this->pInventoryItemList[freeSlot].uItemID = uItemID; |
| 0 | 863 } |
| 864 return result; | |
| 865 } | |
| 866 // 506128: using guessed type int areWeLoadingTexture; | |
| 867 | |
| 868 //----- (00492700) -------------------------------------------------------- | |
| 869 int Player::HasSkill(unsigned int uSkillType) | |
| 870 { | |
| 1374 | 871 if ( uSkillType >= 37 || this->pActiveSkills[uSkillType] ) |
| 872 { | |
| 873 return 1; | |
| 0 | 874 } |
| 875 else | |
| 876 { | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
877 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[67], this->pName); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
878 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1374 | 879 return 0; |
| 880 } | |
| 0 | 881 } |
| 882 | |
| 883 //----- (00492745) -------------------------------------------------------- | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
884 void Player::WearItem( unsigned int uItemID ) |
| 0 | 885 { |
| 1010 | 886 int item_body_anch; // edi@6 |
| 887 int item_indx; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
888 item_indx = FindFreeInventoryListSlot(); |
| 1010 | 889 |
| 890 if ( item_indx != -1 ) | |
| 891 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
892 pInventoryItemList[item_indx].uItemID = uItemID; |
| 1374 | 893 item_body_anch = pEquipTypeToBodyAnchor[pItemsTable->pItems[uItemID].uEquipType]; |
| 894 pEquipment.pIndices[item_body_anch] = item_indx + 1; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
895 pInventoryItemList[item_indx].uBodyAnchor = item_body_anch + 1; |
| 0 | 896 } |
| 897 } | |
| 898 | |
| 899 //----- (004927A8) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
900 int Player::AddItem(int index, unsigned int uItemID) |
| 0 | 901 { |
| 1374 | 902 int xStartValue = 0; |
| 903 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
904 if ( index == -1 ) |
| 0 | 905 { |
| 1385 | 906 for (int xcoord = 0; xcoord < INVETORYSLOTSWIDTH; xcoord++) |
| 907 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
908 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) |
| 0 | 909 { |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
910 if ( CanFitItem(ycoord * INVETORYSLOTSWIDTH + xcoord, uItemID) ) |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
911 { |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
912 return CreateItemInInventory(ycoord * INVETORYSLOTSWIDTH + xcoord, uItemID); |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
913 } |
| 0 | 914 } |
| 1385 | 915 } |
| 0 | 916 return 0; |
| 917 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
918 if ( !CanFitItem(index, uItemID) ) |
| 0 | 919 { |
| 920 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); | |
| 921 return 0; | |
| 922 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
923 return CreateItemInInventory(index, uItemID); |
| 0 | 924 } |
| 925 | |
| 926 //----- (00492826) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
927 int Player::AddItem2(int index, ItemGen *Src) |
| 0 | 928 { |
| 929 pItemsTable->SetSpecialBonus(Src); | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
930 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
931 if ( index == -1 ) |
| 0 | 932 { |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
933 for (int xcoord = 0; xcoord < INVETORYSLOTSWIDTH; xcoord++) |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
934 { |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
935 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) //TODO: change pInventoryMatrix to 2 dimensional array. |
| 1385 | 936 { |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
937 if ( CanFitItem(ycoord * INVETORYSLOTSWIDTH + xcoord, Src->uItemID) ) |
| 0 | 938 { |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
939 return CreateItemInInventory2(ycoord * INVETORYSLOTSWIDTH + xcoord, Src); |
| 0 | 940 } |
| 1385 | 941 } |
| 0 | 942 } |
| 943 return 0; | |
| 944 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
945 if ( !CanFitItem(index, Src->uItemID) ) |
| 0 | 946 return 0; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
947 return CreateItemInInventory2(index, Src); |
| 0 | 948 } |
| 949 | |
| 950 //----- (0049289C) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
951 int Player::CreateItemInInventory2( unsigned int index, ItemGen *Src ) |
| 0 | 952 { |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
953 signed int freeSlot; // ebx@1 |
| 0 | 954 int result; // eax@6 |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
955 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
956 freeSlot = FindFreeInventoryListSlot(); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
957 if ( freeSlot == -1 ) |
| 0 | 958 { |
| 959 result = 0; | |
| 960 } | |
| 961 else | |
| 962 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
963 PutItemArInventoryIndex(Src->uItemID, freeSlot, index); |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
964 memcpy(&pInventoryItemList[freeSlot], Src, sizeof(ItemGen)); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
965 result = freeSlot + 1; |
| 0 | 966 } |
| 967 return result; | |
| 968 } | |
| 969 // 506128: using guessed type int areWeLoadingTexture; | |
| 970 | |
| 971 //----- (0049298B) -------------------------------------------------------- | |
| 1385 | 972 void Player::PutItemArInventoryIndex( int uItemID, int itemListPos, int index ) //originally accepted ItemGen* but needed only its uItemID |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
973 { |
| 1014 | 974 Texture *item_texture; // esi@1 |
| 975 int *pInvPos; // esi@4 | |
| 976 unsigned int slot_width; // [sp+Ch] [bp-4h]@1 | |
| 977 unsigned int slot_height; // [sp+18h] [bp+8h]@1 | |
| 978 | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
979 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1014 | 980 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); |
| 981 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 982 if ( !areWeLoadingTexture ) |
| 983 { | |
| 1014 | 984 item_texture->Release(); |
| 1006 | 985 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 986 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
987 if ( slot_width > 0 ) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
988 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
989 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
990 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
991 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
992 memset32(pInvPos, -1 - index, slot_width);//TODO: try to come up with a better solution. negative values are used when drawing the inventory - nothing is drawn |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
993 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
994 } |
| 1014 | 995 } |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
996 pInventoryMatrix[index] = itemListPos + 1; |
| 0 | 997 } |
| 278 | 998 |
| 0 | 999 // 506128: using guessed type int areWeLoadingTexture; |
| 1000 | |
| 1001 //----- (00492A36) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1002 void Player::RemoveItemAtInventoryIndex( unsigned int index ) |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1003 { |
| 1014 | 1004 ItemGen *item_in_slot; // ecx@1 |
| 1005 Texture *item_texture; // esi@1 | |
| 1006 unsigned int slot_height; // ebp@1 | |
| 1007 int *pInvPos; // edx@4 | |
| 1008 unsigned int slot_width; // [sp+14h] [bp+4h]@1 | |
| 1009 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1010 item_in_slot = &this->pInventoryItemList[pInventoryMatrix[index]-1]; |
| 1014 | 1011 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[item_in_slot->uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1012 item_in_slot->Reset(); | |
| 1013 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); | |
| 1014 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 1015 if ( !areWeLoadingTexture ) |
| 1016 { | |
| 1014 | 1017 item_texture->Release(); |
| 1006 | 1018 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1019 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1020 if ( slot_width > 0 ) |
| 1014 | 1021 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1022 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1023 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1024 { |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1025 memset32(pInvPos, 0, slot_width); |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1026 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1027 } |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1028 } |
| 0 | 1029 } |
| 1030 // 506128: using guessed type int areWeLoadingTexture; | |
| 1031 | |
| 1032 //----- (00490EEE) -------------------------------------------------------- | |
| 1386 | 1033 int Player::SelectPhrasesTransaction(ItemGen *pItem, int building_type, int BuildID_2Events, int ShopMenuType) //TODO: probably move this somewhere else, not really Player:: stuff |
| 1034 { | |
| 1035 unsigned int idemId; // edx@1 | |
| 1036 signed int equipType; // esi@1 | |
| 1037 float multiplier; // ST04_4@26 | |
| 1038 int price; // edi@26 | |
| 1039 int merchantLevel; // [sp+10h] [bp-8h]@1 | |
| 1040 int itemValue; | |
| 1041 | |
| 1042 merchantLevel = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); | |
| 1043 idemId = pItem->uItemID; | |
| 1044 equipType = pItemsTable->pItems[idemId].uEquipType; | |
| 1045 itemValue = pItem->GetValue(); | |
| 1046 | |
| 1047 switch (building_type) | |
| 1048 { | |
| 1411 | 1049 case BuildingType_WeaponShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1050 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1051 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1052 if (equipType > EQUIP_BOW) |
| 1386 | 1053 return 4; |
| 1054 break; | |
| 1411 | 1055 case BuildingType_ArmorShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1056 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1057 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1058 if ( equipType < EQUIP_ARMOUR || equipType > EQUIP_BOOTS) |
| 1386 | 1059 return 4; |
| 1060 break; | |
| 1411 | 1061 case BuildingType_MagicShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1062 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1063 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1064 if ( pItemsTable->pItems[idemId].uSkillType != PLAYER_SKILL_MISC ) |
| 1386 | 1065 return 4; |
| 1066 break; | |
| 1411 | 1067 case BuildingType_AlchemistShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1068 if ((idemId >= ITEM_ARTIFACT_HERMES_SANDALS && idemId < ITEM_RECIPE_REJUVENATION) || idemId > ITEM_RECIPE_BODY_RESISTANCE) |
| 1386 | 1069 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1070 if ( !(equipType == EQUIP_REAGENT || equipType == EQUIP_POTION || equipType == EQUIP_MESSAGE_SCROLL)) |
| 1386 | 1071 return 4; |
| 1072 break; | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1073 default: |
| 1545 | 1074 Error("(%u)", building_type); |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1075 break; |
| 1386 | 1076 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1077 if (pItem->IsStolen()) |
| 1386 | 1078 return 6; |
| 1079 | |
| 1080 multiplier = p2DEvents[BuildID_2Events - 1].fPriceMultiplier; | |
| 1081 switch (ShopMenuType) | |
| 1082 { | |
| 1083 case 2: | |
| 1084 price = GetBuyingPrice(itemValue, multiplier); | |
| 1085 break; | |
| 1086 case 3: | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1087 if (pItem->IsBroken()) |
| 1386 | 1088 price = 1; |
| 917 | 1089 else |
| 1386 | 1090 price = this->GetPriceSell(itemValue, multiplier); |
| 1091 break; | |
| 1092 case 4: | |
| 1093 price = this->GetPriceIdentification(multiplier); | |
| 1094 break; | |
| 1095 case 5: | |
| 1096 price = this->GetPriceRepair(itemValue, multiplier); | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1097 break; |
|
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1098 default: |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1099 Error("(%u)", ShopMenuType); |
| 1386 | 1100 break; |
| 1101 } | |
| 1102 if ( merchantLevel ) | |
| 1103 { | |
| 1104 if (price == itemValue) | |
| 1105 { | |
| 1106 return 3; | |
| 1107 } | |
| 917 | 1108 else |
| 1386 | 1109 { |
| 1110 return 2; | |
| 1111 } | |
| 1112 } | |
| 0 | 1113 else |
| 1386 | 1114 { |
| 1115 return 1; | |
| 1116 } | |
| 0 | 1117 } |
| 1118 | |
| 1119 //----- (0049107D) -------------------------------------------------------- | |
| 1120 int Player::GetBodybuilding() | |
| 1121 { | |
| 1010 | 1122 int v1; // al@1 |
| 0 | 1123 |
| 1124 v1 = GetActualSkillLevel(PLAYER_SKILL_BODYBUILDING); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1125 int multiplier = GetMultiplierForSkillLevel(v1, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1126 return multiplier * (v1 & 0x3F); |
| 0 | 1127 } |
| 1128 | |
| 1129 //----- (004910A8) -------------------------------------------------------- | |
| 607 | 1130 int Player::GetMeditation() |
| 0 | 1131 { |
| 1010 | 1132 int v1; // al@1 |
| 0 | 1133 |
| 1134 v1 = GetActualSkillLevel(PLAYER_SKILL_MEDITATION); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1135 int multiplier = GetMultiplierForSkillLevel(v1, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1136 return multiplier * (v1 & 0x3F); |
| 0 | 1137 } |
| 1138 | |
| 1139 //----- (004910D3) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1140 bool Player::CanIdentify( ItemGen *pItem ) |
| 0 | 1141 { |
| 1142 unsigned __int16 v2; // ax@1 | |
| 1143 int v5; // edi@7 | |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
1144 return true; |
| 652 | 1145 if (CheckHiredNPCSpeciality(Scholar)) |
| 1146 return true; | |
| 0 | 1147 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1148 v2 = GetActualSkillLevel(PLAYER_SKILL_ITEM_ID); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1149 if ( (signed int)SkillToMastery(v2) >= 4 ) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1150 return true; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1151 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1152 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1153 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1154 return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St; |
| 0 | 1155 } |
| 1156 | |
| 1157 //----- (00491151) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1158 bool Player::CanRepair( ItemGen *pItem ) |
| 0 | 1159 { |
| 1160 unsigned __int16 v2; // ax@1 | |
| 1161 int v5; // edi@7 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1162 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1163 ItemDesc* v7 = &pItemsTable->pItems[pItem->uItemID]; |
| 652 | 1164 if (CheckHiredNPCSpeciality(Smith) && v7->uEquipType <= 2 || |
| 1165 CheckHiredNPCSpeciality(Armorer) && v7->uEquipType >= 3 && v7->uEquipType <= 9 || | |
| 1166 CheckHiredNPCSpeciality(Alchemist) && v7->uEquipType >= 9 ) | |
| 1167 return true; | |
| 1168 | |
| 1010 | 1169 v2 = GetActualSkillLevel(PLAYER_SKILL_REPAIR); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1170 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 0 | 1171 return true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1172 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1173 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1174 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1175 return v5 >= v7->uItemID_Rep_St; |
| 0 | 1176 } |
| 1177 | |
| 1178 //----- (004911F3) -------------------------------------------------------- | |
| 1179 int Player::GetMerchant() | |
| 1180 { | |
| 1181 unsigned __int16 v2; // ax@1 | |
| 1182 int v5; // edi@1 | |
| 1183 int v7; // eax@3 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1184 |
| 607 | 1185 v2 = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1186 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1187 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1188 |
| 0 | 1189 v7 = GetPartyReputation(); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1190 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1191 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1192 if (v5 == 0) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1193 { |
| 0 | 1194 return -v7; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1195 } |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1196 return v5 - v7 + 7; |
| 0 | 1197 } |
| 1198 | |
| 1199 //----- (0049125A) -------------------------------------------------------- | |
| 1200 int Player::GetPerception() | |
| 1201 { | |
| 1202 unsigned __int16 v2; // ax@1 | |
| 1203 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1204 |
| 1010 | 1205 v2 = GetActualSkillLevel(PLAYER_SKILL_PERCEPTION); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1206 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1207 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1208 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1209 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1210 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1211 return v5; |
| 0 | 1212 } |
| 1213 | |
| 1214 //----- (004912B0) -------------------------------------------------------- | |
| 1215 int Player::GetDisarmTrap() | |
| 1216 { | |
| 1217 unsigned __int16 v2; // ax@1 | |
| 1218 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1219 |
| 1010 | 1220 v2 = GetActualSkillLevel(PLAYER_SKILL_TRAP_DISARM); |
| 0 | 1221 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 1222 return 10000; | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1223 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1224 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1225 if ( HasEnchantedItemEquipped(35) ) //only the real skill level is supposed to be added again, not the multiplied value |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1226 multiplier++; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1227 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1228 return v5; |
| 0 | 1229 } |
| 1230 | |
| 1231 //----- (00491317) -------------------------------------------------------- | |
| 1232 char Player::GetLearningPercent() | |
| 1233 { | |
| 1234 int v2; // eax@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1235 |
| 1010 | 1236 v2 = GetActualSkillLevel(PLAYER_SKILL_LEARNING); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1237 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1238 return multiplier * v2 + 9; |
| 0 | 1239 } |
| 1240 | |
| 1241 //----- (0048C6AF) -------------------------------------------------------- | |
| 1242 Player::Player() | |
| 1243 { | |
| 1244 memset(&pEquipment, 0, sizeof(PlayerEquipment)); | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1245 memset(pInventoryMatrix, 0, 126 * sizeof(int)); |
| 0 | 1246 for (uint i = 0; i < 126; ++i) |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1247 pInventoryItemList[i].Reset(); |
| 0 | 1248 for (uint i = 0; i < 12; ++i) |
| 1249 pEquippedItems[i].Reset(); | |
| 1250 | |
| 1251 | |
| 1252 for (uint i = 0; i < 24; ++i) | |
| 1253 { | |
| 1254 pPlayerBuffs[i].uSkill = 0; | |
| 1255 pPlayerBuffs[i].uSkill = 0; | |
| 1256 pPlayerBuffs[i].uPower = 0; | |
| 1257 pPlayerBuffs[i].uExpireTime = 0; | |
| 1258 pPlayerBuffs[i].uCaster = 0; | |
| 1259 pPlayerBuffs[i].uFlags = 0; | |
| 1260 } | |
| 1261 | |
| 1262 pName[0] = 0; | |
| 1014 | 1263 uCurrentFace = 0; |
| 0 | 1264 uVoiceID = 0; |
| 1265 memset(pConditions, 0, 20 * sizeof(__int64)); | |
| 1266 | |
| 1267 field_BB = 0; | |
| 1268 | |
| 1269 uMight = uMightBonus = 0; | |
| 1270 uIntelligence = uIntelligenceBonus = 0; | |
| 1271 uWillpower = uWillpowerBonus = 0; | |
| 1272 uEndurance = uEnduranceBonus = 0; | |
| 1273 uSpeed = uSpeedBonus = 0; | |
| 1274 uAccuracy = uAccuracyBonus = 0; | |
| 1275 uLuck = uLuckBonus = 0; | |
| 1276 uLevel = sLevelModifier = 0; | |
| 1277 sAgeModifier = 0; | |
|
1388
60d4885eb107
sACModifier zeroed in player constructor so AC is not always 0(or -some value) ingame
Grumpy7
parents:
1387
diff
changeset
|
1278 sACModifier = 0; |
| 0 | 1279 |
| 1019 | 1280 // memset(field_1F5, 0, 30); |
| 1281 pure_luck_used=0; | |
| 1282 pure_speed_used=0; | |
| 1283 pure_intellect_used=0; | |
| 1284 pure_endurance_used=0; | |
| 1285 pure_willpower_used=0; | |
| 1286 pure_accuracy_used=0; | |
| 1287 pure_might_used=0; | |
| 0 | 1288 |
| 1289 sResFireBase = sResFireBonus = 0; | |
| 1290 sResAirBase = sResAirBonus = 0; | |
| 1291 sResWaterBase = sResWaterBonus = 0; | |
| 1292 sResEarthBase = sResEarthBonus = 0; | |
| 1293 sResMagicBase = sResMagicBonus = 0; | |
| 1294 sResSpiritBase = sResSpiritBonus = 0; | |
| 1295 sResMindBase = sResMindBonus = 0; | |
| 1296 sResBodyBase = sResBodyBonus = 0; | |
| 1297 sResLightBase = sResLightBonus = 0; | |
| 1298 sResDarkBase = sResDarkBonus = 0; | |
| 1299 | |
| 1300 uTimeToRecovery = 0; | |
| 1301 | |
| 1302 uSkillPoints = 0; | |
| 1303 | |
| 1304 sHealth = 0; | |
| 1305 uFullHealthBonus = 0; | |
| 1306 _health_related = 0; | |
| 1307 | |
| 1308 sMana = 0; | |
| 1309 uFullManaBonus = 0; | |
| 1310 _mana_related = 0; | |
| 1311 | |
| 1312 uQuickSpell = 0; | |
| 1313 memset(pInstalledBeacons, 0, 5 * sizeof(LloydBeacon)); | |
| 1314 | |
| 1315 _some_attack_bonus = 0; | |
| 1316 field_1A91 = 0; | |
| 1317 _melee_dmg_bonus = 0; | |
| 1318 field_1A93 = 0; | |
| 1319 _ranged_atk_bonus = 0; | |
| 1320 field_1A95 = 0; | |
| 1321 _ranged_dmg_bonus = 0; | |
| 1322 field_1A97 = 0; | |
| 1323 | |
| 130 | 1324 expression = CHARACTER_EXPRESSION_INVALID; |
| 0 | 1325 uExpressionTimePassed = 0; |
| 1326 uExpressionTimeLength = 0; | |
| 1327 | |
| 1328 uNumDivineInterventionCastsThisDay = 0; | |
| 1329 uNumArmageddonCasts = 0; | |
| 1330 uNumFireSpikeCasts = 0; | |
| 1331 | |
| 1332 memset(field_1988, 0, 49 * sizeof(int)); | |
| 1333 memset(field_1A50, 0, 64 * sizeof(char)); | |
| 1334 | |
| 1335 field_E0 = 0; | |
| 1336 field_E4 = 0; | |
| 1337 field_E8 = 0; | |
| 1338 field_EC = 0; | |
| 1339 field_F0 = 0; | |
| 1340 field_F4 = 0; | |
| 1341 field_F8 = 0; | |
| 1342 field_FC = 0; | |
| 1343 field_100 = 0; | |
| 1344 field_104 = 0; | |
| 198 | 1345 |
|
554
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1346 _expression21_animtime = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1347 _expression21_frameset = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1348 |
| 198 | 1349 lastOpenedSpellbookPage = 0; |
| 0 | 1350 } |
| 1351 | |
| 1352 //----- (0048C6F6) -------------------------------------------------------- | |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1353 bool Party::AddItemToParty(ItemGen *pItem) //TODO move to party.cpp |
| 0 | 1354 { |
| 1355 unsigned int v2; // eax@1 | |
| 1356 char *v5; // eax@8 | |
| 1357 Texture *v7; // ebx@10 | |
| 1358 signed int v8; // esi@10 | |
| 1359 Player *v9; // edi@11 | |
| 1360 int v10; // eax@11 | |
| 1361 int v21; // [sp+24h] [bp-4h]@10 | |
| 1362 | |
| 1363 v2 = pItem->uItemID; | |
| 222 | 1364 if ( !pItemsTable->pItems[v2].uItemID_Rep_St ) |
| 315 | 1365 pItem->SetIdentified(); |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1366 |
| 0 | 1367 v5 = pItemsTable->pItems[v2].pIconName; |
| 1368 if ( v5 ) | |
| 1369 { | |
| 973 | 1370 v7 = pIcons_LOD->LoadTexturePtr(v5, TEXTURE_16BIT_PALETTE); |
| 0 | 1371 v21 = areWeLoadingTexture; |
| 1372 v8 = 0; | |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1373 int startId = uActiveCharacter >= 0 ? uActiveCharacter - 1 : 0; |
|
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1374 for (int i = 0; i < 4; i++) |
|
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1375 { |
|
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1376 v9 = &pPlayers[(startId + i) % 4]; //start with current active player, then cycle right if item won't fit |
|
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1377 v10 = v9->AddItem(-1, pItem->uItemID); |
| 0 | 1378 if ( v10 ) |
| 1379 { | |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1380 memcpy(&v9->pInventoryItemList[v10-1], pItem, 0x24u); |
|
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1381 pItem->Reset(); |
|
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1382 pAudioPlayer->PlaySound(SOUND_GoldReceived, 0, 0, -1, 0, 0, 0, 0); |
|
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1383 v9->PlaySound(SPEECH_60, 0); |
| 0 | 1384 if ( !v21 ) |
| 1385 { | |
| 1386 v7->Release(); | |
| 1006 | 1387 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1388 } |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1389 return true; |
| 0 | 1390 } |
| 1391 } | |
| 1392 if ( !v21 ) | |
| 1393 { | |
| 1394 v7->Release(); | |
| 1006 | 1395 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1396 } |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1397 return false; |
| 0 | 1398 } |
| 1399 else | |
| 1400 { | |
| 1401 MessageBoxW(nullptr, L"Invalid picture_name detected ::addItem()", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Party.cpp:795", 0); | |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1402 return false; |
|
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1403 } |
| 0 | 1404 } |
| 1405 // 506128: using guessed type int areWeLoadingTexture; | |
| 1406 | |
| 1407 //----- (0048C855) -------------------------------------------------------- | |
| 1408 int Player::GetBaseStrength() | |
| 1409 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1410 return this->uMight + GetItemsBonus(CHARACTER_ATTRIBUTE_STRENGTH); |
| 0 | 1411 } |
| 1412 | |
| 1413 //----- (0048C86C) -------------------------------------------------------- | |
| 1414 int Player::GetBaseIntelligence() | |
| 1415 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1416 return this->uIntelligence + GetItemsBonus(CHARACTER_ATTRIBUTE_INTELLIGENCE); |
| 0 | 1417 } |
| 1418 | |
| 1419 //----- (0048C883) -------------------------------------------------------- | |
| 1420 int Player::GetBaseWillpower() | |
| 1421 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1422 return this->uWillpower + GetItemsBonus(CHARACTER_ATTRIBUTE_WILLPOWER); |
| 0 | 1423 } |
| 1424 | |
| 1425 //----- (0048C89A) -------------------------------------------------------- | |
| 1426 int Player::GetBaseEndurance() | |
| 1427 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1428 return this->uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE); |
| 0 | 1429 } |
| 1430 | |
| 1431 //----- (0048C8B1) -------------------------------------------------------- | |
| 1432 int Player::GetBaseAccuracy() | |
| 1433 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1434 return this->uAccuracy + GetItemsBonus(CHARACTER_ATTRIBUTE_ACCURACY); |
| 0 | 1435 } |
| 1436 | |
| 1437 //----- (0048C8C8) -------------------------------------------------------- | |
| 1438 int Player::GetBaseSpeed() | |
| 1439 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1440 return this->uSpeed + GetItemsBonus(CHARACTER_ATTRIBUTE_SPEED); |
| 0 | 1441 } |
| 1442 | |
| 1443 //----- (0048C8DF) -------------------------------------------------------- | |
| 1444 int Player::GetBaseLuck() | |
| 1445 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1446 return this->uLuck + GetItemsBonus(CHARACTER_ATTRIBUTE_LUCK); |
| 0 | 1447 } |
| 1448 | |
| 1449 //----- (0048C8F6) -------------------------------------------------------- | |
| 1450 int Player::GetBaseLevel() | |
| 1451 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1452 return this->uLevel + GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1453 } |
| 1454 | |
| 1455 //----- (0048C90D) -------------------------------------------------------- | |
| 1456 int Player::GetActualLevel() | |
| 1457 { | |
| 1458 return uLevel + sLevelModifier + | |
| 1459 GetMagicalBonus(CHARACTER_ATTRIBUTE_LEVEL) + | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1460 GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1461 } |
| 1462 | |
| 1463 //----- (0048C93C) -------------------------------------------------------- | |
| 1464 int Player::GetActualMight() | |
| 1465 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1466 return GetActualAttribute(CHARACTER_ATTRIBUTE_STRENGTH, &Player::uMight, &Player::uMightBonus); |
| 0 | 1467 } |
| 1468 | |
| 1469 //----- (0048C9C2) -------------------------------------------------------- | |
| 1470 int Player::GetActualIntelligence() | |
| 1471 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1472 return GetActualAttribute(CHARACTER_ATTRIBUTE_INTELLIGENCE, &Player::uIntelligence, &Player::uIntelligenceBonus); |
| 0 | 1473 } |
| 1474 | |
| 1475 //----- (0048CA3F) -------------------------------------------------------- | |
| 1476 int Player::GetActualWillpower() | |
| 1477 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1478 return GetActualAttribute(CHARACTER_ATTRIBUTE_WILLPOWER, &Player::uWillpower, &Player::uWillpowerBonus); |
| 0 | 1479 } |
| 1480 | |
| 1481 //----- (0048CABC) -------------------------------------------------------- | |
| 1482 int Player::GetActualEndurance() | |
| 1483 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1484 return GetActualAttribute(CHARACTER_ATTRIBUTE_ENDURANCE, &Player::uEndurance, &Player::uEnduranceBonus); |
| 0 | 1485 } |
| 1486 | |
| 1487 //----- (0048CB39) -------------------------------------------------------- | |
| 1488 int Player::GetActualAccuracy() | |
| 1489 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1490 return GetActualAttribute(CHARACTER_ATTRIBUTE_ACCURACY, &Player::uAccuracy, &Player::uAccuracyBonus); |
| 0 | 1491 } |
| 1492 | |
| 1493 //----- (0048CBB6) -------------------------------------------------------- | |
| 1494 int Player::GetActualSpeed() | |
| 1495 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1496 return GetActualAttribute(CHARACTER_ATTRIBUTE_SPEED, &Player::uSpeed, &Player::uSpeedBonus); |
| 0 | 1497 } |
| 1498 | |
| 1499 //----- (0048CC33) -------------------------------------------------------- | |
| 1500 int Player::GetActualLuck() | |
| 1501 { | |
| 1036 | 1502 signed int npc_luck_bonus; // [sp+10h] [bp-4h]@1 |
| 1503 | |
| 1504 npc_luck_bonus = 0; | |
| 652 | 1505 if ( CheckHiredNPCSpeciality(Fool) ) |
| 1036 | 1506 npc_luck_bonus = 5; |
| 652 | 1507 if ( CheckHiredNPCSpeciality(ChimneySweep) ) |
| 1036 | 1508 npc_luck_bonus += 20; |
| 652 | 1509 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1036 | 1510 npc_luck_bonus += 10; |
| 1324 | 1511 |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1512 return GetActualAttribute(CHARACTER_ATTRIBUTE_LUCK, &Player::uLuck, &Player::uLuckBonus) |
| 1325 | 1513 + npc_luck_bonus; |
| 1514 } | |
| 1515 | |
| 1516 //----- (new function) -------------------------------------------------------- | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1517 int Player::GetActualAttribute( CHARACTER_ATTRIBUTE_TYPE attrId, unsigned short Player::* attrValue, unsigned short Player::* attrBonus ) |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1518 { |
| 1324 | 1519 uint uActualAge = this->sAgeModifier + GetBaseAge(); |
| 1520 uint uAgeingMultiplier = 100; | |
| 1521 for (uint i = 0; i < 4; ++i) | |
| 1325 | 1522 { |
| 1324 | 1523 if (uActualAge >= pAgeingTable[i]) |
| 1325 | 1524 uAgeingMultiplier = pAgingAttributeModifier[attrId][i]; |
| 1525 else | |
| 1526 break; | |
| 1527 } | |
| 1528 | |
| 1529 auto uConditionMult = pConditionAttributeModifier[attrId][GetMajorConditionIdx()]; | |
| 1530 int magicBonus = GetMagicalBonus(attrId); | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1531 int itemBonus = GetItemsBonus(attrId); |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1532 return uConditionMult * uAgeingMultiplier * this->*attrValue / 100 / 100 |
| 1325 | 1533 + magicBonus |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1534 + itemBonus |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1535 + this->*attrBonus; |
| 0 | 1536 } |
| 1537 | |
| 1538 //----- (0048CCF5) -------------------------------------------------------- | |
| 1684 | 1539 int Player::GetActualAttack( bool a2 ) |
| 0 | 1540 { |
| 1541 int v3; // eax@1 | |
| 1542 int v4; // edi@1 | |
| 1543 int v5; // ebx@1 | |
| 1544 int v6; // ebp@1 | |
| 1545 | |
| 1546 v3 = GetActualAccuracy(); | |
| 1036 | 1547 v4 = GetParameterBonus(v3); |
| 0 | 1548 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_ATTACK); |
| 1549 v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_ATTACK, a2); | |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1550 return v4 + v5 + v6 + GetMagicalBonus(CHARACTER_ATTRIBUTE_ATTACK) + this->_some_attack_bonus; |
| 0 | 1551 } |
| 1552 | |
| 1553 //----- (0048CD45) -------------------------------------------------------- | |
| 1554 int Player::GetMeleeDamageMinimal() | |
| 1555 { | |
| 1556 int v2; // eax@1 | |
| 1557 int v3; // esi@1 | |
| 1558 int v4; // esi@1 | |
| 1559 int v5; // esi@1 | |
| 1560 signed int result; // eax@1 | |
| 1036 | 1561 |
| 0 | 1562 v2 = GetActualMight(); |
| 1036 | 1563 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1564 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN) + v3; |
| 0 | 1565 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v4; |
| 1036 | 1566 result = _melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 1567 if ( result < 1 ) | |
| 1568 result = 1; | |
| 0 | 1569 return result; |
| 1570 } | |
| 1571 | |
| 1572 //----- (0048CD90) -------------------------------------------------------- | |
| 1573 int Player::GetMeleeDamageMaximal() | |
| 1574 { | |
| 1575 int v2; // eax@1 | |
| 1576 int v3; // esi@1 | |
| 1577 int v4; // esi@1 | |
| 1578 int v5; // esi@1 | |
| 1579 int v6; // esi@1 | |
| 1580 signed int result; // eax@1 | |
| 1581 | |
| 1582 v2 = GetActualMight(); | |
| 1036 | 1583 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1584 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX) + v3; |
| 0 | 1585 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v4; |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1586 v6 = this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 0 | 1587 result = 1; |
| 1588 if ( v6 >= 1 ) | |
| 1589 result = v6; | |
| 1590 return result; | |
| 1591 } | |
| 1592 | |
| 1593 //----- (0048CDDB) -------------------------------------------------------- | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1594 int Player::CalculateMeleeDamageTo( bool ignoreSkillBonus, bool ignoreOffhand, unsigned int uTargetActorID ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1595 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1596 int dmgSum; // esi@62 |
| 0 | 1597 signed int result; // eax@64 |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1598 int mainWpnDmg; // [sp+18h] [bp-8h]@1 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1599 int offHndWpnDmg; // [sp+1Ch] [bp-4h]@1 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1600 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1601 offHndWpnDmg = 0; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1602 mainWpnDmg = 0; |
|
1549
5a3afcaa6717
Player::CalculateMeleeDamageTo removed labels, ifdowhile patterns changed to for cycles, magic numbers to enum values, fixing gibbet being only undead slaying
Grumpy7
parents:
1547
diff
changeset
|
1603 if ( IsUnarmed() ) |
| 0 | 1604 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1605 mainWpnDmg = rand() % 3 + 1; |
|
1549
5a3afcaa6717
Player::CalculateMeleeDamageTo removed labels, ifdowhile patterns changed to for cycles, magic numbers to enum values, fixing gibbet being only undead slaying
Grumpy7
parents:
1547
diff
changeset
|
1606 } |
|
5a3afcaa6717
Player::CalculateMeleeDamageTo removed labels, ifdowhile patterns changed to for cycles, magic numbers to enum values, fixing gibbet being only undead slaying
Grumpy7
parents:
1547
diff
changeset
|
1607 else |
|
5a3afcaa6717
Player::CalculateMeleeDamageTo removed labels, ifdowhile patterns changed to for cycles, magic numbers to enum values, fixing gibbet being only undead slaying
Grumpy7
parents:
1547
diff
changeset
|
1608 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1609 if ( HasItemEquipped(EQUIP_MAIN_HAND) ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1610 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1611 ItemGen *mainHandItemGen = &this->pInventoryItemList[this->pEquipment.uMainHand-1]; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1612 int itemId = mainHandItemGen->uItemID; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1613 bool addOneDice = false; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1614 if ( pItemsTable->pItems[itemId].uSkillType == PLAYER_SKILL_SPEAR && !this->pEquipment.uShield ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1615 addOneDice = true; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1616 mainWpnDmg = CalculateMeleeDmgToEnemyWithWeapon(mainHandItemGen, uTargetActorID, addOneDice); |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1617 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1618 if ( !ignoreOffhand ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1619 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1620 if ( this->HasItemEquipped(EQUIP_OFF_HAND) ) |
| 0 | 1621 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1622 ItemGen *offHandItemGen = (ItemGen *)&this->pInventoryItemList[this->pEquipment.uShield - 1]; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1623 int itemId = offHandItemGen->uItemID; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1624 if ( pItemsTable->pItems[itemId].uEquipType != EQUIP_SHIELD ) |
| 0 | 1625 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1626 offHndWpnDmg = CalculateMeleeDmgToEnemyWithWeapon(offHandItemGen, uTargetActorID, false); |
| 0 | 1627 } |
| 1628 } | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1629 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1630 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1631 dmgSum = mainWpnDmg + offHndWpnDmg; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1632 if ( !ignoreSkillBonus ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1633 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1634 int might = GetActualMight(); |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1635 int mightBonus = GetParameterBonus(might); |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1636 int mightAndSkillbonus = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + mightBonus; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1637 dmgSum += this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + mightAndSkillbonus; |
| 0 | 1638 } |
| 1639 result = 1; | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1640 if ( dmgSum >= 1 ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1641 result = dmgSum; |
| 0 | 1642 return result; |
| 1643 } | |
| 1644 | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1645 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1646 int Player::CalculateMeleeDmgToEnemyWithWeapon( ItemGen * weapon, unsigned int uTargetActorID , bool addOneDice ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1647 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1648 int itemId = weapon->uItemID; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1649 int diceCount = pItemsTable->pItems[itemId].uDamageDice; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1650 if (addOneDice) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1651 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1652 diceCount++; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1653 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1654 int diceSides = pItemsTable->pItems[itemId].uDamageRoll; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1655 int diceResult = 0; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1656 for (int i = 0; i < diceCount; i++) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1657 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1658 diceResult += rand() % diceSides + 1; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1659 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1660 int totalDmg = pItemsTable->pItems[itemId].uDamageMod + diceResult; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1661 if ( uTargetActorID > 0) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1662 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1663 int enchType = weapon->uSpecEnchantmentType; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1664 if ( MonsterStats::BelongsToSupertype(uTargetActorID, MONSTER_SUPERTYPE_UNDEAD) && (enchType == 64 || itemId == ITEM_ARTIFACT_GHOULSBANE || itemId == ITEM_ARTIFACT_GIBBET || itemId == ITEM_RELIC_JUSTICE) ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1665 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1666 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1667 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1668 else if (MonsterStats::BelongsToSupertype(uTargetActorID, MONSTER_SUPERTYPE_KREEGAN) && ( enchType == 39 || itemId == ITEM_ARTIFACT_GIBBET)) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1669 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1670 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1671 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1672 else if (MonsterStats::BelongsToSupertype(uTargetActorID, MONSTER_SUPERTYPE_DRAGON) && ( enchType == 40 || itemId == ITEM_ARTIFACT_GIBBET)) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1673 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1674 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1675 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1676 else if (MonsterStats::BelongsToSupertype(uTargetActorID, MONSTER_SUPERTYPE_TITAN) && ( enchType == 65 )) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1677 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1678 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1679 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1680 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1681 if ( (signed int)SkillToMastery(this->pActiveSkills[2]) >= 3 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1682 && pItemsTable->pItems[itemId].uSkillType == 2 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1683 && rand() % 100 < 10 ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1684 totalDmg *= 3; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1685 return totalDmg; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1686 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1687 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1688 |
| 0 | 1689 //----- (0048D0B9) -------------------------------------------------------- |
| 1690 int Player::GetRangedAttack() | |
| 1691 { | |
| 1692 int v2; // eax@1 | |
| 1693 int v3; // edi@3 | |
| 1694 int v4; // eax@4 | |
| 1695 int v5; // edi@4 | |
| 1696 int v6; // edi@4 | |
| 1697 int v7; // edi@4 | |
| 1698 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1699 v2 = *(int *)&this->pInventoryItemList[this->pEquipment.uMainHand-1]; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1700 if ( v2 < ITEM_BLASTER || v2 > ITEM_LASER_RIFLE ) |
| 0 | 1701 { |
| 1702 v4 = GetActualAccuracy(); | |
| 1036 | 1703 v5 = GetParameterBonus(v4); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1704 v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v5; |
| 0 | 1705 v7 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v6; |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1706 v3 = this->_ranged_atk_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v7; |
| 0 | 1707 } |
| 1708 else | |
| 1709 { | |
| 1684 | 1710 v3 = GetActualAttack(true); |
| 0 | 1711 } |
| 1712 return v3; | |
| 1713 } | |
| 1714 | |
| 1715 //----- (0048D124) -------------------------------------------------------- | |
| 1716 int Player::GetRangedDamageMin() | |
| 1717 { | |
| 1718 int v2; // edi@1 | |
| 1719 int v3; // edi@1 | |
| 1720 int v4; // edi@1 | |
| 1721 int result; // eax@6 | |
| 1722 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1723 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MIN); |
| 1040 | 1724 v3 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v2; |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1725 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1726 if ( v4 >= 1 ) |
| 1727 result = v4; | |
| 1728 else | |
| 1729 result = 0; | |
| 1730 return result; | |
| 1731 } | |
| 1732 | |
| 1733 //----- (0048D191) -------------------------------------------------------- | |
| 1734 int Player::GetRangedDamageMax() | |
| 1735 { | |
| 1736 int v2; // edi@1 | |
| 1737 int v3; // edi@1 | |
| 1738 int v4; // edi@1 | |
| 1739 int result; // eax@6 | |
| 1740 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1741 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MAX); |
| 1040 | 1742 v3 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v2; |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1743 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1744 if ( v4 >= 1 ) |
| 1745 result = v4; | |
| 1746 else | |
| 1747 result = 0; | |
| 1748 return result; | |
| 1749 } | |
| 1750 | |
| 1751 //----- (0048D1FE) -------------------------------------------------------- | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1752 int Player::CalculateRangedDamageTo( int a2 ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1753 { |
| 0 | 1754 ItemGen *v4; // ebx@2 |
| 1755 unsigned int v5; // edi@2 | |
| 1756 int v9; // esi@5 | |
| 1757 int v10; // ebx@6 | |
| 1758 signed int v15; // [sp+8h] [bp-Ch]@2 | |
| 1759 int v17; // [sp+10h] [bp-4h]@1 | |
| 1760 | |
| 1761 v17 = 0; | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1762 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1763 return 0; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1764 v4 = (ItemGen *)&this->pInventoryItemList[this->pEquipment.uBow-1]; |
| 0 | 1765 v5 = v4->uItemID; |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1766 v15 = pItemsTable->pItems[v5].uDamageRoll; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1767 for( int i = 0; i < pItemsTable->pItems[v5].uDamageDice; i++ ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1768 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1769 int v7 = rand() % v15; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1770 v17 += v7 + 1; |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1771 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1772 v9 = pItemsTable->pItems[v5].uDamageMod + v17; |
| 0 | 1773 if ( a2 ) |
| 1774 { | |
| 377 | 1775 v10 = v4->uSpecEnchantmentType; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1776 if ( v10 == 64 && MonsterStats::BelongsToSupertype(a2, MONSTER_SUPERTYPE_UNDEAD)) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1777 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1778 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1779 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1780 else if ( v10 == 39 && MonsterStats::BelongsToSupertype(a2, MONSTER_SUPERTYPE_KREEGAN)) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1781 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1782 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1783 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1784 else if ( v10 == 40 && MonsterStats::BelongsToSupertype(a2, MONSTER_SUPERTYPE_DRAGON)) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1785 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1786 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1787 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1788 else if ( v10 == 63 && MonsterStats::BelongsToSupertype(a2, MONSTER_SUPERTYPE_ELF)) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1789 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1790 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1791 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1792 } |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1793 return v9 + this->GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS); |
| 0 | 1794 } |
| 1795 | |
| 1796 //----- (0048D2EA) -------------------------------------------------------- | |
| 1797 char *Player::GetMeleeDamageString() | |
| 1798 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1799 signed int itemid; // eax@1 |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1800 int min_damage; // edi@3 |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1801 int max_damage; // eax@3 |
| 0 | 1802 |
| 1803 static char player__getmeleedamagestring_static_buff[40]; // idb | |
| 1804 | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1805 if (pEquipment.uMainHand >= 0) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1806 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1807 itemid = pOwnItems[this->pEquipment.uMainHand-1].uItemID; |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1808 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1809 |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1810 if (pEquipment.uMainHand >= 0 && ( itemid >= 135 ) && ( itemid <= 159 )) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1811 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1812 strcpy(player__getmeleedamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1813 return player__getmeleedamagestring_static_buff; |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1814 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1815 else if (pEquipment.uMainHand >= 0 && (itemid == ITEM_BLASTER || itemid == ITEM_LASER_RIFLE)) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1816 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1817 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1818 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1819 } |
| 0 | 1820 else |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1821 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1822 min_damage = GetMeleeDamageMinimal(); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1823 max_damage = GetMeleeDamageMaximal(); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1824 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1825 if ( min_damage == max_damage ) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1826 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1827 sprintf(player__getmeleedamagestring_static_buff, "%d", min_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1828 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1829 else |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1830 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1831 sprintf(player__getmeleedamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1832 } |
| 1036 | 1833 return player__getmeleedamagestring_static_buff; |
| 0 | 1834 } |
| 1835 | |
| 1836 //----- (0048D396) -------------------------------------------------------- | |
| 1837 char *Player::GetRangedDamageString() | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1838 { |
| 1036 | 1839 signed int itemid; // eax@1 |
| 1840 int min_damage; // edi@3 | |
| 1841 int max_damage; // eax@3 | |
| 1842 | |
| 1843 static char player__getrangeddamagestring_static_buff[40]; // idb | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1844 |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1845 if (pEquipment.uMainHand >= 0) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1846 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1847 itemid = pOwnItems[this->pEquipment.uMainHand-1].uItemID; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1848 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1849 |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1850 if (pEquipment.uMainHand >= 0 && ( itemid >= 135 ) && ( itemid <= 159 )) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1851 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1852 strcpy(player__getrangeddamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1853 return player__getrangeddamagestring_static_buff; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1854 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1855 else if (pEquipment.uMainHand >= 0 && (itemid == ITEM_BLASTER || itemid == ITEM_LASER_RIFLE)) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1856 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1857 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1858 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1859 } |
| 0 | 1860 else |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1861 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1862 min_damage = GetRangedDamageMin(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1863 max_damage = GetRangedDamageMax(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1864 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1865 if ( max_damage > 0) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1866 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1867 if ( min_damage == max_damage ) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1868 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1869 sprintf(player__getrangeddamagestring_static_buff, "%d", min_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1870 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1871 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1872 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1873 sprintf(player__getrangeddamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1874 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1875 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1876 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1877 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1878 strcpy(player__getrangeddamagestring_static_buff, "N/A"); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1879 } |
| 1036 | 1880 return player__getrangeddamagestring_static_buff; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1881 } |
| 0 | 1882 |
| 1883 //----- (0048D45A) -------------------------------------------------------- | |
| 1884 bool Player::CanTrainToNextLevel() | |
| 1885 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1886 int lvl = this->uLevel + 1; |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1887 int neededExp = ((lvl * (lvl - 1)) / 2 * 1000); |
| 1564 | 1888 return this->uExperience >= neededExp; |
| 0 | 1889 } |
| 1890 | |
| 1891 //----- (0048D498) -------------------------------------------------------- | |
| 1892 unsigned int Player::GetExperienceDisplayColor() | |
| 1893 { | |
| 1894 if ( CanTrainToNextLevel() ) | |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1895 return ui_character_bonus_text_color; |
| 0 | 1896 else |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1897 return ui_character_default_text_color; |
| 0 | 1898 } |
| 1899 | |
| 1900 //----- (0048D4B3) -------------------------------------------------------- | |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1901 int Player::CalculateIncommingDamage( DAMAGE_TYPE dmg_type, int dmg ) |
| 1561 | 1902 { |
| 1036 | 1903 int resist_value; // edi@8 |
| 1904 int player_luck; // eax@21 | |
| 1905 signed int res_rand_divider; // ebx@2 | |
| 1906 int armor_skill; // eax@29 | |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1907 |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1908 if ( classType == PLAYER_CLASS_LICH && (dmg_type == CHARACTER_ATTRIBUTE_RESIST_MIND || dmg_type == CHARACTER_ATTRIBUTE_RESIST_BODY || dmg_type == CHARACTER_ATTRIBUTE_RESIST_SPIRIT )) //TODO: determine if spirit resistance should be handled by body res. modifier |
|
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1909 return 0; |
|
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1910 |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1911 resist_value = 0; |
| 1036 | 1912 switch(dmg_type) |
| 1913 { | |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1914 case DMGT_FIRE: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_FIRE); break; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1915 case DMGT_ELECTR: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_AIR); break; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1916 case DMGT_COLD: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_WATER); break; |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1917 case DMGT_EARTH: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_EARTH); break; |
| 1036 | 1918 |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1919 case DMGT_SPIRIT: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_SPIRIT);break; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1920 case DMGT_MIND: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_MIND); break; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1921 case DMGT_BODY: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_BODY); break; |
| 1036 | 1922 } |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1923 |
| 1036 | 1924 player_luck = GetActualLuck(); |
| 1925 res_rand_divider = GetParameterBonus(player_luck) + resist_value + 30; | |
| 1926 | |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1927 if ( GetParameterBonus(player_luck) + resist_value > 0 ) |
| 1036 | 1928 { |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1929 for (int i = 0; i < 4; i++) |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1930 { |
| 1036 | 1931 if ( rand() % res_rand_divider >= 30 ) |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1932 dmg >>= 1; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1933 else |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1934 break; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1935 } |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1936 } |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1937 if (( dmg_type == DMGT_PHISYCAL ) && ( pEquipment.uArmor )) |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1938 { |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1939 if (!pOwnItems[pEquipment.uArmor - 1].IsBroken()) |
| 0 | 1940 { |
| 1036 | 1941 armor_skill = GetEquippedItemSkillType(EQUIP_ARMOUR); |
| 1942 if ( armor_skill==PLAYER_SKILL_PLATE ) | |
| 0 | 1943 { |
| 1036 | 1944 if ( SkillToMastery(pActiveSkills[PLAYER_SKILL_PLATE]) >= 3 ) |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1945 return dmg / 2; |
| 0 | 1946 } |
| 1036 | 1947 if (armor_skill==PLAYER_SKILL_CHAIN ) |
| 0 | 1948 { |
| 1036 | 1949 if (SkillToMastery(pActiveSkills[PLAYER_SKILL_CHAIN]) == 4) |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1950 return dmg * 2 / 3; |
| 0 | 1951 } |
| 1952 } | |
| 1036 | 1953 } |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1954 return dmg; |
| 0 | 1955 } |
| 1956 | |
| 1957 //----- (0048D62C) -------------------------------------------------------- | |
| 816 | 1958 ITEM_EQUIP_TYPE Player::GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1959 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1960 return pItemsTable->pItems[pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uEquipType; |
| 0 | 1961 } |
| 1962 | |
| 1963 //----- (0048D651) -------------------------------------------------------- | |
| 816 | 1964 PLAYER_SKILL_TYPE Player::GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1965 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1966 return (PLAYER_SKILL_TYPE)pItemsTable->pItems[pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uSkillType; |
| 0 | 1967 } |
| 1968 | |
| 1969 //----- (0048D676) -------------------------------------------------------- | |
| 1970 bool Player::IsUnarmed() | |
| 1971 { | |
| 1561 | 1972 return !HasItemEquipped(EQUIP_MAIN_HAND) && |
| 1973 (!HasItemEquipped(EQUIP_OFF_HAND) || GetEquippedItemEquipType(EQUIP_OFF_HAND) == EQUIP_SHIELD); | |
| 0 | 1974 } |
| 1975 | |
| 1976 //----- (0048D6AA) -------------------------------------------------------- | |
| 1977 bool Player::HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex) | |
| 1978 { | |
| 1979 auto i = pEquipment.pIndices[uEquipIndex]; | |
| 1980 if (i) | |
| 1568 | 1981 return (~(pOwnItems[i - 1].uAttributes & ITEM_BROKEN)) != 0; |
| 1036 | 1982 else |
| 1983 return false; | |
| 0 | 1984 } |
| 1985 | |
| 1986 //----- (0048D6D0) -------------------------------------------------------- | |
| 1987 bool Player::HasEnchantedItemEquipped(int uEnchantment) | |
| 1988 { | |
| 1989 for (uint i = 0; i < 16; ++i) | |
| 1990 { | |
| 1991 if (HasItemEquipped((ITEM_EQUIP_TYPE)i) && | |
| 1080 | 1992 pOwnItems[pEquipment.pIndices[i]-1].uSpecEnchantmentType == uEnchantment) |
| 0 | 1993 return true; |
| 1994 } | |
| 1995 return false; | |
| 1996 } | |
| 1997 | |
| 1998 //----- (0048D709) -------------------------------------------------------- | |
| 1080 | 1999 bool Player::WearsItem( int item_id, ITEM_EQUIP_TYPE equip_type ) |
| 1563 | 2000 { |
| 2001 return ( HasItemEquipped(equip_type) && pInventoryItemList[pEquipment.pIndices[equip_type - 1]].uItemID == item_id ); | |
| 2002 } | |
| 2003 | |
| 2004 bool Player::WearsItemAnyWhere(int item_id) | |
| 2005 { | |
| 2006 for (int i = 0; i < 16; i++) | |
| 2007 { | |
| 2008 if (WearsItem(item_id, (ITEM_EQUIP_TYPE) i)) | |
| 2009 { | |
| 2010 return true; | |
| 2011 } | |
| 2012 } | |
| 2013 return false; | |
| 0 | 2014 } |
| 2015 | |
| 2016 //----- (0048D76C) -------------------------------------------------------- | |
| 1686 | 2017 int Player::StealFromShop( ItemGen *itemToSteal, int extraStealDifficulty, int reputation, int a5, int *fineIfFailed ) //returns an int, but is the return value is compared to zero, so might change to bool |
| 0 | 2018 { |
| 2019 unsigned __int16 v6; // cx@8 | |
| 2020 int v7; // edi@8 | |
| 2021 unsigned int v8; // ebx@8 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2022 unsigned int itemvalue; // esi@8 |
| 0 | 2023 int v10; // eax@8 |
| 1686 | 2024 int currMaxItemValue; // edi@12 |
| 0 | 2025 |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2026 if ( !itemToSteal |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
2027 || this->IsEradicated() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
2028 || this->IsDead() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
2029 || this->IsPertified() |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2030 || this->IsDrunk() |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
2031 || this->IsUnconcious() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
2032 || this->IsAsleep() ) |
| 0 | 2033 { |
| 1686 | 2034 return 0; |
| 0 | 2035 } |
| 2036 else | |
| 2037 { | |
| 2038 v6 = this->pActiveSkills[34]; | |
| 2039 v7 = v6 & 0x3F; | |
| 2040 v8 = SkillToMastery(v6); | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2041 itemvalue = itemToSteal->GetValue(); |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2042 v10 = pItemsTable->pItems[itemToSteal->uItemID].uEquipType; |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2043 if ( v10 == EQUIP_OFF_HAND || v10 == EQUIP_MAIN_HAND || v10 == EQUIP_BOW ) |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2044 itemvalue *= 3; |
| 1686 | 2045 currMaxItemValue = StealingRandomBonuses[rand() % 5] + v7 * StealingMasteryBonuses[v8]; |
| 2046 *fineIfFailed = 100 * (reputation + extraStealDifficulty) + itemvalue; | |
| 2047 if (a5) | |
| 2048 { | |
| 2049 *fineIfFailed += 500; | |
| 2050 } | |
| 0 | 2051 if ( rand() % 100 >= 5 ) |
| 2052 { | |
| 1686 | 2053 if ( *fineIfFailed > currMaxItemValue ) |
| 2054 if (*fineIfFailed - currMaxItemValue < 500) | |
| 2055 { | |
| 2056 return 1; | |
| 2057 } | |
| 2058 else | |
| 2059 { | |
| 2060 return 0; | |
| 2061 } | |
| 0 | 2062 else |
| 1686 | 2063 return 2; |
| 0 | 2064 } |
| 2065 else | |
| 2066 { | |
| 1686 | 2067 return 0; |
| 2068 } | |
| 2069 } | |
| 0 | 2070 } |
| 2071 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2072 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2073 | |
| 2074 //----- (0048D88B) -------------------------------------------------------- | |
| 2075 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation) | |
| 2076 { | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2077 Actor *actroPtr; // edi@1 |
| 0 | 2078 int v7; // ebx@10 |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2079 unsigned int stealingMastery; // esi@10 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2080 int fineIfFailed; // esi@10 |
| 0 | 2081 int v11; // eax@13 |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2082 bool HasFullItemSlots; // ebx@15 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2083 unsigned __int16 carriedItemId; // si@21 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2084 unsigned int enchBonusSum; // esi@31 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2085 int *enchTypePtr; // eax@34 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2086 ItemGen tempItem; // [sp+8h] [bp-34h]@15 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2087 int currMaxItemValue; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2088 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2089 actroPtr = &pActors[uActorID]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2090 if ( !actroPtr |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2091 || this->IsEradicated() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2092 || this->IsDead() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2093 || this->IsPertified() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2094 || this->IsDrunk() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2095 || this->IsUnconcious() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2096 || this->IsAsleep() ) |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2097 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2098 return 0; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2099 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2100 pGlobalTXT_LocalizationStrings[1]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2101 if ( !(BYTE2(actroPtr->uAttributes) & 0x80) ) |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2102 actroPtr->SetRandomGoldIfTheresNoItem(); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2103 unsigned __int16 v6 = this->pActiveSkills[34]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2104 v7 = v6 & 0x3F; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2105 stealingMastery = SkillToMastery(v6); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2106 int v30 = StealingMasteryBonuses[stealingMastery]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2107 int v29 = StealingRandomBonuses[rand() % 5]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2108 fineIfFailed = actroPtr->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2109 currMaxItemValue = v29 + v7 * v30; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2110 pGlobalTXT_LocalizationStrings[200]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2111 if ( false && (rand() % 100 < 5 || fineIfFailed > currMaxItemValue || BYTE2(actroPtr->uAttributes) & 8) ) |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2112 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2113 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2114 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[376], this->pName); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2115 ShowStatusBarString(pTmpBuf2.data(), 2u); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2116 return 0; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2117 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2118 else |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2119 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2120 v11 = rand(); |
| 1688 | 2121 if ( v11 % 100 >= 70 ) //stealing gold |
| 2122 { | |
| 2123 enchBonusSum = 0; | |
| 2124 for (int i = 0; i < v7; i++) | |
| 2125 { | |
| 2126 enchBonusSum += rand() % StealingEnchantmentBonusForSkill[stealingMastery] + 1; | |
| 2127 } | |
| 2128 if ( pItemsTable->pItems[actroPtr->array_000234[3].uItemID].uEquipType != EQUIP_GOLD ) | |
| 2129 return 2; | |
| 2130 enchTypePtr = &actroPtr->array_000234[3].uSpecEnchantmentType; | |
| 2131 if ( (int)enchBonusSum >= *enchTypePtr ) | |
| 2132 { | |
| 2133 actroPtr->array_000234[3].uItemID = 0; | |
| 2134 *enchTypePtr = 0; | |
| 2135 } | |
| 2136 else | |
| 2137 { | |
| 2138 *enchTypePtr -= enchBonusSum; | |
| 2139 } | |
| 2140 if ( enchBonusSum ) | |
| 2141 { | |
| 2142 party_finds_gold(enchBonusSum, 2); | |
| 2143 sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[302], this->pName, enchBonusSum); //%stole %d gold | |
| 2144 } | |
| 2145 else | |
| 2146 { | |
| 2147 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName); //%s failed to steal anything | |
| 2148 } | |
| 2149 ShowStatusBarString(pTmpBuf2.data(), 2u); | |
| 2150 return 2; | |
| 2151 } | |
| 2152 else if ( v11 % 100 >= 40 ) //stealing an item | |
| 2153 { | |
| 2154 tempItem.Reset(); | |
| 2155 HasFullItemSlots = false; | |
| 2156 int i; | |
| 2157 for (i = 0; i < 4; i++) | |
| 2158 { | |
| 2159 if ( actroPtr->array_000234[i].uItemID != 0 && pItemsTable->pItems[actroPtr->array_000234[i].uItemID].uEquipType != EQUIP_GOLD ) | |
| 2160 break; | |
| 2161 } | |
| 2162 if (i == 4) | |
| 2163 HasFullItemSlots = true; | |
| 2164 carriedItemId = actroPtr->uCarriedItemID; | |
| 2165 if ( carriedItemId != 0 || HasFullItemSlots ) | |
| 2166 { | |
| 2167 tempItem.Reset(); | |
| 2168 if ( carriedItemId != 0 ) | |
| 0 | 2169 { |
| 1688 | 2170 actroPtr->uCarriedItemID = 0; |
| 2171 tempItem.uItemID = carriedItemId; | |
| 2172 if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_WAND ) | |
| 2173 tempItem.uNumCharges = rand() % 6 + pItemsTable->pItems[carriedItemId].uDamageMod + 1; | |
| 2174 else if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_POTION && carriedItemId != ITEM_POTION_BOTTLE) | |
| 2175 tempItem.uEnchantmentType = 2 * rand() % 4 + 2; | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2176 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2177 else |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2178 { |
| 1688 | 2179 ItemGen* itemToSteal = &actroPtr->array_000234[rand() % 4]; |
| 2180 memcpy(&tempItem, itemToSteal, sizeof(tempItem)); | |
| 2181 itemToSteal->Reset(); | |
| 2182 carriedItemId = tempItem.uItemID; | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2183 } |
| 1688 | 2184 sub_421B2C_PlaceInInventory_or_DropPickedItem(); |
| 2185 sprintf( | |
| 2186 pTmpBuf2.data(), | |
| 2187 pGlobalTXT_LocalizationStrings[304], // Official //TODO: add a normal "%d stole %d" message | |
| 2188 this->pName, | |
| 2189 pItemsTable->pItems[carriedItemId].pUnidentifiedName); | |
| 2190 ShowStatusBarString(pTmpBuf2.data(), 2u); | |
| 2191 sub_421B2C_PlaceInInventory_or_DropPickedItem(); | |
| 2192 memcpy(&pParty->pPickedItem, &tempItem, sizeof(ItemGen)); | |
| 2193 pMouse->SetCursorBitmapFromItemID(carriedItemId); | |
| 2194 return 2; | |
| 0 | 2195 } |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2196 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2197 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName); //%s failed to steal anything |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2198 ShowStatusBarString(pTmpBuf2.data(), 2u); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2199 return 2; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2200 } |
| 0 | 2201 } |
| 2202 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2203 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2204 // 4EDEC4: using guessed type int dword_4EDEC4[]; | |
| 2205 | |
| 2206 //----- (0048DBB9) -------------------------------------------------------- | |
| 2207 void Player::Heal(int amount) | |
| 2208 { | |
| 1010 | 2209 signed int max_health; // eax@3 |
| 2210 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2211 if ( !IsEradicated() && !IsDead() ) |
| 1010 | 2212 { |
| 2213 max_health = GetMaxHealth(); | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2214 if ( IsZombie() ) |
| 1010 | 2215 max_health /= 2; |
| 2216 sHealth += amount; | |
| 2217 if ( sHealth > max_health ) | |
| 2218 sHealth = max_health; | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2219 if ( IsUnconcious() ) |
| 1010 | 2220 { |
| 2221 if ( sHealth > 0 ) | |
| 2222 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2223 SetUnconcious(false); |
| 0 | 2224 } |
| 2225 } | |
| 2226 } | |
| 2227 } | |
| 2228 | |
| 2229 //----- (0048DC1E) -------------------------------------------------------- | |
| 1036 | 2230 int Player::ReceiveDamage( signed int amount, DAMAGE_TYPE dmg_type ) |
| 2231 { | |
| 2232 signed int recieved_dmg; // eax@1 | |
| 2233 unsigned int armor_indx; // eax@8 | |
| 2234 bool broke_armor; | |
| 2235 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2236 SetAsleep(false); |
| 1036 | 2237 recieved_dmg = CalculateIncommingDamage(dmg_type, amount); |
| 2238 sHealth -= recieved_dmg; | |
| 2239 broke_armor = sHealth <= -10; | |
| 2240 if ( sHealth < 1 ) // | |
| 2241 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2242 if ( (sHealth + uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE) >= 1) |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2243 || pPlayerBuffs[PLAYER_BUFF_PRESERVATION].uExpireTime > 0 ) |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2244 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2245 SetCondUnconsciousWithBlockCheck(false); |
| 0 | 2246 } |
| 2247 else | |
| 2248 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2249 SetCondDeadWithBlockCheck(false); |
| 1036 | 2250 if ( sHealth > 0 ) |
| 2251 sHealth = 0; | |
| 2252 } | |
| 2253 if (broke_armor ) | |
| 2254 { | |
| 2255 armor_indx = pEquipment.uArmor; | |
| 2256 if ( armor_indx ) | |
| 0 | 2257 { |
| 1568 | 2258 if ( !(pOwnItems[armor_indx-1].uAttributes & ITEM_ENCHANTED)) |
| 0 | 2259 { |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2260 pOwnItems[armor_indx-1].SetBroken(); |
| 0 | 2261 } |
| 2262 } | |
| 2263 } | |
| 2264 } | |
| 1036 | 2265 if ( recieved_dmg && CanAct() ) |
| 187 | 2266 PlaySound(SPEECH_24, 0); |
| 1036 | 2267 return recieved_dmg; |
| 0 | 2268 } |
| 2269 | |
| 2270 //----- (0048DCF6) -------------------------------------------------------- | |
| 1568 | 2271 int Player::_48DCF6(int a2, Actor *pActor) //TODO check this with IDA to see what the uninitialized vars are supposed to contain |
| 0 | 2272 { |
| 2273 signed int v3; // edi@1 | |
| 2274 signed int v4; // ebx@1 | |
| 2275 Player *v5; // esi@1 | |
| 2276 int v6; // eax@2 | |
| 2277 int v7; // eax@5 | |
| 2278 int v8; // eax@8 | |
| 2279 int v9; // ebx@8 | |
| 2280 int v10; // eax@8 | |
| 2281 int v11; // ebx@8 | |
| 2282 signed int v12; // edx@9 | |
| 2283 ItemGen *v13; // eax@9 | |
| 2284 int v14; // edx@16 | |
| 2285 unsigned int v15; // edx@17 | |
| 2286 int v16; // edx@26 | |
| 2287 unsigned int v17; // edx@27 | |
| 2288 signed int v19; // edx@38 | |
| 2289 int *v20; // ecx@38 | |
| 2290 signed int v21; // eax@40 | |
| 2291 int v22; // eax@49 | |
| 2292 signed int v23; // ebx@49 | |
| 2293 unsigned int v24; // eax@60 | |
| 2294 int v25; // ecx@61 | |
| 2295 int v26; // ebx@74 | |
| 2296 void *v27; // ecx@76 | |
| 2297 unsigned int v28; // ebx@78 | |
| 2298 signed int result; // eax@86 | |
| 2299 SoundID v30; // [sp-20h] [bp-C0h]@56 | |
| 2300 signed int v31; // [sp-1Ch] [bp-BCh]@56 | |
| 2301 unsigned int v32; // [sp-18h] [bp-B8h]@56 | |
| 2302 signed int v33; // [sp-14h] [bp-B4h]@56 | |
| 2303 signed int v34; // [sp-10h] [bp-B0h]@56 | |
| 2304 int v35; // [sp-Ch] [bp-ACh]@56 | |
| 2305 unsigned int v36; // [sp-8h] [bp-A8h]@51 | |
| 2306 unsigned int v37; // [sp-8h] [bp-A8h]@56 | |
| 2307 unsigned int v38; // [sp-8h] [bp-A8h]@57 | |
| 2308 unsigned int v39; // [sp-8h] [bp-A8h]@68 | |
| 2309 enum CHARACTER_ATTRIBUTE_TYPE v40; // [sp-4h] [bp-A4h]@4 | |
| 2310 int v41; // [sp-4h] [bp-A4h]@51 | |
| 2311 int v42; // [sp-4h] [bp-A4h]@56 | |
| 2312 int v43; // [sp-4h] [bp-A4h]@57 | |
| 2313 signed int v44; // [sp-4h] [bp-A4h]@59 | |
| 2314 int v45; // [sp-4h] [bp-A4h]@68 | |
| 2315 char v46[140]; // [sp+Ch] [bp-94h]@13 | |
| 2316 unsigned int v47; // [sp+98h] [bp-8h]@1 | |
| 2317 int v48; // [sp+9Ch] [bp-4h]@1 | |
| 2318 | |
| 2319 v3 = 0; | |
| 2320 v4 = 0; | |
| 2321 v5 = this; | |
| 2322 v47 = 0; | |
| 2323 v48 = 0; | |
| 2324 switch ( a2 ) | |
| 2325 { | |
| 2326 case 1: | |
| 2327 v6 = GetActualWillpower(); | |
| 2328 goto LABEL_46; | |
| 2329 case 2: | |
| 2330 case 3: | |
| 2331 case 4: | |
| 2332 case 9: | |
| 2333 case 10: | |
| 2334 case 11: | |
| 2335 case 13: | |
| 2336 case 21: | |
| 2337 v6 = GetActualEndurance(); | |
| 2338 goto LABEL_46; | |
| 2339 case 5: | |
| 2340 case 12: | |
| 2341 case 23: | |
| 2342 v40 = (CHARACTER_ATTRIBUTE_TYPE)14; | |
| 2343 goto LABEL_5; | |
| 2344 case 15: | |
| 2345 v40 = (CHARACTER_ATTRIBUTE_TYPE)13; | |
| 2346 goto LABEL_5; | |
| 2347 case 6: | |
| 2348 case 7: | |
| 2349 case 8: | |
| 2350 case 14: | |
| 2351 case 16: | |
| 2352 v40 = (CHARACTER_ATTRIBUTE_TYPE)15; | |
| 2353 LABEL_5: | |
| 2354 v7 = GetActualResistance(v40); | |
| 2355 goto LABEL_47; | |
| 2356 case 22: | |
| 2357 v8 = GetActualWillpower(); | |
| 1036 | 2358 v9 = GetParameterBonus(v8); |
| 0 | 2359 v10 = GetActualIntelligence(); |
| 1036 | 2360 v11 = (GetParameterBonus(v10) + v9) >> 1; |
| 0 | 2361 break; |
| 2362 case 17: | |
| 2363 v12 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2364 v13 = this->pInventoryItemList; |
| 0 | 2365 do |
| 2366 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2367 if ( (signed int)v13->uItemID > 0 && (signed int)v13->uItemID <= 134 && !v13->IsBroken()) |
| 0 | 2368 v46[v4++] = v12; |
| 2369 ++v12; | |
| 2370 ++v13; | |
| 2371 } | |
| 2372 while ( v12 < 138 ); | |
| 2373 goto LABEL_36; | |
| 2374 case 18: | |
| 2375 v14 = 0; | |
| 2376 do | |
| 2377 { | |
| 2378 if ( HasItemEquipped((ITEM_EQUIP_TYPE)v14) ) | |
| 2379 { | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
2380 __debugbreak(); // player.cpp(2871): warning C4700: uninitialized local variable 'v15' used |
| 816 | 2381 if ( v15 == EQUIP_ARMOUR ) |
| 898 | 2382 v46[v4++] = LOBYTE(v5->pEquipment.uArmor) - 1; |
| 816 | 2383 if ( (!v15 || v15 == 1) && GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v15) == 4 ) |
| 898 | 2384 v46[v4++] = *((char *)&v5->pEquipment.uShield + 4 * v15) - 1; |
| 0 | 2385 } |
| 2386 v14 = v15 + 1; | |
| 2387 } | |
| 2388 while ( v14 < 16 ); | |
| 2389 goto LABEL_36; | |
| 2390 case 19: | |
| 2391 v16 = 0; | |
| 2392 do | |
| 2393 { | |
| 2394 if ( HasItemEquipped((ITEM_EQUIP_TYPE)v16) ) | |
| 2395 { | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
2396 __debugbreak(); // player.cpp(2886): warning C4700: uninitialized local variable 'v17' used |
| 0 | 2397 if ( v17 == 2 ) |
| 2398 v46[v4++] = LOBYTE(v5->pEquipment.uBow) - 1; | |
| 2399 if ( (!v17 || v17 == 1) | |
| 816 | 2400 && (!GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v17) || GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v17) == 1) ) |
| 898 | 2401 v46[v4++] = *((char *)&v5->pEquipment.uShield + 4 * v17) - 1; |
| 0 | 2402 } |
| 2403 v16 = v17 + 1; | |
| 2404 } | |
| 2405 while ( v16 < 16 ); | |
| 2406 LABEL_36: | |
| 2407 if ( !v4 ) | |
| 2408 goto LABEL_87; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2409 v48 = (int)&v5->pInventoryItemList[(unsigned __int8)v46[rand() % v4]]; |
| 0 | 2410 v11 = 3 * (pItemsTable->pItems[*(int *)v48].uMaterial + pItemsTable->pItems[*(int *)v48].uDamageMod); |
| 2411 break; | |
| 2412 case 20: | |
| 2413 v19 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2414 v20 = this->pInventoryMatrix; |
| 0 | 2415 do |
| 2416 { | |
| 2417 if ( *v20 > 0 ) | |
| 2418 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2419 v21 = *(int *)&v5->pInventoryItemList[*v20-1]; |
| 0 | 2420 if ( v21 > 0 ) |
| 2421 { | |
| 2422 if ( v21 <= 134 ) | |
| 2423 v46[v4++] = v19; | |
| 2424 } | |
| 2425 } | |
| 2426 ++v19; | |
| 2427 ++v20; | |
| 2428 } | |
| 2429 while ( v19 < 126 ); | |
| 2430 if ( !v4 ) | |
| 2431 goto LABEL_87; | |
| 2432 v47 = (unsigned __int8)v46[rand() % v4]; | |
| 2433 v6 = GetActualAccuracy(); | |
| 2434 LABEL_46: | |
| 1036 | 2435 v7 = GetParameterBonus(v6); |
| 0 | 2436 LABEL_47: |
| 2437 v11 = v7; | |
| 2438 break; | |
| 2439 default: | |
| 2440 v11 = 0; | |
| 2441 break; | |
| 2442 } | |
| 2443 v22 = GetActualLuck(); | |
| 1036 | 2444 v23 = GetParameterBonus(v22) + v11 + 30; |
| 0 | 2445 if ( rand() % v23 >= 30 ) |
| 2446 { | |
| 2447 LABEL_87: | |
| 2448 result = 0; | |
| 2449 } | |
| 2450 else | |
| 2451 { | |
| 2452 switch ( a2 ) | |
| 2453 { | |
| 2454 case 1: | |
| 2455 v41 = 1; | |
| 2456 v36 = 0; | |
| 2457 goto LABEL_56; | |
| 2458 case 2: | |
| 2459 v41 = 1; | |
| 2460 v36 = 1; | |
| 2461 goto LABEL_56; | |
| 2462 case 3: | |
| 2463 v41 = 1; | |
| 2464 v36 = 2; | |
| 2465 goto LABEL_56; | |
| 2466 case 23: | |
| 2467 v41 = 1; | |
| 2468 v36 = 3; | |
| 2469 goto LABEL_56; | |
| 2470 case 4: | |
| 2471 v41 = 1; | |
| 2472 v36 = 4; | |
| 2473 LABEL_56: | |
| 2474 SetCondition(v36, v41); | |
| 2475 v42 = 0; | |
| 2476 v37 = 0; | |
| 2477 v35 = 0; | |
| 2478 v34 = 0; | |
| 2479 v33 = -1; | |
| 2480 v32 = 0; | |
| 2481 v31 = 0; | |
| 2482 v30 = (SoundID)221; | |
| 2483 goto LABEL_83; | |
| 2484 case 5: | |
| 2485 v43 = 1; | |
| 2486 v38 = 5; | |
| 2487 goto LABEL_70; | |
| 2488 case 6: | |
| 2489 case 7: | |
| 2490 case 8: | |
| 2491 if ( a2 == 6 ) | |
| 2492 { | |
| 2493 v44 = 6; | |
| 2494 goto LABEL_60; | |
| 2495 } | |
| 2496 v25 = 2 * (a2 != 8) + 8; | |
| 2497 goto LABEL_65; | |
| 2498 case 9: | |
| 2499 if ( a2 == 6 ) | |
| 2500 { | |
| 2501 v44 = 7; | |
| 2502 LABEL_60: | |
| 2503 v24 = v44; | |
| 2504 } | |
| 2505 else | |
| 2506 { | |
| 2507 v25 = 2 * (a2 != 8) + 9; | |
| 2508 LABEL_65: | |
| 2509 v24 = v25; | |
| 2510 } | |
| 2511 SetCondition(v24, 1); | |
| 2512 v42 = 0; | |
| 2513 v37 = 0; | |
| 2514 v35 = 0; | |
| 2515 v34 = 0; | |
| 2516 v33 = -1; | |
| 2517 v32 = 0; | |
| 2518 v31 = 0; | |
| 2519 v30 = (SoundID)222; | |
| 2520 LABEL_83: | |
| 2521 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42); | |
| 2522 do | |
| 2523 { | |
| 2524 LABEL_84: | |
| 2525 if ( v5 == pPlayers[v3 + 1] ) | |
| 2526 break; | |
| 2527 ++v3; | |
| 2528 } | |
| 2529 while ( v3 < 4 ); | |
| 2530 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2531 result = 1; | |
| 2532 break; | |
| 2533 case 12: | |
| 2534 v43 = 1; | |
| 2535 v38 = 12; | |
| 2536 goto LABEL_70; | |
| 2537 case 15: | |
| 2538 v45 = 1; | |
| 2539 v39 = 15; | |
| 2540 goto LABEL_73; | |
| 2541 case 13: | |
| 2542 v43 = 1; | |
| 2543 v38 = 13; | |
| 2544 LABEL_70: | |
| 2545 SetCondition(v38, v43); | |
| 2546 v42 = 0; | |
| 2547 v37 = 0; | |
| 2548 v35 = 0; | |
| 2549 v34 = 0; | |
| 2550 v33 = -1; | |
| 2551 v32 = 0; | |
| 2552 v31 = 0; | |
| 2553 v30 = (SoundID)224; | |
| 2554 goto LABEL_83; | |
| 2555 case 14: | |
| 2556 v45 = 1; | |
| 2557 v39 = 14; | |
| 2558 goto LABEL_73; | |
| 2559 case 16: | |
| 2560 v45 = 1; | |
| 2561 v39 = 16; | |
| 2562 LABEL_73: | |
| 2563 SetCondition(v39, v45); | |
| 2564 v42 = 0; | |
| 2565 v37 = 0; | |
| 2566 v35 = 0; | |
| 2567 v34 = 0; | |
| 2568 v33 = -1; | |
| 2569 v32 = 0; | |
| 2570 v31 = 0; | |
| 2571 v30 = (SoundID)225; | |
| 2572 goto LABEL_83; | |
| 2573 case 17: | |
| 2574 case 18: | |
| 2575 case 19: | |
| 2576 v26 = v48; | |
| 2577 if ( *(char *)(v48 + 21) & 2 ) | |
| 2578 goto LABEL_84; | |
| 187 | 2579 PlaySound(SPEECH_40, 0); |
| 0 | 2580 *(int *)(v26 + 20) |= 2u; |
| 2581 goto LABEL_79; | |
| 2582 case 20: | |
| 187 | 2583 PlaySound(SPEECH_40, 0); |
| 0 | 2584 v27 = pActor->array_000234; |
| 2585 if ( pActor->array_000234[0].uItemID ) | |
| 2586 { | |
| 2587 v27 = &pActor->array_000234[1]; | |
| 2588 if ( pActor->array_000234[1].uItemID ) | |
| 2589 goto LABEL_84; | |
| 2590 } | |
| 2591 v28 = v47; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2592 memcpy(v27, &v5->pInventoryItemList[v5->pInventoryMatrix[v47]-1], 0x24u); |
| 0 | 2593 RemoveItemAtInventoryIndex(v28); |
| 2594 LABEL_79: | |
| 2595 v42 = 0; | |
| 2596 v37 = 0; | |
| 2597 v35 = 0; | |
| 2598 v34 = 0; | |
| 2599 v33 = -1; | |
| 2600 v32 = 0; | |
| 2601 v31 = 0; | |
| 2602 v30 = (SoundID)47; | |
| 2603 goto LABEL_83; | |
| 2604 case 21: | |
| 187 | 2605 PlaySound(SPEECH_42, 0); |
| 0 | 2606 ++v5->sAgeModifier; |
| 2607 goto LABEL_82; | |
| 2608 case 22: | |
| 187 | 2609 PlaySound(SPEECH_41, 0); |
| 0 | 2610 v5->sMana = 0; |
| 2611 LABEL_82: | |
| 2612 v42 = 0; | |
| 2613 v37 = 0; | |
| 2614 v35 = 0; | |
| 2615 v34 = 0; | |
| 2616 v33 = -1; | |
| 2617 v32 = 0; | |
| 2618 v31 = 0; | |
| 2619 v30 = (SoundID)226; | |
| 2620 goto LABEL_83; | |
| 2621 default: | |
| 2622 goto LABEL_87; | |
| 2623 } | |
| 2624 } | |
| 2625 return result; | |
| 2626 } | |
| 324 | 2627 |
| 0 | 2628 // 48DCF6: using guessed type char var_94[140]; |
| 2629 | |
| 2630 //----- (0048E1A3) -------------------------------------------------------- | |
| 2631 unsigned int Player::GetSpellSchool(unsigned int uSpellID) | |
| 2632 { | |
| 1091 | 2633 return pSpellStats->pInfos[uSpellID].uSchool; |
| 0 | 2634 } |
| 2635 | |
| 2636 //----- (0048E1B5) -------------------------------------------------------- | |
| 816 | 2637 int Player::GetAttackRecoveryTime(bool bRangedAttack) |
| 2638 { | |
| 2639 ItemGen *weapon = nullptr; | |
| 2640 ItemDesc *weapon_desc = nullptr; | |
| 2641 uint weapon_recovery = base_recovery_times_per_weapon_type[0]; | |
| 2642 if (bRangedAttack) | |
| 0 | 2643 { |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2644 if ( HasItemEquipped(EQUIP_BOW) ) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2645 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2646 weapon = &pInventoryItemList[pEquipment.uBow - 1]; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2647 weapon_desc = &pItemsTable->pItems[weapon->uItemID]; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2648 weapon_recovery = base_recovery_times_per_weapon_type[weapon_desc->uSkillType]; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2649 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2650 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2651 else if ( IsUnarmed() == 1 && GetActualSkillLevel(PLAYER_SKILL_UNARMED) > 0) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2652 { |
| 816 | 2653 weapon_recovery = base_recovery_times_per_weapon_type[1]; |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2654 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2655 else if ( HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 816 | 2656 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2657 weapon = &pInventoryItemList[pEquipment.uMainHand - 1]; |
| 816 | 2658 weapon_desc = &pItemsTable->pItems[weapon->uItemID]; |
| 2659 if (weapon_desc->uEquipType == EQUIP_WAND) | |
| 2660 { | |
| 2661 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
| 2662 __debugbreak(); // looks like wands were two-handed weapons once, or supposed to be. should not get here now | |
| 2663 weapon_recovery = pSpellDatas[wand_spell_ids[weapon->uItemID - ITEM_WAND_FIRE]].uExpertLevelRecovery; | |
| 2664 } | |
| 0 | 2665 else |
| 816 | 2666 weapon_recovery = base_recovery_times_per_weapon_type[weapon_desc->uSkillType]; |
| 2667 } | |
| 1010 | 2668 if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD) |
| 2669 // ADD: shield check because shield recovery is added later and can be accidentally doubled | |
| 816 | 2670 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2671 auto v12 = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 2672 auto v12_desc = &pItemsTable->pItems[v12->uItemID]; |
| 2673 if (base_recovery_times_per_weapon_type[v12_desc->uSkillType] > weapon_recovery) | |
| 2674 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2675 weapon = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 2676 weapon_desc = &pItemsTable->pItems[weapon->uItemID]; |
| 2677 weapon_recovery = base_recovery_times_per_weapon_type[pItemsTable->pItems[weapon->uItemID].uSkillType]; | |
| 2678 } | |
| 2679 } | |
| 2680 | |
| 2681 uint armour_recovery = 0; | |
| 0 | 2682 if ( HasItemEquipped(EQUIP_ARMOUR) ) |
| 2683 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2684 auto armour_skill_type = pItemsTable->pItems[pInventoryItemList[pEquipment.uArmor - 1].uItemID].uSkillType; |
| 816 | 2685 uint base_armour_recovery = base_recovery_times_per_weapon_type[armour_skill_type]; |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2686 float multiplier; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2687 |
| 816 | 2688 if (armour_skill_type == PLAYER_SKILL_LEATHER) |
| 2689 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2690 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0, 0, 0); |
| 816 | 2691 } |
| 2692 else if (armour_skill_type == PLAYER_SKILL_CHAIN) | |
| 2693 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2694 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0, 0); |
| 816 | 2695 } |
| 2696 else if (armour_skill_type == PLAYER_SKILL_PLATE) | |
| 2697 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2698 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0.5f, 0); |
| 0 | 2699 } |
| 2700 else | |
| 2701 { | |
| 1545 | 2702 Error("Unknown armour type"); // what kind of armour is that? |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2703 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 1.0f, 1.0f, 1.0f); |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2704 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2705 |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2706 armour_recovery = (uint)(base_armour_recovery * multiplier); |
| 816 | 2707 } |
| 2708 | |
| 2709 uint shield_recovery = 0; | |
| 2710 if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) == EQUIP_SHIELD) | |
| 2711 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2712 auto shield = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 2713 auto skill_type = pItemsTable->pItems[shield->uItemID].uSkillType; |
| 2714 | |
| 2715 uint shield_base_recovery = base_recovery_times_per_weapon_type[skill_type]; | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2716 float multiplier = GetArmorRecoveryMultiplierFromSkillLevel(skill_type, 1.0f, 0, 0, 0); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2717 shield_recovery = (uint)(shield_base_recovery * multiplier); |
| 816 | 2718 } |
| 2719 | |
| 1036 | 2720 uint player_speed_recovery_reduction = GetParameterBonus(GetActualSpeed()), |
| 816 | 2721 sword_axe_bow_recovery_reduction = 0; |
| 2722 bool shooting_laser = false; | |
| 2723 if (weapon_desc) | |
| 2724 { | |
| 2725 if (GetActualSkillLevel((PLAYER_SKILL_TYPE)weapon_desc->uSkillType) && | |
| 2726 (weapon_desc->uSkillType == PLAYER_SKILL_SWORD || weapon_desc->uSkillType == PLAYER_SKILL_AXE || weapon_desc->uSkillType == PLAYER_SKILL_BOW) ) | |
| 2727 { | |
| 2728 if (SkillToMastery(pActiveSkills[weapon_desc->uSkillType]) >= 2 ) // Expert Sword, Axe & Bow reduce recovery | |
| 2729 sword_axe_bow_recovery_reduction = pActiveSkills[weapon_desc->uSkillType] & 0x3F; | |
| 2730 } | |
| 2731 if (weapon_desc->uSkillType == PLAYER_SKILL_BLASTER) | |
| 2732 shooting_laser = true; | |
| 2733 } | |
| 2734 | |
| 2735 uint armsmaster_recovery_reduction = 0; | |
| 2736 if (!bRangedAttack && !shooting_laser) | |
| 2737 { | |
| 2738 if (uint armsmaster_level = GetActualSkillLevel(PLAYER_SKILL_ARMSMASTER)) | |
| 2739 { | |
| 2740 armsmaster_recovery_reduction = armsmaster_level & 0x3F; | |
| 2741 if (SkillToMastery(armsmaster_level) >= 4) | |
| 2742 armsmaster_recovery_reduction *= 2; | |
| 2743 } | |
| 2744 } | |
| 2745 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2746 uint hasteRecoveryReduction = 0; |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
2747 if (pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime > 0 || pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime > 0 ) |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2748 hasteRecoveryReduction = 25; |
| 816 | 2749 |
| 2750 uint weapon_enchantment_recovery_reduction = 0; | |
| 2751 if ( weapon ) | |
| 2752 { | |
| 2753 if (weapon->uSpecEnchantmentType == 59 || | |
| 2754 weapon->uSpecEnchantmentType == 41 || | |
| 2755 weapon->uSpecEnchantmentType == 500) | |
| 2756 weapon_enchantment_recovery_reduction = 20; | |
| 2757 } | |
| 2758 | |
| 2759 int recovery = weapon_recovery + | |
| 2760 armour_recovery + | |
| 2761 shield_recovery | |
| 2762 - armsmaster_recovery_reduction | |
| 2763 - weapon_enchantment_recovery_reduction | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2764 - hasteRecoveryReduction |
| 816 | 2765 - sword_axe_bow_recovery_reduction |
| 2766 - player_speed_recovery_reduction; | |
| 2767 | |
| 2768 if (recovery < 0) | |
| 2769 recovery = 0; | |
| 2770 return recovery; | |
| 0 | 2771 } |
| 2772 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2773 |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2774 //----- new -------------------------------------------------------- |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2775 float Player::GetArmorRecoveryMultiplierFromSkillLevel( unsigned char armour_skill_type, float mult1, float mult2, float mult3, float mult4 ) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2776 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2777 uint skill_mastery = SkillToMastery(pActiveSkills[armour_skill_type]); |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2778 switch (skill_mastery) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2779 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2780 case 1: return mult1; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2781 case 2: return mult2; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2782 case 3: return mult3; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2783 case 4: return mult4; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2784 } |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2785 Error("Unexpected input value: %d", armour_skill_type); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2786 return 0; |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2787 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2788 |
| 0 | 2789 //----- (0048E4F8) -------------------------------------------------------- |
| 2790 int Player::GetMaxHealth() | |
| 2791 { | |
| 2792 int v3; // esi@1 | |
| 2793 int v4; // esi@1 | |
| 2794 int v6; // esi@1 | |
| 2795 | |
| 1036 | 2796 v3 = GetParameterBonus(GetActualEndurance()); |
| 135 | 2797 v4 = pBaseHealthPerLevelByClass[classType] * (GetActualLevel() + v3); |
| 0 | 2798 v6 = uFullHealthBonus |
| 135 | 2799 + pBaseHealthByClass[classType / 4] |
| 0 | 2800 + GetSkillBonus(CHARACTER_ATTRIBUTE_HEALTH) |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2801 + GetItemsBonus(CHARACTER_ATTRIBUTE_HEALTH) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2802 return max(1, v6); |
| 0 | 2803 } |
| 2804 | |
| 2805 //----- (0048E565) -------------------------------------------------------- | |
| 2806 int Player::GetMaxMana() | |
| 2807 { | |
| 2808 int v2; // eax@2 | |
| 2809 int v3; // esi@4 | |
| 2810 int v4; // eax@5 | |
| 2811 int v5; // esi@5 | |
| 2812 int v6; // eax@5 | |
| 2813 int v7; // esi@6 | |
| 2814 int v8; // esi@6 | |
| 2815 int v9; // esi@6 | |
| 1116 | 2816 |
| 135 | 2817 switch (classType) |
| 0 | 2818 { |
| 1116 | 2819 case PLAYER_CLASS_ROGUE: |
| 2820 case PLAYER_CLASS_SPY: | |
| 2821 case PLAYER_CLASS_ASSASSIN: | |
| 2822 case PLAYER_CLASS_ARCHER: | |
| 2823 case PLAYER_CLASS_WARRIOR_MAGE: | |
| 2824 case PLAYER_CLASS_MASTER_ARCHER: | |
| 2825 case PLAYER_CLASS_SNIPER: | |
| 2826 case PLAYER_CLASS_SORCERER: | |
| 2827 case PLAYER_CLASS_WIZARD: | |
| 2828 case PLAYER_CLASS_ARCHMAGE: | |
| 2829 case PLAYER_CLASS_LICH: | |
| 0 | 2830 v2 = GetActualIntelligence(); |
| 1036 | 2831 v3 = GetParameterBonus(v2); |
| 1116 | 2832 break; |
| 2833 case PLAYER_CLASS_INITIATE: | |
| 2834 case PLAYER_CLASS_MASTER: | |
| 2835 case PLAYER_CLASS_NINJA: | |
| 2836 case PLAYER_CLASS_PALADIN: | |
| 2837 case PLAYER_CLASS_CRUSADER: | |
| 2838 case PLAYER_CLASS_HERO: | |
| 2839 case PLAYER_CLASS_VILLIAN: | |
| 2840 case PLAYER_CLASS_CLERIC: | |
| 2841 case PLAYER_CLASS_PRIEST: | |
| 2842 case PLAYER_CLASS_PRIEST_OF_SUN: | |
| 2843 case PLAYER_CLASS_PRIEST_OF_MOON: | |
| 0 | 2844 v2 = GetActualWillpower(); |
| 1036 | 2845 v3 = GetParameterBonus(v2); |
| 1116 | 2846 break; |
| 2847 case PLAYER_CLASS_HUNTER: | |
| 2848 case PLAYER_CLASS_RANGER_LORD: | |
| 2849 case PLAYER_CLASS_BOUNTY_HUNTER: | |
| 2850 case PLAYER_CLASS_DRUID: | |
| 2851 case PLAYER_CLASS_GREAT_DRUID: | |
| 2852 case PLAYER_CLASS_ARCH_DRUID: | |
| 2853 case PLAYER_CLASS_WARLOCK: | |
| 0 | 2854 v4 = GetActualWillpower(); |
| 1036 | 2855 v5 = GetParameterBonus(v4); |
| 0 | 2856 v6 = GetActualIntelligence(); |
| 1036 | 2857 v3 = GetParameterBonus(v6) + v5; |
| 0 | 2858 break; |
| 2859 default: | |
| 1116 | 2860 return 0; |
| 0 | 2861 break; |
| 2862 } | |
| 1116 | 2863 v7 = pBaseManaPerLevelByClass[classType] * (GetActualLevel() + v3); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2864 v8 = GetItemsBonus(CHARACTER_ATTRIBUTE_MANA) + v7; |
| 1116 | 2865 v9 = uFullManaBonus |
| 2866 + pBaseManaByClass[classType / 4] | |
| 2867 + GetSkillBonus(CHARACTER_ATTRIBUTE_MANA) | |
| 2868 + v8; | |
| 2869 return max(0,v9); | |
| 0 | 2870 } |
| 2871 | |
| 2872 //----- (0048E656) -------------------------------------------------------- | |
| 2873 int Player::GetBaseAC() | |
| 2874 { | |
| 2875 int v2; // eax@1 | |
| 2876 int v3; // esi@1 | |
| 2877 int v4; // esi@1 | |
| 2878 int v5; // esi@1 | |
| 2879 | |
| 2880 v2 = GetActualSpeed(); | |
| 1036 | 2881 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2882 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2883 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2884 return max(0, v5); |
| 0 | 2885 } |
| 2886 | |
| 2887 //----- (0048E68F) -------------------------------------------------------- | |
| 2888 int Player::GetActualAC() | |
| 2889 { | |
| 2890 int v2; // eax@1 | |
| 2891 int v3; // esi@1 | |
| 2892 int v4; // esi@1 | |
| 2893 int v5; // esi@1 | |
| 2894 int v6; // esi@1 | |
| 2895 | |
| 2896 v2 = GetActualSpeed(); | |
| 1036 | 2897 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2898 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2899 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2900 v6 = this->sACModifier + GetMagicalBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v5; |
|
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2901 return max(0, v6); |
| 0 | 2902 } |
| 2903 | |
| 2904 //----- (0048E6DC) -------------------------------------------------------- | |
| 2905 unsigned int Player::GetBaseAge() | |
| 2906 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2907 return (unsigned int)(((__int64)(pParty->uTimePlayed * 0.234375) / 60 / 60 / 24) / 7 / 4 / 12 - uBirthYear + game_starting_year); |
| 0 | 2908 } |
| 2909 | |
| 2910 //----- (0048E72C) -------------------------------------------------------- | |
| 2911 unsigned int Player::GetActualAge() | |
| 2912 { | |
| 2913 return this->sAgeModifier + GetBaseAge(); | |
| 2914 } | |
| 2915 | |
| 2916 //----- (0048E73F) -------------------------------------------------------- | |
| 2917 int Player::GetBaseResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2918 { | |
| 2919 int v7; // esi@20 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2920 int racialBonus = 0; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2921 __int16* resStat; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2922 |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2923 switch (a2) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2924 { |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2925 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2926 resStat = &sResFireBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2927 if (IsRaceGoblin()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2928 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2929 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2930 case CHARACTER_ATTRIBUTE_RESIST_AIR: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2931 resStat = &sResAirBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2932 if (IsRaceGoblin()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2933 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2934 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2935 case CHARACTER_ATTRIBUTE_RESIST_WATER: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2936 resStat = &sResWaterBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2937 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2938 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2939 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2940 case CHARACTER_ATTRIBUTE_RESIST_EARTH: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2941 resStat = &sResEarthBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2942 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2943 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2944 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2945 case CHARACTER_ATTRIBUTE_RESIST_MIND: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2946 resStat = &sResMindBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2947 if (IsRaceElf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2948 racialBonus = 10; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2949 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2950 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2951 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2952 resStat = &sResBodyBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2953 if (IsRaceHuman()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2954 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2955 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2956 } |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2957 v7 = GetItemsBonus(a2) + racialBonus; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2958 return v7 + *resStat; |
| 0 | 2959 } |
| 2960 | |
| 2961 //----- (0048E7D0) -------------------------------------------------------- | |
| 2962 int Player::GetActualResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2963 { | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2964 signed int v10 = 0; // [sp+14h] [bp-4h]@1 |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2965 __int16* resStat; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2966 int result; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2967 int baseRes; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2968 |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2969 int leatherArmorSkillLevel = GetActualSkillLevel(PLAYER_SKILL_LEATHER); |
| 652 | 2970 if ( CheckHiredNPCSpeciality(Enchanter) ) |
| 0 | 2971 v10 = 20; |
| 2972 if ( (a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE | |
| 2973 || a2 == CHARACTER_ATTRIBUTE_RESIST_AIR | |
| 2974 || a2 == CHARACTER_ATTRIBUTE_RESIST_WATER | |
| 2975 || a2 == CHARACTER_ATTRIBUTE_RESIST_EARTH) | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2976 && SkillToMastery(leatherArmorSkillLevel) == 4 |
| 0 | 2977 && HasItemEquipped(EQUIP_ARMOUR) |
| 2978 && GetEquippedItemSkillType(EQUIP_ARMOUR) == PLAYER_SKILL_LEATHER ) | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2979 v10 += leatherArmorSkillLevel & 0x3F; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2980 switch (a2) |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2981 { |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2982 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2983 resStat = &sResFireBonus; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2984 break; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2985 case CHARACTER_ATTRIBUTE_RESIST_AIR: |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2986 resStat = &sResAirBonus; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2987 break; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2988 case CHARACTER_ATTRIBUTE_RESIST_WATER: |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2989 resStat = &sResWaterBonus; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2990 break; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2991 case CHARACTER_ATTRIBUTE_RESIST_EARTH: |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2992 resStat = &sResEarthBonus; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2993 break; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2994 case CHARACTER_ATTRIBUTE_RESIST_MIND: |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2995 resStat = &sResMindBonus; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2996 break; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2997 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2998 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2999 resStat = &sResBodyBonus; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3000 break; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3001 } |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3002 baseRes = GetBaseResistance(a2); |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3003 result = v10 + GetMagicalBonus(a2) + baseRes + *(resStat); |
| 0 | 3004 return result; |
| 3005 } | |
| 3006 | |
| 3007 //----- (0048E8F5) -------------------------------------------------------- | |
| 816 | 3008 bool Player::Recover(int dt) |
| 3009 { | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3010 int v3; // qax@1 |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3011 |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3012 v3 = (int)(dt * GetSpecialItemBonus(17) * 0.01 + dt); |
| 816 | 3013 |
| 3014 Log::Warning(L"Recover(dt = %u/%u - %u", dt, (uint)v3, (uint)uTimeToRecovery); | |
| 3015 | |
| 3016 if (uTimeToRecovery > v3) | |
| 3017 { | |
| 3018 uTimeToRecovery -= v3; | |
| 3019 return true; | |
| 0 | 3020 } |
| 3021 else | |
| 3022 { | |
| 816 | 3023 uTimeToRecovery = 0; |
| 3024 viewparams->bRedrawGameUI = true; | |
| 3025 if (!uActiveCharacter) | |
| 0 | 3026 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 3027 return false; |
| 3028 } | |
| 0 | 3029 } |
| 3030 | |
| 3031 //----- (0048E96A) -------------------------------------------------------- | |
| 816 | 3032 void Player::SetRecoveryTime(signed int rec) |
| 3033 { | |
| 1545 | 3034 Assert(rec >= 0); |
| 816 | 3035 |
| 3036 if (rec > uTimeToRecovery) | |
| 3037 uTimeToRecovery = rec; | |
| 3038 | |
| 3039 if (pPlayers[uActiveCharacter] == this && !some_active_character) | |
| 0 | 3040 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 3041 |
| 3042 viewparams->bRedrawGameUI = true; | |
| 0 | 3043 } |
| 3044 // 50C0C4: using guessed type int some_active_character; | |
| 3045 | |
| 3046 //----- (0048E9B7) -------------------------------------------------------- | |
| 3047 void Player::RandomizeName() | |
| 3048 { | |
| 3049 if (!uExpressionTimePassed) | |
| 3050 strcpy(pName, pNPCStats->pNPCNames[rand() % pNPCStats->uNumNPCNames[uSex]][uSex]); | |
| 3051 } | |
| 3052 | |
| 3053 //----- (0048E9F4) -------------------------------------------------------- | |
| 3054 unsigned int Player::GetMajorConditionIdx() | |
| 3055 { | |
| 3056 for (uint i = 0; i < 18; ++i) | |
| 3057 if (pConditions[pConditionImportancyTable[i]] != 0) | |
| 3058 return pConditionImportancyTable[i]; | |
| 3059 | |
| 3060 return 18; | |
| 3061 } | |
| 3062 | |
| 3063 //----- (0048EA1B) -------------------------------------------------------- | |
| 1036 | 3064 int Player::GetParameterBonus( int player_parameter ) |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3065 { |
| 1036 | 3066 int i; // eax@1 |
| 3067 i = 0; | |
| 3068 while (param_to_bonus_table[i]) | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3069 { |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3070 if (player_parameter >= param_to_bonus_table[i]) |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3071 break; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3072 ++i; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3073 } |
| 1036 | 3074 return parameter_to_bonus_value[i]; |
| 0 | 3075 } |
| 3076 | |
| 3077 //----- (0048EA46) -------------------------------------------------------- | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3078 int Player::GetSpecialItemBonus( int enchantmentId ) |
| 0 | 3079 { |
| 1032 | 3080 int inv_indx; // eax@3 |
| 3081 | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3082 for (int i = EQUIP_OFF_HAND; i < EQUIP_BOOK; ++i ) |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3083 { |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3084 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3085 { |
| 1032 | 3086 inv_indx = pEquipment.pIndices[i] - 1; |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3087 if (enchantmentId == 17) |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3088 { |
| 1599 | 3089 if ((pInventoryItemList[inv_indx].uSpecEnchantmentType == 17) || (pInventoryItemList[inv_indx].uItemID == 533)) //Elven Chainmail+Increases rate of Recovery |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3090 return 50; |
| 1032 | 3091 } |
|
1598
11bb463837b1
_48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus, forgot to commit actor.cpp
Grumpy7
parents:
1597
diff
changeset
|
3092 if (enchantmentId == 24) |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3093 { |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3094 if (pInventoryItemList[inv_indx].uSpecEnchantmentType == 24) //Increased Knockback. |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3095 return 5; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3096 } |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3097 } |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
3098 } |
| 1032 | 3099 return 0; |
| 0 | 3100 } |
| 3101 | |
| 3102 //----- (0048EAAE) -------------------------------------------------------- | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3103 int Player::GetItemsBonus( enum CHARACTER_ATTRIBUTE_TYPE attr, bool getOnlyMainHandDmg /*= false*/ ) |
| 0 | 3104 { |
| 3105 int v5; // edi@1 | |
| 3106 int v9; // eax@49 | |
| 3107 int v14; // ecx@58 | |
| 3108 int v15; // eax@58 | |
| 3109 int v17; // eax@62 | |
| 3110 int v20; // eax@69 | |
| 3111 int v22; // eax@76 | |
| 3112 int v23; // edx@76 | |
| 3113 int v25; // ecx@80 | |
| 3114 int v26; // edi@80 | |
| 3115 int v31; // ebp@97 | |
| 3116 int v32; // eax@98 | |
| 3117 unsigned int v33; // eax@100 | |
| 3118 int v56; // eax@365 | |
| 3119 int v57; // ebx@368 | |
| 3120 signed int v58; // [sp-4h] [bp-20h]@10 | |
| 3121 int v61; // [sp+10h] [bp-Ch]@1 | |
| 3122 int v62; // [sp+14h] [bp-8h]@1 | |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3123 ItemGen *currEquippedItem; // [sp+20h] [bp+4h]@101 |
| 1040 | 3124 bool no_skills; |
| 0 | 3125 |
| 3126 v5 = 0; | |
| 3127 v62 = 0; | |
| 3128 v61 = 0; | |
| 1040 | 3129 |
| 3130 no_skills=false; | |
| 0 | 3131 switch (attr) |
| 1599 | 3132 { |
| 3133 case CHARACTER_ATTRIBUTE_SKILL_ALCHEMY: v58 = PLAYER_SKILL_ALCHEMY; break; | |
| 3134 case CHARACTER_ATTRIBUTE_SKILL_STEALING: v58 = PLAYER_SKILL_STEALING; break; | |
| 3135 case CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM: v58 = PLAYER_SKILL_TRAP_DISARM; break; | |
| 3136 case CHARACTER_ATTRIBUTE_SKILL_ITEM_ID: v58 = PLAYER_SKILL_ITEM_ID; break; | |
| 3137 case CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID: v58 = PLAYER_SKILL_MONSTER_ID; break; | |
| 3138 case CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER: v58 = PLAYER_SKILL_ARMSMASTER; break; | |
| 3139 case CHARACTER_ATTRIBUTE_SKILL_DODGE: v58 = PLAYER_SKILL_DODGE; break; | |
| 3140 case CHARACTER_ATTRIBUTE_SKILL_UNARMED: v58 = PLAYER_SKILL_UNARMED; break; | |
| 3141 case CHARACTER_ATTRIBUTE_SKILL_FIRE: v58 = PLAYER_SKILL_FIRE; break; | |
| 3142 case CHARACTER_ATTRIBUTE_SKILL_AIR: v58 = PLAYER_SKILL_AIR; break; | |
| 3143 case CHARACTER_ATTRIBUTE_SKILL_WATER: v58 = PLAYER_SKILL_WATER; break; | |
| 3144 case CHARACTER_ATTRIBUTE_SKILL_EARTH: v58 = PLAYER_SKILL_EARTH; break; | |
| 3145 case CHARACTER_ATTRIBUTE_SKILL_SPIRIT: v58 = PLAYER_SKILL_SPIRIT; break; | |
| 3146 case CHARACTER_ATTRIBUTE_SKILL_MIND: v58 = PLAYER_SKILL_MIND; break; | |
| 3147 case CHARACTER_ATTRIBUTE_SKILL_BODY: v58 = PLAYER_SKILL_BODY; break; | |
| 3148 case CHARACTER_ATTRIBUTE_SKILL_LIGHT: v58 = PLAYER_SKILL_LIGHT; break; | |
| 3149 case CHARACTER_ATTRIBUTE_SKILL_DARK: v58 = PLAYER_SKILL_DARK; break; | |
| 3150 case CHARACTER_ATTRIBUTE_SKILL_MEDITATION: v58 = PLAYER_SKILL_MEDITATION; break; | |
| 3151 case CHARACTER_ATTRIBUTE_SKILL_BOW: v58 = PLAYER_SKILL_BOW; break; | |
| 3152 case CHARACTER_ATTRIBUTE_SKILL_SHIELD: v58 = PLAYER_SKILL_SHIELD; break; | |
| 3153 case CHARACTER_ATTRIBUTE_SKILL_LEARNING: v58 = PLAYER_SKILL_LEARNING; break; | |
| 3154 default: | |
| 1040 | 3155 no_skills=true; |
| 1599 | 3156 } |
| 1040 | 3157 if (!no_skills) |
| 1599 | 3158 { |
| 3159 if ( !this->pActiveSkills[v58] ) | |
| 3160 return 0; | |
| 3161 } | |
| 1040 | 3162 |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3163 switch(attr) //TODO would be nice to move these into separate functions |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3164 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3165 case CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3166 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: |
| 0 | 3167 if ( HasItemEquipped(EQUIP_BOW) ) |
| 1599 | 3168 v5 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uBow-1].uItemID].uDamageMod; |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3169 return v5; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3170 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3171 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3172 case CHARACTER_ATTRIBUTE_RANGED_DMG_MIN: |
| 0 | 3173 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3174 return 0; |
| 1599 | 3175 v57 = this->pOwnItems[this->pEquipment.uBow-1].uItemID; |
| 0 | 3176 v5 = pItemsTable->pItems[v57].uDamageMod; |
| 3177 v56 = pItemsTable->pItems[v57].uDamageDice; | |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3178 return v5 + v56; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3179 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3180 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3181 case CHARACTER_ATTRIBUTE_RANGED_DMG_MAX: |
| 0 | 3182 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3183 return 0; |
| 1599 | 3184 v20 = this->pOwnItems[this->pEquipment.uBow-1].uItemID; |
| 0 | 3185 v5 = pItemsTable->pItems[v20].uDamageDice * pItemsTable->pItems[v20].uDamageRoll; |
| 3186 v56 = pItemsTable->pItems[v20].uDamageMod; | |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3187 return v5 + v56; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3188 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3189 case CHARACTER_ATTRIBUTE_LEVEL: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3190 if ( !Player::HasEnchantedItemEquipped(25) ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3191 return 0; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3192 return 5; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3193 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3194 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3195 case CHARACTER_ATTRIBUTE_MELEE_DMG_MAX: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3196 if ( IsUnarmed() ) |
| 0 | 3197 { |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3198 return 3; |
| 0 | 3199 } |
| 3200 else | |
| 3201 { | |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3202 if ( this->HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 0 | 3203 { |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3204 v22 = this->GetEquippedItemEquipType(EQUIP_MAIN_HAND); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3205 if ( v22 >= 0 && v22 <= 2) |
| 0 | 3206 { |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3207 v23 = this->pOwnItems[this->pEquipment.uMainHand].uItemID; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3208 v26 = pItemsTable->pItems[v23].uDamageRoll; |
| 1599 | 3209 if ( this->pEquipment.uShield || pItemsTable->pItems[v23].uSkillType != 4 ) |
| 0 | 3210 { |
| 3211 v25 = pItemsTable->pItems[v23].uDamageDice; | |
| 3212 } | |
| 3213 else | |
| 3214 { | |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3215 v25 = pItemsTable->pItems[v23].uDamageDice + 1; |
| 0 | 3216 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3217 v5 = pItemsTable->pItems[v23].uDamageMod + v25 * v26; |
| 0 | 3218 } |
| 3219 } | |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3220 if ( getOnlyMainHandDmg || !this->HasItemEquipped(EQUIP_OFF_HAND) || (GetEquippedItemEquipType(EQUIP_OFF_HAND) < 0 && GetEquippedItemEquipType(EQUIP_OFF_HAND) > 2)) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3221 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3222 return v5; |
| 1040 | 3223 } |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3224 else |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3225 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3226 v23 = this->pOwnItems[this->pEquipment.uShield].uItemID; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3227 v15 = pItemsTable->pItems[v23].uDamageMod; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3228 v14 = pItemsTable->pItems[v23].uDamageDice * pItemsTable->pItems[v23].uDamageRoll; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3229 return v5 + v15 + v14; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3230 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3231 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3232 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3233 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3234 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3235 case CHARACTER_ATTRIBUTE_ATTACK: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3236 if ( IsUnarmed() ) |
| 1040 | 3237 { |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3238 return 0; |
| 1040 | 3239 } |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3240 if ( this->HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 0 | 3241 { |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3242 v17 = this->GetEquippedItemEquipType(EQUIP_MAIN_HAND); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3243 if ( v17 >= 0 && v17 <= 2) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3244 { |
| 1599 | 3245 v5 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand-1].uItemID].uDamageMod; |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3246 } |
| 0 | 3247 } |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3248 if ( getOnlyMainHandDmg || !this->HasItemEquipped(EQUIP_OFF_HAND) || (this->GetEquippedItemEquipType(EQUIP_OFF_HAND) < 0) || this->GetEquippedItemEquipType(EQUIP_OFF_HAND) > 2 ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3249 return v5; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3250 else |
| 0 | 3251 { |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3252 v20 = this->pOwnItems[this->pEquipment.uShield - 1].uItemID; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3253 v56 = pItemsTable->pItems[v20].uDamageMod; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3254 return v5 + v56; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3255 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3256 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3257 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3258 case CHARACTER_ATTRIBUTE_MELEE_DMG_MIN: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3259 if ( IsUnarmed() ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3260 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3261 return 1; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3262 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3263 if ( this->HasItemEquipped(EQUIP_MAIN_HAND) ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3264 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3265 v9 = this->GetEquippedItemEquipType(EQUIP_MAIN_HAND); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3266 if ( v9 >= 0 && v9 <= 2) |
| 0 | 3267 { |
| 1040 | 3268 v5 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand].uItemID].uDamageDice + |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3269 pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand].uItemID].uDamageMod; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3270 if ( !this->pEquipment.uShield && pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand].uItemID].uSkillType == 4) |
| 0 | 3271 { |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3272 ++v5; |
| 0 | 3273 } |
| 3274 } | |
| 3275 } | |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3276 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3277 if ( getOnlyMainHandDmg || !this->HasItemEquipped(EQUIP_OFF_HAND) || (this->GetEquippedItemEquipType(EQUIP_OFF_HAND) < 0) || this->GetEquippedItemEquipType(EQUIP_OFF_HAND) > 2 ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3278 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3279 return v5; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3280 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3281 else |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3282 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3283 v14 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uShield].uItemID].uDamageMod; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3284 v15 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uShield].uItemID].uDamageDice; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3285 return v5 + v15 + v14; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3286 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3287 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3288 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3289 case CHARACTER_ATTRIBUTE_STRENGTH: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3290 case CHARACTER_ATTRIBUTE_INTELLIGENCE: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3291 case CHARACTER_ATTRIBUTE_WILLPOWER: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3292 case CHARACTER_ATTRIBUTE_ENDURANCE: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3293 case CHARACTER_ATTRIBUTE_ACCURACY: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3294 case CHARACTER_ATTRIBUTE_SPEED: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3295 case CHARACTER_ATTRIBUTE_LUCK: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3296 case CHARACTER_ATTRIBUTE_HEALTH: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3297 case CHARACTER_ATTRIBUTE_MANA: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3298 case CHARACTER_ATTRIBUTE_AC_BONUS: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3299 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3300 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3301 case CHARACTER_ATTRIBUTE_RESIST_AIR: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3302 case CHARACTER_ATTRIBUTE_RESIST_WATER: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3303 case CHARACTER_ATTRIBUTE_RESIST_EARTH: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3304 case CHARACTER_ATTRIBUTE_RESIST_MIND: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3305 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3306 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3307 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3308 case CHARACTER_ATTRIBUTE_SKILL_ALCHEMY: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3309 case CHARACTER_ATTRIBUTE_SKILL_STEALING: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3310 case CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3311 case CHARACTER_ATTRIBUTE_SKILL_ITEM_ID: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3312 case CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3313 case CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3314 case CHARACTER_ATTRIBUTE_SKILL_DODGE: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3315 case CHARACTER_ATTRIBUTE_SKILL_UNARMED: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3316 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3317 case CHARACTER_ATTRIBUTE_SKILL_FIRE: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3318 case CHARACTER_ATTRIBUTE_SKILL_AIR: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3319 case CHARACTER_ATTRIBUTE_SKILL_WATER: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3320 case CHARACTER_ATTRIBUTE_SKILL_EARTH: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3321 case CHARACTER_ATTRIBUTE_SKILL_SPIRIT: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3322 case CHARACTER_ATTRIBUTE_SKILL_MIND: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3323 case CHARACTER_ATTRIBUTE_SKILL_BODY: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3324 case CHARACTER_ATTRIBUTE_SKILL_LIGHT: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3325 case CHARACTER_ATTRIBUTE_SKILL_DARK: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3326 case CHARACTER_ATTRIBUTE_SKILL_MEDITATION: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3327 case CHARACTER_ATTRIBUTE_SKILL_BOW: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3328 case CHARACTER_ATTRIBUTE_SKILL_SHIELD: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3329 case CHARACTER_ATTRIBUTE_SKILL_LEARNING: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3330 for (int i = 0; i < 16; i++) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3331 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3332 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 1040 | 3333 { |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3334 v31 = this->pEquipment.pIndices[i] - 1; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3335 currEquippedItem = &this->pInventoryItemList[v31]; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3336 if ( attr == CHARACTER_ATTRIBUTE_AC_BONUS ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3337 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3338 v32 = GetEquippedItemEquipType((ITEM_EQUIP_TYPE)i); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3339 if ( v32 >= 3 && v32 <= 11 ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3340 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3341 v33 = currEquippedItem->uItemID; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3342 v5 += pItemsTable->pItems[v33].uDamageDice + pItemsTable->pItems[v33].uDamageMod; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3343 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3344 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3345 if ( pItemsTable->IsMaterialNonCommon((ItemGen *)(currEquippedItem)) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3346 && !pItemsTable->IsMaterialSpecial(currEquippedItem) ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3347 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3348 currEquippedItem->GetItemBonusArtifact(this, attr, &v62); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3349 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3350 else if ( currEquippedItem->uEnchantmentType != 0 ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3351 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3352 if (currEquippedItem->IsRegularEnchanmentForAttribute(attr)) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3353 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3354 if ( attr > CHARACTER_ATTRIBUTE_RESIST_BODY && v5 < currEquippedItem->m_enchantmentStrength ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3355 v5 = currEquippedItem->m_enchantmentStrength; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3356 else |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3357 v5 += currEquippedItem->m_enchantmentStrength; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3358 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3359 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3360 else |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3361 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3362 currEquippedItem->GetItemBonusSpecialEnchantment(this, attr, &v5, &v61); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3363 } |
| 1040 | 3364 } |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3365 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3366 return v5 + v62 + v61; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3367 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3368 default: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3369 return 0; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3370 } |
| 0 | 3371 } |
| 3372 | |
| 3373 //----- (0048F73C) -------------------------------------------------------- | |
| 3374 int Player::GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 3375 { | |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3376 int v3 = 0; // eax@4 |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3377 int v4 = 0; // ecx@5 |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3378 |
| 0 | 3379 switch ( a2 ) |
| 3380 { | |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3381 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3382 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_FIRE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3383 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_FIRE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3384 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3385 case CHARACTER_ATTRIBUTE_RESIST_AIR: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3386 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_AIR].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3387 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_AIR].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3388 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3389 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3390 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_BODY].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3391 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_BODY].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3392 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3393 case CHARACTER_ATTRIBUTE_RESIST_WATER: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3394 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_WATER].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3395 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_WATER].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3396 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3397 case CHARACTER_ATTRIBUTE_RESIST_EARTH: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3398 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_EARTH].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3399 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_EARTH].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3400 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3401 case CHARACTER_ATTRIBUTE_RESIST_MIND: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3402 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_MIND].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3403 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_MIND].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3404 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3405 case CHARACTER_ATTRIBUTE_ATTACK: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3406 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3407 v3 = this->pPlayerBuffs[PLAYER_BUFF_BLESS].uPower; //only player effect spell in both VI and VII |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3408 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3409 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3410 v3 = this->pPlayerBuffs[PLAYER_BUFF_HEROISM].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3411 v4 = pParty->pPartyBuffs[PARTY_BUFF_HEROISM].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3412 break; |
| 0 | 3413 case CHARACTER_ATTRIBUTE_STRENGTH: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3414 v3 = pPlayerBuffs[PLAYER_BUFF_STRENGTH].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3415 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3416 break; |
| 0 | 3417 case CHARACTER_ATTRIBUTE_INTELLIGENCE: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3418 v3 = pPlayerBuffs[PLAYER_BUFF_INTELLIGENCE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3419 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3420 break; |
| 0 | 3421 case CHARACTER_ATTRIBUTE_WILLPOWER: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3422 v3 = pPlayerBuffs[PLAYER_BUFF_WILLPOWER].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3423 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3424 break; |
| 0 | 3425 case CHARACTER_ATTRIBUTE_ENDURANCE: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3426 v3 = pPlayerBuffs[PLAYER_BUFF_ENDURANCE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3427 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3428 break; |
| 0 | 3429 case CHARACTER_ATTRIBUTE_ACCURACY: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3430 v3 = pPlayerBuffs[PLAYER_BUFF_ACCURACY].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3431 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3432 break; |
| 0 | 3433 case CHARACTER_ATTRIBUTE_SPEED: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3434 v3 = pPlayerBuffs[PLAYER_BUFF_SPEED].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3435 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3436 break; |
| 0 | 3437 case CHARACTER_ATTRIBUTE_LUCK: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3438 v3 = pPlayerBuffs[PLAYER_BUFF_LUCK].uPower; |
| 1167 | 3439 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3440 break; |
| 0 | 3441 case CHARACTER_ATTRIBUTE_AC_BONUS: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3442 v3 = this->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uPower; |
| 1167 | 3443 v4 = pParty->pPartyBuffs[PARTY_BUFF_STONE_SKIN].uPower; |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3444 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3445 } |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3446 return v3 + v4; |
| 0 | 3447 } |
| 3448 | |
| 3449 //----- (0048F882) -------------------------------------------------------- | |
| 1008 | 3450 int Player::GetActualSkillLevel( PLAYER_SKILL_TYPE uSkillType ) |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3451 { |
| 1064 | 3452 signed int bonus_value; // esi@1 |
| 3453 unsigned __int16 skill_value; // ax@126 | |
| 3454 int result; // al@127 | |
| 353 | 3455 |
| 1064 | 3456 bonus_value = 0; |
| 353 | 3457 switch (uSkillType) |
| 3458 { | |
| 3459 case PLAYER_SKILL_MONSTER_ID: | |
| 3460 { | |
| 652 | 3461 if ( CheckHiredNPCSpeciality(Hunter) ) |
| 1064 | 3462 bonus_value = 6; |
| 652 | 3463 if ( CheckHiredNPCSpeciality(Sage) ) |
| 1064 | 3464 bonus_value += 6; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3465 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID); |
| 353 | 3466 } |
| 3467 break; | |
| 3468 | |
| 3469 case PLAYER_SKILL_ARMSMASTER: | |
| 3470 { | |
| 652 | 3471 if ( CheckHiredNPCSpeciality(Armsmaster) ) |
| 1064 | 3472 bonus_value = 2; |
| 652 | 3473 if ( CheckHiredNPCSpeciality(Weaponsmaster) ) |
| 1064 | 3474 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3475 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER); |
| 353 | 3476 } |
| 3477 break; | |
| 3478 | |
| 3479 case PLAYER_SKILL_STEALING: | |
| 3480 { | |
| 652 | 3481 if (CheckHiredNPCSpeciality(Burglar)) |
| 1064 | 3482 bonus_value = 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3483 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_STEALING); |
| 353 | 3484 } |
| 3485 break; | |
| 3486 | |
| 3487 | |
| 3488 case PLAYER_SKILL_ALCHEMY: | |
| 3489 { | |
| 652 | 3490 if ( CheckHiredNPCSpeciality(Herbalist) ) |
| 1064 | 3491 bonus_value = 4; |
| 652 | 3492 if ( CheckHiredNPCSpeciality(Apothecary) ) |
| 1064 | 3493 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3494 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ALCHEMY); |
| 353 | 3495 } |
| 3496 break; | |
| 3497 | |
| 3498 case PLAYER_SKILL_LEARNING: | |
| 3499 { | |
| 652 | 3500 if ( CheckHiredNPCSpeciality(Teacher) ) |
| 1064 | 3501 bonus_value = 10; |
| 652 | 3502 if ( CheckHiredNPCSpeciality(Instructor) ) |
| 1064 | 3503 bonus_value += 15; |
| 652 | 3504 if ( CheckHiredNPCSpeciality(Scholar) ) |
| 1064 | 3505 bonus_value += 5; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3506 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LEARNING); |
| 353 | 3507 } |
| 3508 break; | |
| 3509 | |
| 3510 case PLAYER_SKILL_UNARMED: | |
| 3511 { | |
| 652 | 3512 if (CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3513 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3514 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_UNARMED); |
| 353 | 3515 } |
| 3516 break; | |
| 3517 | |
| 3518 case PLAYER_SKILL_DODGE: | |
| 3519 { | |
| 652 | 3520 if ( CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3521 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3522 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DODGE); |
| 353 | 3523 } |
| 3524 break; | |
| 3525 | |
| 3526 case PLAYER_SKILL_BOW: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3527 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BOW); |
| 353 | 3528 break; |
| 3529 case PLAYER_SKILL_SHIELD: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3530 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SHIELD); |
| 353 | 3531 break; |
| 3532 | |
| 3533 case PLAYER_SKILL_EARTH: | |
| 652 | 3534 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3535 bonus_value = 2; |
| 652 | 3536 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3537 bonus_value += 3; |
| 652 | 3538 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3539 bonus_value += 4; |
| 353 | 3540 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3541 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3542 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_EARTH); |
| 353 | 3543 break; |
| 3544 case PLAYER_SKILL_FIRE: | |
| 652 | 3545 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3546 bonus_value = 2; |
| 652 | 3547 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3548 bonus_value += 3; |
| 652 | 3549 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3550 bonus_value += 4; |
| 353 | 3551 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3552 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3553 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_FIRE); |
| 353 | 3554 break; |
| 3555 case PLAYER_SKILL_AIR: | |
| 652 | 3556 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3557 bonus_value = 2; |
| 652 | 3558 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3559 bonus_value += 3; |
| 652 | 3560 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3561 bonus_value += 4; |
| 353 | 3562 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3563 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3564 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_AIR); |
| 353 | 3565 break; |
| 3566 case PLAYER_SKILL_WATER: | |
| 652 | 3567 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3568 bonus_value = 2; |
| 652 | 3569 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3570 bonus_value += 3; |
| 652 | 3571 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3572 bonus_value += 4; |
| 353 | 3573 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3574 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3575 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_WATER); |
| 353 | 3576 break; |
| 3577 case PLAYER_SKILL_SPIRIT: | |
| 652 | 3578 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3579 bonus_value = 2; |
| 652 | 3580 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3581 bonus_value += 3; |
| 652 | 3582 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3583 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3584 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SPIRIT); |
| 353 | 3585 break; |
| 3586 case PLAYER_SKILL_MIND: | |
| 652 | 3587 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3588 bonus_value = 2; |
| 652 | 3589 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3590 bonus_value += 3; |
| 652 | 3591 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3592 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3593 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MIND); |
| 353 | 3594 break; |
| 3595 case PLAYER_SKILL_BODY: | |
| 652 | 3596 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3597 bonus_value = 2; |
| 652 | 3598 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3599 bonus_value += 3; |
| 652 | 3600 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3601 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3602 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BODY); |
| 353 | 3603 break; |
| 3604 case PLAYER_SKILL_LIGHT: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3605 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LIGHT); |
| 353 | 3606 break; |
| 3607 case PLAYER_SKILL_DARK: | |
| 3608 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3609 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DARK); |
| 353 | 3610 } |
| 3611 break; | |
| 3612 | |
| 3613 case PLAYER_SKILL_MERCHANT: | |
| 3614 { | |
| 652 | 3615 if ( CheckHiredNPCSpeciality(Trader) ) |
| 1064 | 3616 bonus_value = 4; |
| 652 | 3617 if ( CheckHiredNPCSpeciality(Merchant) ) |
| 1064 | 3618 bonus_value += 6; |
| 652 | 3619 if ( CheckHiredNPCSpeciality(Gypsy) ) |
| 1064 | 3620 bonus_value += 3; |
| 652 | 3621 if ( CheckHiredNPCSpeciality(Duper) ) |
| 1064 | 3622 bonus_value += 8; |
| 353 | 3623 } |
| 3624 break; | |
| 3625 | |
| 3626 case PLAYER_SKILL_PERCEPTION: | |
| 3627 { | |
| 652 | 3628 if ( CheckHiredNPCSpeciality(Scout) ) |
| 1064 | 3629 bonus_value = 6; |
| 652 | 3630 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1064 | 3631 bonus_value += 5; |
| 353 | 3632 } |
| 3633 break; | |
| 3634 | |
| 0 | 3635 case PLAYER_SKILL_ITEM_ID: |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3636 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ITEM_ID); |
| 0 | 3637 break; |
| 3638 case PLAYER_SKILL_MEDITATION: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3639 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MEDITATION); |
| 353 | 3640 break; |
| 0 | 3641 case PLAYER_SKILL_TRAP_DISARM: |
| 353 | 3642 { |
| 652 | 3643 if ( CheckHiredNPCSpeciality(Tinker) ) |
| 1064 | 3644 bonus_value = 4; |
| 652 | 3645 if ( CheckHiredNPCSpeciality(Locksmith) ) |
| 1064 | 3646 bonus_value += 6; |
| 652 | 3647 if ( CheckHiredNPCSpeciality(Burglar) ) |
| 1064 | 3648 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3649 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM); |
| 353 | 3650 } |
| 3651 break; | |
| 3652 } | |
| 3653 | |
| 1064 | 3654 skill_value = pActiveSkills[uSkillType]; |
| 3655 if ( bonus_value + (skill_value & 0x3F) < 60 ) | |
| 3656 result = bonus_value + skill_value; | |
| 0 | 3657 else |
| 1064 | 3658 result = skill_value & 0xFFFC | 0x3C; //al |
| 0 | 3659 return result; |
| 3660 } | |
| 3661 | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3662 |
| 0 | 3663 //----- (0048FC00) -------------------------------------------------------- |
| 1538 | 3664 int Player::GetSkillBonus(enum CHARACTER_ATTRIBUTE_TYPE inSkill) //TODO: move the individual implementations to attribute classes once possible |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3665 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3666 int armsMasterBonus; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3667 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3668 armsMasterBonus = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3669 int armmaster_skill = GetActualSkillLevel(PLAYER_SKILL_ARMSMASTER); |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3670 if ( armmaster_skill > 0 ) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3671 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3672 int multiplier = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3673 if ( inSkill == CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS ) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3674 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3675 multiplier = GetMultiplierForSkillLevel(armmaster_skill, 0, 0, 1, 2); |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3676 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3677 else if ( inSkill == CHARACTER_ATTRIBUTE_ATTACK ) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3678 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3679 multiplier = GetMultiplierForSkillLevel(armmaster_skill, 0, 1, 1, 2); |
| 1064 | 3680 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3681 armsMasterBonus = multiplier * (armmaster_skill & 0x3F); |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3682 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3683 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3684 switch(inSkill) |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3685 { |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3686 case CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS: |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3687 if (HasItemEquipped(EQUIP_BOW)) |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3688 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3689 int bowSkillLevel = GetActualSkillLevel(PLAYER_SKILL_DODGE); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3690 int multiplier = GetMultiplierForSkillLevel(bowSkillLevel, 0, 0, 0, 1); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3691 return multiplier * (bowSkillLevel & 0x3F); |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3692 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3693 return 0; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3694 break; |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3695 case CHARACTER_ATTRIBUTE_HEALTH: |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3696 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3697 int base_value = pBaseHealthPerLevelByClass[classType]; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3698 int attrib_modif = GetBodybuilding(); |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3699 return base_value * attrib_modif; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3700 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3701 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3702 case CHARACTER_ATTRIBUTE_MANA: |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3703 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3704 int base_value = pBaseManaPerLevelByClass[classType]; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3705 int attrib_modif = GetMeditation(); |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3706 return base_value * attrib_modif; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3707 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3708 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3709 case CHARACTER_ATTRIBUTE_AC_BONUS: |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3710 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3711 bool wearingArmor = false; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3712 bool wearingLeather = false; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3713 unsigned int ACSum = 0; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3714 |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3715 for (int j = 0; j < 16; ++j) |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3716 { |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
3717 if (pEquipment.pIndices[j] && (!pOwnItems[pEquipment.pIndices[j]].IsBroken())) |
| 1538 | 3718 { |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
3719 int curr_item = pOwnItems[pEquipment.pIndices[j] - 1].uItemID; |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3720 PLAYER_SKILL_TYPE itemSkillType = (PLAYER_SKILL_TYPE)pItemsTable->pItems[curr_item].uSkillType; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3721 int currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3722 int multiplier = 0; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3723 switch (itemSkillType) |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3724 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3725 case PLAYER_SKILL_STAFF: |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3726 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 0, 1, 1, 1); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3727 break; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3728 case PLAYER_SKILL_SWORD: |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3729 case PLAYER_SKILL_SPEAR: |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3730 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 0, 0, 0, 1); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3731 break; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3732 case PLAYER_SKILL_SHIELD: |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3733 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3734 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 1, 1, 2, 2); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3735 break; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3736 case PLAYER_SKILL_LEATHER: |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3737 wearingLeather = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3738 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 1, 1, 2, 2); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3739 break; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3740 case PLAYER_SKILL_CHAIN: |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3741 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3742 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 1, 1, 1, 1); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3743 break; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3744 case PLAYER_SKILL_PLATE: |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3745 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3746 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 1, 1, 1, 1); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3747 break; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3748 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3749 ACSum += multiplier * (currArmorSkillLevel & 0x3F); |
| 1538 | 3750 } |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3751 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3752 |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3753 int dodgeSkillLevel = GetActualSkillLevel(PLAYER_SKILL_DODGE); |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3754 int dodgeMastery = SkillToMastery(dodgeSkillLevel); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3755 int multiplier = GetMultiplierForSkillLevel(dodgeSkillLevel, 1, 2, 3, 3); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3756 if ( !wearingArmor && (!wearingLeather || dodgeMastery == 4) ) |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3757 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3758 ACSum += multiplier * (dodgeSkillLevel & 0x3F); |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3759 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3760 return ACSum; |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3761 } |
| 1538 | 3762 break; |
| 3763 case CHARACTER_ATTRIBUTE_ATTACK: | |
| 3764 if ( this->IsUnarmed() ) | |
| 3765 { | |
| 3766 int unarmedSkill = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3767 if (!unarmedSkill) | |
| 3768 { | |
| 3769 return 0; | |
| 3770 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3771 int multiplier = GetMultiplierForSkillLevel(unarmedSkill, 0, 1, 2, 2); |
| 1538 | 3772 return armsMasterBonus + multiplier * (unarmedSkill & 0x3F); |
| 3773 } | |
| 3774 for (int i = 0; i < 16; ++i) | |
| 3775 { | |
| 3776 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3777 { | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
3778 ItemDesc currItem = pItemsTable->pItems[this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID]; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
3779 if ( currItem.uEquipType <= EQUIP_MAIN_HAND) |
| 1533 | 3780 { |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
3781 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItem.uSkillType; |
| 1538 | 3782 int currentItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 3783 if (currItemSkillType == PLAYER_SKILL_BLASTER) | |
| 3784 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3785 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); |
| 1538 | 3786 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3787 } | |
| 3788 else if (currItemSkillType == PLAYER_SKILL_STAFF && this->GetActualSkillLevel(PLAYER_SKILL_UNARMED) > 0) | |
| 3789 { | |
| 3790 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3791 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 2, 2); |
| 1538 | 3792 return multiplier * (unarmedSkillLevel & 0x3F) + armsMasterBonus + (currentItemSkillLevel & 0x3F); |
| 3793 } | |
| 3794 else | |
| 3795 { | |
| 3796 return armsMasterBonus + (currentItemSkillLevel & 0x3F); | |
| 3797 } | |
| 3798 } | |
| 3799 } | |
| 3800 } | |
| 3801 return 0; | |
| 3802 break; | |
| 3803 | |
| 3804 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: | |
| 3805 for (int i = 0; i < 16; i++) | |
| 3806 { | |
| 3807 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3808 { | |
| 3809 PLAYER_SKILL_TYPE currentItemSkillType = (PLAYER_SKILL_TYPE)pItemsTable->pItems[this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID].uSkillType; | |
| 3810 int currentItemSkillLevel = this->GetActualSkillLevel(currentItemSkillType); | |
| 3811 if ( currentItemSkillType == PLAYER_SKILL_BOW ) | |
| 3812 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3813 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 1, 1); |
| 1538 | 3814 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3815 } | |
| 3816 else if ( currentItemSkillType == PLAYER_SKILL_BLASTER ) | |
| 3817 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3818 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); |
| 1538 | 3819 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3820 } | |
| 3821 } | |
| 3822 } | |
| 3823 return 0; | |
| 3824 break; | |
| 3825 | |
| 3826 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: | |
| 3827 if ( this->IsUnarmed() ) | |
| 3828 { | |
| 3829 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3830 if ( !unarmedSkillLevel ) | |
| 3831 { | |
| 3832 return 0; | |
| 3833 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3834 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 3835 return multiplier * (unarmedSkillLevel & 0x3F); |
| 3836 } | |
| 3837 for (int i = 0; i < 16; i++) | |
| 3838 { | |
| 3839 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3840 { | |
| 3841 int currItemId = this->pInventoryItemList[this->pEquipment.pIndices[i]].uItemID; | |
| 3842 if ( pItemsTable->pItems[currItemId].uEquipType == EQUIP_MAIN_HAND || pItemsTable->pItems[currItemId].uEquipType == EQUIP_OFF_HAND ) | |
| 3843 { | |
| 3844 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)pItemsTable->pItems[currItemId].uSkillType; | |
| 3845 int currItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); | |
| 3846 int baseSkillBonus; | |
| 3847 int multiplier; | |
| 3848 switch (currItemSkillType) | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3849 { |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3850 case PLAYER_SKILL_STAFF: |
| 1538 | 3851 if ( SkillToMastery(currItemSkillLevel) >= 4 && this->GetActualSkillLevel(PLAYER_SKILL_UNARMED) > 0) |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3852 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3853 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3854 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 3855 return multiplier * (unarmedSkillLevel & 0x3F); |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3856 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3857 else |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3858 { |
| 1538 | 3859 return armsMasterBonus; |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3860 } |
| 1538 | 3861 break; |
| 3862 | |
| 3863 case PLAYER_SKILL_DAGGER: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3864 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 1); |
| 1538 | 3865 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3866 return armsMasterBonus + baseSkillBonus; | |
| 3867 break; | |
| 3868 case PLAYER_SKILL_SWORD: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3869 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 0); |
| 1538 | 3870 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3871 return armsMasterBonus + baseSkillBonus; | |
| 3872 break; | |
| 3873 case PLAYER_SKILL_MACE: | |
| 3874 case PLAYER_SKILL_SPEAR: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3875 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 1, 1, 1); |
| 1538 | 3876 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3877 return armsMasterBonus + baseSkillBonus; | |
| 3878 break; | |
| 3879 case PLAYER_SKILL_AXE: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3880 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 1, 1); |
| 1538 | 3881 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3882 return armsMasterBonus + baseSkillBonus; | |
| 3883 break; | |
| 1535 | 3884 } |
| 1533 | 3885 } |
| 1535 | 3886 } |
| 1538 | 3887 } |
| 3888 return 0; | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3889 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3890 default: |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3891 return 0; |
| 1533 | 3892 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3893 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3894 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3895 unsigned int Player::GetMultiplierForSkillLevel(unsigned int skillValue, int mult1, int mult2, int mult3, int mult4) |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3896 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3897 int masteryLvl = SkillToMastery(skillValue); |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3898 switch (masteryLvl) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3899 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3900 case 1: return mult1; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3901 case 2: return mult2; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3902 case 3: return mult3; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3903 case 4: return mult4; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3904 } |
| 1545 | 3905 Error("(%u)", masteryLvl); |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3906 return 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3907 } |
| 0 | 3908 //----- (00490109) -------------------------------------------------------- |
| 3909 // faces are: 0 1 2 3 human males | |
| 3910 // 4 5 6 7 human females | |
| 3911 // 8 9 elf males | |
| 3912 // 10 11 elf females | |
| 3913 // 12 13 dwarf males | |
| 3914 // 14 15 dwarf females | |
| 3915 // 16 17 goblin males | |
| 3916 // 18 19 goblin females | |
| 3917 // 20 lich male | |
| 3918 // 21 lich female | |
| 3919 // 22 underwater suits (unused) | |
| 3920 // 23 zombie male | |
| 3921 // 24 zombie female | |
| 3922 enum CHARACTER_RACE Player::GetRace() | |
| 3923 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3924 if ( uCurrentFace <= 7 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3925 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3926 return CHARACTER_RACE_HUMAN; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3927 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3928 else if ( uCurrentFace <= 11 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3929 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3930 return CHARACTER_RACE_ELF; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3931 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3932 else if ( uCurrentFace <= 15 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3933 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3934 return CHARACTER_RACE_DWARF; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3935 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3936 else if ( uCurrentFace <= 19 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3937 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3938 return CHARACTER_RACE_GOBLIN; |
| 0 | 3939 } |
| 3940 else | |
| 3941 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3942 return CHARACTER_RACE_HUMAN; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3943 } |
| 0 | 3944 } |
| 3945 | |
| 3946 //----- (00490141) -------------------------------------------------------- | |
| 187 | 3947 PLAYER_SEX Player::GetSexByVoice() |
| 0 | 3948 { |
| 3949 switch ( this->uVoiceID ) | |
| 3950 { | |
| 3951 case 0u: | |
| 3952 case 1u: | |
| 3953 case 2u: | |
| 3954 case 3u: | |
| 3955 case 8u: | |
| 3956 case 9u: | |
| 3957 case 0xCu: | |
| 3958 case 0xDu: | |
| 3959 case 0x10u: | |
| 3960 case 0x11u: | |
| 3961 case 0x14u: | |
| 3962 case 0x17u: | |
| 187 | 3963 return SEX_MALE; |
| 3964 | |
| 0 | 3965 case 4u: |
| 3966 case 5u: | |
| 3967 case 6u: | |
| 3968 case 7u: | |
| 3969 case 0xAu: | |
| 3970 case 0xBu: | |
| 3971 case 0xEu: | |
| 3972 case 0xFu: | |
| 3973 case 0x12u: | |
| 3974 case 0x13u: | |
| 3975 case 0x15u: | |
| 3976 case 0x18u: | |
| 187 | 3977 return SEX_FEMALE; |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3978 } |
| 1545 | 3979 Error("(%u)", this->uVoiceID); |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3980 return SEX_MALE; |
| 0 | 3981 } |
| 3982 | |
| 3983 //----- (00490188) -------------------------------------------------------- | |
| 3984 void Player::SetInitialStats() | |
| 3985 { | |
| 3986 auto v1 = GetRace(); | |
| 290 | 3987 uMight = StatTable[v1][0].uBaseValue; |
| 3988 uIntelligence = StatTable[v1][1].uBaseValue; | |
| 3989 uWillpower = StatTable[v1][2].uBaseValue; | |
| 3990 uEndurance = StatTable[v1][3].uBaseValue; | |
| 3991 uAccuracy = StatTable[v1][4].uBaseValue; | |
| 3992 uSpeed = StatTable[v1][5].uBaseValue; | |
| 3993 uLuck = StatTable[v1][6].uBaseValue; | |
| 0 | 3994 } |
| 3995 | |
| 3996 //----- (004901FC) -------------------------------------------------------- | |
| 1021 | 3997 void Player::SetSexByVoice() |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3998 { |
| 1021 | 3999 switch ( this->uVoiceID) |
| 0 | 4000 { |
| 4001 case 0: | |
| 4002 case 1: | |
| 4003 case 2: | |
| 4004 case 3: | |
| 4005 case 8: | |
| 4006 case 9: | |
| 4007 case 0xC: | |
| 4008 case 0xD: | |
| 4009 case 0x10: | |
| 4010 case 0x11: | |
| 4011 case 0x14: | |
| 4012 case 0x17: | |
| 1021 | 4013 this->uSex = SEX_MALE; |
| 0 | 4014 break; |
| 4015 case 4: | |
| 4016 case 5: | |
| 4017 case 6: | |
| 4018 case 7: | |
| 4019 case 0xA: | |
| 4020 case 0xB: | |
| 4021 case 0xE: | |
| 4022 case 0xF: | |
| 4023 case 0x12: | |
| 4024 case 0x13: | |
| 4025 case 0x15: | |
| 4026 case 0x18: | |
| 1021 | 4027 this->uSex = SEX_FEMALE; |
| 0 | 4028 break; |
| 4029 default: | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4030 Error("(%u)", this->uVoiceID); |
| 0 | 4031 break; |
| 4032 } | |
| 1021 | 4033 |
| 0 | 4034 } |
| 4035 | |
| 4036 //----- (0049024A) -------------------------------------------------------- | |
| 135 | 4037 void Player::Reset(PLAYER_CLASS_TYPE cls) |
| 0 | 4038 { |
| 4039 sLevelModifier = 0; | |
| 4040 sAgeModifier = 0; | |
| 4041 | |
| 135 | 4042 classType = cls; |
| 0 | 4043 uLuckBonus = 0; |
| 4044 uSpeedBonus = 0; | |
| 4045 uAccuracyBonus = 0; | |
| 4046 uEnduranceBonus = 0; | |
| 4047 uWillpowerBonus = 0; | |
| 4048 uIntelligenceBonus = 0; | |
| 4049 uMightBonus = 0; | |
| 4050 uLevel = 1; | |
| 4051 uExperience = 251 + rand() % 100; | |
| 4052 uBirthYear = 1147 - rand() % 6; | |
| 4053 memset(pActiveSkills, 0, sizeof(pActiveSkills)); | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
4054 memset(_achieved_awards_bits, 0, 64); |
| 0 | 4055 memset(&spellbook, 0, sizeof(PlayerSpells)); |
| 4056 | |
| 4057 for (uint i = 0; i < 37; ++i) | |
| 4058 { | |
| 135 | 4059 if (pSkillAvailabilityPerClass[classType / 4][i] != 2) |
| 0 | 4060 continue; |
| 4061 | |
| 4062 pActiveSkills[i] = 1; | |
| 4063 | |
| 4064 switch (i) | |
| 4065 { | |
| 886 | 4066 case PLAYER_SKILL_FIRE: |
| 4067 spellbook.pFireSpellbook.bIsSpellAvailable[0] = true;//its temporary, for test spells | |
| 894 | 4068 |
| 4069 extern bool all_magic; | |
| 4070 if ( all_magic == true ) | |
| 4071 { | |
| 4072 pActiveSkills[PLAYER_SKILL_AIR] = 1; | |
| 4073 pActiveSkills[PLAYER_SKILL_WATER] = 1; | |
| 4074 pActiveSkills[PLAYER_SKILL_EARTH] = 1; | |
| 4075 spellbook.pFireSpellbook.bIsSpellAvailable[1] = true; | |
| 4076 spellbook.pFireSpellbook.bIsSpellAvailable[2] = true; | |
| 4077 spellbook.pFireSpellbook.bIsSpellAvailable[3] = true; | |
| 4078 spellbook.pFireSpellbook.bIsSpellAvailable[4] = true; | |
| 4079 spellbook.pFireSpellbook.bIsSpellAvailable[5] = true; | |
| 4080 spellbook.pFireSpellbook.bIsSpellAvailable[6] = true; | |
| 4081 spellbook.pFireSpellbook.bIsSpellAvailable[7] = true; | |
| 4082 spellbook.pFireSpellbook.bIsSpellAvailable[8] = true; | |
| 4083 spellbook.pFireSpellbook.bIsSpellAvailable[9] = true; | |
| 4084 spellbook.pFireSpellbook.bIsSpellAvailable[10] = true; | |
| 886 | 4085 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; |
| 569 | 4086 spellbook.pAirSpellbook.bIsSpellAvailable[1] = true; |
| 4087 spellbook.pAirSpellbook.bIsSpellAvailable[2] = true; | |
| 4088 spellbook.pAirSpellbook.bIsSpellAvailable[3] = true; | |
| 4089 spellbook.pAirSpellbook.bIsSpellAvailable[4] = true; | |
| 4090 spellbook.pAirSpellbook.bIsSpellAvailable[5] = true; | |
| 4091 spellbook.pAirSpellbook.bIsSpellAvailable[6] = true; | |
| 4092 spellbook.pAirSpellbook.bIsSpellAvailable[7] = true; | |
| 4093 spellbook.pAirSpellbook.bIsSpellAvailable[8] = true; | |
| 4094 spellbook.pAirSpellbook.bIsSpellAvailable[9] = true; | |
| 4095 spellbook.pAirSpellbook.bIsSpellAvailable[10] = true; | |
| 4096 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 4097 spellbook.pWaterSpellbook.bIsSpellAvailable[1] = true; | |
| 4098 spellbook.pWaterSpellbook.bIsSpellAvailable[2] = true; | |
| 4099 spellbook.pWaterSpellbook.bIsSpellAvailable[3] = true; | |
| 4100 spellbook.pWaterSpellbook.bIsSpellAvailable[4] = true; | |
| 4101 spellbook.pWaterSpellbook.bIsSpellAvailable[5] = true; | |
| 710 | 4102 spellbook.pWaterSpellbook.bIsSpellAvailable[6] = true; |
| 4103 spellbook.pWaterSpellbook.bIsSpellAvailable[7] = true; | |
| 4104 spellbook.pWaterSpellbook.bIsSpellAvailable[8] = true; | |
| 886 | 4105 spellbook.pWaterSpellbook.bIsSpellAvailable[9] = true; |
| 4106 spellbook.pWaterSpellbook.bIsSpellAvailable[10] = true; | |
| 894 | 4107 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; |
| 4108 spellbook.pEarthSpellbook.bIsSpellAvailable[1] = true; | |
| 4109 spellbook.pEarthSpellbook.bIsSpellAvailable[2] = true; | |
| 4110 spellbook.pEarthSpellbook.bIsSpellAvailable[3] = true; | |
| 4111 spellbook.pEarthSpellbook.bIsSpellAvailable[4] = true; | |
| 4112 spellbook.pEarthSpellbook.bIsSpellAvailable[5] = true; | |
| 4113 spellbook.pEarthSpellbook.bIsSpellAvailable[6] = true; | |
| 4114 spellbook.pEarthSpellbook.bIsSpellAvailable[7] = true; | |
| 4115 spellbook.pEarthSpellbook.bIsSpellAvailable[8] = true; | |
| 4116 spellbook.pEarthSpellbook.bIsSpellAvailable[9] = true; | |
| 4117 spellbook.pEarthSpellbook.bIsSpellAvailable[10] = true; | |
| 4118 } | |
| 486 | 4119 break; |
| 886 | 4120 case PLAYER_SKILL_AIR: |
| 4121 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; | |
| 4122 break; | |
| 4123 case PLAYER_SKILL_WATER: | |
| 4124 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 4125 break; | |
| 4126 case PLAYER_SKILL_EARTH: | |
| 4127 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; | |
| 4128 break; | |
| 4129 case PLAYER_SKILL_SPIRIT: | |
| 4130 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; | |
| 4131 break; | |
| 4132 case PLAYER_SKILL_MIND: | |
| 4133 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; | |
| 4134 break; | |
| 4135 case PLAYER_SKILL_BODY: | |
| 4136 spellbook.pBodySpellbook.bIsSpellAvailable[0] = true; | |
| 894 | 4137 |
| 4138 if ( all_magic == true ) | |
| 4139 { | |
| 4140 pActiveSkills[PLAYER_SKILL_MIND] = 1; | |
| 4141 pActiveSkills[PLAYER_SKILL_SPIRIT] = 1; | |
| 4142 spellbook.pBodySpellbook.bIsSpellAvailable[1] = true; | |
| 4143 spellbook.pBodySpellbook.bIsSpellAvailable[2] = true; | |
| 4144 spellbook.pBodySpellbook.bIsSpellAvailable[3] = true; | |
| 4145 spellbook.pBodySpellbook.bIsSpellAvailable[4] = true; | |
| 4146 spellbook.pBodySpellbook.bIsSpellAvailable[5] = true; | |
| 4147 spellbook.pBodySpellbook.bIsSpellAvailable[6] = true; | |
| 4148 spellbook.pBodySpellbook.bIsSpellAvailable[7] = true; | |
| 4149 spellbook.pBodySpellbook.bIsSpellAvailable[8] = true; | |
| 4150 spellbook.pBodySpellbook.bIsSpellAvailable[9] = true; | |
| 4151 spellbook.pBodySpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 4152 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 4153 spellbook.pMindSpellbook.bIsSpellAvailable[1] = true; |
| 4154 spellbook.pMindSpellbook.bIsSpellAvailable[2] = true; | |
| 4155 spellbook.pMindSpellbook.bIsSpellAvailable[3] = true; | |
| 4156 spellbook.pMindSpellbook.bIsSpellAvailable[4] = true; | |
| 4157 spellbook.pMindSpellbook.bIsSpellAvailable[5] = true; | |
| 4158 spellbook.pMindSpellbook.bIsSpellAvailable[6] = true; | |
| 4159 spellbook.pMindSpellbook.bIsSpellAvailable[7] = true; | |
| 4160 spellbook.pMindSpellbook.bIsSpellAvailable[8] = true; | |
| 4161 spellbook.pMindSpellbook.bIsSpellAvailable[9] = true; | |
| 4162 spellbook.pMindSpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 4163 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 4164 spellbook.pSpiritSpellbook.bIsSpellAvailable[1] = true; |
| 4165 spellbook.pSpiritSpellbook.bIsSpellAvailable[2] = true; | |
| 4166 spellbook.pSpiritSpellbook.bIsSpellAvailable[3] = true; | |
| 4167 spellbook.pSpiritSpellbook.bIsSpellAvailable[4] = true; | |
| 4168 spellbook.pSpiritSpellbook.bIsSpellAvailable[5] = true; | |
| 4169 spellbook.pSpiritSpellbook.bIsSpellAvailable[6] = true; | |
| 4170 spellbook.pSpiritSpellbook.bIsSpellAvailable[7] = true; | |
| 4171 spellbook.pSpiritSpellbook.bIsSpellAvailable[8] = true; | |
| 4172 spellbook.pSpiritSpellbook.bIsSpellAvailable[9] = true; | |
| 4173 spellbook.pSpiritSpellbook.bIsSpellAvailable[10] = true; | |
| 4174 } | |
| 569 | 4175 break; |
| 886 | 4176 case PLAYER_SKILL_LIGHT: |
| 4177 spellbook.pLightSpellbook.bIsSpellAvailable[0] = true; | |
| 4178 break; | |
| 4179 case PLAYER_SKILL_DARK: | |
| 4180 spellbook.pDarkSpellbook.bIsSpellAvailable[0] = true; | |
| 4181 break; | |
| 0 | 4182 } |
| 4183 } | |
| 4184 | |
| 4185 sHealth = GetMaxHealth(); | |
| 4186 sMana = GetMaxMana(); | |
| 4187 } | |
| 4188 | |
| 4189 //----- (004903C9) -------------------------------------------------------- | |
| 821 | 4190 PLAYER_SKILL_TYPE Player::GetSkillIdxByOrder(signed int order) |
| 4191 { | |
|
1271
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4192 int counter; // edx@5 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4193 bool canBeInactive; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4194 unsigned char requiredValue; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4195 signed int offset; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4196 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4197 if ( order <= 1 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4198 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4199 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4200 requiredValue = 2; // 2 - primary skill |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4201 offset = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4202 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4203 else if ( order <= 3 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4204 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4205 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4206 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4207 offset = 2; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4208 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4209 else if ( order <= 12 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4210 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4211 canBeInactive = true; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4212 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4213 offset = 4; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4214 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4215 else |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4216 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4217 return (PLAYER_SKILL_TYPE)37; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4218 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4219 counter = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4220 for (int i = 0; i < 37; i++) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4221 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4222 if ( (this->pActiveSkills[i] || canBeInactive) && pSkillAvailabilityPerClass[classType / 4][i] == requiredValue ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4223 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4224 if ( counter == order - offset ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4225 return (PLAYER_SKILL_TYPE)i; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4226 ++counter; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4227 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4228 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4229 |
|
1549
5a3afcaa6717
Player::CalculateMeleeDamageTo removed labels, ifdowhile patterns changed to for cycles, magic numbers to enum values, fixing gibbet being only undead slaying
Grumpy7
parents:
1547
diff
changeset
|
4230 return (PLAYER_SKILL_TYPE)37; |
| 0 | 4231 } |
| 4232 | |
| 4233 | |
| 4234 | |
| 4235 //----- (0049048D) -------------------------------------------------------- | |
| 4236 //unsigned __int16 PartyCreation_BtnMinusClick(Player *_this, int eAttribute) | |
| 4237 void Player::DecreaseAttribute(int eAttribute) | |
| 4238 { | |
| 4239 int pBaseValue; // ecx@1 | |
| 4240 int pDroppedStep; // ebx@1 | |
| 4241 int pStep; // esi@1 | |
| 4242 int uMinValue; // [sp+Ch] [bp-4h]@1 | |
| 4243 | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4244 int raceId = GetRace(); |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4245 pBaseValue = StatTable[raceId][eAttribute].uBaseValue; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4246 pDroppedStep = StatTable[raceId][eAttribute].uDroppedStep; |
| 0 | 4247 uMinValue = pBaseValue - 2; |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4248 pStep = StatTable[raceId][eAttribute].uBaseStep; |
| 1272 | 4249 unsigned short* AttrToChange = nullptr; |
| 4250 switch ( eAttribute ) | |
| 4251 { | |
| 4252 case CHARACTER_ATTRIBUTE_STRENGTH: | |
| 4253 AttrToChange = &this->uMight; | |
| 4254 break; | |
| 4255 case CHARACTER_ATTRIBUTE_INTELLIGENCE: | |
| 4256 AttrToChange = &this->uIntelligence; | |
| 4257 break; | |
| 4258 case CHARACTER_ATTRIBUTE_WILLPOWER: | |
| 4259 AttrToChange = &this->uWillpower; | |
| 4260 break; | |
| 4261 case CHARACTER_ATTRIBUTE_ENDURANCE: | |
| 4262 AttrToChange = &this->uEndurance; | |
| 4263 break; | |
| 4264 case CHARACTER_ATTRIBUTE_ACCURACY: | |
| 4265 AttrToChange = &this->uAccuracy; | |
| 4266 break; | |
| 4267 case CHARACTER_ATTRIBUTE_SPEED: | |
| 4268 AttrToChange = &this->uSpeed; | |
| 4269 break; | |
| 4270 case CHARACTER_ATTRIBUTE_LUCK: | |
| 4271 AttrToChange = &this->uLuck; | |
| 4272 break; | |
| 4273 } | |
| 4274 if ( *AttrToChange <= pBaseValue ) | |
| 4275 pStep = pDroppedStep; | |
| 4276 if ( *AttrToChange - pStep >= uMinValue ) | |
| 4277 *AttrToChange -= pStep; | |
| 0 | 4278 } |
| 4279 | |
| 4280 //----- (004905F5) -------------------------------------------------------- | |
| 1458 | 4281 //signed int PartyCreation_BtnPlusClick(Player *this, int eAttribute) |
| 1273 | 4282 void Player::IncreaseAttribute( int eAttribute ) |
| 4283 { | |
| 4284 int raceId; // eax@1 | |
| 4285 int maxValue; // ebx@1 | |
| 4286 signed int baseStep; // edi@1 | |
| 4287 signed int tmp; // eax@17 | |
| 0 | 4288 signed int result; // eax@18 |
| 1273 | 4289 int baseValue; // [sp+Ch] [bp-8h]@1 |
| 4290 signed int droppedStep; // [sp+10h] [bp-4h]@1 | |
| 4291 unsigned short* statToChange; | |
| 4292 | |
| 4293 raceId = GetRace(); | |
| 4294 maxValue = StatTable[raceId][eAttribute].uMaxValue; | |
| 4295 baseStep = StatTable[raceId][eAttribute].uBaseStep; | |
| 4296 baseValue = StatTable[raceId][eAttribute].uBaseValue; | |
| 4297 droppedStep = StatTable[raceId][eAttribute].uDroppedStep; | |
| 4298 PlayerCreation_GetUnspentAttributePointCount(); | |
| 4299 switch ( eAttribute ) | |
| 4300 { | |
| 4301 case 0: | |
| 4302 statToChange = &this->uMight; | |
| 4303 break; | |
| 4304 case 1: | |
| 4305 statToChange = &this->uIntelligence; | |
| 4306 break; | |
| 4307 case 2: | |
| 4308 statToChange = &this->uWillpower; | |
| 4309 break; | |
| 4310 case 3: | |
| 4311 statToChange = &this->uEndurance; | |
| 4312 break; | |
| 4313 case 4: | |
| 4314 statToChange = &this->uAccuracy; | |
| 4315 break; | |
| 4316 case 5: | |
| 4317 statToChange = &this->uSpeed; | |
| 4318 break; | |
| 4319 case 6: | |
| 4320 statToChange = &this->uLuck; | |
| 4321 default: | |
| 1545 | 4322 Error("(%u)", eAttribute); |
| 1273 | 4323 } |
| 4324 if ( *statToChange < baseValue ) | |
| 4325 { | |
| 4326 tmp = baseStep; | |
| 4327 baseStep = droppedStep; | |
| 4328 droppedStep = tmp; | |
| 4329 } | |
| 4330 result = PlayerCreation_GetUnspentAttributePointCount(); | |
| 4331 if ( result >= droppedStep ) | |
| 4332 { | |
| 4333 if ( baseStep + *statToChange <= maxValue ) | |
| 4334 *statToChange += baseStep; | |
| 4335 } | |
| 0 | 4336 } |
| 4337 | |
| 4338 //----- (0049070F) -------------------------------------------------------- | |
| 4339 void Player::Zero() | |
| 4340 { | |
| 4341 this->sLevelModifier = 0; | |
| 4342 this->sACModifier = 0; | |
| 4343 this->uLuckBonus = 0; | |
| 4344 this->uAccuracyBonus = 0; | |
| 4345 this->uSpeedBonus = 0; | |
| 4346 this->uEnduranceBonus = 0; | |
| 4347 this->uWillpowerBonus = 0; | |
| 4348 this->uIntelligenceBonus = 0; | |
| 4349 this->uMightBonus = 0; | |
| 4350 this->field_100 = 0; | |
| 4351 this->field_FC = 0; | |
| 4352 this->field_F8 = 0; | |
| 4353 this->field_F4 = 0; | |
| 4354 this->field_F0 = 0; | |
| 4355 this->field_EC = 0; | |
| 4356 this->field_E8 = 0; | |
| 4357 this->field_E4 = 0; | |
| 4358 this->field_E0 = 0; | |
| 766 | 4359 memset(&this->sResFireBonus, 0, 0x16u); |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4360 this->field_1A97 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4361 this->_ranged_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4362 this->field_1A95 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4363 this->_ranged_atk_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4364 this->field_1A93 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4365 this->_melee_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4366 this->field_1A91 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4367 this->_some_attack_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4368 this->_mana_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4369 this->uFullManaBonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4370 this->_health_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4371 this->uFullHealthBonus = 0; |
| 0 | 4372 } |
| 4373 | |
| 4374 //----- (004907E7) -------------------------------------------------------- | |
| 299 | 4375 unsigned int Player::GetStatColor(int uStat) |
| 0 | 4376 { |
| 290 | 4377 int attribute_value; // edx@1 |
| 1393 | 4378 |
| 4379 int base_attribute_value = StatTable[GetRace()][uStat].uBaseValue; | |
| 0 | 4380 switch (uStat) |
| 4381 { | |
| 4382 case 0: attribute_value = uMight; break; | |
| 4383 case 1: attribute_value = uIntelligence; break; | |
| 4384 case 2: attribute_value = uWillpower; break; | |
| 4385 case 3: attribute_value = uEndurance; break; | |
| 290 | 4386 case 4: attribute_value = uAccuracy; break; |
| 4387 case 5: attribute_value = uSpeed; break; | |
| 0 | 4388 case 6: attribute_value = uLuck; break; |
| 4389 }; | |
| 4390 | |
| 1393 | 4391 if (attribute_value == base_attribute_value) |
| 4392 return ui_character_stat_default_color; | |
| 4393 else if (attribute_value > base_attribute_value) | |
| 4394 return ui_character_stat_buffed_color; | |
| 0 | 4395 else |
| 1393 | 4396 return ui_character_stat_debuffed_color; |
| 0 | 4397 } |
| 4398 | |
| 4399 //----- (004908A8) -------------------------------------------------------- | |
| 4400 bool Player::DiscardConditionIfLastsLongerThan(unsigned int uCondition, unsigned __int64 uTime) | |
| 4401 { | |
| 1684 | 4402 if ( pConditions[uCondition] && (uTime < (signed long long)pConditions[uCondition]) ) |
| 1014 | 4403 { |
| 1393 | 4404 pConditions[uCondition] = 0i64; |
| 1014 | 4405 return true; |
| 0 | 4406 } |
| 4407 else | |
| 1014 | 4408 return false; |
| 0 | 4409 } |
| 4410 | |
| 4411 //----- (004680ED) -------------------------------------------------------- | |
| 1019 | 4412 void Player::UseItem_DrinkPotion_etc(signed int player_num, int a3) |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4413 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4414 Player *playerAffected; // esi@1 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4415 signed int v5; // eax@17 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4416 int v8; // edx@39 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4417 char *v13; // eax@45 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4418 signed int v15; // edi@68 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4419 int v16; // edx@73 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4420 unsigned __int16 v17; // edi@73 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4421 unsigned int v18; // eax@73 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4422 const char *v22; // eax@84 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4423 int scroll_id; // esi@96 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4424 int v25; // eax@109 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4425 int v26; // eax@113 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4426 int new_mana_val; // edi@114 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4427 signed __int64 v28; // qax@120 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4428 __int64 v30; // edi@137 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4429 __int64 v32; // ST3C_4@137 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4430 __int64 v34; // ST34_4@137 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4431 unsigned __int16 v50; // [sp-Ch] [bp-38h]@120 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4432 const char *v66; // [sp-4h] [bp-30h]@69 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4433 signed int v67; // [sp-4h] [bp-30h]@77 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4434 const char *v68; // [sp-4h] [bp-30h]@89 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4435 char v72; // [sp+20h] [bp-Ch]@68 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4436 signed int v73; // [sp+24h] [bp-8h]@1 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4437 char* v74; // [sp+24h] [bp-8h]@23 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4438 Player *thisb; // [sp+28h] [bp-4h]@1 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4439 unsigned int thisa; // [sp+28h] [bp-4h]@22 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4440 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4441 thisb = this; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4442 playerAffected = &pParty->pPlayers[player_num-1]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4443 v73 = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4444 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4445 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4446 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_REAGENT ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4447 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4448 if ( pParty->pPickedItem.uItemID == 160 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4449 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4450 playerAffected->SetCondition(Condition_Poison1, 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4451 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4452 else if ( pParty->pPickedItem.uItemID == 161 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4453 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4454 new_mana_val = playerAffected->sMana; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4455 new_mana_val += 2; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4456 if ( new_mana_val > playerAffected->GetMaxMana() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4457 new_mana_val = playerAffected->GetMaxMana(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4458 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4459 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4460 else if ( pParty->pPickedItem.uItemID == 162 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4461 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4462 playerAffected->Heal(2); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4463 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4464 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4465 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4466 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4467 v68 = pParty->pPickedItem.GetDisplayName(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4468 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[36], v68);//"%s can not be used that way" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4469 ShowStatusBarString(pTmpBuf.data(), 2); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4470 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4471 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4472 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4473 pAudioPlayer->PlaySound((SoundID)211, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4474 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4475 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4476 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4477 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4478 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4479 if ( v73 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4480 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4481 if ( pParty->bTurnBasedModeOn ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4482 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4483 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4484 thisb->SetRecoveryTime(100); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4485 pTurnEngine->ApplyPlayerAction(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4486 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4487 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4488 { |
| 1684 | 4489 thisb->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4490 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4491 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4492 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4493 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4494 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4495 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4496 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_POTION ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4497 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4498 switch ( pParty->pPickedItem.uItemID ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4499 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4500 case 221: //Catalyst |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4501 playerAffected->SetCondition(Condition_Poison1, 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4502 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4503 case 222: //Cure Wounds |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4504 v25 = pParty->pPickedItem.uEnchantmentType + 10; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4505 playerAffected->Heal(v25); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4506 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4507 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4508 case 223: //Magic Potion |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4509 v26 = pParty->pPickedItem.uEnchantmentType + 10; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4510 new_mana_val = playerAffected->sMana; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4511 new_mana_val += v26; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4512 if ( new_mana_val > playerAffected->GetMaxMana() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4513 new_mana_val = playerAffected->GetMaxMana(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4514 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4515 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4516 case 224: //Cure Weakness |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4517 playerAffected->pConditions[Condition_Weak] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4518 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4519 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4520 case 225: //Cure Disease |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4521 playerAffected->pConditions[Condition_Disease3] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4522 playerAffected->pConditions[Condition_Disease2] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4523 playerAffected->pConditions[Condition_Disease1] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4524 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4525 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4526 case 226: //Cure Poison |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4527 playerAffected->pConditions[Condition_Poison3] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4528 playerAffected->pConditions[Condition_Poison2] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4529 playerAffected->pConditions[Condition_Poison1] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4530 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4531 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4532 case 227: //Awaken |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4533 playerAffected->pConditions[Condition_Sleep] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4534 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4535 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4536 case 228: //Haste |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4537 if ( !playerAffected->pConditions[Condition_Weak] ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4538 { |
| 1021 | 4539 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4540 playerAffected->pPlayerBuffs[7].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4541 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4542 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4543 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4544 case 229: //Heroism |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4545 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4546 playerAffected->pPlayerBuffs[8].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4547 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4548 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4549 case 230: //Bless |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4550 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4551 playerAffected->pPlayerBuffs[1].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4552 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4553 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4554 case 231: //Preservation |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4555 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4556 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4557 playerAffected->pPlayerBuffs[11].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4558 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4559 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4560 case 232: //Shield |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4561 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4562 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4563 playerAffected->pPlayerBuffs[13].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4564 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4565 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4566 case 234: //Stoneskin |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4567 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4568 playerAffected->pPlayerBuffs[14].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4569 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4570 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4571 case 235: //Water Breathing |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4572 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335), |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4573 playerAffected->pPlayerBuffs[23].Apply(pParty->uTimePlayed +v28, 3, 5, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4574 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4575 case 237: //Remove Fear |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4576 playerAffected->pConditions[Condition_Fear] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4577 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4578 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4579 case 238: //Remove Curse |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4580 playerAffected->pConditions[Condition_Cursed] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4581 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4582 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4583 case 239: //Cure Insanity |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4584 playerAffected->pConditions[Condition_Insane] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4585 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4586 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4587 case 240: //Might Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4588 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4589 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4590 playerAffected->pPlayerBuffs[19].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4591 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4592 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4593 case 241: //Intellect Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4594 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4595 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4596 playerAffected->pPlayerBuffs[17].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4597 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4598 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4599 case 242: //Personality Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4600 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4601 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4602 playerAffected->pPlayerBuffs[20].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4603 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4604 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4605 case 243://Endurance Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4606 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4607 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4608 playerAffected->pPlayerBuffs[16].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4609 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4610 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4611 case 244: //Speed Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4612 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4613 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4614 playerAffected->pPlayerBuffs[21].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4615 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4616 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4617 case 245: //Accuracy Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4618 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4619 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4620 playerAffected->pPlayerBuffs[15].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4621 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4622 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4623 case 251: //Cure Paralysis |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4624 playerAffected->pConditions[Condition_Paralyzed] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4625 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4626 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4627 case 252://Divine Restoration |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4628 v30 = playerAffected->pConditions[Condition_Dead]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4629 v32 = playerAffected->pConditions[Condition_Pertified]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4630 v34 = playerAffected->pConditions[Condition_Eradicated]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4631 memset(&playerAffected->pConditions,0,sizeof(pConditions)); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4632 playerAffected->pConditions[Condition_Dead] = v30; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4633 playerAffected->pConditions[Condition_Pertified] = v32; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4634 playerAffected->pConditions[Condition_Eradicated] = v34; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4635 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4636 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4637 case 253: //Divine Cure |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4638 v25 = 5 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4639 playerAffected->Heal(v25); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4640 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4641 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4642 case 254: //Divine Power |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4643 v26 = 5 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4644 new_mana_val = playerAffected->sMana; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4645 new_mana_val += v26; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4646 if ( new_mana_val > playerAffected->GetMaxMana() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4647 new_mana_val = playerAffected->GetMaxMana(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4648 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4649 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4650 case 255: //Luck Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4651 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4652 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4653 playerAffected->pPlayerBuffs[18].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4654 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4655 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4656 case 256: //Fire Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4657 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4658 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4659 playerAffected->pPlayerBuffs[5].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4660 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4661 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4662 case 257: //Air Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4663 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4664 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4665 playerAffected->pPlayerBuffs[0].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4666 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4667 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4668 case 258: //Water Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4669 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4670 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4671 playerAffected->pPlayerBuffs[22].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4672 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4673 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4674 case 259: //Earth Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4675 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4676 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4677 playerAffected->pPlayerBuffs[3].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4678 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4679 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4680 case 260: //Mind Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4681 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4682 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4683 playerAffected->pPlayerBuffs[9].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4684 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4685 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4686 case 261: //Body Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4687 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4688 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4689 playerAffected->pPlayerBuffs[2].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4690 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4691 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4692 case 262: //Stone to Flesh |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4693 playerAffected->pConditions[Condition_Pertified] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4694 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4695 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4696 case 264: //Pure Luck |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4697 if ( !playerAffected->pure_luck_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4698 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4699 playerAffected->uLuck += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4700 playerAffected->pure_luck_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4701 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4702 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4703 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4704 case 265: //Pure Speed |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4705 if ( !playerAffected->pure_speed_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4706 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4707 playerAffected->uSpeed += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4708 playerAffected->pure_speed_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4709 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4710 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4711 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4712 case 266: //Pure Intellect |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4713 if ( !playerAffected->pure_intellect_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4714 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4715 playerAffected->uIntelligence += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4716 playerAffected->pure_intellect_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4717 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4718 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4719 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4720 case 267: //Pure Endurance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4721 if ( !playerAffected->pure_endurance_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4722 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4723 playerAffected->uEndurance += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4724 playerAffected->pure_endurance_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4725 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4726 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4727 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4728 case 268: //Pure Personality |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4729 if ( !playerAffected->pure_willpower_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4730 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4731 playerAffected->uWillpower += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4732 playerAffected->pure_willpower_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4733 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4734 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4735 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4736 case 269: //Pure Accuracy |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4737 if ( !playerAffected->pure_accuracy_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4738 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4739 playerAffected->uAccuracy += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4740 playerAffected->pure_accuracy_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4741 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4742 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4743 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4744 case 270: //Pure Might |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4745 if ( !playerAffected->pure_might_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4746 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4747 playerAffected->uMight += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4748 playerAffected->pure_might_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4749 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4750 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4751 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4752 case 271: //Rejuvenation |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4753 playerAffected->sAgeModifier = 0; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4754 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4755 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4756 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4757 default: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4758 v68 = pParty->pPickedItem.GetDisplayName(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4759 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[36], v68);//"%s can not be used that way" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4760 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4761 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4762 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4763 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4764 pAudioPlayer->PlaySound((SoundID)210, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4765 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4766 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4767 // if ( !v73 ) v73 is always 1 at this point |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4768 // { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4769 // pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4770 // return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4771 // } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4772 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4773 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4774 if ( v73 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4775 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4776 if ( pParty->bTurnBasedModeOn ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4777 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4778 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4779 thisb->SetRecoveryTime(100); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4780 pTurnEngine->ApplyPlayerAction(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4781 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4782 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4783 { |
| 1684 | 4784 thisb->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4785 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4786 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4787 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4788 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4789 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4790 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4791 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4792 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_SPELL_SCROLL ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4793 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4794 if ( pCurrentScreen == SCREEN_CASTING ) |
| 1032 | 4795 return; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4796 if ( !playerAffected->CanAct() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4797 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4798 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4799 v68 = aCharacterConditionNames[playerAffected->GetMajorConditionIdx()]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4800 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4801 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4802 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4803 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4804 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4805 if ( bUnderwater == 1 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4806 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4807 ShowStatusBarString(pGlobalTXT_LocalizationStrings[652], 2u);//"You can not do that while you are underwater!" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4808 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4809 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4810 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4811 dword_50C9AC = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4812 scroll_id = pParty->pPickedItem.uItemID - 299; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4813 if ( scroll_id == 30 || scroll_id == 4 || scroll_id == 91 || scroll_id == 28 ) //Enchant Item scroll, Vampiric Weapon scroll ,Recharge Item ,Fire Aura |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4814 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4815 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4816 pGUIWindow_CurrentMenu->Release(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4817 pIcons_LOD->RemoveTexturesPackFromTextureList(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4818 pCurrentScreen = SCREEN_GAME; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4819 viewparams->bRedrawGameUI = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4820 _42777D_CastSpell_UseWand_ShootArrow(scroll_id, player_num - 1, 0x85u, 1, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4821 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4822 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4823 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4824 _720984_unused = pParty->pPickedItem.uItemID; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4825 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4826 pMessageQueue_50C9E8->AddMessage(UIMSG_SpellScrollUse, scroll_id, player_num - 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4827 if ( pCurrentScreen && pGUIWindow_CurrentMenu |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4828 && (pGUIWindow_CurrentMenu->eWindowType != WINDOW_null)) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4829 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4830 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4831 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4832 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4833 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4834 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4835 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4836 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_BOOK ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4837 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4838 v15 = pParty->pPickedItem.uItemID - 400; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4839 v72 = playerAffected->spellbook.bHaveSpell[pParty->pPickedItem.uItemID-400];//(char *)&v3->pConditions[0] + pParty->pPickedItem.uItemID + 2; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4840 if ( v72 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4841 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4842 v66 = pParty->pPickedItem.GetDisplayName(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4843 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[380], v66);//"You already know the %s spell" |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4844 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4845 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4846 return; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4847 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4848 if ( !playerAffected->CanAct() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4849 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4850 v66 = aCharacterConditionNames[playerAffected->GetMajorConditionIdx()]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4851 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v66);//"That player is %s" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4852 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4853 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4854 return; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4855 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4856 v16 = v15 % 11 + 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4857 v17 = playerAffected->pActiveSkills[v15 / 11 + 12]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4858 v18 = SkillToMastery(v17) - 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4859 switch (v18) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4860 { |
| 1032 | 4861 case 0: v67 = 4; break; |
| 4862 case 1: v67 = 7; break; | |
| 4863 case 2: v67 = 10; break; | |
| 4864 case 3: v67 = 11; break; | |
| 4865 default: | |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4866 v67 = player_num; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4867 } |
| 1032 | 4868 |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4869 if ( v16 > v67 || !v17 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4870 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4871 v22 = pParty->pPickedItem.GetDisplayName(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4872 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[381], v22); //"You don't have the skill to learn %s" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4873 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4874 playerAffected->PlaySound((PlayerSpeech)20, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4875 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4876 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4877 // v72 = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4878 playerAffected->PlaySound(SPEECH_21, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4879 v73 = 0; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4880 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4881 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4882 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4883 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4884 if ( !v73 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4885 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4886 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4887 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4888 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4889 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4890 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4891 // if ( v73 ) v73 is always 0 at this point |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4892 // { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4893 // if ( pParty->bTurnBasedModeOn ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4894 // { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4895 // pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4896 // thisb->SetRecoveryTime(100); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4897 // pTurnEngine->ApplyPlayerAction(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4898 // } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4899 // else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4900 // { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4901 // thisb->SetRecoveryTime(flt_6BE3A4_debug_recmod1 * 213.3333333333333); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4902 // } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4903 // } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4904 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4905 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4906 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4907 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4908 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_MESSAGE_SCROLL ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4909 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4910 if ( playerAffected->CanAct() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4911 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4912 CreateMsgScrollWindow(pParty->pPickedItem.uItemID); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4913 playerAffected->PlaySound(SPEECH_37, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4914 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4915 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4916 v68 = aCharacterConditionNames[playerAffected->GetMajorConditionIdx()]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4917 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4918 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4919 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4920 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4921 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4922 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4923 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4924 if (pParty->pPickedItem.uItemID == 616) //Genie Lamp |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4925 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4926 thisa = pParty->uCurrentMonthWeek + 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4927 if ( pParty->uCurrentMonth >= 7 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4928 v74 = NULL; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4929 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4930 v74 = aAttributeNames[pParty->uCurrentMonth]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4931 switch ( pParty->uCurrentMonth ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4932 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4933 case 0: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4934 playerAffected->uMight += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4935 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4936 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4937 case 1: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4938 playerAffected->uIntelligence += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4939 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4940 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4941 case 2: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4942 playerAffected->uWillpower += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4943 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4944 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4945 case 3: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4946 playerAffected->uEndurance += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4947 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4948 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4949 case 4: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4950 playerAffected->uAccuracy += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4951 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4952 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4953 case 5: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4954 playerAffected->uSpeed += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4955 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4956 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4957 case 6: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4958 playerAffected->uLuck += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4959 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4960 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4961 case 7: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4962 party_finds_gold(1000 * thisa, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4963 sprintf(pTmpBuf.data(), "+%u %s", 1000 * thisa, pGlobalTXT_LocalizationStrings[97]);//"Gold" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4964 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4965 case 8: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4966 Party::GiveFood(5 * thisa); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4967 sprintf(pTmpBuf.data(), "+%u %s",5 * thisa , pGlobalTXT_LocalizationStrings[653]);//"Food" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4968 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4969 case 9u: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4970 playerAffected->uSkillPoints += 2 * thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4971 sprintf(pTmpBuf.data(), "+%u %s", 2 * thisa, pGlobalTXT_LocalizationStrings[LOCSTR_SKILL_POINTS]); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4972 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4973 case 10: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4974 playerAffected->uExperience += 2500 * thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4975 sprintf(pTmpBuf.data(), "+%u %s", 2500 * thisa, pGlobalTXT_LocalizationStrings[LOCSTR_EXPIRIENCE]); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4976 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4977 case 11: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4978 v8 = rand() % 6; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4979 switch (v8) |
| 1032 | 4980 { |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4981 case 0: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4982 playerAffected->sResFireBase += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4983 v13 = pGlobalTXT_LocalizationStrings[87]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4984 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4985 case 1: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4986 playerAffected->sResAirBase += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4987 v13 = pGlobalTXT_LocalizationStrings[6]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4988 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4989 case 2: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4990 playerAffected->sResWaterBase += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4991 v13 = pGlobalTXT_LocalizationStrings[240]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4992 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4993 case 3: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4994 playerAffected->sResEarthBase += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4995 v13 = pGlobalTXT_LocalizationStrings[70]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4996 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4997 case 4: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4998 playerAffected->sResMindBase += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4999 v13 = pGlobalTXT_LocalizationStrings[142]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5000 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5001 case 5: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5002 playerAffected->sResBodyBase += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5003 v13 = pGlobalTXT_LocalizationStrings[29]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5004 break; |
| 1021 | 5005 } |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5006 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v13, pGlobalTXT_LocalizationStrings[121]); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5007 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5008 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5009 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5010 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5011 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5012 pGame->pStru6Instance->SetPlayerBuffAnim(SPELL_QUEST_COMPLETED, player_num - 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5013 playerAffected->PlaySound(SPEECH_93, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5014 pAudioPlayer->PlaySound((SoundID)219, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5015 if ( pParty->uDaysPlayed == 6 || pParty->uDaysPlayed == 20 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5016 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5017 playerAffected->SetCondition(Condition_Eradicated, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5018 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5019 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5020 else if ( pParty->uDaysPlayed == 12 || pParty->uDaysPlayed == 26 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5021 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5022 playerAffected->SetCondition(Condition_Dead, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5023 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5024 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5025 else if ( pParty->uDaysPlayed == 4 || pParty->uDaysPlayed == 25 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5026 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5027 playerAffected->SetCondition(Condition_Pertified, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5028 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5029 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5030 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5031 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5032 else if ( pParty->pPickedItem.uItemID == 630 ) //Red Apple |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5033 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5034 Party::GiveFood(1u); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5035 pAudioPlayer->PlaySound(SOUND_EatApple, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5036 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5037 else if ( pParty->pPickedItem.uItemID == 632 ) //Lute |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5038 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5039 pAudioPlayer->PlaySound(SOUND_PlayLute, 0, 0, -1, 0, 0, 0, 0); |
| 1032 | 5040 return; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5041 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5042 else if ( pParty->pPickedItem.uItemID == 633 ) //Faerie Pipes |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5043 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5044 pAudioPlayer->PlaySound(SOUND_PlayFaeriePipes, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5045 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5046 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5047 else if ( pParty->pPickedItem.uItemID == 634 ) //Gryphonheart's Trumpet |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5048 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5049 pAudioPlayer->PlaySound(SOUND_PlayGryphonheartsTrumpet, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5050 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5051 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5052 else if ( pParty->pPickedItem.uItemID == 646 ) //Horseshoe |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5053 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5054 pGame->pStru6Instance->SetPlayerBuffAnim(SPELL_QUEST_COMPLETED, player_num - 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5055 v5 = PID(OBJECT_Player, player_num + 49); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5056 pAudioPlayer->PlaySound(SOUND_20001, v5, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5057 playerAffected->AddVariable(VAR_NumSkillPoints, 2); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5058 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5059 else if ( pParty->pPickedItem.uItemID == 650 ) //Temple in a Bottle |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5060 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5061 TeleportToNWCDungeon(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5062 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5063 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5064 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5065 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5066 v68 = pParty->pPickedItem.GetDisplayName(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5067 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[36],v68);//"%s can not be used that way" |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5068 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5069 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5070 return; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5071 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5072 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5073 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5074 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5075 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
5076 } |
| 0 | 5077 |
| 5078 //----- (00449BB4) -------------------------------------------------------- | |
| 484 | 5079 bool Player::CompareVariable( enum VariableType VarNum, signed int pValue ) |
| 1033 | 5080 { |
| 0 | 5081 Player *v3; // esi@1 |
| 5082 signed int v4; // edi@1 | |
| 5083 unsigned int v5; // eax@8 | |
| 5084 int v6; // eax@9 | |
| 5085 enum CHARACTER_RACE v7; // eax@11 | |
| 5086 signed int v8; // eax@17 | |
| 5087 unsigned __int8 v9; // sf@17 | |
| 5088 unsigned __int8 v10; // of@17 | |
| 5089 int v11; // eax@19 | |
| 5090 unsigned int v12; // eax@20 | |
| 484 | 5091 unsigned int test_bit_value; // eax@25 |
| 5092 unsigned __int8 our_bit_value; // cl@25 | |
| 0 | 5093 signed int v15; // ecx@28 |
| 5094 ItemGen *v16; // eax@28 | |
| 5095 char v17; // zf@31 | |
| 5096 int v18; // edi@90 | |
| 5097 DDM_DLV_Header *v19; // eax@122 | |
| 5098 char v20; // cl@124 | |
| 5099 DDM_DLV_Header *v21; // eax@126 | |
| 5100 unsigned int v22; // edi@129 | |
| 100 | 5101 Player *v23; // esi@134 |
| 0 | 5102 ItemGen *v24; // ecx@135 |
| 5103 signed int v25; // edx@135 | |
| 5104 ITEM_EQUIP_TYPE v26; // ebx@155 | |
| 5105 char *v27; // edi@155 | |
| 5106 int v28; // ebx@161 | |
| 5107 int v29; // eax@161 | |
| 5108 | |
| 469 | 5109 v6 = 0; |
| 0 | 5110 v3 = this; |
| 5111 v4 = -1; | |
| 469 | 5112 if ( VarNum > VAR_AutoNotes ) |
| 5113 { | |
| 5114 switch ( VarNum ) | |
| 0 | 5115 { |
| 5116 case VAR_Invisible: | |
| 1167 | 5117 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime >0 ) |
| 469 | 5118 return true; |
| 484 | 5119 return false; |
| 0 | 5120 case VAR_NumDeaths: |
| 5121 v4 = pParty->uNumDeaths; | |
| 469 | 5122 return v4 >= pValue; |
| 0 | 5123 case VAR_NumBounties: |
| 5124 v4 = pParty->uNumBountiesCollected; | |
| 469 | 5125 return v4 >= pValue; |
| 0 | 5126 case VAR_PrisonTerms: |
| 5127 v4 = pParty->uNumPrisonTerms; | |
| 469 | 5128 return v4 >= pValue; |
| 0 | 5129 case VAR_ArenaWinsPage: |
| 5130 v4 = (unsigned __int8)pParty->uNumArenaPageWins; | |
| 469 | 5131 return v4 >= pValue; |
| 0 | 5132 case VAR_ArenaWinsSquire: |
| 5133 v4 = (unsigned __int8)pParty->uNumArenaSquireWins; | |
| 469 | 5134 return v4 >= pValue; |
| 0 | 5135 case VAR_ArenaWinsKnight: |
| 5136 v4 = (unsigned __int8)pParty->uNumArenaKnightWins; | |
| 469 | 5137 return v4 >= pValue; |
| 0 | 5138 case VAR_ArenaWinsLord: |
| 5139 v4 = (unsigned __int8)pParty->uNumArenaLordWins; | |
| 469 | 5140 return v4 >= pValue; |
| 0 | 5141 case VAR_ReputationInCurrentLocation: |
| 5142 v19 = &pOutdoor->ddm; | |
| 5143 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5144 v19 = &pIndoor->dlv; | |
| 469 | 5145 v6 = v19->uReputation >= pValue; |
| 5146 return v6; | |
| 0 | 5147 case VAR_History_28|VAR_Sex: |
| 5148 v21 = &pOutdoor->ddm; | |
| 5149 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5150 v21 = &pIndoor->dlv; | |
| 469 | 5151 v6 = v21->field_C_alert == pValue; |
| 0 | 5152 return v6; |
| 5153 case VAR_MonthEquals2|VAR_Sex: | |
| 5154 case VAR_MonthEquals2|VAR_Class: | |
| 5155 case VAR_Counter1: | |
| 5156 case VAR_Counter2: | |
| 5157 case VAR_Counter3: | |
| 5158 case VAR_Counter4: | |
| 5159 case VAR_Counter5: | |
| 5160 case VAR_Counter6: | |
| 5161 case VAR_Counter7: | |
| 5162 case VAR_Counter8: | |
| 469 | 5163 v22 = *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44304]; |
| 5164 if ( v22 | *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44300] | |
| 5165 && (signed __int64)(__PAIR__(v22, *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44300]) | |
| 5166 + (signed __int64)((double)(460800 * pValue) * 0.033333335)) <= (signed __int64)pParty->uTimePlayed ) | |
| 5167 return true; | |
| 5168 return false; | |
| 0 | 5169 case VAR_NumSkillPoints: |
| 5170 v4 = this->uSkillPoints; | |
| 469 | 5171 return v4 >= pValue; |
| 0 | 5172 case VAR_CircusPrises: |
| 5173 v4 = 0; | |
| 100 | 5174 v23 = pParty->pPlayers;//[0].pInventoryItems; |
| 0 | 5175 do |
| 5176 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
5177 v24 = v23->pInventoryItemList; |
| 0 | 5178 v25 = 138; |
| 5179 do | |
| 5180 { | |
| 5181 switch ( v24->uItemID ) | |
| 5182 { | |
| 5183 case 0x1D6u: | |
| 5184 ++v4; | |
| 5185 break; | |
| 5186 case 0x1D7u: | |
| 5187 v4 += 3; | |
| 5188 break; | |
| 5189 case 0x1DDu: | |
| 5190 v4 += 5; | |
| 5191 break; | |
| 5192 } | |
| 5193 ++v24; | |
| 5194 --v25; | |
| 5195 } | |
| 5196 while ( v25 ); | |
| 100 | 5197 ++v23; |
| 0 | 5198 } |
| 100 | 5199 while ( v23 <= &pParty->pPlayers[3] ); |
| 469 | 5200 return v4 >= pValue; |
| 0 | 5201 case VAR_MonthEquals2: |
| 469 | 5202 v6 = pParty->uCurrentMonth == pValue; |
| 5203 return v6; | |
| 0 | 5204 case VAR_IsFlying: |
| 5205 if ( pParty->bFlying | |
| 1167 | 5206 && (pParty->pPartyBuffs[PARTY_BUFF_FLY].uExpireTime> 0) ) |
| 469 | 5207 return true; |
| 5208 return false; | |
| 0 | 5209 case VAR_HiredNPCHasSpeciality: |
| 469 | 5210 LOBYTE(v6) = CheckHiredNPCSpeciality(pValue); |
| 0 | 5211 return v6; |
| 5212 case VAR_NPCs2: | |
| 469 | 5213 return pNPCStats->pNewNPCData[pValue].Hired(); |
| 0 | 5214 case VAR_MonthEquals|VAR_CurrentSP: |
| 1033 | 5215 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; |
| 5216 our_bit_value = this->field_1A50[((signed __int16)pValue - 1)/8]; | |
| 484 | 5217 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 469 | 5218 return v4 >= pValue; |
| 5219 v4 = pValue; | |
| 5220 return v4 >= pValue; | |
| 0 | 5221 case VAR_ItemEquipped: |
| 5222 v26 = (ITEM_EQUIP_TYPE)0; | |
| 5223 v27 = (char *)&this->pEquipment; | |
| 5224 break; | |
| 5225 case VAR_GoldInBank: | |
| 5226 v4 = pParty->uNumGoldInBank; | |
| 469 | 5227 return v4 >= pValue; |
| 0 | 5228 case VAR_ThieverySkill|0x80: |
| 5229 v28 = GetActualMight(); | |
| 5230 v29 = v3->GetBaseStrength(); | |
| 5231 goto LABEL_168; | |
| 5232 case VAR_DisarmTrapSkill|0x80: | |
| 5233 v28 = GetActualIntelligence(); | |
| 5234 v29 = v3->GetBaseIntelligence(); | |
| 5235 goto LABEL_168; | |
| 5236 case VAR_MonthEquals: | |
| 5237 v28 = GetActualWillpower(); | |
| 5238 v29 = v3->GetBaseWillpower(); | |
| 5239 goto LABEL_168; | |
| 5240 case VAR_MonthEquals|VAR_Sex: | |
| 5241 v28 = GetActualEndurance(); | |
| 5242 v29 = v3->GetBaseEndurance(); | |
| 5243 goto LABEL_168; | |
| 5244 case VAR_IdentifyMonsterSkill|0x80: | |
| 5245 v28 = GetActualSpeed(); | |
| 5246 v29 = v3->GetBaseSpeed(); | |
| 5247 goto LABEL_168; | |
| 5248 case VAR_ArmsmasterSkill|0x80: | |
| 5249 v28 = GetActualAccuracy(); | |
| 5250 v29 = v3->GetBaseAccuracy(); | |
| 5251 goto LABEL_168; | |
| 5252 case VAR_MonthEquals|VAR_MaxHP: | |
| 5253 v28 = GetActualLuck(); | |
| 5254 v29 = v3->GetBaseLuck(); | |
| 5255 LABEL_168: | |
| 5256 v10 = __OFSUB__(v28, v29); | |
| 5257 v9 = v28 - v29 < 0; | |
| 5258 LABEL_169: | |
| 5259 if ( v9 ^ v10 ) | |
| 469 | 5260 return v4 >= pValue; |
| 5261 return true; | |
| 0 | 5262 default: |
| 469 | 5263 return v4 >= pValue; |
| 0 | 5264 } |
| 5265 while ( !v3->HasItemEquipped(v26) | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
5266 || *(int *)&v3->pInventoryItemList[*(int *)v27-1] != pValue ) |
| 0 | 5267 { |
| 5268 v26 = (ITEM_EQUIP_TYPE)((int)v26 + 1); | |
| 5269 v27 += 4; | |
| 5270 if ( (signed int)v26 >= 16 ) | |
| 469 | 5271 return false; |
| 5272 } | |
| 5273 return true; | |
| 5274 } | |
| 5275 if ( VarNum == VAR_AutoNotes ) | |
| 0 | 5276 { |
| 1033 | 5277 test_bit_value = 0x80u >> ((signed __int16)(pValue - 1) - 1) % 8; |
| 5278 our_bit_value = pParty->_autonote_bits[((signed __int16)(pValue - 1) - 1) /8]; | |
| 484 | 5279 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 5280 return false; | |
| 5281 return true; | |
| 469 | 5282 } |
| 5283 if ( VarNum <= VAR_BaseLuck ) | |
| 5284 { | |
| 5285 if ( VarNum != VAR_BaseLuck ) | |
| 5286 { | |
| 5287 switch ( VarNum ) | |
| 0 | 5288 { |
| 5289 case VAR_Hour: | |
| 469 | 5290 if ( (signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60 % 24 == pValue ) |
| 5291 return true; | |
| 5292 return false; | |
| 0 | 5293 case VAR_DayOfYear: |
| 469 | 5294 v5 = (unsigned int)((signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60) / 0x18 % 0x150 + 1; |
| 5295 v6 = v5 == pValue; | |
| 5296 return v6; | |
| 0 | 5297 case VAR_DayOfWeek: |
| 469 | 5298 v5 = (unsigned int)((signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60) / 0x18 % 7; |
| 5299 v6 = v5 == pValue; | |
| 0 | 5300 return v6; |
| 5301 case VAR_Sex: | |
| 469 | 5302 if ( pValue == (CHARACTER_RACE)this->uSex ) |
| 5303 return true; | |
| 5304 return v4 >= pValue; | |
| 0 | 5305 case VAR_Class: |
| 135 | 5306 v7 = (CHARACTER_RACE)this->classType; |
| 469 | 5307 if ( pValue == v7 ) |
| 5308 return true; | |
| 5309 return v4 >= pValue; | |
| 0 | 5310 case VAR_Race: |
| 5311 v7 = GetRace(); | |
| 469 | 5312 if ( pValue == v7 ) |
| 5313 return true; | |
| 5314 return v4 >= pValue; | |
| 0 | 5315 case VAR_CurrentHP: |
| 5316 v4 = this->sHealth; | |
| 469 | 5317 return v4 >= pValue; |
| 0 | 5318 case VAR_MaxHP: |
| 5319 v8 = GetMaxHealth(); | |
| 5320 v10 = __OFSUB__(v3->sHealth, v8); | |
| 5321 v9 = v3->sHealth - v8 < 0; | |
| 5322 goto LABEL_169; | |
| 5323 case VAR_CurrentSP: | |
| 5324 v4 = this->sMana; | |
| 469 | 5325 return v4 >= pValue; |
| 0 | 5326 case VAR_MaxSP: |
| 5327 v11 = GetMaxMana(); | |
| 5328 v10 = __OFSUB__(v3->sMana, v11); | |
| 5329 v9 = v3->sMana - v11 < 0; | |
| 5330 goto LABEL_169; | |
| 5331 case VAR_ActualAC: | |
| 5332 v12 = GetActualAC(); | |
| 5333 goto _j_cmp_against_arg; | |
| 5334 case VAR_ACModifier: | |
| 5335 v4 = this->sACModifier; | |
| 469 | 5336 return v4 >= pValue; |
| 0 | 5337 case VAR_BaseLevel: |
| 5338 v4 = this->uLevel; | |
| 469 | 5339 return v4 >= pValue; |
| 0 | 5340 case VAR_LevelModifier: |
| 5341 v4 = this->sLevelModifier; | |
| 469 | 5342 return v4 >= pValue; |
| 0 | 5343 case VAR_Age: |
| 5344 v12 = GetActualAge(); | |
| 5345 goto _j_cmp_against_arg; | |
| 5346 case VAR_Award: | |
| 1033 | 5347 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
5348 our_bit_value = this->_achieved_awards_bits[((signed __int16)pValue - 1) /8]; |
| 484 | 5349 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 5350 return true; | |
| 5351 return false; | |
| 0 | 5352 case VAR_Experience: |
| 5353 v4 = LODWORD(this->uExperience); | |
| 469 | 5354 return v4 >= pValue; |
| 0 | 5355 case VAR_QBits_QuestsDone: |
| 484 | 5356 test_bit_value = 0x80u >> (pValue - 1) % 8; |
| 5357 our_bit_value = pParty->_quest_bits[(pValue - 1)/8]; | |
| 5358 if ( test_bit_value & our_bit_value ) | |
| 478 | 5359 return true; |
| 5360 return false; | |
| 0 | 5361 case VAR_PlayerItemInHands: |
| 5362 v15 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
5363 v16 = v3->pInventoryItemList; |
| 0 | 5364 break; |
| 5365 case VAR_FixedGold: | |
| 5366 v4 = pParty->uNumGold; | |
| 469 | 5367 return v4 >= pValue; |
| 0 | 5368 case VAR_MightBonus: |
| 5369 v4 = this->uMightBonus; | |
| 469 | 5370 return v4 >= pValue; |
| 0 | 5371 case VAR_IntellectBonus: |
| 5372 v4 = this->uIntelligenceBonus; | |
| 469 | 5373 return v4 >= pValue; |
| 0 | 5374 case VAR_PersonalityBonus: |
| 5375 v4 = this->uWillpowerBonus; | |
| 469 | 5376 return v4 >= pValue; |
| 0 | 5377 case VAR_EnduranceBonus: |
| 5378 v4 = this->uEnduranceBonus; | |
| 469 | 5379 return v4 >= pValue; |
| 0 | 5380 case VAR_SpeedBonus: |
| 5381 v4 = this->uSpeedBonus; | |
| 469 | 5382 return v4 >= pValue; |
| 0 | 5383 case VAR_AccuracyBonus: |
| 5384 v4 = this->uAccuracyBonus; | |
| 469 | 5385 return v4 >= pValue; |
| 0 | 5386 case VAR_LuckBonus: |
| 5387 v4 = this->uLuckBonus; | |
| 469 | 5388 return v4 >= pValue; |
| 0 | 5389 case VAR_BaseMight: |
| 5390 v4 = this->uMight; | |
| 469 | 5391 return v4 >= pValue; |
| 0 | 5392 case VAR_BaseIntellect: |
| 5393 v4 = this->uIntelligence; | |
| 469 | 5394 return v4 >= pValue; |
| 0 | 5395 case VAR_BasePersonality: |
| 5396 v4 = this->uWillpower; | |
| 469 | 5397 return v4 >= pValue; |
| 0 | 5398 case VAR_BaseEndurance: |
| 5399 v4 = this->uEndurance; | |
| 469 | 5400 return v4 >= pValue; |
| 0 | 5401 case VAR_BaseSpeed: |
| 5402 v4 = this->uSpeed; | |
| 469 | 5403 return v4 >= pValue; |
| 0 | 5404 case VAR_BaseAccuracy: |
| 5405 v4 = this->uAccuracy; | |
| 469 | 5406 return v4 >= pValue; |
| 0 | 5407 case VAR_FixedFood: |
| 5408 v4 = pParty->uNumFoodRations; | |
| 469 | 5409 return v4 >= pValue; |
| 0 | 5410 default: |
| 469 | 5411 return v4 >= pValue; |
| 5412 } | |
| 5413 while ( v16->uItemID != pValue ) | |
| 0 | 5414 { |
| 5415 ++v15; | |
| 5416 ++v16; | |
| 5417 if ( v15 >= 138 ) | |
| 5418 { | |
| 469 | 5419 v6 = pParty->pPickedItem.uItemID == pValue; |
| 0 | 5420 return v6; |
| 5421 } | |
| 5422 } | |
| 469 | 5423 return true; |
| 0 | 5424 } |
| 5425 v4 = this->uLuck; | |
| 469 | 5426 return v4 >= pValue; |
| 5427 } | |
| 5428 if ( VarNum <= VAR_MagicResistance ) | |
| 5429 { | |
| 5430 if ( VarNum == VAR_MagicResistance ) | |
| 0 | 5431 { |
| 5432 v4 = this->sResMagicBase; | |
| 5433 } | |
| 5434 else | |
| 5435 { | |
| 469 | 5436 switch ( VarNum ) |
| 0 | 5437 { |
| 5438 case VAR_FireResistance: | |
| 5439 v4 = this->sResFireBase; | |
| 469 | 5440 return v4 >= pValue; |
| 0 | 5441 case VAR_AirResistance: |
| 5442 v4 = this->sResAirBase; | |
| 469 | 5443 return v4 >= pValue; |
| 0 | 5444 case VAR_WaterResistance: |
| 5445 v4 = this->sResWaterBase; | |
| 469 | 5446 return v4 >= pValue; |
| 0 | 5447 case VAR_EarthResistance: |
| 5448 v4 = this->sResEarthBase; | |
| 469 | 5449 return v4 >= pValue; |
| 0 | 5450 case VAR_SpiritResistance: |
| 5451 v4 = this->sResSpiritBase; | |
| 469 | 5452 return v4 >= pValue; |
| 0 | 5453 case VAR_MindResistance: |
| 5454 v4 = this->sResMindBase; | |
| 469 | 5455 return v4 >= pValue; |
| 0 | 5456 case VAR_BodyResistance: |
| 5457 v4 = this->sResBodyBase; | |
| 469 | 5458 return v4 >= pValue; |
| 0 | 5459 case VAR_LightResistance: |
| 5460 v4 = this->sResLightBase; | |
| 469 | 5461 return v4 >= pValue; |
| 0 | 5462 case VAR_DarkResistance: |
| 5463 v4 = this->sResDarkBase; | |
| 469 | 5464 return v4 >= pValue; |
| 0 | 5465 case VAR_ActualMight: |
| 5466 v12 = GetActualMight(); | |
| 5467 goto _j_cmp_against_arg; | |
| 5468 case VAR_ActualIntellect: | |
| 5469 v12 = GetActualIntelligence(); | |
| 5470 goto _j_cmp_against_arg; | |
| 5471 case VAR_ActualPersonality: | |
| 5472 v12 = GetActualWillpower(); | |
| 5473 goto _j_cmp_against_arg; | |
| 5474 case VAR_ActualEndurance: | |
| 5475 v12 = GetActualEndurance(); | |
| 5476 goto _j_cmp_against_arg; | |
| 5477 case VAR_ActualSpeed: | |
| 5478 v12 = GetActualSpeed(); | |
| 5479 goto _j_cmp_against_arg; | |
| 5480 case VAR_ActualAccuracy: | |
| 5481 v12 = GetActualAccuracy(); | |
| 5482 goto _j_cmp_against_arg; | |
| 5483 case VAR_ActualLuck: | |
| 5484 v12 = GetActualLuck(); | |
| 5485 _j_cmp_against_arg: | |
| 5486 v4 = v12; | |
| 5487 break; | |
| 5488 default: | |
| 469 | 5489 return v4 >= pValue; |
| 5490 } | |
| 5491 } | |
| 5492 return v4 >= pValue; | |
| 5493 } | |
| 5494 if ( VarNum <= VAR_DisarmTrapSkill ) | |
| 5495 { | |
| 5496 if ( VarNum != VAR_DisarmTrapSkill ) | |
| 5497 { | |
| 5498 if ( VarNum <= VAR_MindResistanceBonus ) | |
| 5499 { | |
| 5500 switch ( VarNum ) | |
| 0 | 5501 { |
| 5502 case VAR_MindResistanceBonus: | |
| 5503 v4 = this->sResMindBonus; | |
| 5504 break; | |
| 5505 case VAR_FireResistanceBonus: | |
| 5506 v4 = this->sResFireBonus; | |
| 5507 break; | |
| 5508 case VAR_AirResistanceBonus: | |
| 5509 v4 = this->sResAirBonus; | |
| 5510 break; | |
| 5511 case VAR_WaterResistanceBonus: | |
| 5512 v4 = this->sResWaterBonus; | |
| 5513 break; | |
| 5514 case VAR_EarthResistanceBonus: | |
| 5515 v4 = this->sResEarthBonus; | |
| 5516 break; | |
| 5517 case VAR_SpiritResistanceBonus: | |
| 5518 v4 = this->sResSpiritBonus; | |
| 5519 break; | |
| 5520 } | |
| 469 | 5521 return v4 >= pValue; |
| 5522 } | |
| 5523 if ( VarNum == VAR_BodyResistanceBonus ) | |
| 0 | 5524 { |
| 5525 v4 = this->sResBodyBonus; | |
| 469 | 5526 return v4 >= pValue; |
| 5527 } | |
| 5528 if ( VarNum == VAR_LightResistanceBonus ) | |
| 0 | 5529 { |
| 5530 v4 = this->sResLightBonus; | |
| 469 | 5531 return v4 >= pValue; |
| 5532 } | |
| 5533 if ( VarNum == VAR_DarkResistanceBonus ) | |
| 0 | 5534 { |
| 5535 v4 = this->sResDarkBonus; | |
| 469 | 5536 return v4 >= pValue; |
| 5537 } | |
| 5538 if ( VarNum == VAR_MagicResistanceBonus ) | |
| 0 | 5539 { |
| 5540 v4 = this->sResMagicBonus; | |
| 469 | 5541 return v4 >= pValue; |
| 5542 } | |
| 5543 if ( VarNum <= VAR_MagicResistanceBonus || VarNum > VAR_DiplomacySkill ) | |
| 5544 return v4 >= pValue; | |
| 0 | 5545 } |
| 5546 LABEL_90: | |
| 469 | 5547 v18 = *((short *)&this->pConditions[16] + VarNum); |
| 5548 if ( pValue <= 63 ) | |
| 0 | 5549 v4 = v18 & 0x3F; |
| 5550 else | |
| 469 | 5551 v4 = pValue & v18; |
| 5552 return v4 >= pValue; | |
| 5553 } | |
| 5554 if ( VarNum == 104 ) | |
| 0 | 5555 goto LABEL_90; |
| 469 | 5556 if ( (signed int)VarNum <= 104 ) |
| 5557 return v4 >= pValue; | |
| 5558 if ( (signed int)VarNum > 0x79 ) | |
| 5559 { | |
| 5560 if ( VarNum != 122 ) | |
| 5561 { | |
| 5562 if ( (signed int)VarNum > 122 && VarNum <= VAR_ActiveSpells ) | |
| 5563 v4 = (unsigned __int8)byte_5E4C15[VarNum]; | |
| 5564 return v4 >= pValue; | |
| 0 | 5565 } |
| 5566 v4 = GetMajorConditionIdx(); | |
| 5567 if ( v4 != 18 ) | |
| 5568 { | |
| 469 | 5569 return v4 >= pValue; |
| 5570 } | |
| 5571 v4 = pValue; | |
| 5572 return v4 >= pValue; | |
| 5573 } | |
| 1072 | 5574 return &LODWORD(this->pConditions[VarNum]);// *((int *)this + 2 * VarNum - 210); |
| 0 | 5575 } |
| 5576 | |
| 5577 | |
| 5578 //----- (0044A5CB) -------------------------------------------------------- | |
| 492 | 5579 void Player::SetVariable(enum VariableType var_type, signed int var_value) |
| 5580 { | |
| 5581 signed int currPlayerId; // ebx@1 | |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5582 Player *v4_unused; // esi@1 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5583 unsigned int v5_unused; // edi@1 |
| 0 | 5584 unsigned int v6; // esi@13 |
| 5585 unsigned int v7; // esi@14 | |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5586 signed int v8_unused; // eax@17 |
| 0 | 5587 ItemGen *v9; // ecx@17 |
| 5588 int v10; // eax@21 | |
| 5589 signed int v11; // eax@30 | |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5590 Player *unused12; // ecx@44 |
| 0 | 5591 char *v13; // ecx@45 |
| 5592 Player *v14; // ecx@49 | |
| 5593 int v15; // ecx@86 | |
| 5594 int v16; // esi@106 | |
| 5595 char v17; // al@106 | |
| 5596 int v18; // eax@107 | |
| 5597 Player *v19; // ecx@112 | |
| 5598 Player *v20; // ecx@127 | |
| 5599 int v21; // eax@127 | |
| 5600 int v22; // eax@145 | |
| 5601 char v23; // zf@146 | |
| 5602 DDM_DLV_Header *v24; // ecx@148 | |
| 5603 signed int v25; // eax@172 | |
| 5604 int v26; // [sp-8h] [bp-3Ch]@84 | |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5605 signed int unused27; // [sp-4h] [bp-38h]@4 |
|
1260
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
5606 int v28_unused; // [sp-4h] [bp-38h]@84 |
| 0 | 5607 ItemGen item; // [sp+Ch] [bp-28h]@52 |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5608 char v30_unused; // [sp+32h] [bp-2h]@1 |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5609 char v31_unused; // [sp+33h] [bp-1h]@1 |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5610 |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5611 currPlayerId = -1; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5612 for (int i = 1; i <= 4; i++) //TODO: add a member variable for playerid in the future |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5613 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5614 if ( this == pPlayers[i] ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5615 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5616 currPlayerId = i - 1; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5617 break; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5618 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5619 } |
| 1545 | 5620 |
| 5621 Assert(currPlayerId != -1); | |
| 492 | 5622 if ( var_type > VAR_AutoNotes ) |
| 5623 { | |
| 5624 if ( var_type <= VAR_GoldInBank ) | |
| 5625 { | |
| 5626 if ( var_type == VAR_GoldInBank ) | |
| 5627 { | |
| 5628 pParty->uNumGoldInBank = var_value; | |
| 0 | 5629 return; |
| 5630 } | |
| 492 | 5631 if ( var_type <= VAR_Counter8 ) |
| 5632 { | |
| 5633 if ( (signed int)var_type >= 0xF5 ) | |
| 0 | 5634 { |
| 1619 | 5635 __debugbreak(); //how do I get here? |
| 492 | 5636 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44300] = LODWORD(pParty->uTimePlayed); |
| 5637 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44304] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 5638 } |
| 5639 else | |
| 5640 { | |
| 492 | 5641 switch ( var_type ) |
| 0 | 5642 { |
| 5643 case VAR_MonthEquals|VAR_CurrentSP: | |
| 1619 | 5644 __debugbreak(); //how do I get here? |
| 492 | 5645 _449B7E_toggle_bit((unsigned char *)field_1A50, var_value, 1u); |
| 0 | 5646 break; |
| 5647 case VAR_NPCs2: | |
| 1619 | 5648 __debugbreak(); //how do I get here? |
| 0 | 5649 pParty->field_709 = 0; |
| 492 | 5650 LOBYTE(pNPCStats->pNewNPCData[var_value].uFlags) |= 0x80u; |
| 1035 | 5651 pParty->CountHirelings(); |
| 5652 viewparams->bRedrawGameUI = true; | |
| 0 | 5653 break; |
| 5654 case VAR_NumSkillPoints: | |
| 492 | 5655 this->uSkillPoints = var_value; |
| 0 | 5656 break; |
| 5657 } | |
| 5658 } | |
| 5659 return; | |
| 5660 } | |
| 492 | 5661 if ( var_type < VAR_Counter9 ) |
| 0 | 5662 return; |
| 492 | 5663 if ( (signed int)var_type <= 0x112 ) |
| 5664 { | |
| 1619 | 5665 __debugbreak(); //how do I get here? |
| 492 | 5666 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44532] = LODWORD(pParty->uTimePlayed); |
| 5667 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44536] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 5668 } |
| 5669 else | |
| 5670 { | |
| 492 | 5671 if ( var_type == VAR_ReputationInCurrentLocation ) |
| 0 | 5672 { |
| 5673 v24 = &pOutdoor->ddm; | |
| 5674 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5675 v24 = &pIndoor->dlv; | |
| 492 | 5676 v24->uReputation = var_value; |
| 5677 if ( var_value > 10000 ) | |
| 0 | 5678 v24->uReputation = 10000; |
| 5679 return; | |
| 5680 } | |
| 492 | 5681 if ( var_type <= VAR_ReputationInCurrentLocation |
| 5682 || var_type > VAR_History_28 | |
| 5683 || (v22 = var_type - 276, pParty->field_3C.field_4F0[2 * v22 + 1] | pParty->field_3C.field_4F0[2 * v22]) | |
| 5684 || (pParty->field_3C.field_4F0[2 * (var_type - 276)] = LODWORD(pParty->uTimePlayed), | |
| 1455 | 5685 v23 = pStorylineText->StoreLine[v22].pText == 0,//*(&pStorylineText->field_0 + 3 * v22) == 0, |
| 492 | 5686 pParty->field_3C.field_4F0[2 * (var_type - 276) + 1] = HIDWORD(pParty->uTimePlayed), |
| 0 | 5687 v23) ) |
| 1619 | 5688 __debugbreak(); //how do I get here? |
| 0 | 5689 return; |
| 5690 bFlashHistoryBook = 1; | |
| 5691 } | |
| 492 | 5692 v25 = 8 * currPlayerId + 400; |
| 862 | 5693 LOBYTE(v25) = PID(OBJECT_Player,currPlayerId - 112); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5694 pAudioPlayer->PlaySound(SOUND_20001, v25, 0, -1, 0, 0, 0, 0); |
| 0 | 5695 return; |
| 5696 } | |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5697 switch ( var_type ) |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5698 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5699 case VAR_NumDeaths: |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5700 pParty->uNumDeaths = var_value; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5701 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5702 case VAR_NumBounties: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5703 pParty->uNumBountiesCollected = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5704 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5705 case VAR_PrisonTerms: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5706 pParty->uNumPrisonTerms = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5707 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5708 case VAR_ArenaWinsPage: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5709 pParty->uNumArenaPageWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5710 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5711 case VAR_ArenaWinsSquire: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5712 pParty->uNumArenaSquireWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5713 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5714 case VAR_ArenaWinsKnight: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5715 pParty->uNumArenaKnightWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5716 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5717 case VAR_ArenaWinsLord: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5718 pParty->uNumArenaLordWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5719 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5720 } |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5721 return; |
| 0 | 5722 } |
| 492 | 5723 if ( var_type == VAR_AutoNotes ) |
| 5724 { | |
| 5725 if ( !((unsigned __int8)(0x80u >> ((signed __int16)var_value - 1) % 8) & pParty->_autonote_bits[((signed __int16)var_value - 1) >> 3]) | |
|
81
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
5726 //&& (&dword_723718_autonote_related)[8 * a3] ) |
| 1310 | 5727 && pAutonoteTxt[var_value].pText ) |
| 492 | 5728 { |
| 5729 v20 = pPlayers[currPlayerId + 1]; | |
| 187 | 5730 v20->PlaySound(SPEECH_96, 0); |
| 1453 | 5731 //v21 = pAutonoteTxt[var_value].eType;// dword_72371C[2 * a3]; |
| 0 | 5732 bFlashAutonotesBook = 1; |
| 1453 | 5733 _506568_autonote_type = pAutonoteTxt[var_value].eType; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5734 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
| 0 | 5735 } |
| 1453 | 5736 _449B7E_toggle_bit(pParty->_autonote_bits, var_value, 1); |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5737 PlaySoundBasedOnCondition(currPlayerId); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5738 return; |
| 0 | 5739 } |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5740 if ( var_type <= VAR_BaseLuck ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5741 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5742 switch ( var_type ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5743 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5744 case VAR_Sex: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5745 this->uSex = (PLAYER_SEX)var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5746 goto LABEL_124; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5747 case VAR_Class: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5748 this->classType = (PLAYER_CLASS_TYPE)var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5749 if ( (char)var_value == PLAYER_CLASS_LICH ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5750 { |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5751 v9 = NULL; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5752 for (int i = 0; i < 138; i++) |
| 0 | 5753 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
5754 v9 = &this->pInventoryItemList[i]; |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
5755 if (v9->uItemID == ITEM_LICH_JAR_EMPTY) |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5756 break; |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5757 } |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
5758 if (v9 != NULL && v9->uItemID != ITEM_LICH_JAR_EMPTY) |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5759 { |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5760 v10 = (int)((char *)this + 36 * 138); //originally 36 * v8. the code got to this condition only if v8 was equal to 138 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5761 *(int *)(v10 + 532) = 601; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5762 *(char *)(v10 + 558) = currPlayerId + 1; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5763 } |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5764 if ( this->sResFireBase < 20 ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5765 this->sResFireBase = 20; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5766 if ( this->sResAirBase < 20 ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5767 this->sResAirBase = 20; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5768 if ( this->sResWaterBase < 20 ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5769 this->sResWaterBase = 20; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5770 if ( this->sResEarthBase < 20 ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5771 this->sResEarthBase = 20; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5772 this->sResMindBase = 200; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5773 this->sResBodyBase = 200; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5774 v11 = this->GetSexByVoice(); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5775 this->uPrevVoiceID = this->uVoiceID; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5776 this->uPrevFace = this->uCurrentFace; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5777 if ( v11 ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5778 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5779 this->uCurrentFace = 21; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5780 this->uVoiceID = 21; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5781 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5782 else |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5783 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5784 this->uCurrentFace = 20; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5785 this->uVoiceID = 20; |
| 0 | 5786 } |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5787 ReloadPlayerPortraits(currPlayerId, this->uCurrentFace); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5788 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5789 goto LABEL_124; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5790 case VAR_CurrentHP: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5791 this->sHealth = var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5792 goto LABEL_124; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5793 case VAR_MaxHP: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5794 this->sHealth = GetMaxHealth(); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5795 return; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5796 case VAR_CurrentSP: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5797 this->sMana = var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5798 goto LABEL_124; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5799 case VAR_MaxSP: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5800 this->sMana = GetMaxMana(); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5801 return; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5802 case VAR_ACModifier: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5803 this->sACModifier = (unsigned __int8)var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5804 goto LABEL_124; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5805 case VAR_BaseLevel: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5806 this->uLevel = (unsigned __int8)var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5807 goto LABEL_124; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5808 case VAR_LevelModifier: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5809 this->sLevelModifier = (unsigned __int8)var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5810 goto LABEL_124; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5811 case VAR_Age: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5812 this->sAgeModifier = var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5813 return; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5814 case VAR_Award: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5815 if ( !((unsigned __int8)(0x80u >> ((signed __int16)var_value - 1) % 8) & |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
5816 pPlayers[currPlayerId + 1]->_achieved_awards_bits[((signed __int16)var_value - 1)/ 8]) |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5817 //&& dword_723E80_award_related[2 * a3] ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5818 && pAwards[var_value].pText ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5819 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5820 pPlayers[currPlayerId + 1]->PlaySound(SPEECH_96, 0); |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5821 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5822 PlaySoundBasedOnCondition(currPlayerId); |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5823 } |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
5824 _449B7E_toggle_bit((unsigned char *)this->_achieved_awards_bits, var_value, 1u); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5825 return; |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5826 case VAR_Experience: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5827 this->uExperience = var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5828 goto LABEL_124; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5829 case VAR_QBits_QuestsDone: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5830 if ( !((unsigned __int8)(0x80u >> ((signed __int16)var_value - 1) % 8) & pParty->_quest_bits[((signed __int16)var_value - 1) >> 3]) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5831 // && (&dword_722F10)[4 * a3] ) |
| 1310 | 5832 && pQuestTable[var_value] ) |
| 0 | 5833 { |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5834 v14 = pPlayers[currPlayerId + 1]; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5835 bFlashQuestBook = 1; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5836 v14->PlaySound(SPEECH_93, 0); |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5837 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5838 PlaySoundBasedOnCondition(currPlayerId); |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5839 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5840 v13 = (char *)pParty->_quest_bits; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5841 _449B7E_toggle_bit((unsigned char *)v13, var_value, 1u); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5842 return; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5843 case VAR_PlayerItemInHands: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5844 item.Reset(); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5845 item.Reset(); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5846 item.uItemID = var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5847 item.uAttributes = 1; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5848 pParty->SetHoldingItem(&item); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5849 if ( var_value >= ITEM_ARTIFACT_PUCK && var_value <= ITEM_RELIC_MEKORIGS_HAMMER ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5850 pParty->pIsArtifactFound[var_value-500] = 1; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5851 return; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5852 case VAR_FixedGold: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5853 Party::SetGold(var_value); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5854 return; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5855 case VAR_RandomGold: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5856 v6 = rand() % var_value + 1; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5857 Party::SetGold(v6); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5858 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[500], v6);// You have %lu gold |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5859 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5860 GameUI_DrawFoodAndGold(); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5861 return; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5862 case VAR_FixedFood: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5863 Party::SetFood(var_value); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5864 goto LABEL_124; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5865 case VAR_RandomFood: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5866 v7 = rand() % var_value + 1; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5867 Party::SetFood(v7); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5868 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[501], v7);// You have %lu food |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5869 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5870 GameUI_DrawFoodAndGold(); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5871 goto LABEL_124; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5872 case VAR_MightBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5873 goto LABEL_64; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5874 case VAR_IntellectBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5875 goto LABEL_68; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5876 case VAR_PersonalityBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5877 goto LABEL_69; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5878 case VAR_EnduranceBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5879 goto LABEL_70; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5880 case VAR_SpeedBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5881 goto LABEL_71; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5882 case VAR_AccuracyBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5883 goto LABEL_72; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5884 case VAR_LuckBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5885 goto LABEL_73; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5886 case VAR_BaseMight: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5887 this->uMight = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5888 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5889 goto LABEL_112; |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5890 case VAR_BaseIntellect: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5891 this->uIntelligence = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5892 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5893 goto LABEL_112; |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5894 case VAR_BasePersonality: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5895 this->uWillpower = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5896 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5897 goto LABEL_112; |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5898 case VAR_BaseEndurance: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5899 this->uEndurance = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5900 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5901 goto LABEL_112; |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5902 case VAR_BaseSpeed: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5903 this->uSpeed = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5904 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5905 goto LABEL_112; |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5906 case VAR_BaseAccuracy: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5907 this->uAccuracy = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5908 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5909 goto LABEL_112; |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5910 case VAR_BaseLuck: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5911 this->uLuck = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5912 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5913 goto LABEL_112; |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5914 default: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5915 return; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5916 } |
| 0 | 5917 LABEL_111: |
| 187 | 5918 v26 = SPEECH_91; |
| 0 | 5919 LABEL_112: |
| 492 | 5920 v19 = pPlayers[currPlayerId + 1]; |
|
1260
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
5921 v19->PlaySound((PlayerSpeech)v26, 0); |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5922 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5923 PlaySoundBasedOnCondition(currPlayerId); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5924 return; |
| 0 | 5925 } |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5926 if ( var_type <= VAR_MagicResistance ) |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5927 { |
| 492 | 5928 switch ( var_type ) |
| 0 | 5929 { |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5930 case VAR_ActualMight: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5931 LABEL_64: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5932 this->uMightBonus = (unsigned __int8)var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
5933 goto LABEL_111; |
| 0 | 5934 case VAR_ActualIntellect: |
| 5935 LABEL_68: | |
| 492 | 5936 this->uIntelligenceBonus = (unsigned __int8)var_value; |
| 0 | 5937 goto LABEL_111; |
| 5938 case VAR_ActualPersonality: | |
| 5939 LABEL_69: | |
| 492 | 5940 this->uWillpowerBonus = (unsigned __int8)var_value; |
| 0 | 5941 goto LABEL_111; |
| 5942 case VAR_ActualEndurance: | |
| 5943 LABEL_70: | |
| 492 | 5944 this->uEnduranceBonus = (unsigned __int8)var_value; |
| 0 | 5945 goto LABEL_111; |
| 5946 case VAR_ActualSpeed: | |
| 5947 LABEL_71: | |
| 492 | 5948 this->uSpeedBonus = (unsigned __int8)var_value; |
| 0 | 5949 goto LABEL_111; |
| 5950 case VAR_ActualAccuracy: | |
| 5951 LABEL_72: | |
| 492 | 5952 this->uAccuracyBonus = (unsigned __int8)var_value; |
| 0 | 5953 goto LABEL_111; |
| 5954 case VAR_ActualLuck: | |
| 5955 LABEL_73: | |
| 492 | 5956 this->uLuckBonus = (unsigned __int8)var_value; |
| 0 | 5957 goto LABEL_111; |
| 5958 case VAR_FireResistance: | |
| 492 | 5959 this->sResFireBase = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5960 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5961 goto LABEL_112; |
| 0 | 5962 case VAR_AirResistance: |
| 492 | 5963 this->sResAirBase = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5964 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5965 goto LABEL_112; |
| 0 | 5966 case VAR_WaterResistance: |
| 492 | 5967 this->sResWaterBase = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5968 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5969 goto LABEL_112; |
| 0 | 5970 case VAR_EarthResistance: |
| 492 | 5971 this->sResEarthBase = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5972 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5973 goto LABEL_112; |
| 0 | 5974 case VAR_SpiritResistance: |
| 492 | 5975 this->sResSpiritBase = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5976 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5977 goto LABEL_112; |
| 0 | 5978 case VAR_MindResistance: |
| 492 | 5979 this->sResMindBase = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5980 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5981 goto LABEL_112; |
| 0 | 5982 case VAR_BodyResistance: |
| 492 | 5983 this->sResBodyBase = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5984 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5985 goto LABEL_112; |
| 0 | 5986 case VAR_LightResistance: |
| 492 | 5987 this->sResLightBase = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5988 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5989 goto LABEL_112; |
| 0 | 5990 case VAR_DarkResistance: |
| 492 | 5991 this->sResDarkBase = (unsigned __int8)var_value; |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5992 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5993 goto LABEL_112; |
| 0 | 5994 case VAR_MagicResistance: |
| 492 | 5995 this->sResMagicBase = (unsigned __int8)var_value; |
| 0 | 5996 v26 = 92; |
| 5997 goto LABEL_112; | |
| 5998 default: | |
| 5999 return; | |
| 6000 } | |
| 6001 return; | |
| 6002 } | |
| 6003 HIWORD(v15) = 0; | |
| 492 | 6004 if ( var_type > VAR_DisarmTrapSkill ) |
| 6005 { | |
| 6006 if ( var_type != VAR_LearningSkill ) | |
| 6007 { | |
| 6008 if ( var_type <= VAR_LearningSkill ) | |
| 0 | 6009 return; |
| 492 | 6010 if ( var_type <= VAR_Eradicated ) |
| 6011 { | |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6012 this->SetCondition(var_type - 105, 1); |
| 0 | 6013 } |
| 6014 else | |
| 6015 { | |
| 492 | 6016 if ( var_type != VAR_MajorCondition ) |
| 0 | 6017 { |
| 492 | 6018 if ( var_type > VAR_MajorCondition && var_type <= VAR_ActiveSpells ) |
| 6019 byte_5E4C15[var_type] = var_value; | |
| 0 | 6020 return; |
| 6021 } | |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6022 memset(this, 0, 0xA0u); |
| 0 | 6023 } |
| 6024 } | |
| 6025 else | |
| 6026 { | |
|
1260
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6027 v16 = (int)((char *)&this->pConditions[16] + 2 * var_type); |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6028 v17 = *(char *)v16; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6029 if ( var_value <= VAR_BodyResistanceBonus ) |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6030 { |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6031 LOWORD(v15) = (unsigned __int8)var_value; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6032 v18 = v15 | v17 & VAR_BodyResistanceBonus; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6033 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6034 else |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6035 { |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6036 LOWORD(v18) = (unsigned __int8)(var_value | v17 & 0xC0); |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6037 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6038 *(short *)v16 = v18; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6039 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6040 LABEL_124: |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6041 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6042 PlaySoundBasedOnCondition(currPlayerId); |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6043 return; |
| 0 | 6044 } |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6045 if ( var_type <= VAR_MagicResistanceBonus ) |
| 492 | 6046 { |
| 6047 switch ( var_type ) | |
| 0 | 6048 { |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6049 case VAR_FireResistanceBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6050 this->sResFireBonus = (unsigned __int8)var_value; |
| 0 | 6051 break; |
| 6052 case VAR_AirResistanceBonus: | |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6053 this->sResAirBonus = (unsigned __int8)var_value; |
| 0 | 6054 break; |
| 6055 case VAR_WaterResistanceBonus: | |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6056 this->sResWaterBonus = (unsigned __int8)var_value; |
| 0 | 6057 break; |
| 6058 case VAR_EarthResistanceBonus: | |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6059 this->sResEarthBonus = (unsigned __int8)var_value; |
| 0 | 6060 break; |
| 6061 case VAR_SpiritResistanceBonus: | |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6062 this->sResSpiritBonus = (unsigned __int8)var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6063 break; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6064 case VAR_MindResistanceBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6065 this->sResMindBonus = (unsigned __int8)var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6066 break; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6067 case VAR_BodyResistanceBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6068 this->sResBodyBonus = (unsigned __int8)var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6069 break; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6070 case VAR_LightResistanceBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6071 this->sResLightBonus = (unsigned __int8)var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6072 break; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6073 case VAR_DarkResistanceBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6074 this->sResDarkBonus = (unsigned __int8)var_value; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6075 break; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6076 case VAR_PhysicalResistanceBonus: |
| 1545 | 6077 Assert("VAR_PhysicalResistanceBonus variable unsupported" && false); |
|
1251
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6078 return; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6079 break; |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6080 case VAR_MagicResistanceBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6081 this->sResMagicBonus = (unsigned __int8)var_value; |
| 0 | 6082 break; |
| 6083 default: | |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
6084 Error("Unexpected var_type: %u", var_type); |
| 0 | 6085 return; |
| 6086 break; | |
| 6087 } | |
| 6088 goto LABEL_111; | |
| 6089 } | |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6090 if ( var_type > VAR_MagicResistanceBonus && var_type <= VAR_DiplomacySkill || var_type == VAR_DisarmTrapSkill) //VAR_ThieverySkill wasn't present in the original function |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6091 { |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6092 return; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6093 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6094 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6095 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6096 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6097 //----- (new function) -------------------------------------------------------- |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6098 void Player::PlaySoundBasedOnCondition(int currPlayerId) |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6099 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6100 signed int v25 = 8 * currPlayerId + 400; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6101 LOBYTE(v25) = PID(OBJECT_Player,currPlayerId - 112); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6102 pAudioPlayer->PlaySound(SOUND_20001, v25, 0, -1, 0, 0, 0, 0); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6103 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6104 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6105 //----- (new function) -------------------------------------------------------- |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6106 void Player::DrawPlayerBuffAnimBasedOnCondition(int currPlayerId) |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6107 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6108 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6109 } |
| 0 | 6110 |
| 6111 //----- (0044AFFB) -------------------------------------------------------- | |
| 310 | 6112 void Player::AddVariable(enum VariableType var_type, signed int val) |
| 0 | 6113 { |
| 6114 char v3; // bl@1 | |
| 6115 Player *v4; // esi@1 | |
| 6116 signed int uPlayerIdx; // edi@1 | |
| 6117 int v6; // eax@15 | |
| 6118 unsigned int v7; // esi@18 | |
| 6119 int *v8; // ebx@21 | |
| 6120 int v9; // eax@22 | |
| 6121 signed int v10; // eax@24 | |
| 6122 int v11; // eax@27 | |
| 6123 __int16 *v12; // esi@28 | |
| 6124 Player *v13; // ecx@34 | |
| 6125 Player *v14; // ecx@36 | |
| 6126 char *v15; // ecx@37 | |
| 6127 unsigned __int8 v16; // cf@38 | |
| 6128 Player *v17; // ecx@42 | |
| 6129 __int16 *v18; // esi@53 | |
| 6130 __int16 *v19; // esi@62 | |
| 6131 char *v20; // esi@107 | |
| 6132 __int16 v21; // dx@107 | |
| 6133 int v22; // ecx@107 | |
| 6134 Player *v23; // ecx@132 | |
| 6135 int v24; // eax@132 | |
| 6136 int v25; // eax@150 | |
| 6137 char v26; // zf@151 | |
| 6138 DDM_DLV_Header *v27; // eax@153 | |
| 6139 signed int v28; // eax@176 | |
| 6140 int v29; // [sp-8h] [bp-40h]@84 | |
| 310 | 6141 // signed int v30; // [sp-4h] [bp-3Ch]@4 |
| 0 | 6142 int v31; // [sp-4h] [bp-3Ch]@84 |
| 6143 ItemGen item; // [sp+Ch] [bp-2Ch]@45 | |
| 6144 unsigned int v33; // [sp+30h] [bp-8h]@34 | |
| 6145 char v34; // [sp+37h] [bp-1h]@1 | |
| 6146 | |
| 6147 auto Dst = this; | |
| 6148 v3 = 0; | |
| 6149 v34 = 0; | |
| 6150 v4 = Dst; | |
| 6151 uPlayerIdx = 0; | |
| 6152 if ( Dst == pPlayers[2] ) | |
| 6153 uPlayerIdx = 1; | |
| 310 | 6154 else if ( Dst == pPlayers[3] ) |
| 6155 uPlayerIdx = 2; | |
| 6156 else if ( Dst == pPlayers[4] ) | |
| 6157 uPlayerIdx = 3; | |
| 6158 | |
| 6159 if ( var_type <= VAR_AutoNotes ) | |
| 6160 { | |
| 6161 if ( var_type != VAR_AutoNotes ) | |
| 6162 { | |
| 6163 if ( var_type <= VAR_ActualMight ) | |
| 6164 { | |
| 6165 if ( var_type != VAR_ActualMight ) | |
| 0 | 6166 { |
| 310 | 6167 switch ( var_type ) |
| 0 | 6168 { |
| 6169 case VAR_RandomGold: | |
| 6170 if ( !val ) | |
| 6171 val = 1; | |
| 6172 v6 = rand(); | |
| 6173 party_finds_gold(v6 % val + 1, 1); | |
| 6174 GameUI_DrawFoodAndGold(); | |
| 6175 return; | |
| 6176 case VAR_RandomFood: | |
| 6177 if ( !val ) | |
| 6178 val = 1; | |
| 6179 v7 = rand() % val + 1; | |
| 6180 Party::GiveFood(v7); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6181 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[502], v7);// You find %lu food |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6182 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 6183 GameUI_DrawFoodAndGold(); |
| 6184 goto _play_sound; | |
| 6185 case VAR_Sex: | |
| 6186 Dst->uSex = (PLAYER_SEX)val; | |
| 1507 | 6187 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6188 goto _play_sound; | |
| 0 | 6189 case VAR_Class: |
| 135 | 6190 Dst->classType = (PLAYER_CLASS_TYPE)val; |
| 1507 | 6191 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6192 goto _play_sound; | |
| 0 | 6193 case VAR_CurrentHP: |
| 6194 v8 = &Dst->sHealth; | |
| 6195 *v8 += val; | |
| 6196 if ( Dst->sHealth <= Dst->GetMaxHealth() ) | |
| 1507 | 6197 { |
| 6198 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6199 goto _play_sound; | |
| 6200 } | |
| 0 | 6201 v9 = v4->GetMaxHealth(); |
| 6202 goto LABEL_23; | |
| 6203 case VAR_MaxHP: | |
| 6204 v10 = Dst->GetMaxHealth(); | |
| 6205 v4->_health_related = 0; | |
| 6206 v4->uFullHealthBonus = 0; | |
| 6207 v4->sHealth = v10; | |
| 6208 return; | |
| 6209 case VAR_CurrentSP: | |
| 6210 v8 = &Dst->sMana; | |
| 6211 *v8 += val; | |
| 6212 if ( Dst->sMana > GetMaxMana() ) | |
| 6213 { | |
| 6214 v9 = v4->GetMaxMana(); | |
| 6215 LABEL_23: | |
| 6216 *v8 = v9; | |
| 6217 } | |
| 1507 | 6218 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6219 goto _play_sound; | |
| 0 | 6220 case VAR_MaxSP: |
| 6221 v11 = GetMaxMana(); | |
| 6222 v4->_mana_related = 0; | |
| 6223 v4->uFullManaBonus = 0; | |
| 6224 v4->sMana = v11; | |
| 6225 return; | |
| 6226 case VAR_ACModifier: | |
| 6227 v12 = &Dst->sACModifier; | |
| 6228 goto LABEL_29; | |
| 6229 case VAR_BaseLevel: | |
| 6230 v12 = (__int16 *)&Dst->uLevel; | |
| 6231 goto LABEL_29; | |
| 6232 case VAR_LevelModifier: | |
| 6233 v12 = &Dst->sLevelModifier; | |
| 6234 LABEL_29: | |
| 6235 *v12 += val; | |
| 6236 if ( *v12 > 255 ) | |
| 6237 *v12 = 255; | |
| 1507 | 6238 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6239 goto _play_sound; | |
| 0 | 6240 case VAR_Age: |
| 6241 Dst->sAgeModifier += val; | |
| 6242 return; | |
| 6243 case VAR_Award: | |
| 6244 v13 = pPlayers[uPlayerIdx + 1]; | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6245 if (_449B57_test_bit((unsigned __int8 *)pPlayers[uPlayerIdx + 1]->_achieved_awards_bits, val) |
| 521 | 6246 |
| 492 | 6247 && pAwards[val].pText ) |
| 0 | 6248 { |
| 6249 v14 = pPlayers[uPlayerIdx + 1]; | |
| 6250 v34 = 1; | |
| 6251 v3 = 1; | |
| 187 | 6252 v14->PlaySound(SPEECH_96, 0); |
| 0 | 6253 } |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6254 v15 = (char *)v4->_achieved_awards_bits; |
| 1507 | 6255 _449B7E_toggle_bit((unsigned char *)v15, val, 1); |
| 6256 if ( v34 != 1 ) | |
| 6257 { | |
| 6258 if ( v3 != 1 ) | |
| 6259 return; | |
| 6260 goto _play_sound; | |
| 6261 } | |
| 6262 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6263 if ( v3 != 1 ) | |
| 6264 return; | |
| 6265 goto _play_sound; | |
| 0 | 6266 case VAR_Experience: |
| 6267 v16 = __CFADD__(val, LODWORD(Dst->uExperience)); | |
| 6268 LODWORD(Dst->uExperience) += val; | |
| 6269 HIDWORD(Dst->uExperience) += ((unsigned __int64)val >> 32) + v16; | |
| 6270 if ( (signed __int64)Dst->uExperience > 4000000000i64 ) | |
| 6271 Dst->uExperience = 4000000000i64; | |
| 1507 | 6272 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6273 goto _play_sound; | |
| 0 | 6274 case VAR_QBits_QuestsDone: |
| 484 | 6275 if ( !((unsigned __int8)(0x80u >> ((signed __int16)val - 1) % 8) & pParty->_quest_bits[((signed __int16)val - 1) >> 3]) |
|
81
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
6276 //&& (&dword_722F10)[4 * val] ) |
| 1310 | 6277 && pQuestTable[val] ) |
| 0 | 6278 { |
| 501 | 6279 //v17 = pPlayers[uPlayerIdx + 1]; |
| 0 | 6280 bFlashQuestBook = 1; |
| 6281 v34 = 1; | |
| 6282 v3 = 1; | |
| 501 | 6283 pPlayers[uPlayerIdx + 1]->PlaySound(SPEECH_93, 0); |
| 0 | 6284 } |
| 484 | 6285 v15 = (char *)pParty->_quest_bits; |
| 1507 | 6286 _449B7E_toggle_bit((unsigned char *)v15, val, 1); |
| 6287 if ( v34 != 1 ) | |
| 6288 { | |
| 6289 if ( v3 != 1 ) | |
| 6290 return; | |
| 6291 goto _play_sound; | |
| 6292 } | |
| 6293 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6294 if ( v3 != 1 ) | |
| 6295 return; | |
| 6296 goto _play_sound; | |
| 0 | 6297 case VAR_PlayerItemInHands: |
| 6298 item.Reset(); | |
| 6299 item.Reset(); | |
| 6300 item.uAttributes = 1; | |
| 6301 item.uItemID = val; | |
| 6302 if ( val >= ITEM_ARTIFACT_PUCK && val <= ITEM_RELIC_MEKORIGS_HAMMER ) | |
| 484 | 6303 pParty->pIsArtifactFound[val-500] = 1; |
| 0 | 6304 if ( val >= ITEM_WAND_FIRE && val <= ITEM_WAND_INCENERATION ) |
| 6305 { | |
| 6306 item.uNumCharges = rand() % 6 + pItemsTable->pItems[item.uItemID].uDamageMod + 1; | |
| 6307 item.uMaxCharges = LOBYTE(item.uNumCharges); | |
| 6308 } | |
| 6309 pParty->SetHoldingItem(&item); | |
| 6310 return; | |
| 6311 case VAR_FixedGold: | |
| 6312 party_finds_gold(val, 1); | |
| 6313 return; | |
| 6314 case VAR_BaseMight: | |
| 6315 v18 = (__int16 *)&Dst->uMight; | |
| 6316 goto LABEL_82; | |
| 6317 case VAR_BaseIntellect: | |
| 6318 v18 = (__int16 *)&Dst->uIntelligence; | |
| 6319 goto LABEL_82; | |
| 6320 case VAR_BasePersonality: | |
| 6321 v18 = (__int16 *)&Dst->uWillpower; | |
| 6322 goto LABEL_82; | |
| 6323 case VAR_BaseEndurance: | |
| 6324 v18 = (__int16 *)&Dst->uEndurance; | |
| 6325 goto LABEL_82; | |
| 6326 case VAR_BaseSpeed: | |
| 6327 v18 = (__int16 *)&Dst->uSpeed; | |
| 6328 goto LABEL_82; | |
| 6329 case VAR_BaseAccuracy: | |
| 6330 v18 = (__int16 *)&Dst->uAccuracy; | |
| 6331 goto LABEL_82; | |
| 6332 case VAR_BaseLuck: | |
| 6333 v18 = (__int16 *)&Dst->uLuck; | |
| 6334 goto LABEL_82; | |
| 6335 case VAR_FixedFood: | |
| 6336 Party::GiveFood(val); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6337 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[502], val); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6338 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 6339 if ( pParty->uNumFoodRations > 0xFFFF ) |
| 6340 Party::SetFood(0xFFFFu); | |
| 6341 goto _play_sound; | |
| 6342 case VAR_MightBonus: | |
| 6343 goto LABEL_62; | |
| 6344 case VAR_IntellectBonus: | |
| 6345 goto LABEL_66; | |
| 6346 case VAR_PersonalityBonus: | |
| 6347 goto LABEL_67; | |
| 6348 case VAR_EnduranceBonus: | |
| 6349 goto LABEL_68; | |
| 6350 case VAR_SpeedBonus: | |
| 6351 goto LABEL_69; | |
| 6352 case VAR_AccuracyBonus: | |
| 6353 goto LABEL_70; | |
| 6354 case VAR_LuckBonus: | |
| 6355 goto LABEL_71; | |
| 6356 default: | |
| 6357 return; | |
| 6358 } | |
| 6359 return; | |
| 6360 } | |
| 6361 LABEL_62: | |
| 6362 v19 = (__int16 *)&Dst->uMightBonus; | |
| 6363 goto LABEL_113; | |
| 6364 } | |
| 310 | 6365 if ( var_type <= VAR_FireResistanceBonus ) |
| 6366 { | |
| 6367 if ( var_type != VAR_FireResistanceBonus ) | |
| 0 | 6368 { |
| 310 | 6369 switch ( var_type ) |
| 0 | 6370 { |
| 6371 case VAR_ActualIntellect: | |
| 6372 LABEL_66: | |
| 6373 v19 = (__int16 *)&Dst->uIntelligenceBonus; | |
| 6374 goto LABEL_113; | |
| 6375 case VAR_ActualPersonality: | |
| 6376 LABEL_67: | |
| 6377 v19 = (__int16 *)&Dst->uWillpowerBonus; | |
| 6378 goto LABEL_113; | |
| 6379 case VAR_ActualEndurance: | |
| 6380 LABEL_68: | |
| 6381 v19 = (__int16 *)&Dst->uEnduranceBonus; | |
| 6382 goto LABEL_113; | |
| 6383 case VAR_ActualSpeed: | |
| 6384 LABEL_69: | |
| 6385 v19 = (__int16 *)&Dst->uSpeedBonus; | |
| 6386 goto LABEL_113; | |
| 6387 case VAR_ActualAccuracy: | |
| 6388 LABEL_70: | |
| 6389 v19 = (__int16 *)&Dst->uAccuracyBonus; | |
| 6390 goto LABEL_113; | |
| 6391 case VAR_ActualLuck: | |
| 6392 LABEL_71: | |
| 6393 v19 = (__int16 *)&Dst->uLuckBonus; | |
| 6394 goto LABEL_113; | |
| 6395 case VAR_FireResistance: | |
| 6396 v18 = &Dst->sResFireBase; | |
| 6397 goto LABEL_82; | |
| 6398 case VAR_AirResistance: | |
| 6399 v18 = &Dst->sResAirBase; | |
| 6400 goto LABEL_82; | |
| 6401 case VAR_WaterResistance: | |
| 6402 v18 = &Dst->sResWaterBase; | |
| 6403 goto LABEL_82; | |
| 6404 case VAR_EarthResistance: | |
| 6405 v18 = &Dst->sResEarthBase; | |
| 6406 goto LABEL_82; | |
| 6407 case VAR_SpiritResistance: | |
| 6408 v18 = &Dst->sResSpiritBase; | |
| 6409 goto LABEL_82; | |
| 6410 case VAR_MindResistance: | |
| 6411 v18 = &Dst->sResMindBase; | |
| 6412 goto LABEL_82; | |
| 6413 case VAR_BodyResistance: | |
| 6414 v18 = &Dst->sResBodyBase; | |
| 6415 goto LABEL_82; | |
| 6416 case VAR_LightResistance: | |
| 6417 v18 = &Dst->sResLightBase; | |
| 6418 goto LABEL_82; | |
| 6419 case VAR_DarkResistance: | |
| 6420 v18 = &Dst->sResDarkBase; | |
| 6421 goto LABEL_82; | |
| 6422 case VAR_MagicResistance: | |
| 6423 v18 = &Dst->sResMagicBase; | |
| 6424 LABEL_82: | |
| 6425 *v18 += val; | |
| 6426 if ( *v18 > 255 ) | |
| 6427 *v18 = 255; | |
| 1507 | 6428 pPlayers[uPlayerIdx + 1]->PlaySound(SPEECH_92, 0); |
| 6429 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6430 goto _play_sound; | |
| 0 | 6431 default: |
| 6432 return; | |
| 6433 } | |
| 6434 return; | |
| 6435 } | |
| 6436 v19 = &Dst->sResFireBonus; | |
| 6437 LABEL_113: | |
| 6438 *v19 += val; | |
| 6439 if ( *v19 > 255 ) | |
| 6440 *v19 = 255; | |
| 6441 v31 = 0; | |
| 187 | 6442 v29 = SPEECH_91; |
| 6443 pPlayers[uPlayerIdx + 1]->PlaySound((PlayerSpeech)v29, v31); | |
| 1507 | 6444 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6445 goto _play_sound; | |
| 0 | 6446 } |
| 310 | 6447 if ( var_type <= VAR_DisarmTrapSkill ) |
| 6448 { | |
| 6449 if ( var_type != VAR_DisarmTrapSkill ) | |
| 0 | 6450 { |
| 310 | 6451 if ( var_type <= VAR_BodyResistanceBonus ) |
| 0 | 6452 { |
| 310 | 6453 switch ( var_type ) |
| 0 | 6454 { |
| 6455 case VAR_BodyResistanceBonus: | |
| 6456 v19 = &Dst->sResBodyBonus; | |
| 6457 break; | |
| 6458 case VAR_AirResistanceBonus: | |
| 6459 v19 = &Dst->sResAirBonus; | |
| 6460 break; | |
| 6461 case VAR_WaterResistanceBonus: | |
| 6462 v19 = &Dst->sResWaterBonus; | |
| 6463 break; | |
| 6464 case VAR_EarthResistanceBonus: | |
| 6465 v19 = &Dst->sResEarthBonus; | |
| 6466 break; | |
| 6467 case VAR_SpiritResistanceBonus: | |
| 6468 v19 = &Dst->sResSpiritBonus; | |
| 6469 break; | |
| 6470 default: | |
| 310 | 6471 if ( var_type != 62 ) |
| 0 | 6472 return; |
| 6473 v19 = &Dst->sResMindBonus; | |
| 6474 break; | |
| 6475 } | |
| 6476 goto LABEL_113; | |
| 6477 } | |
| 310 | 6478 if ( var_type == VAR_LightResistanceBonus ) |
| 0 | 6479 { |
| 6480 v19 = &Dst->sResLightBonus; | |
| 6481 goto LABEL_113; | |
| 6482 } | |
| 310 | 6483 if ( var_type == VAR_DarkResistanceBonus ) |
| 0 | 6484 { |
| 6485 v19 = &Dst->sResDarkBonus; | |
| 6486 goto LABEL_113; | |
| 6487 } | |
| 310 | 6488 if ( var_type == VAR_MagicResistanceBonus ) |
| 0 | 6489 { |
| 6490 v19 = &Dst->sResMagicBonus; | |
| 6491 goto LABEL_113; | |
| 6492 } | |
| 310 | 6493 if ( var_type <= VAR_MagicResistanceBonus || var_type > VAR_DiplomacySkill ) |
| 0 | 6494 return; |
| 6495 } | |
| 6496 goto LABEL_106; | |
| 6497 } | |
| 310 | 6498 if ( var_type == VAR_LearningSkill ) |
| 0 | 6499 { |
| 6500 LABEL_106: | |
| 6501 if ( val <= VAR_BodyResistanceBonus ) | |
| 6502 { | |
| 310 | 6503 *((short *)&Dst->pConditions[16] + var_type) = (unsigned __int8)val | *((char *)&Dst->pConditions[16] + 2 * var_type) & VAR_BodyResistanceBonus; |
| 0 | 6504 } |
| 6505 else | |
| 6506 { | |
| 310 | 6507 v20 = (char *)&Dst->pConditions[16] + 2 * var_type; |
| 0 | 6508 v21 = *(short *)v20; |
| 6509 v22 = (unsigned __int8)val + (v21 & VAR_BodyResistanceBonus); | |
| 6510 if ( v22 > 60 ) | |
| 6511 LOWORD(v22) = 60; | |
| 6512 LOBYTE(v21) = v21 & 0xC0; | |
| 6513 *(short *)v20 = v22 | v21; | |
| 6514 } | |
| 1507 | 6515 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6516 goto _play_sound; | |
| 0 | 6517 } |
| 310 | 6518 if ( var_type <= VAR_LearningSkill ) |
| 0 | 6519 return; |
| 310 | 6520 if ( var_type <= VAR_Eradicated ) |
| 6521 { | |
| 6522 Dst->SetCondition(var_type - 105, 0); | |
| 0 | 6523 } |
| 6524 else | |
| 6525 { | |
| 310 | 6526 if ( var_type != VAR_MajorCondition ) |
| 0 | 6527 { |
| 310 | 6528 if ( var_type > VAR_MajorCondition && var_type <= VAR_ActiveSpells ) |
| 0 | 6529 { |
| 310 | 6530 if ( (unsigned __int8)val + (unsigned __int8)byte_5E4C15[var_type] <= 255 ) |
| 6531 byte_5E4C15[var_type] += val; | |
| 0 | 6532 else |
| 310 | 6533 byte_5E4C15[var_type] = -1; |
| 0 | 6534 } |
| 6535 return; | |
| 6536 } | |
| 6537 memset(Dst, 0, 0xA0u); | |
| 6538 } | |
| 6539 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6540 goto _play_sound; | |
| 6541 } | |
| 6542 if ( !((unsigned __int8)(0x80u >> ((signed __int16)val - 1) % 8) & pParty->_autonote_bits[((signed __int16)val - 1) >> 3]) | |
|
81
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
6543 //&& (&dword_723718_autonote_related)[8 * val] ) |
| 1310 | 6544 && pAutonoteTxt[val].pText ) |
| 0 | 6545 { |
| 6546 v23 = pPlayers[uPlayerIdx + 1]; | |
| 6547 v34 = 1; | |
| 187 | 6548 v23->PlaySound(SPEECH_96, 0); |
| 1453 | 6549 //v24 = pAutonoteTxt[val].eType;//dword_72371C[2 * val]; |
| 0 | 6550 bFlashAutonotesBook = 1; |
| 1453 | 6551 _506568_autonote_type = pAutonoteTxt[val].eType; |
| 6552 } | |
| 6553 _449B7E_toggle_bit(pParty->_autonote_bits, val, 1); | |
| 0 | 6554 v3 = 1; |
| 6555 if ( v34 != 1 ) | |
| 1507 | 6556 { |
| 6557 if ( v3 != 1 ) | |
| 6558 return; | |
| 6559 goto _play_sound; | |
| 6560 } | |
| 6561 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6562 if ( v3 != 1 ) | |
| 6563 return; | |
| 6564 goto _play_sound; | |
| 0 | 6565 } |
| 310 | 6566 if ( var_type > VAR_GoldInBank ) |
| 6567 { | |
| 6568 if ( var_type == 307 ) | |
| 0 | 6569 { |
| 6570 pParty->uNumDeaths += val; | |
| 1507 | 6571 if ( v34 != 1 ) |
| 6572 { | |
| 6573 if ( v3 != 1 ) | |
| 6574 return; | |
| 6575 goto _play_sound; | |
| 6576 } | |
| 6577 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6578 if ( v3 != 1 ) | |
| 6579 return; | |
| 6580 goto _play_sound; | |
| 0 | 6581 } |
| 310 | 6582 switch ( var_type ) |
| 0 | 6583 { |
| 6584 case 308: | |
| 6585 pParty->uNumBountiesCollected += val; | |
| 6586 break; | |
| 6587 case 309: | |
| 6588 pParty->uNumPrisonTerms += val; | |
| 6589 break; | |
| 6590 case 310: | |
| 6591 pParty->uNumArenaPageWins += val; | |
| 6592 break; | |
| 6593 case 311: | |
| 6594 pParty->uNumArenaSquireWins += val; | |
| 6595 break; | |
| 6596 case 312: | |
| 6597 pParty->uNumArenaKnightWins += val; | |
| 6598 break; | |
| 6599 case 313: | |
| 6600 pParty->uNumArenaLordWins += val; | |
| 6601 break; | |
| 6602 } | |
| 6603 } | |
| 6604 else | |
| 6605 { | |
| 310 | 6606 if ( var_type == VAR_GoldInBank ) |
| 0 | 6607 { |
| 6608 pParty->uNumGoldInBank += val; | |
| 6609 return; | |
| 6610 } | |
| 310 | 6611 if ( var_type <= VAR_Counter8 ) |
| 6612 { | |
| 6613 if ( (signed int)var_type >= 245 ) | |
| 6614 { | |
| 6615 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44300] = LODWORD(pParty->uTimePlayed); | |
| 6616 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44304] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 6617 } |
| 6618 else | |
| 6619 { | |
| 310 | 6620 switch ( var_type ) |
| 0 | 6621 { |
| 6622 case VAR_MonthEquals|VAR_CurrentSP: | |
| 6623 _449B7E_toggle_bit((unsigned char *)Dst->field_1A50, val, 1u); | |
| 6624 break; | |
| 6625 case VAR_NPCs2: | |
| 6626 pParty->field_709 = 0; | |
| 6627 LOBYTE(pNPCStats->pNewNPCData[val].uFlags) |= 0x80u; | |
| 1035 | 6628 pParty->CountHirelings(); |
| 6629 viewparams->bRedrawGameUI = true; | |
| 0 | 6630 break; |
| 6631 case VAR_NumSkillPoints: | |
| 6632 Dst->uSkillPoints += val; | |
| 6633 break; | |
| 6634 } | |
| 6635 } | |
| 6636 return; | |
| 6637 } | |
| 310 | 6638 if ( var_type < VAR_Counter9 ) |
| 0 | 6639 return; |
| 310 | 6640 if ( (signed int)var_type <= 274 ) |
| 6641 { | |
| 6642 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44532] = LODWORD(pParty->uTimePlayed); | |
| 6643 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44536] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 6644 goto _play_sound; |
| 6645 } | |
| 310 | 6646 if ( var_type != VAR_ReputationInCurrentLocation ) |
| 6647 { | |
| 6648 if ( var_type <= VAR_ReputationInCurrentLocation | |
| 6649 || var_type > VAR_History_28 | |
| 6650 || (v25 = var_type - 276, pParty->field_3C.field_4F0[2 * v25 + 1] | pParty->field_3C.field_4F0[2 * v25]) | |
| 6651 || (pParty->field_3C.field_4F0[2 * (var_type - 276)] = LODWORD(pParty->uTimePlayed), | |
| 233 | 6652 v26 = pStorylineText->StoreLine[v25].pText==0,//*(&pStorylineText->field_0 + 3 * v25) == 0, |
| 310 | 6653 pParty->field_3C.field_4F0[2 * (var_type - 276) + 1] = HIDWORD(pParty->uTimePlayed), |
| 0 | 6654 v26) ) |
| 6655 return; | |
| 6656 bFlashHistoryBook = 1; | |
| 6657 _play_sound: | |
| 6658 v28 = 8 * uPlayerIdx + 400; | |
| 862 | 6659 LOBYTE(v28) = PID(OBJECT_Player,uPlayerIdx - 112); |
| 0 | 6660 pAudioPlayer->PlaySound(SOUND_20001, v28, 0, -1, 0, 0, 0, 0); |
| 6661 return; | |
| 6662 } | |
| 6663 v27 = &pOutdoor->ddm; | |
| 6664 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 6665 v27 = &pIndoor->dlv; | |
| 6666 v27->uReputation += val; | |
| 6667 if ( v27->uReputation > 10000 ) | |
| 6668 v27->uReputation = 10000; | |
| 6669 } | |
| 6670 } | |
| 6671 | |
| 6672 | |
| 6673 //----- (0044B9C4) -------------------------------------------------------- | |
| 501 | 6674 bool Player::SubtractVariable(enum VariableType VarNum, signed int pValue) |
| 0 | 6675 { |
| 6676 unsigned int v3; // ebx@1 | |
| 6677 signed int v4; // esi@1 | |
| 501 | 6678 bool result; // eax@8 |
| 0 | 6679 int v6; // esi@11 |
| 6680 int v7; // edi@14 | |
| 6681 signed int v8; // eax@17 | |
| 6682 char *v9; // eax@20 | |
| 6683 char v10; // sf@20 | |
| 6684 char *v11; // ecx@26 | |
| 6685 char *v12; // ecx@27 | |
| 6686 __int64 v13; // qax@27 | |
| 6687 unsigned __int8 v14; // cf@27 | |
| 501 | 6688 int *v15; // edx@29 |
| 0 | 6689 char *v16; // eax@90 |
| 6690 char *v17; // ecx@94 | |
| 501 | 6691 int v18; // esi@97 |
| 0 | 6692 signed int v19; // edx@97 |
| 6693 char *v20; // ecx@98 | |
| 6694 int v21; // eax@100 | |
| 6695 __int16 v22; // dx@112 | |
| 6696 int v23; // [sp-8h] [bp-14h]@45 | |
| 6697 signed int v24; // [sp-4h] [bp-10h]@4 | |
| 6698 int v25; // [sp-4h] [bp-10h]@45 | |
| 6699 | |
| 6700 v3 = 0; | |
| 605 | 6701 v4 = uActiveCharacter - 1; |
| 501 | 6702 result = false; |
| 6703 if ( (signed int)VarNum > 222 ) | |
| 6704 { | |
| 6705 if ( (signed int)VarNum <= 307 ) | |
| 6706 { | |
| 6707 if ( VarNum == 307 ) | |
| 6708 { | |
| 6709 pParty->uNumDeaths -= (unsigned int)pValue; | |
| 6710 return pValue; | |
| 6711 } | |
| 6712 if ( VarNum == 223 ) | |
| 0 | 6713 { |
| 6714 v11 = (char *)pParty->_autonote_bits; | |
| 501 | 6715 v22 = (short)pValue - 1; |
| 0 | 6716 } |
| 6717 else | |
| 6718 { | |
| 501 | 6719 if ( VarNum != 231 ) |
| 0 | 6720 { |
| 501 | 6721 switch ( VarNum ) |
| 0 | 6722 { |
| 6723 case 232: | |
| 501 | 6724 VarNum = (VariableType)0; |
| 1094 | 6725 GetNewNPCData(sDialogue_SpeakingActorNPC_ID, (int*)&VarNum); |
| 501 | 6726 result = (bool) pValue; |
| 6727 dword_5B65CC = 0; | |
| 6728 if ( (int)VarNum == pValue ) | |
| 0 | 6729 { |
| 501 | 6730 dword_5B65CC = (int)pValue; |
| 0 | 6731 } |
| 6732 else | |
| 6733 { | |
| 6734 pParty->field_709 = 0; | |
| 501 | 6735 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
| 1035 | 6736 pParty->CountHirelings(); |
| 6737 viewparams->bRedrawGameUI = true; | |
| 0 | 6738 } |
| 6739 break; | |
| 6740 case 241: | |
| 6741 if ( (signed int)pNPCStats->uNumNewNPCs > 0 ) | |
| 6742 { | |
| 6743 v20 = (char *)&pNPCStats->pNewNPCData[0].uFlags; | |
| 605 | 6744 for ( v19 = 0; v19 < (signed int)pNPCStats->uNumNewNPCs; ++v19 ) |
| 0 | 6745 { |
| 605 | 6746 if ( *((void **)v20 + 4) == (void *)pValue ) |
| 0 | 6747 { |
| 6748 v21 = *(int *)v20; | |
| 6749 if ( (char)*(int *)v20 < 0 ) | |
| 6750 { | |
| 6751 LOBYTE(v21) = v21 & 0x7F; | |
| 6752 *(int *)v20 = v21; | |
| 6753 } | |
| 6754 } | |
| 6755 v20 += 76; | |
| 6756 } | |
| 6757 } | |
| 605 | 6758 if ( pParty->pHirelings[0].uProfession == pValue ) |
| 0 | 6759 memset(pParty->pHirelings, 0, 0x4Cu); |
| 605 | 6760 if ( pParty->pHirelings[1].uProfession == pValue ) |
| 0 | 6761 memset(&pParty->pHirelings[1], 0, 0x4Cu); |
| 6762 pParty->field_709 = 0; | |
| 1035 | 6763 pParty->CountHirelings(); |
| 0 | 6764 break; |
| 6765 case 243: | |
| 6766 v17 = (char *)&this->uSkillPoints; | |
|
1113
39eaa6b00141
something to bool cast (performance warning) mostly fixed
Grumpy7
parents:
1097
diff
changeset
|
6767 result = *v17 != NULL; |
| 501 | 6768 if ( (unsigned int)pValue <= *(int *)v17 ) |
| 6769 { | |
| 6770 *(int *)v17 -= (int)pValue; | |
|
1113
39eaa6b00141
something to bool cast (performance warning) mostly fixed
Grumpy7
parents:
1097
diff
changeset
|
6771 result = (v17 != NULL); |
| 501 | 6772 } |
| 0 | 6773 else |
| 6774 *(int *)v17 = 0; | |
| 6775 break; | |
| 6776 case 275: | |
| 6777 v16 = (char *)&pOutdoor->ddm; | |
| 6778 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 6779 v16 = (char *)&pIndoor->dlv; | |
| 501 | 6780 *((int *)v16 + 2) -= (int)pValue; |
| 0 | 6781 if ( *((int *)v16 + 2) < -10000 ) |
| 6782 *((int *)v16 + 2) = -10000; | |
| 6783 break; | |
| 6784 case 306: | |
| 501 | 6785 result = VarNum - 306; |
| 6786 if ( (unsigned int)pValue <= pParty->uNumGoldInBank ) | |
| 6787 { | |
| 6788 result = (bool)pValue; | |
| 6789 pParty->uNumGoldInBank -= (unsigned int)pValue; | |
| 605 | 6790 } |
| 0 | 6791 else |
| 6792 LABEL_88: | |
| 6793 dword_5B65C4 = 1; | |
| 6794 break; | |
| 6795 } | |
| 501 | 6796 return result; |
| 0 | 6797 } |
| 6798 v11 = this->field_1A50; | |
| 501 | 6799 v22 = (signed __int16)pValue; |
| 0 | 6800 } |
| 6801 _449B7E_toggle_bit((unsigned char *)v11, v22, 0); | |
| 501 | 6802 return result; |
| 6803 } | |
| 6804 switch ( VarNum ) | |
| 0 | 6805 { |
| 6806 case 308: | |
| 501 | 6807 result = (bool)pValue; |
| 6808 pParty->uNumBountiesCollected -= (unsigned int)pValue; | |
| 0 | 6809 break; |
| 6810 case 309: | |
| 501 | 6811 result = (bool)pValue; |
| 6812 pParty->uNumPrisonTerms -= (int)pValue; | |
| 0 | 6813 break; |
| 6814 case 310: | |
| 501 | 6815 result = (bool)pValue; |
| 6816 pParty->uNumArenaPageWins -= (char)pValue; | |
| 0 | 6817 break; |
| 6818 case 311: | |
| 501 | 6819 result = (bool)pValue; |
| 6820 pParty->uNumArenaSquireWins -= (char)pValue; | |
| 0 | 6821 break; |
| 6822 case 312: | |
| 501 | 6823 result = (bool)pValue; |
| 6824 pParty->uNumArenaKnightWins -= (char)pValue; | |
| 0 | 6825 break; |
| 6826 case 313: | |
| 501 | 6827 result = (bool)pValue; |
| 6828 pParty->uNumArenaLordWins -= (char)pValue; | |
| 0 | 6829 break; |
| 6830 } | |
| 1545 | 6831 Error("Function not returning any value! (%u)", VarNum); |
| 0 | 6832 } |
| 6833 else | |
| 6834 { | |
| 501 | 6835 if ( (signed int)VarNum >= 123 ) |
| 6836 { | |
| 6837 byte_5E4C15[VarNum] -= (char)pValue; | |
| 0 | 6838 } |
| 6839 else | |
| 6840 { | |
| 501 | 6841 switch ( VarNum ) |
| 0 | 6842 { |
| 6843 case VAR_RandomGold: | |
| 501 | 6844 v6 = rand() % (signed int)pValue + 1; |
| 0 | 6845 if ( v6 > pParty->uNumGold ) |
| 6846 v6 = pParty->uNumGold; | |
| 6847 Party::TakeGold(v6); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6848 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[503], v6); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6849 ShowStatusBarString(pTmpBuf.data(), 2); |
| 0 | 6850 GameUI_DrawFoodAndGold(); |
| 501 | 6851 return result; |
| 0 | 6852 case VAR_RandomFood: |
| 501 | 6853 v7 = rand() % (signed int)pValue + 1; |
| 0 | 6854 if ( v7 > pParty->uNumFoodRations ) |
| 6855 v7 = pParty->uNumFoodRations; | |
| 6856 Party::TakeFood(v7); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6857 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[504], v7); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6858 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 6859 GameUI_DrawFoodAndGold(); |
| 605 | 6860 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6861 v8 = 8 * v4 + 400; | |
| 862 | 6862 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6863 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 501 | 6864 return result; |
| 0 | 6865 case VAR_CurrentHP: |
| 1036 | 6866 ReceiveDamage((signed int)pValue, DMGT_PHISYCAL); |
| 605 | 6867 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6868 v8 = 8 * v4 + 400; | |
| 862 | 6869 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6870 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6871 return result; | |
| 0 | 6872 case VAR_CurrentSP: |
| 6873 v9 = (char *)&this->sMana; | |
| 501 | 6874 v10 = this->sMana - (signed int)pValue < 0; |
| 6875 *(int *)v9 -= (int)pValue; | |
| 0 | 6876 if ( v10 ) |
| 6877 *(int *)v9 = 0; | |
| 605 | 6878 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6879 v8 = 8 * v4 + 400; | |
| 862 | 6880 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6881 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6882 return result; | |
| 0 | 6883 case VAR_ACModifier: |
| 501 | 6884 this->sACModifier -= (unsigned __int8)pValue; |
| 605 | 6885 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6886 v8 = 8 * v4 + 400; | |
| 862 | 6887 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6888 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6889 return result; | |
| 0 | 6890 case VAR_BaseLevel: |
| 501 | 6891 this->uLevel -= (unsigned __int8)pValue; |
| 605 | 6892 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6893 v8 = 8 * v4 + 400; | |
| 862 | 6894 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6895 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6896 return result; | |
| 0 | 6897 case VAR_LevelModifier: |
| 501 | 6898 this->sLevelModifier -= (unsigned __int8)pValue; |
| 605 | 6899 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6900 v8 = 8 * v4 + 400; | |
| 862 | 6901 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6902 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6903 return result; | |
| 0 | 6904 case VAR_Age: |
| 501 | 6905 this->sAgeModifier -= (signed __int16)pValue; |
| 6906 return result; | |
| 0 | 6907 case VAR_Award: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6908 _449B7E_toggle_bit((unsigned char *)this->_achieved_awards_bits, (signed __int16)pValue, 0); |
| 605 | 6909 return result; |
| 0 | 6910 case VAR_Experience: |
| 6911 v12 = (char *)&this->uExperience; | |
| 501 | 6912 v13 = (signed int)pValue; |
| 6913 v14 = *(int *)v12 < (unsigned int)pValue; | |
| 6914 *(int *)v12 -= (int)pValue; | |
| 0 | 6915 *((int *)v12 + 1) -= v14 + HIDWORD(v13); |
| 605 | 6916 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6917 v8 = 8 * v4 + 400; | |
| 862 | 6918 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6919 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6920 return result; | |
| 0 | 6921 case VAR_QBits_QuestsDone: |
| 501 | 6922 _449B7E_toggle_bit(pParty->_quest_bits, (__int16)pValue, 0); |
| 187 | 6923 pPlayers[v4 + 1]->PlaySound(SPEECH_96, 0); |
| 501 | 6924 return true; |
| 0 | 6925 case VAR_PlayerItemInHands: |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
6926 v15 = this->pInventoryMatrix; |
| 0 | 6927 break; |
| 6928 case VAR_FixedGold: | |
| 501 | 6929 if ( (unsigned int)pValue > pParty->uNumGold ) |
| 0 | 6930 goto LABEL_88; |
| 501 | 6931 Party::TakeGold((unsigned int)pValue); |
| 6932 return result; | |
| 0 | 6933 case VAR_MightBonus: |
| 6934 case VAR_ActualMight: | |
| 501 | 6935 this->uMightBonus -= (unsigned __int16)pValue; |
| 605 | 6936 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6937 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6938 v8 = 8 * v4 + 400; | |
| 862 | 6939 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6940 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6941 return result; | |
| 0 | 6942 case VAR_IntellectBonus: |
| 6943 case VAR_ActualIntellect: | |
| 501 | 6944 this->uIntelligenceBonus -= (unsigned __int16)pValue; |
| 605 | 6945 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6946 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6947 v8 = 8 * v4 + 400; | |
| 862 | 6948 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6949 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6950 return result; | |
| 0 | 6951 case VAR_PersonalityBonus: |
| 6952 case VAR_ActualPersonality: | |
| 501 | 6953 this->uWillpowerBonus -= (unsigned __int16)pValue; |
| 605 | 6954 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6955 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6956 v8 = 8 * v4 + 400; | |
| 862 | 6957 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6958 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6959 return result; | |
| 0 | 6960 case VAR_EnduranceBonus: |
| 6961 case VAR_ActualEndurance: | |
| 501 | 6962 this->uEnduranceBonus -= (unsigned __int16)pValue; |
| 605 | 6963 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6964 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6965 v8 = 8 * v4 + 400; | |
| 862 | 6966 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6967 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6968 return result; | |
| 0 | 6969 case VAR_SpeedBonus: |
| 6970 case VAR_ActualSpeed: | |
| 501 | 6971 this->uSpeedBonus -= (unsigned __int16)pValue; |
| 605 | 6972 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6973 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6974 v8 = 8 * v4 + 400; | |
| 862 | 6975 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6976 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6977 return result; | |
| 0 | 6978 case VAR_AccuracyBonus: |
| 6979 case VAR_ActualAccuracy: | |
| 501 | 6980 this->uAccuracyBonus -= (unsigned __int16)pValue; |
| 605 | 6981 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6982 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6983 v8 = 8 * v4 + 400; | |
| 862 | 6984 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6985 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6986 return result; | |
| 0 | 6987 case VAR_LuckBonus: |
| 6988 case VAR_ActualLuck: | |
| 501 | 6989 this->uLuckBonus -= (unsigned __int16)pValue; |
| 605 | 6990 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6991 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6992 v8 = 8 * v4 + 400; | |
| 862 | 6993 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6994 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6995 return result; | |
| 0 | 6996 case VAR_BaseMight: |
| 501 | 6997 this->uMight -= (unsigned __int16)pValue; |
| 605 | 6998 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 6999 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7000 v8 = 8 * v4 + 400; | |
| 862 | 7001 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7002 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7003 return result; | |
| 0 | 7004 case VAR_BaseIntellect: |
| 501 | 7005 this->uIntelligence -= (unsigned __int16)pValue; |
| 605 | 7006 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7007 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7008 v8 = 8 * v4 + 400; | |
| 862 | 7009 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7010 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7011 return result; | |
| 0 | 7012 case VAR_BasePersonality: |
| 501 | 7013 this->uWillpower -= (unsigned __int16)pValue; |
| 605 | 7014 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7015 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7016 v8 = 8 * v4 + 400; | |
| 862 | 7017 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7018 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7019 return result; | |
| 0 | 7020 case VAR_BaseEndurance: |
| 501 | 7021 this->uEndurance -= (unsigned __int16)pValue; |
| 605 | 7022 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7023 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7024 v8 = 8 * v4 + 400; | |
| 862 | 7025 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7026 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7027 return result; | |
| 0 | 7028 case VAR_BaseSpeed: |
| 501 | 7029 this->uSpeed -= (unsigned __int16)pValue; |
| 605 | 7030 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7031 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7032 v8 = 8 * v4 + 400; | |
| 862 | 7033 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7034 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7035 return result; | |
| 0 | 7036 case VAR_BaseAccuracy: |
| 501 | 7037 this->uAccuracy -= (unsigned __int16)pValue; |
| 605 | 7038 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7039 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7040 v8 = 8 * v4 + 400; | |
| 862 | 7041 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7042 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7043 return result; | |
| 0 | 7044 case VAR_BaseLuck: |
| 501 | 7045 this->uLuck -= (unsigned __int16)pValue; |
| 605 | 7046 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7047 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7048 v8 = 8 * v4 + 400; | |
| 862 | 7049 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7050 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7051 return result; | |
| 0 | 7052 case VAR_FireResistance: |
| 501 | 7053 this->sResFireBase -= (signed __int16)pValue; |
| 605 | 7054 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7055 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7056 v8 = 8 * v4 + 400; | |
| 862 | 7057 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7058 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7059 return result; | |
| 0 | 7060 case VAR_AirResistance: |
| 501 | 7061 this->sResAirBase -= (signed __int16)pValue; |
| 605 | 7062 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7063 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7064 v8 = 8 * v4 + 400; | |
| 862 | 7065 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7066 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7067 return result; | |
| 0 | 7068 case VAR_WaterResistance: |
| 501 | 7069 this->sResWaterBase -= (signed __int16)pValue; |
| 605 | 7070 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7071 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7072 v8 = 8 * v4 + 400; | |
| 862 | 7073 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7074 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7075 return result; | |
| 0 | 7076 case VAR_EarthResistance: |
| 501 | 7077 this->sResEarthBase -= (signed __int16)pValue; |
| 605 | 7078 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7079 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7080 v8 = 8 * v4 + 400; | |
| 862 | 7081 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7082 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7083 return result; | |
| 0 | 7084 case VAR_SpiritResistance: |
| 501 | 7085 this->sResSpiritBase -= (signed __int16)pValue; |
| 605 | 7086 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7087 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7088 v8 = 8 * v4 + 400; | |
| 862 | 7089 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7090 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7091 return result; | |
| 0 | 7092 case VAR_MindResistance: |
| 501 | 7093 this->sResMindBase -= (signed __int16)pValue; |
| 605 | 7094 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7095 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7096 v8 = 8 * v4 + 400; | |
| 862 | 7097 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7098 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7099 return result; | |
| 0 | 7100 case VAR_BodyResistance: |
| 501 | 7101 this->sResBodyBase -= (signed __int16)pValue; |
| 605 | 7102 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7103 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7104 v8 = 8 * v4 + 400; | |
| 862 | 7105 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7106 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7107 return result; | |
| 0 | 7108 case VAR_LightResistance: |
| 501 | 7109 this->sResLightBase -= (signed __int16)pValue; |
| 605 | 7110 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7111 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7112 v8 = 8 * v4 + 400; | |
| 862 | 7113 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7114 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7115 return result; | |
| 0 | 7116 case VAR_DarkResistance: |
| 501 | 7117 this->sResDarkBase -= (signed __int16)pValue; |
| 605 | 7118 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7119 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7120 v8 = 8 * v4 + 400; | |
| 862 | 7121 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7122 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7123 return result; | |
| 0 | 7124 case VAR_MagicResistance: |
| 501 | 7125 this->sResMagicBase -= (signed __int16)pValue; |
| 605 | 7126 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7127 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7128 v8 = 8 * v4 + 400; | |
| 862 | 7129 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7130 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7131 return result; | |
| 0 | 7132 case VAR_FireResistanceBonus: |
| 501 | 7133 this->sResFireBonus -= (signed __int16)pValue; |
| 605 | 7134 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7135 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7136 v8 = 8 * v4 + 400; | |
| 862 | 7137 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7138 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7139 return result; | |
| 0 | 7140 case VAR_AirResistanceBonus: |
| 501 | 7141 this->sResAirBonus -= (signed __int16)pValue; |
| 605 | 7142 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7143 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7144 v8 = 8 * v4 + 400; | |
| 862 | 7145 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7146 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7147 return result; | |
| 0 | 7148 case VAR_WaterResistanceBonus: |
| 501 | 7149 this->sResWaterBonus -= (signed __int16)pValue; |
| 605 | 7150 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7151 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7152 v8 = 8 * v4 + 400; | |
| 862 | 7153 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7154 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7155 return result; | |
| 0 | 7156 case VAR_EarthResistanceBonus: |
| 501 | 7157 this->sResEarthBonus -= (signed __int16)pValue; |
| 605 | 7158 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7159 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7160 v8 = 8 * v4 + 400; | |
| 862 | 7161 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7162 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7163 return result; | |
| 0 | 7164 case VAR_SpiritResistanceBonus: |
| 501 | 7165 this->sResSpiritBonus -= (signed __int16)pValue; |
| 605 | 7166 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7167 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7168 v8 = 8 * v4 + 400; | |
| 862 | 7169 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7170 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7171 return result; | |
| 0 | 7172 case VAR_MindResistanceBonus: |
| 501 | 7173 this->sResMindBonus -= (signed __int16)pValue; |
| 605 | 7174 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7175 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7176 v8 = 8 * v4 + 400; | |
| 862 | 7177 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7178 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7179 return result; | |
| 0 | 7180 case VAR_BodyResistanceBonus: |
| 501 | 7181 this->sResBodyBonus -= (signed __int16)pValue; |
| 605 | 7182 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7183 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7184 v8 = 8 * v4 + 400; | |
| 862 | 7185 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7186 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7187 return result; | |
| 0 | 7188 case VAR_LightResistanceBonus: |
| 501 | 7189 this->sResLightBonus -= (signed __int16)pValue; |
| 605 | 7190 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7191 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7192 v8 = 8 * v4 + 400; | |
| 862 | 7193 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7194 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7195 return result; | |
| 0 | 7196 case VAR_DarkResistanceBonus: |
| 501 | 7197 this->sResDarkBonus -= (signed __int16)pValue; |
| 605 | 7198 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7199 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7200 v8 = 8 * v4 + 400; | |
| 862 | 7201 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7202 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7203 return result; | |
| 0 | 7204 case VAR_MagicResistanceBonus: |
| 501 | 7205 this->sResMagicBonus -= (signed __int16)pValue; |
| 0 | 7206 v25 = 0; |
| 187 | 7207 v23 = SPEECH_91; |
| 7208 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)v23, v25); | |
| 605 | 7209 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7210 v8 = 8 * v4 + 400; | |
| 862 | 7211 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7212 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7213 return result; | |
| 0 | 7214 case VAR_FixedFood: |
| 501 | 7215 Party::TakeFood((unsigned int)pValue); |
| 605 | 7216 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7217 v8 = 8 * v4 + 400; | |
| 862 | 7218 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7219 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7220 return result; | |
| 0 | 7221 case VAR_StaffSkill: |
| 7222 case VAR_SwordSkill: | |
| 7223 case VAR_DaggerSkill: | |
| 7224 case VAR_AxeSkill: | |
| 7225 case VAR_SpearSkill: | |
| 7226 case VAR_BowSkill: | |
| 7227 case VAR_MaceSkill: | |
| 7228 case VAR_BlasterSkill: | |
| 7229 case VAR_ShieldSkill: | |
| 7230 case VAR_LeatherSkill: | |
| 7231 case VAR_SkillChain: | |
| 7232 case VAR_PlateSkill: | |
| 7233 case VAR_FireSkill: | |
| 7234 case VAR_AirSkill: | |
| 7235 case VAR_WaterSkill: | |
| 7236 case VAR_EarthSkill: | |
| 7237 case VAR_SpiritSkill: | |
| 7238 case VAR_MindSkill: | |
| 7239 case VAR_BodySkill: | |
| 7240 case VAR_LightSkill: | |
| 7241 case VAR_DarkSkill: | |
| 7242 case VAR_IdentifyItemSkill: | |
| 7243 case VAR_MerchantSkill: | |
| 7244 case VAR_RepairSkill: | |
| 7245 case VAR_BodybuildingSkill: | |
| 7246 case VAR_MeditationSkill: | |
| 7247 case VAR_PerceptionSkill: | |
| 7248 case VAR_DiplomacySkill: | |
| 7249 case VAR_DisarmTrapSkill: | |
| 7250 case VAR_LearningSkill: | |
| 501 | 7251 *((short *)&this->pConditions[16] + VarNum) -= (unsigned __int8)pValue; |
| 605 | 7252 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7253 v8 = 8 * v4 + 400; | |
| 862 | 7254 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7255 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7256 return result; | |
| 0 | 7257 case VAR_Cursed: |
| 7258 case VAR_Weak: | |
| 7259 case VAR_Asleep: | |
| 7260 case VAR_Afraid: | |
| 7261 case VAR_Drunk: | |
| 7262 case VAR_Insane: | |
| 7263 case VAR_PoisonedGreen: | |
| 7264 case VAR_DiseasedGreen: | |
| 7265 case VAR_PoisonedYellow: | |
| 7266 case VAR_DiseasedYellow: | |
| 7267 case VAR_PoisonedRed: | |
| 7268 case VAR_DiseasedRed: | |
| 7269 case VAR_Paralyzed: | |
| 7270 case VAR_Unconsious: | |
| 7271 case VAR_Dead: | |
| 7272 case VAR_Stoned: | |
| 7273 case VAR_Eradicated: | |
| 1071 | 7274 //*((int *)this + 2 * VarNum - 210) = 0; |
| 7275 //*((int *)this + 2 * result - 209) = 0; | |
| 7276 this->pConditions[VarNum] = 0; | |
| 0 | 7277 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7278 v8 = 8 * v4 + 400; | |
| 862 | 7279 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 0 | 7280 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 501 | 7281 return result; |
| 605 | 7282 default: |
| 7283 return result; | |
| 7284 } | |
| 7285 for (v3 = 1; v3 < 126; v3++) | |
| 7286 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7287 if ( *(&this->pInventoryItemList[pInventoryMatrix[v3] - 1].uItemID) == pValue ) |
| 0 | 7288 { |
| 605 | 7289 RemoveItemAtInventoryIndex(v3); |
| 501 | 7290 return true; |
| 0 | 7291 } |
| 605 | 7292 } |
| 501 | 7293 if ( pParty->pPickedItem.uItemID == pValue ) |
| 7294 { | |
| 605 | 7295 pMouse->RemoveHoldingItem(); |
| 7296 return true; | |
| 7297 } | |
| 7298 return false; | |
| 0 | 7299 } |
| 7300 } | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
7301 |
| 1430 | 7302 //assert(false); |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
7303 return false; |
| 0 | 7304 } |
| 7305 // 5B65C4: using guessed type int dword_5B65C4; | |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7306 // 5B65CC: using guessed type int dword_5B65CC; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7307 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7308 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7309 //----- (00467E7F) -------------------------------------------------------- |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7310 void Player::EquipBody(ITEM_EQUIP_TYPE uEquipType) |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7311 { |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7312 int v2; // ebx@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7313 Player *v3; // eax@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7314 int v4; // edx@1 |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
7315 int v7; // eax@3 |
| 1619 | 7316 ItemGen tempPickedItem; // [sp+Ch] [bp-30h]@1 |
| 7317 unsigned int *v11; // [sp+38h] [bp-4h]@1 | |
| 7318 | |
| 7319 tempPickedItem.Reset(); | |
| 1374 | 7320 v2 = pEquipTypeToBodyAnchor[uEquipType]; |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7321 v3 = pPlayers[uActiveCharacter]; |
| 1619 | 7322 v11 = &v3->pEquipment.pIndices[v2]; |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7323 v4 = *v11; |
| 1619 | 7324 if ( v4 ) |
| 7325 { | |
| 7326 memcpy(&tempPickedItem, &pParty->pPickedItem, sizeof(tempPickedItem)); | |
| 7327 v3->pInventoryItemList[v4 - 1].uBodyAnchor = 0; | |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7328 pParty->pPickedItem.Reset(); |
| 1619 | 7329 pParty->SetHoldingItem(&v3->pInventoryItemList[v4 - 1]); |
| 7330 tempPickedItem.uBodyAnchor = v2 + 1; | |
| 7331 memcpy(&v3->pInventoryItemList[v4 - 1], &tempPickedItem, sizeof(ItemGen)); | |
| 7332 *v11 = v4; | |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7333 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7334 else |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7335 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7336 v7 = v3->FindFreeInventoryListSlot(); |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7337 if (v7 >= 0) |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7338 { |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7339 pParty->pPickedItem.uBodyAnchor = v2 + 1; |
| 1619 | 7340 memcpy(&v3->pInventoryItemList[v7], &pParty->pPickedItem, sizeof(ItemGen)); |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7341 *v11 = v7 + 1; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7342 pMouse->RemoveHoldingItem(); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7343 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7344 } |
| 1295 | 7345 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7346 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7347 |
| 1295 | 7348 //----- (0049387A) -------------------------------------------------------- |
| 1459 | 7349 int CycleCharacter(bool backwards) |
| 1295 | 7350 { |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7351 const int PARTYSIZE = 4; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7352 int valToAdd = backwards ? (PARTYSIZE - 2) : 0; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7353 int mult = backwards ? -1 : 1; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7354 |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7355 for (int i = 0; i < (PARTYSIZE - 1); i++) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7356 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7357 int currCharId = ((uActiveCharacter + mult * i + valToAdd) % PARTYSIZE) + 1; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7358 if ( pPlayers[currCharId]->uTimeToRecovery == 0 ) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7359 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7360 return currCharId; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7361 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7362 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7363 return uActiveCharacter; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7364 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7365 |
| 1297 | 7366 //----- (0043EE77) -------------------------------------------------------- |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7367 bool Player::HasUnderwaterSuitEquipped() //the original function took the player number as a parameter. if it was 0, the whole party was checked. calls with the parameter 0 have been changed to calls to this for every player |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7368 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7369 if (this->pEquipment.uArmor == 0 || this->pInventoryItemList[this->pEquipment.uArmor].uItemID != 604) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7370 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7371 return false; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7372 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7373 return true; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7374 } |
| 1432 | 7375 |
| 1297 | 7376 //----- (0043EE15) -------------------------------------------------------- |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7377 bool Player::HasItem( unsigned int uItemID, char a3 ) |
| 1297 | 7378 { |
| 7379 if ( !a3 || pParty->pPickedItem.uItemID != uItemID ) | |
| 7380 { | |
| 7381 for ( uint i = 0; i < 126; ++i ) | |
| 7382 { | |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7383 if ( this->pInventoryMatrix[i] > 0 ) |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7384 { |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7385 if ( (unsigned int)this->pInventoryItemList[this->pInventoryMatrix[i] - 1].uItemID == uItemID ) |
| 1297 | 7386 return true; |
| 7387 } | |
| 7388 } | |
| 7389 for ( uint i = 0; i < 16; ++i ) | |
| 7390 { | |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7391 if ( this->pEquipment.pIndices[i] ) |
| 1297 | 7392 { |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7393 if ( (unsigned int)this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID == uItemID ) |
| 1297 | 7394 return true; |
| 7395 } | |
| 7396 } | |
| 7397 } | |
| 7398 return false; | |
| 7399 } | |
| 7400 //----- (0043EDB9) -------------------------------------------------------- | |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7401 bool ShouldLoadTexturesForRaceAndGender(unsigned int _this) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7402 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7403 CHARACTER_RACE race; // edi@2 |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7404 PLAYER_SEX sex; // eax@2 |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7405 |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7406 for (int i = 1; i <= 4; i++) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7407 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7408 race = pPlayers[i]->GetRace(); |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7409 sex = pPlayers[i]->GetSexByVoice(); |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7410 switch(_this) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7411 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7412 case 0: |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7413 if (( race == CHARACTER_RACE_HUMAN || race == CHARACTER_RACE_ELF || race == CHARACTER_RACE_GOBLIN ) && sex == SEX_MALE ) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7414 return true; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7415 break; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7416 case 1: |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7417 if (( race == CHARACTER_RACE_HUMAN || race == CHARACTER_RACE_ELF || race == CHARACTER_RACE_GOBLIN ) && sex == SEX_FEMALE ) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7418 return true; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7419 break; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7420 case 2: |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7421 if ( race == CHARACTER_RACE_DWARF && sex == SEX_MALE ) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7422 return true; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7423 break; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7424 case 3: |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7425 if ( race == CHARACTER_RACE_DWARF && sex == SEX_FEMALE ) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7426 return true; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7427 break; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7428 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7429 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7430 return false; |
| 1297 | 7431 } |
| 7432 //----- (0043ED6F) -------------------------------------------------------- | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7433 bool IsDwarfPresentInParty(bool a1) |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7434 { |
| 1297 | 7435 for (uint i = 0; i < 4; ++i) |
| 7436 { | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7437 CHARACTER_RACE race = pParty->pPlayers[i].GetRace(); |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7438 |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7439 if (race == CHARACTER_RACE_DWARF && a1) |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7440 return true; |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7441 else if (race != CHARACTER_RACE_DWARF && !a1) |
| 1297 | 7442 return true; |
| 7443 } | |
| 7444 return false; | |
| 7445 } | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7446 |
| 1649 | 7447 |
| 7448 | |
| 1297 | 7449 //----- (00439FCB) -------------------------------------------------------- |
| 1681 | 7450 void __fastcall DamagePlayerFromMonster(unsigned int uObjID, int element, Vec3_int_ *pPos, unsigned int a4) |
| 7451 { | |
| 1649 | 7452 Player *playerPtr; // ebx@3 |
| 7453 Actor *actorPtr; // esi@3 | |
| 1297 | 7454 unsigned int v8; // eax@4 |
| 1681 | 7455 int spellId; // eax@38 |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7456 signed int recvdMagicDmg; // eax@139 |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7457 int v72[4]; // [sp+30h] [bp-24h]@164 |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7458 int healthBeforeRecvdDamage; // [sp+48h] [bp-Ch]@3 |
| 1297 | 7459 unsigned int uActorID; // [sp+4Ch] [bp-8h]@1 |
| 1681 | 7460 |
| 7461 uActorID = PID_ID(uObjID); | |
| 7462 if ( PID_TYPE(uObjID) != 2) | |
| 1297 | 7463 { |
| 1649 | 7464 playerPtr = &pParty->pPlayers[a4]; |
| 1681 | 7465 actorPtr = &pActors[uActorID]; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7466 healthBeforeRecvdDamage = playerPtr->sHealth; |
| 1681 | 7467 if ( PID_TYPE(uObjID) != 3 || !stru_50C198.ActorHitOrMiss(actorPtr, playerPtr) ) |
| 1297 | 7468 return; |
| 1649 | 7469 v8 = playerPtr->pEquipment.uArmor; |
| 1681 | 7470 SoundID soundToPlay; |
| 1297 | 7471 if ( !v8 |
| 1649 | 7472 || playerPtr->pInventoryItemList[v8 - 1].IsBroken() |
| 7473 || | |
| 7474 (pItemsTable->pItems[playerPtr->pInventoryItemList[v8 - 1].uItemID].uSkillType != PLAYER_SKILL_CHAIN | |
| 7475 && pItemsTable->pItems[playerPtr->pInventoryItemList[v8 - 1].uItemID].uSkillType != PLAYER_SKILL_PLATE | |
| 7476 ) | |
| 7477 ) | |
| 1297 | 7478 { |
| 1681 | 7479 int randVal = rand() % 4; |
| 7480 switch (randVal) | |
| 1297 | 7481 { |
| 1681 | 7482 case 0 : soundToPlay = (SoundID)108; break; |
| 7483 case 1 : soundToPlay = (SoundID)109; break; | |
| 7484 case 2 : soundToPlay = (SoundID)110; break; | |
| 7485 case 3 : soundToPlay = (SoundID)44; break; | |
| 1297 | 7486 } |
| 7487 } | |
| 7488 else | |
| 7489 { | |
| 1681 | 7490 int randVal = rand() % 4; |
| 7491 switch (randVal) | |
| 1297 | 7492 { |
| 1681 | 7493 case 0 : soundToPlay = (SoundID)105; break; |
| 7494 case 1 : soundToPlay = (SoundID)106; break; | |
| 7495 case 2 : soundToPlay = (SoundID)107; break; | |
| 7496 case 3 : soundToPlay = (SoundID)45; break; | |
| 1297 | 7497 } |
| 1648 | 7498 } |
| 1681 | 7499 pAudioPlayer->PlaySound(soundToPlay, PID(OBJECT_Player,a4 + 80), 0, -1, 0, 0, 0, 0); |
| 7500 int dmgToReceive = Actor::_43B3E0_CalcDamage(actorPtr, element); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7501 if ( actorPtr->pActorBuffs[3].uExpireTime > 0 ) |
| 1649 | 7502 { |
| 1681 | 7503 __int16 spellPower = actorPtr->pActorBuffs[3].uPower; |
| 7504 if ( spellPower ) | |
| 7505 dmgToReceive /= (signed int)spellPower; | |
| 7506 } | |
| 1682 | 7507 int damageType; |
| 1681 | 7508 switch (element) |
| 1648 | 7509 { |
| 1682 | 7510 case 0: damageType = actorPtr->pMonsterInfo.uAttack1Type; |
| 1648 | 7511 break; |
| 1682 | 7512 case 1: damageType = actorPtr->pMonsterInfo.uAttack2Type; |
| 1648 | 7513 break; |
| 1681 | 7514 case 2: spellId = actorPtr->pMonsterInfo.uSpell1ID; |
| 1682 | 7515 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); |
| 1648 | 7516 break; |
| 1681 | 7517 case 3: spellId = actorPtr->pMonsterInfo.uSpell2ID; |
| 1682 | 7518 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); |
| 1648 | 7519 break; |
| 1682 | 7520 case 4: damageType = actorPtr->pMonsterInfo.field_3C_some_special_attack; |
| 1648 | 7521 break; |
| 7522 default: | |
| 1682 | 7523 case 5: damageType = 4; //yes, the original just assigned the value 4 |
| 1648 | 7524 break; |
| 7525 } | |
| 1297 | 7526 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) |
| 7527 { | |
| 1682 | 7528 dmgToReceive = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7529 if ( playerPtr->pPlayerBuffs[10].uExpireTime > 0 ) |
| 1297 | 7530 { |
| 1681 | 7531 int actorState = actorPtr->uAIState; |
| 7532 if ( actorState != Dying && actorState != Dead) | |
| 1297 | 7533 { |
| 1682 | 7534 int reflectedDamage = stru_50C198.CalcMagicalDamageToActor(actorPtr, damageType, dmgToReceive); |
| 1681 | 7535 actorPtr->sCurrentHP -= reflectedDamage; |
| 7536 if ( reflectedDamage >= 0 ) | |
| 1297 | 7537 { |
| 1649 | 7538 if ( actorPtr->sCurrentHP >= 1 ) |
| 1297 | 7539 { |
| 1682 | 7540 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); //todo extract this branch to a function once Actor::functions are changed to nonstatic actor functions |
| 1648 | 7541 Actor::AggroSurroundingPeasants(uActorID, 1); |
| 7542 } | |
| 7543 else | |
| 7544 { | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7545 if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pRenderer->pRenderD3D && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS) |
| 1297 | 7546 { |
| 1681 | 7547 int splatRadius = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; |
| 7548 pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)splatRadius, 0, 0); | |
| 1297 | 7549 } |
| 1648 | 7550 Actor::Die(uActorID); |
| 7551 Actor::ApplyFineForKillingPeasant(uActorID); | |
| 7552 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 1649 | 7553 if ( actorPtr->pMonsterInfo.uExp ) |
| 7554 GivePartyExp(pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].uExp); | |
| 1681 | 7555 int speechToPlay = SPEECH_51; |
| 1648 | 7556 if ( rand() % 100 < 20 ) |
| 1681 | 7557 speechToPlay = actorPtr->pMonsterInfo.uHP >= 100 ? 2 : 1; |
| 7558 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0); | |
| 1297 | 7559 } |
| 7560 } | |
| 7561 } | |
| 7562 } | |
| 7563 if ( !(dword_6BE368_debug_settings_2 & 0x10) | |
| 1649 | 7564 && actorPtr->pMonsterInfo.uSpecialAttack |
| 7565 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackType ) | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7566 { |
| 1649 | 7567 playerPtr->_48DCF6(actorPtr->pMonsterInfo.uSpecialAttack, actorPtr); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7568 } |
| 1297 | 7569 } |
| 7570 if ( !pParty->bTurnBasedModeOn ) | |
| 7571 { | |
| 1681 | 7572 int actEndurance = playerPtr->GetActualEndurance(); |
| 7573 int recoveryTime = (int)((20 - playerPtr->GetParameterBonus(actEndurance)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333); | |
| 7574 playerPtr->SetRecoveryTime(recoveryTime); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7575 } |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7576 int yellThreshold = playerPtr->GetMaxHealth() / 4; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7577 if ( yellThreshold < playerPtr->sHealth && yellThreshold >= healthBeforeRecvdDamage && playerPtr->sHealth > 0 ) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7578 { |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7579 playerPtr->PlaySound(SPEECH_48, 0); |
| 1297 | 7580 } |
| 7581 viewparams->bRedrawGameUI = 1; | |
| 7582 return; | |
| 7583 } | |
| 1648 | 7584 else |
| 7585 { | |
| 1681 | 7586 SpriteObject* v37 = &pSpriteObjects[uActorID]; |
| 7587 int uActorType = PID_TYPE(v37->spell_caster_pid); | |
| 7588 int uActorID = PID_ID(v37->spell_caster_pid); | |
| 7589 if ( uActorType == 2 ) | |
| 7590 { | |
| 7591 Player *playerPtr; // eax@81 | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7592 if ( a4 != -1 ) |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7593 { |
| 1681 | 7594 playerPtr = &pParty->pPlayers[a4]; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7595 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7596 else |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7597 { |
| 1681 | 7598 element = 0; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7599 for (int i = 1; i <= 4; i++) |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7600 { |
| 1681 | 7601 v72[element] = i; |
| 7602 element++; | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7603 } |
| 1681 | 7604 if ( element ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7605 { |
| 1681 | 7606 playerPtr = &pParty->pPlayers[v72[rand() % element]];//&stru_AA1058[3].pSounds[6972 * *(&v72 + rand() % v74) + 40552]; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7607 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7608 } |
| 1681 | 7609 int v68; |
| 7610 int v69; | |
| 7611 if ( uActorType != OBJECT_Player || v37->spell_id != SPELL_BOW_ARROW) | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7612 { |
| 1681 | 7613 int playerMaxHp = playerPtr->GetMaxHealth(); |
| 7614 v68 = _43AFE3_calc_spell_damage(v37->spell_id, v37->spell_level, v37->spell_skill, playerMaxHp); | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7615 v69 = LOBYTE(pSpellStats->pInfos[v37->spell_id].uSchool); |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7616 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7617 else |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7618 { |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7619 v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7620 v69 = 0; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7621 } |
| 1681 | 7622 playerPtr->ReceiveDamage(v68, (DAMAGE_TYPE)v69); |
| 7623 if ( uActorType == OBJECT_Player && !qword_A750D8 ) | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7624 { |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7625 qword_A750D8 = 256i64; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7626 PlayerSpeechID = SPEECH_44; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7627 uSpeakingCharacter = uActorID + 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7628 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7629 return; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7630 } |
| 1681 | 7631 else if ( uActorType == 3 ) |
| 7632 { | |
| 7633 Actor *actorPtr = &pActors[uActorID]; | |
| 1648 | 7634 if ( a4 == -1 ) |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7635 a4 = stru_50C198.which_player_would_attack(actorPtr); |
| 1681 | 7636 Player *playerPtr = &pParty->pPlayers[a4]; |
| 7637 int dmgToReceive = Actor::_43B3E0_CalcDamage(actorPtr, element); | |
| 7638 unsigned __int16 spriteType = v37->uType; | |
| 1648 | 7639 if ( v37->uType == 545 ) |
| 1297 | 7640 { |
| 1681 | 7641 __int16 skillLevel = playerPtr->GetActualSkillLevel(PLAYER_SKILL_UNARMED); |
| 7642 if ( SkillToMastery(skillLevel) >= 4 && rand() % 100 < (skillLevel & 0x3F) ) | |
| 1648 | 7643 { |
| 1681 | 7644 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], playerPtr->pName); |
| 1648 | 7645 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1681 | 7646 playerPtr->PlaySound(SPEECH_6, 0); |
| 1648 | 7647 return; |
| 7648 } | |
| 1297 | 7649 } |
| 1681 | 7650 else if ( spriteType == 555 |
| 7651 || spriteType == 510 | |
| 7652 || spriteType == 500 | |
| 7653 || spriteType == 515 | |
| 7654 || spriteType == 505 | |
| 7655 || spriteType == 530 | |
| 7656 || spriteType == 525 | |
| 7657 || spriteType == 520 | |
| 7658 || spriteType == 535 | |
| 7659 || spriteType == 540 ) | |
| 1297 | 7660 { |
| 1681 | 7661 if ( !stru_50C198.ActorHitOrMiss(actorPtr, playerPtr) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7662 return; |
| 1681 | 7663 if ( playerPtr->pPlayerBuffs[13].uExpireTime > 0 ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7664 dmgToReceive >>= 1; |
| 1681 | 7665 if ( playerPtr->HasEnchantedItemEquipped(36) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7666 dmgToReceive >>= 1; |
| 1681 | 7667 if ( playerPtr->HasEnchantedItemEquipped(69) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7668 dmgToReceive >>= 1; |
| 1681 | 7669 if ( playerPtr->HasItemEquipped(EQUIP_ARMOUR) |
| 7670 && playerPtr->pInventoryItemList[playerPtr->pEquipment.uArmor-1].uItemID == ITEM_ARTIFACT_GOVERNORS_ARMOR ) | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7671 dmgToReceive >>= 1; |
| 1681 | 7672 if ( playerPtr->HasItemEquipped(EQUIP_MAIN_HAND)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7673 { |
| 1681 | 7674 int itemId = playerPtr->pInventoryItemList[playerPtr->pEquipment.uMainHand - 1].uItemID; |
| 7675 if ( itemId == ITEM_RELIC_KELEBRIM || itemId == ITEM_ARTIFACT_ELFBANE || (playerPtr->GetEquippedItemEquipType(EQUIP_MAIN_HAND) == EQUIP_SHIELD && SkillToMastery(playerPtr->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4)) | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7676 dmgToReceive >>= 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7677 } |
| 1681 | 7678 if ( playerPtr->HasItemEquipped(EQUIP_OFF_HAND)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7679 { |
| 1681 | 7680 int itemId = playerPtr->pInventoryItemList[playerPtr->pEquipment.uShield - 1].uItemID; |
| 7681 if ( itemId == ITEM_RELIC_KELEBRIM || itemId == ITEM_ARTIFACT_ELFBANE || (playerPtr->GetEquippedItemEquipType(EQUIP_OFF_HAND) == EQUIP_SHIELD && SkillToMastery(playerPtr->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4)) | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7682 dmgToReceive >>= 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7683 } |
| 1648 | 7684 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7685 if ( actorPtr->pActorBuffs[3].uExpireTime > 0 ) |
| 1648 | 7686 { |
| 1681 | 7687 int spellPower = actorPtr->pActorBuffs[3].uPower; |
| 7688 if ( spellPower ) | |
| 7689 dmgToReceive /= (signed int)spellPower; | |
| 1648 | 7690 } |
| 1681 | 7691 int damageType; |
| 7692 switch(element) | |
| 1648 | 7693 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7694 case 0: |
| 1681 | 7695 damageType = actorPtr->pMonsterInfo.uAttack1Type; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7696 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7697 case 1: |
| 1681 | 7698 damageType = actorPtr->pMonsterInfo.uAttack2Type; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7699 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7700 case 2: |
| 1681 | 7701 spellId = actorPtr->pMonsterInfo.uSpell1ID; |
| 7702 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7703 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7704 case 3: |
| 1681 | 7705 spellId = actorPtr->pMonsterInfo.uSpell2ID; |
| 7706 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7707 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7708 case 4: |
| 1681 | 7709 damageType = actorPtr->pMonsterInfo.field_3C_some_special_attack; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7710 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7711 case 5: |
| 1681 | 7712 damageType = 4; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7713 break; |
| 1648 | 7714 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7715 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) |
| 1648 | 7716 { |
| 1681 | 7717 int reflectedDmg = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); |
| 7718 if ( playerPtr->pPlayerBuffs[10].uExpireTime > 0 ) | |
| 1297 | 7719 { |
| 1681 | 7720 unsigned __int16 actorState = actorPtr->uAIState; |
| 7721 if ( actorState != Dying && actorState != Dead) | |
| 1297 | 7722 { |
| 1681 | 7723 recvdMagicDmg = stru_50C198.CalcMagicalDamageToActor(actorPtr, damageType, reflectedDmg); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7724 actorPtr->sCurrentHP -= recvdMagicDmg; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7725 if ( recvdMagicDmg >= 0 ) |
| 1297 | 7726 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7727 if ( actorPtr->sCurrentHP >= 1 ) |
| 1297 | 7728 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7729 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7730 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7731 } |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7732 else |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7733 { |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7734 if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pRenderer->pRenderD3D && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) |
| 1297 | 7735 { |
| 1681 | 7736 int splatRadius = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; |
| 7737 pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)splatRadius, 0, 0); | |
| 1297 | 7738 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7739 Actor::Die(uActorID); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7740 Actor::ApplyFineForKillingPeasant(uActorID); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7741 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7742 if ( actorPtr->pMonsterInfo.uExp ) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7743 GivePartyExp(pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].uExp); |
| 1681 | 7744 int speechToPlay = SPEECH_51; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7745 if ( rand() % 100 < 20 ) |
| 1681 | 7746 speechToPlay = actorPtr->pMonsterInfo.uHP >= 100 ? 2 : 1; |
| 7747 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0); | |
| 1297 | 7748 } |
| 7749 } | |
| 7750 } | |
| 7751 } | |
| 7752 } | |
| 1681 | 7753 if ( !element |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7754 && !(dword_6BE368_debug_settings_2 & 0x10) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7755 && actorPtr->pMonsterInfo.uSpecialAttack |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7756 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackType ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7757 { |
| 1681 | 7758 playerPtr->_48DCF6(actorPtr->pMonsterInfo.uSpecialAttack, actorPtr); |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7759 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7760 if ( !pParty->bTurnBasedModeOn ) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7761 { |
| 1681 | 7762 int actEnd = playerPtr->GetActualEndurance(); |
| 7763 int recTime = (int)((20 - playerPtr->GetParameterBonus(actEnd)) | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7764 * flt_6BE3A4_debug_recmod1 |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7765 * 2.133333333333333); |
| 1681 | 7766 playerPtr->SetRecoveryTime(recTime); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7767 } |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7768 return; |
| 1648 | 7769 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7770 else |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7771 { |
| 1648 | 7772 return; |
| 7773 } | |
| 1297 | 7774 } |
| 7775 } | |
| 7776 //----- (00421EA6) -------------------------------------------------------- | |
| 1683 | 7777 void Player::OnInventoryLeftClick() |
| 7778 { | |
| 1297 | 7779 signed int v2; // ecx@2 |
| 7780 int v3; // eax@2 | |
| 1682 | 7781 int invMatrixIndex; // eax@2 |
| 1297 | 7782 unsigned int v6; // eax@7 |
| 1682 | 7783 unsigned int pickedItemId; // esi@12 |
| 7784 unsigned int invItemIndex; // eax@12 | |
| 1297 | 7785 unsigned int v9; // eax@16 |
| 7786 unsigned int v10; // eax@18 | |
| 1682 | 7787 ItemGen tmpItem; // [sp+Ch] [bp-3Ch]@1 |
| 1297 | 7788 POINT a2; // [sp+30h] [bp-18h]@4 |
| 7789 unsigned int pY; // [sp+3Ch] [bp-Ch]@2 | |
| 7790 unsigned int pX; // [sp+40h] [bp-8h]@2 | |
| 7791 | |
| 7792 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103 ) | |
| 7793 { | |
| 7794 pMouse->GetClickPos(&pX, &pY); | |
| 1682 | 7795 v3 = Player::INVETORYSLOTSWIDTH * ((pY - 17) / 32); |
| 7796 v2 = (pX - 14) / 32; | |
| 7797 invMatrixIndex = v2 + v3; | |
| 7798 if ( v2 + v3 >= 0 ) | |
| 7799 { | |
| 7800 if ( invMatrixIndex <= 126 && pMouse->GetCursorPos(&a2)->x < 462 | |
| 1297 | 7801 && pMouse->GetCursorPos(&a2)->x >= 14 ) |
| 7802 { | |
| 1682 | 7803 if ( _50C9A0_IsEnchantingInProgress ) |
| 1297 | 7804 { |
| 1683 | 7805 v6 = this->GetItemIDAtInventoryIndex(&invMatrixIndex); |
| 1297 | 7806 if ( v6 ) |
| 7807 { | |
| 7808 *((char *)pGUIWindow_Settings->ptr_1C + 8) &= 0x7Fu; | |
| 7809 *((short *)pGUIWindow_Settings->ptr_1C + 2) = uActiveCharacter - 1; | |
| 7810 *((int *)pGUIWindow_Settings->ptr_1C + 3) = v6 - 1; | |
| 1682 | 7811 *((short *)pGUIWindow_Settings->ptr_1C + 3) = invMatrixIndex; |
| 1683 | 7812 ptr_50C9A4_ItemToEnchant = &this->pInventoryItemList[v6-1]; |
| 1682 | 7813 _50C9A0_IsEnchantingInProgress = 0; |
| 1297 | 7814 if ( pMessageQueue_50CBD0->uNumMessages ) |
| 7815 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; | |
| 7816 pMouse->SetCursorBitmap("MICON1"); | |
| 1682 | 7817 _50C9D0_AfterEnchClickEventId = 113; |
| 7818 _50C9D4_AfterEnchClickEventSecondParam = 0; | |
| 7819 _50C9D8_AfterEnchClickEventTimeout = 256; | |
| 1297 | 7820 } |
| 7821 return; | |
| 7822 } | |
| 1682 | 7823 if ( ptr_50C9A4_ItemToEnchant ) |
| 1297 | 7824 return; |
| 1682 | 7825 pickedItemId = pParty->pPickedItem.uItemID; |
| 1683 | 7826 invItemIndex = this->GetItemIDAtInventoryIndex(&invMatrixIndex); |
| 1682 | 7827 if (!pickedItemId) |
| 1297 | 7828 { |
| 1682 | 7829 if ( !invItemIndex ) |
| 1297 | 7830 return; |
| 1682 | 7831 else |
| 7832 { | |
| 1683 | 7833 memcpy(&pParty->pPickedItem, &this->pInventoryItemList[invItemIndex-1], sizeof(pParty->pPickedItem)); |
| 7834 this->RemoveItemAtInventoryIndex(invMatrixIndex); | |
| 1682 | 7835 v9 = pParty->pPickedItem.uItemID; |
| 7836 pMouse->SetCursorBitmap(pItemsTable->pItems[v9].pIconName); | |
| 7837 return; | |
| 7838 } | |
| 1297 | 7839 } |
| 1682 | 7840 else |
| 1297 | 7841 { |
| 1682 | 7842 if ( invItemIndex ) |
| 1297 | 7843 { |
| 1683 | 7844 ItemGen* invItemPtr = &this->pInventoryItemList[invItemIndex-1]; |
| 1682 | 7845 memcpy(&tmpItem, invItemPtr, sizeof(tmpItem)); |
| 1683 | 7846 this->RemoveItemAtInventoryIndex(invMatrixIndex); |
| 7847 int emptyIndex = this->AddItem2(invMatrixIndex, &pParty->pPickedItem); | |
| 1682 | 7848 if ( !emptyIndex ) |
| 1297 | 7849 { |
| 1683 | 7850 emptyIndex = this->AddItem2(-1, &pParty->pPickedItem); |
| 1682 | 7851 if ( !emptyIndex ) |
| 7852 { | |
| 1683 | 7853 this->PutItemArInventoryIndex(tmpItem.uItemID, invItemIndex - 1, invMatrixIndex); |
| 1682 | 7854 memcpy(invItemPtr, &tmpItem, sizeof(ItemGen)); |
| 7855 return; | |
| 7856 } | |
| 7857 } | |
| 7858 v9 = tmpItem.uItemID; | |
| 7859 memcpy(&pParty->pPickedItem, &tmpItem, sizeof(ItemGen)); | |
| 7860 pMouse->SetCursorBitmap(pItemsTable->pItems[pParty->pPickedItem.uItemID].pIconName); | |
| 7861 return; | |
| 7862 } | |
| 7863 else | |
| 7864 { | |
| 1683 | 7865 v10 = this->AddItem(invMatrixIndex, pickedItemId); |
| 1682 | 7866 if ( v10 ) |
| 7867 { | |
| 1683 | 7868 memcpy(&this->pInventoryItemList[v10-1], &pParty->pPickedItem, sizeof(ItemGen)); |
| 1682 | 7869 pMouse->RemoveHoldingItem(); |
| 7870 return; | |
| 7871 } | |
| 1683 | 7872 v10 = this->AddItem(-1, pickedItemId); |
| 1682 | 7873 if ( v10 ) |
| 7874 { | |
| 1683 | 7875 memcpy(&this->pInventoryItemList[v10-1], &pParty->pPickedItem, sizeof(ItemGen)); |
| 1682 | 7876 pMouse->RemoveHoldingItem(); |
| 1297 | 7877 return; |
| 7878 } | |
| 7879 } | |
| 7880 } | |
| 7881 } | |
| 7882 } | |
| 7883 } | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7884 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7885 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7886 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7887 bool Player::IsWeak() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7888 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7889 return pConditions[Condition_Weak] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7890 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7891 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7892 bool Player::IsDead() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7893 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7894 return pConditions[Condition_Dead] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7895 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7896 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7897 bool Player::IsEradicated() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7898 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7899 return pConditions[Condition_Eradicated] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7900 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7901 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7902 bool Player::IsZombie() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7903 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7904 return pConditions[Condition_Zombie] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7905 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7906 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7907 bool Player::IsCursed() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7908 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7909 return pConditions[Condition_Cursed] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7910 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7911 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7912 bool Player::IsPertified() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7913 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7914 return pConditions[Condition_Pertified] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7915 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7916 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7917 bool Player::IsUnconcious() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7918 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7919 return pConditions[Condition_Unconcious] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7920 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7921 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7922 bool Player::IsAsleep() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7923 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7924 return pConditions[Condition_Sleep] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7925 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7926 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7927 bool Player::IsParalyzed() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7928 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7929 return pConditions[Condition_Paralyzed] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7930 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7931 |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7932 bool Player::IsDrunk() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7933 { |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7934 return pConditions[Condition_Drunk] != 0; |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7935 } |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7936 |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7937 void Player::SetCursed( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7938 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7939 pConditions[Condition_Cursed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7940 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7941 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7942 void Player::SetWeak( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7943 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7944 pConditions[Condition_Weak] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7945 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7946 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7947 void Player::SetAsleep( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7948 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7949 pConditions[Condition_Sleep] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7950 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7951 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7952 void Player::SetAfraid( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7953 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7954 pConditions[Condition_Fear] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7955 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7956 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7957 void Player::SetDrunk( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7958 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7959 pConditions[Condition_Drunk] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7960 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7961 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7962 void Player::SetInsane( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7963 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7964 pConditions[Condition_Insane] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7965 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7966 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7967 void Player::SetPoison1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7968 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7969 pConditions[Condition_Poison1] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7970 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7971 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7972 void Player::SetDisease1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7973 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7974 pConditions[Condition_Disease1] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7975 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7976 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7977 void Player::SetPoison2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7978 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7979 pConditions[Condition_Poison2] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7980 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7981 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7982 void Player::SetDisease2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7983 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7984 pConditions[Condition_Disease2] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7985 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7986 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7987 void Player::SetPoison3( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7988 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7989 pConditions[Condition_Poison3] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7990 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7991 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7992 void Player::SetDisease3( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7993 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7994 pConditions[Condition_Disease3] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7995 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7996 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7997 void Player::SetParalyzed( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7998 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7999 pConditions[Condition_Paralyzed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8000 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8001 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8002 void Player::SetUnconcious( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8003 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8004 pConditions[Condition_Unconcious] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8005 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8006 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8007 void Player::SetDead( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8008 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8009 pConditions[Condition_Dead] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8010 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8011 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8012 void Player::SetPertified( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8013 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8014 pConditions[Condition_Pertified] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8015 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8016 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8017 void Player::SetEradicated( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8018 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8019 pConditions[Condition_Eradicated] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8020 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8021 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8022 void Player::SetZombie( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8023 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8024 pConditions[Condition_Zombie] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8025 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8026 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8027 void Player::SetCondWeakWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8028 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8029 SetCondition(Condition_Weak, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8030 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8031 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8032 void Player::SetCondInsaneWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8033 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8034 SetCondition(Condition_Insane, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8035 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8036 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8037 void Player::SetCondDeadWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8038 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8039 SetCondition(Condition_Dead, blockable); |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8040 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
8041 |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
8042 void Player::SetCondUnconsciousWithBlockCheck( int blockable ) |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
8043 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
8044 SetCondition(Condition_Dead, blockable); |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
8045 } |