Mercurial > mm7
annotate Player.cpp @ 1594:c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
| author | Grumpy7 |
|---|---|
| date | Sun, 08 Sep 2013 08:10:09 +0200 |
| parents | 5658d0f3b5ee |
| children | a52a01aaf439 |
| 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 | |
| 159 | |
| 0 | 160 |
| 161 //----- (00490913) -------------------------------------------------------- | |
| 1459 | 162 int PlayerCreation_GetUnspentAttributePointCount() |
| 0 | 163 { |
| 164 signed int v0; // edi@1 | |
| 1273 | 165 int raceId; // ebx@2 |
| 0 | 166 signed int v4; // eax@17 |
| 167 int v5; // edx@18 | |
| 168 signed int v6; // ecx@18 | |
| 1273 | 169 signed int remainingStatPoints; // [sp+Ch] [bp-8h]@1 |
| 170 | |
| 171 remainingStatPoints = 50; | |
| 0 | 172 v0 = 50; |
| 1273 | 173 for (int playerNum = 0; playerNum < 4; playerNum++) |
| 174 { | |
| 175 raceId = pParty->pPlayers[playerNum].GetRace(); | |
| 176 for (int statNum = 0; statNum <= 6; statNum++) | |
| 177 { | |
| 178 switch ( statNum ) | |
| 0 | 179 { |
| 1273 | 180 case 0: |
| 181 v0 = pParty->pPlayers[playerNum].uMight; | |
| 182 break; | |
| 183 case 1: | |
| 184 v0 = pParty->pPlayers[playerNum].uIntelligence; | |
| 185 break; | |
| 186 case 2: | |
| 187 v0 = pParty->pPlayers[playerNum].uWillpower; | |
| 188 break; | |
| 189 case 3: | |
| 190 v0 = pParty->pPlayers[playerNum].uEndurance; | |
| 191 break; | |
| 192 case 4: | |
| 193 v0 = pParty->pPlayers[playerNum].uAccuracy; | |
| 194 break; | |
| 195 case 5: | |
| 196 v0 = pParty->pPlayers[playerNum].uSpeed; | |
| 197 break; | |
| 198 case 6: | |
| 199 v0 = pParty->pPlayers[playerNum].uLuck; | |
| 200 break; | |
| 201 } | |
| 202 v4 = StatTable[raceId][statNum].uBaseValue; | |
| 203 if ( v0 >= v4 ) | |
| 204 { | |
| 205 v5 = StatTable[raceId][statNum].uDroppedStep; | |
| 206 v6 = StatTable[raceId][statNum].uBaseStep; | |
| 0 | 207 } |
| 208 else | |
| 209 { | |
| 1273 | 210 v5 = StatTable[raceId][statNum].uBaseStep; |
| 211 v6 = StatTable[raceId][statNum].uDroppedStep; | |
| 0 | 212 } |
| 1273 | 213 remainingStatPoints += v5 * (v4 - v0) / v6; |
| 214 } | |
| 215 } | |
| 216 return remainingStatPoints; | |
| 0 | 217 } |
| 218 | |
| 219 | |
| 220 | |
| 221 //----- (00427730) -------------------------------------------------------- | |
| 222 bool Player::CanCastSpell(unsigned int uRequiredMana) | |
| 223 { | |
| 1275 | 224 if (sMana >= (signed int)uRequiredMana) |
| 225 { | |
| 226 sMana -= (signed int)uRequiredMana; | |
| 488 | 227 return true; |
| 228 } | |
| 229 | |
| 230 pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0); | |
| 231 return false; | |
| 0 | 232 } |
| 233 | |
| 234 | |
| 235 //----- (004BE2DD) -------------------------------------------------------- | |
| 1014 | 236 void Player::SalesProcess( unsigned int inventory_idnx, int item_index, int _2devent_idx ) |
| 237 { | |
| 0 | 238 float v6; // ST04_4@1 |
| 1014 | 239 signed int item_value; // eax@1 |
| 240 signed int sell_price; // ebx@1 | |
| 241 | |
| 242 item_value =pOwnItems[item_index].GetValue(); | |
| 243 v6 = p2DEvents[ _2devent_idx - 1].fPriceMultiplier; | |
| 244 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
|
245 if ( pOwnItems[item_index].IsBroken() ) |
| 1014 | 246 sell_price = 1; |
| 247 if ( sell_price < 1 ) | |
| 248 sell_price = 1; | |
| 249 RemoveItemAtInventoryIndex(inventory_idnx); | |
| 250 Party::SetGold(pParty->uNumGold + sell_price); | |
| 0 | 251 } |
| 252 | |
| 253 | |
| 254 | |
| 255 //----- (0043EEF3) -------------------------------------------------------- | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
256 bool Player::NothingOrJustBlastersEquipped() |
| 0 | 257 { |
| 1014 | 258 signed int item_idx; // esi@1 |
| 259 signed int item_id; // esi@1 | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
260 for (int i = 0; i < 16; ++i) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
261 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
262 item_idx = pEquipment.pIndices[i]; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
263 if (item_idx) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
264 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
265 item_id = pOwnItems[item_idx - 1].uItemID; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
266 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
|
267 return false; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
268 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
269 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
270 return true; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
271 } |
| 1014 | 272 |
| 0 | 273 |
| 274 | |
| 275 | |
| 276 //----- (004B8040) -------------------------------------------------------- | |
| 1036 | 277 int Player::GetConditionDayOfWeek( unsigned int uCondition ) |
| 278 { | |
| 279 return (unsigned int)(((signed __int64)((double)this->pConditions[uCondition] * 0.234375) / 60 / 60) / 24) % 7 + 1; | |
| 0 | 280 } |
| 281 | |
| 282 //----- (004B807C) -------------------------------------------------------- | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
283 int Player::GetTempleHealCostModifier(float a2) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
284 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
285 unsigned int conditionIdx; // eax@1 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
286 int conditionTimeMultiplier; // esi@1 |
| 0 | 287 int v6; // eax@8 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
288 signed int result; // qax@13 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
289 signed int baseConditionMultiplier; // [sp+8h] [bp-8h]@4 |
| 1275 | 290 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
291 conditionIdx = GetMajorConditionIdx(); |
| 1275 | 292 if ( conditionIdx >= 14 && conditionIdx <= 16) |
|
1274
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 if ( conditionIdx <= 15 ) |
|
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 baseConditionMultiplier = 5; |
|
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 if ( conditionIdx == 16 ) |
|
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 baseConditionMultiplier = 10; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
301 } |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
302 conditionTimeMultiplier = GetConditionDayOfWeek(conditionIdx); |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
303 } |
| 1350 | 304 else |
| 305 { | |
| 1275 | 306 conditionTimeMultiplier = 1; |
| 307 baseConditionMultiplier = 1; | |
| 1350 | 308 if (conditionIdx < 14) |
| 309 { | |
| 310 for (int i = 0; i <= 13; i++) | |
| 311 { | |
| 312 v6 = GetConditionDayOfWeek(i); | |
| 313 if ( v6 > conditionTimeMultiplier ) | |
| 314 conditionTimeMultiplier = v6; | |
| 315 } | |
| 316 } | |
| 1275 | 317 } |
| 318 result = (int)((double)conditionTimeMultiplier * (double)baseConditionMultiplier * a2); | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
319 if ( result < 1 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
320 result = 1; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
321 return result; |
| 0 | 322 } |
| 323 | |
| 324 //----- (004B8102) -------------------------------------------------------- | |
| 917 | 325 int Player::GetPriceSell(int uRealValue, float price_multiplier) |
| 0 | 326 { |
| 327 signed int v3; // esi@1 | |
| 328 signed int result; // eax@3 | |
| 329 | |
| 1275 | 330 v3 = (signed int)((signed __int64)((double)uRealValue / (price_multiplier + 2.0)) + uRealValue * GetMerchant() / 100); |
| 917 | 331 if ( v3 > uRealValue ) |
| 332 v3 = uRealValue; | |
| 0 | 333 result = 1; |
| 334 if ( v3 >= 1 ) | |
| 335 result = v3; | |
| 336 return result; | |
| 337 } | |
| 338 | |
| 339 //----- (004B8142) -------------------------------------------------------- | |
| 749 | 340 int Player::GetBuyingPrice(unsigned int uRealValue, float price_multiplier) |
| 341 { | |
| 1275 | 342 uint price = (uint)(((100 - GetMerchant()) * (uRealValue * price_multiplier)) / 100); |
| 749 | 343 |
| 344 if (price < uRealValue) | |
| 345 price = uRealValue; | |
| 346 return price; | |
| 0 | 347 } |
| 348 | |
| 349 //----- (004B8179) -------------------------------------------------------- | |
| 916 | 350 int Player::GetPriceIdentification(float a2) |
| 0 | 351 { |
| 352 signed int v2; // esi@1 | |
| 353 int v3; // ecx@1 | |
| 354 signed int result; // eax@3 | |
| 355 | |
| 1275 | 356 v2 = (signed int)(a2 * 50.0); |
| 0 | 357 v3 = v2 * (100 - GetMerchant()) / 100; |
| 358 if ( v3 < v2 / 3 ) | |
| 359 v3 = v2 / 3; | |
| 360 result = 1; | |
| 361 if ( v3 >= 1 ) | |
| 362 result = v3; | |
| 363 return result; | |
| 364 } | |
| 365 | |
| 366 //----- (004B81C3) -------------------------------------------------------- | |
| 916 | 367 int Player::GetPriceRepair(int a2, float a3) |
| 0 | 368 { |
| 369 signed int v3; // esi@1 | |
| 370 int v4; // ecx@1 | |
| 371 signed int result; // eax@3 | |
| 372 | |
| 1275 | 373 v3 = (signed int)((double)a2 / (6.0 - a3)); |
| 0 | 374 v4 = v3 * (100 - GetMerchant()) / 100; |
| 375 if ( v4 < v3 / 3 ) | |
| 376 v4 = v3 / 3; | |
| 377 result = 1; | |
| 378 if ( v4 >= 1 ) | |
| 379 result = v4; | |
| 380 return result; | |
| 381 } | |
| 382 | |
| 383 //----- (004B8213) -------------------------------------------------------- | |
| 1275 | 384 int Player::GetBaseSellingPrice(int a2, float a3) |
| 385 { | |
| 386 signed int v3; // qax@1 | |
| 387 | |
| 388 v3 = (signed int)((double)a2 / (a3 + 2.0)); | |
| 389 if ( v3 < 1 ) | |
| 390 v3 = 1; | |
| 0 | 391 return v3; |
| 392 } | |
| 393 | |
| 394 //----- (004B8233) -------------------------------------------------------- | |
| 1275 | 395 int Player::GetBaseBuyingPrice(int a2, float a3) |
| 396 { | |
| 397 signed int v3; // qax@1 | |
| 398 | |
| 399 v3 = (signed int)((double)a2 * a3); | |
| 400 if ( v3 < 1 ) | |
| 401 v3 = 1; | |
| 0 | 402 return v3; |
| 403 } | |
| 404 | |
| 405 //----- (004B824B) -------------------------------------------------------- | |
| 1275 | 406 int Player::GetBaseIdentifyPrice(float a2) |
| 407 { | |
| 408 signed int v2; // qax@1 | |
| 409 | |
| 410 v2 = (signed int)(a2 * 50.0); | |
| 411 if ( v2 < 1 ) | |
| 412 v2 = 1; | |
| 0 | 413 return v2; |
| 414 } | |
| 415 | |
| 416 //----- (004B8265) -------------------------------------------------------- | |
| 1275 | 417 int Player::GetBaseRepairPrice(int a2, float a3) |
| 418 { | |
| 419 signed int v3; // qax@1 | |
| 420 | |
| 421 v3 = (signed int)((double)a2 / (6.0 - a3)); | |
| 422 if ( v3 < 1 ) | |
| 423 v3 = 1; | |
| 0 | 424 return v3; |
| 425 } | |
| 426 | |
| 427 | |
| 428 | |
| 429 | |
| 430 | |
| 431 //----- (004B6FF9) -------------------------------------------------------- | |
| 1348 | 432 bool Player::IsPlayerHealableByTemple() |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
433 { |
| 0 | 434 signed int v2; // eax@1 |
| 336 | 435 v2 = (signed int)window_SpeakInHouse->ptr_1C; |
| 1348 | 436 if (this->sHealth >= GetMaxHealth() && this->sMana >= GetMaxMana() && GetMajorConditionIdx() == Condition_Good) |
| 437 { | |
| 438 return false; | |
| 439 } | |
| 440 else | |
| 441 { | |
| 442 if (GetMajorConditionIdx() == Condition_Zombie) | |
| 443 { | |
| 444 if ((v2 == 78 || v2 == 81 || v2 == 82)) | |
| 445 { | |
| 446 return false; | |
| 447 } | |
| 448 else | |
| 449 { | |
| 450 return true; | |
| 451 } | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
452 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
453 else |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
454 { |
| 1348 | 455 return true; |
| 456 } | |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
457 } |
| 0 | 458 } |
| 459 | |
| 460 | |
| 461 | |
| 462 //----- (00421E75) -------------------------------------------------------- | |
| 1012 | 463 unsigned int Player::GetItemIDAtInventoryIndex(int *pitem_index) |
| 464 { | |
| 465 int item_idx; // eax@1 | |
| 466 int inv_index; // eax@3 | |
| 467 | |
| 1351 | 468 |
| 1012 | 469 item_idx = *pitem_index; |
| 470 if ( item_idx >125 || item_idx < 0 ) | |
| 471 { | |
| 472 return 0; | |
| 473 } | |
| 474 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
475 inv_index = this->pInventoryMatrix[item_idx]; |
| 1012 | 476 if ( inv_index < 0 ) |
| 477 { | |
| 478 *pitem_index = -1 - inv_index; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
479 inv_index = this->pInventoryMatrix[-1 - inv_index]; |
| 1012 | 480 } |
| 481 | |
| 482 return inv_index; | |
| 0 | 483 } |
| 484 | |
| 485 | |
| 486 | |
| 487 //----- (004160CA) -------------------------------------------------------- | |
| 1012 | 488 void Player::ItemsEnchant( int enchant_count ) |
| 489 { | |
| 490 int avalible_items; // ebx@1 | |
| 491 int i; // edx@8 | |
| 492 __int16 item_index_tabl[138]; // [sp+Ch] [bp-118h]@1 | |
| 493 | |
| 494 avalible_items = 0; | |
| 495 memset (item_index_tabl,0,sizeof(item_index_tabl)); | |
| 496 | |
| 1349 | 497 for (i = 0; i < 138; ++i) |
| 498 { | |
| 499 if (( pOwnItems[i].uItemID>0)&&(pOwnItems[i].uItemID <= 134)) | |
| 500 item_index_tabl[avalible_items++] = i; | |
| 501 } | |
| 1012 | 502 |
| 503 if ( avalible_items ) | |
| 504 { | |
| 505 if ( enchant_count ) | |
| 506 { | |
| 1349 | 507 for ( i = 0; i < enchant_count; ++i ) |
| 508 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
509 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
|
510 pInventoryItemList[item_index_tabl[rand() % avalible_items]].uAttributes |= ITEM_ENCHANTED; |
| 1349 | 511 } |
| 0 | 512 } |
| 513 else | |
| 514 { | |
| 1012 | 515 for ( i = 0; i < avalible_items; ++i ) |
| 516 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
517 pInventoryItemList[item_index_tabl[i]].uAttributes |= ITEM_ENCHANTED; |
| 1349 | 518 } |
| 519 } | |
| 520 } | |
| 0 | 521 } |
| 522 | |
| 523 //----- (004948B1) -------------------------------------------------------- | |
| 187 | 524 void Player::PlaySound(PlayerSpeech speech, int a3) |
| 525 { | |
| 1351 | 526 signed int speechCount = 0; // esi@4 |
| 527 signed int expressionCount = 0; // esi@4 | |
| 528 int pickedVariant; // esi@10 | |
| 248 | 529 CHARACTER_EXPRESSION_ID expression; // ebx@17 |
| 1406 | 530 signed int pSoundID; // ecx@19 |
| 1351 | 531 int speechVariantArray[5]; // [sp+Ch] [bp-1Ch]@7 |
| 532 int expressionVariantArray[5]; | |
| 533 unsigned int pickedSoundID; // [sp+30h] [bp+8h]@4 | |
| 534 unsigned int expressionDuration = 0; | |
| 187 | 535 |
| 1351 | 536 pickedSoundID = 0; |
| 203 | 537 if (uVoicesVolumeMultiplier) |
| 0 | 538 { |
| 1351 | 539 for (int i = 0; i < 2; i++) |
| 540 { | |
| 1406 | 541 if ( SoundSetAction[speech][i] ) |
| 542 { | |
| 543 speechVariantArray[speechCount] = SoundSetAction[speech][i]; | |
| 1351 | 544 speechCount++; |
| 545 } | |
| 546 } | |
| 547 if ( speechCount ) | |
| 548 { | |
| 549 pickedVariant = speechVariantArray[rand() % speechCount]; | |
| 550 int numberOfSubvariants = byte_4ECF08[pickedVariant - 1][uVoiceID]; | |
| 551 if (numberOfSubvariants > 0) | |
| 552 { | |
| 553 pickedSoundID = rand() % numberOfSubvariants + 2 * (pickedVariant + 50 * uVoiceID) + 4998; | |
| 1406 | 554 pAudioPlayer->PlaySound((SoundID)pickedSoundID, PID(OBJECT_Player, uActiveCharacter + 39), 0, -1, 0, 0, (int)(pSoundVolumeLevels[uVoicesVolumeMultiplier] * 128.0f), 0); |
| 1351 | 555 } |
| 556 } | |
| 557 } | |
| 558 | |
| 559 for (int i = 0; i < 5; i++) | |
| 560 { | |
| 1406 | 561 if ( SoundSetAction[speech][i + 3] ) |
| 562 { | |
| 563 expressionVariantArray[expressionCount] = SoundSetAction[speech][i + 3]; | |
| 1351 | 564 expressionCount++; |
| 565 } | |
| 566 } | |
| 567 if ( expressionCount ) | |
| 568 { | |
| 569 expression = (CHARACTER_EXPRESSION_ID)expressionVariantArray[rand() % expressionCount]; | |
| 570 if (expression == CHARACTER_EXPRESSION_21 && pickedSoundID ) | |
| 571 { | |
| 1406 | 572 pSoundID = 0; |
| 573 if ( pSoundList->sNumSounds ) | |
| 574 { | |
| 1351 | 575 for (int i = 0; i < pSoundList->sNumSounds; i++) |
| 0 | 576 { |
| 1406 | 577 if (pSoundList->pSounds[i].uSoundID == pickedSoundID) |
| 578 pSoundID = i; | |
| 0 | 579 } |
| 580 } | |
| 1406 | 581 if ( pSoundList->pSounds[pSoundID].pSoundData[0] ) |
| 1351 | 582 expressionDuration = (sLastTrackLengthMS << 7) / 1000; |
| 583 } | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
584 PlayEmotion(expression, expressionDuration); |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
585 } |
| 0 | 586 } |
| 587 // 4948B1: using guessed type int var_1C[5]; | |
| 588 | |
| 589 //----- (00494A25) -------------------------------------------------------- | |
| 187 | 590 void Player::PlayEmotion(CHARACTER_EXPRESSION_ID new_expression, int a3) |
| 591 { | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
592 unsigned int v3 = expression; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
593 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
|
594 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
595 return; |
|
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 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
|
598 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
599 return; |
|
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 else |
|
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 (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
|
604 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
605 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
|
606 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
607 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
608 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
609 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
610 } |
| 0 | 611 this->uExpressionTimePassed = 0; |
| 612 if ( !a3 ) | |
| 613 { | |
| 187 | 614 this->uExpressionTimeLength = 8 * pPlayerFrameTable->pFrames[a3].uAnimLength; |
| 615 } | |
|
1353
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
616 else |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
617 { |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
618 this->uExpressionTimeLength = 0; |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
619 } |
| 187 | 620 expression = new_expression; |
| 0 | 621 viewparams->bRedrawGameUI = 1; |
| 622 } | |
| 623 | |
| 624 //----- (0049327B) -------------------------------------------------------- | |
| 1355 | 625 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
|
626 { |
| 135 | 627 if ( this->classType == uClass ) |
| 0 | 628 { |
|
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
|
629 return true; |
| 0 | 630 } |
| 631 else | |
| 632 { | |
|
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
|
633 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
|
634 { |
|
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
635 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
|
636 } |
| 0 | 637 switch ( uClass ) |
| 638 { | |
| 639 case 0x1Au: | |
|
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, 65)); |
| 0 | 641 case 0x1Bu: |
|
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, 67)); |
| 0 | 643 case 0x22u: |
|
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, 77)); |
| 0 | 645 case 0x23u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
646 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 79)); |
| 0 | 647 break; |
| 648 default: | |
| 1545 | 649 Error("Should not be able to get here (%u)", uClass); |
| 0 | 650 break; |
| 651 } | |
|
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
|
652 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
|
653 } |
| 0 | 654 } |
| 655 | |
| 656 | |
| 657 //----- (00492C0B) -------------------------------------------------------- | |
| 658 bool Player::CanAct() | |
| 659 { | |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
660 if ( this->IsAsleep() || this->IsParalyzed() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
661 this->IsUnconcious() || this->IsDead() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
662 this->IsPertified() || this->IsEradicated() ) |
| 1355 | 663 return false; |
| 0 | 664 else |
| 1355 | 665 return true; |
| 0 | 666 } |
| 667 | |
| 668 //----- (00492C40) -------------------------------------------------------- | |
| 669 bool Player::CanSteal() | |
| 670 { | |
| 1355 | 671 return GetActualSkillLevel(PLAYER_SKILL_STEALING) != 0; |
| 0 | 672 } |
| 673 | |
| 674 //----- (00492C4E) -------------------------------------------------------- | |
| 675 bool Player::CanEquip_RaceAndAlignmentCheck(unsigned int uItemID) | |
| 676 { | |
|
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
|
677 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
|
678 { |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
679 case ITEM_RELIC_ETHRICS_STAFF: |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
680 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
|
681 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
|
682 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
|
683 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
|
684 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
|
685 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
|
686 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
|
687 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
|
688 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
|
689 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
|
690 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
|
691 default: return 1; break; |
|
1356
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
692 } |
|
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
693 } |
|
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
|
694 |
| 0 | 695 //----- (00492D65) -------------------------------------------------------- |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
696 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
|
697 { |
|
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 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
|
699 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
|
700 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
|
701 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
|
702 |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
703 if ( pConditions[uConditionIdx] ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
704 return; |
|
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 if (!ConditionProcessor::IsPlayerAffected(this, uConditionIdx, a3)) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
707 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
708 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
709 } |
|
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
|
710 |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
711 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
|
712 { |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
713 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
|
714 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
|
715 case Condition_Sleep: break; //nosound |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
716 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
|
717 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
|
718 case Condition_Insane: PlaySound(SPEECH_29, 0); break; |
| 1014 | 719 case Condition_Poison1: |
| 720 case Condition_Poison2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
721 case Condition_Poison3: PlaySound(SPEECH_27, 0); break; |
| 1014 | 722 case Condition_Disease1: |
| 723 case Condition_Disease2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
724 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
|
725 case Condition_Paralyzed: break; //nosound |
| 1014 | 726 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
|
727 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
|
728 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
|
729 sHealth = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
730 break; |
| 1014 | 731 case Condition_Dead: |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
732 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
|
733 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
|
734 sHealth = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
735 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
|
736 sMana = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
737 break; |
| 1014 | 738 case Condition_Pertified: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
739 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
|
740 break; |
| 1014 | 741 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
|
742 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
|
743 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
|
744 sHealth = 0; |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
745 if ( sMana > 0 ) |
| 1014 | 746 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
|
747 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
|
748 case Condition_Zombie: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
749 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
|
750 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
|
751 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
|
752 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
|
753 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
|
754 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
|
755 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
|
756 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
|
757 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
|
758 { |
|
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 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
|
760 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
|
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 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
|
763 { |
|
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 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
|
765 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
|
766 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
767 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
|
768 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
|
769 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
770 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
771 players_before = 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
772 for (int i = 1; i < 5; ++i) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
773 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
774 if ( pPlayers[i]->CanAct() ) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
775 ++players_before; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
776 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
777 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
778 pConditions[uConditionIdx] = 1; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
779 |
|
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
|
780 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
|
781 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
|
782 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
|
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 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
|
785 { |
|
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 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
|
787 ++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
|
788 } |
|
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 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
|
791 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
792 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
|
793 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
794 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
|
795 } |
| 0 | 796 |
| 797 //----- (00492528) -------------------------------------------------------- | |
| 798 bool Player::CanFitItem(unsigned int uSlot, unsigned int uItemID) | |
| 799 { | |
| 1363 | 800 Texture *texture; // esi@1 |
| 801 unsigned int slotWidth; // ebx@1 | |
| 802 unsigned int slotHeight; // [sp+1Ch] [bp+Ch]@1 | |
| 803 | |
| 804 texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); | |
| 805 slotWidth = GetSizeInInventorySlots(texture->uTextureWidth); | |
| 806 slotHeight = GetSizeInInventorySlots(texture->uTextureHeight); | |
| 0 | 807 if ( !areWeLoadingTexture ) |
| 808 { | |
| 1363 | 809 texture->Release(); |
| 1006 | 810 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 811 } |
| 1555 | 812 Assert(slotHeight > 0 && slotWidth > 0, "Items should have nonzero dimensions"); |
| 1363 | 813 if ( (slotWidth + uSlot % INVETORYSLOTSWIDTH) <= INVETORYSLOTSWIDTH && (slotHeight + uSlot / INVETORYSLOTSWIDTH) <= INVETORYSLOTSHEIGHT ) |
| 814 { | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
815 for (unsigned int x = 0; x < slotWidth; x++) |
| 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 for (unsigned int y = 0; y < slotHeight; y++) |
| 1363 | 818 { |
|
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
|
819 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
|
820 { |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
821 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
|
822 } |
| 1363 | 823 } |
| 824 } | |
| 825 return true; | |
| 826 } | |
| 827 return false; | |
| 0 | 828 } |
| 829 // 506128: using guessed type int areWeLoadingTexture; | |
| 830 | |
| 831 //----- (004925E6) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
832 int Player::FindFreeInventoryListSlot() |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
833 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
834 for (int i = 0; i < 126; i++ ) |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
835 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
836 if (pInventoryItemList[i].uItemID == 0) |
|
1365
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 return i; |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
839 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
840 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
841 return -1; |
| 0 | 842 } |
| 843 | |
| 844 //----- (00492600) -------------------------------------------------------- | |
| 845 int Player::CreateItemInInventory(unsigned int uSlot, unsigned int uItemID) | |
| 846 { | |
| 847 int result; // eax@8 | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
848 signed int freeSlot; // [sp+8h] [bp-4h]@4 |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
849 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
850 freeSlot = FindFreeInventoryListSlot(); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
851 if ( freeSlot == -1 ) |
| 0 | 852 { |
| 853 if ( uActiveCharacter ) | |
| 201 | 854 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NoRoom, 0); |
|
1366
8f339c3bbdaf
Player::CreateItemInInventory small bugfix from previous change
Grumpy7
parents:
1365
diff
changeset
|
855 return 0; |
| 0 | 856 } |
| 857 else | |
| 858 { | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
859 PutItemArInventoryIndex(uItemID, freeSlot, uSlot); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
860 result = freeSlot + 1; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
861 this->pInventoryItemList[freeSlot].uItemID = uItemID; |
| 0 | 862 } |
| 863 return result; | |
| 864 } | |
| 865 // 506128: using guessed type int areWeLoadingTexture; | |
| 866 | |
| 867 //----- (00492700) -------------------------------------------------------- | |
| 868 int Player::HasSkill(unsigned int uSkillType) | |
| 869 { | |
| 1374 | 870 if ( uSkillType >= 37 || this->pActiveSkills[uSkillType] ) |
| 871 { | |
| 872 return 1; | |
| 0 | 873 } |
| 874 else | |
| 875 { | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
876 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[67], this->pName); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
877 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1374 | 878 return 0; |
| 879 } | |
| 0 | 880 } |
| 881 | |
| 882 //----- (00492745) -------------------------------------------------------- | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
883 void Player::WearItem( unsigned int uItemID ) |
| 0 | 884 { |
| 1010 | 885 int item_body_anch; // edi@6 |
| 886 int item_indx; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
887 item_indx = FindFreeInventoryListSlot(); |
| 1010 | 888 |
| 889 if ( item_indx != -1 ) | |
| 890 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
891 pInventoryItemList[item_indx].uItemID = uItemID; |
| 1374 | 892 item_body_anch = pEquipTypeToBodyAnchor[pItemsTable->pItems[uItemID].uEquipType]; |
| 893 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
|
894 pInventoryItemList[item_indx].uBodyAnchor = item_body_anch + 1; |
| 0 | 895 } |
| 896 } | |
| 897 | |
| 898 //----- (004927A8) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
899 int Player::AddItem(int index, unsigned int uItemID) |
| 0 | 900 { |
| 1374 | 901 int xStartValue = 0; |
| 902 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
903 if ( index == -1 ) |
| 0 | 904 { |
| 1385 | 905 for (int xcoord = 0; xcoord < INVETORYSLOTSWIDTH; xcoord++) |
| 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 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) |
| 0 | 908 { |
|
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
|
909 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
|
910 { |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
911 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
|
912 } |
| 0 | 913 } |
| 1385 | 914 } |
| 0 | 915 return 0; |
| 916 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
917 if ( !CanFitItem(index, uItemID) ) |
| 0 | 918 { |
| 919 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); | |
| 920 return 0; | |
| 921 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
922 return CreateItemInInventory(index, uItemID); |
| 0 | 923 } |
| 924 | |
| 925 //----- (00492826) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
926 int Player::AddItem2(int index, ItemGen *Src) |
| 0 | 927 { |
| 928 pItemsTable->SetSpecialBonus(Src); | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
929 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
930 if ( index == -1 ) |
| 0 | 931 { |
|
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
|
932 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
|
933 { |
|
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 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) //TODO: change pInventoryMatrix to 2 dimensional array. |
| 1385 | 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 if ( CanFitItem(ycoord * INVETORYSLOTSWIDTH + xcoord, Src->uItemID) ) |
| 0 | 937 { |
|
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
|
938 return CreateItemInInventory2(ycoord * INVETORYSLOTSWIDTH + xcoord, Src); |
| 0 | 939 } |
| 1385 | 940 } |
| 0 | 941 } |
| 942 return 0; | |
| 943 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
944 if ( !CanFitItem(index, Src->uItemID) ) |
| 0 | 945 return 0; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
946 return CreateItemInInventory2(index, Src); |
| 0 | 947 } |
| 948 | |
| 949 //----- (0049289C) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
950 int Player::CreateItemInInventory2( unsigned int index, ItemGen *Src ) |
| 0 | 951 { |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
952 signed int freeSlot; // ebx@1 |
| 0 | 953 int result; // eax@6 |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
954 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
955 freeSlot = FindFreeInventoryListSlot(); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
956 if ( freeSlot == -1 ) |
| 0 | 957 { |
| 958 result = 0; | |
| 959 } | |
| 960 else | |
| 961 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
962 PutItemArInventoryIndex(Src->uItemID, freeSlot, index); |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
963 memcpy(&pInventoryItemList[freeSlot], Src, sizeof(ItemGen)); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
964 result = freeSlot + 1; |
| 0 | 965 } |
| 966 return result; | |
| 967 } | |
| 968 // 506128: using guessed type int areWeLoadingTexture; | |
| 969 | |
| 970 //----- (0049298B) -------------------------------------------------------- | |
| 1385 | 971 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
|
972 { |
| 1014 | 973 Texture *item_texture; // esi@1 |
| 974 int *pInvPos; // esi@4 | |
| 975 unsigned int slot_width; // [sp+Ch] [bp-4h]@1 | |
| 976 unsigned int slot_height; // [sp+18h] [bp+8h]@1 | |
| 977 | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
978 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1014 | 979 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); |
| 980 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 981 if ( !areWeLoadingTexture ) |
| 982 { | |
| 1014 | 983 item_texture->Release(); |
| 1006 | 984 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 985 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
986 if ( slot_width > 0 ) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
987 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
988 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
989 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
990 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
991 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
|
992 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
993 } |
| 1014 | 994 } |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
995 pInventoryMatrix[index] = itemListPos + 1; |
| 0 | 996 } |
| 278 | 997 |
| 0 | 998 // 506128: using guessed type int areWeLoadingTexture; |
| 999 | |
| 1000 //----- (00492A36) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1001 void Player::RemoveItemAtInventoryIndex( unsigned int index ) |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1002 { |
| 1014 | 1003 ItemGen *item_in_slot; // ecx@1 |
| 1004 Texture *item_texture; // esi@1 | |
| 1005 unsigned int slot_height; // ebp@1 | |
| 1006 int *pInvPos; // edx@4 | |
| 1007 unsigned int slot_width; // [sp+14h] [bp+4h]@1 | |
| 1008 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1009 item_in_slot = &this->pInventoryItemList[pInventoryMatrix[index]-1]; |
| 1014 | 1010 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[item_in_slot->uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1011 item_in_slot->Reset(); | |
| 1012 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); | |
| 1013 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 1014 if ( !areWeLoadingTexture ) |
| 1015 { | |
| 1014 | 1016 item_texture->Release(); |
| 1006 | 1017 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1018 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1019 if ( slot_width > 0 ) |
| 1014 | 1020 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1021 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1022 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1023 { |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1024 memset32(pInvPos, 0, slot_width); |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1025 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1026 } |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1027 } |
| 0 | 1028 } |
| 1029 // 506128: using guessed type int areWeLoadingTexture; | |
| 1030 | |
| 1031 //----- (00490EEE) -------------------------------------------------------- | |
| 1386 | 1032 int Player::SelectPhrasesTransaction(ItemGen *pItem, int building_type, int BuildID_2Events, int ShopMenuType) //TODO: probably move this somewhere else, not really Player:: stuff |
| 1033 { | |
| 1034 unsigned int idemId; // edx@1 | |
| 1035 signed int equipType; // esi@1 | |
| 1036 float multiplier; // ST04_4@26 | |
| 1037 int price; // edi@26 | |
| 1038 int merchantLevel; // [sp+10h] [bp-8h]@1 | |
| 1039 int itemValue; | |
| 1040 | |
| 1041 merchantLevel = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); | |
| 1042 idemId = pItem->uItemID; | |
| 1043 equipType = pItemsTable->pItems[idemId].uEquipType; | |
| 1044 itemValue = pItem->GetValue(); | |
| 1045 | |
| 1046 switch (building_type) | |
| 1047 { | |
| 1411 | 1048 case BuildingType_WeaponShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1049 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1050 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1051 if (equipType > EQUIP_BOW) |
| 1386 | 1052 return 4; |
| 1053 break; | |
| 1411 | 1054 case BuildingType_ArmorShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1055 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1056 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1057 if ( equipType < EQUIP_ARMOUR || equipType > EQUIP_BOOTS) |
| 1386 | 1058 return 4; |
| 1059 break; | |
| 1411 | 1060 case BuildingType_MagicShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1061 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1062 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1063 if ( pItemsTable->pItems[idemId].uSkillType != PLAYER_SKILL_MISC ) |
| 1386 | 1064 return 4; |
| 1065 break; | |
| 1411 | 1066 case BuildingType_AlchemistShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1067 if ((idemId >= ITEM_ARTIFACT_HERMES_SANDALS && idemId < ITEM_RECIPE_REJUVENATION) || idemId > ITEM_RECIPE_BODY_RESISTANCE) |
| 1386 | 1068 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1069 if ( !(equipType == EQUIP_REAGENT || equipType == EQUIP_POTION || equipType == EQUIP_MESSAGE_SCROLL)) |
| 1386 | 1070 return 4; |
| 1071 break; | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1072 default: |
| 1545 | 1073 Error("(%u)", building_type); |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1074 break; |
| 1386 | 1075 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1076 if (pItem->IsStolen()) |
| 1386 | 1077 return 6; |
| 1078 | |
| 1079 multiplier = p2DEvents[BuildID_2Events - 1].fPriceMultiplier; | |
| 1080 switch (ShopMenuType) | |
| 1081 { | |
| 1082 case 2: | |
| 1083 price = GetBuyingPrice(itemValue, multiplier); | |
| 1084 break; | |
| 1085 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
|
1086 if (pItem->IsBroken()) |
| 1386 | 1087 price = 1; |
| 917 | 1088 else |
| 1386 | 1089 price = this->GetPriceSell(itemValue, multiplier); |
| 1090 break; | |
| 1091 case 4: | |
| 1092 price = this->GetPriceIdentification(multiplier); | |
| 1093 break; | |
| 1094 case 5: | |
| 1095 price = this->GetPriceRepair(itemValue, multiplier); | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1096 break; |
|
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1097 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
|
1098 Error("(%u)", ShopMenuType); |
| 1386 | 1099 break; |
| 1100 } | |
| 1101 if ( merchantLevel ) | |
| 1102 { | |
| 1103 if (price == itemValue) | |
| 1104 { | |
| 1105 return 3; | |
| 1106 } | |
| 917 | 1107 else |
| 1386 | 1108 { |
| 1109 return 2; | |
| 1110 } | |
| 1111 } | |
| 0 | 1112 else |
| 1386 | 1113 { |
| 1114 return 1; | |
| 1115 } | |
| 0 | 1116 } |
| 1117 | |
| 1118 //----- (0049107D) -------------------------------------------------------- | |
| 1119 int Player::GetBodybuilding() | |
| 1120 { | |
| 1010 | 1121 int v1; // al@1 |
| 0 | 1122 |
| 1123 v1 = GetActualSkillLevel(PLAYER_SKILL_BODYBUILDING); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1124 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
|
1125 return multiplier * (v1 & 0x3F); |
| 0 | 1126 } |
| 1127 | |
| 1128 //----- (004910A8) -------------------------------------------------------- | |
| 607 | 1129 int Player::GetMeditation() |
| 0 | 1130 { |
| 1010 | 1131 int v1; // al@1 |
| 0 | 1132 |
| 1133 v1 = GetActualSkillLevel(PLAYER_SKILL_MEDITATION); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1134 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
|
1135 return multiplier * (v1 & 0x3F); |
| 0 | 1136 } |
| 1137 | |
| 1138 //----- (004910D3) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1139 bool Player::CanIdentify( ItemGen *pItem ) |
| 0 | 1140 { |
| 1141 unsigned __int16 v2; // ax@1 | |
| 1142 int v5; // edi@7 | |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
1143 |
| 652 | 1144 if (CheckHiredNPCSpeciality(Scholar)) |
| 1145 return true; | |
| 0 | 1146 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1147 v2 = GetActualSkillLevel(PLAYER_SKILL_ITEM_ID); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1148 if ( (signed int)SkillToMastery(v2) >= 4 ) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1149 return true; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1150 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1151 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
|
1152 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1153 return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St; |
| 0 | 1154 } |
| 1155 | |
| 1156 //----- (00491151) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1157 bool Player::CanRepair( ItemGen *pItem ) |
| 0 | 1158 { |
| 1159 unsigned __int16 v2; // ax@1 | |
| 1160 int v5; // edi@7 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1161 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1162 ItemDesc* v7 = &pItemsTable->pItems[pItem->uItemID]; |
| 652 | 1163 if (CheckHiredNPCSpeciality(Smith) && v7->uEquipType <= 2 || |
| 1164 CheckHiredNPCSpeciality(Armorer) && v7->uEquipType >= 3 && v7->uEquipType <= 9 || | |
| 1165 CheckHiredNPCSpeciality(Alchemist) && v7->uEquipType >= 9 ) | |
| 1166 return true; | |
| 1167 | |
| 1010 | 1168 v2 = GetActualSkillLevel(PLAYER_SKILL_REPAIR); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1169 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 0 | 1170 return true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1171 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1172 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
|
1173 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1174 return v5 >= v7->uItemID_Rep_St; |
| 0 | 1175 } |
| 1176 | |
| 1177 //----- (004911F3) -------------------------------------------------------- | |
| 1178 int Player::GetMerchant() | |
| 1179 { | |
| 1180 unsigned __int16 v2; // ax@1 | |
| 1181 int v5; // edi@1 | |
| 1182 int v7; // eax@3 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1183 |
| 607 | 1184 v2 = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1185 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1186 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1187 |
| 0 | 1188 v7 = GetPartyReputation(); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1189 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
|
1190 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1191 if (v5 == 0) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1192 { |
| 0 | 1193 return -v7; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1194 } |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1195 return v5 - v7 + 7; |
| 0 | 1196 } |
| 1197 | |
| 1198 //----- (0049125A) -------------------------------------------------------- | |
| 1199 int Player::GetPerception() | |
| 1200 { | |
| 1201 unsigned __int16 v2; // ax@1 | |
| 1202 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1203 |
| 1010 | 1204 v2 = GetActualSkillLevel(PLAYER_SKILL_PERCEPTION); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1205 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1206 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1207 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1208 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
|
1209 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1210 return v5; |
| 0 | 1211 } |
| 1212 | |
| 1213 //----- (004912B0) -------------------------------------------------------- | |
| 1214 int Player::GetDisarmTrap() | |
| 1215 { | |
| 1216 unsigned __int16 v2; // ax@1 | |
| 1217 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1218 |
| 1010 | 1219 v2 = GetActualSkillLevel(PLAYER_SKILL_TRAP_DISARM); |
| 0 | 1220 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 1221 return 10000; | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1222 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1223 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
|
1224 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
|
1225 multiplier++; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1226 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1227 return v5; |
| 0 | 1228 } |
| 1229 | |
| 1230 //----- (00491317) -------------------------------------------------------- | |
| 1231 char Player::GetLearningPercent() | |
| 1232 { | |
| 1233 int v2; // eax@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1234 |
| 1010 | 1235 v2 = GetActualSkillLevel(PLAYER_SKILL_LEARNING); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1236 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
|
1237 return multiplier * v2 + 9; |
| 0 | 1238 } |
| 1239 | |
| 1240 //----- (0048C6AF) -------------------------------------------------------- | |
| 1241 Player::Player() | |
| 1242 { | |
| 1243 memset(&pEquipment, 0, sizeof(PlayerEquipment)); | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1244 memset(pInventoryMatrix, 0, 126 * sizeof(int)); |
| 0 | 1245 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
|
1246 pInventoryItemList[i].Reset(); |
| 0 | 1247 for (uint i = 0; i < 12; ++i) |
| 1248 pEquippedItems[i].Reset(); | |
| 1249 | |
| 1250 | |
| 1251 for (uint i = 0; i < 24; ++i) | |
| 1252 { | |
| 1253 pPlayerBuffs[i].uSkill = 0; | |
| 1254 pPlayerBuffs[i].uSkill = 0; | |
| 1255 pPlayerBuffs[i].uPower = 0; | |
| 1256 pPlayerBuffs[i].uExpireTime = 0; | |
| 1257 pPlayerBuffs[i].uCaster = 0; | |
| 1258 pPlayerBuffs[i].uFlags = 0; | |
| 1259 } | |
| 1260 | |
| 1261 pName[0] = 0; | |
| 1014 | 1262 uCurrentFace = 0; |
| 0 | 1263 uVoiceID = 0; |
| 1264 memset(pConditions, 0, 20 * sizeof(__int64)); | |
| 1265 | |
| 1266 field_BB = 0; | |
| 1267 | |
| 1268 uMight = uMightBonus = 0; | |
| 1269 uIntelligence = uIntelligenceBonus = 0; | |
| 1270 uWillpower = uWillpowerBonus = 0; | |
| 1271 uEndurance = uEnduranceBonus = 0; | |
| 1272 uSpeed = uSpeedBonus = 0; | |
| 1273 uAccuracy = uAccuracyBonus = 0; | |
| 1274 uLuck = uLuckBonus = 0; | |
| 1275 uLevel = sLevelModifier = 0; | |
| 1276 sAgeModifier = 0; | |
|
1388
60d4885eb107
sACModifier zeroed in player constructor so AC is not always 0(or -some value) ingame
Grumpy7
parents:
1387
diff
changeset
|
1277 sACModifier = 0; |
| 0 | 1278 |
| 1019 | 1279 // memset(field_1F5, 0, 30); |
| 1280 pure_luck_used=0; | |
| 1281 pure_speed_used=0; | |
| 1282 pure_intellect_used=0; | |
| 1283 pure_endurance_used=0; | |
| 1284 pure_willpower_used=0; | |
| 1285 pure_accuracy_used=0; | |
| 1286 pure_might_used=0; | |
| 0 | 1287 |
| 1288 sResFireBase = sResFireBonus = 0; | |
| 1289 sResAirBase = sResAirBonus = 0; | |
| 1290 sResWaterBase = sResWaterBonus = 0; | |
| 1291 sResEarthBase = sResEarthBonus = 0; | |
| 1292 sResMagicBase = sResMagicBonus = 0; | |
| 1293 sResSpiritBase = sResSpiritBonus = 0; | |
| 1294 sResMindBase = sResMindBonus = 0; | |
| 1295 sResBodyBase = sResBodyBonus = 0; | |
| 1296 sResLightBase = sResLightBonus = 0; | |
| 1297 sResDarkBase = sResDarkBonus = 0; | |
| 1298 | |
| 1299 uTimeToRecovery = 0; | |
| 1300 | |
| 1301 uSkillPoints = 0; | |
| 1302 | |
| 1303 sHealth = 0; | |
| 1304 uFullHealthBonus = 0; | |
| 1305 _health_related = 0; | |
| 1306 | |
| 1307 sMana = 0; | |
| 1308 uFullManaBonus = 0; | |
| 1309 _mana_related = 0; | |
| 1310 | |
| 1311 uQuickSpell = 0; | |
| 1312 memset(pInstalledBeacons, 0, 5 * sizeof(LloydBeacon)); | |
| 1313 | |
| 1314 _some_attack_bonus = 0; | |
| 1315 field_1A91 = 0; | |
| 1316 _melee_dmg_bonus = 0; | |
| 1317 field_1A93 = 0; | |
| 1318 _ranged_atk_bonus = 0; | |
| 1319 field_1A95 = 0; | |
| 1320 _ranged_dmg_bonus = 0; | |
| 1321 field_1A97 = 0; | |
| 1322 | |
| 130 | 1323 expression = CHARACTER_EXPRESSION_INVALID; |
| 0 | 1324 uExpressionTimePassed = 0; |
| 1325 uExpressionTimeLength = 0; | |
| 1326 | |
| 1327 uNumDivineInterventionCastsThisDay = 0; | |
| 1328 uNumArmageddonCasts = 0; | |
| 1329 uNumFireSpikeCasts = 0; | |
| 1330 | |
| 1331 memset(field_1988, 0, 49 * sizeof(int)); | |
| 1332 memset(field_1A50, 0, 64 * sizeof(char)); | |
| 1333 | |
| 1334 field_E0 = 0; | |
| 1335 field_E4 = 0; | |
| 1336 field_E8 = 0; | |
| 1337 field_EC = 0; | |
| 1338 field_F0 = 0; | |
| 1339 field_F4 = 0; | |
| 1340 field_F8 = 0; | |
| 1341 field_FC = 0; | |
| 1342 field_100 = 0; | |
| 1343 field_104 = 0; | |
| 198 | 1344 |
|
554
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1345 _expression21_animtime = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1346 _expression21_frameset = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1347 |
| 198 | 1348 lastOpenedSpellbookPage = 0; |
| 0 | 1349 } |
| 1350 | |
| 1351 //----- (0048C6F6) -------------------------------------------------------- | |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1352 bool Party::AddItemToParty(ItemGen *pItem) //TODO move to party.cpp |
| 0 | 1353 { |
| 1354 unsigned int v2; // eax@1 | |
| 1355 char *v5; // eax@8 | |
| 1356 Texture *v7; // ebx@10 | |
| 1357 signed int v8; // esi@10 | |
| 1358 Player *v9; // edi@11 | |
| 1359 int v10; // eax@11 | |
| 1360 int v21; // [sp+24h] [bp-4h]@10 | |
| 1361 | |
| 1362 v2 = pItem->uItemID; | |
| 222 | 1363 if ( !pItemsTable->pItems[v2].uItemID_Rep_St ) |
| 315 | 1364 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
|
1365 |
| 0 | 1366 v5 = pItemsTable->pItems[v2].pIconName; |
| 1367 if ( v5 ) | |
| 1368 { | |
| 973 | 1369 v7 = pIcons_LOD->LoadTexturePtr(v5, TEXTURE_16BIT_PALETTE); |
| 0 | 1370 v21 = areWeLoadingTexture; |
| 1371 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
|
1372 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
|
1373 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
|
1374 { |
|
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1375 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
|
1376 v10 = v9->AddItem(-1, pItem->uItemID); |
| 0 | 1377 if ( v10 ) |
| 1378 { | |
|
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
|
1379 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
|
1380 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
|
1381 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
|
1382 v9->PlaySound(SPEECH_60, 0); |
| 0 | 1383 if ( !v21 ) |
| 1384 { | |
| 1385 v7->Release(); | |
| 1006 | 1386 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1387 } |
|
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
|
1388 return true; |
| 0 | 1389 } |
| 1390 } | |
| 1391 if ( !v21 ) | |
| 1392 { | |
| 1393 v7->Release(); | |
| 1006 | 1394 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1395 } |
|
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
|
1396 return false; |
| 0 | 1397 } |
| 1398 else | |
| 1399 { | |
| 1400 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
|
1401 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
|
1402 } |
| 0 | 1403 } |
| 1404 // 506128: using guessed type int areWeLoadingTexture; | |
| 1405 | |
| 1406 //----- (0048C855) -------------------------------------------------------- | |
| 1407 int Player::GetBaseStrength() | |
| 1408 { | |
| 1409 return this->uMight + GetItemsBonus(CHARACTER_ATTRIBUTE_STRENGTH, 0); | |
| 1410 } | |
| 1411 | |
| 1412 //----- (0048C86C) -------------------------------------------------------- | |
| 1413 int Player::GetBaseIntelligence() | |
| 1414 { | |
| 1415 return this->uIntelligence + GetItemsBonus(CHARACTER_ATTRIBUTE_INTELLIGENCE, 0); | |
| 1416 } | |
| 1417 | |
| 1418 //----- (0048C883) -------------------------------------------------------- | |
| 1419 int Player::GetBaseWillpower() | |
| 1420 { | |
| 1421 return this->uWillpower + GetItemsBonus(CHARACTER_ATTRIBUTE_WILLPOWER, 0); | |
| 1422 } | |
| 1423 | |
| 1424 //----- (0048C89A) -------------------------------------------------------- | |
| 1425 int Player::GetBaseEndurance() | |
| 1426 { | |
| 1427 return this->uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE, 0); | |
| 1428 } | |
| 1429 | |
| 1430 //----- (0048C8B1) -------------------------------------------------------- | |
| 1431 int Player::GetBaseAccuracy() | |
| 1432 { | |
| 1433 return this->uAccuracy + GetItemsBonus(CHARACTER_ATTRIBUTE_ACCURACY, 0); | |
| 1434 } | |
| 1435 | |
| 1436 //----- (0048C8C8) -------------------------------------------------------- | |
| 1437 int Player::GetBaseSpeed() | |
| 1438 { | |
| 1439 return this->uSpeed + GetItemsBonus(CHARACTER_ATTRIBUTE_SPEED, 0); | |
| 1440 } | |
| 1441 | |
| 1442 //----- (0048C8DF) -------------------------------------------------------- | |
| 1443 int Player::GetBaseLuck() | |
| 1444 { | |
| 1445 return this->uLuck + GetItemsBonus(CHARACTER_ATTRIBUTE_LUCK, 0); | |
| 1446 } | |
| 1447 | |
| 1448 //----- (0048C8F6) -------------------------------------------------------- | |
| 1449 int Player::GetBaseLevel() | |
| 1450 { | |
| 1451 return this->uLevel + GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL, 0); | |
| 1452 } | |
| 1453 | |
| 1454 //----- (0048C90D) -------------------------------------------------------- | |
| 1455 int Player::GetActualLevel() | |
| 1456 { | |
| 1457 return uLevel + sLevelModifier + | |
| 1458 GetMagicalBonus(CHARACTER_ATTRIBUTE_LEVEL) + | |
| 1459 GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL, 0); | |
| 1460 } | |
| 1461 | |
| 1462 //----- (0048C93C) -------------------------------------------------------- | |
| 1463 int Player::GetActualMight() | |
| 1464 { | |
|
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
|
1465 return GetActualAttribute(CHARACTER_ATTRIBUTE_STRENGTH, &Player::uMight, &Player::uMightBonus); |
| 0 | 1466 } |
| 1467 | |
| 1468 //----- (0048C9C2) -------------------------------------------------------- | |
| 1469 int Player::GetActualIntelligence() | |
| 1470 { | |
|
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
|
1471 return GetActualAttribute(CHARACTER_ATTRIBUTE_INTELLIGENCE, &Player::uIntelligence, &Player::uIntelligenceBonus); |
| 0 | 1472 } |
| 1473 | |
| 1474 //----- (0048CA3F) -------------------------------------------------------- | |
| 1475 int Player::GetActualWillpower() | |
| 1476 { | |
|
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
|
1477 return GetActualAttribute(CHARACTER_ATTRIBUTE_WILLPOWER, &Player::uWillpower, &Player::uWillpowerBonus); |
| 0 | 1478 } |
| 1479 | |
| 1480 //----- (0048CABC) -------------------------------------------------------- | |
| 1481 int Player::GetActualEndurance() | |
| 1482 { | |
|
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
|
1483 return GetActualAttribute(CHARACTER_ATTRIBUTE_ENDURANCE, &Player::uEndurance, &Player::uEnduranceBonus); |
| 0 | 1484 } |
| 1485 | |
| 1486 //----- (0048CB39) -------------------------------------------------------- | |
| 1487 int Player::GetActualAccuracy() | |
| 1488 { | |
|
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
|
1489 return GetActualAttribute(CHARACTER_ATTRIBUTE_ACCURACY, &Player::uAccuracy, &Player::uAccuracyBonus); |
| 0 | 1490 } |
| 1491 | |
| 1492 //----- (0048CBB6) -------------------------------------------------------- | |
| 1493 int Player::GetActualSpeed() | |
| 1494 { | |
|
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
|
1495 return GetActualAttribute(CHARACTER_ATTRIBUTE_SPEED, &Player::uSpeed, &Player::uSpeedBonus); |
| 0 | 1496 } |
| 1497 | |
| 1498 //----- (0048CC33) -------------------------------------------------------- | |
| 1499 int Player::GetActualLuck() | |
| 1500 { | |
| 1036 | 1501 signed int npc_luck_bonus; // [sp+10h] [bp-4h]@1 |
| 1502 | |
| 1503 npc_luck_bonus = 0; | |
| 652 | 1504 if ( CheckHiredNPCSpeciality(Fool) ) |
| 1036 | 1505 npc_luck_bonus = 5; |
| 652 | 1506 if ( CheckHiredNPCSpeciality(ChimneySweep) ) |
| 1036 | 1507 npc_luck_bonus += 20; |
| 652 | 1508 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1036 | 1509 npc_luck_bonus += 10; |
| 1324 | 1510 |
|
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
|
1511 return GetActualAttribute(CHARACTER_ATTRIBUTE_LUCK, &Player::uLuck, &Player::uLuckBonus) |
| 1325 | 1512 + npc_luck_bonus; |
| 1513 } | |
| 1514 | |
| 1515 //----- (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
|
1516 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
|
1517 { |
| 1324 | 1518 uint uActualAge = this->sAgeModifier + GetBaseAge(); |
| 1519 uint uAgeingMultiplier = 100; | |
| 1520 for (uint i = 0; i < 4; ++i) | |
| 1325 | 1521 { |
| 1324 | 1522 if (uActualAge >= pAgeingTable[i]) |
| 1325 | 1523 uAgeingMultiplier = pAgingAttributeModifier[attrId][i]; |
| 1524 else | |
| 1525 break; | |
| 1526 } | |
| 1527 | |
| 1528 auto uConditionMult = pConditionAttributeModifier[attrId][GetMajorConditionIdx()]; | |
| 1529 int magicBonus = GetMagicalBonus(attrId); | |
| 1530 int itemBonus = GetItemsBonus(attrId, 0); | |
|
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 return uConditionMult * uAgeingMultiplier * this->*attrValue / 100 / 100 |
| 1325 | 1532 + 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
|
1533 + 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
|
1534 + this->*attrBonus; |
| 0 | 1535 } |
| 1536 | |
| 1537 //----- (0048CCF5) -------------------------------------------------------- | |
| 1538 int Player::GetActualAttack(int a2) | |
| 1539 { | |
| 1540 int v3; // eax@1 | |
| 1541 int v4; // edi@1 | |
| 1542 int v5; // ebx@1 | |
| 1543 int v6; // ebp@1 | |
| 1544 | |
| 1545 v3 = GetActualAccuracy(); | |
| 1036 | 1546 v4 = GetParameterBonus(v3); |
| 0 | 1547 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_ATTACK); |
| 1548 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
|
1549 return v4 + v5 + v6 + GetMagicalBonus(CHARACTER_ATTRIBUTE_ATTACK) + this->_some_attack_bonus; |
| 0 | 1550 } |
| 1551 | |
| 1552 //----- (0048CD45) -------------------------------------------------------- | |
| 1553 int Player::GetMeleeDamageMinimal() | |
| 1554 { | |
| 1555 int v2; // eax@1 | |
| 1556 int v3; // esi@1 | |
| 1557 int v4; // esi@1 | |
| 1558 int v5; // esi@1 | |
| 1559 signed int result; // eax@1 | |
| 1036 | 1560 |
| 0 | 1561 v2 = GetActualMight(); |
| 1036 | 1562 v3 = GetParameterBonus(v2); |
| 0 | 1563 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, 0) + v3; |
| 1564 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v4; | |
| 1036 | 1565 result = _melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 1566 if ( result < 1 ) | |
| 1567 result = 1; | |
| 0 | 1568 return result; |
| 1569 } | |
| 1570 | |
| 1571 //----- (0048CD90) -------------------------------------------------------- | |
| 1572 int Player::GetMeleeDamageMaximal() | |
| 1573 { | |
| 1574 int v2; // eax@1 | |
| 1575 int v3; // esi@1 | |
| 1576 int v4; // esi@1 | |
| 1577 int v5; // esi@1 | |
| 1578 int v6; // esi@1 | |
| 1579 signed int result; // eax@1 | |
| 1580 | |
| 1581 v2 = GetActualMight(); | |
| 1036 | 1582 v3 = GetParameterBonus(v2); |
| 0 | 1583 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, 0) + v3; |
| 1584 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
|
1585 v6 = this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 0 | 1586 result = 1; |
| 1587 if ( v6 >= 1 ) | |
| 1588 result = v6; | |
| 1589 return result; | |
| 1590 } | |
| 1591 | |
| 1592 //----- (0048CDDB) -------------------------------------------------------- | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1593 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
|
1594 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1595 int dmgSum; // esi@62 |
| 0 | 1596 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
|
1597 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
|
1598 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
|
1599 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1600 offHndWpnDmg = 0; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1601 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
|
1602 if ( IsUnarmed() ) |
| 0 | 1603 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1604 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
|
1605 } |
|
5a3afcaa6717
Player::CalculateMeleeDamageTo removed labels, ifdowhile patterns changed to for cycles, magic numbers to enum values, fixing gibbet being only undead slaying
Grumpy7
parents:
1547
diff
changeset
|
1606 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
|
1607 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1608 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
|
1609 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1610 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
|
1611 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
|
1612 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
|
1613 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
|
1614 addOneDice = true; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1615 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
|
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 ( !ignoreOffhand ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1618 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1619 if ( this->HasItemEquipped(EQUIP_OFF_HAND) ) |
| 0 | 1620 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1621 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
|
1622 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
|
1623 if ( pItemsTable->pItems[itemId].uEquipType != EQUIP_SHIELD ) |
| 0 | 1624 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1625 offHndWpnDmg = CalculateMeleeDmgToEnemyWithWeapon(offHandItemGen, uTargetActorID, false); |
| 0 | 1626 } |
| 1627 } | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1628 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1629 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1630 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
|
1631 if ( !ignoreSkillBonus ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1632 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1633 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
|
1634 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
|
1635 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
|
1636 dmgSum += this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + mightAndSkillbonus; |
| 0 | 1637 } |
| 1638 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
|
1639 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
|
1640 result = dmgSum; |
| 0 | 1641 return result; |
| 1642 } | |
| 1643 | |
|
1550
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 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
|
1646 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1647 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
|
1648 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
|
1649 if (addOneDice) |
|
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 diceCount++; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1652 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1653 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
|
1654 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
|
1655 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
|
1656 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1657 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
|
1658 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1659 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
|
1660 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
|
1661 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1662 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
|
1663 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
|
1664 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1665 totalDmg *= 2; |
|
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 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
|
1668 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1669 totalDmg *= 2; |
|
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 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
|
1672 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1673 totalDmg *= 2; |
|
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 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
|
1676 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1677 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1678 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1679 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1680 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
|
1681 && 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
|
1682 && 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
|
1683 totalDmg *= 3; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1684 return totalDmg; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1685 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1686 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1687 |
| 0 | 1688 //----- (0048D0B9) -------------------------------------------------------- |
| 1689 int Player::GetRangedAttack() | |
| 1690 { | |
| 1691 int v2; // eax@1 | |
| 1692 int v3; // edi@3 | |
| 1693 int v4; // eax@4 | |
| 1694 int v5; // edi@4 | |
| 1695 int v6; // edi@4 | |
| 1696 int v7; // edi@4 | |
| 1697 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1698 v2 = *(int *)&this->pInventoryItemList[this->pEquipment.uMainHand-1]; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1699 if ( v2 < ITEM_BLASTER || v2 > ITEM_LASER_RIFLE ) |
| 0 | 1700 { |
| 1701 v4 = GetActualAccuracy(); | |
| 1036 | 1702 v5 = GetParameterBonus(v4); |
| 0 | 1703 v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK, 0) + v5; |
| 1704 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
|
1705 v3 = this->_ranged_atk_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v7; |
| 0 | 1706 } |
| 1707 else | |
| 1708 { | |
| 1709 v3 = GetActualAttack(1); | |
| 1710 } | |
| 1711 return v3; | |
| 1712 } | |
| 1713 | |
| 1714 //----- (0048D124) -------------------------------------------------------- | |
| 1715 int Player::GetRangedDamageMin() | |
| 1716 { | |
| 1717 int v2; // edi@1 | |
| 1718 int v3; // edi@1 | |
| 1719 int v4; // edi@1 | |
| 1720 int result; // eax@6 | |
| 1721 | |
| 1040 | 1722 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MIN, 0); |
| 1723 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
|
1724 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1725 if ( v4 >= 1 ) |
| 1726 result = v4; | |
| 1727 else | |
| 1728 result = 0; | |
| 1729 return result; | |
| 1730 } | |
| 1731 | |
| 1732 //----- (0048D191) -------------------------------------------------------- | |
| 1733 int Player::GetRangedDamageMax() | |
| 1734 { | |
| 1735 int v2; // edi@1 | |
| 1736 int v3; // edi@1 | |
| 1737 int v4; // edi@1 | |
| 1738 int result; // eax@6 | |
| 1739 | |
| 1040 | 1740 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MAX, 0); |
| 1741 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
|
1742 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1743 if ( v4 >= 1 ) |
| 1744 result = v4; | |
| 1745 else | |
| 1746 result = 0; | |
| 1747 return result; | |
| 1748 } | |
| 1749 | |
| 1750 //----- (0048D1FE) -------------------------------------------------------- | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1751 int Player::CalculateRangedDamageTo( int a2 ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1752 { |
| 0 | 1753 ItemGen *v4; // ebx@2 |
| 1754 unsigned int v5; // edi@2 | |
| 1755 int v9; // esi@5 | |
| 1756 int v10; // ebx@6 | |
| 1757 signed int v15; // [sp+8h] [bp-Ch]@2 | |
| 1758 int v17; // [sp+10h] [bp-4h]@1 | |
| 1759 | |
| 1760 v17 = 0; | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1761 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1762 return 0; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1763 v4 = (ItemGen *)&this->pInventoryItemList[this->pEquipment.uBow-1]; |
| 0 | 1764 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
|
1765 v15 = pItemsTable->pItems[v5].uDamageRoll; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1766 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
|
1767 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1768 int v7 = rand() % v15; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1769 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
|
1770 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1771 v9 = pItemsTable->pItems[v5].uDamageMod + v17; |
| 0 | 1772 if ( a2 ) |
| 1773 { | |
| 377 | 1774 v10 = v4->uSpecEnchantmentType; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1775 if ( v10 == 64 && MonsterStats::BelongsToSupertype(a2, MONSTER_SUPERTYPE_UNDEAD)) |
|
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 v9 *= 2; |
|
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 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
|
1780 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1781 v9 *= 2; |
|
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 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
|
1784 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1785 v9 *= 2; |
|
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 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
|
1788 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1789 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1790 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1791 } |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1792 return v9 + this->GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS); |
| 0 | 1793 } |
| 1794 | |
| 1795 //----- (0048D2EA) -------------------------------------------------------- | |
| 1796 char *Player::GetMeleeDamageString() | |
| 1797 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1798 signed int itemid; // eax@1 |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1799 int min_damage; // edi@3 |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1800 int max_damage; // eax@3 |
| 0 | 1801 |
| 1802 static char player__getmeleedamagestring_static_buff[40]; // idb | |
| 1803 | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1804 if (pEquipment.uMainHand >= 0) |
|
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 itemid = pOwnItems[this->pEquipment.uMainHand-1].uItemID; |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1807 } |
|
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 if (pEquipment.uMainHand >= 0 && ( itemid >= 135 ) && ( itemid <= 159 )) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1810 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1811 strcpy(player__getmeleedamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1812 return player__getmeleedamagestring_static_buff; |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1813 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1814 else if (pEquipment.uMainHand >= 0 && (itemid == ITEM_BLASTER || itemid == ITEM_LASER_RIFLE)) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1815 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1816 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, 1); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1817 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, 1); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1818 } |
| 0 | 1819 else |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1820 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1821 min_damage = GetMeleeDamageMinimal(); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1822 max_damage = GetMeleeDamageMaximal(); |
|
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 if ( min_damage == max_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 sprintf(player__getmeleedamagestring_static_buff, "%d", min_damage); |
|
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 else |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1829 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1830 sprintf(player__getmeleedamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1831 } |
| 1036 | 1832 return player__getmeleedamagestring_static_buff; |
| 0 | 1833 } |
| 1834 | |
| 1835 //----- (0048D396) -------------------------------------------------------- | |
| 1836 char *Player::GetRangedDamageString() | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1837 { |
| 1036 | 1838 signed int itemid; // eax@1 |
| 1839 int min_damage; // edi@3 | |
| 1840 int max_damage; // eax@3 | |
| 1841 | |
| 1842 static char player__getrangeddamagestring_static_buff[40]; // idb | |
|
1547
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 if (pEquipment.uMainHand >= 0) |
|
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 itemid = pOwnItems[this->pEquipment.uMainHand-1].uItemID; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1847 } |
|
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 if (pEquipment.uMainHand >= 0 && ( itemid >= 135 ) && ( itemid <= 159 )) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1850 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1851 strcpy(player__getrangeddamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1852 return player__getrangeddamagestring_static_buff; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1853 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1854 else if (pEquipment.uMainHand >= 0 && (itemid == ITEM_BLASTER || itemid == ITEM_LASER_RIFLE)) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1855 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1856 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, 1); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1857 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, 1); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1858 } |
| 0 | 1859 else |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1860 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1861 min_damage = GetRangedDamageMin(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1862 max_damage = GetRangedDamageMax(); |
|
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 ( max_damage > 0) |
|
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 if ( min_damage == max_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 sprintf(player__getrangeddamagestring_static_buff, "%d", min_damage); |
|
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 else |
|
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 sprintf(player__getrangeddamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1873 } |
|
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 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1876 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1877 strcpy(player__getrangeddamagestring_static_buff, "N/A"); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1878 } |
| 1036 | 1879 return player__getrangeddamagestring_static_buff; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1880 } |
| 0 | 1881 |
| 1882 //----- (0048D45A) -------------------------------------------------------- | |
| 1883 bool Player::CanTrainToNextLevel() | |
| 1884 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1885 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
|
1886 int neededExp = ((lvl * (lvl - 1)) / 2 * 1000); |
| 1564 | 1887 return this->uExperience >= neededExp; |
| 0 | 1888 } |
| 1889 | |
| 1890 //----- (0048D498) -------------------------------------------------------- | |
| 1891 unsigned int Player::GetExperienceDisplayColor() | |
| 1892 { | |
| 1893 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
|
1894 return ui_character_bonus_text_color; |
| 0 | 1895 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
|
1896 return ui_character_default_text_color; |
| 0 | 1897 } |
| 1898 | |
| 1899 //----- (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
|
1900 int Player::CalculateIncommingDamage( DAMAGE_TYPE dmg_type, int dmg ) |
| 1561 | 1901 { |
| 1036 | 1902 int resist_value; // edi@8 |
| 1903 int player_luck; // eax@21 | |
| 1904 signed int res_rand_divider; // ebx@2 | |
| 1905 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
|
1906 |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1907 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
|
1908 return 0; |
|
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1909 |
|
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
|
1910 resist_value = 0; |
| 1036 | 1911 switch(dmg_type) |
| 1912 { | |
|
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
|
1913 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
|
1914 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
|
1915 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
|
1916 case DMGT_EARTH: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_EARTH); break; |
| 1036 | 1917 |
|
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
|
1918 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
|
1919 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
|
1920 case DMGT_BODY: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_BODY); break; |
| 1036 | 1921 } |
|
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
|
1922 |
| 1036 | 1923 player_luck = GetActualLuck(); |
| 1924 res_rand_divider = GetParameterBonus(player_luck) + resist_value + 30; | |
| 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 if ( GetParameterBonus(player_luck) + resist_value > 0 ) |
| 1036 | 1927 { |
|
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
|
1928 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
|
1929 { |
| 1036 | 1930 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
|
1931 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
|
1932 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
|
1933 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
|
1934 } |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1935 } |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1936 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
|
1937 { |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1938 if (!pOwnItems[pEquipment.uArmor - 1].IsBroken()) |
| 0 | 1939 { |
| 1036 | 1940 armor_skill = GetEquippedItemSkillType(EQUIP_ARMOUR); |
| 1941 if ( armor_skill==PLAYER_SKILL_PLATE ) | |
| 0 | 1942 { |
| 1036 | 1943 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
|
1944 return dmg / 2; |
| 0 | 1945 } |
| 1036 | 1946 if (armor_skill==PLAYER_SKILL_CHAIN ) |
| 0 | 1947 { |
| 1036 | 1948 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
|
1949 return dmg * 2 / 3; |
| 0 | 1950 } |
| 1951 } | |
| 1036 | 1952 } |
|
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
|
1953 return dmg; |
| 0 | 1954 } |
| 1955 | |
| 1956 //----- (0048D62C) -------------------------------------------------------- | |
| 816 | 1957 ITEM_EQUIP_TYPE Player::GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1958 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1959 return pItemsTable->pItems[pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uEquipType; |
| 0 | 1960 } |
| 1961 | |
| 1962 //----- (0048D651) -------------------------------------------------------- | |
| 816 | 1963 PLAYER_SKILL_TYPE Player::GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1964 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1965 return (PLAYER_SKILL_TYPE)pItemsTable->pItems[pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uSkillType; |
| 0 | 1966 } |
| 1967 | |
| 1968 //----- (0048D676) -------------------------------------------------------- | |
| 1969 bool Player::IsUnarmed() | |
| 1970 { | |
| 1561 | 1971 return !HasItemEquipped(EQUIP_MAIN_HAND) && |
| 1972 (!HasItemEquipped(EQUIP_OFF_HAND) || GetEquippedItemEquipType(EQUIP_OFF_HAND) == EQUIP_SHIELD); | |
| 0 | 1973 } |
| 1974 | |
| 1975 //----- (0048D6AA) -------------------------------------------------------- | |
| 1976 bool Player::HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex) | |
| 1977 { | |
| 1978 auto i = pEquipment.pIndices[uEquipIndex]; | |
| 1979 if (i) | |
| 1568 | 1980 return (~(pOwnItems[i - 1].uAttributes & ITEM_BROKEN)) != 0; |
| 1036 | 1981 else |
| 1982 return false; | |
| 0 | 1983 } |
| 1984 | |
| 1985 //----- (0048D6D0) -------------------------------------------------------- | |
| 1986 bool Player::HasEnchantedItemEquipped(int uEnchantment) | |
| 1987 { | |
| 1988 for (uint i = 0; i < 16; ++i) | |
| 1989 { | |
| 1990 if (HasItemEquipped((ITEM_EQUIP_TYPE)i) && | |
| 1080 | 1991 pOwnItems[pEquipment.pIndices[i]-1].uSpecEnchantmentType == uEnchantment) |
| 0 | 1992 return true; |
| 1993 } | |
| 1994 return false; | |
| 1995 } | |
| 1996 | |
| 1997 //----- (0048D709) -------------------------------------------------------- | |
| 1080 | 1998 bool Player::WearsItem( int item_id, ITEM_EQUIP_TYPE equip_type ) |
| 1563 | 1999 { |
| 2000 return ( HasItemEquipped(equip_type) && pInventoryItemList[pEquipment.pIndices[equip_type - 1]].uItemID == item_id ); | |
| 2001 } | |
| 2002 | |
| 2003 bool Player::WearsItemAnyWhere(int item_id) | |
| 2004 { | |
| 2005 for (int i = 0; i < 16; i++) | |
| 2006 { | |
| 2007 if (WearsItem(item_id, (ITEM_EQUIP_TYPE) i)) | |
| 2008 { | |
| 2009 return true; | |
| 2010 } | |
| 2011 } | |
| 2012 return false; | |
| 0 | 2013 } |
| 2014 | |
| 2015 //----- (0048D76C) -------------------------------------------------------- | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2016 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 | 2017 { |
| 2018 unsigned __int16 v6; // cx@8 | |
| 2019 int v7; // edi@8 | |
| 2020 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
|
2021 unsigned int itemvalue; // esi@8 |
| 0 | 2022 int v10; // eax@8 |
| 2023 int v11; // edi@12 | |
| 2024 bool result; // eax@13 | |
| 2025 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2026 if ( !itemToSteal |
| 0 | 2027 || this->pConditions[16] |
| 2028 || this->pConditions[14] | |
| 2029 || this->pConditions[15] | |
| 2030 || this->pConditions[4] | |
| 2031 || this->pConditions[13] | |
| 2032 || this->pConditions[2] ) | |
| 2033 { | |
| 2034 result = 0; | |
| 2035 } | |
| 2036 else | |
| 2037 { | |
| 2038 v6 = this->pActiveSkills[34]; | |
| 2039 v7 = v6 & 0x3F; | |
| 2040 v8 = SkillToMastery(v6); | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2041 itemvalue = itemToSteal->GetValue(); |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2042 v10 = pItemsTable->pItems[itemToSteal->uItemID].uEquipType; |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2043 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
|
2044 itemvalue *= 3; |
| 0 | 2045 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
|
2046 *a6 = 100 * (reputation + a3) + itemvalue + (a5 != 0 ? 0x1F4 : 0); |
| 0 | 2047 if ( rand() % 100 >= 5 ) |
| 2048 { | |
| 2049 if ( *a6 > v11 ) | |
| 2050 result = *a6 - v11 < 500; | |
| 2051 else | |
| 2052 result = 2; | |
| 2053 } | |
| 2054 else | |
| 2055 { | |
| 2056 result = 0; | |
| 2057 } | |
| 2058 } | |
| 2059 return result; | |
| 2060 } | |
| 2061 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2062 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2063 | |
| 2064 //----- (0048D88B) -------------------------------------------------------- | |
| 2065 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation) | |
| 2066 { | |
| 2067 Player *v4; // esi@1 | |
| 2068 Actor *v5; // edi@1 | |
| 2069 unsigned __int16 v6; // cx@10 | |
| 2070 int v7; // ebx@10 | |
| 2071 unsigned int v8; // esi@10 | |
| 2072 int v9; // eax@10 | |
| 2073 int v10; // esi@10 | |
| 2074 int v11; // eax@13 | |
| 2075 signed int v12; // ebx@15 | |
| 2076 signed int v13; // edx@15 | |
| 2077 int v14; // ecx@15 | |
| 2078 unsigned __int16 v15; // si@21 | |
| 2079 unsigned int v16; // ebx@24 | |
| 2080 int v17; // esi@24 | |
| 2081 const void *v18; // eax@29 | |
| 2082 unsigned int v19; // esi@31 | |
| 2083 int v20; // eax@34 | |
| 2084 char v21; // zf@36 | |
| 2085 unsigned int v22; // ST0C_4@39 | |
| 2086 char *v23; // esi@39 | |
| 2087 const char *v25; // [sp-Ch] [bp-48h]@40 | |
| 2088 int v26; // [sp-8h] [bp-44h]@40 | |
| 2089 ItemGen v27; // [sp+8h] [bp-34h]@15 | |
| 2090 unsigned int v28; // [sp+2Ch] [bp-10h]@10 | |
| 2091 int v29; // [sp+30h] [bp-Ch]@10 | |
| 2092 int v30; // [sp+34h] [bp-8h]@10 | |
| 2093 Player *v31; // [sp+38h] [bp-4h]@1 | |
| 2094 signed int _steal_perma; // [sp+48h] [bp+Ch]@12 | |
| 2095 | |
| 2096 v4 = this; | |
| 2097 v5 = &pActors[uActorID]; | |
| 2098 v31 = this; | |
| 2099 if ( &pActors[uActorID] | |
| 2100 && !this->pConditions[16] | |
| 2101 && !this->pConditions[14] | |
| 2102 && !this->pConditions[15] | |
| 2103 && !this->pConditions[4] | |
| 2104 && !this->pConditions[13] | |
| 2105 && !this->pConditions[2] ) | |
| 2106 { | |
| 2107 if ( !(BYTE2(v5->uAttributes) & 0x80) ) | |
| 2108 pActors[uActorID].SetRandomGoldIfTheresNoItem(); | |
| 2109 v6 = v4->pActiveSkills[34]; | |
| 2110 v7 = v6 & 0x3F; | |
| 2111 v8 = SkillToMastery(v6); | |
| 2112 v9 = rand(); | |
| 2113 v28 = 4 * v8; | |
| 2114 v30 = dword_4EDEA0[v8]; | |
| 2115 v29 = dword_4EDEB4[v9 % 100 / 20]; | |
| 2116 v10 = v5->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation); | |
| 2117 if ( rand() % 100 < 5 || v10 > v29 + v7 * v30 || (_steal_perma = 2, BYTE2(v5->uAttributes) & 8) ) | |
| 2118 { | |
| 322 | 2119 Actor::AggroSurroundingPeasants(uActorID, 1); |
| 0 | 2120 _steal_perma = 0; |
| 2121 v26 = (int)v31->pName; | |
| 2122 v25 = pGlobalTXT_LocalizationStrings[376]; | |
| 2123 } | |
| 2124 else | |
| 2125 { | |
| 2126 v11 = rand(); | |
| 2127 if ( v11 % 100 >= 40 ) | |
| 2128 { | |
| 2129 if ( v11 % 100 >= 70 ) | |
| 2130 { | |
| 2131 v19 = 0; | |
| 2132 if ( v7 > 0 ) | |
| 2133 { | |
| 2134 do | |
| 2135 { | |
| 2136 --v7; | |
| 2137 v19 += rand() % dword_4EDEC4[v28 / 4] + 1; | |
| 2138 } | |
| 2139 while ( v7 ); | |
| 2140 } | |
| 2141 if ( pItemsTable->pItems[v5->array_000234[3].uItemID].uEquipType != 18 ) | |
| 2142 return _steal_perma; | |
| 377 | 2143 v20 = (int)&v5->array_000234[3].uSpecEnchantmentType; |
| 2144 if ( (signed int)v19 > v5->array_000234[3].uSpecEnchantmentType ) | |
| 2145 v19 = v5->array_000234[3].uSpecEnchantmentType; | |
| 0 | 2146 v21 = *(int *)v20 == v19; |
| 2147 *(int *)v20 -= v19; | |
| 2148 if ( v21 ) | |
| 2149 v5->array_000234[3].uItemID = 0; | |
| 2150 if ( v19 ) | |
| 2151 { | |
| 2152 party_finds_gold(v19, 2); | |
| 2153 v22 = v19; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2154 v23 = pTmpBuf2.data(); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2155 sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[302], v31->pName, v22); |
| 0 | 2156 LABEL_43: |
| 2157 ShowStatusBarString(v23, 2u); | |
| 2158 return _steal_perma; | |
| 2159 } | |
| 2160 } | |
| 2161 else | |
| 2162 { | |
| 2163 v27.Reset(); | |
| 2164 v12 = 0; | |
| 2165 v13 = 0; | |
| 2166 v14 = (int)v5->array_000234; | |
| 2167 while ( !*(int *)v14 || pItemsTable->pItems[*(int *)v14].uEquipType == 18 ) | |
| 2168 { | |
| 2169 ++v13; | |
| 2170 v14 += 36; | |
| 2171 if ( v13 >= 4 ) | |
| 2172 goto LABEL_21; | |
| 2173 } | |
| 2174 v12 = 1; | |
| 2175 LABEL_21: | |
| 2176 v15 = v5->uCarriedItemID; | |
| 2177 if ( v15 || v12 ) | |
| 2178 { | |
| 2179 v27.Reset(); | |
| 2180 if ( v15 ) | |
| 2181 { | |
| 2182 v16 = (signed __int16)v15; | |
| 2183 v5->uCarriedItemID = 0; | |
| 2184 v27.uItemID = (signed __int16)v15; | |
| 2185 v17 = (signed __int16)v15; | |
| 2186 if ( pItemsTable->pItems[v17].uEquipType == 12 ) | |
| 2187 v27.uNumCharges = rand() % 6 + pItemsTable->pItems[v17].uDamageMod + 1; | |
| 2188 if ( pItemsTable->pItems[v17].uEquipType == 14 ) | |
| 2189 { | |
| 2190 if ( v16 != 220 ) | |
| 570 | 2191 v27.uEnchantmentType = 2 * rand() % 4 + 2; |
| 0 | 2192 } |
| 2193 } | |
| 2194 else | |
| 2195 { | |
| 2196 v18 = &v5->array_000234[rand() % 4]; | |
| 2197 memcpy(&v27, v18, sizeof(v27)); | |
| 2198 ((ItemGen *)v18)->Reset(); | |
| 2199 v16 = v27.uItemID; | |
| 2200 } | |
| 2201 sub_421B2C_PlaceInInventory_or_DropPickedItem(); | |
| 2202 sprintf( | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2203 pTmpBuf2.data(), |
| 0 | 2204 pGlobalTXT_LocalizationStrings[304], |
| 2205 v31->pName, | |
| 2206 pItemsTable->pItems[v16].pUnidentifiedName); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2207 ShowStatusBarString(pTmpBuf2.data(), 2u); |
| 0 | 2208 sub_421B2C_PlaceInInventory_or_DropPickedItem(); |
| 2209 memcpy(&pParty->pPickedItem, &v27, sizeof(pParty->pPickedItem)); | |
| 2210 pMouse->SetCursorBitmapFromItemID(v16); | |
| 2211 return _steal_perma; | |
| 2212 } | |
| 2213 } | |
| 2214 } | |
| 2215 v26 = (int)v31->pName; | |
| 2216 v25 = pGlobalTXT_LocalizationStrings[377]; | |
| 2217 } | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2218 v23 = pTmpBuf2.data(); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2219 sprintfex(pTmpBuf2.data(), v25, v26); |
| 0 | 2220 goto LABEL_43; |
| 2221 } | |
| 2222 return 0; | |
| 2223 } | |
| 2224 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2225 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2226 // 4EDEC4: using guessed type int dword_4EDEC4[]; | |
| 2227 | |
| 2228 //----- (0048DBB9) -------------------------------------------------------- | |
| 2229 void Player::Heal(int amount) | |
| 2230 { | |
| 1010 | 2231 signed int max_health; // eax@3 |
| 2232 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2233 if ( !IsEradicated() && !IsDead() ) |
| 1010 | 2234 { |
| 2235 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
|
2236 if ( IsZombie() ) |
| 1010 | 2237 max_health /= 2; |
| 2238 sHealth += amount; | |
| 2239 if ( sHealth > max_health ) | |
| 2240 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
|
2241 if ( IsUnconcious() ) |
| 1010 | 2242 { |
| 2243 if ( sHealth > 0 ) | |
| 2244 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2245 SetUnconcious(false); |
| 0 | 2246 } |
| 2247 } | |
| 2248 } | |
| 2249 } | |
| 2250 | |
| 2251 //----- (0048DC1E) -------------------------------------------------------- | |
| 1036 | 2252 int Player::ReceiveDamage( signed int amount, DAMAGE_TYPE dmg_type ) |
| 2253 { | |
| 2254 signed int recieved_dmg; // eax@1 | |
| 2255 unsigned int armor_indx; // eax@8 | |
| 2256 bool broke_armor; | |
| 2257 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2258 SetAsleep(false); |
| 1036 | 2259 recieved_dmg = CalculateIncommingDamage(dmg_type, amount); |
| 2260 sHealth -= recieved_dmg; | |
| 2261 broke_armor = sHealth <= -10; | |
| 2262 if ( sHealth < 1 ) // | |
| 2263 { | |
| 2264 if ( (sHealth + uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE, 0) >= 1) | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2265 || 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
|
2266 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2267 SetCondUnconsciousWithBlockCheck(false); |
| 0 | 2268 } |
| 2269 else | |
| 2270 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2271 SetCondDeadWithBlockCheck(false); |
| 1036 | 2272 if ( sHealth > 0 ) |
| 2273 sHealth = 0; | |
| 2274 } | |
| 2275 if (broke_armor ) | |
| 2276 { | |
| 2277 armor_indx = pEquipment.uArmor; | |
| 2278 if ( armor_indx ) | |
| 0 | 2279 { |
| 1568 | 2280 if ( !(pOwnItems[armor_indx-1].uAttributes & ITEM_ENCHANTED)) |
| 0 | 2281 { |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2282 pOwnItems[armor_indx-1].SetBroken(); |
| 0 | 2283 } |
| 2284 } | |
| 2285 } | |
| 2286 } | |
| 1036 | 2287 if ( recieved_dmg && CanAct() ) |
| 187 | 2288 PlaySound(SPEECH_24, 0); |
| 1036 | 2289 return recieved_dmg; |
| 0 | 2290 } |
| 2291 | |
| 2292 //----- (0048DCF6) -------------------------------------------------------- | |
| 1568 | 2293 int Player::_48DCF6(int a2, Actor *pActor) //TODO check this with IDA to see what the uninitialized vars are supposed to contain |
| 0 | 2294 { |
| 2295 signed int v3; // edi@1 | |
| 2296 signed int v4; // ebx@1 | |
| 2297 Player *v5; // esi@1 | |
| 2298 int v6; // eax@2 | |
| 2299 int v7; // eax@5 | |
| 2300 int v8; // eax@8 | |
| 2301 int v9; // ebx@8 | |
| 2302 int v10; // eax@8 | |
| 2303 int v11; // ebx@8 | |
| 2304 signed int v12; // edx@9 | |
| 2305 ItemGen *v13; // eax@9 | |
| 2306 int v14; // edx@16 | |
| 2307 unsigned int v15; // edx@17 | |
| 2308 int v16; // edx@26 | |
| 2309 unsigned int v17; // edx@27 | |
| 2310 signed int v19; // edx@38 | |
| 2311 int *v20; // ecx@38 | |
| 2312 signed int v21; // eax@40 | |
| 2313 int v22; // eax@49 | |
| 2314 signed int v23; // ebx@49 | |
| 2315 unsigned int v24; // eax@60 | |
| 2316 int v25; // ecx@61 | |
| 2317 int v26; // ebx@74 | |
| 2318 void *v27; // ecx@76 | |
| 2319 unsigned int v28; // ebx@78 | |
| 2320 signed int result; // eax@86 | |
| 2321 SoundID v30; // [sp-20h] [bp-C0h]@56 | |
| 2322 signed int v31; // [sp-1Ch] [bp-BCh]@56 | |
| 2323 unsigned int v32; // [sp-18h] [bp-B8h]@56 | |
| 2324 signed int v33; // [sp-14h] [bp-B4h]@56 | |
| 2325 signed int v34; // [sp-10h] [bp-B0h]@56 | |
| 2326 int v35; // [sp-Ch] [bp-ACh]@56 | |
| 2327 unsigned int v36; // [sp-8h] [bp-A8h]@51 | |
| 2328 unsigned int v37; // [sp-8h] [bp-A8h]@56 | |
| 2329 unsigned int v38; // [sp-8h] [bp-A8h]@57 | |
| 2330 unsigned int v39; // [sp-8h] [bp-A8h]@68 | |
| 2331 enum CHARACTER_ATTRIBUTE_TYPE v40; // [sp-4h] [bp-A4h]@4 | |
| 2332 int v41; // [sp-4h] [bp-A4h]@51 | |
| 2333 int v42; // [sp-4h] [bp-A4h]@56 | |
| 2334 int v43; // [sp-4h] [bp-A4h]@57 | |
| 2335 signed int v44; // [sp-4h] [bp-A4h]@59 | |
| 2336 int v45; // [sp-4h] [bp-A4h]@68 | |
| 2337 char v46[140]; // [sp+Ch] [bp-94h]@13 | |
| 2338 unsigned int v47; // [sp+98h] [bp-8h]@1 | |
| 2339 int v48; // [sp+9Ch] [bp-4h]@1 | |
| 2340 | |
| 2341 v3 = 0; | |
| 2342 v4 = 0; | |
| 2343 v5 = this; | |
| 2344 v47 = 0; | |
| 2345 v48 = 0; | |
| 2346 switch ( a2 ) | |
| 2347 { | |
| 2348 case 1: | |
| 2349 v6 = GetActualWillpower(); | |
| 2350 goto LABEL_46; | |
| 2351 case 2: | |
| 2352 case 3: | |
| 2353 case 4: | |
| 2354 case 9: | |
| 2355 case 10: | |
| 2356 case 11: | |
| 2357 case 13: | |
| 2358 case 21: | |
| 2359 v6 = GetActualEndurance(); | |
| 2360 goto LABEL_46; | |
| 2361 case 5: | |
| 2362 case 12: | |
| 2363 case 23: | |
| 2364 v40 = (CHARACTER_ATTRIBUTE_TYPE)14; | |
| 2365 goto LABEL_5; | |
| 2366 case 15: | |
| 2367 v40 = (CHARACTER_ATTRIBUTE_TYPE)13; | |
| 2368 goto LABEL_5; | |
| 2369 case 6: | |
| 2370 case 7: | |
| 2371 case 8: | |
| 2372 case 14: | |
| 2373 case 16: | |
| 2374 v40 = (CHARACTER_ATTRIBUTE_TYPE)15; | |
| 2375 LABEL_5: | |
| 2376 v7 = GetActualResistance(v40); | |
| 2377 goto LABEL_47; | |
| 2378 case 22: | |
| 2379 v8 = GetActualWillpower(); | |
| 1036 | 2380 v9 = GetParameterBonus(v8); |
| 0 | 2381 v10 = GetActualIntelligence(); |
| 1036 | 2382 v11 = (GetParameterBonus(v10) + v9) >> 1; |
| 0 | 2383 break; |
| 2384 case 17: | |
| 2385 v12 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2386 v13 = this->pInventoryItemList; |
| 0 | 2387 do |
| 2388 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2389 if ( (signed int)v13->uItemID > 0 && (signed int)v13->uItemID <= 134 && !v13->IsBroken()) |
| 0 | 2390 v46[v4++] = v12; |
| 2391 ++v12; | |
| 2392 ++v13; | |
| 2393 } | |
| 2394 while ( v12 < 138 ); | |
| 2395 goto LABEL_36; | |
| 2396 case 18: | |
| 2397 v14 = 0; | |
| 2398 do | |
| 2399 { | |
| 2400 if ( HasItemEquipped((ITEM_EQUIP_TYPE)v14) ) | |
| 2401 { | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
2402 __debugbreak(); // player.cpp(2871): warning C4700: uninitialized local variable 'v15' used |
| 816 | 2403 if ( v15 == EQUIP_ARMOUR ) |
| 898 | 2404 v46[v4++] = LOBYTE(v5->pEquipment.uArmor) - 1; |
| 816 | 2405 if ( (!v15 || v15 == 1) && GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v15) == 4 ) |
| 898 | 2406 v46[v4++] = *((char *)&v5->pEquipment.uShield + 4 * v15) - 1; |
| 0 | 2407 } |
| 2408 v14 = v15 + 1; | |
| 2409 } | |
| 2410 while ( v14 < 16 ); | |
| 2411 goto LABEL_36; | |
| 2412 case 19: | |
| 2413 v16 = 0; | |
| 2414 do | |
| 2415 { | |
| 2416 if ( HasItemEquipped((ITEM_EQUIP_TYPE)v16) ) | |
| 2417 { | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
2418 __debugbreak(); // player.cpp(2886): warning C4700: uninitialized local variable 'v17' used |
| 0 | 2419 if ( v17 == 2 ) |
| 2420 v46[v4++] = LOBYTE(v5->pEquipment.uBow) - 1; | |
| 2421 if ( (!v17 || v17 == 1) | |
| 816 | 2422 && (!GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v17) || GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v17) == 1) ) |
| 898 | 2423 v46[v4++] = *((char *)&v5->pEquipment.uShield + 4 * v17) - 1; |
| 0 | 2424 } |
| 2425 v16 = v17 + 1; | |
| 2426 } | |
| 2427 while ( v16 < 16 ); | |
| 2428 LABEL_36: | |
| 2429 if ( !v4 ) | |
| 2430 goto LABEL_87; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2431 v48 = (int)&v5->pInventoryItemList[(unsigned __int8)v46[rand() % v4]]; |
| 0 | 2432 v11 = 3 * (pItemsTable->pItems[*(int *)v48].uMaterial + pItemsTable->pItems[*(int *)v48].uDamageMod); |
| 2433 break; | |
| 2434 case 20: | |
| 2435 v19 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2436 v20 = this->pInventoryMatrix; |
| 0 | 2437 do |
| 2438 { | |
| 2439 if ( *v20 > 0 ) | |
| 2440 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2441 v21 = *(int *)&v5->pInventoryItemList[*v20-1]; |
| 0 | 2442 if ( v21 > 0 ) |
| 2443 { | |
| 2444 if ( v21 <= 134 ) | |
| 2445 v46[v4++] = v19; | |
| 2446 } | |
| 2447 } | |
| 2448 ++v19; | |
| 2449 ++v20; | |
| 2450 } | |
| 2451 while ( v19 < 126 ); | |
| 2452 if ( !v4 ) | |
| 2453 goto LABEL_87; | |
| 2454 v47 = (unsigned __int8)v46[rand() % v4]; | |
| 2455 v6 = GetActualAccuracy(); | |
| 2456 LABEL_46: | |
| 1036 | 2457 v7 = GetParameterBonus(v6); |
| 0 | 2458 LABEL_47: |
| 2459 v11 = v7; | |
| 2460 break; | |
| 2461 default: | |
| 2462 v11 = 0; | |
| 2463 break; | |
| 2464 } | |
| 2465 v22 = GetActualLuck(); | |
| 1036 | 2466 v23 = GetParameterBonus(v22) + v11 + 30; |
| 0 | 2467 if ( rand() % v23 >= 30 ) |
| 2468 { | |
| 2469 LABEL_87: | |
| 2470 result = 0; | |
| 2471 } | |
| 2472 else | |
| 2473 { | |
| 2474 switch ( a2 ) | |
| 2475 { | |
| 2476 case 1: | |
| 2477 v41 = 1; | |
| 2478 v36 = 0; | |
| 2479 goto LABEL_56; | |
| 2480 case 2: | |
| 2481 v41 = 1; | |
| 2482 v36 = 1; | |
| 2483 goto LABEL_56; | |
| 2484 case 3: | |
| 2485 v41 = 1; | |
| 2486 v36 = 2; | |
| 2487 goto LABEL_56; | |
| 2488 case 23: | |
| 2489 v41 = 1; | |
| 2490 v36 = 3; | |
| 2491 goto LABEL_56; | |
| 2492 case 4: | |
| 2493 v41 = 1; | |
| 2494 v36 = 4; | |
| 2495 LABEL_56: | |
| 2496 SetCondition(v36, v41); | |
| 2497 v42 = 0; | |
| 2498 v37 = 0; | |
| 2499 v35 = 0; | |
| 2500 v34 = 0; | |
| 2501 v33 = -1; | |
| 2502 v32 = 0; | |
| 2503 v31 = 0; | |
| 2504 v30 = (SoundID)221; | |
| 2505 goto LABEL_83; | |
| 2506 case 5: | |
| 2507 v43 = 1; | |
| 2508 v38 = 5; | |
| 2509 goto LABEL_70; | |
| 2510 case 6: | |
| 2511 case 7: | |
| 2512 case 8: | |
| 2513 if ( a2 == 6 ) | |
| 2514 { | |
| 2515 v44 = 6; | |
| 2516 goto LABEL_60; | |
| 2517 } | |
| 2518 v25 = 2 * (a2 != 8) + 8; | |
| 2519 goto LABEL_65; | |
| 2520 case 9: | |
| 2521 if ( a2 == 6 ) | |
| 2522 { | |
| 2523 v44 = 7; | |
| 2524 LABEL_60: | |
| 2525 v24 = v44; | |
| 2526 } | |
| 2527 else | |
| 2528 { | |
| 2529 v25 = 2 * (a2 != 8) + 9; | |
| 2530 LABEL_65: | |
| 2531 v24 = v25; | |
| 2532 } | |
| 2533 SetCondition(v24, 1); | |
| 2534 v42 = 0; | |
| 2535 v37 = 0; | |
| 2536 v35 = 0; | |
| 2537 v34 = 0; | |
| 2538 v33 = -1; | |
| 2539 v32 = 0; | |
| 2540 v31 = 0; | |
| 2541 v30 = (SoundID)222; | |
| 2542 LABEL_83: | |
| 2543 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42); | |
| 2544 do | |
| 2545 { | |
| 2546 LABEL_84: | |
| 2547 if ( v5 == pPlayers[v3 + 1] ) | |
| 2548 break; | |
| 2549 ++v3; | |
| 2550 } | |
| 2551 while ( v3 < 4 ); | |
| 2552 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2553 result = 1; | |
| 2554 break; | |
| 2555 case 12: | |
| 2556 v43 = 1; | |
| 2557 v38 = 12; | |
| 2558 goto LABEL_70; | |
| 2559 case 15: | |
| 2560 v45 = 1; | |
| 2561 v39 = 15; | |
| 2562 goto LABEL_73; | |
| 2563 case 13: | |
| 2564 v43 = 1; | |
| 2565 v38 = 13; | |
| 2566 LABEL_70: | |
| 2567 SetCondition(v38, v43); | |
| 2568 v42 = 0; | |
| 2569 v37 = 0; | |
| 2570 v35 = 0; | |
| 2571 v34 = 0; | |
| 2572 v33 = -1; | |
| 2573 v32 = 0; | |
| 2574 v31 = 0; | |
| 2575 v30 = (SoundID)224; | |
| 2576 goto LABEL_83; | |
| 2577 case 14: | |
| 2578 v45 = 1; | |
| 2579 v39 = 14; | |
| 2580 goto LABEL_73; | |
| 2581 case 16: | |
| 2582 v45 = 1; | |
| 2583 v39 = 16; | |
| 2584 LABEL_73: | |
| 2585 SetCondition(v39, v45); | |
| 2586 v42 = 0; | |
| 2587 v37 = 0; | |
| 2588 v35 = 0; | |
| 2589 v34 = 0; | |
| 2590 v33 = -1; | |
| 2591 v32 = 0; | |
| 2592 v31 = 0; | |
| 2593 v30 = (SoundID)225; | |
| 2594 goto LABEL_83; | |
| 2595 case 17: | |
| 2596 case 18: | |
| 2597 case 19: | |
| 2598 v26 = v48; | |
| 2599 if ( *(char *)(v48 + 21) & 2 ) | |
| 2600 goto LABEL_84; | |
| 187 | 2601 PlaySound(SPEECH_40, 0); |
| 0 | 2602 *(int *)(v26 + 20) |= 2u; |
| 2603 goto LABEL_79; | |
| 2604 case 20: | |
| 187 | 2605 PlaySound(SPEECH_40, 0); |
| 0 | 2606 v27 = pActor->array_000234; |
| 2607 if ( pActor->array_000234[0].uItemID ) | |
| 2608 { | |
| 2609 v27 = &pActor->array_000234[1]; | |
| 2610 if ( pActor->array_000234[1].uItemID ) | |
| 2611 goto LABEL_84; | |
| 2612 } | |
| 2613 v28 = v47; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2614 memcpy(v27, &v5->pInventoryItemList[v5->pInventoryMatrix[v47]-1], 0x24u); |
| 0 | 2615 RemoveItemAtInventoryIndex(v28); |
| 2616 LABEL_79: | |
| 2617 v42 = 0; | |
| 2618 v37 = 0; | |
| 2619 v35 = 0; | |
| 2620 v34 = 0; | |
| 2621 v33 = -1; | |
| 2622 v32 = 0; | |
| 2623 v31 = 0; | |
| 2624 v30 = (SoundID)47; | |
| 2625 goto LABEL_83; | |
| 2626 case 21: | |
| 187 | 2627 PlaySound(SPEECH_42, 0); |
| 0 | 2628 ++v5->sAgeModifier; |
| 2629 goto LABEL_82; | |
| 2630 case 22: | |
| 187 | 2631 PlaySound(SPEECH_41, 0); |
| 0 | 2632 v5->sMana = 0; |
| 2633 LABEL_82: | |
| 2634 v42 = 0; | |
| 2635 v37 = 0; | |
| 2636 v35 = 0; | |
| 2637 v34 = 0; | |
| 2638 v33 = -1; | |
| 2639 v32 = 0; | |
| 2640 v31 = 0; | |
| 2641 v30 = (SoundID)226; | |
| 2642 goto LABEL_83; | |
| 2643 default: | |
| 2644 goto LABEL_87; | |
| 2645 } | |
| 2646 } | |
| 2647 return result; | |
| 2648 } | |
| 324 | 2649 |
| 0 | 2650 // 48DCF6: using guessed type char var_94[140]; |
| 2651 | |
| 2652 //----- (0048E1A3) -------------------------------------------------------- | |
| 2653 unsigned int Player::GetSpellSchool(unsigned int uSpellID) | |
| 2654 { | |
| 1091 | 2655 return pSpellStats->pInfos[uSpellID].uSchool; |
| 0 | 2656 } |
| 2657 | |
| 2658 //----- (0048E1B5) -------------------------------------------------------- | |
| 816 | 2659 int Player::GetAttackRecoveryTime(bool bRangedAttack) |
| 2660 { | |
| 2661 ItemGen *weapon = nullptr; | |
| 2662 ItemDesc *weapon_desc = nullptr; | |
| 2663 uint weapon_recovery = base_recovery_times_per_weapon_type[0]; | |
| 2664 if (bRangedAttack) | |
| 0 | 2665 { |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2666 if ( HasItemEquipped(EQUIP_BOW) ) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2667 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2668 weapon = &pInventoryItemList[pEquipment.uBow - 1]; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2669 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
|
2670 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
|
2671 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2672 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2673 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
|
2674 { |
| 816 | 2675 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
|
2676 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2677 else if ( HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 816 | 2678 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2679 weapon = &pInventoryItemList[pEquipment.uMainHand - 1]; |
| 816 | 2680 weapon_desc = &pItemsTable->pItems[weapon->uItemID]; |
| 2681 if (weapon_desc->uEquipType == EQUIP_WAND) | |
| 2682 { | |
| 2683 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
| 2684 __debugbreak(); // looks like wands were two-handed weapons once, or supposed to be. should not get here now | |
| 2685 weapon_recovery = pSpellDatas[wand_spell_ids[weapon->uItemID - ITEM_WAND_FIRE]].uExpertLevelRecovery; | |
| 2686 } | |
| 0 | 2687 else |
| 816 | 2688 weapon_recovery = base_recovery_times_per_weapon_type[weapon_desc->uSkillType]; |
| 2689 } | |
| 1010 | 2690 if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD) |
| 2691 // ADD: shield check because shield recovery is added later and can be accidentally doubled | |
| 816 | 2692 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2693 auto v12 = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 2694 auto v12_desc = &pItemsTable->pItems[v12->uItemID]; |
| 2695 if (base_recovery_times_per_weapon_type[v12_desc->uSkillType] > weapon_recovery) | |
| 2696 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2697 weapon = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 2698 weapon_desc = &pItemsTable->pItems[weapon->uItemID]; |
| 2699 weapon_recovery = base_recovery_times_per_weapon_type[pItemsTable->pItems[weapon->uItemID].uSkillType]; | |
| 2700 } | |
| 2701 } | |
| 2702 | |
| 2703 uint armour_recovery = 0; | |
| 0 | 2704 if ( HasItemEquipped(EQUIP_ARMOUR) ) |
| 2705 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2706 auto armour_skill_type = pItemsTable->pItems[pInventoryItemList[pEquipment.uArmor - 1].uItemID].uSkillType; |
| 816 | 2707 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
|
2708 float multiplier; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2709 |
| 816 | 2710 if (armour_skill_type == PLAYER_SKILL_LEATHER) |
| 2711 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2712 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0, 0, 0); |
| 816 | 2713 } |
| 2714 else if (armour_skill_type == PLAYER_SKILL_CHAIN) | |
| 2715 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2716 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0, 0); |
| 816 | 2717 } |
| 2718 else if (armour_skill_type == PLAYER_SKILL_PLATE) | |
| 2719 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2720 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0.5f, 0); |
| 0 | 2721 } |
| 2722 else | |
| 2723 { | |
| 1545 | 2724 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
|
2725 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
|
2726 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2727 |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2728 armour_recovery = base_armour_recovery * multiplier; |
| 816 | 2729 } |
| 2730 | |
| 2731 uint shield_recovery = 0; | |
| 2732 if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) == EQUIP_SHIELD) | |
| 2733 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2734 auto shield = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 2735 auto skill_type = pItemsTable->pItems[shield->uItemID].uSkillType; |
| 2736 | |
| 2737 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
|
2738 float multiplier = GetArmorRecoveryMultiplierFromSkillLevel(skill_type, 1.0f, 0, 0, 0); |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2739 shield_recovery = shield_base_recovery * multiplier; |
| 816 | 2740 } |
| 2741 | |
| 1036 | 2742 uint player_speed_recovery_reduction = GetParameterBonus(GetActualSpeed()), |
| 816 | 2743 sword_axe_bow_recovery_reduction = 0; |
| 2744 bool shooting_laser = false; | |
| 2745 if (weapon_desc) | |
| 2746 { | |
| 2747 if (GetActualSkillLevel((PLAYER_SKILL_TYPE)weapon_desc->uSkillType) && | |
| 2748 (weapon_desc->uSkillType == PLAYER_SKILL_SWORD || weapon_desc->uSkillType == PLAYER_SKILL_AXE || weapon_desc->uSkillType == PLAYER_SKILL_BOW) ) | |
| 2749 { | |
| 2750 if (SkillToMastery(pActiveSkills[weapon_desc->uSkillType]) >= 2 ) // Expert Sword, Axe & Bow reduce recovery | |
| 2751 sword_axe_bow_recovery_reduction = pActiveSkills[weapon_desc->uSkillType] & 0x3F; | |
| 2752 } | |
| 2753 if (weapon_desc->uSkillType == PLAYER_SKILL_BLASTER) | |
| 2754 shooting_laser = true; | |
| 2755 } | |
| 2756 | |
| 2757 uint armsmaster_recovery_reduction = 0; | |
| 2758 if (!bRangedAttack && !shooting_laser) | |
| 2759 { | |
| 2760 if (uint armsmaster_level = GetActualSkillLevel(PLAYER_SKILL_ARMSMASTER)) | |
| 2761 { | |
| 2762 armsmaster_recovery_reduction = armsmaster_level & 0x3F; | |
| 2763 if (SkillToMastery(armsmaster_level) >= 4) | |
| 2764 armsmaster_recovery_reduction *= 2; | |
| 2765 } | |
| 2766 } | |
| 2767 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2768 uint hasteRecoveryReduction = 0; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2769 if (pPlayerBuffs[PLAYER_BUFF_7].uExpireTime > 0 || pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime > 0 ) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2770 hasteRecoveryReduction = 25; |
| 816 | 2771 |
| 2772 uint weapon_enchantment_recovery_reduction = 0; | |
| 2773 if ( weapon ) | |
| 2774 { | |
| 2775 if (weapon->uSpecEnchantmentType == 59 || | |
| 2776 weapon->uSpecEnchantmentType == 41 || | |
| 2777 weapon->uSpecEnchantmentType == 500) | |
| 2778 weapon_enchantment_recovery_reduction = 20; | |
| 2779 } | |
| 2780 | |
| 2781 int recovery = weapon_recovery + | |
| 2782 armour_recovery + | |
| 2783 shield_recovery | |
| 2784 - armsmaster_recovery_reduction | |
| 2785 - weapon_enchantment_recovery_reduction | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2786 - hasteRecoveryReduction |
| 816 | 2787 - sword_axe_bow_recovery_reduction |
| 2788 - player_speed_recovery_reduction; | |
| 2789 | |
| 2790 if (recovery < 0) | |
| 2791 recovery = 0; | |
| 2792 return recovery; | |
| 0 | 2793 } |
| 2794 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2795 |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2796 //----- new -------------------------------------------------------- |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2797 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
|
2798 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2799 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
|
2800 switch (skill_mastery) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2801 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2802 case 1: return mult1; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2803 case 2: return mult2; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2804 case 3: return mult3; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2805 case 4: return mult4; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2806 } |
|
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) |
| 2821 + GetItemsBonus(CHARACTER_ATTRIBUTE_HEALTH, 0) + 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 | |
| 2836 int result; // eax@7 | |
| 1116 | 2837 |
| 135 | 2838 switch (classType) |
| 0 | 2839 { |
| 1116 | 2840 case PLAYER_CLASS_ROGUE: |
| 2841 case PLAYER_CLASS_SPY: | |
| 2842 case PLAYER_CLASS_ASSASSIN: | |
| 2843 case PLAYER_CLASS_ARCHER: | |
| 2844 case PLAYER_CLASS_WARRIOR_MAGE: | |
| 2845 case PLAYER_CLASS_MASTER_ARCHER: | |
| 2846 case PLAYER_CLASS_SNIPER: | |
| 2847 case PLAYER_CLASS_SORCERER: | |
| 2848 case PLAYER_CLASS_WIZARD: | |
| 2849 case PLAYER_CLASS_ARCHMAGE: | |
| 2850 case PLAYER_CLASS_LICH: | |
| 0 | 2851 v2 = GetActualIntelligence(); |
| 1036 | 2852 v3 = GetParameterBonus(v2); |
| 1116 | 2853 break; |
| 2854 case PLAYER_CLASS_INITIATE: | |
| 2855 case PLAYER_CLASS_MASTER: | |
| 2856 case PLAYER_CLASS_NINJA: | |
| 2857 case PLAYER_CLASS_PALADIN: | |
| 2858 case PLAYER_CLASS_CRUSADER: | |
| 2859 case PLAYER_CLASS_HERO: | |
| 2860 case PLAYER_CLASS_VILLIAN: | |
| 2861 case PLAYER_CLASS_CLERIC: | |
| 2862 case PLAYER_CLASS_PRIEST: | |
| 2863 case PLAYER_CLASS_PRIEST_OF_SUN: | |
| 2864 case PLAYER_CLASS_PRIEST_OF_MOON: | |
| 0 | 2865 v2 = GetActualWillpower(); |
| 1036 | 2866 v3 = GetParameterBonus(v2); |
| 1116 | 2867 break; |
| 2868 case PLAYER_CLASS_HUNTER: | |
| 2869 case PLAYER_CLASS_RANGER_LORD: | |
| 2870 case PLAYER_CLASS_BOUNTY_HUNTER: | |
| 2871 case PLAYER_CLASS_DRUID: | |
| 2872 case PLAYER_CLASS_GREAT_DRUID: | |
| 2873 case PLAYER_CLASS_ARCH_DRUID: | |
| 2874 case PLAYER_CLASS_WARLOCK: | |
| 0 | 2875 v4 = GetActualWillpower(); |
| 1036 | 2876 v5 = GetParameterBonus(v4); |
| 0 | 2877 v6 = GetActualIntelligence(); |
| 1036 | 2878 v3 = GetParameterBonus(v6) + v5; |
| 0 | 2879 break; |
| 2880 default: | |
| 1116 | 2881 return 0; |
| 0 | 2882 break; |
| 2883 } | |
| 1116 | 2884 v7 = pBaseManaPerLevelByClass[classType] * (GetActualLevel() + v3); |
| 2885 v8 = GetItemsBonus(CHARACTER_ATTRIBUTE_MANA, 0) + v7; | |
| 2886 v9 = uFullManaBonus | |
| 2887 + pBaseManaByClass[classType / 4] | |
| 2888 + GetSkillBonus(CHARACTER_ATTRIBUTE_MANA) | |
| 2889 + v8; | |
| 2890 return max(0,v9); | |
| 0 | 2891 } |
| 2892 | |
| 2893 //----- (0048E656) -------------------------------------------------------- | |
| 2894 int Player::GetBaseAC() | |
| 2895 { | |
| 2896 int v2; // eax@1 | |
| 2897 int v3; // esi@1 | |
| 2898 int v4; // esi@1 | |
| 2899 int v5; // esi@1 | |
| 2900 int result; // eax@2 | |
| 2901 | |
| 2902 v2 = GetActualSpeed(); | |
| 1036 | 2903 v3 = GetParameterBonus(v2); |
| 0 | 2904 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS, 0) + v3; |
| 2905 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; | |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2906 return max(0, v5); |
| 0 | 2907 } |
| 2908 | |
| 2909 //----- (0048E68F) -------------------------------------------------------- | |
| 2910 int Player::GetActualAC() | |
| 2911 { | |
| 2912 int v2; // eax@1 | |
| 2913 int v3; // esi@1 | |
| 2914 int v4; // esi@1 | |
| 2915 int v5; // esi@1 | |
| 2916 int v6; // esi@1 | |
| 2917 int result; // eax@2 | |
| 2918 | |
| 2919 v2 = GetActualSpeed(); | |
| 1036 | 2920 v3 = GetParameterBonus(v2); |
| 0 | 2921 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS, 0) + v3; |
| 2922 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; | |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2923 v6 = this->sACModifier + GetMagicalBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v5; |
|
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2924 return max(0, v6); |
| 0 | 2925 } |
| 2926 | |
| 2927 //----- (0048E6DC) -------------------------------------------------------- | |
| 2928 unsigned int Player::GetBaseAge() | |
| 2929 { | |
| 352 | 2930 return ((__int64)(pParty->uTimePlayed * 0.234375) / 60 / 60 / 24) / 7 / 4 / 12 - uBirthYear + game_starting_year; |
| 0 | 2931 } |
| 2932 | |
| 2933 //----- (0048E72C) -------------------------------------------------------- | |
| 2934 unsigned int Player::GetActualAge() | |
| 2935 { | |
| 2936 return this->sAgeModifier + GetBaseAge(); | |
| 2937 } | |
| 2938 | |
| 2939 //----- (0048E73F) -------------------------------------------------------- | |
| 2940 int Player::GetBaseResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2941 { | |
| 2942 Player *v2; // ebx@1 | |
| 2943 signed int v3; // esi@1 | |
| 2944 enum CHARACTER_RACE v4; // eax@1 | |
| 2945 signed int v5; // edi@8 | |
| 2946 char v6; // zf@9 | |
| 2947 int v7; // esi@20 | |
| 2948 int result; // eax@21 | |
| 2949 signed int v9; // [sp-4h] [bp-10h]@11 | |
| 2950 | |
| 2951 v2 = this; | |
| 2952 v3 = 0; | |
| 2953 v4 = GetRace(); | |
| 2954 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE ) | |
| 2955 { | |
| 2956 v5 = 0; | |
| 2957 goto LABEL_16; | |
| 2958 } | |
| 2959 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_AIR ) | |
| 2960 { | |
| 2961 v5 = 1; | |
| 2962 LABEL_16: | |
| 2963 v6 = v4 == 2; | |
| 2964 goto LABEL_17; | |
| 2965 } | |
| 2966 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_WATER ) | |
| 2967 { | |
| 2968 v6 = v4 == 3; | |
| 2969 v5 = 2; | |
| 2970 goto LABEL_17; | |
| 2971 } | |
| 2972 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_EARTH ) | |
| 2973 { | |
| 2974 v5 = 3; | |
| 2975 v6 = v4 == 3; | |
| 2976 goto LABEL_17; | |
| 2977 } | |
| 2978 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_MIND ) | |
| 2979 { | |
| 2980 v5 = 7; | |
| 2981 if ( v4 != 1 ) | |
| 2982 goto LABEL_20; | |
| 2983 v9 = 10; | |
| 2984 LABEL_19: | |
| 2985 v3 = v9; | |
| 2986 goto LABEL_20; | |
| 2987 } | |
| 2988 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_BODY || a2 == 33 ) | |
| 2989 { | |
| 2990 v5 = 8; | |
| 2991 v6 = v4 == 0; | |
| 2992 LABEL_17: | |
| 2993 if ( !v6 ) | |
| 2994 goto LABEL_20; | |
| 2995 v9 = 5; | |
| 2996 goto LABEL_19; | |
| 2997 } | |
| 2998 v5 = 0; | |
| 2999 LABEL_20: | |
| 3000 v7 = GetItemsBonus(a2, 0) + v3; | |
| 135 | 3001 if ( v2->classType != PLAYER_CLASS_LICH || (result = 200, v7 + *(&v2->sResFireBase + v5) <= 200) ) |
| 0 | 3002 result = v7 + *(&v2->sResFireBase + v5); |
| 3003 return result; | |
| 3004 } | |
| 3005 | |
| 3006 //----- (0048E7D0) -------------------------------------------------------- | |
| 3007 int Player::GetActualResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 3008 { | |
| 3009 signed int v2; // edi@1 | |
| 3010 Player *v3; // esi@1 | |
| 3011 enum CHARACTER_RACE v4; // ebx@1 | |
| 3012 char v6; // zf@18 | |
| 3013 int v7; // ebx@28 | |
| 3014 int result; // eax@28 | |
| 3015 signed int v9; // [sp+10h] [bp-8h]@1 | |
| 3016 signed int v10; // [sp+14h] [bp-4h]@1 | |
| 3017 | |
| 3018 v2 = 0; | |
| 3019 v3 = this; | |
| 3020 v10 = 0; | |
| 3021 v9 = 0; | |
| 3022 v4 = GetRace(); | |
| 652 | 3023 if ( CheckHiredNPCSpeciality(Enchanter) ) |
| 0 | 3024 v10 = 20; |
| 3025 if ( (a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE | |
| 3026 || a2 == CHARACTER_ATTRIBUTE_RESIST_AIR | |
| 3027 || a2 == CHARACTER_ATTRIBUTE_RESIST_WATER | |
| 3028 || a2 == CHARACTER_ATTRIBUTE_RESIST_EARTH) | |
| 3029 && SkillToMastery(v3->pActiveSkills[9]) == 4 | |
| 3030 && HasItemEquipped(EQUIP_ARMOUR) | |
| 3031 && GetEquippedItemSkillType(EQUIP_ARMOUR) == PLAYER_SKILL_LEATHER ) | |
| 3032 v10 += v3->pActiveSkills[9] & 0x3F; | |
| 3033 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE ) | |
| 3034 goto LABEL_25; | |
| 3035 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_AIR ) | |
| 3036 { | |
| 3037 v2 = 1; | |
| 3038 LABEL_25: | |
| 3039 v6 = v4 == 2; | |
| 3040 LABEL_26: | |
| 3041 if ( v6 ) | |
| 3042 v9 = 5; | |
| 3043 goto LABEL_28; | |
| 3044 } | |
| 3045 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_WATER ) | |
| 3046 { | |
| 3047 v6 = v4 == 3; | |
| 3048 v2 = 2; | |
| 3049 goto LABEL_26; | |
| 3050 } | |
| 3051 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_EARTH ) | |
| 3052 { | |
| 3053 v2 = 3; | |
| 3054 if ( v4 == 3 ) | |
| 3055 v10 += 5; | |
| 3056 } | |
| 3057 else | |
| 3058 { | |
| 3059 if ( a2 != CHARACTER_ATTRIBUTE_RESIST_MIND ) | |
| 3060 { | |
| 3061 if ( a2 != CHARACTER_ATTRIBUTE_RESIST_BODY && a2 != 33 ) | |
| 3062 goto LABEL_28; | |
| 3063 v2 = 8; | |
| 3064 v6 = v4 == 0; | |
| 3065 goto LABEL_26; | |
| 3066 } | |
| 3067 v2 = 7; | |
| 3068 if ( v4 == 1 ) | |
| 3069 v9 = 10; | |
| 3070 } | |
| 3071 LABEL_28: | |
| 3072 v7 = GetItemsBonus(a2, 0); | |
| 3073 result = v10 + GetMagicalBonus(a2) + v7 + v9 + *(&v3->sResFireBonus + v2) + *(&v3->sResFireBase + v2); | |
| 135 | 3074 if ( v3->classType == PLAYER_CLASS_LICH ) |
| 0 | 3075 { |
| 3076 if ( result > 200 ) | |
| 3077 result = 200; | |
| 3078 } | |
| 3079 return result; | |
| 3080 } | |
| 3081 | |
| 3082 //----- (0048E8F5) -------------------------------------------------------- | |
| 816 | 3083 bool Player::Recover(int dt) |
| 3084 { | |
| 3085 //Player *v2; // esi@1 | |
| 0 | 3086 signed __int64 v3; // qax@1 |
| 816 | 3087 //bool result; // eax@4 |
| 3088 | |
| 3089 //v2 = this; | |
| 3090 v3 = (signed __int64)((double)(dt * _48EA46_calc_special_bonus_by_items(17)) * 0.01 + (double)dt); | |
| 3091 | |
| 3092 Log::Warning(L"Recover(dt = %u/%u - %u", dt, (uint)v3, (uint)uTimeToRecovery); | |
| 3093 | |
| 3094 if (uTimeToRecovery > v3) | |
| 3095 { | |
| 3096 uTimeToRecovery -= v3; | |
| 3097 return true; | |
| 0 | 3098 } |
| 3099 else | |
| 3100 { | |
| 816 | 3101 uTimeToRecovery = 0; |
| 3102 viewparams->bRedrawGameUI = true; | |
| 3103 if (!uActiveCharacter) | |
| 0 | 3104 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 3105 return false; |
| 3106 } | |
| 0 | 3107 } |
| 3108 | |
| 3109 //----- (0048E96A) -------------------------------------------------------- | |
| 816 | 3110 void Player::SetRecoveryTime(signed int rec) |
| 3111 { | |
| 1545 | 3112 Assert(rec >= 0); |
| 816 | 3113 |
| 3114 if (rec > uTimeToRecovery) | |
| 3115 uTimeToRecovery = rec; | |
| 3116 | |
| 3117 if (pPlayers[uActiveCharacter] == this && !some_active_character) | |
| 0 | 3118 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 3119 |
| 3120 viewparams->bRedrawGameUI = true; | |
| 0 | 3121 } |
| 3122 // 50C0C4: using guessed type int some_active_character; | |
| 3123 | |
| 3124 //----- (0048E9B7) -------------------------------------------------------- | |
| 3125 void Player::RandomizeName() | |
| 3126 { | |
| 3127 if (!uExpressionTimePassed) | |
| 3128 strcpy(pName, pNPCStats->pNPCNames[rand() % pNPCStats->uNumNPCNames[uSex]][uSex]); | |
| 3129 } | |
| 3130 | |
| 3131 //----- (0048E9F4) -------------------------------------------------------- | |
| 3132 unsigned int Player::GetMajorConditionIdx() | |
| 3133 { | |
| 3134 for (uint i = 0; i < 18; ++i) | |
| 3135 if (pConditions[pConditionImportancyTable[i]] != 0) | |
| 3136 return pConditionImportancyTable[i]; | |
| 3137 | |
| 3138 return 18; | |
| 3139 } | |
| 3140 | |
| 3141 //----- (0048EA1B) -------------------------------------------------------- | |
| 1036 | 3142 int Player::GetParameterBonus( int player_parameter ) |
| 3143 { | |
| 3144 int i; // eax@1 | |
| 3145 i = 0; | |
| 3146 while (param_to_bonus_table[i]) | |
| 3147 { | |
| 3148 if (player_parameter >= param_to_bonus_table[i]) | |
| 3149 break; | |
| 3150 ++i; | |
| 3151 } | |
| 3152 return parameter_to_bonus_value[i]; | |
| 0 | 3153 } |
| 3154 | |
| 3155 //----- (0048EA46) -------------------------------------------------------- | |
| 3156 int Player::_48EA46_calc_special_bonus_by_items(int a2) | |
| 3157 { | |
| 1032 | 3158 int inv_indx; // eax@3 |
| 3159 | |
| 3160 for (int i=EQUIP_OFF_HAND; i<EQUIP_BOOK; ++i ) | |
| 3161 { | |
| 3162 if ( !HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3163 continue; | |
| 3164 inv_indx = pEquipment.pIndices[i] - 1; | |
| 3165 if (a2==17) | |
| 3166 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
3167 if ((pInventoryItemList[inv_indx].uSpecEnchantmentType==17)||(pInventoryItemList[inv_indx].uItemID==533)) //Elven Chainmail+Increases rate of Recovery |
| 1032 | 3168 return 50; |
| 3169 } | |
| 3170 if (a2==24) | |
| 3171 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
3172 if (pInventoryItemList[inv_indx].uSpecEnchantmentType==24) //Increased Knockback. |
| 1032 | 3173 return 5; |
| 3174 } | |
| 3175 } | |
| 3176 return 0; | |
| 0 | 3177 } |
| 3178 | |
| 3179 //----- (0048EAAE) -------------------------------------------------------- | |
| 3180 int Player::GetItemsBonus(CHARACTER_ATTRIBUTE_TYPE attr, int a3) | |
| 3181 { | |
| 3182 CHARACTER_ATTRIBUTE_TYPE v3; // esi@1 | |
| 1040 | 3183 // signed int v4; // eax@1 |
| 0 | 3184 int v5; // edi@1 |
| 3185 Player *v6; // ebx@1 | |
| 3186 Player *v8; // ecx@48 | |
| 3187 int v9; // eax@49 | |
| 3188 int v10; // edx@49 | |
| 3189 Player *v11; // ecx@55 | |
| 3190 int v12; // eax@56 | |
| 3191 int v13; // edx@56 | |
| 3192 int v14; // ecx@58 | |
| 3193 int v15; // eax@58 | |
| 3194 Player *v16; // ecx@61 | |
| 3195 int v17; // eax@62 | |
| 3196 Player *v18; // ecx@66 | |
| 3197 int v19; // eax@67 | |
| 3198 int v20; // eax@69 | |
| 3199 Player *v21; // ecx@75 | |
| 3200 int v22; // eax@76 | |
| 3201 int v23; // edx@76 | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3202 //int v24; // eax@79 |
| 0 | 3203 int v25; // ecx@80 |
| 3204 int v26; // edi@80 | |
| 3205 Player *v27; // ecx@84 | |
| 3206 int v28; // eax@85 | |
| 3207 int v29; // edx@85 | |
| 3208 Player *v30; // ecx@96 | |
| 3209 int v31; // ebp@97 | |
| 3210 int v32; // eax@98 | |
| 3211 unsigned int v33; // eax@100 | |
| 3212 int v34; // eax@103 | |
| 3213 char v35; // zf@104 | |
| 3214 char v36; // zf@107 | |
| 3215 unsigned __int8 v37; // zf@119 | |
| 3216 char v38; // sf@119 | |
| 3217 unsigned __int8 v39; // of@119 | |
| 3218 char v40; // zf@122 | |
| 3219 char v41; // zf@145 | |
| 3220 char v42; // zf@164 | |
| 3221 char v43; // zf@173 | |
| 3222 char v44; // zf@189 | |
| 3223 char v45; // zf@198 | |
| 3224 char v46; // zf@239 | |
| 3225 int v47; // eax@268 | |
| 3226 int v48; // eax@269 | |
| 3227 int v49; // eax@291 | |
| 3228 char v50; // zf@295 | |
| 3229 int v51; // eax@306 | |
| 3230 int v52; // eax@307 | |
| 3231 char v53; // zf@312 | |
| 3232 char v54; // zf@336 | |
| 3233 char v55; // zf@348 | |
| 3234 int v56; // eax@365 | |
| 3235 int v57; // ebx@368 | |
| 3236 signed int v58; // [sp-4h] [bp-20h]@10 | |
| 3237 signed int v59; // [sp-4h] [bp-20h]@71 | |
| 3238 signed int v60; // [sp-4h] [bp-20h]@347 | |
| 3239 int v61; // [sp+10h] [bp-Ch]@1 | |
| 3240 int v62; // [sp+14h] [bp-8h]@1 | |
| 3241 int v63; // [sp+18h] [bp-4h]@101 | |
| 3242 ItemGen *attra; // [sp+20h] [bp+4h]@101 | |
| 3243 unsigned int v65; // [sp+24h] [bp+8h]@95 | |
| 1040 | 3244 bool no_skills; |
| 0 | 3245 |
| 3246 v3 = attr; | |
| 3247 v5 = 0; | |
| 3248 v6 = this; | |
| 3249 v62 = 0; | |
| 3250 v61 = 0; | |
| 3251 | |
| 1040 | 3252 |
| 3253 no_skills=false; | |
| 0 | 3254 switch (attr) |
| 3255 { | |
| 1040 | 3256 case CHARACTER_ATTRIBUTE_SKILL_ALCHEMY: v58 = PLAYER_SKILL_ALCHEMY; break; |
| 3257 case CHARACTER_ATTRIBUTE_SKILL_STEALING: v58 = PLAYER_SKILL_STEALING; break; | |
| 3258 case CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM: v58 = PLAYER_SKILL_TRAP_DISARM; break; | |
| 3259 case CHARACTER_ATTRIBUTE_SKILL_ITEM_ID: v58 = PLAYER_SKILL_ITEM_ID; break; | |
| 3260 case CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID: v58 = PLAYER_SKILL_MONSTER_ID; break; | |
| 3261 case CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER: v58 = PLAYER_SKILL_ARMSMASTER; break; | |
| 3262 case CHARACTER_ATTRIBUTE_SKILL_DODGE: v58 = PLAYER_SKILL_DODGE; break; | |
| 3263 case CHARACTER_ATTRIBUTE_SKILL_UNARMED: v58 = PLAYER_SKILL_UNARMED; break; | |
| 3264 case CHARACTER_ATTRIBUTE_SKILL_FIRE: v58 = PLAYER_SKILL_FIRE; break; | |
| 3265 case CHARACTER_ATTRIBUTE_SKILL_AIR: v58 = PLAYER_SKILL_AIR; break; | |
| 3266 case CHARACTER_ATTRIBUTE_SKILL_WATER: v58 = PLAYER_SKILL_WATER; break; | |
| 3267 case CHARACTER_ATTRIBUTE_SKILL_EARTH: v58 = PLAYER_SKILL_EARTH; break; | |
| 3268 case CHARACTER_ATTRIBUTE_SKILL_SPIRIT: v58 = PLAYER_SKILL_SPIRIT; break; | |
| 3269 case CHARACTER_ATTRIBUTE_SKILL_MIND: v58 = PLAYER_SKILL_MIND; break; | |
| 3270 case CHARACTER_ATTRIBUTE_SKILL_BODY: v58 = PLAYER_SKILL_BODY; break; | |
| 3271 case CHARACTER_ATTRIBUTE_SKILL_LIGHT: v58 = PLAYER_SKILL_LIGHT; break; | |
| 3272 case CHARACTER_ATTRIBUTE_SKILL_DARK: v58 = PLAYER_SKILL_DARK; break; | |
| 3273 case CHARACTER_ATTRIBUTE_SKILL_MEDITATION: v58 = PLAYER_SKILL_MEDITATION; break; | |
| 3274 case CHARACTER_ATTRIBUTE_SKILL_BOW: v58 = PLAYER_SKILL_BOW; break; | |
| 3275 case CHARACTER_ATTRIBUTE_SKILL_SHIELD: v58 = PLAYER_SKILL_SHIELD; break; | |
| 3276 case CHARACTER_ATTRIBUTE_SKILL_LEARNING: v58 = PLAYER_SKILL_LEARNING; break; | |
| 3277 default: | |
| 3278 no_skills=true; | |
| 0 | 3279 } |
| 1040 | 3280 if (!no_skills) |
| 0 | 3281 { |
| 1040 | 3282 if ( !this->pActiveSkills[v58] ) |
| 3283 return 0; | |
| 0 | 3284 } |
| 1040 | 3285 |
| 0 | 3286 if ( (signed int)attr > 28 ) |
| 3287 { | |
| 3288 if ( (signed int)attr < 29 ) | |
| 3289 return v5 + v62 + v61; | |
| 1040 | 3290 if ( (signed int)attr <= CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS ) |
| 0 | 3291 { |
| 3292 if ( HasItemEquipped(EQUIP_BOW) ) | |
| 1040 | 3293 v5 = pItemsTable->pItems[v6->pOwnItems[v6->pEquipment.uBow-1].uItemID].uDamageMod; |
| 0 | 3294 return v5 + v62 + v61; |
| 3295 } | |
| 1040 | 3296 if ( attr == CHARACTER_ATTRIBUTE_RANGED_DMG_MIN ) |
| 0 | 3297 { |
| 3298 if ( !HasItemEquipped(EQUIP_BOW) ) | |
| 3299 return v5 + v62 + v61; | |
| 1040 | 3300 v57 = v6->pOwnItems[v6->pEquipment.uBow-1].uItemID; |
| 0 | 3301 v5 = pItemsTable->pItems[v57].uDamageMod; |
| 3302 v56 = pItemsTable->pItems[v57].uDamageDice; | |
| 1040 | 3303 v5 += v56; |
| 3304 return v5 + v62 + v61; | |
| 3305 } | |
| 3306 if ( attr == CHARACTER_ATTRIBUTE_RANGED_DMG_MAX ) | |
| 0 | 3307 { |
| 3308 if ( !HasItemEquipped(EQUIP_BOW) ) | |
| 3309 return v5 + v62 + v61; | |
| 1040 | 3310 v20 = v6->pOwnItems[v6->pEquipment.uBow-1].uItemID; |
| 0 | 3311 v5 = pItemsTable->pItems[v20].uDamageDice * pItemsTable->pItems[v20].uDamageRoll; |
| 3312 LABEL_365: | |
| 3313 v56 = pItemsTable->pItems[v20].uDamageMod; | |
| 3314 LABEL_366: | |
| 3315 v5 += v56; | |
| 3316 return v5 + v62 + v61; | |
| 3317 } | |
| 3318 if ( (signed int)attr <= 33 || (signed int)attr > 46 ) | |
| 3319 return v5 + v62 + v61; | |
| 3320 LABEL_95: | |
| 3321 v65 = 0; | |
| 3322 while ( 1 ) | |
| 3323 { | |
| 3324 if ( !HasItemEquipped((ITEM_EQUIP_TYPE)v65) ) | |
| 3325 goto LABEL_361; | |
| 898 | 3326 v31 = *(&v6->pEquipment.uShield + v65) - 1; |
| 0 | 3327 if ( v3 == 9 ) |
| 3328 { | |
| 816 | 3329 v32 = GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v65); |
| 0 | 3330 if ( v32 >= 3 ) |
| 3331 { | |
| 3332 if ( v32 <= 11 ) | |
| 3333 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
3334 v33 = v6->pInventoryItemList[v31].uItemID; |
| 0 | 3335 v5 += pItemsTable->pItems[v33].uDamageDice + pItemsTable->pItems[v33].uDamageMod; |
| 3336 } | |
| 3337 } | |
| 3338 } | |
| 3339 v63 = (int)((char *)v6 + 36 * v31); | |
| 3340 attra = (ItemGen *)(v63 + 532); | |
| 377 | 3341 if ( pItemsTable->IsMaterialNonCommon((ItemGen *)(v63 + 532)) == 1 |
| 3342 && !pItemsTable->IsMaterialSpecial(attra) ) | |
| 0 | 3343 { |
| 3344 v34 = attra->uItemID; | |
| 3345 switch ( attra->uItemID ) | |
| 3346 { | |
| 3347 case 0x1F4u: | |
| 3348 v35 = v3 == 5; | |
| 3349 goto LABEL_105; | |
| 3350 case 0x1F5u: | |
| 3351 v36 = v3 == 0; | |
| 3352 goto LABEL_108; | |
| 3353 case 0x1F6u: | |
| 3354 if ( v3 == 21 ) | |
| 3355 v61 += 10; | |
| 3356 v36 = v3 == 2; | |
| 3357 goto LABEL_108; | |
| 3358 case 0x1F7u: | |
| 3359 if ( v3 == 17 ) | |
| 3360 v61 += 5; | |
| 3361 if ( v3 == 18 ) | |
| 3362 v61 += 5; | |
| 3363 v36 = v3 == 6; | |
| 3364 goto LABEL_108; | |
| 3365 case 0x1F8u: | |
| 3366 goto LABEL_118; | |
| 3367 case 0x1F9u: | |
| 3368 v40 = v3 == 3; | |
| 3369 goto LABEL_123; | |
| 3370 case 0x1FAu: | |
| 3371 v35 = v3 == 10; | |
| 3372 goto LABEL_105; | |
| 3373 case 0x1FEu: | |
| 3374 v35 = v3 == 4; | |
| 3375 goto LABEL_105; | |
| 3376 case 0x1FFu: | |
| 3377 if ( v3 == 23 ) | |
| 3378 v61 += 10; | |
| 3379 if ( v3 == 22 ) | |
| 3380 v61 += 10; | |
| 3381 goto LABEL_361; | |
| 3382 case 0x200u: | |
| 3383 if ( v3 == 36 ) | |
| 3384 { | |
| 3385 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[14]); | |
| 3386 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3387 } | |
| 3388 v36 = v3 == 5; | |
| 3389 LABEL_108: | |
| 3390 if ( v36 ) | |
| 3391 v5 += 40; | |
| 3392 goto LABEL_361; | |
| 3393 case 0x201u: | |
| 3394 if ( v3 == 39 ) | |
| 3395 { | |
| 3396 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[17]); | |
| 3397 v34 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3398 v62 = v34; | |
| 3399 } | |
| 3400 goto LABEL_136; | |
| 3401 case 0x202u: | |
| 3402 if ( !v3 ) | |
| 3403 v5 += 150; | |
| 3404 if ( v3 == 1 ) | |
| 3405 v5 -= 40; | |
| 3406 if ( v3 == 2 ) | |
| 3407 v5 -= 40; | |
| 3408 goto LABEL_145; | |
| 3409 case 0x203u: | |
| 3410 if ( v3 == 42 ) | |
| 3411 { | |
| 3412 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[20]); | |
| 3413 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3414 } | |
| 3415 if ( v3 == 43 ) | |
| 3416 v61 += 15; | |
| 3417 goto LABEL_361; | |
| 3418 case 0x204u: | |
| 3419 if ( v3 == 17 ) | |
| 3420 v61 += 5; | |
| 3421 if ( v3 == 18 ) | |
| 3422 v61 += 5; | |
| 3423 if ( v3 == 6 ) | |
| 3424 v5 += 50; | |
| 3425 if ( v3 == 11 || v3 == 10 || v3 == 12 || v3 == 13 || v3 == 33 || v3 == 14 ) | |
| 3426 goto LABEL_166; | |
| 3427 v42 = v3 == 15; | |
| 3428 goto LABEL_165; | |
| 3429 case 0x205u: | |
| 3430 if ( v3 == 18 ) | |
| 3431 v61 += 5; | |
| 3432 goto LABEL_361; | |
| 3433 case 0x206u: | |
| 3434 if ( !v3 ) | |
| 3435 v5 += 100; | |
| 3436 if ( v3 == 3 ) | |
| 3437 v5 += 100; | |
| 3438 v43 = v3 == 9; | |
| 3439 goto LABEL_174; | |
| 3440 case 0x207u: | |
| 3441 if ( v3 == 45 ) | |
| 3442 v61 += 5; | |
| 3443 if ( v3 == 15 ) | |
| 3444 v5 -= 10; | |
| 3445 v42 = v3 == 14; | |
| 3446 LABEL_165: | |
| 3447 if ( v42 ) | |
| 3448 LABEL_166: | |
| 3449 v5 -= 10; | |
| 3450 goto LABEL_361; | |
| 3451 case 0x208u: | |
| 3452 v35 = v3 == 3; | |
| 3453 goto LABEL_105; | |
| 3454 case 0x209u: | |
| 3455 if ( v3 == 2 ) | |
| 3456 v5 += 15; | |
| 3457 if ( !v3 ) | |
| 3458 v5 += 15; | |
| 3459 v41 = v3 == 6; | |
| 3460 goto LABEL_146; | |
| 3461 case 0x20Au: | |
| 3462 if ( v3 == 46 ) | |
| 3463 v61 += 15; | |
| 3464 v44 = v3 == 3; | |
| 3465 goto LABEL_190; | |
| 3466 case 0x20Bu: | |
| 3467 if ( v3 == 34 ) | |
| 3468 { | |
| 3469 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[12]); | |
| 3470 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3471 } | |
| 3472 if ( v3 == 12 ) | |
| 3473 v5 += 50; | |
| 3474 if ( v3 == 2 ) | |
| 3475 v5 += 30; | |
| 3476 v45 = v3 == 9; | |
| 3477 goto LABEL_199; | |
| 3478 case 0x20Cu: | |
| 3479 if ( !v3 ) | |
| 3480 v5 += 75; | |
| 3481 goto LABEL_145; | |
| 3482 case 0x20Du: | |
| 3483 if ( v3 == 5 ) | |
| 3484 v5 += 50; | |
| 3485 if ( v3 == 6 ) | |
| 3486 v5 += 50; | |
| 3487 if ( v3 == 11 || v3 == 10 || v3 == 12 || v3 == 13 || v3 == 33 || v3 == 14 ) | |
| 3488 goto LABEL_374; | |
| 3489 v43 = v3 == 15; | |
| 3490 LABEL_174: | |
| 3491 if ( v43 ) | |
| 3492 LABEL_374: | |
| 3493 v5 -= 15; | |
| 3494 goto LABEL_361; | |
| 3495 case 0x20Eu: | |
| 3496 if ( v3 == 4 ) | |
| 3497 v5 += 150; | |
| 3498 if ( v3 == 44 ) | |
| 3499 v61 += 5; | |
| 3500 if ( v3 == 9 ) | |
| 3501 v5 -= 25; | |
| 3502 goto LABEL_361; | |
| 3503 case 0x20Fu: | |
| 3504 if ( v3 == 39 ) | |
| 3505 { | |
| 3506 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[17]); | |
| 3507 v34 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3508 v62 = v34; | |
| 3509 } | |
| 3510 if ( v3 == 40 ) | |
| 3511 { | |
| 3512 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[18]); | |
| 3513 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3514 } | |
| 3515 LABEL_145: | |
| 3516 v41 = v3 == 5; | |
| 3517 LABEL_146: | |
| 3518 if ( v41 ) | |
| 3519 v5 -= 40; | |
| 3520 goto LABEL_361; | |
| 3521 case 0x210u: | |
| 3522 if ( v3 == 38 ) | |
| 3523 { | |
| 3524 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[16]); | |
| 3525 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3526 } | |
| 3527 if ( !v3 ) | |
| 3528 v5 += 75; | |
| 3529 v44 = v3 == 11; | |
| 3530 LABEL_190: | |
| 3531 if ( v44 ) | |
| 3532 v5 -= 50; | |
| 3533 goto LABEL_361; | |
| 3534 case 0x211u: | |
| 3535 if ( v3 == 5 ) | |
| 3536 v5 += 100; | |
| 3537 if ( v3 == 4 ) | |
| 3538 v5 += 50; | |
| 3539 v35 = v3 == 11; | |
| 3540 LABEL_105: | |
| 3541 if ( v35 ) | |
| 3542 v5 += 50; | |
| 3543 goto LABEL_361; | |
| 3544 case 0x212u: | |
| 3545 if ( v3 == 1 ) | |
| 3546 v5 -= 20; | |
| 3547 v45 = v3 == 2; | |
| 3548 LABEL_199: | |
| 3549 if ( v45 ) | |
| 3550 v5 -= 20; | |
| 3551 goto LABEL_361; | |
| 3552 case 0x214u: | |
| 3553 if ( v3 == 1 ) | |
| 3554 v5 += 15; | |
| 3555 v46 = v3 == 2; | |
| 3556 goto LABEL_240; | |
| 3557 case 0x215u: | |
| 3558 if ( v3 == 5 ) | |
| 3559 v5 += 15; | |
| 3560 v46 = v3 == 4; | |
| 3561 goto LABEL_240; | |
| 3562 case 0x216u: | |
| 3563 if ( v3 == 10 ) | |
| 3564 v5 += 30; | |
| 3565 if ( !v3 ) | |
| 3566 v5 += 15; | |
| 3567 goto LABEL_315; | |
| 3568 case 0x217u: | |
| 3569 if ( v3 == 21 ) | |
| 3570 v61 += 5; | |
| 3571 if ( !v3 ) | |
| 3572 v5 += 15; | |
| 3573 goto LABEL_253; | |
| 3574 case 0x218u: | |
| 3575 goto LABEL_253; | |
| 3576 default: | |
| 3577 goto LABEL_361; | |
| 3578 } | |
| 3579 goto LABEL_361; | |
| 3580 } | |
| 3581 if ( *(int *)(v63 + 536) == v3 + 1 ) | |
| 3582 { | |
| 3583 if ( (signed int)v3 >= 0 ) | |
| 3584 { | |
| 3585 if ( (signed int)v3 <= 15 ) | |
| 3586 { | |
| 3587 v5 += *((int *)v6->pConditions + 9 * v31 + 135); | |
| 3588 } | |
| 3589 else | |
| 3590 { | |
| 3591 if ( (signed int)v3 <= 23 && v5 < *((int *)v6->pConditions + 9 * v31 + 135) ) | |
| 3592 v5 = *((int *)v6->pConditions + 9 * v31 + 135); | |
| 3593 } | |
| 3594 } | |
| 3595 goto LABEL_361; | |
| 3596 } | |
| 3597 v34 = *(int *)(v63 + 544); | |
| 3598 if ( v34 > 48 ) | |
| 3599 { | |
| 3600 switch ( v34 ) | |
| 3601 { | |
| 3602 case 54: | |
| 3603 goto LABEL_315; | |
| 3604 case 49: | |
| 3605 if ( v3 == 6 ) | |
| 3606 goto LABEL_121; | |
| 3607 v50 = v3 == 1; | |
| 3608 goto LABEL_296; | |
| 3609 case 51: | |
| 3610 if ( v3 != 5 && v3 != 1 ) | |
| 3611 goto LABEL_309; | |
| 3612 goto LABEL_121; | |
| 3613 case 52: | |
| 3614 if ( v3 == 3 ) | |
| 3615 goto LABEL_121; | |
| 3616 v50 = v3 == 4; | |
| 3617 goto LABEL_296; | |
| 3618 case 53: | |
| 3619 if ( !v3 ) | |
| 3620 goto LABEL_121; | |
| 3621 v50 = v3 == 2; | |
| 3622 goto LABEL_296; | |
| 3623 case 55: | |
| 3624 v46 = v3 == 6; | |
| 3625 goto LABEL_240; | |
| 3626 case 56: | |
| 3627 if ( !v3 ) | |
| 3628 goto LABEL_351; | |
| 3629 v53 = v3 == 3; | |
| 3630 goto LABEL_350; | |
| 3631 case 57: | |
| 3632 if ( v3 == 1 ) | |
| 3633 goto LABEL_351; | |
| 3634 v53 = v3 == 2; | |
| 3635 goto LABEL_350; | |
| 3636 case 50: | |
| 3637 if ( v3 == 10 ) | |
| 3638 v5 += 30; | |
| 3639 goto LABEL_361; | |
| 3640 case 60: | |
| 3641 if ( v3 != 23 ) | |
| 3642 goto LABEL_336; | |
| 3643 if ( v5 >= 3 ) | |
| 3644 goto LABEL_361; | |
| 3645 v5 = 3; | |
| 3646 LABEL_336: | |
| 3647 v54 = v3 == 22; | |
| 3648 goto LABEL_345; | |
| 3649 case 61: | |
| 3650 if ( v3 != 17 ) | |
| 3651 goto LABEL_340; | |
| 3652 if ( v5 >= 3 ) | |
| 3653 goto LABEL_361; | |
| 3654 v5 = 3; | |
| 3655 LABEL_340: | |
| 3656 v54 = v3 == 18; | |
| 3657 goto LABEL_345; | |
| 3658 case 62: | |
| 3659 if ( v3 != 19 ) | |
| 3660 goto LABEL_344; | |
| 3661 if ( v5 >= 3 ) | |
| 3662 goto LABEL_361; | |
| 3663 v5 = 3; | |
| 3664 LABEL_344: | |
| 3665 v54 = v3 == 20; | |
| 3666 LABEL_345: | |
| 3667 if ( !v54 ) | |
| 3668 goto LABEL_361; | |
| 3669 if ( v5 >= 3 ) | |
| 3670 goto LABEL_361; | |
| 3671 v60 = 3; | |
| 3672 goto LABEL_360; | |
| 3673 case 67: | |
| 3674 v55 = v3 == 18; | |
| 3675 goto LABEL_357; | |
| 3676 case 68: | |
| 3677 v53 = v3 == 9; | |
| 3678 goto LABEL_350; | |
| 3679 case 69: | |
| 3680 if ( v3 == 11 ) | |
| 3681 v5 += 20; | |
| 3682 break; | |
| 3683 case 70: | |
| 3684 if ( v3 == 12 ) | |
| 3685 v5 += 10; | |
| 3686 v55 = v3 == 16; | |
| 3687 LABEL_357: | |
| 3688 if ( v55 && v5 < 2 ) | |
| 3689 { | |
| 3690 v60 = 2; | |
| 3691 LABEL_360: | |
| 3692 v5 = v60; | |
| 3693 } | |
| 3694 break; | |
| 3695 default: | |
| 3696 goto LABEL_361; | |
| 3697 } | |
| 3698 goto LABEL_361; | |
| 3699 } | |
| 3700 if ( v34 == 48 ) | |
| 3701 { | |
| 3702 if ( v3 == 9 ) | |
| 3703 v5 += 5; | |
| 3704 LABEL_315: | |
| 3705 v46 = v3 == 3; | |
| 3706 LABEL_240: | |
| 3707 if ( v46 ) | |
| 3708 v5 += 15; | |
| 3709 goto LABEL_361; | |
| 3710 } | |
| 3711 if ( v34 > 32 ) | |
| 3712 { | |
| 3713 if ( v34 > 44 ) | |
| 3714 { | |
| 3715 v51 = v34 - 45; | |
| 3716 if ( !v51 ) | |
| 3717 { | |
| 3718 if ( v3 == 5 ) | |
| 3719 goto LABEL_351; | |
| 3720 v53 = v3 == 4; | |
| 3721 LABEL_350: | |
| 3722 if ( v53 ) | |
| 3723 LABEL_351: | |
| 3724 v5 += 5; | |
| 3725 goto LABEL_361; | |
| 3726 } | |
| 3727 v52 = v51 - 1; | |
| 3728 if ( !v52 ) | |
| 3729 { | |
| 3730 v40 = v3 == 0; | |
| 3731 LABEL_123: | |
| 3732 if ( v40 ) | |
| 3733 v5 += 25; | |
| 3734 goto LABEL_361; | |
| 3735 } | |
| 3736 if ( v52 == 1 ) | |
| 3737 { | |
| 3738 LABEL_309: | |
| 3739 v50 = v3 == 8; | |
| 3740 goto LABEL_296; | |
| 3741 } | |
| 3742 } | |
| 3743 else | |
| 3744 { | |
| 3745 if ( v34 == 44 ) | |
| 3746 { | |
| 3747 v50 = v3 == 7; | |
| 3748 goto LABEL_296; | |
| 3749 } | |
| 3750 v34 -= 33; | |
| 3751 if ( !v34 ) | |
| 3752 { | |
| 3753 if ( v3 != 38 ) | |
| 3754 goto LABEL_361; | |
| 3755 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[16]); | |
| 3756 goto LABEL_138; | |
| 3757 } | |
| 3758 --v34; | |
| 3759 if ( !v34 ) | |
| 3760 { | |
| 3761 if ( v3 != 36 ) | |
| 3762 goto LABEL_361; | |
| 3763 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[14]); | |
| 3764 goto LABEL_138; | |
| 3765 } | |
| 3766 v49 = v34 - 8; | |
| 3767 if ( !v49 ) | |
| 3768 { | |
| 3769 if ( (signed int)v3 >= 0 && (signed int)v3 <= 15 ) | |
| 3770 ++v5; | |
| 3771 goto LABEL_361; | |
| 3772 } | |
| 3773 if ( v49 == 1 ) | |
| 3774 { | |
| 3775 if ( v3 != 3 && v3 != 7 ) | |
| 3776 { | |
| 3777 v50 = v3 == 9; | |
| 3778 LABEL_296: | |
| 3779 if ( !v50 ) | |
| 3780 goto LABEL_361; | |
| 3781 } | |
| 3782 LABEL_121: | |
| 3783 v5 += 10; | |
| 3784 goto LABEL_361; | |
| 3785 } | |
| 3786 } | |
| 3787 } | |
| 3788 else | |
| 3789 { | |
| 3790 if ( v34 == 32 ) | |
| 3791 { | |
| 3792 if ( v3 != 39 ) | |
| 3793 goto LABEL_361; | |
| 3794 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[17]); | |
| 3795 goto LABEL_138; | |
| 3796 } | |
| 3797 if ( v34 > 28 ) | |
| 3798 { | |
| 3799 v34 -= 29; | |
| 3800 if ( v34 ) | |
| 3801 { | |
| 3802 --v34; | |
| 3803 if ( v34 ) | |
| 3804 { | |
| 3805 --v34; | |
| 3806 if ( v34 || v3 != 41 ) | |
| 3807 goto LABEL_361; | |
| 3808 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[19]); | |
| 3809 } | |
| 3810 else | |
| 3811 { | |
| 3812 if ( v3 != 34 ) | |
| 3813 goto LABEL_361; | |
| 3814 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[12]); | |
| 3815 } | |
| 3816 } | |
| 3817 else | |
| 3818 { | |
| 3819 if ( v3 != 37 ) | |
| 3820 goto LABEL_361; | |
| 3821 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[15]); | |
| 3822 } | |
| 3823 goto LABEL_138; | |
| 3824 } | |
| 3825 if ( v34 == 28 ) | |
| 3826 { | |
| 3827 LABEL_136: | |
| 3828 if ( v3 == 42 ) | |
| 3829 { | |
| 3830 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[20]); | |
| 3831 LABEL_138: | |
| 3832 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3833 goto LABEL_361; | |
| 3834 } | |
| 3835 } | |
| 3836 else | |
| 3837 { | |
| 3838 v47 = v34 - 1; | |
| 3839 if ( v47 ) | |
| 3840 { | |
| 3841 v48 = v47 - 1; | |
| 3842 if ( v48 ) | |
| 3843 { | |
| 3844 v34 = v48 - 24; | |
| 3845 if ( v34 ) | |
| 3846 { | |
| 3847 --v34; | |
| 3848 if ( v34 || v3 != 40 ) | |
| 3849 goto LABEL_361; | |
| 3850 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[18]); | |
| 3851 } | |
| 3852 else | |
| 3853 { | |
| 3854 if ( v3 != 35 ) | |
| 3855 goto LABEL_361; | |
| 3856 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[13]); | |
| 3857 } | |
| 3858 goto LABEL_138; | |
| 3859 } | |
| 3860 LABEL_118: | |
| 3861 if ( (signed int)v3 < 0 ) | |
| 3862 goto LABEL_361; | |
| 3863 v39 = __OFSUB__((int)v3, 6); | |
| 3864 v37 = v3 == 6; | |
| 3865 v38 = v3 - 6 < 0; | |
| 3866 } | |
| 3867 else | |
| 3868 { | |
| 3869 LABEL_253: | |
| 3870 if ( (signed int)v3 < 10 ) | |
| 3871 goto LABEL_361; | |
| 3872 v39 = __OFSUB__((int)v3, 15); | |
| 3873 v37 = v3 == 15; | |
| 3874 v38 = v3 - 15 < 0; | |
| 3875 } | |
| 3876 if ( (unsigned __int8)(v38 ^ v39) | v37 ) | |
| 3877 goto LABEL_121; | |
| 3878 } | |
| 3879 } | |
| 3880 LABEL_361: | |
| 3881 ++v65; | |
| 3882 if ( (signed int)v65 >= 16 ) | |
| 3883 return v5 + v62 + v61; | |
| 3884 } | |
| 3885 } | |
| 1040 | 3886 if ( attr == CHARACTER_ATTRIBUTE_MELEE_DMG_MAX ) |
| 0 | 3887 { |
| 3888 if ( IsUnarmed() != 1 ) | |
| 3889 { | |
| 816 | 3890 if ( v6->HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 3891 { | |
| 3892 v22 = this->GetEquippedItemEquipType(EQUIP_MAIN_HAND); | |
| 0 | 3893 if ( v22 >= 0 ) |
| 3894 { | |
| 3895 if ( v22 <= 2 ) | |
| 3896 { | |
| 1040 | 3897 v23 = this->pOwnItems[this->pEquipment.uMainHand].uItemID; |
| 898 | 3898 if ( v6->pEquipment.uShield || pItemsTable->pItems[v23].uSkillType != 4 ) |
| 0 | 3899 { |
| 3900 v26 = pItemsTable->pItems[v23].uDamageRoll; | |
| 3901 v25 = pItemsTable->pItems[v23].uDamageDice; | |
| 3902 } | |
| 3903 else | |
| 3904 { | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3905 v25 = pItemsTable->pItems[v23].uDamageRoll; |
|
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3906 v26 = pItemsTable->pItems[v23].uDamageDice + 1; |
| 0 | 3907 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3908 v5 = pItemsTable->pItems[v23].uDamageMod + v25 * v26; |
| 0 | 3909 } |
| 3910 } | |
| 3911 } | |
| 1040 | 3912 |
| 3913 if ( a3 || !v6->HasItemEquipped(EQUIP_OFF_HAND) ) | |
| 3914 { | |
| 3915 | |
| 3916 v28 = v6->GetEquippedItemEquipType(EQUIP_OFF_HAND); | |
| 3917 if ((v28 < 0) || v28 > 2 ) | |
| 3918 return v5 + v62 + v61; | |
| 3919 } | |
| 1062 | 3920 v15 = pItemsTable->pItems[v23].uDamageMod; |
| 3921 v14 = pItemsTable->pItems[v23].uDamageDice * pItemsTable->pItems[v23].uDamageRoll; | |
| 1040 | 3922 v5 += v15 + v14; |
| 1049 | 3923 return v5 + v62 + v61; |
| 0 | 3924 } |
| 3925 v59 = 3; | |
| 3926 LABEL_74: | |
| 3927 v5 = v59; | |
| 3928 return v5 + v62 + v61; | |
| 3929 } | |
| 3930 if ( (signed int)attr < 0 ) | |
| 3931 return v5 + v62 + v61; | |
| 1040 | 3932 if ( (signed int)attr <= CHARACTER_ATTRIBUTE_SKILL_UNARMED ) |
| 0 | 3933 goto LABEL_95; |
| 1040 | 3934 if ( attr == CHARACTER_ATTRIBUTE_LEVEL ) |
| 3935 { | |
| 3936 if ( !Player::HasEnchantedItemEquipped(25) ) | |
| 3937 return v5 + v62 + v61; | |
| 3938 v5 = 5; | |
| 3939 return v5 + v62 + v61; | |
| 3940 } | |
| 3941 if ( (signed int)attr <= CHARACTER_ATTRIBUTE_LEVEL ) | |
| 0 | 3942 return v5 + v62 + v61; |
| 1040 | 3943 if ( (signed int)attr <= CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS ) |
| 0 | 3944 { |
| 3945 if ( IsUnarmed() == 1 ) | |
| 3946 { | |
| 3947 v5 = 0; | |
| 3948 return v5 + v62 + v61; | |
| 3949 } | |
| 816 | 3950 if ( v6->HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 3951 { | |
| 3952 v17 = this->GetEquippedItemEquipType(EQUIP_MAIN_HAND); | |
| 0 | 3953 if ( v17 >= 0 ) |
| 3954 { | |
| 3955 if ( v17 <= 2 ) | |
| 1040 | 3956 v5 = pItemsTable->pItems[v6->pOwnItems[v6->pEquipment.uMainHand-1].uItemID].uDamageMod; |
| 0 | 3957 } |
| 3958 } | |
| 865 | 3959 if ( a3 || !v6->HasItemEquipped(EQUIP_OFF_HAND) || (v19 = v6->GetEquippedItemEquipType(EQUIP_OFF_HAND), v19 < 0) || v19 > 2 ) |
| 0 | 3960 return v5 + v62 + v61; |
| 1040 | 3961 v20 = v6->pOwnItems[v6->pEquipment.uShield - 1].uItemID; |
| 3962 v56 = pItemsTable->pItems[v20].uDamageMod; | |
| 3963 v5 += v56; | |
| 3964 return v5 + v62 + v61; | |
| 3965 } | |
| 3966 if ( attr == CHARACTER_ATTRIBUTE_MELEE_DMG_MIN ) | |
| 0 | 3967 { |
| 3968 if ( IsUnarmed() == 1 ) | |
| 3969 { | |
| 3970 v5 = 1; | |
| 3971 return v5 + v62 + v61; | |
| 3972 } | |
| 816 | 3973 if ( v6->HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 3974 { | |
| 3975 v9 = this->GetEquippedItemEquipType(EQUIP_MAIN_HAND); | |
| 0 | 3976 if ( v9 >= 0 ) |
| 3977 { | |
| 3978 if ( v9 <= 2 ) | |
| 3979 { | |
| 1040 | 3980 v5 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand].uItemID].uDamageDice + |
| 3981 pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand].uItemID].uDamageMod; | |
| 898 | 3982 if ( !v6->pEquipment.uShield ) |
| 0 | 3983 { |
| 1040 | 3984 if ( pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand].uItemID].uSkillType == 4 ) |
| 0 | 3985 ++v5; |
| 3986 } | |
| 3987 } | |
| 3988 } | |
| 3989 } | |
| 1040 | 3990 |
| 3991 if ( a3 || !v6->HasItemEquipped(EQUIP_OFF_HAND)) | |
| 3992 { | |
| 3993 v12 = v6->GetEquippedItemEquipType(EQUIP_OFF_HAND); | |
| 3994 if ((v12 < 0) || v12 > 2 ) | |
| 3995 return v5 + v62 + v61; | |
| 3996 } | |
| 3997 v14 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uShield].uItemID].uDamageMod; | |
| 3998 v15 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uShield].uItemID].uDamageDice; | |
| 0 | 3999 LABEL_88: |
| 4000 v5 += v15 + v14; | |
| 4001 } | |
| 4002 return v5 + v62 + v61; | |
| 4003 } | |
| 4004 | |
| 4005 //----- (0048F73C) -------------------------------------------------------- | |
| 4006 int Player::GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 4007 { | |
| 4008 int result; // eax@1 | |
| 4009 int v3; // eax@4 | |
| 4010 int v4; // ecx@5 | |
| 4011 | |
| 4012 switch (a2) | |
| 4013 { | |
| 4014 case CHARACTER_ATTRIBUTE_LEVEL: return 0; | |
| 4015 } | |
| 4016 | |
| 4017 result = 0; | |
| 4018 if ( (signed int)a2 > 10 ) | |
| 4019 { | |
| 4020 if ( (signed int)a2 <= 15 ) | |
| 4021 { | |
| 4022 switch ( a2 ) | |
| 4023 { | |
| 4024 case CHARACTER_ATTRIBUTE_RESIST_BODY: | |
| 4025 v3 = this->pPlayerBuffs[2].uPower; | |
| 1167 | 4026 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_BODY].uPower; |
| 0 | 4027 break; |
| 4028 case CHARACTER_ATTRIBUTE_RESIST_AIR: | |
| 4029 v3 = this->pPlayerBuffs[0].uPower; | |
| 1167 | 4030 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_AIR].uPower; |
| 0 | 4031 break; |
| 4032 case CHARACTER_ATTRIBUTE_RESIST_WATER: | |
| 4033 v3 = this->pPlayerBuffs[22].uPower; | |
| 1167 | 4034 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_WATER].uPower; |
| 0 | 4035 break; |
| 4036 case CHARACTER_ATTRIBUTE_RESIST_EARTH: | |
| 4037 v3 = this->pPlayerBuffs[3].uPower; | |
| 1167 | 4038 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_EARTH].uPower; |
| 0 | 4039 break; |
| 4040 default: | |
| 4041 if ( a2 != 14 ) | |
| 4042 return result; | |
| 4043 v3 = this->pPlayerBuffs[9].uPower; | |
| 1167 | 4044 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_MIND].uPower; |
| 0 | 4045 break; |
| 4046 } | |
| 4047 return v4 + v3; | |
| 4048 } | |
| 4049 if ( a2 != CHARACTER_ATTRIBUTE_ATTACK ) | |
| 4050 { | |
| 4051 if ( a2 == CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS ) | |
| 4052 { | |
| 4053 v3 = this->pPlayerBuffs[8].uPower; | |
| 1167 | 4054 v4 = pParty->pPartyBuffs[PARTY_BUFF_HEROISM].uPower; |
| 0 | 4055 return v4 + v3; |
| 4056 } | |
| 4057 if ( a2 != CHARACTER_ATTRIBUTE_RANGED_ATTACK ) | |
| 4058 return result; | |
| 4059 } | |
| 4060 return this->pPlayerBuffs[1].uPower; | |
| 4061 } | |
| 4062 if ( a2 == 10 ) | |
| 4063 { | |
| 4064 v3 = this->pPlayerBuffs[5].uPower; | |
| 1167 | 4065 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_FIRE].uPower; |
| 0 | 4066 return v4 + v3; |
| 4067 } | |
| 4068 switch ( a2 ) | |
| 4069 { | |
| 4070 case CHARACTER_ATTRIBUTE_STRENGTH: | |
| 4071 v3 = pPlayerBuffs[19].uPower; | |
| 4072 goto LABEL_5; | |
| 4073 case CHARACTER_ATTRIBUTE_INTELLIGENCE: | |
| 4074 v3 = pPlayerBuffs[17].uPower; | |
| 4075 goto LABEL_5; | |
| 4076 case CHARACTER_ATTRIBUTE_WILLPOWER: | |
| 4077 v3 = pPlayerBuffs[20].uPower; | |
| 4078 goto LABEL_5; | |
| 4079 case CHARACTER_ATTRIBUTE_ENDURANCE: | |
| 4080 v3 = pPlayerBuffs[16].uPower; | |
| 4081 goto LABEL_5; | |
| 4082 case CHARACTER_ATTRIBUTE_ACCURACY: | |
| 4083 v3 = pPlayerBuffs[15].uPower; | |
| 4084 goto LABEL_5; | |
| 4085 case CHARACTER_ATTRIBUTE_SPEED: | |
| 4086 v3 = pPlayerBuffs[21].uPower; | |
| 4087 goto LABEL_5; | |
| 4088 case CHARACTER_ATTRIBUTE_LUCK: | |
| 4089 v3 = pPlayerBuffs[18].uPower; | |
| 4090 LABEL_5: | |
| 1167 | 4091 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
| 0 | 4092 return v4 + v3; |
| 4093 case CHARACTER_ATTRIBUTE_AC_BONUS: | |
| 4094 v3 = this->pPlayerBuffs[14].uPower; | |
| 1167 | 4095 v4 = pParty->pPartyBuffs[PARTY_BUFF_STONE_SKIN].uPower; |
| 0 | 4096 return v4 + v3; |
| 4097 default: | |
| 4098 return result; | |
| 4099 } | |
| 4100 return result; | |
| 4101 } | |
| 4102 | |
| 4103 //----- (0048F882) -------------------------------------------------------- | |
| 1008 | 4104 int Player::GetActualSkillLevel( PLAYER_SKILL_TYPE uSkillType ) |
| 4105 { | |
| 1064 | 4106 signed int bonus_value; // esi@1 |
| 4107 unsigned __int16 skill_value; // ax@126 | |
| 4108 int result; // al@127 | |
| 353 | 4109 |
| 1064 | 4110 bonus_value = 0; |
| 353 | 4111 switch (uSkillType) |
| 4112 { | |
| 4113 case PLAYER_SKILL_MONSTER_ID: | |
| 4114 { | |
| 652 | 4115 if ( CheckHiredNPCSpeciality(Hunter) ) |
| 1064 | 4116 bonus_value = 6; |
| 652 | 4117 if ( CheckHiredNPCSpeciality(Sage) ) |
| 1064 | 4118 bonus_value += 6; |
| 4119 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID, 0); | |
| 353 | 4120 } |
| 4121 break; | |
| 4122 | |
| 4123 case PLAYER_SKILL_ARMSMASTER: | |
| 4124 { | |
| 652 | 4125 if ( CheckHiredNPCSpeciality(Armsmaster) ) |
| 1064 | 4126 bonus_value = 2; |
| 652 | 4127 if ( CheckHiredNPCSpeciality(Weaponsmaster) ) |
| 1064 | 4128 bonus_value += 3; |
| 4129 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER, 0); | |
| 353 | 4130 } |
| 4131 break; | |
| 4132 | |
| 4133 case PLAYER_SKILL_STEALING: | |
| 4134 { | |
| 652 | 4135 if (CheckHiredNPCSpeciality(Burglar)) |
| 1064 | 4136 bonus_value = 8; |
| 4137 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_STEALING, 0); | |
| 353 | 4138 } |
| 4139 break; | |
| 4140 | |
| 4141 | |
| 4142 case PLAYER_SKILL_ALCHEMY: | |
| 4143 { | |
| 652 | 4144 if ( CheckHiredNPCSpeciality(Herbalist) ) |
| 1064 | 4145 bonus_value = 4; |
| 652 | 4146 if ( CheckHiredNPCSpeciality(Apothecary) ) |
| 1064 | 4147 bonus_value += 8; |
| 4148 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ALCHEMY, 0); | |
| 353 | 4149 } |
| 4150 break; | |
| 4151 | |
| 4152 case PLAYER_SKILL_LEARNING: | |
| 4153 { | |
| 652 | 4154 if ( CheckHiredNPCSpeciality(Teacher) ) |
| 1064 | 4155 bonus_value = 10; |
| 652 | 4156 if ( CheckHiredNPCSpeciality(Instructor) ) |
| 1064 | 4157 bonus_value += 15; |
| 652 | 4158 if ( CheckHiredNPCSpeciality(Scholar) ) |
| 1064 | 4159 bonus_value += 5; |
| 4160 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LEARNING, 0); | |
| 353 | 4161 } |
| 4162 break; | |
| 4163 | |
| 4164 case PLAYER_SKILL_UNARMED: | |
| 4165 { | |
| 652 | 4166 if (CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 4167 bonus_value = 2; |
| 4168 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_UNARMED, 0); | |
| 353 | 4169 } |
| 4170 break; | |
| 4171 | |
| 4172 case PLAYER_SKILL_DODGE: | |
| 4173 { | |
| 652 | 4174 if ( CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 4175 bonus_value = 2; |
| 4176 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DODGE, 0); | |
| 353 | 4177 } |
| 4178 break; | |
| 4179 | |
| 4180 case PLAYER_SKILL_BOW: | |
| 1064 | 4181 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BOW, 0); |
| 353 | 4182 break; |
| 4183 case PLAYER_SKILL_SHIELD: | |
| 1064 | 4184 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SHIELD, 0); |
| 353 | 4185 break; |
| 4186 | |
| 4187 case PLAYER_SKILL_EARTH: | |
| 652 | 4188 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 4189 bonus_value = 2; |
| 652 | 4190 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 4191 bonus_value += 3; |
| 652 | 4192 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 4193 bonus_value += 4; |
| 353 | 4194 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 4195 bonus_value += 3; |
| 4196 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_EARTH, 0); | |
| 353 | 4197 break; |
| 4198 case PLAYER_SKILL_FIRE: | |
| 652 | 4199 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 4200 bonus_value = 2; |
| 652 | 4201 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 4202 bonus_value += 3; |
| 652 | 4203 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 4204 bonus_value += 4; |
| 353 | 4205 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 4206 bonus_value += 3; |
| 4207 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_FIRE, 0); | |
| 353 | 4208 break; |
| 4209 case PLAYER_SKILL_AIR: | |
| 652 | 4210 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 4211 bonus_value = 2; |
| 652 | 4212 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 4213 bonus_value += 3; |
| 652 | 4214 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 4215 bonus_value += 4; |
| 353 | 4216 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 4217 bonus_value += 3; |
| 4218 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_AIR, 0); | |
| 353 | 4219 break; |
| 4220 case PLAYER_SKILL_WATER: | |
| 652 | 4221 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 4222 bonus_value = 2; |
| 652 | 4223 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 4224 bonus_value += 3; |
| 652 | 4225 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 4226 bonus_value += 4; |
| 353 | 4227 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 4228 bonus_value += 3; |
| 4229 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_WATER, 0); | |
| 353 | 4230 break; |
| 4231 case PLAYER_SKILL_SPIRIT: | |
| 652 | 4232 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 4233 bonus_value = 2; |
| 652 | 4234 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 4235 bonus_value += 3; |
| 652 | 4236 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 4237 bonus_value += 4; |
| 4238 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SPIRIT, 0); | |
| 353 | 4239 break; |
| 4240 case PLAYER_SKILL_MIND: | |
| 652 | 4241 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 4242 bonus_value = 2; |
| 652 | 4243 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 4244 bonus_value += 3; |
| 652 | 4245 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 4246 bonus_value += 4; |
| 4247 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MIND, 0); | |
| 353 | 4248 break; |
| 4249 case PLAYER_SKILL_BODY: | |
| 652 | 4250 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 4251 bonus_value = 2; |
| 652 | 4252 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 4253 bonus_value += 3; |
| 652 | 4254 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 4255 bonus_value += 4; |
| 4256 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BODY, 0); | |
| 353 | 4257 break; |
| 4258 case PLAYER_SKILL_LIGHT: | |
| 1064 | 4259 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LIGHT, 0); |
| 353 | 4260 break; |
| 4261 case PLAYER_SKILL_DARK: | |
| 4262 { | |
| 1064 | 4263 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DARK, 0); |
| 353 | 4264 } |
| 4265 break; | |
| 4266 | |
| 4267 case PLAYER_SKILL_MERCHANT: | |
| 4268 { | |
| 652 | 4269 if ( CheckHiredNPCSpeciality(Trader) ) |
| 1064 | 4270 bonus_value = 4; |
| 652 | 4271 if ( CheckHiredNPCSpeciality(Merchant) ) |
| 1064 | 4272 bonus_value += 6; |
| 652 | 4273 if ( CheckHiredNPCSpeciality(Gypsy) ) |
| 1064 | 4274 bonus_value += 3; |
| 652 | 4275 if ( CheckHiredNPCSpeciality(Duper) ) |
| 1064 | 4276 bonus_value += 8; |
| 353 | 4277 } |
| 4278 break; | |
| 4279 | |
| 4280 case PLAYER_SKILL_PERCEPTION: | |
| 4281 { | |
| 652 | 4282 if ( CheckHiredNPCSpeciality(Scout) ) |
| 1064 | 4283 bonus_value = 6; |
| 652 | 4284 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1064 | 4285 bonus_value += 5; |
| 353 | 4286 } |
| 4287 break; | |
| 4288 | |
| 0 | 4289 case PLAYER_SKILL_ITEM_ID: |
| 1064 | 4290 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ITEM_ID, 0); |
| 0 | 4291 break; |
| 4292 case PLAYER_SKILL_MEDITATION: | |
| 1064 | 4293 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MEDITATION, 0); |
| 353 | 4294 break; |
| 0 | 4295 case PLAYER_SKILL_TRAP_DISARM: |
| 353 | 4296 { |
| 652 | 4297 if ( CheckHiredNPCSpeciality(Tinker) ) |
| 1064 | 4298 bonus_value = 4; |
| 652 | 4299 if ( CheckHiredNPCSpeciality(Locksmith) ) |
| 1064 | 4300 bonus_value += 6; |
| 652 | 4301 if ( CheckHiredNPCSpeciality(Burglar) ) |
| 1064 | 4302 bonus_value += 8; |
| 4303 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM, 0); | |
| 353 | 4304 } |
| 4305 break; | |
| 4306 } | |
| 4307 | |
| 1064 | 4308 skill_value = pActiveSkills[uSkillType]; |
| 4309 if ( bonus_value + (skill_value & 0x3F) < 60 ) | |
| 4310 result = bonus_value + skill_value; | |
| 0 | 4311 else |
| 1064 | 4312 result = skill_value & 0xFFFC | 0x3C; //al |
| 0 | 4313 return result; |
| 4314 } | |
| 4315 | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4316 |
| 0 | 4317 //----- (0048FC00) -------------------------------------------------------- |
| 1538 | 4318 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
|
4319 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4320 int armsMasterBonus; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4321 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4322 armsMasterBonus = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4323 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
|
4324 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
|
4325 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4326 int multiplier = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4327 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
|
4328 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4329 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
|
4330 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4331 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
|
4332 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4333 multiplier = GetMultiplierForSkillLevel(armmaster_skill, 0, 1, 1, 2); |
| 1064 | 4334 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4335 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
|
4336 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4337 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4338 switch(inSkill) |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4339 { |
|
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
|
4340 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
|
4341 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
|
4342 { |
|
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
|
4343 int bowSkillLevel = GetActualSkillLevel(PLAYER_SKILL_DODGE); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4344 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
|
4345 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
|
4346 } |
|
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
|
4347 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
|
4348 break; |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4349 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
|
4350 { |
|
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
|
4351 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
|
4352 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
|
4353 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
|
4354 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4355 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4356 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
|
4357 { |
|
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
|
4358 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
|
4359 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
|
4360 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
|
4361 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4362 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4363 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
|
4364 { |
|
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
|
4365 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
|
4366 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
|
4367 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
|
4368 |
|
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
|
4369 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
|
4370 { |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
4371 if (pEquipment.pIndices[j] && (!pOwnItems[pEquipment.pIndices[j]].IsBroken())) |
| 1538 | 4372 { |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
4373 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
|
4374 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
|
4375 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
|
4376 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
|
4377 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
|
4378 { |
|
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
|
4379 case PLAYER_SKILL_STAFF: |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4380 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
|
4381 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
|
4382 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
|
4383 case PLAYER_SKILL_SPEAR: |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4384 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
|
4385 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
|
4386 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
|
4387 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4388 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
|
4389 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
|
4390 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
|
4391 wearingLeather = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4392 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
|
4393 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
|
4394 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
|
4395 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4396 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
|
4397 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
|
4398 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
|
4399 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4400 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
|
4401 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
|
4402 } |
|
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
|
4403 ACSum += multiplier * (currArmorSkillLevel & 0x3F); |
| 1538 | 4404 } |
|
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
|
4405 } |
|
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
|
4406 |
|
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
|
4407 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
|
4408 int dodgeMastery = SkillToMastery(dodgeSkillLevel); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4409 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
|
4410 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
|
4411 { |
|
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
|
4412 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
|
4413 } |
|
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
|
4414 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
|
4415 } |
| 1538 | 4416 break; |
| 4417 case CHARACTER_ATTRIBUTE_ATTACK: | |
| 4418 if ( this->IsUnarmed() ) | |
| 4419 { | |
| 4420 int unarmedSkill = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 4421 if (!unarmedSkill) | |
| 4422 { | |
| 4423 return 0; | |
| 4424 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4425 int multiplier = GetMultiplierForSkillLevel(unarmedSkill, 0, 1, 2, 2); |
| 1538 | 4426 return armsMasterBonus + multiplier * (unarmedSkill & 0x3F); |
| 4427 } | |
| 4428 for (int i = 0; i < 16; ++i) | |
| 4429 { | |
| 4430 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 4431 { | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
4432 ItemDesc currItem = pItemsTable->pItems[this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID]; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
4433 if ( currItem.uEquipType <= EQUIP_MAIN_HAND) |
| 1533 | 4434 { |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
4435 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItem.uSkillType; |
| 1538 | 4436 int currentItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 4437 if (currItemSkillType == PLAYER_SKILL_BLASTER) | |
| 4438 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4439 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); |
| 1538 | 4440 return multiplier * (currentItemSkillLevel & 0x3F); |
| 4441 } | |
| 4442 else if (currItemSkillType == PLAYER_SKILL_STAFF && this->GetActualSkillLevel(PLAYER_SKILL_UNARMED) > 0) | |
| 4443 { | |
| 4444 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
|
4445 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 2, 2); |
| 1538 | 4446 return multiplier * (unarmedSkillLevel & 0x3F) + armsMasterBonus + (currentItemSkillLevel & 0x3F); |
| 4447 } | |
| 4448 else | |
| 4449 { | |
| 4450 return armsMasterBonus + (currentItemSkillLevel & 0x3F); | |
| 4451 } | |
| 4452 } | |
| 4453 } | |
| 4454 } | |
| 4455 return 0; | |
| 4456 break; | |
| 4457 | |
| 4458 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: | |
| 4459 for (int i = 0; i < 16; i++) | |
| 4460 { | |
| 4461 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 4462 { | |
| 4463 PLAYER_SKILL_TYPE currentItemSkillType = (PLAYER_SKILL_TYPE)pItemsTable->pItems[this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID].uSkillType; | |
| 4464 int currentItemSkillLevel = this->GetActualSkillLevel(currentItemSkillType); | |
| 4465 if ( currentItemSkillType == PLAYER_SKILL_BOW ) | |
| 4466 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4467 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 1, 1); |
| 1538 | 4468 return multiplier * (currentItemSkillLevel & 0x3F); |
| 4469 } | |
| 4470 else if ( currentItemSkillType == PLAYER_SKILL_BLASTER ) | |
| 4471 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4472 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); |
| 1538 | 4473 return multiplier * (currentItemSkillLevel & 0x3F); |
| 4474 } | |
| 4475 } | |
| 4476 } | |
| 4477 return 0; | |
| 4478 break; | |
| 4479 | |
| 4480 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: | |
| 4481 if ( this->IsUnarmed() ) | |
| 4482 { | |
| 4483 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 4484 if ( !unarmedSkillLevel ) | |
| 4485 { | |
| 4486 return 0; | |
| 4487 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4488 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 4489 return multiplier * (unarmedSkillLevel & 0x3F); |
| 4490 } | |
| 4491 for (int i = 0; i < 16; i++) | |
| 4492 { | |
| 4493 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 4494 { | |
| 4495 int currItemId = this->pInventoryItemList[this->pEquipment.pIndices[i]].uItemID; | |
| 4496 if ( pItemsTable->pItems[currItemId].uEquipType == EQUIP_MAIN_HAND || pItemsTable->pItems[currItemId].uEquipType == EQUIP_OFF_HAND ) | |
| 4497 { | |
| 4498 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)pItemsTable->pItems[currItemId].uSkillType; | |
| 4499 int currItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); | |
| 4500 int baseSkillBonus; | |
| 4501 int multiplier; | |
| 4502 switch (currItemSkillType) | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4503 { |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4504 case PLAYER_SKILL_STAFF: |
| 1538 | 4505 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
|
4506 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4507 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
|
4508 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 4509 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
|
4510 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4511 else |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4512 { |
| 1538 | 4513 return armsMasterBonus; |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4514 } |
| 1538 | 4515 break; |
| 4516 | |
| 4517 case PLAYER_SKILL_DAGGER: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4518 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 1); |
| 1538 | 4519 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 4520 return armsMasterBonus + baseSkillBonus; | |
| 4521 break; | |
| 4522 case PLAYER_SKILL_SWORD: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4523 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 0); |
| 1538 | 4524 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 4525 return armsMasterBonus + baseSkillBonus; | |
| 4526 break; | |
| 4527 case PLAYER_SKILL_MACE: | |
| 4528 case PLAYER_SKILL_SPEAR: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4529 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 1, 1, 1); |
| 1538 | 4530 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 4531 return armsMasterBonus + baseSkillBonus; | |
| 4532 break; | |
| 4533 case PLAYER_SKILL_AXE: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4534 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 1, 1); |
| 1538 | 4535 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 4536 return armsMasterBonus + baseSkillBonus; | |
| 4537 break; | |
| 1535 | 4538 } |
| 1533 | 4539 } |
| 1535 | 4540 } |
| 1538 | 4541 } |
| 4542 return 0; | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4543 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4544 default: |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4545 return 0; |
| 1533 | 4546 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4547 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4548 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
4549 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
|
4550 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4551 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
|
4552 switch (masteryLvl) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4553 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4554 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
|
4555 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
|
4556 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
|
4557 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
|
4558 } |
| 1545 | 4559 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
|
4560 return 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4561 } |
| 0 | 4562 //----- (00490109) -------------------------------------------------------- |
| 4563 // faces are: 0 1 2 3 human males | |
| 4564 // 4 5 6 7 human females | |
| 4565 // 8 9 elf males | |
| 4566 // 10 11 elf females | |
| 4567 // 12 13 dwarf males | |
| 4568 // 14 15 dwarf females | |
| 4569 // 16 17 goblin males | |
| 4570 // 18 19 goblin females | |
| 4571 // 20 lich male | |
| 4572 // 21 lich female | |
| 4573 // 22 underwater suits (unused) | |
| 4574 // 23 zombie male | |
| 4575 // 24 zombie female | |
| 4576 enum CHARACTER_RACE Player::GetRace() | |
| 4577 { | |
| 1014 | 4578 if ( uCurrentFace > 15 ) |
| 4579 { | |
| 4580 if ( uCurrentFace >= 16 && uCurrentFace <= 19 ) | |
| 0 | 4581 return CHARACTER_RACE_GOBLIN; |
| 4582 } | |
| 4583 else | |
| 4584 { | |
| 1014 | 4585 if ( uCurrentFace >= 12 ) |
| 0 | 4586 { |
| 4587 return CHARACTER_RACE_DWARF; | |
| 4588 } | |
| 4589 else | |
| 4590 { | |
| 1014 | 4591 |
| 4592 if ( uCurrentFace <= 7 ) | |
| 0 | 4593 { |
| 4594 return CHARACTER_RACE_HUMAN; | |
| 4595 } | |
| 4596 else | |
| 4597 { | |
| 1014 | 4598 if ( uCurrentFace <= 11 ) |
| 0 | 4599 return CHARACTER_RACE_ELF; |
| 4600 } | |
| 4601 } | |
| 4602 } | |
| 4603 return CHARACTER_RACE_HUMAN; | |
| 4604 } | |
| 4605 | |
| 4606 //----- (00490141) -------------------------------------------------------- | |
| 187 | 4607 PLAYER_SEX Player::GetSexByVoice() |
| 0 | 4608 { |
| 4609 signed int result; // eax@1 | |
| 4610 | |
| 4611 result = 0; | |
| 4612 switch ( this->uVoiceID ) | |
| 4613 { | |
| 4614 case 0u: | |
| 4615 case 1u: | |
| 4616 case 2u: | |
| 4617 case 3u: | |
| 4618 case 8u: | |
| 4619 case 9u: | |
| 4620 case 0xCu: | |
| 4621 case 0xDu: | |
| 4622 case 0x10u: | |
| 4623 case 0x11u: | |
| 4624 case 0x14u: | |
| 4625 case 0x17u: | |
| 187 | 4626 return SEX_MALE; |
| 4627 | |
| 0 | 4628 case 4u: |
| 4629 case 5u: | |
| 4630 case 6u: | |
| 4631 case 7u: | |
| 4632 case 0xAu: | |
| 4633 case 0xBu: | |
| 4634 case 0xEu: | |
| 4635 case 0xFu: | |
| 4636 case 0x12u: | |
| 4637 case 0x13u: | |
| 4638 case 0x15u: | |
| 4639 case 0x18u: | |
| 187 | 4640 return SEX_FEMALE; |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4641 } |
| 1545 | 4642 Error("(%u)", this->uVoiceID); |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4643 return SEX_MALE; |
| 0 | 4644 } |
| 4645 | |
| 4646 //----- (00490188) -------------------------------------------------------- | |
| 4647 void Player::SetInitialStats() | |
| 4648 { | |
| 4649 auto v1 = GetRace(); | |
| 290 | 4650 uMight = StatTable[v1][0].uBaseValue; |
| 4651 uIntelligence = StatTable[v1][1].uBaseValue; | |
| 4652 uWillpower = StatTable[v1][2].uBaseValue; | |
| 4653 uEndurance = StatTable[v1][3].uBaseValue; | |
| 4654 uAccuracy = StatTable[v1][4].uBaseValue; | |
| 4655 uSpeed = StatTable[v1][5].uBaseValue; | |
| 4656 uLuck = StatTable[v1][6].uBaseValue; | |
| 0 | 4657 } |
| 4658 | |
| 4659 //----- (004901FC) -------------------------------------------------------- | |
| 1021 | 4660 void Player::SetSexByVoice() |
| 4661 { | |
| 4662 switch ( this->uVoiceID) | |
| 0 | 4663 { |
| 4664 case 0: | |
| 4665 case 1: | |
| 4666 case 2: | |
| 4667 case 3: | |
| 4668 case 8: | |
| 4669 case 9: | |
| 4670 case 0xC: | |
| 4671 case 0xD: | |
| 4672 case 0x10: | |
| 4673 case 0x11: | |
| 4674 case 0x14: | |
| 4675 case 0x17: | |
| 1021 | 4676 this->uSex = SEX_MALE; |
| 0 | 4677 break; |
| 4678 case 4: | |
| 4679 case 5: | |
| 4680 case 6: | |
| 4681 case 7: | |
| 4682 case 0xA: | |
| 4683 case 0xB: | |
| 4684 case 0xE: | |
| 4685 case 0xF: | |
| 4686 case 0x12: | |
| 4687 case 0x13: | |
| 4688 case 0x15: | |
| 4689 case 0x18: | |
| 1021 | 4690 this->uSex = SEX_FEMALE; |
| 0 | 4691 break; |
| 4692 default: | |
| 4693 break; | |
| 4694 } | |
| 1021 | 4695 |
| 0 | 4696 } |
| 4697 | |
| 4698 //----- (0049024A) -------------------------------------------------------- | |
| 135 | 4699 void Player::Reset(PLAYER_CLASS_TYPE cls) |
| 0 | 4700 { |
| 4701 sLevelModifier = 0; | |
| 4702 sAgeModifier = 0; | |
| 4703 | |
| 135 | 4704 classType = cls; |
| 0 | 4705 uLuckBonus = 0; |
| 4706 uSpeedBonus = 0; | |
| 4707 uAccuracyBonus = 0; | |
| 4708 uEnduranceBonus = 0; | |
| 4709 uWillpowerBonus = 0; | |
| 4710 uIntelligenceBonus = 0; | |
| 4711 uMightBonus = 0; | |
| 4712 uLevel = 1; | |
| 4713 uExperience = 251 + rand() % 100; | |
| 4714 uBirthYear = 1147 - rand() % 6; | |
| 4715 memset(pActiveSkills, 0, sizeof(pActiveSkills)); | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
4716 memset(_achieved_awards_bits, 0, 64); |
| 0 | 4717 memset(&spellbook, 0, sizeof(PlayerSpells)); |
| 4718 | |
| 4719 for (uint i = 0; i < 37; ++i) | |
| 4720 { | |
| 135 | 4721 if (pSkillAvailabilityPerClass[classType / 4][i] != 2) |
| 0 | 4722 continue; |
| 4723 | |
| 4724 pActiveSkills[i] = 1; | |
| 4725 | |
| 4726 switch (i) | |
| 4727 { | |
| 886 | 4728 case PLAYER_SKILL_FIRE: |
| 4729 spellbook.pFireSpellbook.bIsSpellAvailable[0] = true;//its temporary, for test spells | |
| 894 | 4730 |
| 4731 extern bool all_magic; | |
| 4732 if ( all_magic == true ) | |
| 4733 { | |
| 4734 pActiveSkills[PLAYER_SKILL_AIR] = 1; | |
| 4735 pActiveSkills[PLAYER_SKILL_WATER] = 1; | |
| 4736 pActiveSkills[PLAYER_SKILL_EARTH] = 1; | |
| 4737 spellbook.pFireSpellbook.bIsSpellAvailable[1] = true; | |
| 4738 spellbook.pFireSpellbook.bIsSpellAvailable[2] = true; | |
| 4739 spellbook.pFireSpellbook.bIsSpellAvailable[3] = true; | |
| 4740 spellbook.pFireSpellbook.bIsSpellAvailable[4] = true; | |
| 4741 spellbook.pFireSpellbook.bIsSpellAvailable[5] = true; | |
| 4742 spellbook.pFireSpellbook.bIsSpellAvailable[6] = true; | |
| 4743 spellbook.pFireSpellbook.bIsSpellAvailable[7] = true; | |
| 4744 spellbook.pFireSpellbook.bIsSpellAvailable[8] = true; | |
| 4745 spellbook.pFireSpellbook.bIsSpellAvailable[9] = true; | |
| 4746 spellbook.pFireSpellbook.bIsSpellAvailable[10] = true; | |
| 886 | 4747 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; |
| 569 | 4748 spellbook.pAirSpellbook.bIsSpellAvailable[1] = true; |
| 4749 spellbook.pAirSpellbook.bIsSpellAvailable[2] = true; | |
| 4750 spellbook.pAirSpellbook.bIsSpellAvailable[3] = true; | |
| 4751 spellbook.pAirSpellbook.bIsSpellAvailable[4] = true; | |
| 4752 spellbook.pAirSpellbook.bIsSpellAvailable[5] = true; | |
| 4753 spellbook.pAirSpellbook.bIsSpellAvailable[6] = true; | |
| 4754 spellbook.pAirSpellbook.bIsSpellAvailable[7] = true; | |
| 4755 spellbook.pAirSpellbook.bIsSpellAvailable[8] = true; | |
| 4756 spellbook.pAirSpellbook.bIsSpellAvailable[9] = true; | |
| 4757 spellbook.pAirSpellbook.bIsSpellAvailable[10] = true; | |
| 4758 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 4759 spellbook.pWaterSpellbook.bIsSpellAvailable[1] = true; | |
| 4760 spellbook.pWaterSpellbook.bIsSpellAvailable[2] = true; | |
| 4761 spellbook.pWaterSpellbook.bIsSpellAvailable[3] = true; | |
| 4762 spellbook.pWaterSpellbook.bIsSpellAvailable[4] = true; | |
| 4763 spellbook.pWaterSpellbook.bIsSpellAvailable[5] = true; | |
| 710 | 4764 spellbook.pWaterSpellbook.bIsSpellAvailable[6] = true; |
| 4765 spellbook.pWaterSpellbook.bIsSpellAvailable[7] = true; | |
| 4766 spellbook.pWaterSpellbook.bIsSpellAvailable[8] = true; | |
| 886 | 4767 spellbook.pWaterSpellbook.bIsSpellAvailable[9] = true; |
| 4768 spellbook.pWaterSpellbook.bIsSpellAvailable[10] = true; | |
| 894 | 4769 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; |
| 4770 spellbook.pEarthSpellbook.bIsSpellAvailable[1] = true; | |
| 4771 spellbook.pEarthSpellbook.bIsSpellAvailable[2] = true; | |
| 4772 spellbook.pEarthSpellbook.bIsSpellAvailable[3] = true; | |
| 4773 spellbook.pEarthSpellbook.bIsSpellAvailable[4] = true; | |
| 4774 spellbook.pEarthSpellbook.bIsSpellAvailable[5] = true; | |
| 4775 spellbook.pEarthSpellbook.bIsSpellAvailable[6] = true; | |
| 4776 spellbook.pEarthSpellbook.bIsSpellAvailable[7] = true; | |
| 4777 spellbook.pEarthSpellbook.bIsSpellAvailable[8] = true; | |
| 4778 spellbook.pEarthSpellbook.bIsSpellAvailable[9] = true; | |
| 4779 spellbook.pEarthSpellbook.bIsSpellAvailable[10] = true; | |
| 4780 } | |
| 486 | 4781 break; |
| 886 | 4782 case PLAYER_SKILL_AIR: |
| 4783 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; | |
| 4784 break; | |
| 4785 case PLAYER_SKILL_WATER: | |
| 4786 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 4787 break; | |
| 4788 case PLAYER_SKILL_EARTH: | |
| 4789 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; | |
| 4790 break; | |
| 4791 case PLAYER_SKILL_SPIRIT: | |
| 4792 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; | |
| 4793 break; | |
| 4794 case PLAYER_SKILL_MIND: | |
| 4795 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; | |
| 4796 break; | |
| 4797 case PLAYER_SKILL_BODY: | |
| 4798 spellbook.pBodySpellbook.bIsSpellAvailable[0] = true; | |
| 894 | 4799 |
| 4800 if ( all_magic == true ) | |
| 4801 { | |
| 4802 pActiveSkills[PLAYER_SKILL_MIND] = 1; | |
| 4803 pActiveSkills[PLAYER_SKILL_SPIRIT] = 1; | |
| 4804 spellbook.pBodySpellbook.bIsSpellAvailable[1] = true; | |
| 4805 spellbook.pBodySpellbook.bIsSpellAvailable[2] = true; | |
| 4806 spellbook.pBodySpellbook.bIsSpellAvailable[3] = true; | |
| 4807 spellbook.pBodySpellbook.bIsSpellAvailable[4] = true; | |
| 4808 spellbook.pBodySpellbook.bIsSpellAvailable[5] = true; | |
| 4809 spellbook.pBodySpellbook.bIsSpellAvailable[6] = true; | |
| 4810 spellbook.pBodySpellbook.bIsSpellAvailable[7] = true; | |
| 4811 spellbook.pBodySpellbook.bIsSpellAvailable[8] = true; | |
| 4812 spellbook.pBodySpellbook.bIsSpellAvailable[9] = true; | |
| 4813 spellbook.pBodySpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 4814 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 4815 spellbook.pMindSpellbook.bIsSpellAvailable[1] = true; |
| 4816 spellbook.pMindSpellbook.bIsSpellAvailable[2] = true; | |
| 4817 spellbook.pMindSpellbook.bIsSpellAvailable[3] = true; | |
| 4818 spellbook.pMindSpellbook.bIsSpellAvailable[4] = true; | |
| 4819 spellbook.pMindSpellbook.bIsSpellAvailable[5] = true; | |
| 4820 spellbook.pMindSpellbook.bIsSpellAvailable[6] = true; | |
| 4821 spellbook.pMindSpellbook.bIsSpellAvailable[7] = true; | |
| 4822 spellbook.pMindSpellbook.bIsSpellAvailable[8] = true; | |
| 4823 spellbook.pMindSpellbook.bIsSpellAvailable[9] = true; | |
| 4824 spellbook.pMindSpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 4825 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 4826 spellbook.pSpiritSpellbook.bIsSpellAvailable[1] = true; |
| 4827 spellbook.pSpiritSpellbook.bIsSpellAvailable[2] = true; | |
| 4828 spellbook.pSpiritSpellbook.bIsSpellAvailable[3] = true; | |
| 4829 spellbook.pSpiritSpellbook.bIsSpellAvailable[4] = true; | |
| 4830 spellbook.pSpiritSpellbook.bIsSpellAvailable[5] = true; | |
| 4831 spellbook.pSpiritSpellbook.bIsSpellAvailable[6] = true; | |
| 4832 spellbook.pSpiritSpellbook.bIsSpellAvailable[7] = true; | |
| 4833 spellbook.pSpiritSpellbook.bIsSpellAvailable[8] = true; | |
| 4834 spellbook.pSpiritSpellbook.bIsSpellAvailable[9] = true; | |
| 4835 spellbook.pSpiritSpellbook.bIsSpellAvailable[10] = true; | |
| 4836 } | |
| 569 | 4837 break; |
| 886 | 4838 case PLAYER_SKILL_LIGHT: |
| 4839 spellbook.pLightSpellbook.bIsSpellAvailable[0] = true; | |
| 4840 break; | |
| 4841 case PLAYER_SKILL_DARK: | |
| 4842 spellbook.pDarkSpellbook.bIsSpellAvailable[0] = true; | |
| 4843 break; | |
| 0 | 4844 } |
| 4845 } | |
| 4846 | |
| 4847 sHealth = GetMaxHealth(); | |
| 4848 sMana = GetMaxMana(); | |
| 4849 } | |
| 4850 | |
| 4851 //----- (004903C9) -------------------------------------------------------- | |
| 821 | 4852 PLAYER_SKILL_TYPE Player::GetSkillIdxByOrder(signed int order) |
| 4853 { | |
|
1271
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4854 int counter; // edx@5 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4855 bool canBeInactive; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4856 unsigned char requiredValue; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4857 signed int offset; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4858 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4859 if ( order <= 1 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4860 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4861 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4862 requiredValue = 2; // 2 - primary skill |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4863 offset = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4864 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4865 else if ( order <= 3 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4866 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4867 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4868 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4869 offset = 2; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4870 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4871 else if ( order <= 12 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4872 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4873 canBeInactive = true; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4874 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4875 offset = 4; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4876 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4877 else |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4878 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4879 return (PLAYER_SKILL_TYPE)37; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4880 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4881 counter = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4882 for (int i = 0; i < 37; i++) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4883 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4884 if ( (this->pActiveSkills[i] || canBeInactive) && pSkillAvailabilityPerClass[classType / 4][i] == requiredValue ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4885 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4886 if ( counter == order - offset ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4887 return (PLAYER_SKILL_TYPE)i; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4888 ++counter; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4889 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4890 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4891 |
|
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
|
4892 return (PLAYER_SKILL_TYPE)37; |
| 0 | 4893 } |
| 4894 | |
| 4895 | |
| 4896 | |
| 4897 //----- (0049048D) -------------------------------------------------------- | |
| 4898 //unsigned __int16 PartyCreation_BtnMinusClick(Player *_this, int eAttribute) | |
| 4899 void Player::DecreaseAttribute(int eAttribute) | |
| 4900 { | |
| 4901 int v2; // eax@1 | |
| 4902 int pBaseValue; // ecx@1 | |
| 4903 int pDroppedStep; // ebx@1 | |
| 4904 int pStep; // esi@1 | |
| 4905 unsigned __int16 result; // ax@7 | |
| 4906 int uMinValue; // [sp+Ch] [bp-4h]@1 | |
| 4907 | |
| 4908 v2 = eAttribute + 7 * GetRace(); | |
| 290 | 4909 pBaseValue = StatTable[0][v2].uBaseValue; |
| 4910 pDroppedStep = StatTable[0][v2].uDroppedStep; | |
| 0 | 4911 uMinValue = pBaseValue - 2; |
| 290 | 4912 pStep = StatTable[0][v2].uBaseStep; |
| 1272 | 4913 unsigned short* AttrToChange = nullptr; |
| 4914 switch ( eAttribute ) | |
| 4915 { | |
| 4916 case CHARACTER_ATTRIBUTE_STRENGTH: | |
| 4917 AttrToChange = &this->uMight; | |
| 4918 break; | |
| 4919 case CHARACTER_ATTRIBUTE_INTELLIGENCE: | |
| 4920 AttrToChange = &this->uIntelligence; | |
| 4921 break; | |
| 4922 case CHARACTER_ATTRIBUTE_WILLPOWER: | |
| 4923 AttrToChange = &this->uWillpower; | |
| 4924 break; | |
| 4925 case CHARACTER_ATTRIBUTE_ENDURANCE: | |
| 4926 AttrToChange = &this->uEndurance; | |
| 4927 break; | |
| 4928 case CHARACTER_ATTRIBUTE_ACCURACY: | |
| 4929 AttrToChange = &this->uAccuracy; | |
| 4930 break; | |
| 4931 case CHARACTER_ATTRIBUTE_SPEED: | |
| 4932 AttrToChange = &this->uSpeed; | |
| 4933 break; | |
| 4934 case CHARACTER_ATTRIBUTE_LUCK: | |
| 4935 AttrToChange = &this->uLuck; | |
| 4936 break; | |
| 4937 } | |
| 4938 if ( *AttrToChange <= pBaseValue ) | |
| 4939 pStep = pDroppedStep; | |
| 4940 if ( *AttrToChange - pStep >= uMinValue ) | |
| 4941 *AttrToChange -= pStep; | |
| 0 | 4942 } |
| 4943 | |
| 4944 //----- (004905F5) -------------------------------------------------------- | |
| 1458 | 4945 //signed int PartyCreation_BtnPlusClick(Player *this, int eAttribute) |
| 1273 | 4946 void Player::IncreaseAttribute( int eAttribute ) |
| 4947 { | |
| 4948 int raceId; // eax@1 | |
| 4949 int maxValue; // ebx@1 | |
| 4950 signed int baseStep; // edi@1 | |
| 4951 signed int tmp; // eax@17 | |
| 0 | 4952 signed int result; // eax@18 |
| 1273 | 4953 int baseValue; // [sp+Ch] [bp-8h]@1 |
| 4954 signed int droppedStep; // [sp+10h] [bp-4h]@1 | |
| 4955 unsigned short* statToChange; | |
| 4956 | |
| 4957 raceId = GetRace(); | |
| 4958 maxValue = StatTable[raceId][eAttribute].uMaxValue; | |
| 4959 baseStep = StatTable[raceId][eAttribute].uBaseStep; | |
| 4960 baseValue = StatTable[raceId][eAttribute].uBaseValue; | |
| 4961 droppedStep = StatTable[raceId][eAttribute].uDroppedStep; | |
| 4962 PlayerCreation_GetUnspentAttributePointCount(); | |
| 4963 switch ( eAttribute ) | |
| 4964 { | |
| 4965 case 0: | |
| 4966 statToChange = &this->uMight; | |
| 4967 break; | |
| 4968 case 1: | |
| 4969 statToChange = &this->uIntelligence; | |
| 4970 break; | |
| 4971 case 2: | |
| 4972 statToChange = &this->uWillpower; | |
| 4973 break; | |
| 4974 case 3: | |
| 4975 statToChange = &this->uEndurance; | |
| 4976 break; | |
| 4977 case 4: | |
| 4978 statToChange = &this->uAccuracy; | |
| 4979 break; | |
| 4980 case 5: | |
| 4981 statToChange = &this->uSpeed; | |
| 4982 break; | |
| 4983 case 6: | |
| 4984 statToChange = &this->uLuck; | |
| 4985 default: | |
| 1545 | 4986 Error("(%u)", eAttribute); |
| 1273 | 4987 } |
| 4988 if ( *statToChange < baseValue ) | |
| 4989 { | |
| 4990 tmp = baseStep; | |
| 4991 baseStep = droppedStep; | |
| 4992 droppedStep = tmp; | |
| 4993 } | |
| 4994 result = PlayerCreation_GetUnspentAttributePointCount(); | |
| 4995 if ( result >= droppedStep ) | |
| 4996 { | |
| 4997 if ( baseStep + *statToChange <= maxValue ) | |
| 4998 *statToChange += baseStep; | |
| 4999 } | |
| 0 | 5000 } |
| 5001 | |
| 5002 //----- (0049070F) -------------------------------------------------------- | |
| 5003 void Player::Zero() | |
| 5004 { | |
| 5005 this->sLevelModifier = 0; | |
| 5006 this->sACModifier = 0; | |
| 5007 this->uLuckBonus = 0; | |
| 5008 this->uAccuracyBonus = 0; | |
| 5009 this->uSpeedBonus = 0; | |
| 5010 this->uEnduranceBonus = 0; | |
| 5011 this->uWillpowerBonus = 0; | |
| 5012 this->uIntelligenceBonus = 0; | |
| 5013 this->uMightBonus = 0; | |
| 5014 this->field_100 = 0; | |
| 5015 this->field_FC = 0; | |
| 5016 this->field_F8 = 0; | |
| 5017 this->field_F4 = 0; | |
| 5018 this->field_F0 = 0; | |
| 5019 this->field_EC = 0; | |
| 5020 this->field_E8 = 0; | |
| 5021 this->field_E4 = 0; | |
| 5022 this->field_E0 = 0; | |
| 766 | 5023 memset(&this->sResFireBonus, 0, 0x16u); |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5024 this->field_1A97 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5025 this->_ranged_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5026 this->field_1A95 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5027 this->_ranged_atk_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5028 this->field_1A93 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5029 this->_melee_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5030 this->field_1A91 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5031 this->_some_attack_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5032 this->_mana_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5033 this->uFullManaBonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5034 this->_health_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5035 this->uFullHealthBonus = 0; |
| 0 | 5036 } |
| 5037 | |
| 5038 //----- (004907E7) -------------------------------------------------------- | |
| 299 | 5039 unsigned int Player::GetStatColor(int uStat) |
| 0 | 5040 { |
| 290 | 5041 int attribute_value; // edx@1 |
| 1393 | 5042 |
| 5043 int base_attribute_value = StatTable[GetRace()][uStat].uBaseValue; | |
| 0 | 5044 switch (uStat) |
| 5045 { | |
| 5046 case 0: attribute_value = uMight; break; | |
| 5047 case 1: attribute_value = uIntelligence; break; | |
| 5048 case 2: attribute_value = uWillpower; break; | |
| 5049 case 3: attribute_value = uEndurance; break; | |
| 290 | 5050 case 4: attribute_value = uAccuracy; break; |
| 5051 case 5: attribute_value = uSpeed; break; | |
| 0 | 5052 case 6: attribute_value = uLuck; break; |
| 5053 }; | |
| 5054 | |
| 1393 | 5055 if (attribute_value == base_attribute_value) |
| 5056 return ui_character_stat_default_color; | |
| 5057 else if (attribute_value > base_attribute_value) | |
| 5058 return ui_character_stat_buffed_color; | |
| 0 | 5059 else |
| 1393 | 5060 return ui_character_stat_debuffed_color; |
| 0 | 5061 } |
| 5062 | |
| 5063 //----- (004908A8) -------------------------------------------------------- | |
| 5064 bool Player::DiscardConditionIfLastsLongerThan(unsigned int uCondition, unsigned __int64 uTime) | |
| 5065 { | |
| 1014 | 5066 if ( pConditions[uCondition] && (uTime < pConditions[uCondition]) ) |
| 5067 { | |
| 1393 | 5068 pConditions[uCondition] = 0i64; |
| 1014 | 5069 return true; |
| 0 | 5070 } |
| 5071 else | |
| 1014 | 5072 return false; |
| 0 | 5073 } |
| 5074 | |
| 5075 //----- (004680ED) -------------------------------------------------------- | |
| 1019 | 5076 void Player::UseItem_DrinkPotion_etc(signed int player_num, int a3) |
| 1021 | 5077 { |
| 5078 Player *v3; // esi@1 | |
| 5079 signed int v5; // eax@17 | |
| 5080 int v8; // edx@39 | |
| 5081 char *v13; // eax@45 | |
| 5082 signed int v15; // edi@68 | |
| 5083 int v16; // edx@73 | |
| 5084 unsigned __int16 v17; // edi@73 | |
| 5085 unsigned int v18; // eax@73 | |
| 5086 const char *v22; // eax@84 | |
| 5087 int scroll_id; // esi@96 | |
| 5088 int v25; // eax@109 | |
| 5089 int v26; // eax@113 | |
| 5090 int new_mana_val; // edi@114 | |
| 5091 signed __int64 v28; // qax@120 | |
| 5092 __int64 v30; // edi@137 | |
| 5093 __int64 v32; // ST3C_4@137 | |
| 5094 __int64 v34; // ST34_4@137 | |
| 5095 unsigned __int16 v50; // [sp-Ch] [bp-38h]@120 | |
| 5096 const char *v66; // [sp-4h] [bp-30h]@69 | |
| 5097 signed int v67; // [sp-4h] [bp-30h]@77 | |
| 5098 const char *v68; // [sp-4h] [bp-30h]@89 | |
| 5099 char v72; // [sp+20h] [bp-Ch]@68 | |
| 5100 signed int v73; // [sp+24h] [bp-8h]@1 | |
| 1032 | 5101 char* v74; // [sp+24h] [bp-8h]@23 |
| 1021 | 5102 Player *thisb; // [sp+28h] [bp-4h]@1 |
| 5103 unsigned int thisa; // [sp+28h] [bp-4h]@22 | |
| 5104 | |
| 5105 thisb = this; | |
| 5106 v3 = &pParty->pPlayers[player_num-1]; | |
| 5107 v73 = 1; | |
| 1340 | 5108 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) ) |
| 1021 | 5109 return; |
| 5110 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_REAGENT ) | |
| 0 | 5111 { |
| 1021 | 5112 if ( pParty->pPickedItem.uItemID == 160 ) |
| 5113 { | |
| 5114 pParty->pPlayers[player_num-1].SetCondition(Condition_Poison1, 1); | |
| 5115 } | |
| 5116 else if ( pParty->pPickedItem.uItemID == 161 ) | |
| 1019 | 5117 { |
| 1021 | 5118 new_mana_val = v3->sMana; |
| 5119 new_mana_val += 2; | |
| 5120 if ( new_mana_val > v3->GetMaxMana() ) | |
| 5121 new_mana_val = v3->GetMaxMana(); | |
| 5122 v3->PlaySound(SPEECH_36, 0); | |
| 5123 } | |
| 5124 else if ( pParty->pPickedItem.uItemID == 162 ) | |
| 5125 { | |
| 5126 pParty->pPlayers[player_num-1].Heal(2); | |
| 1019 | 5127 v3->PlaySound(SPEECH_36, 0); |
| 1021 | 5128 |
| 5129 } | |
| 5130 else | |
| 5131 { | |
| 5132 v68 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5133 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
|
5134 ShowStatusBarString(pTmpBuf.data(), 2); |
| 1021 | 5135 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 5136 return; | |
| 1019 | 5137 } |
| 1032 | 5138 pAudioPlayer->PlaySound((SoundID)211, 0, 0, -1, 0, 0, 0, 0); |
| 5139 | |
| 5140 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) | |
| 5141 { | |
| 5142 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 5143 } | |
| 5144 if ( v73 ) | |
| 5145 { | |
| 5146 if ( pParty->bTurnBasedModeOn ) | |
| 5147 { | |
| 5148 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; | |
| 5149 thisb->SetRecoveryTime(100); | |
| 1448 | 5150 pTurnEngine->ApplyPlayerAction(); |
| 1032 | 5151 } |
| 5152 else | |
| 5153 { | |
| 5154 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); | |
| 5155 } | |
| 5156 } | |
| 5157 pMouse->RemoveHoldingItem(); | |
| 5158 return; | |
| 5159 | |
| 1021 | 5160 |
| 5161 } | |
| 5162 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_POTION ) | |
| 0 | 5163 { |
| 1021 | 5164 switch ( pParty->pPickedItem.uItemID ) |
| 5165 { | |
| 5166 case 221: //Catalyst | |
| 5167 pParty->pPlayers[player_num-1].SetCondition(Condition_Poison1, 1); | |
| 5168 break; | |
| 5169 case 222: //Cure Wounds | |
| 5170 v25 = pParty->pPickedItem.uEnchantmentType + 10; | |
| 5171 pParty->pPlayers[player_num-1].Heal(v25); | |
| 5172 v3->PlaySound(SPEECH_36, 0); | |
| 5173 break; | |
| 5174 case 223: //Magic Potion | |
| 5175 v26 = pParty->pPickedItem.uEnchantmentType + 10; | |
| 5176 new_mana_val = v3->sMana; | |
| 5177 new_mana_val += v26; | |
| 5178 if ( new_mana_val > v3->GetMaxMana() ) | |
| 5179 new_mana_val = v3->GetMaxMana(); | |
| 5180 v3->PlaySound(SPEECH_36, 0); | |
| 5181 break; | |
| 5182 case 224: //Cure Weakness | |
| 5183 v3->pConditions[Condition_Weak] = 0i64; | |
| 5184 v3->PlaySound(SPEECH_36, 0); | |
| 5185 break; | |
| 5186 case 225: //Cure Disease | |
| 5187 v3->pConditions[Condition_Disease3] = 0i64; | |
| 5188 v3->pConditions[Condition_Disease2] = 0i64; | |
| 5189 v3->pConditions[Condition_Disease1] = 0i64; | |
| 5190 v3->PlaySound(SPEECH_36, 0); | |
| 5191 break; | |
| 5192 case 226: //Cure Poison | |
| 5193 v3->pConditions[Condition_Poison3] = 0i64; | |
| 5194 v3->pConditions[Condition_Poison2] = 0i64; | |
| 5195 v3->pConditions[Condition_Poison1] = 0i64; | |
| 5196 v3->PlaySound(SPEECH_36, 0); | |
| 5197 break; | |
| 5198 case 227: //Awaken | |
| 5199 v3->pConditions[Condition_Sleep] = 0i64; | |
| 5200 v3->PlaySound(SPEECH_36, 0); | |
| 5201 break; | |
| 5202 case 228: //Haste | |
| 5203 if ( !v3->pConditions[Condition_Weak] ) | |
| 5204 { | |
| 5205 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 5206 v3->pPlayerBuffs[7].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 5207 v3->PlaySound(SPEECH_36, 0); | |
| 5208 } | |
| 5209 break; | |
| 5210 case 229: //Heroism | |
| 5211 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 5212 v3->pPlayerBuffs[8].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 5213 v3->PlaySound(SPEECH_36, 0); | |
| 5214 break; | |
| 5215 case 230: //Bless | |
| 5216 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 5217 v3->pPlayerBuffs[1].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 5218 v3->PlaySound(SPEECH_36, 0); | |
| 5219 break; | |
| 5220 case 231: //Preservation | |
| 1032 | 5221 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5222 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5223 v3->pPlayerBuffs[11].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5224 v3->PlaySound(SPEECH_36, 0); | |
| 5225 break; | |
| 5226 case 232: //Shield | |
| 1032 | 5227 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5228 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5229 v3->pPlayerBuffs[13].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5230 v3->PlaySound(SPEECH_36, 0); | |
| 5231 break; | |
| 5232 case 234: //Stoneskin | |
| 5233 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 5234 v3->pPlayerBuffs[14].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 5235 v3->PlaySound(SPEECH_36, 0); | |
| 5236 break; | |
| 5237 case 235: //Water Breathing | |
| 5238 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335), | |
| 5239 v3->pPlayerBuffs[23].Apply(pParty->uTimePlayed +v28, 3, 5, 0, 0); | |
| 5240 break; | |
| 5241 case 237: //Remove Fear | |
| 5242 v3->pConditions[Condition_Fear] = 0i64; | |
| 5243 v3->PlaySound(SPEECH_36, 0); | |
| 5244 break; | |
| 5245 case 238: //Remove Curse | |
| 5246 v3->pConditions[Condition_Cursed] = 0i64; | |
| 5247 v3->PlaySound(SPEECH_36, 0); | |
| 5248 break; | |
| 5249 case 239: //Cure Insanity | |
| 5250 v3->pConditions[Condition_Insane] = 0i64; | |
| 5251 v3->PlaySound(SPEECH_36, 0); | |
| 5252 break; | |
| 5253 case 240: //Might Boost | |
| 1032 | 5254 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5255 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5256 v3->pPlayerBuffs[19].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5257 v3->PlaySound(SPEECH_36, 0); | |
| 5258 break; | |
| 5259 case 241: //Intellect Boost | |
| 1032 | 5260 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5261 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5262 v3->pPlayerBuffs[17].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5263 v3->PlaySound(SPEECH_36, 0); | |
| 5264 break; | |
| 5265 case 242: //Personality Boost | |
| 1032 | 5266 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5267 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5268 v3->pPlayerBuffs[20].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5269 v3->PlaySound(SPEECH_36, 0); | |
| 5270 break; | |
| 5271 case 243://Endurance Boost | |
| 1032 | 5272 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5273 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5274 v3->pPlayerBuffs[16].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5275 v3->PlaySound(SPEECH_36, 0); | |
| 5276 break; | |
| 5277 case 244: //Speed Boost | |
| 1032 | 5278 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5279 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5280 v3->pPlayerBuffs[21].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5281 v3->PlaySound(SPEECH_36, 0); | |
| 5282 break; | |
| 5283 case 245: //Accuracy Boost | |
| 1032 | 5284 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5285 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5286 v3->pPlayerBuffs[15].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5287 v3->PlaySound(SPEECH_36, 0); | |
| 5288 break; | |
| 5289 case 251: //Cure Paralysis | |
| 5290 v3->pConditions[Condition_Paralyzed] = 0i64; | |
| 5291 v3->PlaySound(SPEECH_36, 0); | |
| 5292 break; | |
| 5293 case 252://Divine Restoration | |
| 5294 v30 = v3->pConditions[Condition_Dead]; | |
| 5295 v32 = v3->pConditions[Condition_Pertified]; | |
| 5296 v34 = v3->pConditions[Condition_Eradicated]; | |
| 5297 memset(&pParty->pPlayers[player_num-1].pConditions,0,sizeof(pConditions)); | |
| 5298 v3->pConditions[Condition_Dead] = v30; | |
| 5299 v3->pConditions[Condition_Pertified] = v32; | |
| 5300 v3->pConditions[Condition_Eradicated] = v34; | |
| 5301 v3->PlaySound(SPEECH_36, 0); | |
| 5302 break; | |
| 5303 case 253: //Divine Cure | |
| 5304 v25 = 5 * pParty->pPickedItem.uEnchantmentType; | |
| 5305 pParty->pPlayers[player_num-1].Heal(v25); | |
| 5306 v3->PlaySound(SPEECH_36, 0); | |
| 5307 break; | |
| 5308 case 254: //Divine Power | |
| 5309 v26 = 5 * pParty->pPickedItem.uEnchantmentType; | |
| 5310 new_mana_val = v3->sMana; | |
| 5311 new_mana_val += v26; | |
| 5312 if ( new_mana_val > v3->GetMaxMana() ) | |
| 5313 new_mana_val = v3->GetMaxMana(); | |
| 5314 v3->PlaySound(SPEECH_36, 0); | |
| 5315 break; | |
| 5316 case 255: //Luck Boost | |
| 1032 | 5317 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5318 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5319 v3->pPlayerBuffs[18].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5320 v3->PlaySound(SPEECH_36, 0); | |
| 5321 break; | |
| 5322 case 256: //Fire Resistance | |
| 1032 | 5323 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5324 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5325 v3->pPlayerBuffs[5].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5326 v3->PlaySound(SPEECH_36, 0); | |
| 1032 | 5327 break; |
| 1021 | 5328 case 257: //Air Resistance |
| 1032 | 5329 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5330 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5331 v3->pPlayerBuffs[0].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5332 v3->PlaySound(SPEECH_36, 0); | |
| 5333 break; | |
| 5334 case 258: //Water Resistance | |
| 1032 | 5335 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5336 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5337 v3->pPlayerBuffs[22].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5338 v3->PlaySound(SPEECH_36, 0); | |
| 5339 break; | |
| 5340 case 259: //Earth Resistance | |
| 1032 | 5341 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5342 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5343 v3->pPlayerBuffs[3].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5344 v3->PlaySound(SPEECH_36, 0); | |
| 5345 break; | |
| 5346 case 260: //Mind Resistance | |
| 1032 | 5347 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5348 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5349 v3->pPlayerBuffs[9].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5350 v3->PlaySound(SPEECH_36, 0); | |
| 5351 break; | |
| 5352 case 261: //Body Resistance | |
| 1032 | 5353 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5354 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5355 v3->pPlayerBuffs[2].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5356 v3->PlaySound(SPEECH_36, 0); | |
| 5357 break; | |
| 5358 case 262: //Stone to Flesh | |
| 5359 v3->pConditions[Condition_Pertified] = 0i64; | |
| 5360 v3->PlaySound(SPEECH_36, 0); | |
| 5361 break; | |
| 5362 case 264: //Pure Luck | |
| 5363 if ( !v3->pure_luck_used ) | |
| 5364 { | |
| 5365 v3->uLuck += 50; | |
| 5366 v3->pure_luck_used = 1; | |
| 5367 } | |
| 5368 v3->PlaySound(SPEECH_36, 0); | |
| 5369 break; | |
| 5370 case 265: //Pure Speed | |
| 5371 if ( !v3->pure_speed_used ) | |
| 5372 { | |
| 5373 v3->uSpeed += 50; | |
| 5374 v3->pure_speed_used = 1; | |
| 5375 } | |
| 5376 v3->PlaySound(SPEECH_36, 0); | |
| 5377 break; | |
| 5378 case 266: //Pure Intellect | |
| 5379 if ( !v3->pure_intellect_used ) | |
| 5380 { | |
| 5381 v3->uIntelligence += 50; | |
| 5382 v3->pure_intellect_used = 1; | |
| 5383 } | |
| 5384 v3->PlaySound(SPEECH_36, 0); | |
| 5385 break; | |
| 5386 case 267: //Pure Endurance | |
| 5387 if ( !v3->pure_endurance_used ) | |
| 5388 { | |
| 5389 v3->uEndurance += 50; | |
| 5390 v3->pure_endurance_used = 1; | |
| 5391 } | |
| 5392 v3->PlaySound(SPEECH_36, 0); | |
| 5393 break; | |
| 5394 case 268: //Pure Personality | |
| 5395 if ( !v3->pure_willpower_used ) | |
| 5396 { | |
| 5397 v3->uWillpower += 50; | |
| 5398 v3->pure_willpower_used = 1; | |
| 5399 } | |
| 5400 v3->PlaySound(SPEECH_36, 0); | |
| 5401 break; | |
| 5402 case 269: //Pure Accuracy | |
| 5403 if ( !v3->pure_accuracy_used ) | |
| 5404 { | |
| 5405 v3->uAccuracy += 50; | |
| 5406 v3->pure_accuracy_used = 1; | |
| 5407 } | |
| 5408 v3->PlaySound(SPEECH_36, 0); | |
| 5409 break; | |
| 5410 case 270: //Pure Might | |
| 5411 if ( !v3->pure_might_used ) | |
| 5412 { | |
| 5413 v3->uMight += 50; | |
| 5414 v3->pure_might_used = 1; | |
| 5415 } | |
| 5416 v3->PlaySound(SPEECH_36, 0); | |
| 5417 break; | |
| 5418 case 271: //Rejuvenation | |
| 5419 v3->sAgeModifier = 0; | |
| 5420 v3->PlaySound(SPEECH_36, 0); | |
| 5421 break; | |
| 5422 | |
| 5423 default: | |
| 5424 v68 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5425 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
|
5426 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1021 | 5427 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 5428 return; | |
| 1032 | 5429 } |
| 5430 pAudioPlayer->PlaySound((SoundID)210, 0, 0, -1, 0, 0, 0, 0); | |
| 5431 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) | |
| 5432 { | |
| 5433 if ( !v73 ) | |
| 5434 { | |
| 5435 pMouse->RemoveHoldingItem(); | |
| 5436 return; | |
| 5437 } | |
| 5438 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 1021 | 5439 } |
| 1032 | 5440 if ( v73 ) |
| 5441 { | |
| 5442 if ( pParty->bTurnBasedModeOn ) | |
| 5443 { | |
| 5444 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; | |
| 5445 thisb->SetRecoveryTime(100); | |
| 1448 | 5446 pTurnEngine->ApplyPlayerAction(); |
| 1032 | 5447 } |
| 5448 else | |
| 5449 { | |
| 5450 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); | |
| 5451 } | |
| 5452 } | |
| 5453 pMouse->RemoveHoldingItem(); | |
| 5454 return; | |
| 5455 | |
| 1021 | 5456 } |
| 5457 | |
| 5458 | |
| 5459 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_SPELL_SCROLL ) | |
| 5460 { | |
| 5461 | |
| 5462 | |
| 5463 if ( pCurrentScreen == SCREEN_CASTING ) | |
| 5464 return; | |
| 5465 if ( !pParty->pPlayers[player_num-1].CanAct() ) | |
| 5466 { | |
| 5467 | |
| 5468 v68 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5469 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5470 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5471 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5472 return; |
| 5473 } | |
| 5474 if ( bUnderwater == 1 ) | |
| 5475 { | |
| 1032 | 5476 ShowStatusBarString(pGlobalTXT_LocalizationStrings[652], 2u);//"You can not do that while you are underwater!" |
| 5477 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); | |
| 1021 | 5478 return; |
| 5479 } | |
| 5480 dword_50C9AC = 1; | |
| 5481 scroll_id = pParty->pPickedItem.uItemID - 299; | |
| 5482 if ( scroll_id == 30 || scroll_id == 4 || scroll_id == 91 || scroll_id == 28 ) //Enchant Item scroll, Vampiric Weapon scroll ,Recharge Item ,Fire Aura | |
| 5483 { | |
| 5484 pMouse->RemoveHoldingItem(); | |
| 5485 pGUIWindow_CurrentMenu->Release(); | |
|
1405
c0b273d33338
RemoveTexturesPackFromTextureList and RemoveTexturesFromTextureList
Ritor1
parents:
1404
diff
changeset
|
5486 pIcons_LOD->RemoveTexturesPackFromTextureList(); |
| 1021 | 5487 pCurrentScreen = SCREEN_GAME; |
| 5488 viewparams->bRedrawGameUI = 1; | |
| 5489 _42777D_CastSpell_UseWand_ShootArrow(scroll_id, player_num - 1, 0x85u, 1, 0); | |
| 5490 } | |
| 5491 else | |
| 5492 { | |
| 5493 _720984_unused = pParty->pPickedItem.uItemID; | |
| 5494 pMouse->RemoveHoldingItem(); | |
| 5495 pMessageQueue_50C9E8->AddMessage(UIMSG_SpellScrollUse, scroll_id, player_num - 1); | |
| 5496 if ( pCurrentScreen && pGUIWindow_CurrentMenu | |
| 5497 && (pGUIWindow_CurrentMenu->eWindowType != WINDOW_null)) | |
| 5498 { | |
| 5499 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 5500 } | |
| 5501 } | |
| 5502 return; | |
| 5503 } | |
| 5504 | |
| 5505 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_BOOK ) | |
| 5506 | |
| 5507 { | |
| 5508 v15 = pParty->pPickedItem.uItemID - 400; | |
| 5509 v72 = v3->spellbook.bHaveSpell[pParty->pPickedItem.uItemID-400];//(char *)&v3->pConditions[0] + pParty->pPickedItem.uItemID + 2; | |
| 5510 if ( v72 ) | |
| 5511 { | |
| 5512 v66 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5513 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
|
5514 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5515 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5516 return; |
| 5517 } | |
| 5518 if ( !pParty->pPlayers[player_num-1].CanAct() ) | |
| 5519 { | |
| 5520 v66 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5521 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
|
5522 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5523 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5524 return; |
| 5525 } | |
| 5526 v16 = v15 % 11 + 1; | |
| 5527 v17 = v3->pActiveSkills[v15 / 11 + 12]; | |
| 5528 v18 = SkillToMastery(v17) - 1; | |
| 1032 | 5529 switch (v18) |
| 5530 { | |
| 5531 case 0: v67 = 4; break; | |
| 5532 case 1: v67 = 7; break; | |
| 5533 case 2: v67 = 10; break; | |
| 5534 case 3: v67 = 11; break; | |
| 5535 default: | |
| 5536 v67 = player_num; | |
| 5537 } | |
| 5538 | |
| 5539 if ( v16 > v67 || !v17 ) | |
| 1021 | 5540 { |
| 1032 | 5541 v22 = pParty->pPickedItem.GetDisplayName(); |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5542 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
|
5543 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5544 v3->PlaySound((PlayerSpeech)20, 0); |
| 5545 return; | |
| 5546 } | |
| 5547 // v72 = 1; | |
| 5548 v3->PlaySound(SPEECH_21, 0); | |
| 5549 v73 = 0; | |
| 5550 | |
| 5551 | |
| 5552 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) | |
| 5553 { | |
| 5554 if ( !v73 ) | |
| 1021 | 5555 { |
| 1032 | 5556 pMouse->RemoveHoldingItem(); |
| 5557 return; | |
| 5558 } | |
| 5559 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 5560 } | |
| 5561 if ( v73 ) | |
| 5562 { | |
| 5563 if ( pParty->bTurnBasedModeOn ) | |
| 5564 { | |
| 5565 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; | |
| 5566 thisb->SetRecoveryTime(100); | |
| 1448 | 5567 pTurnEngine->ApplyPlayerAction(); |
| 1021 | 5568 } |
| 5569 else | |
| 5570 { | |
| 1032 | 5571 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
| 1021 | 5572 } |
| 5573 } | |
| 1032 | 5574 pMouse->RemoveHoldingItem(); |
| 5575 return; | |
| 5576 | |
| 1021 | 5577 } |
| 5578 | |
| 5579 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_MESSAGE_SCROLL ) | |
| 5580 | |
| 5581 { | |
| 5582 if ( pParty->pPlayers[player_num-1].CanAct() ) | |
| 5583 { | |
| 5584 CreateMsgScrollWindow(pParty->pPickedItem.uItemID); | |
| 1032 | 5585 v3->PlaySound(SPEECH_37, 0); |
| 1021 | 5586 return; |
| 5587 } | |
| 5588 v68 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5589 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5590 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5591 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5592 return; |
| 5593 } | |
| 5594 else | |
| 1459 | 5595 { |
| 5596 if (pParty->pPickedItem.uItemID == 616) //Genie Lamp | |
| 5597 { | |
| 1021 | 5598 thisa = pParty->uCurrentMonthWeek + 1; |
| 5599 if ( pParty->uCurrentMonth >= 7 ) | |
| 1032 | 5600 v74 = NULL; |
| 1021 | 5601 else |
| 5602 v74 = aAttributeNames[pParty->uCurrentMonth]; | |
| 5603 switch ( pParty->uCurrentMonth ) | |
| 5604 { | |
| 1019 | 5605 case 0: |
| 1021 | 5606 v3->uMight += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5607 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5608 break; |
| 1019 | 5609 case 1: |
| 1021 | 5610 v3->uIntelligence += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5611 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5612 break; |
| 1019 | 5613 case 2: |
| 1021 | 5614 v3->uWillpower += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5615 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5616 break; |
| 1019 | 5617 case 3: |
| 1021 | 5618 v3->uEndurance += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5619 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5620 break; |
| 1019 | 5621 case 4: |
| 1021 | 5622 v3->uAccuracy += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5623 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5624 break; |
| 1019 | 5625 case 5: |
| 1021 | 5626 v3->uSpeed += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5627 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5628 break; |
| 1019 | 5629 case 6: |
| 1021 | 5630 v3->uLuck += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5631 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5632 break; |
| 1019 | 5633 case 7: |
| 1021 | 5634 party_finds_gold(1000 * thisa, 0); |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5635 sprintf(pTmpBuf.data(), "+%u %s", 1000 * thisa, pGlobalTXT_LocalizationStrings[97]);//"Gold" |
| 1021 | 5636 break; |
| 1019 | 5637 case 8: |
| 1021 | 5638 Party::GiveFood(5 * thisa); |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5639 sprintf(pTmpBuf.data(), "+%u %s",5 * thisa , pGlobalTXT_LocalizationStrings[653]);//"Food" |
| 1021 | 5640 break; |
| 0 | 5641 case 9u: |
| 1021 | 5642 v3->uSkillPoints += 2 * thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5643 sprintf(pTmpBuf.data(), "+%u %s", 2 * thisa, pGlobalTXT_LocalizationStrings[LOCSTR_SKILL_POINTS]); |
| 1021 | 5644 break; |
| 1019 | 5645 case 10: |
| 1021 | 5646 v3->uExperience += 2500 * thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5647 sprintf(pTmpBuf.data(), "+%u %s", 2500 * thisa, pGlobalTXT_LocalizationStrings[LOCSTR_EXPIRIENCE]); |
| 1021 | 5648 break; |
| 1019 | 5649 case 11: |
| 1021 | 5650 v8 = rand() % 6; |
| 5651 switch (v8) | |
| 5652 { | |
| 5653 case 0: | |
| 5654 v3->sResFireBase += thisa; | |
| 5655 v13 = pGlobalTXT_LocalizationStrings[87]; | |
| 5656 break; | |
| 5657 case 1: | |
| 5658 v3->sResAirBase += thisa; | |
| 5659 v13 = pGlobalTXT_LocalizationStrings[6]; | |
| 5660 break; | |
| 5661 case 2: | |
| 5662 v3->sResWaterBase += thisa; | |
| 5663 v13 = pGlobalTXT_LocalizationStrings[240]; | |
| 5664 break; | |
| 5665 case 3: | |
| 5666 v3->sResEarthBase += thisa; | |
| 5667 v13 = pGlobalTXT_LocalizationStrings[70]; | |
| 5668 break; | |
| 5669 case 4: | |
| 5670 v3->sResMindBase += thisa; | |
| 5671 v13 = pGlobalTXT_LocalizationStrings[142]; | |
| 5672 break; | |
| 5673 case 5: | |
| 5674 v3->sResBodyBase += thisa; | |
| 5675 v13 = pGlobalTXT_LocalizationStrings[29]; | |
| 1019 | 5676 break; |
| 1021 | 5677 } |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5678 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v13, pGlobalTXT_LocalizationStrings[121]); |
| 1021 | 5679 break; |
| 5680 | |
| 5681 } | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5682 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1021 | 5683 pMouse->RemoveHoldingItem(); |
| 1459 | 5684 pGame->pStru6Instance->SetPlayerBuffAnim(SPELL_QUEST_COMPLETED, player_num - 1); |
| 1021 | 5685 v3->PlaySound(SPEECH_93, 0); |
| 1032 | 5686 pAudioPlayer->PlaySound((SoundID)219, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5687 if ( pParty->uDaysPlayed == 6 || pParty->uDaysPlayed == 20 ) |
| 0 | 5688 { |
| 1021 | 5689 v3->SetCondition(Condition_Eradicated, 0); |
| 5690 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); | |
| 0 | 5691 } |
| 1021 | 5692 else if ( pParty->uDaysPlayed == 12 || pParty->uDaysPlayed == 26 ) |
| 5693 { | |
| 5694 v3->SetCondition(Condition_Dead, 0); | |
| 5695 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); | |
| 5696 } | |
| 5697 else if ( pParty->uDaysPlayed == 4 || pParty->uDaysPlayed == 25 ) | |
| 5698 { | |
| 5699 v3->SetCondition(Condition_Pertified, 0); | |
| 5700 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); | |
| 5701 } | |
| 1019 | 5702 return; |
| 1021 | 5703 } |
| 5704 else if ( pParty->pPickedItem.uItemID == 630 ) //Red Apple | |
| 1459 | 5705 { |
| 1021 | 5706 Party::GiveFood(1u); |
| 1459 | 5707 pAudioPlayer->PlaySound(SOUND_EatApple, 0, 0, -1, 0, 0, 0, 0); |
| 5708 } | |
| 1021 | 5709 else if ( pParty->pPickedItem.uItemID == 632 ) //Lute |
| 5710 { | |
| 1459 | 5711 pAudioPlayer->PlaySound(SOUND_PlayLute, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5712 return; |
| 5713 } | |
| 5714 else if ( pParty->pPickedItem.uItemID == 633 ) //Faerie Pipes | |
| 5715 { | |
| 1459 | 5716 pAudioPlayer->PlaySound(SOUND_PlayFaeriePipes, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5717 return; |
| 5718 } | |
| 5719 else if ( pParty->pPickedItem.uItemID == 634 ) //Gryphonheart's Trumpet | |
| 5720 { | |
| 1459 | 5721 pAudioPlayer->PlaySound(SOUND_PlayGryphonheartsTrumpet, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5722 return; |
| 5723 } | |
| 1032 | 5724 else if ( pParty->pPickedItem.uItemID == 646 ) //Horseshoe |
| 1459 | 5725 { |
| 5726 pGame->pStru6Instance->SetPlayerBuffAnim(SPELL_QUEST_COMPLETED, player_num - 1); | |
| 5727 v5 = PID(OBJECT_Player, player_num + 49); | |
| 1021 | 5728 pAudioPlayer->PlaySound(SOUND_20001, v5, 0, -1, 0, 0, 0, 0); |
| 5729 v3->AddVariable(VAR_NumSkillPoints, 2); | |
| 5730 } | |
| 5731 else if ( pParty->pPickedItem.uItemID == 650 ) //Temple in a Bottle | |
| 5732 { | |
| 1459 | 5733 TeleportToNWCDungeon(); |
| 1021 | 5734 return; |
| 5735 } | |
| 0 | 5736 else |
| 1021 | 5737 { |
| 5738 | |
| 5739 v68 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5740 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
|
5741 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5742 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5743 return; |
| 5744 } | |
| 1032 | 5745 |
| 0 | 5746 pMouse->RemoveHoldingItem(); |
| 5747 return; | |
| 5748 } | |
| 1021 | 5749 |
| 5750 } | |
| 0 | 5751 |
| 5752 //----- (00449BB4) -------------------------------------------------------- | |
| 484 | 5753 bool Player::CompareVariable( enum VariableType VarNum, signed int pValue ) |
| 1033 | 5754 { |
| 0 | 5755 Player *v3; // esi@1 |
| 5756 signed int v4; // edi@1 | |
| 5757 unsigned int v5; // eax@8 | |
| 5758 int v6; // eax@9 | |
| 5759 enum CHARACTER_RACE v7; // eax@11 | |
| 5760 signed int v8; // eax@17 | |
| 5761 unsigned __int8 v9; // sf@17 | |
| 5762 unsigned __int8 v10; // of@17 | |
| 5763 int v11; // eax@19 | |
| 5764 unsigned int v12; // eax@20 | |
| 484 | 5765 unsigned int test_bit_value; // eax@25 |
| 5766 unsigned __int8 our_bit_value; // cl@25 | |
| 0 | 5767 signed int v15; // ecx@28 |
| 5768 ItemGen *v16; // eax@28 | |
| 5769 char v17; // zf@31 | |
| 5770 int v18; // edi@90 | |
| 5771 DDM_DLV_Header *v19; // eax@122 | |
| 5772 char v20; // cl@124 | |
| 5773 DDM_DLV_Header *v21; // eax@126 | |
| 5774 unsigned int v22; // edi@129 | |
| 100 | 5775 Player *v23; // esi@134 |
| 0 | 5776 ItemGen *v24; // ecx@135 |
| 5777 signed int v25; // edx@135 | |
| 5778 ITEM_EQUIP_TYPE v26; // ebx@155 | |
| 5779 char *v27; // edi@155 | |
| 5780 int v28; // ebx@161 | |
| 5781 int v29; // eax@161 | |
| 5782 | |
| 469 | 5783 v6 = 0; |
| 0 | 5784 v3 = this; |
| 5785 v4 = -1; | |
| 469 | 5786 if ( VarNum > VAR_AutoNotes ) |
| 5787 { | |
| 5788 switch ( VarNum ) | |
| 0 | 5789 { |
| 5790 case VAR_Invisible: | |
| 1167 | 5791 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime >0 ) |
| 469 | 5792 return true; |
| 484 | 5793 return false; |
| 0 | 5794 case VAR_NumDeaths: |
| 5795 v4 = pParty->uNumDeaths; | |
| 469 | 5796 return v4 >= pValue; |
| 0 | 5797 case VAR_NumBounties: |
| 5798 v4 = pParty->uNumBountiesCollected; | |
| 469 | 5799 return v4 >= pValue; |
| 0 | 5800 case VAR_PrisonTerms: |
| 5801 v4 = pParty->uNumPrisonTerms; | |
| 469 | 5802 return v4 >= pValue; |
| 0 | 5803 case VAR_ArenaWinsPage: |
| 5804 v4 = (unsigned __int8)pParty->uNumArenaPageWins; | |
| 469 | 5805 return v4 >= pValue; |
| 0 | 5806 case VAR_ArenaWinsSquire: |
| 5807 v4 = (unsigned __int8)pParty->uNumArenaSquireWins; | |
| 469 | 5808 return v4 >= pValue; |
| 0 | 5809 case VAR_ArenaWinsKnight: |
| 5810 v4 = (unsigned __int8)pParty->uNumArenaKnightWins; | |
| 469 | 5811 return v4 >= pValue; |
| 0 | 5812 case VAR_ArenaWinsLord: |
| 5813 v4 = (unsigned __int8)pParty->uNumArenaLordWins; | |
| 469 | 5814 return v4 >= pValue; |
| 0 | 5815 case VAR_ReputationInCurrentLocation: |
| 5816 v19 = &pOutdoor->ddm; | |
| 5817 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5818 v19 = &pIndoor->dlv; | |
| 469 | 5819 v6 = v19->uReputation >= pValue; |
| 5820 return v6; | |
| 0 | 5821 case VAR_History_28|VAR_Sex: |
| 5822 v21 = &pOutdoor->ddm; | |
| 5823 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5824 v21 = &pIndoor->dlv; | |
| 469 | 5825 v6 = v21->field_C_alert == pValue; |
| 0 | 5826 return v6; |
| 5827 case VAR_MonthEquals2|VAR_Sex: | |
| 5828 case VAR_MonthEquals2|VAR_Class: | |
| 5829 case VAR_Counter1: | |
| 5830 case VAR_Counter2: | |
| 5831 case VAR_Counter3: | |
| 5832 case VAR_Counter4: | |
| 5833 case VAR_Counter5: | |
| 5834 case VAR_Counter6: | |
| 5835 case VAR_Counter7: | |
| 5836 case VAR_Counter8: | |
| 469 | 5837 v22 = *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44304]; |
| 5838 if ( v22 | *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44300] | |
| 5839 && (signed __int64)(__PAIR__(v22, *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44300]) | |
| 5840 + (signed __int64)((double)(460800 * pValue) * 0.033333335)) <= (signed __int64)pParty->uTimePlayed ) | |
| 5841 return true; | |
| 5842 return false; | |
| 0 | 5843 case VAR_NumSkillPoints: |
| 5844 v4 = this->uSkillPoints; | |
| 469 | 5845 return v4 >= pValue; |
| 0 | 5846 case VAR_CircusPrises: |
| 5847 v4 = 0; | |
| 100 | 5848 v23 = pParty->pPlayers;//[0].pInventoryItems; |
| 0 | 5849 do |
| 5850 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
5851 v24 = v23->pInventoryItemList; |
| 0 | 5852 v25 = 138; |
| 5853 do | |
| 5854 { | |
| 5855 switch ( v24->uItemID ) | |
| 5856 { | |
| 5857 case 0x1D6u: | |
| 5858 ++v4; | |
| 5859 break; | |
| 5860 case 0x1D7u: | |
| 5861 v4 += 3; | |
| 5862 break; | |
| 5863 case 0x1DDu: | |
| 5864 v4 += 5; | |
| 5865 break; | |
| 5866 } | |
| 5867 ++v24; | |
| 5868 --v25; | |
| 5869 } | |
| 5870 while ( v25 ); | |
| 100 | 5871 ++v23; |
| 0 | 5872 } |
| 100 | 5873 while ( v23 <= &pParty->pPlayers[3] ); |
| 469 | 5874 return v4 >= pValue; |
| 0 | 5875 case VAR_MonthEquals2: |
| 469 | 5876 v6 = pParty->uCurrentMonth == pValue; |
| 5877 return v6; | |
| 0 | 5878 case VAR_IsFlying: |
| 5879 if ( pParty->bFlying | |
| 1167 | 5880 && (pParty->pPartyBuffs[PARTY_BUFF_FLY].uExpireTime> 0) ) |
| 469 | 5881 return true; |
| 5882 return false; | |
| 0 | 5883 case VAR_HiredNPCHasSpeciality: |
| 469 | 5884 LOBYTE(v6) = CheckHiredNPCSpeciality(pValue); |
| 0 | 5885 return v6; |
| 5886 case VAR_NPCs2: | |
| 469 | 5887 return pNPCStats->pNewNPCData[pValue].Hired(); |
| 0 | 5888 case VAR_MonthEquals|VAR_CurrentSP: |
| 1033 | 5889 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; |
| 5890 our_bit_value = this->field_1A50[((signed __int16)pValue - 1)/8]; | |
| 484 | 5891 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 469 | 5892 return v4 >= pValue; |
| 5893 v4 = pValue; | |
| 5894 return v4 >= pValue; | |
| 0 | 5895 case VAR_ItemEquipped: |
| 5896 v26 = (ITEM_EQUIP_TYPE)0; | |
| 5897 v27 = (char *)&this->pEquipment; | |
| 5898 break; | |
| 5899 case VAR_GoldInBank: | |
| 5900 v4 = pParty->uNumGoldInBank; | |
| 469 | 5901 return v4 >= pValue; |
| 0 | 5902 case VAR_ThieverySkill|0x80: |
| 5903 v28 = GetActualMight(); | |
| 5904 v29 = v3->GetBaseStrength(); | |
| 5905 goto LABEL_168; | |
| 5906 case VAR_DisarmTrapSkill|0x80: | |
| 5907 v28 = GetActualIntelligence(); | |
| 5908 v29 = v3->GetBaseIntelligence(); | |
| 5909 goto LABEL_168; | |
| 5910 case VAR_MonthEquals: | |
| 5911 v28 = GetActualWillpower(); | |
| 5912 v29 = v3->GetBaseWillpower(); | |
| 5913 goto LABEL_168; | |
| 5914 case VAR_MonthEquals|VAR_Sex: | |
| 5915 v28 = GetActualEndurance(); | |
| 5916 v29 = v3->GetBaseEndurance(); | |
| 5917 goto LABEL_168; | |
| 5918 case VAR_IdentifyMonsterSkill|0x80: | |
| 5919 v28 = GetActualSpeed(); | |
| 5920 v29 = v3->GetBaseSpeed(); | |
| 5921 goto LABEL_168; | |
| 5922 case VAR_ArmsmasterSkill|0x80: | |
| 5923 v28 = GetActualAccuracy(); | |
| 5924 v29 = v3->GetBaseAccuracy(); | |
| 5925 goto LABEL_168; | |
| 5926 case VAR_MonthEquals|VAR_MaxHP: | |
| 5927 v28 = GetActualLuck(); | |
| 5928 v29 = v3->GetBaseLuck(); | |
| 5929 LABEL_168: | |
| 5930 v10 = __OFSUB__(v28, v29); | |
| 5931 v9 = v28 - v29 < 0; | |
| 5932 LABEL_169: | |
| 5933 if ( v9 ^ v10 ) | |
| 469 | 5934 return v4 >= pValue; |
| 5935 return true; | |
| 0 | 5936 default: |
| 469 | 5937 return v4 >= pValue; |
| 0 | 5938 } |
| 5939 while ( !v3->HasItemEquipped(v26) | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
5940 || *(int *)&v3->pInventoryItemList[*(int *)v27-1] != pValue ) |
| 0 | 5941 { |
| 5942 v26 = (ITEM_EQUIP_TYPE)((int)v26 + 1); | |
| 5943 v27 += 4; | |
| 5944 if ( (signed int)v26 >= 16 ) | |
| 469 | 5945 return false; |
| 5946 } | |
| 5947 return true; | |
| 5948 } | |
| 5949 if ( VarNum == VAR_AutoNotes ) | |
| 0 | 5950 { |
| 1033 | 5951 test_bit_value = 0x80u >> ((signed __int16)(pValue - 1) - 1) % 8; |
| 5952 our_bit_value = pParty->_autonote_bits[((signed __int16)(pValue - 1) - 1) /8]; | |
| 484 | 5953 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 5954 return false; | |
| 5955 return true; | |
| 469 | 5956 } |
| 5957 if ( VarNum <= VAR_BaseLuck ) | |
| 5958 { | |
| 5959 if ( VarNum != VAR_BaseLuck ) | |
| 5960 { | |
| 5961 switch ( VarNum ) | |
| 0 | 5962 { |
| 5963 case VAR_Hour: | |
| 469 | 5964 if ( (signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60 % 24 == pValue ) |
| 5965 return true; | |
| 5966 return false; | |
| 0 | 5967 case VAR_DayOfYear: |
| 469 | 5968 v5 = (unsigned int)((signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60) / 0x18 % 0x150 + 1; |
| 5969 v6 = v5 == pValue; | |
| 5970 return v6; | |
| 0 | 5971 case VAR_DayOfWeek: |
| 469 | 5972 v5 = (unsigned int)((signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60) / 0x18 % 7; |
| 5973 v6 = v5 == pValue; | |
| 0 | 5974 return v6; |
| 5975 case VAR_Sex: | |
| 469 | 5976 if ( pValue == (CHARACTER_RACE)this->uSex ) |
| 5977 return true; | |
| 5978 return v4 >= pValue; | |
| 0 | 5979 case VAR_Class: |
| 135 | 5980 v7 = (CHARACTER_RACE)this->classType; |
| 469 | 5981 if ( pValue == v7 ) |
| 5982 return true; | |
| 5983 return v4 >= pValue; | |
| 0 | 5984 case VAR_Race: |
| 5985 v7 = GetRace(); | |
| 469 | 5986 if ( pValue == v7 ) |
| 5987 return true; | |
| 5988 return v4 >= pValue; | |
| 0 | 5989 case VAR_CurrentHP: |
| 5990 v4 = this->sHealth; | |
| 469 | 5991 return v4 >= pValue; |
| 0 | 5992 case VAR_MaxHP: |
| 5993 v8 = GetMaxHealth(); | |
| 5994 v10 = __OFSUB__(v3->sHealth, v8); | |
| 5995 v9 = v3->sHealth - v8 < 0; | |
| 5996 goto LABEL_169; | |
| 5997 case VAR_CurrentSP: | |
| 5998 v4 = this->sMana; | |
| 469 | 5999 return v4 >= pValue; |
| 0 | 6000 case VAR_MaxSP: |
| 6001 v11 = GetMaxMana(); | |
| 6002 v10 = __OFSUB__(v3->sMana, v11); | |
| 6003 v9 = v3->sMana - v11 < 0; | |
| 6004 goto LABEL_169; | |
| 6005 case VAR_ActualAC: | |
| 6006 v12 = GetActualAC(); | |
| 6007 goto _j_cmp_against_arg; | |
| 6008 case VAR_ACModifier: | |
| 6009 v4 = this->sACModifier; | |
| 469 | 6010 return v4 >= pValue; |
| 0 | 6011 case VAR_BaseLevel: |
| 6012 v4 = this->uLevel; | |
| 469 | 6013 return v4 >= pValue; |
| 0 | 6014 case VAR_LevelModifier: |
| 6015 v4 = this->sLevelModifier; | |
| 469 | 6016 return v4 >= pValue; |
| 0 | 6017 case VAR_Age: |
| 6018 v12 = GetActualAge(); | |
| 6019 goto _j_cmp_against_arg; | |
| 6020 case VAR_Award: | |
| 1033 | 6021 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6022 our_bit_value = this->_achieved_awards_bits[((signed __int16)pValue - 1) /8]; |
| 484 | 6023 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 6024 return true; | |
| 6025 return false; | |
| 0 | 6026 case VAR_Experience: |
| 6027 v4 = LODWORD(this->uExperience); | |
| 469 | 6028 return v4 >= pValue; |
| 0 | 6029 case VAR_QBits_QuestsDone: |
| 484 | 6030 test_bit_value = 0x80u >> (pValue - 1) % 8; |
| 6031 our_bit_value = pParty->_quest_bits[(pValue - 1)/8]; | |
| 6032 if ( test_bit_value & our_bit_value ) | |
| 478 | 6033 return true; |
| 6034 return false; | |
| 0 | 6035 case VAR_PlayerItemInHands: |
| 6036 v15 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
6037 v16 = v3->pInventoryItemList; |
| 0 | 6038 break; |
| 6039 case VAR_FixedGold: | |
| 6040 v4 = pParty->uNumGold; | |
| 469 | 6041 return v4 >= pValue; |
| 0 | 6042 case VAR_MightBonus: |
| 6043 v4 = this->uMightBonus; | |
| 469 | 6044 return v4 >= pValue; |
| 0 | 6045 case VAR_IntellectBonus: |
| 6046 v4 = this->uIntelligenceBonus; | |
| 469 | 6047 return v4 >= pValue; |
| 0 | 6048 case VAR_PersonalityBonus: |
| 6049 v4 = this->uWillpowerBonus; | |
| 469 | 6050 return v4 >= pValue; |
| 0 | 6051 case VAR_EnduranceBonus: |
| 6052 v4 = this->uEnduranceBonus; | |
| 469 | 6053 return v4 >= pValue; |
| 0 | 6054 case VAR_SpeedBonus: |
| 6055 v4 = this->uSpeedBonus; | |
| 469 | 6056 return v4 >= pValue; |
| 0 | 6057 case VAR_AccuracyBonus: |
| 6058 v4 = this->uAccuracyBonus; | |
| 469 | 6059 return v4 >= pValue; |
| 0 | 6060 case VAR_LuckBonus: |
| 6061 v4 = this->uLuckBonus; | |
| 469 | 6062 return v4 >= pValue; |
| 0 | 6063 case VAR_BaseMight: |
| 6064 v4 = this->uMight; | |
| 469 | 6065 return v4 >= pValue; |
| 0 | 6066 case VAR_BaseIntellect: |
| 6067 v4 = this->uIntelligence; | |
| 469 | 6068 return v4 >= pValue; |
| 0 | 6069 case VAR_BasePersonality: |
| 6070 v4 = this->uWillpower; | |
| 469 | 6071 return v4 >= pValue; |
| 0 | 6072 case VAR_BaseEndurance: |
| 6073 v4 = this->uEndurance; | |
| 469 | 6074 return v4 >= pValue; |
| 0 | 6075 case VAR_BaseSpeed: |
| 6076 v4 = this->uSpeed; | |
| 469 | 6077 return v4 >= pValue; |
| 0 | 6078 case VAR_BaseAccuracy: |
| 6079 v4 = this->uAccuracy; | |
| 469 | 6080 return v4 >= pValue; |
| 0 | 6081 case VAR_FixedFood: |
| 6082 v4 = pParty->uNumFoodRations; | |
| 469 | 6083 return v4 >= pValue; |
| 0 | 6084 default: |
| 469 | 6085 return v4 >= pValue; |
| 6086 } | |
| 6087 while ( v16->uItemID != pValue ) | |
| 0 | 6088 { |
| 6089 ++v15; | |
| 6090 ++v16; | |
| 6091 if ( v15 >= 138 ) | |
| 6092 { | |
| 469 | 6093 v6 = pParty->pPickedItem.uItemID == pValue; |
| 0 | 6094 return v6; |
| 6095 } | |
| 6096 } | |
| 469 | 6097 return true; |
| 0 | 6098 } |
| 6099 v4 = this->uLuck; | |
| 469 | 6100 return v4 >= pValue; |
| 6101 } | |
| 6102 if ( VarNum <= VAR_MagicResistance ) | |
| 6103 { | |
| 6104 if ( VarNum == VAR_MagicResistance ) | |
| 0 | 6105 { |
| 6106 v4 = this->sResMagicBase; | |
| 6107 } | |
| 6108 else | |
| 6109 { | |
| 469 | 6110 switch ( VarNum ) |
| 0 | 6111 { |
| 6112 case VAR_FireResistance: | |
| 6113 v4 = this->sResFireBase; | |
| 469 | 6114 return v4 >= pValue; |
| 0 | 6115 case VAR_AirResistance: |
| 6116 v4 = this->sResAirBase; | |
| 469 | 6117 return v4 >= pValue; |
| 0 | 6118 case VAR_WaterResistance: |
| 6119 v4 = this->sResWaterBase; | |
| 469 | 6120 return v4 >= pValue; |
| 0 | 6121 case VAR_EarthResistance: |
| 6122 v4 = this->sResEarthBase; | |
| 469 | 6123 return v4 >= pValue; |
| 0 | 6124 case VAR_SpiritResistance: |
| 6125 v4 = this->sResSpiritBase; | |
| 469 | 6126 return v4 >= pValue; |
| 0 | 6127 case VAR_MindResistance: |
| 6128 v4 = this->sResMindBase; | |
| 469 | 6129 return v4 >= pValue; |
| 0 | 6130 case VAR_BodyResistance: |
| 6131 v4 = this->sResBodyBase; | |
| 469 | 6132 return v4 >= pValue; |
| 0 | 6133 case VAR_LightResistance: |
| 6134 v4 = this->sResLightBase; | |
| 469 | 6135 return v4 >= pValue; |
| 0 | 6136 case VAR_DarkResistance: |
| 6137 v4 = this->sResDarkBase; | |
| 469 | 6138 return v4 >= pValue; |
| 0 | 6139 case VAR_ActualMight: |
| 6140 v12 = GetActualMight(); | |
| 6141 goto _j_cmp_against_arg; | |
| 6142 case VAR_ActualIntellect: | |
| 6143 v12 = GetActualIntelligence(); | |
| 6144 goto _j_cmp_against_arg; | |
| 6145 case VAR_ActualPersonality: | |
| 6146 v12 = GetActualWillpower(); | |
| 6147 goto _j_cmp_against_arg; | |
| 6148 case VAR_ActualEndurance: | |
| 6149 v12 = GetActualEndurance(); | |
| 6150 goto _j_cmp_against_arg; | |
| 6151 case VAR_ActualSpeed: | |
| 6152 v12 = GetActualSpeed(); | |
| 6153 goto _j_cmp_against_arg; | |
| 6154 case VAR_ActualAccuracy: | |
| 6155 v12 = GetActualAccuracy(); | |
| 6156 goto _j_cmp_against_arg; | |
| 6157 case VAR_ActualLuck: | |
| 6158 v12 = GetActualLuck(); | |
| 6159 _j_cmp_against_arg: | |
| 6160 v4 = v12; | |
| 6161 break; | |
| 6162 default: | |
| 469 | 6163 return v4 >= pValue; |
| 6164 } | |
| 6165 } | |
| 6166 return v4 >= pValue; | |
| 6167 } | |
| 6168 if ( VarNum <= VAR_DisarmTrapSkill ) | |
| 6169 { | |
| 6170 if ( VarNum != VAR_DisarmTrapSkill ) | |
| 6171 { | |
| 6172 if ( VarNum <= VAR_MindResistanceBonus ) | |
| 6173 { | |
| 6174 switch ( VarNum ) | |
| 0 | 6175 { |
| 6176 case VAR_MindResistanceBonus: | |
| 6177 v4 = this->sResMindBonus; | |
| 6178 break; | |
| 6179 case VAR_FireResistanceBonus: | |
| 6180 v4 = this->sResFireBonus; | |
| 6181 break; | |
| 6182 case VAR_AirResistanceBonus: | |
| 6183 v4 = this->sResAirBonus; | |
| 6184 break; | |
| 6185 case VAR_WaterResistanceBonus: | |
| 6186 v4 = this->sResWaterBonus; | |
| 6187 break; | |
| 6188 case VAR_EarthResistanceBonus: | |
| 6189 v4 = this->sResEarthBonus; | |
| 6190 break; | |
| 6191 case VAR_SpiritResistanceBonus: | |
| 6192 v4 = this->sResSpiritBonus; | |
| 6193 break; | |
| 6194 } | |
| 469 | 6195 return v4 >= pValue; |
| 6196 } | |
| 6197 if ( VarNum == VAR_BodyResistanceBonus ) | |
| 0 | 6198 { |
| 6199 v4 = this->sResBodyBonus; | |
| 469 | 6200 return v4 >= pValue; |
| 6201 } | |
| 6202 if ( VarNum == VAR_LightResistanceBonus ) | |
| 0 | 6203 { |
| 6204 v4 = this->sResLightBonus; | |
| 469 | 6205 return v4 >= pValue; |
| 6206 } | |
| 6207 if ( VarNum == VAR_DarkResistanceBonus ) | |
| 0 | 6208 { |
| 6209 v4 = this->sResDarkBonus; | |
| 469 | 6210 return v4 >= pValue; |
| 6211 } | |
| 6212 if ( VarNum == VAR_MagicResistanceBonus ) | |
| 0 | 6213 { |
| 6214 v4 = this->sResMagicBonus; | |
| 469 | 6215 return v4 >= pValue; |
| 6216 } | |
| 6217 if ( VarNum <= VAR_MagicResistanceBonus || VarNum > VAR_DiplomacySkill ) | |
| 6218 return v4 >= pValue; | |
| 0 | 6219 } |
| 6220 LABEL_90: | |
| 469 | 6221 v18 = *((short *)&this->pConditions[16] + VarNum); |
| 6222 if ( pValue <= 63 ) | |
| 0 | 6223 v4 = v18 & 0x3F; |
| 6224 else | |
| 469 | 6225 v4 = pValue & v18; |
| 6226 return v4 >= pValue; | |
| 6227 } | |
| 6228 if ( VarNum == 104 ) | |
| 0 | 6229 goto LABEL_90; |
| 469 | 6230 if ( (signed int)VarNum <= 104 ) |
| 6231 return v4 >= pValue; | |
| 6232 if ( (signed int)VarNum > 0x79 ) | |
| 6233 { | |
| 6234 if ( VarNum != 122 ) | |
| 6235 { | |
| 6236 if ( (signed int)VarNum > 122 && VarNum <= VAR_ActiveSpells ) | |
| 6237 v4 = (unsigned __int8)byte_5E4C15[VarNum]; | |
| 6238 return v4 >= pValue; | |
| 0 | 6239 } |
| 6240 v4 = GetMajorConditionIdx(); | |
| 6241 if ( v4 != 18 ) | |
| 6242 { | |
| 469 | 6243 return v4 >= pValue; |
| 6244 } | |
| 6245 v4 = pValue; | |
| 6246 return v4 >= pValue; | |
| 6247 } | |
| 1072 | 6248 return &LODWORD(this->pConditions[VarNum]);// *((int *)this + 2 * VarNum - 210); |
| 0 | 6249 } |
| 6250 | |
| 6251 | |
| 6252 //----- (0044A5CB) -------------------------------------------------------- | |
| 492 | 6253 void Player::SetVariable(enum VariableType var_type, signed int var_value) |
| 6254 { | |
| 6255 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
|
6256 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
|
6257 unsigned int v5_unused; // edi@1 |
| 0 | 6258 unsigned int v6; // esi@13 |
| 6259 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
|
6260 signed int v8_unused; // eax@17 |
| 0 | 6261 ItemGen *v9; // ecx@17 |
| 6262 int v10; // eax@21 | |
| 6263 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
|
6264 Player *unused12; // ecx@44 |
| 0 | 6265 char *v13; // ecx@45 |
| 6266 Player *v14; // ecx@49 | |
| 6267 int v15; // ecx@86 | |
| 6268 int v16; // esi@106 | |
| 6269 char v17; // al@106 | |
| 6270 int v18; // eax@107 | |
| 6271 Player *v19; // ecx@112 | |
| 6272 Player *v20; // ecx@127 | |
| 6273 int v21; // eax@127 | |
| 6274 int v22; // eax@145 | |
| 6275 char v23; // zf@146 | |
| 6276 DDM_DLV_Header *v24; // ecx@148 | |
| 6277 signed int v25; // eax@172 | |
| 6278 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
|
6279 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
|
6280 int v28_unused; // [sp-4h] [bp-38h]@84 |
| 0 | 6281 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
|
6282 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
|
6283 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
|
6284 |
|
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
|
6285 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
|
6286 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
|
6287 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6288 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
|
6289 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6290 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
|
6291 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
|
6292 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6293 } |
| 1545 | 6294 |
| 6295 Assert(currPlayerId != -1); | |
| 492 | 6296 if ( var_type > VAR_AutoNotes ) |
| 6297 { | |
| 6298 if ( var_type <= VAR_GoldInBank ) | |
| 6299 { | |
| 6300 if ( var_type == VAR_GoldInBank ) | |
| 6301 { | |
| 6302 pParty->uNumGoldInBank = var_value; | |
| 0 | 6303 return; |
| 6304 } | |
| 492 | 6305 if ( var_type <= VAR_Counter8 ) |
| 6306 { | |
| 6307 if ( (signed int)var_type >= 0xF5 ) | |
| 0 | 6308 { |
| 492 | 6309 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44300] = LODWORD(pParty->uTimePlayed); |
| 6310 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44304] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 6311 } |
| 6312 else | |
| 6313 { | |
| 492 | 6314 switch ( var_type ) |
| 0 | 6315 { |
| 6316 case VAR_MonthEquals|VAR_CurrentSP: | |
| 492 | 6317 _449B7E_toggle_bit((unsigned char *)field_1A50, var_value, 1u); |
| 0 | 6318 break; |
| 6319 case VAR_NPCs2: | |
| 6320 pParty->field_709 = 0; | |
| 492 | 6321 LOBYTE(pNPCStats->pNewNPCData[var_value].uFlags) |= 0x80u; |
| 1035 | 6322 pParty->CountHirelings(); |
| 6323 viewparams->bRedrawGameUI = true; | |
| 0 | 6324 break; |
| 6325 case VAR_NumSkillPoints: | |
| 492 | 6326 this->uSkillPoints = var_value; |
| 0 | 6327 break; |
| 6328 } | |
| 6329 } | |
| 6330 return; | |
| 6331 } | |
| 492 | 6332 if ( var_type < VAR_Counter9 ) |
| 0 | 6333 return; |
| 492 | 6334 if ( (signed int)var_type <= 0x112 ) |
| 6335 { | |
| 6336 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44532] = LODWORD(pParty->uTimePlayed); | |
| 6337 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44536] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 6338 } |
| 6339 else | |
| 6340 { | |
| 492 | 6341 if ( var_type == VAR_ReputationInCurrentLocation ) |
| 0 | 6342 { |
| 6343 v24 = &pOutdoor->ddm; | |
| 6344 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 6345 v24 = &pIndoor->dlv; | |
| 492 | 6346 v24->uReputation = var_value; |
| 6347 if ( var_value > 10000 ) | |
| 0 | 6348 v24->uReputation = 10000; |
| 6349 return; | |
| 6350 } | |
| 492 | 6351 if ( var_type <= VAR_ReputationInCurrentLocation |
| 6352 || var_type > VAR_History_28 | |
| 6353 || (v22 = var_type - 276, pParty->field_3C.field_4F0[2 * v22 + 1] | pParty->field_3C.field_4F0[2 * v22]) | |
| 6354 || (pParty->field_3C.field_4F0[2 * (var_type - 276)] = LODWORD(pParty->uTimePlayed), | |
| 1455 | 6355 v23 = pStorylineText->StoreLine[v22].pText == 0,//*(&pStorylineText->field_0 + 3 * v22) == 0, |
| 492 | 6356 pParty->field_3C.field_4F0[2 * (var_type - 276) + 1] = HIDWORD(pParty->uTimePlayed), |
| 0 | 6357 v23) ) |
| 6358 return; | |
| 6359 bFlashHistoryBook = 1; | |
| 6360 } | |
| 492 | 6361 v25 = 8 * currPlayerId + 400; |
| 862 | 6362 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
|
6363 pAudioPlayer->PlaySound(SOUND_20001, v25, 0, -1, 0, 0, 0, 0); |
| 0 | 6364 return; |
| 6365 } | |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6366 switch ( var_type ) |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6367 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6368 case VAR_NumDeaths: |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6369 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
|
6370 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6371 case VAR_NumBounties: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6372 pParty->uNumBountiesCollected = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6373 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6374 case VAR_PrisonTerms: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6375 pParty->uNumPrisonTerms = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6376 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6377 case VAR_ArenaWinsPage: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6378 pParty->uNumArenaPageWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6379 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6380 case VAR_ArenaWinsSquire: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6381 pParty->uNumArenaSquireWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6382 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6383 case VAR_ArenaWinsKnight: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6384 pParty->uNumArenaKnightWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6385 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6386 case VAR_ArenaWinsLord: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6387 pParty->uNumArenaLordWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6388 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6389 } |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6390 return; |
| 0 | 6391 } |
| 492 | 6392 if ( var_type == VAR_AutoNotes ) |
| 6393 { | |
| 6394 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
|
6395 //&& (&dword_723718_autonote_related)[8 * a3] ) |
| 1310 | 6396 && pAutonoteTxt[var_value].pText ) |
| 492 | 6397 { |
| 6398 v20 = pPlayers[currPlayerId + 1]; | |
| 187 | 6399 v20->PlaySound(SPEECH_96, 0); |
| 1453 | 6400 //v21 = pAutonoteTxt[var_value].eType;// dword_72371C[2 * a3]; |
| 0 | 6401 bFlashAutonotesBook = 1; |
| 1453 | 6402 _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
|
6403 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
| 0 | 6404 } |
| 1453 | 6405 _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
|
6406 PlaySoundBasedOnCondition(currPlayerId); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6407 return; |
| 0 | 6408 } |
|
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
|
6409 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
|
6410 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6411 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
|
6412 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6413 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
|
6414 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
|
6415 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
|
6416 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
|
6417 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
|
6418 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
|
6419 { |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6420 v9 = NULL; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6421 for (int i = 0; i < 138; i++) |
| 0 | 6422 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
6423 v9 = &this->pInventoryItemList[i]; |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
6424 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
|
6425 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
|
6426 } |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
6427 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
|
6428 { |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6429 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
|
6430 *(int *)(v10 + 532) = 601; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6431 *(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
|
6432 } |
|
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
|
6433 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
|
6434 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
|
6435 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
|
6436 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
|
6437 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
|
6438 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
|
6439 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
|
6440 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
|
6441 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
|
6442 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
|
6443 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
|
6444 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
|
6445 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
|
6446 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
|
6447 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6448 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
|
6449 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
|
6450 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6451 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
|
6452 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6453 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
|
6454 this->uVoiceID = 20; |
| 0 | 6455 } |
|
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
|
6456 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
|
6457 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6458 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
|
6459 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
|
6460 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
|
6461 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
|
6462 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
|
6463 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
|
6464 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
|
6465 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
|
6466 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
|
6467 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
|
6468 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
|
6469 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
|
6470 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
|
6471 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
|
6472 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
|
6473 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
|
6474 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
|
6475 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
|
6476 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
|
6477 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
|
6478 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
|
6479 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
|
6480 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
|
6481 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
|
6482 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
|
6483 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
|
6484 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
|
6485 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
|
6486 //&& 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
|
6487 && 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
|
6488 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6489 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
|
6490 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6491 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
|
6492 } |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6493 _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
|
6494 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
|
6495 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
|
6496 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
|
6497 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
|
6498 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
|
6499 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
|
6500 // && (&dword_722F10)[4 * a3] ) |
| 1310 | 6501 && pQuestTable[var_value] ) |
| 0 | 6502 { |
|
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
|
6503 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
|
6504 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
|
6505 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
|
6506 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6507 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
|
6508 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6509 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
|
6510 _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
|
6511 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
|
6512 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
|
6513 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
|
6514 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
|
6515 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
|
6516 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
|
6517 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
|
6518 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
|
6519 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
|
6520 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
|
6521 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
|
6522 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
|
6523 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
|
6524 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
|
6525 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
|
6526 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
|
6527 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
|
6528 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
|
6529 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
|
6530 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
|
6531 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
|
6532 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
|
6533 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
|
6534 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
|
6535 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
|
6536 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
|
6537 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
|
6538 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
|
6539 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
|
6540 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
|
6541 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
|
6542 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
|
6543 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
|
6544 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
|
6545 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
|
6546 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
|
6547 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
|
6548 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
|
6549 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
|
6550 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
|
6551 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
|
6552 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
|
6553 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
|
6554 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
|
6555 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
|
6556 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
|
6557 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6558 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
|
6559 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
|
6560 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
|
6561 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6562 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
|
6563 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
|
6564 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
|
6565 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6566 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
|
6567 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
|
6568 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
|
6569 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6570 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
|
6571 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
|
6572 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
|
6573 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6574 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
|
6575 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
|
6576 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
|
6577 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6578 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
|
6579 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
|
6580 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
|
6581 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6582 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
|
6583 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
|
6584 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
|
6585 } |
| 0 | 6586 LABEL_111: |
| 187 | 6587 v26 = SPEECH_91; |
| 0 | 6588 LABEL_112: |
| 492 | 6589 v19 = pPlayers[currPlayerId + 1]; |
|
1260
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6590 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
|
6591 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6592 PlaySoundBasedOnCondition(currPlayerId); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6593 return; |
| 0 | 6594 } |
|
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
|
6595 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
|
6596 { |
| 492 | 6597 switch ( var_type ) |
| 0 | 6598 { |
|
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
|
6599 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
|
6600 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
|
6601 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
|
6602 goto LABEL_111; |
| 0 | 6603 case VAR_ActualIntellect: |
| 6604 LABEL_68: | |
| 492 | 6605 this->uIntelligenceBonus = (unsigned __int8)var_value; |
| 0 | 6606 goto LABEL_111; |
| 6607 case VAR_ActualPersonality: | |
| 6608 LABEL_69: | |
| 492 | 6609 this->uWillpowerBonus = (unsigned __int8)var_value; |
| 0 | 6610 goto LABEL_111; |
| 6611 case VAR_ActualEndurance: | |
| 6612 LABEL_70: | |
| 492 | 6613 this->uEnduranceBonus = (unsigned __int8)var_value; |
| 0 | 6614 goto LABEL_111; |
| 6615 case VAR_ActualSpeed: | |
| 6616 LABEL_71: | |
| 492 | 6617 this->uSpeedBonus = (unsigned __int8)var_value; |
| 0 | 6618 goto LABEL_111; |
| 6619 case VAR_ActualAccuracy: | |
| 6620 LABEL_72: | |
| 492 | 6621 this->uAccuracyBonus = (unsigned __int8)var_value; |
| 0 | 6622 goto LABEL_111; |
| 6623 case VAR_ActualLuck: | |
| 6624 LABEL_73: | |
| 492 | 6625 this->uLuckBonus = (unsigned __int8)var_value; |
| 0 | 6626 goto LABEL_111; |
| 6627 case VAR_FireResistance: | |
| 492 | 6628 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
|
6629 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6630 goto LABEL_112; |
| 0 | 6631 case VAR_AirResistance: |
| 492 | 6632 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
|
6633 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6634 goto LABEL_112; |
| 0 | 6635 case VAR_WaterResistance: |
| 492 | 6636 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
|
6637 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6638 goto LABEL_112; |
| 0 | 6639 case VAR_EarthResistance: |
| 492 | 6640 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
|
6641 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6642 goto LABEL_112; |
| 0 | 6643 case VAR_SpiritResistance: |
| 492 | 6644 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
|
6645 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6646 goto LABEL_112; |
| 0 | 6647 case VAR_MindResistance: |
| 492 | 6648 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
|
6649 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6650 goto LABEL_112; |
| 0 | 6651 case VAR_BodyResistance: |
| 492 | 6652 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
|
6653 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6654 goto LABEL_112; |
| 0 | 6655 case VAR_LightResistance: |
| 492 | 6656 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
|
6657 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6658 goto LABEL_112; |
| 0 | 6659 case VAR_DarkResistance: |
| 492 | 6660 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
|
6661 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6662 goto LABEL_112; |
| 0 | 6663 case VAR_MagicResistance: |
| 492 | 6664 this->sResMagicBase = (unsigned __int8)var_value; |
| 0 | 6665 v26 = 92; |
| 6666 goto LABEL_112; | |
| 6667 default: | |
| 6668 return; | |
| 6669 } | |
| 6670 return; | |
| 6671 } | |
| 6672 HIWORD(v15) = 0; | |
| 492 | 6673 if ( var_type > VAR_DisarmTrapSkill ) |
| 6674 { | |
| 6675 if ( var_type != VAR_LearningSkill ) | |
| 6676 { | |
| 6677 if ( var_type <= VAR_LearningSkill ) | |
| 0 | 6678 return; |
| 492 | 6679 if ( var_type <= VAR_Eradicated ) |
| 6680 { | |
|
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
|
6681 this->SetCondition(var_type - 105, 1); |
| 0 | 6682 } |
| 6683 else | |
| 6684 { | |
| 492 | 6685 if ( var_type != VAR_MajorCondition ) |
| 0 | 6686 { |
| 492 | 6687 if ( var_type > VAR_MajorCondition && var_type <= VAR_ActiveSpells ) |
| 6688 byte_5E4C15[var_type] = var_value; | |
| 0 | 6689 return; |
| 6690 } | |
|
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
|
6691 memset(this, 0, 0xA0u); |
| 0 | 6692 } |
| 6693 } | |
| 6694 else | |
| 6695 { | |
|
1260
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6696 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
|
6697 v17 = *(char *)v16; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6698 if ( var_value <= VAR_BodyResistanceBonus ) |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6699 { |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6700 LOWORD(v15) = (unsigned __int8)var_value; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6701 v18 = v15 | v17 & VAR_BodyResistanceBonus; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6702 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6703 else |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6704 { |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6705 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
|
6706 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6707 *(short *)v16 = v18; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6708 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6709 LABEL_124: |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6710 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6711 PlaySoundBasedOnCondition(currPlayerId); |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6712 return; |
| 0 | 6713 } |
|
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
|
6714 if ( var_type <= VAR_MagicResistanceBonus ) |
| 492 | 6715 { |
| 6716 switch ( var_type ) | |
| 0 | 6717 { |
|
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
|
6718 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
|
6719 this->sResFireBonus = (unsigned __int8)var_value; |
| 0 | 6720 break; |
| 6721 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
|
6722 this->sResAirBonus = (unsigned __int8)var_value; |
| 0 | 6723 break; |
| 6724 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
|
6725 this->sResWaterBonus = (unsigned __int8)var_value; |
| 0 | 6726 break; |
| 6727 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
|
6728 this->sResEarthBonus = (unsigned __int8)var_value; |
| 0 | 6729 break; |
| 6730 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
|
6731 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
|
6732 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
|
6733 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
|
6734 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
|
6735 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
|
6736 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
|
6737 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
|
6738 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
|
6739 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
|
6740 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
|
6741 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
|
6742 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
|
6743 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
|
6744 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
|
6745 case VAR_PhysicalResistanceBonus: |
| 1545 | 6746 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
|
6747 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
|
6748 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
|
6749 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
|
6750 this->sResMagicBonus = (unsigned __int8)var_value; |
| 0 | 6751 break; |
| 6752 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
|
6753 Error("Unexpected var_type: %u", var_type); |
| 0 | 6754 return; |
| 6755 break; | |
| 6756 } | |
| 6757 goto LABEL_111; | |
| 6758 } | |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6759 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
|
6760 { |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6761 return; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6762 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6763 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6764 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6765 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6766 //----- (new function) -------------------------------------------------------- |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6767 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
|
6768 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6769 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
|
6770 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
|
6771 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
|
6772 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6773 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6774 //----- (new function) -------------------------------------------------------- |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6775 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
|
6776 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6777 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
|
6778 } |
| 0 | 6779 |
| 6780 //----- (0044AFFB) -------------------------------------------------------- | |
| 310 | 6781 void Player::AddVariable(enum VariableType var_type, signed int val) |
| 0 | 6782 { |
| 6783 char v3; // bl@1 | |
| 6784 Player *v4; // esi@1 | |
| 6785 signed int uPlayerIdx; // edi@1 | |
| 6786 int v6; // eax@15 | |
| 6787 unsigned int v7; // esi@18 | |
| 6788 int *v8; // ebx@21 | |
| 6789 int v9; // eax@22 | |
| 6790 signed int v10; // eax@24 | |
| 6791 int v11; // eax@27 | |
| 6792 __int16 *v12; // esi@28 | |
| 6793 Player *v13; // ecx@34 | |
| 6794 Player *v14; // ecx@36 | |
| 6795 char *v15; // ecx@37 | |
| 6796 unsigned __int8 v16; // cf@38 | |
| 6797 Player *v17; // ecx@42 | |
| 6798 __int16 *v18; // esi@53 | |
| 6799 __int16 *v19; // esi@62 | |
| 6800 char *v20; // esi@107 | |
| 6801 __int16 v21; // dx@107 | |
| 6802 int v22; // ecx@107 | |
| 6803 Player *v23; // ecx@132 | |
| 6804 int v24; // eax@132 | |
| 6805 int v25; // eax@150 | |
| 6806 char v26; // zf@151 | |
| 6807 DDM_DLV_Header *v27; // eax@153 | |
| 6808 signed int v28; // eax@176 | |
| 6809 int v29; // [sp-8h] [bp-40h]@84 | |
| 310 | 6810 // signed int v30; // [sp-4h] [bp-3Ch]@4 |
| 0 | 6811 int v31; // [sp-4h] [bp-3Ch]@84 |
| 6812 ItemGen item; // [sp+Ch] [bp-2Ch]@45 | |
| 6813 unsigned int v33; // [sp+30h] [bp-8h]@34 | |
| 6814 char v34; // [sp+37h] [bp-1h]@1 | |
| 6815 | |
| 6816 auto Dst = this; | |
| 6817 v3 = 0; | |
| 6818 v34 = 0; | |
| 6819 v4 = Dst; | |
| 6820 uPlayerIdx = 0; | |
| 6821 if ( Dst == pPlayers[2] ) | |
| 6822 uPlayerIdx = 1; | |
| 310 | 6823 else if ( Dst == pPlayers[3] ) |
| 6824 uPlayerIdx = 2; | |
| 6825 else if ( Dst == pPlayers[4] ) | |
| 6826 uPlayerIdx = 3; | |
| 6827 | |
| 6828 if ( var_type <= VAR_AutoNotes ) | |
| 6829 { | |
| 6830 if ( var_type != VAR_AutoNotes ) | |
| 6831 { | |
| 6832 if ( var_type <= VAR_ActualMight ) | |
| 6833 { | |
| 6834 if ( var_type != VAR_ActualMight ) | |
| 0 | 6835 { |
| 310 | 6836 switch ( var_type ) |
| 0 | 6837 { |
| 6838 case VAR_RandomGold: | |
| 6839 if ( !val ) | |
| 6840 val = 1; | |
| 6841 v6 = rand(); | |
| 6842 party_finds_gold(v6 % val + 1, 1); | |
| 6843 GameUI_DrawFoodAndGold(); | |
| 6844 return; | |
| 6845 case VAR_RandomFood: | |
| 6846 if ( !val ) | |
| 6847 val = 1; | |
| 6848 v7 = rand() % val + 1; | |
| 6849 Party::GiveFood(v7); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6850 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
|
6851 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 6852 GameUI_DrawFoodAndGold(); |
| 6853 goto _play_sound; | |
| 6854 case VAR_Sex: | |
| 6855 Dst->uSex = (PLAYER_SEX)val; | |
| 1507 | 6856 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6857 goto _play_sound; | |
| 0 | 6858 case VAR_Class: |
| 135 | 6859 Dst->classType = (PLAYER_CLASS_TYPE)val; |
| 1507 | 6860 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6861 goto _play_sound; | |
| 0 | 6862 case VAR_CurrentHP: |
| 6863 v8 = &Dst->sHealth; | |
| 6864 *v8 += val; | |
| 6865 if ( Dst->sHealth <= Dst->GetMaxHealth() ) | |
| 1507 | 6866 { |
| 6867 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6868 goto _play_sound; | |
| 6869 } | |
| 0 | 6870 v9 = v4->GetMaxHealth(); |
| 6871 goto LABEL_23; | |
| 6872 case VAR_MaxHP: | |
| 6873 v10 = Dst->GetMaxHealth(); | |
| 6874 v4->_health_related = 0; | |
| 6875 v4->uFullHealthBonus = 0; | |
| 6876 v4->sHealth = v10; | |
| 6877 return; | |
| 6878 case VAR_CurrentSP: | |
| 6879 v8 = &Dst->sMana; | |
| 6880 *v8 += val; | |
| 6881 if ( Dst->sMana > GetMaxMana() ) | |
| 6882 { | |
| 6883 v9 = v4->GetMaxMana(); | |
| 6884 LABEL_23: | |
| 6885 *v8 = v9; | |
| 6886 } | |
| 1507 | 6887 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6888 goto _play_sound; | |
| 0 | 6889 case VAR_MaxSP: |
| 6890 v11 = GetMaxMana(); | |
| 6891 v4->_mana_related = 0; | |
| 6892 v4->uFullManaBonus = 0; | |
| 6893 v4->sMana = v11; | |
| 6894 return; | |
| 6895 case VAR_ACModifier: | |
| 6896 v12 = &Dst->sACModifier; | |
| 6897 goto LABEL_29; | |
| 6898 case VAR_BaseLevel: | |
| 6899 v12 = (__int16 *)&Dst->uLevel; | |
| 6900 goto LABEL_29; | |
| 6901 case VAR_LevelModifier: | |
| 6902 v12 = &Dst->sLevelModifier; | |
| 6903 LABEL_29: | |
| 6904 *v12 += val; | |
| 6905 if ( *v12 > 255 ) | |
| 6906 *v12 = 255; | |
| 1507 | 6907 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6908 goto _play_sound; | |
| 0 | 6909 case VAR_Age: |
| 6910 Dst->sAgeModifier += val; | |
| 6911 return; | |
| 6912 case VAR_Award: | |
| 6913 v13 = pPlayers[uPlayerIdx + 1]; | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6914 if (_449B57_test_bit((unsigned __int8 *)pPlayers[uPlayerIdx + 1]->_achieved_awards_bits, val) |
| 521 | 6915 |
| 492 | 6916 && pAwards[val].pText ) |
| 0 | 6917 { |
| 6918 v14 = pPlayers[uPlayerIdx + 1]; | |
| 6919 v34 = 1; | |
| 6920 v3 = 1; | |
| 187 | 6921 v14->PlaySound(SPEECH_96, 0); |
| 0 | 6922 } |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6923 v15 = (char *)v4->_achieved_awards_bits; |
| 1507 | 6924 _449B7E_toggle_bit((unsigned char *)v15, val, 1); |
| 6925 if ( v34 != 1 ) | |
| 6926 { | |
| 6927 if ( v3 != 1 ) | |
| 6928 return; | |
| 6929 goto _play_sound; | |
| 6930 } | |
| 6931 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6932 if ( v3 != 1 ) | |
| 6933 return; | |
| 6934 goto _play_sound; | |
| 0 | 6935 case VAR_Experience: |
| 6936 v16 = __CFADD__(val, LODWORD(Dst->uExperience)); | |
| 6937 LODWORD(Dst->uExperience) += val; | |
| 6938 HIDWORD(Dst->uExperience) += ((unsigned __int64)val >> 32) + v16; | |
| 6939 if ( (signed __int64)Dst->uExperience > 4000000000i64 ) | |
| 6940 Dst->uExperience = 4000000000i64; | |
| 1507 | 6941 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 6942 goto _play_sound; | |
| 0 | 6943 case VAR_QBits_QuestsDone: |
| 484 | 6944 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
|
6945 //&& (&dword_722F10)[4 * val] ) |
| 1310 | 6946 && pQuestTable[val] ) |
| 0 | 6947 { |
| 501 | 6948 //v17 = pPlayers[uPlayerIdx + 1]; |
| 0 | 6949 bFlashQuestBook = 1; |
| 6950 v34 = 1; | |
| 6951 v3 = 1; | |
| 501 | 6952 pPlayers[uPlayerIdx + 1]->PlaySound(SPEECH_93, 0); |
| 0 | 6953 } |
| 484 | 6954 v15 = (char *)pParty->_quest_bits; |
| 1507 | 6955 _449B7E_toggle_bit((unsigned char *)v15, val, 1); |
| 6956 if ( v34 != 1 ) | |
| 6957 { | |
| 6958 if ( v3 != 1 ) | |
| 6959 return; | |
| 6960 goto _play_sound; | |
| 6961 } | |
| 6962 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 6963 if ( v3 != 1 ) | |
| 6964 return; | |
| 6965 goto _play_sound; | |
| 0 | 6966 case VAR_PlayerItemInHands: |
| 6967 item.Reset(); | |
| 6968 item.Reset(); | |
| 6969 item.uAttributes = 1; | |
| 6970 item.uItemID = val; | |
| 6971 if ( val >= ITEM_ARTIFACT_PUCK && val <= ITEM_RELIC_MEKORIGS_HAMMER ) | |
| 484 | 6972 pParty->pIsArtifactFound[val-500] = 1; |
| 0 | 6973 if ( val >= ITEM_WAND_FIRE && val <= ITEM_WAND_INCENERATION ) |
| 6974 { | |
| 6975 item.uNumCharges = rand() % 6 + pItemsTable->pItems[item.uItemID].uDamageMod + 1; | |
| 6976 item.uMaxCharges = LOBYTE(item.uNumCharges); | |
| 6977 } | |
| 6978 pParty->SetHoldingItem(&item); | |
| 6979 return; | |
| 6980 case VAR_FixedGold: | |
| 6981 party_finds_gold(val, 1); | |
| 6982 return; | |
| 6983 case VAR_BaseMight: | |
| 6984 v18 = (__int16 *)&Dst->uMight; | |
| 6985 goto LABEL_82; | |
| 6986 case VAR_BaseIntellect: | |
| 6987 v18 = (__int16 *)&Dst->uIntelligence; | |
| 6988 goto LABEL_82; | |
| 6989 case VAR_BasePersonality: | |
| 6990 v18 = (__int16 *)&Dst->uWillpower; | |
| 6991 goto LABEL_82; | |
| 6992 case VAR_BaseEndurance: | |
| 6993 v18 = (__int16 *)&Dst->uEndurance; | |
| 6994 goto LABEL_82; | |
| 6995 case VAR_BaseSpeed: | |
| 6996 v18 = (__int16 *)&Dst->uSpeed; | |
| 6997 goto LABEL_82; | |
| 6998 case VAR_BaseAccuracy: | |
| 6999 v18 = (__int16 *)&Dst->uAccuracy; | |
| 7000 goto LABEL_82; | |
| 7001 case VAR_BaseLuck: | |
| 7002 v18 = (__int16 *)&Dst->uLuck; | |
| 7003 goto LABEL_82; | |
| 7004 case VAR_FixedFood: | |
| 7005 Party::GiveFood(val); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7006 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[502], val); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7007 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 7008 if ( pParty->uNumFoodRations > 0xFFFF ) |
| 7009 Party::SetFood(0xFFFFu); | |
| 7010 goto _play_sound; | |
| 7011 case VAR_MightBonus: | |
| 7012 goto LABEL_62; | |
| 7013 case VAR_IntellectBonus: | |
| 7014 goto LABEL_66; | |
| 7015 case VAR_PersonalityBonus: | |
| 7016 goto LABEL_67; | |
| 7017 case VAR_EnduranceBonus: | |
| 7018 goto LABEL_68; | |
| 7019 case VAR_SpeedBonus: | |
| 7020 goto LABEL_69; | |
| 7021 case VAR_AccuracyBonus: | |
| 7022 goto LABEL_70; | |
| 7023 case VAR_LuckBonus: | |
| 7024 goto LABEL_71; | |
| 7025 default: | |
| 7026 return; | |
| 7027 } | |
| 7028 return; | |
| 7029 } | |
| 7030 LABEL_62: | |
| 7031 v19 = (__int16 *)&Dst->uMightBonus; | |
| 7032 goto LABEL_113; | |
| 7033 } | |
| 310 | 7034 if ( var_type <= VAR_FireResistanceBonus ) |
| 7035 { | |
| 7036 if ( var_type != VAR_FireResistanceBonus ) | |
| 0 | 7037 { |
| 310 | 7038 switch ( var_type ) |
| 0 | 7039 { |
| 7040 case VAR_ActualIntellect: | |
| 7041 LABEL_66: | |
| 7042 v19 = (__int16 *)&Dst->uIntelligenceBonus; | |
| 7043 goto LABEL_113; | |
| 7044 case VAR_ActualPersonality: | |
| 7045 LABEL_67: | |
| 7046 v19 = (__int16 *)&Dst->uWillpowerBonus; | |
| 7047 goto LABEL_113; | |
| 7048 case VAR_ActualEndurance: | |
| 7049 LABEL_68: | |
| 7050 v19 = (__int16 *)&Dst->uEnduranceBonus; | |
| 7051 goto LABEL_113; | |
| 7052 case VAR_ActualSpeed: | |
| 7053 LABEL_69: | |
| 7054 v19 = (__int16 *)&Dst->uSpeedBonus; | |
| 7055 goto LABEL_113; | |
| 7056 case VAR_ActualAccuracy: | |
| 7057 LABEL_70: | |
| 7058 v19 = (__int16 *)&Dst->uAccuracyBonus; | |
| 7059 goto LABEL_113; | |
| 7060 case VAR_ActualLuck: | |
| 7061 LABEL_71: | |
| 7062 v19 = (__int16 *)&Dst->uLuckBonus; | |
| 7063 goto LABEL_113; | |
| 7064 case VAR_FireResistance: | |
| 7065 v18 = &Dst->sResFireBase; | |
| 7066 goto LABEL_82; | |
| 7067 case VAR_AirResistance: | |
| 7068 v18 = &Dst->sResAirBase; | |
| 7069 goto LABEL_82; | |
| 7070 case VAR_WaterResistance: | |
| 7071 v18 = &Dst->sResWaterBase; | |
| 7072 goto LABEL_82; | |
| 7073 case VAR_EarthResistance: | |
| 7074 v18 = &Dst->sResEarthBase; | |
| 7075 goto LABEL_82; | |
| 7076 case VAR_SpiritResistance: | |
| 7077 v18 = &Dst->sResSpiritBase; | |
| 7078 goto LABEL_82; | |
| 7079 case VAR_MindResistance: | |
| 7080 v18 = &Dst->sResMindBase; | |
| 7081 goto LABEL_82; | |
| 7082 case VAR_BodyResistance: | |
| 7083 v18 = &Dst->sResBodyBase; | |
| 7084 goto LABEL_82; | |
| 7085 case VAR_LightResistance: | |
| 7086 v18 = &Dst->sResLightBase; | |
| 7087 goto LABEL_82; | |
| 7088 case VAR_DarkResistance: | |
| 7089 v18 = &Dst->sResDarkBase; | |
| 7090 goto LABEL_82; | |
| 7091 case VAR_MagicResistance: | |
| 7092 v18 = &Dst->sResMagicBase; | |
| 7093 LABEL_82: | |
| 7094 *v18 += val; | |
| 7095 if ( *v18 > 255 ) | |
| 7096 *v18 = 255; | |
| 1507 | 7097 pPlayers[uPlayerIdx + 1]->PlaySound(SPEECH_92, 0); |
| 7098 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 7099 goto _play_sound; | |
| 0 | 7100 default: |
| 7101 return; | |
| 7102 } | |
| 7103 return; | |
| 7104 } | |
| 7105 v19 = &Dst->sResFireBonus; | |
| 7106 LABEL_113: | |
| 7107 *v19 += val; | |
| 7108 if ( *v19 > 255 ) | |
| 7109 *v19 = 255; | |
| 7110 v31 = 0; | |
| 187 | 7111 v29 = SPEECH_91; |
| 7112 pPlayers[uPlayerIdx + 1]->PlaySound((PlayerSpeech)v29, v31); | |
| 1507 | 7113 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 7114 goto _play_sound; | |
| 0 | 7115 } |
| 310 | 7116 if ( var_type <= VAR_DisarmTrapSkill ) |
| 7117 { | |
| 7118 if ( var_type != VAR_DisarmTrapSkill ) | |
| 0 | 7119 { |
| 310 | 7120 if ( var_type <= VAR_BodyResistanceBonus ) |
| 0 | 7121 { |
| 310 | 7122 switch ( var_type ) |
| 0 | 7123 { |
| 7124 case VAR_BodyResistanceBonus: | |
| 7125 v19 = &Dst->sResBodyBonus; | |
| 7126 break; | |
| 7127 case VAR_AirResistanceBonus: | |
| 7128 v19 = &Dst->sResAirBonus; | |
| 7129 break; | |
| 7130 case VAR_WaterResistanceBonus: | |
| 7131 v19 = &Dst->sResWaterBonus; | |
| 7132 break; | |
| 7133 case VAR_EarthResistanceBonus: | |
| 7134 v19 = &Dst->sResEarthBonus; | |
| 7135 break; | |
| 7136 case VAR_SpiritResistanceBonus: | |
| 7137 v19 = &Dst->sResSpiritBonus; | |
| 7138 break; | |
| 7139 default: | |
| 310 | 7140 if ( var_type != 62 ) |
| 0 | 7141 return; |
| 7142 v19 = &Dst->sResMindBonus; | |
| 7143 break; | |
| 7144 } | |
| 7145 goto LABEL_113; | |
| 7146 } | |
| 310 | 7147 if ( var_type == VAR_LightResistanceBonus ) |
| 0 | 7148 { |
| 7149 v19 = &Dst->sResLightBonus; | |
| 7150 goto LABEL_113; | |
| 7151 } | |
| 310 | 7152 if ( var_type == VAR_DarkResistanceBonus ) |
| 0 | 7153 { |
| 7154 v19 = &Dst->sResDarkBonus; | |
| 7155 goto LABEL_113; | |
| 7156 } | |
| 310 | 7157 if ( var_type == VAR_MagicResistanceBonus ) |
| 0 | 7158 { |
| 7159 v19 = &Dst->sResMagicBonus; | |
| 7160 goto LABEL_113; | |
| 7161 } | |
| 310 | 7162 if ( var_type <= VAR_MagicResistanceBonus || var_type > VAR_DiplomacySkill ) |
| 0 | 7163 return; |
| 7164 } | |
| 7165 goto LABEL_106; | |
| 7166 } | |
| 310 | 7167 if ( var_type == VAR_LearningSkill ) |
| 0 | 7168 { |
| 7169 LABEL_106: | |
| 7170 if ( val <= VAR_BodyResistanceBonus ) | |
| 7171 { | |
| 310 | 7172 *((short *)&Dst->pConditions[16] + var_type) = (unsigned __int8)val | *((char *)&Dst->pConditions[16] + 2 * var_type) & VAR_BodyResistanceBonus; |
| 0 | 7173 } |
| 7174 else | |
| 7175 { | |
| 310 | 7176 v20 = (char *)&Dst->pConditions[16] + 2 * var_type; |
| 0 | 7177 v21 = *(short *)v20; |
| 7178 v22 = (unsigned __int8)val + (v21 & VAR_BodyResistanceBonus); | |
| 7179 if ( v22 > 60 ) | |
| 7180 LOWORD(v22) = 60; | |
| 7181 LOBYTE(v21) = v21 & 0xC0; | |
| 7182 *(short *)v20 = v22 | v21; | |
| 7183 } | |
| 1507 | 7184 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 7185 goto _play_sound; | |
| 0 | 7186 } |
| 310 | 7187 if ( var_type <= VAR_LearningSkill ) |
| 0 | 7188 return; |
| 310 | 7189 if ( var_type <= VAR_Eradicated ) |
| 7190 { | |
| 7191 Dst->SetCondition(var_type - 105, 0); | |
| 0 | 7192 } |
| 7193 else | |
| 7194 { | |
| 310 | 7195 if ( var_type != VAR_MajorCondition ) |
| 0 | 7196 { |
| 310 | 7197 if ( var_type > VAR_MajorCondition && var_type <= VAR_ActiveSpells ) |
| 0 | 7198 { |
| 310 | 7199 if ( (unsigned __int8)val + (unsigned __int8)byte_5E4C15[var_type] <= 255 ) |
| 7200 byte_5E4C15[var_type] += val; | |
| 0 | 7201 else |
| 310 | 7202 byte_5E4C15[var_type] = -1; |
| 0 | 7203 } |
| 7204 return; | |
| 7205 } | |
| 7206 memset(Dst, 0, 0xA0u); | |
| 7207 } | |
| 7208 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 7209 goto _play_sound; | |
| 7210 } | |
| 7211 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
|
7212 //&& (&dword_723718_autonote_related)[8 * val] ) |
| 1310 | 7213 && pAutonoteTxt[val].pText ) |
| 0 | 7214 { |
| 7215 v23 = pPlayers[uPlayerIdx + 1]; | |
| 7216 v34 = 1; | |
| 187 | 7217 v23->PlaySound(SPEECH_96, 0); |
| 1453 | 7218 //v24 = pAutonoteTxt[val].eType;//dword_72371C[2 * val]; |
| 0 | 7219 bFlashAutonotesBook = 1; |
| 1453 | 7220 _506568_autonote_type = pAutonoteTxt[val].eType; |
| 7221 } | |
| 7222 _449B7E_toggle_bit(pParty->_autonote_bits, val, 1); | |
| 0 | 7223 v3 = 1; |
| 7224 if ( v34 != 1 ) | |
| 1507 | 7225 { |
| 7226 if ( v3 != 1 ) | |
| 7227 return; | |
| 7228 goto _play_sound; | |
| 7229 } | |
| 7230 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 7231 if ( v3 != 1 ) | |
| 7232 return; | |
| 7233 goto _play_sound; | |
| 0 | 7234 } |
| 310 | 7235 if ( var_type > VAR_GoldInBank ) |
| 7236 { | |
| 7237 if ( var_type == 307 ) | |
| 0 | 7238 { |
| 7239 pParty->uNumDeaths += val; | |
| 1507 | 7240 if ( v34 != 1 ) |
| 7241 { | |
| 7242 if ( v3 != 1 ) | |
| 7243 return; | |
| 7244 goto _play_sound; | |
| 7245 } | |
| 7246 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 7247 if ( v3 != 1 ) | |
| 7248 return; | |
| 7249 goto _play_sound; | |
| 0 | 7250 } |
| 310 | 7251 switch ( var_type ) |
| 0 | 7252 { |
| 7253 case 308: | |
| 7254 pParty->uNumBountiesCollected += val; | |
| 7255 break; | |
| 7256 case 309: | |
| 7257 pParty->uNumPrisonTerms += val; | |
| 7258 break; | |
| 7259 case 310: | |
| 7260 pParty->uNumArenaPageWins += val; | |
| 7261 break; | |
| 7262 case 311: | |
| 7263 pParty->uNumArenaSquireWins += val; | |
| 7264 break; | |
| 7265 case 312: | |
| 7266 pParty->uNumArenaKnightWins += val; | |
| 7267 break; | |
| 7268 case 313: | |
| 7269 pParty->uNumArenaLordWins += val; | |
| 7270 break; | |
| 7271 } | |
| 7272 } | |
| 7273 else | |
| 7274 { | |
| 310 | 7275 if ( var_type == VAR_GoldInBank ) |
| 0 | 7276 { |
| 7277 pParty->uNumGoldInBank += val; | |
| 7278 return; | |
| 7279 } | |
| 310 | 7280 if ( var_type <= VAR_Counter8 ) |
| 7281 { | |
| 7282 if ( (signed int)var_type >= 245 ) | |
| 7283 { | |
| 7284 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44300] = LODWORD(pParty->uTimePlayed); | |
| 7285 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44304] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 7286 } |
| 7287 else | |
| 7288 { | |
| 310 | 7289 switch ( var_type ) |
| 0 | 7290 { |
| 7291 case VAR_MonthEquals|VAR_CurrentSP: | |
| 7292 _449B7E_toggle_bit((unsigned char *)Dst->field_1A50, val, 1u); | |
| 7293 break; | |
| 7294 case VAR_NPCs2: | |
| 7295 pParty->field_709 = 0; | |
| 7296 LOBYTE(pNPCStats->pNewNPCData[val].uFlags) |= 0x80u; | |
| 1035 | 7297 pParty->CountHirelings(); |
| 7298 viewparams->bRedrawGameUI = true; | |
| 0 | 7299 break; |
| 7300 case VAR_NumSkillPoints: | |
| 7301 Dst->uSkillPoints += val; | |
| 7302 break; | |
| 7303 } | |
| 7304 } | |
| 7305 return; | |
| 7306 } | |
| 310 | 7307 if ( var_type < VAR_Counter9 ) |
| 0 | 7308 return; |
| 310 | 7309 if ( (signed int)var_type <= 274 ) |
| 7310 { | |
| 7311 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44532] = LODWORD(pParty->uTimePlayed); | |
| 7312 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44536] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 7313 goto _play_sound; |
| 7314 } | |
| 310 | 7315 if ( var_type != VAR_ReputationInCurrentLocation ) |
| 7316 { | |
| 7317 if ( var_type <= VAR_ReputationInCurrentLocation | |
| 7318 || var_type > VAR_History_28 | |
| 7319 || (v25 = var_type - 276, pParty->field_3C.field_4F0[2 * v25 + 1] | pParty->field_3C.field_4F0[2 * v25]) | |
| 7320 || (pParty->field_3C.field_4F0[2 * (var_type - 276)] = LODWORD(pParty->uTimePlayed), | |
| 233 | 7321 v26 = pStorylineText->StoreLine[v25].pText==0,//*(&pStorylineText->field_0 + 3 * v25) == 0, |
| 310 | 7322 pParty->field_3C.field_4F0[2 * (var_type - 276) + 1] = HIDWORD(pParty->uTimePlayed), |
| 0 | 7323 v26) ) |
| 7324 return; | |
| 7325 bFlashHistoryBook = 1; | |
| 7326 _play_sound: | |
| 7327 v28 = 8 * uPlayerIdx + 400; | |
| 862 | 7328 LOBYTE(v28) = PID(OBJECT_Player,uPlayerIdx - 112); |
| 0 | 7329 pAudioPlayer->PlaySound(SOUND_20001, v28, 0, -1, 0, 0, 0, 0); |
| 7330 return; | |
| 7331 } | |
| 7332 v27 = &pOutdoor->ddm; | |
| 7333 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 7334 v27 = &pIndoor->dlv; | |
| 7335 v27->uReputation += val; | |
| 7336 if ( v27->uReputation > 10000 ) | |
| 7337 v27->uReputation = 10000; | |
| 7338 } | |
| 7339 } | |
| 7340 | |
| 7341 | |
| 7342 //----- (0044B9C4) -------------------------------------------------------- | |
| 501 | 7343 bool Player::SubtractVariable(enum VariableType VarNum, signed int pValue) |
| 0 | 7344 { |
| 7345 unsigned int v3; // ebx@1 | |
| 7346 signed int v4; // esi@1 | |
| 501 | 7347 bool result; // eax@8 |
| 0 | 7348 int v6; // esi@11 |
| 7349 int v7; // edi@14 | |
| 7350 signed int v8; // eax@17 | |
| 7351 char *v9; // eax@20 | |
| 7352 char v10; // sf@20 | |
| 7353 char *v11; // ecx@26 | |
| 7354 char *v12; // ecx@27 | |
| 7355 __int64 v13; // qax@27 | |
| 7356 unsigned __int8 v14; // cf@27 | |
| 501 | 7357 int *v15; // edx@29 |
| 0 | 7358 char *v16; // eax@90 |
| 7359 char *v17; // ecx@94 | |
| 501 | 7360 int v18; // esi@97 |
| 0 | 7361 signed int v19; // edx@97 |
| 7362 char *v20; // ecx@98 | |
| 7363 int v21; // eax@100 | |
| 7364 __int16 v22; // dx@112 | |
| 7365 int v23; // [sp-8h] [bp-14h]@45 | |
| 7366 signed int v24; // [sp-4h] [bp-10h]@4 | |
| 7367 int v25; // [sp-4h] [bp-10h]@45 | |
| 7368 | |
| 7369 v3 = 0; | |
| 605 | 7370 v4 = uActiveCharacter - 1; |
| 501 | 7371 result = false; |
| 7372 if ( (signed int)VarNum > 222 ) | |
| 7373 { | |
| 7374 if ( (signed int)VarNum <= 307 ) | |
| 7375 { | |
| 7376 if ( VarNum == 307 ) | |
| 7377 { | |
| 7378 pParty->uNumDeaths -= (unsigned int)pValue; | |
| 7379 return pValue; | |
| 7380 } | |
| 7381 if ( VarNum == 223 ) | |
| 0 | 7382 { |
| 7383 v11 = (char *)pParty->_autonote_bits; | |
| 501 | 7384 v22 = (short)pValue - 1; |
| 0 | 7385 } |
| 7386 else | |
| 7387 { | |
| 501 | 7388 if ( VarNum != 231 ) |
| 0 | 7389 { |
| 501 | 7390 switch ( VarNum ) |
| 0 | 7391 { |
| 7392 case 232: | |
| 501 | 7393 VarNum = (VariableType)0; |
| 1094 | 7394 GetNewNPCData(sDialogue_SpeakingActorNPC_ID, (int*)&VarNum); |
| 501 | 7395 result = (bool) pValue; |
| 7396 dword_5B65CC = 0; | |
| 7397 if ( (int)VarNum == pValue ) | |
| 0 | 7398 { |
| 501 | 7399 dword_5B65CC = (int)pValue; |
| 0 | 7400 } |
| 7401 else | |
| 7402 { | |
| 7403 pParty->field_709 = 0; | |
| 501 | 7404 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
| 1035 | 7405 pParty->CountHirelings(); |
| 7406 viewparams->bRedrawGameUI = true; | |
| 0 | 7407 } |
| 7408 break; | |
| 7409 case 241: | |
| 7410 if ( (signed int)pNPCStats->uNumNewNPCs > 0 ) | |
| 7411 { | |
| 7412 v20 = (char *)&pNPCStats->pNewNPCData[0].uFlags; | |
| 605 | 7413 for ( v19 = 0; v19 < (signed int)pNPCStats->uNumNewNPCs; ++v19 ) |
| 0 | 7414 { |
| 605 | 7415 if ( *((void **)v20 + 4) == (void *)pValue ) |
| 0 | 7416 { |
| 7417 v21 = *(int *)v20; | |
| 7418 if ( (char)*(int *)v20 < 0 ) | |
| 7419 { | |
| 7420 LOBYTE(v21) = v21 & 0x7F; | |
| 7421 *(int *)v20 = v21; | |
| 7422 } | |
| 7423 } | |
| 7424 v20 += 76; | |
| 7425 } | |
| 7426 } | |
| 605 | 7427 if ( pParty->pHirelings[0].uProfession == pValue ) |
| 0 | 7428 memset(pParty->pHirelings, 0, 0x4Cu); |
| 605 | 7429 if ( pParty->pHirelings[1].uProfession == pValue ) |
| 0 | 7430 memset(&pParty->pHirelings[1], 0, 0x4Cu); |
| 7431 pParty->field_709 = 0; | |
| 1035 | 7432 pParty->CountHirelings(); |
| 0 | 7433 break; |
| 7434 case 243: | |
| 7435 v17 = (char *)&this->uSkillPoints; | |
|
1113
39eaa6b00141
something to bool cast (performance warning) mostly fixed
Grumpy7
parents:
1097
diff
changeset
|
7436 result = *v17 != NULL; |
| 501 | 7437 if ( (unsigned int)pValue <= *(int *)v17 ) |
| 7438 { | |
| 7439 *(int *)v17 -= (int)pValue; | |
|
1113
39eaa6b00141
something to bool cast (performance warning) mostly fixed
Grumpy7
parents:
1097
diff
changeset
|
7440 result = (v17 != NULL); |
| 501 | 7441 } |
| 0 | 7442 else |
| 7443 *(int *)v17 = 0; | |
| 7444 break; | |
| 7445 case 275: | |
| 7446 v16 = (char *)&pOutdoor->ddm; | |
| 7447 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 7448 v16 = (char *)&pIndoor->dlv; | |
| 501 | 7449 *((int *)v16 + 2) -= (int)pValue; |
| 0 | 7450 if ( *((int *)v16 + 2) < -10000 ) |
| 7451 *((int *)v16 + 2) = -10000; | |
| 7452 break; | |
| 7453 case 306: | |
| 501 | 7454 result = VarNum - 306; |
| 7455 if ( (unsigned int)pValue <= pParty->uNumGoldInBank ) | |
| 7456 { | |
| 7457 result = (bool)pValue; | |
| 7458 pParty->uNumGoldInBank -= (unsigned int)pValue; | |
| 605 | 7459 } |
| 0 | 7460 else |
| 7461 LABEL_88: | |
| 7462 dword_5B65C4 = 1; | |
| 7463 break; | |
| 7464 } | |
| 501 | 7465 return result; |
| 0 | 7466 } |
| 7467 v11 = this->field_1A50; | |
| 501 | 7468 v22 = (signed __int16)pValue; |
| 0 | 7469 } |
| 7470 _449B7E_toggle_bit((unsigned char *)v11, v22, 0); | |
| 501 | 7471 return result; |
| 7472 } | |
| 7473 switch ( VarNum ) | |
| 0 | 7474 { |
| 7475 case 308: | |
| 501 | 7476 result = (bool)pValue; |
| 7477 pParty->uNumBountiesCollected -= (unsigned int)pValue; | |
| 0 | 7478 break; |
| 7479 case 309: | |
| 501 | 7480 result = (bool)pValue; |
| 7481 pParty->uNumPrisonTerms -= (int)pValue; | |
| 0 | 7482 break; |
| 7483 case 310: | |
| 501 | 7484 result = (bool)pValue; |
| 7485 pParty->uNumArenaPageWins -= (char)pValue; | |
| 0 | 7486 break; |
| 7487 case 311: | |
| 501 | 7488 result = (bool)pValue; |
| 7489 pParty->uNumArenaSquireWins -= (char)pValue; | |
| 0 | 7490 break; |
| 7491 case 312: | |
| 501 | 7492 result = (bool)pValue; |
| 7493 pParty->uNumArenaKnightWins -= (char)pValue; | |
| 0 | 7494 break; |
| 7495 case 313: | |
| 501 | 7496 result = (bool)pValue; |
| 7497 pParty->uNumArenaLordWins -= (char)pValue; | |
| 0 | 7498 break; |
| 7499 } | |
| 1545 | 7500 Error("Function not returning any value! (%u)", VarNum); |
| 0 | 7501 } |
| 7502 else | |
| 7503 { | |
| 501 | 7504 if ( (signed int)VarNum >= 123 ) |
| 7505 { | |
| 7506 byte_5E4C15[VarNum] -= (char)pValue; | |
| 0 | 7507 } |
| 7508 else | |
| 7509 { | |
| 501 | 7510 switch ( VarNum ) |
| 0 | 7511 { |
| 7512 case VAR_RandomGold: | |
| 501 | 7513 v6 = rand() % (signed int)pValue + 1; |
| 0 | 7514 if ( v6 > pParty->uNumGold ) |
| 7515 v6 = pParty->uNumGold; | |
| 7516 Party::TakeGold(v6); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7517 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[503], v6); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7518 ShowStatusBarString(pTmpBuf.data(), 2); |
| 0 | 7519 GameUI_DrawFoodAndGold(); |
| 501 | 7520 return result; |
| 0 | 7521 case VAR_RandomFood: |
| 501 | 7522 v7 = rand() % (signed int)pValue + 1; |
| 0 | 7523 if ( v7 > pParty->uNumFoodRations ) |
| 7524 v7 = pParty->uNumFoodRations; | |
| 7525 Party::TakeFood(v7); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7526 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[504], v7); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7527 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 7528 GameUI_DrawFoodAndGold(); |
| 605 | 7529 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7530 v8 = 8 * v4 + 400; | |
| 862 | 7531 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7532 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 501 | 7533 return result; |
| 0 | 7534 case VAR_CurrentHP: |
| 1036 | 7535 ReceiveDamage((signed int)pValue, DMGT_PHISYCAL); |
| 605 | 7536 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7537 v8 = 8 * v4 + 400; | |
| 862 | 7538 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7539 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7540 return result; | |
| 0 | 7541 case VAR_CurrentSP: |
| 7542 v9 = (char *)&this->sMana; | |
| 501 | 7543 v10 = this->sMana - (signed int)pValue < 0; |
| 7544 *(int *)v9 -= (int)pValue; | |
| 0 | 7545 if ( v10 ) |
| 7546 *(int *)v9 = 0; | |
| 605 | 7547 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7548 v8 = 8 * v4 + 400; | |
| 862 | 7549 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7550 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7551 return result; | |
| 0 | 7552 case VAR_ACModifier: |
| 501 | 7553 this->sACModifier -= (unsigned __int8)pValue; |
| 605 | 7554 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7555 v8 = 8 * v4 + 400; | |
| 862 | 7556 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7557 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7558 return result; | |
| 0 | 7559 case VAR_BaseLevel: |
| 501 | 7560 this->uLevel -= (unsigned __int8)pValue; |
| 605 | 7561 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7562 v8 = 8 * v4 + 400; | |
| 862 | 7563 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7564 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7565 return result; | |
| 0 | 7566 case VAR_LevelModifier: |
| 501 | 7567 this->sLevelModifier -= (unsigned __int8)pValue; |
| 605 | 7568 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7569 v8 = 8 * v4 + 400; | |
| 862 | 7570 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7571 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7572 return result; | |
| 0 | 7573 case VAR_Age: |
| 501 | 7574 this->sAgeModifier -= (signed __int16)pValue; |
| 7575 return result; | |
| 0 | 7576 case VAR_Award: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
7577 _449B7E_toggle_bit((unsigned char *)this->_achieved_awards_bits, (signed __int16)pValue, 0); |
| 605 | 7578 return result; |
| 0 | 7579 case VAR_Experience: |
| 7580 v12 = (char *)&this->uExperience; | |
| 501 | 7581 v13 = (signed int)pValue; |
| 7582 v14 = *(int *)v12 < (unsigned int)pValue; | |
| 7583 *(int *)v12 -= (int)pValue; | |
| 0 | 7584 *((int *)v12 + 1) -= v14 + HIDWORD(v13); |
| 605 | 7585 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7586 v8 = 8 * v4 + 400; | |
| 862 | 7587 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7588 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7589 return result; | |
| 0 | 7590 case VAR_QBits_QuestsDone: |
| 501 | 7591 _449B7E_toggle_bit(pParty->_quest_bits, (__int16)pValue, 0); |
| 187 | 7592 pPlayers[v4 + 1]->PlaySound(SPEECH_96, 0); |
| 501 | 7593 return true; |
| 0 | 7594 case VAR_PlayerItemInHands: |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7595 v15 = this->pInventoryMatrix; |
| 0 | 7596 break; |
| 7597 case VAR_FixedGold: | |
| 501 | 7598 if ( (unsigned int)pValue > pParty->uNumGold ) |
| 0 | 7599 goto LABEL_88; |
| 501 | 7600 Party::TakeGold((unsigned int)pValue); |
| 7601 return result; | |
| 0 | 7602 case VAR_MightBonus: |
| 7603 case VAR_ActualMight: | |
| 501 | 7604 this->uMightBonus -= (unsigned __int16)pValue; |
| 605 | 7605 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7606 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7607 v8 = 8 * v4 + 400; | |
| 862 | 7608 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7609 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7610 return result; | |
| 0 | 7611 case VAR_IntellectBonus: |
| 7612 case VAR_ActualIntellect: | |
| 501 | 7613 this->uIntelligenceBonus -= (unsigned __int16)pValue; |
| 605 | 7614 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7615 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7616 v8 = 8 * v4 + 400; | |
| 862 | 7617 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7618 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7619 return result; | |
| 0 | 7620 case VAR_PersonalityBonus: |
| 7621 case VAR_ActualPersonality: | |
| 501 | 7622 this->uWillpowerBonus -= (unsigned __int16)pValue; |
| 605 | 7623 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7624 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7625 v8 = 8 * v4 + 400; | |
| 862 | 7626 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7627 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7628 return result; | |
| 0 | 7629 case VAR_EnduranceBonus: |
| 7630 case VAR_ActualEndurance: | |
| 501 | 7631 this->uEnduranceBonus -= (unsigned __int16)pValue; |
| 605 | 7632 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7633 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7634 v8 = 8 * v4 + 400; | |
| 862 | 7635 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7636 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7637 return result; | |
| 0 | 7638 case VAR_SpeedBonus: |
| 7639 case VAR_ActualSpeed: | |
| 501 | 7640 this->uSpeedBonus -= (unsigned __int16)pValue; |
| 605 | 7641 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7642 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7643 v8 = 8 * v4 + 400; | |
| 862 | 7644 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7645 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7646 return result; | |
| 0 | 7647 case VAR_AccuracyBonus: |
| 7648 case VAR_ActualAccuracy: | |
| 501 | 7649 this->uAccuracyBonus -= (unsigned __int16)pValue; |
| 605 | 7650 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7651 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7652 v8 = 8 * v4 + 400; | |
| 862 | 7653 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7654 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7655 return result; | |
| 0 | 7656 case VAR_LuckBonus: |
| 7657 case VAR_ActualLuck: | |
| 501 | 7658 this->uLuckBonus -= (unsigned __int16)pValue; |
| 605 | 7659 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7660 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7661 v8 = 8 * v4 + 400; | |
| 862 | 7662 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7663 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7664 return result; | |
| 0 | 7665 case VAR_BaseMight: |
| 501 | 7666 this->uMight -= (unsigned __int16)pValue; |
| 605 | 7667 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7668 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7669 v8 = 8 * v4 + 400; | |
| 862 | 7670 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7671 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7672 return result; | |
| 0 | 7673 case VAR_BaseIntellect: |
| 501 | 7674 this->uIntelligence -= (unsigned __int16)pValue; |
| 605 | 7675 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7676 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7677 v8 = 8 * v4 + 400; | |
| 862 | 7678 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7679 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7680 return result; | |
| 0 | 7681 case VAR_BasePersonality: |
| 501 | 7682 this->uWillpower -= (unsigned __int16)pValue; |
| 605 | 7683 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7684 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7685 v8 = 8 * v4 + 400; | |
| 862 | 7686 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7687 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7688 return result; | |
| 0 | 7689 case VAR_BaseEndurance: |
| 501 | 7690 this->uEndurance -= (unsigned __int16)pValue; |
| 605 | 7691 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7692 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7693 v8 = 8 * v4 + 400; | |
| 862 | 7694 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7695 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7696 return result; | |
| 0 | 7697 case VAR_BaseSpeed: |
| 501 | 7698 this->uSpeed -= (unsigned __int16)pValue; |
| 605 | 7699 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7700 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7701 v8 = 8 * v4 + 400; | |
| 862 | 7702 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7703 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7704 return result; | |
| 0 | 7705 case VAR_BaseAccuracy: |
| 501 | 7706 this->uAccuracy -= (unsigned __int16)pValue; |
| 605 | 7707 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7708 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7709 v8 = 8 * v4 + 400; | |
| 862 | 7710 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7711 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7712 return result; | |
| 0 | 7713 case VAR_BaseLuck: |
| 501 | 7714 this->uLuck -= (unsigned __int16)pValue; |
| 605 | 7715 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7716 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7717 v8 = 8 * v4 + 400; | |
| 862 | 7718 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7719 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7720 return result; | |
| 0 | 7721 case VAR_FireResistance: |
| 501 | 7722 this->sResFireBase -= (signed __int16)pValue; |
| 605 | 7723 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7724 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7725 v8 = 8 * v4 + 400; | |
| 862 | 7726 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7727 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7728 return result; | |
| 0 | 7729 case VAR_AirResistance: |
| 501 | 7730 this->sResAirBase -= (signed __int16)pValue; |
| 605 | 7731 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7732 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7733 v8 = 8 * v4 + 400; | |
| 862 | 7734 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7735 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7736 return result; | |
| 0 | 7737 case VAR_WaterResistance: |
| 501 | 7738 this->sResWaterBase -= (signed __int16)pValue; |
| 605 | 7739 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7740 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7741 v8 = 8 * v4 + 400; | |
| 862 | 7742 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7743 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7744 return result; | |
| 0 | 7745 case VAR_EarthResistance: |
| 501 | 7746 this->sResEarthBase -= (signed __int16)pValue; |
| 605 | 7747 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7748 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7749 v8 = 8 * v4 + 400; | |
| 862 | 7750 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7751 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7752 return result; | |
| 0 | 7753 case VAR_SpiritResistance: |
| 501 | 7754 this->sResSpiritBase -= (signed __int16)pValue; |
| 605 | 7755 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7756 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7757 v8 = 8 * v4 + 400; | |
| 862 | 7758 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7759 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7760 return result; | |
| 0 | 7761 case VAR_MindResistance: |
| 501 | 7762 this->sResMindBase -= (signed __int16)pValue; |
| 605 | 7763 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7764 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7765 v8 = 8 * v4 + 400; | |
| 862 | 7766 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7767 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7768 return result; | |
| 0 | 7769 case VAR_BodyResistance: |
| 501 | 7770 this->sResBodyBase -= (signed __int16)pValue; |
| 605 | 7771 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7772 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7773 v8 = 8 * v4 + 400; | |
| 862 | 7774 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7775 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7776 return result; | |
| 0 | 7777 case VAR_LightResistance: |
| 501 | 7778 this->sResLightBase -= (signed __int16)pValue; |
| 605 | 7779 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7780 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7781 v8 = 8 * v4 + 400; | |
| 862 | 7782 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7783 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7784 return result; | |
| 0 | 7785 case VAR_DarkResistance: |
| 501 | 7786 this->sResDarkBase -= (signed __int16)pValue; |
| 605 | 7787 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7788 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7789 v8 = 8 * v4 + 400; | |
| 862 | 7790 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7791 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7792 return result; | |
| 0 | 7793 case VAR_MagicResistance: |
| 501 | 7794 this->sResMagicBase -= (signed __int16)pValue; |
| 605 | 7795 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7796 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7797 v8 = 8 * v4 + 400; | |
| 862 | 7798 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7799 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7800 return result; | |
| 0 | 7801 case VAR_FireResistanceBonus: |
| 501 | 7802 this->sResFireBonus -= (signed __int16)pValue; |
| 605 | 7803 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7804 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7805 v8 = 8 * v4 + 400; | |
| 862 | 7806 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7807 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7808 return result; | |
| 0 | 7809 case VAR_AirResistanceBonus: |
| 501 | 7810 this->sResAirBonus -= (signed __int16)pValue; |
| 605 | 7811 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7812 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7813 v8 = 8 * v4 + 400; | |
| 862 | 7814 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7815 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7816 return result; | |
| 0 | 7817 case VAR_WaterResistanceBonus: |
| 501 | 7818 this->sResWaterBonus -= (signed __int16)pValue; |
| 605 | 7819 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7820 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7821 v8 = 8 * v4 + 400; | |
| 862 | 7822 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7823 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7824 return result; | |
| 0 | 7825 case VAR_EarthResistanceBonus: |
| 501 | 7826 this->sResEarthBonus -= (signed __int16)pValue; |
| 605 | 7827 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7828 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7829 v8 = 8 * v4 + 400; | |
| 862 | 7830 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7831 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7832 return result; | |
| 0 | 7833 case VAR_SpiritResistanceBonus: |
| 501 | 7834 this->sResSpiritBonus -= (signed __int16)pValue; |
| 605 | 7835 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7836 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7837 v8 = 8 * v4 + 400; | |
| 862 | 7838 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7839 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7840 return result; | |
| 0 | 7841 case VAR_MindResistanceBonus: |
| 501 | 7842 this->sResMindBonus -= (signed __int16)pValue; |
| 605 | 7843 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7844 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7845 v8 = 8 * v4 + 400; | |
| 862 | 7846 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7847 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7848 return result; | |
| 0 | 7849 case VAR_BodyResistanceBonus: |
| 501 | 7850 this->sResBodyBonus -= (signed __int16)pValue; |
| 605 | 7851 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7852 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7853 v8 = 8 * v4 + 400; | |
| 862 | 7854 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7855 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7856 return result; | |
| 0 | 7857 case VAR_LightResistanceBonus: |
| 501 | 7858 this->sResLightBonus -= (signed __int16)pValue; |
| 605 | 7859 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7860 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7861 v8 = 8 * v4 + 400; | |
| 862 | 7862 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7863 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7864 return result; | |
| 0 | 7865 case VAR_DarkResistanceBonus: |
| 501 | 7866 this->sResDarkBonus -= (signed __int16)pValue; |
| 605 | 7867 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7868 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7869 v8 = 8 * v4 + 400; | |
| 862 | 7870 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7871 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7872 return result; | |
| 0 | 7873 case VAR_MagicResistanceBonus: |
| 501 | 7874 this->sResMagicBonus -= (signed __int16)pValue; |
| 0 | 7875 v25 = 0; |
| 187 | 7876 v23 = SPEECH_91; |
| 7877 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)v23, v25); | |
| 605 | 7878 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7879 v8 = 8 * v4 + 400; | |
| 862 | 7880 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7881 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7882 return result; | |
| 0 | 7883 case VAR_FixedFood: |
| 501 | 7884 Party::TakeFood((unsigned int)pValue); |
| 605 | 7885 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7886 v8 = 8 * v4 + 400; | |
| 862 | 7887 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7888 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7889 return result; | |
| 0 | 7890 case VAR_StaffSkill: |
| 7891 case VAR_SwordSkill: | |
| 7892 case VAR_DaggerSkill: | |
| 7893 case VAR_AxeSkill: | |
| 7894 case VAR_SpearSkill: | |
| 7895 case VAR_BowSkill: | |
| 7896 case VAR_MaceSkill: | |
| 7897 case VAR_BlasterSkill: | |
| 7898 case VAR_ShieldSkill: | |
| 7899 case VAR_LeatherSkill: | |
| 7900 case VAR_SkillChain: | |
| 7901 case VAR_PlateSkill: | |
| 7902 case VAR_FireSkill: | |
| 7903 case VAR_AirSkill: | |
| 7904 case VAR_WaterSkill: | |
| 7905 case VAR_EarthSkill: | |
| 7906 case VAR_SpiritSkill: | |
| 7907 case VAR_MindSkill: | |
| 7908 case VAR_BodySkill: | |
| 7909 case VAR_LightSkill: | |
| 7910 case VAR_DarkSkill: | |
| 7911 case VAR_IdentifyItemSkill: | |
| 7912 case VAR_MerchantSkill: | |
| 7913 case VAR_RepairSkill: | |
| 7914 case VAR_BodybuildingSkill: | |
| 7915 case VAR_MeditationSkill: | |
| 7916 case VAR_PerceptionSkill: | |
| 7917 case VAR_DiplomacySkill: | |
| 7918 case VAR_DisarmTrapSkill: | |
| 7919 case VAR_LearningSkill: | |
| 501 | 7920 *((short *)&this->pConditions[16] + VarNum) -= (unsigned __int8)pValue; |
| 605 | 7921 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7922 v8 = 8 * v4 + 400; | |
| 862 | 7923 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7924 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7925 return result; | |
| 0 | 7926 case VAR_Cursed: |
| 7927 case VAR_Weak: | |
| 7928 case VAR_Asleep: | |
| 7929 case VAR_Afraid: | |
| 7930 case VAR_Drunk: | |
| 7931 case VAR_Insane: | |
| 7932 case VAR_PoisonedGreen: | |
| 7933 case VAR_DiseasedGreen: | |
| 7934 case VAR_PoisonedYellow: | |
| 7935 case VAR_DiseasedYellow: | |
| 7936 case VAR_PoisonedRed: | |
| 7937 case VAR_DiseasedRed: | |
| 7938 case VAR_Paralyzed: | |
| 7939 case VAR_Unconsious: | |
| 7940 case VAR_Dead: | |
| 7941 case VAR_Stoned: | |
| 7942 case VAR_Eradicated: | |
| 1071 | 7943 //*((int *)this + 2 * VarNum - 210) = 0; |
| 7944 //*((int *)this + 2 * result - 209) = 0; | |
| 7945 this->pConditions[VarNum] = 0; | |
| 0 | 7946 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7947 v8 = 8 * v4 + 400; | |
| 862 | 7948 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 0 | 7949 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 501 | 7950 return result; |
| 605 | 7951 default: |
| 7952 return result; | |
| 7953 } | |
| 7954 for (v3 = 1; v3 < 126; v3++) | |
| 7955 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7956 if ( *(&this->pInventoryItemList[pInventoryMatrix[v3] - 1].uItemID) == pValue ) |
| 0 | 7957 { |
| 605 | 7958 RemoveItemAtInventoryIndex(v3); |
| 501 | 7959 return true; |
| 0 | 7960 } |
| 605 | 7961 } |
| 501 | 7962 if ( pParty->pPickedItem.uItemID == pValue ) |
| 7963 { | |
| 605 | 7964 pMouse->RemoveHoldingItem(); |
| 7965 return true; | |
| 7966 } | |
| 7967 return false; | |
| 0 | 7968 } |
| 7969 } | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
7970 |
| 1430 | 7971 //assert(false); |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
7972 return false; |
| 0 | 7973 } |
| 7974 // 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
|
7975 // 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
|
7976 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7977 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7978 //----- (00467E7F) -------------------------------------------------------- |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7979 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
|
7980 { |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7981 //unsigned int v1; // esi@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7982 int v2; // ebx@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7983 Player *v3; // eax@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7984 int v4; // edx@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7985 int v5; // esi@2 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7986 //int v6; // eax@2 |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
7987 int v7; // eax@3 |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7988 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
|
7989 //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
|
7990 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
|
7991 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
|
7992 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7993 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7994 _this.Reset(); |
| 1374 | 7995 v2 = pEquipTypeToBodyAnchor[uEquipType]; |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7996 v3 = pPlayers[uActiveCharacter]; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7997 v11 = (int *)&v3->pEquipment.pIndices[v2]; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7998 v4 = *v11; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7999 v10 = *v11; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8000 if ( v10 ) |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8001 { |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8002 memcpy(&_this, &pParty->pPickedItem, sizeof(_this)); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8003 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
|
8004 *(char *)(v5 + 556) = 0; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8005 pParty->pPickedItem.Reset(); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8006 pParty->SetHoldingItem((ItemGen *)(v5 + 532)); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8007 _this.uBodyAnchor = v2 + 1; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8008 memcpy((void *)(v5 + 532), &_this, 0x24u); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8009 *v11 = v10; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8010 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8011 else |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8012 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8013 v7 = v3->FindFreeInventoryListSlot(); |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8014 if (v7 >= 0) |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8015 { |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8016 pParty->pPickedItem.uBodyAnchor = v2 + 1; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8017 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
|
8018 *v11 = v7 + 1; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8019 pMouse->RemoveHoldingItem(); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8020 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8021 } |
| 1295 | 8022 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8023 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8024 |
| 1295 | 8025 //----- (0049387A) -------------------------------------------------------- |
| 1459 | 8026 int CycleCharacter(bool backwards) |
| 1295 | 8027 { |
| 8028 signed int result; // eax@1 | |
| 8029 signed int v2; // ecx@2 | |
| 8030 signed int v3; // ecx@8 | |
| 8031 | |
| 8032 result = uActiveCharacter; | |
| 1459 | 8033 if ( backwards ) |
| 1295 | 8034 { |
| 8035 v2 = 0; | |
| 8036 while ( 1 ) | |
| 8037 { | |
| 8038 --result; | |
| 8039 if ( result < 1 ) | |
| 8040 result = 4; | |
| 8041 if ( !pPlayers[result]->uTimeToRecovery ) | |
| 8042 break; | |
| 8043 ++v2; | |
| 8044 if ( v2 >= 4 ) | |
| 8045 return uActiveCharacter; | |
| 8046 } | |
| 8047 } | |
| 8048 else | |
| 8049 { | |
| 8050 v3 = 0; | |
| 8051 while ( 1 ) | |
| 8052 { | |
| 8053 ++result; | |
| 8054 if ( result > 4 ) | |
| 8055 result = 1; | |
| 8056 if ( !pPlayers[result]->uTimeToRecovery ) | |
| 8057 break; | |
| 8058 ++v3; | |
| 8059 if ( v3 >= 4 ) | |
| 8060 return uActiveCharacter; | |
| 8061 } | |
| 8062 } | |
| 8063 return result; | |
| 1297 | 8064 } |
| 8065 //----- (0043EE77) -------------------------------------------------------- | |
| 8066 bool __fastcall sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(signed int a1) | |
| 8067 { | |
| 8068 bool result; // eax@0 | |
| 8069 Player *v2; // edx@3 | |
| 8070 int v3; // ecx@3 | |
| 8071 Player **pPlayers; // esi@8 | |
| 1424 | 8072 //bool item_flag; |
| 1297 | 8073 Player *v6; // edx@9 |
| 8074 | |
| 1424 | 8075 //if ( a1 < 1 || a1 > 4 ) |
| 8076 //{ | |
| 8077 //if ( !a1 ) | |
| 8078 //{ | |
| 8079 //pPlayers = &::pPlayers[1]; | |
| 8080 //v5 = 604; | |
| 8081 //while ( 1 ) | |
| 1545 | 8082 Assert ( a1 > 0 && a1 < 5 ); |
| 1432 | 8083 for ( uint i = 1; i < 5; ++i ) |
| 1424 | 8084 { |
| 8085 //item_flag = Player_has_item(604, *pPlayers, 0); | |
| 8086 if ( !Player_has_item(604, ::pPlayers[i], 0) ) | |
| 8087 return false; | |
| 8088 //__debugbreak(); // player.cpp(8748): warning C4700: uninitialized local variable 'v6' used | |
| 8089 //result = ::pPlayers[i]->pEquipment.uArmor; | |
| 8090 if ( !::pPlayers[i]->pEquipment.uArmor ) | |
| 8091 return false; | |
| 8092 //result *= 9; | |
| 1432 | 8093 if (::pPlayers[i]->pEquippedItems[::pPlayers[i]->pEquipment.uArmor].uItemID != 604 ) |
| 1424 | 8094 return false; |
| 8095 //++pPlayers; | |
| 8096 //if ( (signed int)pPlayers >= (signed int)&qword_A750D8 ) | |
| 8097 //return true; | |
| 8098 } | |
| 8099 return true; | |
| 8100 } | |
| 1432 | 8101 |
| 1297 | 8102 //----- (0043EE15) -------------------------------------------------------- |
| 8103 bool __fastcall Player_has_item(unsigned int uItemID, Player *pPlayer, char a3) | |
| 8104 { | |
| 8105 if ( !a3 || pParty->pPickedItem.uItemID != uItemID ) | |
| 8106 { | |
| 8107 for ( uint i = 0; i < 126; ++i ) | |
| 8108 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8109 if ( pPlayer->pInventoryMatrix[i] > 0 ) |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8110 { |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8111 if ( (unsigned int)pPlayer->pInventoryItemList[pPlayer->pInventoryMatrix[i] - 1].uItemID == uItemID ) |
| 1297 | 8112 return true; |
| 8113 } | |
| 8114 } | |
| 8115 for ( uint i = 0; i < 16; ++i ) | |
| 8116 { | |
| 8117 if ( pPlayer->pEquipment.pIndices[i] ) | |
| 8118 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8119 if ( (unsigned int)pPlayer->pInventoryItemList[pPlayer->pEquipment.pIndices[i] - 1].uItemID == uItemID ) |
| 1297 | 8120 return true; |
| 8121 } | |
| 8122 } | |
| 8123 } | |
| 8124 return false; | |
| 8125 } | |
| 8126 //----- (0043EDB9) -------------------------------------------------------- | |
| 1458 | 8127 bool sub_43EDB9_get_some_race_sex_relation_2(unsigned int a1) |
| 1297 | 8128 { |
| 8129 unsigned int pNum; // ebp@1 | |
| 8130 Player **pPlayer; // ebx@1 | |
| 8131 Player *pPlayer2; // esi@2 | |
| 8132 enum CHARACTER_RACE pRace; // edi@2 | |
| 8133 bool pSex; // eax@2 | |
| 8134 char v6; // zf@7 | |
| 8135 | |
| 8136 //pPlayer = &pPlayers[1]; | |
| 8137 /*pNum = a1; | |
| 8138 | |
| 8139 while ( 1 ) | |
| 8140 { | |
| 8141 pPlayer2 = *pPlayer; | |
| 8142 pRace = pPlayer2->GetRace(); | |
| 8143 pSex = pPlayer2->GetSexByVoice(); | |
| 8144 if ( !pRace ) | |
| 8145 break; | |
| 8146 if ( pRace == 1 || pRace == 2 ) | |
| 8147 break; | |
| 8148 if ( !pSex && pNum == 2 )// | |
| 8149 //goto LABEL_15; | |
| 8150 { | |
| 8151 pSex = 1; | |
| 8152 return pSex; | |
| 8153 } | |
| 8154 v6 = pNum == 3;// | |
| 8155 LABEL_11: | |
| 8156 if ( v6 ) | |
| 8157 //goto LABEL_15; | |
| 8158 { | |
| 8159 pSex = 1; | |
| 8160 return pSex; | |
| 8161 } | |
| 8162 ++pPlayer; | |
| 8163 if ( (signed int)pPlayer >= (signed int)&qword_A750D8 )// | |
| 8164 { | |
| 8165 pSex = 0; | |
| 8166 return pSex; | |
| 8167 } | |
| 8168 } | |
| 8169 if ( pSex || pNum ) | |
| 8170 { | |
| 8171 v6 = pNum == 1; | |
| 8172 goto LABEL_11; | |
| 8173 } | |
| 8174 //LABEL_15: | |
| 8175 pSex = 1; | |
| 8176 return pSex;*/ | |
| 8177 for (uint i = 1; i <= 4; ++i) | |
| 8178 { | |
| 8179 pRace = pPlayers[i]->GetRace(); | |
| 8180 pSex = pPlayers[i]->GetSexByVoice(); | |
| 8181 if (pRace == 0 || pRace == 1 || pRace == 2 || pSex == 0 ) | |
| 8182 return 1; | |
| 8183 } | |
| 8184 return 0; | |
| 8185 } | |
| 8186 //----- (0043ED6F) -------------------------------------------------------- | |
| 8187 bool _43ED6F_check_party_races(bool a1) | |
| 8188 { | |
| 8189 bool v6; // zf@5 | |
| 8190 | |
| 8191 for (uint i = 0; i < 4; ++i) | |
| 8192 { | |
| 8193 auto player = pParty->pPlayers + i; | |
| 8194 auto race = player->GetRace(); | |
| 8195 | |
| 8196 if (race != CHARACTER_RACE_HUMAN && | |
| 8197 race != CHARACTER_RACE_ELF && | |
| 8198 race != CHARACTER_RACE_GOBLIN) | |
| 8199 v6 = a1 == 1; | |
| 8200 else | |
| 8201 v6 = !a1; | |
| 8202 | |
| 8203 if (v6) | |
| 8204 return true; | |
| 8205 } | |
| 8206 return false; | |
| 8207 } | |
| 8208 //----- (00439FCB) -------------------------------------------------------- | |
| 8209 void __fastcall DamagePlayerFromMonster(unsigned int uObjID, int a2, Vec3_int_ *pPos, unsigned int a4) | |
| 8210 { | |
| 8211 signed int v4; // esi@1 | |
| 8212 unsigned int v5; // ecx@1 | |
| 8213 Player *v6; // ebx@3 | |
| 8214 Actor *v7; // esi@3 | |
| 8215 unsigned int v8; // eax@4 | |
| 8216 char *v9; // eax@5 | |
| 8217 signed int v10; // eax@6 | |
| 8218 int v11; // edx@8 | |
| 8219 int v12; // edx@9 | |
| 8220 int v13; // edx@10 | |
| 8221 int v14; // edx@16 | |
| 8222 int v15; // edx@17 | |
| 8223 int v16; // edx@18 | |
| 8224 enum SoundID v17; // eax@24 | |
| 8225 int v18; // eax@26 | |
| 8226 unsigned __int8 v19; // zf@26 | |
| 8227 unsigned __int8 v20; // sf@26 | |
| 8228 unsigned __int16 v21; // ax@29 | |
| 8229 signed int v22; // edi@36 | |
| 8230 int v23; // eax@38 | |
| 8231 signed int v24; // eax@44 | |
| 8232 unsigned __int16 v25; // cx@47 | |
| 8233 signed int v26; // eax@49 | |
| 8234 int v27; // eax@54 | |
| 8235 float v28; // ST18_4@58 | |
| 8236 double v29; // st7@58 | |
| 8237 float v30; // ST08_4@58 | |
| 8238 double v31; // st7@58 | |
| 8239 float v32; // ST04_4@58 | |
| 8240 float v33; // ST00_4@58 | |
| 8241 int v34; // edi@61 | |
| 8242 int v35; // eax@70 | |
| 8243 double v36; // st7@70 | |
| 8244 SpriteObject *v37; // ebx@77 | |
| 8245 int v38; // edi@77 | |
| 8246 int v39; // esi@77 | |
| 8247 int v40; // eax@77 | |
| 8248 int v41; // eax@77 | |
| 8249 int v42; // eax@78 | |
| 8250 Player *v43; // eax@81 | |
| 8251 Actor *v44; // esi@82 | |
| 8252 Player *v45; // edi@84 | |
| 8253 unsigned __int16 v46; // ax@84 | |
| 8254 int v47; // ebx@105 | |
| 8255 int v48; // eax@107 | |
| 8256 unsigned __int16 v49; // ax@116 | |
| 8257 int v50; // ebx@123 | |
| 8258 unsigned __int16 v51; // ax@124 | |
| 8259 char v52; // bl@124 | |
| 8260 int v53; // eax@128 | |
| 8261 signed int v54; // eax@134 | |
| 8262 unsigned __int16 v55; // cx@137 | |
| 8263 signed int v56; // eax@139 | |
| 8264 int v57; // eax@144 | |
| 8265 float v58; // ST18_4@148 | |
| 8266 double v59; // st7@148 | |
| 8267 float v60; // ST08_4@148 | |
| 8268 double v61; // st7@148 | |
| 8269 float v62; // ST04_4@148 | |
| 8270 float v63; // ST00_4@148 | |
| 8271 int v64; // ebx@151 | |
| 8272 int v65; // eax@161 | |
| 8273 double v66; // st7@161 | |
| 8274 signed int v67; // ecx@164 | |
| 8275 signed int v68; // eax@170 | |
| 8276 int v69; // ecx@170 | |
| 8277 int v70; // eax@171 | |
| 8278 enum SoundID v71; // [sp+20h] [bp-34h]@12 | |
| 8279 int v72; // [sp+30h] [bp-24h]@164 | |
| 8280 double v73; // [sp+40h] [bp-14h]@72 | |
| 8281 signed int v74; // [sp+44h] [bp-10h]@1 | |
| 8282 unsigned int v75; // [sp+48h] [bp-Ch]@3 | |
| 8283 unsigned int uActorID; // [sp+4Ch] [bp-8h]@1 | |
| 8284 int v77; // [sp+50h] [bp-4h]@26 | |
| 8285 signed int a4a; // [sp+60h] [bp+Ch]@162 | |
| 8286 Player *a4b; // [sp+60h] [bp+Ch]@168 | |
| 8287 | |
| 8288 v4 = PID_ID(uObjID); | |
| 8289 v5 = PID_TYPE(uObjID) - 2; | |
| 8290 v74 = a2; | |
| 8291 uActorID = v4; | |
| 8292 if ( v5 ) | |
| 8293 { | |
| 8294 if ( v5 != 1 | |
| 8295 || (v6 = &pParty->pPlayers[a4], v7 = &pActors[v4], | |
| 8296 v75 = v6->sHealth, | |
| 8297 !stru_50C198.ActorHitOrMiss(v7, v6)) ) | |
| 8298 return; | |
| 8299 v8 = v6->pEquipment.uArmor; | |
| 8300 if ( !v8 | |
| 8301 || (v9 = (char *)v6 + 36 * v8, v9[516] & 2) | |
| 8302 || (v10 = pItemsTable->pItems[*((int *)v9 + 124)].uSkillType, v10 < 10) | |
| 8303 || v10 > 11 ) | |
| 8304 { | |
| 8305 v14 = rand() % 4; | |
| 8306 if ( !v14 ) | |
| 8307 { | |
| 8308 v71 = (SoundID)108; | |
| 8309 goto LABEL_24; | |
| 8310 } | |
| 8311 v15 = v14 - 1; | |
| 8312 if ( !v15 ) | |
| 8313 { | |
| 8314 v71 = (SoundID)109; | |
| 8315 goto LABEL_24; | |
| 8316 } | |
| 8317 v16 = v15 - 1; | |
| 8318 if ( !v16 ) | |
| 8319 { | |
| 8320 v71 = (SoundID)110; | |
| 8321 goto LABEL_24; | |
| 8322 } | |
| 8323 if ( v16 == 1 ) | |
| 8324 { | |
| 8325 v71 = (SoundID)44; | |
| 8326 goto LABEL_24; | |
| 8327 } | |
| 8328 } | |
| 8329 else | |
| 8330 { | |
| 8331 v11 = rand() % 4; | |
| 8332 if ( !v11 ) | |
| 8333 { | |
| 8334 v71 = (SoundID)105; | |
| 8335 goto LABEL_24; | |
| 8336 } | |
| 8337 v12 = v11 - 1; | |
| 8338 if ( !v12 ) | |
| 8339 { | |
| 8340 v71 = (SoundID)106; | |
| 8341 goto LABEL_24; | |
| 8342 } | |
| 8343 v13 = v12 - 1; | |
| 8344 if ( !v13 ) | |
| 8345 { | |
| 8346 v71 = (SoundID)107; | |
| 8347 goto LABEL_24; | |
| 8348 } | |
| 8349 if ( v13 == 1 ) | |
| 8350 { | |
| 8351 v71 = (SoundID)45; | |
| 8352 LABEL_24: | |
| 8353 v17 = v71; | |
| 8354 goto LABEL_26; | |
| 8355 } | |
| 8356 } | |
| 8357 v17 = (SoundID)a4; | |
| 8358 LABEL_26: | |
| 8359 pAudioPlayer->PlaySound(v17, PID(OBJECT_Player,a4 + 80), 0, -1, 0, 0, 0, 0); | |
| 8360 v18 = Actor::_43B3E0_CalcDamage(v7, v74); | |
| 8361 v19 = HIDWORD(v7->pActorBuffs[3].uExpireTime) == 0; | |
| 8362 v20 = SHIDWORD(v7->pActorBuffs[3].uExpireTime) < 0; | |
| 8363 v77 = v18; | |
| 8364 if ( !v20 && (!(v20 | v19) || LODWORD(v7->pActorBuffs[3].uExpireTime) > 0) ) | |
| 8365 { | |
| 8366 v21 = v7->pActorBuffs[3].uPower; | |
| 8367 if ( v21 ) | |
| 8368 v77 /= (signed int)v21; | |
| 8369 } | |
| 8370 if ( v74 ) | |
| 8371 { | |
| 8372 if ( v74 == 1 ) | |
| 8373 { | |
| 8374 v22 = v7->pMonsterInfo.uAttack2Type; | |
| 8375 } | |
| 8376 else | |
| 8377 { | |
| 8378 if ( v74 == 2 ) | |
| 8379 { | |
| 8380 v23 = v7->pMonsterInfo.uSpell1ID; | |
| 8381 } | |
| 8382 else | |
| 8383 { | |
| 8384 if ( v74 != 3 ) | |
| 8385 { | |
| 8386 if ( v74 == 4 ) | |
| 8387 v22 = v7->pMonsterInfo.field_3C_some_special_attack; | |
| 8388 else | |
| 8389 v22 = 4; | |
| 8390 goto LABEL_43; | |
| 8391 } | |
| 8392 v23 = v7->pMonsterInfo.uSpell2ID; | |
| 8393 } | |
| 8394 v22 = LOBYTE(pSpellStats->pInfos[v23].uSchool); | |
| 8395 } | |
| 8396 } | |
| 8397 else | |
| 8398 { | |
| 8399 v22 = v7->pMonsterInfo.uAttack1Type; | |
| 8400 } | |
| 8401 LABEL_43: | |
| 8402 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) | |
| 8403 { | |
| 8404 v24 = v6->ReceiveDamage(v77, (DAMAGE_TYPE)v22); | |
| 8405 if ( SHIDWORD(v6->pPlayerBuffs[10].uExpireTime) >= 0 | |
| 8406 && (SHIDWORD(v6->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v6->pPlayerBuffs[10].uExpireTime)) ) | |
| 8407 { | |
| 8408 v25 = v7->uAIState; | |
| 8409 if ( v25 != 5 ) | |
| 8410 { | |
| 8411 if ( v25 != 4 ) | |
| 8412 { | |
| 8413 v26 = stru_50C198.CalcMagicalDamageToActor(v7, v22, v24); | |
| 8414 v7->sCurrentHP -= v26; | |
| 8415 if ( v26 ) | |
| 8416 { | |
| 8417 if ( v7->sCurrentHP >= 1 ) | |
| 8418 { | |
| 8419 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); | |
| 8420 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 8421 } | |
| 8422 else | |
| 8423 { | |
| 8424 if ( pMonsterStats->pInfos[v7->pMonsterInfo.uID].bQuestMonster & 1 ) | |
| 8425 { | |
| 8426 v27 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * v7->uActorRadius : v7->uActorRadius; | |
| 8427 v74 = v27; | |
| 8428 if ( pRenderer->pRenderD3D ) | |
| 8429 { | |
| 8430 if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) | |
| 8431 { | |
| 8432 v28 = (double)v74; | |
| 8433 v74 = v7->vPosition.z; | |
| 8434 v29 = (double)v74; | |
| 8435 v74 = v7->vPosition.y; | |
| 8436 v30 = v29; | |
| 8437 v31 = (double)v74; | |
| 8438 v74 = v7->vPosition.x; | |
| 8439 v32 = v31; | |
| 8440 v33 = (double)v74; | |
| 8441 pDecalBuilder->AddBloodsplat(v33, v32, v30, 1.0, 0.0, 0.0, v28, 0, 0); | |
| 8442 } | |
| 8443 } | |
| 8444 } | |
| 8445 Actor::Die(uActorID); | |
| 8446 Actor::ApplyFineForKillingPeasant(uActorID); | |
| 8447 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 8448 if ( v7->pMonsterInfo.uExp ) | |
| 8449 GivePartyExp(pMonsterStats->pInfos[v7->pMonsterInfo.uID].uExp); | |
| 8450 v34 = SPEECH_51; | |
| 8451 if ( rand() % 100 < 20 ) | |
| 8452 v34 = ((signed int)v7->pMonsterInfo.uHP >= 100) + 1; | |
| 8453 v6->PlaySound((PlayerSpeech)v34, 0); | |
| 8454 } | |
| 8455 } | |
| 8456 } | |
| 8457 } | |
| 8458 } | |
| 8459 if ( !(dword_6BE368_debug_settings_2 & 0x10) | |
| 8460 && v7->pMonsterInfo.uSpecialAttack | |
| 8461 && rand() % 100 < v7->pMonsterInfo.uLevel * v7->pMonsterInfo.uSpecialAttackType ) | |
| 8462 v6->_48DCF6(v7->pMonsterInfo.uSpecialAttack, v7); | |
| 8463 } | |
| 8464 if ( !pParty->bTurnBasedModeOn ) | |
| 8465 { | |
| 8466 v35 = v6->GetActualEndurance(); | |
| 8467 v36 = (double)(20 - v6->GetParameterBonus(v35)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333; | |
| 8468 v6->SetRecoveryTime((signed __int64)v36); | |
| 8469 } | |
| 8470 if ( v77 ) | |
| 8471 { | |
| 8472 v73 = (double)(signed int)v75; | |
| 8473 if ( (double)v6->GetMaxHealth() * 0.25 < v73 ) | |
| 8474 { | |
| 8475 if ( v6->sHealth > 0 ) | |
| 8476 { | |
| 8477 if ( (double)v6->GetMaxHealth() * 0.25 >= (double)v6->sHealth ) | |
| 8478 v6->PlaySound(SPEECH_48, 0); | |
| 8479 } | |
| 8480 } | |
| 8481 } | |
| 8482 viewparams->bRedrawGameUI = 1; | |
| 8483 return; | |
| 8484 } | |
| 8485 v37 = &pSpriteObjects[uActorID]; | |
| 8486 v38 = PID_TYPE(v37->spell_caster_pid); | |
| 8487 v39 = PID_ID(v37->spell_caster_pid); | |
| 8488 v40 = PID_TYPE(v37->spell_caster_pid); | |
| 8489 uActorID = PID_ID(v37->spell_caster_pid); | |
| 8490 v41 = v40 - 2; | |
| 8491 if ( !v41 ) | |
| 8492 goto LABEL_80; | |
| 8493 v42 = v41 - 1; | |
| 8494 if ( !v42 ) | |
| 8495 { | |
| 8496 v44 = &pActors[v39]; | |
| 8497 if ( a4 == -1 ) | |
| 8498 a4 = stru_50C198.which_player_would_attack(v44); | |
| 8499 v45 = &pParty->pPlayers[a4]; | |
| 8500 v77 = Actor::_43B3E0_CalcDamage(v44, v74); | |
| 8501 v46 = v37->uType; | |
| 8502 if ( v37->uType == 545 ) | |
| 8503 { | |
| 8504 LOBYTE(v51) = v45->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 8505 v52 = v51; | |
| 8506 if ( (signed int)SkillToMastery(v51) >= 4 && rand() % 100 < (v52 & 0x3F) ) | |
| 8507 { | |
| 8508 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], v45->pName); | |
| 8509 ShowStatusBarString(pTmpBuf.data(), 2u); | |
| 8510 v45->PlaySound(SPEECH_6, 0); | |
| 8511 return; | |
| 8512 } | |
| 8513 } | |
| 8514 else | |
| 8515 { | |
| 8516 if ( v46 != 555 | |
| 8517 && v46 != 510 | |
| 8518 && v46 != 500 | |
| 8519 && v46 != 515 | |
| 8520 && v46 != 505 | |
| 8521 && v46 != 530 | |
| 8522 && v46 != 525 | |
| 8523 && v46 != 520 | |
| 8524 && v46 != 535 | |
| 8525 && v46 != 540 ) | |
| 8526 goto LABEL_115; | |
| 8527 } | |
| 8528 if ( !stru_50C198.ActorHitOrMiss(v44, v45) ) | |
| 8529 return; | |
| 8530 if ( (signed __int64)v45->pPlayerBuffs[13].uExpireTime > 0 ) | |
| 8531 v77 >>= 1; | |
| 8532 if ( v45->HasEnchantedItemEquipped(36) ) | |
| 8533 v77 >>= 1; | |
| 8534 if ( v45->HasEnchantedItemEquipped(69) ) | |
| 8535 v77 >>= 1; | |
| 8536 if ( v45->HasItemEquipped(EQUIP_ARMOUR) | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8537 && *(_DWORD *)&v45->pInventoryItemList[v45->pEquipment.uArmor-1] == 504 ) |
| 1297 | 8538 v77 >>= 1; |
| 8539 v75 = 0; | |
| 8540 v47 = (int)&v45->pEquipment; | |
| 8541 do | |
| 8542 { | |
| 8543 if ( v45->HasItemEquipped((ITEM_EQUIP_TYPE)v75) ) | |
| 8544 { | |
| 8545 v48 = *(int *)&v45[36 * *(int *)v47 + 496]; | |
| 8546 if ( v48 == 520 ) | |
| 8547 v77 >>= 1; | |
| 8548 if ( v48 == 531 ) | |
| 8549 v77 >>= 1; | |
| 8550 if ( v45->GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v75) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4 ) | |
| 8551 v77 >>= 1; | |
| 8552 } | |
| 8553 ++v75; | |
| 8554 v47 += 4; | |
| 8555 } | |
| 8556 while ( (signed int)v75 <= 1 ); | |
| 8557 LABEL_115: | |
| 8558 if ( (signed __int64)v44->pActorBuffs[3].uExpireTime > 0 ) | |
| 8559 { | |
| 8560 v49 = v44->pActorBuffs[3].uPower; | |
| 8561 if ( v49 ) | |
| 8562 v77 /= (signed int)v49; | |
| 8563 } | |
| 8564 if ( !v74 ) | |
| 8565 { | |
| 8566 v50 = v44->pMonsterInfo.uAttack1Type; | |
| 8567 goto LABEL_133; | |
| 8568 } | |
| 8569 if ( v74 == 1 ) | |
| 8570 { | |
| 8571 v50 = v44->pMonsterInfo.uAttack2Type; | |
| 8572 goto LABEL_133; | |
| 8573 } | |
| 8574 if ( v74 == 2 ) | |
| 8575 { | |
| 8576 v53 = v44->pMonsterInfo.uSpell1ID; | |
| 8577 } | |
| 8578 else | |
| 8579 { | |
| 8580 if ( v74 != 3 ) | |
| 8581 { | |
| 8582 if ( v74 == 4 ) | |
| 8583 v50 = v44->pMonsterInfo.field_3C_some_special_attack; | |
| 8584 else | |
| 8585 v50 = 4; | |
| 8586 LABEL_133: | |
| 8587 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) | |
| 8588 { | |
| 8589 v54 = v45->ReceiveDamage(v77, (DAMAGE_TYPE)v50); | |
| 8590 if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) >= 0 ) | |
| 8591 { | |
| 8592 if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v45->pPlayerBuffs[10].uExpireTime) ) | |
| 8593 { | |
| 8594 v55 = v44->uAIState; | |
| 8595 if ( v55 != 5 ) | |
| 8596 { | |
| 8597 if ( v55 != 4 ) | |
| 8598 { | |
| 8599 v56 = stru_50C198.CalcMagicalDamageToActor(v44, v50, v54); | |
| 8600 v44->sCurrentHP -= v56; | |
| 8601 if ( v56 ) | |
| 8602 { | |
| 8603 if ( v44->sCurrentHP >= 1 ) | |
| 8604 { | |
| 8605 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); | |
| 8606 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 8607 } | |
| 8608 else | |
| 8609 { | |
| 8610 if ( pMonsterStats->pInfos[v44->pMonsterInfo.uID].bQuestMonster & 1 ) | |
| 8611 { | |
| 8612 v57 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * v44->uActorRadius : v44->uActorRadius; | |
| 8613 v75 = v57; | |
| 8614 if ( pRenderer->pRenderD3D ) | |
| 8615 { | |
| 8616 if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) | |
| 8617 { | |
| 8618 v58 = (double)(signed int)v75; | |
| 8619 v75 = v44->vPosition.z; | |
| 8620 v59 = (double)(signed int)v75; | |
| 8621 v75 = v44->vPosition.y; | |
| 8622 v60 = v59; | |
| 8623 v61 = (double)(signed int)v75; | |
| 8624 v75 = v44->vPosition.x; | |
| 8625 v62 = v61; | |
| 8626 v63 = (double)(signed int)v75; | |
| 8627 pDecalBuilder->AddBloodsplat(v63, v62, v60, 1.0, 0.0, 0.0, v58, 0, 0); | |
| 8628 } | |
| 8629 } | |
| 8630 } | |
| 8631 Actor::Die(uActorID); | |
| 8632 Actor::ApplyFineForKillingPeasant(uActorID); | |
| 8633 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 8634 if ( v44->pMonsterInfo.uExp ) | |
| 8635 GivePartyExp(pMonsterStats->pInfos[v44->pMonsterInfo.uID].uExp); | |
| 8636 v64 = SPEECH_51; | |
| 8637 if ( rand() % 100 < 20 ) | |
| 8638 v64 = ((signed int)v44->pMonsterInfo.uHP >= 100) + 1; | |
| 8639 v45->PlaySound((PlayerSpeech)v64, 0); | |
| 8640 } | |
| 8641 } | |
| 8642 } | |
| 8643 } | |
| 8644 } | |
| 8645 } | |
| 8646 } | |
| 8647 if ( !v74 | |
| 8648 && !(dword_6BE368_debug_settings_2 & 0x10) | |
| 8649 && v44->pMonsterInfo.uSpecialAttack | |
| 8650 && rand() % 100 < v44->pMonsterInfo.uLevel * v44->pMonsterInfo.uSpecialAttackType ) | |
| 8651 v45->_48DCF6(v44->pMonsterInfo.uSpecialAttack, v44); | |
| 8652 if ( !pParty->bTurnBasedModeOn ) | |
| 8653 { | |
| 8654 v65 = v45->GetActualEndurance(); | |
| 8655 v66 = (double)(20 - v45->GetParameterBonus(v65)) | |
| 8656 * flt_6BE3A4_debug_recmod1 | |
| 8657 * 2.133333333333333; | |
| 8658 v45->SetRecoveryTime((signed __int64)v66); | |
| 8659 } | |
| 8660 return; | |
| 8661 } | |
| 8662 v53 = v44->pMonsterInfo.uSpell2ID; | |
| 8663 } | |
| 8664 v50 = LOBYTE(pSpellStats->pInfos[v53].uSchool); | |
| 8665 goto LABEL_133; | |
| 8666 } | |
| 8667 if ( v42 != 1 ) | |
| 8668 return; | |
| 8669 LABEL_80: | |
| 8670 if ( a4 != -1 ) | |
| 8671 { | |
| 8672 v43 = &pParty->pPlayers[a4]; | |
| 8673 LABEL_168: | |
| 8674 a4b = v43; | |
| 8675 if ( v38 != OBJECT_Player || v37->spell_id != SPELL_BOW_ARROW) | |
| 8676 { | |
| 8677 v70 = v43->GetMaxHealth(); | |
| 8678 v68 = _43AFE3_calc_spell_damage(v37->spell_id, v37->spell_level, v37->spell_skill, v70); | |
| 8679 v69 = LOBYTE(pSpellStats->pInfos[v37->spell_id].uSchool); | |
| 8680 } | |
| 8681 else | |
| 8682 { | |
| 8683 v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); | |
| 8684 v69 = 0; | |
| 8685 } | |
| 8686 a4b->ReceiveDamage(v68, (DAMAGE_TYPE)v69); | |
| 8687 if ( v38 == OBJECT_Player && !qword_A750D8 ) | |
| 8688 { | |
| 8689 qword_A750D8 = 256i64; | |
| 1406 | 8690 PlayerSpeechID = SPEECH_44; |
| 1407 | 8691 uSpeakingCharacter = uActorID + 1; |
| 1297 | 8692 } |
| 8693 return; | |
| 8694 } | |
| 8695 v74 = 0; | |
| 8696 a4a = 1; | |
| 8697 do | |
| 8698 { | |
| 8699 if ( pPlayers[a4a]->CanAct() ) | |
| 8700 { | |
| 8701 v67 = v74++; | |
| 8702 *(&v72 + v67) = a4a; | |
| 8703 } | |
| 8704 ++a4a; | |
| 8705 } | |
| 8706 while ( a4a <= 4 ); | |
| 8707 if ( v74 ) | |
| 8708 { | |
| 8709 v43 = &pParty->pPlayers[*(&v72+rand()%v74)-1];//&stru_AA1058[3].pSounds[6972 * *(&v72 + rand() % v74) + 40552]; | |
| 8710 goto LABEL_168; | |
| 8711 } | |
| 8712 } | |
| 8713 //----- (00421EA6) -------------------------------------------------------- | |
| 1458 | 8714 void OnInventoryLeftClick() |
| 1297 | 8715 { |
| 8716 Player *v0; // ebx@1 | |
| 8717 signed int v1; // eax@2 | |
| 8718 signed int v2; // ecx@2 | |
| 8719 int v3; // eax@2 | |
| 8720 char v4; // sf@2 | |
| 8721 int v5; // eax@2 | |
| 8722 unsigned int v6; // eax@7 | |
| 8723 unsigned int v7; // esi@12 | |
| 8724 unsigned int v8; // eax@12 | |
| 8725 unsigned int v9; // eax@16 | |
| 8726 unsigned int v10; // eax@18 | |
| 8727 ItemGen this_; // [sp+Ch] [bp-3Ch]@1 | |
| 8728 POINT a2; // [sp+30h] [bp-18h]@4 | |
| 8729 unsigned int v13; // [sp+38h] [bp-10h]@13 | |
| 8730 unsigned int pY; // [sp+3Ch] [bp-Ch]@2 | |
| 8731 unsigned int pX; // [sp+40h] [bp-8h]@2 | |
| 8732 int a4; // [sp+44h] [bp-4h]@2 | |
| 8733 | |
| 8734 v0 = pPlayers[uActiveCharacter]; | |
| 8735 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103 ) | |
| 8736 { | |
| 8737 pMouse->GetClickPos(&pX, &pY); | |
| 8738 pY = pY - 17; | |
| 8739 v2 =pX - 14; | |
| 8740 pX = v2; | |
| 8741 v3 = 14 * (pY >> 5); | |
| 8742 v2 >>= 5; | |
| 8743 v4 = v2 + v3 < 0; | |
| 8744 v5 = v2 + v3; | |
| 8745 a4 = v5; | |
| 8746 if ( !v4 ) | |
| 8747 { | |
| 8748 if ( v5 <= 126 && pMouse->GetCursorPos(&a2)->x < 462 | |
| 8749 && pMouse->GetCursorPos(&a2)->x >= 14 ) | |
| 8750 { | |
| 8751 if ( unk_50C9A0 ) | |
| 8752 { | |
| 8753 v6 = v0->GetItemIDAtInventoryIndex(&a4); | |
| 8754 if ( v6 ) | |
| 8755 { | |
| 8756 *((char *)pGUIWindow_Settings->ptr_1C + 8) &= 0x7Fu; | |
| 8757 *((short *)pGUIWindow_Settings->ptr_1C + 2) = uActiveCharacter - 1; | |
| 8758 *((int *)pGUIWindow_Settings->ptr_1C + 3) = v6 - 1; | |
| 8759 *((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
|
8760 ptr_50C9A4 = (ItemGen *)&v0->pInventoryItemList[v6-1]; |
| 1297 | 8761 unk_50C9A0 = 0; |
| 8762 if ( pMessageQueue_50CBD0->uNumMessages ) | |
| 8763 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; | |
| 8764 pMouse->SetCursorBitmap("MICON1"); | |
| 8765 dword_50C9D0 = 113; | |
| 8766 dword_50C9D4 = 0; | |
| 8767 dword_50C9D8 = 256; | |
| 8768 } | |
| 8769 return; | |
| 8770 } | |
| 8771 if ( ptr_50C9A4 ) | |
| 8772 return; | |
| 8773 v7 = pParty->pPickedItem.uItemID; | |
| 8774 v8 = v0->GetItemIDAtInventoryIndex(&a4); | |
| 8775 if ( !v7 ) | |
| 8776 { | |
| 8777 if ( !v8 ) | |
| 8778 return; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8779 memcpy(&pParty->pPickedItem, &v0->pInventoryItemList[v8-1], sizeof(pParty->pPickedItem)); |
| 1297 | 8780 v0->RemoveItemAtInventoryIndex(a4); |
| 8781 v9 = pParty->pPickedItem.uItemID; | |
| 8782 pMouse->SetCursorBitmap(pItemsTable->pItems[v9].pIconName); | |
| 8783 return; | |
| 8784 } | |
| 8785 v13 = v8; | |
| 8786 if ( v8 ) | |
| 8787 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8788 a2.y = (LONG)&v0->pInventoryItemList[v8-1]; |
| 1297 | 8789 memcpy(&this_, (const void *)a2.y, sizeof(this_)); |
| 8790 v0->RemoveItemAtInventoryIndex(a4); | |
| 8791 pX = v0->AddItem2(a4, &pParty->pPickedItem); | |
| 8792 if ( !pX ) | |
| 8793 { | |
| 8794 pX = v0->AddItem2(0xFFFFFFFFu, &pParty->pPickedItem); | |
| 8795 if ( !pX ) | |
| 8796 { | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
8797 v0->PutItemArInventoryIndex(this_.uItemID, v13 - 1, a4); |
| 1297 | 8798 memcpy((void *)a2.y, &this_, sizeof(ItemGen)); |
| 8799 return; | |
| 8800 } | |
| 8801 } | |
| 8802 v9 = this_.uItemID; | |
| 8803 memcpy(&pParty->pPickedItem, &this_, sizeof(pParty->pPickedItem)); | |
| 8804 pMouse->SetCursorBitmap(pItemsTable->pItems[v9].pIconName); | |
| 8805 return; | |
| 8806 } | |
| 8807 v10 = v0->AddItem(a4, v7); | |
| 8808 pX = v10; | |
| 8809 if ( v10 || (v10 = v0->AddItem(-1, pParty->pPickedItem.uItemID), (pX = v10) != 0) ) | |
| 8810 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8811 memcpy(&v0->pInventoryItemList[v10-1], &pParty->pPickedItem, 0x24u); |
| 1297 | 8812 pMouse->RemoveHoldingItem(); |
| 8813 } | |
| 8814 } | |
| 8815 } | |
| 8816 } | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8817 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8818 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8819 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8820 bool Player::IsWeak() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8821 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8822 return pConditions[Condition_Weak] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8823 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8824 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8825 bool Player::IsDead() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8826 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8827 return pConditions[Condition_Dead] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8828 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8829 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8830 bool Player::IsEradicated() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8831 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8832 return pConditions[Condition_Eradicated] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8833 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8834 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8835 bool Player::IsZombie() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8836 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8837 return pConditions[Condition_Zombie] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8838 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8839 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8840 bool Player::IsCursed() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8841 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8842 return pConditions[Condition_Cursed] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8843 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8844 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8845 bool Player::IsPertified() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8846 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8847 return pConditions[Condition_Pertified] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8848 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8849 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8850 bool Player::IsUnconcious() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8851 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8852 return pConditions[Condition_Unconcious] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8853 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8854 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8855 bool Player::IsAsleep() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8856 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8857 return pConditions[Condition_Sleep] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8858 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8859 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8860 bool Player::IsParalyzed() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8861 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8862 return pConditions[Condition_Paralyzed] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8863 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8864 |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8865 void Player::SetCursed( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8866 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8867 pConditions[Condition_Cursed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8868 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8869 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8870 void Player::SetWeak( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8871 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8872 pConditions[Condition_Weak] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8873 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8874 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8875 void Player::SetAsleep( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8876 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8877 pConditions[Condition_Sleep] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8878 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8879 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8880 void Player::SetAfraid( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8881 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8882 pConditions[Condition_Fear] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8883 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8884 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8885 void Player::SetDrunk( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8886 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8887 pConditions[Condition_Drunk] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8888 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8889 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8890 void Player::SetInsane( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8891 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8892 pConditions[Condition_Insane] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8893 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8894 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8895 void Player::SetPoison1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8896 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8897 pConditions[Condition_Poison1] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8898 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8899 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8900 void Player::SetDisease1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8901 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8902 pConditions[Condition_Disease1] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8903 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8904 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8905 void Player::SetPoison2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8906 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8907 pConditions[Condition_Poison2] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8908 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8909 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8910 void Player::SetDisease2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8911 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8912 pConditions[Condition_Disease2] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8913 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8914 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8915 void Player::SetPoison3( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8916 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8917 pConditions[Condition_Poison3] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8918 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8919 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8920 void Player::SetDisease3( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8921 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8922 pConditions[Condition_Disease3] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8923 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8924 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8925 void Player::SetParalyzed( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8926 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8927 pConditions[Condition_Paralyzed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8928 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8929 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8930 void Player::SetUnconcious( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8931 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8932 pConditions[Condition_Unconcious] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8933 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8934 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8935 void Player::SetDead( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8936 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8937 pConditions[Condition_Dead] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8938 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8939 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8940 void Player::SetPertified( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8941 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8942 pConditions[Condition_Pertified] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8943 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8944 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8945 void Player::SetEradicated( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8946 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8947 pConditions[Condition_Eradicated] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8948 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8949 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8950 void Player::SetZombie( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8951 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8952 pConditions[Condition_Zombie] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8953 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8954 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8955 void Player::SetCondWeakWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8956 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8957 SetCondition(Condition_Weak, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8958 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8959 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8960 void Player::SetCondInsaneWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8961 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8962 SetCondition(Condition_Insane, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8963 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8964 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8965 void Player::SetCondDeadWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8966 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8967 SetCondition(Condition_Dead, blockable); |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
8968 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
8969 |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
8970 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
|
8971 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
8972 SetCondition(Condition_Dead, blockable); |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
8973 } |