Mercurial > mm7
annotate Player.cpp @ 1617:8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
| author | Grumpy7 |
|---|---|
| date | Sat, 14 Sep 2013 06:56:05 +0200 |
| parents | 434b796cdfd3 |
| children | f5b13e6be493 |
| 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 | |
| 63 | |
| 64 | |
| 65 | |
| 66 // available skills per class ( 9 classes X 37 skills ) | |
| 67 // 0 - not available | |
| 68 // 1 - available | |
| 69 // 2 - primary skill | |
| 70 unsigned char pSkillAvailabilityPerClass[9][37] = // byte[] @ MM7.exe::004ED820 | |
| 71 { | |
| 72 {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}, | |
| 73 {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}, | |
| 74 {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}, | |
| 75 {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}, | |
| 76 {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}, | |
| 77 {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}, | |
| 78 {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}, | |
| 79 {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}, | |
| 80 {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 | |
| 81 }; | |
| 82 | |
| 83 | |
| 1374 | 84 unsigned char pEquipTypeToBodyAnchor[21] = // 4E8398 |
| 85 { | |
| 86 1, // EQUIP_OFF_HAND | |
| 87 1, // EQUIP_MAIN_HAND | |
| 88 2, // EQUIP_BOW | |
| 89 3, // EQUIP_ARMOUR | |
| 90 0, // EQUIP_SHIELD | |
| 91 4, // EQUIP_HELMET | |
| 92 5, // EQUIP_BELT | |
| 93 6, // EQUIP_CLOAK | |
| 94 7, // EQUIP_GAUNTLETS | |
| 95 8, // EQUIP_BOOTS | |
| 96 10, // EQUIP_RING | |
| 97 9, // EQUIP_AMULET | |
| 98 1, // EQUIP_WAND | |
| 99 0, // EQUIP_REAGENT | |
| 100 0, // EQUIP_POTION | |
| 101 0, // EQUIP_SPELL_SCROLL | |
| 102 0, // EQUIP_BOOK | |
| 103 0, // EQUIP_MESSAGE_SCROLL | |
| 104 0, // EQUIP_GOLD | |
| 105 0, // EQUIP_GEM | |
| 106 0 // EQUIP_NONE | |
| 107 }; | |
| 0 | 108 |
| 109 | |
| 110 unsigned char pBaseHealthByClass[12] = {40, 35, 35, 30, 30, 30, 25, 20, 20, 0, 0, 0}; | |
| 111 unsigned char pBaseManaByClass[12] = { 0, 0, 0, 5, 5, 0, 10, 10, 15, 0, 0, 0}; | |
| 112 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}; | |
| 113 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}; | |
| 114 | |
| 1325 | 115 unsigned char pConditionAttributeModifier[7][19] = |
| 116 {{100, 100, 100, 120, 50, 200, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Might | |
| 117 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Intelligence | |
| 118 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Willpower | |
| 119 {100, 100, 100, 100, 50, 150, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Endurance | |
| 120 {100, 100, 100, 50, 10, 100, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Accuracy | |
| 121 {100, 100, 100, 120, 20, 120, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Speed | |
| 122 {100, 100, 100, 100, 200, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100}}; //Luck | |
| 123 | |
| 124 unsigned char pAgingAttributeModifier[7][4] = | |
| 125 {{100, 75, 40, 10}, //Might | |
| 126 {100, 150, 100, 10}, //Intelligence | |
| 127 {100, 150, 100, 10}, //Willpower | |
| 128 {100, 75, 40, 10}, //Endurance | |
| 129 {100, 100, 40, 10}, //Accuracy | |
| 130 {100, 100, 40, 10}, //Speed | |
| 131 {100, 100, 100, 100}}; //Luck | |
| 0 | 132 |
| 1036 | 133 signed int pAgeingTable[4] = {50, 100, 150, 0xFFFF}; |
| 0 | 134 |
|
1207
96a81634669e
arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents:
1205
diff
changeset
|
135 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 | 136 |
| 1036 | 137 short param_to_bonus_table[29] = {500, 400, 350, 300, 275, 250, 225, 200, 175, |
| 0 | 138 150, 125, 100, 75, 50, 40, 35, 30, 25, 21, |
| 1036 | 139 19, 17, 15, 13, 11, 9, 7, 5, 3, 0}; |
| 140 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 | 141 |
| 142 | |
| 816 | 143 unsigned short base_recovery_times_per_weapon_type[12] = |
| 144 { | |
| 145 100, // PLAYER_SKILL_STAFF && Unarmed withoud skill | |
| 146 90, // PLAYER_SKILL_SWORD && Unarmed with skill | |
| 147 60, // PLAYER_SKILL_DAGGER | |
| 148 100, // PLAYER_SKILL_AXE | |
| 149 80, // PLAYER_SKILL_SPEAR | |
| 150 100, // PLAYER_SKILL_BOW | |
| 151 80, // PLAYER_SKILL_MACE | |
| 152 30, // PLAYER_SKILL_BLASTER | |
| 153 10, // PLAYER_SKILL_SHIELD | |
| 154 10, // PLAYER_SKILL_LEATHER | |
| 155 20, // PLAYER_SKILL_CHAIN | |
| 156 30 // PLAYER_SKILL_PLATE | |
| 157 }; | |
| 158 | |
| 0 | 159 //----- (00490913) -------------------------------------------------------- |
| 1459 | 160 int PlayerCreation_GetUnspentAttributePointCount() |
| 0 | 161 { |
| 162 signed int v0; // edi@1 | |
| 1273 | 163 int raceId; // ebx@2 |
| 0 | 164 signed int v4; // eax@17 |
| 165 int v5; // edx@18 | |
| 166 signed int v6; // ecx@18 | |
| 1273 | 167 signed int remainingStatPoints; // [sp+Ch] [bp-8h]@1 |
| 168 | |
| 169 remainingStatPoints = 50; | |
| 0 | 170 v0 = 50; |
| 1273 | 171 for (int playerNum = 0; playerNum < 4; playerNum++) |
| 172 { | |
| 173 raceId = pParty->pPlayers[playerNum].GetRace(); | |
| 174 for (int statNum = 0; statNum <= 6; statNum++) | |
| 175 { | |
| 176 switch ( statNum ) | |
| 0 | 177 { |
| 1273 | 178 case 0: |
| 179 v0 = pParty->pPlayers[playerNum].uMight; | |
| 180 break; | |
| 181 case 1: | |
| 182 v0 = pParty->pPlayers[playerNum].uIntelligence; | |
| 183 break; | |
| 184 case 2: | |
| 185 v0 = pParty->pPlayers[playerNum].uWillpower; | |
| 186 break; | |
| 187 case 3: | |
| 188 v0 = pParty->pPlayers[playerNum].uEndurance; | |
| 189 break; | |
| 190 case 4: | |
| 191 v0 = pParty->pPlayers[playerNum].uAccuracy; | |
| 192 break; | |
| 193 case 5: | |
| 194 v0 = pParty->pPlayers[playerNum].uSpeed; | |
| 195 break; | |
| 196 case 6: | |
| 197 v0 = pParty->pPlayers[playerNum].uLuck; | |
| 198 break; | |
| 199 } | |
| 200 v4 = StatTable[raceId][statNum].uBaseValue; | |
| 201 if ( v0 >= v4 ) | |
| 202 { | |
| 203 v5 = StatTable[raceId][statNum].uDroppedStep; | |
| 204 v6 = StatTable[raceId][statNum].uBaseStep; | |
| 0 | 205 } |
| 206 else | |
| 207 { | |
| 1273 | 208 v5 = StatTable[raceId][statNum].uBaseStep; |
| 209 v6 = StatTable[raceId][statNum].uDroppedStep; | |
| 0 | 210 } |
| 1273 | 211 remainingStatPoints += v5 * (v4 - v0) / v6; |
| 212 } | |
| 213 } | |
| 214 return remainingStatPoints; | |
| 0 | 215 } |
| 216 | |
| 217 | |
| 218 | |
| 219 //----- (00427730) -------------------------------------------------------- | |
| 220 bool Player::CanCastSpell(unsigned int uRequiredMana) | |
| 221 { | |
| 1275 | 222 if (sMana >= (signed int)uRequiredMana) |
| 223 { | |
| 224 sMana -= (signed int)uRequiredMana; | |
| 488 | 225 return true; |
| 226 } | |
| 227 | |
| 228 pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0); | |
| 229 return false; | |
| 0 | 230 } |
| 231 | |
| 232 | |
| 233 //----- (004BE2DD) -------------------------------------------------------- | |
| 1014 | 234 void Player::SalesProcess( unsigned int inventory_idnx, int item_index, int _2devent_idx ) |
| 235 { | |
| 0 | 236 float v6; // ST04_4@1 |
| 1014 | 237 signed int item_value; // eax@1 |
| 238 signed int sell_price; // ebx@1 | |
| 239 | |
| 240 item_value =pOwnItems[item_index].GetValue(); | |
| 241 v6 = p2DEvents[ _2devent_idx - 1].fPriceMultiplier; | |
| 242 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
|
243 if ( pOwnItems[item_index].IsBroken() ) |
| 1014 | 244 sell_price = 1; |
| 245 if ( sell_price < 1 ) | |
| 246 sell_price = 1; | |
| 247 RemoveItemAtInventoryIndex(inventory_idnx); | |
| 248 Party::SetGold(pParty->uNumGold + sell_price); | |
| 0 | 249 } |
| 250 | |
| 251 | |
| 252 | |
| 253 //----- (0043EEF3) -------------------------------------------------------- | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
254 bool Player::NothingOrJustBlastersEquipped() |
| 0 | 255 { |
| 1014 | 256 signed int item_idx; // esi@1 |
| 257 signed int item_id; // esi@1 | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
258 for (int i = 0; i < 16; ++i) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
259 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
260 item_idx = pEquipment.pIndices[i]; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
261 if (item_idx) |
|
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_id = pOwnItems[item_idx - 1].uItemID; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
264 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
|
265 return false; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
266 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
267 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
268 return true; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
269 } |
| 1014 | 270 |
| 0 | 271 |
| 272 | |
| 273 | |
| 274 //----- (004B8040) -------------------------------------------------------- | |
| 1036 | 275 int Player::GetConditionDayOfWeek( unsigned int uCondition ) |
| 276 { | |
| 277 return (unsigned int)(((signed __int64)((double)this->pConditions[uCondition] * 0.234375) / 60 / 60) / 24) % 7 + 1; | |
| 0 | 278 } |
| 279 | |
| 280 //----- (004B807C) -------------------------------------------------------- | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
281 int Player::GetTempleHealCostModifier(float a2) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
282 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
283 unsigned int conditionIdx; // eax@1 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
284 int conditionTimeMultiplier; // esi@1 |
| 0 | 285 int v6; // eax@8 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
286 signed int result; // qax@13 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
287 signed int baseConditionMultiplier; // [sp+8h] [bp-8h]@4 |
| 1275 | 288 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
289 conditionIdx = GetMajorConditionIdx(); |
| 1275 | 290 if ( conditionIdx >= 14 && conditionIdx <= 16) |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
291 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
292 if ( conditionIdx <= 15 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
293 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
294 baseConditionMultiplier = 5; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
295 } |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
296 if ( conditionIdx == 16 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
297 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
298 baseConditionMultiplier = 10; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
299 } |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
300 conditionTimeMultiplier = GetConditionDayOfWeek(conditionIdx); |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
301 } |
| 1350 | 302 else |
| 303 { | |
| 1275 | 304 conditionTimeMultiplier = 1; |
| 305 baseConditionMultiplier = 1; | |
| 1350 | 306 if (conditionIdx < 14) |
| 307 { | |
| 308 for (int i = 0; i <= 13; i++) | |
| 309 { | |
| 310 v6 = GetConditionDayOfWeek(i); | |
| 311 if ( v6 > conditionTimeMultiplier ) | |
| 312 conditionTimeMultiplier = v6; | |
| 313 } | |
| 314 } | |
| 1275 | 315 } |
| 316 result = (int)((double)conditionTimeMultiplier * (double)baseConditionMultiplier * a2); | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
317 if ( result < 1 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
318 result = 1; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
319 return result; |
| 0 | 320 } |
| 321 | |
| 322 //----- (004B8102) -------------------------------------------------------- | |
| 917 | 323 int Player::GetPriceSell(int uRealValue, float price_multiplier) |
| 0 | 324 { |
| 325 signed int v3; // esi@1 | |
| 326 signed int result; // eax@3 | |
| 327 | |
| 1275 | 328 v3 = (signed int)((signed __int64)((double)uRealValue / (price_multiplier + 2.0)) + uRealValue * GetMerchant() / 100); |
| 917 | 329 if ( v3 > uRealValue ) |
| 330 v3 = uRealValue; | |
| 0 | 331 result = 1; |
| 332 if ( v3 >= 1 ) | |
| 333 result = v3; | |
| 334 return result; | |
| 335 } | |
| 336 | |
| 337 //----- (004B8142) -------------------------------------------------------- | |
| 749 | 338 int Player::GetBuyingPrice(unsigned int uRealValue, float price_multiplier) |
| 339 { | |
| 1275 | 340 uint price = (uint)(((100 - GetMerchant()) * (uRealValue * price_multiplier)) / 100); |
| 749 | 341 |
| 342 if (price < uRealValue) | |
| 343 price = uRealValue; | |
| 344 return price; | |
| 0 | 345 } |
| 346 | |
| 347 //----- (004B8179) -------------------------------------------------------- | |
| 916 | 348 int Player::GetPriceIdentification(float a2) |
| 0 | 349 { |
| 350 signed int v2; // esi@1 | |
| 351 int v3; // ecx@1 | |
| 352 signed int result; // eax@3 | |
| 353 | |
| 1275 | 354 v2 = (signed int)(a2 * 50.0); |
| 0 | 355 v3 = v2 * (100 - GetMerchant()) / 100; |
| 356 if ( v3 < v2 / 3 ) | |
| 357 v3 = v2 / 3; | |
| 358 result = 1; | |
| 359 if ( v3 >= 1 ) | |
| 360 result = v3; | |
| 361 return result; | |
| 362 } | |
| 363 | |
| 364 //----- (004B81C3) -------------------------------------------------------- | |
| 916 | 365 int Player::GetPriceRepair(int a2, float a3) |
| 0 | 366 { |
| 367 signed int v3; // esi@1 | |
| 368 int v4; // ecx@1 | |
| 369 signed int result; // eax@3 | |
| 370 | |
| 1275 | 371 v3 = (signed int)((double)a2 / (6.0 - a3)); |
| 0 | 372 v4 = v3 * (100 - GetMerchant()) / 100; |
| 373 if ( v4 < v3 / 3 ) | |
| 374 v4 = v3 / 3; | |
| 375 result = 1; | |
| 376 if ( v4 >= 1 ) | |
| 377 result = v4; | |
| 378 return result; | |
| 379 } | |
| 380 | |
| 381 //----- (004B8213) -------------------------------------------------------- | |
| 1275 | 382 int Player::GetBaseSellingPrice(int a2, float a3) |
| 383 { | |
| 384 signed int v3; // qax@1 | |
| 385 | |
| 386 v3 = (signed int)((double)a2 / (a3 + 2.0)); | |
| 387 if ( v3 < 1 ) | |
| 388 v3 = 1; | |
| 0 | 389 return v3; |
| 390 } | |
| 391 | |
| 392 //----- (004B8233) -------------------------------------------------------- | |
| 1275 | 393 int Player::GetBaseBuyingPrice(int a2, float a3) |
| 394 { | |
| 395 signed int v3; // qax@1 | |
| 396 | |
| 397 v3 = (signed int)((double)a2 * a3); | |
| 398 if ( v3 < 1 ) | |
| 399 v3 = 1; | |
| 0 | 400 return v3; |
| 401 } | |
| 402 | |
| 403 //----- (004B824B) -------------------------------------------------------- | |
| 1275 | 404 int Player::GetBaseIdentifyPrice(float a2) |
| 405 { | |
| 406 signed int v2; // qax@1 | |
| 407 | |
| 408 v2 = (signed int)(a2 * 50.0); | |
| 409 if ( v2 < 1 ) | |
| 410 v2 = 1; | |
| 0 | 411 return v2; |
| 412 } | |
| 413 | |
| 414 //----- (004B8265) -------------------------------------------------------- | |
| 1275 | 415 int Player::GetBaseRepairPrice(int a2, float a3) |
| 416 { | |
| 417 signed int v3; // qax@1 | |
| 418 | |
| 419 v3 = (signed int)((double)a2 / (6.0 - a3)); | |
| 420 if ( v3 < 1 ) | |
| 421 v3 = 1; | |
| 0 | 422 return v3; |
| 423 } | |
| 424 | |
| 425 | |
| 426 | |
| 427 | |
| 428 | |
| 429 //----- (004B6FF9) -------------------------------------------------------- | |
| 1348 | 430 bool Player::IsPlayerHealableByTemple() |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
431 { |
| 0 | 432 signed int v2; // eax@1 |
| 336 | 433 v2 = (signed int)window_SpeakInHouse->ptr_1C; |
| 1348 | 434 if (this->sHealth >= GetMaxHealth() && this->sMana >= GetMaxMana() && GetMajorConditionIdx() == Condition_Good) |
| 435 { | |
| 436 return false; | |
| 437 } | |
| 438 else | |
| 439 { | |
| 440 if (GetMajorConditionIdx() == Condition_Zombie) | |
| 441 { | |
| 442 if ((v2 == 78 || v2 == 81 || v2 == 82)) | |
| 443 { | |
| 444 return false; | |
| 445 } | |
| 446 else | |
| 447 { | |
| 448 return true; | |
| 449 } | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
450 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
451 else |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
452 { |
| 1348 | 453 return true; |
| 454 } | |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
455 } |
| 0 | 456 } |
| 457 | |
| 458 | |
| 459 | |
| 460 //----- (00421E75) -------------------------------------------------------- | |
| 1012 | 461 unsigned int Player::GetItemIDAtInventoryIndex(int *pitem_index) |
| 462 { | |
| 463 int item_idx; // eax@1 | |
| 464 int inv_index; // eax@3 | |
| 465 | |
| 1351 | 466 |
| 1012 | 467 item_idx = *pitem_index; |
| 468 if ( item_idx >125 || item_idx < 0 ) | |
| 469 { | |
| 470 return 0; | |
| 471 } | |
| 472 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
473 inv_index = this->pInventoryMatrix[item_idx]; |
| 1012 | 474 if ( inv_index < 0 ) |
| 475 { | |
| 476 *pitem_index = -1 - inv_index; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
477 inv_index = this->pInventoryMatrix[-1 - inv_index]; |
| 1012 | 478 } |
| 479 | |
| 480 return inv_index; | |
| 0 | 481 } |
| 482 | |
| 483 | |
| 484 | |
| 485 //----- (004160CA) -------------------------------------------------------- | |
| 1012 | 486 void Player::ItemsEnchant( int enchant_count ) |
| 487 { | |
| 488 int avalible_items; // ebx@1 | |
| 489 int i; // edx@8 | |
| 490 __int16 item_index_tabl[138]; // [sp+Ch] [bp-118h]@1 | |
| 491 | |
| 492 avalible_items = 0; | |
| 493 memset (item_index_tabl,0,sizeof(item_index_tabl)); | |
| 494 | |
| 1349 | 495 for (i = 0; i < 138; ++i) |
| 496 { | |
| 497 if (( pOwnItems[i].uItemID>0)&&(pOwnItems[i].uItemID <= 134)) | |
| 498 item_index_tabl[avalible_items++] = i; | |
| 499 } | |
| 1012 | 500 |
| 501 if ( avalible_items ) | |
| 502 { | |
| 503 if ( enchant_count ) | |
| 504 { | |
| 1349 | 505 for ( i = 0; i < enchant_count; ++i ) |
| 506 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
507 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
|
508 pInventoryItemList[item_index_tabl[rand() % avalible_items]].uAttributes |= ITEM_ENCHANTED; |
| 1349 | 509 } |
| 0 | 510 } |
| 511 else | |
| 512 { | |
| 1012 | 513 for ( i = 0; i < avalible_items; ++i ) |
| 514 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
515 pInventoryItemList[item_index_tabl[i]].uAttributes |= ITEM_ENCHANTED; |
| 1349 | 516 } |
| 517 } | |
| 518 } | |
| 0 | 519 } |
| 520 | |
| 521 //----- (004948B1) -------------------------------------------------------- | |
| 187 | 522 void Player::PlaySound(PlayerSpeech speech, int a3) |
| 523 { | |
| 1351 | 524 signed int speechCount = 0; // esi@4 |
| 525 signed int expressionCount = 0; // esi@4 | |
| 526 int pickedVariant; // esi@10 | |
| 248 | 527 CHARACTER_EXPRESSION_ID expression; // ebx@17 |
| 1406 | 528 signed int pSoundID; // ecx@19 |
| 1351 | 529 int speechVariantArray[5]; // [sp+Ch] [bp-1Ch]@7 |
| 530 int expressionVariantArray[5]; | |
| 531 unsigned int pickedSoundID; // [sp+30h] [bp+8h]@4 | |
| 532 unsigned int expressionDuration = 0; | |
| 187 | 533 |
| 1351 | 534 pickedSoundID = 0; |
| 203 | 535 if (uVoicesVolumeMultiplier) |
| 0 | 536 { |
| 1351 | 537 for (int i = 0; i < 2; i++) |
| 538 { | |
| 1406 | 539 if ( SoundSetAction[speech][i] ) |
| 540 { | |
| 541 speechVariantArray[speechCount] = SoundSetAction[speech][i]; | |
| 1351 | 542 speechCount++; |
| 543 } | |
| 544 } | |
| 545 if ( speechCount ) | |
| 546 { | |
| 547 pickedVariant = speechVariantArray[rand() % speechCount]; | |
| 548 int numberOfSubvariants = byte_4ECF08[pickedVariant - 1][uVoiceID]; | |
| 549 if (numberOfSubvariants > 0) | |
| 550 { | |
| 551 pickedSoundID = rand() % numberOfSubvariants + 2 * (pickedVariant + 50 * uVoiceID) + 4998; | |
| 1406 | 552 pAudioPlayer->PlaySound((SoundID)pickedSoundID, PID(OBJECT_Player, uActiveCharacter + 39), 0, -1, 0, 0, (int)(pSoundVolumeLevels[uVoicesVolumeMultiplier] * 128.0f), 0); |
| 1351 | 553 } |
| 554 } | |
| 555 } | |
| 556 | |
| 557 for (int i = 0; i < 5; i++) | |
| 558 { | |
| 1406 | 559 if ( SoundSetAction[speech][i + 3] ) |
| 560 { | |
| 561 expressionVariantArray[expressionCount] = SoundSetAction[speech][i + 3]; | |
| 1351 | 562 expressionCount++; |
| 563 } | |
| 564 } | |
| 565 if ( expressionCount ) | |
| 566 { | |
| 567 expression = (CHARACTER_EXPRESSION_ID)expressionVariantArray[rand() % expressionCount]; | |
| 568 if (expression == CHARACTER_EXPRESSION_21 && pickedSoundID ) | |
| 569 { | |
| 1406 | 570 pSoundID = 0; |
| 571 if ( pSoundList->sNumSounds ) | |
| 572 { | |
| 1351 | 573 for (int i = 0; i < pSoundList->sNumSounds; i++) |
| 0 | 574 { |
| 1406 | 575 if (pSoundList->pSounds[i].uSoundID == pickedSoundID) |
| 576 pSoundID = i; | |
| 0 | 577 } |
| 578 } | |
| 1406 | 579 if ( pSoundList->pSounds[pSoundID].pSoundData[0] ) |
| 1351 | 580 expressionDuration = (sLastTrackLengthMS << 7) / 1000; |
| 581 } | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
582 PlayEmotion(expression, expressionDuration); |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
583 } |
| 0 | 584 } |
| 585 // 4948B1: using guessed type int var_1C[5]; | |
| 586 | |
| 587 //----- (00494A25) -------------------------------------------------------- | |
| 187 | 588 void Player::PlayEmotion(CHARACTER_EXPRESSION_ID new_expression, int a3) |
| 589 { | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
590 unsigned int v3 = expression; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
591 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
|
592 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
593 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
594 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
595 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
|
596 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
597 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
598 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
599 else |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
600 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
601 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
|
602 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
603 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
|
604 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
605 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
606 } |
|
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 } |
| 0 | 609 this->uExpressionTimePassed = 0; |
| 610 if ( !a3 ) | |
| 611 { | |
| 187 | 612 this->uExpressionTimeLength = 8 * pPlayerFrameTable->pFrames[a3].uAnimLength; |
| 613 } | |
|
1353
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
614 else |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
615 { |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
616 this->uExpressionTimeLength = 0; |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
617 } |
| 187 | 618 expression = new_expression; |
| 0 | 619 viewparams->bRedrawGameUI = 1; |
| 620 } | |
| 621 | |
| 622 //----- (0049327B) -------------------------------------------------------- | |
| 1355 | 623 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
|
624 { |
| 135 | 625 if ( this->classType == uClass ) |
| 0 | 626 { |
|
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 return true; |
| 0 | 628 } |
| 629 else | |
| 630 { | |
|
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
|
631 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
|
632 { |
|
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
|
633 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
|
634 } |
| 0 | 635 switch ( uClass ) |
| 636 { | |
| 637 case 0x1Au: | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
638 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 65)); |
| 0 | 639 case 0x1Bu: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
640 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 67)); |
| 0 | 641 case 0x22u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
642 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 77)); |
| 0 | 643 case 0x23u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
644 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 79)); |
| 0 | 645 break; |
| 646 default: | |
| 1545 | 647 Error("Should not be able to get here (%u)", uClass); |
| 0 | 648 break; |
| 649 } | |
|
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
|
650 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
|
651 } |
| 0 | 652 } |
| 653 | |
| 654 | |
| 655 //----- (00492C0B) -------------------------------------------------------- | |
| 656 bool Player::CanAct() | |
| 657 { | |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
658 if ( this->IsAsleep() || this->IsParalyzed() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
659 this->IsUnconcious() || this->IsDead() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
660 this->IsPertified() || this->IsEradicated() ) |
| 1355 | 661 return false; |
| 0 | 662 else |
| 1355 | 663 return true; |
| 0 | 664 } |
| 665 | |
| 666 //----- (00492C40) -------------------------------------------------------- | |
| 667 bool Player::CanSteal() | |
| 668 { | |
| 1355 | 669 return GetActualSkillLevel(PLAYER_SKILL_STEALING) != 0; |
| 0 | 670 } |
| 671 | |
| 672 //----- (00492C4E) -------------------------------------------------------- | |
| 673 bool Player::CanEquip_RaceAndAlignmentCheck(unsigned int uItemID) | |
| 674 { | |
|
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
|
675 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
|
676 { |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
677 case ITEM_RELIC_ETHRICS_STAFF: |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
678 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
|
679 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
|
680 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
|
681 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
|
682 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
|
683 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
|
684 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
|
685 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
|
686 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
|
687 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
|
688 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
|
689 default: return 1; break; |
|
1356
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
690 } |
|
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
691 } |
|
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
|
692 |
| 0 | 693 //----- (00492D65) -------------------------------------------------------- |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
694 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
|
695 { |
|
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
|
696 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
|
697 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
|
698 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
|
699 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
|
700 |
|
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 if ( pConditions[uConditionIdx] ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
702 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
703 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
704 if (!ConditionProcessor::IsPlayerAffected(this, uConditionIdx, a3)) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
705 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
706 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
707 } |
|
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
|
708 |
|
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
|
709 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
|
710 { |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
711 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
|
712 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
|
713 case Condition_Sleep: break; //nosound |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
714 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
|
715 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
|
716 case Condition_Insane: PlaySound(SPEECH_29, 0); break; |
| 1014 | 717 case Condition_Poison1: |
| 718 case Condition_Poison2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
719 case Condition_Poison3: PlaySound(SPEECH_27, 0); break; |
| 1014 | 720 case Condition_Disease1: |
| 721 case Condition_Disease2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
722 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
|
723 case Condition_Paralyzed: break; //nosound |
| 1014 | 724 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
|
725 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
|
726 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
|
727 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
|
728 break; |
| 1014 | 729 case Condition_Dead: |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
730 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
|
731 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
|
732 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
|
733 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
|
734 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
|
735 break; |
| 1014 | 736 case Condition_Pertified: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
737 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
|
738 break; |
| 1014 | 739 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
|
740 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
|
741 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
|
742 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
|
743 if ( sMana > 0 ) |
| 1014 | 744 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
|
745 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
|
746 case Condition_Zombie: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
747 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
|
748 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
|
749 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
|
750 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
|
751 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
|
752 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
|
753 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
|
754 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
|
755 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
|
756 { |
|
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 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
|
758 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
|
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 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
|
761 { |
|
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 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
|
763 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
|
764 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
765 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
|
766 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
|
767 } |
|
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
|
768 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
769 players_before = 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
770 for (int i = 1; i < 5; ++i) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
771 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
772 if ( pPlayers[i]->CanAct() ) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
773 ++players_before; |
|
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 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
776 pConditions[uConditionIdx] = 1; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
777 |
|
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
|
778 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
|
779 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
|
780 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
|
781 { |
|
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 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
|
783 { |
|
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 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
|
785 ++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
|
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 } |
|
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 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
|
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 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
|
791 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
792 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
|
793 } |
| 0 | 794 |
| 795 //----- (00492528) -------------------------------------------------------- | |
| 796 bool Player::CanFitItem(unsigned int uSlot, unsigned int uItemID) | |
| 797 { | |
| 1363 | 798 Texture *texture; // esi@1 |
| 799 unsigned int slotWidth; // ebx@1 | |
| 800 unsigned int slotHeight; // [sp+1Ch] [bp+Ch]@1 | |
| 801 | |
| 802 texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); | |
| 803 slotWidth = GetSizeInInventorySlots(texture->uTextureWidth); | |
| 804 slotHeight = GetSizeInInventorySlots(texture->uTextureHeight); | |
| 0 | 805 if ( !areWeLoadingTexture ) |
| 806 { | |
| 1363 | 807 texture->Release(); |
| 1006 | 808 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 809 } |
| 1555 | 810 Assert(slotHeight > 0 && slotWidth > 0, "Items should have nonzero dimensions"); |
| 1363 | 811 if ( (slotWidth + uSlot % INVETORYSLOTSWIDTH) <= INVETORYSLOTSWIDTH && (slotHeight + uSlot / INVETORYSLOTSWIDTH) <= INVETORYSLOTSHEIGHT ) |
| 812 { | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
813 for (unsigned int x = 0; x < slotWidth; x++) |
| 1363 | 814 { |
|
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
|
815 for (unsigned int y = 0; y < slotHeight; y++) |
| 1363 | 816 { |
|
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
|
817 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
|
818 { |
|
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
|
819 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
|
820 } |
| 1363 | 821 } |
| 822 } | |
| 823 return true; | |
| 824 } | |
| 825 return false; | |
| 0 | 826 } |
| 827 // 506128: using guessed type int areWeLoadingTexture; | |
| 828 | |
| 829 //----- (004925E6) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
830 int Player::FindFreeInventoryListSlot() |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
831 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
832 for (int i = 0; i < 126; i++ ) |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
833 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
834 if (pInventoryItemList[i].uItemID == 0) |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
835 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
836 return i; |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
837 } |
|
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 -1; |
| 0 | 840 } |
| 841 | |
| 842 //----- (00492600) -------------------------------------------------------- | |
| 843 int Player::CreateItemInInventory(unsigned int uSlot, unsigned int uItemID) | |
| 844 { | |
| 845 int result; // eax@8 | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
846 signed int freeSlot; // [sp+8h] [bp-4h]@4 |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
847 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
848 freeSlot = FindFreeInventoryListSlot(); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
849 if ( freeSlot == -1 ) |
| 0 | 850 { |
| 851 if ( uActiveCharacter ) | |
| 201 | 852 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NoRoom, 0); |
|
1366
8f339c3bbdaf
Player::CreateItemInInventory small bugfix from previous change
Grumpy7
parents:
1365
diff
changeset
|
853 return 0; |
| 0 | 854 } |
| 855 else | |
| 856 { | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
857 PutItemArInventoryIndex(uItemID, freeSlot, uSlot); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
858 result = freeSlot + 1; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
859 this->pInventoryItemList[freeSlot].uItemID = uItemID; |
| 0 | 860 } |
| 861 return result; | |
| 862 } | |
| 863 // 506128: using guessed type int areWeLoadingTexture; | |
| 864 | |
| 865 //----- (00492700) -------------------------------------------------------- | |
| 866 int Player::HasSkill(unsigned int uSkillType) | |
| 867 { | |
| 1374 | 868 if ( uSkillType >= 37 || this->pActiveSkills[uSkillType] ) |
| 869 { | |
| 870 return 1; | |
| 0 | 871 } |
| 872 else | |
| 873 { | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
874 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[67], this->pName); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
875 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1374 | 876 return 0; |
| 877 } | |
| 0 | 878 } |
| 879 | |
| 880 //----- (00492745) -------------------------------------------------------- | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
881 void Player::WearItem( unsigned int uItemID ) |
| 0 | 882 { |
| 1010 | 883 int item_body_anch; // edi@6 |
| 884 int item_indx; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
885 item_indx = FindFreeInventoryListSlot(); |
| 1010 | 886 |
| 887 if ( item_indx != -1 ) | |
| 888 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
889 pInventoryItemList[item_indx].uItemID = uItemID; |
| 1374 | 890 item_body_anch = pEquipTypeToBodyAnchor[pItemsTable->pItems[uItemID].uEquipType]; |
| 891 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
|
892 pInventoryItemList[item_indx].uBodyAnchor = item_body_anch + 1; |
| 0 | 893 } |
| 894 } | |
| 895 | |
| 896 //----- (004927A8) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
897 int Player::AddItem(int index, unsigned int uItemID) |
| 0 | 898 { |
| 1374 | 899 int xStartValue = 0; |
| 900 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
901 if ( index == -1 ) |
| 0 | 902 { |
| 1385 | 903 for (int xcoord = 0; xcoord < INVETORYSLOTSWIDTH; xcoord++) |
| 904 { | |
|
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
|
905 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) |
| 0 | 906 { |
|
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
|
907 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
|
908 { |
|
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
|
909 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
|
910 } |
| 0 | 911 } |
| 1385 | 912 } |
| 0 | 913 return 0; |
| 914 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
915 if ( !CanFitItem(index, uItemID) ) |
| 0 | 916 { |
| 917 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); | |
| 918 return 0; | |
| 919 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
920 return CreateItemInInventory(index, uItemID); |
| 0 | 921 } |
| 922 | |
| 923 //----- (00492826) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
924 int Player::AddItem2(int index, ItemGen *Src) |
| 0 | 925 { |
| 926 pItemsTable->SetSpecialBonus(Src); | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
927 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
928 if ( index == -1 ) |
| 0 | 929 { |
|
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
|
930 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
|
931 { |
|
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
|
932 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) //TODO: change pInventoryMatrix to 2 dimensional array. |
| 1385 | 933 { |
|
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
|
934 if ( CanFitItem(ycoord * INVETORYSLOTSWIDTH + xcoord, Src->uItemID) ) |
| 0 | 935 { |
|
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
|
936 return CreateItemInInventory2(ycoord * INVETORYSLOTSWIDTH + xcoord, Src); |
| 0 | 937 } |
| 1385 | 938 } |
| 0 | 939 } |
| 940 return 0; | |
| 941 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
942 if ( !CanFitItem(index, Src->uItemID) ) |
| 0 | 943 return 0; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
944 return CreateItemInInventory2(index, Src); |
| 0 | 945 } |
| 946 | |
| 947 //----- (0049289C) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
948 int Player::CreateItemInInventory2( unsigned int index, ItemGen *Src ) |
| 0 | 949 { |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
950 signed int freeSlot; // ebx@1 |
| 0 | 951 int result; // eax@6 |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
952 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
953 freeSlot = FindFreeInventoryListSlot(); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
954 if ( freeSlot == -1 ) |
| 0 | 955 { |
| 956 result = 0; | |
| 957 } | |
| 958 else | |
| 959 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
960 PutItemArInventoryIndex(Src->uItemID, freeSlot, index); |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
961 memcpy(&pInventoryItemList[freeSlot], Src, sizeof(ItemGen)); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
962 result = freeSlot + 1; |
| 0 | 963 } |
| 964 return result; | |
| 965 } | |
| 966 // 506128: using guessed type int areWeLoadingTexture; | |
| 967 | |
| 968 //----- (0049298B) -------------------------------------------------------- | |
| 1385 | 969 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
|
970 { |
| 1014 | 971 Texture *item_texture; // esi@1 |
| 972 int *pInvPos; // esi@4 | |
| 973 unsigned int slot_width; // [sp+Ch] [bp-4h]@1 | |
| 974 unsigned int slot_height; // [sp+18h] [bp+8h]@1 | |
| 975 | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
976 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1014 | 977 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); |
| 978 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 979 if ( !areWeLoadingTexture ) |
| 980 { | |
| 1014 | 981 item_texture->Release(); |
| 1006 | 982 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 983 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
984 if ( slot_width > 0 ) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
985 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
986 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
987 for (unsigned int i = 0; i < slot_height; i++) |
|
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 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
|
990 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
991 } |
| 1014 | 992 } |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
993 pInventoryMatrix[index] = itemListPos + 1; |
| 0 | 994 } |
| 278 | 995 |
| 0 | 996 // 506128: using guessed type int areWeLoadingTexture; |
| 997 | |
| 998 //----- (00492A36) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
999 void Player::RemoveItemAtInventoryIndex( unsigned int index ) |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1000 { |
| 1014 | 1001 ItemGen *item_in_slot; // ecx@1 |
| 1002 Texture *item_texture; // esi@1 | |
| 1003 unsigned int slot_height; // ebp@1 | |
| 1004 int *pInvPos; // edx@4 | |
| 1005 unsigned int slot_width; // [sp+14h] [bp+4h]@1 | |
| 1006 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1007 item_in_slot = &this->pInventoryItemList[pInventoryMatrix[index]-1]; |
| 1014 | 1008 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[item_in_slot->uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1009 item_in_slot->Reset(); | |
| 1010 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); | |
| 1011 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 1012 if ( !areWeLoadingTexture ) |
| 1013 { | |
| 1014 | 1014 item_texture->Release(); |
| 1006 | 1015 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1016 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1017 if ( slot_width > 0 ) |
| 1014 | 1018 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1019 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1020 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1021 { |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1022 memset32(pInvPos, 0, slot_width); |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1023 pInvPos += INVETORYSLOTSWIDTH; |
|
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 } |
| 0 | 1026 } |
| 1027 // 506128: using guessed type int areWeLoadingTexture; | |
| 1028 | |
| 1029 //----- (00490EEE) -------------------------------------------------------- | |
| 1386 | 1030 int Player::SelectPhrasesTransaction(ItemGen *pItem, int building_type, int BuildID_2Events, int ShopMenuType) //TODO: probably move this somewhere else, not really Player:: stuff |
| 1031 { | |
| 1032 unsigned int idemId; // edx@1 | |
| 1033 signed int equipType; // esi@1 | |
| 1034 float multiplier; // ST04_4@26 | |
| 1035 int price; // edi@26 | |
| 1036 int merchantLevel; // [sp+10h] [bp-8h]@1 | |
| 1037 int itemValue; | |
| 1038 | |
| 1039 merchantLevel = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); | |
| 1040 idemId = pItem->uItemID; | |
| 1041 equipType = pItemsTable->pItems[idemId].uEquipType; | |
| 1042 itemValue = pItem->GetValue(); | |
| 1043 | |
| 1044 switch (building_type) | |
| 1045 { | |
| 1411 | 1046 case BuildingType_WeaponShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1047 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1048 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1049 if (equipType > EQUIP_BOW) |
| 1386 | 1050 return 4; |
| 1051 break; | |
| 1411 | 1052 case BuildingType_ArmorShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1053 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1054 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1055 if ( equipType < EQUIP_ARMOUR || equipType > EQUIP_BOOTS) |
| 1386 | 1056 return 4; |
| 1057 break; | |
| 1411 | 1058 case BuildingType_MagicShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1059 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1060 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1061 if ( pItemsTable->pItems[idemId].uSkillType != PLAYER_SKILL_MISC ) |
| 1386 | 1062 return 4; |
| 1063 break; | |
| 1411 | 1064 case BuildingType_AlchemistShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1065 if ((idemId >= ITEM_ARTIFACT_HERMES_SANDALS && idemId < ITEM_RECIPE_REJUVENATION) || idemId > ITEM_RECIPE_BODY_RESISTANCE) |
| 1386 | 1066 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1067 if ( !(equipType == EQUIP_REAGENT || equipType == EQUIP_POTION || equipType == EQUIP_MESSAGE_SCROLL)) |
| 1386 | 1068 return 4; |
| 1069 break; | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1070 default: |
| 1545 | 1071 Error("(%u)", building_type); |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1072 break; |
| 1386 | 1073 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1074 if (pItem->IsStolen()) |
| 1386 | 1075 return 6; |
| 1076 | |
| 1077 multiplier = p2DEvents[BuildID_2Events - 1].fPriceMultiplier; | |
| 1078 switch (ShopMenuType) | |
| 1079 { | |
| 1080 case 2: | |
| 1081 price = GetBuyingPrice(itemValue, multiplier); | |
| 1082 break; | |
| 1083 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
|
1084 if (pItem->IsBroken()) |
| 1386 | 1085 price = 1; |
| 917 | 1086 else |
| 1386 | 1087 price = this->GetPriceSell(itemValue, multiplier); |
| 1088 break; | |
| 1089 case 4: | |
| 1090 price = this->GetPriceIdentification(multiplier); | |
| 1091 break; | |
| 1092 case 5: | |
| 1093 price = this->GetPriceRepair(itemValue, multiplier); | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1094 break; |
|
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1095 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
|
1096 Error("(%u)", ShopMenuType); |
| 1386 | 1097 break; |
| 1098 } | |
| 1099 if ( merchantLevel ) | |
| 1100 { | |
| 1101 if (price == itemValue) | |
| 1102 { | |
| 1103 return 3; | |
| 1104 } | |
| 917 | 1105 else |
| 1386 | 1106 { |
| 1107 return 2; | |
| 1108 } | |
| 1109 } | |
| 0 | 1110 else |
| 1386 | 1111 { |
| 1112 return 1; | |
| 1113 } | |
| 0 | 1114 } |
| 1115 | |
| 1116 //----- (0049107D) -------------------------------------------------------- | |
| 1117 int Player::GetBodybuilding() | |
| 1118 { | |
| 1010 | 1119 int v1; // al@1 |
| 0 | 1120 |
| 1121 v1 = GetActualSkillLevel(PLAYER_SKILL_BODYBUILDING); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1122 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
|
1123 return multiplier * (v1 & 0x3F); |
| 0 | 1124 } |
| 1125 | |
| 1126 //----- (004910A8) -------------------------------------------------------- | |
| 607 | 1127 int Player::GetMeditation() |
| 0 | 1128 { |
| 1010 | 1129 int v1; // al@1 |
| 0 | 1130 |
| 1131 v1 = GetActualSkillLevel(PLAYER_SKILL_MEDITATION); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1132 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
|
1133 return multiplier * (v1 & 0x3F); |
| 0 | 1134 } |
| 1135 | |
| 1136 //----- (004910D3) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1137 bool Player::CanIdentify( ItemGen *pItem ) |
| 0 | 1138 { |
| 1139 unsigned __int16 v2; // ax@1 | |
| 1140 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
|
1141 return true; |
| 652 | 1142 if (CheckHiredNPCSpeciality(Scholar)) |
| 1143 return true; | |
| 0 | 1144 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1145 v2 = GetActualSkillLevel(PLAYER_SKILL_ITEM_ID); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1146 if ( (signed int)SkillToMastery(v2) >= 4 ) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1147 return true; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1148 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1149 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
|
1150 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1151 return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St; |
| 0 | 1152 } |
| 1153 | |
| 1154 //----- (00491151) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1155 bool Player::CanRepair( ItemGen *pItem ) |
| 0 | 1156 { |
| 1157 unsigned __int16 v2; // ax@1 | |
| 1158 int v5; // edi@7 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1159 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1160 ItemDesc* v7 = &pItemsTable->pItems[pItem->uItemID]; |
| 652 | 1161 if (CheckHiredNPCSpeciality(Smith) && v7->uEquipType <= 2 || |
| 1162 CheckHiredNPCSpeciality(Armorer) && v7->uEquipType >= 3 && v7->uEquipType <= 9 || | |
| 1163 CheckHiredNPCSpeciality(Alchemist) && v7->uEquipType >= 9 ) | |
| 1164 return true; | |
| 1165 | |
| 1010 | 1166 v2 = GetActualSkillLevel(PLAYER_SKILL_REPAIR); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1167 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 0 | 1168 return true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1169 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1170 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
|
1171 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1172 return v5 >= v7->uItemID_Rep_St; |
| 0 | 1173 } |
| 1174 | |
| 1175 //----- (004911F3) -------------------------------------------------------- | |
| 1176 int Player::GetMerchant() | |
| 1177 { | |
| 1178 unsigned __int16 v2; // ax@1 | |
| 1179 int v5; // edi@1 | |
| 1180 int v7; // eax@3 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1181 |
| 607 | 1182 v2 = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1183 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1184 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1185 |
| 0 | 1186 v7 = GetPartyReputation(); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1187 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
|
1188 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1189 if (v5 == 0) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1190 { |
| 0 | 1191 return -v7; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1192 } |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1193 return v5 - v7 + 7; |
| 0 | 1194 } |
| 1195 | |
| 1196 //----- (0049125A) -------------------------------------------------------- | |
| 1197 int Player::GetPerception() | |
| 1198 { | |
| 1199 unsigned __int16 v2; // ax@1 | |
| 1200 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1201 |
| 1010 | 1202 v2 = GetActualSkillLevel(PLAYER_SKILL_PERCEPTION); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1203 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1204 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1205 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1206 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
|
1207 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1208 return v5; |
| 0 | 1209 } |
| 1210 | |
| 1211 //----- (004912B0) -------------------------------------------------------- | |
| 1212 int Player::GetDisarmTrap() | |
| 1213 { | |
| 1214 unsigned __int16 v2; // ax@1 | |
| 1215 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1216 |
| 1010 | 1217 v2 = GetActualSkillLevel(PLAYER_SKILL_TRAP_DISARM); |
| 0 | 1218 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 1219 return 10000; | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1220 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1221 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
|
1222 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
|
1223 multiplier++; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1224 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1225 return v5; |
| 0 | 1226 } |
| 1227 | |
| 1228 //----- (00491317) -------------------------------------------------------- | |
| 1229 char Player::GetLearningPercent() | |
| 1230 { | |
| 1231 int v2; // eax@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1232 |
| 1010 | 1233 v2 = GetActualSkillLevel(PLAYER_SKILL_LEARNING); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1234 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
|
1235 return multiplier * v2 + 9; |
| 0 | 1236 } |
| 1237 | |
| 1238 //----- (0048C6AF) -------------------------------------------------------- | |
| 1239 Player::Player() | |
| 1240 { | |
| 1241 memset(&pEquipment, 0, sizeof(PlayerEquipment)); | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1242 memset(pInventoryMatrix, 0, 126 * sizeof(int)); |
| 0 | 1243 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
|
1244 pInventoryItemList[i].Reset(); |
| 0 | 1245 for (uint i = 0; i < 12; ++i) |
| 1246 pEquippedItems[i].Reset(); | |
| 1247 | |
| 1248 | |
| 1249 for (uint i = 0; i < 24; ++i) | |
| 1250 { | |
| 1251 pPlayerBuffs[i].uSkill = 0; | |
| 1252 pPlayerBuffs[i].uSkill = 0; | |
| 1253 pPlayerBuffs[i].uPower = 0; | |
| 1254 pPlayerBuffs[i].uExpireTime = 0; | |
| 1255 pPlayerBuffs[i].uCaster = 0; | |
| 1256 pPlayerBuffs[i].uFlags = 0; | |
| 1257 } | |
| 1258 | |
| 1259 pName[0] = 0; | |
| 1014 | 1260 uCurrentFace = 0; |
| 0 | 1261 uVoiceID = 0; |
| 1262 memset(pConditions, 0, 20 * sizeof(__int64)); | |
| 1263 | |
| 1264 field_BB = 0; | |
| 1265 | |
| 1266 uMight = uMightBonus = 0; | |
| 1267 uIntelligence = uIntelligenceBonus = 0; | |
| 1268 uWillpower = uWillpowerBonus = 0; | |
| 1269 uEndurance = uEnduranceBonus = 0; | |
| 1270 uSpeed = uSpeedBonus = 0; | |
| 1271 uAccuracy = uAccuracyBonus = 0; | |
| 1272 uLuck = uLuckBonus = 0; | |
| 1273 uLevel = sLevelModifier = 0; | |
| 1274 sAgeModifier = 0; | |
|
1388
60d4885eb107
sACModifier zeroed in player constructor so AC is not always 0(or -some value) ingame
Grumpy7
parents:
1387
diff
changeset
|
1275 sACModifier = 0; |
| 0 | 1276 |
| 1019 | 1277 // memset(field_1F5, 0, 30); |
| 1278 pure_luck_used=0; | |
| 1279 pure_speed_used=0; | |
| 1280 pure_intellect_used=0; | |
| 1281 pure_endurance_used=0; | |
| 1282 pure_willpower_used=0; | |
| 1283 pure_accuracy_used=0; | |
| 1284 pure_might_used=0; | |
| 0 | 1285 |
| 1286 sResFireBase = sResFireBonus = 0; | |
| 1287 sResAirBase = sResAirBonus = 0; | |
| 1288 sResWaterBase = sResWaterBonus = 0; | |
| 1289 sResEarthBase = sResEarthBonus = 0; | |
| 1290 sResMagicBase = sResMagicBonus = 0; | |
| 1291 sResSpiritBase = sResSpiritBonus = 0; | |
| 1292 sResMindBase = sResMindBonus = 0; | |
| 1293 sResBodyBase = sResBodyBonus = 0; | |
| 1294 sResLightBase = sResLightBonus = 0; | |
| 1295 sResDarkBase = sResDarkBonus = 0; | |
| 1296 | |
| 1297 uTimeToRecovery = 0; | |
| 1298 | |
| 1299 uSkillPoints = 0; | |
| 1300 | |
| 1301 sHealth = 0; | |
| 1302 uFullHealthBonus = 0; | |
| 1303 _health_related = 0; | |
| 1304 | |
| 1305 sMana = 0; | |
| 1306 uFullManaBonus = 0; | |
| 1307 _mana_related = 0; | |
| 1308 | |
| 1309 uQuickSpell = 0; | |
| 1310 memset(pInstalledBeacons, 0, 5 * sizeof(LloydBeacon)); | |
| 1311 | |
| 1312 _some_attack_bonus = 0; | |
| 1313 field_1A91 = 0; | |
| 1314 _melee_dmg_bonus = 0; | |
| 1315 field_1A93 = 0; | |
| 1316 _ranged_atk_bonus = 0; | |
| 1317 field_1A95 = 0; | |
| 1318 _ranged_dmg_bonus = 0; | |
| 1319 field_1A97 = 0; | |
| 1320 | |
| 130 | 1321 expression = CHARACTER_EXPRESSION_INVALID; |
| 0 | 1322 uExpressionTimePassed = 0; |
| 1323 uExpressionTimeLength = 0; | |
| 1324 | |
| 1325 uNumDivineInterventionCastsThisDay = 0; | |
| 1326 uNumArmageddonCasts = 0; | |
| 1327 uNumFireSpikeCasts = 0; | |
| 1328 | |
| 1329 memset(field_1988, 0, 49 * sizeof(int)); | |
| 1330 memset(field_1A50, 0, 64 * sizeof(char)); | |
| 1331 | |
| 1332 field_E0 = 0; | |
| 1333 field_E4 = 0; | |
| 1334 field_E8 = 0; | |
| 1335 field_EC = 0; | |
| 1336 field_F0 = 0; | |
| 1337 field_F4 = 0; | |
| 1338 field_F8 = 0; | |
| 1339 field_FC = 0; | |
| 1340 field_100 = 0; | |
| 1341 field_104 = 0; | |
| 198 | 1342 |
|
554
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1343 _expression21_animtime = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1344 _expression21_frameset = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1345 |
| 198 | 1346 lastOpenedSpellbookPage = 0; |
| 0 | 1347 } |
| 1348 | |
| 1349 //----- (0048C6F6) -------------------------------------------------------- | |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1350 bool Party::AddItemToParty(ItemGen *pItem) //TODO move to party.cpp |
| 0 | 1351 { |
| 1352 unsigned int v2; // eax@1 | |
| 1353 char *v5; // eax@8 | |
| 1354 Texture *v7; // ebx@10 | |
| 1355 signed int v8; // esi@10 | |
| 1356 Player *v9; // edi@11 | |
| 1357 int v10; // eax@11 | |
| 1358 int v21; // [sp+24h] [bp-4h]@10 | |
| 1359 | |
| 1360 v2 = pItem->uItemID; | |
| 222 | 1361 if ( !pItemsTable->pItems[v2].uItemID_Rep_St ) |
| 315 | 1362 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
|
1363 |
| 0 | 1364 v5 = pItemsTable->pItems[v2].pIconName; |
| 1365 if ( v5 ) | |
| 1366 { | |
| 973 | 1367 v7 = pIcons_LOD->LoadTexturePtr(v5, TEXTURE_16BIT_PALETTE); |
| 0 | 1368 v21 = areWeLoadingTexture; |
| 1369 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
|
1370 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
|
1371 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
|
1372 { |
|
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 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
|
1374 v10 = v9->AddItem(-1, pItem->uItemID); |
| 0 | 1375 if ( v10 ) |
| 1376 { | |
|
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
|
1377 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
|
1378 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
|
1379 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
|
1380 v9->PlaySound(SPEECH_60, 0); |
| 0 | 1381 if ( !v21 ) |
| 1382 { | |
| 1383 v7->Release(); | |
| 1006 | 1384 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1385 } |
|
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
|
1386 return true; |
| 0 | 1387 } |
| 1388 } | |
| 1389 if ( !v21 ) | |
| 1390 { | |
| 1391 v7->Release(); | |
| 1006 | 1392 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1393 } |
|
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
|
1394 return false; |
| 0 | 1395 } |
| 1396 else | |
| 1397 { | |
| 1398 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
|
1399 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
|
1400 } |
| 0 | 1401 } |
| 1402 // 506128: using guessed type int areWeLoadingTexture; | |
| 1403 | |
| 1404 //----- (0048C855) -------------------------------------------------------- | |
| 1405 int Player::GetBaseStrength() | |
| 1406 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1407 return this->uMight + GetItemsBonus(CHARACTER_ATTRIBUTE_STRENGTH); |
| 0 | 1408 } |
| 1409 | |
| 1410 //----- (0048C86C) -------------------------------------------------------- | |
| 1411 int Player::GetBaseIntelligence() | |
| 1412 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1413 return this->uIntelligence + GetItemsBonus(CHARACTER_ATTRIBUTE_INTELLIGENCE); |
| 0 | 1414 } |
| 1415 | |
| 1416 //----- (0048C883) -------------------------------------------------------- | |
| 1417 int Player::GetBaseWillpower() | |
| 1418 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1419 return this->uWillpower + GetItemsBonus(CHARACTER_ATTRIBUTE_WILLPOWER); |
| 0 | 1420 } |
| 1421 | |
| 1422 //----- (0048C89A) -------------------------------------------------------- | |
| 1423 int Player::GetBaseEndurance() | |
| 1424 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1425 return this->uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE); |
| 0 | 1426 } |
| 1427 | |
| 1428 //----- (0048C8B1) -------------------------------------------------------- | |
| 1429 int Player::GetBaseAccuracy() | |
| 1430 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1431 return this->uAccuracy + GetItemsBonus(CHARACTER_ATTRIBUTE_ACCURACY); |
| 0 | 1432 } |
| 1433 | |
| 1434 //----- (0048C8C8) -------------------------------------------------------- | |
| 1435 int Player::GetBaseSpeed() | |
| 1436 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1437 return this->uSpeed + GetItemsBonus(CHARACTER_ATTRIBUTE_SPEED); |
| 0 | 1438 } |
| 1439 | |
| 1440 //----- (0048C8DF) -------------------------------------------------------- | |
| 1441 int Player::GetBaseLuck() | |
| 1442 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1443 return this->uLuck + GetItemsBonus(CHARACTER_ATTRIBUTE_LUCK); |
| 0 | 1444 } |
| 1445 | |
| 1446 //----- (0048C8F6) -------------------------------------------------------- | |
| 1447 int Player::GetBaseLevel() | |
| 1448 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1449 return this->uLevel + GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1450 } |
| 1451 | |
| 1452 //----- (0048C90D) -------------------------------------------------------- | |
| 1453 int Player::GetActualLevel() | |
| 1454 { | |
| 1455 return uLevel + sLevelModifier + | |
| 1456 GetMagicalBonus(CHARACTER_ATTRIBUTE_LEVEL) + | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1457 GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1458 } |
| 1459 | |
| 1460 //----- (0048C93C) -------------------------------------------------------- | |
| 1461 int Player::GetActualMight() | |
| 1462 { | |
|
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
|
1463 return GetActualAttribute(CHARACTER_ATTRIBUTE_STRENGTH, &Player::uMight, &Player::uMightBonus); |
| 0 | 1464 } |
| 1465 | |
| 1466 //----- (0048C9C2) -------------------------------------------------------- | |
| 1467 int Player::GetActualIntelligence() | |
| 1468 { | |
|
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
|
1469 return GetActualAttribute(CHARACTER_ATTRIBUTE_INTELLIGENCE, &Player::uIntelligence, &Player::uIntelligenceBonus); |
| 0 | 1470 } |
| 1471 | |
| 1472 //----- (0048CA3F) -------------------------------------------------------- | |
| 1473 int Player::GetActualWillpower() | |
| 1474 { | |
|
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
|
1475 return GetActualAttribute(CHARACTER_ATTRIBUTE_WILLPOWER, &Player::uWillpower, &Player::uWillpowerBonus); |
| 0 | 1476 } |
| 1477 | |
| 1478 //----- (0048CABC) -------------------------------------------------------- | |
| 1479 int Player::GetActualEndurance() | |
| 1480 { | |
|
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
|
1481 return GetActualAttribute(CHARACTER_ATTRIBUTE_ENDURANCE, &Player::uEndurance, &Player::uEnduranceBonus); |
| 0 | 1482 } |
| 1483 | |
| 1484 //----- (0048CB39) -------------------------------------------------------- | |
| 1485 int Player::GetActualAccuracy() | |
| 1486 { | |
|
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
|
1487 return GetActualAttribute(CHARACTER_ATTRIBUTE_ACCURACY, &Player::uAccuracy, &Player::uAccuracyBonus); |
| 0 | 1488 } |
| 1489 | |
| 1490 //----- (0048CBB6) -------------------------------------------------------- | |
| 1491 int Player::GetActualSpeed() | |
| 1492 { | |
|
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
|
1493 return GetActualAttribute(CHARACTER_ATTRIBUTE_SPEED, &Player::uSpeed, &Player::uSpeedBonus); |
| 0 | 1494 } |
| 1495 | |
| 1496 //----- (0048CC33) -------------------------------------------------------- | |
| 1497 int Player::GetActualLuck() | |
| 1498 { | |
| 1036 | 1499 signed int npc_luck_bonus; // [sp+10h] [bp-4h]@1 |
| 1500 | |
| 1501 npc_luck_bonus = 0; | |
| 652 | 1502 if ( CheckHiredNPCSpeciality(Fool) ) |
| 1036 | 1503 npc_luck_bonus = 5; |
| 652 | 1504 if ( CheckHiredNPCSpeciality(ChimneySweep) ) |
| 1036 | 1505 npc_luck_bonus += 20; |
| 652 | 1506 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1036 | 1507 npc_luck_bonus += 10; |
| 1324 | 1508 |
|
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
|
1509 return GetActualAttribute(CHARACTER_ATTRIBUTE_LUCK, &Player::uLuck, &Player::uLuckBonus) |
| 1325 | 1510 + npc_luck_bonus; |
| 1511 } | |
| 1512 | |
| 1513 //----- (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
|
1514 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
|
1515 { |
| 1324 | 1516 uint uActualAge = this->sAgeModifier + GetBaseAge(); |
| 1517 uint uAgeingMultiplier = 100; | |
| 1518 for (uint i = 0; i < 4; ++i) | |
| 1325 | 1519 { |
| 1324 | 1520 if (uActualAge >= pAgeingTable[i]) |
| 1325 | 1521 uAgeingMultiplier = pAgingAttributeModifier[attrId][i]; |
| 1522 else | |
| 1523 break; | |
| 1524 } | |
| 1525 | |
| 1526 auto uConditionMult = pConditionAttributeModifier[attrId][GetMajorConditionIdx()]; | |
| 1527 int magicBonus = GetMagicalBonus(attrId); | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1528 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
|
1529 return uConditionMult * uAgeingMultiplier * this->*attrValue / 100 / 100 |
| 1325 | 1530 + 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
|
1531 + 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
|
1532 + this->*attrBonus; |
| 0 | 1533 } |
| 1534 | |
| 1535 //----- (0048CCF5) -------------------------------------------------------- | |
| 1536 int Player::GetActualAttack(int a2) | |
| 1537 { | |
| 1538 int v3; // eax@1 | |
| 1539 int v4; // edi@1 | |
| 1540 int v5; // ebx@1 | |
| 1541 int v6; // ebp@1 | |
| 1542 | |
| 1543 v3 = GetActualAccuracy(); | |
| 1036 | 1544 v4 = GetParameterBonus(v3); |
| 0 | 1545 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_ATTACK); |
| 1546 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
|
1547 return v4 + v5 + v6 + GetMagicalBonus(CHARACTER_ATTRIBUTE_ATTACK) + this->_some_attack_bonus; |
| 0 | 1548 } |
| 1549 | |
| 1550 //----- (0048CD45) -------------------------------------------------------- | |
| 1551 int Player::GetMeleeDamageMinimal() | |
| 1552 { | |
| 1553 int v2; // eax@1 | |
| 1554 int v3; // esi@1 | |
| 1555 int v4; // esi@1 | |
| 1556 int v5; // esi@1 | |
| 1557 signed int result; // eax@1 | |
| 1036 | 1558 |
| 0 | 1559 v2 = GetActualMight(); |
| 1036 | 1560 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1561 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN) + v3; |
| 0 | 1562 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v4; |
| 1036 | 1563 result = _melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 1564 if ( result < 1 ) | |
| 1565 result = 1; | |
| 0 | 1566 return result; |
| 1567 } | |
| 1568 | |
| 1569 //----- (0048CD90) -------------------------------------------------------- | |
| 1570 int Player::GetMeleeDamageMaximal() | |
| 1571 { | |
| 1572 int v2; // eax@1 | |
| 1573 int v3; // esi@1 | |
| 1574 int v4; // esi@1 | |
| 1575 int v5; // esi@1 | |
| 1576 int v6; // esi@1 | |
| 1577 signed int result; // eax@1 | |
| 1578 | |
| 1579 v2 = GetActualMight(); | |
| 1036 | 1580 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1581 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX) + v3; |
| 0 | 1582 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
|
1583 v6 = this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 0 | 1584 result = 1; |
| 1585 if ( v6 >= 1 ) | |
| 1586 result = v6; | |
| 1587 return result; | |
| 1588 } | |
| 1589 | |
| 1590 //----- (0048CDDB) -------------------------------------------------------- | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1591 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
|
1592 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1593 int dmgSum; // esi@62 |
| 0 | 1594 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
|
1595 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
|
1596 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
|
1597 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1598 offHndWpnDmg = 0; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1599 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
|
1600 if ( IsUnarmed() ) |
| 0 | 1601 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1602 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
|
1603 } |
|
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
|
1604 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
|
1605 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1606 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
|
1607 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1608 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
|
1609 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
|
1610 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
|
1611 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
|
1612 addOneDice = true; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1613 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
|
1614 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1615 if ( !ignoreOffhand ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1616 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1617 if ( this->HasItemEquipped(EQUIP_OFF_HAND) ) |
| 0 | 1618 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1619 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
|
1620 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
|
1621 if ( pItemsTable->pItems[itemId].uEquipType != EQUIP_SHIELD ) |
| 0 | 1622 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1623 offHndWpnDmg = CalculateMeleeDmgToEnemyWithWeapon(offHandItemGen, uTargetActorID, false); |
| 0 | 1624 } |
| 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 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1627 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1628 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
|
1629 if ( !ignoreSkillBonus ) |
|
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 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
|
1632 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
|
1633 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
|
1634 dmgSum += this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + mightAndSkillbonus; |
| 0 | 1635 } |
| 1636 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
|
1637 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
|
1638 result = dmgSum; |
| 0 | 1639 return result; |
| 1640 } | |
| 1641 | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1642 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1643 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
|
1644 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1645 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
|
1646 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
|
1647 if (addOneDice) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1648 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1649 diceCount++; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1650 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1651 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
|
1652 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
|
1653 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
|
1654 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1655 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
|
1656 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1657 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
|
1658 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
|
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 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
|
1661 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
|
1662 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1663 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1664 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1665 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
|
1666 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1667 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1668 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1669 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
|
1670 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1671 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1672 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1673 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
|
1674 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1675 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1676 } |
|
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 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
|
1679 && 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
|
1680 && 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
|
1681 totalDmg *= 3; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1682 return totalDmg; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1683 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1684 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1685 |
| 0 | 1686 //----- (0048D0B9) -------------------------------------------------------- |
| 1687 int Player::GetRangedAttack() | |
| 1688 { | |
| 1689 int v2; // eax@1 | |
| 1690 int v3; // edi@3 | |
| 1691 int v4; // eax@4 | |
| 1692 int v5; // edi@4 | |
| 1693 int v6; // edi@4 | |
| 1694 int v7; // edi@4 | |
| 1695 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1696 v2 = *(int *)&this->pInventoryItemList[this->pEquipment.uMainHand-1]; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1697 if ( v2 < ITEM_BLASTER || v2 > ITEM_LASER_RIFLE ) |
| 0 | 1698 { |
| 1699 v4 = GetActualAccuracy(); | |
| 1036 | 1700 v5 = GetParameterBonus(v4); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1701 v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v5; |
| 0 | 1702 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
|
1703 v3 = this->_ranged_atk_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v7; |
| 0 | 1704 } |
| 1705 else | |
| 1706 { | |
| 1707 v3 = GetActualAttack(1); | |
| 1708 } | |
| 1709 return v3; | |
| 1710 } | |
| 1711 | |
| 1712 //----- (0048D124) -------------------------------------------------------- | |
| 1713 int Player::GetRangedDamageMin() | |
| 1714 { | |
| 1715 int v2; // edi@1 | |
| 1716 int v3; // edi@1 | |
| 1717 int v4; // edi@1 | |
| 1718 int result; // eax@6 | |
| 1719 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1720 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MIN); |
| 1040 | 1721 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
|
1722 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1723 if ( v4 >= 1 ) |
| 1724 result = v4; | |
| 1725 else | |
| 1726 result = 0; | |
| 1727 return result; | |
| 1728 } | |
| 1729 | |
| 1730 //----- (0048D191) -------------------------------------------------------- | |
| 1731 int Player::GetRangedDamageMax() | |
| 1732 { | |
| 1733 int v2; // edi@1 | |
| 1734 int v3; // edi@1 | |
| 1735 int v4; // edi@1 | |
| 1736 int result; // eax@6 | |
| 1737 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1738 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MAX); |
| 1040 | 1739 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
|
1740 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1741 if ( v4 >= 1 ) |
| 1742 result = v4; | |
| 1743 else | |
| 1744 result = 0; | |
| 1745 return result; | |
| 1746 } | |
| 1747 | |
| 1748 //----- (0048D1FE) -------------------------------------------------------- | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1749 int Player::CalculateRangedDamageTo( int a2 ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1750 { |
| 0 | 1751 ItemGen *v4; // ebx@2 |
| 1752 unsigned int v5; // edi@2 | |
| 1753 int v9; // esi@5 | |
| 1754 int v10; // ebx@6 | |
| 1755 signed int v15; // [sp+8h] [bp-Ch]@2 | |
| 1756 int v17; // [sp+10h] [bp-4h]@1 | |
| 1757 | |
| 1758 v17 = 0; | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1759 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1760 return 0; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1761 v4 = (ItemGen *)&this->pInventoryItemList[this->pEquipment.uBow-1]; |
| 0 | 1762 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
|
1763 v15 = pItemsTable->pItems[v5].uDamageRoll; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1764 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
|
1765 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1766 int v7 = rand() % v15; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1767 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
|
1768 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1769 v9 = pItemsTable->pItems[v5].uDamageMod + v17; |
| 0 | 1770 if ( a2 ) |
| 1771 { | |
| 377 | 1772 v10 = v4->uSpecEnchantmentType; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1773 if ( v10 == 64 && MonsterStats::BelongsToSupertype(a2, MONSTER_SUPERTYPE_UNDEAD)) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1774 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1775 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1776 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1777 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
|
1778 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1779 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1780 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1781 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
|
1782 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1783 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1784 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1785 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
|
1786 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1787 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1788 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1789 } |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1790 return v9 + this->GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS); |
| 0 | 1791 } |
| 1792 | |
| 1793 //----- (0048D2EA) -------------------------------------------------------- | |
| 1794 char *Player::GetMeleeDamageString() | |
| 1795 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1796 signed int itemid; // eax@1 |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1797 int min_damage; // edi@3 |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1798 int max_damage; // eax@3 |
| 0 | 1799 |
| 1800 static char player__getmeleedamagestring_static_buff[40]; // idb | |
| 1801 | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1802 if (pEquipment.uMainHand >= 0) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1803 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1804 itemid = pOwnItems[this->pEquipment.uMainHand-1].uItemID; |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1805 } |
|
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 if (pEquipment.uMainHand >= 0 && ( itemid >= 135 ) && ( itemid <= 159 )) |
|
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 strcpy(player__getmeleedamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1810 return player__getmeleedamagestring_static_buff; |
|
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 else if (pEquipment.uMainHand >= 0 && (itemid == ITEM_BLASTER || itemid == ITEM_LASER_RIFLE)) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1813 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1814 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1815 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1816 } |
| 0 | 1817 else |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1818 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1819 min_damage = GetMeleeDamageMinimal(); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1820 max_damage = GetMeleeDamageMaximal(); |
|
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 if ( min_damage == max_damage ) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1823 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1824 sprintf(player__getmeleedamagestring_static_buff, "%d", min_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1825 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1826 else |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1827 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1828 sprintf(player__getmeleedamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1829 } |
| 1036 | 1830 return player__getmeleedamagestring_static_buff; |
| 0 | 1831 } |
| 1832 | |
| 1833 //----- (0048D396) -------------------------------------------------------- | |
| 1834 char *Player::GetRangedDamageString() | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1835 { |
| 1036 | 1836 signed int itemid; // eax@1 |
| 1837 int min_damage; // edi@3 | |
| 1838 int max_damage; // eax@3 | |
| 1839 | |
| 1840 static char player__getrangeddamagestring_static_buff[40]; // idb | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1841 |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1842 if (pEquipment.uMainHand >= 0) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1843 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1844 itemid = pOwnItems[this->pEquipment.uMainHand-1].uItemID; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1845 } |
|
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 if (pEquipment.uMainHand >= 0 && ( itemid >= 135 ) && ( itemid <= 159 )) |
|
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 strcpy(player__getrangeddamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1850 return player__getrangeddamagestring_static_buff; |
|
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 else if (pEquipment.uMainHand >= 0 && (itemid == ITEM_BLASTER || itemid == ITEM_LASER_RIFLE)) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1853 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1854 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1855 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1856 } |
| 0 | 1857 else |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1858 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1859 min_damage = GetRangedDamageMin(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1860 max_damage = GetRangedDamageMax(); |
|
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 if ( max_damage > 0) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1863 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1864 if ( min_damage == max_damage ) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1865 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1866 sprintf(player__getrangeddamagestring_static_buff, "%d", min_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1867 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1868 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1869 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1870 sprintf(player__getrangeddamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1871 } |
|
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 else |
|
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 strcpy(player__getrangeddamagestring_static_buff, "N/A"); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1876 } |
| 1036 | 1877 return player__getrangeddamagestring_static_buff; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1878 } |
| 0 | 1879 |
| 1880 //----- (0048D45A) -------------------------------------------------------- | |
| 1881 bool Player::CanTrainToNextLevel() | |
| 1882 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1883 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
|
1884 int neededExp = ((lvl * (lvl - 1)) / 2 * 1000); |
| 1564 | 1885 return this->uExperience >= neededExp; |
| 0 | 1886 } |
| 1887 | |
| 1888 //----- (0048D498) -------------------------------------------------------- | |
| 1889 unsigned int Player::GetExperienceDisplayColor() | |
| 1890 { | |
| 1891 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
|
1892 return ui_character_bonus_text_color; |
| 0 | 1893 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
|
1894 return ui_character_default_text_color; |
| 0 | 1895 } |
| 1896 | |
| 1897 //----- (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
|
1898 int Player::CalculateIncommingDamage( DAMAGE_TYPE dmg_type, int dmg ) |
| 1561 | 1899 { |
| 1036 | 1900 int resist_value; // edi@8 |
| 1901 int player_luck; // eax@21 | |
| 1902 signed int res_rand_divider; // ebx@2 | |
| 1903 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
|
1904 |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1905 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
|
1906 return 0; |
|
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1907 |
|
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
|
1908 resist_value = 0; |
| 1036 | 1909 switch(dmg_type) |
| 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 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
|
1912 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
|
1913 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
|
1914 case DMGT_EARTH: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_EARTH); break; |
| 1036 | 1915 |
|
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
|
1916 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
|
1917 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
|
1918 case DMGT_BODY: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_BODY); break; |
| 1036 | 1919 } |
|
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
|
1920 |
| 1036 | 1921 player_luck = GetActualLuck(); |
| 1922 res_rand_divider = GetParameterBonus(player_luck) + resist_value + 30; | |
| 1923 | |
|
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
|
1924 if ( GetParameterBonus(player_luck) + resist_value > 0 ) |
| 1036 | 1925 { |
|
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
|
1926 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
|
1927 { |
| 1036 | 1928 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
|
1929 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
|
1930 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
|
1931 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
|
1932 } |
|
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 } |
|
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 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
|
1935 { |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1936 if (!pOwnItems[pEquipment.uArmor - 1].IsBroken()) |
| 0 | 1937 { |
| 1036 | 1938 armor_skill = GetEquippedItemSkillType(EQUIP_ARMOUR); |
| 1939 if ( armor_skill==PLAYER_SKILL_PLATE ) | |
| 0 | 1940 { |
| 1036 | 1941 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
|
1942 return dmg / 2; |
| 0 | 1943 } |
| 1036 | 1944 if (armor_skill==PLAYER_SKILL_CHAIN ) |
| 0 | 1945 { |
| 1036 | 1946 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
|
1947 return dmg * 2 / 3; |
| 0 | 1948 } |
| 1949 } | |
| 1036 | 1950 } |
|
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
|
1951 return dmg; |
| 0 | 1952 } |
| 1953 | |
| 1954 //----- (0048D62C) -------------------------------------------------------- | |
| 816 | 1955 ITEM_EQUIP_TYPE Player::GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1956 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1957 return pItemsTable->pItems[pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uEquipType; |
| 0 | 1958 } |
| 1959 | |
| 1960 //----- (0048D651) -------------------------------------------------------- | |
| 816 | 1961 PLAYER_SKILL_TYPE Player::GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1962 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1963 return (PLAYER_SKILL_TYPE)pItemsTable->pItems[pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uSkillType; |
| 0 | 1964 } |
| 1965 | |
| 1966 //----- (0048D676) -------------------------------------------------------- | |
| 1967 bool Player::IsUnarmed() | |
| 1968 { | |
| 1561 | 1969 return !HasItemEquipped(EQUIP_MAIN_HAND) && |
| 1970 (!HasItemEquipped(EQUIP_OFF_HAND) || GetEquippedItemEquipType(EQUIP_OFF_HAND) == EQUIP_SHIELD); | |
| 0 | 1971 } |
| 1972 | |
| 1973 //----- (0048D6AA) -------------------------------------------------------- | |
| 1974 bool Player::HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex) | |
| 1975 { | |
| 1976 auto i = pEquipment.pIndices[uEquipIndex]; | |
| 1977 if (i) | |
| 1568 | 1978 return (~(pOwnItems[i - 1].uAttributes & ITEM_BROKEN)) != 0; |
| 1036 | 1979 else |
| 1980 return false; | |
| 0 | 1981 } |
| 1982 | |
| 1983 //----- (0048D6D0) -------------------------------------------------------- | |
| 1984 bool Player::HasEnchantedItemEquipped(int uEnchantment) | |
| 1985 { | |
| 1986 for (uint i = 0; i < 16; ++i) | |
| 1987 { | |
| 1988 if (HasItemEquipped((ITEM_EQUIP_TYPE)i) && | |
| 1080 | 1989 pOwnItems[pEquipment.pIndices[i]-1].uSpecEnchantmentType == uEnchantment) |
| 0 | 1990 return true; |
| 1991 } | |
| 1992 return false; | |
| 1993 } | |
| 1994 | |
| 1995 //----- (0048D709) -------------------------------------------------------- | |
| 1080 | 1996 bool Player::WearsItem( int item_id, ITEM_EQUIP_TYPE equip_type ) |
| 1563 | 1997 { |
| 1998 return ( HasItemEquipped(equip_type) && pInventoryItemList[pEquipment.pIndices[equip_type - 1]].uItemID == item_id ); | |
| 1999 } | |
| 2000 | |
| 2001 bool Player::WearsItemAnyWhere(int item_id) | |
| 2002 { | |
| 2003 for (int i = 0; i < 16; i++) | |
| 2004 { | |
| 2005 if (WearsItem(item_id, (ITEM_EQUIP_TYPE) i)) | |
| 2006 { | |
| 2007 return true; | |
| 2008 } | |
| 2009 } | |
| 2010 return false; | |
| 0 | 2011 } |
| 2012 | |
| 2013 //----- (0048D76C) -------------------------------------------------------- | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2014 bool Player::StealFromShop(ItemGen *itemToSteal, int a3, int reputation, int a5, int *a6) //check stealing in IDA pro once I get home. The whole thing looks odd, dword_4EDEB4 and dword_4EDEA0 are never filled, might be a bug, might me on purpose |
| 0 | 2015 { |
| 2016 unsigned __int16 v6; // cx@8 | |
| 2017 int v7; // edi@8 | |
| 2018 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
|
2019 unsigned int itemvalue; // esi@8 |
| 0 | 2020 int v10; // eax@8 |
| 2021 int v11; // edi@12 | |
| 2022 bool result; // eax@13 | |
| 2023 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2024 if ( !itemToSteal |
| 0 | 2025 || this->pConditions[16] |
| 2026 || this->pConditions[14] | |
| 2027 || this->pConditions[15] | |
| 2028 || this->pConditions[4] | |
| 2029 || this->pConditions[13] | |
| 2030 || this->pConditions[2] ) | |
| 2031 { | |
| 2032 result = 0; | |
| 2033 } | |
| 2034 else | |
| 2035 { | |
| 2036 v6 = this->pActiveSkills[34]; | |
| 2037 v7 = v6 & 0x3F; | |
| 2038 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
|
2039 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
|
2040 v10 = pItemsTable->pItems[itemToSteal->uItemID].uEquipType; |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2041 if ( !pItemsTable->pItems[itemToSteal->uItemID].uEquipType || v10 == 1 || v10 == 2 ) |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2042 itemvalue *= 3; |
| 0 | 2043 v11 = dword_4EDEB4[rand() % 100 / 20] + v7 * dword_4EDEA0[v8]; |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2044 *a6 = 100 * (reputation + a3) + itemvalue + (a5 != 0 ? 0x1F4 : 0); |
| 0 | 2045 if ( rand() % 100 >= 5 ) |
| 2046 { | |
| 2047 if ( *a6 > v11 ) | |
| 2048 result = *a6 - v11 < 500; | |
| 2049 else | |
| 2050 result = 2; | |
| 2051 } | |
| 2052 else | |
| 2053 { | |
| 2054 result = 0; | |
| 2055 } | |
| 2056 } | |
| 2057 return result; | |
| 2058 } | |
| 2059 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2060 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2061 | |
| 2062 //----- (0048D88B) -------------------------------------------------------- | |
| 2063 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation) | |
| 2064 { | |
| 2065 Player *v4; // esi@1 | |
| 2066 Actor *v5; // edi@1 | |
| 2067 unsigned __int16 v6; // cx@10 | |
| 2068 int v7; // ebx@10 | |
| 2069 unsigned int v8; // esi@10 | |
| 2070 int v9; // eax@10 | |
| 2071 int v10; // esi@10 | |
| 2072 int v11; // eax@13 | |
| 2073 signed int v12; // ebx@15 | |
| 2074 signed int v13; // edx@15 | |
| 2075 int v14; // ecx@15 | |
| 2076 unsigned __int16 v15; // si@21 | |
| 2077 unsigned int v16; // ebx@24 | |
| 2078 int v17; // esi@24 | |
| 2079 const void *v18; // eax@29 | |
| 2080 unsigned int v19; // esi@31 | |
| 2081 int v20; // eax@34 | |
| 2082 char v21; // zf@36 | |
| 2083 unsigned int v22; // ST0C_4@39 | |
| 2084 char *v23; // esi@39 | |
| 2085 const char *v25; // [sp-Ch] [bp-48h]@40 | |
| 2086 int v26; // [sp-8h] [bp-44h]@40 | |
| 2087 ItemGen v27; // [sp+8h] [bp-34h]@15 | |
| 2088 unsigned int v28; // [sp+2Ch] [bp-10h]@10 | |
| 2089 int v29; // [sp+30h] [bp-Ch]@10 | |
| 2090 int v30; // [sp+34h] [bp-8h]@10 | |
| 2091 Player *v31; // [sp+38h] [bp-4h]@1 | |
| 2092 signed int _steal_perma; // [sp+48h] [bp+Ch]@12 | |
| 2093 | |
| 2094 v4 = this; | |
| 2095 v5 = &pActors[uActorID]; | |
| 2096 v31 = this; | |
| 2097 if ( &pActors[uActorID] | |
| 2098 && !this->pConditions[16] | |
| 2099 && !this->pConditions[14] | |
| 2100 && !this->pConditions[15] | |
| 2101 && !this->pConditions[4] | |
| 2102 && !this->pConditions[13] | |
| 2103 && !this->pConditions[2] ) | |
| 2104 { | |
| 2105 if ( !(BYTE2(v5->uAttributes) & 0x80) ) | |
| 2106 pActors[uActorID].SetRandomGoldIfTheresNoItem(); | |
| 2107 v6 = v4->pActiveSkills[34]; | |
| 2108 v7 = v6 & 0x3F; | |
| 2109 v8 = SkillToMastery(v6); | |
| 2110 v9 = rand(); | |
| 2111 v28 = 4 * v8; | |
| 2112 v30 = dword_4EDEA0[v8]; | |
| 2113 v29 = dword_4EDEB4[v9 % 100 / 20]; | |
| 2114 v10 = v5->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation); | |
| 2115 if ( rand() % 100 < 5 || v10 > v29 + v7 * v30 || (_steal_perma = 2, BYTE2(v5->uAttributes) & 8) ) | |
| 2116 { | |
| 322 | 2117 Actor::AggroSurroundingPeasants(uActorID, 1); |
| 0 | 2118 _steal_perma = 0; |
| 2119 v26 = (int)v31->pName; | |
| 2120 v25 = pGlobalTXT_LocalizationStrings[376]; | |
| 2121 } | |
| 2122 else | |
| 2123 { | |
| 2124 v11 = rand(); | |
| 2125 if ( v11 % 100 >= 40 ) | |
| 2126 { | |
| 2127 if ( v11 % 100 >= 70 ) | |
| 2128 { | |
| 2129 v19 = 0; | |
| 2130 if ( v7 > 0 ) | |
| 2131 { | |
| 2132 do | |
| 2133 { | |
| 2134 --v7; | |
| 2135 v19 += rand() % dword_4EDEC4[v28 / 4] + 1; | |
| 2136 } | |
| 2137 while ( v7 ); | |
| 2138 } | |
| 2139 if ( pItemsTable->pItems[v5->array_000234[3].uItemID].uEquipType != 18 ) | |
| 2140 return _steal_perma; | |
| 377 | 2141 v20 = (int)&v5->array_000234[3].uSpecEnchantmentType; |
| 2142 if ( (signed int)v19 > v5->array_000234[3].uSpecEnchantmentType ) | |
| 2143 v19 = v5->array_000234[3].uSpecEnchantmentType; | |
| 0 | 2144 v21 = *(int *)v20 == v19; |
| 2145 *(int *)v20 -= v19; | |
| 2146 if ( v21 ) | |
| 2147 v5->array_000234[3].uItemID = 0; | |
| 2148 if ( v19 ) | |
| 2149 { | |
| 2150 party_finds_gold(v19, 2); | |
| 2151 v22 = v19; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2152 v23 = pTmpBuf2.data(); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2153 sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[302], v31->pName, v22); |
| 0 | 2154 LABEL_43: |
| 2155 ShowStatusBarString(v23, 2u); | |
| 2156 return _steal_perma; | |
| 2157 } | |
| 2158 } | |
| 2159 else | |
| 2160 { | |
| 2161 v27.Reset(); | |
| 2162 v12 = 0; | |
| 2163 v13 = 0; | |
| 2164 v14 = (int)v5->array_000234; | |
| 2165 while ( !*(int *)v14 || pItemsTable->pItems[*(int *)v14].uEquipType == 18 ) | |
| 2166 { | |
| 2167 ++v13; | |
| 2168 v14 += 36; | |
| 2169 if ( v13 >= 4 ) | |
| 2170 goto LABEL_21; | |
| 2171 } | |
| 2172 v12 = 1; | |
| 2173 LABEL_21: | |
| 2174 v15 = v5->uCarriedItemID; | |
| 2175 if ( v15 || v12 ) | |
| 2176 { | |
| 2177 v27.Reset(); | |
| 2178 if ( v15 ) | |
| 2179 { | |
| 2180 v16 = (signed __int16)v15; | |
| 2181 v5->uCarriedItemID = 0; | |
| 2182 v27.uItemID = (signed __int16)v15; | |
| 2183 v17 = (signed __int16)v15; | |
| 2184 if ( pItemsTable->pItems[v17].uEquipType == 12 ) | |
| 2185 v27.uNumCharges = rand() % 6 + pItemsTable->pItems[v17].uDamageMod + 1; | |
| 2186 if ( pItemsTable->pItems[v17].uEquipType == 14 ) | |
| 2187 { | |
| 2188 if ( v16 != 220 ) | |
| 570 | 2189 v27.uEnchantmentType = 2 * rand() % 4 + 2; |
| 0 | 2190 } |
| 2191 } | |
| 2192 else | |
| 2193 { | |
| 2194 v18 = &v5->array_000234[rand() % 4]; | |
| 2195 memcpy(&v27, v18, sizeof(v27)); | |
| 2196 ((ItemGen *)v18)->Reset(); | |
| 2197 v16 = v27.uItemID; | |
| 2198 } | |
| 2199 sub_421B2C_PlaceInInventory_or_DropPickedItem(); | |
| 2200 sprintf( | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2201 pTmpBuf2.data(), |
| 0 | 2202 pGlobalTXT_LocalizationStrings[304], |
| 2203 v31->pName, | |
| 2204 pItemsTable->pItems[v16].pUnidentifiedName); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2205 ShowStatusBarString(pTmpBuf2.data(), 2u); |
| 0 | 2206 sub_421B2C_PlaceInInventory_or_DropPickedItem(); |
| 2207 memcpy(&pParty->pPickedItem, &v27, sizeof(pParty->pPickedItem)); | |
| 2208 pMouse->SetCursorBitmapFromItemID(v16); | |
| 2209 return _steal_perma; | |
| 2210 } | |
| 2211 } | |
| 2212 } | |
| 2213 v26 = (int)v31->pName; | |
| 2214 v25 = pGlobalTXT_LocalizationStrings[377]; | |
| 2215 } | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2216 v23 = pTmpBuf2.data(); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2217 sprintfex(pTmpBuf2.data(), v25, v26); |
| 0 | 2218 goto LABEL_43; |
| 2219 } | |
| 2220 return 0; | |
| 2221 } | |
| 2222 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2223 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2224 // 4EDEC4: using guessed type int dword_4EDEC4[]; | |
| 2225 | |
| 2226 //----- (0048DBB9) -------------------------------------------------------- | |
| 2227 void Player::Heal(int amount) | |
| 2228 { | |
| 1010 | 2229 signed int max_health; // eax@3 |
| 2230 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2231 if ( !IsEradicated() && !IsDead() ) |
| 1010 | 2232 { |
| 2233 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
|
2234 if ( IsZombie() ) |
| 1010 | 2235 max_health /= 2; |
| 2236 sHealth += amount; | |
| 2237 if ( sHealth > max_health ) | |
| 2238 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
|
2239 if ( IsUnconcious() ) |
| 1010 | 2240 { |
| 2241 if ( sHealth > 0 ) | |
| 2242 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2243 SetUnconcious(false); |
| 0 | 2244 } |
| 2245 } | |
| 2246 } | |
| 2247 } | |
| 2248 | |
| 2249 //----- (0048DC1E) -------------------------------------------------------- | |
| 1036 | 2250 int Player::ReceiveDamage( signed int amount, DAMAGE_TYPE dmg_type ) |
| 2251 { | |
| 2252 signed int recieved_dmg; // eax@1 | |
| 2253 unsigned int armor_indx; // eax@8 | |
| 2254 bool broke_armor; | |
| 2255 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2256 SetAsleep(false); |
| 1036 | 2257 recieved_dmg = CalculateIncommingDamage(dmg_type, amount); |
| 2258 sHealth -= recieved_dmg; | |
| 2259 broke_armor = sHealth <= -10; | |
| 2260 if ( sHealth < 1 ) // | |
| 2261 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2262 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
|
2263 || 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
|
2264 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2265 SetCondUnconsciousWithBlockCheck(false); |
| 0 | 2266 } |
| 2267 else | |
| 2268 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2269 SetCondDeadWithBlockCheck(false); |
| 1036 | 2270 if ( sHealth > 0 ) |
| 2271 sHealth = 0; | |
| 2272 } | |
| 2273 if (broke_armor ) | |
| 2274 { | |
| 2275 armor_indx = pEquipment.uArmor; | |
| 2276 if ( armor_indx ) | |
| 0 | 2277 { |
| 1568 | 2278 if ( !(pOwnItems[armor_indx-1].uAttributes & ITEM_ENCHANTED)) |
| 0 | 2279 { |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2280 pOwnItems[armor_indx-1].SetBroken(); |
| 0 | 2281 } |
| 2282 } | |
| 2283 } | |
| 2284 } | |
| 1036 | 2285 if ( recieved_dmg && CanAct() ) |
| 187 | 2286 PlaySound(SPEECH_24, 0); |
| 1036 | 2287 return recieved_dmg; |
| 0 | 2288 } |
| 2289 | |
| 2290 //----- (0048DCF6) -------------------------------------------------------- | |
| 1568 | 2291 int Player::_48DCF6(int a2, Actor *pActor) //TODO check this with IDA to see what the uninitialized vars are supposed to contain |
| 0 | 2292 { |
| 2293 signed int v3; // edi@1 | |
| 2294 signed int v4; // ebx@1 | |
| 2295 Player *v5; // esi@1 | |
| 2296 int v6; // eax@2 | |
| 2297 int v7; // eax@5 | |
| 2298 int v8; // eax@8 | |
| 2299 int v9; // ebx@8 | |
| 2300 int v10; // eax@8 | |
| 2301 int v11; // ebx@8 | |
| 2302 signed int v12; // edx@9 | |
| 2303 ItemGen *v13; // eax@9 | |
| 2304 int v14; // edx@16 | |
| 2305 unsigned int v15; // edx@17 | |
| 2306 int v16; // edx@26 | |
| 2307 unsigned int v17; // edx@27 | |
| 2308 signed int v19; // edx@38 | |
| 2309 int *v20; // ecx@38 | |
| 2310 signed int v21; // eax@40 | |
| 2311 int v22; // eax@49 | |
| 2312 signed int v23; // ebx@49 | |
| 2313 unsigned int v24; // eax@60 | |
| 2314 int v25; // ecx@61 | |
| 2315 int v26; // ebx@74 | |
| 2316 void *v27; // ecx@76 | |
| 2317 unsigned int v28; // ebx@78 | |
| 2318 signed int result; // eax@86 | |
| 2319 SoundID v30; // [sp-20h] [bp-C0h]@56 | |
| 2320 signed int v31; // [sp-1Ch] [bp-BCh]@56 | |
| 2321 unsigned int v32; // [sp-18h] [bp-B8h]@56 | |
| 2322 signed int v33; // [sp-14h] [bp-B4h]@56 | |
| 2323 signed int v34; // [sp-10h] [bp-B0h]@56 | |
| 2324 int v35; // [sp-Ch] [bp-ACh]@56 | |
| 2325 unsigned int v36; // [sp-8h] [bp-A8h]@51 | |
| 2326 unsigned int v37; // [sp-8h] [bp-A8h]@56 | |
| 2327 unsigned int v38; // [sp-8h] [bp-A8h]@57 | |
| 2328 unsigned int v39; // [sp-8h] [bp-A8h]@68 | |
| 2329 enum CHARACTER_ATTRIBUTE_TYPE v40; // [sp-4h] [bp-A4h]@4 | |
| 2330 int v41; // [sp-4h] [bp-A4h]@51 | |
| 2331 int v42; // [sp-4h] [bp-A4h]@56 | |
| 2332 int v43; // [sp-4h] [bp-A4h]@57 | |
| 2333 signed int v44; // [sp-4h] [bp-A4h]@59 | |
| 2334 int v45; // [sp-4h] [bp-A4h]@68 | |
| 2335 char v46[140]; // [sp+Ch] [bp-94h]@13 | |
| 2336 unsigned int v47; // [sp+98h] [bp-8h]@1 | |
| 2337 int v48; // [sp+9Ch] [bp-4h]@1 | |
| 2338 | |
| 2339 v3 = 0; | |
| 2340 v4 = 0; | |
| 2341 v5 = this; | |
| 2342 v47 = 0; | |
| 2343 v48 = 0; | |
| 2344 switch ( a2 ) | |
| 2345 { | |
| 2346 case 1: | |
| 2347 v6 = GetActualWillpower(); | |
| 2348 goto LABEL_46; | |
| 2349 case 2: | |
| 2350 case 3: | |
| 2351 case 4: | |
| 2352 case 9: | |
| 2353 case 10: | |
| 2354 case 11: | |
| 2355 case 13: | |
| 2356 case 21: | |
| 2357 v6 = GetActualEndurance(); | |
| 2358 goto LABEL_46; | |
| 2359 case 5: | |
| 2360 case 12: | |
| 2361 case 23: | |
| 2362 v40 = (CHARACTER_ATTRIBUTE_TYPE)14; | |
| 2363 goto LABEL_5; | |
| 2364 case 15: | |
| 2365 v40 = (CHARACTER_ATTRIBUTE_TYPE)13; | |
| 2366 goto LABEL_5; | |
| 2367 case 6: | |
| 2368 case 7: | |
| 2369 case 8: | |
| 2370 case 14: | |
| 2371 case 16: | |
| 2372 v40 = (CHARACTER_ATTRIBUTE_TYPE)15; | |
| 2373 LABEL_5: | |
| 2374 v7 = GetActualResistance(v40); | |
| 2375 goto LABEL_47; | |
| 2376 case 22: | |
| 2377 v8 = GetActualWillpower(); | |
| 1036 | 2378 v9 = GetParameterBonus(v8); |
| 0 | 2379 v10 = GetActualIntelligence(); |
| 1036 | 2380 v11 = (GetParameterBonus(v10) + v9) >> 1; |
| 0 | 2381 break; |
| 2382 case 17: | |
| 2383 v12 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2384 v13 = this->pInventoryItemList; |
| 0 | 2385 do |
| 2386 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2387 if ( (signed int)v13->uItemID > 0 && (signed int)v13->uItemID <= 134 && !v13->IsBroken()) |
| 0 | 2388 v46[v4++] = v12; |
| 2389 ++v12; | |
| 2390 ++v13; | |
| 2391 } | |
| 2392 while ( v12 < 138 ); | |
| 2393 goto LABEL_36; | |
| 2394 case 18: | |
| 2395 v14 = 0; | |
| 2396 do | |
| 2397 { | |
| 2398 if ( HasItemEquipped((ITEM_EQUIP_TYPE)v14) ) | |
| 2399 { | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
2400 __debugbreak(); // player.cpp(2871): warning C4700: uninitialized local variable 'v15' used |
| 816 | 2401 if ( v15 == EQUIP_ARMOUR ) |
| 898 | 2402 v46[v4++] = LOBYTE(v5->pEquipment.uArmor) - 1; |
| 816 | 2403 if ( (!v15 || v15 == 1) && GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v15) == 4 ) |
| 898 | 2404 v46[v4++] = *((char *)&v5->pEquipment.uShield + 4 * v15) - 1; |
| 0 | 2405 } |
| 2406 v14 = v15 + 1; | |
| 2407 } | |
| 2408 while ( v14 < 16 ); | |
| 2409 goto LABEL_36; | |
| 2410 case 19: | |
| 2411 v16 = 0; | |
| 2412 do | |
| 2413 { | |
| 2414 if ( HasItemEquipped((ITEM_EQUIP_TYPE)v16) ) | |
| 2415 { | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
2416 __debugbreak(); // player.cpp(2886): warning C4700: uninitialized local variable 'v17' used |
| 0 | 2417 if ( v17 == 2 ) |
| 2418 v46[v4++] = LOBYTE(v5->pEquipment.uBow) - 1; | |
| 2419 if ( (!v17 || v17 == 1) | |
| 816 | 2420 && (!GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v17) || GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v17) == 1) ) |
| 898 | 2421 v46[v4++] = *((char *)&v5->pEquipment.uShield + 4 * v17) - 1; |
| 0 | 2422 } |
| 2423 v16 = v17 + 1; | |
| 2424 } | |
| 2425 while ( v16 < 16 ); | |
| 2426 LABEL_36: | |
| 2427 if ( !v4 ) | |
| 2428 goto LABEL_87; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2429 v48 = (int)&v5->pInventoryItemList[(unsigned __int8)v46[rand() % v4]]; |
| 0 | 2430 v11 = 3 * (pItemsTable->pItems[*(int *)v48].uMaterial + pItemsTable->pItems[*(int *)v48].uDamageMod); |
| 2431 break; | |
| 2432 case 20: | |
| 2433 v19 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2434 v20 = this->pInventoryMatrix; |
| 0 | 2435 do |
| 2436 { | |
| 2437 if ( *v20 > 0 ) | |
| 2438 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2439 v21 = *(int *)&v5->pInventoryItemList[*v20-1]; |
| 0 | 2440 if ( v21 > 0 ) |
| 2441 { | |
| 2442 if ( v21 <= 134 ) | |
| 2443 v46[v4++] = v19; | |
| 2444 } | |
| 2445 } | |
| 2446 ++v19; | |
| 2447 ++v20; | |
| 2448 } | |
| 2449 while ( v19 < 126 ); | |
| 2450 if ( !v4 ) | |
| 2451 goto LABEL_87; | |
| 2452 v47 = (unsigned __int8)v46[rand() % v4]; | |
| 2453 v6 = GetActualAccuracy(); | |
| 2454 LABEL_46: | |
| 1036 | 2455 v7 = GetParameterBonus(v6); |
| 0 | 2456 LABEL_47: |
| 2457 v11 = v7; | |
| 2458 break; | |
| 2459 default: | |
| 2460 v11 = 0; | |
| 2461 break; | |
| 2462 } | |
| 2463 v22 = GetActualLuck(); | |
| 1036 | 2464 v23 = GetParameterBonus(v22) + v11 + 30; |
| 0 | 2465 if ( rand() % v23 >= 30 ) |
| 2466 { | |
| 2467 LABEL_87: | |
| 2468 result = 0; | |
| 2469 } | |
| 2470 else | |
| 2471 { | |
| 2472 switch ( a2 ) | |
| 2473 { | |
| 2474 case 1: | |
| 2475 v41 = 1; | |
| 2476 v36 = 0; | |
| 2477 goto LABEL_56; | |
| 2478 case 2: | |
| 2479 v41 = 1; | |
| 2480 v36 = 1; | |
| 2481 goto LABEL_56; | |
| 2482 case 3: | |
| 2483 v41 = 1; | |
| 2484 v36 = 2; | |
| 2485 goto LABEL_56; | |
| 2486 case 23: | |
| 2487 v41 = 1; | |
| 2488 v36 = 3; | |
| 2489 goto LABEL_56; | |
| 2490 case 4: | |
| 2491 v41 = 1; | |
| 2492 v36 = 4; | |
| 2493 LABEL_56: | |
| 2494 SetCondition(v36, v41); | |
| 2495 v42 = 0; | |
| 2496 v37 = 0; | |
| 2497 v35 = 0; | |
| 2498 v34 = 0; | |
| 2499 v33 = -1; | |
| 2500 v32 = 0; | |
| 2501 v31 = 0; | |
| 2502 v30 = (SoundID)221; | |
| 2503 goto LABEL_83; | |
| 2504 case 5: | |
| 2505 v43 = 1; | |
| 2506 v38 = 5; | |
| 2507 goto LABEL_70; | |
| 2508 case 6: | |
| 2509 case 7: | |
| 2510 case 8: | |
| 2511 if ( a2 == 6 ) | |
| 2512 { | |
| 2513 v44 = 6; | |
| 2514 goto LABEL_60; | |
| 2515 } | |
| 2516 v25 = 2 * (a2 != 8) + 8; | |
| 2517 goto LABEL_65; | |
| 2518 case 9: | |
| 2519 if ( a2 == 6 ) | |
| 2520 { | |
| 2521 v44 = 7; | |
| 2522 LABEL_60: | |
| 2523 v24 = v44; | |
| 2524 } | |
| 2525 else | |
| 2526 { | |
| 2527 v25 = 2 * (a2 != 8) + 9; | |
| 2528 LABEL_65: | |
| 2529 v24 = v25; | |
| 2530 } | |
| 2531 SetCondition(v24, 1); | |
| 2532 v42 = 0; | |
| 2533 v37 = 0; | |
| 2534 v35 = 0; | |
| 2535 v34 = 0; | |
| 2536 v33 = -1; | |
| 2537 v32 = 0; | |
| 2538 v31 = 0; | |
| 2539 v30 = (SoundID)222; | |
| 2540 LABEL_83: | |
| 2541 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42); | |
| 2542 do | |
| 2543 { | |
| 2544 LABEL_84: | |
| 2545 if ( v5 == pPlayers[v3 + 1] ) | |
| 2546 break; | |
| 2547 ++v3; | |
| 2548 } | |
| 2549 while ( v3 < 4 ); | |
| 2550 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2551 result = 1; | |
| 2552 break; | |
| 2553 case 12: | |
| 2554 v43 = 1; | |
| 2555 v38 = 12; | |
| 2556 goto LABEL_70; | |
| 2557 case 15: | |
| 2558 v45 = 1; | |
| 2559 v39 = 15; | |
| 2560 goto LABEL_73; | |
| 2561 case 13: | |
| 2562 v43 = 1; | |
| 2563 v38 = 13; | |
| 2564 LABEL_70: | |
| 2565 SetCondition(v38, v43); | |
| 2566 v42 = 0; | |
| 2567 v37 = 0; | |
| 2568 v35 = 0; | |
| 2569 v34 = 0; | |
| 2570 v33 = -1; | |
| 2571 v32 = 0; | |
| 2572 v31 = 0; | |
| 2573 v30 = (SoundID)224; | |
| 2574 goto LABEL_83; | |
| 2575 case 14: | |
| 2576 v45 = 1; | |
| 2577 v39 = 14; | |
| 2578 goto LABEL_73; | |
| 2579 case 16: | |
| 2580 v45 = 1; | |
| 2581 v39 = 16; | |
| 2582 LABEL_73: | |
| 2583 SetCondition(v39, v45); | |
| 2584 v42 = 0; | |
| 2585 v37 = 0; | |
| 2586 v35 = 0; | |
| 2587 v34 = 0; | |
| 2588 v33 = -1; | |
| 2589 v32 = 0; | |
| 2590 v31 = 0; | |
| 2591 v30 = (SoundID)225; | |
| 2592 goto LABEL_83; | |
| 2593 case 17: | |
| 2594 case 18: | |
| 2595 case 19: | |
| 2596 v26 = v48; | |
| 2597 if ( *(char *)(v48 + 21) & 2 ) | |
| 2598 goto LABEL_84; | |
| 187 | 2599 PlaySound(SPEECH_40, 0); |
| 0 | 2600 *(int *)(v26 + 20) |= 2u; |
| 2601 goto LABEL_79; | |
| 2602 case 20: | |
| 187 | 2603 PlaySound(SPEECH_40, 0); |
| 0 | 2604 v27 = pActor->array_000234; |
| 2605 if ( pActor->array_000234[0].uItemID ) | |
| 2606 { | |
| 2607 v27 = &pActor->array_000234[1]; | |
| 2608 if ( pActor->array_000234[1].uItemID ) | |
| 2609 goto LABEL_84; | |
| 2610 } | |
| 2611 v28 = v47; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2612 memcpy(v27, &v5->pInventoryItemList[v5->pInventoryMatrix[v47]-1], 0x24u); |
| 0 | 2613 RemoveItemAtInventoryIndex(v28); |
| 2614 LABEL_79: | |
| 2615 v42 = 0; | |
| 2616 v37 = 0; | |
| 2617 v35 = 0; | |
| 2618 v34 = 0; | |
| 2619 v33 = -1; | |
| 2620 v32 = 0; | |
| 2621 v31 = 0; | |
| 2622 v30 = (SoundID)47; | |
| 2623 goto LABEL_83; | |
| 2624 case 21: | |
| 187 | 2625 PlaySound(SPEECH_42, 0); |
| 0 | 2626 ++v5->sAgeModifier; |
| 2627 goto LABEL_82; | |
| 2628 case 22: | |
| 187 | 2629 PlaySound(SPEECH_41, 0); |
| 0 | 2630 v5->sMana = 0; |
| 2631 LABEL_82: | |
| 2632 v42 = 0; | |
| 2633 v37 = 0; | |
| 2634 v35 = 0; | |
| 2635 v34 = 0; | |
| 2636 v33 = -1; | |
| 2637 v32 = 0; | |
| 2638 v31 = 0; | |
| 2639 v30 = (SoundID)226; | |
| 2640 goto LABEL_83; | |
| 2641 default: | |
| 2642 goto LABEL_87; | |
| 2643 } | |
| 2644 } | |
| 2645 return result; | |
| 2646 } | |
| 324 | 2647 |
| 0 | 2648 // 48DCF6: using guessed type char var_94[140]; |
| 2649 | |
| 2650 //----- (0048E1A3) -------------------------------------------------------- | |
| 2651 unsigned int Player::GetSpellSchool(unsigned int uSpellID) | |
| 2652 { | |
| 1091 | 2653 return pSpellStats->pInfos[uSpellID].uSchool; |
| 0 | 2654 } |
| 2655 | |
| 2656 //----- (0048E1B5) -------------------------------------------------------- | |
| 816 | 2657 int Player::GetAttackRecoveryTime(bool bRangedAttack) |
| 2658 { | |
| 2659 ItemGen *weapon = nullptr; | |
| 2660 ItemDesc *weapon_desc = nullptr; | |
| 2661 uint weapon_recovery = base_recovery_times_per_weapon_type[0]; | |
| 2662 if (bRangedAttack) | |
| 0 | 2663 { |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2664 if ( HasItemEquipped(EQUIP_BOW) ) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2665 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2666 weapon = &pInventoryItemList[pEquipment.uBow - 1]; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2667 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
|
2668 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
|
2669 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2670 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2671 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
|
2672 { |
| 816 | 2673 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
|
2674 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2675 else if ( HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 816 | 2676 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2677 weapon = &pInventoryItemList[pEquipment.uMainHand - 1]; |
| 816 | 2678 weapon_desc = &pItemsTable->pItems[weapon->uItemID]; |
| 2679 if (weapon_desc->uEquipType == EQUIP_WAND) | |
| 2680 { | |
| 2681 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
| 2682 __debugbreak(); // looks like wands were two-handed weapons once, or supposed to be. should not get here now | |
| 2683 weapon_recovery = pSpellDatas[wand_spell_ids[weapon->uItemID - ITEM_WAND_FIRE]].uExpertLevelRecovery; | |
| 2684 } | |
| 0 | 2685 else |
| 816 | 2686 weapon_recovery = base_recovery_times_per_weapon_type[weapon_desc->uSkillType]; |
| 2687 } | |
| 1010 | 2688 if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD) |
| 2689 // ADD: shield check because shield recovery is added later and can be accidentally doubled | |
| 816 | 2690 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2691 auto v12 = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 2692 auto v12_desc = &pItemsTable->pItems[v12->uItemID]; |
| 2693 if (base_recovery_times_per_weapon_type[v12_desc->uSkillType] > weapon_recovery) | |
| 2694 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2695 weapon = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 2696 weapon_desc = &pItemsTable->pItems[weapon->uItemID]; |
| 2697 weapon_recovery = base_recovery_times_per_weapon_type[pItemsTable->pItems[weapon->uItemID].uSkillType]; | |
| 2698 } | |
| 2699 } | |
| 2700 | |
| 2701 uint armour_recovery = 0; | |
| 0 | 2702 if ( HasItemEquipped(EQUIP_ARMOUR) ) |
| 2703 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2704 auto armour_skill_type = pItemsTable->pItems[pInventoryItemList[pEquipment.uArmor - 1].uItemID].uSkillType; |
| 816 | 2705 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
|
2706 float multiplier; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2707 |
| 816 | 2708 if (armour_skill_type == PLAYER_SKILL_LEATHER) |
| 2709 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2710 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0, 0, 0); |
| 816 | 2711 } |
| 2712 else if (armour_skill_type == PLAYER_SKILL_CHAIN) | |
| 2713 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2714 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0, 0); |
| 816 | 2715 } |
| 2716 else if (armour_skill_type == PLAYER_SKILL_PLATE) | |
| 2717 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2718 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0.5f, 0); |
| 0 | 2719 } |
| 2720 else | |
| 2721 { | |
| 1545 | 2722 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
|
2723 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
|
2724 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2725 |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2726 armour_recovery = (uint)(base_armour_recovery * multiplier); |
| 816 | 2727 } |
| 2728 | |
| 2729 uint shield_recovery = 0; | |
| 2730 if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) == EQUIP_SHIELD) | |
| 2731 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2732 auto shield = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 2733 auto skill_type = pItemsTable->pItems[shield->uItemID].uSkillType; |
| 2734 | |
| 2735 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
|
2736 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
|
2737 shield_recovery = (uint)(shield_base_recovery * multiplier); |
| 816 | 2738 } |
| 2739 | |
| 1036 | 2740 uint player_speed_recovery_reduction = GetParameterBonus(GetActualSpeed()), |
| 816 | 2741 sword_axe_bow_recovery_reduction = 0; |
| 2742 bool shooting_laser = false; | |
| 2743 if (weapon_desc) | |
| 2744 { | |
| 2745 if (GetActualSkillLevel((PLAYER_SKILL_TYPE)weapon_desc->uSkillType) && | |
| 2746 (weapon_desc->uSkillType == PLAYER_SKILL_SWORD || weapon_desc->uSkillType == PLAYER_SKILL_AXE || weapon_desc->uSkillType == PLAYER_SKILL_BOW) ) | |
| 2747 { | |
| 2748 if (SkillToMastery(pActiveSkills[weapon_desc->uSkillType]) >= 2 ) // Expert Sword, Axe & Bow reduce recovery | |
| 2749 sword_axe_bow_recovery_reduction = pActiveSkills[weapon_desc->uSkillType] & 0x3F; | |
| 2750 } | |
| 2751 if (weapon_desc->uSkillType == PLAYER_SKILL_BLASTER) | |
| 2752 shooting_laser = true; | |
| 2753 } | |
| 2754 | |
| 2755 uint armsmaster_recovery_reduction = 0; | |
| 2756 if (!bRangedAttack && !shooting_laser) | |
| 2757 { | |
| 2758 if (uint armsmaster_level = GetActualSkillLevel(PLAYER_SKILL_ARMSMASTER)) | |
| 2759 { | |
| 2760 armsmaster_recovery_reduction = armsmaster_level & 0x3F; | |
| 2761 if (SkillToMastery(armsmaster_level) >= 4) | |
| 2762 armsmaster_recovery_reduction *= 2; | |
| 2763 } | |
| 2764 } | |
| 2765 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2766 uint hasteRecoveryReduction = 0; |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
2767 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
|
2768 hasteRecoveryReduction = 25; |
| 816 | 2769 |
| 2770 uint weapon_enchantment_recovery_reduction = 0; | |
| 2771 if ( weapon ) | |
| 2772 { | |
| 2773 if (weapon->uSpecEnchantmentType == 59 || | |
| 2774 weapon->uSpecEnchantmentType == 41 || | |
| 2775 weapon->uSpecEnchantmentType == 500) | |
| 2776 weapon_enchantment_recovery_reduction = 20; | |
| 2777 } | |
| 2778 | |
| 2779 int recovery = weapon_recovery + | |
| 2780 armour_recovery + | |
| 2781 shield_recovery | |
| 2782 - armsmaster_recovery_reduction | |
| 2783 - weapon_enchantment_recovery_reduction | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2784 - hasteRecoveryReduction |
| 816 | 2785 - sword_axe_bow_recovery_reduction |
| 2786 - player_speed_recovery_reduction; | |
| 2787 | |
| 2788 if (recovery < 0) | |
| 2789 recovery = 0; | |
| 2790 return recovery; | |
| 0 | 2791 } |
| 2792 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2793 |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2794 //----- new -------------------------------------------------------- |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2795 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
|
2796 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2797 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
|
2798 switch (skill_mastery) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2799 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2800 case 1: return mult1; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2801 case 2: return mult2; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2802 case 3: return mult3; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2803 case 4: return mult4; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2804 } |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2805 Error("Unexpected input value: %d", armour_skill_type); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2806 return 0; |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2807 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2808 |
| 0 | 2809 //----- (0048E4F8) -------------------------------------------------------- |
| 2810 int Player::GetMaxHealth() | |
| 2811 { | |
| 2812 int v3; // esi@1 | |
| 2813 int v4; // esi@1 | |
| 2814 int v6; // esi@1 | |
| 2815 | |
| 1036 | 2816 v3 = GetParameterBonus(GetActualEndurance()); |
| 135 | 2817 v4 = pBaseHealthPerLevelByClass[classType] * (GetActualLevel() + v3); |
| 0 | 2818 v6 = uFullHealthBonus |
| 135 | 2819 + pBaseHealthByClass[classType / 4] |
| 0 | 2820 + GetSkillBonus(CHARACTER_ATTRIBUTE_HEALTH) |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2821 + GetItemsBonus(CHARACTER_ATTRIBUTE_HEALTH) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2822 return max(1, v6); |
| 0 | 2823 } |
| 2824 | |
| 2825 //----- (0048E565) -------------------------------------------------------- | |
| 2826 int Player::GetMaxMana() | |
| 2827 { | |
| 2828 int v2; // eax@2 | |
| 2829 int v3; // esi@4 | |
| 2830 int v4; // eax@5 | |
| 2831 int v5; // esi@5 | |
| 2832 int v6; // eax@5 | |
| 2833 int v7; // esi@6 | |
| 2834 int v8; // esi@6 | |
| 2835 int v9; // esi@6 | |
| 1116 | 2836 |
| 135 | 2837 switch (classType) |
| 0 | 2838 { |
| 1116 | 2839 case PLAYER_CLASS_ROGUE: |
| 2840 case PLAYER_CLASS_SPY: | |
| 2841 case PLAYER_CLASS_ASSASSIN: | |
| 2842 case PLAYER_CLASS_ARCHER: | |
| 2843 case PLAYER_CLASS_WARRIOR_MAGE: | |
| 2844 case PLAYER_CLASS_MASTER_ARCHER: | |
| 2845 case PLAYER_CLASS_SNIPER: | |
| 2846 case PLAYER_CLASS_SORCERER: | |
| 2847 case PLAYER_CLASS_WIZARD: | |
| 2848 case PLAYER_CLASS_ARCHMAGE: | |
| 2849 case PLAYER_CLASS_LICH: | |
| 0 | 2850 v2 = GetActualIntelligence(); |
| 1036 | 2851 v3 = GetParameterBonus(v2); |
| 1116 | 2852 break; |
| 2853 case PLAYER_CLASS_INITIATE: | |
| 2854 case PLAYER_CLASS_MASTER: | |
| 2855 case PLAYER_CLASS_NINJA: | |
| 2856 case PLAYER_CLASS_PALADIN: | |
| 2857 case PLAYER_CLASS_CRUSADER: | |
| 2858 case PLAYER_CLASS_HERO: | |
| 2859 case PLAYER_CLASS_VILLIAN: | |
| 2860 case PLAYER_CLASS_CLERIC: | |
| 2861 case PLAYER_CLASS_PRIEST: | |
| 2862 case PLAYER_CLASS_PRIEST_OF_SUN: | |
| 2863 case PLAYER_CLASS_PRIEST_OF_MOON: | |
| 0 | 2864 v2 = GetActualWillpower(); |
| 1036 | 2865 v3 = GetParameterBonus(v2); |
| 1116 | 2866 break; |
| 2867 case PLAYER_CLASS_HUNTER: | |
| 2868 case PLAYER_CLASS_RANGER_LORD: | |
| 2869 case PLAYER_CLASS_BOUNTY_HUNTER: | |
| 2870 case PLAYER_CLASS_DRUID: | |
| 2871 case PLAYER_CLASS_GREAT_DRUID: | |
| 2872 case PLAYER_CLASS_ARCH_DRUID: | |
| 2873 case PLAYER_CLASS_WARLOCK: | |
| 0 | 2874 v4 = GetActualWillpower(); |
| 1036 | 2875 v5 = GetParameterBonus(v4); |
| 0 | 2876 v6 = GetActualIntelligence(); |
| 1036 | 2877 v3 = GetParameterBonus(v6) + v5; |
| 0 | 2878 break; |
| 2879 default: | |
| 1116 | 2880 return 0; |
| 0 | 2881 break; |
| 2882 } | |
| 1116 | 2883 v7 = pBaseManaPerLevelByClass[classType] * (GetActualLevel() + v3); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2884 v8 = GetItemsBonus(CHARACTER_ATTRIBUTE_MANA) + v7; |
| 1116 | 2885 v9 = uFullManaBonus |
| 2886 + pBaseManaByClass[classType / 4] | |
| 2887 + GetSkillBonus(CHARACTER_ATTRIBUTE_MANA) | |
| 2888 + v8; | |
| 2889 return max(0,v9); | |
| 0 | 2890 } |
| 2891 | |
| 2892 //----- (0048E656) -------------------------------------------------------- | |
| 2893 int Player::GetBaseAC() | |
| 2894 { | |
| 2895 int v2; // eax@1 | |
| 2896 int v3; // esi@1 | |
| 2897 int v4; // esi@1 | |
| 2898 int v5; // esi@1 | |
| 2899 | |
| 2900 v2 = GetActualSpeed(); | |
| 1036 | 2901 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2902 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2903 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2904 return max(0, v5); |
| 0 | 2905 } |
| 2906 | |
| 2907 //----- (0048E68F) -------------------------------------------------------- | |
| 2908 int Player::GetActualAC() | |
| 2909 { | |
| 2910 int v2; // eax@1 | |
| 2911 int v3; // esi@1 | |
| 2912 int v4; // esi@1 | |
| 2913 int v5; // esi@1 | |
| 2914 int v6; // esi@1 | |
| 2915 | |
| 2916 v2 = GetActualSpeed(); | |
| 1036 | 2917 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2918 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2919 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2920 v6 = this->sACModifier + GetMagicalBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v5; |
|
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2921 return max(0, v6); |
| 0 | 2922 } |
| 2923 | |
| 2924 //----- (0048E6DC) -------------------------------------------------------- | |
| 2925 unsigned int Player::GetBaseAge() | |
| 2926 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2927 return (unsigned int)(((__int64)(pParty->uTimePlayed * 0.234375) / 60 / 60 / 24) / 7 / 4 / 12 - uBirthYear + game_starting_year); |
| 0 | 2928 } |
| 2929 | |
| 2930 //----- (0048E72C) -------------------------------------------------------- | |
| 2931 unsigned int Player::GetActualAge() | |
| 2932 { | |
| 2933 return this->sAgeModifier + GetBaseAge(); | |
| 2934 } | |
| 2935 | |
| 2936 //----- (0048E73F) -------------------------------------------------------- | |
| 2937 int Player::GetBaseResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2938 { | |
| 2939 int v7; // esi@20 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2940 int racialBonus = 0; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2941 __int16* resStat; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2942 |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2943 switch (a2) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2944 { |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2945 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2946 resStat = &sResFireBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2947 if (IsRaceGoblin()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2948 racialBonus = 5; |
|
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_AIR: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2951 resStat = &sResAirBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2952 if (IsRaceGoblin()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2953 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2954 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2955 case CHARACTER_ATTRIBUTE_RESIST_WATER: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2956 resStat = &sResWaterBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2957 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2958 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2959 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2960 case CHARACTER_ATTRIBUTE_RESIST_EARTH: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2961 resStat = &sResEarthBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2962 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2963 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2964 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2965 case CHARACTER_ATTRIBUTE_RESIST_MIND: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2966 resStat = &sResMindBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2967 if (IsRaceElf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2968 racialBonus = 10; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2969 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2970 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2971 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2972 resStat = &sResBodyBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2973 if (IsRaceHuman()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2974 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2975 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2976 } |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2977 v7 = GetItemsBonus(a2) + racialBonus; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2978 return v7 + *resStat; |
| 0 | 2979 } |
| 2980 | |
| 2981 //----- (0048E7D0) -------------------------------------------------------- | |
| 2982 int Player::GetActualResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2983 { | |
|
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
|
2984 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
|
2985 __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
|
2986 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
|
2987 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
|
2988 |
|
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 int leatherArmorSkillLevel = GetActualSkillLevel(PLAYER_SKILL_LEATHER); |
| 652 | 2990 if ( CheckHiredNPCSpeciality(Enchanter) ) |
| 0 | 2991 v10 = 20; |
| 2992 if ( (a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE | |
| 2993 || a2 == CHARACTER_ATTRIBUTE_RESIST_AIR | |
| 2994 || a2 == CHARACTER_ATTRIBUTE_RESIST_WATER | |
| 2995 || 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
|
2996 && SkillToMastery(leatherArmorSkillLevel) == 4 |
| 0 | 2997 && HasItemEquipped(EQUIP_ARMOUR) |
| 2998 && 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
|
2999 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
|
3000 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
|
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 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
|
3003 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
|
3004 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
|
3005 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
|
3006 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
|
3007 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
|
3008 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
|
3009 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
|
3010 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
|
3011 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
|
3012 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
|
3013 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
|
3014 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
|
3015 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
|
3016 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
|
3017 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
|
3018 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
|
3019 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
|
3020 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
|
3021 } |
|
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
|
3022 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
|
3023 result = v10 + GetMagicalBonus(a2) + baseRes + *(resStat); |
| 0 | 3024 return result; |
| 3025 } | |
| 3026 | |
| 3027 //----- (0048E8F5) -------------------------------------------------------- | |
| 816 | 3028 bool Player::Recover(int dt) |
| 3029 { | |
|
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
|
3030 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
|
3031 |
|
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
|
3032 v3 = (int)(dt * GetSpecialItemBonus(17) * 0.01 + dt); |
| 816 | 3033 |
| 3034 Log::Warning(L"Recover(dt = %u/%u - %u", dt, (uint)v3, (uint)uTimeToRecovery); | |
| 3035 | |
| 3036 if (uTimeToRecovery > v3) | |
| 3037 { | |
| 3038 uTimeToRecovery -= v3; | |
| 3039 return true; | |
| 0 | 3040 } |
| 3041 else | |
| 3042 { | |
| 816 | 3043 uTimeToRecovery = 0; |
| 3044 viewparams->bRedrawGameUI = true; | |
| 3045 if (!uActiveCharacter) | |
| 0 | 3046 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 3047 return false; |
| 3048 } | |
| 0 | 3049 } |
| 3050 | |
| 3051 //----- (0048E96A) -------------------------------------------------------- | |
| 816 | 3052 void Player::SetRecoveryTime(signed int rec) |
| 3053 { | |
| 1545 | 3054 Assert(rec >= 0); |
| 816 | 3055 |
| 3056 if (rec > uTimeToRecovery) | |
| 3057 uTimeToRecovery = rec; | |
| 3058 | |
| 3059 if (pPlayers[uActiveCharacter] == this && !some_active_character) | |
| 0 | 3060 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 3061 |
| 3062 viewparams->bRedrawGameUI = true; | |
| 0 | 3063 } |
| 3064 // 50C0C4: using guessed type int some_active_character; | |
| 3065 | |
| 3066 //----- (0048E9B7) -------------------------------------------------------- | |
| 3067 void Player::RandomizeName() | |
| 3068 { | |
| 3069 if (!uExpressionTimePassed) | |
| 3070 strcpy(pName, pNPCStats->pNPCNames[rand() % pNPCStats->uNumNPCNames[uSex]][uSex]); | |
| 3071 } | |
| 3072 | |
| 3073 //----- (0048E9F4) -------------------------------------------------------- | |
| 3074 unsigned int Player::GetMajorConditionIdx() | |
| 3075 { | |
| 3076 for (uint i = 0; i < 18; ++i) | |
| 3077 if (pConditions[pConditionImportancyTable[i]] != 0) | |
| 3078 return pConditionImportancyTable[i]; | |
| 3079 | |
| 3080 return 18; | |
| 3081 } | |
| 3082 | |
| 3083 //----- (0048EA1B) -------------------------------------------------------- | |
| 1036 | 3084 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
|
3085 { |
| 1036 | 3086 int i; // eax@1 |
| 3087 i = 0; | |
| 3088 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
|
3089 { |
|
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 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
|
3091 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
|
3092 ++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
|
3093 } |
| 1036 | 3094 return parameter_to_bonus_value[i]; |
| 0 | 3095 } |
| 3096 | |
| 3097 //----- (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
|
3098 int Player::GetSpecialItemBonus( int enchantmentId ) |
| 0 | 3099 { |
| 1032 | 3100 int inv_indx; // eax@3 |
| 3101 | |
|
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
|
3102 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
|
3103 { |
|
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
|
3104 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
|
3105 { |
| 1032 | 3106 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
|
3107 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
|
3108 { |
| 1599 | 3109 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
|
3110 return 50; |
| 1032 | 3111 } |
|
1598
11bb463837b1
_48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus, forgot to commit actor.cpp
Grumpy7
parents:
1597
diff
changeset
|
3112 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
|
3113 { |
|
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
|
3114 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
|
3115 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
|
3116 } |
|
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
|
3117 } |
|
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
|
3118 } |
| 1032 | 3119 return 0; |
| 0 | 3120 } |
| 3121 | |
| 3122 //----- (0048EAAE) -------------------------------------------------------- | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3123 int Player::GetItemsBonus( enum CHARACTER_ATTRIBUTE_TYPE attr, bool getOnlyMainHandDmg /*= false*/ ) |
| 0 | 3124 { |
| 3125 int v5; // edi@1 | |
| 3126 int v9; // eax@49 | |
| 3127 int v14; // ecx@58 | |
| 3128 int v15; // eax@58 | |
| 3129 int v17; // eax@62 | |
| 3130 int v20; // eax@69 | |
| 3131 int v22; // eax@76 | |
| 3132 int v23; // edx@76 | |
| 3133 int v25; // ecx@80 | |
| 3134 int v26; // edi@80 | |
| 3135 int v31; // ebp@97 | |
| 3136 int v32; // eax@98 | |
| 3137 unsigned int v33; // eax@100 | |
| 3138 int v56; // eax@365 | |
| 3139 int v57; // ebx@368 | |
| 3140 signed int v58; // [sp-4h] [bp-20h]@10 | |
| 3141 int v61; // [sp+10h] [bp-Ch]@1 | |
| 3142 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
|
3143 ItemGen *currEquippedItem; // [sp+20h] [bp+4h]@101 |
| 1040 | 3144 bool no_skills; |
| 0 | 3145 |
| 3146 v5 = 0; | |
| 3147 v62 = 0; | |
| 3148 v61 = 0; | |
| 1040 | 3149 |
| 3150 no_skills=false; | |
| 0 | 3151 switch (attr) |
| 1599 | 3152 { |
| 3153 case CHARACTER_ATTRIBUTE_SKILL_ALCHEMY: v58 = PLAYER_SKILL_ALCHEMY; break; | |
| 3154 case CHARACTER_ATTRIBUTE_SKILL_STEALING: v58 = PLAYER_SKILL_STEALING; break; | |
| 3155 case CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM: v58 = PLAYER_SKILL_TRAP_DISARM; break; | |
| 3156 case CHARACTER_ATTRIBUTE_SKILL_ITEM_ID: v58 = PLAYER_SKILL_ITEM_ID; break; | |
| 3157 case CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID: v58 = PLAYER_SKILL_MONSTER_ID; break; | |
| 3158 case CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER: v58 = PLAYER_SKILL_ARMSMASTER; break; | |
| 3159 case CHARACTER_ATTRIBUTE_SKILL_DODGE: v58 = PLAYER_SKILL_DODGE; break; | |
| 3160 case CHARACTER_ATTRIBUTE_SKILL_UNARMED: v58 = PLAYER_SKILL_UNARMED; break; | |
| 3161 case CHARACTER_ATTRIBUTE_SKILL_FIRE: v58 = PLAYER_SKILL_FIRE; break; | |
| 3162 case CHARACTER_ATTRIBUTE_SKILL_AIR: v58 = PLAYER_SKILL_AIR; break; | |
| 3163 case CHARACTER_ATTRIBUTE_SKILL_WATER: v58 = PLAYER_SKILL_WATER; break; | |
| 3164 case CHARACTER_ATTRIBUTE_SKILL_EARTH: v58 = PLAYER_SKILL_EARTH; break; | |
| 3165 case CHARACTER_ATTRIBUTE_SKILL_SPIRIT: v58 = PLAYER_SKILL_SPIRIT; break; | |
| 3166 case CHARACTER_ATTRIBUTE_SKILL_MIND: v58 = PLAYER_SKILL_MIND; break; | |
| 3167 case CHARACTER_ATTRIBUTE_SKILL_BODY: v58 = PLAYER_SKILL_BODY; break; | |
| 3168 case CHARACTER_ATTRIBUTE_SKILL_LIGHT: v58 = PLAYER_SKILL_LIGHT; break; | |
| 3169 case CHARACTER_ATTRIBUTE_SKILL_DARK: v58 = PLAYER_SKILL_DARK; break; | |
| 3170 case CHARACTER_ATTRIBUTE_SKILL_MEDITATION: v58 = PLAYER_SKILL_MEDITATION; break; | |
| 3171 case CHARACTER_ATTRIBUTE_SKILL_BOW: v58 = PLAYER_SKILL_BOW; break; | |
| 3172 case CHARACTER_ATTRIBUTE_SKILL_SHIELD: v58 = PLAYER_SKILL_SHIELD; break; | |
| 3173 case CHARACTER_ATTRIBUTE_SKILL_LEARNING: v58 = PLAYER_SKILL_LEARNING; break; | |
| 3174 default: | |
| 1040 | 3175 no_skills=true; |
| 1599 | 3176 } |
| 1040 | 3177 if (!no_skills) |
| 1599 | 3178 { |
| 3179 if ( !this->pActiveSkills[v58] ) | |
| 3180 return 0; | |
| 3181 } | |
| 1040 | 3182 |
|
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 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
|
3184 { |
|
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
|
3185 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
|
3186 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: |
| 0 | 3187 if ( HasItemEquipped(EQUIP_BOW) ) |
| 1599 | 3188 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
|
3189 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
|
3190 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
|
3191 |
|
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 case CHARACTER_ATTRIBUTE_RANGED_DMG_MIN: |
| 0 | 3193 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
|
3194 return 0; |
| 1599 | 3195 v57 = this->pOwnItems[this->pEquipment.uBow-1].uItemID; |
| 0 | 3196 v5 = pItemsTable->pItems[v57].uDamageMod; |
| 3197 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
|
3198 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
|
3199 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
|
3200 |
|
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
|
3201 case CHARACTER_ATTRIBUTE_RANGED_DMG_MAX: |
| 0 | 3202 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
|
3203 return 0; |
| 1599 | 3204 v20 = this->pOwnItems[this->pEquipment.uBow-1].uItemID; |
| 0 | 3205 v5 = pItemsTable->pItems[v20].uDamageDice * pItemsTable->pItems[v20].uDamageRoll; |
| 3206 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
|
3207 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
|
3208 |
|
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
|
3209 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
|
3210 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
|
3211 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
|
3212 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
|
3213 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
|
3214 |
|
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 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
|
3216 if ( IsUnarmed() ) |
| 0 | 3217 { |
|
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
|
3218 return 3; |
| 0 | 3219 } |
| 3220 else | |
| 3221 { | |
|
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
|
3222 if ( this->HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 0 | 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 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
|
3225 if ( v22 >= 0 && v22 <= 2) |
| 0 | 3226 { |
|
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
|
3227 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
|
3228 v26 = pItemsTable->pItems[v23].uDamageRoll; |
| 1599 | 3229 if ( this->pEquipment.uShield || pItemsTable->pItems[v23].uSkillType != 4 ) |
| 0 | 3230 { |
| 3231 v25 = pItemsTable->pItems[v23].uDamageDice; | |
| 3232 } | |
| 3233 else | |
| 3234 { | |
|
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
|
3235 v25 = pItemsTable->pItems[v23].uDamageDice + 1; |
| 0 | 3236 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3237 v5 = pItemsTable->pItems[v23].uDamageMod + v25 * v26; |
| 0 | 3238 } |
| 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 ( 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
|
3241 { |
|
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 return v5; |
| 1040 | 3243 } |
|
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
|
3244 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
|
3245 { |
|
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 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
|
3247 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
|
3248 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
|
3249 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
|
3250 } |
|
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
|
3251 } |
|
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 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
|
3253 |
|
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 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
|
3255 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
|
3256 if ( IsUnarmed() ) |
| 1040 | 3257 { |
|
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
|
3258 return 0; |
| 1040 | 3259 } |
|
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
|
3260 if ( this->HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 0 | 3261 { |
|
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
|
3262 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
|
3263 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
|
3264 { |
| 1599 | 3265 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
|
3266 } |
| 0 | 3267 } |
|
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
|
3268 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
|
3269 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
|
3270 else |
| 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 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
|
3273 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
|
3274 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
|
3275 } |
|
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 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
|
3277 |
|
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 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
|
3279 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
|
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 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
|
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 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
|
3284 { |
|
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 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
|
3286 if ( v9 >= 0 && v9 <= 2) |
| 0 | 3287 { |
| 1040 | 3288 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
|
3289 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
|
3290 if ( !this->pEquipment.uShield && pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand].uItemID].uSkillType == 4) |
| 0 | 3291 { |
|
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
|
3292 ++v5; |
| 0 | 3293 } |
| 3294 } | |
| 3295 } | |
|
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
|
3296 |
|
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 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
|
3298 { |
|
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 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
|
3300 } |
|
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 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
|
3302 { |
|
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 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
|
3304 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
|
3305 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
|
3306 } |
|
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 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
|
3308 |
|
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_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
|
3310 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
|
3311 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
|
3312 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
|
3313 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
|
3314 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
|
3315 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
|
3316 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
|
3317 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
|
3318 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
|
3319 |
|
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_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
|
3321 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
|
3322 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
|
3323 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
|
3324 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
|
3325 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
|
3326 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
|
3327 |
|
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_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
|
3329 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
|
3330 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
|
3331 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
|
3332 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
|
3333 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
|
3334 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
|
3335 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
|
3336 |
|
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 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
|
3338 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
|
3339 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
|
3340 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
|
3341 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
|
3342 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
|
3343 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
|
3344 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
|
3345 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
|
3346 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
|
3347 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
|
3348 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
|
3349 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
|
3350 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
|
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 ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 1040 | 3353 { |
|
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
|
3354 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
|
3355 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
|
3356 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
|
3357 { |
|
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 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
|
3359 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
|
3360 { |
|
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 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
|
3362 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
|
3363 } |
|
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
|
3364 } |
|
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 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
|
3366 && !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
|
3367 { |
|
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 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
|
3369 } |
|
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 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
|
3371 { |
|
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
|
3372 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
|
3373 { |
|
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
|
3374 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
|
3375 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
|
3376 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
|
3377 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
|
3378 } |
|
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
|
3379 } |
|
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
|
3380 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
|
3381 { |
|
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
|
3382 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
|
3383 } |
| 1040 | 3384 } |
|
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
|
3385 } |
|
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
|
3386 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
|
3387 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
|
3388 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
|
3389 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
|
3390 } |
| 0 | 3391 } |
| 3392 | |
| 3393 //----- (0048F73C) -------------------------------------------------------- | |
| 3394 int Player::GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 3395 { | |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3396 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
|
3397 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
|
3398 |
| 0 | 3399 switch ( a2 ) |
| 3400 { | |
|
1605
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_FIRE: |
|
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_FIRE].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_FIRE].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_RESIST_AIR: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3406 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
|
3407 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
|
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_RESIST_BODY: |
|
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_RESIST_BODY].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_RESIST_BODY].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3412 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3413 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
|
3414 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
|
3415 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
|
3416 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3417 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
|
3418 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
|
3419 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
|
3420 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3421 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
|
3422 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
|
3423 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
|
3424 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3425 case CHARACTER_ATTRIBUTE_ATTACK: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3426 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
|
3427 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
|
3428 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3429 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
|
3430 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
|
3431 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
|
3432 break; |
| 0 | 3433 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
|
3434 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
|
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_INTELLIGENCE: |
|
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_INTELLIGENCE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3439 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
|
3440 break; |
| 0 | 3441 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
|
3442 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
|
3443 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
|
3444 break; |
| 0 | 3445 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
|
3446 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
|
3447 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
|
3448 break; |
| 0 | 3449 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
|
3450 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
|
3451 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
|
3452 break; |
| 0 | 3453 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
|
3454 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
|
3455 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
|
3456 break; |
| 0 | 3457 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
|
3458 v3 = pPlayerBuffs[PLAYER_BUFF_LUCK].uPower; |
| 1167 | 3459 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
|
3460 break; |
| 0 | 3461 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
|
3462 v3 = this->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uPower; |
| 1167 | 3463 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
|
3464 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3465 } |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3466 return v3 + v4; |
| 0 | 3467 } |
| 3468 | |
| 3469 //----- (0048F882) -------------------------------------------------------- | |
| 1008 | 3470 int Player::GetActualSkillLevel( PLAYER_SKILL_TYPE uSkillType ) |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3471 { |
| 1064 | 3472 signed int bonus_value; // esi@1 |
| 3473 unsigned __int16 skill_value; // ax@126 | |
| 3474 int result; // al@127 | |
| 353 | 3475 |
| 1064 | 3476 bonus_value = 0; |
| 353 | 3477 switch (uSkillType) |
| 3478 { | |
| 3479 case PLAYER_SKILL_MONSTER_ID: | |
| 3480 { | |
| 652 | 3481 if ( CheckHiredNPCSpeciality(Hunter) ) |
| 1064 | 3482 bonus_value = 6; |
| 652 | 3483 if ( CheckHiredNPCSpeciality(Sage) ) |
| 1064 | 3484 bonus_value += 6; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3485 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID); |
| 353 | 3486 } |
| 3487 break; | |
| 3488 | |
| 3489 case PLAYER_SKILL_ARMSMASTER: | |
| 3490 { | |
| 652 | 3491 if ( CheckHiredNPCSpeciality(Armsmaster) ) |
| 1064 | 3492 bonus_value = 2; |
| 652 | 3493 if ( CheckHiredNPCSpeciality(Weaponsmaster) ) |
| 1064 | 3494 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3495 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER); |
| 353 | 3496 } |
| 3497 break; | |
| 3498 | |
| 3499 case PLAYER_SKILL_STEALING: | |
| 3500 { | |
| 652 | 3501 if (CheckHiredNPCSpeciality(Burglar)) |
| 1064 | 3502 bonus_value = 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3503 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_STEALING); |
| 353 | 3504 } |
| 3505 break; | |
| 3506 | |
| 3507 | |
| 3508 case PLAYER_SKILL_ALCHEMY: | |
| 3509 { | |
| 652 | 3510 if ( CheckHiredNPCSpeciality(Herbalist) ) |
| 1064 | 3511 bonus_value = 4; |
| 652 | 3512 if ( CheckHiredNPCSpeciality(Apothecary) ) |
| 1064 | 3513 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3514 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ALCHEMY); |
| 353 | 3515 } |
| 3516 break; | |
| 3517 | |
| 3518 case PLAYER_SKILL_LEARNING: | |
| 3519 { | |
| 652 | 3520 if ( CheckHiredNPCSpeciality(Teacher) ) |
| 1064 | 3521 bonus_value = 10; |
| 652 | 3522 if ( CheckHiredNPCSpeciality(Instructor) ) |
| 1064 | 3523 bonus_value += 15; |
| 652 | 3524 if ( CheckHiredNPCSpeciality(Scholar) ) |
| 1064 | 3525 bonus_value += 5; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3526 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LEARNING); |
| 353 | 3527 } |
| 3528 break; | |
| 3529 | |
| 3530 case PLAYER_SKILL_UNARMED: | |
| 3531 { | |
| 652 | 3532 if (CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3533 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3534 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_UNARMED); |
| 353 | 3535 } |
| 3536 break; | |
| 3537 | |
| 3538 case PLAYER_SKILL_DODGE: | |
| 3539 { | |
| 652 | 3540 if ( CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3541 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3542 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DODGE); |
| 353 | 3543 } |
| 3544 break; | |
| 3545 | |
| 3546 case PLAYER_SKILL_BOW: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3547 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BOW); |
| 353 | 3548 break; |
| 3549 case PLAYER_SKILL_SHIELD: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3550 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SHIELD); |
| 353 | 3551 break; |
| 3552 | |
| 3553 case PLAYER_SKILL_EARTH: | |
| 652 | 3554 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3555 bonus_value = 2; |
| 652 | 3556 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3557 bonus_value += 3; |
| 652 | 3558 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3559 bonus_value += 4; |
| 353 | 3560 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3561 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3562 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_EARTH); |
| 353 | 3563 break; |
| 3564 case PLAYER_SKILL_FIRE: | |
| 652 | 3565 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3566 bonus_value = 2; |
| 652 | 3567 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3568 bonus_value += 3; |
| 652 | 3569 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3570 bonus_value += 4; |
| 353 | 3571 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3572 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3573 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_FIRE); |
| 353 | 3574 break; |
| 3575 case PLAYER_SKILL_AIR: | |
| 652 | 3576 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3577 bonus_value = 2; |
| 652 | 3578 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3579 bonus_value += 3; |
| 652 | 3580 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3581 bonus_value += 4; |
| 353 | 3582 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3583 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3584 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_AIR); |
| 353 | 3585 break; |
| 3586 case PLAYER_SKILL_WATER: | |
| 652 | 3587 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3588 bonus_value = 2; |
| 652 | 3589 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3590 bonus_value += 3; |
| 652 | 3591 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3592 bonus_value += 4; |
| 353 | 3593 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3594 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3595 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_WATER); |
| 353 | 3596 break; |
| 3597 case PLAYER_SKILL_SPIRIT: | |
| 652 | 3598 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3599 bonus_value = 2; |
| 652 | 3600 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3601 bonus_value += 3; |
| 652 | 3602 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3603 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3604 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SPIRIT); |
| 353 | 3605 break; |
| 3606 case PLAYER_SKILL_MIND: | |
| 652 | 3607 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3608 bonus_value = 2; |
| 652 | 3609 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3610 bonus_value += 3; |
| 652 | 3611 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3612 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3613 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MIND); |
| 353 | 3614 break; |
| 3615 case PLAYER_SKILL_BODY: | |
| 652 | 3616 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3617 bonus_value = 2; |
| 652 | 3618 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3619 bonus_value += 3; |
| 652 | 3620 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3621 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3622 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BODY); |
| 353 | 3623 break; |
| 3624 case PLAYER_SKILL_LIGHT: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3625 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LIGHT); |
| 353 | 3626 break; |
| 3627 case PLAYER_SKILL_DARK: | |
| 3628 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3629 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DARK); |
| 353 | 3630 } |
| 3631 break; | |
| 3632 | |
| 3633 case PLAYER_SKILL_MERCHANT: | |
| 3634 { | |
| 652 | 3635 if ( CheckHiredNPCSpeciality(Trader) ) |
| 1064 | 3636 bonus_value = 4; |
| 652 | 3637 if ( CheckHiredNPCSpeciality(Merchant) ) |
| 1064 | 3638 bonus_value += 6; |
| 652 | 3639 if ( CheckHiredNPCSpeciality(Gypsy) ) |
| 1064 | 3640 bonus_value += 3; |
| 652 | 3641 if ( CheckHiredNPCSpeciality(Duper) ) |
| 1064 | 3642 bonus_value += 8; |
| 353 | 3643 } |
| 3644 break; | |
| 3645 | |
| 3646 case PLAYER_SKILL_PERCEPTION: | |
| 3647 { | |
| 652 | 3648 if ( CheckHiredNPCSpeciality(Scout) ) |
| 1064 | 3649 bonus_value = 6; |
| 652 | 3650 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1064 | 3651 bonus_value += 5; |
| 353 | 3652 } |
| 3653 break; | |
| 3654 | |
| 0 | 3655 case PLAYER_SKILL_ITEM_ID: |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3656 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ITEM_ID); |
| 0 | 3657 break; |
| 3658 case PLAYER_SKILL_MEDITATION: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3659 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MEDITATION); |
| 353 | 3660 break; |
| 0 | 3661 case PLAYER_SKILL_TRAP_DISARM: |
| 353 | 3662 { |
| 652 | 3663 if ( CheckHiredNPCSpeciality(Tinker) ) |
| 1064 | 3664 bonus_value = 4; |
| 652 | 3665 if ( CheckHiredNPCSpeciality(Locksmith) ) |
| 1064 | 3666 bonus_value += 6; |
| 652 | 3667 if ( CheckHiredNPCSpeciality(Burglar) ) |
| 1064 | 3668 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3669 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM); |
| 353 | 3670 } |
| 3671 break; | |
| 3672 } | |
| 3673 | |
| 1064 | 3674 skill_value = pActiveSkills[uSkillType]; |
| 3675 if ( bonus_value + (skill_value & 0x3F) < 60 ) | |
| 3676 result = bonus_value + skill_value; | |
| 0 | 3677 else |
| 1064 | 3678 result = skill_value & 0xFFFC | 0x3C; //al |
| 0 | 3679 return result; |
| 3680 } | |
| 3681 | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3682 |
| 0 | 3683 //----- (0048FC00) -------------------------------------------------------- |
| 1538 | 3684 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
|
3685 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3686 int armsMasterBonus; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3687 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3688 armsMasterBonus = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3689 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
|
3690 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
|
3691 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3692 int multiplier = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3693 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
|
3694 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3695 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
|
3696 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3697 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
|
3698 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3699 multiplier = GetMultiplierForSkillLevel(armmaster_skill, 0, 1, 1, 2); |
| 1064 | 3700 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3701 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
|
3702 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3703 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3704 switch(inSkill) |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3705 { |
|
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
|
3706 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
|
3707 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
|
3708 { |
|
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
|
3709 int bowSkillLevel = GetActualSkillLevel(PLAYER_SKILL_DODGE); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3710 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
|
3711 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
|
3712 } |
|
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 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
|
3714 break; |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3715 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
|
3716 { |
|
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
|
3717 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
|
3718 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
|
3719 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
|
3720 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3721 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3722 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
|
3723 { |
|
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 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
|
3725 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
|
3726 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
|
3727 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3728 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3729 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
|
3730 { |
|
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 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
|
3732 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
|
3733 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
|
3734 |
|
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 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
|
3736 { |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
3737 if (pEquipment.pIndices[j] && (!pOwnItems[pEquipment.pIndices[j]].IsBroken())) |
| 1538 | 3738 { |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
3739 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
|
3740 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
|
3741 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
|
3742 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
|
3743 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
|
3744 { |
|
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 case PLAYER_SKILL_STAFF: |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3746 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
|
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 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
|
3749 case PLAYER_SKILL_SPEAR: |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3750 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
|
3751 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
|
3752 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
|
3753 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3754 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
|
3755 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
|
3756 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
|
3757 wearingLeather = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3758 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
|
3759 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
|
3760 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
|
3761 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3762 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
|
3763 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
|
3764 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
|
3765 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3766 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
|
3767 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
|
3768 } |
|
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
|
3769 ACSum += multiplier * (currArmorSkillLevel & 0x3F); |
| 1538 | 3770 } |
|
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
|
3771 } |
|
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
|
3772 |
|
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
|
3773 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
|
3774 int dodgeMastery = SkillToMastery(dodgeSkillLevel); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3775 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
|
3776 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
|
3777 { |
|
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
|
3778 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
|
3779 } |
|
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
|
3780 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
|
3781 } |
| 1538 | 3782 break; |
| 3783 case CHARACTER_ATTRIBUTE_ATTACK: | |
| 3784 if ( this->IsUnarmed() ) | |
| 3785 { | |
| 3786 int unarmedSkill = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3787 if (!unarmedSkill) | |
| 3788 { | |
| 3789 return 0; | |
| 3790 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3791 int multiplier = GetMultiplierForSkillLevel(unarmedSkill, 0, 1, 2, 2); |
| 1538 | 3792 return armsMasterBonus + multiplier * (unarmedSkill & 0x3F); |
| 3793 } | |
| 3794 for (int i = 0; i < 16; ++i) | |
| 3795 { | |
| 3796 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3797 { | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
3798 ItemDesc currItem = pItemsTable->pItems[this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID]; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
3799 if ( currItem.uEquipType <= EQUIP_MAIN_HAND) |
| 1533 | 3800 { |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
3801 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItem.uSkillType; |
| 1538 | 3802 int currentItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 3803 if (currItemSkillType == PLAYER_SKILL_BLASTER) | |
| 3804 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3805 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); |
| 1538 | 3806 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3807 } | |
| 3808 else if (currItemSkillType == PLAYER_SKILL_STAFF && this->GetActualSkillLevel(PLAYER_SKILL_UNARMED) > 0) | |
| 3809 { | |
| 3810 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
|
3811 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 2, 2); |
| 1538 | 3812 return multiplier * (unarmedSkillLevel & 0x3F) + armsMasterBonus + (currentItemSkillLevel & 0x3F); |
| 3813 } | |
| 3814 else | |
| 3815 { | |
| 3816 return armsMasterBonus + (currentItemSkillLevel & 0x3F); | |
| 3817 } | |
| 3818 } | |
| 3819 } | |
| 3820 } | |
| 3821 return 0; | |
| 3822 break; | |
| 3823 | |
| 3824 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: | |
| 3825 for (int i = 0; i < 16; i++) | |
| 3826 { | |
| 3827 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3828 { | |
| 3829 PLAYER_SKILL_TYPE currentItemSkillType = (PLAYER_SKILL_TYPE)pItemsTable->pItems[this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID].uSkillType; | |
| 3830 int currentItemSkillLevel = this->GetActualSkillLevel(currentItemSkillType); | |
| 3831 if ( currentItemSkillType == PLAYER_SKILL_BOW ) | |
| 3832 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3833 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 1, 1); |
| 1538 | 3834 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3835 } | |
| 3836 else if ( currentItemSkillType == PLAYER_SKILL_BLASTER ) | |
| 3837 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3838 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); |
| 1538 | 3839 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3840 } | |
| 3841 } | |
| 3842 } | |
| 3843 return 0; | |
| 3844 break; | |
| 3845 | |
| 3846 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: | |
| 3847 if ( this->IsUnarmed() ) | |
| 3848 { | |
| 3849 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3850 if ( !unarmedSkillLevel ) | |
| 3851 { | |
| 3852 return 0; | |
| 3853 } | |
|
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); |
| 3856 } | |
| 3857 for (int i = 0; i < 16; i++) | |
| 3858 { | |
| 3859 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3860 { | |
| 3861 int currItemId = this->pInventoryItemList[this->pEquipment.pIndices[i]].uItemID; | |
| 3862 if ( pItemsTable->pItems[currItemId].uEquipType == EQUIP_MAIN_HAND || pItemsTable->pItems[currItemId].uEquipType == EQUIP_OFF_HAND ) | |
| 3863 { | |
| 3864 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)pItemsTable->pItems[currItemId].uSkillType; | |
| 3865 int currItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); | |
| 3866 int baseSkillBonus; | |
| 3867 int multiplier; | |
| 3868 switch (currItemSkillType) | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3869 { |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3870 case PLAYER_SKILL_STAFF: |
| 1538 | 3871 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
|
3872 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3873 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
|
3874 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 3875 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
|
3876 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3877 else |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3878 { |
| 1538 | 3879 return armsMasterBonus; |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3880 } |
| 1538 | 3881 break; |
| 3882 | |
| 3883 case PLAYER_SKILL_DAGGER: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3884 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 1); |
| 1538 | 3885 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3886 return armsMasterBonus + baseSkillBonus; | |
| 3887 break; | |
| 3888 case PLAYER_SKILL_SWORD: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3889 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 0); |
| 1538 | 3890 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3891 return armsMasterBonus + baseSkillBonus; | |
| 3892 break; | |
| 3893 case PLAYER_SKILL_MACE: | |
| 3894 case PLAYER_SKILL_SPEAR: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3895 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 1, 1, 1); |
| 1538 | 3896 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3897 return armsMasterBonus + baseSkillBonus; | |
| 3898 break; | |
| 3899 case PLAYER_SKILL_AXE: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3900 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 1, 1); |
| 1538 | 3901 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3902 return armsMasterBonus + baseSkillBonus; | |
| 3903 break; | |
| 1535 | 3904 } |
| 1533 | 3905 } |
| 1535 | 3906 } |
| 1538 | 3907 } |
| 3908 return 0; | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3909 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3910 default: |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3911 return 0; |
| 1533 | 3912 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3913 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3914 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3915 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
|
3916 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3917 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
|
3918 switch (masteryLvl) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3919 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3920 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
|
3921 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
|
3922 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
|
3923 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
|
3924 } |
| 1545 | 3925 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
|
3926 return 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3927 } |
| 0 | 3928 //----- (00490109) -------------------------------------------------------- |
| 3929 // faces are: 0 1 2 3 human males | |
| 3930 // 4 5 6 7 human females | |
| 3931 // 8 9 elf males | |
| 3932 // 10 11 elf females | |
| 3933 // 12 13 dwarf males | |
| 3934 // 14 15 dwarf females | |
| 3935 // 16 17 goblin males | |
| 3936 // 18 19 goblin females | |
| 3937 // 20 lich male | |
| 3938 // 21 lich female | |
| 3939 // 22 underwater suits (unused) | |
| 3940 // 23 zombie male | |
| 3941 // 24 zombie female | |
| 3942 enum CHARACTER_RACE Player::GetRace() | |
| 3943 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3944 if ( uCurrentFace <= 7 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3945 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3946 return CHARACTER_RACE_HUMAN; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3947 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3948 else if ( uCurrentFace <= 11 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3949 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3950 return CHARACTER_RACE_ELF; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3951 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3952 else if ( uCurrentFace <= 15 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3953 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3954 return CHARACTER_RACE_DWARF; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3955 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3956 else if ( uCurrentFace <= 19 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3957 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3958 return CHARACTER_RACE_GOBLIN; |
| 0 | 3959 } |
| 3960 else | |
| 3961 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3962 return CHARACTER_RACE_HUMAN; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3963 } |
| 0 | 3964 } |
| 3965 | |
| 3966 //----- (00490141) -------------------------------------------------------- | |
| 187 | 3967 PLAYER_SEX Player::GetSexByVoice() |
| 0 | 3968 { |
| 3969 switch ( this->uVoiceID ) | |
| 3970 { | |
| 3971 case 0u: | |
| 3972 case 1u: | |
| 3973 case 2u: | |
| 3974 case 3u: | |
| 3975 case 8u: | |
| 3976 case 9u: | |
| 3977 case 0xCu: | |
| 3978 case 0xDu: | |
| 3979 case 0x10u: | |
| 3980 case 0x11u: | |
| 3981 case 0x14u: | |
| 3982 case 0x17u: | |
| 187 | 3983 return SEX_MALE; |
| 3984 | |
| 0 | 3985 case 4u: |
| 3986 case 5u: | |
| 3987 case 6u: | |
| 3988 case 7u: | |
| 3989 case 0xAu: | |
| 3990 case 0xBu: | |
| 3991 case 0xEu: | |
| 3992 case 0xFu: | |
| 3993 case 0x12u: | |
| 3994 case 0x13u: | |
| 3995 case 0x15u: | |
| 3996 case 0x18u: | |
| 187 | 3997 return SEX_FEMALE; |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3998 } |
| 1545 | 3999 Error("(%u)", this->uVoiceID); |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4000 return SEX_MALE; |
| 0 | 4001 } |
| 4002 | |
| 4003 //----- (00490188) -------------------------------------------------------- | |
| 4004 void Player::SetInitialStats() | |
| 4005 { | |
| 4006 auto v1 = GetRace(); | |
| 290 | 4007 uMight = StatTable[v1][0].uBaseValue; |
| 4008 uIntelligence = StatTable[v1][1].uBaseValue; | |
| 4009 uWillpower = StatTable[v1][2].uBaseValue; | |
| 4010 uEndurance = StatTable[v1][3].uBaseValue; | |
| 4011 uAccuracy = StatTable[v1][4].uBaseValue; | |
| 4012 uSpeed = StatTable[v1][5].uBaseValue; | |
| 4013 uLuck = StatTable[v1][6].uBaseValue; | |
| 0 | 4014 } |
| 4015 | |
| 4016 //----- (004901FC) -------------------------------------------------------- | |
| 1021 | 4017 void Player::SetSexByVoice() |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4018 { |
| 1021 | 4019 switch ( this->uVoiceID) |
| 0 | 4020 { |
| 4021 case 0: | |
| 4022 case 1: | |
| 4023 case 2: | |
| 4024 case 3: | |
| 4025 case 8: | |
| 4026 case 9: | |
| 4027 case 0xC: | |
| 4028 case 0xD: | |
| 4029 case 0x10: | |
| 4030 case 0x11: | |
| 4031 case 0x14: | |
| 4032 case 0x17: | |
| 1021 | 4033 this->uSex = SEX_MALE; |
| 0 | 4034 break; |
| 4035 case 4: | |
| 4036 case 5: | |
| 4037 case 6: | |
| 4038 case 7: | |
| 4039 case 0xA: | |
| 4040 case 0xB: | |
| 4041 case 0xE: | |
| 4042 case 0xF: | |
| 4043 case 0x12: | |
| 4044 case 0x13: | |
| 4045 case 0x15: | |
| 4046 case 0x18: | |
| 1021 | 4047 this->uSex = SEX_FEMALE; |
| 0 | 4048 break; |
| 4049 default: | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4050 Error("(%u)", this->uVoiceID); |
| 0 | 4051 break; |
| 4052 } | |
| 1021 | 4053 |
| 0 | 4054 } |
| 4055 | |
| 4056 //----- (0049024A) -------------------------------------------------------- | |
| 135 | 4057 void Player::Reset(PLAYER_CLASS_TYPE cls) |
| 0 | 4058 { |
| 4059 sLevelModifier = 0; | |
| 4060 sAgeModifier = 0; | |
| 4061 | |
| 135 | 4062 classType = cls; |
| 0 | 4063 uLuckBonus = 0; |
| 4064 uSpeedBonus = 0; | |
| 4065 uAccuracyBonus = 0; | |
| 4066 uEnduranceBonus = 0; | |
| 4067 uWillpowerBonus = 0; | |
| 4068 uIntelligenceBonus = 0; | |
| 4069 uMightBonus = 0; | |
| 4070 uLevel = 1; | |
| 4071 uExperience = 251 + rand() % 100; | |
| 4072 uBirthYear = 1147 - rand() % 6; | |
| 4073 memset(pActiveSkills, 0, sizeof(pActiveSkills)); | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
4074 memset(_achieved_awards_bits, 0, 64); |
| 0 | 4075 memset(&spellbook, 0, sizeof(PlayerSpells)); |
| 4076 | |
| 4077 for (uint i = 0; i < 37; ++i) | |
| 4078 { | |
| 135 | 4079 if (pSkillAvailabilityPerClass[classType / 4][i] != 2) |
| 0 | 4080 continue; |
| 4081 | |
| 4082 pActiveSkills[i] = 1; | |
| 4083 | |
| 4084 switch (i) | |
| 4085 { | |
| 886 | 4086 case PLAYER_SKILL_FIRE: |
| 4087 spellbook.pFireSpellbook.bIsSpellAvailable[0] = true;//its temporary, for test spells | |
| 894 | 4088 |
| 4089 extern bool all_magic; | |
| 4090 if ( all_magic == true ) | |
| 4091 { | |
| 4092 pActiveSkills[PLAYER_SKILL_AIR] = 1; | |
| 4093 pActiveSkills[PLAYER_SKILL_WATER] = 1; | |
| 4094 pActiveSkills[PLAYER_SKILL_EARTH] = 1; | |
| 4095 spellbook.pFireSpellbook.bIsSpellAvailable[1] = true; | |
| 4096 spellbook.pFireSpellbook.bIsSpellAvailable[2] = true; | |
| 4097 spellbook.pFireSpellbook.bIsSpellAvailable[3] = true; | |
| 4098 spellbook.pFireSpellbook.bIsSpellAvailable[4] = true; | |
| 4099 spellbook.pFireSpellbook.bIsSpellAvailable[5] = true; | |
| 4100 spellbook.pFireSpellbook.bIsSpellAvailable[6] = true; | |
| 4101 spellbook.pFireSpellbook.bIsSpellAvailable[7] = true; | |
| 4102 spellbook.pFireSpellbook.bIsSpellAvailable[8] = true; | |
| 4103 spellbook.pFireSpellbook.bIsSpellAvailable[9] = true; | |
| 4104 spellbook.pFireSpellbook.bIsSpellAvailable[10] = true; | |
| 886 | 4105 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; |
| 569 | 4106 spellbook.pAirSpellbook.bIsSpellAvailable[1] = true; |
| 4107 spellbook.pAirSpellbook.bIsSpellAvailable[2] = true; | |
| 4108 spellbook.pAirSpellbook.bIsSpellAvailable[3] = true; | |
| 4109 spellbook.pAirSpellbook.bIsSpellAvailable[4] = true; | |
| 4110 spellbook.pAirSpellbook.bIsSpellAvailable[5] = true; | |
| 4111 spellbook.pAirSpellbook.bIsSpellAvailable[6] = true; | |
| 4112 spellbook.pAirSpellbook.bIsSpellAvailable[7] = true; | |
| 4113 spellbook.pAirSpellbook.bIsSpellAvailable[8] = true; | |
| 4114 spellbook.pAirSpellbook.bIsSpellAvailable[9] = true; | |
| 4115 spellbook.pAirSpellbook.bIsSpellAvailable[10] = true; | |
| 4116 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 4117 spellbook.pWaterSpellbook.bIsSpellAvailable[1] = true; | |
| 4118 spellbook.pWaterSpellbook.bIsSpellAvailable[2] = true; | |
| 4119 spellbook.pWaterSpellbook.bIsSpellAvailable[3] = true; | |
| 4120 spellbook.pWaterSpellbook.bIsSpellAvailable[4] = true; | |
| 4121 spellbook.pWaterSpellbook.bIsSpellAvailable[5] = true; | |
| 710 | 4122 spellbook.pWaterSpellbook.bIsSpellAvailable[6] = true; |
| 4123 spellbook.pWaterSpellbook.bIsSpellAvailable[7] = true; | |
| 4124 spellbook.pWaterSpellbook.bIsSpellAvailable[8] = true; | |
| 886 | 4125 spellbook.pWaterSpellbook.bIsSpellAvailable[9] = true; |
| 4126 spellbook.pWaterSpellbook.bIsSpellAvailable[10] = true; | |
| 894 | 4127 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; |
| 4128 spellbook.pEarthSpellbook.bIsSpellAvailable[1] = true; | |
| 4129 spellbook.pEarthSpellbook.bIsSpellAvailable[2] = true; | |
| 4130 spellbook.pEarthSpellbook.bIsSpellAvailable[3] = true; | |
| 4131 spellbook.pEarthSpellbook.bIsSpellAvailable[4] = true; | |
| 4132 spellbook.pEarthSpellbook.bIsSpellAvailable[5] = true; | |
| 4133 spellbook.pEarthSpellbook.bIsSpellAvailable[6] = true; | |
| 4134 spellbook.pEarthSpellbook.bIsSpellAvailable[7] = true; | |
| 4135 spellbook.pEarthSpellbook.bIsSpellAvailable[8] = true; | |
| 4136 spellbook.pEarthSpellbook.bIsSpellAvailable[9] = true; | |
| 4137 spellbook.pEarthSpellbook.bIsSpellAvailable[10] = true; | |
| 4138 } | |
| 486 | 4139 break; |
| 886 | 4140 case PLAYER_SKILL_AIR: |
| 4141 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; | |
| 4142 break; | |
| 4143 case PLAYER_SKILL_WATER: | |
| 4144 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 4145 break; | |
| 4146 case PLAYER_SKILL_EARTH: | |
| 4147 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; | |
| 4148 break; | |
| 4149 case PLAYER_SKILL_SPIRIT: | |
| 4150 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; | |
| 4151 break; | |
| 4152 case PLAYER_SKILL_MIND: | |
| 4153 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; | |
| 4154 break; | |
| 4155 case PLAYER_SKILL_BODY: | |
| 4156 spellbook.pBodySpellbook.bIsSpellAvailable[0] = true; | |
| 894 | 4157 |
| 4158 if ( all_magic == true ) | |
| 4159 { | |
| 4160 pActiveSkills[PLAYER_SKILL_MIND] = 1; | |
| 4161 pActiveSkills[PLAYER_SKILL_SPIRIT] = 1; | |
| 4162 spellbook.pBodySpellbook.bIsSpellAvailable[1] = true; | |
| 4163 spellbook.pBodySpellbook.bIsSpellAvailable[2] = true; | |
| 4164 spellbook.pBodySpellbook.bIsSpellAvailable[3] = true; | |
| 4165 spellbook.pBodySpellbook.bIsSpellAvailable[4] = true; | |
| 4166 spellbook.pBodySpellbook.bIsSpellAvailable[5] = true; | |
| 4167 spellbook.pBodySpellbook.bIsSpellAvailable[6] = true; | |
| 4168 spellbook.pBodySpellbook.bIsSpellAvailable[7] = true; | |
| 4169 spellbook.pBodySpellbook.bIsSpellAvailable[8] = true; | |
| 4170 spellbook.pBodySpellbook.bIsSpellAvailable[9] = true; | |
| 4171 spellbook.pBodySpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 4172 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 4173 spellbook.pMindSpellbook.bIsSpellAvailable[1] = true; |
| 4174 spellbook.pMindSpellbook.bIsSpellAvailable[2] = true; | |
| 4175 spellbook.pMindSpellbook.bIsSpellAvailable[3] = true; | |
| 4176 spellbook.pMindSpellbook.bIsSpellAvailable[4] = true; | |
| 4177 spellbook.pMindSpellbook.bIsSpellAvailable[5] = true; | |
| 4178 spellbook.pMindSpellbook.bIsSpellAvailable[6] = true; | |
| 4179 spellbook.pMindSpellbook.bIsSpellAvailable[7] = true; | |
| 4180 spellbook.pMindSpellbook.bIsSpellAvailable[8] = true; | |
| 4181 spellbook.pMindSpellbook.bIsSpellAvailable[9] = true; | |
| 4182 spellbook.pMindSpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 4183 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 4184 spellbook.pSpiritSpellbook.bIsSpellAvailable[1] = true; |
| 4185 spellbook.pSpiritSpellbook.bIsSpellAvailable[2] = true; | |
| 4186 spellbook.pSpiritSpellbook.bIsSpellAvailable[3] = true; | |
| 4187 spellbook.pSpiritSpellbook.bIsSpellAvailable[4] = true; | |
| 4188 spellbook.pSpiritSpellbook.bIsSpellAvailable[5] = true; | |
| 4189 spellbook.pSpiritSpellbook.bIsSpellAvailable[6] = true; | |
| 4190 spellbook.pSpiritSpellbook.bIsSpellAvailable[7] = true; | |
| 4191 spellbook.pSpiritSpellbook.bIsSpellAvailable[8] = true; | |
| 4192 spellbook.pSpiritSpellbook.bIsSpellAvailable[9] = true; | |
| 4193 spellbook.pSpiritSpellbook.bIsSpellAvailable[10] = true; | |
| 4194 } | |
| 569 | 4195 break; |
| 886 | 4196 case PLAYER_SKILL_LIGHT: |
| 4197 spellbook.pLightSpellbook.bIsSpellAvailable[0] = true; | |
| 4198 break; | |
| 4199 case PLAYER_SKILL_DARK: | |
| 4200 spellbook.pDarkSpellbook.bIsSpellAvailable[0] = true; | |
| 4201 break; | |
| 0 | 4202 } |
| 4203 } | |
| 4204 | |
| 4205 sHealth = GetMaxHealth(); | |
| 4206 sMana = GetMaxMana(); | |
| 4207 } | |
| 4208 | |
| 4209 //----- (004903C9) -------------------------------------------------------- | |
| 821 | 4210 PLAYER_SKILL_TYPE Player::GetSkillIdxByOrder(signed int order) |
| 4211 { | |
|
1271
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4212 int counter; // edx@5 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4213 bool canBeInactive; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4214 unsigned char requiredValue; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4215 signed int offset; |
|
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 if ( order <= 1 ) |
|
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 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4220 requiredValue = 2; // 2 - primary skill |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4221 offset = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4222 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4223 else if ( order <= 3 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4224 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4225 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4226 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4227 offset = 2; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4228 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4229 else if ( order <= 12 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4230 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4231 canBeInactive = true; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4232 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4233 offset = 4; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4234 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4235 else |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4236 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4237 return (PLAYER_SKILL_TYPE)37; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4238 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4239 counter = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4240 for (int i = 0; i < 37; i++) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4241 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4242 if ( (this->pActiveSkills[i] || canBeInactive) && pSkillAvailabilityPerClass[classType / 4][i] == requiredValue ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4243 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4244 if ( counter == order - offset ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4245 return (PLAYER_SKILL_TYPE)i; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4246 ++counter; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4247 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4248 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4249 |
|
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
|
4250 return (PLAYER_SKILL_TYPE)37; |
| 0 | 4251 } |
| 4252 | |
| 4253 | |
| 4254 | |
| 4255 //----- (0049048D) -------------------------------------------------------- | |
| 4256 //unsigned __int16 PartyCreation_BtnMinusClick(Player *_this, int eAttribute) | |
| 4257 void Player::DecreaseAttribute(int eAttribute) | |
| 4258 { | |
| 4259 int pBaseValue; // ecx@1 | |
| 4260 int pDroppedStep; // ebx@1 | |
| 4261 int pStep; // esi@1 | |
| 4262 int uMinValue; // [sp+Ch] [bp-4h]@1 | |
| 4263 | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4264 int raceId = GetRace(); |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4265 pBaseValue = StatTable[raceId][eAttribute].uBaseValue; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4266 pDroppedStep = StatTable[raceId][eAttribute].uDroppedStep; |
| 0 | 4267 uMinValue = pBaseValue - 2; |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4268 pStep = StatTable[raceId][eAttribute].uBaseStep; |
| 1272 | 4269 unsigned short* AttrToChange = nullptr; |
| 4270 switch ( eAttribute ) | |
| 4271 { | |
| 4272 case CHARACTER_ATTRIBUTE_STRENGTH: | |
| 4273 AttrToChange = &this->uMight; | |
| 4274 break; | |
| 4275 case CHARACTER_ATTRIBUTE_INTELLIGENCE: | |
| 4276 AttrToChange = &this->uIntelligence; | |
| 4277 break; | |
| 4278 case CHARACTER_ATTRIBUTE_WILLPOWER: | |
| 4279 AttrToChange = &this->uWillpower; | |
| 4280 break; | |
| 4281 case CHARACTER_ATTRIBUTE_ENDURANCE: | |
| 4282 AttrToChange = &this->uEndurance; | |
| 4283 break; | |
| 4284 case CHARACTER_ATTRIBUTE_ACCURACY: | |
| 4285 AttrToChange = &this->uAccuracy; | |
| 4286 break; | |
| 4287 case CHARACTER_ATTRIBUTE_SPEED: | |
| 4288 AttrToChange = &this->uSpeed; | |
| 4289 break; | |
| 4290 case CHARACTER_ATTRIBUTE_LUCK: | |
| 4291 AttrToChange = &this->uLuck; | |
| 4292 break; | |
| 4293 } | |
| 4294 if ( *AttrToChange <= pBaseValue ) | |
| 4295 pStep = pDroppedStep; | |
| 4296 if ( *AttrToChange - pStep >= uMinValue ) | |
| 4297 *AttrToChange -= pStep; | |
| 0 | 4298 } |
| 4299 | |
| 4300 //----- (004905F5) -------------------------------------------------------- | |
| 1458 | 4301 //signed int PartyCreation_BtnPlusClick(Player *this, int eAttribute) |
| 1273 | 4302 void Player::IncreaseAttribute( int eAttribute ) |
| 4303 { | |
| 4304 int raceId; // eax@1 | |
| 4305 int maxValue; // ebx@1 | |
| 4306 signed int baseStep; // edi@1 | |
| 4307 signed int tmp; // eax@17 | |
| 0 | 4308 signed int result; // eax@18 |
| 1273 | 4309 int baseValue; // [sp+Ch] [bp-8h]@1 |
| 4310 signed int droppedStep; // [sp+10h] [bp-4h]@1 | |
| 4311 unsigned short* statToChange; | |
| 4312 | |
| 4313 raceId = GetRace(); | |
| 4314 maxValue = StatTable[raceId][eAttribute].uMaxValue; | |
| 4315 baseStep = StatTable[raceId][eAttribute].uBaseStep; | |
| 4316 baseValue = StatTable[raceId][eAttribute].uBaseValue; | |
| 4317 droppedStep = StatTable[raceId][eAttribute].uDroppedStep; | |
| 4318 PlayerCreation_GetUnspentAttributePointCount(); | |
| 4319 switch ( eAttribute ) | |
| 4320 { | |
| 4321 case 0: | |
| 4322 statToChange = &this->uMight; | |
| 4323 break; | |
| 4324 case 1: | |
| 4325 statToChange = &this->uIntelligence; | |
| 4326 break; | |
| 4327 case 2: | |
| 4328 statToChange = &this->uWillpower; | |
| 4329 break; | |
| 4330 case 3: | |
| 4331 statToChange = &this->uEndurance; | |
| 4332 break; | |
| 4333 case 4: | |
| 4334 statToChange = &this->uAccuracy; | |
| 4335 break; | |
| 4336 case 5: | |
| 4337 statToChange = &this->uSpeed; | |
| 4338 break; | |
| 4339 case 6: | |
| 4340 statToChange = &this->uLuck; | |
| 4341 default: | |
| 1545 | 4342 Error("(%u)", eAttribute); |
| 1273 | 4343 } |
| 4344 if ( *statToChange < baseValue ) | |
| 4345 { | |
| 4346 tmp = baseStep; | |
| 4347 baseStep = droppedStep; | |
| 4348 droppedStep = tmp; | |
| 4349 } | |
| 4350 result = PlayerCreation_GetUnspentAttributePointCount(); | |
| 4351 if ( result >= droppedStep ) | |
| 4352 { | |
| 4353 if ( baseStep + *statToChange <= maxValue ) | |
| 4354 *statToChange += baseStep; | |
| 4355 } | |
| 0 | 4356 } |
| 4357 | |
| 4358 //----- (0049070F) -------------------------------------------------------- | |
| 4359 void Player::Zero() | |
| 4360 { | |
| 4361 this->sLevelModifier = 0; | |
| 4362 this->sACModifier = 0; | |
| 4363 this->uLuckBonus = 0; | |
| 4364 this->uAccuracyBonus = 0; | |
| 4365 this->uSpeedBonus = 0; | |
| 4366 this->uEnduranceBonus = 0; | |
| 4367 this->uWillpowerBonus = 0; | |
| 4368 this->uIntelligenceBonus = 0; | |
| 4369 this->uMightBonus = 0; | |
| 4370 this->field_100 = 0; | |
| 4371 this->field_FC = 0; | |
| 4372 this->field_F8 = 0; | |
| 4373 this->field_F4 = 0; | |
| 4374 this->field_F0 = 0; | |
| 4375 this->field_EC = 0; | |
| 4376 this->field_E8 = 0; | |
| 4377 this->field_E4 = 0; | |
| 4378 this->field_E0 = 0; | |
| 766 | 4379 memset(&this->sResFireBonus, 0, 0x16u); |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4380 this->field_1A97 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4381 this->_ranged_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4382 this->field_1A95 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4383 this->_ranged_atk_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4384 this->field_1A93 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4385 this->_melee_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4386 this->field_1A91 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4387 this->_some_attack_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4388 this->_mana_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4389 this->uFullManaBonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4390 this->_health_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4391 this->uFullHealthBonus = 0; |
| 0 | 4392 } |
| 4393 | |
| 4394 //----- (004907E7) -------------------------------------------------------- | |
| 299 | 4395 unsigned int Player::GetStatColor(int uStat) |
| 0 | 4396 { |
| 290 | 4397 int attribute_value; // edx@1 |
| 1393 | 4398 |
| 4399 int base_attribute_value = StatTable[GetRace()][uStat].uBaseValue; | |
| 0 | 4400 switch (uStat) |
| 4401 { | |
| 4402 case 0: attribute_value = uMight; break; | |
| 4403 case 1: attribute_value = uIntelligence; break; | |
| 4404 case 2: attribute_value = uWillpower; break; | |
| 4405 case 3: attribute_value = uEndurance; break; | |
| 290 | 4406 case 4: attribute_value = uAccuracy; break; |
| 4407 case 5: attribute_value = uSpeed; break; | |
| 0 | 4408 case 6: attribute_value = uLuck; break; |
| 4409 }; | |
| 4410 | |
| 1393 | 4411 if (attribute_value == base_attribute_value) |
| 4412 return ui_character_stat_default_color; | |
| 4413 else if (attribute_value > base_attribute_value) | |
| 4414 return ui_character_stat_buffed_color; | |
| 0 | 4415 else |
| 1393 | 4416 return ui_character_stat_debuffed_color; |
| 0 | 4417 } |
| 4418 | |
| 4419 //----- (004908A8) -------------------------------------------------------- | |
| 4420 bool Player::DiscardConditionIfLastsLongerThan(unsigned int uCondition, unsigned __int64 uTime) | |
| 4421 { | |
| 1014 | 4422 if ( pConditions[uCondition] && (uTime < pConditions[uCondition]) ) |
| 4423 { | |
| 1393 | 4424 pConditions[uCondition] = 0i64; |
| 1014 | 4425 return true; |
| 0 | 4426 } |
| 4427 else | |
| 1014 | 4428 return false; |
| 0 | 4429 } |
| 4430 | |
| 4431 //----- (004680ED) -------------------------------------------------------- | |
| 1019 | 4432 void Player::UseItem_DrinkPotion_etc(signed int player_num, int a3) |
| 1021 | 4433 { |
| 4434 Player *v3; // esi@1 | |
| 4435 signed int v5; // eax@17 | |
| 4436 int v8; // edx@39 | |
| 4437 char *v13; // eax@45 | |
| 4438 signed int v15; // edi@68 | |
| 4439 int v16; // edx@73 | |
| 4440 unsigned __int16 v17; // edi@73 | |
| 4441 unsigned int v18; // eax@73 | |
| 4442 const char *v22; // eax@84 | |
| 4443 int scroll_id; // esi@96 | |
| 4444 int v25; // eax@109 | |
| 4445 int v26; // eax@113 | |
| 4446 int new_mana_val; // edi@114 | |
| 4447 signed __int64 v28; // qax@120 | |
| 4448 __int64 v30; // edi@137 | |
| 4449 __int64 v32; // ST3C_4@137 | |
| 4450 __int64 v34; // ST34_4@137 | |
| 4451 unsigned __int16 v50; // [sp-Ch] [bp-38h]@120 | |
| 4452 const char *v66; // [sp-4h] [bp-30h]@69 | |
| 4453 signed int v67; // [sp-4h] [bp-30h]@77 | |
| 4454 const char *v68; // [sp-4h] [bp-30h]@89 | |
| 4455 char v72; // [sp+20h] [bp-Ch]@68 | |
| 4456 signed int v73; // [sp+24h] [bp-8h]@1 | |
| 1032 | 4457 char* v74; // [sp+24h] [bp-8h]@23 |
| 1021 | 4458 Player *thisb; // [sp+28h] [bp-4h]@1 |
| 4459 unsigned int thisa; // [sp+28h] [bp-4h]@22 | |
| 4460 | |
| 4461 thisb = this; | |
| 4462 v3 = &pParty->pPlayers[player_num-1]; | |
| 4463 v73 = 1; | |
| 1340 | 4464 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) ) |
| 1021 | 4465 return; |
| 4466 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_REAGENT ) | |
| 0 | 4467 { |
| 1021 | 4468 if ( pParty->pPickedItem.uItemID == 160 ) |
| 4469 { | |
| 4470 pParty->pPlayers[player_num-1].SetCondition(Condition_Poison1, 1); | |
| 4471 } | |
| 4472 else if ( pParty->pPickedItem.uItemID == 161 ) | |
| 1019 | 4473 { |
| 1021 | 4474 new_mana_val = v3->sMana; |
| 4475 new_mana_val += 2; | |
| 4476 if ( new_mana_val > v3->GetMaxMana() ) | |
| 4477 new_mana_val = v3->GetMaxMana(); | |
| 4478 v3->PlaySound(SPEECH_36, 0); | |
| 4479 } | |
| 4480 else if ( pParty->pPickedItem.uItemID == 162 ) | |
| 4481 { | |
| 4482 pParty->pPlayers[player_num-1].Heal(2); | |
| 1019 | 4483 v3->PlaySound(SPEECH_36, 0); |
| 1021 | 4484 |
| 4485 } | |
| 4486 else | |
| 4487 { | |
| 4488 v68 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4489 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[36], v68);//"%s can not be used that way" |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4490 ShowStatusBarString(pTmpBuf.data(), 2); |
| 1021 | 4491 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 4492 return; | |
| 1019 | 4493 } |
| 1032 | 4494 pAudioPlayer->PlaySound((SoundID)211, 0, 0, -1, 0, 0, 0, 0); |
| 4495 | |
| 4496 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) | |
| 4497 { | |
| 4498 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 4499 } | |
| 4500 if ( v73 ) | |
| 4501 { | |
| 4502 if ( pParty->bTurnBasedModeOn ) | |
| 4503 { | |
| 4504 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; | |
| 4505 thisb->SetRecoveryTime(100); | |
| 1448 | 4506 pTurnEngine->ApplyPlayerAction(); |
| 1032 | 4507 } |
| 4508 else | |
| 4509 { | |
| 4510 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); | |
| 4511 } | |
| 4512 } | |
| 4513 pMouse->RemoveHoldingItem(); | |
| 4514 return; | |
| 4515 | |
| 1021 | 4516 |
| 4517 } | |
| 4518 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_POTION ) | |
| 0 | 4519 { |
| 1021 | 4520 switch ( pParty->pPickedItem.uItemID ) |
| 4521 { | |
| 4522 case 221: //Catalyst | |
| 4523 pParty->pPlayers[player_num-1].SetCondition(Condition_Poison1, 1); | |
| 4524 break; | |
| 4525 case 222: //Cure Wounds | |
| 4526 v25 = pParty->pPickedItem.uEnchantmentType + 10; | |
| 4527 pParty->pPlayers[player_num-1].Heal(v25); | |
| 4528 v3->PlaySound(SPEECH_36, 0); | |
| 4529 break; | |
| 4530 case 223: //Magic Potion | |
| 4531 v26 = pParty->pPickedItem.uEnchantmentType + 10; | |
| 4532 new_mana_val = v3->sMana; | |
| 4533 new_mana_val += v26; | |
| 4534 if ( new_mana_val > v3->GetMaxMana() ) | |
| 4535 new_mana_val = v3->GetMaxMana(); | |
| 4536 v3->PlaySound(SPEECH_36, 0); | |
| 4537 break; | |
| 4538 case 224: //Cure Weakness | |
| 4539 v3->pConditions[Condition_Weak] = 0i64; | |
| 4540 v3->PlaySound(SPEECH_36, 0); | |
| 4541 break; | |
| 4542 case 225: //Cure Disease | |
| 4543 v3->pConditions[Condition_Disease3] = 0i64; | |
| 4544 v3->pConditions[Condition_Disease2] = 0i64; | |
| 4545 v3->pConditions[Condition_Disease1] = 0i64; | |
| 4546 v3->PlaySound(SPEECH_36, 0); | |
| 4547 break; | |
| 4548 case 226: //Cure Poison | |
| 4549 v3->pConditions[Condition_Poison3] = 0i64; | |
| 4550 v3->pConditions[Condition_Poison2] = 0i64; | |
| 4551 v3->pConditions[Condition_Poison1] = 0i64; | |
| 4552 v3->PlaySound(SPEECH_36, 0); | |
| 4553 break; | |
| 4554 case 227: //Awaken | |
| 4555 v3->pConditions[Condition_Sleep] = 0i64; | |
| 4556 v3->PlaySound(SPEECH_36, 0); | |
| 4557 break; | |
| 4558 case 228: //Haste | |
| 4559 if ( !v3->pConditions[Condition_Weak] ) | |
| 4560 { | |
| 4561 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 4562 v3->pPlayerBuffs[7].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 4563 v3->PlaySound(SPEECH_36, 0); | |
| 4564 } | |
| 4565 break; | |
| 4566 case 229: //Heroism | |
| 4567 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 4568 v3->pPlayerBuffs[8].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 4569 v3->PlaySound(SPEECH_36, 0); | |
| 4570 break; | |
| 4571 case 230: //Bless | |
| 4572 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 4573 v3->pPlayerBuffs[1].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 4574 v3->PlaySound(SPEECH_36, 0); | |
| 4575 break; | |
| 4576 case 231: //Preservation | |
| 1032 | 4577 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4578 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4579 v3->pPlayerBuffs[11].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4580 v3->PlaySound(SPEECH_36, 0); | |
| 4581 break; | |
| 4582 case 232: //Shield | |
| 1032 | 4583 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4584 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4585 v3->pPlayerBuffs[13].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4586 v3->PlaySound(SPEECH_36, 0); | |
| 4587 break; | |
| 4588 case 234: //Stoneskin | |
| 4589 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 4590 v3->pPlayerBuffs[14].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 4591 v3->PlaySound(SPEECH_36, 0); | |
| 4592 break; | |
| 4593 case 235: //Water Breathing | |
| 4594 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335), | |
| 4595 v3->pPlayerBuffs[23].Apply(pParty->uTimePlayed +v28, 3, 5, 0, 0); | |
| 4596 break; | |
| 4597 case 237: //Remove Fear | |
| 4598 v3->pConditions[Condition_Fear] = 0i64; | |
| 4599 v3->PlaySound(SPEECH_36, 0); | |
| 4600 break; | |
| 4601 case 238: //Remove Curse | |
| 4602 v3->pConditions[Condition_Cursed] = 0i64; | |
| 4603 v3->PlaySound(SPEECH_36, 0); | |
| 4604 break; | |
| 4605 case 239: //Cure Insanity | |
| 4606 v3->pConditions[Condition_Insane] = 0i64; | |
| 4607 v3->PlaySound(SPEECH_36, 0); | |
| 4608 break; | |
| 4609 case 240: //Might Boost | |
| 1032 | 4610 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4611 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4612 v3->pPlayerBuffs[19].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4613 v3->PlaySound(SPEECH_36, 0); | |
| 4614 break; | |
| 4615 case 241: //Intellect Boost | |
| 1032 | 4616 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4617 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4618 v3->pPlayerBuffs[17].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4619 v3->PlaySound(SPEECH_36, 0); | |
| 4620 break; | |
| 4621 case 242: //Personality Boost | |
| 1032 | 4622 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4623 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4624 v3->pPlayerBuffs[20].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4625 v3->PlaySound(SPEECH_36, 0); | |
| 4626 break; | |
| 4627 case 243://Endurance Boost | |
| 1032 | 4628 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4629 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4630 v3->pPlayerBuffs[16].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4631 v3->PlaySound(SPEECH_36, 0); | |
| 4632 break; | |
| 4633 case 244: //Speed Boost | |
| 1032 | 4634 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4635 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4636 v3->pPlayerBuffs[21].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4637 v3->PlaySound(SPEECH_36, 0); | |
| 4638 break; | |
| 4639 case 245: //Accuracy Boost | |
| 1032 | 4640 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4641 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4642 v3->pPlayerBuffs[15].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4643 v3->PlaySound(SPEECH_36, 0); | |
| 4644 break; | |
| 4645 case 251: //Cure Paralysis | |
| 4646 v3->pConditions[Condition_Paralyzed] = 0i64; | |
| 4647 v3->PlaySound(SPEECH_36, 0); | |
| 4648 break; | |
| 4649 case 252://Divine Restoration | |
| 4650 v30 = v3->pConditions[Condition_Dead]; | |
| 4651 v32 = v3->pConditions[Condition_Pertified]; | |
| 4652 v34 = v3->pConditions[Condition_Eradicated]; | |
| 4653 memset(&pParty->pPlayers[player_num-1].pConditions,0,sizeof(pConditions)); | |
| 4654 v3->pConditions[Condition_Dead] = v30; | |
| 4655 v3->pConditions[Condition_Pertified] = v32; | |
| 4656 v3->pConditions[Condition_Eradicated] = v34; | |
| 4657 v3->PlaySound(SPEECH_36, 0); | |
| 4658 break; | |
| 4659 case 253: //Divine Cure | |
| 4660 v25 = 5 * pParty->pPickedItem.uEnchantmentType; | |
| 4661 pParty->pPlayers[player_num-1].Heal(v25); | |
| 4662 v3->PlaySound(SPEECH_36, 0); | |
| 4663 break; | |
| 4664 case 254: //Divine Power | |
| 4665 v26 = 5 * pParty->pPickedItem.uEnchantmentType; | |
| 4666 new_mana_val = v3->sMana; | |
| 4667 new_mana_val += v26; | |
| 4668 if ( new_mana_val > v3->GetMaxMana() ) | |
| 4669 new_mana_val = v3->GetMaxMana(); | |
| 4670 v3->PlaySound(SPEECH_36, 0); | |
| 4671 break; | |
| 4672 case 255: //Luck Boost | |
| 1032 | 4673 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4674 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4675 v3->pPlayerBuffs[18].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4676 v3->PlaySound(SPEECH_36, 0); | |
| 4677 break; | |
| 4678 case 256: //Fire Resistance | |
| 1032 | 4679 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4680 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4681 v3->pPlayerBuffs[5].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4682 v3->PlaySound(SPEECH_36, 0); | |
| 1032 | 4683 break; |
| 1021 | 4684 case 257: //Air Resistance |
| 1032 | 4685 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4686 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4687 v3->pPlayerBuffs[0].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4688 v3->PlaySound(SPEECH_36, 0); | |
| 4689 break; | |
| 4690 case 258: //Water Resistance | |
| 1032 | 4691 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4692 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4693 v3->pPlayerBuffs[22].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4694 v3->PlaySound(SPEECH_36, 0); | |
| 4695 break; | |
| 4696 case 259: //Earth Resistance | |
| 1032 | 4697 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4698 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4699 v3->pPlayerBuffs[3].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4700 v3->PlaySound(SPEECH_36, 0); | |
| 4701 break; | |
| 4702 case 260: //Mind Resistance | |
| 1032 | 4703 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4704 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4705 v3->pPlayerBuffs[9].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4706 v3->PlaySound(SPEECH_36, 0); | |
| 4707 break; | |
| 4708 case 261: //Body Resistance | |
| 1032 | 4709 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 4710 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 4711 v3->pPlayerBuffs[2].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 4712 v3->PlaySound(SPEECH_36, 0); | |
| 4713 break; | |
| 4714 case 262: //Stone to Flesh | |
| 4715 v3->pConditions[Condition_Pertified] = 0i64; | |
| 4716 v3->PlaySound(SPEECH_36, 0); | |
| 4717 break; | |
| 4718 case 264: //Pure Luck | |
| 4719 if ( !v3->pure_luck_used ) | |
| 4720 { | |
| 4721 v3->uLuck += 50; | |
| 4722 v3->pure_luck_used = 1; | |
| 4723 } | |
| 4724 v3->PlaySound(SPEECH_36, 0); | |
| 4725 break; | |
| 4726 case 265: //Pure Speed | |
| 4727 if ( !v3->pure_speed_used ) | |
| 4728 { | |
| 4729 v3->uSpeed += 50; | |
| 4730 v3->pure_speed_used = 1; | |
| 4731 } | |
| 4732 v3->PlaySound(SPEECH_36, 0); | |
| 4733 break; | |
| 4734 case 266: //Pure Intellect | |
| 4735 if ( !v3->pure_intellect_used ) | |
| 4736 { | |
| 4737 v3->uIntelligence += 50; | |
| 4738 v3->pure_intellect_used = 1; | |
| 4739 } | |
| 4740 v3->PlaySound(SPEECH_36, 0); | |
| 4741 break; | |
| 4742 case 267: //Pure Endurance | |
| 4743 if ( !v3->pure_endurance_used ) | |
| 4744 { | |
| 4745 v3->uEndurance += 50; | |
| 4746 v3->pure_endurance_used = 1; | |
| 4747 } | |
| 4748 v3->PlaySound(SPEECH_36, 0); | |
| 4749 break; | |
| 4750 case 268: //Pure Personality | |
| 4751 if ( !v3->pure_willpower_used ) | |
| 4752 { | |
| 4753 v3->uWillpower += 50; | |
| 4754 v3->pure_willpower_used = 1; | |
| 4755 } | |
| 4756 v3->PlaySound(SPEECH_36, 0); | |
| 4757 break; | |
| 4758 case 269: //Pure Accuracy | |
| 4759 if ( !v3->pure_accuracy_used ) | |
| 4760 { | |
| 4761 v3->uAccuracy += 50; | |
| 4762 v3->pure_accuracy_used = 1; | |
| 4763 } | |
| 4764 v3->PlaySound(SPEECH_36, 0); | |
| 4765 break; | |
| 4766 case 270: //Pure Might | |
| 4767 if ( !v3->pure_might_used ) | |
| 4768 { | |
| 4769 v3->uMight += 50; | |
| 4770 v3->pure_might_used = 1; | |
| 4771 } | |
| 4772 v3->PlaySound(SPEECH_36, 0); | |
| 4773 break; | |
| 4774 case 271: //Rejuvenation | |
| 4775 v3->sAgeModifier = 0; | |
| 4776 v3->PlaySound(SPEECH_36, 0); | |
| 4777 break; | |
| 4778 | |
| 4779 default: | |
| 4780 v68 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4781 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[36], v68);//"%s can not be used that way" |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4782 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1021 | 4783 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 4784 return; | |
| 1032 | 4785 } |
| 4786 pAudioPlayer->PlaySound((SoundID)210, 0, 0, -1, 0, 0, 0, 0); | |
| 4787 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) | |
| 4788 { | |
| 4789 if ( !v73 ) | |
| 4790 { | |
| 4791 pMouse->RemoveHoldingItem(); | |
| 4792 return; | |
| 4793 } | |
| 4794 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 1021 | 4795 } |
| 1032 | 4796 if ( v73 ) |
| 4797 { | |
| 4798 if ( pParty->bTurnBasedModeOn ) | |
| 4799 { | |
| 4800 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; | |
| 4801 thisb->SetRecoveryTime(100); | |
| 1448 | 4802 pTurnEngine->ApplyPlayerAction(); |
| 1032 | 4803 } |
| 4804 else | |
| 4805 { | |
| 4806 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); | |
| 4807 } | |
| 4808 } | |
| 4809 pMouse->RemoveHoldingItem(); | |
| 4810 return; | |
| 4811 | |
| 1021 | 4812 } |
| 4813 | |
| 4814 | |
| 4815 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_SPELL_SCROLL ) | |
| 4816 { | |
| 4817 | |
| 4818 | |
| 4819 if ( pCurrentScreen == SCREEN_CASTING ) | |
| 4820 return; | |
| 4821 if ( !pParty->pPlayers[player_num-1].CanAct() ) | |
| 4822 { | |
| 4823 | |
| 4824 v68 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4825 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4826 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4827 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4828 return; |
| 4829 } | |
| 4830 if ( bUnderwater == 1 ) | |
| 4831 { | |
| 1032 | 4832 ShowStatusBarString(pGlobalTXT_LocalizationStrings[652], 2u);//"You can not do that while you are underwater!" |
| 4833 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); | |
| 1021 | 4834 return; |
| 4835 } | |
| 4836 dword_50C9AC = 1; | |
| 4837 scroll_id = pParty->pPickedItem.uItemID - 299; | |
| 4838 if ( scroll_id == 30 || scroll_id == 4 || scroll_id == 91 || scroll_id == 28 ) //Enchant Item scroll, Vampiric Weapon scroll ,Recharge Item ,Fire Aura | |
| 4839 { | |
| 4840 pMouse->RemoveHoldingItem(); | |
| 4841 pGUIWindow_CurrentMenu->Release(); | |
|
1405
c0b273d33338
RemoveTexturesPackFromTextureList and RemoveTexturesFromTextureList
Ritor1
parents:
1404
diff
changeset
|
4842 pIcons_LOD->RemoveTexturesPackFromTextureList(); |
| 1021 | 4843 pCurrentScreen = SCREEN_GAME; |
| 4844 viewparams->bRedrawGameUI = 1; | |
| 4845 _42777D_CastSpell_UseWand_ShootArrow(scroll_id, player_num - 1, 0x85u, 1, 0); | |
| 4846 } | |
| 4847 else | |
| 4848 { | |
| 4849 _720984_unused = pParty->pPickedItem.uItemID; | |
| 4850 pMouse->RemoveHoldingItem(); | |
| 4851 pMessageQueue_50C9E8->AddMessage(UIMSG_SpellScrollUse, scroll_id, player_num - 1); | |
| 4852 if ( pCurrentScreen && pGUIWindow_CurrentMenu | |
| 4853 && (pGUIWindow_CurrentMenu->eWindowType != WINDOW_null)) | |
| 4854 { | |
| 4855 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 4856 } | |
| 4857 } | |
| 4858 return; | |
| 4859 } | |
| 4860 | |
| 4861 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_BOOK ) | |
| 4862 | |
| 4863 { | |
| 4864 v15 = pParty->pPickedItem.uItemID - 400; | |
| 4865 v72 = v3->spellbook.bHaveSpell[pParty->pPickedItem.uItemID-400];//(char *)&v3->pConditions[0] + pParty->pPickedItem.uItemID + 2; | |
| 4866 if ( v72 ) | |
| 4867 { | |
| 4868 v66 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4869 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[380], v66);//"You already know the %s spell" |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4870 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4871 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4872 return; |
| 4873 } | |
| 4874 if ( !pParty->pPlayers[player_num-1].CanAct() ) | |
| 4875 { | |
| 4876 v66 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4877 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v66);//"That player is %s" |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4878 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4879 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4880 return; |
| 4881 } | |
| 4882 v16 = v15 % 11 + 1; | |
| 4883 v17 = v3->pActiveSkills[v15 / 11 + 12]; | |
| 4884 v18 = SkillToMastery(v17) - 1; | |
| 1032 | 4885 switch (v18) |
| 4886 { | |
| 4887 case 0: v67 = 4; break; | |
| 4888 case 1: v67 = 7; break; | |
| 4889 case 2: v67 = 10; break; | |
| 4890 case 3: v67 = 11; break; | |
| 4891 default: | |
| 4892 v67 = player_num; | |
| 4893 } | |
| 4894 | |
| 4895 if ( v16 > v67 || !v17 ) | |
| 1021 | 4896 { |
| 1032 | 4897 v22 = pParty->pPickedItem.GetDisplayName(); |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4898 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[381], v22); //"You don't have the skill to learn %s" |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4899 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4900 v3->PlaySound((PlayerSpeech)20, 0); |
| 4901 return; | |
| 4902 } | |
| 4903 // v72 = 1; | |
| 4904 v3->PlaySound(SPEECH_21, 0); | |
| 4905 v73 = 0; | |
| 4906 | |
| 4907 | |
| 4908 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) | |
| 4909 { | |
| 4910 if ( !v73 ) | |
| 1021 | 4911 { |
| 1032 | 4912 pMouse->RemoveHoldingItem(); |
| 4913 return; | |
| 4914 } | |
| 4915 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 4916 } | |
| 4917 if ( v73 ) | |
| 4918 { | |
| 4919 if ( pParty->bTurnBasedModeOn ) | |
| 4920 { | |
| 4921 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; | |
| 4922 thisb->SetRecoveryTime(100); | |
| 1448 | 4923 pTurnEngine->ApplyPlayerAction(); |
| 1021 | 4924 } |
| 4925 else | |
| 4926 { | |
| 1032 | 4927 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
| 1021 | 4928 } |
| 4929 } | |
| 1032 | 4930 pMouse->RemoveHoldingItem(); |
| 4931 return; | |
| 4932 | |
| 1021 | 4933 } |
| 4934 | |
| 4935 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_MESSAGE_SCROLL ) | |
| 4936 | |
| 4937 { | |
| 4938 if ( pParty->pPlayers[player_num-1].CanAct() ) | |
| 4939 { | |
| 4940 CreateMsgScrollWindow(pParty->pPickedItem.uItemID); | |
| 1032 | 4941 v3->PlaySound(SPEECH_37, 0); |
| 1021 | 4942 return; |
| 4943 } | |
| 4944 v68 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4945 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4946 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4947 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4948 return; |
| 4949 } | |
| 4950 else | |
| 1459 | 4951 { |
| 4952 if (pParty->pPickedItem.uItemID == 616) //Genie Lamp | |
| 4953 { | |
| 1021 | 4954 thisa = pParty->uCurrentMonthWeek + 1; |
| 4955 if ( pParty->uCurrentMonth >= 7 ) | |
| 1032 | 4956 v74 = NULL; |
| 1021 | 4957 else |
| 4958 v74 = aAttributeNames[pParty->uCurrentMonth]; | |
| 4959 switch ( pParty->uCurrentMonth ) | |
| 4960 { | |
| 1019 | 4961 case 0: |
| 1021 | 4962 v3->uMight += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4963 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 4964 break; |
| 1019 | 4965 case 1: |
| 1021 | 4966 v3->uIntelligence += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4967 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 4968 break; |
| 1019 | 4969 case 2: |
| 1021 | 4970 v3->uWillpower += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4971 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 4972 break; |
| 1019 | 4973 case 3: |
| 1021 | 4974 v3->uEndurance += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4975 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 4976 break; |
| 1019 | 4977 case 4: |
| 1021 | 4978 v3->uAccuracy += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4979 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 4980 break; |
| 1019 | 4981 case 5: |
| 1021 | 4982 v3->uSpeed += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4983 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 4984 break; |
| 1019 | 4985 case 6: |
| 1021 | 4986 v3->uLuck += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4987 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 4988 break; |
| 1019 | 4989 case 7: |
| 1021 | 4990 party_finds_gold(1000 * thisa, 0); |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4991 sprintf(pTmpBuf.data(), "+%u %s", 1000 * thisa, pGlobalTXT_LocalizationStrings[97]);//"Gold" |
| 1021 | 4992 break; |
| 1019 | 4993 case 8: |
| 1021 | 4994 Party::GiveFood(5 * thisa); |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4995 sprintf(pTmpBuf.data(), "+%u %s",5 * thisa , pGlobalTXT_LocalizationStrings[653]);//"Food" |
| 1021 | 4996 break; |
| 0 | 4997 case 9u: |
| 1021 | 4998 v3->uSkillPoints += 2 * thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4999 sprintf(pTmpBuf.data(), "+%u %s", 2 * thisa, pGlobalTXT_LocalizationStrings[LOCSTR_SKILL_POINTS]); |
| 1021 | 5000 break; |
| 1019 | 5001 case 10: |
| 1021 | 5002 v3->uExperience += 2500 * thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5003 sprintf(pTmpBuf.data(), "+%u %s", 2500 * thisa, pGlobalTXT_LocalizationStrings[LOCSTR_EXPIRIENCE]); |
| 1021 | 5004 break; |
| 1019 | 5005 case 11: |
| 1021 | 5006 v8 = rand() % 6; |
| 5007 switch (v8) | |
| 5008 { | |
| 5009 case 0: | |
| 5010 v3->sResFireBase += thisa; | |
| 5011 v13 = pGlobalTXT_LocalizationStrings[87]; | |
| 5012 break; | |
| 5013 case 1: | |
| 5014 v3->sResAirBase += thisa; | |
| 5015 v13 = pGlobalTXT_LocalizationStrings[6]; | |
| 5016 break; | |
| 5017 case 2: | |
| 5018 v3->sResWaterBase += thisa; | |
| 5019 v13 = pGlobalTXT_LocalizationStrings[240]; | |
| 5020 break; | |
| 5021 case 3: | |
| 5022 v3->sResEarthBase += thisa; | |
| 5023 v13 = pGlobalTXT_LocalizationStrings[70]; | |
| 5024 break; | |
| 5025 case 4: | |
| 5026 v3->sResMindBase += thisa; | |
| 5027 v13 = pGlobalTXT_LocalizationStrings[142]; | |
| 5028 break; | |
| 5029 case 5: | |
| 5030 v3->sResBodyBase += thisa; | |
| 5031 v13 = pGlobalTXT_LocalizationStrings[29]; | |
| 1019 | 5032 break; |
| 1021 | 5033 } |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5034 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v13, pGlobalTXT_LocalizationStrings[121]); |
| 1021 | 5035 break; |
| 5036 | |
| 5037 } | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5038 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1021 | 5039 pMouse->RemoveHoldingItem(); |
| 1459 | 5040 pGame->pStru6Instance->SetPlayerBuffAnim(SPELL_QUEST_COMPLETED, player_num - 1); |
| 1021 | 5041 v3->PlaySound(SPEECH_93, 0); |
| 1032 | 5042 pAudioPlayer->PlaySound((SoundID)219, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5043 if ( pParty->uDaysPlayed == 6 || pParty->uDaysPlayed == 20 ) |
| 0 | 5044 { |
| 1021 | 5045 v3->SetCondition(Condition_Eradicated, 0); |
| 5046 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); | |
| 0 | 5047 } |
| 1021 | 5048 else if ( pParty->uDaysPlayed == 12 || pParty->uDaysPlayed == 26 ) |
| 5049 { | |
| 5050 v3->SetCondition(Condition_Dead, 0); | |
| 5051 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); | |
| 5052 } | |
| 5053 else if ( pParty->uDaysPlayed == 4 || pParty->uDaysPlayed == 25 ) | |
| 5054 { | |
| 5055 v3->SetCondition(Condition_Pertified, 0); | |
| 5056 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); | |
| 5057 } | |
| 1019 | 5058 return; |
| 1021 | 5059 } |
| 5060 else if ( pParty->pPickedItem.uItemID == 630 ) //Red Apple | |
| 1459 | 5061 { |
| 1021 | 5062 Party::GiveFood(1u); |
| 1459 | 5063 pAudioPlayer->PlaySound(SOUND_EatApple, 0, 0, -1, 0, 0, 0, 0); |
| 5064 } | |
| 1021 | 5065 else if ( pParty->pPickedItem.uItemID == 632 ) //Lute |
| 5066 { | |
| 1459 | 5067 pAudioPlayer->PlaySound(SOUND_PlayLute, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5068 return; |
| 5069 } | |
| 5070 else if ( pParty->pPickedItem.uItemID == 633 ) //Faerie Pipes | |
| 5071 { | |
| 1459 | 5072 pAudioPlayer->PlaySound(SOUND_PlayFaeriePipes, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5073 return; |
| 5074 } | |
| 5075 else if ( pParty->pPickedItem.uItemID == 634 ) //Gryphonheart's Trumpet | |
| 5076 { | |
| 1459 | 5077 pAudioPlayer->PlaySound(SOUND_PlayGryphonheartsTrumpet, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5078 return; |
| 5079 } | |
| 1032 | 5080 else if ( pParty->pPickedItem.uItemID == 646 ) //Horseshoe |
| 1459 | 5081 { |
| 5082 pGame->pStru6Instance->SetPlayerBuffAnim(SPELL_QUEST_COMPLETED, player_num - 1); | |
| 5083 v5 = PID(OBJECT_Player, player_num + 49); | |
| 1021 | 5084 pAudioPlayer->PlaySound(SOUND_20001, v5, 0, -1, 0, 0, 0, 0); |
| 5085 v3->AddVariable(VAR_NumSkillPoints, 2); | |
| 5086 } | |
| 5087 else if ( pParty->pPickedItem.uItemID == 650 ) //Temple in a Bottle | |
| 5088 { | |
| 1459 | 5089 TeleportToNWCDungeon(); |
| 1021 | 5090 return; |
| 5091 } | |
| 0 | 5092 else |
| 1021 | 5093 { |
| 5094 | |
| 5095 v68 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5096 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[36],v68);//"%s can not be used that way" |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5097 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5098 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5099 return; |
| 5100 } | |
| 1032 | 5101 |
| 0 | 5102 pMouse->RemoveHoldingItem(); |
| 5103 return; | |
| 5104 } | |
| 1021 | 5105 |
| 5106 } | |
| 0 | 5107 |
| 5108 //----- (00449BB4) -------------------------------------------------------- | |
| 484 | 5109 bool Player::CompareVariable( enum VariableType VarNum, signed int pValue ) |
| 1033 | 5110 { |
| 0 | 5111 Player *v3; // esi@1 |
| 5112 signed int v4; // edi@1 | |
| 5113 unsigned int v5; // eax@8 | |
| 5114 int v6; // eax@9 | |
| 5115 enum CHARACTER_RACE v7; // eax@11 | |
| 5116 signed int v8; // eax@17 | |
| 5117 unsigned __int8 v9; // sf@17 | |
| 5118 unsigned __int8 v10; // of@17 | |
| 5119 int v11; // eax@19 | |
| 5120 unsigned int v12; // eax@20 | |
| 484 | 5121 unsigned int test_bit_value; // eax@25 |
| 5122 unsigned __int8 our_bit_value; // cl@25 | |
| 0 | 5123 signed int v15; // ecx@28 |
| 5124 ItemGen *v16; // eax@28 | |
| 5125 char v17; // zf@31 | |
| 5126 int v18; // edi@90 | |
| 5127 DDM_DLV_Header *v19; // eax@122 | |
| 5128 char v20; // cl@124 | |
| 5129 DDM_DLV_Header *v21; // eax@126 | |
| 5130 unsigned int v22; // edi@129 | |
| 100 | 5131 Player *v23; // esi@134 |
| 0 | 5132 ItemGen *v24; // ecx@135 |
| 5133 signed int v25; // edx@135 | |
| 5134 ITEM_EQUIP_TYPE v26; // ebx@155 | |
| 5135 char *v27; // edi@155 | |
| 5136 int v28; // ebx@161 | |
| 5137 int v29; // eax@161 | |
| 5138 | |
| 469 | 5139 v6 = 0; |
| 0 | 5140 v3 = this; |
| 5141 v4 = -1; | |
| 469 | 5142 if ( VarNum > VAR_AutoNotes ) |
| 5143 { | |
| 5144 switch ( VarNum ) | |
| 0 | 5145 { |
| 5146 case VAR_Invisible: | |
| 1167 | 5147 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime >0 ) |
| 469 | 5148 return true; |
| 484 | 5149 return false; |
| 0 | 5150 case VAR_NumDeaths: |
| 5151 v4 = pParty->uNumDeaths; | |
| 469 | 5152 return v4 >= pValue; |
| 0 | 5153 case VAR_NumBounties: |
| 5154 v4 = pParty->uNumBountiesCollected; | |
| 469 | 5155 return v4 >= pValue; |
| 0 | 5156 case VAR_PrisonTerms: |
| 5157 v4 = pParty->uNumPrisonTerms; | |
| 469 | 5158 return v4 >= pValue; |
| 0 | 5159 case VAR_ArenaWinsPage: |
| 5160 v4 = (unsigned __int8)pParty->uNumArenaPageWins; | |
| 469 | 5161 return v4 >= pValue; |
| 0 | 5162 case VAR_ArenaWinsSquire: |
| 5163 v4 = (unsigned __int8)pParty->uNumArenaSquireWins; | |
| 469 | 5164 return v4 >= pValue; |
| 0 | 5165 case VAR_ArenaWinsKnight: |
| 5166 v4 = (unsigned __int8)pParty->uNumArenaKnightWins; | |
| 469 | 5167 return v4 >= pValue; |
| 0 | 5168 case VAR_ArenaWinsLord: |
| 5169 v4 = (unsigned __int8)pParty->uNumArenaLordWins; | |
| 469 | 5170 return v4 >= pValue; |
| 0 | 5171 case VAR_ReputationInCurrentLocation: |
| 5172 v19 = &pOutdoor->ddm; | |
| 5173 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5174 v19 = &pIndoor->dlv; | |
| 469 | 5175 v6 = v19->uReputation >= pValue; |
| 5176 return v6; | |
| 0 | 5177 case VAR_History_28|VAR_Sex: |
| 5178 v21 = &pOutdoor->ddm; | |
| 5179 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5180 v21 = &pIndoor->dlv; | |
| 469 | 5181 v6 = v21->field_C_alert == pValue; |
| 0 | 5182 return v6; |
| 5183 case VAR_MonthEquals2|VAR_Sex: | |
| 5184 case VAR_MonthEquals2|VAR_Class: | |
| 5185 case VAR_Counter1: | |
| 5186 case VAR_Counter2: | |
| 5187 case VAR_Counter3: | |
| 5188 case VAR_Counter4: | |
| 5189 case VAR_Counter5: | |
| 5190 case VAR_Counter6: | |
| 5191 case VAR_Counter7: | |
| 5192 case VAR_Counter8: | |
| 469 | 5193 v22 = *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44304]; |
| 5194 if ( v22 | *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44300] | |
| 5195 && (signed __int64)(__PAIR__(v22, *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44300]) | |
| 5196 + (signed __int64)((double)(460800 * pValue) * 0.033333335)) <= (signed __int64)pParty->uTimePlayed ) | |
| 5197 return true; | |
| 5198 return false; | |
| 0 | 5199 case VAR_NumSkillPoints: |
| 5200 v4 = this->uSkillPoints; | |
| 469 | 5201 return v4 >= pValue; |
| 0 | 5202 case VAR_CircusPrises: |
| 5203 v4 = 0; | |
| 100 | 5204 v23 = pParty->pPlayers;//[0].pInventoryItems; |
| 0 | 5205 do |
| 5206 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
5207 v24 = v23->pInventoryItemList; |
| 0 | 5208 v25 = 138; |
| 5209 do | |
| 5210 { | |
| 5211 switch ( v24->uItemID ) | |
| 5212 { | |
| 5213 case 0x1D6u: | |
| 5214 ++v4; | |
| 5215 break; | |
| 5216 case 0x1D7u: | |
| 5217 v4 += 3; | |
| 5218 break; | |
| 5219 case 0x1DDu: | |
| 5220 v4 += 5; | |
| 5221 break; | |
| 5222 } | |
| 5223 ++v24; | |
| 5224 --v25; | |
| 5225 } | |
| 5226 while ( v25 ); | |
| 100 | 5227 ++v23; |
| 0 | 5228 } |
| 100 | 5229 while ( v23 <= &pParty->pPlayers[3] ); |
| 469 | 5230 return v4 >= pValue; |
| 0 | 5231 case VAR_MonthEquals2: |
| 469 | 5232 v6 = pParty->uCurrentMonth == pValue; |
| 5233 return v6; | |
| 0 | 5234 case VAR_IsFlying: |
| 5235 if ( pParty->bFlying | |
| 1167 | 5236 && (pParty->pPartyBuffs[PARTY_BUFF_FLY].uExpireTime> 0) ) |
| 469 | 5237 return true; |
| 5238 return false; | |
| 0 | 5239 case VAR_HiredNPCHasSpeciality: |
| 469 | 5240 LOBYTE(v6) = CheckHiredNPCSpeciality(pValue); |
| 0 | 5241 return v6; |
| 5242 case VAR_NPCs2: | |
| 469 | 5243 return pNPCStats->pNewNPCData[pValue].Hired(); |
| 0 | 5244 case VAR_MonthEquals|VAR_CurrentSP: |
| 1033 | 5245 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; |
| 5246 our_bit_value = this->field_1A50[((signed __int16)pValue - 1)/8]; | |
| 484 | 5247 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 469 | 5248 return v4 >= pValue; |
| 5249 v4 = pValue; | |
| 5250 return v4 >= pValue; | |
| 0 | 5251 case VAR_ItemEquipped: |
| 5252 v26 = (ITEM_EQUIP_TYPE)0; | |
| 5253 v27 = (char *)&this->pEquipment; | |
| 5254 break; | |
| 5255 case VAR_GoldInBank: | |
| 5256 v4 = pParty->uNumGoldInBank; | |
| 469 | 5257 return v4 >= pValue; |
| 0 | 5258 case VAR_ThieverySkill|0x80: |
| 5259 v28 = GetActualMight(); | |
| 5260 v29 = v3->GetBaseStrength(); | |
| 5261 goto LABEL_168; | |
| 5262 case VAR_DisarmTrapSkill|0x80: | |
| 5263 v28 = GetActualIntelligence(); | |
| 5264 v29 = v3->GetBaseIntelligence(); | |
| 5265 goto LABEL_168; | |
| 5266 case VAR_MonthEquals: | |
| 5267 v28 = GetActualWillpower(); | |
| 5268 v29 = v3->GetBaseWillpower(); | |
| 5269 goto LABEL_168; | |
| 5270 case VAR_MonthEquals|VAR_Sex: | |
| 5271 v28 = GetActualEndurance(); | |
| 5272 v29 = v3->GetBaseEndurance(); | |
| 5273 goto LABEL_168; | |
| 5274 case VAR_IdentifyMonsterSkill|0x80: | |
| 5275 v28 = GetActualSpeed(); | |
| 5276 v29 = v3->GetBaseSpeed(); | |
| 5277 goto LABEL_168; | |
| 5278 case VAR_ArmsmasterSkill|0x80: | |
| 5279 v28 = GetActualAccuracy(); | |
| 5280 v29 = v3->GetBaseAccuracy(); | |
| 5281 goto LABEL_168; | |
| 5282 case VAR_MonthEquals|VAR_MaxHP: | |
| 5283 v28 = GetActualLuck(); | |
| 5284 v29 = v3->GetBaseLuck(); | |
| 5285 LABEL_168: | |
| 5286 v10 = __OFSUB__(v28, v29); | |
| 5287 v9 = v28 - v29 < 0; | |
| 5288 LABEL_169: | |
| 5289 if ( v9 ^ v10 ) | |
| 469 | 5290 return v4 >= pValue; |
| 5291 return true; | |
| 0 | 5292 default: |
| 469 | 5293 return v4 >= pValue; |
| 0 | 5294 } |
| 5295 while ( !v3->HasItemEquipped(v26) | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
5296 || *(int *)&v3->pInventoryItemList[*(int *)v27-1] != pValue ) |
| 0 | 5297 { |
| 5298 v26 = (ITEM_EQUIP_TYPE)((int)v26 + 1); | |
| 5299 v27 += 4; | |
| 5300 if ( (signed int)v26 >= 16 ) | |
| 469 | 5301 return false; |
| 5302 } | |
| 5303 return true; | |
| 5304 } | |
| 5305 if ( VarNum == VAR_AutoNotes ) | |
| 0 | 5306 { |
| 1033 | 5307 test_bit_value = 0x80u >> ((signed __int16)(pValue - 1) - 1) % 8; |
| 5308 our_bit_value = pParty->_autonote_bits[((signed __int16)(pValue - 1) - 1) /8]; | |
| 484 | 5309 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 5310 return false; | |
| 5311 return true; | |
| 469 | 5312 } |
| 5313 if ( VarNum <= VAR_BaseLuck ) | |
| 5314 { | |
| 5315 if ( VarNum != VAR_BaseLuck ) | |
| 5316 { | |
| 5317 switch ( VarNum ) | |
| 0 | 5318 { |
| 5319 case VAR_Hour: | |
| 469 | 5320 if ( (signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60 % 24 == pValue ) |
| 5321 return true; | |
| 5322 return false; | |
| 0 | 5323 case VAR_DayOfYear: |
| 469 | 5324 v5 = (unsigned int)((signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60) / 0x18 % 0x150 + 1; |
| 5325 v6 = v5 == pValue; | |
| 5326 return v6; | |
| 0 | 5327 case VAR_DayOfWeek: |
| 469 | 5328 v5 = (unsigned int)((signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60) / 0x18 % 7; |
| 5329 v6 = v5 == pValue; | |
| 0 | 5330 return v6; |
| 5331 case VAR_Sex: | |
| 469 | 5332 if ( pValue == (CHARACTER_RACE)this->uSex ) |
| 5333 return true; | |
| 5334 return v4 >= pValue; | |
| 0 | 5335 case VAR_Class: |
| 135 | 5336 v7 = (CHARACTER_RACE)this->classType; |
| 469 | 5337 if ( pValue == v7 ) |
| 5338 return true; | |
| 5339 return v4 >= pValue; | |
| 0 | 5340 case VAR_Race: |
| 5341 v7 = GetRace(); | |
| 469 | 5342 if ( pValue == v7 ) |
| 5343 return true; | |
| 5344 return v4 >= pValue; | |
| 0 | 5345 case VAR_CurrentHP: |
| 5346 v4 = this->sHealth; | |
| 469 | 5347 return v4 >= pValue; |
| 0 | 5348 case VAR_MaxHP: |
| 5349 v8 = GetMaxHealth(); | |
| 5350 v10 = __OFSUB__(v3->sHealth, v8); | |
| 5351 v9 = v3->sHealth - v8 < 0; | |
| 5352 goto LABEL_169; | |
| 5353 case VAR_CurrentSP: | |
| 5354 v4 = this->sMana; | |
| 469 | 5355 return v4 >= pValue; |
| 0 | 5356 case VAR_MaxSP: |
| 5357 v11 = GetMaxMana(); | |
| 5358 v10 = __OFSUB__(v3->sMana, v11); | |
| 5359 v9 = v3->sMana - v11 < 0; | |
| 5360 goto LABEL_169; | |
| 5361 case VAR_ActualAC: | |
| 5362 v12 = GetActualAC(); | |
| 5363 goto _j_cmp_against_arg; | |
| 5364 case VAR_ACModifier: | |
| 5365 v4 = this->sACModifier; | |
| 469 | 5366 return v4 >= pValue; |
| 0 | 5367 case VAR_BaseLevel: |
| 5368 v4 = this->uLevel; | |
| 469 | 5369 return v4 >= pValue; |
| 0 | 5370 case VAR_LevelModifier: |
| 5371 v4 = this->sLevelModifier; | |
| 469 | 5372 return v4 >= pValue; |
| 0 | 5373 case VAR_Age: |
| 5374 v12 = GetActualAge(); | |
| 5375 goto _j_cmp_against_arg; | |
| 5376 case VAR_Award: | |
| 1033 | 5377 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
5378 our_bit_value = this->_achieved_awards_bits[((signed __int16)pValue - 1) /8]; |
| 484 | 5379 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 5380 return true; | |
| 5381 return false; | |
| 0 | 5382 case VAR_Experience: |
| 5383 v4 = LODWORD(this->uExperience); | |
| 469 | 5384 return v4 >= pValue; |
| 0 | 5385 case VAR_QBits_QuestsDone: |
| 484 | 5386 test_bit_value = 0x80u >> (pValue - 1) % 8; |
| 5387 our_bit_value = pParty->_quest_bits[(pValue - 1)/8]; | |
| 5388 if ( test_bit_value & our_bit_value ) | |
| 478 | 5389 return true; |
| 5390 return false; | |
| 0 | 5391 case VAR_PlayerItemInHands: |
| 5392 v15 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
5393 v16 = v3->pInventoryItemList; |
| 0 | 5394 break; |
| 5395 case VAR_FixedGold: | |
| 5396 v4 = pParty->uNumGold; | |
| 469 | 5397 return v4 >= pValue; |
| 0 | 5398 case VAR_MightBonus: |
| 5399 v4 = this->uMightBonus; | |
| 469 | 5400 return v4 >= pValue; |
| 0 | 5401 case VAR_IntellectBonus: |
| 5402 v4 = this->uIntelligenceBonus; | |
| 469 | 5403 return v4 >= pValue; |
| 0 | 5404 case VAR_PersonalityBonus: |
| 5405 v4 = this->uWillpowerBonus; | |
| 469 | 5406 return v4 >= pValue; |
| 0 | 5407 case VAR_EnduranceBonus: |
| 5408 v4 = this->uEnduranceBonus; | |
| 469 | 5409 return v4 >= pValue; |
| 0 | 5410 case VAR_SpeedBonus: |
| 5411 v4 = this->uSpeedBonus; | |
| 469 | 5412 return v4 >= pValue; |
| 0 | 5413 case VAR_AccuracyBonus: |
| 5414 v4 = this->uAccuracyBonus; | |
| 469 | 5415 return v4 >= pValue; |
| 0 | 5416 case VAR_LuckBonus: |
| 5417 v4 = this->uLuckBonus; | |
| 469 | 5418 return v4 >= pValue; |
| 0 | 5419 case VAR_BaseMight: |
| 5420 v4 = this->uMight; | |
| 469 | 5421 return v4 >= pValue; |
| 0 | 5422 case VAR_BaseIntellect: |
| 5423 v4 = this->uIntelligence; | |
| 469 | 5424 return v4 >= pValue; |
| 0 | 5425 case VAR_BasePersonality: |
| 5426 v4 = this->uWillpower; | |
| 469 | 5427 return v4 >= pValue; |
| 0 | 5428 case VAR_BaseEndurance: |
| 5429 v4 = this->uEndurance; | |
| 469 | 5430 return v4 >= pValue; |
| 0 | 5431 case VAR_BaseSpeed: |
| 5432 v4 = this->uSpeed; | |
| 469 | 5433 return v4 >= pValue; |
| 0 | 5434 case VAR_BaseAccuracy: |
| 5435 v4 = this->uAccuracy; | |
| 469 | 5436 return v4 >= pValue; |
| 0 | 5437 case VAR_FixedFood: |
| 5438 v4 = pParty->uNumFoodRations; | |
| 469 | 5439 return v4 >= pValue; |
| 0 | 5440 default: |
| 469 | 5441 return v4 >= pValue; |
| 5442 } | |
| 5443 while ( v16->uItemID != pValue ) | |
| 0 | 5444 { |
| 5445 ++v15; | |
| 5446 ++v16; | |
| 5447 if ( v15 >= 138 ) | |
| 5448 { | |
| 469 | 5449 v6 = pParty->pPickedItem.uItemID == pValue; |
| 0 | 5450 return v6; |
| 5451 } | |
| 5452 } | |
| 469 | 5453 return true; |
| 0 | 5454 } |
| 5455 v4 = this->uLuck; | |
| 469 | 5456 return v4 >= pValue; |
| 5457 } | |
| 5458 if ( VarNum <= VAR_MagicResistance ) | |
| 5459 { | |
| 5460 if ( VarNum == VAR_MagicResistance ) | |
| 0 | 5461 { |
| 5462 v4 = this->sResMagicBase; | |
| 5463 } | |
| 5464 else | |
| 5465 { | |
| 469 | 5466 switch ( VarNum ) |
| 0 | 5467 { |
| 5468 case VAR_FireResistance: | |
| 5469 v4 = this->sResFireBase; | |
| 469 | 5470 return v4 >= pValue; |
| 0 | 5471 case VAR_AirResistance: |
| 5472 v4 = this->sResAirBase; | |
| 469 | 5473 return v4 >= pValue; |
| 0 | 5474 case VAR_WaterResistance: |
| 5475 v4 = this->sResWaterBase; | |
| 469 | 5476 return v4 >= pValue; |
| 0 | 5477 case VAR_EarthResistance: |
| 5478 v4 = this->sResEarthBase; | |
| 469 | 5479 return v4 >= pValue; |
| 0 | 5480 case VAR_SpiritResistance: |
| 5481 v4 = this->sResSpiritBase; | |
| 469 | 5482 return v4 >= pValue; |
| 0 | 5483 case VAR_MindResistance: |
| 5484 v4 = this->sResMindBase; | |
| 469 | 5485 return v4 >= pValue; |
| 0 | 5486 case VAR_BodyResistance: |
| 5487 v4 = this->sResBodyBase; | |
| 469 | 5488 return v4 >= pValue; |
| 0 | 5489 case VAR_LightResistance: |
| 5490 v4 = this->sResLightBase; | |
| 469 | 5491 return v4 >= pValue; |
| 0 | 5492 case VAR_DarkResistance: |
| 5493 v4 = this->sResDarkBase; | |
| 469 | 5494 return v4 >= pValue; |
| 0 | 5495 case VAR_ActualMight: |
| 5496 v12 = GetActualMight(); | |
| 5497 goto _j_cmp_against_arg; | |
| 5498 case VAR_ActualIntellect: | |
| 5499 v12 = GetActualIntelligence(); | |
| 5500 goto _j_cmp_against_arg; | |
| 5501 case VAR_ActualPersonality: | |
| 5502 v12 = GetActualWillpower(); | |
| 5503 goto _j_cmp_against_arg; | |
| 5504 case VAR_ActualEndurance: | |
| 5505 v12 = GetActualEndurance(); | |
| 5506 goto _j_cmp_against_arg; | |
| 5507 case VAR_ActualSpeed: | |
| 5508 v12 = GetActualSpeed(); | |
| 5509 goto _j_cmp_against_arg; | |
| 5510 case VAR_ActualAccuracy: | |
| 5511 v12 = GetActualAccuracy(); | |
| 5512 goto _j_cmp_against_arg; | |
| 5513 case VAR_ActualLuck: | |
| 5514 v12 = GetActualLuck(); | |
| 5515 _j_cmp_against_arg: | |
| 5516 v4 = v12; | |
| 5517 break; | |
| 5518 default: | |
| 469 | 5519 return v4 >= pValue; |
| 5520 } | |
| 5521 } | |
| 5522 return v4 >= pValue; | |
| 5523 } | |
| 5524 if ( VarNum <= VAR_DisarmTrapSkill ) | |
| 5525 { | |
| 5526 if ( VarNum != VAR_DisarmTrapSkill ) | |
| 5527 { | |
| 5528 if ( VarNum <= VAR_MindResistanceBonus ) | |
| 5529 { | |
| 5530 switch ( VarNum ) | |
| 0 | 5531 { |
| 5532 case VAR_MindResistanceBonus: | |
| 5533 v4 = this->sResMindBonus; | |
| 5534 break; | |
| 5535 case VAR_FireResistanceBonus: | |
| 5536 v4 = this->sResFireBonus; | |
| 5537 break; | |
| 5538 case VAR_AirResistanceBonus: | |
| 5539 v4 = this->sResAirBonus; | |
| 5540 break; | |
| 5541 case VAR_WaterResistanceBonus: | |
| 5542 v4 = this->sResWaterBonus; | |
| 5543 break; | |
| 5544 case VAR_EarthResistanceBonus: | |
| 5545 v4 = this->sResEarthBonus; | |
| 5546 break; | |
| 5547 case VAR_SpiritResistanceBonus: | |
| 5548 v4 = this->sResSpiritBonus; | |
| 5549 break; | |
| 5550 } | |
| 469 | 5551 return v4 >= pValue; |
| 5552 } | |
| 5553 if ( VarNum == VAR_BodyResistanceBonus ) | |
| 0 | 5554 { |
| 5555 v4 = this->sResBodyBonus; | |
| 469 | 5556 return v4 >= pValue; |
| 5557 } | |
| 5558 if ( VarNum == VAR_LightResistanceBonus ) | |
| 0 | 5559 { |
| 5560 v4 = this->sResLightBonus; | |
| 469 | 5561 return v4 >= pValue; |
| 5562 } | |
| 5563 if ( VarNum == VAR_DarkResistanceBonus ) | |
| 0 | 5564 { |
| 5565 v4 = this->sResDarkBonus; | |
| 469 | 5566 return v4 >= pValue; |
| 5567 } | |
| 5568 if ( VarNum == VAR_MagicResistanceBonus ) | |
| 0 | 5569 { |
| 5570 v4 = this->sResMagicBonus; | |
| 469 | 5571 return v4 >= pValue; |
| 5572 } | |
| 5573 if ( VarNum <= VAR_MagicResistanceBonus || VarNum > VAR_DiplomacySkill ) | |
| 5574 return v4 >= pValue; | |
| 0 | 5575 } |
| 5576 LABEL_90: | |
| 469 | 5577 v18 = *((short *)&this->pConditions[16] + VarNum); |
| 5578 if ( pValue <= 63 ) | |
| 0 | 5579 v4 = v18 & 0x3F; |
| 5580 else | |
| 469 | 5581 v4 = pValue & v18; |
| 5582 return v4 >= pValue; | |
| 5583 } | |
| 5584 if ( VarNum == 104 ) | |
| 0 | 5585 goto LABEL_90; |
| 469 | 5586 if ( (signed int)VarNum <= 104 ) |
| 5587 return v4 >= pValue; | |
| 5588 if ( (signed int)VarNum > 0x79 ) | |
| 5589 { | |
| 5590 if ( VarNum != 122 ) | |
| 5591 { | |
| 5592 if ( (signed int)VarNum > 122 && VarNum <= VAR_ActiveSpells ) | |
| 5593 v4 = (unsigned __int8)byte_5E4C15[VarNum]; | |
| 5594 return v4 >= pValue; | |
| 0 | 5595 } |
| 5596 v4 = GetMajorConditionIdx(); | |
| 5597 if ( v4 != 18 ) | |
| 5598 { | |
| 469 | 5599 return v4 >= pValue; |
| 5600 } | |
| 5601 v4 = pValue; | |
| 5602 return v4 >= pValue; | |
| 5603 } | |
| 1072 | 5604 return &LODWORD(this->pConditions[VarNum]);// *((int *)this + 2 * VarNum - 210); |
| 0 | 5605 } |
| 5606 | |
| 5607 | |
| 5608 //----- (0044A5CB) -------------------------------------------------------- | |
| 492 | 5609 void Player::SetVariable(enum VariableType var_type, signed int var_value) |
| 5610 { | |
| 5611 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
|
5612 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
|
5613 unsigned int v5_unused; // edi@1 |
| 0 | 5614 unsigned int v6; // esi@13 |
| 5615 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
|
5616 signed int v8_unused; // eax@17 |
| 0 | 5617 ItemGen *v9; // ecx@17 |
| 5618 int v10; // eax@21 | |
| 5619 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
|
5620 Player *unused12; // ecx@44 |
| 0 | 5621 char *v13; // ecx@45 |
| 5622 Player *v14; // ecx@49 | |
| 5623 int v15; // ecx@86 | |
| 5624 int v16; // esi@106 | |
| 5625 char v17; // al@106 | |
| 5626 int v18; // eax@107 | |
| 5627 Player *v19; // ecx@112 | |
| 5628 Player *v20; // ecx@127 | |
| 5629 int v21; // eax@127 | |
| 5630 int v22; // eax@145 | |
| 5631 char v23; // zf@146 | |
| 5632 DDM_DLV_Header *v24; // ecx@148 | |
| 5633 signed int v25; // eax@172 | |
| 5634 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
|
5635 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
|
5636 int v28_unused; // [sp-4h] [bp-38h]@84 |
| 0 | 5637 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
|
5638 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
|
5639 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
|
5640 |
|
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
|
5641 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
|
5642 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
|
5643 { |
|
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
|
5644 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
|
5645 { |
|
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
|
5646 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
|
5647 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
|
5648 } |
|
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
|
5649 } |
| 1545 | 5650 |
| 5651 Assert(currPlayerId != -1); | |
| 492 | 5652 if ( var_type > VAR_AutoNotes ) |
| 5653 { | |
| 5654 if ( var_type <= VAR_GoldInBank ) | |
| 5655 { | |
| 5656 if ( var_type == VAR_GoldInBank ) | |
| 5657 { | |
| 5658 pParty->uNumGoldInBank = var_value; | |
| 0 | 5659 return; |
| 5660 } | |
| 492 | 5661 if ( var_type <= VAR_Counter8 ) |
| 5662 { | |
| 5663 if ( (signed int)var_type >= 0xF5 ) | |
| 0 | 5664 { |
| 492 | 5665 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44300] = LODWORD(pParty->uTimePlayed); |
| 5666 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44304] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 5667 } |
| 5668 else | |
| 5669 { | |
| 492 | 5670 switch ( var_type ) |
| 0 | 5671 { |
| 5672 case VAR_MonthEquals|VAR_CurrentSP: | |
| 492 | 5673 _449B7E_toggle_bit((unsigned char *)field_1A50, var_value, 1u); |
| 0 | 5674 break; |
| 5675 case VAR_NPCs2: | |
| 5676 pParty->field_709 = 0; | |
| 492 | 5677 LOBYTE(pNPCStats->pNewNPCData[var_value].uFlags) |= 0x80u; |
| 1035 | 5678 pParty->CountHirelings(); |
| 5679 viewparams->bRedrawGameUI = true; | |
| 0 | 5680 break; |
| 5681 case VAR_NumSkillPoints: | |
| 492 | 5682 this->uSkillPoints = var_value; |
| 0 | 5683 break; |
| 5684 } | |
| 5685 } | |
| 5686 return; | |
| 5687 } | |
| 492 | 5688 if ( var_type < VAR_Counter9 ) |
| 0 | 5689 return; |
| 492 | 5690 if ( (signed int)var_type <= 0x112 ) |
| 5691 { | |
| 5692 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44532] = LODWORD(pParty->uTimePlayed); | |
| 5693 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44536] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 5694 } |
| 5695 else | |
| 5696 { | |
| 492 | 5697 if ( var_type == VAR_ReputationInCurrentLocation ) |
| 0 | 5698 { |
| 5699 v24 = &pOutdoor->ddm; | |
| 5700 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5701 v24 = &pIndoor->dlv; | |
| 492 | 5702 v24->uReputation = var_value; |
| 5703 if ( var_value > 10000 ) | |
| 0 | 5704 v24->uReputation = 10000; |
| 5705 return; | |
| 5706 } | |
| 492 | 5707 if ( var_type <= VAR_ReputationInCurrentLocation |
| 5708 || var_type > VAR_History_28 | |
| 5709 || (v22 = var_type - 276, pParty->field_3C.field_4F0[2 * v22 + 1] | pParty->field_3C.field_4F0[2 * v22]) | |
| 5710 || (pParty->field_3C.field_4F0[2 * (var_type - 276)] = LODWORD(pParty->uTimePlayed), | |
| 1455 | 5711 v23 = pStorylineText->StoreLine[v22].pText == 0,//*(&pStorylineText->field_0 + 3 * v22) == 0, |
| 492 | 5712 pParty->field_3C.field_4F0[2 * (var_type - 276) + 1] = HIDWORD(pParty->uTimePlayed), |
| 0 | 5713 v23) ) |
| 5714 return; | |
| 5715 bFlashHistoryBook = 1; | |
| 5716 } | |
| 492 | 5717 v25 = 8 * currPlayerId + 400; |
| 862 | 5718 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
|
5719 pAudioPlayer->PlaySound(SOUND_20001, v25, 0, -1, 0, 0, 0, 0); |
| 0 | 5720 return; |
| 5721 } | |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5722 switch ( var_type ) |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5723 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5724 case VAR_NumDeaths: |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5725 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
|
5726 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5727 case VAR_NumBounties: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5728 pParty->uNumBountiesCollected = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5729 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5730 case VAR_PrisonTerms: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5731 pParty->uNumPrisonTerms = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5732 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5733 case VAR_ArenaWinsPage: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5734 pParty->uNumArenaPageWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5735 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5736 case VAR_ArenaWinsSquire: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5737 pParty->uNumArenaSquireWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5738 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5739 case VAR_ArenaWinsKnight: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5740 pParty->uNumArenaKnightWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5741 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5742 case VAR_ArenaWinsLord: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5743 pParty->uNumArenaLordWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5744 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5745 } |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5746 return; |
| 0 | 5747 } |
| 492 | 5748 if ( var_type == VAR_AutoNotes ) |
| 5749 { | |
| 5750 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
|
5751 //&& (&dword_723718_autonote_related)[8 * a3] ) |
| 1310 | 5752 && pAutonoteTxt[var_value].pText ) |
| 492 | 5753 { |
| 5754 v20 = pPlayers[currPlayerId + 1]; | |
| 187 | 5755 v20->PlaySound(SPEECH_96, 0); |
| 1453 | 5756 //v21 = pAutonoteTxt[var_value].eType;// dword_72371C[2 * a3]; |
| 0 | 5757 bFlashAutonotesBook = 1; |
| 1453 | 5758 _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
|
5759 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
| 0 | 5760 } |
| 1453 | 5761 _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
|
5762 PlaySoundBasedOnCondition(currPlayerId); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5763 return; |
| 0 | 5764 } |
|
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
|
5765 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
|
5766 { |
|
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 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
|
5768 { |
|
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 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
|
5770 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
|
5771 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
|
5772 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
|
5773 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
|
5774 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
|
5775 { |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5776 v9 = NULL; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5777 for (int i = 0; i < 138; i++) |
| 0 | 5778 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
5779 v9 = &this->pInventoryItemList[i]; |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
5780 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
|
5781 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
|
5782 } |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
5783 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
|
5784 { |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5785 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
|
5786 *(int *)(v10 + 532) = 601; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5787 *(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
|
5788 } |
|
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
|
5789 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
|
5790 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
|
5791 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
|
5792 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
|
5793 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
|
5794 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
|
5795 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
|
5796 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
|
5797 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
|
5798 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
|
5799 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
|
5800 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
|
5801 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
|
5802 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
|
5803 { |
|
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 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
|
5805 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
|
5806 } |
|
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 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
|
5808 { |
|
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->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
|
5810 this->uVoiceID = 20; |
| 0 | 5811 } |
|
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
|
5812 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
|
5813 } |
|
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 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
|
5815 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
|
5816 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
|
5817 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
|
5818 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
|
5819 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
|
5820 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
|
5821 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
|
5822 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
|
5823 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
|
5824 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
|
5825 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
|
5826 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
|
5827 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
|
5828 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
|
5829 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
|
5830 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
|
5831 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
|
5832 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
|
5833 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
|
5834 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
|
5835 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
|
5836 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
|
5837 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
|
5838 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
|
5839 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
|
5840 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
|
5841 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
|
5842 //&& 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
|
5843 && 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
|
5844 { |
|
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 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
|
5846 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5847 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
|
5848 } |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
5849 _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
|
5850 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
|
5851 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
|
5852 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
|
5853 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
|
5854 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
|
5855 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
|
5856 // && (&dword_722F10)[4 * a3] ) |
| 1310 | 5857 && pQuestTable[var_value] ) |
| 0 | 5858 { |
|
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
|
5859 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
|
5860 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
|
5861 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
|
5862 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5863 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
|
5864 } |
|
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 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
|
5866 _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
|
5867 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
|
5868 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
|
5869 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
|
5870 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
|
5871 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
|
5872 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
|
5873 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
|
5874 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
|
5875 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
|
5876 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
|
5877 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
|
5878 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
|
5879 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
|
5880 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
|
5881 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
|
5882 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
|
5883 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
|
5884 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
|
5885 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
|
5886 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
|
5887 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
|
5888 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
|
5889 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
|
5890 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
|
5891 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
|
5892 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
|
5893 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
|
5894 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
|
5895 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
|
5896 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
|
5897 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
|
5898 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
|
5899 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
|
5900 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
|
5901 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
|
5902 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
|
5903 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
|
5904 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
|
5905 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
|
5906 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
|
5907 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
|
5908 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
|
5909 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
|
5910 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
|
5911 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
|
5912 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
|
5913 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5914 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
|
5915 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
|
5916 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
|
5917 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5918 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
|
5919 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
|
5920 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
|
5921 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5922 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
|
5923 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
|
5924 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
|
5925 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5926 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
|
5927 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
|
5928 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
|
5929 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5930 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
|
5931 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
|
5932 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
|
5933 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5934 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
|
5935 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
|
5936 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
|
5937 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5938 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
|
5939 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
|
5940 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
|
5941 } |
| 0 | 5942 LABEL_111: |
| 187 | 5943 v26 = SPEECH_91; |
| 0 | 5944 LABEL_112: |
| 492 | 5945 v19 = pPlayers[currPlayerId + 1]; |
|
1260
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
5946 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
|
5947 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5948 PlaySoundBasedOnCondition(currPlayerId); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5949 return; |
| 0 | 5950 } |
|
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
|
5951 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
|
5952 { |
| 492 | 5953 switch ( var_type ) |
| 0 | 5954 { |
|
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
|
5955 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
|
5956 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
|
5957 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
|
5958 goto LABEL_111; |
| 0 | 5959 case VAR_ActualIntellect: |
| 5960 LABEL_68: | |
| 492 | 5961 this->uIntelligenceBonus = (unsigned __int8)var_value; |
| 0 | 5962 goto LABEL_111; |
| 5963 case VAR_ActualPersonality: | |
| 5964 LABEL_69: | |
| 492 | 5965 this->uWillpowerBonus = (unsigned __int8)var_value; |
| 0 | 5966 goto LABEL_111; |
| 5967 case VAR_ActualEndurance: | |
| 5968 LABEL_70: | |
| 492 | 5969 this->uEnduranceBonus = (unsigned __int8)var_value; |
| 0 | 5970 goto LABEL_111; |
| 5971 case VAR_ActualSpeed: | |
| 5972 LABEL_71: | |
| 492 | 5973 this->uSpeedBonus = (unsigned __int8)var_value; |
| 0 | 5974 goto LABEL_111; |
| 5975 case VAR_ActualAccuracy: | |
| 5976 LABEL_72: | |
| 492 | 5977 this->uAccuracyBonus = (unsigned __int8)var_value; |
| 0 | 5978 goto LABEL_111; |
| 5979 case VAR_ActualLuck: | |
| 5980 LABEL_73: | |
| 492 | 5981 this->uLuckBonus = (unsigned __int8)var_value; |
| 0 | 5982 goto LABEL_111; |
| 5983 case VAR_FireResistance: | |
| 492 | 5984 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
|
5985 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5986 goto LABEL_112; |
| 0 | 5987 case VAR_AirResistance: |
| 492 | 5988 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
|
5989 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5990 goto LABEL_112; |
| 0 | 5991 case VAR_WaterResistance: |
| 492 | 5992 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
|
5993 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5994 goto LABEL_112; |
| 0 | 5995 case VAR_EarthResistance: |
| 492 | 5996 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
|
5997 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5998 goto LABEL_112; |
| 0 | 5999 case VAR_SpiritResistance: |
| 492 | 6000 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
|
6001 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6002 goto LABEL_112; |
| 0 | 6003 case VAR_MindResistance: |
| 492 | 6004 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
|
6005 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6006 goto LABEL_112; |
| 0 | 6007 case VAR_BodyResistance: |
| 492 | 6008 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
|
6009 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6010 goto LABEL_112; |
| 0 | 6011 case VAR_LightResistance: |
| 492 | 6012 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
|
6013 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6014 goto LABEL_112; |
| 0 | 6015 case VAR_DarkResistance: |
| 492 | 6016 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
|
6017 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6018 goto LABEL_112; |
| 0 | 6019 case VAR_MagicResistance: |
| 492 | 6020 this->sResMagicBase = (unsigned __int8)var_value; |
| 0 | 6021 v26 = 92; |
| 6022 goto LABEL_112; | |
| 6023 default: | |
| 6024 return; | |
| 6025 } | |
| 6026 return; | |
| 6027 } | |
| 6028 HIWORD(v15) = 0; | |
| 492 | 6029 if ( var_type > VAR_DisarmTrapSkill ) |
| 6030 { | |
| 6031 if ( var_type != VAR_LearningSkill ) | |
| 6032 { | |
| 6033 if ( var_type <= VAR_LearningSkill ) | |
| 0 | 6034 return; |
| 492 | 6035 if ( var_type <= VAR_Eradicated ) |
| 6036 { | |
|
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
|
6037 this->SetCondition(var_type - 105, 1); |
| 0 | 6038 } |
| 6039 else | |
| 6040 { | |
| 492 | 6041 if ( var_type != VAR_MajorCondition ) |
| 0 | 6042 { |
| 492 | 6043 if ( var_type > VAR_MajorCondition && var_type <= VAR_ActiveSpells ) |
| 6044 byte_5E4C15[var_type] = var_value; | |
| 0 | 6045 return; |
| 6046 } | |
|
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
|
6047 memset(this, 0, 0xA0u); |
| 0 | 6048 } |
| 6049 } | |
| 6050 else | |
| 6051 { | |
|
1260
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6052 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
|
6053 v17 = *(char *)v16; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6054 if ( var_value <= VAR_BodyResistanceBonus ) |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6055 { |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6056 LOWORD(v15) = (unsigned __int8)var_value; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6057 v18 = v15 | v17 & VAR_BodyResistanceBonus; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6058 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6059 else |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6060 { |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6061 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
|
6062 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6063 *(short *)v16 = v18; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6064 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6065 LABEL_124: |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6066 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6067 PlaySoundBasedOnCondition(currPlayerId); |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6068 return; |
| 0 | 6069 } |
|
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
|
6070 if ( var_type <= VAR_MagicResistanceBonus ) |
| 492 | 6071 { |
| 6072 switch ( var_type ) | |
| 0 | 6073 { |
|
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
|
6074 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
|
6075 this->sResFireBonus = (unsigned __int8)var_value; |
| 0 | 6076 break; |
| 6077 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
|
6078 this->sResAirBonus = (unsigned __int8)var_value; |
| 0 | 6079 break; |
| 6080 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
|
6081 this->sResWaterBonus = (unsigned __int8)var_value; |
| 0 | 6082 break; |
| 6083 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
|
6084 this->sResEarthBonus = (unsigned __int8)var_value; |
| 0 | 6085 break; |
| 6086 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
|
6087 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
|
6088 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
|
6089 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
|
6090 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
|
6091 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
|
6092 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
|
6093 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
|
6094 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
|
6095 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
|
6096 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
|
6097 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
|
6098 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
|
6099 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
|
6100 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
|
6101 case VAR_PhysicalResistanceBonus: |
| 1545 | 6102 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
|
6103 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
|
6104 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
|
6105 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
|
6106 this->sResMagicBonus = (unsigned __int8)var_value; |
| 0 | 6107 break; |
| 6108 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
|
6109 Error("Unexpected var_type: %u", var_type); |
| 0 | 6110 return; |
| 6111 break; | |
| 6112 } | |
| 6113 goto LABEL_111; | |
| 6114 } | |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6115 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
|
6116 { |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6117 return; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6118 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6119 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6120 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6121 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6122 //----- (new function) -------------------------------------------------------- |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6123 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
|
6124 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6125 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
|
6126 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
|
6127 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
|
6128 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6129 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6130 //----- (new function) -------------------------------------------------------- |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6131 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
|
6132 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6133 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
|
6134 } |
| 0 | 6135 |
| 6136 //----- (0044AFFB) -------------------------------------------------------- | |
| 310 | 6137 void Player::AddVariable(enum VariableType var_type, signed int val) |
| 0 | 6138 { |
| 6139 char v3; // bl@1 | |
| 6140 Player *v4; // esi@1 | |
| 6141 signed int uPlayerIdx; // edi@1 | |
| 6142 int v6; // eax@15 | |
| 6143 unsigned int v7; // esi@18 | |
| 6144 int *v8; // ebx@21 | |
| 6145 int v9; // eax@22 | |
| 6146 signed int v10; // eax@24 | |
| 6147 int v11; // eax@27 | |
| 6148 __int16 *v12; // esi@28 | |
| 6149 Player *v13; // ecx@34 | |
| 6150 Player *v14; // ecx@36 | |
| 6151 char *v15; // ecx@37 | |
| 6152 unsigned __int8 v16; // cf@38 | |
| 6153 Player *v17; // ecx@42 | |
| 6154 __int16 *v18; // esi@53 | |
| 6155 __int16 *v19; // esi@62 | |
| 6156 char *v20; // esi@107 | |
| 6157 __int16 v21; // dx@107 | |
| 6158 int v22; // ecx@107 | |
| 6159 Player *v23; // ecx@132 | |
| 6160 int v24; // eax@132 | |
| 6161 int v25; // eax@150 | |
| 6162 char v26; // zf@151 | |
| 6163 DDM_DLV_Header *v27; // eax@153 | |
| 6164 signed int v28; // eax@176 | |
| 6165 int v29; // [sp-8h] [bp-40h]@84 | |
| 310 | 6166 // signed int v30; // [sp-4h] [bp-3Ch]@4 |
| 0 | 6167 int v31; // [sp-4h] [bp-3Ch]@84 |
| 6168 ItemGen item; // [sp+Ch] [bp-2Ch]@45 | |
| 6169 unsigned int v33; // [sp+30h] [bp-8h]@34 | |
| 6170 char v34; // [sp+37h] [bp-1h]@1 | |
| 6171 | |
| 6172 auto Dst = this; | |
| 6173 v3 = 0; | |
| 6174 v34 = 0; | |
| 6175 v4 = Dst; | |
| 6176 uPlayerIdx = 0; | |
| 6177 if ( Dst == pPlayers[2] ) | |
| 6178 uPlayerIdx = 1; | |
| 310 | 6179 else if ( Dst == pPlayers[3] ) |
| 6180 uPlayerIdx = 2; | |
| 6181 else if ( Dst == pPlayers[4] ) | |
| 6182 uPlayerIdx = 3; | |
| 6183 | |
| 6184 if ( var_type <= VAR_AutoNotes ) | |
| 6185 { | |
| 6186 if ( var_type != VAR_AutoNotes ) | |
| 6187 { | |
| 6188 if ( var_type <= VAR_ActualMight ) | |
| 6189 { | |
| 6190 if ( var_type != VAR_ActualMight ) | |
| 0 | 6191 { |
| 310 | 6192 switch ( var_type ) |
| 0 | 6193 { |
| 6194 case VAR_RandomGold: | |
| 6195 if ( !val ) | |
| 6196 val = 1; | |
| 6197 v6 = rand(); | |
| 6198 party_finds_gold(v6 % val + 1, 1); | |
| 6199 GameUI_DrawFoodAndGold(); | |
| 6200 return; | |
| 6201 case VAR_RandomFood: | |
| 6202 if ( !val ) | |
| 6203 val = 1; | |
| 6204 v7 = rand() % val + 1; | |
| 6205 Party::GiveFood(v7); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6206 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
|
6207 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 6208 GameUI_DrawFoodAndGold(); |
| 6209 goto _play_sound; | |
| 6210 case VAR_Sex: | |
| 6211 Dst->uSex = (PLAYER_SEX)val; | |
| 1507 | 6212 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6213 goto _play_sound; | |
| 0 | 6214 case VAR_Class: |
| 135 | 6215 Dst->classType = (PLAYER_CLASS_TYPE)val; |
| 1507 | 6216 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6217 goto _play_sound; | |
| 0 | 6218 case VAR_CurrentHP: |
| 6219 v8 = &Dst->sHealth; | |
| 6220 *v8 += val; | |
| 6221 if ( Dst->sHealth <= Dst->GetMaxHealth() ) | |
| 1507 | 6222 { |
| 6223 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6224 goto _play_sound; | |
| 6225 } | |
| 0 | 6226 v9 = v4->GetMaxHealth(); |
| 6227 goto LABEL_23; | |
| 6228 case VAR_MaxHP: | |
| 6229 v10 = Dst->GetMaxHealth(); | |
| 6230 v4->_health_related = 0; | |
| 6231 v4->uFullHealthBonus = 0; | |
| 6232 v4->sHealth = v10; | |
| 6233 return; | |
| 6234 case VAR_CurrentSP: | |
| 6235 v8 = &Dst->sMana; | |
| 6236 *v8 += val; | |
| 6237 if ( Dst->sMana > GetMaxMana() ) | |
| 6238 { | |
| 6239 v9 = v4->GetMaxMana(); | |
| 6240 LABEL_23: | |
| 6241 *v8 = v9; | |
| 6242 } | |
| 1507 | 6243 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6244 goto _play_sound; | |
| 0 | 6245 case VAR_MaxSP: |
| 6246 v11 = GetMaxMana(); | |
| 6247 v4->_mana_related = 0; | |
| 6248 v4->uFullManaBonus = 0; | |
| 6249 v4->sMana = v11; | |
| 6250 return; | |
| 6251 case VAR_ACModifier: | |
| 6252 v12 = &Dst->sACModifier; | |
| 6253 goto LABEL_29; | |
| 6254 case VAR_BaseLevel: | |
| 6255 v12 = (__int16 *)&Dst->uLevel; | |
| 6256 goto LABEL_29; | |
| 6257 case VAR_LevelModifier: | |
| 6258 v12 = &Dst->sLevelModifier; | |
| 6259 LABEL_29: | |
| 6260 *v12 += val; | |
| 6261 if ( *v12 > 255 ) | |
| 6262 *v12 = 255; | |
| 1507 | 6263 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6264 goto _play_sound; | |
| 0 | 6265 case VAR_Age: |
| 6266 Dst->sAgeModifier += val; | |
| 6267 return; | |
| 6268 case VAR_Award: | |
| 6269 v13 = pPlayers[uPlayerIdx + 1]; | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6270 if (_449B57_test_bit((unsigned __int8 *)pPlayers[uPlayerIdx + 1]->_achieved_awards_bits, val) |
| 521 | 6271 |
| 492 | 6272 && pAwards[val].pText ) |
| 0 | 6273 { |
| 6274 v14 = pPlayers[uPlayerIdx + 1]; | |
| 6275 v34 = 1; | |
| 6276 v3 = 1; | |
| 187 | 6277 v14->PlaySound(SPEECH_96, 0); |
| 0 | 6278 } |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6279 v15 = (char *)v4->_achieved_awards_bits; |
| 1507 | 6280 _449B7E_toggle_bit((unsigned char *)v15, val, 1); |
| 6281 if ( v34 != 1 ) | |
| 6282 { | |
| 6283 if ( v3 != 1 ) | |
| 6284 return; | |
| 6285 goto _play_sound; | |
| 6286 } | |
| 6287 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6288 if ( v3 != 1 ) | |
| 6289 return; | |
| 6290 goto _play_sound; | |
| 0 | 6291 case VAR_Experience: |
| 6292 v16 = __CFADD__(val, LODWORD(Dst->uExperience)); | |
| 6293 LODWORD(Dst->uExperience) += val; | |
| 6294 HIDWORD(Dst->uExperience) += ((unsigned __int64)val >> 32) + v16; | |
| 6295 if ( (signed __int64)Dst->uExperience > 4000000000i64 ) | |
| 6296 Dst->uExperience = 4000000000i64; | |
| 1507 | 6297 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6298 goto _play_sound; | |
| 0 | 6299 case VAR_QBits_QuestsDone: |
| 484 | 6300 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
|
6301 //&& (&dword_722F10)[4 * val] ) |
| 1310 | 6302 && pQuestTable[val] ) |
| 0 | 6303 { |
| 501 | 6304 //v17 = pPlayers[uPlayerIdx + 1]; |
| 0 | 6305 bFlashQuestBook = 1; |
| 6306 v34 = 1; | |
| 6307 v3 = 1; | |
| 501 | 6308 pPlayers[uPlayerIdx + 1]->PlaySound(SPEECH_93, 0); |
| 0 | 6309 } |
| 484 | 6310 v15 = (char *)pParty->_quest_bits; |
| 1507 | 6311 _449B7E_toggle_bit((unsigned char *)v15, val, 1); |
| 6312 if ( v34 != 1 ) | |
| 6313 { | |
| 6314 if ( v3 != 1 ) | |
| 6315 return; | |
| 6316 goto _play_sound; | |
| 6317 } | |
| 6318 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6319 if ( v3 != 1 ) | |
| 6320 return; | |
| 6321 goto _play_sound; | |
| 0 | 6322 case VAR_PlayerItemInHands: |
| 6323 item.Reset(); | |
| 6324 item.Reset(); | |
| 6325 item.uAttributes = 1; | |
| 6326 item.uItemID = val; | |
| 6327 if ( val >= ITEM_ARTIFACT_PUCK && val <= ITEM_RELIC_MEKORIGS_HAMMER ) | |
| 484 | 6328 pParty->pIsArtifactFound[val-500] = 1; |
| 0 | 6329 if ( val >= ITEM_WAND_FIRE && val <= ITEM_WAND_INCENERATION ) |
| 6330 { | |
| 6331 item.uNumCharges = rand() % 6 + pItemsTable->pItems[item.uItemID].uDamageMod + 1; | |
| 6332 item.uMaxCharges = LOBYTE(item.uNumCharges); | |
| 6333 } | |
| 6334 pParty->SetHoldingItem(&item); | |
| 6335 return; | |
| 6336 case VAR_FixedGold: | |
| 6337 party_finds_gold(val, 1); | |
| 6338 return; | |
| 6339 case VAR_BaseMight: | |
| 6340 v18 = (__int16 *)&Dst->uMight; | |
| 6341 goto LABEL_82; | |
| 6342 case VAR_BaseIntellect: | |
| 6343 v18 = (__int16 *)&Dst->uIntelligence; | |
| 6344 goto LABEL_82; | |
| 6345 case VAR_BasePersonality: | |
| 6346 v18 = (__int16 *)&Dst->uWillpower; | |
| 6347 goto LABEL_82; | |
| 6348 case VAR_BaseEndurance: | |
| 6349 v18 = (__int16 *)&Dst->uEndurance; | |
| 6350 goto LABEL_82; | |
| 6351 case VAR_BaseSpeed: | |
| 6352 v18 = (__int16 *)&Dst->uSpeed; | |
| 6353 goto LABEL_82; | |
| 6354 case VAR_BaseAccuracy: | |
| 6355 v18 = (__int16 *)&Dst->uAccuracy; | |
| 6356 goto LABEL_82; | |
| 6357 case VAR_BaseLuck: | |
| 6358 v18 = (__int16 *)&Dst->uLuck; | |
| 6359 goto LABEL_82; | |
| 6360 case VAR_FixedFood: | |
| 6361 Party::GiveFood(val); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6362 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[502], val); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6363 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 6364 if ( pParty->uNumFoodRations > 0xFFFF ) |
| 6365 Party::SetFood(0xFFFFu); | |
| 6366 goto _play_sound; | |
| 6367 case VAR_MightBonus: | |
| 6368 goto LABEL_62; | |
| 6369 case VAR_IntellectBonus: | |
| 6370 goto LABEL_66; | |
| 6371 case VAR_PersonalityBonus: | |
| 6372 goto LABEL_67; | |
| 6373 case VAR_EnduranceBonus: | |
| 6374 goto LABEL_68; | |
| 6375 case VAR_SpeedBonus: | |
| 6376 goto LABEL_69; | |
| 6377 case VAR_AccuracyBonus: | |
| 6378 goto LABEL_70; | |
| 6379 case VAR_LuckBonus: | |
| 6380 goto LABEL_71; | |
| 6381 default: | |
| 6382 return; | |
| 6383 } | |
| 6384 return; | |
| 6385 } | |
| 6386 LABEL_62: | |
| 6387 v19 = (__int16 *)&Dst->uMightBonus; | |
| 6388 goto LABEL_113; | |
| 6389 } | |
| 310 | 6390 if ( var_type <= VAR_FireResistanceBonus ) |
| 6391 { | |
| 6392 if ( var_type != VAR_FireResistanceBonus ) | |
| 0 | 6393 { |
| 310 | 6394 switch ( var_type ) |
| 0 | 6395 { |
| 6396 case VAR_ActualIntellect: | |
| 6397 LABEL_66: | |
| 6398 v19 = (__int16 *)&Dst->uIntelligenceBonus; | |
| 6399 goto LABEL_113; | |
| 6400 case VAR_ActualPersonality: | |
| 6401 LABEL_67: | |
| 6402 v19 = (__int16 *)&Dst->uWillpowerBonus; | |
| 6403 goto LABEL_113; | |
| 6404 case VAR_ActualEndurance: | |
| 6405 LABEL_68: | |
| 6406 v19 = (__int16 *)&Dst->uEnduranceBonus; | |
| 6407 goto LABEL_113; | |
| 6408 case VAR_ActualSpeed: | |
| 6409 LABEL_69: | |
| 6410 v19 = (__int16 *)&Dst->uSpeedBonus; | |
| 6411 goto LABEL_113; | |
| 6412 case VAR_ActualAccuracy: | |
| 6413 LABEL_70: | |
| 6414 v19 = (__int16 *)&Dst->uAccuracyBonus; | |
| 6415 goto LABEL_113; | |
| 6416 case VAR_ActualLuck: | |
| 6417 LABEL_71: | |
| 6418 v19 = (__int16 *)&Dst->uLuckBonus; | |
| 6419 goto LABEL_113; | |
| 6420 case VAR_FireResistance: | |
| 6421 v18 = &Dst->sResFireBase; | |
| 6422 goto LABEL_82; | |
| 6423 case VAR_AirResistance: | |
| 6424 v18 = &Dst->sResAirBase; | |
| 6425 goto LABEL_82; | |
| 6426 case VAR_WaterResistance: | |
| 6427 v18 = &Dst->sResWaterBase; | |
| 6428 goto LABEL_82; | |
| 6429 case VAR_EarthResistance: | |
| 6430 v18 = &Dst->sResEarthBase; | |
| 6431 goto LABEL_82; | |
| 6432 case VAR_SpiritResistance: | |
| 6433 v18 = &Dst->sResSpiritBase; | |
| 6434 goto LABEL_82; | |
| 6435 case VAR_MindResistance: | |
| 6436 v18 = &Dst->sResMindBase; | |
| 6437 goto LABEL_82; | |
| 6438 case VAR_BodyResistance: | |
| 6439 v18 = &Dst->sResBodyBase; | |
| 6440 goto LABEL_82; | |
| 6441 case VAR_LightResistance: | |
| 6442 v18 = &Dst->sResLightBase; | |
| 6443 goto LABEL_82; | |
| 6444 case VAR_DarkResistance: | |
| 6445 v18 = &Dst->sResDarkBase; | |
| 6446 goto LABEL_82; | |
| 6447 case VAR_MagicResistance: | |
| 6448 v18 = &Dst->sResMagicBase; | |
| 6449 LABEL_82: | |
| 6450 *v18 += val; | |
| 6451 if ( *v18 > 255 ) | |
| 6452 *v18 = 255; | |
| 1507 | 6453 pPlayers[uPlayerIdx + 1]->PlaySound(SPEECH_92, 0); |
| 6454 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6455 goto _play_sound; | |
| 0 | 6456 default: |
| 6457 return; | |
| 6458 } | |
| 6459 return; | |
| 6460 } | |
| 6461 v19 = &Dst->sResFireBonus; | |
| 6462 LABEL_113: | |
| 6463 *v19 += val; | |
| 6464 if ( *v19 > 255 ) | |
| 6465 *v19 = 255; | |
| 6466 v31 = 0; | |
| 187 | 6467 v29 = SPEECH_91; |
| 6468 pPlayers[uPlayerIdx + 1]->PlaySound((PlayerSpeech)v29, v31); | |
| 1507 | 6469 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6470 goto _play_sound; | |
| 0 | 6471 } |
| 310 | 6472 if ( var_type <= VAR_DisarmTrapSkill ) |
| 6473 { | |
| 6474 if ( var_type != VAR_DisarmTrapSkill ) | |
| 0 | 6475 { |
| 310 | 6476 if ( var_type <= VAR_BodyResistanceBonus ) |
| 0 | 6477 { |
| 310 | 6478 switch ( var_type ) |
| 0 | 6479 { |
| 6480 case VAR_BodyResistanceBonus: | |
| 6481 v19 = &Dst->sResBodyBonus; | |
| 6482 break; | |
| 6483 case VAR_AirResistanceBonus: | |
| 6484 v19 = &Dst->sResAirBonus; | |
| 6485 break; | |
| 6486 case VAR_WaterResistanceBonus: | |
| 6487 v19 = &Dst->sResWaterBonus; | |
| 6488 break; | |
| 6489 case VAR_EarthResistanceBonus: | |
| 6490 v19 = &Dst->sResEarthBonus; | |
| 6491 break; | |
| 6492 case VAR_SpiritResistanceBonus: | |
| 6493 v19 = &Dst->sResSpiritBonus; | |
| 6494 break; | |
| 6495 default: | |
| 310 | 6496 if ( var_type != 62 ) |
| 0 | 6497 return; |
| 6498 v19 = &Dst->sResMindBonus; | |
| 6499 break; | |
| 6500 } | |
| 6501 goto LABEL_113; | |
| 6502 } | |
| 310 | 6503 if ( var_type == VAR_LightResistanceBonus ) |
| 0 | 6504 { |
| 6505 v19 = &Dst->sResLightBonus; | |
| 6506 goto LABEL_113; | |
| 6507 } | |
| 310 | 6508 if ( var_type == VAR_DarkResistanceBonus ) |
| 0 | 6509 { |
| 6510 v19 = &Dst->sResDarkBonus; | |
| 6511 goto LABEL_113; | |
| 6512 } | |
| 310 | 6513 if ( var_type == VAR_MagicResistanceBonus ) |
| 0 | 6514 { |
| 6515 v19 = &Dst->sResMagicBonus; | |
| 6516 goto LABEL_113; | |
| 6517 } | |
| 310 | 6518 if ( var_type <= VAR_MagicResistanceBonus || var_type > VAR_DiplomacySkill ) |
| 0 | 6519 return; |
| 6520 } | |
| 6521 goto LABEL_106; | |
| 6522 } | |
| 310 | 6523 if ( var_type == VAR_LearningSkill ) |
| 0 | 6524 { |
| 6525 LABEL_106: | |
| 6526 if ( val <= VAR_BodyResistanceBonus ) | |
| 6527 { | |
| 310 | 6528 *((short *)&Dst->pConditions[16] + var_type) = (unsigned __int8)val | *((char *)&Dst->pConditions[16] + 2 * var_type) & VAR_BodyResistanceBonus; |
| 0 | 6529 } |
| 6530 else | |
| 6531 { | |
| 310 | 6532 v20 = (char *)&Dst->pConditions[16] + 2 * var_type; |
| 0 | 6533 v21 = *(short *)v20; |
| 6534 v22 = (unsigned __int8)val + (v21 & VAR_BodyResistanceBonus); | |
| 6535 if ( v22 > 60 ) | |
| 6536 LOWORD(v22) = 60; | |
| 6537 LOBYTE(v21) = v21 & 0xC0; | |
| 6538 *(short *)v20 = v22 | v21; | |
| 6539 } | |
| 1507 | 6540 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6541 goto _play_sound; | |
| 0 | 6542 } |
| 310 | 6543 if ( var_type <= VAR_LearningSkill ) |
| 0 | 6544 return; |
| 310 | 6545 if ( var_type <= VAR_Eradicated ) |
| 6546 { | |
| 6547 Dst->SetCondition(var_type - 105, 0); | |
| 0 | 6548 } |
| 6549 else | |
| 6550 { | |
| 310 | 6551 if ( var_type != VAR_MajorCondition ) |
| 0 | 6552 { |
| 310 | 6553 if ( var_type > VAR_MajorCondition && var_type <= VAR_ActiveSpells ) |
| 0 | 6554 { |
| 310 | 6555 if ( (unsigned __int8)val + (unsigned __int8)byte_5E4C15[var_type] <= 255 ) |
| 6556 byte_5E4C15[var_type] += val; | |
| 0 | 6557 else |
| 310 | 6558 byte_5E4C15[var_type] = -1; |
| 0 | 6559 } |
| 6560 return; | |
| 6561 } | |
| 6562 memset(Dst, 0, 0xA0u); | |
| 6563 } | |
| 6564 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6565 goto _play_sound; | |
| 6566 } | |
| 6567 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
|
6568 //&& (&dword_723718_autonote_related)[8 * val] ) |
| 1310 | 6569 && pAutonoteTxt[val].pText ) |
| 0 | 6570 { |
| 6571 v23 = pPlayers[uPlayerIdx + 1]; | |
| 6572 v34 = 1; | |
| 187 | 6573 v23->PlaySound(SPEECH_96, 0); |
| 1453 | 6574 //v24 = pAutonoteTxt[val].eType;//dword_72371C[2 * val]; |
| 0 | 6575 bFlashAutonotesBook = 1; |
| 1453 | 6576 _506568_autonote_type = pAutonoteTxt[val].eType; |
| 6577 } | |
| 6578 _449B7E_toggle_bit(pParty->_autonote_bits, val, 1); | |
| 0 | 6579 v3 = 1; |
| 6580 if ( v34 != 1 ) | |
| 1507 | 6581 { |
| 6582 if ( v3 != 1 ) | |
| 6583 return; | |
| 6584 goto _play_sound; | |
| 6585 } | |
| 6586 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6587 if ( v3 != 1 ) | |
| 6588 return; | |
| 6589 goto _play_sound; | |
| 0 | 6590 } |
| 310 | 6591 if ( var_type > VAR_GoldInBank ) |
| 6592 { | |
| 6593 if ( var_type == 307 ) | |
| 0 | 6594 { |
| 6595 pParty->uNumDeaths += val; | |
| 1507 | 6596 if ( v34 != 1 ) |
| 6597 { | |
| 6598 if ( v3 != 1 ) | |
| 6599 return; | |
| 6600 goto _play_sound; | |
| 6601 } | |
| 6602 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6603 if ( v3 != 1 ) | |
| 6604 return; | |
| 6605 goto _play_sound; | |
| 0 | 6606 } |
| 310 | 6607 switch ( var_type ) |
| 0 | 6608 { |
| 6609 case 308: | |
| 6610 pParty->uNumBountiesCollected += val; | |
| 6611 break; | |
| 6612 case 309: | |
| 6613 pParty->uNumPrisonTerms += val; | |
| 6614 break; | |
| 6615 case 310: | |
| 6616 pParty->uNumArenaPageWins += val; | |
| 6617 break; | |
| 6618 case 311: | |
| 6619 pParty->uNumArenaSquireWins += val; | |
| 6620 break; | |
| 6621 case 312: | |
| 6622 pParty->uNumArenaKnightWins += val; | |
| 6623 break; | |
| 6624 case 313: | |
| 6625 pParty->uNumArenaLordWins += val; | |
| 6626 break; | |
| 6627 } | |
| 6628 } | |
| 6629 else | |
| 6630 { | |
| 310 | 6631 if ( var_type == VAR_GoldInBank ) |
| 0 | 6632 { |
| 6633 pParty->uNumGoldInBank += val; | |
| 6634 return; | |
| 6635 } | |
| 310 | 6636 if ( var_type <= VAR_Counter8 ) |
| 6637 { | |
| 6638 if ( (signed int)var_type >= 245 ) | |
| 6639 { | |
| 6640 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44300] = LODWORD(pParty->uTimePlayed); | |
| 6641 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44304] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 6642 } |
| 6643 else | |
| 6644 { | |
| 310 | 6645 switch ( var_type ) |
| 0 | 6646 { |
| 6647 case VAR_MonthEquals|VAR_CurrentSP: | |
| 6648 _449B7E_toggle_bit((unsigned char *)Dst->field_1A50, val, 1u); | |
| 6649 break; | |
| 6650 case VAR_NPCs2: | |
| 6651 pParty->field_709 = 0; | |
| 6652 LOBYTE(pNPCStats->pNewNPCData[val].uFlags) |= 0x80u; | |
| 1035 | 6653 pParty->CountHirelings(); |
| 6654 viewparams->bRedrawGameUI = true; | |
| 0 | 6655 break; |
| 6656 case VAR_NumSkillPoints: | |
| 6657 Dst->uSkillPoints += val; | |
| 6658 break; | |
| 6659 } | |
| 6660 } | |
| 6661 return; | |
| 6662 } | |
| 310 | 6663 if ( var_type < VAR_Counter9 ) |
| 0 | 6664 return; |
| 310 | 6665 if ( (signed int)var_type <= 274 ) |
| 6666 { | |
| 6667 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44532] = LODWORD(pParty->uTimePlayed); | |
| 6668 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44536] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 6669 goto _play_sound; |
| 6670 } | |
| 310 | 6671 if ( var_type != VAR_ReputationInCurrentLocation ) |
| 6672 { | |
| 6673 if ( var_type <= VAR_ReputationInCurrentLocation | |
| 6674 || var_type > VAR_History_28 | |
| 6675 || (v25 = var_type - 276, pParty->field_3C.field_4F0[2 * v25 + 1] | pParty->field_3C.field_4F0[2 * v25]) | |
| 6676 || (pParty->field_3C.field_4F0[2 * (var_type - 276)] = LODWORD(pParty->uTimePlayed), | |
| 233 | 6677 v26 = pStorylineText->StoreLine[v25].pText==0,//*(&pStorylineText->field_0 + 3 * v25) == 0, |
| 310 | 6678 pParty->field_3C.field_4F0[2 * (var_type - 276) + 1] = HIDWORD(pParty->uTimePlayed), |
| 0 | 6679 v26) ) |
| 6680 return; | |
| 6681 bFlashHistoryBook = 1; | |
| 6682 _play_sound: | |
| 6683 v28 = 8 * uPlayerIdx + 400; | |
| 862 | 6684 LOBYTE(v28) = PID(OBJECT_Player,uPlayerIdx - 112); |
| 0 | 6685 pAudioPlayer->PlaySound(SOUND_20001, v28, 0, -1, 0, 0, 0, 0); |
| 6686 return; | |
| 6687 } | |
| 6688 v27 = &pOutdoor->ddm; | |
| 6689 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 6690 v27 = &pIndoor->dlv; | |
| 6691 v27->uReputation += val; | |
| 6692 if ( v27->uReputation > 10000 ) | |
| 6693 v27->uReputation = 10000; | |
| 6694 } | |
| 6695 } | |
| 6696 | |
| 6697 | |
| 6698 //----- (0044B9C4) -------------------------------------------------------- | |
| 501 | 6699 bool Player::SubtractVariable(enum VariableType VarNum, signed int pValue) |
| 0 | 6700 { |
| 6701 unsigned int v3; // ebx@1 | |
| 6702 signed int v4; // esi@1 | |
| 501 | 6703 bool result; // eax@8 |
| 0 | 6704 int v6; // esi@11 |
| 6705 int v7; // edi@14 | |
| 6706 signed int v8; // eax@17 | |
| 6707 char *v9; // eax@20 | |
| 6708 char v10; // sf@20 | |
| 6709 char *v11; // ecx@26 | |
| 6710 char *v12; // ecx@27 | |
| 6711 __int64 v13; // qax@27 | |
| 6712 unsigned __int8 v14; // cf@27 | |
| 501 | 6713 int *v15; // edx@29 |
| 0 | 6714 char *v16; // eax@90 |
| 6715 char *v17; // ecx@94 | |
| 501 | 6716 int v18; // esi@97 |
| 0 | 6717 signed int v19; // edx@97 |
| 6718 char *v20; // ecx@98 | |
| 6719 int v21; // eax@100 | |
| 6720 __int16 v22; // dx@112 | |
| 6721 int v23; // [sp-8h] [bp-14h]@45 | |
| 6722 signed int v24; // [sp-4h] [bp-10h]@4 | |
| 6723 int v25; // [sp-4h] [bp-10h]@45 | |
| 6724 | |
| 6725 v3 = 0; | |
| 605 | 6726 v4 = uActiveCharacter - 1; |
| 501 | 6727 result = false; |
| 6728 if ( (signed int)VarNum > 222 ) | |
| 6729 { | |
| 6730 if ( (signed int)VarNum <= 307 ) | |
| 6731 { | |
| 6732 if ( VarNum == 307 ) | |
| 6733 { | |
| 6734 pParty->uNumDeaths -= (unsigned int)pValue; | |
| 6735 return pValue; | |
| 6736 } | |
| 6737 if ( VarNum == 223 ) | |
| 0 | 6738 { |
| 6739 v11 = (char *)pParty->_autonote_bits; | |
| 501 | 6740 v22 = (short)pValue - 1; |
| 0 | 6741 } |
| 6742 else | |
| 6743 { | |
| 501 | 6744 if ( VarNum != 231 ) |
| 0 | 6745 { |
| 501 | 6746 switch ( VarNum ) |
| 0 | 6747 { |
| 6748 case 232: | |
| 501 | 6749 VarNum = (VariableType)0; |
| 1094 | 6750 GetNewNPCData(sDialogue_SpeakingActorNPC_ID, (int*)&VarNum); |
| 501 | 6751 result = (bool) pValue; |
| 6752 dword_5B65CC = 0; | |
| 6753 if ( (int)VarNum == pValue ) | |
| 0 | 6754 { |
| 501 | 6755 dword_5B65CC = (int)pValue; |
| 0 | 6756 } |
| 6757 else | |
| 6758 { | |
| 6759 pParty->field_709 = 0; | |
| 501 | 6760 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
| 1035 | 6761 pParty->CountHirelings(); |
| 6762 viewparams->bRedrawGameUI = true; | |
| 0 | 6763 } |
| 6764 break; | |
| 6765 case 241: | |
| 6766 if ( (signed int)pNPCStats->uNumNewNPCs > 0 ) | |
| 6767 { | |
| 6768 v20 = (char *)&pNPCStats->pNewNPCData[0].uFlags; | |
| 605 | 6769 for ( v19 = 0; v19 < (signed int)pNPCStats->uNumNewNPCs; ++v19 ) |
| 0 | 6770 { |
| 605 | 6771 if ( *((void **)v20 + 4) == (void *)pValue ) |
| 0 | 6772 { |
| 6773 v21 = *(int *)v20; | |
| 6774 if ( (char)*(int *)v20 < 0 ) | |
| 6775 { | |
| 6776 LOBYTE(v21) = v21 & 0x7F; | |
| 6777 *(int *)v20 = v21; | |
| 6778 } | |
| 6779 } | |
| 6780 v20 += 76; | |
| 6781 } | |
| 6782 } | |
| 605 | 6783 if ( pParty->pHirelings[0].uProfession == pValue ) |
| 0 | 6784 memset(pParty->pHirelings, 0, 0x4Cu); |
| 605 | 6785 if ( pParty->pHirelings[1].uProfession == pValue ) |
| 0 | 6786 memset(&pParty->pHirelings[1], 0, 0x4Cu); |
| 6787 pParty->field_709 = 0; | |
| 1035 | 6788 pParty->CountHirelings(); |
| 0 | 6789 break; |
| 6790 case 243: | |
| 6791 v17 = (char *)&this->uSkillPoints; | |
|
1113
39eaa6b00141
something to bool cast (performance warning) mostly fixed
Grumpy7
parents:
1097
diff
changeset
|
6792 result = *v17 != NULL; |
| 501 | 6793 if ( (unsigned int)pValue <= *(int *)v17 ) |
| 6794 { | |
| 6795 *(int *)v17 -= (int)pValue; | |
|
1113
39eaa6b00141
something to bool cast (performance warning) mostly fixed
Grumpy7
parents:
1097
diff
changeset
|
6796 result = (v17 != NULL); |
| 501 | 6797 } |
| 0 | 6798 else |
| 6799 *(int *)v17 = 0; | |
| 6800 break; | |
| 6801 case 275: | |
| 6802 v16 = (char *)&pOutdoor->ddm; | |
| 6803 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 6804 v16 = (char *)&pIndoor->dlv; | |
| 501 | 6805 *((int *)v16 + 2) -= (int)pValue; |
| 0 | 6806 if ( *((int *)v16 + 2) < -10000 ) |
| 6807 *((int *)v16 + 2) = -10000; | |
| 6808 break; | |
| 6809 case 306: | |
| 501 | 6810 result = VarNum - 306; |
| 6811 if ( (unsigned int)pValue <= pParty->uNumGoldInBank ) | |
| 6812 { | |
| 6813 result = (bool)pValue; | |
| 6814 pParty->uNumGoldInBank -= (unsigned int)pValue; | |
| 605 | 6815 } |
| 0 | 6816 else |
| 6817 LABEL_88: | |
| 6818 dword_5B65C4 = 1; | |
| 6819 break; | |
| 6820 } | |
| 501 | 6821 return result; |
| 0 | 6822 } |
| 6823 v11 = this->field_1A50; | |
| 501 | 6824 v22 = (signed __int16)pValue; |
| 0 | 6825 } |
| 6826 _449B7E_toggle_bit((unsigned char *)v11, v22, 0); | |
| 501 | 6827 return result; |
| 6828 } | |
| 6829 switch ( VarNum ) | |
| 0 | 6830 { |
| 6831 case 308: | |
| 501 | 6832 result = (bool)pValue; |
| 6833 pParty->uNumBountiesCollected -= (unsigned int)pValue; | |
| 0 | 6834 break; |
| 6835 case 309: | |
| 501 | 6836 result = (bool)pValue; |
| 6837 pParty->uNumPrisonTerms -= (int)pValue; | |
| 0 | 6838 break; |
| 6839 case 310: | |
| 501 | 6840 result = (bool)pValue; |
| 6841 pParty->uNumArenaPageWins -= (char)pValue; | |
| 0 | 6842 break; |
| 6843 case 311: | |
| 501 | 6844 result = (bool)pValue; |
| 6845 pParty->uNumArenaSquireWins -= (char)pValue; | |
| 0 | 6846 break; |
| 6847 case 312: | |
| 501 | 6848 result = (bool)pValue; |
| 6849 pParty->uNumArenaKnightWins -= (char)pValue; | |
| 0 | 6850 break; |
| 6851 case 313: | |
| 501 | 6852 result = (bool)pValue; |
| 6853 pParty->uNumArenaLordWins -= (char)pValue; | |
| 0 | 6854 break; |
| 6855 } | |
| 1545 | 6856 Error("Function not returning any value! (%u)", VarNum); |
| 0 | 6857 } |
| 6858 else | |
| 6859 { | |
| 501 | 6860 if ( (signed int)VarNum >= 123 ) |
| 6861 { | |
| 6862 byte_5E4C15[VarNum] -= (char)pValue; | |
| 0 | 6863 } |
| 6864 else | |
| 6865 { | |
| 501 | 6866 switch ( VarNum ) |
| 0 | 6867 { |
| 6868 case VAR_RandomGold: | |
| 501 | 6869 v6 = rand() % (signed int)pValue + 1; |
| 0 | 6870 if ( v6 > pParty->uNumGold ) |
| 6871 v6 = pParty->uNumGold; | |
| 6872 Party::TakeGold(v6); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6873 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[503], v6); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6874 ShowStatusBarString(pTmpBuf.data(), 2); |
| 0 | 6875 GameUI_DrawFoodAndGold(); |
| 501 | 6876 return result; |
| 0 | 6877 case VAR_RandomFood: |
| 501 | 6878 v7 = rand() % (signed int)pValue + 1; |
| 0 | 6879 if ( v7 > pParty->uNumFoodRations ) |
| 6880 v7 = pParty->uNumFoodRations; | |
| 6881 Party::TakeFood(v7); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6882 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[504], v7); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6883 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 6884 GameUI_DrawFoodAndGold(); |
| 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); |
| 501 | 6889 return result; |
| 0 | 6890 case VAR_CurrentHP: |
| 1036 | 6891 ReceiveDamage((signed int)pValue, DMGT_PHISYCAL); |
| 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_CurrentSP: |
| 6898 v9 = (char *)&this->sMana; | |
| 501 | 6899 v10 = this->sMana - (signed int)pValue < 0; |
| 6900 *(int *)v9 -= (int)pValue; | |
| 0 | 6901 if ( v10 ) |
| 6902 *(int *)v9 = 0; | |
| 605 | 6903 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6904 v8 = 8 * v4 + 400; | |
| 862 | 6905 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6906 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6907 return result; | |
| 0 | 6908 case VAR_ACModifier: |
| 501 | 6909 this->sACModifier -= (unsigned __int8)pValue; |
| 605 | 6910 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6911 v8 = 8 * v4 + 400; | |
| 862 | 6912 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6913 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6914 return result; | |
| 0 | 6915 case VAR_BaseLevel: |
| 501 | 6916 this->uLevel -= (unsigned __int8)pValue; |
| 605 | 6917 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6918 v8 = 8 * v4 + 400; | |
| 862 | 6919 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6920 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6921 return result; | |
| 0 | 6922 case VAR_LevelModifier: |
| 501 | 6923 this->sLevelModifier -= (unsigned __int8)pValue; |
| 605 | 6924 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6925 v8 = 8 * v4 + 400; | |
| 862 | 6926 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6927 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6928 return result; | |
| 0 | 6929 case VAR_Age: |
| 501 | 6930 this->sAgeModifier -= (signed __int16)pValue; |
| 6931 return result; | |
| 0 | 6932 case VAR_Award: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6933 _449B7E_toggle_bit((unsigned char *)this->_achieved_awards_bits, (signed __int16)pValue, 0); |
| 605 | 6934 return result; |
| 0 | 6935 case VAR_Experience: |
| 6936 v12 = (char *)&this->uExperience; | |
| 501 | 6937 v13 = (signed int)pValue; |
| 6938 v14 = *(int *)v12 < (unsigned int)pValue; | |
| 6939 *(int *)v12 -= (int)pValue; | |
| 0 | 6940 *((int *)v12 + 1) -= v14 + HIDWORD(v13); |
| 605 | 6941 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 6942 v8 = 8 * v4 + 400; | |
| 862 | 6943 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6944 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6945 return result; | |
| 0 | 6946 case VAR_QBits_QuestsDone: |
| 501 | 6947 _449B7E_toggle_bit(pParty->_quest_bits, (__int16)pValue, 0); |
| 187 | 6948 pPlayers[v4 + 1]->PlaySound(SPEECH_96, 0); |
| 501 | 6949 return true; |
| 0 | 6950 case VAR_PlayerItemInHands: |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
6951 v15 = this->pInventoryMatrix; |
| 0 | 6952 break; |
| 6953 case VAR_FixedGold: | |
| 501 | 6954 if ( (unsigned int)pValue > pParty->uNumGold ) |
| 0 | 6955 goto LABEL_88; |
| 501 | 6956 Party::TakeGold((unsigned int)pValue); |
| 6957 return result; | |
| 0 | 6958 case VAR_MightBonus: |
| 6959 case VAR_ActualMight: | |
| 501 | 6960 this->uMightBonus -= (unsigned __int16)pValue; |
| 605 | 6961 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6962 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6963 v8 = 8 * v4 + 400; | |
| 862 | 6964 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6965 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6966 return result; | |
| 0 | 6967 case VAR_IntellectBonus: |
| 6968 case VAR_ActualIntellect: | |
| 501 | 6969 this->uIntelligenceBonus -= (unsigned __int16)pValue; |
| 605 | 6970 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6971 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6972 v8 = 8 * v4 + 400; | |
| 862 | 6973 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6974 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6975 return result; | |
| 0 | 6976 case VAR_PersonalityBonus: |
| 6977 case VAR_ActualPersonality: | |
| 501 | 6978 this->uWillpowerBonus -= (unsigned __int16)pValue; |
| 605 | 6979 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6980 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6981 v8 = 8 * v4 + 400; | |
| 862 | 6982 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6983 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6984 return result; | |
| 0 | 6985 case VAR_EnduranceBonus: |
| 6986 case VAR_ActualEndurance: | |
| 501 | 6987 this->uEnduranceBonus -= (unsigned __int16)pValue; |
| 605 | 6988 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6989 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6990 v8 = 8 * v4 + 400; | |
| 862 | 6991 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 6992 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 6993 return result; | |
| 0 | 6994 case VAR_SpeedBonus: |
| 6995 case VAR_ActualSpeed: | |
| 501 | 6996 this->uSpeedBonus -= (unsigned __int16)pValue; |
| 605 | 6997 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 6998 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 6999 v8 = 8 * v4 + 400; | |
| 862 | 7000 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7001 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7002 return result; | |
| 0 | 7003 case VAR_AccuracyBonus: |
| 7004 case VAR_ActualAccuracy: | |
| 501 | 7005 this->uAccuracyBonus -= (unsigned __int16)pValue; |
| 605 | 7006 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 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_LuckBonus: |
| 7013 case VAR_ActualLuck: | |
| 501 | 7014 this->uLuckBonus -= (unsigned __int16)pValue; |
| 605 | 7015 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7016 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7017 v8 = 8 * v4 + 400; | |
| 862 | 7018 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7019 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7020 return result; | |
| 0 | 7021 case VAR_BaseMight: |
| 501 | 7022 this->uMight -= (unsigned __int16)pValue; |
| 605 | 7023 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7024 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7025 v8 = 8 * v4 + 400; | |
| 862 | 7026 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7027 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7028 return result; | |
| 0 | 7029 case VAR_BaseIntellect: |
| 501 | 7030 this->uIntelligence -= (unsigned __int16)pValue; |
| 605 | 7031 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7032 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7033 v8 = 8 * v4 + 400; | |
| 862 | 7034 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7035 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7036 return result; | |
| 0 | 7037 case VAR_BasePersonality: |
| 501 | 7038 this->uWillpower -= (unsigned __int16)pValue; |
| 605 | 7039 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7040 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7041 v8 = 8 * v4 + 400; | |
| 862 | 7042 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7043 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7044 return result; | |
| 0 | 7045 case VAR_BaseEndurance: |
| 501 | 7046 this->uEndurance -= (unsigned __int16)pValue; |
| 605 | 7047 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7048 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7049 v8 = 8 * v4 + 400; | |
| 862 | 7050 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7051 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7052 return result; | |
| 0 | 7053 case VAR_BaseSpeed: |
| 501 | 7054 this->uSpeed -= (unsigned __int16)pValue; |
| 605 | 7055 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7056 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7057 v8 = 8 * v4 + 400; | |
| 862 | 7058 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7059 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7060 return result; | |
| 0 | 7061 case VAR_BaseAccuracy: |
| 501 | 7062 this->uAccuracy -= (unsigned __int16)pValue; |
| 605 | 7063 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7064 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7065 v8 = 8 * v4 + 400; | |
| 862 | 7066 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7067 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7068 return result; | |
| 0 | 7069 case VAR_BaseLuck: |
| 501 | 7070 this->uLuck -= (unsigned __int16)pValue; |
| 605 | 7071 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7072 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7073 v8 = 8 * v4 + 400; | |
| 862 | 7074 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7075 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7076 return result; | |
| 0 | 7077 case VAR_FireResistance: |
| 501 | 7078 this->sResFireBase -= (signed __int16)pValue; |
| 605 | 7079 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7080 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7081 v8 = 8 * v4 + 400; | |
| 862 | 7082 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7083 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7084 return result; | |
| 0 | 7085 case VAR_AirResistance: |
| 501 | 7086 this->sResAirBase -= (signed __int16)pValue; |
| 605 | 7087 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7088 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7089 v8 = 8 * v4 + 400; | |
| 862 | 7090 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7091 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7092 return result; | |
| 0 | 7093 case VAR_WaterResistance: |
| 501 | 7094 this->sResWaterBase -= (signed __int16)pValue; |
| 605 | 7095 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7096 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7097 v8 = 8 * v4 + 400; | |
| 862 | 7098 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7099 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7100 return result; | |
| 0 | 7101 case VAR_EarthResistance: |
| 501 | 7102 this->sResEarthBase -= (signed __int16)pValue; |
| 605 | 7103 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7104 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7105 v8 = 8 * v4 + 400; | |
| 862 | 7106 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7107 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7108 return result; | |
| 0 | 7109 case VAR_SpiritResistance: |
| 501 | 7110 this->sResSpiritBase -= (signed __int16)pValue; |
| 605 | 7111 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7112 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7113 v8 = 8 * v4 + 400; | |
| 862 | 7114 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7115 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7116 return result; | |
| 0 | 7117 case VAR_MindResistance: |
| 501 | 7118 this->sResMindBase -= (signed __int16)pValue; |
| 605 | 7119 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7120 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7121 v8 = 8 * v4 + 400; | |
| 862 | 7122 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7123 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7124 return result; | |
| 0 | 7125 case VAR_BodyResistance: |
| 501 | 7126 this->sResBodyBase -= (signed __int16)pValue; |
| 605 | 7127 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7128 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7129 v8 = 8 * v4 + 400; | |
| 862 | 7130 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7131 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7132 return result; | |
| 0 | 7133 case VAR_LightResistance: |
| 501 | 7134 this->sResLightBase -= (signed __int16)pValue; |
| 605 | 7135 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7136 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7137 v8 = 8 * v4 + 400; | |
| 862 | 7138 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7139 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7140 return result; | |
| 0 | 7141 case VAR_DarkResistance: |
| 501 | 7142 this->sResDarkBase -= (signed __int16)pValue; |
| 605 | 7143 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7144 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7145 v8 = 8 * v4 + 400; | |
| 862 | 7146 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7147 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7148 return result; | |
| 0 | 7149 case VAR_MagicResistance: |
| 501 | 7150 this->sResMagicBase -= (signed __int16)pValue; |
| 605 | 7151 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7152 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7153 v8 = 8 * v4 + 400; | |
| 862 | 7154 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7155 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7156 return result; | |
| 0 | 7157 case VAR_FireResistanceBonus: |
| 501 | 7158 this->sResFireBonus -= (signed __int16)pValue; |
| 605 | 7159 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7160 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7161 v8 = 8 * v4 + 400; | |
| 862 | 7162 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7163 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7164 return result; | |
| 0 | 7165 case VAR_AirResistanceBonus: |
| 501 | 7166 this->sResAirBonus -= (signed __int16)pValue; |
| 605 | 7167 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7168 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7169 v8 = 8 * v4 + 400; | |
| 862 | 7170 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7171 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7172 return result; | |
| 0 | 7173 case VAR_WaterResistanceBonus: |
| 501 | 7174 this->sResWaterBonus -= (signed __int16)pValue; |
| 605 | 7175 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7176 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7177 v8 = 8 * v4 + 400; | |
| 862 | 7178 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7179 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7180 return result; | |
| 0 | 7181 case VAR_EarthResistanceBonus: |
| 501 | 7182 this->sResEarthBonus -= (signed __int16)pValue; |
| 605 | 7183 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7184 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7185 v8 = 8 * v4 + 400; | |
| 862 | 7186 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7187 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7188 return result; | |
| 0 | 7189 case VAR_SpiritResistanceBonus: |
| 501 | 7190 this->sResSpiritBonus -= (signed __int16)pValue; |
| 605 | 7191 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7192 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7193 v8 = 8 * v4 + 400; | |
| 862 | 7194 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7195 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7196 return result; | |
| 0 | 7197 case VAR_MindResistanceBonus: |
| 501 | 7198 this->sResMindBonus -= (signed __int16)pValue; |
| 605 | 7199 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7200 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7201 v8 = 8 * v4 + 400; | |
| 862 | 7202 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7203 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7204 return result; | |
| 0 | 7205 case VAR_BodyResistanceBonus: |
| 501 | 7206 this->sResBodyBonus -= (signed __int16)pValue; |
| 605 | 7207 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7208 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7209 v8 = 8 * v4 + 400; | |
| 862 | 7210 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7211 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7212 return result; | |
| 0 | 7213 case VAR_LightResistanceBonus: |
| 501 | 7214 this->sResLightBonus -= (signed __int16)pValue; |
| 605 | 7215 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 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_DarkResistanceBonus: |
| 501 | 7222 this->sResDarkBonus -= (signed __int16)pValue; |
| 605 | 7223 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7224 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7225 v8 = 8 * v4 + 400; | |
| 862 | 7226 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7227 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7228 return result; | |
| 0 | 7229 case VAR_MagicResistanceBonus: |
| 501 | 7230 this->sResMagicBonus -= (signed __int16)pValue; |
| 0 | 7231 v25 = 0; |
| 187 | 7232 v23 = SPEECH_91; |
| 7233 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)v23, v25); | |
| 605 | 7234 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7235 v8 = 8 * v4 + 400; | |
| 862 | 7236 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7237 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7238 return result; | |
| 0 | 7239 case VAR_FixedFood: |
| 501 | 7240 Party::TakeFood((unsigned int)pValue); |
| 605 | 7241 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7242 v8 = 8 * v4 + 400; | |
| 862 | 7243 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7244 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7245 return result; | |
| 0 | 7246 case VAR_StaffSkill: |
| 7247 case VAR_SwordSkill: | |
| 7248 case VAR_DaggerSkill: | |
| 7249 case VAR_AxeSkill: | |
| 7250 case VAR_SpearSkill: | |
| 7251 case VAR_BowSkill: | |
| 7252 case VAR_MaceSkill: | |
| 7253 case VAR_BlasterSkill: | |
| 7254 case VAR_ShieldSkill: | |
| 7255 case VAR_LeatherSkill: | |
| 7256 case VAR_SkillChain: | |
| 7257 case VAR_PlateSkill: | |
| 7258 case VAR_FireSkill: | |
| 7259 case VAR_AirSkill: | |
| 7260 case VAR_WaterSkill: | |
| 7261 case VAR_EarthSkill: | |
| 7262 case VAR_SpiritSkill: | |
| 7263 case VAR_MindSkill: | |
| 7264 case VAR_BodySkill: | |
| 7265 case VAR_LightSkill: | |
| 7266 case VAR_DarkSkill: | |
| 7267 case VAR_IdentifyItemSkill: | |
| 7268 case VAR_MerchantSkill: | |
| 7269 case VAR_RepairSkill: | |
| 7270 case VAR_BodybuildingSkill: | |
| 7271 case VAR_MeditationSkill: | |
| 7272 case VAR_PerceptionSkill: | |
| 7273 case VAR_DiplomacySkill: | |
| 7274 case VAR_DisarmTrapSkill: | |
| 7275 case VAR_LearningSkill: | |
| 501 | 7276 *((short *)&this->pConditions[16] + VarNum) -= (unsigned __int8)pValue; |
| 605 | 7277 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7278 v8 = 8 * v4 + 400; | |
| 862 | 7279 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7280 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7281 return result; | |
| 0 | 7282 case VAR_Cursed: |
| 7283 case VAR_Weak: | |
| 7284 case VAR_Asleep: | |
| 7285 case VAR_Afraid: | |
| 7286 case VAR_Drunk: | |
| 7287 case VAR_Insane: | |
| 7288 case VAR_PoisonedGreen: | |
| 7289 case VAR_DiseasedGreen: | |
| 7290 case VAR_PoisonedYellow: | |
| 7291 case VAR_DiseasedYellow: | |
| 7292 case VAR_PoisonedRed: | |
| 7293 case VAR_DiseasedRed: | |
| 7294 case VAR_Paralyzed: | |
| 7295 case VAR_Unconsious: | |
| 7296 case VAR_Dead: | |
| 7297 case VAR_Stoned: | |
| 7298 case VAR_Eradicated: | |
| 1071 | 7299 //*((int *)this + 2 * VarNum - 210) = 0; |
| 7300 //*((int *)this + 2 * result - 209) = 0; | |
| 7301 this->pConditions[VarNum] = 0; | |
| 0 | 7302 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7303 v8 = 8 * v4 + 400; | |
| 862 | 7304 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 0 | 7305 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 501 | 7306 return result; |
| 605 | 7307 default: |
| 7308 return result; | |
| 7309 } | |
| 7310 for (v3 = 1; v3 < 126; v3++) | |
| 7311 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7312 if ( *(&this->pInventoryItemList[pInventoryMatrix[v3] - 1].uItemID) == pValue ) |
| 0 | 7313 { |
| 605 | 7314 RemoveItemAtInventoryIndex(v3); |
| 501 | 7315 return true; |
| 0 | 7316 } |
| 605 | 7317 } |
| 501 | 7318 if ( pParty->pPickedItem.uItemID == pValue ) |
| 7319 { | |
| 605 | 7320 pMouse->RemoveHoldingItem(); |
| 7321 return true; | |
| 7322 } | |
| 7323 return false; | |
| 0 | 7324 } |
| 7325 } | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
7326 |
| 1430 | 7327 //assert(false); |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
7328 return false; |
| 0 | 7329 } |
| 7330 // 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
|
7331 // 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
|
7332 |
|
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 //----- (00467E7F) -------------------------------------------------------- |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7335 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
|
7336 { |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7337 //unsigned int v1; // esi@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7338 int v2; // ebx@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7339 Player *v3; // eax@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7340 int v4; // edx@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7341 int v5; // esi@2 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7342 //int v6; // eax@2 |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
7343 int v7; // eax@3 |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7344 ItemGen _this; // [sp+Ch] [bp-30h]@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7345 //Player *v9; // [sp+30h] [bp-Ch]@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7346 int v10; // [sp+34h] [bp-8h]@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7347 int *v11; // [sp+38h] [bp-4h]@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7348 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7349 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7350 _this.Reset(); |
| 1374 | 7351 v2 = pEquipTypeToBodyAnchor[uEquipType]; |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7352 v3 = pPlayers[uActiveCharacter]; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7353 v11 = (int *)&v3->pEquipment.pIndices[v2]; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7354 v4 = *v11; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7355 v10 = *v11; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7356 if ( v10 ) |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7357 { |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7358 memcpy(&_this, &pParty->pPickedItem, sizeof(_this)); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7359 v5 = (int)((char *)v3 + 4 * (9 * v4 - 9)); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7360 *(char *)(v5 + 556) = 0; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7361 pParty->pPickedItem.Reset(); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7362 pParty->SetHoldingItem((ItemGen *)(v5 + 532)); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7363 _this.uBodyAnchor = v2 + 1; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7364 memcpy((void *)(v5 + 532), &_this, 0x24u); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7365 *v11 = v10; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7366 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7367 else |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7368 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7369 v7 = v3->FindFreeInventoryListSlot(); |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7370 if (v7 >= 0) |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7371 { |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7372 pParty->pPickedItem.uBodyAnchor = v2 + 1; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7373 memcpy(&v3->pInventoryItemList[v7], &pParty->pPickedItem, sizeof(v3->pInventoryItemList[v7])); |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7374 *v11 = v7 + 1; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7375 pMouse->RemoveHoldingItem(); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7376 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7377 } |
| 1295 | 7378 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7379 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7380 |
| 1295 | 7381 //----- (0049387A) -------------------------------------------------------- |
| 1459 | 7382 int CycleCharacter(bool backwards) |
| 1295 | 7383 { |
| 7384 signed int result; // eax@1 | |
| 7385 signed int v2; // ecx@2 | |
| 7386 signed int v3; // ecx@8 | |
| 7387 | |
| 7388 result = uActiveCharacter; | |
| 1459 | 7389 if ( backwards ) |
| 1295 | 7390 { |
| 7391 v2 = 0; | |
| 7392 while ( 1 ) | |
| 7393 { | |
| 7394 --result; | |
| 7395 if ( result < 1 ) | |
| 7396 result = 4; | |
| 7397 if ( !pPlayers[result]->uTimeToRecovery ) | |
| 7398 break; | |
| 7399 ++v2; | |
| 7400 if ( v2 >= 4 ) | |
| 7401 return uActiveCharacter; | |
| 7402 } | |
| 7403 } | |
| 7404 else | |
| 7405 { | |
| 7406 v3 = 0; | |
| 7407 while ( 1 ) | |
| 7408 { | |
| 7409 ++result; | |
| 7410 if ( result > 4 ) | |
| 7411 result = 1; | |
| 7412 if ( !pPlayers[result]->uTimeToRecovery ) | |
| 7413 break; | |
| 7414 ++v3; | |
| 7415 if ( v3 >= 4 ) | |
| 7416 return uActiveCharacter; | |
| 7417 } | |
| 7418 } | |
| 7419 return result; | |
| 1297 | 7420 } |
| 7421 //----- (0043EE77) -------------------------------------------------------- | |
| 7422 bool __fastcall sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(signed int a1) | |
| 7423 { | |
| 7424 bool result; // eax@0 | |
| 7425 Player *v2; // edx@3 | |
| 7426 int v3; // ecx@3 | |
| 7427 Player **pPlayers; // esi@8 | |
| 1424 | 7428 //bool item_flag; |
| 1297 | 7429 Player *v6; // edx@9 |
| 7430 | |
| 1424 | 7431 //if ( a1 < 1 || a1 > 4 ) |
| 7432 //{ | |
| 7433 //if ( !a1 ) | |
| 7434 //{ | |
| 7435 //pPlayers = &::pPlayers[1]; | |
| 7436 //v5 = 604; | |
| 7437 //while ( 1 ) | |
| 1545 | 7438 Assert ( a1 > 0 && a1 < 5 ); |
| 1432 | 7439 for ( uint i = 1; i < 5; ++i ) |
| 1424 | 7440 { |
| 7441 //item_flag = Player_has_item(604, *pPlayers, 0); | |
| 7442 if ( !Player_has_item(604, ::pPlayers[i], 0) ) | |
| 7443 return false; | |
| 7444 //__debugbreak(); // player.cpp(8748): warning C4700: uninitialized local variable 'v6' used | |
| 7445 //result = ::pPlayers[i]->pEquipment.uArmor; | |
| 7446 if ( !::pPlayers[i]->pEquipment.uArmor ) | |
| 7447 return false; | |
| 7448 //result *= 9; | |
| 1432 | 7449 if (::pPlayers[i]->pEquippedItems[::pPlayers[i]->pEquipment.uArmor].uItemID != 604 ) |
| 1424 | 7450 return false; |
| 7451 //++pPlayers; | |
| 7452 //if ( (signed int)pPlayers >= (signed int)&qword_A750D8 ) | |
| 7453 //return true; | |
| 7454 } | |
| 7455 return true; | |
| 7456 } | |
| 1432 | 7457 |
| 1297 | 7458 //----- (0043EE15) -------------------------------------------------------- |
| 7459 bool __fastcall Player_has_item(unsigned int uItemID, Player *pPlayer, char a3) | |
| 7460 { | |
| 7461 if ( !a3 || pParty->pPickedItem.uItemID != uItemID ) | |
| 7462 { | |
| 7463 for ( uint i = 0; i < 126; ++i ) | |
| 7464 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7465 if ( pPlayer->pInventoryMatrix[i] > 0 ) |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7466 { |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7467 if ( (unsigned int)pPlayer->pInventoryItemList[pPlayer->pInventoryMatrix[i] - 1].uItemID == uItemID ) |
| 1297 | 7468 return true; |
| 7469 } | |
| 7470 } | |
| 7471 for ( uint i = 0; i < 16; ++i ) | |
| 7472 { | |
| 7473 if ( pPlayer->pEquipment.pIndices[i] ) | |
| 7474 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7475 if ( (unsigned int)pPlayer->pInventoryItemList[pPlayer->pEquipment.pIndices[i] - 1].uItemID == uItemID ) |
| 1297 | 7476 return true; |
| 7477 } | |
| 7478 } | |
| 7479 } | |
| 7480 return false; | |
| 7481 } | |
| 7482 //----- (0043EDB9) -------------------------------------------------------- | |
| 1458 | 7483 bool sub_43EDB9_get_some_race_sex_relation_2(unsigned int a1) |
| 1297 | 7484 { |
| 7485 unsigned int pNum; // ebp@1 | |
| 7486 Player **pPlayer; // ebx@1 | |
| 7487 Player *pPlayer2; // esi@2 | |
| 7488 enum CHARACTER_RACE pRace; // edi@2 | |
| 7489 bool pSex; // eax@2 | |
| 7490 char v6; // zf@7 | |
| 7491 | |
| 7492 //pPlayer = &pPlayers[1]; | |
| 7493 /*pNum = a1; | |
| 7494 | |
| 7495 while ( 1 ) | |
| 7496 { | |
| 7497 pPlayer2 = *pPlayer; | |
| 7498 pRace = pPlayer2->GetRace(); | |
| 7499 pSex = pPlayer2->GetSexByVoice(); | |
| 7500 if ( !pRace ) | |
| 7501 break; | |
| 7502 if ( pRace == 1 || pRace == 2 ) | |
| 7503 break; | |
| 7504 if ( !pSex && pNum == 2 )// | |
| 7505 //goto LABEL_15; | |
| 7506 { | |
| 7507 pSex = 1; | |
| 7508 return pSex; | |
| 7509 } | |
| 7510 v6 = pNum == 3;// | |
| 7511 LABEL_11: | |
| 7512 if ( v6 ) | |
| 7513 //goto LABEL_15; | |
| 7514 { | |
| 7515 pSex = 1; | |
| 7516 return pSex; | |
| 7517 } | |
| 7518 ++pPlayer; | |
| 7519 if ( (signed int)pPlayer >= (signed int)&qword_A750D8 )// | |
| 7520 { | |
| 7521 pSex = 0; | |
| 7522 return pSex; | |
| 7523 } | |
| 7524 } | |
| 7525 if ( pSex || pNum ) | |
| 7526 { | |
| 7527 v6 = pNum == 1; | |
| 7528 goto LABEL_11; | |
| 7529 } | |
| 7530 //LABEL_15: | |
| 7531 pSex = 1; | |
| 7532 return pSex;*/ | |
| 7533 for (uint i = 1; i <= 4; ++i) | |
| 7534 { | |
| 7535 pRace = pPlayers[i]->GetRace(); | |
| 7536 pSex = pPlayers[i]->GetSexByVoice(); | |
| 7537 if (pRace == 0 || pRace == 1 || pRace == 2 || pSex == 0 ) | |
| 7538 return 1; | |
| 7539 } | |
| 7540 return 0; | |
| 7541 } | |
| 7542 //----- (0043ED6F) -------------------------------------------------------- | |
| 7543 bool _43ED6F_check_party_races(bool a1) | |
| 7544 { | |
| 7545 bool v6; // zf@5 | |
| 7546 | |
| 7547 for (uint i = 0; i < 4; ++i) | |
| 7548 { | |
| 7549 auto player = pParty->pPlayers + i; | |
| 7550 auto race = player->GetRace(); | |
| 7551 | |
| 7552 if (race != CHARACTER_RACE_HUMAN && | |
| 7553 race != CHARACTER_RACE_ELF && | |
| 7554 race != CHARACTER_RACE_GOBLIN) | |
| 7555 v6 = a1 == 1; | |
| 7556 else | |
| 7557 v6 = !a1; | |
| 7558 | |
| 7559 if (v6) | |
| 7560 return true; | |
| 7561 } | |
| 7562 return false; | |
| 7563 } | |
| 7564 //----- (00439FCB) -------------------------------------------------------- | |
| 7565 void __fastcall DamagePlayerFromMonster(unsigned int uObjID, int a2, Vec3_int_ *pPos, unsigned int a4) | |
| 7566 { | |
| 7567 signed int v4; // esi@1 | |
| 7568 unsigned int v5; // ecx@1 | |
| 7569 Player *v6; // ebx@3 | |
| 7570 Actor *v7; // esi@3 | |
| 7571 unsigned int v8; // eax@4 | |
| 7572 char *v9; // eax@5 | |
| 7573 signed int v10; // eax@6 | |
| 7574 int v11; // edx@8 | |
| 7575 int v12; // edx@9 | |
| 7576 int v13; // edx@10 | |
| 7577 int v14; // edx@16 | |
| 7578 int v15; // edx@17 | |
| 7579 int v16; // edx@18 | |
| 7580 enum SoundID v17; // eax@24 | |
| 7581 int v18; // eax@26 | |
| 7582 unsigned __int8 v19; // zf@26 | |
| 7583 unsigned __int8 v20; // sf@26 | |
| 7584 unsigned __int16 v21; // ax@29 | |
| 7585 signed int v22; // edi@36 | |
| 7586 int v23; // eax@38 | |
| 7587 signed int v24; // eax@44 | |
| 7588 unsigned __int16 v25; // cx@47 | |
| 7589 signed int v26; // eax@49 | |
| 7590 int v27; // eax@54 | |
| 7591 float v28; // ST18_4@58 | |
| 7592 double v29; // st7@58 | |
| 7593 float v30; // ST08_4@58 | |
| 7594 double v31; // st7@58 | |
| 7595 float v32; // ST04_4@58 | |
| 7596 float v33; // ST00_4@58 | |
| 7597 int v34; // edi@61 | |
| 7598 int v35; // eax@70 | |
| 7599 double v36; // st7@70 | |
| 7600 SpriteObject *v37; // ebx@77 | |
| 7601 int v38; // edi@77 | |
| 7602 int v39; // esi@77 | |
| 7603 int v40; // eax@77 | |
| 7604 int v41; // eax@77 | |
| 7605 int v42; // eax@78 | |
| 7606 Player *v43; // eax@81 | |
| 7607 Actor *v44; // esi@82 | |
| 7608 Player *v45; // edi@84 | |
| 7609 unsigned __int16 v46; // ax@84 | |
| 7610 int v47; // ebx@105 | |
| 7611 int v48; // eax@107 | |
| 7612 unsigned __int16 v49; // ax@116 | |
| 7613 int v50; // ebx@123 | |
| 7614 unsigned __int16 v51; // ax@124 | |
| 7615 char v52; // bl@124 | |
| 7616 int v53; // eax@128 | |
| 7617 signed int v54; // eax@134 | |
| 7618 unsigned __int16 v55; // cx@137 | |
| 7619 signed int v56; // eax@139 | |
| 7620 int v57; // eax@144 | |
| 7621 float v58; // ST18_4@148 | |
| 7622 double v59; // st7@148 | |
| 7623 float v60; // ST08_4@148 | |
| 7624 double v61; // st7@148 | |
| 7625 float v62; // ST04_4@148 | |
| 7626 float v63; // ST00_4@148 | |
| 7627 int v64; // ebx@151 | |
| 7628 int v65; // eax@161 | |
| 7629 double v66; // st7@161 | |
| 7630 signed int v67; // ecx@164 | |
| 7631 signed int v68; // eax@170 | |
| 7632 int v69; // ecx@170 | |
| 7633 int v70; // eax@171 | |
| 7634 enum SoundID v71; // [sp+20h] [bp-34h]@12 | |
| 7635 int v72; // [sp+30h] [bp-24h]@164 | |
| 7636 double v73; // [sp+40h] [bp-14h]@72 | |
| 7637 signed int v74; // [sp+44h] [bp-10h]@1 | |
| 7638 unsigned int v75; // [sp+48h] [bp-Ch]@3 | |
| 7639 unsigned int uActorID; // [sp+4Ch] [bp-8h]@1 | |
| 7640 int v77; // [sp+50h] [bp-4h]@26 | |
| 7641 signed int a4a; // [sp+60h] [bp+Ch]@162 | |
| 7642 Player *a4b; // [sp+60h] [bp+Ch]@168 | |
| 7643 | |
| 7644 v4 = PID_ID(uObjID); | |
| 7645 v5 = PID_TYPE(uObjID) - 2; | |
| 7646 v74 = a2; | |
| 7647 uActorID = v4; | |
| 7648 if ( v5 ) | |
| 7649 { | |
| 7650 if ( v5 != 1 | |
| 7651 || (v6 = &pParty->pPlayers[a4], v7 = &pActors[v4], | |
| 7652 v75 = v6->sHealth, | |
| 7653 !stru_50C198.ActorHitOrMiss(v7, v6)) ) | |
| 7654 return; | |
| 7655 v8 = v6->pEquipment.uArmor; | |
| 7656 if ( !v8 | |
| 7657 || (v9 = (char *)v6 + 36 * v8, v9[516] & 2) | |
| 7658 || (v10 = pItemsTable->pItems[*((int *)v9 + 124)].uSkillType, v10 < 10) | |
| 7659 || v10 > 11 ) | |
| 7660 { | |
| 7661 v14 = rand() % 4; | |
| 7662 if ( !v14 ) | |
| 7663 { | |
| 7664 v71 = (SoundID)108; | |
| 7665 goto LABEL_24; | |
| 7666 } | |
| 7667 v15 = v14 - 1; | |
| 7668 if ( !v15 ) | |
| 7669 { | |
| 7670 v71 = (SoundID)109; | |
| 7671 goto LABEL_24; | |
| 7672 } | |
| 7673 v16 = v15 - 1; | |
| 7674 if ( !v16 ) | |
| 7675 { | |
| 7676 v71 = (SoundID)110; | |
| 7677 goto LABEL_24; | |
| 7678 } | |
| 7679 if ( v16 == 1 ) | |
| 7680 { | |
| 7681 v71 = (SoundID)44; | |
| 7682 goto LABEL_24; | |
| 7683 } | |
| 7684 } | |
| 7685 else | |
| 7686 { | |
| 7687 v11 = rand() % 4; | |
| 7688 if ( !v11 ) | |
| 7689 { | |
| 7690 v71 = (SoundID)105; | |
| 7691 goto LABEL_24; | |
| 7692 } | |
| 7693 v12 = v11 - 1; | |
| 7694 if ( !v12 ) | |
| 7695 { | |
| 7696 v71 = (SoundID)106; | |
| 7697 goto LABEL_24; | |
| 7698 } | |
| 7699 v13 = v12 - 1; | |
| 7700 if ( !v13 ) | |
| 7701 { | |
| 7702 v71 = (SoundID)107; | |
| 7703 goto LABEL_24; | |
| 7704 } | |
| 7705 if ( v13 == 1 ) | |
| 7706 { | |
| 7707 v71 = (SoundID)45; | |
| 7708 LABEL_24: | |
| 7709 v17 = v71; | |
| 7710 goto LABEL_26; | |
| 7711 } | |
| 7712 } | |
| 7713 v17 = (SoundID)a4; | |
| 7714 LABEL_26: | |
| 7715 pAudioPlayer->PlaySound(v17, PID(OBJECT_Player,a4 + 80), 0, -1, 0, 0, 0, 0); | |
| 7716 v18 = Actor::_43B3E0_CalcDamage(v7, v74); | |
| 7717 v19 = HIDWORD(v7->pActorBuffs[3].uExpireTime) == 0; | |
| 7718 v20 = SHIDWORD(v7->pActorBuffs[3].uExpireTime) < 0; | |
| 7719 v77 = v18; | |
| 7720 if ( !v20 && (!(v20 | v19) || LODWORD(v7->pActorBuffs[3].uExpireTime) > 0) ) | |
| 7721 { | |
| 7722 v21 = v7->pActorBuffs[3].uPower; | |
| 7723 if ( v21 ) | |
| 7724 v77 /= (signed int)v21; | |
| 7725 } | |
| 7726 if ( v74 ) | |
| 7727 { | |
| 7728 if ( v74 == 1 ) | |
| 7729 { | |
| 7730 v22 = v7->pMonsterInfo.uAttack2Type; | |
| 7731 } | |
| 7732 else | |
| 7733 { | |
| 7734 if ( v74 == 2 ) | |
| 7735 { | |
| 7736 v23 = v7->pMonsterInfo.uSpell1ID; | |
| 7737 } | |
| 7738 else | |
| 7739 { | |
| 7740 if ( v74 != 3 ) | |
| 7741 { | |
| 7742 if ( v74 == 4 ) | |
| 7743 v22 = v7->pMonsterInfo.field_3C_some_special_attack; | |
| 7744 else | |
| 7745 v22 = 4; | |
| 7746 goto LABEL_43; | |
| 7747 } | |
| 7748 v23 = v7->pMonsterInfo.uSpell2ID; | |
| 7749 } | |
| 7750 v22 = LOBYTE(pSpellStats->pInfos[v23].uSchool); | |
| 7751 } | |
| 7752 } | |
| 7753 else | |
| 7754 { | |
| 7755 v22 = v7->pMonsterInfo.uAttack1Type; | |
| 7756 } | |
| 7757 LABEL_43: | |
| 7758 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) | |
| 7759 { | |
| 7760 v24 = v6->ReceiveDamage(v77, (DAMAGE_TYPE)v22); | |
| 7761 if ( SHIDWORD(v6->pPlayerBuffs[10].uExpireTime) >= 0 | |
| 7762 && (SHIDWORD(v6->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v6->pPlayerBuffs[10].uExpireTime)) ) | |
| 7763 { | |
| 7764 v25 = v7->uAIState; | |
| 7765 if ( v25 != 5 ) | |
| 7766 { | |
| 7767 if ( v25 != 4 ) | |
| 7768 { | |
| 7769 v26 = stru_50C198.CalcMagicalDamageToActor(v7, v22, v24); | |
| 7770 v7->sCurrentHP -= v26; | |
| 7771 if ( v26 ) | |
| 7772 { | |
| 7773 if ( v7->sCurrentHP >= 1 ) | |
| 7774 { | |
| 7775 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); | |
| 7776 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 7777 } | |
| 7778 else | |
| 7779 { | |
| 7780 if ( pMonsterStats->pInfos[v7->pMonsterInfo.uID].bQuestMonster & 1 ) | |
| 7781 { | |
| 7782 v27 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * v7->uActorRadius : v7->uActorRadius; | |
| 7783 v74 = v27; | |
| 7784 if ( pRenderer->pRenderD3D ) | |
| 7785 { | |
| 7786 if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) | |
| 7787 { | |
| 7788 v28 = (double)v74; | |
| 7789 v74 = v7->vPosition.z; | |
| 7790 v29 = (double)v74; | |
| 7791 v74 = v7->vPosition.y; | |
| 7792 v30 = v29; | |
| 7793 v31 = (double)v74; | |
| 7794 v74 = v7->vPosition.x; | |
| 7795 v32 = v31; | |
| 7796 v33 = (double)v74; | |
| 7797 pDecalBuilder->AddBloodsplat(v33, v32, v30, 1.0, 0.0, 0.0, v28, 0, 0); | |
| 7798 } | |
| 7799 } | |
| 7800 } | |
| 7801 Actor::Die(uActorID); | |
| 7802 Actor::ApplyFineForKillingPeasant(uActorID); | |
| 7803 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 7804 if ( v7->pMonsterInfo.uExp ) | |
| 7805 GivePartyExp(pMonsterStats->pInfos[v7->pMonsterInfo.uID].uExp); | |
| 7806 v34 = SPEECH_51; | |
| 7807 if ( rand() % 100 < 20 ) | |
| 7808 v34 = ((signed int)v7->pMonsterInfo.uHP >= 100) + 1; | |
| 7809 v6->PlaySound((PlayerSpeech)v34, 0); | |
| 7810 } | |
| 7811 } | |
| 7812 } | |
| 7813 } | |
| 7814 } | |
| 7815 if ( !(dword_6BE368_debug_settings_2 & 0x10) | |
| 7816 && v7->pMonsterInfo.uSpecialAttack | |
| 7817 && rand() % 100 < v7->pMonsterInfo.uLevel * v7->pMonsterInfo.uSpecialAttackType ) | |
| 7818 v6->_48DCF6(v7->pMonsterInfo.uSpecialAttack, v7); | |
| 7819 } | |
| 7820 if ( !pParty->bTurnBasedModeOn ) | |
| 7821 { | |
| 7822 v35 = v6->GetActualEndurance(); | |
| 7823 v36 = (double)(20 - v6->GetParameterBonus(v35)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333; | |
| 7824 v6->SetRecoveryTime((signed __int64)v36); | |
| 7825 } | |
| 7826 if ( v77 ) | |
| 7827 { | |
| 7828 v73 = (double)(signed int)v75; | |
| 7829 if ( (double)v6->GetMaxHealth() * 0.25 < v73 ) | |
| 7830 { | |
| 7831 if ( v6->sHealth > 0 ) | |
| 7832 { | |
| 7833 if ( (double)v6->GetMaxHealth() * 0.25 >= (double)v6->sHealth ) | |
| 7834 v6->PlaySound(SPEECH_48, 0); | |
| 7835 } | |
| 7836 } | |
| 7837 } | |
| 7838 viewparams->bRedrawGameUI = 1; | |
| 7839 return; | |
| 7840 } | |
| 7841 v37 = &pSpriteObjects[uActorID]; | |
| 7842 v38 = PID_TYPE(v37->spell_caster_pid); | |
| 7843 v39 = PID_ID(v37->spell_caster_pid); | |
| 7844 v40 = PID_TYPE(v37->spell_caster_pid); | |
| 7845 uActorID = PID_ID(v37->spell_caster_pid); | |
| 7846 v41 = v40 - 2; | |
| 7847 if ( !v41 ) | |
| 7848 goto LABEL_80; | |
| 7849 v42 = v41 - 1; | |
| 7850 if ( !v42 ) | |
| 7851 { | |
| 7852 v44 = &pActors[v39]; | |
| 7853 if ( a4 == -1 ) | |
| 7854 a4 = stru_50C198.which_player_would_attack(v44); | |
| 7855 v45 = &pParty->pPlayers[a4]; | |
| 7856 v77 = Actor::_43B3E0_CalcDamage(v44, v74); | |
| 7857 v46 = v37->uType; | |
| 7858 if ( v37->uType == 545 ) | |
| 7859 { | |
| 7860 LOBYTE(v51) = v45->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 7861 v52 = v51; | |
| 7862 if ( (signed int)SkillToMastery(v51) >= 4 && rand() % 100 < (v52 & 0x3F) ) | |
| 7863 { | |
| 7864 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], v45->pName); | |
| 7865 ShowStatusBarString(pTmpBuf.data(), 2u); | |
| 7866 v45->PlaySound(SPEECH_6, 0); | |
| 7867 return; | |
| 7868 } | |
| 7869 } | |
| 7870 else | |
| 7871 { | |
| 7872 if ( v46 != 555 | |
| 7873 && v46 != 510 | |
| 7874 && v46 != 500 | |
| 7875 && v46 != 515 | |
| 7876 && v46 != 505 | |
| 7877 && v46 != 530 | |
| 7878 && v46 != 525 | |
| 7879 && v46 != 520 | |
| 7880 && v46 != 535 | |
| 7881 && v46 != 540 ) | |
| 7882 goto LABEL_115; | |
| 7883 } | |
| 7884 if ( !stru_50C198.ActorHitOrMiss(v44, v45) ) | |
| 7885 return; | |
| 7886 if ( (signed __int64)v45->pPlayerBuffs[13].uExpireTime > 0 ) | |
| 7887 v77 >>= 1; | |
| 7888 if ( v45->HasEnchantedItemEquipped(36) ) | |
| 7889 v77 >>= 1; | |
| 7890 if ( v45->HasEnchantedItemEquipped(69) ) | |
| 7891 v77 >>= 1; | |
| 7892 if ( v45->HasItemEquipped(EQUIP_ARMOUR) | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7893 && *(_DWORD *)&v45->pInventoryItemList[v45->pEquipment.uArmor-1] == 504 ) |
| 1297 | 7894 v77 >>= 1; |
| 7895 v75 = 0; | |
| 7896 v47 = (int)&v45->pEquipment; | |
| 7897 do | |
| 7898 { | |
| 7899 if ( v45->HasItemEquipped((ITEM_EQUIP_TYPE)v75) ) | |
| 7900 { | |
| 7901 v48 = *(int *)&v45[36 * *(int *)v47 + 496]; | |
| 7902 if ( v48 == 520 ) | |
| 7903 v77 >>= 1; | |
| 7904 if ( v48 == 531 ) | |
| 7905 v77 >>= 1; | |
| 7906 if ( v45->GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v75) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4 ) | |
| 7907 v77 >>= 1; | |
| 7908 } | |
| 7909 ++v75; | |
| 7910 v47 += 4; | |
| 7911 } | |
| 7912 while ( (signed int)v75 <= 1 ); | |
| 7913 LABEL_115: | |
| 7914 if ( (signed __int64)v44->pActorBuffs[3].uExpireTime > 0 ) | |
| 7915 { | |
| 7916 v49 = v44->pActorBuffs[3].uPower; | |
| 7917 if ( v49 ) | |
| 7918 v77 /= (signed int)v49; | |
| 7919 } | |
| 7920 if ( !v74 ) | |
| 7921 { | |
| 7922 v50 = v44->pMonsterInfo.uAttack1Type; | |
| 7923 goto LABEL_133; | |
| 7924 } | |
| 7925 if ( v74 == 1 ) | |
| 7926 { | |
| 7927 v50 = v44->pMonsterInfo.uAttack2Type; | |
| 7928 goto LABEL_133; | |
| 7929 } | |
| 7930 if ( v74 == 2 ) | |
| 7931 { | |
| 7932 v53 = v44->pMonsterInfo.uSpell1ID; | |
| 7933 } | |
| 7934 else | |
| 7935 { | |
| 7936 if ( v74 != 3 ) | |
| 7937 { | |
| 7938 if ( v74 == 4 ) | |
| 7939 v50 = v44->pMonsterInfo.field_3C_some_special_attack; | |
| 7940 else | |
| 7941 v50 = 4; | |
| 7942 LABEL_133: | |
| 7943 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) | |
| 7944 { | |
| 7945 v54 = v45->ReceiveDamage(v77, (DAMAGE_TYPE)v50); | |
| 7946 if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) >= 0 ) | |
| 7947 { | |
| 7948 if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v45->pPlayerBuffs[10].uExpireTime) ) | |
| 7949 { | |
| 7950 v55 = v44->uAIState; | |
| 7951 if ( v55 != 5 ) | |
| 7952 { | |
| 7953 if ( v55 != 4 ) | |
| 7954 { | |
| 7955 v56 = stru_50C198.CalcMagicalDamageToActor(v44, v50, v54); | |
| 7956 v44->sCurrentHP -= v56; | |
| 7957 if ( v56 ) | |
| 7958 { | |
| 7959 if ( v44->sCurrentHP >= 1 ) | |
| 7960 { | |
| 7961 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); | |
| 7962 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 7963 } | |
| 7964 else | |
| 7965 { | |
| 7966 if ( pMonsterStats->pInfos[v44->pMonsterInfo.uID].bQuestMonster & 1 ) | |
| 7967 { | |
| 7968 v57 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * v44->uActorRadius : v44->uActorRadius; | |
| 7969 v75 = v57; | |
| 7970 if ( pRenderer->pRenderD3D ) | |
| 7971 { | |
| 7972 if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) | |
| 7973 { | |
| 7974 v58 = (double)(signed int)v75; | |
| 7975 v75 = v44->vPosition.z; | |
| 7976 v59 = (double)(signed int)v75; | |
| 7977 v75 = v44->vPosition.y; | |
| 7978 v60 = v59; | |
| 7979 v61 = (double)(signed int)v75; | |
| 7980 v75 = v44->vPosition.x; | |
| 7981 v62 = v61; | |
| 7982 v63 = (double)(signed int)v75; | |
| 7983 pDecalBuilder->AddBloodsplat(v63, v62, v60, 1.0, 0.0, 0.0, v58, 0, 0); | |
| 7984 } | |
| 7985 } | |
| 7986 } | |
| 7987 Actor::Die(uActorID); | |
| 7988 Actor::ApplyFineForKillingPeasant(uActorID); | |
| 7989 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 7990 if ( v44->pMonsterInfo.uExp ) | |
| 7991 GivePartyExp(pMonsterStats->pInfos[v44->pMonsterInfo.uID].uExp); | |
| 7992 v64 = SPEECH_51; | |
| 7993 if ( rand() % 100 < 20 ) | |
| 7994 v64 = ((signed int)v44->pMonsterInfo.uHP >= 100) + 1; | |
| 7995 v45->PlaySound((PlayerSpeech)v64, 0); | |
| 7996 } | |
| 7997 } | |
| 7998 } | |
| 7999 } | |
| 8000 } | |
| 8001 } | |
| 8002 } | |
| 8003 if ( !v74 | |
| 8004 && !(dword_6BE368_debug_settings_2 & 0x10) | |
| 8005 && v44->pMonsterInfo.uSpecialAttack | |
| 8006 && rand() % 100 < v44->pMonsterInfo.uLevel * v44->pMonsterInfo.uSpecialAttackType ) | |
| 8007 v45->_48DCF6(v44->pMonsterInfo.uSpecialAttack, v44); | |
| 8008 if ( !pParty->bTurnBasedModeOn ) | |
| 8009 { | |
| 8010 v65 = v45->GetActualEndurance(); | |
| 8011 v66 = (double)(20 - v45->GetParameterBonus(v65)) | |
| 8012 * flt_6BE3A4_debug_recmod1 | |
| 8013 * 2.133333333333333; | |
| 8014 v45->SetRecoveryTime((signed __int64)v66); | |
| 8015 } | |
| 8016 return; | |
| 8017 } | |
| 8018 v53 = v44->pMonsterInfo.uSpell2ID; | |
| 8019 } | |
| 8020 v50 = LOBYTE(pSpellStats->pInfos[v53].uSchool); | |
| 8021 goto LABEL_133; | |
| 8022 } | |
| 8023 if ( v42 != 1 ) | |
| 8024 return; | |
| 8025 LABEL_80: | |
| 8026 if ( a4 != -1 ) | |
| 8027 { | |
| 8028 v43 = &pParty->pPlayers[a4]; | |
| 8029 LABEL_168: | |
| 8030 a4b = v43; | |
| 8031 if ( v38 != OBJECT_Player || v37->spell_id != SPELL_BOW_ARROW) | |
| 8032 { | |
| 8033 v70 = v43->GetMaxHealth(); | |
| 8034 v68 = _43AFE3_calc_spell_damage(v37->spell_id, v37->spell_level, v37->spell_skill, v70); | |
| 8035 v69 = LOBYTE(pSpellStats->pInfos[v37->spell_id].uSchool); | |
| 8036 } | |
| 8037 else | |
| 8038 { | |
| 8039 v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); | |
| 8040 v69 = 0; | |
| 8041 } | |
| 8042 a4b->ReceiveDamage(v68, (DAMAGE_TYPE)v69); | |
| 8043 if ( v38 == OBJECT_Player && !qword_A750D8 ) | |
| 8044 { | |
| 8045 qword_A750D8 = 256i64; | |
| 1406 | 8046 PlayerSpeechID = SPEECH_44; |
| 1407 | 8047 uSpeakingCharacter = uActorID + 1; |
| 1297 | 8048 } |
| 8049 return; | |
| 8050 } | |
| 8051 v74 = 0; | |
| 8052 a4a = 1; | |
| 8053 do | |
| 8054 { | |
| 8055 if ( pPlayers[a4a]->CanAct() ) | |
| 8056 { | |
| 8057 v67 = v74++; | |
| 8058 *(&v72 + v67) = a4a; | |
| 8059 } | |
| 8060 ++a4a; | |
| 8061 } | |
| 8062 while ( a4a <= 4 ); | |
| 8063 if ( v74 ) | |
| 8064 { | |
| 8065 v43 = &pParty->pPlayers[*(&v72+rand()%v74)-1];//&stru_AA1058[3].pSounds[6972 * *(&v72 + rand() % v74) + 40552]; | |
| 8066 goto LABEL_168; | |
| 8067 } | |
| 8068 } | |
| 8069 //----- (00421EA6) -------------------------------------------------------- | |
| 1458 | 8070 void OnInventoryLeftClick() |
| 1297 | 8071 { |
| 8072 Player *v0; // ebx@1 | |
| 8073 signed int v1; // eax@2 | |
| 8074 signed int v2; // ecx@2 | |
| 8075 int v3; // eax@2 | |
| 8076 char v4; // sf@2 | |
| 8077 int v5; // eax@2 | |
| 8078 unsigned int v6; // eax@7 | |
| 8079 unsigned int v7; // esi@12 | |
| 8080 unsigned int v8; // eax@12 | |
| 8081 unsigned int v9; // eax@16 | |
| 8082 unsigned int v10; // eax@18 | |
| 8083 ItemGen this_; // [sp+Ch] [bp-3Ch]@1 | |
| 8084 POINT a2; // [sp+30h] [bp-18h]@4 | |
| 8085 unsigned int v13; // [sp+38h] [bp-10h]@13 | |
| 8086 unsigned int pY; // [sp+3Ch] [bp-Ch]@2 | |
| 8087 unsigned int pX; // [sp+40h] [bp-8h]@2 | |
| 8088 int a4; // [sp+44h] [bp-4h]@2 | |
| 8089 | |
| 8090 v0 = pPlayers[uActiveCharacter]; | |
| 8091 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103 ) | |
| 8092 { | |
| 8093 pMouse->GetClickPos(&pX, &pY); | |
| 8094 pY = pY - 17; | |
| 8095 v2 =pX - 14; | |
| 8096 pX = v2; | |
| 8097 v3 = 14 * (pY >> 5); | |
| 8098 v2 >>= 5; | |
| 8099 v4 = v2 + v3 < 0; | |
| 8100 v5 = v2 + v3; | |
| 8101 a4 = v5; | |
| 8102 if ( !v4 ) | |
| 8103 { | |
| 8104 if ( v5 <= 126 && pMouse->GetCursorPos(&a2)->x < 462 | |
| 8105 && pMouse->GetCursorPos(&a2)->x >= 14 ) | |
| 8106 { | |
| 8107 if ( unk_50C9A0 ) | |
| 8108 { | |
| 8109 v6 = v0->GetItemIDAtInventoryIndex(&a4); | |
| 8110 if ( v6 ) | |
| 8111 { | |
| 8112 *((char *)pGUIWindow_Settings->ptr_1C + 8) &= 0x7Fu; | |
| 8113 *((short *)pGUIWindow_Settings->ptr_1C + 2) = uActiveCharacter - 1; | |
| 8114 *((int *)pGUIWindow_Settings->ptr_1C + 3) = v6 - 1; | |
| 8115 *((short *)pGUIWindow_Settings->ptr_1C + 3) = a4; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8116 ptr_50C9A4 = (ItemGen *)&v0->pInventoryItemList[v6-1]; |
| 1297 | 8117 unk_50C9A0 = 0; |
| 8118 if ( pMessageQueue_50CBD0->uNumMessages ) | |
| 8119 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; | |
| 8120 pMouse->SetCursorBitmap("MICON1"); | |
| 8121 dword_50C9D0 = 113; | |
| 8122 dword_50C9D4 = 0; | |
| 8123 dword_50C9D8 = 256; | |
| 8124 } | |
| 8125 return; | |
| 8126 } | |
| 8127 if ( ptr_50C9A4 ) | |
| 8128 return; | |
| 8129 v7 = pParty->pPickedItem.uItemID; | |
| 8130 v8 = v0->GetItemIDAtInventoryIndex(&a4); | |
| 8131 if ( !v7 ) | |
| 8132 { | |
| 8133 if ( !v8 ) | |
| 8134 return; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8135 memcpy(&pParty->pPickedItem, &v0->pInventoryItemList[v8-1], sizeof(pParty->pPickedItem)); |
| 1297 | 8136 v0->RemoveItemAtInventoryIndex(a4); |
| 8137 v9 = pParty->pPickedItem.uItemID; | |
| 8138 pMouse->SetCursorBitmap(pItemsTable->pItems[v9].pIconName); | |
| 8139 return; | |
| 8140 } | |
| 8141 v13 = v8; | |
| 8142 if ( v8 ) | |
| 8143 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8144 a2.y = (LONG)&v0->pInventoryItemList[v8-1]; |
| 1297 | 8145 memcpy(&this_, (const void *)a2.y, sizeof(this_)); |
| 8146 v0->RemoveItemAtInventoryIndex(a4); | |
| 8147 pX = v0->AddItem2(a4, &pParty->pPickedItem); | |
| 8148 if ( !pX ) | |
| 8149 { | |
| 8150 pX = v0->AddItem2(0xFFFFFFFFu, &pParty->pPickedItem); | |
| 8151 if ( !pX ) | |
| 8152 { | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
8153 v0->PutItemArInventoryIndex(this_.uItemID, v13 - 1, a4); |
| 1297 | 8154 memcpy((void *)a2.y, &this_, sizeof(ItemGen)); |
| 8155 return; | |
| 8156 } | |
| 8157 } | |
| 8158 v9 = this_.uItemID; | |
| 8159 memcpy(&pParty->pPickedItem, &this_, sizeof(pParty->pPickedItem)); | |
| 8160 pMouse->SetCursorBitmap(pItemsTable->pItems[v9].pIconName); | |
| 8161 return; | |
| 8162 } | |
| 8163 v10 = v0->AddItem(a4, v7); | |
| 8164 pX = v10; | |
| 8165 if ( v10 || (v10 = v0->AddItem(-1, pParty->pPickedItem.uItemID), (pX = v10) != 0) ) | |
| 8166 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8167 memcpy(&v0->pInventoryItemList[v10-1], &pParty->pPickedItem, 0x24u); |
| 1297 | 8168 pMouse->RemoveHoldingItem(); |
| 8169 } | |
| 8170 } | |
| 8171 } | |
| 8172 } | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8173 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8174 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8175 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8176 bool Player::IsWeak() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8177 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8178 return pConditions[Condition_Weak] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8179 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8180 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8181 bool Player::IsDead() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8182 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8183 return pConditions[Condition_Dead] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8184 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8185 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8186 bool Player::IsEradicated() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8187 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8188 return pConditions[Condition_Eradicated] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8189 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8190 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8191 bool Player::IsZombie() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8192 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8193 return pConditions[Condition_Zombie] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8194 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8195 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8196 bool Player::IsCursed() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8197 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8198 return pConditions[Condition_Cursed] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8199 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8200 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8201 bool Player::IsPertified() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8202 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8203 return pConditions[Condition_Pertified] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8204 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8205 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8206 bool Player::IsUnconcious() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8207 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8208 return pConditions[Condition_Unconcious] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8209 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8210 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8211 bool Player::IsAsleep() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8212 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8213 return pConditions[Condition_Sleep] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8214 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8215 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8216 bool Player::IsParalyzed() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8217 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8218 return pConditions[Condition_Paralyzed] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8219 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8220 |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8221 void Player::SetCursed( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8222 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8223 pConditions[Condition_Cursed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8224 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8225 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8226 void Player::SetWeak( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8227 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8228 pConditions[Condition_Weak] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8229 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8230 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8231 void Player::SetAsleep( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8232 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8233 pConditions[Condition_Sleep] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8234 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8235 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8236 void Player::SetAfraid( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8237 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8238 pConditions[Condition_Fear] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8239 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8240 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8241 void Player::SetDrunk( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8242 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8243 pConditions[Condition_Drunk] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8244 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8245 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8246 void Player::SetInsane( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8247 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8248 pConditions[Condition_Insane] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8249 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8250 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8251 void Player::SetPoison1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8252 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8253 pConditions[Condition_Poison1] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8254 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8255 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8256 void Player::SetDisease1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8257 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8258 pConditions[Condition_Disease1] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8259 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8260 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8261 void Player::SetPoison2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8262 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8263 pConditions[Condition_Poison2] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8264 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8265 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8266 void Player::SetDisease2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8267 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8268 pConditions[Condition_Disease2] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8269 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8270 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8271 void Player::SetPoison3( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8272 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8273 pConditions[Condition_Poison3] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8274 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8275 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8276 void Player::SetDisease3( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8277 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8278 pConditions[Condition_Disease3] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8279 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8280 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8281 void Player::SetParalyzed( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8282 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8283 pConditions[Condition_Paralyzed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8284 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8285 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8286 void Player::SetUnconcious( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8287 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8288 pConditions[Condition_Unconcious] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8289 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8290 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8291 void Player::SetDead( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8292 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8293 pConditions[Condition_Dead] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8294 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8295 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8296 void Player::SetPertified( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8297 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8298 pConditions[Condition_Pertified] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8299 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8300 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8301 void Player::SetEradicated( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8302 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8303 pConditions[Condition_Eradicated] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8304 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8305 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8306 void Player::SetZombie( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8307 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8308 pConditions[Condition_Zombie] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8309 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8310 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8311 void Player::SetCondWeakWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8312 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8313 SetCondition(Condition_Weak, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8314 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8315 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8316 void Player::SetCondInsaneWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8317 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8318 SetCondition(Condition_Insane, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8319 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8320 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8321 void Player::SetCondDeadWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8322 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8323 SetCondition(Condition_Dead, blockable); |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8324 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
8325 |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
8326 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
|
8327 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
8328 SetCondition(Condition_Dead, blockable); |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
8329 } |