Mercurial > mm7
annotate Player.cpp @ 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
| author | Grumpy7 |
|---|---|
| date | Sat, 07 Sep 2013 10:49:42 +0200 |
| parents | a9e8d2a7abb5 |
| children | b98812ead5d9 |
| 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 |
| 187 | 5 #include <assert.h> |
| 6 | |
| 1016 | 7 #include "stru6.h" |
| 8 | |
| 9 | |
| 0 | 10 #include "Player.h" |
| 11 #include "PlayerFrameTable.h" | |
| 12 #include "AudioPlayer.h" | |
| 13 #include "Party.h" | |
| 816 | 14 #include "Log.h" |
| 0 | 15 #include "LOD.h" |
| 16 #include "GUIWindow.h" | |
| 17 #include "Viewport.h" | |
| 18 #include "Actor.h" | |
| 19 #include "Game.h" | |
| 20 #include "Mouse.h" | |
| 21 #include "TurnEngine.h" | |
| 22 #include "Events.h" | |
| 23 #include "Events2D.h" | |
| 24 #include "Outdoor.h" | |
| 25 #include "StorylineTextTable.h" | |
|
81
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
26 #include "Autonotes.h" |
|
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
27 #include "Awards.h" |
| 189 | 28 #include "texts.h" |
| 816 | 29 |
| 0 | 30 #include "mm7_data.h" |
|
828
0f56abdcce94
Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents:
821
diff
changeset
|
31 #include "MM7.h" |
| 1297 | 32 #include "SpriteObject.h" |
| 33 #include "DecalBuilder.h" | |
| 0 | 34 |
| 35 | |
| 36 | |
| 37 | |
| 38 | |
| 39 /* 381 */ | |
| 40 #pragma pack(push, 1) | |
| 290 | 41 struct PlayerCreation_AttributeProps |
| 0 | 42 { |
| 43 unsigned __int8 uBaseValue; | |
| 44 char uMaxValue; | |
| 45 char uDroppedStep; | |
| 46 char uBaseStep; | |
| 47 }; | |
| 48 #pragma pack(pop) | |
| 49 | |
| 50 | |
| 51 #pragma pack(push, 1) | |
| 290 | 52 |
| 53 | |
| 54 | |
| 0 | 55 #pragma pack(pop) |
| 290 | 56 PlayerCreation_AttributeProps StatTable[4][7] = //0x4ED7B0 |
| 57 { | |
| 58 {{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},}, | |
| 59 {{ 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},}, | |
| 60 {{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},}, | |
| 61 {{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 | 62 }; |
| 63 | |
| 64 | |
| 65 | |
| 66 | |
| 67 | |
| 68 | |
| 69 // available skills per class ( 9 classes X 37 skills ) | |
| 70 // 0 - not available | |
| 71 // 1 - available | |
| 72 // 2 - primary skill | |
| 73 unsigned char pSkillAvailabilityPerClass[9][37] = // byte[] @ MM7.exe::004ED820 | |
| 74 { | |
| 75 {0, 2, 0, 1, 1, 1, 1, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, | |
| 76 {0, 1, 2, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 2, 1, 0}, | |
| 77 {1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 2, 2, 1, 1, 0, 0, 0}, | |
| 78 {0, 1, 1, 1, 0, 0, 2, 0, 1, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, | |
| 79 {0, 1, 0, 1, 1, 2, 0, 0, 0, 1, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1}, | |
| 80 {0, 1, 1, 2, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0}, | |
| 81 {0, 0, 0, 0, 0, 0, 2, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 2, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}, | |
| 82 {0, 0, 2, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}, | |
| 83 {2, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0} // some of these are started at 4ED94C, but needs to be here | |
| 84 }; | |
| 85 | |
| 86 | |
| 1374 | 87 unsigned char pEquipTypeToBodyAnchor[21] = // 4E8398 |
| 88 { | |
| 89 1, // EQUIP_OFF_HAND | |
| 90 1, // EQUIP_MAIN_HAND | |
| 91 2, // EQUIP_BOW | |
| 92 3, // EQUIP_ARMOUR | |
| 93 0, // EQUIP_SHIELD | |
| 94 4, // EQUIP_HELMET | |
| 95 5, // EQUIP_BELT | |
| 96 6, // EQUIP_CLOAK | |
| 97 7, // EQUIP_GAUNTLETS | |
| 98 8, // EQUIP_BOOTS | |
| 99 10, // EQUIP_RING | |
| 100 9, // EQUIP_AMULET | |
| 101 1, // EQUIP_WAND | |
| 102 0, // EQUIP_REAGENT | |
| 103 0, // EQUIP_POTION | |
| 104 0, // EQUIP_SPELL_SCROLL | |
| 105 0, // EQUIP_BOOK | |
| 106 0, // EQUIP_MESSAGE_SCROLL | |
| 107 0, // EQUIP_GOLD | |
| 108 0, // EQUIP_GEM | |
| 109 0 // EQUIP_NONE | |
| 110 }; | |
| 0 | 111 |
| 112 | |
| 113 unsigned char pBaseHealthByClass[12] = {40, 35, 35, 30, 30, 30, 25, 20, 20, 0, 0, 0}; | |
| 114 unsigned char pBaseManaByClass[12] = { 0, 0, 0, 5, 5, 0, 10, 10, 15, 0, 0, 0}; | |
| 115 unsigned char pBaseHealthPerLevelByClass[36] = {5, 7, 9, 9, 4, 6, 8, 8, 5, 6, 8, 8, 4, 5, 6, 6, 3, 4, 6, 6, 4, 5, 6, 6, 2, 3, 4, 4, 2, 3, 4, 4, 2, 3, 3, 3}; | |
| 116 unsigned char pBaseManaPerLevelByClass[36] = {0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 2, 3, 3, 1, 2, 3, 3, 0, 2, 3, 3, 3, 4, 5, 5, 3, 4, 5, 5, 3, 4, 6, 6}; | |
| 117 | |
| 1325 | 118 unsigned char pConditionAttributeModifier[7][19] = |
| 119 {{100, 100, 100, 120, 50, 200, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Might | |
| 120 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Intelligence | |
| 121 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Willpower | |
| 122 {100, 100, 100, 100, 50, 150, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Endurance | |
| 123 {100, 100, 100, 50, 10, 100, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Accuracy | |
| 124 {100, 100, 100, 120, 20, 120, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Speed | |
| 125 {100, 100, 100, 100, 200, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100}}; //Luck | |
| 126 | |
| 127 unsigned char pAgingAttributeModifier[7][4] = | |
| 128 {{100, 75, 40, 10}, //Might | |
| 129 {100, 150, 100, 10}, //Intelligence | |
| 130 {100, 150, 100, 10}, //Willpower | |
| 131 {100, 75, 40, 10}, //Endurance | |
| 132 {100, 100, 40, 10}, //Accuracy | |
| 133 {100, 100, 40, 10}, //Speed | |
| 134 {100, 100, 100, 100}}; //Luck | |
| 0 | 135 |
| 1036 | 136 signed int pAgeingTable[4] = {50, 100, 150, 0xFFFF}; |
| 0 | 137 |
|
1207
96a81634669e
arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents:
1205
diff
changeset
|
138 std::array<unsigned int, 18> pConditionImportancyTable = {{16, 15, 14, 17, 13, 2, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 1, 0}}; |
| 0 | 139 |
| 1036 | 140 short param_to_bonus_table[29] = {500, 400, 350, 300, 275, 250, 225, 200, 175, |
| 0 | 141 150, 125, 100, 75, 50, 40, 35, 30, 25, 21, |
| 1036 | 142 19, 17, 15, 13, 11, 9, 7, 5, 3, 0}; |
| 143 signed int parameter_to_bonus_value[29] = {30, 25, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, -1, -2, -3, -4, -5, -6}; | |
| 0 | 144 |
| 145 | |
| 816 | 146 unsigned short base_recovery_times_per_weapon_type[12] = |
| 147 { | |
| 148 100, // PLAYER_SKILL_STAFF && Unarmed withoud skill | |
| 149 90, // PLAYER_SKILL_SWORD && Unarmed with skill | |
| 150 60, // PLAYER_SKILL_DAGGER | |
| 151 100, // PLAYER_SKILL_AXE | |
| 152 80, // PLAYER_SKILL_SPEAR | |
| 153 100, // PLAYER_SKILL_BOW | |
| 154 80, // PLAYER_SKILL_MACE | |
| 155 30, // PLAYER_SKILL_BLASTER | |
| 156 10, // PLAYER_SKILL_SHIELD | |
| 157 10, // PLAYER_SKILL_LEATHER | |
| 158 20, // PLAYER_SKILL_CHAIN | |
| 159 30 // PLAYER_SKILL_PLATE | |
| 160 }; | |
| 161 | |
| 162 | |
| 0 | 163 |
| 164 //----- (00490913) -------------------------------------------------------- | |
| 1459 | 165 int PlayerCreation_GetUnspentAttributePointCount() |
| 0 | 166 { |
| 167 signed int v0; // edi@1 | |
| 1273 | 168 int raceId; // ebx@2 |
| 0 | 169 signed int v4; // eax@17 |
| 170 int v5; // edx@18 | |
| 171 signed int v6; // ecx@18 | |
| 1273 | 172 signed int remainingStatPoints; // [sp+Ch] [bp-8h]@1 |
| 173 | |
| 174 remainingStatPoints = 50; | |
| 0 | 175 v0 = 50; |
| 1273 | 176 for (int playerNum = 0; playerNum < 4; playerNum++) |
| 177 { | |
| 178 raceId = pParty->pPlayers[playerNum].GetRace(); | |
| 179 for (int statNum = 0; statNum <= 6; statNum++) | |
| 180 { | |
| 181 switch ( statNum ) | |
| 0 | 182 { |
| 1273 | 183 case 0: |
| 184 v0 = pParty->pPlayers[playerNum].uMight; | |
| 185 break; | |
| 186 case 1: | |
| 187 v0 = pParty->pPlayers[playerNum].uIntelligence; | |
| 188 break; | |
| 189 case 2: | |
| 190 v0 = pParty->pPlayers[playerNum].uWillpower; | |
| 191 break; | |
| 192 case 3: | |
| 193 v0 = pParty->pPlayers[playerNum].uEndurance; | |
| 194 break; | |
| 195 case 4: | |
| 196 v0 = pParty->pPlayers[playerNum].uAccuracy; | |
| 197 break; | |
| 198 case 5: | |
| 199 v0 = pParty->pPlayers[playerNum].uSpeed; | |
| 200 break; | |
| 201 case 6: | |
| 202 v0 = pParty->pPlayers[playerNum].uLuck; | |
| 203 break; | |
| 204 } | |
| 205 v4 = StatTable[raceId][statNum].uBaseValue; | |
| 206 if ( v0 >= v4 ) | |
| 207 { | |
| 208 v5 = StatTable[raceId][statNum].uDroppedStep; | |
| 209 v6 = StatTable[raceId][statNum].uBaseStep; | |
| 0 | 210 } |
| 211 else | |
| 212 { | |
| 1273 | 213 v5 = StatTable[raceId][statNum].uBaseStep; |
| 214 v6 = StatTable[raceId][statNum].uDroppedStep; | |
| 0 | 215 } |
| 1273 | 216 remainingStatPoints += v5 * (v4 - v0) / v6; |
| 217 } | |
| 218 } | |
| 219 return remainingStatPoints; | |
| 0 | 220 } |
| 221 | |
| 222 | |
| 223 | |
| 224 //----- (00427730) -------------------------------------------------------- | |
| 225 bool Player::CanCastSpell(unsigned int uRequiredMana) | |
| 226 { | |
| 1275 | 227 if (sMana >= (signed int)uRequiredMana) |
| 228 { | |
| 229 sMana -= (signed int)uRequiredMana; | |
| 488 | 230 return true; |
| 231 } | |
| 232 | |
| 233 pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0); | |
| 234 return false; | |
| 0 | 235 } |
| 236 | |
| 237 | |
| 238 //----- (004BE2DD) -------------------------------------------------------- | |
| 1014 | 239 void Player::SalesProcess( unsigned int inventory_idnx, int item_index, int _2devent_idx ) |
| 240 { | |
| 0 | 241 float v6; // ST04_4@1 |
| 1014 | 242 signed int item_value; // eax@1 |
| 243 signed int sell_price; // ebx@1 | |
| 244 | |
| 245 item_value =pOwnItems[item_index].GetValue(); | |
| 246 v6 = p2DEvents[ _2devent_idx - 1].fPriceMultiplier; | |
| 247 sell_price = GetPriceSell(item_value, v6); | |
| 248 if ( pOwnItems[item_index].Broken() ) | |
| 249 sell_price = 1; | |
| 250 if ( sell_price < 1 ) | |
| 251 sell_price = 1; | |
| 252 RemoveItemAtInventoryIndex(inventory_idnx); | |
| 253 Party::SetGold(pParty->uNumGold + sell_price); | |
| 0 | 254 } |
| 255 | |
| 256 | |
| 257 | |
| 258 //----- (0043EEF3) -------------------------------------------------------- | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
259 bool Player::NothingOrJustBlastersEquipped() |
| 0 | 260 { |
| 1014 | 261 signed int item_idx; // esi@1 |
| 262 signed int item_id; // esi@1 | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
263 for (int i = 0; i < 16; ++i) |
|
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_idx = pEquipment.pIndices[i]; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
266 if (item_idx) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
267 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
268 item_id = pOwnItems[item_idx - 1].uItemID; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
269 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
|
270 return false; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
271 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
272 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
273 return true; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
274 } |
| 1014 | 275 |
| 0 | 276 |
| 277 | |
| 278 | |
| 279 //----- (004B8040) -------------------------------------------------------- | |
| 1036 | 280 int Player::GetConditionDayOfWeek( unsigned int uCondition ) |
| 281 { | |
| 282 return (unsigned int)(((signed __int64)((double)this->pConditions[uCondition] * 0.234375) / 60 / 60) / 24) % 7 + 1; | |
| 0 | 283 } |
| 284 | |
| 285 //----- (004B807C) -------------------------------------------------------- | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
286 int Player::GetTempleHealCostModifier(float a2) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
287 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
288 unsigned int conditionIdx; // eax@1 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
289 int conditionTimeMultiplier; // esi@1 |
| 0 | 290 int v6; // eax@8 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
291 signed int result; // qax@13 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
292 signed int baseConditionMultiplier; // [sp+8h] [bp-8h]@4 |
| 1275 | 293 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
294 conditionIdx = GetMajorConditionIdx(); |
| 1275 | 295 if ( conditionIdx >= 14 && conditionIdx <= 16) |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
296 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
297 if ( conditionIdx <= 15 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
298 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
299 baseConditionMultiplier = 5; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
300 } |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
301 if ( conditionIdx == 16 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
302 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
303 baseConditionMultiplier = 10; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
304 } |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
305 conditionTimeMultiplier = GetConditionDayOfWeek(conditionIdx); |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
306 } |
| 1350 | 307 else |
| 308 { | |
| 1275 | 309 conditionTimeMultiplier = 1; |
| 310 baseConditionMultiplier = 1; | |
| 1350 | 311 if (conditionIdx < 14) |
| 312 { | |
| 313 for (int i = 0; i <= 13; i++) | |
| 314 { | |
| 315 v6 = GetConditionDayOfWeek(i); | |
| 316 if ( v6 > conditionTimeMultiplier ) | |
| 317 conditionTimeMultiplier = v6; | |
| 318 } | |
| 319 } | |
| 1275 | 320 } |
| 321 result = (int)((double)conditionTimeMultiplier * (double)baseConditionMultiplier * a2); | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
322 if ( result < 1 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
323 result = 1; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
324 return result; |
| 0 | 325 } |
| 326 | |
| 327 //----- (004B8102) -------------------------------------------------------- | |
| 917 | 328 int Player::GetPriceSell(int uRealValue, float price_multiplier) |
| 0 | 329 { |
| 330 signed int v3; // esi@1 | |
| 331 signed int result; // eax@3 | |
| 332 | |
| 1275 | 333 v3 = (signed int)((signed __int64)((double)uRealValue / (price_multiplier + 2.0)) + uRealValue * GetMerchant() / 100); |
| 917 | 334 if ( v3 > uRealValue ) |
| 335 v3 = uRealValue; | |
| 0 | 336 result = 1; |
| 337 if ( v3 >= 1 ) | |
| 338 result = v3; | |
| 339 return result; | |
| 340 } | |
| 341 | |
| 342 //----- (004B8142) -------------------------------------------------------- | |
| 749 | 343 int Player::GetBuyingPrice(unsigned int uRealValue, float price_multiplier) |
| 344 { | |
| 1275 | 345 uint price = (uint)(((100 - GetMerchant()) * (uRealValue * price_multiplier)) / 100); |
| 749 | 346 assert (price > 0); |
| 347 | |
| 348 if (price < uRealValue) | |
| 349 price = uRealValue; | |
| 350 return price; | |
| 0 | 351 } |
| 352 | |
| 353 //----- (004B8179) -------------------------------------------------------- | |
| 916 | 354 int Player::GetPriceIdentification(float a2) |
| 0 | 355 { |
| 356 signed int v2; // esi@1 | |
| 357 int v3; // ecx@1 | |
| 358 signed int result; // eax@3 | |
| 359 | |
| 1275 | 360 v2 = (signed int)(a2 * 50.0); |
| 0 | 361 v3 = v2 * (100 - GetMerchant()) / 100; |
| 362 if ( v3 < v2 / 3 ) | |
| 363 v3 = v2 / 3; | |
| 364 result = 1; | |
| 365 if ( v3 >= 1 ) | |
| 366 result = v3; | |
| 367 return result; | |
| 368 } | |
| 369 | |
| 370 //----- (004B81C3) -------------------------------------------------------- | |
| 916 | 371 int Player::GetPriceRepair(int a2, float a3) |
| 0 | 372 { |
| 373 signed int v3; // esi@1 | |
| 374 int v4; // ecx@1 | |
| 375 signed int result; // eax@3 | |
| 376 | |
| 1275 | 377 v3 = (signed int)((double)a2 / (6.0 - a3)); |
| 0 | 378 v4 = v3 * (100 - GetMerchant()) / 100; |
| 379 if ( v4 < v3 / 3 ) | |
| 380 v4 = v3 / 3; | |
| 381 result = 1; | |
| 382 if ( v4 >= 1 ) | |
| 383 result = v4; | |
| 384 return result; | |
| 385 } | |
| 386 | |
| 387 //----- (004B8213) -------------------------------------------------------- | |
| 1275 | 388 int Player::GetBaseSellingPrice(int a2, float a3) |
| 389 { | |
| 390 signed int v3; // qax@1 | |
| 391 | |
| 392 v3 = (signed int)((double)a2 / (a3 + 2.0)); | |
| 393 if ( v3 < 1 ) | |
| 394 v3 = 1; | |
| 0 | 395 return v3; |
| 396 } | |
| 397 | |
| 398 //----- (004B8233) -------------------------------------------------------- | |
| 1275 | 399 int Player::GetBaseBuyingPrice(int a2, float a3) |
| 400 { | |
| 401 signed int v3; // qax@1 | |
| 402 | |
| 403 v3 = (signed int)((double)a2 * a3); | |
| 404 if ( v3 < 1 ) | |
| 405 v3 = 1; | |
| 0 | 406 return v3; |
| 407 } | |
| 408 | |
| 409 //----- (004B824B) -------------------------------------------------------- | |
| 1275 | 410 int Player::GetBaseIdentifyPrice(float a2) |
| 411 { | |
| 412 signed int v2; // qax@1 | |
| 413 | |
| 414 v2 = (signed int)(a2 * 50.0); | |
| 415 if ( v2 < 1 ) | |
| 416 v2 = 1; | |
| 0 | 417 return v2; |
| 418 } | |
| 419 | |
| 420 //----- (004B8265) -------------------------------------------------------- | |
| 1275 | 421 int Player::GetBaseRepairPrice(int a2, float a3) |
| 422 { | |
| 423 signed int v3; // qax@1 | |
| 424 | |
| 425 v3 = (signed int)((double)a2 / (6.0 - a3)); | |
| 426 if ( v3 < 1 ) | |
| 427 v3 = 1; | |
| 0 | 428 return v3; |
| 429 } | |
| 430 | |
| 431 | |
| 432 | |
| 433 | |
| 434 | |
| 435 //----- (004B6FF9) -------------------------------------------------------- | |
| 1348 | 436 bool Player::IsPlayerHealableByTemple() |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
437 { |
| 0 | 438 signed int v2; // eax@1 |
| 336 | 439 v2 = (signed int)window_SpeakInHouse->ptr_1C; |
| 1348 | 440 if (this->sHealth >= GetMaxHealth() && this->sMana >= GetMaxMana() && GetMajorConditionIdx() == Condition_Good) |
| 441 { | |
| 442 return false; | |
| 443 } | |
| 444 else | |
| 445 { | |
| 446 if (GetMajorConditionIdx() == Condition_Zombie) | |
| 447 { | |
| 448 if ((v2 == 78 || v2 == 81 || v2 == 82)) | |
| 449 { | |
| 450 return false; | |
| 451 } | |
| 452 else | |
| 453 { | |
| 454 return true; | |
| 455 } | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
456 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
457 else |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
458 { |
| 1348 | 459 return true; |
| 460 } | |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
461 } |
| 0 | 462 } |
| 463 | |
| 464 | |
| 465 | |
| 466 //----- (00421E75) -------------------------------------------------------- | |
| 1012 | 467 unsigned int Player::GetItemIDAtInventoryIndex(int *pitem_index) |
| 468 { | |
| 469 int item_idx; // eax@1 | |
| 470 int inv_index; // eax@3 | |
| 471 | |
| 1351 | 472 |
| 1012 | 473 item_idx = *pitem_index; |
| 474 if ( item_idx >125 || item_idx < 0 ) | |
| 475 { | |
| 476 return 0; | |
| 477 } | |
| 478 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
479 inv_index = this->pInventoryMatrix[item_idx]; |
| 1012 | 480 if ( inv_index < 0 ) |
| 481 { | |
| 482 *pitem_index = -1 - inv_index; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
483 inv_index = this->pInventoryMatrix[-1 - inv_index]; |
| 1012 | 484 } |
| 485 | |
| 486 return inv_index; | |
| 0 | 487 } |
| 488 | |
| 489 | |
| 490 | |
| 491 //----- (004160CA) -------------------------------------------------------- | |
| 1012 | 492 void Player::ItemsEnchant( int enchant_count ) |
| 493 { | |
| 494 int avalible_items; // ebx@1 | |
| 495 int i; // edx@8 | |
| 496 __int16 item_index_tabl[138]; // [sp+Ch] [bp-118h]@1 | |
| 497 | |
| 498 avalible_items = 0; | |
| 499 memset (item_index_tabl,0,sizeof(item_index_tabl)); | |
| 500 | |
| 1349 | 501 for (i = 0; i < 138; ++i) |
| 502 { | |
| 503 if (( pOwnItems[i].uItemID>0)&&(pOwnItems[i].uItemID <= 134)) | |
| 504 item_index_tabl[avalible_items++] = i; | |
| 505 } | |
| 1012 | 506 |
| 507 if ( avalible_items ) | |
| 508 { | |
| 509 if ( enchant_count ) | |
| 510 { | |
| 1349 | 511 for ( i = 0; i < enchant_count; ++i ) |
| 512 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
513 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
|
514 pInventoryItemList[item_index_tabl[rand() % avalible_items]].uAttributes |= ITEM_ENCHANTED; |
| 1349 | 515 } |
| 0 | 516 } |
| 517 else | |
| 518 { | |
| 1012 | 519 for ( i = 0; i < avalible_items; ++i ) |
| 520 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
521 pInventoryItemList[item_index_tabl[i]].uAttributes |= ITEM_ENCHANTED; |
| 1349 | 522 } |
| 523 } | |
| 524 } | |
| 0 | 525 } |
| 526 | |
| 527 //----- (004948B1) -------------------------------------------------------- | |
| 187 | 528 void Player::PlaySound(PlayerSpeech speech, int a3) |
| 529 { | |
| 1351 | 530 signed int speechCount = 0; // esi@4 |
| 531 signed int expressionCount = 0; // esi@4 | |
| 532 int pickedVariant; // esi@10 | |
| 248 | 533 CHARACTER_EXPRESSION_ID expression; // ebx@17 |
| 1406 | 534 signed int pSoundID; // ecx@19 |
| 1351 | 535 int speechVariantArray[5]; // [sp+Ch] [bp-1Ch]@7 |
| 536 int expressionVariantArray[5]; | |
| 537 unsigned int pickedSoundID; // [sp+30h] [bp+8h]@4 | |
| 538 unsigned int expressionDuration = 0; | |
| 187 | 539 |
| 1351 | 540 pickedSoundID = 0; |
| 203 | 541 if (uVoicesVolumeMultiplier) |
| 0 | 542 { |
| 1351 | 543 for (int i = 0; i < 2; i++) |
| 544 { | |
| 1406 | 545 if ( SoundSetAction[speech][i] ) |
| 546 { | |
| 547 speechVariantArray[speechCount] = SoundSetAction[speech][i]; | |
| 1351 | 548 speechCount++; |
| 549 } | |
| 550 } | |
| 551 if ( speechCount ) | |
| 552 { | |
| 553 pickedVariant = speechVariantArray[rand() % speechCount]; | |
| 554 int numberOfSubvariants = byte_4ECF08[pickedVariant - 1][uVoiceID]; | |
| 555 if (numberOfSubvariants > 0) | |
| 556 { | |
| 557 pickedSoundID = rand() % numberOfSubvariants + 2 * (pickedVariant + 50 * uVoiceID) + 4998; | |
| 1406 | 558 pAudioPlayer->PlaySound((SoundID)pickedSoundID, PID(OBJECT_Player, uActiveCharacter + 39), 0, -1, 0, 0, (int)(pSoundVolumeLevels[uVoicesVolumeMultiplier] * 128.0f), 0); |
| 1351 | 559 } |
| 560 } | |
| 561 } | |
| 562 | |
| 563 for (int i = 0; i < 5; i++) | |
| 564 { | |
| 1406 | 565 if ( SoundSetAction[speech][i + 3] ) |
| 566 { | |
| 567 expressionVariantArray[expressionCount] = SoundSetAction[speech][i + 3]; | |
| 1351 | 568 expressionCount++; |
| 569 } | |
| 570 } | |
| 571 if ( expressionCount ) | |
| 572 { | |
| 573 expression = (CHARACTER_EXPRESSION_ID)expressionVariantArray[rand() % expressionCount]; | |
| 574 if (expression == CHARACTER_EXPRESSION_21 && pickedSoundID ) | |
| 575 { | |
| 1406 | 576 pSoundID = 0; |
| 577 if ( pSoundList->sNumSounds ) | |
| 578 { | |
| 1351 | 579 for (int i = 0; i < pSoundList->sNumSounds; i++) |
| 0 | 580 { |
| 1406 | 581 if (pSoundList->pSounds[i].uSoundID == pickedSoundID) |
| 582 pSoundID = i; | |
| 0 | 583 } |
| 584 } | |
| 1406 | 585 if ( pSoundList->pSounds[pSoundID].pSoundData[0] ) |
| 1351 | 586 expressionDuration = (sLastTrackLengthMS << 7) / 1000; |
| 587 } | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
588 PlayEmotion(expression, expressionDuration); |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
589 } |
| 0 | 590 } |
| 591 // 4948B1: using guessed type int var_1C[5]; | |
| 592 | |
| 593 //----- (00494A25) -------------------------------------------------------- | |
| 187 | 594 void Player::PlayEmotion(CHARACTER_EXPRESSION_ID new_expression, int a3) |
| 595 { | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
596 unsigned int v3 = expression; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
597 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
|
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 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
|
602 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
603 return; |
|
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 else |
|
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 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
|
608 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
609 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
|
610 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
611 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
612 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
613 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
614 } |
| 0 | 615 this->uExpressionTimePassed = 0; |
| 616 if ( !a3 ) | |
| 617 { | |
| 187 | 618 this->uExpressionTimeLength = 8 * pPlayerFrameTable->pFrames[a3].uAnimLength; |
| 619 } | |
|
1353
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
620 else |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
621 { |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
622 this->uExpressionTimeLength = 0; |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
623 } |
| 187 | 624 expression = new_expression; |
| 0 | 625 viewparams->bRedrawGameUI = 1; |
| 626 } | |
| 627 | |
| 628 //----- (0049327B) -------------------------------------------------------- | |
| 1355 | 629 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
|
630 { |
| 135 | 631 if ( this->classType == uClass ) |
| 0 | 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 return true; |
| 0 | 634 } |
| 635 else | |
| 636 { | |
|
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
|
637 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
|
638 { |
|
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
|
639 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
|
640 } |
| 0 | 641 switch ( uClass ) |
| 642 { | |
| 643 case 0x1Au: | |
|
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, 65)); |
| 0 | 645 case 0x1Bu: |
|
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, 67)); |
| 0 | 647 case 0x22u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
648 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 77)); |
| 0 | 649 case 0x23u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
650 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 79)); |
| 0 | 651 break; |
| 652 default: | |
|
1354
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
653 assert("Should not be able to get here" && false); |
| 0 | 654 break; |
| 655 } | |
|
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
|
656 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
|
657 } |
| 0 | 658 } |
| 659 | |
| 660 | |
| 661 //----- (00492C0B) -------------------------------------------------------- | |
| 662 bool Player::CanAct() | |
| 663 { | |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
664 if ( this->IsAsleep() || this->IsParalyzed() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
665 this->IsUnconcious() || this->IsDead() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
666 this->IsPertified() || this->IsEradicated() ) |
| 1355 | 667 return false; |
| 0 | 668 else |
| 1355 | 669 return true; |
| 0 | 670 } |
| 671 | |
| 672 //----- (00492C40) -------------------------------------------------------- | |
| 673 bool Player::CanSteal() | |
| 674 { | |
| 1355 | 675 return GetActualSkillLevel(PLAYER_SKILL_STEALING) != 0; |
| 0 | 676 } |
| 677 | |
| 678 //----- (00492C4E) -------------------------------------------------------- | |
| 679 bool Player::CanEquip_RaceAndAlignmentCheck(unsigned int uItemID) | |
| 680 { | |
|
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
|
681 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
|
682 { |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
683 case ITEM_RELIC_ETHRICS_STAFF: |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
684 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
|
685 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
|
686 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
|
687 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
|
688 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
|
689 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
|
690 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
|
691 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
|
692 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
|
693 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
|
694 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
|
695 default: return 1; break; |
|
1356
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
696 } |
|
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
697 } |
|
1360
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
698 |
| 0 | 699 //----- (00492D65) -------------------------------------------------------- |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
700 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
|
701 { |
|
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 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
|
703 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
|
704 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
|
705 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
|
706 |
|
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
|
707 if ( pConditions[uConditionIdx] ) |
|
1361
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
710 if (!ConditionProcessor::IsPlayerAffected(this, uConditionIdx, a3)) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
711 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
712 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
713 } |
|
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
|
714 |
|
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
|
715 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
|
716 { |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
717 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
|
718 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
|
719 case Condition_Sleep: break; //nosound |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
720 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
|
721 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
|
722 case Condition_Insane: PlaySound(SPEECH_29, 0); break; |
| 1014 | 723 case Condition_Poison1: |
| 724 case Condition_Poison2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
725 case Condition_Poison3: PlaySound(SPEECH_27, 0); break; |
| 1014 | 726 case Condition_Disease1: |
| 727 case Condition_Disease2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
728 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
|
729 case Condition_Paralyzed: break; //nosound |
| 1014 | 730 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
|
731 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
|
732 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
|
733 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 break; |
| 1014 | 735 case Condition_Dead: |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
736 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
|
737 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
|
738 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
|
739 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
|
740 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
|
741 break; |
| 1014 | 742 case Condition_Pertified: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
743 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
|
744 break; |
| 1014 | 745 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
|
746 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
|
747 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
|
748 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
|
749 if ( sMana > 0 ) |
| 1014 | 750 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
|
751 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
|
752 case Condition_Zombie: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
753 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
|
754 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
|
755 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
|
756 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
|
757 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
|
758 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
|
759 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
|
760 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
|
761 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
|
762 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
763 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
|
764 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
|
765 } |
|
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 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
|
767 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
768 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
|
769 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
|
770 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
771 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
|
772 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
|
773 } |
|
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
|
774 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
775 players_before = 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
776 for (int i = 1; i < 5; ++i) |
|
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 if ( pPlayers[i]->CanAct() ) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
779 ++players_before; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
780 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
781 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
782 pConditions[uConditionIdx] = 1; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
783 |
|
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
|
784 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
|
785 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
|
786 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
|
787 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
788 if ( 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
|
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 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
|
791 ++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
|
792 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
793 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
794 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
|
795 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
796 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
|
797 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
798 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
|
799 } |
| 0 | 800 |
| 801 //----- (00492528) -------------------------------------------------------- | |
| 802 bool Player::CanFitItem(unsigned int uSlot, unsigned int uItemID) | |
| 803 { | |
| 1363 | 804 Texture *texture; // esi@1 |
| 805 unsigned int slotWidth; // ebx@1 | |
| 806 unsigned int slotHeight; // [sp+1Ch] [bp+Ch]@1 | |
| 807 | |
| 808 texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); | |
| 809 slotWidth = GetSizeInInventorySlots(texture->uTextureWidth); | |
| 810 slotHeight = GetSizeInInventorySlots(texture->uTextureHeight); | |
| 0 | 811 if ( !areWeLoadingTexture ) |
| 812 { | |
| 1363 | 813 texture->Release(); |
| 1006 | 814 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 815 } |
| 1363 | 816 if ( slotHeight == 0 || slotWidth == 0) |
| 817 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
818 assert("Items should have nonzero dimensions" && false); |
| 1363 | 819 return 1; |
| 820 } | |
| 821 if ( (slotWidth + uSlot % INVETORYSLOTSWIDTH) <= INVETORYSLOTSWIDTH && (slotHeight + uSlot / INVETORYSLOTSWIDTH) <= INVETORYSLOTSHEIGHT ) | |
| 822 { | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
823 for (unsigned int x = 0; x < slotWidth; x++) |
| 1363 | 824 { |
|
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
|
825 for (unsigned int y = 0; y < slotHeight; y++) |
| 1363 | 826 { |
|
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
|
827 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
|
828 { |
|
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
|
829 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
|
830 } |
| 1363 | 831 } |
| 832 } | |
| 833 return true; | |
| 834 } | |
| 835 return false; | |
| 0 | 836 } |
| 837 // 506128: using guessed type int areWeLoadingTexture; | |
| 838 | |
| 839 //----- (004925E6) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
840 int Player::FindFreeInventoryListSlot() |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
841 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
842 for (int i = 0; i < 126; i++ ) |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
843 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
844 if (pInventoryItemList[i].uItemID == 0) |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
845 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
846 return i; |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
847 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
848 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
849 return -1; |
| 0 | 850 } |
| 851 | |
| 852 //----- (00492600) -------------------------------------------------------- | |
| 853 int Player::CreateItemInInventory(unsigned int uSlot, unsigned int uItemID) | |
| 854 { | |
| 855 int result; // eax@8 | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
856 signed int freeSlot; // [sp+8h] [bp-4h]@4 |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
857 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
858 freeSlot = FindFreeInventoryListSlot(); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
859 if ( freeSlot == -1 ) |
| 0 | 860 { |
| 861 if ( uActiveCharacter ) | |
| 201 | 862 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NoRoom, 0); |
|
1366
8f339c3bbdaf
Player::CreateItemInInventory small bugfix from previous change
Grumpy7
parents:
1365
diff
changeset
|
863 return 0; |
| 0 | 864 } |
| 865 else | |
| 866 { | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
867 PutItemArInventoryIndex(uItemID, freeSlot, uSlot); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
868 result = freeSlot + 1; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
869 this->pInventoryItemList[freeSlot].uItemID = uItemID; |
| 0 | 870 } |
| 871 return result; | |
| 872 } | |
| 873 // 506128: using guessed type int areWeLoadingTexture; | |
| 874 | |
| 875 //----- (00492700) -------------------------------------------------------- | |
| 876 int Player::HasSkill(unsigned int uSkillType) | |
| 877 { | |
| 1374 | 878 if ( uSkillType >= 37 || this->pActiveSkills[uSkillType] ) |
| 879 { | |
| 880 return 1; | |
| 0 | 881 } |
| 882 else | |
| 883 { | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
884 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[67], this->pName); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
885 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1374 | 886 return 0; |
| 887 } | |
| 0 | 888 } |
| 889 | |
| 890 //----- (00492745) -------------------------------------------------------- | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
891 void Player::WearItem( unsigned int uItemID ) |
| 0 | 892 { |
| 1010 | 893 int item_body_anch; // edi@6 |
| 894 int item_indx; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
895 item_indx = FindFreeInventoryListSlot(); |
| 1010 | 896 |
| 897 if ( item_indx != -1 ) | |
| 898 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
899 pInventoryItemList[item_indx].uItemID = uItemID; |
| 1374 | 900 item_body_anch = pEquipTypeToBodyAnchor[pItemsTable->pItems[uItemID].uEquipType]; |
| 901 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
|
902 pInventoryItemList[item_indx].uBodyAnchor = item_body_anch + 1; |
| 0 | 903 } |
| 904 } | |
| 905 | |
| 906 //----- (004927A8) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
907 int Player::AddItem(int index, unsigned int uItemID) |
| 0 | 908 { |
| 1374 | 909 int xStartValue = 0; |
| 910 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
911 if ( index == -1 ) |
| 0 | 912 { |
| 1385 | 913 for (int xcoord = 0; xcoord < INVETORYSLOTSWIDTH; xcoord++) |
| 914 { | |
|
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
|
915 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) |
| 0 | 916 { |
|
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
|
917 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
|
918 { |
|
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
|
919 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
|
920 } |
| 0 | 921 } |
| 1385 | 922 } |
| 0 | 923 return 0; |
| 924 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
925 if ( !CanFitItem(index, uItemID) ) |
| 0 | 926 { |
| 927 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); | |
| 928 return 0; | |
| 929 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
930 return CreateItemInInventory(index, uItemID); |
| 0 | 931 } |
| 932 | |
| 933 //----- (00492826) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
934 int Player::AddItem2(int index, ItemGen *Src) |
| 0 | 935 { |
| 936 pItemsTable->SetSpecialBonus(Src); | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
937 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
938 if ( index == -1 ) |
| 0 | 939 { |
|
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
|
940 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
|
941 { |
|
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
|
942 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) //TODO: change pInventoryMatrix to 2 dimensional array. |
| 1385 | 943 { |
|
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
|
944 if ( CanFitItem(ycoord * INVETORYSLOTSWIDTH + xcoord, Src->uItemID) ) |
| 0 | 945 { |
|
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
|
946 return CreateItemInInventory2(ycoord * INVETORYSLOTSWIDTH + xcoord, Src); |
| 0 | 947 } |
| 1385 | 948 } |
| 0 | 949 } |
| 950 return 0; | |
| 951 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
952 if ( !CanFitItem(index, Src->uItemID) ) |
| 0 | 953 return 0; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
954 return CreateItemInInventory2(index, Src); |
| 0 | 955 } |
| 956 | |
| 957 //----- (0049289C) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
958 int Player::CreateItemInInventory2( unsigned int index, ItemGen *Src ) |
| 0 | 959 { |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
960 signed int freeSlot; // ebx@1 |
| 0 | 961 int result; // eax@6 |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
962 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
963 freeSlot = FindFreeInventoryListSlot(); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
964 if ( freeSlot == -1 ) |
| 0 | 965 { |
| 966 result = 0; | |
| 967 } | |
| 968 else | |
| 969 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
970 PutItemArInventoryIndex(Src->uItemID, freeSlot, index); |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
971 memcpy(&pInventoryItemList[freeSlot], Src, sizeof(ItemGen)); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
972 result = freeSlot + 1; |
| 0 | 973 } |
| 974 return result; | |
| 975 } | |
| 976 // 506128: using guessed type int areWeLoadingTexture; | |
| 977 | |
| 978 //----- (0049298B) -------------------------------------------------------- | |
| 1385 | 979 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
|
980 { |
| 1014 | 981 Texture *item_texture; // esi@1 |
| 982 int *pInvPos; // esi@4 | |
| 983 unsigned int slot_width; // [sp+Ch] [bp-4h]@1 | |
| 984 unsigned int slot_height; // [sp+18h] [bp+8h]@1 | |
| 985 | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
986 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1014 | 987 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); |
| 988 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 989 if ( !areWeLoadingTexture ) |
| 990 { | |
| 1014 | 991 item_texture->Release(); |
| 1006 | 992 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 993 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
994 if ( slot_width > 0 ) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
995 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
996 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
997 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
998 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
999 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
|
1000 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1001 } |
| 1014 | 1002 } |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1003 pInventoryMatrix[index] = itemListPos + 1; |
| 0 | 1004 } |
| 278 | 1005 |
| 0 | 1006 // 506128: using guessed type int areWeLoadingTexture; |
| 1007 | |
| 1008 //----- (00492A36) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1009 void Player::RemoveItemAtInventoryIndex( unsigned int index ) |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1010 { |
| 1014 | 1011 ItemGen *item_in_slot; // ecx@1 |
| 1012 Texture *item_texture; // esi@1 | |
| 1013 unsigned int slot_height; // ebp@1 | |
| 1014 int *pInvPos; // edx@4 | |
| 1015 unsigned int slot_width; // [sp+14h] [bp+4h]@1 | |
| 1016 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1017 item_in_slot = &this->pInventoryItemList[pInventoryMatrix[index]-1]; |
| 1014 | 1018 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[item_in_slot->uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1019 item_in_slot->Reset(); | |
| 1020 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); | |
| 1021 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 1022 if ( !areWeLoadingTexture ) |
| 1023 { | |
| 1014 | 1024 item_texture->Release(); |
| 1006 | 1025 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1026 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1027 if ( slot_width > 0 ) |
| 1014 | 1028 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1029 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1030 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1031 { |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1032 memset32(pInvPos, 0, slot_width); |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1033 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1034 } |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1035 } |
| 0 | 1036 } |
| 1037 // 506128: using guessed type int areWeLoadingTexture; | |
| 1038 | |
| 1039 //----- (00490EEE) -------------------------------------------------------- | |
| 1386 | 1040 int Player::SelectPhrasesTransaction(ItemGen *pItem, int building_type, int BuildID_2Events, int ShopMenuType) //TODO: probably move this somewhere else, not really Player:: stuff |
| 1041 { | |
| 1042 unsigned int idemId; // edx@1 | |
| 1043 signed int equipType; // esi@1 | |
| 1044 float multiplier; // ST04_4@26 | |
| 1045 int price; // edi@26 | |
| 1046 int merchantLevel; // [sp+10h] [bp-8h]@1 | |
| 1047 int itemValue; | |
| 1048 | |
| 1049 merchantLevel = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); | |
| 1050 idemId = pItem->uItemID; | |
| 1051 equipType = pItemsTable->pItems[idemId].uEquipType; | |
| 1052 itemValue = pItem->GetValue(); | |
| 1053 | |
| 1054 switch (building_type) | |
| 1055 { | |
| 1411 | 1056 case BuildingType_WeaponShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1057 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1058 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1059 if (equipType > EQUIP_BOW) |
| 1386 | 1060 return 4; |
| 1061 break; | |
| 1411 | 1062 case BuildingType_ArmorShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1063 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1064 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1065 if ( equipType < EQUIP_ARMOUR || equipType > EQUIP_BOOTS) |
| 1386 | 1066 return 4; |
| 1067 break; | |
| 1411 | 1068 case BuildingType_MagicShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1069 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1070 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1071 if ( pItemsTable->pItems[idemId].uSkillType != PLAYER_SKILL_MISC ) |
| 1386 | 1072 return 4; |
| 1073 break; | |
| 1411 | 1074 case BuildingType_AlchemistShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1075 if ((idemId >= ITEM_ARTIFACT_HERMES_SANDALS && idemId < ITEM_RECIPE_REJUVENATION) || idemId > ITEM_RECIPE_BODY_RESISTANCE) |
| 1386 | 1076 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1077 if ( !(equipType == EQUIP_REAGENT || equipType == EQUIP_POTION || equipType == EQUIP_MESSAGE_SCROLL)) |
| 1386 | 1078 return 4; |
| 1079 break; | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1080 default: |
|
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1081 assert(false); |
|
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1082 break; |
| 1386 | 1083 } |
| 1084 if (pItem->Stolen()) | |
| 1085 return 6; | |
| 1086 | |
| 1087 multiplier = p2DEvents[BuildID_2Events - 1].fPriceMultiplier; | |
| 1088 switch (ShopMenuType) | |
| 1089 { | |
| 1090 case 2: | |
| 1091 price = GetBuyingPrice(itemValue, multiplier); | |
| 1092 break; | |
| 1093 case 3: | |
| 917 | 1094 if (pItem->Broken()) |
| 1386 | 1095 price = 1; |
| 917 | 1096 else |
| 1386 | 1097 price = this->GetPriceSell(itemValue, multiplier); |
| 1098 break; | |
| 1099 case 4: | |
| 1100 price = this->GetPriceIdentification(multiplier); | |
| 1101 break; | |
| 1102 case 5: | |
| 1103 price = this->GetPriceRepair(itemValue, multiplier); | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1104 break; |
|
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1105 default: |
|
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1106 assert(false); |
| 1386 | 1107 break; |
| 1108 } | |
| 1109 if ( merchantLevel ) | |
| 1110 { | |
| 1111 if (price == itemValue) | |
| 1112 { | |
| 1113 return 3; | |
| 1114 } | |
| 917 | 1115 else |
| 1386 | 1116 { |
| 1117 return 2; | |
| 1118 } | |
| 1119 } | |
| 0 | 1120 else |
| 1386 | 1121 { |
| 1122 return 1; | |
| 1123 } | |
| 0 | 1124 } |
| 1125 | |
| 1126 //----- (0049107D) -------------------------------------------------------- | |
| 1127 int Player::GetBodybuilding() | |
| 1128 { | |
| 1010 | 1129 int v1; // al@1 |
| 0 | 1130 int v2; // ecx@1 |
| 1131 int v4; // eax@3 | |
| 1132 signed int v6; // [sp-4h] [bp-4h]@2 | |
| 1133 | |
| 1134 v1 = GetActualSkillLevel(PLAYER_SKILL_BODYBUILDING); | |
| 1135 v2 = v1 & 0x3F; | |
| 1136 if ( v1 & 0x100 ) | |
| 1137 { | |
| 1138 v6 = 5; | |
| 1139 } | |
| 1140 else | |
| 1141 { | |
| 1008 | 1142 if ( (v1&0xFF) >= 0 ) |
| 0 | 1143 { |
| 1144 v4 = ((v1 & 0x40) != 0) + 1; | |
| 1145 return v2 * v4; | |
| 1146 } | |
| 1147 v6 = 3; | |
| 1148 } | |
| 1149 v4 = v6; | |
| 1150 return v2 * v4; | |
| 1151 } | |
| 1152 | |
| 1153 //----- (004910A8) -------------------------------------------------------- | |
| 607 | 1154 int Player::GetMeditation() |
| 0 | 1155 { |
| 1010 | 1156 int v1; // al@1 |
| 1008 | 1157 int base_level; // ecx@1 |
| 0 | 1158 int v4; // eax@3 |
| 1159 signed int v6; // [sp-4h] [bp-4h]@2 | |
| 1160 | |
| 1161 v1 = GetActualSkillLevel(PLAYER_SKILL_MEDITATION); | |
| 1008 | 1162 base_level = v1 & 0x3F; |
| 0 | 1163 if ( v1 & 0x100 ) |
| 1164 { | |
| 1165 v6 = 5; | |
| 1166 } | |
| 1167 else | |
| 1168 { | |
| 1008 | 1169 if ( (v1&0xFF) >= 0 ) |
| 0 | 1170 { |
| 1171 v4 = ((v1 & 0x40) != 0) + 1; | |
| 1008 | 1172 return base_level * v4; |
| 0 | 1173 } |
| 1174 v6 = 3; | |
| 1175 } | |
| 1176 v4 = v6; | |
| 1008 | 1177 return base_level * v4; |
| 0 | 1178 } |
| 1179 | |
| 1180 //----- (004910D3) -------------------------------------------------------- | |
| 1181 int Player::CanIdentify(ItemGen *pItem) | |
| 1182 { | |
| 1183 unsigned __int16 v2; // ax@1 | |
| 1184 unsigned __int16 v3; // bx@1 | |
| 1185 int uSkillMult; // eax@3 | |
| 1186 int v5; // edi@7 | |
| 1187 signed int v6; // ebp@7 | |
| 1188 char *v7; // esi@7 | |
| 1189 signed int uSkillMultiplier; // [sp-4h] [bp-14h]@2 | |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
1190 |
| 652 | 1191 if (CheckHiredNPCSpeciality(Scholar)) |
| 1192 return true; | |
| 0 | 1193 |
| 179 | 1194 v2 = pPlayers[uActiveCharacter]->GetActualSkillLevel(PLAYER_SKILL_ITEM_ID); |
| 0 | 1195 v3 = v2; |
| 179 | 1196 if ( v2 & 1 ) |
| 0 | 1197 { |
| 1198 uSkillMultiplier = 5; | |
| 1199 } | |
| 1200 else | |
| 1201 { | |
| 1202 if ( (v2 & 0x80u) == 0 ) | |
| 1203 { | |
| 1204 uSkillMult = ((v2 & 0x40) != 0) + 1; | |
| 179 | 1205 v5 = uSkillMult * (v3 & 0x3F); |
| 1206 v6 = 0; | |
| 1207 v7 = (char *)&pItemsTable->pItems[pItem->uItemID].pIconName; | |
| 652 | 1208 |
| 179 | 1209 if ( (signed int)SkillToMastery(v3) >= 4 ) |
| 1210 v6 = 1; | |
| 1211 if ( v5 >= (unsigned __int8)v7[46] ) | |
| 1212 v6 = 1; | |
| 1213 return v6; | |
| 0 | 1214 } |
| 1215 uSkillMultiplier = 3; | |
| 1216 } | |
| 1217 uSkillMult = uSkillMultiplier; | |
| 1218 v5 = uSkillMult * (v3 & 0x3F); | |
| 1219 v6 = 0; | |
| 1220 v7 = (char *)&pItemsTable->pItems[pItem->uItemID].pIconName; | |
| 652 | 1221 |
| 0 | 1222 if ( (signed int)SkillToMastery(v3) >= 4 ) |
| 1223 v6 = 1; | |
| 1224 if ( v5 >= (unsigned __int8)v7[46] ) | |
| 1225 v6 = 1; | |
| 1226 return v6; | |
| 1227 } | |
| 1228 | |
| 1229 //----- (00491151) -------------------------------------------------------- | |
| 1230 int Player::CanRepair(ItemGen *a2) | |
| 1231 { | |
| 1232 unsigned __int16 v2; // ax@1 | |
| 1233 unsigned __int16 v3; // bx@1 | |
| 1234 int v4; // eax@3 | |
| 1235 int v5; // edi@7 | |
| 1236 signed int v6; // ebp@7 | |
| 1237 signed int v10; // [sp-4h] [bp-14h]@2 | |
| 1238 | |
| 652 | 1239 |
| 1240 auto v7 = &pItemsTable->pItems[a2->uItemID]; | |
| 1241 if (CheckHiredNPCSpeciality(Smith) && v7->uEquipType <= 2 || | |
| 1242 CheckHiredNPCSpeciality(Armorer) && v7->uEquipType >= 3 && v7->uEquipType <= 9 || | |
| 1243 CheckHiredNPCSpeciality(Alchemist) && v7->uEquipType >= 9 ) | |
| 1244 return true; | |
| 1245 | |
| 1010 | 1246 v2 = GetActualSkillLevel(PLAYER_SKILL_REPAIR); |
| 0 | 1247 v3 = v2; |
| 1010 | 1248 if (v2 & 0x100 ) |
| 0 | 1249 { |
| 1250 v10 = 5; | |
| 1251 } | |
| 1252 else | |
| 1253 { | |
| 1254 if ( (v2 & 0x80u) == 0 ) | |
| 1255 { | |
| 1256 v4 = ((v2 & 0x40) != 0) + 1; | |
| 1257 goto LABEL_7; | |
| 1258 } | |
| 1259 v10 = 3; | |
| 1260 } | |
| 1261 v4 = v10; | |
| 1262 LABEL_7: | |
| 1263 v5 = v4 * (v3 & 0x3F); | |
| 1264 v6 = 0; | |
| 1265 if ( (signed int)SkillToMastery(v3) >= 4 ) | |
| 1266 return true; | |
| 1267 if ( v5 >= *((char *)(v7 + 1) + 2) ) | |
| 1268 { | |
| 1269 __debugbreak(); // really odd | |
| 1270 return true; | |
| 1271 } | |
| 1272 return false; | |
| 1273 } | |
| 1274 | |
| 1275 //----- (004911F3) -------------------------------------------------------- | |
| 1276 int Player::GetMerchant() | |
| 1277 { | |
| 1278 Player *v1; // edi@1 | |
| 1279 unsigned __int16 v2; // ax@1 | |
| 1280 unsigned __int16 v3; // bx@1 | |
| 1281 int v4; // esi@1 | |
| 1282 int v5; // edi@1 | |
| 1283 int v7; // eax@3 | |
| 1284 int v8; // ecx@7 | |
| 1285 signed int v9; // [sp-4h] [bp-10h]@6 | |
| 1286 | |
| 1287 v1 = this; | |
| 607 | 1288 v2 = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); |
| 1010 | 1289 v3 = v1->pActiveSkills[PLAYER_SKILL_MERCHANT]; |
| 607 | 1290 v4 = v2 & 0x003F; |
| 1010 | 1291 v5 = v1->pActiveSkills[PLAYER_SKILL_MERCHANT] & 0x3F; |
| 0 | 1292 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 1293 return 10000; | |
| 1294 v7 = GetPartyReputation(); | |
| 1295 if ( !v4 ) | |
| 1296 return -v7; | |
| 1010 | 1297 if ( v3 & 0x100 ) |
| 0 | 1298 { |
| 1299 v9 = 5; | |
| 1300 } | |
| 1301 else | |
| 1302 { | |
| 1303 if ( (v3 & 0x80u) == 0 ) | |
| 1304 { | |
| 1305 v8 = ((v3 & 0x40) != 0) + 1; | |
| 1306 return v5 * (v8 - 1) - v7 + v4 + 7; | |
| 1307 } | |
| 1308 v9 = 3; | |
| 1309 } | |
| 1310 v8 = v9; | |
| 1311 return v5 * (v8 - 1) - v7 + v4 + 7; | |
| 1312 } | |
| 1313 | |
| 1314 //----- (0049125A) -------------------------------------------------------- | |
| 1315 int Player::GetPerception() | |
| 1316 { | |
| 1317 Player *v1; // edi@1 | |
| 1318 unsigned __int16 v2; // ax@1 | |
| 1319 unsigned __int16 v3; // bx@1 | |
| 1320 int v4; // esi@1 | |
| 1321 int v5; // edi@1 | |
| 1322 int v7; // eax@5 | |
| 1323 signed int v8; // [sp-4h] [bp-10h]@4 | |
| 1324 | |
| 1325 v1 = this; | |
| 1010 | 1326 v2 = GetActualSkillLevel(PLAYER_SKILL_PERCEPTION); |
| 1327 v3 = v1->pActiveSkills[PLAYER_SKILL_PERCEPTION]; | |
| 0 | 1328 v4 = v2 & 0x3F; |
| 1010 | 1329 v5 = v1->pActiveSkills[PLAYER_SKILL_PERCEPTION] & 0x3F; |
| 0 | 1330 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 1331 return 10000; | |
| 1010 | 1332 if ( v3 & 0x100 ) |
| 0 | 1333 { |
| 1334 v8 = 5; | |
| 1335 } | |
| 1336 else | |
| 1337 { | |
| 1338 if ( (v3 & 0x80u) == 0 ) | |
| 1339 { | |
| 1340 v7 = ((v3 & 0x40) != 0) + 1; | |
| 1341 return v4 + v5 * (v7 - 1); | |
| 1342 } | |
| 1343 v8 = 3; | |
| 1344 } | |
| 1345 v7 = v8; | |
| 1346 return v4 + v5 * (v7 - 1); | |
| 1347 } | |
| 1348 | |
| 1349 //----- (004912B0) -------------------------------------------------------- | |
| 1350 int Player::GetDisarmTrap() | |
| 1351 { | |
| 1352 Player *v1; // ebp@1 | |
| 1353 unsigned __int16 v2; // ax@1 | |
| 1354 unsigned __int16 v3; // bx@1 | |
| 1355 int v4; // esi@1 | |
| 1356 int v5; // edi@1 | |
| 1357 int v7; // eax@7 | |
| 1358 signed int v8; // [sp-4h] [bp-14h]@6 | |
| 1359 | |
| 1360 v1 = this; | |
| 1010 | 1361 v2 = GetActualSkillLevel(PLAYER_SKILL_TRAP_DISARM); |
| 0 | 1362 v3 = v1->pActiveSkills[29]; |
| 1363 v4 = v2 & 0x3F; | |
| 1364 v5 = v1->pActiveSkills[29] & 0x3F; | |
| 1365 if ( (signed int)SkillToMastery(v2) >= 4 ) | |
| 1366 return 10000; | |
| 1367 if ( HasEnchantedItemEquipped(35) ) | |
| 1368 v4 *= 2; | |
| 1010 | 1369 if ( v3 & 0x100 ) |
| 0 | 1370 { |
| 1371 v8 = 5; | |
| 1372 } | |
| 1373 else | |
| 1374 { | |
| 1375 if ( (v3 & 0x80u) == 0 ) | |
| 1376 { | |
| 1377 v7 = ((v3 & 0x40) != 0) + 1; | |
| 1378 return v4 + v5 * (v7 - 1); | |
| 1379 } | |
| 1380 v8 = 3; | |
| 1381 } | |
| 1382 v7 = v8; | |
| 1383 return v4 + v5 * (v7 - 1); | |
| 1384 } | |
| 1385 | |
| 1386 //----- (00491317) -------------------------------------------------------- | |
| 1387 char Player::GetLearningPercent() | |
| 1388 { | |
| 1389 Player *v1; // esi@1 | |
| 1390 int v2; // eax@1 | |
| 1391 unsigned __int16 v3; // bx@1 | |
| 1392 int v4; // ecx@1 | |
| 1393 int v5; // eax@4 | |
| 1394 signed int v7; // [sp-4h] [bp-Ch]@3 | |
| 1395 | |
| 1396 v1 = this; | |
| 1010 | 1397 v2 = GetActualSkillLevel(PLAYER_SKILL_LEARNING); |
| 0 | 1398 v3 = v1->pActiveSkills[36]; |
| 1399 v4 = v2 & 0x3F; | |
| 1400 if ( v2 ) | |
| 1401 { | |
| 1010 | 1402 if (v3 & 0x100 ) |
| 0 | 1403 { |
| 1404 v7 = 5; | |
| 1405 } | |
| 1406 else | |
| 1407 { | |
| 1408 if ( (v3 & 0x80u) == 0 ) | |
| 1409 { | |
| 1410 v5 = ((v3 & 0x40) != 0) + 1; | |
| 1411 goto LABEL_8; | |
| 1412 } | |
| 1413 v7 = 3; | |
| 1414 } | |
| 1415 v5 = v7; | |
| 1416 LABEL_8: | |
| 1417 v2 = (v1->pActiveSkills[36] & 0x3F) * (v5 - 1) + v4 + 9; | |
| 1418 } | |
| 1419 return v2; | |
| 1420 } | |
| 1421 | |
| 1422 //----- (0048C6AF) -------------------------------------------------------- | |
| 1423 Player::Player() | |
| 1424 { | |
| 1425 memset(&pEquipment, 0, sizeof(PlayerEquipment)); | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1426 memset(pInventoryMatrix, 0, 126 * sizeof(int)); |
| 0 | 1427 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
|
1428 pInventoryItemList[i].Reset(); |
| 0 | 1429 for (uint i = 0; i < 12; ++i) |
| 1430 pEquippedItems[i].Reset(); | |
| 1431 | |
| 1432 | |
| 1433 for (uint i = 0; i < 24; ++i) | |
| 1434 { | |
| 1435 pPlayerBuffs[i].uSkill = 0; | |
| 1436 pPlayerBuffs[i].uSkill = 0; | |
| 1437 pPlayerBuffs[i].uPower = 0; | |
| 1438 pPlayerBuffs[i].uExpireTime = 0; | |
| 1439 pPlayerBuffs[i].uCaster = 0; | |
| 1440 pPlayerBuffs[i].uFlags = 0; | |
| 1441 } | |
| 1442 | |
| 1443 pName[0] = 0; | |
| 1014 | 1444 uCurrentFace = 0; |
| 0 | 1445 uVoiceID = 0; |
| 1446 memset(pConditions, 0, 20 * sizeof(__int64)); | |
| 1447 | |
| 1448 field_BB = 0; | |
| 1449 | |
| 1450 uMight = uMightBonus = 0; | |
| 1451 uIntelligence = uIntelligenceBonus = 0; | |
| 1452 uWillpower = uWillpowerBonus = 0; | |
| 1453 uEndurance = uEnduranceBonus = 0; | |
| 1454 uSpeed = uSpeedBonus = 0; | |
| 1455 uAccuracy = uAccuracyBonus = 0; | |
| 1456 uLuck = uLuckBonus = 0; | |
| 1457 uLevel = sLevelModifier = 0; | |
| 1458 sAgeModifier = 0; | |
|
1388
60d4885eb107
sACModifier zeroed in player constructor so AC is not always 0(or -some value) ingame
Grumpy7
parents:
1387
diff
changeset
|
1459 sACModifier = 0; |
| 0 | 1460 |
| 1019 | 1461 // memset(field_1F5, 0, 30); |
| 1462 pure_luck_used=0; | |
| 1463 pure_speed_used=0; | |
| 1464 pure_intellect_used=0; | |
| 1465 pure_endurance_used=0; | |
| 1466 pure_willpower_used=0; | |
| 1467 pure_accuracy_used=0; | |
| 1468 pure_might_used=0; | |
| 0 | 1469 |
| 1470 sResFireBase = sResFireBonus = 0; | |
| 1471 sResAirBase = sResAirBonus = 0; | |
| 1472 sResWaterBase = sResWaterBonus = 0; | |
| 1473 sResEarthBase = sResEarthBonus = 0; | |
| 1474 sResMagicBase = sResMagicBonus = 0; | |
| 1475 sResSpiritBase = sResSpiritBonus = 0; | |
| 1476 sResMindBase = sResMindBonus = 0; | |
| 1477 sResBodyBase = sResBodyBonus = 0; | |
| 1478 sResLightBase = sResLightBonus = 0; | |
| 1479 sResDarkBase = sResDarkBonus = 0; | |
| 1480 | |
| 1481 uTimeToRecovery = 0; | |
| 1482 | |
| 1483 uSkillPoints = 0; | |
| 1484 | |
| 1485 sHealth = 0; | |
| 1486 uFullHealthBonus = 0; | |
| 1487 _health_related = 0; | |
| 1488 | |
| 1489 sMana = 0; | |
| 1490 uFullManaBonus = 0; | |
| 1491 _mana_related = 0; | |
| 1492 | |
| 1493 uQuickSpell = 0; | |
| 1494 memset(pInstalledBeacons, 0, 5 * sizeof(LloydBeacon)); | |
| 1495 | |
| 1496 _some_attack_bonus = 0; | |
| 1497 field_1A91 = 0; | |
| 1498 _melee_dmg_bonus = 0; | |
| 1499 field_1A93 = 0; | |
| 1500 _ranged_atk_bonus = 0; | |
| 1501 field_1A95 = 0; | |
| 1502 _ranged_dmg_bonus = 0; | |
| 1503 field_1A97 = 0; | |
| 1504 | |
| 130 | 1505 expression = CHARACTER_EXPRESSION_INVALID; |
| 0 | 1506 uExpressionTimePassed = 0; |
| 1507 uExpressionTimeLength = 0; | |
| 1508 | |
| 1509 uNumDivineInterventionCastsThisDay = 0; | |
| 1510 uNumArmageddonCasts = 0; | |
| 1511 uNumFireSpikeCasts = 0; | |
| 1512 | |
| 1513 memset(field_1988, 0, 49 * sizeof(int)); | |
| 1514 memset(field_1A50, 0, 64 * sizeof(char)); | |
| 1515 | |
| 1516 field_E0 = 0; | |
| 1517 field_E4 = 0; | |
| 1518 field_E8 = 0; | |
| 1519 field_EC = 0; | |
| 1520 field_F0 = 0; | |
| 1521 field_F4 = 0; | |
| 1522 field_F8 = 0; | |
| 1523 field_FC = 0; | |
| 1524 field_100 = 0; | |
| 1525 field_104 = 0; | |
| 198 | 1526 |
|
554
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1527 _expression21_animtime = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1528 _expression21_frameset = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1529 |
| 198 | 1530 lastOpenedSpellbookPage = 0; |
| 0 | 1531 } |
| 1532 | |
| 1533 //----- (0048C6F6) -------------------------------------------------------- | |
| 1534 bool Party::AddItem(ItemGen *pItem) | |
| 1535 { | |
| 1536 unsigned int v2; // eax@1 | |
| 1537 unsigned int v3; // ecx@4 | |
| 1538 signed int v4; // edx@4 | |
| 1539 char *v5; // eax@8 | |
| 973 | 1540 //unsigned int v6; // eax@10 |
| 0 | 1541 Texture *v7; // ebx@10 |
| 1542 signed int v8; // esi@10 | |
| 1543 Player *v9; // edi@11 | |
| 1544 int v10; // eax@11 | |
| 1545 bool result; // eax@15 | |
| 1546 std::string v12; // [sp-18h] [bp-40h]@9 | |
| 1010 | 1547 |
| 1548 | |
| 188 | 1549 int v15[4] = {0, 1, 2, 3}; // [sp+Ch] [bp-1Ch]@3 |
| 1550 //int v16; // [sp+10h] [bp-18h]@3 | |
| 1551 //int v17; // [sp+14h] [bp-14h]@3 | |
| 1552 //int v18; // [sp+18h] [bp-10h]@3 | |
| 0 | 1553 Player *v19; // [sp+1Ch] [bp-Ch]@9 |
| 1554 Party *v20; // [sp+20h] [bp-8h]@1 | |
| 1555 int v21; // [sp+24h] [bp-4h]@10 | |
| 1556 | |
| 1557 auto thos = this; | |
| 1558 | |
| 1559 v20 = thos; | |
| 1560 v2 = pItem->uItemID; | |
| 222 | 1561 if ( !pItemsTable->pItems[v2].uItemID_Rep_St ) |
| 315 | 1562 pItem->SetIdentified(); |
| 188 | 1563 ///v15 = 0; |
| 1564 //v16 = 1; | |
| 1565 //v18 = 3; | |
| 1566 //v17 = 2; | |
| 0 | 1567 if ( uActiveCharacter ) |
| 1568 { | |
| 1569 v3 = uActiveCharacter - 1; | |
| 1570 v4 = 0; | |
| 1571 do | |
| 1572 { | |
| 188 | 1573 v15[v4++] = v3++; |
| 0 | 1574 if ( (signed int)v3 >= 4 ) |
| 1575 v3 = 0; | |
| 1576 } | |
| 1577 while ( v4 < 4 ); | |
| 1578 } | |
| 1579 v5 = pItemsTable->pItems[v2].pIconName; | |
| 1580 if ( v5 ) | |
| 1581 { | |
| 973 | 1582 v7 = pIcons_LOD->LoadTexturePtr(v5, TEXTURE_16BIT_PALETTE); |
| 0 | 1583 v21 = areWeLoadingTexture; |
| 1584 v8 = 0; | |
| 1585 while ( 1 ) | |
| 1586 { | |
| 188 | 1587 v9 = &v20->pPlayers[v15[v8]]; |
| 1588 v19 = &v20->pPlayers[v15[v8]]; | |
| 1014 | 1589 v10 = v19->AddItem(-1, pItem->uItemID); |
| 0 | 1590 if ( v10 ) |
| 1591 break; | |
| 1592 ++v8; | |
| 1593 if ( v8 >= 4 ) | |
| 1594 { | |
| 1595 if ( !v21 ) | |
| 1596 { | |
| 1597 v7->Release(); | |
| 1006 | 1598 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1599 } |
| 1600 goto LABEL_15; | |
| 1601 } | |
| 1602 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1603 memcpy(&v9->pInventoryItemList[v10-1], pItem, 0x24u); |
| 0 | 1604 pItem->Reset(); |
| 1605 pAudioPlayer->PlaySound(SOUND_GoldReceived, 0, 0, -1, 0, 0, 0, 0); | |
| 187 | 1606 v19->PlaySound(SPEECH_60, 0); |
| 0 | 1607 if ( !v21 ) |
| 1608 { | |
| 1609 v7->Release(); | |
| 1006 | 1610 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1611 } |
| 1612 result = 1; | |
| 1613 } | |
| 1614 else | |
| 1615 { | |
| 1616 MessageBoxW(nullptr, L"Invalid picture_name detected ::addItem()", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Party.cpp:795", 0); | |
| 1617 LABEL_15: | |
| 1618 result = 0; | |
| 1619 } | |
| 1620 return result; | |
| 1621 } | |
| 1622 // 506128: using guessed type int areWeLoadingTexture; | |
| 1623 | |
| 1624 //----- (0048C855) -------------------------------------------------------- | |
| 1625 int Player::GetBaseStrength() | |
| 1626 { | |
| 1627 return this->uMight + GetItemsBonus(CHARACTER_ATTRIBUTE_STRENGTH, 0); | |
| 1628 } | |
| 1629 | |
| 1630 //----- (0048C86C) -------------------------------------------------------- | |
| 1631 int Player::GetBaseIntelligence() | |
| 1632 { | |
| 1633 return this->uIntelligence + GetItemsBonus(CHARACTER_ATTRIBUTE_INTELLIGENCE, 0); | |
| 1634 } | |
| 1635 | |
| 1636 //----- (0048C883) -------------------------------------------------------- | |
| 1637 int Player::GetBaseWillpower() | |
| 1638 { | |
| 1639 return this->uWillpower + GetItemsBonus(CHARACTER_ATTRIBUTE_WILLPOWER, 0); | |
| 1640 } | |
| 1641 | |
| 1642 //----- (0048C89A) -------------------------------------------------------- | |
| 1643 int Player::GetBaseEndurance() | |
| 1644 { | |
| 1645 return this->uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE, 0); | |
| 1646 } | |
| 1647 | |
| 1648 //----- (0048C8B1) -------------------------------------------------------- | |
| 1649 int Player::GetBaseAccuracy() | |
| 1650 { | |
| 1651 return this->uAccuracy + GetItemsBonus(CHARACTER_ATTRIBUTE_ACCURACY, 0); | |
| 1652 } | |
| 1653 | |
| 1654 //----- (0048C8C8) -------------------------------------------------------- | |
| 1655 int Player::GetBaseSpeed() | |
| 1656 { | |
| 1657 return this->uSpeed + GetItemsBonus(CHARACTER_ATTRIBUTE_SPEED, 0); | |
| 1658 } | |
| 1659 | |
| 1660 //----- (0048C8DF) -------------------------------------------------------- | |
| 1661 int Player::GetBaseLuck() | |
| 1662 { | |
| 1663 return this->uLuck + GetItemsBonus(CHARACTER_ATTRIBUTE_LUCK, 0); | |
| 1664 } | |
| 1665 | |
| 1666 //----- (0048C8F6) -------------------------------------------------------- | |
| 1667 int Player::GetBaseLevel() | |
| 1668 { | |
| 1669 return this->uLevel + GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL, 0); | |
| 1670 } | |
| 1671 | |
| 1672 //----- (0048C90D) -------------------------------------------------------- | |
| 1673 int Player::GetActualLevel() | |
| 1674 { | |
| 1675 return uLevel + sLevelModifier + | |
| 1676 GetMagicalBonus(CHARACTER_ATTRIBUTE_LEVEL) + | |
| 1677 GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL, 0); | |
| 1678 } | |
| 1679 | |
| 1680 //----- (0048C93C) -------------------------------------------------------- | |
| 1681 int Player::GetActualMight() | |
| 1682 { | |
|
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
|
1683 return GetActualAttribute(CHARACTER_ATTRIBUTE_STRENGTH, &Player::uMight, &Player::uMightBonus); |
| 0 | 1684 } |
| 1685 | |
| 1686 //----- (0048C9C2) -------------------------------------------------------- | |
| 1687 int Player::GetActualIntelligence() | |
| 1688 { | |
|
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
|
1689 return GetActualAttribute(CHARACTER_ATTRIBUTE_INTELLIGENCE, &Player::uIntelligence, &Player::uIntelligenceBonus); |
| 0 | 1690 } |
| 1691 | |
| 1692 //----- (0048CA3F) -------------------------------------------------------- | |
| 1693 int Player::GetActualWillpower() | |
| 1694 { | |
|
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
|
1695 return GetActualAttribute(CHARACTER_ATTRIBUTE_WILLPOWER, &Player::uWillpower, &Player::uWillpowerBonus); |
| 0 | 1696 } |
| 1697 | |
| 1698 //----- (0048CABC) -------------------------------------------------------- | |
| 1699 int Player::GetActualEndurance() | |
| 1700 { | |
|
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
|
1701 return GetActualAttribute(CHARACTER_ATTRIBUTE_ENDURANCE, &Player::uEndurance, &Player::uEnduranceBonus); |
| 0 | 1702 } |
| 1703 | |
| 1704 //----- (0048CB39) -------------------------------------------------------- | |
| 1705 int Player::GetActualAccuracy() | |
| 1706 { | |
|
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
|
1707 return GetActualAttribute(CHARACTER_ATTRIBUTE_ACCURACY, &Player::uAccuracy, &Player::uAccuracyBonus); |
| 0 | 1708 } |
| 1709 | |
| 1710 //----- (0048CBB6) -------------------------------------------------------- | |
| 1711 int Player::GetActualSpeed() | |
| 1712 { | |
|
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
|
1713 return GetActualAttribute(CHARACTER_ATTRIBUTE_SPEED, &Player::uSpeed, &Player::uSpeedBonus); |
| 0 | 1714 } |
| 1715 | |
| 1716 //----- (0048CC33) -------------------------------------------------------- | |
| 1717 int Player::GetActualLuck() | |
| 1718 { | |
| 1036 | 1719 signed int npc_luck_bonus; // [sp+10h] [bp-4h]@1 |
| 1720 | |
| 1721 npc_luck_bonus = 0; | |
| 652 | 1722 if ( CheckHiredNPCSpeciality(Fool) ) |
| 1036 | 1723 npc_luck_bonus = 5; |
| 652 | 1724 if ( CheckHiredNPCSpeciality(ChimneySweep) ) |
| 1036 | 1725 npc_luck_bonus += 20; |
| 652 | 1726 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1036 | 1727 npc_luck_bonus += 10; |
| 1324 | 1728 |
|
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
|
1729 return GetActualAttribute(CHARACTER_ATTRIBUTE_LUCK, &Player::uLuck, &Player::uLuckBonus) |
| 1325 | 1730 + npc_luck_bonus; |
| 1731 } | |
| 1732 | |
| 1733 //----- (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
|
1734 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
|
1735 { |
| 1324 | 1736 uint uActualAge = this->sAgeModifier + GetBaseAge(); |
| 1737 uint uAgeingMultiplier = 100; | |
| 1738 for (uint i = 0; i < 4; ++i) | |
| 1325 | 1739 { |
| 1324 | 1740 if (uActualAge >= pAgeingTable[i]) |
| 1325 | 1741 uAgeingMultiplier = pAgingAttributeModifier[attrId][i]; |
| 1742 else | |
| 1743 break; | |
| 1744 } | |
| 1745 | |
| 1746 auto uConditionMult = pConditionAttributeModifier[attrId][GetMajorConditionIdx()]; | |
| 1747 int magicBonus = GetMagicalBonus(attrId); | |
| 1748 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
|
1749 return uConditionMult * uAgeingMultiplier * this->*attrValue / 100 / 100 |
| 1325 | 1750 + 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
|
1751 + 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
|
1752 + this->*attrBonus; |
| 0 | 1753 } |
| 1754 | |
| 1755 //----- (0048CCF5) -------------------------------------------------------- | |
| 1756 int Player::GetActualAttack(int a2) | |
| 1757 { | |
| 1758 Player *v2; // esi@1 | |
| 1759 int v3; // eax@1 | |
| 1760 int v4; // edi@1 | |
| 1761 int v5; // ebx@1 | |
| 1762 int v6; // ebp@1 | |
| 1763 | |
| 1764 v2 = this; | |
| 1765 v3 = GetActualAccuracy(); | |
| 1036 | 1766 v4 = GetParameterBonus(v3); |
| 0 | 1767 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_ATTACK); |
| 1768 v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_ATTACK, a2); | |
| 1769 return v4 + v5 + v6 + GetMagicalBonus(CHARACTER_ATTRIBUTE_ATTACK) + v2->_some_attack_bonus; | |
| 1770 } | |
| 1771 | |
| 1772 //----- (0048CD45) -------------------------------------------------------- | |
| 1773 int Player::GetMeleeDamageMinimal() | |
| 1774 { | |
| 1775 Player *v1; // edi@1 | |
| 1776 int v2; // eax@1 | |
| 1777 int v3; // esi@1 | |
| 1778 int v4; // esi@1 | |
| 1779 int v5; // esi@1 | |
| 1780 int v6; // esi@1 | |
| 1781 signed int result; // eax@1 | |
| 1782 | |
| 1036 | 1783 |
| 0 | 1784 v2 = GetActualMight(); |
| 1036 | 1785 v3 = GetParameterBonus(v2); |
| 0 | 1786 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, 0) + v3; |
| 1787 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v4; | |
| 1036 | 1788 result = _melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 1789 if ( result < 1 ) | |
| 1790 result = 1; | |
| 0 | 1791 return result; |
| 1792 } | |
| 1793 | |
| 1794 //----- (0048CD90) -------------------------------------------------------- | |
| 1795 int Player::GetMeleeDamageMaximal() | |
| 1796 { | |
| 1797 Player *v1; // edi@1 | |
| 1798 int v2; // eax@1 | |
| 1799 int v3; // esi@1 | |
| 1800 int v4; // esi@1 | |
| 1801 int v5; // esi@1 | |
| 1802 int v6; // esi@1 | |
| 1803 signed int result; // eax@1 | |
| 1804 | |
| 1805 v1 = this; | |
| 1806 v2 = GetActualMight(); | |
| 1036 | 1807 v3 = GetParameterBonus(v2); |
| 0 | 1808 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, 0) + v3; |
| 1809 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v4; | |
| 1810 v6 = v1->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; | |
| 1811 result = 1; | |
| 1812 if ( v6 >= 1 ) | |
| 1813 result = v6; | |
| 1814 return result; | |
| 1815 } | |
| 1816 | |
| 1817 //----- (0048CDDB) -------------------------------------------------------- | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1818 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
|
1819 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1820 int dmgSum; // esi@62 |
| 0 | 1821 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
|
1822 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
|
1823 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
|
1824 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1825 offHndWpnDmg = 0; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1826 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
|
1827 if ( IsUnarmed() ) |
| 0 | 1828 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1829 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
|
1830 } |
|
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
|
1831 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
|
1832 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1833 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
|
1834 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1835 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
|
1836 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
|
1837 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
|
1838 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
|
1839 addOneDice = true; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1840 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
|
1841 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1842 if ( !ignoreOffhand ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1843 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1844 if ( this->HasItemEquipped(EQUIP_OFF_HAND) ) |
|
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
|
1845 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1846 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
|
1847 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
|
1848 if ( pItemsTable->pItems[itemId].uEquipType != EQUIP_SHIELD ) |
| 0 | 1849 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1850 offHndWpnDmg = CalculateMeleeDmgToEnemyWithWeapon(offHandItemGen, uTargetActorID, false); |
|
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
|
1851 } |
|
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
|
1852 } |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1853 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1854 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1855 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
|
1856 if ( !ignoreSkillBonus ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1857 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1858 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
|
1859 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
|
1860 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
|
1861 dmgSum += this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + mightAndSkillbonus; |
| 0 | 1862 } |
| 1863 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
|
1864 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
|
1865 result = dmgSum; |
| 0 | 1866 return result; |
| 1867 } | |
| 1868 | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1869 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1870 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
|
1871 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1872 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
|
1873 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
|
1874 if (addOneDice) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1875 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1876 diceCount++; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1877 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1878 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
|
1879 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
|
1880 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
|
1881 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1882 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
|
1883 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1884 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
|
1885 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
|
1886 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1887 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
|
1888 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
|
1889 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1890 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1891 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1892 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
|
1893 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1894 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1895 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1896 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
|
1897 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1898 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1899 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1900 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
|
1901 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1902 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1903 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1904 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1905 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
|
1906 && 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
|
1907 && 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
|
1908 totalDmg *= 3; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1909 return totalDmg; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1910 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1911 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1912 |
| 0 | 1913 //----- (0048D0B9) -------------------------------------------------------- |
| 1914 int Player::GetRangedAttack() | |
| 1915 { | |
| 1916 Player *v1; // esi@1 | |
| 1917 int v2; // eax@1 | |
| 1918 int v3; // edi@3 | |
| 1919 int v4; // eax@4 | |
| 1920 int v5; // edi@4 | |
| 1921 int v6; // edi@4 | |
| 1922 int v7; // edi@4 | |
| 1923 | |
| 1924 v1 = this; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1925 v2 = *(int *)&this->pInventoryItemList[this->pEquipment.uMainHand-1]; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1926 if ( v2 < ITEM_BLASTER || v2 > ITEM_LASER_RIFLE ) |
| 0 | 1927 { |
| 1928 v4 = GetActualAccuracy(); | |
| 1036 | 1929 v5 = GetParameterBonus(v4); |
| 0 | 1930 v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK, 0) + v5; |
| 1931 v7 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v6; | |
| 1932 v3 = v1->_ranged_atk_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v7; | |
| 1933 } | |
| 1934 else | |
| 1935 { | |
| 1936 v3 = GetActualAttack(1); | |
| 1937 } | |
| 1938 return v3; | |
| 1939 } | |
| 1940 | |
| 1941 //----- (0048D124) -------------------------------------------------------- | |
| 1942 int Player::GetRangedDamageMin() | |
| 1943 { | |
| 1944 Player *v1; // esi@1 | |
| 1945 int v2; // edi@1 | |
| 1946 int v3; // edi@1 | |
| 1947 int v4; // edi@1 | |
| 1948 unsigned __int16 v5; // ax@1 | |
| 1949 int result; // eax@6 | |
| 1950 | |
| 1951 v1 = this; | |
| 1040 | 1952 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MIN, 0); |
| 1953 v3 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v2; | |
| 1954 v4 = v1->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; | |
| 0 | 1955 if ( v4 >= 1 ) |
| 1956 result = v4; | |
| 1957 else | |
| 1958 result = 0; | |
| 1959 return result; | |
| 1960 } | |
| 1961 | |
| 1962 //----- (0048D191) -------------------------------------------------------- | |
| 1963 int Player::GetRangedDamageMax() | |
| 1964 { | |
| 1965 Player *v1; // esi@1 | |
| 1966 int v2; // edi@1 | |
| 1967 int v3; // edi@1 | |
| 1968 int v4; // edi@1 | |
| 1969 unsigned __int16 v5; // ax@1 | |
| 1970 int result; // eax@6 | |
| 1971 | |
| 1972 v1 = this; | |
| 1040 | 1973 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MAX, 0); |
| 1974 v3 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v2; | |
| 1975 v4 = v1->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; | |
| 0 | 1976 if ( v4 >= 1 ) |
| 1977 result = v4; | |
| 1978 else | |
| 1979 result = 0; | |
| 1980 return result; | |
| 1981 } | |
| 1982 | |
| 1983 //----- (0048D1FE) -------------------------------------------------------- | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1984 int Player::CalculateRangedDamageTo( int a2 ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1985 { |
| 0 | 1986 bool result; // eax@1 |
| 1987 ItemGen *v4; // ebx@2 | |
| 1988 unsigned int v5; // edi@2 | |
| 1989 int v7; // edx@4 | |
| 1990 char v8; // zf@4 | |
| 1991 int v9; // esi@5 | |
| 1992 int v10; // ebx@6 | |
| 1993 signed int v15; // [sp+8h] [bp-Ch]@2 | |
| 1994 int v17; // [sp+10h] [bp-4h]@1 | |
| 1995 | |
| 1996 v17 = 0; | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1997 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1998 return 0; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1999 v4 = (ItemGen *)&this->pInventoryItemList[this->pEquipment.uBow-1]; |
| 0 | 2000 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
|
2001 v15 = pItemsTable->pItems[v5].uDamageRoll; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2002 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
|
2003 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2004 int v7 = rand() % v15; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2005 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
|
2006 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
2007 v9 = pItemsTable->pItems[v5].uDamageMod + v17; |
| 0 | 2008 if ( a2 ) |
| 2009 { | |
| 377 | 2010 v10 = v4->uSpecEnchantmentType; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2011 if ( v10 == 64 && MonsterStats::BelongsToSupertype(a2, MONSTER_SUPERTYPE_UNDEAD)) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2012 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2013 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2014 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2015 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
|
2016 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2017 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2018 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2019 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
|
2020 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2021 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2022 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2023 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
|
2024 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2025 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2026 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
2027 } |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
2028 return v9 + this->GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS); |
| 0 | 2029 } |
| 2030 | |
| 2031 //----- (0048D2EA) -------------------------------------------------------- | |
| 2032 char *Player::GetMeleeDamageString() | |
| 2033 { | |
| 1036 | 2034 signed int itemid; // eax@1 |
| 2035 int min_damage; // edi@3 | |
| 2036 int max_damage; // eax@3 | |
| 0 | 2037 |
| 2038 static char player__getmeleedamagestring_static_buff[40]; // idb | |
| 2039 | |
| 1036 | 2040 if ( pEquipment.uMainHand) |
| 2041 { | |
| 2042 itemid= pOwnItems[this->pEquipment.uMainHand-1].uItemID; | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2043 if ( itemid < ITEM_BLASTER || itemid > ITEM_LASER_RIFLE ) //blasters |
| 1036 | 2044 { |
| 2045 min_damage = GetMeleeDamageMinimal(); | |
| 2046 max_damage = GetMeleeDamageMaximal(); | |
| 2047 } | |
| 2048 else | |
| 2049 { //for blasters | |
| 2050 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, 0); | |
| 2051 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, 0); | |
| 2052 } | |
| 2053 if ( max_damage ) | |
| 2054 { | |
| 2055 if ( min_damage == max_damage ) | |
| 2056 { | |
| 2057 sprintf(player__getmeleedamagestring_static_buff, "%d", min_damage); | |
| 2058 } | |
| 2059 else | |
| 2060 { | |
| 2061 sprintf(player__getmeleedamagestring_static_buff, "%d - %d", min_damage, max_damage); | |
| 2062 } | |
| 2063 } | |
| 2064 else | |
| 2065 { | |
| 2066 strcpy(player__getmeleedamagestring_static_buff, "N/A"); | |
| 2067 } | |
| 2068 | |
| 2069 if (( itemid >= 135 )&&( itemid <= 159 )) //wands | |
| 2070 { | |
| 2071 strcpy(player__getmeleedamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" | |
| 2072 } | |
| 2073 } | |
| 0 | 2074 else |
| 1036 | 2075 strcpy(player__getmeleedamagestring_static_buff, "N/A"); |
| 2076 return player__getmeleedamagestring_static_buff; | |
| 0 | 2077 } |
| 2078 | |
| 2079 //----- (0048D396) -------------------------------------------------------- | |
| 2080 char *Player::GetRangedDamageString() | |
| 1036 | 2081 { |
| 2082 signed int itemid; // eax@1 | |
| 2083 int min_damage; // edi@3 | |
| 2084 int max_damage; // eax@3 | |
| 2085 | |
| 2086 static char player__getrangeddamagestring_static_buff[40]; // idb | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2087 |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2088 if (pEquipment.uMainHand >= 0) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2089 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2090 itemid = pOwnItems[this->pEquipment.uMainHand-1].uItemID; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2091 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2092 |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2093 if (pEquipment.uMainHand >= 0 && ( itemid >= 135 ) && ( itemid <= 159 )) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2094 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2095 strcpy(player__getrangeddamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2096 return player__getrangeddamagestring_static_buff; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2097 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2098 else if (pEquipment.uMainHand >= 0 && (itemid == ITEM_BLASTER || itemid == ITEM_LASER_RIFLE)) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2099 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2100 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, 1); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2101 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, 1); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2102 } |
| 0 | 2103 else |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2104 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2105 min_damage = GetRangedDamageMin(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2106 max_damage = GetRangedDamageMax(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2107 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2108 if ( max_damage > 0) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2109 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2110 if ( min_damage == max_damage ) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2111 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2112 sprintf(player__getrangeddamagestring_static_buff, "%d", min_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2113 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2114 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2115 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2116 sprintf(player__getrangeddamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2117 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2118 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2119 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2120 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2121 strcpy(player__getrangeddamagestring_static_buff, "N/A"); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2122 } |
| 1036 | 2123 return player__getrangeddamagestring_static_buff; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
2124 } |
| 0 | 2125 |
| 2126 //----- (0048D45A) -------------------------------------------------------- | |
| 2127 bool Player::CanTrainToNextLevel() | |
| 2128 { | |
| 2129 int v1; // edx@1 | |
| 2130 int v2; // eax@1 | |
| 2131 int i; // esi@1 | |
| 2132 | |
| 2133 v1 = this->uLevel; | |
| 2134 v2 = 0; | |
| 2135 for ( i = 0; i < v1; ++i ) | |
| 2136 v2 += i + 1; | |
| 2137 return (signed __int64)this->uExperience >= 1000 * v2; | |
| 2138 } | |
| 2139 | |
| 2140 //----- (0048D498) -------------------------------------------------------- | |
| 2141 unsigned int Player::GetExperienceDisplayColor() | |
| 2142 { | |
| 2143 unsigned int result; // eax@2 | |
| 2144 | |
| 2145 if ( CanTrainToNextLevel() ) | |
| 995 | 2146 result = ui_character_bonus_text_color; |
| 0 | 2147 else |
| 995 | 2148 result = ui_character_default_text_color; |
| 0 | 2149 return result; |
| 2150 } | |
| 2151 | |
| 2152 //----- (0048D4B3) -------------------------------------------------------- | |
| 1036 | 2153 int Player::CalculateIncommingDamage( DAMAGE_TYPE dmg_type, int amount ) |
| 2154 { | |
| 2155 | |
| 2156 int resist_value; // edi@8 | |
| 2157 int player_luck; // eax@21 | |
| 2158 signed int res_rand_divider; // ebx@2 | |
| 2159 int armor_skill; // eax@29 | |
| 2160 enum CHARACTER_ATTRIBUTE_TYPE player_resist; // [sp-4h] [bp-10h]@9 | |
| 2161 signed int result_amount_dmg; // [sp+8h] [bp-4h]@17 | |
| 2162 | |
| 2163 player_resist=CHARACTER_ATTRIBUTE_STRENGTH; | |
| 2164 switch(dmg_type) | |
| 2165 { | |
| 2166 case DMGT_FIRE: player_resist=CHARACTER_ATTRIBUTE_RESIST_FIRE; break; | |
| 2167 case DMGT_ELECTR: player_resist=CHARACTER_ATTRIBUTE_RESIST_AIR; break; | |
| 2168 case DMGT_COLD: player_resist=CHARACTER_ATTRIBUTE_RESIST_WATER; break; | |
| 2169 case DMGT_3: player_resist=CHARACTER_ATTRIBUTE_RESIST_EARTH; break; | |
| 2170 | |
| 2171 case DMGT_SPIRIT: player_resist=CHARACTER_ATTRIBUTE_RESIST_SPIRIT;break; | |
| 2172 case DMGT_MIND: player_resist=CHARACTER_ATTRIBUTE_RESIST_MIND; break; | |
| 2173 case DMGT_BODY: player_resist=CHARACTER_ATTRIBUTE_RESIST_BODY; break; | |
| 2174 } | |
| 2175 if (player_resist) | |
| 2176 resist_value = GetActualResistance(player_resist); | |
| 2177 else | |
| 2178 resist_value = 0; | |
| 2179 | |
| 2180 result_amount_dmg = amount; | |
| 2181 if ( classType == PLAYER_CLASS_LICH && resist_value >= 200 ) | |
| 0 | 2182 return 0; |
| 1036 | 2183 player_luck = GetActualLuck(); |
| 2184 res_rand_divider = GetParameterBonus(player_luck) + resist_value + 30; | |
| 2185 | |
| 2186 if ( resist_value ) | |
| 2187 { | |
| 2188 if ( rand() % res_rand_divider >= 30 ) | |
| 2189 { | |
| 2190 result_amount_dmg = amount >> 1; | |
| 2191 if ( rand() % res_rand_divider >= 30 ) | |
| 0 | 2192 { |
| 1036 | 2193 result_amount_dmg = amount >> 2; |
| 2194 if ( rand() % res_rand_divider >= 30 ) | |
| 0 | 2195 { |
| 1036 | 2196 result_amount_dmg = amount >> 3; |
| 2197 if ( rand() % res_rand_divider >= 30 ) | |
| 2198 result_amount_dmg = amount >> 4; | |
| 0 | 2199 } |
| 2200 } | |
| 2201 } | |
| 2202 } | |
| 1036 | 2203 if (( dmg_type == DMGT_PHISYCAL )&&( pEquipment.uArmor )) |
| 2204 { | |
| 2205 if (!pOwnItems[pEquipment.uArmor-1].Broken()) | |
| 0 | 2206 { |
| 1036 | 2207 armor_skill = GetEquippedItemSkillType(EQUIP_ARMOUR); |
| 2208 if ( armor_skill==PLAYER_SKILL_PLATE ) | |
| 0 | 2209 { |
| 1036 | 2210 if ( SkillToMastery(pActiveSkills[PLAYER_SKILL_PLATE]) >= 3 ) |
| 2211 return (int)(double)result_amount_dmg * 0.5; | |
| 0 | 2212 } |
| 1036 | 2213 if (armor_skill==PLAYER_SKILL_CHAIN ) |
| 0 | 2214 { |
| 1036 | 2215 if (SkillToMastery(pActiveSkills[PLAYER_SKILL_CHAIN]) == 4) |
| 2216 return (int)(double)result_amount_dmg * 0.66670001; | |
| 0 | 2217 } |
| 2218 } | |
| 1036 | 2219 } |
| 2220 return result_amount_dmg; | |
| 0 | 2221 } |
| 2222 | |
| 2223 //----- (0048D62C) -------------------------------------------------------- | |
| 816 | 2224 ITEM_EQUIP_TYPE Player::GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot) |
| 2225 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2226 return pItemsTable->pItems[pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uEquipType; |
| 0 | 2227 } |
| 2228 | |
| 2229 //----- (0048D651) -------------------------------------------------------- | |
| 816 | 2230 PLAYER_SKILL_TYPE Player::GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot) |
| 2231 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2232 return (PLAYER_SKILL_TYPE)pItemsTable->pItems[pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uSkillType; |
| 0 | 2233 } |
| 2234 | |
| 2235 //----- (0048D676) -------------------------------------------------------- | |
| 2236 bool Player::IsUnarmed() | |
| 2237 { | |
| 1091 | 2238 return HasItemEquipped(EQUIP_MAIN_HAND) != 0 && |
| 2239 !(HasItemEquipped(EQUIP_OFF_HAND) == 0 && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD); | |
| 0 | 2240 } |
| 2241 | |
| 2242 //----- (0048D6AA) -------------------------------------------------------- | |
| 2243 bool Player::HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex) | |
| 2244 { | |
| 2245 auto i = pEquipment.pIndices[uEquipIndex]; | |
| 2246 if (i) | |
| 1080 | 2247 return ~(pOwnItems[i - 1].uAttributes & ITEM_BROKEN); |
| 1036 | 2248 else |
| 2249 return false; | |
| 0 | 2250 } |
| 2251 | |
| 2252 //----- (0048D6D0) -------------------------------------------------------- | |
| 2253 bool Player::HasEnchantedItemEquipped(int uEnchantment) | |
| 2254 { | |
| 2255 for (uint i = 0; i < 16; ++i) | |
| 2256 { | |
| 2257 if (HasItemEquipped((ITEM_EQUIP_TYPE)i) && | |
| 1080 | 2258 pOwnItems[pEquipment.pIndices[i]-1].uSpecEnchantmentType == uEnchantment) |
| 0 | 2259 // *(int *)&this->field_1F6[36 * pEquipment[i] + 6] != uEnchantment) |
| 2260 return true; | |
| 2261 } | |
| 2262 return false; | |
| 2263 } | |
| 2264 | |
| 2265 //----- (0048D709) -------------------------------------------------------- | |
| 1080 | 2266 bool Player::WearsItem( int item_id, ITEM_EQUIP_TYPE equip_type ) |
| 2267 { | |
| 1010 | 2268 |
| 0 | 2269 int v6; // esi@5 |
| 2270 | |
| 1080 | 2271 if ( equip_type >= 16 ) |
| 0 | 2272 { |
| 2273 v6 = 0; | |
| 2274 while ( !HasItemEquipped((ITEM_EQUIP_TYPE)v6) | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2275 || pInventoryItemList[pEquipment.pIndices[v6] - 1].uItemID != item_id ) |
| 0 | 2276 { |
| 2277 ++v6; | |
| 2278 if ( (signed int)v6 >= 16 ) | |
| 2279 return 0; | |
| 2280 } | |
| 2281 return 1; | |
| 2282 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2283 if ( HasItemEquipped(equip_type) && pInventoryItemList[pEquipment.pIndices[equip_type - 1]].uItemID == item_id ) |
| 0 | 2284 return 1; |
| 2285 return 0; | |
| 2286 } | |
| 2287 | |
| 2288 //----- (0048D76C) -------------------------------------------------------- | |
| 2289 bool Player::StealFromShop(ItemGen *a2, int a3, int a4, int a5, int *a6) | |
| 2290 { | |
| 2291 unsigned __int16 v6; // cx@8 | |
| 2292 int v7; // edi@8 | |
| 2293 unsigned int v8; // ebx@8 | |
| 2294 unsigned int v9; // esi@8 | |
| 2295 int v10; // eax@8 | |
| 2296 int v11; // edi@12 | |
| 2297 bool result; // eax@13 | |
| 2298 | |
| 2299 if ( !a2 | |
| 2300 || this->pConditions[16] | |
| 2301 || this->pConditions[14] | |
| 2302 || this->pConditions[15] | |
| 2303 || this->pConditions[4] | |
| 2304 || this->pConditions[13] | |
| 2305 || this->pConditions[2] ) | |
| 2306 { | |
| 2307 result = 0; | |
| 2308 } | |
| 2309 else | |
| 2310 { | |
| 2311 v6 = this->pActiveSkills[34]; | |
| 2312 v7 = v6 & 0x3F; | |
| 2313 v8 = SkillToMastery(v6); | |
| 2314 v9 = a2->GetValue(); | |
| 2315 v10 = pItemsTable->pItems[a2->uItemID].uEquipType; | |
| 2316 if ( !pItemsTable->pItems[a2->uItemID].uEquipType || v10 == 1 || v10 == 2 ) | |
| 2317 v9 *= 3; | |
| 2318 v11 = dword_4EDEB4[rand() % 100 / 20] + v7 * dword_4EDEA0[v8]; | |
| 2319 *a6 = 100 * (a4 + a3) + v9 + (a5 != 0 ? 0x1F4 : 0); | |
| 2320 if ( rand() % 100 >= 5 ) | |
| 2321 { | |
| 2322 if ( *a6 > v11 ) | |
| 2323 result = *a6 - v11 < 500; | |
| 2324 else | |
| 2325 result = 2; | |
| 2326 } | |
| 2327 else | |
| 2328 { | |
| 2329 result = 0; | |
| 2330 } | |
| 2331 } | |
| 2332 return result; | |
| 2333 } | |
| 2334 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2335 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2336 | |
| 2337 //----- (0048D88B) -------------------------------------------------------- | |
| 2338 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation) | |
| 2339 { | |
| 2340 Player *v4; // esi@1 | |
| 2341 Actor *v5; // edi@1 | |
| 2342 unsigned __int16 v6; // cx@10 | |
| 2343 int v7; // ebx@10 | |
| 2344 unsigned int v8; // esi@10 | |
| 2345 int v9; // eax@10 | |
| 2346 int v10; // esi@10 | |
| 2347 int v11; // eax@13 | |
| 2348 signed int v12; // ebx@15 | |
| 2349 signed int v13; // edx@15 | |
| 2350 int v14; // ecx@15 | |
| 2351 unsigned __int16 v15; // si@21 | |
| 2352 unsigned int v16; // ebx@24 | |
| 2353 int v17; // esi@24 | |
| 2354 const void *v18; // eax@29 | |
| 2355 unsigned int v19; // esi@31 | |
| 2356 int v20; // eax@34 | |
| 2357 char v21; // zf@36 | |
| 2358 unsigned int v22; // ST0C_4@39 | |
| 2359 char *v23; // esi@39 | |
| 2360 const char *v25; // [sp-Ch] [bp-48h]@40 | |
| 2361 int v26; // [sp-8h] [bp-44h]@40 | |
| 2362 ItemGen v27; // [sp+8h] [bp-34h]@15 | |
| 2363 unsigned int v28; // [sp+2Ch] [bp-10h]@10 | |
| 2364 int v29; // [sp+30h] [bp-Ch]@10 | |
| 2365 int v30; // [sp+34h] [bp-8h]@10 | |
| 2366 Player *v31; // [sp+38h] [bp-4h]@1 | |
| 2367 signed int _steal_perma; // [sp+48h] [bp+Ch]@12 | |
| 2368 | |
| 2369 v4 = this; | |
| 2370 v5 = &pActors[uActorID]; | |
| 2371 v31 = this; | |
| 2372 if ( &pActors[uActorID] | |
| 2373 && !this->pConditions[16] | |
| 2374 && !this->pConditions[14] | |
| 2375 && !this->pConditions[15] | |
| 2376 && !this->pConditions[4] | |
| 2377 && !this->pConditions[13] | |
| 2378 && !this->pConditions[2] ) | |
| 2379 { | |
| 2380 if ( !(BYTE2(v5->uAttributes) & 0x80) ) | |
| 2381 pActors[uActorID].SetRandomGoldIfTheresNoItem(); | |
| 2382 v6 = v4->pActiveSkills[34]; | |
| 2383 v7 = v6 & 0x3F; | |
| 2384 v8 = SkillToMastery(v6); | |
| 2385 v9 = rand(); | |
| 2386 v28 = 4 * v8; | |
| 2387 v30 = dword_4EDEA0[v8]; | |
| 2388 v29 = dword_4EDEB4[v9 % 100 / 20]; | |
| 2389 v10 = v5->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation); | |
| 2390 if ( rand() % 100 < 5 || v10 > v29 + v7 * v30 || (_steal_perma = 2, BYTE2(v5->uAttributes) & 8) ) | |
| 2391 { | |
| 322 | 2392 Actor::AggroSurroundingPeasants(uActorID, 1); |
| 0 | 2393 _steal_perma = 0; |
| 2394 v26 = (int)v31->pName; | |
| 2395 v25 = pGlobalTXT_LocalizationStrings[376]; | |
| 2396 } | |
| 2397 else | |
| 2398 { | |
| 2399 v11 = rand(); | |
| 2400 if ( v11 % 100 >= 40 ) | |
| 2401 { | |
| 2402 if ( v11 % 100 >= 70 ) | |
| 2403 { | |
| 2404 v19 = 0; | |
| 2405 if ( v7 > 0 ) | |
| 2406 { | |
| 2407 do | |
| 2408 { | |
| 2409 --v7; | |
| 2410 v19 += rand() % dword_4EDEC4[v28 / 4] + 1; | |
| 2411 } | |
| 2412 while ( v7 ); | |
| 2413 } | |
| 2414 if ( pItemsTable->pItems[v5->array_000234[3].uItemID].uEquipType != 18 ) | |
| 2415 return _steal_perma; | |
| 377 | 2416 v20 = (int)&v5->array_000234[3].uSpecEnchantmentType; |
| 2417 if ( (signed int)v19 > v5->array_000234[3].uSpecEnchantmentType ) | |
| 2418 v19 = v5->array_000234[3].uSpecEnchantmentType; | |
| 0 | 2419 v21 = *(int *)v20 == v19; |
| 2420 *(int *)v20 -= v19; | |
| 2421 if ( v21 ) | |
| 2422 v5->array_000234[3].uItemID = 0; | |
| 2423 if ( v19 ) | |
| 2424 { | |
| 2425 party_finds_gold(v19, 2); | |
| 2426 v22 = v19; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2427 v23 = pTmpBuf2.data(); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2428 sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[302], v31->pName, v22); |
| 0 | 2429 LABEL_43: |
| 2430 ShowStatusBarString(v23, 2u); | |
| 2431 return _steal_perma; | |
| 2432 } | |
| 2433 } | |
| 2434 else | |
| 2435 { | |
| 2436 v27.Reset(); | |
| 2437 v12 = 0; | |
| 2438 v13 = 0; | |
| 2439 v14 = (int)v5->array_000234; | |
| 2440 while ( !*(int *)v14 || pItemsTable->pItems[*(int *)v14].uEquipType == 18 ) | |
| 2441 { | |
| 2442 ++v13; | |
| 2443 v14 += 36; | |
| 2444 if ( v13 >= 4 ) | |
| 2445 goto LABEL_21; | |
| 2446 } | |
| 2447 v12 = 1; | |
| 2448 LABEL_21: | |
| 2449 v15 = v5->uCarriedItemID; | |
| 2450 if ( v15 || v12 ) | |
| 2451 { | |
| 2452 v27.Reset(); | |
| 2453 if ( v15 ) | |
| 2454 { | |
| 2455 v16 = (signed __int16)v15; | |
| 2456 v5->uCarriedItemID = 0; | |
| 2457 v27.uItemID = (signed __int16)v15; | |
| 2458 v17 = (signed __int16)v15; | |
| 2459 if ( pItemsTable->pItems[v17].uEquipType == 12 ) | |
| 2460 v27.uNumCharges = rand() % 6 + pItemsTable->pItems[v17].uDamageMod + 1; | |
| 2461 if ( pItemsTable->pItems[v17].uEquipType == 14 ) | |
| 2462 { | |
| 2463 if ( v16 != 220 ) | |
| 570 | 2464 v27.uEnchantmentType = 2 * rand() % 4 + 2; |
| 0 | 2465 } |
| 2466 } | |
| 2467 else | |
| 2468 { | |
| 2469 v18 = &v5->array_000234[rand() % 4]; | |
| 2470 memcpy(&v27, v18, sizeof(v27)); | |
| 2471 ((ItemGen *)v18)->Reset(); | |
| 2472 v16 = v27.uItemID; | |
| 2473 } | |
| 2474 sub_421B2C_PlaceInInventory_or_DropPickedItem(); | |
| 2475 sprintf( | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2476 pTmpBuf2.data(), |
| 0 | 2477 pGlobalTXT_LocalizationStrings[304], |
| 2478 v31->pName, | |
| 2479 pItemsTable->pItems[v16].pUnidentifiedName); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2480 ShowStatusBarString(pTmpBuf2.data(), 2u); |
| 0 | 2481 sub_421B2C_PlaceInInventory_or_DropPickedItem(); |
| 2482 memcpy(&pParty->pPickedItem, &v27, sizeof(pParty->pPickedItem)); | |
| 2483 pMouse->SetCursorBitmapFromItemID(v16); | |
| 2484 return _steal_perma; | |
| 2485 } | |
| 2486 } | |
| 2487 } | |
| 2488 v26 = (int)v31->pName; | |
| 2489 v25 = pGlobalTXT_LocalizationStrings[377]; | |
| 2490 } | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2491 v23 = pTmpBuf2.data(); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
2492 sprintfex(pTmpBuf2.data(), v25, v26); |
| 0 | 2493 goto LABEL_43; |
| 2494 } | |
| 2495 return 0; | |
| 2496 } | |
| 2497 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2498 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2499 // 4EDEC4: using guessed type int dword_4EDEC4[]; | |
| 2500 | |
| 2501 //----- (0048DBB9) -------------------------------------------------------- | |
| 2502 void Player::Heal(int amount) | |
| 2503 { | |
| 1010 | 2504 signed int max_health; // eax@3 |
| 2505 | |
| 2506 if ( !pConditions[Condition_Eradicated] && !pConditions[Condition_Dead] ) | |
| 2507 { | |
| 2508 max_health = GetMaxHealth(); | |
| 2509 if ( pConditions[Condition_Zombie] ) | |
| 2510 max_health /= 2; | |
| 2511 sHealth += amount; | |
| 2512 if ( sHealth > max_health ) | |
| 2513 sHealth = max_health; | |
| 2514 if ( pConditions[Condition_Unconcious] ) | |
| 2515 { | |
| 2516 if ( sHealth > 0 ) | |
| 2517 { | |
| 2518 pConditions[Condition_Unconcious] = 0i64; | |
| 0 | 2519 } |
| 2520 } | |
| 2521 } | |
| 2522 } | |
| 2523 | |
| 2524 //----- (0048DC1E) -------------------------------------------------------- | |
| 1036 | 2525 int Player::ReceiveDamage( signed int amount, DAMAGE_TYPE dmg_type ) |
| 2526 { | |
| 2527 signed int recieved_dmg; // eax@1 | |
| 2528 unsigned int armor_indx; // eax@8 | |
| 2529 bool broke_armor; | |
| 2530 | |
| 2531 pConditions[Condition_Sleep] = 0i64; | |
| 2532 recieved_dmg = CalculateIncommingDamage(dmg_type, amount); | |
| 2533 sHealth -= recieved_dmg; | |
| 2534 broke_armor = sHealth <= -10; | |
| 2535 if ( sHealth < 1 ) // | |
| 2536 { | |
| 2537 if ( (sHealth + uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE, 0) >= 1) | |
| 2538 || pPlayerBuffs[PLAYER_BUFF_PRESERVATION].uExpireTime > 0i64 ) | |
| 0 | 2539 { |
| 1019 | 2540 SetCondition(Condition_Unconcious, 0); |
| 0 | 2541 } |
| 2542 else | |
| 2543 { | |
| 1019 | 2544 SetCondition(Condition_Dead, 0); |
| 1036 | 2545 //v6 = LODWORD(pParty->uTimePlayed); ???? if equals 0 do not broke armor? |
| 2546 if ( sHealth > 0 ) | |
| 2547 sHealth = 0; | |
| 2548 } | |
| 2549 if (broke_armor ) | |
| 2550 { | |
| 2551 armor_indx = pEquipment.uArmor; | |
| 2552 if ( armor_indx ) | |
| 0 | 2553 { |
| 1036 | 2554 if ( !pOwnItems[armor_indx-1].uAttributes & ITEM_ENCHANTED) |
| 0 | 2555 { |
| 1036 | 2556 pOwnItems[armor_indx-1].uAttributes|=ITEM_BROKEN; |
| 0 | 2557 } |
| 2558 } | |
| 2559 } | |
| 2560 } | |
| 1036 | 2561 if ( recieved_dmg && CanAct() ) |
| 187 | 2562 PlaySound(SPEECH_24, 0); |
| 1036 | 2563 return recieved_dmg; |
| 0 | 2564 } |
| 2565 | |
| 2566 //----- (0048DCF6) -------------------------------------------------------- | |
| 2567 int Player::_48DCF6(int a2, Actor *pActor) | |
| 2568 { | |
| 2569 signed int v3; // edi@1 | |
| 2570 signed int v4; // ebx@1 | |
| 2571 Player *v5; // esi@1 | |
| 2572 int v6; // eax@2 | |
| 2573 int v7; // eax@5 | |
| 2574 int v8; // eax@8 | |
| 2575 int v9; // ebx@8 | |
| 2576 int v10; // eax@8 | |
| 2577 int v11; // ebx@8 | |
| 2578 signed int v12; // edx@9 | |
| 2579 ItemGen *v13; // eax@9 | |
| 2580 int v14; // edx@16 | |
| 2581 unsigned int v15; // edx@17 | |
| 2582 int v16; // edx@26 | |
| 2583 unsigned int v17; // edx@27 | |
| 2584 signed int v19; // edx@38 | |
| 2585 int *v20; // ecx@38 | |
| 2586 signed int v21; // eax@40 | |
| 2587 int v22; // eax@49 | |
| 2588 signed int v23; // ebx@49 | |
| 2589 unsigned int v24; // eax@60 | |
| 2590 int v25; // ecx@61 | |
| 2591 int v26; // ebx@74 | |
| 2592 void *v27; // ecx@76 | |
| 2593 unsigned int v28; // ebx@78 | |
| 2594 signed int result; // eax@86 | |
| 2595 SoundID v30; // [sp-20h] [bp-C0h]@56 | |
| 2596 signed int v31; // [sp-1Ch] [bp-BCh]@56 | |
| 2597 unsigned int v32; // [sp-18h] [bp-B8h]@56 | |
| 2598 signed int v33; // [sp-14h] [bp-B4h]@56 | |
| 2599 signed int v34; // [sp-10h] [bp-B0h]@56 | |
| 2600 int v35; // [sp-Ch] [bp-ACh]@56 | |
| 2601 unsigned int v36; // [sp-8h] [bp-A8h]@51 | |
| 2602 unsigned int v37; // [sp-8h] [bp-A8h]@56 | |
| 2603 unsigned int v38; // [sp-8h] [bp-A8h]@57 | |
| 2604 unsigned int v39; // [sp-8h] [bp-A8h]@68 | |
| 2605 enum CHARACTER_ATTRIBUTE_TYPE v40; // [sp-4h] [bp-A4h]@4 | |
| 2606 int v41; // [sp-4h] [bp-A4h]@51 | |
| 2607 int v42; // [sp-4h] [bp-A4h]@56 | |
| 2608 int v43; // [sp-4h] [bp-A4h]@57 | |
| 2609 signed int v44; // [sp-4h] [bp-A4h]@59 | |
| 2610 int v45; // [sp-4h] [bp-A4h]@68 | |
| 2611 char v46[140]; // [sp+Ch] [bp-94h]@13 | |
| 2612 unsigned int v47; // [sp+98h] [bp-8h]@1 | |
| 2613 int v48; // [sp+9Ch] [bp-4h]@1 | |
| 2614 | |
| 2615 v3 = 0; | |
| 2616 v4 = 0; | |
| 2617 v5 = this; | |
| 2618 v47 = 0; | |
| 2619 v48 = 0; | |
| 2620 switch ( a2 ) | |
| 2621 { | |
| 2622 case 1: | |
| 2623 v6 = GetActualWillpower(); | |
| 2624 goto LABEL_46; | |
| 2625 case 2: | |
| 2626 case 3: | |
| 2627 case 4: | |
| 2628 case 9: | |
| 2629 case 10: | |
| 2630 case 11: | |
| 2631 case 13: | |
| 2632 case 21: | |
| 2633 v6 = GetActualEndurance(); | |
| 2634 goto LABEL_46; | |
| 2635 case 5: | |
| 2636 case 12: | |
| 2637 case 23: | |
| 2638 v40 = (CHARACTER_ATTRIBUTE_TYPE)14; | |
| 2639 goto LABEL_5; | |
| 2640 case 15: | |
| 2641 v40 = (CHARACTER_ATTRIBUTE_TYPE)13; | |
| 2642 goto LABEL_5; | |
| 2643 case 6: | |
| 2644 case 7: | |
| 2645 case 8: | |
| 2646 case 14: | |
| 2647 case 16: | |
| 2648 v40 = (CHARACTER_ATTRIBUTE_TYPE)15; | |
| 2649 LABEL_5: | |
| 2650 v7 = GetActualResistance(v40); | |
| 2651 goto LABEL_47; | |
| 2652 case 22: | |
| 2653 v8 = GetActualWillpower(); | |
| 1036 | 2654 v9 = GetParameterBonus(v8); |
| 0 | 2655 v10 = GetActualIntelligence(); |
| 1036 | 2656 v11 = (GetParameterBonus(v10) + v9) >> 1; |
| 0 | 2657 break; |
| 2658 case 17: | |
| 2659 v12 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2660 v13 = this->pInventoryItemList; |
| 0 | 2661 do |
| 2662 { | |
| 315 | 2663 if ( (signed int)v13->uItemID > 0 && (signed int)v13->uItemID <= 134 && !v13->Broken()) |
| 0 | 2664 v46[v4++] = v12; |
| 2665 ++v12; | |
| 2666 ++v13; | |
| 2667 } | |
| 2668 while ( v12 < 138 ); | |
| 2669 goto LABEL_36; | |
| 2670 case 18: | |
| 2671 v14 = 0; | |
| 2672 do | |
| 2673 { | |
| 2674 if ( HasItemEquipped((ITEM_EQUIP_TYPE)v14) ) | |
| 2675 { | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
2676 __debugbreak(); // player.cpp(2871): warning C4700: uninitialized local variable 'v15' used |
| 816 | 2677 if ( v15 == EQUIP_ARMOUR ) |
| 898 | 2678 v46[v4++] = LOBYTE(v5->pEquipment.uArmor) - 1; |
| 816 | 2679 if ( (!v15 || v15 == 1) && GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v15) == 4 ) |
| 898 | 2680 v46[v4++] = *((char *)&v5->pEquipment.uShield + 4 * v15) - 1; |
| 0 | 2681 } |
| 2682 v14 = v15 + 1; | |
| 2683 } | |
| 2684 while ( v14 < 16 ); | |
| 2685 goto LABEL_36; | |
| 2686 case 19: | |
| 2687 v16 = 0; | |
| 2688 do | |
| 2689 { | |
| 2690 if ( HasItemEquipped((ITEM_EQUIP_TYPE)v16) ) | |
| 2691 { | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
2692 __debugbreak(); // player.cpp(2886): warning C4700: uninitialized local variable 'v17' used |
| 0 | 2693 if ( v17 == 2 ) |
| 2694 v46[v4++] = LOBYTE(v5->pEquipment.uBow) - 1; | |
| 2695 if ( (!v17 || v17 == 1) | |
| 816 | 2696 && (!GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v17) || GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v17) == 1) ) |
| 898 | 2697 v46[v4++] = *((char *)&v5->pEquipment.uShield + 4 * v17) - 1; |
| 0 | 2698 } |
| 2699 v16 = v17 + 1; | |
| 2700 } | |
| 2701 while ( v16 < 16 ); | |
| 2702 LABEL_36: | |
| 2703 if ( !v4 ) | |
| 2704 goto LABEL_87; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2705 v48 = (int)&v5->pInventoryItemList[(unsigned __int8)v46[rand() % v4]]; |
| 0 | 2706 v11 = 3 * (pItemsTable->pItems[*(int *)v48].uMaterial + pItemsTable->pItems[*(int *)v48].uDamageMod); |
| 2707 break; | |
| 2708 case 20: | |
| 2709 v19 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2710 v20 = this->pInventoryMatrix; |
| 0 | 2711 do |
| 2712 { | |
| 2713 if ( *v20 > 0 ) | |
| 2714 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2715 v21 = *(int *)&v5->pInventoryItemList[*v20-1]; |
| 0 | 2716 if ( v21 > 0 ) |
| 2717 { | |
| 2718 if ( v21 <= 134 ) | |
| 2719 v46[v4++] = v19; | |
| 2720 } | |
| 2721 } | |
| 2722 ++v19; | |
| 2723 ++v20; | |
| 2724 } | |
| 2725 while ( v19 < 126 ); | |
| 2726 if ( !v4 ) | |
| 2727 goto LABEL_87; | |
| 2728 v47 = (unsigned __int8)v46[rand() % v4]; | |
| 2729 v6 = GetActualAccuracy(); | |
| 2730 LABEL_46: | |
| 1036 | 2731 v7 = GetParameterBonus(v6); |
| 0 | 2732 LABEL_47: |
| 2733 v11 = v7; | |
| 2734 break; | |
| 2735 default: | |
| 2736 v11 = 0; | |
| 2737 break; | |
| 2738 } | |
| 2739 v22 = GetActualLuck(); | |
| 1036 | 2740 v23 = GetParameterBonus(v22) + v11 + 30; |
| 0 | 2741 if ( rand() % v23 >= 30 ) |
| 2742 { | |
| 2743 LABEL_87: | |
| 2744 result = 0; | |
| 2745 } | |
| 2746 else | |
| 2747 { | |
| 2748 switch ( a2 ) | |
| 2749 { | |
| 2750 case 1: | |
| 2751 v41 = 1; | |
| 2752 v36 = 0; | |
| 2753 goto LABEL_56; | |
| 2754 case 2: | |
| 2755 v41 = 1; | |
| 2756 v36 = 1; | |
| 2757 goto LABEL_56; | |
| 2758 case 3: | |
| 2759 v41 = 1; | |
| 2760 v36 = 2; | |
| 2761 goto LABEL_56; | |
| 2762 case 23: | |
| 2763 v41 = 1; | |
| 2764 v36 = 3; | |
| 2765 goto LABEL_56; | |
| 2766 case 4: | |
| 2767 v41 = 1; | |
| 2768 v36 = 4; | |
| 2769 LABEL_56: | |
| 2770 SetCondition(v36, v41); | |
| 2771 v42 = 0; | |
| 2772 v37 = 0; | |
| 2773 v35 = 0; | |
| 2774 v34 = 0; | |
| 2775 v33 = -1; | |
| 2776 v32 = 0; | |
| 2777 v31 = 0; | |
| 2778 v30 = (SoundID)221; | |
| 2779 goto LABEL_83; | |
| 2780 case 5: | |
| 2781 v43 = 1; | |
| 2782 v38 = 5; | |
| 2783 goto LABEL_70; | |
| 2784 case 6: | |
| 2785 case 7: | |
| 2786 case 8: | |
| 2787 if ( a2 == 6 ) | |
| 2788 { | |
| 2789 v44 = 6; | |
| 2790 goto LABEL_60; | |
| 2791 } | |
| 2792 v25 = 2 * (a2 != 8) + 8; | |
| 2793 goto LABEL_65; | |
| 2794 case 9: | |
| 2795 if ( a2 == 6 ) | |
| 2796 { | |
| 2797 v44 = 7; | |
| 2798 LABEL_60: | |
| 2799 v24 = v44; | |
| 2800 } | |
| 2801 else | |
| 2802 { | |
| 2803 v25 = 2 * (a2 != 8) + 9; | |
| 2804 LABEL_65: | |
| 2805 v24 = v25; | |
| 2806 } | |
| 2807 SetCondition(v24, 1); | |
| 2808 v42 = 0; | |
| 2809 v37 = 0; | |
| 2810 v35 = 0; | |
| 2811 v34 = 0; | |
| 2812 v33 = -1; | |
| 2813 v32 = 0; | |
| 2814 v31 = 0; | |
| 2815 v30 = (SoundID)222; | |
| 2816 LABEL_83: | |
| 2817 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42); | |
| 2818 do | |
| 2819 { | |
| 2820 LABEL_84: | |
| 2821 if ( v5 == pPlayers[v3 + 1] ) | |
| 2822 break; | |
| 2823 ++v3; | |
| 2824 } | |
| 2825 while ( v3 < 4 ); | |
| 2826 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2827 result = 1; | |
| 2828 break; | |
| 2829 case 12: | |
| 2830 v43 = 1; | |
| 2831 v38 = 12; | |
| 2832 goto LABEL_70; | |
| 2833 case 15: | |
| 2834 v45 = 1; | |
| 2835 v39 = 15; | |
| 2836 goto LABEL_73; | |
| 2837 case 13: | |
| 2838 v43 = 1; | |
| 2839 v38 = 13; | |
| 2840 LABEL_70: | |
| 2841 SetCondition(v38, v43); | |
| 2842 v42 = 0; | |
| 2843 v37 = 0; | |
| 2844 v35 = 0; | |
| 2845 v34 = 0; | |
| 2846 v33 = -1; | |
| 2847 v32 = 0; | |
| 2848 v31 = 0; | |
| 2849 v30 = (SoundID)224; | |
| 2850 goto LABEL_83; | |
| 2851 case 14: | |
| 2852 v45 = 1; | |
| 2853 v39 = 14; | |
| 2854 goto LABEL_73; | |
| 2855 case 16: | |
| 2856 v45 = 1; | |
| 2857 v39 = 16; | |
| 2858 LABEL_73: | |
| 2859 SetCondition(v39, v45); | |
| 2860 v42 = 0; | |
| 2861 v37 = 0; | |
| 2862 v35 = 0; | |
| 2863 v34 = 0; | |
| 2864 v33 = -1; | |
| 2865 v32 = 0; | |
| 2866 v31 = 0; | |
| 2867 v30 = (SoundID)225; | |
| 2868 goto LABEL_83; | |
| 2869 case 17: | |
| 2870 case 18: | |
| 2871 case 19: | |
| 2872 v26 = v48; | |
| 2873 if ( *(char *)(v48 + 21) & 2 ) | |
| 2874 goto LABEL_84; | |
| 187 | 2875 PlaySound(SPEECH_40, 0); |
| 0 | 2876 *(int *)(v26 + 20) |= 2u; |
| 2877 goto LABEL_79; | |
| 2878 case 20: | |
| 187 | 2879 PlaySound(SPEECH_40, 0); |
| 0 | 2880 v27 = pActor->array_000234; |
| 2881 if ( pActor->array_000234[0].uItemID ) | |
| 2882 { | |
| 2883 v27 = &pActor->array_000234[1]; | |
| 2884 if ( pActor->array_000234[1].uItemID ) | |
| 2885 goto LABEL_84; | |
| 2886 } | |
| 2887 v28 = v47; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2888 memcpy(v27, &v5->pInventoryItemList[v5->pInventoryMatrix[v47]-1], 0x24u); |
| 0 | 2889 RemoveItemAtInventoryIndex(v28); |
| 2890 LABEL_79: | |
| 2891 v42 = 0; | |
| 2892 v37 = 0; | |
| 2893 v35 = 0; | |
| 2894 v34 = 0; | |
| 2895 v33 = -1; | |
| 2896 v32 = 0; | |
| 2897 v31 = 0; | |
| 2898 v30 = (SoundID)47; | |
| 2899 goto LABEL_83; | |
| 2900 case 21: | |
| 187 | 2901 PlaySound(SPEECH_42, 0); |
| 0 | 2902 ++v5->sAgeModifier; |
| 2903 goto LABEL_82; | |
| 2904 case 22: | |
| 187 | 2905 PlaySound(SPEECH_41, 0); |
| 0 | 2906 v5->sMana = 0; |
| 2907 LABEL_82: | |
| 2908 v42 = 0; | |
| 2909 v37 = 0; | |
| 2910 v35 = 0; | |
| 2911 v34 = 0; | |
| 2912 v33 = -1; | |
| 2913 v32 = 0; | |
| 2914 v31 = 0; | |
| 2915 v30 = (SoundID)226; | |
| 2916 goto LABEL_83; | |
| 2917 default: | |
| 2918 goto LABEL_87; | |
| 2919 } | |
| 2920 } | |
| 2921 return result; | |
| 2922 } | |
| 324 | 2923 |
| 0 | 2924 // 48DCF6: using guessed type char var_94[140]; |
| 2925 | |
| 2926 //----- (0048E1A3) -------------------------------------------------------- | |
| 2927 unsigned int Player::GetSpellSchool(unsigned int uSpellID) | |
| 2928 { | |
| 1091 | 2929 return pSpellStats->pInfos[uSpellID].uSchool; |
| 0 | 2930 } |
| 2931 | |
| 2932 //----- (0048E1B5) -------------------------------------------------------- | |
| 816 | 2933 int Player::GetAttackRecoveryTime(bool bRangedAttack) |
| 2934 { | |
| 2935 ItemGen *weapon = nullptr; | |
| 2936 ItemDesc *weapon_desc = nullptr; | |
| 2937 uint weapon_recovery = base_recovery_times_per_weapon_type[0]; | |
| 2938 if (bRangedAttack) | |
| 0 | 2939 { |
| 2940 if ( !HasItemEquipped(EQUIP_BOW) ) | |
| 2941 goto LABEL_17; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2942 weapon = &pInventoryItemList[pEquipment.uBow - 1]; |
| 816 | 2943 weapon_desc = &pItemsTable->pItems[weapon->uItemID]; |
| 2944 weapon_recovery = base_recovery_times_per_weapon_type[weapon_desc->uSkillType]; | |
| 2945 goto LABEL_17; | |
| 2946 } | |
| 2947 else if ( IsUnarmed() == 1 ) | |
| 2948 { | |
| 2949 if (GetActualSkillLevel(PLAYER_SKILL_UNARMED)) | |
| 2950 { | |
| 2951 weapon_recovery = base_recovery_times_per_weapon_type[1]; | |
| 0 | 2952 goto LABEL_17; |
| 2953 } | |
| 2954 } | |
| 816 | 2955 |
| 2956 if ( HasItemEquipped(EQUIP_MAIN_HAND) ) | |
| 2957 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2958 weapon = &pInventoryItemList[pEquipment.uMainHand - 1]; |
| 816 | 2959 weapon_desc = &pItemsTable->pItems[weapon->uItemID]; |
| 2960 if (weapon_desc->uEquipType == EQUIP_WAND) | |
| 2961 { | |
| 2962 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
| 2963 __debugbreak(); // looks like wands were two-handed weapons once, or supposed to be. should not get here now | |
| 2964 weapon_recovery = pSpellDatas[wand_spell_ids[weapon->uItemID - ITEM_WAND_FIRE]].uExpertLevelRecovery; | |
| 2965 } | |
| 0 | 2966 else |
| 816 | 2967 weapon_recovery = base_recovery_times_per_weapon_type[weapon_desc->uSkillType]; |
| 2968 } | |
| 1010 | 2969 if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD) |
| 2970 // ADD: shield check because shield recovery is added later and can be accidentally doubled | |
| 816 | 2971 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2972 auto v12 = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 2973 auto v12_desc = &pItemsTable->pItems[v12->uItemID]; |
| 2974 if (base_recovery_times_per_weapon_type[v12_desc->uSkillType] > weapon_recovery) | |
| 2975 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2976 weapon = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 2977 weapon_desc = &pItemsTable->pItems[weapon->uItemID]; |
| 2978 weapon_recovery = base_recovery_times_per_weapon_type[pItemsTable->pItems[weapon->uItemID].uSkillType]; | |
| 2979 } | |
| 2980 } | |
| 2981 | |
| 0 | 2982 LABEL_17: |
| 816 | 2983 uint armour_recovery = 0; |
| 0 | 2984 if ( HasItemEquipped(EQUIP_ARMOUR) ) |
| 2985 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
2986 auto armour_skill_type = pItemsTable->pItems[pInventoryItemList[pEquipment.uArmor - 1].uItemID].uSkillType; |
| 816 | 2987 uint base_armour_recovery = base_recovery_times_per_weapon_type[armour_skill_type]; |
| 2988 | |
| 2989 float armour_recovery_multipliers[4]; | |
| 2990 if (armour_skill_type == PLAYER_SKILL_LEATHER) | |
| 2991 { | |
| 2992 armour_recovery_multipliers[0] = 1.0f; | |
| 2993 armour_recovery_multipliers[1] = 0; | |
| 2994 armour_recovery_multipliers[2] = 0; | |
| 2995 armour_recovery_multipliers[3] = 0; | |
| 2996 } | |
| 2997 else if (armour_skill_type == PLAYER_SKILL_CHAIN) | |
| 2998 { | |
| 2999 armour_recovery_multipliers[0] = 1.0f; | |
| 3000 armour_recovery_multipliers[1] = 0.5f; | |
| 3001 armour_recovery_multipliers[2] = 0; | |
| 3002 armour_recovery_multipliers[3] = 0; | |
| 3003 } | |
| 3004 else if (armour_skill_type == PLAYER_SKILL_PLATE) | |
| 3005 { | |
| 3006 armour_recovery_multipliers[0] = 1.0f; | |
| 3007 armour_recovery_multipliers[1] = 0.5f; | |
| 3008 armour_recovery_multipliers[2] = 0.5f; | |
| 3009 armour_recovery_multipliers[3] = 0; | |
| 0 | 3010 } |
| 3011 else | |
| 3012 { | |
| 816 | 3013 assert(false && "Unknown armour type"); // what kind of armour is that? |
| 3014 armour_recovery_multipliers[0] = 1.0f; | |
| 3015 armour_recovery_multipliers[1] = 1.0f; | |
| 3016 armour_recovery_multipliers[2] = 1.0f; | |
| 3017 armour_recovery_multipliers[3] = 1.0f; | |
| 3018 } | |
| 3019 | |
| 3020 uint skill_mastery = SkillToMastery(pActiveSkills[armour_skill_type]); | |
| 3021 armour_recovery = base_armour_recovery * armour_recovery_multipliers[skill_mastery - 1]; | |
| 3022 } | |
| 3023 | |
| 3024 uint shield_recovery = 0; | |
| 3025 if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) == EQUIP_SHIELD) | |
| 3026 { | |
| 3027 float shield_recovery_multipliers[4] = {1, 0, 0, 0}; | |
| 3028 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
3029 auto shield = &pInventoryItemList[pEquipment.uShield - 1]; |
| 816 | 3030 auto skill_type = pItemsTable->pItems[shield->uItemID].uSkillType; |
| 3031 | |
| 3032 uint shield_base_recovery = base_recovery_times_per_weapon_type[skill_type]; | |
| 3033 shield_recovery = shield_base_recovery * SkillToMastery(pActiveSkills[skill_type]); | |
| 3034 } | |
| 3035 | |
| 1036 | 3036 uint player_speed_recovery_reduction = GetParameterBonus(GetActualSpeed()), |
| 816 | 3037 sword_axe_bow_recovery_reduction = 0; |
| 3038 bool shooting_laser = false; | |
| 3039 if (weapon_desc) | |
| 3040 { | |
| 3041 if (GetActualSkillLevel((PLAYER_SKILL_TYPE)weapon_desc->uSkillType) && | |
| 3042 (weapon_desc->uSkillType == PLAYER_SKILL_SWORD || weapon_desc->uSkillType == PLAYER_SKILL_AXE || weapon_desc->uSkillType == PLAYER_SKILL_BOW) ) | |
| 3043 { | |
| 3044 if (SkillToMastery(pActiveSkills[weapon_desc->uSkillType]) >= 2 ) // Expert Sword, Axe & Bow reduce recovery | |
| 3045 sword_axe_bow_recovery_reduction = pActiveSkills[weapon_desc->uSkillType] & 0x3F; | |
| 3046 } | |
| 3047 if (weapon_desc->uSkillType == PLAYER_SKILL_BLASTER) | |
| 3048 shooting_laser = true; | |
| 3049 } | |
| 3050 | |
| 3051 uint armsmaster_recovery_reduction = 0; | |
| 3052 if (!bRangedAttack && !shooting_laser) | |
| 3053 { | |
| 3054 if (uint armsmaster_level = GetActualSkillLevel(PLAYER_SKILL_ARMSMASTER)) | |
| 3055 { | |
| 3056 armsmaster_recovery_reduction = armsmaster_level & 0x3F; | |
| 3057 if (SkillToMastery(armsmaster_level) >= 4) | |
| 3058 armsmaster_recovery_reduction *= 2; | |
| 3059 } | |
| 3060 } | |
| 3061 | |
| 3062 uint v41 = 0; | |
| 3063 if (pPlayerBuffs[PLAYER_BUFF_7].uExpireTime > 0) | |
| 0 | 3064 v41 = 25; |
| 816 | 3065 |
| 3066 uint weapon_enchantment_recovery_reduction = 0; | |
| 3067 if ( weapon ) | |
| 3068 { | |
| 3069 if (weapon->uSpecEnchantmentType == 59 || | |
| 3070 weapon->uSpecEnchantmentType == 41 || | |
| 3071 weapon->uSpecEnchantmentType == 500) | |
| 3072 weapon_enchantment_recovery_reduction = 20; | |
| 3073 } | |
| 3074 | |
| 3075 | |
| 3076 int recovery = weapon_recovery + | |
| 3077 armour_recovery + | |
| 3078 shield_recovery | |
| 3079 - armsmaster_recovery_reduction | |
| 3080 - weapon_enchantment_recovery_reduction | |
| 3081 - v41 | |
| 3082 - sword_axe_bow_recovery_reduction | |
| 3083 - player_speed_recovery_reduction; | |
| 3084 | |
| 3085 if (recovery < 0) | |
| 3086 recovery = 0; | |
| 3087 return recovery; | |
| 0 | 3088 } |
| 3089 | |
| 3090 //----- (0048E4F8) -------------------------------------------------------- | |
| 3091 int Player::GetMaxHealth() | |
| 3092 { | |
| 3093 int v3; // esi@1 | |
| 3094 int v4; // esi@1 | |
| 3095 int v6; // esi@1 | |
| 3096 | |
| 1036 | 3097 v3 = GetParameterBonus(GetActualEndurance()); |
| 135 | 3098 v4 = pBaseHealthPerLevelByClass[classType] * (GetActualLevel() + v3); |
| 0 | 3099 v6 = uFullHealthBonus |
| 135 | 3100 + pBaseHealthByClass[classType / 4] |
| 0 | 3101 + GetSkillBonus(CHARACTER_ATTRIBUTE_HEALTH) |
| 3102 + GetItemsBonus(CHARACTER_ATTRIBUTE_HEALTH, 0) + v4; | |
| 3103 if (v6 <= 0) | |
| 3104 return 1; | |
| 3105 return v6; | |
| 3106 } | |
| 3107 | |
| 3108 //----- (0048E565) -------------------------------------------------------- | |
| 3109 int Player::GetMaxMana() | |
| 3110 { | |
| 3111 int v2; // eax@2 | |
| 3112 int v3; // esi@4 | |
| 3113 int v4; // eax@5 | |
| 3114 int v5; // esi@5 | |
| 3115 int v6; // eax@5 | |
| 3116 int v7; // esi@6 | |
| 3117 int v8; // esi@6 | |
| 3118 int v9; // esi@6 | |
| 3119 int result; // eax@7 | |
| 1116 | 3120 |
| 135 | 3121 switch (classType) |
| 0 | 3122 { |
| 1116 | 3123 case PLAYER_CLASS_ROGUE: |
| 3124 case PLAYER_CLASS_SPY: | |
| 3125 case PLAYER_CLASS_ASSASSIN: | |
| 3126 case PLAYER_CLASS_ARCHER: | |
| 3127 case PLAYER_CLASS_WARRIOR_MAGE: | |
| 3128 case PLAYER_CLASS_MASTER_ARCHER: | |
| 3129 case PLAYER_CLASS_SNIPER: | |
| 3130 case PLAYER_CLASS_SORCERER: | |
| 3131 case PLAYER_CLASS_WIZARD: | |
| 3132 case PLAYER_CLASS_ARCHMAGE: | |
| 3133 case PLAYER_CLASS_LICH: | |
| 0 | 3134 v2 = GetActualIntelligence(); |
| 1036 | 3135 v3 = GetParameterBonus(v2); |
| 1116 | 3136 break; |
| 3137 case PLAYER_CLASS_INITIATE: | |
| 3138 case PLAYER_CLASS_MASTER: | |
| 3139 case PLAYER_CLASS_NINJA: | |
| 3140 case PLAYER_CLASS_PALADIN: | |
| 3141 case PLAYER_CLASS_CRUSADER: | |
| 3142 case PLAYER_CLASS_HERO: | |
| 3143 case PLAYER_CLASS_VILLIAN: | |
| 3144 case PLAYER_CLASS_CLERIC: | |
| 3145 case PLAYER_CLASS_PRIEST: | |
| 3146 case PLAYER_CLASS_PRIEST_OF_SUN: | |
| 3147 case PLAYER_CLASS_PRIEST_OF_MOON: | |
| 0 | 3148 v2 = GetActualWillpower(); |
| 1036 | 3149 v3 = GetParameterBonus(v2); |
| 1116 | 3150 break; |
| 3151 case PLAYER_CLASS_HUNTER: | |
| 3152 case PLAYER_CLASS_RANGER_LORD: | |
| 3153 case PLAYER_CLASS_BOUNTY_HUNTER: | |
| 3154 case PLAYER_CLASS_DRUID: | |
| 3155 case PLAYER_CLASS_GREAT_DRUID: | |
| 3156 case PLAYER_CLASS_ARCH_DRUID: | |
| 3157 case PLAYER_CLASS_WARLOCK: | |
| 0 | 3158 v4 = GetActualWillpower(); |
| 1036 | 3159 v5 = GetParameterBonus(v4); |
| 0 | 3160 v6 = GetActualIntelligence(); |
| 1036 | 3161 v3 = GetParameterBonus(v6) + v5; |
| 0 | 3162 break; |
| 3163 default: | |
| 1116 | 3164 return 0; |
| 0 | 3165 break; |
| 3166 } | |
| 1116 | 3167 v7 = pBaseManaPerLevelByClass[classType] * (GetActualLevel() + v3); |
| 3168 v8 = GetItemsBonus(CHARACTER_ATTRIBUTE_MANA, 0) + v7; | |
| 3169 v9 = uFullManaBonus | |
| 3170 + pBaseManaByClass[classType / 4] | |
| 3171 + GetSkillBonus(CHARACTER_ATTRIBUTE_MANA) | |
| 3172 + v8; | |
| 3173 return max(0,v9); | |
| 0 | 3174 } |
| 3175 | |
| 3176 //----- (0048E656) -------------------------------------------------------- | |
| 3177 int Player::GetBaseAC() | |
| 3178 { | |
| 3179 Player *v1; // edi@1 | |
| 3180 int v2; // eax@1 | |
| 3181 int v3; // esi@1 | |
| 3182 int v4; // esi@1 | |
| 3183 int v5; // esi@1 | |
| 3184 int result; // eax@2 | |
| 3185 | |
| 3186 v1 = this; | |
| 3187 v2 = GetActualSpeed(); | |
| 1036 | 3188 v3 = GetParameterBonus(v2); |
| 0 | 3189 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS, 0) + v3; |
| 3190 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; | |
| 3191 if ( v5 >= 1 ) | |
| 3192 result = v5; | |
| 3193 else | |
| 3194 result = 0; | |
| 3195 return result; | |
| 3196 } | |
| 3197 | |
| 3198 //----- (0048E68F) -------------------------------------------------------- | |
| 3199 int Player::GetActualAC() | |
| 3200 { | |
| 3201 Player *v1; // edi@1 | |
| 3202 int v2; // eax@1 | |
| 3203 int v3; // esi@1 | |
| 3204 int v4; // esi@1 | |
| 3205 int v5; // esi@1 | |
| 3206 int v6; // esi@1 | |
| 3207 int result; // eax@2 | |
| 3208 | |
| 3209 v1 = this; | |
| 3210 v2 = GetActualSpeed(); | |
| 1036 | 3211 v3 = GetParameterBonus(v2); |
| 0 | 3212 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS, 0) + v3; |
| 3213 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; | |
| 3214 v6 = v1->sACModifier + GetMagicalBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v5; | |
| 3215 if ( v6 >= 1 ) | |
| 3216 result = v6; | |
| 3217 else | |
| 3218 result = 0; | |
| 3219 return result; | |
| 3220 } | |
| 3221 | |
| 3222 //----- (0048E6DC) -------------------------------------------------------- | |
| 3223 unsigned int Player::GetBaseAge() | |
| 3224 { | |
| 352 | 3225 return ((__int64)(pParty->uTimePlayed * 0.234375) / 60 / 60 / 24) / 7 / 4 / 12 - uBirthYear + game_starting_year; |
| 0 | 3226 } |
| 3227 | |
| 3228 //----- (0048E72C) -------------------------------------------------------- | |
| 3229 unsigned int Player::GetActualAge() | |
| 3230 { | |
| 3231 return this->sAgeModifier + GetBaseAge(); | |
| 3232 } | |
| 3233 | |
| 3234 //----- (0048E73F) -------------------------------------------------------- | |
| 3235 int Player::GetBaseResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 3236 { | |
| 3237 Player *v2; // ebx@1 | |
| 3238 signed int v3; // esi@1 | |
| 3239 enum CHARACTER_RACE v4; // eax@1 | |
| 3240 signed int v5; // edi@8 | |
| 3241 char v6; // zf@9 | |
| 3242 int v7; // esi@20 | |
| 3243 int result; // eax@21 | |
| 3244 signed int v9; // [sp-4h] [bp-10h]@11 | |
| 3245 | |
| 3246 v2 = this; | |
| 3247 v3 = 0; | |
| 3248 v4 = GetRace(); | |
| 3249 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE ) | |
| 3250 { | |
| 3251 v5 = 0; | |
| 3252 goto LABEL_16; | |
| 3253 } | |
| 3254 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_AIR ) | |
| 3255 { | |
| 3256 v5 = 1; | |
| 3257 LABEL_16: | |
| 3258 v6 = v4 == 2; | |
| 3259 goto LABEL_17; | |
| 3260 } | |
| 3261 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_WATER ) | |
| 3262 { | |
| 3263 v6 = v4 == 3; | |
| 3264 v5 = 2; | |
| 3265 goto LABEL_17; | |
| 3266 } | |
| 3267 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_EARTH ) | |
| 3268 { | |
| 3269 v5 = 3; | |
| 3270 v6 = v4 == 3; | |
| 3271 goto LABEL_17; | |
| 3272 } | |
| 3273 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_MIND ) | |
| 3274 { | |
| 3275 v5 = 7; | |
| 3276 if ( v4 != 1 ) | |
| 3277 goto LABEL_20; | |
| 3278 v9 = 10; | |
| 3279 LABEL_19: | |
| 3280 v3 = v9; | |
| 3281 goto LABEL_20; | |
| 3282 } | |
| 3283 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_BODY || a2 == 33 ) | |
| 3284 { | |
| 3285 v5 = 8; | |
| 3286 v6 = v4 == 0; | |
| 3287 LABEL_17: | |
| 3288 if ( !v6 ) | |
| 3289 goto LABEL_20; | |
| 3290 v9 = 5; | |
| 3291 goto LABEL_19; | |
| 3292 } | |
| 3293 v5 = 0; | |
| 3294 LABEL_20: | |
| 3295 v7 = GetItemsBonus(a2, 0) + v3; | |
| 135 | 3296 if ( v2->classType != PLAYER_CLASS_LICH || (result = 200, v7 + *(&v2->sResFireBase + v5) <= 200) ) |
| 0 | 3297 result = v7 + *(&v2->sResFireBase + v5); |
| 3298 return result; | |
| 3299 } | |
| 3300 | |
| 3301 //----- (0048E7D0) -------------------------------------------------------- | |
| 3302 int Player::GetActualResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 3303 { | |
| 3304 signed int v2; // edi@1 | |
| 3305 Player *v3; // esi@1 | |
| 3306 enum CHARACTER_RACE v4; // ebx@1 | |
| 3307 char v6; // zf@18 | |
| 3308 int v7; // ebx@28 | |
| 3309 int result; // eax@28 | |
| 3310 signed int v9; // [sp+10h] [bp-8h]@1 | |
| 3311 signed int v10; // [sp+14h] [bp-4h]@1 | |
| 3312 | |
| 3313 v2 = 0; | |
| 3314 v3 = this; | |
| 3315 v10 = 0; | |
| 3316 v9 = 0; | |
| 3317 v4 = GetRace(); | |
| 652 | 3318 if ( CheckHiredNPCSpeciality(Enchanter) ) |
| 0 | 3319 v10 = 20; |
| 3320 if ( (a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE | |
| 3321 || a2 == CHARACTER_ATTRIBUTE_RESIST_AIR | |
| 3322 || a2 == CHARACTER_ATTRIBUTE_RESIST_WATER | |
| 3323 || a2 == CHARACTER_ATTRIBUTE_RESIST_EARTH) | |
| 3324 && SkillToMastery(v3->pActiveSkills[9]) == 4 | |
| 3325 && HasItemEquipped(EQUIP_ARMOUR) | |
| 3326 && GetEquippedItemSkillType(EQUIP_ARMOUR) == PLAYER_SKILL_LEATHER ) | |
| 3327 v10 += v3->pActiveSkills[9] & 0x3F; | |
| 3328 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE ) | |
| 3329 goto LABEL_25; | |
| 3330 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_AIR ) | |
| 3331 { | |
| 3332 v2 = 1; | |
| 3333 LABEL_25: | |
| 3334 v6 = v4 == 2; | |
| 3335 LABEL_26: | |
| 3336 if ( v6 ) | |
| 3337 v9 = 5; | |
| 3338 goto LABEL_28; | |
| 3339 } | |
| 3340 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_WATER ) | |
| 3341 { | |
| 3342 v6 = v4 == 3; | |
| 3343 v2 = 2; | |
| 3344 goto LABEL_26; | |
| 3345 } | |
| 3346 if ( a2 == CHARACTER_ATTRIBUTE_RESIST_EARTH ) | |
| 3347 { | |
| 3348 v2 = 3; | |
| 3349 if ( v4 == 3 ) | |
| 3350 v10 += 5; | |
| 3351 } | |
| 3352 else | |
| 3353 { | |
| 3354 if ( a2 != CHARACTER_ATTRIBUTE_RESIST_MIND ) | |
| 3355 { | |
| 3356 if ( a2 != CHARACTER_ATTRIBUTE_RESIST_BODY && a2 != 33 ) | |
| 3357 goto LABEL_28; | |
| 3358 v2 = 8; | |
| 3359 v6 = v4 == 0; | |
| 3360 goto LABEL_26; | |
| 3361 } | |
| 3362 v2 = 7; | |
| 3363 if ( v4 == 1 ) | |
| 3364 v9 = 10; | |
| 3365 } | |
| 3366 LABEL_28: | |
| 3367 v7 = GetItemsBonus(a2, 0); | |
| 3368 result = v10 + GetMagicalBonus(a2) + v7 + v9 + *(&v3->sResFireBonus + v2) + *(&v3->sResFireBase + v2); | |
| 135 | 3369 if ( v3->classType == PLAYER_CLASS_LICH ) |
| 0 | 3370 { |
| 3371 if ( result > 200 ) | |
| 3372 result = 200; | |
| 3373 } | |
| 3374 return result; | |
| 3375 } | |
| 3376 | |
| 3377 //----- (0048E8F5) -------------------------------------------------------- | |
| 816 | 3378 bool Player::Recover(int dt) |
| 3379 { | |
| 3380 //Player *v2; // esi@1 | |
| 0 | 3381 signed __int64 v3; // qax@1 |
| 816 | 3382 //bool result; // eax@4 |
| 3383 | |
| 3384 //v2 = this; | |
| 3385 v3 = (signed __int64)((double)(dt * _48EA46_calc_special_bonus_by_items(17)) * 0.01 + (double)dt); | |
| 3386 | |
| 3387 Log::Warning(L"Recover(dt = %u/%u - %u", dt, (uint)v3, (uint)uTimeToRecovery); | |
| 3388 | |
| 3389 if (uTimeToRecovery > v3) | |
| 3390 { | |
| 3391 uTimeToRecovery -= v3; | |
| 3392 return true; | |
| 0 | 3393 } |
| 3394 else | |
| 3395 { | |
| 816 | 3396 uTimeToRecovery = 0; |
| 3397 viewparams->bRedrawGameUI = true; | |
| 3398 if (!uActiveCharacter) | |
| 0 | 3399 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 3400 return false; |
| 3401 } | |
| 0 | 3402 } |
| 3403 | |
| 3404 //----- (0048E96A) -------------------------------------------------------- | |
| 816 | 3405 void Player::SetRecoveryTime(signed int rec) |
| 3406 { | |
|
828
0f56abdcce94
Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents:
821
diff
changeset
|
3407 assert(rec >= 0); |
| 816 | 3408 |
| 3409 if (rec > uTimeToRecovery) | |
| 3410 uTimeToRecovery = rec; | |
| 3411 | |
| 3412 if (pPlayers[uActiveCharacter] == this && !some_active_character) | |
| 0 | 3413 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 3414 |
| 3415 viewparams->bRedrawGameUI = true; | |
| 0 | 3416 } |
| 3417 // 50C0C4: using guessed type int some_active_character; | |
| 3418 | |
| 3419 //----- (0048E9B7) -------------------------------------------------------- | |
| 3420 void Player::RandomizeName() | |
| 3421 { | |
| 3422 if (!uExpressionTimePassed) | |
| 3423 strcpy(pName, pNPCStats->pNPCNames[rand() % pNPCStats->uNumNPCNames[uSex]][uSex]); | |
| 3424 } | |
| 3425 | |
| 3426 //----- (0048E9F4) -------------------------------------------------------- | |
| 3427 unsigned int Player::GetMajorConditionIdx() | |
| 3428 { | |
| 3429 for (uint i = 0; i < 18; ++i) | |
| 3430 if (pConditions[pConditionImportancyTable[i]] != 0) | |
| 3431 return pConditionImportancyTable[i]; | |
| 3432 | |
| 3433 return 18; | |
| 3434 } | |
| 3435 | |
| 3436 //----- (0048EA1B) -------------------------------------------------------- | |
| 1036 | 3437 int Player::GetParameterBonus( int player_parameter ) |
| 3438 { | |
| 3439 int i; // eax@1 | |
| 3440 i = 0; | |
| 3441 while (param_to_bonus_table[i]) | |
| 3442 { | |
| 3443 if (player_parameter >= param_to_bonus_table[i]) | |
| 3444 break; | |
| 3445 ++i; | |
| 3446 } | |
| 3447 return parameter_to_bonus_value[i]; | |
| 0 | 3448 } |
| 3449 | |
| 3450 //----- (0048EA46) -------------------------------------------------------- | |
| 3451 int Player::_48EA46_calc_special_bonus_by_items(int a2) | |
| 3452 { | |
| 1032 | 3453 int inv_indx; // eax@3 |
| 3454 | |
| 3455 for (int i=EQUIP_OFF_HAND; i<EQUIP_BOOK; ++i ) | |
| 3456 { | |
| 3457 if ( !HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3458 continue; | |
| 3459 inv_indx = pEquipment.pIndices[i] - 1; | |
| 3460 if (a2==17) | |
| 3461 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
3462 if ((pInventoryItemList[inv_indx].uSpecEnchantmentType==17)||(pInventoryItemList[inv_indx].uItemID==533)) //Elven Chainmail+Increases rate of Recovery |
| 1032 | 3463 return 50; |
| 3464 } | |
| 3465 if (a2==24) | |
| 3466 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
3467 if (pInventoryItemList[inv_indx].uSpecEnchantmentType==24) //Increased Knockback. |
| 1032 | 3468 return 5; |
| 3469 } | |
| 3470 } | |
| 3471 return 0; | |
| 0 | 3472 } |
| 3473 | |
| 3474 //----- (0048EAAE) -------------------------------------------------------- | |
| 3475 int Player::GetItemsBonus(CHARACTER_ATTRIBUTE_TYPE attr, int a3) | |
| 3476 { | |
| 3477 CHARACTER_ATTRIBUTE_TYPE v3; // esi@1 | |
| 1040 | 3478 // signed int v4; // eax@1 |
| 0 | 3479 int v5; // edi@1 |
| 3480 Player *v6; // ebx@1 | |
| 3481 Player *v8; // ecx@48 | |
| 3482 int v9; // eax@49 | |
| 3483 int v10; // edx@49 | |
| 3484 Player *v11; // ecx@55 | |
| 3485 int v12; // eax@56 | |
| 3486 int v13; // edx@56 | |
| 3487 int v14; // ecx@58 | |
| 3488 int v15; // eax@58 | |
| 3489 Player *v16; // ecx@61 | |
| 3490 int v17; // eax@62 | |
| 3491 Player *v18; // ecx@66 | |
| 3492 int v19; // eax@67 | |
| 3493 int v20; // eax@69 | |
| 3494 Player *v21; // ecx@75 | |
| 3495 int v22; // eax@76 | |
| 3496 int v23; // edx@76 | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3497 //int v24; // eax@79 |
| 0 | 3498 int v25; // ecx@80 |
| 3499 int v26; // edi@80 | |
| 3500 Player *v27; // ecx@84 | |
| 3501 int v28; // eax@85 | |
| 3502 int v29; // edx@85 | |
| 3503 Player *v30; // ecx@96 | |
| 3504 int v31; // ebp@97 | |
| 3505 int v32; // eax@98 | |
| 3506 unsigned int v33; // eax@100 | |
| 3507 int v34; // eax@103 | |
| 3508 char v35; // zf@104 | |
| 3509 char v36; // zf@107 | |
| 3510 unsigned __int8 v37; // zf@119 | |
| 3511 char v38; // sf@119 | |
| 3512 unsigned __int8 v39; // of@119 | |
| 3513 char v40; // zf@122 | |
| 3514 char v41; // zf@145 | |
| 3515 char v42; // zf@164 | |
| 3516 char v43; // zf@173 | |
| 3517 char v44; // zf@189 | |
| 3518 char v45; // zf@198 | |
| 3519 char v46; // zf@239 | |
| 3520 int v47; // eax@268 | |
| 3521 int v48; // eax@269 | |
| 3522 int v49; // eax@291 | |
| 3523 char v50; // zf@295 | |
| 3524 int v51; // eax@306 | |
| 3525 int v52; // eax@307 | |
| 3526 char v53; // zf@312 | |
| 3527 char v54; // zf@336 | |
| 3528 char v55; // zf@348 | |
| 3529 int v56; // eax@365 | |
| 3530 int v57; // ebx@368 | |
| 3531 signed int v58; // [sp-4h] [bp-20h]@10 | |
| 3532 signed int v59; // [sp-4h] [bp-20h]@71 | |
| 3533 signed int v60; // [sp-4h] [bp-20h]@347 | |
| 3534 int v61; // [sp+10h] [bp-Ch]@1 | |
| 3535 int v62; // [sp+14h] [bp-8h]@1 | |
| 3536 int v63; // [sp+18h] [bp-4h]@101 | |
| 3537 ItemGen *attra; // [sp+20h] [bp+4h]@101 | |
| 3538 unsigned int v65; // [sp+24h] [bp+8h]@95 | |
| 1040 | 3539 bool no_skills; |
| 0 | 3540 |
| 3541 v3 = attr; | |
| 3542 v5 = 0; | |
| 3543 v6 = this; | |
| 3544 v62 = 0; | |
| 3545 v61 = 0; | |
| 3546 | |
| 1040 | 3547 |
| 3548 no_skills=false; | |
| 0 | 3549 switch (attr) |
| 3550 { | |
| 1040 | 3551 case CHARACTER_ATTRIBUTE_SKILL_ALCHEMY: v58 = PLAYER_SKILL_ALCHEMY; break; |
| 3552 case CHARACTER_ATTRIBUTE_SKILL_STEALING: v58 = PLAYER_SKILL_STEALING; break; | |
| 3553 case CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM: v58 = PLAYER_SKILL_TRAP_DISARM; break; | |
| 3554 case CHARACTER_ATTRIBUTE_SKILL_ITEM_ID: v58 = PLAYER_SKILL_ITEM_ID; break; | |
| 3555 case CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID: v58 = PLAYER_SKILL_MONSTER_ID; break; | |
| 3556 case CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER: v58 = PLAYER_SKILL_ARMSMASTER; break; | |
| 3557 case CHARACTER_ATTRIBUTE_SKILL_DODGE: v58 = PLAYER_SKILL_DODGE; break; | |
| 3558 case CHARACTER_ATTRIBUTE_SKILL_UNARMED: v58 = PLAYER_SKILL_UNARMED; break; | |
| 3559 case CHARACTER_ATTRIBUTE_SKILL_FIRE: v58 = PLAYER_SKILL_FIRE; break; | |
| 3560 case CHARACTER_ATTRIBUTE_SKILL_AIR: v58 = PLAYER_SKILL_AIR; break; | |
| 3561 case CHARACTER_ATTRIBUTE_SKILL_WATER: v58 = PLAYER_SKILL_WATER; break; | |
| 3562 case CHARACTER_ATTRIBUTE_SKILL_EARTH: v58 = PLAYER_SKILL_EARTH; break; | |
| 3563 case CHARACTER_ATTRIBUTE_SKILL_SPIRIT: v58 = PLAYER_SKILL_SPIRIT; break; | |
| 3564 case CHARACTER_ATTRIBUTE_SKILL_MIND: v58 = PLAYER_SKILL_MIND; break; | |
| 3565 case CHARACTER_ATTRIBUTE_SKILL_BODY: v58 = PLAYER_SKILL_BODY; break; | |
| 3566 case CHARACTER_ATTRIBUTE_SKILL_LIGHT: v58 = PLAYER_SKILL_LIGHT; break; | |
| 3567 case CHARACTER_ATTRIBUTE_SKILL_DARK: v58 = PLAYER_SKILL_DARK; break; | |
| 3568 case CHARACTER_ATTRIBUTE_SKILL_MEDITATION: v58 = PLAYER_SKILL_MEDITATION; break; | |
| 3569 case CHARACTER_ATTRIBUTE_SKILL_BOW: v58 = PLAYER_SKILL_BOW; break; | |
| 3570 case CHARACTER_ATTRIBUTE_SKILL_SHIELD: v58 = PLAYER_SKILL_SHIELD; break; | |
| 3571 case CHARACTER_ATTRIBUTE_SKILL_LEARNING: v58 = PLAYER_SKILL_LEARNING; break; | |
| 3572 default: | |
| 3573 no_skills=true; | |
| 0 | 3574 } |
| 1040 | 3575 if (!no_skills) |
| 0 | 3576 { |
| 1040 | 3577 if ( !this->pActiveSkills[v58] ) |
| 3578 return 0; | |
| 0 | 3579 } |
| 1040 | 3580 |
| 0 | 3581 if ( (signed int)attr > 28 ) |
| 3582 { | |
| 3583 if ( (signed int)attr < 29 ) | |
| 3584 return v5 + v62 + v61; | |
| 1040 | 3585 if ( (signed int)attr <= CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS ) |
| 0 | 3586 { |
| 3587 if ( HasItemEquipped(EQUIP_BOW) ) | |
| 1040 | 3588 v5 = pItemsTable->pItems[v6->pOwnItems[v6->pEquipment.uBow-1].uItemID].uDamageMod; |
| 0 | 3589 return v5 + v62 + v61; |
| 3590 } | |
| 1040 | 3591 if ( attr == CHARACTER_ATTRIBUTE_RANGED_DMG_MIN ) |
| 0 | 3592 { |
| 3593 if ( !HasItemEquipped(EQUIP_BOW) ) | |
| 3594 return v5 + v62 + v61; | |
| 1040 | 3595 v57 = v6->pOwnItems[v6->pEquipment.uBow-1].uItemID; |
| 0 | 3596 v5 = pItemsTable->pItems[v57].uDamageMod; |
| 3597 v56 = pItemsTable->pItems[v57].uDamageDice; | |
| 1040 | 3598 v5 += v56; |
| 3599 return v5 + v62 + v61; | |
| 3600 } | |
| 3601 if ( attr == CHARACTER_ATTRIBUTE_RANGED_DMG_MAX ) | |
| 0 | 3602 { |
| 3603 if ( !HasItemEquipped(EQUIP_BOW) ) | |
| 3604 return v5 + v62 + v61; | |
| 1040 | 3605 v20 = v6->pOwnItems[v6->pEquipment.uBow-1].uItemID; |
| 0 | 3606 v5 = pItemsTable->pItems[v20].uDamageDice * pItemsTable->pItems[v20].uDamageRoll; |
| 3607 LABEL_365: | |
| 3608 v56 = pItemsTable->pItems[v20].uDamageMod; | |
| 3609 LABEL_366: | |
| 3610 v5 += v56; | |
| 3611 return v5 + v62 + v61; | |
| 3612 } | |
| 3613 if ( (signed int)attr <= 33 || (signed int)attr > 46 ) | |
| 3614 return v5 + v62 + v61; | |
| 3615 LABEL_95: | |
| 3616 v65 = 0; | |
| 3617 while ( 1 ) | |
| 3618 { | |
| 3619 if ( !HasItemEquipped((ITEM_EQUIP_TYPE)v65) ) | |
| 3620 goto LABEL_361; | |
| 898 | 3621 v31 = *(&v6->pEquipment.uShield + v65) - 1; |
| 0 | 3622 if ( v3 == 9 ) |
| 3623 { | |
| 816 | 3624 v32 = GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v65); |
| 0 | 3625 if ( v32 >= 3 ) |
| 3626 { | |
| 3627 if ( v32 <= 11 ) | |
| 3628 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
3629 v33 = v6->pInventoryItemList[v31].uItemID; |
| 0 | 3630 v5 += pItemsTable->pItems[v33].uDamageDice + pItemsTable->pItems[v33].uDamageMod; |
| 3631 } | |
| 3632 } | |
| 3633 } | |
| 3634 v63 = (int)((char *)v6 + 36 * v31); | |
| 3635 attra = (ItemGen *)(v63 + 532); | |
| 377 | 3636 if ( pItemsTable->IsMaterialNonCommon((ItemGen *)(v63 + 532)) == 1 |
| 3637 && !pItemsTable->IsMaterialSpecial(attra) ) | |
| 0 | 3638 { |
| 3639 v34 = attra->uItemID; | |
| 3640 switch ( attra->uItemID ) | |
| 3641 { | |
| 3642 case 0x1F4u: | |
| 3643 v35 = v3 == 5; | |
| 3644 goto LABEL_105; | |
| 3645 case 0x1F5u: | |
| 3646 v36 = v3 == 0; | |
| 3647 goto LABEL_108; | |
| 3648 case 0x1F6u: | |
| 3649 if ( v3 == 21 ) | |
| 3650 v61 += 10; | |
| 3651 v36 = v3 == 2; | |
| 3652 goto LABEL_108; | |
| 3653 case 0x1F7u: | |
| 3654 if ( v3 == 17 ) | |
| 3655 v61 += 5; | |
| 3656 if ( v3 == 18 ) | |
| 3657 v61 += 5; | |
| 3658 v36 = v3 == 6; | |
| 3659 goto LABEL_108; | |
| 3660 case 0x1F8u: | |
| 3661 goto LABEL_118; | |
| 3662 case 0x1F9u: | |
| 3663 v40 = v3 == 3; | |
| 3664 goto LABEL_123; | |
| 3665 case 0x1FAu: | |
| 3666 v35 = v3 == 10; | |
| 3667 goto LABEL_105; | |
| 3668 case 0x1FEu: | |
| 3669 v35 = v3 == 4; | |
| 3670 goto LABEL_105; | |
| 3671 case 0x1FFu: | |
| 3672 if ( v3 == 23 ) | |
| 3673 v61 += 10; | |
| 3674 if ( v3 == 22 ) | |
| 3675 v61 += 10; | |
| 3676 goto LABEL_361; | |
| 3677 case 0x200u: | |
| 3678 if ( v3 == 36 ) | |
| 3679 { | |
| 3680 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[14]); | |
| 3681 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3682 } | |
| 3683 v36 = v3 == 5; | |
| 3684 LABEL_108: | |
| 3685 if ( v36 ) | |
| 3686 v5 += 40; | |
| 3687 goto LABEL_361; | |
| 3688 case 0x201u: | |
| 3689 if ( v3 == 39 ) | |
| 3690 { | |
| 3691 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[17]); | |
| 3692 v34 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3693 v62 = v34; | |
| 3694 } | |
| 3695 goto LABEL_136; | |
| 3696 case 0x202u: | |
| 3697 if ( !v3 ) | |
| 3698 v5 += 150; | |
| 3699 if ( v3 == 1 ) | |
| 3700 v5 -= 40; | |
| 3701 if ( v3 == 2 ) | |
| 3702 v5 -= 40; | |
| 3703 goto LABEL_145; | |
| 3704 case 0x203u: | |
| 3705 if ( v3 == 42 ) | |
| 3706 { | |
| 3707 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[20]); | |
| 3708 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3709 } | |
| 3710 if ( v3 == 43 ) | |
| 3711 v61 += 15; | |
| 3712 goto LABEL_361; | |
| 3713 case 0x204u: | |
| 3714 if ( v3 == 17 ) | |
| 3715 v61 += 5; | |
| 3716 if ( v3 == 18 ) | |
| 3717 v61 += 5; | |
| 3718 if ( v3 == 6 ) | |
| 3719 v5 += 50; | |
| 3720 if ( v3 == 11 || v3 == 10 || v3 == 12 || v3 == 13 || v3 == 33 || v3 == 14 ) | |
| 3721 goto LABEL_166; | |
| 3722 v42 = v3 == 15; | |
| 3723 goto LABEL_165; | |
| 3724 case 0x205u: | |
| 3725 if ( v3 == 18 ) | |
| 3726 v61 += 5; | |
| 3727 goto LABEL_361; | |
| 3728 case 0x206u: | |
| 3729 if ( !v3 ) | |
| 3730 v5 += 100; | |
| 3731 if ( v3 == 3 ) | |
| 3732 v5 += 100; | |
| 3733 v43 = v3 == 9; | |
| 3734 goto LABEL_174; | |
| 3735 case 0x207u: | |
| 3736 if ( v3 == 45 ) | |
| 3737 v61 += 5; | |
| 3738 if ( v3 == 15 ) | |
| 3739 v5 -= 10; | |
| 3740 v42 = v3 == 14; | |
| 3741 LABEL_165: | |
| 3742 if ( v42 ) | |
| 3743 LABEL_166: | |
| 3744 v5 -= 10; | |
| 3745 goto LABEL_361; | |
| 3746 case 0x208u: | |
| 3747 v35 = v3 == 3; | |
| 3748 goto LABEL_105; | |
| 3749 case 0x209u: | |
| 3750 if ( v3 == 2 ) | |
| 3751 v5 += 15; | |
| 3752 if ( !v3 ) | |
| 3753 v5 += 15; | |
| 3754 v41 = v3 == 6; | |
| 3755 goto LABEL_146; | |
| 3756 case 0x20Au: | |
| 3757 if ( v3 == 46 ) | |
| 3758 v61 += 15; | |
| 3759 v44 = v3 == 3; | |
| 3760 goto LABEL_190; | |
| 3761 case 0x20Bu: | |
| 3762 if ( v3 == 34 ) | |
| 3763 { | |
| 3764 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[12]); | |
| 3765 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3766 } | |
| 3767 if ( v3 == 12 ) | |
| 3768 v5 += 50; | |
| 3769 if ( v3 == 2 ) | |
| 3770 v5 += 30; | |
| 3771 v45 = v3 == 9; | |
| 3772 goto LABEL_199; | |
| 3773 case 0x20Cu: | |
| 3774 if ( !v3 ) | |
| 3775 v5 += 75; | |
| 3776 goto LABEL_145; | |
| 3777 case 0x20Du: | |
| 3778 if ( v3 == 5 ) | |
| 3779 v5 += 50; | |
| 3780 if ( v3 == 6 ) | |
| 3781 v5 += 50; | |
| 3782 if ( v3 == 11 || v3 == 10 || v3 == 12 || v3 == 13 || v3 == 33 || v3 == 14 ) | |
| 3783 goto LABEL_374; | |
| 3784 v43 = v3 == 15; | |
| 3785 LABEL_174: | |
| 3786 if ( v43 ) | |
| 3787 LABEL_374: | |
| 3788 v5 -= 15; | |
| 3789 goto LABEL_361; | |
| 3790 case 0x20Eu: | |
| 3791 if ( v3 == 4 ) | |
| 3792 v5 += 150; | |
| 3793 if ( v3 == 44 ) | |
| 3794 v61 += 5; | |
| 3795 if ( v3 == 9 ) | |
| 3796 v5 -= 25; | |
| 3797 goto LABEL_361; | |
| 3798 case 0x20Fu: | |
| 3799 if ( v3 == 39 ) | |
| 3800 { | |
| 3801 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[17]); | |
| 3802 v34 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3803 v62 = v34; | |
| 3804 } | |
| 3805 if ( v3 == 40 ) | |
| 3806 { | |
| 3807 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[18]); | |
| 3808 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3809 } | |
| 3810 LABEL_145: | |
| 3811 v41 = v3 == 5; | |
| 3812 LABEL_146: | |
| 3813 if ( v41 ) | |
| 3814 v5 -= 40; | |
| 3815 goto LABEL_361; | |
| 3816 case 0x210u: | |
| 3817 if ( v3 == 38 ) | |
| 3818 { | |
| 3819 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[16]); | |
| 3820 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 3821 } | |
| 3822 if ( !v3 ) | |
| 3823 v5 += 75; | |
| 3824 v44 = v3 == 11; | |
| 3825 LABEL_190: | |
| 3826 if ( v44 ) | |
| 3827 v5 -= 50; | |
| 3828 goto LABEL_361; | |
| 3829 case 0x211u: | |
| 3830 if ( v3 == 5 ) | |
| 3831 v5 += 100; | |
| 3832 if ( v3 == 4 ) | |
| 3833 v5 += 50; | |
| 3834 v35 = v3 == 11; | |
| 3835 LABEL_105: | |
| 3836 if ( v35 ) | |
| 3837 v5 += 50; | |
| 3838 goto LABEL_361; | |
| 3839 case 0x212u: | |
| 3840 if ( v3 == 1 ) | |
| 3841 v5 -= 20; | |
| 3842 v45 = v3 == 2; | |
| 3843 LABEL_199: | |
| 3844 if ( v45 ) | |
| 3845 v5 -= 20; | |
| 3846 goto LABEL_361; | |
| 3847 case 0x214u: | |
| 3848 if ( v3 == 1 ) | |
| 3849 v5 += 15; | |
| 3850 v46 = v3 == 2; | |
| 3851 goto LABEL_240; | |
| 3852 case 0x215u: | |
| 3853 if ( v3 == 5 ) | |
| 3854 v5 += 15; | |
| 3855 v46 = v3 == 4; | |
| 3856 goto LABEL_240; | |
| 3857 case 0x216u: | |
| 3858 if ( v3 == 10 ) | |
| 3859 v5 += 30; | |
| 3860 if ( !v3 ) | |
| 3861 v5 += 15; | |
| 3862 goto LABEL_315; | |
| 3863 case 0x217u: | |
| 3864 if ( v3 == 21 ) | |
| 3865 v61 += 5; | |
| 3866 if ( !v3 ) | |
| 3867 v5 += 15; | |
| 3868 goto LABEL_253; | |
| 3869 case 0x218u: | |
| 3870 goto LABEL_253; | |
| 3871 default: | |
| 3872 goto LABEL_361; | |
| 3873 } | |
| 3874 goto LABEL_361; | |
| 3875 } | |
| 3876 if ( *(int *)(v63 + 536) == v3 + 1 ) | |
| 3877 { | |
| 3878 if ( (signed int)v3 >= 0 ) | |
| 3879 { | |
| 3880 if ( (signed int)v3 <= 15 ) | |
| 3881 { | |
| 3882 v5 += *((int *)v6->pConditions + 9 * v31 + 135); | |
| 3883 } | |
| 3884 else | |
| 3885 { | |
| 3886 if ( (signed int)v3 <= 23 && v5 < *((int *)v6->pConditions + 9 * v31 + 135) ) | |
| 3887 v5 = *((int *)v6->pConditions + 9 * v31 + 135); | |
| 3888 } | |
| 3889 } | |
| 3890 goto LABEL_361; | |
| 3891 } | |
| 3892 v34 = *(int *)(v63 + 544); | |
| 3893 if ( v34 > 48 ) | |
| 3894 { | |
| 3895 switch ( v34 ) | |
| 3896 { | |
| 3897 case 54: | |
| 3898 goto LABEL_315; | |
| 3899 case 49: | |
| 3900 if ( v3 == 6 ) | |
| 3901 goto LABEL_121; | |
| 3902 v50 = v3 == 1; | |
| 3903 goto LABEL_296; | |
| 3904 case 51: | |
| 3905 if ( v3 != 5 && v3 != 1 ) | |
| 3906 goto LABEL_309; | |
| 3907 goto LABEL_121; | |
| 3908 case 52: | |
| 3909 if ( v3 == 3 ) | |
| 3910 goto LABEL_121; | |
| 3911 v50 = v3 == 4; | |
| 3912 goto LABEL_296; | |
| 3913 case 53: | |
| 3914 if ( !v3 ) | |
| 3915 goto LABEL_121; | |
| 3916 v50 = v3 == 2; | |
| 3917 goto LABEL_296; | |
| 3918 case 55: | |
| 3919 v46 = v3 == 6; | |
| 3920 goto LABEL_240; | |
| 3921 case 56: | |
| 3922 if ( !v3 ) | |
| 3923 goto LABEL_351; | |
| 3924 v53 = v3 == 3; | |
| 3925 goto LABEL_350; | |
| 3926 case 57: | |
| 3927 if ( v3 == 1 ) | |
| 3928 goto LABEL_351; | |
| 3929 v53 = v3 == 2; | |
| 3930 goto LABEL_350; | |
| 3931 case 50: | |
| 3932 if ( v3 == 10 ) | |
| 3933 v5 += 30; | |
| 3934 goto LABEL_361; | |
| 3935 case 60: | |
| 3936 if ( v3 != 23 ) | |
| 3937 goto LABEL_336; | |
| 3938 if ( v5 >= 3 ) | |
| 3939 goto LABEL_361; | |
| 3940 v5 = 3; | |
| 3941 LABEL_336: | |
| 3942 v54 = v3 == 22; | |
| 3943 goto LABEL_345; | |
| 3944 case 61: | |
| 3945 if ( v3 != 17 ) | |
| 3946 goto LABEL_340; | |
| 3947 if ( v5 >= 3 ) | |
| 3948 goto LABEL_361; | |
| 3949 v5 = 3; | |
| 3950 LABEL_340: | |
| 3951 v54 = v3 == 18; | |
| 3952 goto LABEL_345; | |
| 3953 case 62: | |
| 3954 if ( v3 != 19 ) | |
| 3955 goto LABEL_344; | |
| 3956 if ( v5 >= 3 ) | |
| 3957 goto LABEL_361; | |
| 3958 v5 = 3; | |
| 3959 LABEL_344: | |
| 3960 v54 = v3 == 20; | |
| 3961 LABEL_345: | |
| 3962 if ( !v54 ) | |
| 3963 goto LABEL_361; | |
| 3964 if ( v5 >= 3 ) | |
| 3965 goto LABEL_361; | |
| 3966 v60 = 3; | |
| 3967 goto LABEL_360; | |
| 3968 case 67: | |
| 3969 v55 = v3 == 18; | |
| 3970 goto LABEL_357; | |
| 3971 case 68: | |
| 3972 v53 = v3 == 9; | |
| 3973 goto LABEL_350; | |
| 3974 case 69: | |
| 3975 if ( v3 == 11 ) | |
| 3976 v5 += 20; | |
| 3977 break; | |
| 3978 case 70: | |
| 3979 if ( v3 == 12 ) | |
| 3980 v5 += 10; | |
| 3981 v55 = v3 == 16; | |
| 3982 LABEL_357: | |
| 3983 if ( v55 && v5 < 2 ) | |
| 3984 { | |
| 3985 v60 = 2; | |
| 3986 LABEL_360: | |
| 3987 v5 = v60; | |
| 3988 } | |
| 3989 break; | |
| 3990 default: | |
| 3991 goto LABEL_361; | |
| 3992 } | |
| 3993 goto LABEL_361; | |
| 3994 } | |
| 3995 if ( v34 == 48 ) | |
| 3996 { | |
| 3997 if ( v3 == 9 ) | |
| 3998 v5 += 5; | |
| 3999 LABEL_315: | |
| 4000 v46 = v3 == 3; | |
| 4001 LABEL_240: | |
| 4002 if ( v46 ) | |
| 4003 v5 += 15; | |
| 4004 goto LABEL_361; | |
| 4005 } | |
| 4006 if ( v34 > 32 ) | |
| 4007 { | |
| 4008 if ( v34 > 44 ) | |
| 4009 { | |
| 4010 v51 = v34 - 45; | |
| 4011 if ( !v51 ) | |
| 4012 { | |
| 4013 if ( v3 == 5 ) | |
| 4014 goto LABEL_351; | |
| 4015 v53 = v3 == 4; | |
| 4016 LABEL_350: | |
| 4017 if ( v53 ) | |
| 4018 LABEL_351: | |
| 4019 v5 += 5; | |
| 4020 goto LABEL_361; | |
| 4021 } | |
| 4022 v52 = v51 - 1; | |
| 4023 if ( !v52 ) | |
| 4024 { | |
| 4025 v40 = v3 == 0; | |
| 4026 LABEL_123: | |
| 4027 if ( v40 ) | |
| 4028 v5 += 25; | |
| 4029 goto LABEL_361; | |
| 4030 } | |
| 4031 if ( v52 == 1 ) | |
| 4032 { | |
| 4033 LABEL_309: | |
| 4034 v50 = v3 == 8; | |
| 4035 goto LABEL_296; | |
| 4036 } | |
| 4037 } | |
| 4038 else | |
| 4039 { | |
| 4040 if ( v34 == 44 ) | |
| 4041 { | |
| 4042 v50 = v3 == 7; | |
| 4043 goto LABEL_296; | |
| 4044 } | |
| 4045 v34 -= 33; | |
| 4046 if ( !v34 ) | |
| 4047 { | |
| 4048 if ( v3 != 38 ) | |
| 4049 goto LABEL_361; | |
| 4050 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[16]); | |
| 4051 goto LABEL_138; | |
| 4052 } | |
| 4053 --v34; | |
| 4054 if ( !v34 ) | |
| 4055 { | |
| 4056 if ( v3 != 36 ) | |
| 4057 goto LABEL_361; | |
| 4058 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[14]); | |
| 4059 goto LABEL_138; | |
| 4060 } | |
| 4061 v49 = v34 - 8; | |
| 4062 if ( !v49 ) | |
| 4063 { | |
| 4064 if ( (signed int)v3 >= 0 && (signed int)v3 <= 15 ) | |
| 4065 ++v5; | |
| 4066 goto LABEL_361; | |
| 4067 } | |
| 4068 if ( v49 == 1 ) | |
| 4069 { | |
| 4070 if ( v3 != 3 && v3 != 7 ) | |
| 4071 { | |
| 4072 v50 = v3 == 9; | |
| 4073 LABEL_296: | |
| 4074 if ( !v50 ) | |
| 4075 goto LABEL_361; | |
| 4076 } | |
| 4077 LABEL_121: | |
| 4078 v5 += 10; | |
| 4079 goto LABEL_361; | |
| 4080 } | |
| 4081 } | |
| 4082 } | |
| 4083 else | |
| 4084 { | |
| 4085 if ( v34 == 32 ) | |
| 4086 { | |
| 4087 if ( v3 != 39 ) | |
| 4088 goto LABEL_361; | |
| 4089 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[17]); | |
| 4090 goto LABEL_138; | |
| 4091 } | |
| 4092 if ( v34 > 28 ) | |
| 4093 { | |
| 4094 v34 -= 29; | |
| 4095 if ( v34 ) | |
| 4096 { | |
| 4097 --v34; | |
| 4098 if ( v34 ) | |
| 4099 { | |
| 4100 --v34; | |
| 4101 if ( v34 || v3 != 41 ) | |
| 4102 goto LABEL_361; | |
| 4103 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[19]); | |
| 4104 } | |
| 4105 else | |
| 4106 { | |
| 4107 if ( v3 != 34 ) | |
| 4108 goto LABEL_361; | |
| 4109 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[12]); | |
| 4110 } | |
| 4111 } | |
| 4112 else | |
| 4113 { | |
| 4114 if ( v3 != 37 ) | |
| 4115 goto LABEL_361; | |
| 4116 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[15]); | |
| 4117 } | |
| 4118 goto LABEL_138; | |
| 4119 } | |
| 4120 if ( v34 == 28 ) | |
| 4121 { | |
| 4122 LABEL_136: | |
| 4123 if ( v3 == 42 ) | |
| 4124 { | |
| 4125 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[20]); | |
| 4126 LABEL_138: | |
| 4127 v62 = ((unsigned int)v34 >> 1) & 0x1F; | |
| 4128 goto LABEL_361; | |
| 4129 } | |
| 4130 } | |
| 4131 else | |
| 4132 { | |
| 4133 v47 = v34 - 1; | |
| 4134 if ( v47 ) | |
| 4135 { | |
| 4136 v48 = v47 - 1; | |
| 4137 if ( v48 ) | |
| 4138 { | |
| 4139 v34 = v48 - 24; | |
| 4140 if ( v34 ) | |
| 4141 { | |
| 4142 --v34; | |
| 4143 if ( v34 || v3 != 40 ) | |
| 4144 goto LABEL_361; | |
| 4145 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[18]); | |
| 4146 } | |
| 4147 else | |
| 4148 { | |
| 4149 if ( v3 != 35 ) | |
| 4150 goto LABEL_361; | |
| 4151 LOBYTE(v34) = LOBYTE(v6->pActiveSkills[13]); | |
| 4152 } | |
| 4153 goto LABEL_138; | |
| 4154 } | |
| 4155 LABEL_118: | |
| 4156 if ( (signed int)v3 < 0 ) | |
| 4157 goto LABEL_361; | |
| 4158 v39 = __OFSUB__((int)v3, 6); | |
| 4159 v37 = v3 == 6; | |
| 4160 v38 = v3 - 6 < 0; | |
| 4161 } | |
| 4162 else | |
| 4163 { | |
| 4164 LABEL_253: | |
| 4165 if ( (signed int)v3 < 10 ) | |
| 4166 goto LABEL_361; | |
| 4167 v39 = __OFSUB__((int)v3, 15); | |
| 4168 v37 = v3 == 15; | |
| 4169 v38 = v3 - 15 < 0; | |
| 4170 } | |
| 4171 if ( (unsigned __int8)(v38 ^ v39) | v37 ) | |
| 4172 goto LABEL_121; | |
| 4173 } | |
| 4174 } | |
| 4175 LABEL_361: | |
| 4176 ++v65; | |
| 4177 if ( (signed int)v65 >= 16 ) | |
| 4178 return v5 + v62 + v61; | |
| 4179 } | |
| 4180 } | |
| 1040 | 4181 if ( attr == CHARACTER_ATTRIBUTE_MELEE_DMG_MAX ) |
| 0 | 4182 { |
| 4183 if ( IsUnarmed() != 1 ) | |
| 4184 { | |
| 816 | 4185 if ( v6->HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 4186 { | |
| 4187 v22 = this->GetEquippedItemEquipType(EQUIP_MAIN_HAND); | |
| 0 | 4188 if ( v22 >= 0 ) |
| 4189 { | |
| 4190 if ( v22 <= 2 ) | |
| 4191 { | |
| 1040 | 4192 v23 = this->pOwnItems[this->pEquipment.uMainHand].uItemID; |
| 898 | 4193 if ( v6->pEquipment.uShield || pItemsTable->pItems[v23].uSkillType != 4 ) |
| 0 | 4194 { |
| 4195 v26 = pItemsTable->pItems[v23].uDamageRoll; | |
| 4196 v25 = pItemsTable->pItems[v23].uDamageDice; | |
| 4197 } | |
| 4198 else | |
| 4199 { | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4200 v25 = pItemsTable->pItems[v23].uDamageRoll; |
|
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4201 v26 = pItemsTable->pItems[v23].uDamageDice + 1; |
| 0 | 4202 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4203 v5 = pItemsTable->pItems[v23].uDamageMod + v25 * v26; |
| 0 | 4204 } |
| 4205 } | |
| 4206 } | |
| 1040 | 4207 |
| 4208 if ( a3 || !v6->HasItemEquipped(EQUIP_OFF_HAND) ) | |
| 4209 { | |
| 4210 | |
| 4211 v28 = v6->GetEquippedItemEquipType(EQUIP_OFF_HAND); | |
| 4212 if ((v28 < 0) || v28 > 2 ) | |
| 4213 return v5 + v62 + v61; | |
| 4214 } | |
| 1062 | 4215 v15 = pItemsTable->pItems[v23].uDamageMod; |
| 4216 v14 = pItemsTable->pItems[v23].uDamageDice * pItemsTable->pItems[v23].uDamageRoll; | |
| 1040 | 4217 v5 += v15 + v14; |
| 1049 | 4218 return v5 + v62 + v61; |
| 0 | 4219 } |
| 4220 v59 = 3; | |
| 4221 LABEL_74: | |
| 4222 v5 = v59; | |
| 4223 return v5 + v62 + v61; | |
| 4224 } | |
| 4225 if ( (signed int)attr < 0 ) | |
| 4226 return v5 + v62 + v61; | |
| 1040 | 4227 if ( (signed int)attr <= CHARACTER_ATTRIBUTE_SKILL_UNARMED ) |
| 0 | 4228 goto LABEL_95; |
| 1040 | 4229 if ( attr == CHARACTER_ATTRIBUTE_LEVEL ) |
| 4230 { | |
| 4231 if ( !Player::HasEnchantedItemEquipped(25) ) | |
| 4232 return v5 + v62 + v61; | |
| 4233 v5 = 5; | |
| 4234 return v5 + v62 + v61; | |
| 4235 } | |
| 4236 if ( (signed int)attr <= CHARACTER_ATTRIBUTE_LEVEL ) | |
| 0 | 4237 return v5 + v62 + v61; |
| 1040 | 4238 if ( (signed int)attr <= CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS ) |
| 0 | 4239 { |
| 4240 if ( IsUnarmed() == 1 ) | |
| 4241 { | |
| 4242 v5 = 0; | |
| 4243 return v5 + v62 + v61; | |
| 4244 } | |
| 816 | 4245 if ( v6->HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 4246 { | |
| 4247 v17 = this->GetEquippedItemEquipType(EQUIP_MAIN_HAND); | |
| 0 | 4248 if ( v17 >= 0 ) |
| 4249 { | |
| 4250 if ( v17 <= 2 ) | |
| 1040 | 4251 v5 = pItemsTable->pItems[v6->pOwnItems[v6->pEquipment.uMainHand-1].uItemID].uDamageMod; |
| 0 | 4252 } |
| 4253 } | |
| 865 | 4254 if ( a3 || !v6->HasItemEquipped(EQUIP_OFF_HAND) || (v19 = v6->GetEquippedItemEquipType(EQUIP_OFF_HAND), v19 < 0) || v19 > 2 ) |
| 0 | 4255 return v5 + v62 + v61; |
| 1040 | 4256 v20 = v6->pOwnItems[v6->pEquipment.uShield - 1].uItemID; |
| 4257 v56 = pItemsTable->pItems[v20].uDamageMod; | |
| 4258 v5 += v56; | |
| 4259 return v5 + v62 + v61; | |
| 4260 } | |
| 4261 if ( attr == CHARACTER_ATTRIBUTE_MELEE_DMG_MIN ) | |
| 0 | 4262 { |
| 4263 if ( IsUnarmed() == 1 ) | |
| 4264 { | |
| 4265 v5 = 1; | |
| 4266 return v5 + v62 + v61; | |
| 4267 } | |
| 816 | 4268 if ( v6->HasItemEquipped(EQUIP_MAIN_HAND) ) |
| 4269 { | |
| 4270 v9 = this->GetEquippedItemEquipType(EQUIP_MAIN_HAND); | |
| 0 | 4271 if ( v9 >= 0 ) |
| 4272 { | |
| 4273 if ( v9 <= 2 ) | |
| 4274 { | |
| 1040 | 4275 v5 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand].uItemID].uDamageDice + |
| 4276 pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand].uItemID].uDamageMod; | |
| 898 | 4277 if ( !v6->pEquipment.uShield ) |
| 0 | 4278 { |
| 1040 | 4279 if ( pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand].uItemID].uSkillType == 4 ) |
| 0 | 4280 ++v5; |
| 4281 } | |
| 4282 } | |
| 4283 } | |
| 4284 } | |
| 1040 | 4285 |
| 4286 if ( a3 || !v6->HasItemEquipped(EQUIP_OFF_HAND)) | |
| 4287 { | |
| 4288 v12 = v6->GetEquippedItemEquipType(EQUIP_OFF_HAND); | |
| 4289 if ((v12 < 0) || v12 > 2 ) | |
| 4290 return v5 + v62 + v61; | |
| 4291 } | |
| 4292 v14 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uShield].uItemID].uDamageMod; | |
| 4293 v15 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uShield].uItemID].uDamageDice; | |
| 0 | 4294 LABEL_88: |
| 4295 v5 += v15 + v14; | |
| 4296 } | |
| 4297 return v5 + v62 + v61; | |
| 4298 } | |
| 4299 | |
| 4300 //----- (0048F73C) -------------------------------------------------------- | |
| 4301 int Player::GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 4302 { | |
| 4303 int result; // eax@1 | |
| 4304 int v3; // eax@4 | |
| 4305 int v4; // ecx@5 | |
| 4306 | |
| 4307 switch (a2) | |
| 4308 { | |
| 4309 case CHARACTER_ATTRIBUTE_LEVEL: return 0; | |
| 4310 } | |
| 4311 | |
| 4312 result = 0; | |
| 4313 if ( (signed int)a2 > 10 ) | |
| 4314 { | |
| 4315 if ( (signed int)a2 <= 15 ) | |
| 4316 { | |
| 4317 switch ( a2 ) | |
| 4318 { | |
| 4319 case CHARACTER_ATTRIBUTE_RESIST_BODY: | |
| 4320 v3 = this->pPlayerBuffs[2].uPower; | |
| 1167 | 4321 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_BODY].uPower; |
| 0 | 4322 break; |
| 4323 case CHARACTER_ATTRIBUTE_RESIST_AIR: | |
| 4324 v3 = this->pPlayerBuffs[0].uPower; | |
| 1167 | 4325 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_AIR].uPower; |
| 0 | 4326 break; |
| 4327 case CHARACTER_ATTRIBUTE_RESIST_WATER: | |
| 4328 v3 = this->pPlayerBuffs[22].uPower; | |
| 1167 | 4329 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_WATER].uPower; |
| 0 | 4330 break; |
| 4331 case CHARACTER_ATTRIBUTE_RESIST_EARTH: | |
| 4332 v3 = this->pPlayerBuffs[3].uPower; | |
| 1167 | 4333 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_EARTH].uPower; |
| 0 | 4334 break; |
| 4335 default: | |
| 4336 if ( a2 != 14 ) | |
| 4337 return result; | |
| 4338 v3 = this->pPlayerBuffs[9].uPower; | |
| 1167 | 4339 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_MIND].uPower; |
| 0 | 4340 break; |
| 4341 } | |
| 4342 return v4 + v3; | |
| 4343 } | |
| 4344 if ( a2 != CHARACTER_ATTRIBUTE_ATTACK ) | |
| 4345 { | |
| 4346 if ( a2 == CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS ) | |
| 4347 { | |
| 4348 v3 = this->pPlayerBuffs[8].uPower; | |
| 1167 | 4349 v4 = pParty->pPartyBuffs[PARTY_BUFF_HEROISM].uPower; |
| 0 | 4350 return v4 + v3; |
| 4351 } | |
| 4352 if ( a2 != CHARACTER_ATTRIBUTE_RANGED_ATTACK ) | |
| 4353 return result; | |
| 4354 } | |
| 4355 return this->pPlayerBuffs[1].uPower; | |
| 4356 } | |
| 4357 if ( a2 == 10 ) | |
| 4358 { | |
| 4359 v3 = this->pPlayerBuffs[5].uPower; | |
| 1167 | 4360 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_FIRE].uPower; |
| 0 | 4361 return v4 + v3; |
| 4362 } | |
| 4363 switch ( a2 ) | |
| 4364 { | |
| 4365 case CHARACTER_ATTRIBUTE_STRENGTH: | |
| 4366 v3 = pPlayerBuffs[19].uPower; | |
| 4367 goto LABEL_5; | |
| 4368 case CHARACTER_ATTRIBUTE_INTELLIGENCE: | |
| 4369 v3 = pPlayerBuffs[17].uPower; | |
| 4370 goto LABEL_5; | |
| 4371 case CHARACTER_ATTRIBUTE_WILLPOWER: | |
| 4372 v3 = pPlayerBuffs[20].uPower; | |
| 4373 goto LABEL_5; | |
| 4374 case CHARACTER_ATTRIBUTE_ENDURANCE: | |
| 4375 v3 = pPlayerBuffs[16].uPower; | |
| 4376 goto LABEL_5; | |
| 4377 case CHARACTER_ATTRIBUTE_ACCURACY: | |
| 4378 v3 = pPlayerBuffs[15].uPower; | |
| 4379 goto LABEL_5; | |
| 4380 case CHARACTER_ATTRIBUTE_SPEED: | |
| 4381 v3 = pPlayerBuffs[21].uPower; | |
| 4382 goto LABEL_5; | |
| 4383 case CHARACTER_ATTRIBUTE_LUCK: | |
| 4384 v3 = pPlayerBuffs[18].uPower; | |
| 4385 LABEL_5: | |
| 1167 | 4386 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
| 0 | 4387 return v4 + v3; |
| 4388 case CHARACTER_ATTRIBUTE_AC_BONUS: | |
| 4389 v3 = this->pPlayerBuffs[14].uPower; | |
| 1167 | 4390 v4 = pParty->pPartyBuffs[PARTY_BUFF_STONE_SKIN].uPower; |
| 0 | 4391 return v4 + v3; |
| 4392 default: | |
| 4393 return result; | |
| 4394 } | |
| 4395 return result; | |
| 4396 } | |
| 4397 | |
| 4398 //----- (0048F882) -------------------------------------------------------- | |
| 1008 | 4399 int Player::GetActualSkillLevel( PLAYER_SKILL_TYPE uSkillType ) |
| 4400 { | |
| 1064 | 4401 signed int bonus_value; // esi@1 |
| 4402 unsigned __int16 skill_value; // ax@126 | |
| 4403 int result; // al@127 | |
| 353 | 4404 |
| 1064 | 4405 bonus_value = 0; |
| 353 | 4406 switch (uSkillType) |
| 4407 { | |
| 4408 case PLAYER_SKILL_MONSTER_ID: | |
| 4409 { | |
| 652 | 4410 if ( CheckHiredNPCSpeciality(Hunter) ) |
| 1064 | 4411 bonus_value = 6; |
| 652 | 4412 if ( CheckHiredNPCSpeciality(Sage) ) |
| 1064 | 4413 bonus_value += 6; |
| 4414 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID, 0); | |
| 353 | 4415 } |
| 4416 break; | |
| 4417 | |
| 4418 case PLAYER_SKILL_ARMSMASTER: | |
| 4419 { | |
| 652 | 4420 if ( CheckHiredNPCSpeciality(Armsmaster) ) |
| 1064 | 4421 bonus_value = 2; |
| 652 | 4422 if ( CheckHiredNPCSpeciality(Weaponsmaster) ) |
| 1064 | 4423 bonus_value += 3; |
| 4424 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER, 0); | |
| 353 | 4425 } |
| 4426 break; | |
| 4427 | |
| 4428 case PLAYER_SKILL_STEALING: | |
| 4429 { | |
| 652 | 4430 if (CheckHiredNPCSpeciality(Burglar)) |
| 1064 | 4431 bonus_value = 8; |
| 4432 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_STEALING, 0); | |
| 353 | 4433 } |
| 4434 break; | |
| 4435 | |
| 4436 | |
| 4437 case PLAYER_SKILL_ALCHEMY: | |
| 4438 { | |
| 652 | 4439 if ( CheckHiredNPCSpeciality(Herbalist) ) |
| 1064 | 4440 bonus_value = 4; |
| 652 | 4441 if ( CheckHiredNPCSpeciality(Apothecary) ) |
| 1064 | 4442 bonus_value += 8; |
| 4443 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ALCHEMY, 0); | |
| 353 | 4444 } |
| 4445 break; | |
| 4446 | |
| 4447 case PLAYER_SKILL_LEARNING: | |
| 4448 { | |
| 652 | 4449 if ( CheckHiredNPCSpeciality(Teacher) ) |
| 1064 | 4450 bonus_value = 10; |
| 652 | 4451 if ( CheckHiredNPCSpeciality(Instructor) ) |
| 1064 | 4452 bonus_value += 15; |
| 652 | 4453 if ( CheckHiredNPCSpeciality(Scholar) ) |
| 1064 | 4454 bonus_value += 5; |
| 4455 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LEARNING, 0); | |
| 353 | 4456 } |
| 4457 break; | |
| 4458 | |
| 4459 case PLAYER_SKILL_UNARMED: | |
| 4460 { | |
| 652 | 4461 if (CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 4462 bonus_value = 2; |
| 4463 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_UNARMED, 0); | |
| 353 | 4464 } |
| 4465 break; | |
| 4466 | |
| 4467 case PLAYER_SKILL_DODGE: | |
| 4468 { | |
| 652 | 4469 if ( CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 4470 bonus_value = 2; |
| 4471 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DODGE, 0); | |
| 353 | 4472 } |
| 4473 break; | |
| 4474 | |
| 4475 case PLAYER_SKILL_BOW: | |
| 1064 | 4476 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BOW, 0); |
| 353 | 4477 break; |
| 4478 case PLAYER_SKILL_SHIELD: | |
| 1064 | 4479 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SHIELD, 0); |
| 353 | 4480 break; |
| 4481 | |
| 4482 case PLAYER_SKILL_EARTH: | |
| 652 | 4483 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 4484 bonus_value = 2; |
| 652 | 4485 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 4486 bonus_value += 3; |
| 652 | 4487 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 4488 bonus_value += 4; |
| 353 | 4489 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 4490 bonus_value += 3; |
| 4491 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_EARTH, 0); | |
| 353 | 4492 break; |
| 4493 case PLAYER_SKILL_FIRE: | |
| 652 | 4494 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 4495 bonus_value = 2; |
| 652 | 4496 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 4497 bonus_value += 3; |
| 652 | 4498 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 4499 bonus_value += 4; |
| 353 | 4500 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 4501 bonus_value += 3; |
| 4502 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_FIRE, 0); | |
| 353 | 4503 break; |
| 4504 case PLAYER_SKILL_AIR: | |
| 652 | 4505 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 4506 bonus_value = 2; |
| 652 | 4507 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 4508 bonus_value += 3; |
| 652 | 4509 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 4510 bonus_value += 4; |
| 353 | 4511 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 4512 bonus_value += 3; |
| 4513 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_AIR, 0); | |
| 353 | 4514 break; |
| 4515 case PLAYER_SKILL_WATER: | |
| 652 | 4516 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 4517 bonus_value = 2; |
| 652 | 4518 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 4519 bonus_value += 3; |
| 652 | 4520 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 4521 bonus_value += 4; |
| 353 | 4522 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 4523 bonus_value += 3; |
| 4524 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_WATER, 0); | |
| 353 | 4525 break; |
| 4526 case PLAYER_SKILL_SPIRIT: | |
| 652 | 4527 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 4528 bonus_value = 2; |
| 652 | 4529 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 4530 bonus_value += 3; |
| 652 | 4531 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 4532 bonus_value += 4; |
| 4533 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SPIRIT, 0); | |
| 353 | 4534 break; |
| 4535 case PLAYER_SKILL_MIND: | |
| 652 | 4536 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 4537 bonus_value = 2; |
| 652 | 4538 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 4539 bonus_value += 3; |
| 652 | 4540 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 4541 bonus_value += 4; |
| 4542 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MIND, 0); | |
| 353 | 4543 break; |
| 4544 case PLAYER_SKILL_BODY: | |
| 652 | 4545 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 4546 bonus_value = 2; |
| 652 | 4547 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 4548 bonus_value += 3; |
| 652 | 4549 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 4550 bonus_value += 4; |
| 4551 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BODY, 0); | |
| 353 | 4552 break; |
| 4553 case PLAYER_SKILL_LIGHT: | |
| 1064 | 4554 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LIGHT, 0); |
| 353 | 4555 break; |
| 4556 case PLAYER_SKILL_DARK: | |
| 4557 { | |
| 1064 | 4558 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DARK, 0); |
| 353 | 4559 } |
| 4560 break; | |
| 4561 | |
| 4562 case PLAYER_SKILL_MERCHANT: | |
| 4563 { | |
| 652 | 4564 if ( CheckHiredNPCSpeciality(Trader) ) |
| 1064 | 4565 bonus_value = 4; |
| 652 | 4566 if ( CheckHiredNPCSpeciality(Merchant) ) |
| 1064 | 4567 bonus_value += 6; |
| 652 | 4568 if ( CheckHiredNPCSpeciality(Gypsy) ) |
| 1064 | 4569 bonus_value += 3; |
| 652 | 4570 if ( CheckHiredNPCSpeciality(Duper) ) |
| 1064 | 4571 bonus_value += 8; |
| 353 | 4572 } |
| 4573 break; | |
| 4574 | |
| 4575 case PLAYER_SKILL_PERCEPTION: | |
| 4576 { | |
| 652 | 4577 if ( CheckHiredNPCSpeciality(Scout) ) |
| 1064 | 4578 bonus_value = 6; |
| 652 | 4579 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1064 | 4580 bonus_value += 5; |
| 353 | 4581 } |
| 4582 break; | |
| 4583 | |
| 0 | 4584 case PLAYER_SKILL_ITEM_ID: |
| 1064 | 4585 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ITEM_ID, 0); |
| 0 | 4586 break; |
| 4587 case PLAYER_SKILL_MEDITATION: | |
| 1064 | 4588 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MEDITATION, 0); |
| 353 | 4589 break; |
| 0 | 4590 case PLAYER_SKILL_TRAP_DISARM: |
| 353 | 4591 { |
| 652 | 4592 if ( CheckHiredNPCSpeciality(Tinker) ) |
| 1064 | 4593 bonus_value = 4; |
| 652 | 4594 if ( CheckHiredNPCSpeciality(Locksmith) ) |
| 1064 | 4595 bonus_value += 6; |
| 652 | 4596 if ( CheckHiredNPCSpeciality(Burglar) ) |
| 1064 | 4597 bonus_value += 8; |
| 4598 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM, 0); | |
| 353 | 4599 } |
| 4600 break; | |
| 4601 } | |
| 4602 | |
| 1064 | 4603 skill_value = pActiveSkills[uSkillType]; |
| 4604 if ( bonus_value + (skill_value & 0x3F) < 60 ) | |
| 4605 result = bonus_value + skill_value; | |
| 0 | 4606 else |
| 1064 | 4607 result = skill_value & 0xFFFC | 0x3C; //al |
| 0 | 4608 return result; |
| 4609 } | |
| 4610 | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4611 |
| 0 | 4612 //----- (0048FC00) -------------------------------------------------------- |
| 1538 | 4613 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
|
4614 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4615 int armsMasterBonus; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4616 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4617 armsMasterBonus = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4618 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
|
4619 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
|
4620 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4621 int multiplier = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4622 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
|
4623 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4624 multiplier = GetMultiplierForMastery(armmaster_skill, 0, 0, 1, 2); |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4625 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4626 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
|
4627 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4628 multiplier = GetMultiplierForMastery(armmaster_skill, 0, 1, 1, 2); |
| 1064 | 4629 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4630 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
|
4631 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4632 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4633 switch(inSkill) |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4634 { |
|
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
|
4635 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
|
4636 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
|
4637 { |
|
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
|
4638 int bowSkillLevel = 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
|
4639 int multiplier = GetMultiplierForMastery(bowSkillLevel, 0, 0, 0, 1); |
|
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
|
4640 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
|
4641 } |
|
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
|
4642 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
|
4643 break; |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4644 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
|
4645 { |
|
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
|
4646 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
|
4647 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
|
4648 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
|
4649 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4650 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4651 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
|
4652 { |
|
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
|
4653 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
|
4654 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
|
4655 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
|
4656 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4657 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4658 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
|
4659 { |
|
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
|
4660 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
|
4661 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
|
4662 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
|
4663 |
|
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
|
4664 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
|
4665 { |
|
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
|
4666 if (pEquipment.pIndices[j] && (!pOwnItems[pEquipment.pIndices[j]].Broken())) |
| 1538 | 4667 { |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
4668 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
|
4669 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
|
4670 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
|
4671 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
|
4672 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
|
4673 { |
|
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
|
4674 case PLAYER_SKILL_STAFF: |
|
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
|
4675 multiplier = GetMultiplierForMastery(currArmorSkillLevel, 0, 1, 1, 1); |
|
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
|
4676 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
|
4677 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
|
4678 case PLAYER_SKILL_SPEAR: |
|
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
|
4679 multiplier = GetMultiplierForMastery(currArmorSkillLevel, 0, 0, 0, 1); |
|
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
|
4680 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
|
4681 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
|
4682 wearingArmor = true; |
|
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
|
4683 multiplier = GetMultiplierForMastery(currArmorSkillLevel, 1, 1, 2, 2); |
|
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
|
4684 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
|
4685 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
|
4686 wearingLeather = true; |
|
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
|
4687 multiplier = GetMultiplierForMastery(currArmorSkillLevel, 1, 1, 2, 2); |
|
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
|
4688 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
|
4689 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
|
4690 wearingArmor = true; |
|
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
|
4691 multiplier = GetMultiplierForMastery(currArmorSkillLevel, 1, 1, 1, 1); |
|
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
|
4692 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
|
4693 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
|
4694 wearingArmor = true; |
|
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
|
4695 multiplier = GetMultiplierForMastery(currArmorSkillLevel, 1, 1, 1, 1); |
|
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
|
4696 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
|
4697 } |
|
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
|
4698 ACSum += multiplier * (currArmorSkillLevel & 0x3F); |
| 1538 | 4699 } |
|
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
|
4700 } |
|
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
|
4701 |
|
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
|
4702 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
|
4703 int dodgeMastery = SkillToMastery(dodgeSkillLevel); |
|
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
|
4704 int multiplier = GetMultiplierForMastery(dodgeSkillLevel, 1, 2, 3, 3); |
|
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
|
4705 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
|
4706 { |
|
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
|
4707 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
|
4708 } |
|
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
|
4709 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
|
4710 } |
| 1538 | 4711 break; |
| 4712 case CHARACTER_ATTRIBUTE_ATTACK: | |
| 4713 if ( this->IsUnarmed() ) | |
| 4714 { | |
| 4715 int unarmedSkill = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 4716 if (!unarmedSkill) | |
| 4717 { | |
| 4718 return 0; | |
| 4719 } | |
| 4720 int multiplier = GetMultiplierForMastery(unarmedSkill, 0, 1, 2, 2); | |
| 4721 return armsMasterBonus + multiplier * (unarmedSkill & 0x3F); | |
| 4722 } | |
| 4723 for (int i = 0; i < 16; ++i) | |
| 4724 { | |
| 4725 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 4726 { | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
4727 ItemDesc currItem = pItemsTable->pItems[this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID]; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
4728 if ( currItem.uEquipType <= EQUIP_MAIN_HAND) |
| 1533 | 4729 { |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
4730 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItem.uSkillType; |
| 1538 | 4731 int currentItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 4732 if (currItemSkillType == PLAYER_SKILL_BLASTER) | |
| 4733 { | |
| 4734 int multiplier = GetMultiplierForMastery(currentItemSkillLevel, 1, 2, 3, 5); | |
| 4735 return multiplier * (currentItemSkillLevel & 0x3F); | |
| 4736 } | |
| 4737 else if (currItemSkillType == PLAYER_SKILL_STAFF && this->GetActualSkillLevel(PLAYER_SKILL_UNARMED) > 0) | |
| 4738 { | |
| 4739 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 4740 int multiplier = GetMultiplierForMastery(currentItemSkillLevel, 1, 1, 2, 2); | |
| 4741 return multiplier * (unarmedSkillLevel & 0x3F) + armsMasterBonus + (currentItemSkillLevel & 0x3F); | |
| 4742 } | |
| 4743 else | |
| 4744 { | |
| 4745 return armsMasterBonus + (currentItemSkillLevel & 0x3F); | |
| 4746 } | |
| 4747 } | |
| 4748 } | |
| 4749 } | |
| 4750 return 0; | |
| 4751 break; | |
| 4752 | |
| 4753 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: | |
| 4754 for (int i = 0; i < 16; i++) | |
| 4755 { | |
| 4756 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 4757 { | |
| 4758 PLAYER_SKILL_TYPE currentItemSkillType = (PLAYER_SKILL_TYPE)pItemsTable->pItems[this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID].uSkillType; | |
| 4759 int currentItemSkillLevel = this->GetActualSkillLevel(currentItemSkillType); | |
| 4760 if ( currentItemSkillType == PLAYER_SKILL_BOW ) | |
| 4761 { | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
4762 int multiplier = GetMultiplierForMastery(currentItemSkillLevel, 1, 1, 1, 1); |
| 1538 | 4763 return multiplier * (currentItemSkillLevel & 0x3F); |
| 4764 } | |
| 4765 else if ( currentItemSkillType == PLAYER_SKILL_BLASTER ) | |
| 4766 { | |
| 4767 int multiplier = GetMultiplierForMastery(currentItemSkillLevel, 1, 2, 3, 5); | |
| 4768 return multiplier * (currentItemSkillLevel & 0x3F); | |
| 4769 } | |
| 4770 } | |
| 4771 } | |
| 4772 return 0; | |
| 4773 break; | |
| 4774 | |
| 4775 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: | |
| 4776 if ( this->IsUnarmed() ) | |
| 4777 { | |
| 4778 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 4779 if ( !unarmedSkillLevel ) | |
| 4780 { | |
| 4781 return 0; | |
| 4782 } | |
| 4783 int multiplier = GetMultiplierForMastery(unarmedSkillLevel, 0, 1, 2, 2); | |
| 4784 return multiplier * (unarmedSkillLevel & 0x3F); | |
| 4785 } | |
| 4786 for (int i = 0; i < 16; i++) | |
| 4787 { | |
| 4788 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 4789 { | |
| 4790 int currItemId = this->pInventoryItemList[this->pEquipment.pIndices[i]].uItemID; | |
| 4791 if ( pItemsTable->pItems[currItemId].uEquipType == EQUIP_MAIN_HAND || pItemsTable->pItems[currItemId].uEquipType == EQUIP_OFF_HAND ) | |
| 4792 { | |
| 4793 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)pItemsTable->pItems[currItemId].uSkillType; | |
| 4794 int currItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); | |
| 4795 int baseSkillBonus; | |
| 4796 int multiplier; | |
| 4797 switch (currItemSkillType) | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4798 { |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4799 case PLAYER_SKILL_STAFF: |
| 1538 | 4800 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
|
4801 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4802 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); |
| 1538 | 4803 int multiplier = GetMultiplierForMastery(unarmedSkillLevel, 0, 1, 2, 2); |
| 4804 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
|
4805 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4806 else |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4807 { |
| 1538 | 4808 return armsMasterBonus; |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4809 } |
| 1538 | 4810 break; |
| 4811 | |
| 4812 case PLAYER_SKILL_DAGGER: | |
| 4813 multiplier = GetMultiplierForMastery(currItemSkillLevel, 0, 0, 0, 1); | |
| 4814 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); | |
| 4815 return armsMasterBonus + baseSkillBonus; | |
| 4816 break; | |
| 4817 case PLAYER_SKILL_SWORD: | |
| 4818 multiplier = GetMultiplierForMastery(currItemSkillLevel, 0, 0, 0, 0); | |
| 4819 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); | |
| 4820 return armsMasterBonus + baseSkillBonus; | |
| 4821 break; | |
| 4822 case PLAYER_SKILL_MACE: | |
| 4823 case PLAYER_SKILL_SPEAR: | |
| 4824 multiplier = GetMultiplierForMastery(currItemSkillLevel, 0, 1, 1, 1); | |
| 4825 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); | |
| 4826 return armsMasterBonus + baseSkillBonus; | |
| 4827 break; | |
| 4828 case PLAYER_SKILL_AXE: | |
| 4829 multiplier = GetMultiplierForMastery(currItemSkillLevel, 0, 0, 1, 1); | |
| 4830 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); | |
| 4831 return armsMasterBonus + baseSkillBonus; | |
| 4832 break; | |
| 1535 | 4833 } |
| 1533 | 4834 } |
| 1535 | 4835 } |
| 1538 | 4836 } |
| 4837 return 0; | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4838 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4839 default: |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
4840 return 0; |
| 1533 | 4841 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4842 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4843 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4844 unsigned int Player::GetMultiplierForMastery(unsigned int skillValue, int mult1, int mult2, int mult3, int mult4) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4845 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4846 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
|
4847 switch (masteryLvl) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4848 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4849 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
|
4850 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
|
4851 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
|
4852 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
|
4853 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4854 assert(false); |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4855 return 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
4856 } |
| 0 | 4857 //----- (00490109) -------------------------------------------------------- |
| 4858 // faces are: 0 1 2 3 human males | |
| 4859 // 4 5 6 7 human females | |
| 4860 // 8 9 elf males | |
| 4861 // 10 11 elf females | |
| 4862 // 12 13 dwarf males | |
| 4863 // 14 15 dwarf females | |
| 4864 // 16 17 goblin males | |
| 4865 // 18 19 goblin females | |
| 4866 // 20 lich male | |
| 4867 // 21 lich female | |
| 4868 // 22 underwater suits (unused) | |
| 4869 // 23 zombie male | |
| 4870 // 24 zombie female | |
| 4871 enum CHARACTER_RACE Player::GetRace() | |
| 4872 { | |
| 1014 | 4873 if ( uCurrentFace > 15 ) |
| 4874 { | |
| 4875 if ( uCurrentFace >= 16 && uCurrentFace <= 19 ) | |
| 0 | 4876 return CHARACTER_RACE_GOBLIN; |
| 4877 } | |
| 4878 else | |
| 4879 { | |
| 1014 | 4880 if ( uCurrentFace >= 12 ) |
| 0 | 4881 { |
| 4882 return CHARACTER_RACE_DWARF; | |
| 4883 } | |
| 4884 else | |
| 4885 { | |
| 1014 | 4886 |
| 4887 if ( uCurrentFace <= 7 ) | |
| 0 | 4888 { |
| 4889 return CHARACTER_RACE_HUMAN; | |
| 4890 } | |
| 4891 else | |
| 4892 { | |
| 1014 | 4893 if ( uCurrentFace <= 11 ) |
| 0 | 4894 return CHARACTER_RACE_ELF; |
| 4895 } | |
| 4896 } | |
| 4897 } | |
| 4898 return CHARACTER_RACE_HUMAN; | |
| 4899 } | |
| 4900 | |
| 4901 //----- (00490141) -------------------------------------------------------- | |
| 187 | 4902 PLAYER_SEX Player::GetSexByVoice() |
| 0 | 4903 { |
| 4904 signed int result; // eax@1 | |
| 4905 | |
| 4906 result = 0; | |
| 4907 switch ( this->uVoiceID ) | |
| 4908 { | |
| 4909 case 0u: | |
| 4910 case 1u: | |
| 4911 case 2u: | |
| 4912 case 3u: | |
| 4913 case 8u: | |
| 4914 case 9u: | |
| 4915 case 0xCu: | |
| 4916 case 0xDu: | |
| 4917 case 0x10u: | |
| 4918 case 0x11u: | |
| 4919 case 0x14u: | |
| 4920 case 0x17u: | |
| 187 | 4921 return SEX_MALE; |
| 4922 | |
| 0 | 4923 case 4u: |
| 4924 case 5u: | |
| 4925 case 6u: | |
| 4926 case 7u: | |
| 4927 case 0xAu: | |
| 4928 case 0xBu: | |
| 4929 case 0xEu: | |
| 4930 case 0xFu: | |
| 4931 case 0x12u: | |
| 4932 case 0x13u: | |
| 4933 case 0x15u: | |
| 4934 case 0x18u: | |
| 187 | 4935 return SEX_FEMALE; |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4936 } |
|
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4937 assert(false); |
|
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4938 return SEX_MALE; |
| 0 | 4939 } |
| 4940 | |
| 4941 //----- (00490188) -------------------------------------------------------- | |
| 4942 void Player::SetInitialStats() | |
| 4943 { | |
| 4944 auto v1 = GetRace(); | |
| 290 | 4945 uMight = StatTable[v1][0].uBaseValue; |
| 4946 uIntelligence = StatTable[v1][1].uBaseValue; | |
| 4947 uWillpower = StatTable[v1][2].uBaseValue; | |
| 4948 uEndurance = StatTable[v1][3].uBaseValue; | |
| 4949 uAccuracy = StatTable[v1][4].uBaseValue; | |
| 4950 uSpeed = StatTable[v1][5].uBaseValue; | |
| 4951 uLuck = StatTable[v1][6].uBaseValue; | |
| 0 | 4952 } |
| 4953 | |
| 4954 //----- (004901FC) -------------------------------------------------------- | |
| 1021 | 4955 void Player::SetSexByVoice() |
| 4956 { | |
| 4957 switch ( this->uVoiceID) | |
| 0 | 4958 { |
| 4959 case 0: | |
| 4960 case 1: | |
| 4961 case 2: | |
| 4962 case 3: | |
| 4963 case 8: | |
| 4964 case 9: | |
| 4965 case 0xC: | |
| 4966 case 0xD: | |
| 4967 case 0x10: | |
| 4968 case 0x11: | |
| 4969 case 0x14: | |
| 4970 case 0x17: | |
| 1021 | 4971 this->uSex = SEX_MALE; |
| 0 | 4972 break; |
| 4973 case 4: | |
| 4974 case 5: | |
| 4975 case 6: | |
| 4976 case 7: | |
| 4977 case 0xA: | |
| 4978 case 0xB: | |
| 4979 case 0xE: | |
| 4980 case 0xF: | |
| 4981 case 0x12: | |
| 4982 case 0x13: | |
| 4983 case 0x15: | |
| 4984 case 0x18: | |
| 1021 | 4985 this->uSex = SEX_FEMALE; |
| 0 | 4986 break; |
| 4987 default: | |
| 4988 break; | |
| 4989 } | |
| 1021 | 4990 |
| 0 | 4991 } |
| 4992 | |
| 4993 //----- (0049024A) -------------------------------------------------------- | |
| 135 | 4994 void Player::Reset(PLAYER_CLASS_TYPE cls) |
| 0 | 4995 { |
| 4996 sLevelModifier = 0; | |
| 4997 sAgeModifier = 0; | |
| 4998 | |
| 135 | 4999 classType = cls; |
| 0 | 5000 uLuckBonus = 0; |
| 5001 uSpeedBonus = 0; | |
| 5002 uAccuracyBonus = 0; | |
| 5003 uEnduranceBonus = 0; | |
| 5004 uWillpowerBonus = 0; | |
| 5005 uIntelligenceBonus = 0; | |
| 5006 uMightBonus = 0; | |
| 5007 uLevel = 1; | |
| 5008 uExperience = 251 + rand() % 100; | |
| 5009 uBirthYear = 1147 - rand() % 6; | |
| 5010 memset(pActiveSkills, 0, sizeof(pActiveSkills)); | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
5011 memset(_achieved_awards_bits, 0, 64); |
| 0 | 5012 memset(&spellbook, 0, sizeof(PlayerSpells)); |
| 5013 | |
| 5014 for (uint i = 0; i < 37; ++i) | |
| 5015 { | |
| 135 | 5016 if (pSkillAvailabilityPerClass[classType / 4][i] != 2) |
| 0 | 5017 continue; |
| 5018 | |
| 5019 pActiveSkills[i] = 1; | |
| 5020 | |
| 5021 switch (i) | |
| 5022 { | |
| 886 | 5023 case PLAYER_SKILL_FIRE: |
| 5024 spellbook.pFireSpellbook.bIsSpellAvailable[0] = true;//its temporary, for test spells | |
| 894 | 5025 |
| 5026 extern bool all_magic; | |
| 5027 if ( all_magic == true ) | |
| 5028 { | |
| 5029 pActiveSkills[PLAYER_SKILL_AIR] = 1; | |
| 5030 pActiveSkills[PLAYER_SKILL_WATER] = 1; | |
| 5031 pActiveSkills[PLAYER_SKILL_EARTH] = 1; | |
| 5032 spellbook.pFireSpellbook.bIsSpellAvailable[1] = true; | |
| 5033 spellbook.pFireSpellbook.bIsSpellAvailable[2] = true; | |
| 5034 spellbook.pFireSpellbook.bIsSpellAvailable[3] = true; | |
| 5035 spellbook.pFireSpellbook.bIsSpellAvailable[4] = true; | |
| 5036 spellbook.pFireSpellbook.bIsSpellAvailable[5] = true; | |
| 5037 spellbook.pFireSpellbook.bIsSpellAvailable[6] = true; | |
| 5038 spellbook.pFireSpellbook.bIsSpellAvailable[7] = true; | |
| 5039 spellbook.pFireSpellbook.bIsSpellAvailable[8] = true; | |
| 5040 spellbook.pFireSpellbook.bIsSpellAvailable[9] = true; | |
| 5041 spellbook.pFireSpellbook.bIsSpellAvailable[10] = true; | |
| 886 | 5042 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; |
| 569 | 5043 spellbook.pAirSpellbook.bIsSpellAvailable[1] = true; |
| 5044 spellbook.pAirSpellbook.bIsSpellAvailable[2] = true; | |
| 5045 spellbook.pAirSpellbook.bIsSpellAvailable[3] = true; | |
| 5046 spellbook.pAirSpellbook.bIsSpellAvailable[4] = true; | |
| 5047 spellbook.pAirSpellbook.bIsSpellAvailable[5] = true; | |
| 5048 spellbook.pAirSpellbook.bIsSpellAvailable[6] = true; | |
| 5049 spellbook.pAirSpellbook.bIsSpellAvailable[7] = true; | |
| 5050 spellbook.pAirSpellbook.bIsSpellAvailable[8] = true; | |
| 5051 spellbook.pAirSpellbook.bIsSpellAvailable[9] = true; | |
| 5052 spellbook.pAirSpellbook.bIsSpellAvailable[10] = true; | |
| 5053 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 5054 spellbook.pWaterSpellbook.bIsSpellAvailable[1] = true; | |
| 5055 spellbook.pWaterSpellbook.bIsSpellAvailable[2] = true; | |
| 5056 spellbook.pWaterSpellbook.bIsSpellAvailable[3] = true; | |
| 5057 spellbook.pWaterSpellbook.bIsSpellAvailable[4] = true; | |
| 5058 spellbook.pWaterSpellbook.bIsSpellAvailable[5] = true; | |
| 710 | 5059 spellbook.pWaterSpellbook.bIsSpellAvailable[6] = true; |
| 5060 spellbook.pWaterSpellbook.bIsSpellAvailable[7] = true; | |
| 5061 spellbook.pWaterSpellbook.bIsSpellAvailable[8] = true; | |
| 886 | 5062 spellbook.pWaterSpellbook.bIsSpellAvailable[9] = true; |
| 5063 spellbook.pWaterSpellbook.bIsSpellAvailable[10] = true; | |
| 894 | 5064 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; |
| 5065 spellbook.pEarthSpellbook.bIsSpellAvailable[1] = true; | |
| 5066 spellbook.pEarthSpellbook.bIsSpellAvailable[2] = true; | |
| 5067 spellbook.pEarthSpellbook.bIsSpellAvailable[3] = true; | |
| 5068 spellbook.pEarthSpellbook.bIsSpellAvailable[4] = true; | |
| 5069 spellbook.pEarthSpellbook.bIsSpellAvailable[5] = true; | |
| 5070 spellbook.pEarthSpellbook.bIsSpellAvailable[6] = true; | |
| 5071 spellbook.pEarthSpellbook.bIsSpellAvailable[7] = true; | |
| 5072 spellbook.pEarthSpellbook.bIsSpellAvailable[8] = true; | |
| 5073 spellbook.pEarthSpellbook.bIsSpellAvailable[9] = true; | |
| 5074 spellbook.pEarthSpellbook.bIsSpellAvailable[10] = true; | |
| 5075 } | |
| 486 | 5076 break; |
| 886 | 5077 case PLAYER_SKILL_AIR: |
| 5078 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; | |
| 5079 break; | |
| 5080 case PLAYER_SKILL_WATER: | |
| 5081 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 5082 break; | |
| 5083 case PLAYER_SKILL_EARTH: | |
| 5084 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; | |
| 5085 break; | |
| 5086 case PLAYER_SKILL_SPIRIT: | |
| 5087 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; | |
| 5088 break; | |
| 5089 case PLAYER_SKILL_MIND: | |
| 5090 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; | |
| 5091 break; | |
| 5092 case PLAYER_SKILL_BODY: | |
| 5093 spellbook.pBodySpellbook.bIsSpellAvailable[0] = true; | |
| 894 | 5094 |
| 5095 if ( all_magic == true ) | |
| 5096 { | |
| 5097 pActiveSkills[PLAYER_SKILL_MIND] = 1; | |
| 5098 pActiveSkills[PLAYER_SKILL_SPIRIT] = 1; | |
| 5099 spellbook.pBodySpellbook.bIsSpellAvailable[1] = true; | |
| 5100 spellbook.pBodySpellbook.bIsSpellAvailable[2] = true; | |
| 5101 spellbook.pBodySpellbook.bIsSpellAvailable[3] = true; | |
| 5102 spellbook.pBodySpellbook.bIsSpellAvailable[4] = true; | |
| 5103 spellbook.pBodySpellbook.bIsSpellAvailable[5] = true; | |
| 5104 spellbook.pBodySpellbook.bIsSpellAvailable[6] = true; | |
| 5105 spellbook.pBodySpellbook.bIsSpellAvailable[7] = true; | |
| 5106 spellbook.pBodySpellbook.bIsSpellAvailable[8] = true; | |
| 5107 spellbook.pBodySpellbook.bIsSpellAvailable[9] = true; | |
| 5108 spellbook.pBodySpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 5109 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 5110 spellbook.pMindSpellbook.bIsSpellAvailable[1] = true; |
| 5111 spellbook.pMindSpellbook.bIsSpellAvailable[2] = true; | |
| 5112 spellbook.pMindSpellbook.bIsSpellAvailable[3] = true; | |
| 5113 spellbook.pMindSpellbook.bIsSpellAvailable[4] = true; | |
| 5114 spellbook.pMindSpellbook.bIsSpellAvailable[5] = true; | |
| 5115 spellbook.pMindSpellbook.bIsSpellAvailable[6] = true; | |
| 5116 spellbook.pMindSpellbook.bIsSpellAvailable[7] = true; | |
| 5117 spellbook.pMindSpellbook.bIsSpellAvailable[8] = true; | |
| 5118 spellbook.pMindSpellbook.bIsSpellAvailable[9] = true; | |
| 5119 spellbook.pMindSpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 5120 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 5121 spellbook.pSpiritSpellbook.bIsSpellAvailable[1] = true; |
| 5122 spellbook.pSpiritSpellbook.bIsSpellAvailable[2] = true; | |
| 5123 spellbook.pSpiritSpellbook.bIsSpellAvailable[3] = true; | |
| 5124 spellbook.pSpiritSpellbook.bIsSpellAvailable[4] = true; | |
| 5125 spellbook.pSpiritSpellbook.bIsSpellAvailable[5] = true; | |
| 5126 spellbook.pSpiritSpellbook.bIsSpellAvailable[6] = true; | |
| 5127 spellbook.pSpiritSpellbook.bIsSpellAvailable[7] = true; | |
| 5128 spellbook.pSpiritSpellbook.bIsSpellAvailable[8] = true; | |
| 5129 spellbook.pSpiritSpellbook.bIsSpellAvailable[9] = true; | |
| 5130 spellbook.pSpiritSpellbook.bIsSpellAvailable[10] = true; | |
| 5131 } | |
| 569 | 5132 break; |
| 886 | 5133 case PLAYER_SKILL_LIGHT: |
| 5134 spellbook.pLightSpellbook.bIsSpellAvailable[0] = true; | |
| 5135 break; | |
| 5136 case PLAYER_SKILL_DARK: | |
| 5137 spellbook.pDarkSpellbook.bIsSpellAvailable[0] = true; | |
| 5138 break; | |
| 0 | 5139 } |
| 5140 } | |
| 5141 | |
| 5142 sHealth = GetMaxHealth(); | |
| 5143 sMana = GetMaxMana(); | |
| 5144 } | |
| 5145 | |
| 5146 //----- (004903C9) -------------------------------------------------------- | |
| 821 | 5147 PLAYER_SKILL_TYPE Player::GetSkillIdxByOrder(signed int order) |
| 5148 { | |
|
1271
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5149 int counter; // edx@5 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5150 bool canBeInactive; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5151 unsigned char requiredValue; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5152 signed int offset; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5153 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5154 if ( order <= 1 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5155 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5156 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5157 requiredValue = 2; // 2 - primary skill |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5158 offset = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5159 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5160 else if ( order <= 3 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5161 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5162 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5163 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5164 offset = 2; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5165 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5166 else if ( order <= 12 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5167 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5168 canBeInactive = true; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5169 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5170 offset = 4; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5171 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5172 else |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5173 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5174 return (PLAYER_SKILL_TYPE)37; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5175 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5176 counter = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5177 for (int i = 0; i < 37; i++) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5178 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5179 if ( (this->pActiveSkills[i] || canBeInactive) && pSkillAvailabilityPerClass[classType / 4][i] == requiredValue ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5180 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5181 if ( counter == order - offset ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5182 return (PLAYER_SKILL_TYPE)i; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5183 ++counter; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5184 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
5185 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
5186 |
|
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
|
5187 return (PLAYER_SKILL_TYPE)37; |
| 0 | 5188 } |
| 5189 | |
| 5190 | |
| 5191 | |
| 5192 //----- (0049048D) -------------------------------------------------------- | |
| 5193 //unsigned __int16 PartyCreation_BtnMinusClick(Player *_this, int eAttribute) | |
| 5194 void Player::DecreaseAttribute(int eAttribute) | |
| 5195 { | |
| 5196 int v2; // eax@1 | |
| 5197 int pBaseValue; // ecx@1 | |
| 5198 int pDroppedStep; // ebx@1 | |
| 5199 int pStep; // esi@1 | |
| 5200 unsigned __int16 result; // ax@7 | |
| 5201 int uMinValue; // [sp+Ch] [bp-4h]@1 | |
| 5202 | |
| 5203 v2 = eAttribute + 7 * GetRace(); | |
| 290 | 5204 pBaseValue = StatTable[0][v2].uBaseValue; |
| 5205 pDroppedStep = StatTable[0][v2].uDroppedStep; | |
| 0 | 5206 uMinValue = pBaseValue - 2; |
| 290 | 5207 pStep = StatTable[0][v2].uBaseStep; |
| 1272 | 5208 unsigned short* AttrToChange = nullptr; |
| 5209 switch ( eAttribute ) | |
| 5210 { | |
| 5211 case CHARACTER_ATTRIBUTE_STRENGTH: | |
| 5212 AttrToChange = &this->uMight; | |
| 5213 break; | |
| 5214 case CHARACTER_ATTRIBUTE_INTELLIGENCE: | |
| 5215 AttrToChange = &this->uIntelligence; | |
| 5216 break; | |
| 5217 case CHARACTER_ATTRIBUTE_WILLPOWER: | |
| 5218 AttrToChange = &this->uWillpower; | |
| 5219 break; | |
| 5220 case CHARACTER_ATTRIBUTE_ENDURANCE: | |
| 5221 AttrToChange = &this->uEndurance; | |
| 5222 break; | |
| 5223 case CHARACTER_ATTRIBUTE_ACCURACY: | |
| 5224 AttrToChange = &this->uAccuracy; | |
| 5225 break; | |
| 5226 case CHARACTER_ATTRIBUTE_SPEED: | |
| 5227 AttrToChange = &this->uSpeed; | |
| 5228 break; | |
| 5229 case CHARACTER_ATTRIBUTE_LUCK: | |
| 5230 AttrToChange = &this->uLuck; | |
| 5231 break; | |
| 5232 } | |
| 5233 if ( *AttrToChange <= pBaseValue ) | |
| 5234 pStep = pDroppedStep; | |
| 5235 if ( *AttrToChange - pStep >= uMinValue ) | |
| 5236 *AttrToChange -= pStep; | |
| 0 | 5237 } |
| 5238 | |
| 5239 //----- (004905F5) -------------------------------------------------------- | |
| 1458 | 5240 //signed int PartyCreation_BtnPlusClick(Player *this, int eAttribute) |
| 1273 | 5241 void Player::IncreaseAttribute( int eAttribute ) |
| 5242 { | |
| 5243 int raceId; // eax@1 | |
| 5244 int maxValue; // ebx@1 | |
| 5245 signed int baseStep; // edi@1 | |
| 5246 signed int tmp; // eax@17 | |
| 0 | 5247 signed int result; // eax@18 |
| 1273 | 5248 int baseValue; // [sp+Ch] [bp-8h]@1 |
| 5249 signed int droppedStep; // [sp+10h] [bp-4h]@1 | |
| 5250 unsigned short* statToChange; | |
| 5251 | |
| 5252 raceId = GetRace(); | |
| 5253 maxValue = StatTable[raceId][eAttribute].uMaxValue; | |
| 5254 baseStep = StatTable[raceId][eAttribute].uBaseStep; | |
| 5255 baseValue = StatTable[raceId][eAttribute].uBaseValue; | |
| 5256 droppedStep = StatTable[raceId][eAttribute].uDroppedStep; | |
| 5257 PlayerCreation_GetUnspentAttributePointCount(); | |
| 5258 switch ( eAttribute ) | |
| 5259 { | |
| 5260 case 0: | |
| 5261 statToChange = &this->uMight; | |
| 5262 break; | |
| 5263 case 1: | |
| 5264 statToChange = &this->uIntelligence; | |
| 5265 break; | |
| 5266 case 2: | |
| 5267 statToChange = &this->uWillpower; | |
| 5268 break; | |
| 5269 case 3: | |
| 5270 statToChange = &this->uEndurance; | |
| 5271 break; | |
| 5272 case 4: | |
| 5273 statToChange = &this->uAccuracy; | |
| 5274 break; | |
| 5275 case 5: | |
| 5276 statToChange = &this->uSpeed; | |
| 5277 break; | |
| 5278 case 6: | |
| 5279 statToChange = &this->uLuck; | |
| 5280 default: | |
| 5281 assert(false); | |
| 5282 return; | |
| 5283 break; | |
| 5284 } | |
| 5285 if ( *statToChange < baseValue ) | |
| 5286 { | |
| 5287 tmp = baseStep; | |
| 5288 baseStep = droppedStep; | |
| 5289 droppedStep = tmp; | |
| 5290 } | |
| 5291 result = PlayerCreation_GetUnspentAttributePointCount(); | |
| 5292 if ( result >= droppedStep ) | |
| 5293 { | |
| 5294 if ( baseStep + *statToChange <= maxValue ) | |
| 5295 *statToChange += baseStep; | |
| 5296 } | |
| 0 | 5297 } |
| 5298 | |
| 5299 //----- (0049070F) -------------------------------------------------------- | |
| 5300 void Player::Zero() | |
| 5301 { | |
| 5302 this->sLevelModifier = 0; | |
| 5303 this->sACModifier = 0; | |
| 5304 this->uLuckBonus = 0; | |
| 5305 this->uAccuracyBonus = 0; | |
| 5306 this->uSpeedBonus = 0; | |
| 5307 this->uEnduranceBonus = 0; | |
| 5308 this->uWillpowerBonus = 0; | |
| 5309 this->uIntelligenceBonus = 0; | |
| 5310 this->uMightBonus = 0; | |
| 5311 this->field_100 = 0; | |
| 5312 this->field_FC = 0; | |
| 5313 this->field_F8 = 0; | |
| 5314 this->field_F4 = 0; | |
| 5315 this->field_F0 = 0; | |
| 5316 this->field_EC = 0; | |
| 5317 this->field_E8 = 0; | |
| 5318 this->field_E4 = 0; | |
| 5319 this->field_E0 = 0; | |
| 766 | 5320 memset(&this->sResFireBonus, 0, 0x16u); |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5321 this->field_1A97 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5322 this->_ranged_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5323 this->field_1A95 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5324 this->_ranged_atk_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5325 this->field_1A93 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5326 this->_melee_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5327 this->field_1A91 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5328 this->_some_attack_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5329 this->_mana_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5330 this->uFullManaBonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5331 this->_health_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
5332 this->uFullHealthBonus = 0; |
| 0 | 5333 } |
| 5334 | |
| 5335 //----- (004907E7) -------------------------------------------------------- | |
| 299 | 5336 unsigned int Player::GetStatColor(int uStat) |
| 0 | 5337 { |
| 290 | 5338 int attribute_value; // edx@1 |
| 1393 | 5339 |
| 5340 int base_attribute_value = StatTable[GetRace()][uStat].uBaseValue; | |
| 0 | 5341 switch (uStat) |
| 5342 { | |
| 5343 case 0: attribute_value = uMight; break; | |
| 5344 case 1: attribute_value = uIntelligence; break; | |
| 5345 case 2: attribute_value = uWillpower; break; | |
| 5346 case 3: attribute_value = uEndurance; break; | |
| 290 | 5347 case 4: attribute_value = uAccuracy; break; |
| 5348 case 5: attribute_value = uSpeed; break; | |
| 0 | 5349 case 6: attribute_value = uLuck; break; |
| 5350 }; | |
| 5351 | |
| 1393 | 5352 if (attribute_value == base_attribute_value) |
| 5353 return ui_character_stat_default_color; | |
| 5354 else if (attribute_value > base_attribute_value) | |
| 5355 return ui_character_stat_buffed_color; | |
| 0 | 5356 else |
| 1393 | 5357 return ui_character_stat_debuffed_color; |
| 0 | 5358 } |
| 5359 | |
| 5360 //----- (004908A8) -------------------------------------------------------- | |
| 5361 bool Player::DiscardConditionIfLastsLongerThan(unsigned int uCondition, unsigned __int64 uTime) | |
| 5362 { | |
| 1014 | 5363 if ( pConditions[uCondition] && (uTime < pConditions[uCondition]) ) |
| 5364 { | |
| 1393 | 5365 pConditions[uCondition] = 0i64; |
| 1014 | 5366 return true; |
| 0 | 5367 } |
| 5368 else | |
| 1014 | 5369 return false; |
| 0 | 5370 } |
| 5371 | |
| 5372 //----- (004680ED) -------------------------------------------------------- | |
| 1019 | 5373 void Player::UseItem_DrinkPotion_etc(signed int player_num, int a3) |
| 1021 | 5374 { |
| 5375 Player *v3; // esi@1 | |
| 5376 signed int v5; // eax@17 | |
| 5377 int v8; // edx@39 | |
| 5378 char *v13; // eax@45 | |
| 5379 signed int v15; // edi@68 | |
| 5380 int v16; // edx@73 | |
| 5381 unsigned __int16 v17; // edi@73 | |
| 5382 unsigned int v18; // eax@73 | |
| 5383 const char *v22; // eax@84 | |
| 5384 int scroll_id; // esi@96 | |
| 5385 int v25; // eax@109 | |
| 5386 int v26; // eax@113 | |
| 5387 int new_mana_val; // edi@114 | |
| 5388 signed __int64 v28; // qax@120 | |
| 5389 __int64 v30; // edi@137 | |
| 5390 __int64 v32; // ST3C_4@137 | |
| 5391 __int64 v34; // ST34_4@137 | |
| 5392 unsigned __int16 v50; // [sp-Ch] [bp-38h]@120 | |
| 5393 const char *v66; // [sp-4h] [bp-30h]@69 | |
| 5394 signed int v67; // [sp-4h] [bp-30h]@77 | |
| 5395 const char *v68; // [sp-4h] [bp-30h]@89 | |
| 5396 char v72; // [sp+20h] [bp-Ch]@68 | |
| 5397 signed int v73; // [sp+24h] [bp-8h]@1 | |
| 1032 | 5398 char* v74; // [sp+24h] [bp-8h]@23 |
| 1021 | 5399 Player *thisb; // [sp+28h] [bp-4h]@1 |
| 5400 unsigned int thisa; // [sp+28h] [bp-4h]@22 | |
| 5401 | |
| 5402 thisb = this; | |
| 5403 v3 = &pParty->pPlayers[player_num-1]; | |
| 5404 v73 = 1; | |
| 1340 | 5405 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) ) |
| 1021 | 5406 return; |
| 5407 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_REAGENT ) | |
| 0 | 5408 { |
| 1021 | 5409 if ( pParty->pPickedItem.uItemID == 160 ) |
| 5410 { | |
| 5411 pParty->pPlayers[player_num-1].SetCondition(Condition_Poison1, 1); | |
| 5412 } | |
| 5413 else if ( pParty->pPickedItem.uItemID == 161 ) | |
| 1019 | 5414 { |
| 1021 | 5415 new_mana_val = v3->sMana; |
| 5416 new_mana_val += 2; | |
| 5417 if ( new_mana_val > v3->GetMaxMana() ) | |
| 5418 new_mana_val = v3->GetMaxMana(); | |
| 5419 v3->PlaySound(SPEECH_36, 0); | |
| 5420 } | |
| 5421 else if ( pParty->pPickedItem.uItemID == 162 ) | |
| 5422 { | |
| 5423 pParty->pPlayers[player_num-1].Heal(2); | |
| 1019 | 5424 v3->PlaySound(SPEECH_36, 0); |
| 1021 | 5425 |
| 5426 } | |
| 5427 else | |
| 5428 { | |
| 5429 v68 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5430 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
|
5431 ShowStatusBarString(pTmpBuf.data(), 2); |
| 1021 | 5432 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 5433 return; | |
| 1019 | 5434 } |
| 1032 | 5435 pAudioPlayer->PlaySound((SoundID)211, 0, 0, -1, 0, 0, 0, 0); |
| 5436 | |
| 5437 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) | |
| 5438 { | |
| 5439 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 5440 } | |
| 5441 if ( v73 ) | |
| 5442 { | |
| 5443 if ( pParty->bTurnBasedModeOn ) | |
| 5444 { | |
| 5445 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; | |
| 5446 thisb->SetRecoveryTime(100); | |
| 1448 | 5447 pTurnEngine->ApplyPlayerAction(); |
| 1032 | 5448 } |
| 5449 else | |
| 5450 { | |
| 5451 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); | |
| 5452 } | |
| 5453 } | |
| 5454 pMouse->RemoveHoldingItem(); | |
| 5455 return; | |
| 5456 | |
| 1021 | 5457 |
| 5458 } | |
| 5459 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_POTION ) | |
| 0 | 5460 { |
| 1021 | 5461 switch ( pParty->pPickedItem.uItemID ) |
| 5462 { | |
| 5463 case 221: //Catalyst | |
| 5464 pParty->pPlayers[player_num-1].SetCondition(Condition_Poison1, 1); | |
| 5465 break; | |
| 5466 case 222: //Cure Wounds | |
| 5467 v25 = pParty->pPickedItem.uEnchantmentType + 10; | |
| 5468 pParty->pPlayers[player_num-1].Heal(v25); | |
| 5469 v3->PlaySound(SPEECH_36, 0); | |
| 5470 break; | |
| 5471 case 223: //Magic Potion | |
| 5472 v26 = pParty->pPickedItem.uEnchantmentType + 10; | |
| 5473 new_mana_val = v3->sMana; | |
| 5474 new_mana_val += v26; | |
| 5475 if ( new_mana_val > v3->GetMaxMana() ) | |
| 5476 new_mana_val = v3->GetMaxMana(); | |
| 5477 v3->PlaySound(SPEECH_36, 0); | |
| 5478 break; | |
| 5479 case 224: //Cure Weakness | |
| 5480 v3->pConditions[Condition_Weak] = 0i64; | |
| 5481 v3->PlaySound(SPEECH_36, 0); | |
| 5482 break; | |
| 5483 case 225: //Cure Disease | |
| 5484 v3->pConditions[Condition_Disease3] = 0i64; | |
| 5485 v3->pConditions[Condition_Disease2] = 0i64; | |
| 5486 v3->pConditions[Condition_Disease1] = 0i64; | |
| 5487 v3->PlaySound(SPEECH_36, 0); | |
| 5488 break; | |
| 5489 case 226: //Cure Poison | |
| 5490 v3->pConditions[Condition_Poison3] = 0i64; | |
| 5491 v3->pConditions[Condition_Poison2] = 0i64; | |
| 5492 v3->pConditions[Condition_Poison1] = 0i64; | |
| 5493 v3->PlaySound(SPEECH_36, 0); | |
| 5494 break; | |
| 5495 case 227: //Awaken | |
| 5496 v3->pConditions[Condition_Sleep] = 0i64; | |
| 5497 v3->PlaySound(SPEECH_36, 0); | |
| 5498 break; | |
| 5499 case 228: //Haste | |
| 5500 if ( !v3->pConditions[Condition_Weak] ) | |
| 5501 { | |
| 5502 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 5503 v3->pPlayerBuffs[7].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 5504 v3->PlaySound(SPEECH_36, 0); | |
| 5505 } | |
| 5506 break; | |
| 5507 case 229: //Heroism | |
| 5508 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 5509 v3->pPlayerBuffs[8].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 5510 v3->PlaySound(SPEECH_36, 0); | |
| 5511 break; | |
| 5512 case 230: //Bless | |
| 5513 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 5514 v3->pPlayerBuffs[1].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 5515 v3->PlaySound(SPEECH_36, 0); | |
| 5516 break; | |
| 5517 case 231: //Preservation | |
| 1032 | 5518 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5519 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5520 v3->pPlayerBuffs[11].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5521 v3->PlaySound(SPEECH_36, 0); | |
| 5522 break; | |
| 5523 case 232: //Shield | |
| 1032 | 5524 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5525 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5526 v3->pPlayerBuffs[13].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5527 v3->PlaySound(SPEECH_36, 0); | |
| 5528 break; | |
| 5529 case 234: //Stoneskin | |
| 5530 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); | |
| 5531 v3->pPlayerBuffs[14].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); | |
| 5532 v3->PlaySound(SPEECH_36, 0); | |
| 5533 break; | |
| 5534 case 235: //Water Breathing | |
| 5535 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335), | |
| 5536 v3->pPlayerBuffs[23].Apply(pParty->uTimePlayed +v28, 3, 5, 0, 0); | |
| 5537 break; | |
| 5538 case 237: //Remove Fear | |
| 5539 v3->pConditions[Condition_Fear] = 0i64; | |
| 5540 v3->PlaySound(SPEECH_36, 0); | |
| 5541 break; | |
| 5542 case 238: //Remove Curse | |
| 5543 v3->pConditions[Condition_Cursed] = 0i64; | |
| 5544 v3->PlaySound(SPEECH_36, 0); | |
| 5545 break; | |
| 5546 case 239: //Cure Insanity | |
| 5547 v3->pConditions[Condition_Insane] = 0i64; | |
| 5548 v3->PlaySound(SPEECH_36, 0); | |
| 5549 break; | |
| 5550 case 240: //Might Boost | |
| 1032 | 5551 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5552 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5553 v3->pPlayerBuffs[19].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5554 v3->PlaySound(SPEECH_36, 0); | |
| 5555 break; | |
| 5556 case 241: //Intellect Boost | |
| 1032 | 5557 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5558 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5559 v3->pPlayerBuffs[17].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5560 v3->PlaySound(SPEECH_36, 0); | |
| 5561 break; | |
| 5562 case 242: //Personality Boost | |
| 1032 | 5563 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5564 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5565 v3->pPlayerBuffs[20].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5566 v3->PlaySound(SPEECH_36, 0); | |
| 5567 break; | |
| 5568 case 243://Endurance Boost | |
| 1032 | 5569 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5570 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5571 v3->pPlayerBuffs[16].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5572 v3->PlaySound(SPEECH_36, 0); | |
| 5573 break; | |
| 5574 case 244: //Speed Boost | |
| 1032 | 5575 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5576 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5577 v3->pPlayerBuffs[21].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5578 v3->PlaySound(SPEECH_36, 0); | |
| 5579 break; | |
| 5580 case 245: //Accuracy Boost | |
| 1032 | 5581 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5582 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5583 v3->pPlayerBuffs[15].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5584 v3->PlaySound(SPEECH_36, 0); | |
| 5585 break; | |
| 5586 case 251: //Cure Paralysis | |
| 5587 v3->pConditions[Condition_Paralyzed] = 0i64; | |
| 5588 v3->PlaySound(SPEECH_36, 0); | |
| 5589 break; | |
| 5590 case 252://Divine Restoration | |
| 5591 v30 = v3->pConditions[Condition_Dead]; | |
| 5592 v32 = v3->pConditions[Condition_Pertified]; | |
| 5593 v34 = v3->pConditions[Condition_Eradicated]; | |
| 5594 memset(&pParty->pPlayers[player_num-1].pConditions,0,sizeof(pConditions)); | |
| 5595 v3->pConditions[Condition_Dead] = v30; | |
| 5596 v3->pConditions[Condition_Pertified] = v32; | |
| 5597 v3->pConditions[Condition_Eradicated] = v34; | |
| 5598 v3->PlaySound(SPEECH_36, 0); | |
| 5599 break; | |
| 5600 case 253: //Divine Cure | |
| 5601 v25 = 5 * pParty->pPickedItem.uEnchantmentType; | |
| 5602 pParty->pPlayers[player_num-1].Heal(v25); | |
| 5603 v3->PlaySound(SPEECH_36, 0); | |
| 5604 break; | |
| 5605 case 254: //Divine Power | |
| 5606 v26 = 5 * pParty->pPickedItem.uEnchantmentType; | |
| 5607 new_mana_val = v3->sMana; | |
| 5608 new_mana_val += v26; | |
| 5609 if ( new_mana_val > v3->GetMaxMana() ) | |
| 5610 new_mana_val = v3->GetMaxMana(); | |
| 5611 v3->PlaySound(SPEECH_36, 0); | |
| 5612 break; | |
| 5613 case 255: //Luck Boost | |
| 1032 | 5614 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5615 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5616 v3->pPlayerBuffs[18].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5617 v3->PlaySound(SPEECH_36, 0); | |
| 5618 break; | |
| 5619 case 256: //Fire Resistance | |
| 1032 | 5620 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5621 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5622 v3->pPlayerBuffs[5].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5623 v3->PlaySound(SPEECH_36, 0); | |
| 1032 | 5624 break; |
| 1021 | 5625 case 257: //Air Resistance |
| 1032 | 5626 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5627 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5628 v3->pPlayerBuffs[0].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5629 v3->PlaySound(SPEECH_36, 0); | |
| 5630 break; | |
| 5631 case 258: //Water Resistance | |
| 1032 | 5632 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5633 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5634 v3->pPlayerBuffs[22].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5635 v3->PlaySound(SPEECH_36, 0); | |
| 5636 break; | |
| 5637 case 259: //Earth Resistance | |
| 1032 | 5638 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5639 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5640 v3->pPlayerBuffs[3].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5641 v3->PlaySound(SPEECH_36, 0); | |
| 5642 break; | |
| 5643 case 260: //Mind Resistance | |
| 1032 | 5644 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5645 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5646 v3->pPlayerBuffs[9].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5647 v3->PlaySound(SPEECH_36, 0); | |
| 5648 break; | |
| 5649 case 261: //Body Resistance | |
| 1032 | 5650 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
| 1021 | 5651 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 5652 v3->pPlayerBuffs[2].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); | |
| 5653 v3->PlaySound(SPEECH_36, 0); | |
| 5654 break; | |
| 5655 case 262: //Stone to Flesh | |
| 5656 v3->pConditions[Condition_Pertified] = 0i64; | |
| 5657 v3->PlaySound(SPEECH_36, 0); | |
| 5658 break; | |
| 5659 case 264: //Pure Luck | |
| 5660 if ( !v3->pure_luck_used ) | |
| 5661 { | |
| 5662 v3->uLuck += 50; | |
| 5663 v3->pure_luck_used = 1; | |
| 5664 } | |
| 5665 v3->PlaySound(SPEECH_36, 0); | |
| 5666 break; | |
| 5667 case 265: //Pure Speed | |
| 5668 if ( !v3->pure_speed_used ) | |
| 5669 { | |
| 5670 v3->uSpeed += 50; | |
| 5671 v3->pure_speed_used = 1; | |
| 5672 } | |
| 5673 v3->PlaySound(SPEECH_36, 0); | |
| 5674 break; | |
| 5675 case 266: //Pure Intellect | |
| 5676 if ( !v3->pure_intellect_used ) | |
| 5677 { | |
| 5678 v3->uIntelligence += 50; | |
| 5679 v3->pure_intellect_used = 1; | |
| 5680 } | |
| 5681 v3->PlaySound(SPEECH_36, 0); | |
| 5682 break; | |
| 5683 case 267: //Pure Endurance | |
| 5684 if ( !v3->pure_endurance_used ) | |
| 5685 { | |
| 5686 v3->uEndurance += 50; | |
| 5687 v3->pure_endurance_used = 1; | |
| 5688 } | |
| 5689 v3->PlaySound(SPEECH_36, 0); | |
| 5690 break; | |
| 5691 case 268: //Pure Personality | |
| 5692 if ( !v3->pure_willpower_used ) | |
| 5693 { | |
| 5694 v3->uWillpower += 50; | |
| 5695 v3->pure_willpower_used = 1; | |
| 5696 } | |
| 5697 v3->PlaySound(SPEECH_36, 0); | |
| 5698 break; | |
| 5699 case 269: //Pure Accuracy | |
| 5700 if ( !v3->pure_accuracy_used ) | |
| 5701 { | |
| 5702 v3->uAccuracy += 50; | |
| 5703 v3->pure_accuracy_used = 1; | |
| 5704 } | |
| 5705 v3->PlaySound(SPEECH_36, 0); | |
| 5706 break; | |
| 5707 case 270: //Pure Might | |
| 5708 if ( !v3->pure_might_used ) | |
| 5709 { | |
| 5710 v3->uMight += 50; | |
| 5711 v3->pure_might_used = 1; | |
| 5712 } | |
| 5713 v3->PlaySound(SPEECH_36, 0); | |
| 5714 break; | |
| 5715 case 271: //Rejuvenation | |
| 5716 v3->sAgeModifier = 0; | |
| 5717 v3->PlaySound(SPEECH_36, 0); | |
| 5718 break; | |
| 5719 | |
| 5720 default: | |
| 5721 v68 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5722 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
|
5723 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1021 | 5724 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 5725 return; | |
| 1032 | 5726 } |
| 5727 pAudioPlayer->PlaySound((SoundID)210, 0, 0, -1, 0, 0, 0, 0); | |
| 5728 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) | |
| 5729 { | |
| 5730 if ( !v73 ) | |
| 5731 { | |
| 5732 pMouse->RemoveHoldingItem(); | |
| 5733 return; | |
| 5734 } | |
| 5735 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 1021 | 5736 } |
| 1032 | 5737 if ( v73 ) |
| 5738 { | |
| 5739 if ( pParty->bTurnBasedModeOn ) | |
| 5740 { | |
| 5741 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; | |
| 5742 thisb->SetRecoveryTime(100); | |
| 1448 | 5743 pTurnEngine->ApplyPlayerAction(); |
| 1032 | 5744 } |
| 5745 else | |
| 5746 { | |
| 5747 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); | |
| 5748 } | |
| 5749 } | |
| 5750 pMouse->RemoveHoldingItem(); | |
| 5751 return; | |
| 5752 | |
| 1021 | 5753 } |
| 5754 | |
| 5755 | |
| 5756 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_SPELL_SCROLL ) | |
| 5757 { | |
| 5758 | |
| 5759 | |
| 5760 if ( pCurrentScreen == SCREEN_CASTING ) | |
| 5761 return; | |
| 5762 if ( !pParty->pPlayers[player_num-1].CanAct() ) | |
| 5763 { | |
| 5764 | |
| 5765 v68 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5766 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5767 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5768 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5769 return; |
| 5770 } | |
| 5771 if ( bUnderwater == 1 ) | |
| 5772 { | |
| 1032 | 5773 ShowStatusBarString(pGlobalTXT_LocalizationStrings[652], 2u);//"You can not do that while you are underwater!" |
| 5774 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); | |
| 1021 | 5775 return; |
| 5776 } | |
| 5777 dword_50C9AC = 1; | |
| 5778 scroll_id = pParty->pPickedItem.uItemID - 299; | |
| 5779 if ( scroll_id == 30 || scroll_id == 4 || scroll_id == 91 || scroll_id == 28 ) //Enchant Item scroll, Vampiric Weapon scroll ,Recharge Item ,Fire Aura | |
| 5780 { | |
| 5781 pMouse->RemoveHoldingItem(); | |
| 5782 pGUIWindow_CurrentMenu->Release(); | |
|
1405
c0b273d33338
RemoveTexturesPackFromTextureList and RemoveTexturesFromTextureList
Ritor1
parents:
1404
diff
changeset
|
5783 pIcons_LOD->RemoveTexturesPackFromTextureList(); |
| 1021 | 5784 pCurrentScreen = SCREEN_GAME; |
| 5785 viewparams->bRedrawGameUI = 1; | |
| 5786 _42777D_CastSpell_UseWand_ShootArrow(scroll_id, player_num - 1, 0x85u, 1, 0); | |
| 5787 } | |
| 5788 else | |
| 5789 { | |
| 5790 _720984_unused = pParty->pPickedItem.uItemID; | |
| 5791 pMouse->RemoveHoldingItem(); | |
| 5792 pMessageQueue_50C9E8->AddMessage(UIMSG_SpellScrollUse, scroll_id, player_num - 1); | |
| 5793 if ( pCurrentScreen && pGUIWindow_CurrentMenu | |
| 5794 && (pGUIWindow_CurrentMenu->eWindowType != WINDOW_null)) | |
| 5795 { | |
| 5796 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 5797 } | |
| 5798 } | |
| 5799 return; | |
| 5800 } | |
| 5801 | |
| 5802 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_BOOK ) | |
| 5803 | |
| 5804 { | |
| 5805 v15 = pParty->pPickedItem.uItemID - 400; | |
| 5806 v72 = v3->spellbook.bHaveSpell[pParty->pPickedItem.uItemID-400];//(char *)&v3->pConditions[0] + pParty->pPickedItem.uItemID + 2; | |
| 5807 if ( v72 ) | |
| 5808 { | |
| 5809 v66 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5810 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
|
5811 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5812 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5813 return; |
| 5814 } | |
| 5815 if ( !pParty->pPlayers[player_num-1].CanAct() ) | |
| 5816 { | |
| 5817 v66 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5818 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
|
5819 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5820 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5821 return; |
| 5822 } | |
| 5823 v16 = v15 % 11 + 1; | |
| 5824 v17 = v3->pActiveSkills[v15 / 11 + 12]; | |
| 5825 v18 = SkillToMastery(v17) - 1; | |
| 1032 | 5826 switch (v18) |
| 5827 { | |
| 5828 case 0: v67 = 4; break; | |
| 5829 case 1: v67 = 7; break; | |
| 5830 case 2: v67 = 10; break; | |
| 5831 case 3: v67 = 11; break; | |
| 5832 default: | |
| 5833 v67 = player_num; | |
| 5834 } | |
| 5835 | |
| 5836 if ( v16 > v67 || !v17 ) | |
| 1021 | 5837 { |
| 1032 | 5838 v22 = pParty->pPickedItem.GetDisplayName(); |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5839 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
|
5840 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5841 v3->PlaySound((PlayerSpeech)20, 0); |
| 5842 return; | |
| 5843 } | |
| 5844 // v72 = 1; | |
| 5845 v3->PlaySound(SPEECH_21, 0); | |
| 5846 v73 = 0; | |
| 5847 | |
| 5848 | |
| 5849 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) | |
| 5850 { | |
| 5851 if ( !v73 ) | |
| 1021 | 5852 { |
| 1032 | 5853 pMouse->RemoveHoldingItem(); |
| 5854 return; | |
| 5855 } | |
| 5856 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); | |
| 5857 } | |
| 5858 if ( v73 ) | |
| 5859 { | |
| 5860 if ( pParty->bTurnBasedModeOn ) | |
| 5861 { | |
| 5862 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; | |
| 5863 thisb->SetRecoveryTime(100); | |
| 1448 | 5864 pTurnEngine->ApplyPlayerAction(); |
| 1021 | 5865 } |
| 5866 else | |
| 5867 { | |
| 1032 | 5868 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
| 1021 | 5869 } |
| 5870 } | |
| 1032 | 5871 pMouse->RemoveHoldingItem(); |
| 5872 return; | |
| 5873 | |
| 1021 | 5874 } |
| 5875 | |
| 5876 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_MESSAGE_SCROLL ) | |
| 5877 | |
| 5878 { | |
| 5879 if ( pParty->pPlayers[player_num-1].CanAct() ) | |
| 5880 { | |
| 5881 CreateMsgScrollWindow(pParty->pPickedItem.uItemID); | |
| 1032 | 5882 v3->PlaySound(SPEECH_37, 0); |
| 1021 | 5883 return; |
| 5884 } | |
| 5885 v68 = aCharacterConditionNames[v3->GetMajorConditionIdx()]; | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5886 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5887 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 5888 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5889 return; |
| 5890 } | |
| 5891 else | |
| 1459 | 5892 { |
| 5893 if (pParty->pPickedItem.uItemID == 616) //Genie Lamp | |
| 5894 { | |
| 1021 | 5895 thisa = pParty->uCurrentMonthWeek + 1; |
| 5896 if ( pParty->uCurrentMonth >= 7 ) | |
| 1032 | 5897 v74 = NULL; |
| 1021 | 5898 else |
| 5899 v74 = aAttributeNames[pParty->uCurrentMonth]; | |
| 5900 switch ( pParty->uCurrentMonth ) | |
| 5901 { | |
| 1019 | 5902 case 0: |
| 1021 | 5903 v3->uMight += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5904 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5905 break; |
| 1019 | 5906 case 1: |
| 1021 | 5907 v3->uIntelligence += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5908 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5909 break; |
| 1019 | 5910 case 2: |
| 1021 | 5911 v3->uWillpower += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5912 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5913 break; |
| 1019 | 5914 case 3: |
| 1021 | 5915 v3->uEndurance += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5916 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5917 break; |
| 1019 | 5918 case 4: |
| 1021 | 5919 v3->uAccuracy += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5920 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5921 break; |
| 1019 | 5922 case 5: |
| 1021 | 5923 v3->uSpeed += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5924 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5925 break; |
| 1019 | 5926 case 6: |
| 1021 | 5927 v3->uLuck += thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5928 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
| 1021 | 5929 break; |
| 1019 | 5930 case 7: |
| 1021 | 5931 party_finds_gold(1000 * thisa, 0); |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5932 sprintf(pTmpBuf.data(), "+%u %s", 1000 * thisa, pGlobalTXT_LocalizationStrings[97]);//"Gold" |
| 1021 | 5933 break; |
| 1019 | 5934 case 8: |
| 1021 | 5935 Party::GiveFood(5 * thisa); |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5936 sprintf(pTmpBuf.data(), "+%u %s",5 * thisa , pGlobalTXT_LocalizationStrings[653]);//"Food" |
| 1021 | 5937 break; |
| 0 | 5938 case 9u: |
| 1021 | 5939 v3->uSkillPoints += 2 * thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5940 sprintf(pTmpBuf.data(), "+%u %s", 2 * thisa, pGlobalTXT_LocalizationStrings[LOCSTR_SKILL_POINTS]); |
| 1021 | 5941 break; |
| 1019 | 5942 case 10: |
| 1021 | 5943 v3->uExperience += 2500 * thisa; |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5944 sprintf(pTmpBuf.data(), "+%u %s", 2500 * thisa, pGlobalTXT_LocalizationStrings[LOCSTR_EXPIRIENCE]); |
| 1021 | 5945 break; |
| 1019 | 5946 case 11: |
| 1021 | 5947 v8 = rand() % 6; |
| 5948 switch (v8) | |
| 5949 { | |
| 5950 case 0: | |
| 5951 v3->sResFireBase += thisa; | |
| 5952 v13 = pGlobalTXT_LocalizationStrings[87]; | |
| 5953 break; | |
| 5954 case 1: | |
| 5955 v3->sResAirBase += thisa; | |
| 5956 v13 = pGlobalTXT_LocalizationStrings[6]; | |
| 5957 break; | |
| 5958 case 2: | |
| 5959 v3->sResWaterBase += thisa; | |
| 5960 v13 = pGlobalTXT_LocalizationStrings[240]; | |
| 5961 break; | |
| 5962 case 3: | |
| 5963 v3->sResEarthBase += thisa; | |
| 5964 v13 = pGlobalTXT_LocalizationStrings[70]; | |
| 5965 break; | |
| 5966 case 4: | |
| 5967 v3->sResMindBase += thisa; | |
| 5968 v13 = pGlobalTXT_LocalizationStrings[142]; | |
| 5969 break; | |
| 5970 case 5: | |
| 5971 v3->sResBodyBase += thisa; | |
| 5972 v13 = pGlobalTXT_LocalizationStrings[29]; | |
| 1019 | 5973 break; |
| 1021 | 5974 } |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5975 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v13, pGlobalTXT_LocalizationStrings[121]); |
| 1021 | 5976 break; |
| 5977 | |
| 5978 } | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
5979 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1021 | 5980 pMouse->RemoveHoldingItem(); |
| 1459 | 5981 pGame->pStru6Instance->SetPlayerBuffAnim(SPELL_QUEST_COMPLETED, player_num - 1); |
| 1021 | 5982 v3->PlaySound(SPEECH_93, 0); |
| 1032 | 5983 pAudioPlayer->PlaySound((SoundID)219, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 5984 if ( pParty->uDaysPlayed == 6 || pParty->uDaysPlayed == 20 ) |
| 0 | 5985 { |
| 1021 | 5986 v3->SetCondition(Condition_Eradicated, 0); |
| 5987 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); | |
| 0 | 5988 } |
| 1021 | 5989 else if ( pParty->uDaysPlayed == 12 || pParty->uDaysPlayed == 26 ) |
| 5990 { | |
| 5991 v3->SetCondition(Condition_Dead, 0); | |
| 5992 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); | |
| 5993 } | |
| 5994 else if ( pParty->uDaysPlayed == 4 || pParty->uDaysPlayed == 25 ) | |
| 5995 { | |
| 5996 v3->SetCondition(Condition_Pertified, 0); | |
| 5997 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); | |
| 5998 } | |
| 1019 | 5999 return; |
| 1021 | 6000 } |
| 6001 else if ( pParty->pPickedItem.uItemID == 630 ) //Red Apple | |
| 1459 | 6002 { |
| 1021 | 6003 Party::GiveFood(1u); |
| 1459 | 6004 pAudioPlayer->PlaySound(SOUND_EatApple, 0, 0, -1, 0, 0, 0, 0); |
| 6005 } | |
| 1021 | 6006 else if ( pParty->pPickedItem.uItemID == 632 ) //Lute |
| 6007 { | |
| 1459 | 6008 pAudioPlayer->PlaySound(SOUND_PlayLute, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 6009 return; |
| 6010 } | |
| 6011 else if ( pParty->pPickedItem.uItemID == 633 ) //Faerie Pipes | |
| 6012 { | |
| 1459 | 6013 pAudioPlayer->PlaySound(SOUND_PlayFaeriePipes, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 6014 return; |
| 6015 } | |
| 6016 else if ( pParty->pPickedItem.uItemID == 634 ) //Gryphonheart's Trumpet | |
| 6017 { | |
| 1459 | 6018 pAudioPlayer->PlaySound(SOUND_PlayGryphonheartsTrumpet, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 6019 return; |
| 6020 } | |
| 1032 | 6021 else if ( pParty->pPickedItem.uItemID == 646 ) //Horseshoe |
| 1459 | 6022 { |
| 6023 pGame->pStru6Instance->SetPlayerBuffAnim(SPELL_QUEST_COMPLETED, player_num - 1); | |
| 6024 v5 = PID(OBJECT_Player, player_num + 49); | |
| 1021 | 6025 pAudioPlayer->PlaySound(SOUND_20001, v5, 0, -1, 0, 0, 0, 0); |
| 6026 v3->AddVariable(VAR_NumSkillPoints, 2); | |
| 6027 } | |
| 6028 else if ( pParty->pPickedItem.uItemID == 650 ) //Temple in a Bottle | |
| 6029 { | |
| 1459 | 6030 TeleportToNWCDungeon(); |
| 1021 | 6031 return; |
| 6032 } | |
| 0 | 6033 else |
| 1021 | 6034 { |
| 6035 | |
| 6036 v68 = pParty->pPickedItem.GetDisplayName(); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
6037 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
|
6038 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 6039 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 6040 return; |
| 6041 } | |
| 1032 | 6042 |
| 0 | 6043 pMouse->RemoveHoldingItem(); |
| 6044 return; | |
| 6045 } | |
| 1021 | 6046 |
| 6047 } | |
| 0 | 6048 |
| 6049 //----- (00449BB4) -------------------------------------------------------- | |
| 484 | 6050 bool Player::CompareVariable( enum VariableType VarNum, signed int pValue ) |
| 1033 | 6051 { |
| 0 | 6052 Player *v3; // esi@1 |
| 6053 signed int v4; // edi@1 | |
| 6054 unsigned int v5; // eax@8 | |
| 6055 int v6; // eax@9 | |
| 6056 enum CHARACTER_RACE v7; // eax@11 | |
| 6057 signed int v8; // eax@17 | |
| 6058 unsigned __int8 v9; // sf@17 | |
| 6059 unsigned __int8 v10; // of@17 | |
| 6060 int v11; // eax@19 | |
| 6061 unsigned int v12; // eax@20 | |
| 484 | 6062 unsigned int test_bit_value; // eax@25 |
| 6063 unsigned __int8 our_bit_value; // cl@25 | |
| 0 | 6064 signed int v15; // ecx@28 |
| 6065 ItemGen *v16; // eax@28 | |
| 6066 char v17; // zf@31 | |
| 6067 int v18; // edi@90 | |
| 6068 DDM_DLV_Header *v19; // eax@122 | |
| 6069 char v20; // cl@124 | |
| 6070 DDM_DLV_Header *v21; // eax@126 | |
| 6071 unsigned int v22; // edi@129 | |
| 100 | 6072 Player *v23; // esi@134 |
| 0 | 6073 ItemGen *v24; // ecx@135 |
| 6074 signed int v25; // edx@135 | |
| 6075 ITEM_EQUIP_TYPE v26; // ebx@155 | |
| 6076 char *v27; // edi@155 | |
| 6077 int v28; // ebx@161 | |
| 6078 int v29; // eax@161 | |
| 6079 | |
| 469 | 6080 v6 = 0; |
| 0 | 6081 v3 = this; |
| 6082 v4 = -1; | |
| 469 | 6083 if ( VarNum > VAR_AutoNotes ) |
| 6084 { | |
| 6085 switch ( VarNum ) | |
| 0 | 6086 { |
| 6087 case VAR_Invisible: | |
| 1167 | 6088 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime >0 ) |
| 469 | 6089 return true; |
| 484 | 6090 return false; |
| 0 | 6091 case VAR_NumDeaths: |
| 6092 v4 = pParty->uNumDeaths; | |
| 469 | 6093 return v4 >= pValue; |
| 0 | 6094 case VAR_NumBounties: |
| 6095 v4 = pParty->uNumBountiesCollected; | |
| 469 | 6096 return v4 >= pValue; |
| 0 | 6097 case VAR_PrisonTerms: |
| 6098 v4 = pParty->uNumPrisonTerms; | |
| 469 | 6099 return v4 >= pValue; |
| 0 | 6100 case VAR_ArenaWinsPage: |
| 6101 v4 = (unsigned __int8)pParty->uNumArenaPageWins; | |
| 469 | 6102 return v4 >= pValue; |
| 0 | 6103 case VAR_ArenaWinsSquire: |
| 6104 v4 = (unsigned __int8)pParty->uNumArenaSquireWins; | |
| 469 | 6105 return v4 >= pValue; |
| 0 | 6106 case VAR_ArenaWinsKnight: |
| 6107 v4 = (unsigned __int8)pParty->uNumArenaKnightWins; | |
| 469 | 6108 return v4 >= pValue; |
| 0 | 6109 case VAR_ArenaWinsLord: |
| 6110 v4 = (unsigned __int8)pParty->uNumArenaLordWins; | |
| 469 | 6111 return v4 >= pValue; |
| 0 | 6112 case VAR_ReputationInCurrentLocation: |
| 6113 v19 = &pOutdoor->ddm; | |
| 6114 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 6115 v19 = &pIndoor->dlv; | |
| 469 | 6116 v6 = v19->uReputation >= pValue; |
| 6117 return v6; | |
| 0 | 6118 case VAR_History_28|VAR_Sex: |
| 6119 v21 = &pOutdoor->ddm; | |
| 6120 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 6121 v21 = &pIndoor->dlv; | |
| 469 | 6122 v6 = v21->field_C_alert == pValue; |
| 0 | 6123 return v6; |
| 6124 case VAR_MonthEquals2|VAR_Sex: | |
| 6125 case VAR_MonthEquals2|VAR_Class: | |
| 6126 case VAR_Counter1: | |
| 6127 case VAR_Counter2: | |
| 6128 case VAR_Counter3: | |
| 6129 case VAR_Counter4: | |
| 6130 case VAR_Counter5: | |
| 6131 case VAR_Counter6: | |
| 6132 case VAR_Counter7: | |
| 6133 case VAR_Counter8: | |
| 469 | 6134 v22 = *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44304]; |
| 6135 if ( v22 | *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44300] | |
| 6136 && (signed __int64)(__PAIR__(v22, *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44300]) | |
| 6137 + (signed __int64)((double)(460800 * pValue) * 0.033333335)) <= (signed __int64)pParty->uTimePlayed ) | |
| 6138 return true; | |
| 6139 return false; | |
| 0 | 6140 case VAR_NumSkillPoints: |
| 6141 v4 = this->uSkillPoints; | |
| 469 | 6142 return v4 >= pValue; |
| 0 | 6143 case VAR_CircusPrises: |
| 6144 v4 = 0; | |
| 100 | 6145 v23 = pParty->pPlayers;//[0].pInventoryItems; |
| 0 | 6146 do |
| 6147 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
6148 v24 = v23->pInventoryItemList; |
| 0 | 6149 v25 = 138; |
| 6150 do | |
| 6151 { | |
| 6152 switch ( v24->uItemID ) | |
| 6153 { | |
| 6154 case 0x1D6u: | |
| 6155 ++v4; | |
| 6156 break; | |
| 6157 case 0x1D7u: | |
| 6158 v4 += 3; | |
| 6159 break; | |
| 6160 case 0x1DDu: | |
| 6161 v4 += 5; | |
| 6162 break; | |
| 6163 } | |
| 6164 ++v24; | |
| 6165 --v25; | |
| 6166 } | |
| 6167 while ( v25 ); | |
| 100 | 6168 ++v23; |
| 0 | 6169 } |
| 100 | 6170 while ( v23 <= &pParty->pPlayers[3] ); |
| 469 | 6171 return v4 >= pValue; |
| 0 | 6172 case VAR_MonthEquals2: |
| 469 | 6173 v6 = pParty->uCurrentMonth == pValue; |
| 6174 return v6; | |
| 0 | 6175 case VAR_IsFlying: |
| 6176 if ( pParty->bFlying | |
| 1167 | 6177 && (pParty->pPartyBuffs[PARTY_BUFF_FLY].uExpireTime> 0) ) |
| 469 | 6178 return true; |
| 6179 return false; | |
| 0 | 6180 case VAR_HiredNPCHasSpeciality: |
| 469 | 6181 LOBYTE(v6) = CheckHiredNPCSpeciality(pValue); |
| 0 | 6182 return v6; |
| 6183 case VAR_NPCs2: | |
| 469 | 6184 return pNPCStats->pNewNPCData[pValue].Hired(); |
| 0 | 6185 case VAR_MonthEquals|VAR_CurrentSP: |
| 1033 | 6186 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; |
| 6187 our_bit_value = this->field_1A50[((signed __int16)pValue - 1)/8]; | |
| 484 | 6188 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 469 | 6189 return v4 >= pValue; |
| 6190 v4 = pValue; | |
| 6191 return v4 >= pValue; | |
| 0 | 6192 case VAR_ItemEquipped: |
| 6193 v26 = (ITEM_EQUIP_TYPE)0; | |
| 6194 v27 = (char *)&this->pEquipment; | |
| 6195 break; | |
| 6196 case VAR_GoldInBank: | |
| 6197 v4 = pParty->uNumGoldInBank; | |
| 469 | 6198 return v4 >= pValue; |
| 0 | 6199 case VAR_ThieverySkill|0x80: |
| 6200 v28 = GetActualMight(); | |
| 6201 v29 = v3->GetBaseStrength(); | |
| 6202 goto LABEL_168; | |
| 6203 case VAR_DisarmTrapSkill|0x80: | |
| 6204 v28 = GetActualIntelligence(); | |
| 6205 v29 = v3->GetBaseIntelligence(); | |
| 6206 goto LABEL_168; | |
| 6207 case VAR_MonthEquals: | |
| 6208 v28 = GetActualWillpower(); | |
| 6209 v29 = v3->GetBaseWillpower(); | |
| 6210 goto LABEL_168; | |
| 6211 case VAR_MonthEquals|VAR_Sex: | |
| 6212 v28 = GetActualEndurance(); | |
| 6213 v29 = v3->GetBaseEndurance(); | |
| 6214 goto LABEL_168; | |
| 6215 case VAR_IdentifyMonsterSkill|0x80: | |
| 6216 v28 = GetActualSpeed(); | |
| 6217 v29 = v3->GetBaseSpeed(); | |
| 6218 goto LABEL_168; | |
| 6219 case VAR_ArmsmasterSkill|0x80: | |
| 6220 v28 = GetActualAccuracy(); | |
| 6221 v29 = v3->GetBaseAccuracy(); | |
| 6222 goto LABEL_168; | |
| 6223 case VAR_MonthEquals|VAR_MaxHP: | |
| 6224 v28 = GetActualLuck(); | |
| 6225 v29 = v3->GetBaseLuck(); | |
| 6226 LABEL_168: | |
| 6227 v10 = __OFSUB__(v28, v29); | |
| 6228 v9 = v28 - v29 < 0; | |
| 6229 LABEL_169: | |
| 6230 if ( v9 ^ v10 ) | |
| 469 | 6231 return v4 >= pValue; |
| 6232 return true; | |
| 0 | 6233 default: |
| 469 | 6234 return v4 >= pValue; |
| 0 | 6235 } |
| 6236 while ( !v3->HasItemEquipped(v26) | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
6237 || *(int *)&v3->pInventoryItemList[*(int *)v27-1] != pValue ) |
| 0 | 6238 { |
| 6239 v26 = (ITEM_EQUIP_TYPE)((int)v26 + 1); | |
| 6240 v27 += 4; | |
| 6241 if ( (signed int)v26 >= 16 ) | |
| 469 | 6242 return false; |
| 6243 } | |
| 6244 return true; | |
| 6245 } | |
| 6246 if ( VarNum == VAR_AutoNotes ) | |
| 0 | 6247 { |
| 1033 | 6248 test_bit_value = 0x80u >> ((signed __int16)(pValue - 1) - 1) % 8; |
| 6249 our_bit_value = pParty->_autonote_bits[((signed __int16)(pValue - 1) - 1) /8]; | |
| 484 | 6250 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 6251 return false; | |
| 6252 return true; | |
| 469 | 6253 } |
| 6254 if ( VarNum <= VAR_BaseLuck ) | |
| 6255 { | |
| 6256 if ( VarNum != VAR_BaseLuck ) | |
| 6257 { | |
| 6258 switch ( VarNum ) | |
| 0 | 6259 { |
| 6260 case VAR_Hour: | |
| 469 | 6261 if ( (signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60 % 24 == pValue ) |
| 6262 return true; | |
| 6263 return false; | |
| 0 | 6264 case VAR_DayOfYear: |
| 469 | 6265 v5 = (unsigned int)((signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60) / 0x18 % 0x150 + 1; |
| 6266 v6 = v5 == pValue; | |
| 6267 return v6; | |
| 0 | 6268 case VAR_DayOfWeek: |
| 469 | 6269 v5 = (unsigned int)((signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60) / 0x18 % 7; |
| 6270 v6 = v5 == pValue; | |
| 0 | 6271 return v6; |
| 6272 case VAR_Sex: | |
| 469 | 6273 if ( pValue == (CHARACTER_RACE)this->uSex ) |
| 6274 return true; | |
| 6275 return v4 >= pValue; | |
| 0 | 6276 case VAR_Class: |
| 135 | 6277 v7 = (CHARACTER_RACE)this->classType; |
| 469 | 6278 if ( pValue == v7 ) |
| 6279 return true; | |
| 6280 return v4 >= pValue; | |
| 0 | 6281 case VAR_Race: |
| 6282 v7 = GetRace(); | |
| 469 | 6283 if ( pValue == v7 ) |
| 6284 return true; | |
| 6285 return v4 >= pValue; | |
| 0 | 6286 case VAR_CurrentHP: |
| 6287 v4 = this->sHealth; | |
| 469 | 6288 return v4 >= pValue; |
| 0 | 6289 case VAR_MaxHP: |
| 6290 v8 = GetMaxHealth(); | |
| 6291 v10 = __OFSUB__(v3->sHealth, v8); | |
| 6292 v9 = v3->sHealth - v8 < 0; | |
| 6293 goto LABEL_169; | |
| 6294 case VAR_CurrentSP: | |
| 6295 v4 = this->sMana; | |
| 469 | 6296 return v4 >= pValue; |
| 0 | 6297 case VAR_MaxSP: |
| 6298 v11 = GetMaxMana(); | |
| 6299 v10 = __OFSUB__(v3->sMana, v11); | |
| 6300 v9 = v3->sMana - v11 < 0; | |
| 6301 goto LABEL_169; | |
| 6302 case VAR_ActualAC: | |
| 6303 v12 = GetActualAC(); | |
| 6304 goto _j_cmp_against_arg; | |
| 6305 case VAR_ACModifier: | |
| 6306 v4 = this->sACModifier; | |
| 469 | 6307 return v4 >= pValue; |
| 0 | 6308 case VAR_BaseLevel: |
| 6309 v4 = this->uLevel; | |
| 469 | 6310 return v4 >= pValue; |
| 0 | 6311 case VAR_LevelModifier: |
| 6312 v4 = this->sLevelModifier; | |
| 469 | 6313 return v4 >= pValue; |
| 0 | 6314 case VAR_Age: |
| 6315 v12 = GetActualAge(); | |
| 6316 goto _j_cmp_against_arg; | |
| 6317 case VAR_Award: | |
| 1033 | 6318 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6319 our_bit_value = this->_achieved_awards_bits[((signed __int16)pValue - 1) /8]; |
| 484 | 6320 if ( !((unsigned __int8)test_bit_value & our_bit_value) ) |
| 6321 return true; | |
| 6322 return false; | |
| 0 | 6323 case VAR_Experience: |
| 6324 v4 = LODWORD(this->uExperience); | |
| 469 | 6325 return v4 >= pValue; |
| 0 | 6326 case VAR_QBits_QuestsDone: |
| 484 | 6327 test_bit_value = 0x80u >> (pValue - 1) % 8; |
| 6328 our_bit_value = pParty->_quest_bits[(pValue - 1)/8]; | |
| 6329 if ( test_bit_value & our_bit_value ) | |
| 478 | 6330 return true; |
| 6331 return false; | |
| 0 | 6332 case VAR_PlayerItemInHands: |
| 6333 v15 = 0; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
6334 v16 = v3->pInventoryItemList; |
| 0 | 6335 break; |
| 6336 case VAR_FixedGold: | |
| 6337 v4 = pParty->uNumGold; | |
| 469 | 6338 return v4 >= pValue; |
| 0 | 6339 case VAR_MightBonus: |
| 6340 v4 = this->uMightBonus; | |
| 469 | 6341 return v4 >= pValue; |
| 0 | 6342 case VAR_IntellectBonus: |
| 6343 v4 = this->uIntelligenceBonus; | |
| 469 | 6344 return v4 >= pValue; |
| 0 | 6345 case VAR_PersonalityBonus: |
| 6346 v4 = this->uWillpowerBonus; | |
| 469 | 6347 return v4 >= pValue; |
| 0 | 6348 case VAR_EnduranceBonus: |
| 6349 v4 = this->uEnduranceBonus; | |
| 469 | 6350 return v4 >= pValue; |
| 0 | 6351 case VAR_SpeedBonus: |
| 6352 v4 = this->uSpeedBonus; | |
| 469 | 6353 return v4 >= pValue; |
| 0 | 6354 case VAR_AccuracyBonus: |
| 6355 v4 = this->uAccuracyBonus; | |
| 469 | 6356 return v4 >= pValue; |
| 0 | 6357 case VAR_LuckBonus: |
| 6358 v4 = this->uLuckBonus; | |
| 469 | 6359 return v4 >= pValue; |
| 0 | 6360 case VAR_BaseMight: |
| 6361 v4 = this->uMight; | |
| 469 | 6362 return v4 >= pValue; |
| 0 | 6363 case VAR_BaseIntellect: |
| 6364 v4 = this->uIntelligence; | |
| 469 | 6365 return v4 >= pValue; |
| 0 | 6366 case VAR_BasePersonality: |
| 6367 v4 = this->uWillpower; | |
| 469 | 6368 return v4 >= pValue; |
| 0 | 6369 case VAR_BaseEndurance: |
| 6370 v4 = this->uEndurance; | |
| 469 | 6371 return v4 >= pValue; |
| 0 | 6372 case VAR_BaseSpeed: |
| 6373 v4 = this->uSpeed; | |
| 469 | 6374 return v4 >= pValue; |
| 0 | 6375 case VAR_BaseAccuracy: |
| 6376 v4 = this->uAccuracy; | |
| 469 | 6377 return v4 >= pValue; |
| 0 | 6378 case VAR_FixedFood: |
| 6379 v4 = pParty->uNumFoodRations; | |
| 469 | 6380 return v4 >= pValue; |
| 0 | 6381 default: |
| 469 | 6382 return v4 >= pValue; |
| 6383 } | |
| 6384 while ( v16->uItemID != pValue ) | |
| 0 | 6385 { |
| 6386 ++v15; | |
| 6387 ++v16; | |
| 6388 if ( v15 >= 138 ) | |
| 6389 { | |
| 469 | 6390 v6 = pParty->pPickedItem.uItemID == pValue; |
| 0 | 6391 return v6; |
| 6392 } | |
| 6393 } | |
| 469 | 6394 return true; |
| 0 | 6395 } |
| 6396 v4 = this->uLuck; | |
| 469 | 6397 return v4 >= pValue; |
| 6398 } | |
| 6399 if ( VarNum <= VAR_MagicResistance ) | |
| 6400 { | |
| 6401 if ( VarNum == VAR_MagicResistance ) | |
| 0 | 6402 { |
| 6403 v4 = this->sResMagicBase; | |
| 6404 } | |
| 6405 else | |
| 6406 { | |
| 469 | 6407 switch ( VarNum ) |
| 0 | 6408 { |
| 6409 case VAR_FireResistance: | |
| 6410 v4 = this->sResFireBase; | |
| 469 | 6411 return v4 >= pValue; |
| 0 | 6412 case VAR_AirResistance: |
| 6413 v4 = this->sResAirBase; | |
| 469 | 6414 return v4 >= pValue; |
| 0 | 6415 case VAR_WaterResistance: |
| 6416 v4 = this->sResWaterBase; | |
| 469 | 6417 return v4 >= pValue; |
| 0 | 6418 case VAR_EarthResistance: |
| 6419 v4 = this->sResEarthBase; | |
| 469 | 6420 return v4 >= pValue; |
| 0 | 6421 case VAR_SpiritResistance: |
| 6422 v4 = this->sResSpiritBase; | |
| 469 | 6423 return v4 >= pValue; |
| 0 | 6424 case VAR_MindResistance: |
| 6425 v4 = this->sResMindBase; | |
| 469 | 6426 return v4 >= pValue; |
| 0 | 6427 case VAR_BodyResistance: |
| 6428 v4 = this->sResBodyBase; | |
| 469 | 6429 return v4 >= pValue; |
| 0 | 6430 case VAR_LightResistance: |
| 6431 v4 = this->sResLightBase; | |
| 469 | 6432 return v4 >= pValue; |
| 0 | 6433 case VAR_DarkResistance: |
| 6434 v4 = this->sResDarkBase; | |
| 469 | 6435 return v4 >= pValue; |
| 0 | 6436 case VAR_ActualMight: |
| 6437 v12 = GetActualMight(); | |
| 6438 goto _j_cmp_against_arg; | |
| 6439 case VAR_ActualIntellect: | |
| 6440 v12 = GetActualIntelligence(); | |
| 6441 goto _j_cmp_against_arg; | |
| 6442 case VAR_ActualPersonality: | |
| 6443 v12 = GetActualWillpower(); | |
| 6444 goto _j_cmp_against_arg; | |
| 6445 case VAR_ActualEndurance: | |
| 6446 v12 = GetActualEndurance(); | |
| 6447 goto _j_cmp_against_arg; | |
| 6448 case VAR_ActualSpeed: | |
| 6449 v12 = GetActualSpeed(); | |
| 6450 goto _j_cmp_against_arg; | |
| 6451 case VAR_ActualAccuracy: | |
| 6452 v12 = GetActualAccuracy(); | |
| 6453 goto _j_cmp_against_arg; | |
| 6454 case VAR_ActualLuck: | |
| 6455 v12 = GetActualLuck(); | |
| 6456 _j_cmp_against_arg: | |
| 6457 v4 = v12; | |
| 6458 break; | |
| 6459 default: | |
| 469 | 6460 return v4 >= pValue; |
| 6461 } | |
| 6462 } | |
| 6463 return v4 >= pValue; | |
| 6464 } | |
| 6465 if ( VarNum <= VAR_DisarmTrapSkill ) | |
| 6466 { | |
| 6467 if ( VarNum != VAR_DisarmTrapSkill ) | |
| 6468 { | |
| 6469 if ( VarNum <= VAR_MindResistanceBonus ) | |
| 6470 { | |
| 6471 switch ( VarNum ) | |
| 0 | 6472 { |
| 6473 case VAR_MindResistanceBonus: | |
| 6474 v4 = this->sResMindBonus; | |
| 6475 break; | |
| 6476 case VAR_FireResistanceBonus: | |
| 6477 v4 = this->sResFireBonus; | |
| 6478 break; | |
| 6479 case VAR_AirResistanceBonus: | |
| 6480 v4 = this->sResAirBonus; | |
| 6481 break; | |
| 6482 case VAR_WaterResistanceBonus: | |
| 6483 v4 = this->sResWaterBonus; | |
| 6484 break; | |
| 6485 case VAR_EarthResistanceBonus: | |
| 6486 v4 = this->sResEarthBonus; | |
| 6487 break; | |
| 6488 case VAR_SpiritResistanceBonus: | |
| 6489 v4 = this->sResSpiritBonus; | |
| 6490 break; | |
| 6491 } | |
| 469 | 6492 return v4 >= pValue; |
| 6493 } | |
| 6494 if ( VarNum == VAR_BodyResistanceBonus ) | |
| 0 | 6495 { |
| 6496 v4 = this->sResBodyBonus; | |
| 469 | 6497 return v4 >= pValue; |
| 6498 } | |
| 6499 if ( VarNum == VAR_LightResistanceBonus ) | |
| 0 | 6500 { |
| 6501 v4 = this->sResLightBonus; | |
| 469 | 6502 return v4 >= pValue; |
| 6503 } | |
| 6504 if ( VarNum == VAR_DarkResistanceBonus ) | |
| 0 | 6505 { |
| 6506 v4 = this->sResDarkBonus; | |
| 469 | 6507 return v4 >= pValue; |
| 6508 } | |
| 6509 if ( VarNum == VAR_MagicResistanceBonus ) | |
| 0 | 6510 { |
| 6511 v4 = this->sResMagicBonus; | |
| 469 | 6512 return v4 >= pValue; |
| 6513 } | |
| 6514 if ( VarNum <= VAR_MagicResistanceBonus || VarNum > VAR_DiplomacySkill ) | |
| 6515 return v4 >= pValue; | |
| 0 | 6516 } |
| 6517 LABEL_90: | |
| 469 | 6518 v18 = *((short *)&this->pConditions[16] + VarNum); |
| 6519 if ( pValue <= 63 ) | |
| 0 | 6520 v4 = v18 & 0x3F; |
| 6521 else | |
| 469 | 6522 v4 = pValue & v18; |
| 6523 return v4 >= pValue; | |
| 6524 } | |
| 6525 if ( VarNum == 104 ) | |
| 0 | 6526 goto LABEL_90; |
| 469 | 6527 if ( (signed int)VarNum <= 104 ) |
| 6528 return v4 >= pValue; | |
| 6529 if ( (signed int)VarNum > 0x79 ) | |
| 6530 { | |
| 6531 if ( VarNum != 122 ) | |
| 6532 { | |
| 6533 if ( (signed int)VarNum > 122 && VarNum <= VAR_ActiveSpells ) | |
| 6534 v4 = (unsigned __int8)byte_5E4C15[VarNum]; | |
| 6535 return v4 >= pValue; | |
| 0 | 6536 } |
| 6537 v4 = GetMajorConditionIdx(); | |
| 6538 if ( v4 != 18 ) | |
| 6539 { | |
| 469 | 6540 return v4 >= pValue; |
| 6541 } | |
| 6542 v4 = pValue; | |
| 6543 return v4 >= pValue; | |
| 6544 } | |
| 1072 | 6545 return &LODWORD(this->pConditions[VarNum]);// *((int *)this + 2 * VarNum - 210); |
| 0 | 6546 } |
| 6547 | |
| 6548 | |
| 6549 //----- (0044A5CB) -------------------------------------------------------- | |
| 492 | 6550 void Player::SetVariable(enum VariableType var_type, signed int var_value) |
| 6551 { | |
| 6552 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
|
6553 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
|
6554 unsigned int v5_unused; // edi@1 |
| 0 | 6555 unsigned int v6; // esi@13 |
| 6556 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
|
6557 signed int v8_unused; // eax@17 |
| 0 | 6558 ItemGen *v9; // ecx@17 |
| 6559 int v10; // eax@21 | |
| 6560 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
|
6561 Player *unused12; // ecx@44 |
| 0 | 6562 char *v13; // ecx@45 |
| 6563 Player *v14; // ecx@49 | |
| 6564 int v15; // ecx@86 | |
| 6565 int v16; // esi@106 | |
| 6566 char v17; // al@106 | |
| 6567 int v18; // eax@107 | |
| 6568 Player *v19; // ecx@112 | |
| 6569 Player *v20; // ecx@127 | |
| 6570 int v21; // eax@127 | |
| 6571 int v22; // eax@145 | |
| 6572 char v23; // zf@146 | |
| 6573 DDM_DLV_Header *v24; // ecx@148 | |
| 6574 signed int v25; // eax@172 | |
| 6575 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
|
6576 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
|
6577 int v28_unused; // [sp-4h] [bp-38h]@84 |
| 0 | 6578 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
|
6579 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
|
6580 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
|
6581 |
|
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
|
6582 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
|
6583 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
|
6584 { |
|
7ef8ae7ce42a
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 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
|
6586 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6587 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
|
6588 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
|
6589 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6590 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6591 assert(currPlayerId != -1); |
| 492 | 6592 if ( var_type > VAR_AutoNotes ) |
| 6593 { | |
| 6594 if ( var_type <= VAR_GoldInBank ) | |
| 6595 { | |
| 6596 if ( var_type == VAR_GoldInBank ) | |
| 6597 { | |
| 6598 pParty->uNumGoldInBank = var_value; | |
| 0 | 6599 return; |
| 6600 } | |
| 492 | 6601 if ( var_type <= VAR_Counter8 ) |
| 6602 { | |
| 6603 if ( (signed int)var_type >= 0xF5 ) | |
| 0 | 6604 { |
| 492 | 6605 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44300] = LODWORD(pParty->uTimePlayed); |
| 6606 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44304] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 6607 } |
| 6608 else | |
| 6609 { | |
| 492 | 6610 switch ( var_type ) |
| 0 | 6611 { |
| 6612 case VAR_MonthEquals|VAR_CurrentSP: | |
| 492 | 6613 _449B7E_toggle_bit((unsigned char *)field_1A50, var_value, 1u); |
| 0 | 6614 break; |
| 6615 case VAR_NPCs2: | |
| 6616 pParty->field_709 = 0; | |
| 492 | 6617 LOBYTE(pNPCStats->pNewNPCData[var_value].uFlags) |= 0x80u; |
| 1035 | 6618 pParty->CountHirelings(); |
| 6619 viewparams->bRedrawGameUI = true; | |
| 0 | 6620 break; |
| 6621 case VAR_NumSkillPoints: | |
| 492 | 6622 this->uSkillPoints = var_value; |
| 0 | 6623 break; |
| 6624 } | |
| 6625 } | |
| 6626 return; | |
| 6627 } | |
| 492 | 6628 if ( var_type < VAR_Counter9 ) |
| 0 | 6629 return; |
| 492 | 6630 if ( (signed int)var_type <= 0x112 ) |
| 6631 { | |
| 6632 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44532] = LODWORD(pParty->uTimePlayed); | |
| 6633 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44536] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 6634 } |
| 6635 else | |
| 6636 { | |
| 492 | 6637 if ( var_type == VAR_ReputationInCurrentLocation ) |
| 0 | 6638 { |
| 6639 v24 = &pOutdoor->ddm; | |
| 6640 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 6641 v24 = &pIndoor->dlv; | |
| 492 | 6642 v24->uReputation = var_value; |
| 6643 if ( var_value > 10000 ) | |
| 0 | 6644 v24->uReputation = 10000; |
| 6645 return; | |
| 6646 } | |
| 492 | 6647 if ( var_type <= VAR_ReputationInCurrentLocation |
| 6648 || var_type > VAR_History_28 | |
| 6649 || (v22 = var_type - 276, pParty->field_3C.field_4F0[2 * v22 + 1] | pParty->field_3C.field_4F0[2 * v22]) | |
| 6650 || (pParty->field_3C.field_4F0[2 * (var_type - 276)] = LODWORD(pParty->uTimePlayed), | |
| 1455 | 6651 v23 = pStorylineText->StoreLine[v22].pText == 0,//*(&pStorylineText->field_0 + 3 * v22) == 0, |
| 492 | 6652 pParty->field_3C.field_4F0[2 * (var_type - 276) + 1] = HIDWORD(pParty->uTimePlayed), |
| 0 | 6653 v23) ) |
| 6654 return; | |
| 6655 bFlashHistoryBook = 1; | |
| 6656 } | |
| 492 | 6657 v25 = 8 * currPlayerId + 400; |
| 862 | 6658 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
|
6659 pAudioPlayer->PlaySound(SOUND_20001, v25, 0, -1, 0, 0, 0, 0); |
| 0 | 6660 return; |
| 6661 } | |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6662 switch ( var_type ) |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6663 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6664 case VAR_NumDeaths: |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6665 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
|
6666 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6667 case VAR_NumBounties: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6668 pParty->uNumBountiesCollected = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6669 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6670 case VAR_PrisonTerms: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6671 pParty->uNumPrisonTerms = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6672 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6673 case VAR_ArenaWinsPage: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6674 pParty->uNumArenaPageWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6675 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6676 case VAR_ArenaWinsSquire: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6677 pParty->uNumArenaSquireWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6678 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6679 case VAR_ArenaWinsKnight: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6680 pParty->uNumArenaKnightWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6681 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6682 case VAR_ArenaWinsLord: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6683 pParty->uNumArenaLordWins = var_value; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6684 break; |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6685 } |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6686 return; |
| 0 | 6687 } |
| 492 | 6688 if ( var_type == VAR_AutoNotes ) |
| 6689 { | |
| 6690 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
|
6691 //&& (&dword_723718_autonote_related)[8 * a3] ) |
| 1310 | 6692 && pAutonoteTxt[var_value].pText ) |
| 492 | 6693 { |
| 6694 v20 = pPlayers[currPlayerId + 1]; | |
| 187 | 6695 v20->PlaySound(SPEECH_96, 0); |
| 1453 | 6696 //v21 = pAutonoteTxt[var_value].eType;// dword_72371C[2 * a3]; |
| 0 | 6697 bFlashAutonotesBook = 1; |
| 1453 | 6698 _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
|
6699 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
| 0 | 6700 } |
| 1453 | 6701 _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
|
6702 PlaySoundBasedOnCondition(currPlayerId); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6703 return; |
| 0 | 6704 } |
|
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
|
6705 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
|
6706 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6707 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
|
6708 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6709 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
|
6710 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
|
6711 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
|
6712 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
|
6713 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
|
6714 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
|
6715 { |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6716 v9 = NULL; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6717 for (int i = 0; i < 138; i++) |
| 0 | 6718 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
6719 v9 = &this->pInventoryItemList[i]; |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
6720 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
|
6721 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
|
6722 } |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
6723 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
|
6724 { |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6725 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
|
6726 *(int *)(v10 + 532) = 601; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6727 *(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
|
6728 } |
|
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
|
6729 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
|
6730 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
|
6731 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
|
6732 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
|
6733 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
|
6734 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
|
6735 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
|
6736 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
|
6737 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
|
6738 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
|
6739 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
|
6740 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
|
6741 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
|
6742 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
|
6743 { |
|
7ef8ae7ce42a
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 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
|
6745 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
|
6746 } |
|
7ef8ae7ce42a
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 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
|
6748 { |
|
7ef8ae7ce42a
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 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
|
6750 this->uVoiceID = 20; |
| 0 | 6751 } |
|
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
|
6752 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
|
6753 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6754 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
|
6755 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
|
6756 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
|
6757 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
|
6758 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
|
6759 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
|
6760 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
|
6761 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
|
6762 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
|
6763 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
|
6764 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
|
6765 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
|
6766 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
|
6767 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
|
6768 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
|
6769 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
|
6770 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
|
6771 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
|
6772 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
|
6773 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
|
6774 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
|
6775 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
|
6776 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
|
6777 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
|
6778 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
|
6779 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
|
6780 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
|
6781 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
|
6782 //&& 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
|
6783 && 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
|
6784 { |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6785 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
|
6786 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6787 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
|
6788 } |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
6789 _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
|
6790 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
|
6791 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
|
6792 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
|
6793 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
|
6794 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
|
6795 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
|
6796 // && (&dword_722F10)[4 * a3] ) |
| 1310 | 6797 && pQuestTable[var_value] ) |
| 0 | 6798 { |
|
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
|
6799 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
|
6800 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
|
6801 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
|
6802 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6803 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
|
6804 } |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
6805 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
|
6806 _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
|
6807 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
|
6808 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
|
6809 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
|
6810 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
|
6811 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
|
6812 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
|
6813 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
|
6814 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
|
6815 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
|
6816 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
|
6817 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
|
6818 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
|
6819 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
|
6820 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
|
6821 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
|
6822 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
|
6823 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
|
6824 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
|
6825 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
|
6826 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
|
6827 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
|
6828 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
|
6829 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
|
6830 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
|
6831 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
|
6832 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
|
6833 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
|
6834 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
|
6835 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
|
6836 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
|
6837 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
|
6838 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
|
6839 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
|
6840 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
|
6841 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
|
6842 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
|
6843 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
|
6844 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
|
6845 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
|
6846 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
|
6847 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
|
6848 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
|
6849 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
|
6850 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
|
6851 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
|
6852 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
|
6853 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6854 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
|
6855 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
|
6856 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
|
6857 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6858 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
|
6859 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
|
6860 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
|
6861 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6862 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
|
6863 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
|
6864 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
|
6865 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6866 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
|
6867 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
|
6868 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
|
6869 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6870 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
|
6871 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
|
6872 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
|
6873 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6874 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
|
6875 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
|
6876 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
|
6877 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6878 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
|
6879 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
|
6880 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
|
6881 } |
| 0 | 6882 LABEL_111: |
| 187 | 6883 v26 = SPEECH_91; |
| 0 | 6884 LABEL_112: |
| 492 | 6885 v19 = pPlayers[currPlayerId + 1]; |
|
1260
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6886 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
|
6887 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
6888 PlaySoundBasedOnCondition(currPlayerId); |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6889 return; |
| 0 | 6890 } |
|
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
|
6891 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
|
6892 { |
| 492 | 6893 switch ( var_type ) |
| 0 | 6894 { |
|
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
|
6895 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
|
6896 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
|
6897 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
|
6898 goto LABEL_111; |
| 0 | 6899 case VAR_ActualIntellect: |
| 6900 LABEL_68: | |
| 492 | 6901 this->uIntelligenceBonus = (unsigned __int8)var_value; |
| 0 | 6902 goto LABEL_111; |
| 6903 case VAR_ActualPersonality: | |
| 6904 LABEL_69: | |
| 492 | 6905 this->uWillpowerBonus = (unsigned __int8)var_value; |
| 0 | 6906 goto LABEL_111; |
| 6907 case VAR_ActualEndurance: | |
| 6908 LABEL_70: | |
| 492 | 6909 this->uEnduranceBonus = (unsigned __int8)var_value; |
| 0 | 6910 goto LABEL_111; |
| 6911 case VAR_ActualSpeed: | |
| 6912 LABEL_71: | |
| 492 | 6913 this->uSpeedBonus = (unsigned __int8)var_value; |
| 0 | 6914 goto LABEL_111; |
| 6915 case VAR_ActualAccuracy: | |
| 6916 LABEL_72: | |
| 492 | 6917 this->uAccuracyBonus = (unsigned __int8)var_value; |
| 0 | 6918 goto LABEL_111; |
| 6919 case VAR_ActualLuck: | |
| 6920 LABEL_73: | |
| 492 | 6921 this->uLuckBonus = (unsigned __int8)var_value; |
| 0 | 6922 goto LABEL_111; |
| 6923 case VAR_FireResistance: | |
| 492 | 6924 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
|
6925 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6926 goto LABEL_112; |
| 0 | 6927 case VAR_AirResistance: |
| 492 | 6928 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
|
6929 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6930 goto LABEL_112; |
| 0 | 6931 case VAR_WaterResistance: |
| 492 | 6932 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
|
6933 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6934 goto LABEL_112; |
| 0 | 6935 case VAR_EarthResistance: |
| 492 | 6936 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
|
6937 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6938 goto LABEL_112; |
| 0 | 6939 case VAR_SpiritResistance: |
| 492 | 6940 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
|
6941 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6942 goto LABEL_112; |
| 0 | 6943 case VAR_MindResistance: |
| 492 | 6944 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
|
6945 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6946 goto LABEL_112; |
| 0 | 6947 case VAR_BodyResistance: |
| 492 | 6948 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
|
6949 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6950 goto LABEL_112; |
| 0 | 6951 case VAR_LightResistance: |
| 492 | 6952 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
|
6953 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6954 goto LABEL_112; |
| 0 | 6955 case VAR_DarkResistance: |
| 492 | 6956 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
|
6957 v26 = 92; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
6958 goto LABEL_112; |
| 0 | 6959 case VAR_MagicResistance: |
| 492 | 6960 this->sResMagicBase = (unsigned __int8)var_value; |
| 0 | 6961 v26 = 92; |
| 6962 goto LABEL_112; | |
| 6963 default: | |
| 6964 return; | |
| 6965 } | |
| 6966 return; | |
| 6967 } | |
| 6968 HIWORD(v15) = 0; | |
| 492 | 6969 if ( var_type > VAR_DisarmTrapSkill ) |
| 6970 { | |
| 6971 if ( var_type != VAR_LearningSkill ) | |
| 6972 { | |
| 6973 if ( var_type <= VAR_LearningSkill ) | |
| 0 | 6974 return; |
| 492 | 6975 if ( var_type <= VAR_Eradicated ) |
| 6976 { | |
|
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
|
6977 this->SetCondition(var_type - 105, 1); |
| 0 | 6978 } |
| 6979 else | |
| 6980 { | |
| 492 | 6981 if ( var_type != VAR_MajorCondition ) |
| 0 | 6982 { |
| 492 | 6983 if ( var_type > VAR_MajorCondition && var_type <= VAR_ActiveSpells ) |
| 6984 byte_5E4C15[var_type] = var_value; | |
| 0 | 6985 return; |
| 6986 } | |
|
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
|
6987 memset(this, 0, 0xA0u); |
| 0 | 6988 } |
| 6989 } | |
| 6990 else | |
| 6991 { | |
|
1260
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6992 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
|
6993 v17 = *(char *)v16; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6994 if ( var_value <= VAR_BodyResistanceBonus ) |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6995 { |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6996 LOWORD(v15) = (unsigned __int8)var_value; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6997 v18 = v15 | v17 & VAR_BodyResistanceBonus; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6998 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
6999 else |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
7000 { |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
7001 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
|
7002 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
7003 *(short *)v16 = v18; |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
7004 } |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
7005 LABEL_124: |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
7006 DrawPlayerBuffAnimBasedOnCondition(currPlayerId); |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
7007 PlaySoundBasedOnCondition(currPlayerId); |
|
dd70fc7eaf08
Player::SetVariable cleanup - preparing to remove LABEL_111 and LABEL_112
Grumpy7
parents:
1259
diff
changeset
|
7008 return; |
| 0 | 7009 } |
|
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
|
7010 if ( var_type <= VAR_MagicResistanceBonus ) |
| 492 | 7011 { |
| 7012 switch ( var_type ) | |
| 0 | 7013 { |
|
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
|
7014 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
|
7015 this->sResFireBonus = (unsigned __int8)var_value; |
| 0 | 7016 break; |
| 7017 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
|
7018 this->sResAirBonus = (unsigned __int8)var_value; |
| 0 | 7019 break; |
| 7020 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
|
7021 this->sResWaterBonus = (unsigned __int8)var_value; |
| 0 | 7022 break; |
| 7023 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
|
7024 this->sResEarthBonus = (unsigned __int8)var_value; |
| 0 | 7025 break; |
| 7026 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
|
7027 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
|
7028 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
|
7029 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
|
7030 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
|
7031 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
|
7032 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
|
7033 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
|
7034 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
|
7035 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
|
7036 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
|
7037 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
|
7038 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
|
7039 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
|
7040 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
|
7041 case VAR_PhysicalResistanceBonus: |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
7042 assert("VAR_PhysicalResistanceBonus variable unsupported" && false); |
|
7ef8ae7ce42a
Player::SetVariable cleanup - moved around some cases to group similar types together, some cases reordered according to enum values
Grumpy7
parents:
1213
diff
changeset
|
7043 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
|
7044 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
|
7045 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
|
7046 this->sResMagicBonus = (unsigned __int8)var_value; |
| 0 | 7047 break; |
| 7048 default: | |
|
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
|
7049 assert("Unexpected var_type" && false); |
| 0 | 7050 return; |
| 7051 break; | |
| 7052 } | |
| 7053 goto LABEL_111; | |
| 7054 } | |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
7055 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
|
7056 { |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
7057 return; |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
7058 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
7059 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
7060 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
7061 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
7062 //----- (new function) -------------------------------------------------------- |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
7063 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
|
7064 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
7065 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
|
7066 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
|
7067 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
|
7068 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
7069 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
7070 //----- (new function) -------------------------------------------------------- |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
7071 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
|
7072 { |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
7073 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
|
7074 } |
| 0 | 7075 |
| 7076 //----- (0044AFFB) -------------------------------------------------------- | |
| 310 | 7077 void Player::AddVariable(enum VariableType var_type, signed int val) |
| 0 | 7078 { |
| 7079 char v3; // bl@1 | |
| 7080 Player *v4; // esi@1 | |
| 7081 signed int uPlayerIdx; // edi@1 | |
| 7082 int v6; // eax@15 | |
| 7083 unsigned int v7; // esi@18 | |
| 7084 int *v8; // ebx@21 | |
| 7085 int v9; // eax@22 | |
| 7086 signed int v10; // eax@24 | |
| 7087 int v11; // eax@27 | |
| 7088 __int16 *v12; // esi@28 | |
| 7089 Player *v13; // ecx@34 | |
| 7090 Player *v14; // ecx@36 | |
| 7091 char *v15; // ecx@37 | |
| 7092 unsigned __int8 v16; // cf@38 | |
| 7093 Player *v17; // ecx@42 | |
| 7094 __int16 *v18; // esi@53 | |
| 7095 __int16 *v19; // esi@62 | |
| 7096 char *v20; // esi@107 | |
| 7097 __int16 v21; // dx@107 | |
| 7098 int v22; // ecx@107 | |
| 7099 Player *v23; // ecx@132 | |
| 7100 int v24; // eax@132 | |
| 7101 int v25; // eax@150 | |
| 7102 char v26; // zf@151 | |
| 7103 DDM_DLV_Header *v27; // eax@153 | |
| 7104 signed int v28; // eax@176 | |
| 7105 int v29; // [sp-8h] [bp-40h]@84 | |
| 310 | 7106 // signed int v30; // [sp-4h] [bp-3Ch]@4 |
| 0 | 7107 int v31; // [sp-4h] [bp-3Ch]@84 |
| 7108 ItemGen item; // [sp+Ch] [bp-2Ch]@45 | |
| 7109 unsigned int v33; // [sp+30h] [bp-8h]@34 | |
| 7110 char v34; // [sp+37h] [bp-1h]@1 | |
| 7111 | |
| 7112 auto Dst = this; | |
| 7113 v3 = 0; | |
| 7114 v34 = 0; | |
| 7115 v4 = Dst; | |
| 7116 uPlayerIdx = 0; | |
| 7117 if ( Dst == pPlayers[2] ) | |
| 7118 uPlayerIdx = 1; | |
| 310 | 7119 else if ( Dst == pPlayers[3] ) |
| 7120 uPlayerIdx = 2; | |
| 7121 else if ( Dst == pPlayers[4] ) | |
| 7122 uPlayerIdx = 3; | |
| 7123 | |
| 7124 if ( var_type <= VAR_AutoNotes ) | |
| 7125 { | |
| 7126 if ( var_type != VAR_AutoNotes ) | |
| 7127 { | |
| 7128 if ( var_type <= VAR_ActualMight ) | |
| 7129 { | |
| 7130 if ( var_type != VAR_ActualMight ) | |
| 0 | 7131 { |
| 310 | 7132 switch ( var_type ) |
| 0 | 7133 { |
| 7134 case VAR_RandomGold: | |
| 7135 if ( !val ) | |
| 7136 val = 1; | |
| 7137 v6 = rand(); | |
| 7138 party_finds_gold(v6 % val + 1, 1); | |
| 7139 GameUI_DrawFoodAndGold(); | |
| 7140 return; | |
| 7141 case VAR_RandomFood: | |
| 7142 if ( !val ) | |
| 7143 val = 1; | |
| 7144 v7 = rand() % val + 1; | |
| 7145 Party::GiveFood(v7); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7146 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
|
7147 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 7148 GameUI_DrawFoodAndGold(); |
| 7149 goto _play_sound; | |
| 7150 case VAR_Sex: | |
| 7151 Dst->uSex = (PLAYER_SEX)val; | |
| 1507 | 7152 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 7153 goto _play_sound; | |
| 0 | 7154 case VAR_Class: |
| 135 | 7155 Dst->classType = (PLAYER_CLASS_TYPE)val; |
| 1507 | 7156 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 7157 goto _play_sound; | |
| 0 | 7158 case VAR_CurrentHP: |
| 7159 v8 = &Dst->sHealth; | |
| 7160 *v8 += val; | |
| 7161 if ( Dst->sHealth <= Dst->GetMaxHealth() ) | |
| 1507 | 7162 { |
| 7163 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 7164 goto _play_sound; | |
| 7165 } | |
| 0 | 7166 v9 = v4->GetMaxHealth(); |
| 7167 goto LABEL_23; | |
| 7168 case VAR_MaxHP: | |
| 7169 v10 = Dst->GetMaxHealth(); | |
| 7170 v4->_health_related = 0; | |
| 7171 v4->uFullHealthBonus = 0; | |
| 7172 v4->sHealth = v10; | |
| 7173 return; | |
| 7174 case VAR_CurrentSP: | |
| 7175 v8 = &Dst->sMana; | |
| 7176 *v8 += val; | |
| 7177 if ( Dst->sMana > GetMaxMana() ) | |
| 7178 { | |
| 7179 v9 = v4->GetMaxMana(); | |
| 7180 LABEL_23: | |
| 7181 *v8 = v9; | |
| 7182 } | |
| 1507 | 7183 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 7184 goto _play_sound; | |
| 0 | 7185 case VAR_MaxSP: |
| 7186 v11 = GetMaxMana(); | |
| 7187 v4->_mana_related = 0; | |
| 7188 v4->uFullManaBonus = 0; | |
| 7189 v4->sMana = v11; | |
| 7190 return; | |
| 7191 case VAR_ACModifier: | |
| 7192 v12 = &Dst->sACModifier; | |
| 7193 goto LABEL_29; | |
| 7194 case VAR_BaseLevel: | |
| 7195 v12 = (__int16 *)&Dst->uLevel; | |
| 7196 goto LABEL_29; | |
| 7197 case VAR_LevelModifier: | |
| 7198 v12 = &Dst->sLevelModifier; | |
| 7199 LABEL_29: | |
| 7200 *v12 += val; | |
| 7201 if ( *v12 > 255 ) | |
| 7202 *v12 = 255; | |
| 1507 | 7203 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 7204 goto _play_sound; | |
| 0 | 7205 case VAR_Age: |
| 7206 Dst->sAgeModifier += val; | |
| 7207 return; | |
| 7208 case VAR_Award: | |
| 7209 v13 = pPlayers[uPlayerIdx + 1]; | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
7210 if (_449B57_test_bit((unsigned __int8 *)pPlayers[uPlayerIdx + 1]->_achieved_awards_bits, val) |
| 521 | 7211 |
| 492 | 7212 && pAwards[val].pText ) |
| 0 | 7213 { |
| 7214 v14 = pPlayers[uPlayerIdx + 1]; | |
| 7215 v34 = 1; | |
| 7216 v3 = 1; | |
| 187 | 7217 v14->PlaySound(SPEECH_96, 0); |
| 0 | 7218 } |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
7219 v15 = (char *)v4->_achieved_awards_bits; |
| 1507 | 7220 _449B7E_toggle_bit((unsigned char *)v15, val, 1); |
| 7221 if ( v34 != 1 ) | |
| 7222 { | |
| 7223 if ( v3 != 1 ) | |
| 7224 return; | |
| 7225 goto _play_sound; | |
| 7226 } | |
| 7227 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 7228 if ( v3 != 1 ) | |
| 7229 return; | |
| 7230 goto _play_sound; | |
| 0 | 7231 case VAR_Experience: |
| 7232 v16 = __CFADD__(val, LODWORD(Dst->uExperience)); | |
| 7233 LODWORD(Dst->uExperience) += val; | |
| 7234 HIDWORD(Dst->uExperience) += ((unsigned __int64)val >> 32) + v16; | |
| 7235 if ( (signed __int64)Dst->uExperience > 4000000000i64 ) | |
| 7236 Dst->uExperience = 4000000000i64; | |
| 1507 | 7237 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 7238 goto _play_sound; | |
| 0 | 7239 case VAR_QBits_QuestsDone: |
| 484 | 7240 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
|
7241 //&& (&dword_722F10)[4 * val] ) |
| 1310 | 7242 && pQuestTable[val] ) |
| 0 | 7243 { |
| 501 | 7244 //v17 = pPlayers[uPlayerIdx + 1]; |
| 0 | 7245 bFlashQuestBook = 1; |
| 7246 v34 = 1; | |
| 7247 v3 = 1; | |
| 501 | 7248 pPlayers[uPlayerIdx + 1]->PlaySound(SPEECH_93, 0); |
| 0 | 7249 } |
| 484 | 7250 v15 = (char *)pParty->_quest_bits; |
| 1507 | 7251 _449B7E_toggle_bit((unsigned char *)v15, val, 1); |
| 7252 if ( v34 != 1 ) | |
| 7253 { | |
| 7254 if ( v3 != 1 ) | |
| 7255 return; | |
| 7256 goto _play_sound; | |
| 7257 } | |
| 7258 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 7259 if ( v3 != 1 ) | |
| 7260 return; | |
| 7261 goto _play_sound; | |
| 0 | 7262 case VAR_PlayerItemInHands: |
| 7263 item.Reset(); | |
| 7264 item.Reset(); | |
| 7265 item.uAttributes = 1; | |
| 7266 item.uItemID = val; | |
| 7267 if ( val >= ITEM_ARTIFACT_PUCK && val <= ITEM_RELIC_MEKORIGS_HAMMER ) | |
| 484 | 7268 pParty->pIsArtifactFound[val-500] = 1; |
| 0 | 7269 if ( val >= ITEM_WAND_FIRE && val <= ITEM_WAND_INCENERATION ) |
| 7270 { | |
| 7271 item.uNumCharges = rand() % 6 + pItemsTable->pItems[item.uItemID].uDamageMod + 1; | |
| 7272 item.uMaxCharges = LOBYTE(item.uNumCharges); | |
| 7273 } | |
| 7274 pParty->SetHoldingItem(&item); | |
| 7275 return; | |
| 7276 case VAR_FixedGold: | |
| 7277 party_finds_gold(val, 1); | |
| 7278 return; | |
| 7279 case VAR_BaseMight: | |
| 7280 v18 = (__int16 *)&Dst->uMight; | |
| 7281 goto LABEL_82; | |
| 7282 case VAR_BaseIntellect: | |
| 7283 v18 = (__int16 *)&Dst->uIntelligence; | |
| 7284 goto LABEL_82; | |
| 7285 case VAR_BasePersonality: | |
| 7286 v18 = (__int16 *)&Dst->uWillpower; | |
| 7287 goto LABEL_82; | |
| 7288 case VAR_BaseEndurance: | |
| 7289 v18 = (__int16 *)&Dst->uEndurance; | |
| 7290 goto LABEL_82; | |
| 7291 case VAR_BaseSpeed: | |
| 7292 v18 = (__int16 *)&Dst->uSpeed; | |
| 7293 goto LABEL_82; | |
| 7294 case VAR_BaseAccuracy: | |
| 7295 v18 = (__int16 *)&Dst->uAccuracy; | |
| 7296 goto LABEL_82; | |
| 7297 case VAR_BaseLuck: | |
| 7298 v18 = (__int16 *)&Dst->uLuck; | |
| 7299 goto LABEL_82; | |
| 7300 case VAR_FixedFood: | |
| 7301 Party::GiveFood(val); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7302 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[502], val); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7303 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 7304 if ( pParty->uNumFoodRations > 0xFFFF ) |
| 7305 Party::SetFood(0xFFFFu); | |
| 7306 goto _play_sound; | |
| 7307 case VAR_MightBonus: | |
| 7308 goto LABEL_62; | |
| 7309 case VAR_IntellectBonus: | |
| 7310 goto LABEL_66; | |
| 7311 case VAR_PersonalityBonus: | |
| 7312 goto LABEL_67; | |
| 7313 case VAR_EnduranceBonus: | |
| 7314 goto LABEL_68; | |
| 7315 case VAR_SpeedBonus: | |
| 7316 goto LABEL_69; | |
| 7317 case VAR_AccuracyBonus: | |
| 7318 goto LABEL_70; | |
| 7319 case VAR_LuckBonus: | |
| 7320 goto LABEL_71; | |
| 7321 default: | |
| 7322 return; | |
| 7323 } | |
| 7324 return; | |
| 7325 } | |
| 7326 LABEL_62: | |
| 7327 v19 = (__int16 *)&Dst->uMightBonus; | |
| 7328 goto LABEL_113; | |
| 7329 } | |
| 310 | 7330 if ( var_type <= VAR_FireResistanceBonus ) |
| 7331 { | |
| 7332 if ( var_type != VAR_FireResistanceBonus ) | |
| 0 | 7333 { |
| 310 | 7334 switch ( var_type ) |
| 0 | 7335 { |
| 7336 case VAR_ActualIntellect: | |
| 7337 LABEL_66: | |
| 7338 v19 = (__int16 *)&Dst->uIntelligenceBonus; | |
| 7339 goto LABEL_113; | |
| 7340 case VAR_ActualPersonality: | |
| 7341 LABEL_67: | |
| 7342 v19 = (__int16 *)&Dst->uWillpowerBonus; | |
| 7343 goto LABEL_113; | |
| 7344 case VAR_ActualEndurance: | |
| 7345 LABEL_68: | |
| 7346 v19 = (__int16 *)&Dst->uEnduranceBonus; | |
| 7347 goto LABEL_113; | |
| 7348 case VAR_ActualSpeed: | |
| 7349 LABEL_69: | |
| 7350 v19 = (__int16 *)&Dst->uSpeedBonus; | |
| 7351 goto LABEL_113; | |
| 7352 case VAR_ActualAccuracy: | |
| 7353 LABEL_70: | |
| 7354 v19 = (__int16 *)&Dst->uAccuracyBonus; | |
| 7355 goto LABEL_113; | |
| 7356 case VAR_ActualLuck: | |
| 7357 LABEL_71: | |
| 7358 v19 = (__int16 *)&Dst->uLuckBonus; | |
| 7359 goto LABEL_113; | |
| 7360 case VAR_FireResistance: | |
| 7361 v18 = &Dst->sResFireBase; | |
| 7362 goto LABEL_82; | |
| 7363 case VAR_AirResistance: | |
| 7364 v18 = &Dst->sResAirBase; | |
| 7365 goto LABEL_82; | |
| 7366 case VAR_WaterResistance: | |
| 7367 v18 = &Dst->sResWaterBase; | |
| 7368 goto LABEL_82; | |
| 7369 case VAR_EarthResistance: | |
| 7370 v18 = &Dst->sResEarthBase; | |
| 7371 goto LABEL_82; | |
| 7372 case VAR_SpiritResistance: | |
| 7373 v18 = &Dst->sResSpiritBase; | |
| 7374 goto LABEL_82; | |
| 7375 case VAR_MindResistance: | |
| 7376 v18 = &Dst->sResMindBase; | |
| 7377 goto LABEL_82; | |
| 7378 case VAR_BodyResistance: | |
| 7379 v18 = &Dst->sResBodyBase; | |
| 7380 goto LABEL_82; | |
| 7381 case VAR_LightResistance: | |
| 7382 v18 = &Dst->sResLightBase; | |
| 7383 goto LABEL_82; | |
| 7384 case VAR_DarkResistance: | |
| 7385 v18 = &Dst->sResDarkBase; | |
| 7386 goto LABEL_82; | |
| 7387 case VAR_MagicResistance: | |
| 7388 v18 = &Dst->sResMagicBase; | |
| 7389 LABEL_82: | |
| 7390 *v18 += val; | |
| 7391 if ( *v18 > 255 ) | |
| 7392 *v18 = 255; | |
| 1507 | 7393 pPlayers[uPlayerIdx + 1]->PlaySound(SPEECH_92, 0); |
| 7394 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 7395 goto _play_sound; | |
| 0 | 7396 default: |
| 7397 return; | |
| 7398 } | |
| 7399 return; | |
| 7400 } | |
| 7401 v19 = &Dst->sResFireBonus; | |
| 7402 LABEL_113: | |
| 7403 *v19 += val; | |
| 7404 if ( *v19 > 255 ) | |
| 7405 *v19 = 255; | |
| 7406 v31 = 0; | |
| 187 | 7407 v29 = SPEECH_91; |
| 7408 pPlayers[uPlayerIdx + 1]->PlaySound((PlayerSpeech)v29, v31); | |
| 1507 | 7409 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 7410 goto _play_sound; | |
| 0 | 7411 } |
| 310 | 7412 if ( var_type <= VAR_DisarmTrapSkill ) |
| 7413 { | |
| 7414 if ( var_type != VAR_DisarmTrapSkill ) | |
| 0 | 7415 { |
| 310 | 7416 if ( var_type <= VAR_BodyResistanceBonus ) |
| 0 | 7417 { |
| 310 | 7418 switch ( var_type ) |
| 0 | 7419 { |
| 7420 case VAR_BodyResistanceBonus: | |
| 7421 v19 = &Dst->sResBodyBonus; | |
| 7422 break; | |
| 7423 case VAR_AirResistanceBonus: | |
| 7424 v19 = &Dst->sResAirBonus; | |
| 7425 break; | |
| 7426 case VAR_WaterResistanceBonus: | |
| 7427 v19 = &Dst->sResWaterBonus; | |
| 7428 break; | |
| 7429 case VAR_EarthResistanceBonus: | |
| 7430 v19 = &Dst->sResEarthBonus; | |
| 7431 break; | |
| 7432 case VAR_SpiritResistanceBonus: | |
| 7433 v19 = &Dst->sResSpiritBonus; | |
| 7434 break; | |
| 7435 default: | |
| 310 | 7436 if ( var_type != 62 ) |
| 0 | 7437 return; |
| 7438 v19 = &Dst->sResMindBonus; | |
| 7439 break; | |
| 7440 } | |
| 7441 goto LABEL_113; | |
| 7442 } | |
| 310 | 7443 if ( var_type == VAR_LightResistanceBonus ) |
| 0 | 7444 { |
| 7445 v19 = &Dst->sResLightBonus; | |
| 7446 goto LABEL_113; | |
| 7447 } | |
| 310 | 7448 if ( var_type == VAR_DarkResistanceBonus ) |
| 0 | 7449 { |
| 7450 v19 = &Dst->sResDarkBonus; | |
| 7451 goto LABEL_113; | |
| 7452 } | |
| 310 | 7453 if ( var_type == VAR_MagicResistanceBonus ) |
| 0 | 7454 { |
| 7455 v19 = &Dst->sResMagicBonus; | |
| 7456 goto LABEL_113; | |
| 7457 } | |
| 310 | 7458 if ( var_type <= VAR_MagicResistanceBonus || var_type > VAR_DiplomacySkill ) |
| 0 | 7459 return; |
| 7460 } | |
| 7461 goto LABEL_106; | |
| 7462 } | |
| 310 | 7463 if ( var_type == VAR_LearningSkill ) |
| 0 | 7464 { |
| 7465 LABEL_106: | |
| 7466 if ( val <= VAR_BodyResistanceBonus ) | |
| 7467 { | |
| 310 | 7468 *((short *)&Dst->pConditions[16] + var_type) = (unsigned __int8)val | *((char *)&Dst->pConditions[16] + 2 * var_type) & VAR_BodyResistanceBonus; |
| 0 | 7469 } |
| 7470 else | |
| 7471 { | |
| 310 | 7472 v20 = (char *)&Dst->pConditions[16] + 2 * var_type; |
| 0 | 7473 v21 = *(short *)v20; |
| 7474 v22 = (unsigned __int8)val + (v21 & VAR_BodyResistanceBonus); | |
| 7475 if ( v22 > 60 ) | |
| 7476 LOWORD(v22) = 60; | |
| 7477 LOBYTE(v21) = v21 & 0xC0; | |
| 7478 *(short *)v20 = v22 | v21; | |
| 7479 } | |
| 1507 | 7480 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); |
| 7481 goto _play_sound; | |
| 0 | 7482 } |
| 310 | 7483 if ( var_type <= VAR_LearningSkill ) |
| 0 | 7484 return; |
| 310 | 7485 if ( var_type <= VAR_Eradicated ) |
| 7486 { | |
| 7487 Dst->SetCondition(var_type - 105, 0); | |
| 0 | 7488 } |
| 7489 else | |
| 7490 { | |
| 310 | 7491 if ( var_type != VAR_MajorCondition ) |
| 0 | 7492 { |
| 310 | 7493 if ( var_type > VAR_MajorCondition && var_type <= VAR_ActiveSpells ) |
| 0 | 7494 { |
| 310 | 7495 if ( (unsigned __int8)val + (unsigned __int8)byte_5E4C15[var_type] <= 255 ) |
| 7496 byte_5E4C15[var_type] += val; | |
| 0 | 7497 else |
| 310 | 7498 byte_5E4C15[var_type] = -1; |
| 0 | 7499 } |
| 7500 return; | |
| 7501 } | |
| 7502 memset(Dst, 0, 0xA0u); | |
| 7503 } | |
| 7504 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 7505 goto _play_sound; | |
| 7506 } | |
| 7507 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
|
7508 //&& (&dword_723718_autonote_related)[8 * val] ) |
| 1310 | 7509 && pAutonoteTxt[val].pText ) |
| 0 | 7510 { |
| 7511 v23 = pPlayers[uPlayerIdx + 1]; | |
| 7512 v34 = 1; | |
| 187 | 7513 v23->PlaySound(SPEECH_96, 0); |
| 1453 | 7514 //v24 = pAutonoteTxt[val].eType;//dword_72371C[2 * val]; |
| 0 | 7515 bFlashAutonotesBook = 1; |
| 1453 | 7516 _506568_autonote_type = pAutonoteTxt[val].eType; |
| 7517 } | |
| 7518 _449B7E_toggle_bit(pParty->_autonote_bits, val, 1); | |
| 0 | 7519 v3 = 1; |
| 7520 if ( v34 != 1 ) | |
| 1507 | 7521 { |
| 7522 if ( v3 != 1 ) | |
| 7523 return; | |
| 7524 goto _play_sound; | |
| 7525 } | |
| 7526 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 7527 if ( v3 != 1 ) | |
| 7528 return; | |
| 7529 goto _play_sound; | |
| 0 | 7530 } |
| 310 | 7531 if ( var_type > VAR_GoldInBank ) |
| 7532 { | |
| 7533 if ( var_type == 307 ) | |
| 0 | 7534 { |
| 7535 pParty->uNumDeaths += val; | |
| 1507 | 7536 if ( v34 != 1 ) |
| 7537 { | |
| 7538 if ( v3 != 1 ) | |
| 7539 return; | |
| 7540 goto _play_sound; | |
| 7541 } | |
| 7542 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, uPlayerIdx); | |
| 7543 if ( v3 != 1 ) | |
| 7544 return; | |
| 7545 goto _play_sound; | |
| 0 | 7546 } |
| 310 | 7547 switch ( var_type ) |
| 0 | 7548 { |
| 7549 case 308: | |
| 7550 pParty->uNumBountiesCollected += val; | |
| 7551 break; | |
| 7552 case 309: | |
| 7553 pParty->uNumPrisonTerms += val; | |
| 7554 break; | |
| 7555 case 310: | |
| 7556 pParty->uNumArenaPageWins += val; | |
| 7557 break; | |
| 7558 case 311: | |
| 7559 pParty->uNumArenaSquireWins += val; | |
| 7560 break; | |
| 7561 case 312: | |
| 7562 pParty->uNumArenaKnightWins += val; | |
| 7563 break; | |
| 7564 case 313: | |
| 7565 pParty->uNumArenaLordWins += val; | |
| 7566 break; | |
| 7567 } | |
| 7568 } | |
| 7569 else | |
| 7570 { | |
| 310 | 7571 if ( var_type == VAR_GoldInBank ) |
| 0 | 7572 { |
| 7573 pParty->uNumGoldInBank += val; | |
| 7574 return; | |
| 7575 } | |
| 310 | 7576 if ( var_type <= VAR_Counter8 ) |
| 7577 { | |
| 7578 if ( (signed int)var_type >= 245 ) | |
| 7579 { | |
| 7580 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44300] = LODWORD(pParty->uTimePlayed); | |
| 7581 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44304] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 7582 } |
| 7583 else | |
| 7584 { | |
| 310 | 7585 switch ( var_type ) |
| 0 | 7586 { |
| 7587 case VAR_MonthEquals|VAR_CurrentSP: | |
| 7588 _449B7E_toggle_bit((unsigned char *)Dst->field_1A50, val, 1u); | |
| 7589 break; | |
| 7590 case VAR_NPCs2: | |
| 7591 pParty->field_709 = 0; | |
| 7592 LOBYTE(pNPCStats->pNewNPCData[val].uFlags) |= 0x80u; | |
| 1035 | 7593 pParty->CountHirelings(); |
| 7594 viewparams->bRedrawGameUI = true; | |
| 0 | 7595 break; |
| 7596 case VAR_NumSkillPoints: | |
| 7597 Dst->uSkillPoints += val; | |
| 7598 break; | |
| 7599 } | |
| 7600 } | |
| 7601 return; | |
| 7602 } | |
| 310 | 7603 if ( var_type < VAR_Counter9 ) |
| 0 | 7604 return; |
| 310 | 7605 if ( (signed int)var_type <= 274 ) |
| 7606 { | |
| 7607 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44532] = LODWORD(pParty->uTimePlayed); | |
| 7608 *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44536] = HIDWORD(pParty->uTimePlayed); | |
| 0 | 7609 goto _play_sound; |
| 7610 } | |
| 310 | 7611 if ( var_type != VAR_ReputationInCurrentLocation ) |
| 7612 { | |
| 7613 if ( var_type <= VAR_ReputationInCurrentLocation | |
| 7614 || var_type > VAR_History_28 | |
| 7615 || (v25 = var_type - 276, pParty->field_3C.field_4F0[2 * v25 + 1] | pParty->field_3C.field_4F0[2 * v25]) | |
| 7616 || (pParty->field_3C.field_4F0[2 * (var_type - 276)] = LODWORD(pParty->uTimePlayed), | |
| 233 | 7617 v26 = pStorylineText->StoreLine[v25].pText==0,//*(&pStorylineText->field_0 + 3 * v25) == 0, |
| 310 | 7618 pParty->field_3C.field_4F0[2 * (var_type - 276) + 1] = HIDWORD(pParty->uTimePlayed), |
| 0 | 7619 v26) ) |
| 7620 return; | |
| 7621 bFlashHistoryBook = 1; | |
| 7622 _play_sound: | |
| 7623 v28 = 8 * uPlayerIdx + 400; | |
| 862 | 7624 LOBYTE(v28) = PID(OBJECT_Player,uPlayerIdx - 112); |
| 0 | 7625 pAudioPlayer->PlaySound(SOUND_20001, v28, 0, -1, 0, 0, 0, 0); |
| 7626 return; | |
| 7627 } | |
| 7628 v27 = &pOutdoor->ddm; | |
| 7629 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 7630 v27 = &pIndoor->dlv; | |
| 7631 v27->uReputation += val; | |
| 7632 if ( v27->uReputation > 10000 ) | |
| 7633 v27->uReputation = 10000; | |
| 7634 } | |
| 7635 } | |
| 7636 | |
| 7637 | |
| 7638 //----- (0044B9C4) -------------------------------------------------------- | |
| 501 | 7639 bool Player::SubtractVariable(enum VariableType VarNum, signed int pValue) |
| 0 | 7640 { |
| 7641 unsigned int v3; // ebx@1 | |
| 7642 signed int v4; // esi@1 | |
| 501 | 7643 bool result; // eax@8 |
| 0 | 7644 int v6; // esi@11 |
| 7645 int v7; // edi@14 | |
| 7646 signed int v8; // eax@17 | |
| 7647 char *v9; // eax@20 | |
| 7648 char v10; // sf@20 | |
| 7649 char *v11; // ecx@26 | |
| 7650 char *v12; // ecx@27 | |
| 7651 __int64 v13; // qax@27 | |
| 7652 unsigned __int8 v14; // cf@27 | |
| 501 | 7653 int *v15; // edx@29 |
| 0 | 7654 char *v16; // eax@90 |
| 7655 char *v17; // ecx@94 | |
| 501 | 7656 int v18; // esi@97 |
| 0 | 7657 signed int v19; // edx@97 |
| 7658 char *v20; // ecx@98 | |
| 7659 int v21; // eax@100 | |
| 7660 __int16 v22; // dx@112 | |
| 7661 int v23; // [sp-8h] [bp-14h]@45 | |
| 7662 signed int v24; // [sp-4h] [bp-10h]@4 | |
| 7663 int v25; // [sp-4h] [bp-10h]@45 | |
| 7664 | |
| 7665 v3 = 0; | |
| 605 | 7666 v4 = uActiveCharacter - 1; |
| 501 | 7667 result = false; |
| 7668 if ( (signed int)VarNum > 222 ) | |
| 7669 { | |
| 7670 if ( (signed int)VarNum <= 307 ) | |
| 7671 { | |
| 7672 if ( VarNum == 307 ) | |
| 7673 { | |
| 7674 pParty->uNumDeaths -= (unsigned int)pValue; | |
| 7675 return pValue; | |
| 7676 } | |
| 7677 if ( VarNum == 223 ) | |
| 0 | 7678 { |
| 7679 v11 = (char *)pParty->_autonote_bits; | |
| 501 | 7680 v22 = (short)pValue - 1; |
| 0 | 7681 } |
| 7682 else | |
| 7683 { | |
| 501 | 7684 if ( VarNum != 231 ) |
| 0 | 7685 { |
| 501 | 7686 switch ( VarNum ) |
| 0 | 7687 { |
| 7688 case 232: | |
| 501 | 7689 VarNum = (VariableType)0; |
| 1094 | 7690 GetNewNPCData(sDialogue_SpeakingActorNPC_ID, (int*)&VarNum); |
| 501 | 7691 result = (bool) pValue; |
| 7692 dword_5B65CC = 0; | |
| 7693 if ( (int)VarNum == pValue ) | |
| 0 | 7694 { |
| 501 | 7695 dword_5B65CC = (int)pValue; |
| 0 | 7696 } |
| 7697 else | |
| 7698 { | |
| 7699 pParty->field_709 = 0; | |
| 501 | 7700 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
| 1035 | 7701 pParty->CountHirelings(); |
| 7702 viewparams->bRedrawGameUI = true; | |
| 0 | 7703 } |
| 7704 break; | |
| 7705 case 241: | |
| 7706 if ( (signed int)pNPCStats->uNumNewNPCs > 0 ) | |
| 7707 { | |
| 7708 v20 = (char *)&pNPCStats->pNewNPCData[0].uFlags; | |
| 605 | 7709 for ( v19 = 0; v19 < (signed int)pNPCStats->uNumNewNPCs; ++v19 ) |
| 0 | 7710 { |
| 605 | 7711 if ( *((void **)v20 + 4) == (void *)pValue ) |
| 0 | 7712 { |
| 7713 v21 = *(int *)v20; | |
| 7714 if ( (char)*(int *)v20 < 0 ) | |
| 7715 { | |
| 7716 LOBYTE(v21) = v21 & 0x7F; | |
| 7717 *(int *)v20 = v21; | |
| 7718 } | |
| 7719 } | |
| 7720 v20 += 76; | |
| 7721 } | |
| 7722 } | |
| 605 | 7723 if ( pParty->pHirelings[0].uProfession == pValue ) |
| 0 | 7724 memset(pParty->pHirelings, 0, 0x4Cu); |
| 605 | 7725 if ( pParty->pHirelings[1].uProfession == pValue ) |
| 0 | 7726 memset(&pParty->pHirelings[1], 0, 0x4Cu); |
| 7727 pParty->field_709 = 0; | |
| 1035 | 7728 pParty->CountHirelings(); |
| 0 | 7729 break; |
| 7730 case 243: | |
| 7731 v17 = (char *)&this->uSkillPoints; | |
|
1113
39eaa6b00141
something to bool cast (performance warning) mostly fixed
Grumpy7
parents:
1097
diff
changeset
|
7732 result = *v17 != NULL; |
| 501 | 7733 if ( (unsigned int)pValue <= *(int *)v17 ) |
| 7734 { | |
| 7735 *(int *)v17 -= (int)pValue; | |
|
1113
39eaa6b00141
something to bool cast (performance warning) mostly fixed
Grumpy7
parents:
1097
diff
changeset
|
7736 result = (v17 != NULL); |
| 501 | 7737 } |
| 0 | 7738 else |
| 7739 *(int *)v17 = 0; | |
| 7740 break; | |
| 7741 case 275: | |
| 7742 v16 = (char *)&pOutdoor->ddm; | |
| 7743 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 7744 v16 = (char *)&pIndoor->dlv; | |
| 501 | 7745 *((int *)v16 + 2) -= (int)pValue; |
| 0 | 7746 if ( *((int *)v16 + 2) < -10000 ) |
| 7747 *((int *)v16 + 2) = -10000; | |
| 7748 break; | |
| 7749 case 306: | |
| 501 | 7750 result = VarNum - 306; |
| 7751 if ( (unsigned int)pValue <= pParty->uNumGoldInBank ) | |
| 7752 { | |
| 7753 result = (bool)pValue; | |
| 7754 pParty->uNumGoldInBank -= (unsigned int)pValue; | |
| 605 | 7755 } |
| 0 | 7756 else |
| 7757 LABEL_88: | |
| 7758 dword_5B65C4 = 1; | |
| 7759 break; | |
| 7760 } | |
| 501 | 7761 return result; |
| 0 | 7762 } |
| 7763 v11 = this->field_1A50; | |
| 501 | 7764 v22 = (signed __int16)pValue; |
| 0 | 7765 } |
| 7766 _449B7E_toggle_bit((unsigned char *)v11, v22, 0); | |
| 501 | 7767 return result; |
| 7768 } | |
| 7769 switch ( VarNum ) | |
| 0 | 7770 { |
| 7771 case 308: | |
| 501 | 7772 result = (bool)pValue; |
| 7773 pParty->uNumBountiesCollected -= (unsigned int)pValue; | |
| 0 | 7774 break; |
| 7775 case 309: | |
| 501 | 7776 result = (bool)pValue; |
| 7777 pParty->uNumPrisonTerms -= (int)pValue; | |
| 0 | 7778 break; |
| 7779 case 310: | |
| 501 | 7780 result = (bool)pValue; |
| 7781 pParty->uNumArenaPageWins -= (char)pValue; | |
| 0 | 7782 break; |
| 7783 case 311: | |
| 501 | 7784 result = (bool)pValue; |
| 7785 pParty->uNumArenaSquireWins -= (char)pValue; | |
| 0 | 7786 break; |
| 7787 case 312: | |
| 501 | 7788 result = (bool)pValue; |
| 7789 pParty->uNumArenaKnightWins -= (char)pValue; | |
| 0 | 7790 break; |
| 7791 case 313: | |
| 501 | 7792 result = (bool)pValue; |
| 7793 pParty->uNumArenaLordWins -= (char)pValue; | |
| 0 | 7794 break; |
| 7795 } | |
|
1113
39eaa6b00141
something to bool cast (performance warning) mostly fixed
Grumpy7
parents:
1097
diff
changeset
|
7796 assert(false && "Function not returning any value!"); |
| 0 | 7797 } |
| 7798 else | |
| 7799 { | |
| 501 | 7800 if ( (signed int)VarNum >= 123 ) |
| 7801 { | |
| 7802 byte_5E4C15[VarNum] -= (char)pValue; | |
| 0 | 7803 } |
| 7804 else | |
| 7805 { | |
| 501 | 7806 switch ( VarNum ) |
| 0 | 7807 { |
| 7808 case VAR_RandomGold: | |
| 501 | 7809 v6 = rand() % (signed int)pValue + 1; |
| 0 | 7810 if ( v6 > pParty->uNumGold ) |
| 7811 v6 = pParty->uNumGold; | |
| 7812 Party::TakeGold(v6); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7813 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[503], v6); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7814 ShowStatusBarString(pTmpBuf.data(), 2); |
| 0 | 7815 GameUI_DrawFoodAndGold(); |
| 501 | 7816 return result; |
| 0 | 7817 case VAR_RandomFood: |
| 501 | 7818 v7 = rand() % (signed int)pValue + 1; |
| 0 | 7819 if ( v7 > pParty->uNumFoodRations ) |
| 7820 v7 = pParty->uNumFoodRations; | |
| 7821 Party::TakeFood(v7); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7822 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[504], v7); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
7823 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 0 | 7824 GameUI_DrawFoodAndGold(); |
| 605 | 7825 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7826 v8 = 8 * v4 + 400; | |
| 862 | 7827 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7828 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 501 | 7829 return result; |
| 0 | 7830 case VAR_CurrentHP: |
| 1036 | 7831 ReceiveDamage((signed int)pValue, DMGT_PHISYCAL); |
| 605 | 7832 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7833 v8 = 8 * v4 + 400; | |
| 862 | 7834 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7835 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7836 return result; | |
| 0 | 7837 case VAR_CurrentSP: |
| 7838 v9 = (char *)&this->sMana; | |
| 501 | 7839 v10 = this->sMana - (signed int)pValue < 0; |
| 7840 *(int *)v9 -= (int)pValue; | |
| 0 | 7841 if ( v10 ) |
| 7842 *(int *)v9 = 0; | |
| 605 | 7843 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7844 v8 = 8 * v4 + 400; | |
| 862 | 7845 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7846 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7847 return result; | |
| 0 | 7848 case VAR_ACModifier: |
| 501 | 7849 this->sACModifier -= (unsigned __int8)pValue; |
| 605 | 7850 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7851 v8 = 8 * v4 + 400; | |
| 862 | 7852 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7853 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7854 return result; | |
| 0 | 7855 case VAR_BaseLevel: |
| 501 | 7856 this->uLevel -= (unsigned __int8)pValue; |
| 605 | 7857 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7858 v8 = 8 * v4 + 400; | |
| 862 | 7859 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7860 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7861 return result; | |
| 0 | 7862 case VAR_LevelModifier: |
| 501 | 7863 this->sLevelModifier -= (unsigned __int8)pValue; |
| 605 | 7864 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7865 v8 = 8 * v4 + 400; | |
| 862 | 7866 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7867 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7868 return result; | |
| 0 | 7869 case VAR_Age: |
| 501 | 7870 this->sAgeModifier -= (signed __int16)pValue; |
| 7871 return result; | |
| 0 | 7872 case VAR_Award: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
7873 _449B7E_toggle_bit((unsigned char *)this->_achieved_awards_bits, (signed __int16)pValue, 0); |
| 605 | 7874 return result; |
| 0 | 7875 case VAR_Experience: |
| 7876 v12 = (char *)&this->uExperience; | |
| 501 | 7877 v13 = (signed int)pValue; |
| 7878 v14 = *(int *)v12 < (unsigned int)pValue; | |
| 7879 *(int *)v12 -= (int)pValue; | |
| 0 | 7880 *((int *)v12 + 1) -= v14 + HIDWORD(v13); |
| 605 | 7881 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 7882 v8 = 8 * v4 + 400; | |
| 862 | 7883 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7884 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7885 return result; | |
| 0 | 7886 case VAR_QBits_QuestsDone: |
| 501 | 7887 _449B7E_toggle_bit(pParty->_quest_bits, (__int16)pValue, 0); |
| 187 | 7888 pPlayers[v4 + 1]->PlaySound(SPEECH_96, 0); |
| 501 | 7889 return true; |
| 0 | 7890 case VAR_PlayerItemInHands: |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7891 v15 = this->pInventoryMatrix; |
| 0 | 7892 break; |
| 7893 case VAR_FixedGold: | |
| 501 | 7894 if ( (unsigned int)pValue > pParty->uNumGold ) |
| 0 | 7895 goto LABEL_88; |
| 501 | 7896 Party::TakeGold((unsigned int)pValue); |
| 7897 return result; | |
| 0 | 7898 case VAR_MightBonus: |
| 7899 case VAR_ActualMight: | |
| 501 | 7900 this->uMightBonus -= (unsigned __int16)pValue; |
| 605 | 7901 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7902 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7903 v8 = 8 * v4 + 400; | |
| 862 | 7904 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7905 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7906 return result; | |
| 0 | 7907 case VAR_IntellectBonus: |
| 7908 case VAR_ActualIntellect: | |
| 501 | 7909 this->uIntelligenceBonus -= (unsigned __int16)pValue; |
| 605 | 7910 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7911 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7912 v8 = 8 * v4 + 400; | |
| 862 | 7913 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7914 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7915 return result; | |
| 0 | 7916 case VAR_PersonalityBonus: |
| 7917 case VAR_ActualPersonality: | |
| 501 | 7918 this->uWillpowerBonus -= (unsigned __int16)pValue; |
| 605 | 7919 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7920 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7921 v8 = 8 * v4 + 400; | |
| 862 | 7922 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7923 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7924 return result; | |
| 0 | 7925 case VAR_EnduranceBonus: |
| 7926 case VAR_ActualEndurance: | |
| 501 | 7927 this->uEnduranceBonus -= (unsigned __int16)pValue; |
| 605 | 7928 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7929 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7930 v8 = 8 * v4 + 400; | |
| 862 | 7931 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7932 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7933 return result; | |
| 0 | 7934 case VAR_SpeedBonus: |
| 7935 case VAR_ActualSpeed: | |
| 501 | 7936 this->uSpeedBonus -= (unsigned __int16)pValue; |
| 605 | 7937 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7938 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7939 v8 = 8 * v4 + 400; | |
| 862 | 7940 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7941 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7942 return result; | |
| 0 | 7943 case VAR_AccuracyBonus: |
| 7944 case VAR_ActualAccuracy: | |
| 501 | 7945 this->uAccuracyBonus -= (unsigned __int16)pValue; |
| 605 | 7946 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7947 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7948 v8 = 8 * v4 + 400; | |
| 862 | 7949 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7950 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7951 return result; | |
| 0 | 7952 case VAR_LuckBonus: |
| 7953 case VAR_ActualLuck: | |
| 501 | 7954 this->uLuckBonus -= (unsigned __int16)pValue; |
| 605 | 7955 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 7956 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7957 v8 = 8 * v4 + 400; | |
| 862 | 7958 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7959 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7960 return result; | |
| 0 | 7961 case VAR_BaseMight: |
| 501 | 7962 this->uMight -= (unsigned __int16)pValue; |
| 605 | 7963 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7964 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7965 v8 = 8 * v4 + 400; | |
| 862 | 7966 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7967 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7968 return result; | |
| 0 | 7969 case VAR_BaseIntellect: |
| 501 | 7970 this->uIntelligence -= (unsigned __int16)pValue; |
| 605 | 7971 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7972 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7973 v8 = 8 * v4 + 400; | |
| 862 | 7974 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7975 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7976 return result; | |
| 0 | 7977 case VAR_BasePersonality: |
| 501 | 7978 this->uWillpower -= (unsigned __int16)pValue; |
| 605 | 7979 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7980 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7981 v8 = 8 * v4 + 400; | |
| 862 | 7982 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7983 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7984 return result; | |
| 0 | 7985 case VAR_BaseEndurance: |
| 501 | 7986 this->uEndurance -= (unsigned __int16)pValue; |
| 605 | 7987 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7988 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7989 v8 = 8 * v4 + 400; | |
| 862 | 7990 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7991 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 7992 return result; | |
| 0 | 7993 case VAR_BaseSpeed: |
| 501 | 7994 this->uSpeed -= (unsigned __int16)pValue; |
| 605 | 7995 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 7996 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 7997 v8 = 8 * v4 + 400; | |
| 862 | 7998 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 7999 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8000 return result; | |
| 0 | 8001 case VAR_BaseAccuracy: |
| 501 | 8002 this->uAccuracy -= (unsigned __int16)pValue; |
| 605 | 8003 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8004 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8005 v8 = 8 * v4 + 400; | |
| 862 | 8006 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8007 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8008 return result; | |
| 0 | 8009 case VAR_BaseLuck: |
| 501 | 8010 this->uLuck -= (unsigned __int16)pValue; |
| 605 | 8011 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8012 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8013 v8 = 8 * v4 + 400; | |
| 862 | 8014 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8015 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8016 return result; | |
| 0 | 8017 case VAR_FireResistance: |
| 501 | 8018 this->sResFireBase -= (signed __int16)pValue; |
| 605 | 8019 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8020 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8021 v8 = 8 * v4 + 400; | |
| 862 | 8022 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8023 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8024 return result; | |
| 0 | 8025 case VAR_AirResistance: |
| 501 | 8026 this->sResAirBase -= (signed __int16)pValue; |
| 605 | 8027 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8028 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8029 v8 = 8 * v4 + 400; | |
| 862 | 8030 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8031 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8032 return result; | |
| 0 | 8033 case VAR_WaterResistance: |
| 501 | 8034 this->sResWaterBase -= (signed __int16)pValue; |
| 605 | 8035 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8036 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8037 v8 = 8 * v4 + 400; | |
| 862 | 8038 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8039 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8040 return result; | |
| 0 | 8041 case VAR_EarthResistance: |
| 501 | 8042 this->sResEarthBase -= (signed __int16)pValue; |
| 605 | 8043 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8044 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8045 v8 = 8 * v4 + 400; | |
| 862 | 8046 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8047 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8048 return result; | |
| 0 | 8049 case VAR_SpiritResistance: |
| 501 | 8050 this->sResSpiritBase -= (signed __int16)pValue; |
| 605 | 8051 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8052 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8053 v8 = 8 * v4 + 400; | |
| 862 | 8054 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8055 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8056 return result; | |
| 0 | 8057 case VAR_MindResistance: |
| 501 | 8058 this->sResMindBase -= (signed __int16)pValue; |
| 605 | 8059 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8060 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8061 v8 = 8 * v4 + 400; | |
| 862 | 8062 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8063 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8064 return result; | |
| 0 | 8065 case VAR_BodyResistance: |
| 501 | 8066 this->sResBodyBase -= (signed __int16)pValue; |
| 605 | 8067 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8068 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8069 v8 = 8 * v4 + 400; | |
| 862 | 8070 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8071 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8072 return result; | |
| 0 | 8073 case VAR_LightResistance: |
| 501 | 8074 this->sResLightBase -= (signed __int16)pValue; |
| 605 | 8075 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8076 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8077 v8 = 8 * v4 + 400; | |
| 862 | 8078 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8079 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8080 return result; | |
| 0 | 8081 case VAR_DarkResistance: |
| 501 | 8082 this->sResDarkBase -= (signed __int16)pValue; |
| 605 | 8083 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8084 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8085 v8 = 8 * v4 + 400; | |
| 862 | 8086 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8087 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8088 return result; | |
| 0 | 8089 case VAR_MagicResistance: |
| 501 | 8090 this->sResMagicBase -= (signed __int16)pValue; |
| 605 | 8091 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8092 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8093 v8 = 8 * v4 + 400; | |
| 862 | 8094 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8095 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8096 return result; | |
| 0 | 8097 case VAR_FireResistanceBonus: |
| 501 | 8098 this->sResFireBonus -= (signed __int16)pValue; |
| 605 | 8099 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8100 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8101 v8 = 8 * v4 + 400; | |
| 862 | 8102 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8103 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8104 return result; | |
| 0 | 8105 case VAR_AirResistanceBonus: |
| 501 | 8106 this->sResAirBonus -= (signed __int16)pValue; |
| 605 | 8107 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)92, 0); |
| 8108 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8109 v8 = 8 * v4 + 400; | |
| 862 | 8110 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8111 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8112 return result; | |
| 0 | 8113 case VAR_WaterResistanceBonus: |
| 501 | 8114 this->sResWaterBonus -= (signed __int16)pValue; |
| 605 | 8115 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 8116 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8117 v8 = 8 * v4 + 400; | |
| 862 | 8118 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8119 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8120 return result; | |
| 0 | 8121 case VAR_EarthResistanceBonus: |
| 501 | 8122 this->sResEarthBonus -= (signed __int16)pValue; |
| 605 | 8123 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 8124 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8125 v8 = 8 * v4 + 400; | |
| 862 | 8126 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8127 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8128 return result; | |
| 0 | 8129 case VAR_SpiritResistanceBonus: |
| 501 | 8130 this->sResSpiritBonus -= (signed __int16)pValue; |
| 605 | 8131 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 8132 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8133 v8 = 8 * v4 + 400; | |
| 862 | 8134 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8135 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8136 return result; | |
| 0 | 8137 case VAR_MindResistanceBonus: |
| 501 | 8138 this->sResMindBonus -= (signed __int16)pValue; |
| 605 | 8139 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 8140 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8141 v8 = 8 * v4 + 400; | |
| 862 | 8142 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8143 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8144 return result; | |
| 0 | 8145 case VAR_BodyResistanceBonus: |
| 501 | 8146 this->sResBodyBonus -= (signed __int16)pValue; |
| 605 | 8147 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 8148 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8149 v8 = 8 * v4 + 400; | |
| 862 | 8150 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8151 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8152 return result; | |
| 0 | 8153 case VAR_LightResistanceBonus: |
| 501 | 8154 this->sResLightBonus -= (signed __int16)pValue; |
| 605 | 8155 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 8156 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8157 v8 = 8 * v4 + 400; | |
| 862 | 8158 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8159 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8160 return result; | |
| 0 | 8161 case VAR_DarkResistanceBonus: |
| 501 | 8162 this->sResDarkBonus -= (signed __int16)pValue; |
| 605 | 8163 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)SPEECH_91, 0); |
| 8164 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); | |
| 8165 v8 = 8 * v4 + 400; | |
| 862 | 8166 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8167 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8168 return result; | |
| 0 | 8169 case VAR_MagicResistanceBonus: |
| 501 | 8170 this->sResMagicBonus -= (signed __int16)pValue; |
| 0 | 8171 v25 = 0; |
| 187 | 8172 v23 = SPEECH_91; |
| 8173 pPlayers[v4 + 1]->PlaySound((PlayerSpeech)v23, v25); | |
| 605 | 8174 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 8175 v8 = 8 * v4 + 400; | |
| 862 | 8176 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8177 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8178 return result; | |
| 0 | 8179 case VAR_FixedFood: |
| 501 | 8180 Party::TakeFood((unsigned int)pValue); |
| 605 | 8181 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 8182 v8 = 8 * v4 + 400; | |
| 862 | 8183 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8184 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8185 return result; | |
| 0 | 8186 case VAR_StaffSkill: |
| 8187 case VAR_SwordSkill: | |
| 8188 case VAR_DaggerSkill: | |
| 8189 case VAR_AxeSkill: | |
| 8190 case VAR_SpearSkill: | |
| 8191 case VAR_BowSkill: | |
| 8192 case VAR_MaceSkill: | |
| 8193 case VAR_BlasterSkill: | |
| 8194 case VAR_ShieldSkill: | |
| 8195 case VAR_LeatherSkill: | |
| 8196 case VAR_SkillChain: | |
| 8197 case VAR_PlateSkill: | |
| 8198 case VAR_FireSkill: | |
| 8199 case VAR_AirSkill: | |
| 8200 case VAR_WaterSkill: | |
| 8201 case VAR_EarthSkill: | |
| 8202 case VAR_SpiritSkill: | |
| 8203 case VAR_MindSkill: | |
| 8204 case VAR_BodySkill: | |
| 8205 case VAR_LightSkill: | |
| 8206 case VAR_DarkSkill: | |
| 8207 case VAR_IdentifyItemSkill: | |
| 8208 case VAR_MerchantSkill: | |
| 8209 case VAR_RepairSkill: | |
| 8210 case VAR_BodybuildingSkill: | |
| 8211 case VAR_MeditationSkill: | |
| 8212 case VAR_PerceptionSkill: | |
| 8213 case VAR_DiplomacySkill: | |
| 8214 case VAR_DisarmTrapSkill: | |
| 8215 case VAR_LearningSkill: | |
| 501 | 8216 *((short *)&this->pConditions[16] + VarNum) -= (unsigned __int8)pValue; |
| 605 | 8217 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 8218 v8 = 8 * v4 + 400; | |
| 862 | 8219 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 605 | 8220 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 8221 return result; | |
| 0 | 8222 case VAR_Cursed: |
| 8223 case VAR_Weak: | |
| 8224 case VAR_Asleep: | |
| 8225 case VAR_Afraid: | |
| 8226 case VAR_Drunk: | |
| 8227 case VAR_Insane: | |
| 8228 case VAR_PoisonedGreen: | |
| 8229 case VAR_DiseasedGreen: | |
| 8230 case VAR_PoisonedYellow: | |
| 8231 case VAR_DiseasedYellow: | |
| 8232 case VAR_PoisonedRed: | |
| 8233 case VAR_DiseasedRed: | |
| 8234 case VAR_Paralyzed: | |
| 8235 case VAR_Unconsious: | |
| 8236 case VAR_Dead: | |
| 8237 case VAR_Stoned: | |
| 8238 case VAR_Eradicated: | |
| 1071 | 8239 //*((int *)this + 2 * VarNum - 210) = 0; |
| 8240 //*((int *)this + 2 * result - 209) = 0; | |
| 8241 this->pConditions[VarNum] = 0; | |
| 0 | 8242 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, v4); |
| 8243 v8 = 8 * v4 + 400; | |
| 862 | 8244 LOBYTE(v8) = PID(OBJECT_Player,v4 - 112); |
| 0 | 8245 pAudioPlayer->PlaySound(SOUND_20001, v8, 0, -1, 0, 0, 0, 0); |
| 501 | 8246 return result; |
| 605 | 8247 default: |
| 8248 return result; | |
| 8249 } | |
| 8250 for (v3 = 1; v3 < 126; v3++) | |
| 8251 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8252 if ( *(&this->pInventoryItemList[pInventoryMatrix[v3] - 1].uItemID) == pValue ) |
| 0 | 8253 { |
| 605 | 8254 RemoveItemAtInventoryIndex(v3); |
| 501 | 8255 return true; |
| 0 | 8256 } |
| 605 | 8257 } |
| 501 | 8258 if ( pParty->pPickedItem.uItemID == pValue ) |
| 8259 { | |
| 605 | 8260 pMouse->RemoveHoldingItem(); |
| 8261 return true; | |
| 8262 } | |
| 8263 return false; | |
| 0 | 8264 } |
| 8265 } | |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
8266 |
| 1430 | 8267 //assert(false); |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
8268 return false; |
| 0 | 8269 } |
| 8270 // 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
|
8271 // 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
|
8272 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8273 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8274 //----- (00467E7F) -------------------------------------------------------- |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8275 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
|
8276 { |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8277 //unsigned int v1; // esi@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8278 int v2; // ebx@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8279 Player *v3; // eax@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8280 int v4; // edx@1 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8281 int v5; // esi@2 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8282 //int v6; // eax@2 |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
8283 int v7; // eax@3 |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8284 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
|
8285 //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
|
8286 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
|
8287 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
|
8288 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8289 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8290 _this.Reset(); |
| 1374 | 8291 v2 = pEquipTypeToBodyAnchor[uEquipType]; |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8292 v3 = pPlayers[uActiveCharacter]; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8293 v11 = (int *)&v3->pEquipment.pIndices[v2]; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8294 v4 = *v11; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8295 v10 = *v11; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8296 if ( v10 ) |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8297 { |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8298 memcpy(&_this, &pParty->pPickedItem, sizeof(_this)); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8299 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
|
8300 *(char *)(v5 + 556) = 0; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8301 pParty->pPickedItem.Reset(); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8302 pParty->SetHoldingItem((ItemGen *)(v5 + 532)); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8303 _this.uBodyAnchor = v2 + 1; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8304 memcpy((void *)(v5 + 532), &_this, 0x24u); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8305 *v11 = v10; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8306 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8307 else |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8308 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8309 v7 = v3->FindFreeInventoryListSlot(); |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8310 if (v7 >= 0) |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8311 { |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8312 pParty->pPickedItem.uBodyAnchor = v2 + 1; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8313 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
|
8314 *v11 = v7 + 1; |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8315 pMouse->RemoveHoldingItem(); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8316 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
8317 } |
| 1295 | 8318 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8319 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
8320 |
| 1295 | 8321 //----- (0049387A) -------------------------------------------------------- |
| 1459 | 8322 int CycleCharacter(bool backwards) |
| 1295 | 8323 { |
| 8324 signed int result; // eax@1 | |
| 8325 signed int v2; // ecx@2 | |
| 8326 signed int v3; // ecx@8 | |
| 8327 | |
| 8328 result = uActiveCharacter; | |
| 1459 | 8329 if ( backwards ) |
| 1295 | 8330 { |
| 8331 v2 = 0; | |
| 8332 while ( 1 ) | |
| 8333 { | |
| 8334 --result; | |
| 8335 if ( result < 1 ) | |
| 8336 result = 4; | |
| 8337 if ( !pPlayers[result]->uTimeToRecovery ) | |
| 8338 break; | |
| 8339 ++v2; | |
| 8340 if ( v2 >= 4 ) | |
| 8341 return uActiveCharacter; | |
| 8342 } | |
| 8343 } | |
| 8344 else | |
| 8345 { | |
| 8346 v3 = 0; | |
| 8347 while ( 1 ) | |
| 8348 { | |
| 8349 ++result; | |
| 8350 if ( result > 4 ) | |
| 8351 result = 1; | |
| 8352 if ( !pPlayers[result]->uTimeToRecovery ) | |
| 8353 break; | |
| 8354 ++v3; | |
| 8355 if ( v3 >= 4 ) | |
| 8356 return uActiveCharacter; | |
| 8357 } | |
| 8358 } | |
| 8359 return result; | |
| 1297 | 8360 } |
| 8361 //----- (0043EE77) -------------------------------------------------------- | |
| 8362 bool __fastcall sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(signed int a1) | |
| 8363 { | |
| 8364 bool result; // eax@0 | |
| 8365 Player *v2; // edx@3 | |
| 8366 int v3; // ecx@3 | |
| 8367 Player **pPlayers; // esi@8 | |
| 1424 | 8368 //bool item_flag; |
| 1297 | 8369 Player *v6; // edx@9 |
| 8370 | |
| 1424 | 8371 //if ( a1 < 1 || a1 > 4 ) |
| 8372 //{ | |
| 8373 //if ( !a1 ) | |
| 8374 //{ | |
| 8375 //pPlayers = &::pPlayers[1]; | |
| 8376 //v5 = 604; | |
| 8377 //while ( 1 ) | |
| 8378 assert ( a1 > 0 && a1 < 5 ); | |
| 1432 | 8379 for ( uint i = 1; i < 5; ++i ) |
| 1424 | 8380 { |
| 8381 //item_flag = Player_has_item(604, *pPlayers, 0); | |
| 8382 if ( !Player_has_item(604, ::pPlayers[i], 0) ) | |
| 8383 return false; | |
| 8384 //__debugbreak(); // player.cpp(8748): warning C4700: uninitialized local variable 'v6' used | |
| 8385 //result = ::pPlayers[i]->pEquipment.uArmor; | |
| 8386 if ( !::pPlayers[i]->pEquipment.uArmor ) | |
| 8387 return false; | |
| 8388 //result *= 9; | |
| 1432 | 8389 if (::pPlayers[i]->pEquippedItems[::pPlayers[i]->pEquipment.uArmor].uItemID != 604 ) |
| 1424 | 8390 return false; |
| 8391 //++pPlayers; | |
| 8392 //if ( (signed int)pPlayers >= (signed int)&qword_A750D8 ) | |
| 8393 //return true; | |
| 8394 } | |
| 8395 return true; | |
| 8396 } | |
| 1432 | 8397 |
| 1297 | 8398 //----- (0043EE15) -------------------------------------------------------- |
| 8399 bool __fastcall Player_has_item(unsigned int uItemID, Player *pPlayer, char a3) | |
| 8400 { | |
| 8401 if ( !a3 || pParty->pPickedItem.uItemID != uItemID ) | |
| 8402 { | |
| 8403 for ( uint i = 0; i < 126; ++i ) | |
| 8404 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8405 if ( pPlayer->pInventoryMatrix[i] > 0 ) |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8406 { |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8407 if ( (unsigned int)pPlayer->pInventoryItemList[pPlayer->pInventoryMatrix[i] - 1].uItemID == uItemID ) |
| 1297 | 8408 return true; |
| 8409 } | |
| 8410 } | |
| 8411 for ( uint i = 0; i < 16; ++i ) | |
| 8412 { | |
| 8413 if ( pPlayer->pEquipment.pIndices[i] ) | |
| 8414 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8415 if ( (unsigned int)pPlayer->pInventoryItemList[pPlayer->pEquipment.pIndices[i] - 1].uItemID == uItemID ) |
| 1297 | 8416 return true; |
| 8417 } | |
| 8418 } | |
| 8419 } | |
| 8420 return false; | |
| 8421 } | |
| 8422 //----- (0043EDB9) -------------------------------------------------------- | |
| 1458 | 8423 bool sub_43EDB9_get_some_race_sex_relation_2(unsigned int a1) |
| 1297 | 8424 { |
| 8425 unsigned int pNum; // ebp@1 | |
| 8426 Player **pPlayer; // ebx@1 | |
| 8427 Player *pPlayer2; // esi@2 | |
| 8428 enum CHARACTER_RACE pRace; // edi@2 | |
| 8429 bool pSex; // eax@2 | |
| 8430 char v6; // zf@7 | |
| 8431 | |
| 8432 //pPlayer = &pPlayers[1]; | |
| 8433 /*pNum = a1; | |
| 8434 | |
| 8435 while ( 1 ) | |
| 8436 { | |
| 8437 pPlayer2 = *pPlayer; | |
| 8438 pRace = pPlayer2->GetRace(); | |
| 8439 pSex = pPlayer2->GetSexByVoice(); | |
| 8440 if ( !pRace ) | |
| 8441 break; | |
| 8442 if ( pRace == 1 || pRace == 2 ) | |
| 8443 break; | |
| 8444 if ( !pSex && pNum == 2 )// | |
| 8445 //goto LABEL_15; | |
| 8446 { | |
| 8447 pSex = 1; | |
| 8448 return pSex; | |
| 8449 } | |
| 8450 v6 = pNum == 3;// | |
| 8451 LABEL_11: | |
| 8452 if ( v6 ) | |
| 8453 //goto LABEL_15; | |
| 8454 { | |
| 8455 pSex = 1; | |
| 8456 return pSex; | |
| 8457 } | |
| 8458 ++pPlayer; | |
| 8459 if ( (signed int)pPlayer >= (signed int)&qword_A750D8 )// | |
| 8460 { | |
| 8461 pSex = 0; | |
| 8462 return pSex; | |
| 8463 } | |
| 8464 } | |
| 8465 if ( pSex || pNum ) | |
| 8466 { | |
| 8467 v6 = pNum == 1; | |
| 8468 goto LABEL_11; | |
| 8469 } | |
| 8470 //LABEL_15: | |
| 8471 pSex = 1; | |
| 8472 return pSex;*/ | |
| 8473 for (uint i = 1; i <= 4; ++i) | |
| 8474 { | |
| 8475 pRace = pPlayers[i]->GetRace(); | |
| 8476 pSex = pPlayers[i]->GetSexByVoice(); | |
| 8477 if (pRace == 0 || pRace == 1 || pRace == 2 || pSex == 0 ) | |
| 8478 return 1; | |
| 8479 } | |
| 8480 return 0; | |
| 8481 } | |
| 8482 //----- (0043ED6F) -------------------------------------------------------- | |
| 8483 bool _43ED6F_check_party_races(bool a1) | |
| 8484 { | |
| 8485 bool v6; // zf@5 | |
| 8486 | |
| 8487 for (uint i = 0; i < 4; ++i) | |
| 8488 { | |
| 8489 auto player = pParty->pPlayers + i; | |
| 8490 auto race = player->GetRace(); | |
| 8491 | |
| 8492 if (race != CHARACTER_RACE_HUMAN && | |
| 8493 race != CHARACTER_RACE_ELF && | |
| 8494 race != CHARACTER_RACE_GOBLIN) | |
| 8495 v6 = a1 == 1; | |
| 8496 else | |
| 8497 v6 = !a1; | |
| 8498 | |
| 8499 if (v6) | |
| 8500 return true; | |
| 8501 } | |
| 8502 return false; | |
| 8503 } | |
| 8504 //----- (00439FCB) -------------------------------------------------------- | |
| 8505 void __fastcall DamagePlayerFromMonster(unsigned int uObjID, int a2, Vec3_int_ *pPos, unsigned int a4) | |
| 8506 { | |
| 8507 signed int v4; // esi@1 | |
| 8508 unsigned int v5; // ecx@1 | |
| 8509 Player *v6; // ebx@3 | |
| 8510 Actor *v7; // esi@3 | |
| 8511 unsigned int v8; // eax@4 | |
| 8512 char *v9; // eax@5 | |
| 8513 signed int v10; // eax@6 | |
| 8514 int v11; // edx@8 | |
| 8515 int v12; // edx@9 | |
| 8516 int v13; // edx@10 | |
| 8517 int v14; // edx@16 | |
| 8518 int v15; // edx@17 | |
| 8519 int v16; // edx@18 | |
| 8520 enum SoundID v17; // eax@24 | |
| 8521 int v18; // eax@26 | |
| 8522 unsigned __int8 v19; // zf@26 | |
| 8523 unsigned __int8 v20; // sf@26 | |
| 8524 unsigned __int16 v21; // ax@29 | |
| 8525 signed int v22; // edi@36 | |
| 8526 int v23; // eax@38 | |
| 8527 signed int v24; // eax@44 | |
| 8528 unsigned __int16 v25; // cx@47 | |
| 8529 signed int v26; // eax@49 | |
| 8530 int v27; // eax@54 | |
| 8531 float v28; // ST18_4@58 | |
| 8532 double v29; // st7@58 | |
| 8533 float v30; // ST08_4@58 | |
| 8534 double v31; // st7@58 | |
| 8535 float v32; // ST04_4@58 | |
| 8536 float v33; // ST00_4@58 | |
| 8537 int v34; // edi@61 | |
| 8538 int v35; // eax@70 | |
| 8539 double v36; // st7@70 | |
| 8540 SpriteObject *v37; // ebx@77 | |
| 8541 int v38; // edi@77 | |
| 8542 int v39; // esi@77 | |
| 8543 int v40; // eax@77 | |
| 8544 int v41; // eax@77 | |
| 8545 int v42; // eax@78 | |
| 8546 Player *v43; // eax@81 | |
| 8547 Actor *v44; // esi@82 | |
| 8548 Player *v45; // edi@84 | |
| 8549 unsigned __int16 v46; // ax@84 | |
| 8550 int v47; // ebx@105 | |
| 8551 int v48; // eax@107 | |
| 8552 unsigned __int16 v49; // ax@116 | |
| 8553 int v50; // ebx@123 | |
| 8554 unsigned __int16 v51; // ax@124 | |
| 8555 char v52; // bl@124 | |
| 8556 int v53; // eax@128 | |
| 8557 signed int v54; // eax@134 | |
| 8558 unsigned __int16 v55; // cx@137 | |
| 8559 signed int v56; // eax@139 | |
| 8560 int v57; // eax@144 | |
| 8561 float v58; // ST18_4@148 | |
| 8562 double v59; // st7@148 | |
| 8563 float v60; // ST08_4@148 | |
| 8564 double v61; // st7@148 | |
| 8565 float v62; // ST04_4@148 | |
| 8566 float v63; // ST00_4@148 | |
| 8567 int v64; // ebx@151 | |
| 8568 int v65; // eax@161 | |
| 8569 double v66; // st7@161 | |
| 8570 signed int v67; // ecx@164 | |
| 8571 signed int v68; // eax@170 | |
| 8572 int v69; // ecx@170 | |
| 8573 int v70; // eax@171 | |
| 8574 enum SoundID v71; // [sp+20h] [bp-34h]@12 | |
| 8575 int v72; // [sp+30h] [bp-24h]@164 | |
| 8576 double v73; // [sp+40h] [bp-14h]@72 | |
| 8577 signed int v74; // [sp+44h] [bp-10h]@1 | |
| 8578 unsigned int v75; // [sp+48h] [bp-Ch]@3 | |
| 8579 unsigned int uActorID; // [sp+4Ch] [bp-8h]@1 | |
| 8580 int v77; // [sp+50h] [bp-4h]@26 | |
| 8581 signed int a4a; // [sp+60h] [bp+Ch]@162 | |
| 8582 Player *a4b; // [sp+60h] [bp+Ch]@168 | |
| 8583 | |
| 8584 v4 = PID_ID(uObjID); | |
| 8585 v5 = PID_TYPE(uObjID) - 2; | |
| 8586 v74 = a2; | |
| 8587 uActorID = v4; | |
| 8588 if ( v5 ) | |
| 8589 { | |
| 8590 if ( v5 != 1 | |
| 8591 || (v6 = &pParty->pPlayers[a4], v7 = &pActors[v4], | |
| 8592 v75 = v6->sHealth, | |
| 8593 !stru_50C198.ActorHitOrMiss(v7, v6)) ) | |
| 8594 return; | |
| 8595 v8 = v6->pEquipment.uArmor; | |
| 8596 if ( !v8 | |
| 8597 || (v9 = (char *)v6 + 36 * v8, v9[516] & 2) | |
| 8598 || (v10 = pItemsTable->pItems[*((int *)v9 + 124)].uSkillType, v10 < 10) | |
| 8599 || v10 > 11 ) | |
| 8600 { | |
| 8601 v14 = rand() % 4; | |
| 8602 if ( !v14 ) | |
| 8603 { | |
| 8604 v71 = (SoundID)108; | |
| 8605 goto LABEL_24; | |
| 8606 } | |
| 8607 v15 = v14 - 1; | |
| 8608 if ( !v15 ) | |
| 8609 { | |
| 8610 v71 = (SoundID)109; | |
| 8611 goto LABEL_24; | |
| 8612 } | |
| 8613 v16 = v15 - 1; | |
| 8614 if ( !v16 ) | |
| 8615 { | |
| 8616 v71 = (SoundID)110; | |
| 8617 goto LABEL_24; | |
| 8618 } | |
| 8619 if ( v16 == 1 ) | |
| 8620 { | |
| 8621 v71 = (SoundID)44; | |
| 8622 goto LABEL_24; | |
| 8623 } | |
| 8624 } | |
| 8625 else | |
| 8626 { | |
| 8627 v11 = rand() % 4; | |
| 8628 if ( !v11 ) | |
| 8629 { | |
| 8630 v71 = (SoundID)105; | |
| 8631 goto LABEL_24; | |
| 8632 } | |
| 8633 v12 = v11 - 1; | |
| 8634 if ( !v12 ) | |
| 8635 { | |
| 8636 v71 = (SoundID)106; | |
| 8637 goto LABEL_24; | |
| 8638 } | |
| 8639 v13 = v12 - 1; | |
| 8640 if ( !v13 ) | |
| 8641 { | |
| 8642 v71 = (SoundID)107; | |
| 8643 goto LABEL_24; | |
| 8644 } | |
| 8645 if ( v13 == 1 ) | |
| 8646 { | |
| 8647 v71 = (SoundID)45; | |
| 8648 LABEL_24: | |
| 8649 v17 = v71; | |
| 8650 goto LABEL_26; | |
| 8651 } | |
| 8652 } | |
| 8653 v17 = (SoundID)a4; | |
| 8654 LABEL_26: | |
| 8655 pAudioPlayer->PlaySound(v17, PID(OBJECT_Player,a4 + 80), 0, -1, 0, 0, 0, 0); | |
| 8656 v18 = Actor::_43B3E0_CalcDamage(v7, v74); | |
| 8657 v19 = HIDWORD(v7->pActorBuffs[3].uExpireTime) == 0; | |
| 8658 v20 = SHIDWORD(v7->pActorBuffs[3].uExpireTime) < 0; | |
| 8659 v77 = v18; | |
| 8660 if ( !v20 && (!(v20 | v19) || LODWORD(v7->pActorBuffs[3].uExpireTime) > 0) ) | |
| 8661 { | |
| 8662 v21 = v7->pActorBuffs[3].uPower; | |
| 8663 if ( v21 ) | |
| 8664 v77 /= (signed int)v21; | |
| 8665 } | |
| 8666 if ( v74 ) | |
| 8667 { | |
| 8668 if ( v74 == 1 ) | |
| 8669 { | |
| 8670 v22 = v7->pMonsterInfo.uAttack2Type; | |
| 8671 } | |
| 8672 else | |
| 8673 { | |
| 8674 if ( v74 == 2 ) | |
| 8675 { | |
| 8676 v23 = v7->pMonsterInfo.uSpell1ID; | |
| 8677 } | |
| 8678 else | |
| 8679 { | |
| 8680 if ( v74 != 3 ) | |
| 8681 { | |
| 8682 if ( v74 == 4 ) | |
| 8683 v22 = v7->pMonsterInfo.field_3C_some_special_attack; | |
| 8684 else | |
| 8685 v22 = 4; | |
| 8686 goto LABEL_43; | |
| 8687 } | |
| 8688 v23 = v7->pMonsterInfo.uSpell2ID; | |
| 8689 } | |
| 8690 v22 = LOBYTE(pSpellStats->pInfos[v23].uSchool); | |
| 8691 } | |
| 8692 } | |
| 8693 else | |
| 8694 { | |
| 8695 v22 = v7->pMonsterInfo.uAttack1Type; | |
| 8696 } | |
| 8697 LABEL_43: | |
| 8698 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) | |
| 8699 { | |
| 8700 v24 = v6->ReceiveDamage(v77, (DAMAGE_TYPE)v22); | |
| 8701 if ( SHIDWORD(v6->pPlayerBuffs[10].uExpireTime) >= 0 | |
| 8702 && (SHIDWORD(v6->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v6->pPlayerBuffs[10].uExpireTime)) ) | |
| 8703 { | |
| 8704 v25 = v7->uAIState; | |
| 8705 if ( v25 != 5 ) | |
| 8706 { | |
| 8707 if ( v25 != 4 ) | |
| 8708 { | |
| 8709 v26 = stru_50C198.CalcMagicalDamageToActor(v7, v22, v24); | |
| 8710 v7->sCurrentHP -= v26; | |
| 8711 if ( v26 ) | |
| 8712 { | |
| 8713 if ( v7->sCurrentHP >= 1 ) | |
| 8714 { | |
| 8715 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); | |
| 8716 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 8717 } | |
| 8718 else | |
| 8719 { | |
| 8720 if ( pMonsterStats->pInfos[v7->pMonsterInfo.uID].bQuestMonster & 1 ) | |
| 8721 { | |
| 8722 v27 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * v7->uActorRadius : v7->uActorRadius; | |
| 8723 v74 = v27; | |
| 8724 if ( pRenderer->pRenderD3D ) | |
| 8725 { | |
| 8726 if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) | |
| 8727 { | |
| 8728 v28 = (double)v74; | |
| 8729 v74 = v7->vPosition.z; | |
| 8730 v29 = (double)v74; | |
| 8731 v74 = v7->vPosition.y; | |
| 8732 v30 = v29; | |
| 8733 v31 = (double)v74; | |
| 8734 v74 = v7->vPosition.x; | |
| 8735 v32 = v31; | |
| 8736 v33 = (double)v74; | |
| 8737 pDecalBuilder->AddBloodsplat(v33, v32, v30, 1.0, 0.0, 0.0, v28, 0, 0); | |
| 8738 } | |
| 8739 } | |
| 8740 } | |
| 8741 Actor::Die(uActorID); | |
| 8742 Actor::ApplyFineForKillingPeasant(uActorID); | |
| 8743 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 8744 if ( v7->pMonsterInfo.uExp ) | |
| 8745 GivePartyExp(pMonsterStats->pInfos[v7->pMonsterInfo.uID].uExp); | |
| 8746 v34 = SPEECH_51; | |
| 8747 if ( rand() % 100 < 20 ) | |
| 8748 v34 = ((signed int)v7->pMonsterInfo.uHP >= 100) + 1; | |
| 8749 v6->PlaySound((PlayerSpeech)v34, 0); | |
| 8750 } | |
| 8751 } | |
| 8752 } | |
| 8753 } | |
| 8754 } | |
| 8755 if ( !(dword_6BE368_debug_settings_2 & 0x10) | |
| 8756 && v7->pMonsterInfo.uSpecialAttack | |
| 8757 && rand() % 100 < v7->pMonsterInfo.uLevel * v7->pMonsterInfo.uSpecialAttackType ) | |
| 8758 v6->_48DCF6(v7->pMonsterInfo.uSpecialAttack, v7); | |
| 8759 } | |
| 8760 if ( !pParty->bTurnBasedModeOn ) | |
| 8761 { | |
| 8762 v35 = v6->GetActualEndurance(); | |
| 8763 v36 = (double)(20 - v6->GetParameterBonus(v35)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333; | |
| 8764 v6->SetRecoveryTime((signed __int64)v36); | |
| 8765 } | |
| 8766 if ( v77 ) | |
| 8767 { | |
| 8768 v73 = (double)(signed int)v75; | |
| 8769 if ( (double)v6->GetMaxHealth() * 0.25 < v73 ) | |
| 8770 { | |
| 8771 if ( v6->sHealth > 0 ) | |
| 8772 { | |
| 8773 if ( (double)v6->GetMaxHealth() * 0.25 >= (double)v6->sHealth ) | |
| 8774 v6->PlaySound(SPEECH_48, 0); | |
| 8775 } | |
| 8776 } | |
| 8777 } | |
| 8778 viewparams->bRedrawGameUI = 1; | |
| 8779 return; | |
| 8780 } | |
| 8781 v37 = &pSpriteObjects[uActorID]; | |
| 8782 v38 = PID_TYPE(v37->spell_caster_pid); | |
| 8783 v39 = PID_ID(v37->spell_caster_pid); | |
| 8784 v40 = PID_TYPE(v37->spell_caster_pid); | |
| 8785 uActorID = PID_ID(v37->spell_caster_pid); | |
| 8786 v41 = v40 - 2; | |
| 8787 if ( !v41 ) | |
| 8788 goto LABEL_80; | |
| 8789 v42 = v41 - 1; | |
| 8790 if ( !v42 ) | |
| 8791 { | |
| 8792 v44 = &pActors[v39]; | |
| 8793 if ( a4 == -1 ) | |
| 8794 a4 = stru_50C198.which_player_would_attack(v44); | |
| 8795 v45 = &pParty->pPlayers[a4]; | |
| 8796 v77 = Actor::_43B3E0_CalcDamage(v44, v74); | |
| 8797 v46 = v37->uType; | |
| 8798 if ( v37->uType == 545 ) | |
| 8799 { | |
| 8800 LOBYTE(v51) = v45->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 8801 v52 = v51; | |
| 8802 if ( (signed int)SkillToMastery(v51) >= 4 && rand() % 100 < (v52 & 0x3F) ) | |
| 8803 { | |
| 8804 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], v45->pName); | |
| 8805 ShowStatusBarString(pTmpBuf.data(), 2u); | |
| 8806 v45->PlaySound(SPEECH_6, 0); | |
| 8807 return; | |
| 8808 } | |
| 8809 } | |
| 8810 else | |
| 8811 { | |
| 8812 if ( v46 != 555 | |
| 8813 && v46 != 510 | |
| 8814 && v46 != 500 | |
| 8815 && v46 != 515 | |
| 8816 && v46 != 505 | |
| 8817 && v46 != 530 | |
| 8818 && v46 != 525 | |
| 8819 && v46 != 520 | |
| 8820 && v46 != 535 | |
| 8821 && v46 != 540 ) | |
| 8822 goto LABEL_115; | |
| 8823 } | |
| 8824 if ( !stru_50C198.ActorHitOrMiss(v44, v45) ) | |
| 8825 return; | |
| 8826 if ( (signed __int64)v45->pPlayerBuffs[13].uExpireTime > 0 ) | |
| 8827 v77 >>= 1; | |
| 8828 if ( v45->HasEnchantedItemEquipped(36) ) | |
| 8829 v77 >>= 1; | |
| 8830 if ( v45->HasEnchantedItemEquipped(69) ) | |
| 8831 v77 >>= 1; | |
| 8832 if ( v45->HasItemEquipped(EQUIP_ARMOUR) | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
8833 && *(_DWORD *)&v45->pInventoryItemList[v45->pEquipment.uArmor-1] == 504 ) |
| 1297 | 8834 v77 >>= 1; |
| 8835 v75 = 0; | |
| 8836 v47 = (int)&v45->pEquipment; | |
| 8837 do | |
| 8838 { | |
| 8839 if ( v45->HasItemEquipped((ITEM_EQUIP_TYPE)v75) ) | |
| 8840 { | |
| 8841 v48 = *(int *)&v45[36 * *(int *)v47 + 496]; | |
| 8842 if ( v48 == 520 ) | |
| 8843 v77 >>= 1; | |
| 8844 if ( v48 == 531 ) | |
| 8845 v77 >>= 1; | |
| 8846 if ( v45->GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v75) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4 ) | |
| 8847 v77 >>= 1; | |
| 8848 } | |
| 8849 ++v75; | |
| 8850 v47 += 4; | |
| 8851 } | |
| 8852 while ( (signed int)v75 <= 1 ); | |
| 8853 LABEL_115: | |
| 8854 if ( (signed __int64)v44->pActorBuffs[3].uExpireTime > 0 ) | |
| 8855 { | |
| 8856 v49 = v44->pActorBuffs[3].uPower; | |
| 8857 if ( v49 ) | |
| 8858 v77 /= (signed int)v49; | |
| 8859 } | |
| 8860 if ( !v74 ) | |
| 8861 { | |
| 8862 v50 = v44->pMonsterInfo.uAttack1Type; | |
| 8863 goto LABEL_133; | |
| 8864 } | |
| 8865 if ( v74 == 1 ) | |
| 8866 { | |
| 8867 v50 = v44->pMonsterInfo.uAttack2Type; | |
| 8868 goto LABEL_133; | |
| 8869 } | |
| 8870 if ( v74 == 2 ) | |
| 8871 { | |
| 8872 v53 = v44->pMonsterInfo.uSpell1ID; | |
| 8873 } | |
| 8874 else | |
| 8875 { | |
| 8876 if ( v74 != 3 ) | |
| 8877 { | |
| 8878 if ( v74 == 4 ) | |
| 8879 v50 = v44->pMonsterInfo.field_3C_some_special_attack; | |
| 8880 else | |
| 8881 v50 = 4; | |
| 8882 LABEL_133: | |
| 8883 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) | |
| 8884 { | |
| 8885 v54 = v45->ReceiveDamage(v77, (DAMAGE_TYPE)v50); | |
| 8886 if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) >= 0 ) | |
| 8887 { | |
| 8888 if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v45->pPlayerBuffs[10].uExpireTime) ) | |
| 8889 { | |
| 8890 v55 = v44->uAIState; | |
| 8891 if ( v55 != 5 ) | |
| 8892 { | |
| 8893 if ( v55 != 4 ) | |
| 8894 { | |
| 8895 v56 = stru_50C198.CalcMagicalDamageToActor(v44, v50, v54); | |
| 8896 v44->sCurrentHP -= v56; | |
| 8897 if ( v56 ) | |
| 8898 { | |
| 8899 if ( v44->sCurrentHP >= 1 ) | |
| 8900 { | |
| 8901 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); | |
| 8902 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 8903 } | |
| 8904 else | |
| 8905 { | |
| 8906 if ( pMonsterStats->pInfos[v44->pMonsterInfo.uID].bQuestMonster & 1 ) | |
| 8907 { | |
| 8908 v57 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * v44->uActorRadius : v44->uActorRadius; | |
| 8909 v75 = v57; | |
| 8910 if ( pRenderer->pRenderD3D ) | |
| 8911 { | |
| 8912 if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) | |
| 8913 { | |
| 8914 v58 = (double)(signed int)v75; | |
| 8915 v75 = v44->vPosition.z; | |
| 8916 v59 = (double)(signed int)v75; | |
| 8917 v75 = v44->vPosition.y; | |
| 8918 v60 = v59; | |
| 8919 v61 = (double)(signed int)v75; | |
| 8920 v75 = v44->vPosition.x; | |
| 8921 v62 = v61; | |
| 8922 v63 = (double)(signed int)v75; | |
| 8923 pDecalBuilder->AddBloodsplat(v63, v62, v60, 1.0, 0.0, 0.0, v58, 0, 0); | |
| 8924 } | |
| 8925 } | |
| 8926 } | |
| 8927 Actor::Die(uActorID); | |
| 8928 Actor::ApplyFineForKillingPeasant(uActorID); | |
| 8929 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 8930 if ( v44->pMonsterInfo.uExp ) | |
| 8931 GivePartyExp(pMonsterStats->pInfos[v44->pMonsterInfo.uID].uExp); | |
| 8932 v64 = SPEECH_51; | |
| 8933 if ( rand() % 100 < 20 ) | |
| 8934 v64 = ((signed int)v44->pMonsterInfo.uHP >= 100) + 1; | |
| 8935 v45->PlaySound((PlayerSpeech)v64, 0); | |
| 8936 } | |
| 8937 } | |
| 8938 } | |
| 8939 } | |
| 8940 } | |
| 8941 } | |
| 8942 } | |
| 8943 if ( !v74 | |
| 8944 && !(dword_6BE368_debug_settings_2 & 0x10) | |
| 8945 && v44->pMonsterInfo.uSpecialAttack | |
| 8946 && rand() % 100 < v44->pMonsterInfo.uLevel * v44->pMonsterInfo.uSpecialAttackType ) | |
| 8947 v45->_48DCF6(v44->pMonsterInfo.uSpecialAttack, v44); | |
| 8948 if ( !pParty->bTurnBasedModeOn ) | |
| 8949 { | |
| 8950 v65 = v45->GetActualEndurance(); | |
| 8951 v66 = (double)(20 - v45->GetParameterBonus(v65)) | |
| 8952 * flt_6BE3A4_debug_recmod1 | |
| 8953 * 2.133333333333333; | |
| 8954 v45->SetRecoveryTime((signed __int64)v66); | |
| 8955 } | |
| 8956 return; | |
| 8957 } | |
| 8958 v53 = v44->pMonsterInfo.uSpell2ID; | |
| 8959 } | |
| 8960 v50 = LOBYTE(pSpellStats->pInfos[v53].uSchool); | |
| 8961 goto LABEL_133; | |
| 8962 } | |
| 8963 if ( v42 != 1 ) | |
| 8964 return; | |
| 8965 LABEL_80: | |
| 8966 if ( a4 != -1 ) | |
| 8967 { | |
| 8968 v43 = &pParty->pPlayers[a4]; | |
| 8969 LABEL_168: | |
| 8970 a4b = v43; | |
| 8971 if ( v38 != OBJECT_Player || v37->spell_id != SPELL_BOW_ARROW) | |
| 8972 { | |
| 8973 v70 = v43->GetMaxHealth(); | |
| 8974 v68 = _43AFE3_calc_spell_damage(v37->spell_id, v37->spell_level, v37->spell_skill, v70); | |
| 8975 v69 = LOBYTE(pSpellStats->pInfos[v37->spell_id].uSchool); | |
| 8976 } | |
| 8977 else | |
| 8978 { | |
| 8979 v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); | |
| 8980 v69 = 0; | |
| 8981 } | |
| 8982 a4b->ReceiveDamage(v68, (DAMAGE_TYPE)v69); | |
| 8983 if ( v38 == OBJECT_Player && !qword_A750D8 ) | |
| 8984 { | |
| 8985 qword_A750D8 = 256i64; | |
| 1406 | 8986 PlayerSpeechID = SPEECH_44; |
| 1407 | 8987 uSpeakingCharacter = uActorID + 1; |
| 1297 | 8988 } |
| 8989 return; | |
| 8990 } | |
| 8991 v74 = 0; | |
| 8992 a4a = 1; | |
| 8993 do | |
| 8994 { | |
| 8995 if ( pPlayers[a4a]->CanAct() ) | |
| 8996 { | |
| 8997 v67 = v74++; | |
| 8998 *(&v72 + v67) = a4a; | |
| 8999 } | |
| 9000 ++a4a; | |
| 9001 } | |
| 9002 while ( a4a <= 4 ); | |
| 9003 if ( v74 ) | |
| 9004 { | |
| 9005 v43 = &pParty->pPlayers[*(&v72+rand()%v74)-1];//&stru_AA1058[3].pSounds[6972 * *(&v72 + rand() % v74) + 40552]; | |
| 9006 goto LABEL_168; | |
| 9007 } | |
| 9008 } | |
| 9009 //----- (00421EA6) -------------------------------------------------------- | |
| 1458 | 9010 void OnInventoryLeftClick() |
| 1297 | 9011 { |
| 9012 Player *v0; // ebx@1 | |
| 9013 signed int v1; // eax@2 | |
| 9014 signed int v2; // ecx@2 | |
| 9015 int v3; // eax@2 | |
| 9016 char v4; // sf@2 | |
| 9017 int v5; // eax@2 | |
| 9018 unsigned int v6; // eax@7 | |
| 9019 unsigned int v7; // esi@12 | |
| 9020 unsigned int v8; // eax@12 | |
| 9021 unsigned int v9; // eax@16 | |
| 9022 unsigned int v10; // eax@18 | |
| 9023 ItemGen this_; // [sp+Ch] [bp-3Ch]@1 | |
| 9024 POINT a2; // [sp+30h] [bp-18h]@4 | |
| 9025 unsigned int v13; // [sp+38h] [bp-10h]@13 | |
| 9026 unsigned int pY; // [sp+3Ch] [bp-Ch]@2 | |
| 9027 unsigned int pX; // [sp+40h] [bp-8h]@2 | |
| 9028 int a4; // [sp+44h] [bp-4h]@2 | |
| 9029 | |
| 9030 v0 = pPlayers[uActiveCharacter]; | |
| 9031 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103 ) | |
| 9032 { | |
| 9033 pMouse->GetClickPos(&pX, &pY); | |
| 9034 pY = pY - 17; | |
| 9035 v2 =pX - 14; | |
| 9036 pX = v2; | |
| 9037 v3 = 14 * (pY >> 5); | |
| 9038 v2 >>= 5; | |
| 9039 v4 = v2 + v3 < 0; | |
| 9040 v5 = v2 + v3; | |
| 9041 a4 = v5; | |
| 9042 if ( !v4 ) | |
| 9043 { | |
| 9044 if ( v5 <= 126 && pMouse->GetCursorPos(&a2)->x < 462 | |
| 9045 && pMouse->GetCursorPos(&a2)->x >= 14 ) | |
| 9046 { | |
| 9047 if ( unk_50C9A0 ) | |
| 9048 { | |
| 9049 v6 = v0->GetItemIDAtInventoryIndex(&a4); | |
| 9050 if ( v6 ) | |
| 9051 { | |
| 9052 *((char *)pGUIWindow_Settings->ptr_1C + 8) &= 0x7Fu; | |
| 9053 *((short *)pGUIWindow_Settings->ptr_1C + 2) = uActiveCharacter - 1; | |
| 9054 *((int *)pGUIWindow_Settings->ptr_1C + 3) = v6 - 1; | |
| 9055 *((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
|
9056 ptr_50C9A4 = (ItemGen *)&v0->pInventoryItemList[v6-1]; |
| 1297 | 9057 unk_50C9A0 = 0; |
| 9058 if ( pMessageQueue_50CBD0->uNumMessages ) | |
| 9059 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; | |
| 9060 pMouse->SetCursorBitmap("MICON1"); | |
| 9061 dword_50C9D0 = 113; | |
| 9062 dword_50C9D4 = 0; | |
| 9063 dword_50C9D8 = 256; | |
| 9064 } | |
| 9065 return; | |
| 9066 } | |
| 9067 if ( ptr_50C9A4 ) | |
| 9068 return; | |
| 9069 v7 = pParty->pPickedItem.uItemID; | |
| 9070 v8 = v0->GetItemIDAtInventoryIndex(&a4); | |
| 9071 if ( !v7 ) | |
| 9072 { | |
| 9073 if ( !v8 ) | |
| 9074 return; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
9075 memcpy(&pParty->pPickedItem, &v0->pInventoryItemList[v8-1], sizeof(pParty->pPickedItem)); |
| 1297 | 9076 v0->RemoveItemAtInventoryIndex(a4); |
| 9077 v9 = pParty->pPickedItem.uItemID; | |
| 9078 pMouse->SetCursorBitmap(pItemsTable->pItems[v9].pIconName); | |
| 9079 return; | |
| 9080 } | |
| 9081 v13 = v8; | |
| 9082 if ( v8 ) | |
| 9083 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
9084 a2.y = (LONG)&v0->pInventoryItemList[v8-1]; |
| 1297 | 9085 memcpy(&this_, (const void *)a2.y, sizeof(this_)); |
| 9086 v0->RemoveItemAtInventoryIndex(a4); | |
| 9087 pX = v0->AddItem2(a4, &pParty->pPickedItem); | |
| 9088 if ( !pX ) | |
| 9089 { | |
| 9090 pX = v0->AddItem2(0xFFFFFFFFu, &pParty->pPickedItem); | |
| 9091 if ( !pX ) | |
| 9092 { | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
9093 v0->PutItemArInventoryIndex(this_.uItemID, v13 - 1, a4); |
| 1297 | 9094 memcpy((void *)a2.y, &this_, sizeof(ItemGen)); |
| 9095 return; | |
| 9096 } | |
| 9097 } | |
| 9098 v9 = this_.uItemID; | |
| 9099 memcpy(&pParty->pPickedItem, &this_, sizeof(pParty->pPickedItem)); | |
| 9100 pMouse->SetCursorBitmap(pItemsTable->pItems[v9].pIconName); | |
| 9101 return; | |
| 9102 } | |
| 9103 v10 = v0->AddItem(a4, v7); | |
| 9104 pX = v10; | |
| 9105 if ( v10 || (v10 = v0->AddItem(-1, pParty->pPickedItem.uItemID), (pX = v10) != 0) ) | |
| 9106 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
9107 memcpy(&v0->pInventoryItemList[v10-1], &pParty->pPickedItem, 0x24u); |
| 1297 | 9108 pMouse->RemoveHoldingItem(); |
| 9109 } | |
| 9110 } | |
| 9111 } | |
| 9112 } | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9113 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9114 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9115 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9116 bool Player::IsWeak() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9117 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9118 return pConditions[Condition_Weak] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9119 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9120 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9121 bool Player::IsDead() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9122 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9123 return pConditions[Condition_Dead] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9124 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9125 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9126 bool Player::IsEradicated() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9127 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9128 return pConditions[Condition_Eradicated] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9129 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9130 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9131 bool Player::IsZombie() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9132 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9133 return pConditions[Condition_Zombie] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9134 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9135 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9136 bool Player::IsCursed() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9137 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9138 return pConditions[Condition_Cursed] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9139 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9140 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9141 bool Player::IsPertified() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9142 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9143 return pConditions[Condition_Pertified] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9144 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9145 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9146 bool Player::IsUnconcious() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9147 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9148 return pConditions[Condition_Unconcious] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9149 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9150 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9151 bool Player::IsAsleep() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9152 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9153 return pConditions[Condition_Sleep] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9154 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9155 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9156 bool Player::IsParalyzed() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9157 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9158 return pConditions[Condition_Paralyzed] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9159 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9160 |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9161 void Player::SetCursed( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9162 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9163 pConditions[Condition_Cursed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9164 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9165 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9166 void Player::SetWeak( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9167 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9168 pConditions[Condition_Weak] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9169 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9170 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9171 void Player::SetAsleep( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9172 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9173 pConditions[Condition_Sleep] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9174 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9175 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9176 void Player::SetAfraid( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9177 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9178 pConditions[Condition_Fear] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9179 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9180 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9181 void Player::SetDrunk( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9182 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9183 pConditions[Condition_Drunk] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9184 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9185 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9186 void Player::SetInsane( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9187 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9188 pConditions[Condition_Insane] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9189 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9190 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9191 void Player::SetPoison1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9192 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9193 pConditions[Condition_Poison1] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9194 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9195 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9196 void Player::SetDisease1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9197 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9198 pConditions[Condition_Disease1] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9199 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9200 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9201 void Player::SetPoison2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9202 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9203 pConditions[Condition_Poison2] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9204 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9205 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9206 void Player::SetDisease2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9207 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9208 pConditions[Condition_Disease2] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9209 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9210 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9211 void Player::SetPoison3( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9212 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9213 pConditions[Condition_Poison3] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9214 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9215 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9216 void Player::SetDisease3( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9217 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9218 pConditions[Condition_Disease3] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9219 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9220 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9221 void Player::SetParalyzed( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9222 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9223 pConditions[Condition_Paralyzed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9224 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9225 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9226 void Player::SetUnconcious( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9227 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9228 pConditions[Condition_Unconcious] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9229 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9230 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9231 void Player::SetDead( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9232 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9233 pConditions[Condition_Dead] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9234 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9235 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9236 void Player::SetPertified( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9237 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9238 pConditions[Condition_Pertified] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9239 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9240 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9241 void Player::SetEradicated( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9242 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9243 pConditions[Condition_Eradicated] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9244 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9245 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9246 void Player::SetZombie( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9247 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9248 pConditions[Condition_Zombie] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9249 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9250 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9251 void Player::SetCondWeakWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9252 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9253 SetCondition(Condition_Weak, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9254 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9255 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9256 void Player::SetCondInsaneWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9257 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9258 SetCondition(Condition_Insane, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9259 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9260 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9261 void Player::SetCondDeadWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9262 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
9263 SetCondition(Condition_Dead, blockable); |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
9264 } |