Mercurial > mm7
annotate Player.cpp @ 2231:8673f3aedfb9
sub_4B1523 to sub_4B1523_showSpellbookInfo, changed input type, some vars renamed
| author | Grumpy7 |
|---|---|
| date | Sat, 22 Feb 2014 19:44:49 +0100 |
| parents | 080fd5a5433d |
| children | c4f87fb3cfee |
| rev | line source |
|---|---|
| 1016 | 1 #include "stru6.h" |
| 2 | |
| 0 | 3 #include "Player.h" |
| 4 #include "PlayerFrameTable.h" | |
| 5 #include "AudioPlayer.h" | |
| 6 #include "Party.h" | |
| 816 | 7 #include "Log.h" |
| 0 | 8 #include "LOD.h" |
| 9 #include "GUIWindow.h" | |
| 10 #include "Viewport.h" | |
| 11 #include "Actor.h" | |
| 12 #include "Game.h" | |
| 13 #include "Mouse.h" | |
| 14 #include "TurnEngine.h" | |
| 15 #include "Events.h" | |
| 16 #include "Events2D.h" | |
| 17 #include "Outdoor.h" | |
| 18 #include "StorylineTextTable.h" | |
|
81
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
19 #include "Autonotes.h" |
|
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
20 #include "Awards.h" |
| 189 | 21 #include "texts.h" |
| 816 | 22 |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
23 #include "stru123.h" |
| 0 | 24 #include "mm7_data.h" |
|
828
0f56abdcce94
Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents:
821
diff
changeset
|
25 #include "MM7.h" |
| 1297 | 26 #include "SpriteObject.h" |
| 27 #include "DecalBuilder.h" | |
| 2156 | 28 #include "CastSpellInfo.h" |
| 0 | 29 |
| 30 | |
| 31 | |
| 32 | |
| 2054 | 33 NZIArray<struct Player *, 5> pPlayers; |
| 34 | |
| 35 | |
| 0 | 36 /* 381 */ |
| 37 #pragma pack(push, 1) | |
| 290 | 38 struct PlayerCreation_AttributeProps |
| 0 | 39 { |
| 40 unsigned __int8 uBaseValue; | |
| 41 char uMaxValue; | |
| 42 char uDroppedStep; | |
| 43 char uBaseStep; | |
| 44 }; | |
| 45 #pragma pack(pop) | |
| 46 | |
| 47 | |
| 48 #pragma pack(push, 1) | |
| 290 | 49 |
| 50 | |
| 51 | |
| 0 | 52 #pragma pack(pop) |
| 290 | 53 PlayerCreation_AttributeProps StatTable[4][7] = //0x4ED7B0 |
| 54 { | |
| 55 {{11, 25, 1, 1}, {11, 25, 1, 1}, {11, 25, 1, 1}, { 9, 25, 1, 1}, {11, 25, 1, 1}, {11, 25, 1, 1}, {9, 25, 1, 1},}, | |
| 56 {{ 7, 15, 2, 1}, {14, 30, 1, 2}, {11, 25, 1, 1}, { 7, 15, 2, 1}, {14, 30, 1, 2}, {11, 25, 1, 1}, {9, 20, 1, 1},}, | |
| 57 {{14, 30, 1, 2}, { 7, 15, 2, 1}, { 7, 15, 2, 1}, {11, 25, 1, 1}, {11, 25, 1, 1}, {14, 30, 1, 2}, {9, 20, 1, 1},}, | |
| 58 {{14, 30, 1, 2}, {11, 25, 1, 1}, {11, 25, 1, 1}, {14, 30, 1, 2}, { 7, 15, 2, 1}, { 7, 15, 2, 1}, {9, 20, 1, 1}} | |
| 0 | 59 }; |
| 60 | |
| 61 | |
| 62 | |
| 1700 | 63 std::array<int, 5> StealingMasteryBonuses = {0, 100, 200, 300, 500}; //dword_4EDEA0 //the zeroth element isn't accessed, it just helps avoid -1 indexing, originally 4 element array off by one |
| 1686 | 64 std::array<int, 5> StealingRandomBonuses = {-200, -100, 0, 100, 200}; //dword_4EDEB4 |
| 1700 | 65 std::array<int, 5> StealingEnchantmentBonusForSkill = {0, 2, 4, 6, 10}; //dword_4EDEC4 //the zeroth element isn't accessed, it just helps avoid -1 indexing, originally 4 element array off by one |
| 0 | 66 |
| 67 | |
| 68 | |
| 69 // available skills per class ( 9 classes X 37 skills ) | |
| 70 // 0 - not available | |
| 71 // 1 - available | |
| 72 // 2 - primary skill | |
| 73 unsigned char pSkillAvailabilityPerClass[9][37] = // byte[] @ MM7.exe::004ED820 | |
| 74 { | |
| 75 {0, 2, 0, 1, 1, 1, 1, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, | |
| 76 {0, 1, 2, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 2, 1, 0}, | |
| 77 {1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 2, 2, 1, 1, 0, 0, 0}, | |
| 78 {0, 1, 1, 1, 0, 0, 2, 0, 1, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, | |
| 79 {0, 1, 0, 1, 1, 2, 0, 0, 0, 1, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1}, | |
| 80 {0, 1, 1, 2, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0}, | |
| 81 {0, 0, 0, 0, 0, 0, 2, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 2, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}, | |
| 82 {0, 0, 2, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}, | |
| 83 {2, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0} // some of these are started at 4ED94C, but needs to be here | |
| 84 }; | |
| 85 | |
| 86 | |
| 1374 | 87 unsigned char pEquipTypeToBodyAnchor[21] = // 4E8398 |
| 88 { | |
| 1989 | 89 1, // EQUIP_SINGLE_HANDED |
| 90 1, // EQUIP_TWO_HANDED | |
| 1374 | 91 2, // EQUIP_BOW |
| 92 3, // EQUIP_ARMOUR | |
| 93 0, // EQUIP_SHIELD | |
| 94 4, // EQUIP_HELMET | |
| 95 5, // EQUIP_BELT | |
| 96 6, // EQUIP_CLOAK | |
| 97 7, // EQUIP_GAUNTLETS | |
| 98 8, // EQUIP_BOOTS | |
| 99 10, // EQUIP_RING | |
| 100 9, // EQUIP_AMULET | |
| 101 1, // EQUIP_WAND | |
| 102 0, // EQUIP_REAGENT | |
| 103 0, // EQUIP_POTION | |
| 104 0, // EQUIP_SPELL_SCROLL | |
| 105 0, // EQUIP_BOOK | |
| 106 0, // EQUIP_MESSAGE_SCROLL | |
| 107 0, // EQUIP_GOLD | |
| 108 0, // EQUIP_GEM | |
| 109 0 // EQUIP_NONE | |
| 110 }; | |
| 0 | 111 |
| 112 | |
| 113 unsigned char pBaseHealthByClass[12] = {40, 35, 35, 30, 30, 30, 25, 20, 20, 0, 0, 0}; | |
| 114 unsigned char pBaseManaByClass[12] = { 0, 0, 0, 5, 5, 0, 10, 10, 15, 0, 0, 0}; | |
| 115 unsigned char pBaseHealthPerLevelByClass[36] = {5, 7, 9, 9, 4, 6, 8, 8, 5, 6, 8, 8, 4, 5, 6, 6, 3, 4, 6, 6, 4, 5, 6, 6, 2, 3, 4, 4, 2, 3, 4, 4, 2, 3, 3, 3}; | |
| 116 unsigned char pBaseManaPerLevelByClass[36] = {0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 2, 3, 3, 1, 2, 3, 3, 0, 2, 3, 3, 3, 4, 5, 5, 3, 4, 5, 5, 3, 4, 6, 6}; | |
| 117 | |
| 1325 | 118 unsigned char pConditionAttributeModifier[7][19] = |
| 119 {{100, 100, 100, 120, 50, 200, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Might | |
| 120 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Intelligence | |
| 121 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Willpower | |
| 122 {100, 100, 100, 100, 50, 150, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Endurance | |
| 123 {100, 100, 100, 50, 10, 100, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Accuracy | |
| 124 {100, 100, 100, 120, 20, 120, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Speed | |
| 125 {100, 100, 100, 100, 200, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100}}; //Luck | |
| 126 | |
| 127 unsigned char pAgingAttributeModifier[7][4] = | |
| 128 {{100, 75, 40, 10}, //Might | |
| 129 {100, 150, 100, 10}, //Intelligence | |
| 130 {100, 150, 100, 10}, //Willpower | |
| 131 {100, 75, 40, 10}, //Endurance | |
| 132 {100, 100, 40, 10}, //Accuracy | |
| 133 {100, 100, 40, 10}, //Speed | |
| 134 {100, 100, 100, 100}}; //Luck | |
| 0 | 135 |
| 1684 | 136 unsigned int pAgeingTable[4] = {50, 100, 150, 0xFFFF}; |
| 0 | 137 |
|
1207
96a81634669e
arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents:
1205
diff
changeset
|
138 std::array<unsigned int, 18> pConditionImportancyTable = {{16, 15, 14, 17, 13, 2, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 1, 0}}; |
| 0 | 139 |
| 1036 | 140 short param_to_bonus_table[29] = {500, 400, 350, 300, 275, 250, 225, 200, 175, |
| 0 | 141 150, 125, 100, 75, 50, 40, 35, 30, 25, 21, |
| 1036 | 142 19, 17, 15, 13, 11, 9, 7, 5, 3, 0}; |
| 143 signed int parameter_to_bonus_value[29] = {30, 25, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, -1, -2, -3, -4, -5, -6}; | |
| 0 | 144 |
| 145 | |
| 816 | 146 unsigned short base_recovery_times_per_weapon_type[12] = |
| 147 { | |
| 148 100, // PLAYER_SKILL_STAFF && Unarmed withoud skill | |
| 149 90, // PLAYER_SKILL_SWORD && Unarmed with skill | |
| 150 60, // PLAYER_SKILL_DAGGER | |
| 151 100, // PLAYER_SKILL_AXE | |
| 152 80, // PLAYER_SKILL_SPEAR | |
| 153 100, // PLAYER_SKILL_BOW | |
| 154 80, // PLAYER_SKILL_MACE | |
| 155 30, // PLAYER_SKILL_BLASTER | |
| 156 10, // PLAYER_SKILL_SHIELD | |
| 157 10, // PLAYER_SKILL_LEATHER | |
| 158 20, // PLAYER_SKILL_CHAIN | |
| 159 30 // PLAYER_SKILL_PLATE | |
| 160 }; | |
| 161 | |
| 0 | 162 //----- (00490913) -------------------------------------------------------- |
| 1459 | 163 int PlayerCreation_GetUnspentAttributePointCount() |
| 0 | 164 { |
| 165 signed int v0; // edi@1 | |
| 1273 | 166 int raceId; // ebx@2 |
| 0 | 167 signed int v4; // eax@17 |
| 168 int v5; // edx@18 | |
| 169 signed int v6; // ecx@18 | |
| 1273 | 170 signed int remainingStatPoints; // [sp+Ch] [bp-8h]@1 |
| 171 | |
| 172 remainingStatPoints = 50; | |
| 0 | 173 v0 = 50; |
| 1273 | 174 for (int playerNum = 0; playerNum < 4; playerNum++) |
| 175 { | |
| 176 raceId = pParty->pPlayers[playerNum].GetRace(); | |
| 177 for (int statNum = 0; statNum <= 6; statNum++) | |
| 178 { | |
| 179 switch ( statNum ) | |
| 0 | 180 { |
| 1273 | 181 case 0: |
| 182 v0 = pParty->pPlayers[playerNum].uMight; | |
| 183 break; | |
| 184 case 1: | |
| 185 v0 = pParty->pPlayers[playerNum].uIntelligence; | |
| 186 break; | |
| 187 case 2: | |
| 188 v0 = pParty->pPlayers[playerNum].uWillpower; | |
| 189 break; | |
| 190 case 3: | |
| 191 v0 = pParty->pPlayers[playerNum].uEndurance; | |
| 192 break; | |
| 193 case 4: | |
| 194 v0 = pParty->pPlayers[playerNum].uAccuracy; | |
| 195 break; | |
| 196 case 5: | |
| 197 v0 = pParty->pPlayers[playerNum].uSpeed; | |
| 198 break; | |
| 199 case 6: | |
| 200 v0 = pParty->pPlayers[playerNum].uLuck; | |
| 201 break; | |
| 202 } | |
| 203 v4 = StatTable[raceId][statNum].uBaseValue; | |
| 204 if ( v0 >= v4 ) | |
| 205 { | |
| 206 v5 = StatTable[raceId][statNum].uDroppedStep; | |
| 207 v6 = StatTable[raceId][statNum].uBaseStep; | |
| 0 | 208 } |
| 209 else | |
| 210 { | |
| 1273 | 211 v5 = StatTable[raceId][statNum].uBaseStep; |
| 212 v6 = StatTable[raceId][statNum].uDroppedStep; | |
| 0 | 213 } |
| 1273 | 214 remainingStatPoints += v5 * (v4 - v0) / v6; |
| 215 } | |
| 216 } | |
| 217 return remainingStatPoints; | |
| 0 | 218 } |
| 219 | |
| 220 //----- (00427730) -------------------------------------------------------- | |
| 221 bool Player::CanCastSpell(unsigned int uRequiredMana) | |
| 222 { | |
| 1275 | 223 if (sMana >= (signed int)uRequiredMana) |
| 224 { | |
| 225 sMana -= (signed int)uRequiredMana; | |
| 488 | 226 return true; |
| 227 } | |
| 228 | |
| 229 pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0); | |
| 230 return false; | |
| 0 | 231 } |
| 232 | |
| 233 //----- (004BE2DD) -------------------------------------------------------- | |
| 1014 | 234 void Player::SalesProcess( unsigned int inventory_idnx, int item_index, int _2devent_idx ) |
| 235 { | |
| 0 | 236 float v6; // ST04_4@1 |
| 1014 | 237 signed int item_value; // eax@1 |
| 238 signed int sell_price; // ebx@1 | |
| 239 | |
| 240 item_value =pOwnItems[item_index].GetValue(); | |
| 241 v6 = p2DEvents[ _2devent_idx - 1].fPriceMultiplier; | |
| 242 sell_price = GetPriceSell(item_value, v6); | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
243 if ( pOwnItems[item_index].IsBroken() ) |
| 1014 | 244 sell_price = 1; |
| 245 if ( sell_price < 1 ) | |
| 246 sell_price = 1; | |
| 247 RemoveItemAtInventoryIndex(inventory_idnx); | |
| 248 Party::SetGold(pParty->uNumGold + sell_price); | |
| 0 | 249 } |
| 250 | |
| 251 //----- (0043EEF3) -------------------------------------------------------- | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
252 bool Player::NothingOrJustBlastersEquipped() |
| 0 | 253 { |
| 1014 | 254 signed int item_idx; // esi@1 |
| 255 signed int item_id; // esi@1 | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
256 for (int i = 0; i < 16; ++i) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
257 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
258 item_idx = pEquipment.pIndices[i]; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
259 if (item_idx) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
260 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
261 item_id = pOwnItems[item_idx - 1].uItemID; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
262 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
|
263 return false; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
264 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
265 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
266 return true; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
267 } |
| 0 | 268 |
| 269 //----- (004B8040) -------------------------------------------------------- | |
| 1036 | 270 int Player::GetConditionDayOfWeek( unsigned int uCondition ) |
| 271 { | |
| 272 return (unsigned int)(((signed __int64)((double)this->pConditions[uCondition] * 0.234375) / 60 / 60) / 24) % 7 + 1; | |
| 0 | 273 } |
| 274 | |
| 275 //----- (004B807C) -------------------------------------------------------- | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
276 int Player::GetTempleHealCostModifier(float a2) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
277 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
278 unsigned int conditionIdx; // eax@1 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
279 int conditionTimeMultiplier; // esi@1 |
| 0 | 280 int v6; // eax@8 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
281 signed int result; // qax@13 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
282 signed int baseConditionMultiplier; // [sp+8h] [bp-8h]@4 |
| 1275 | 283 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
284 conditionIdx = GetMajorConditionIdx(); |
| 1275 | 285 if ( conditionIdx >= 14 && conditionIdx <= 16) |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
286 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
287 if ( conditionIdx <= 15 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
288 baseConditionMultiplier = 5; |
| 1783 | 289 else //if ( conditionIdx == 16 ) |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
290 baseConditionMultiplier = 10; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
291 conditionTimeMultiplier = GetConditionDayOfWeek(conditionIdx); |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
292 } |
| 1350 | 293 else |
| 294 { | |
| 1275 | 295 conditionTimeMultiplier = 1; |
| 296 baseConditionMultiplier = 1; | |
| 1350 | 297 if (conditionIdx < 14) |
| 298 { | |
| 299 for (int i = 0; i <= 13; i++) | |
| 300 { | |
| 301 v6 = GetConditionDayOfWeek(i); | |
| 302 if ( v6 > conditionTimeMultiplier ) | |
| 303 conditionTimeMultiplier = v6; | |
| 304 } | |
| 305 } | |
| 1275 | 306 } |
| 307 result = (int)((double)conditionTimeMultiplier * (double)baseConditionMultiplier * a2); | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
308 if ( result < 1 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
309 result = 1; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
310 return result; |
| 0 | 311 } |
| 312 | |
| 313 //----- (004B8102) -------------------------------------------------------- | |
| 917 | 314 int Player::GetPriceSell(int uRealValue, float price_multiplier) |
| 0 | 315 { |
| 316 signed int v3; // esi@1 | |
| 317 signed int result; // eax@3 | |
| 318 | |
| 1275 | 319 v3 = (signed int)((signed __int64)((double)uRealValue / (price_multiplier + 2.0)) + uRealValue * GetMerchant() / 100); |
| 917 | 320 if ( v3 > uRealValue ) |
| 321 v3 = uRealValue; | |
| 0 | 322 result = 1; |
| 323 if ( v3 >= 1 ) | |
| 324 result = v3; | |
| 325 return result; | |
| 326 } | |
| 327 | |
| 328 //----- (004B8142) -------------------------------------------------------- | |
| 749 | 329 int Player::GetBuyingPrice(unsigned int uRealValue, float price_multiplier) |
| 330 { | |
| 1275 | 331 uint price = (uint)(((100 - GetMerchant()) * (uRealValue * price_multiplier)) / 100); |
| 749 | 332 |
| 333 if (price < uRealValue) | |
| 334 price = uRealValue; | |
| 335 return price; | |
| 0 | 336 } |
| 337 | |
| 338 //----- (004B8179) -------------------------------------------------------- | |
| 916 | 339 int Player::GetPriceIdentification(float a2) |
| 0 | 340 { |
| 341 signed int v2; // esi@1 | |
| 342 int v3; // ecx@1 | |
| 343 signed int result; // eax@3 | |
| 344 | |
| 1275 | 345 v2 = (signed int)(a2 * 50.0); |
| 0 | 346 v3 = v2 * (100 - GetMerchant()) / 100; |
| 347 if ( v3 < v2 / 3 ) | |
| 348 v3 = v2 / 3; | |
| 349 result = 1; | |
| 350 if ( v3 >= 1 ) | |
| 351 result = v3; | |
| 352 return result; | |
| 353 } | |
| 354 | |
| 355 //----- (004B81C3) -------------------------------------------------------- | |
| 916 | 356 int Player::GetPriceRepair(int a2, float a3) |
| 0 | 357 { |
| 358 signed int v3; // esi@1 | |
| 359 int v4; // ecx@1 | |
| 360 signed int result; // eax@3 | |
| 361 | |
| 1275 | 362 v3 = (signed int)((double)a2 / (6.0 - a3)); |
| 0 | 363 v4 = v3 * (100 - GetMerchant()) / 100; |
| 364 if ( v4 < v3 / 3 ) | |
| 365 v4 = v3 / 3; | |
| 366 result = 1; | |
| 367 if ( v4 >= 1 ) | |
| 368 result = v4; | |
| 369 return result; | |
| 370 } | |
| 371 | |
| 372 //----- (004B8213) -------------------------------------------------------- | |
| 1275 | 373 int Player::GetBaseSellingPrice(int a2, float a3) |
| 374 { | |
| 375 signed int v3; // qax@1 | |
| 376 | |
| 377 v3 = (signed int)((double)a2 / (a3 + 2.0)); | |
| 378 if ( v3 < 1 ) | |
| 379 v3 = 1; | |
| 0 | 380 return v3; |
| 381 } | |
| 382 | |
| 383 //----- (004B8233) -------------------------------------------------------- | |
| 1275 | 384 int Player::GetBaseBuyingPrice(int a2, float a3) |
| 385 { | |
| 386 signed int v3; // qax@1 | |
| 387 | |
| 388 v3 = (signed int)((double)a2 * a3); | |
| 389 if ( v3 < 1 ) | |
| 390 v3 = 1; | |
| 0 | 391 return v3; |
| 392 } | |
| 393 | |
| 394 //----- (004B824B) -------------------------------------------------------- | |
| 1275 | 395 int Player::GetBaseIdentifyPrice(float a2) |
| 396 { | |
| 397 signed int v2; // qax@1 | |
| 398 | |
| 399 v2 = (signed int)(a2 * 50.0); | |
| 400 if ( v2 < 1 ) | |
| 401 v2 = 1; | |
| 0 | 402 return v2; |
| 403 } | |
| 404 | |
| 405 //----- (004B8265) -------------------------------------------------------- | |
| 1275 | 406 int Player::GetBaseRepairPrice(int a2, float a3) |
| 407 { | |
| 408 signed int v3; // qax@1 | |
| 409 | |
| 410 v3 = (signed int)((double)a2 / (6.0 - a3)); | |
| 411 if ( v3 < 1 ) | |
| 412 v3 = 1; | |
| 0 | 413 return v3; |
| 414 } | |
| 415 | |
| 416 //----- (004B6FF9) -------------------------------------------------------- | |
| 1348 | 417 bool Player::IsPlayerHealableByTemple() |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
418 { |
| 1348 | 419 if (this->sHealth >= GetMaxHealth() && this->sMana >= GetMaxMana() && GetMajorConditionIdx() == Condition_Good) |
| 420 return false; | |
| 421 else | |
| 422 { | |
| 423 if (GetMajorConditionIdx() == Condition_Zombie) | |
| 424 { | |
| 2156 | 425 if (((signed int)window_SpeakInHouse->ptr_1C == 78 || (signed int)window_SpeakInHouse->ptr_1C == 81 || (signed int)window_SpeakInHouse->ptr_1C == 82)) |
| 1348 | 426 return false; |
| 427 else | |
| 428 return true; | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
429 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
430 else |
| 1348 | 431 return true; |
| 2156 | 432 } |
| 433 } | |
| 0 | 434 |
| 435 //----- (00421E75) -------------------------------------------------------- | |
| 1012 | 436 unsigned int Player::GetItemIDAtInventoryIndex(int *pitem_index) |
| 437 { | |
| 438 int item_idx; // eax@1 | |
| 439 int inv_index; // eax@3 | |
| 440 | |
| 441 item_idx = *pitem_index; | |
| 442 if ( item_idx >125 || item_idx < 0 ) | |
| 443 return 0; | |
| 2156 | 444 inv_index = this->pInventoryMatrix[item_idx]; |
| 445 if ( inv_index < 0 ) | |
| 446 { | |
| 447 *pitem_index = -1 - inv_index; | |
| 448 inv_index = this->pInventoryMatrix[-1 - inv_index]; | |
| 449 } | |
| 1012 | 450 return inv_index; |
| 0 | 451 } |
| 452 | |
| 453 //----- (004160CA) -------------------------------------------------------- | |
| 1012 | 454 void Player::ItemsEnchant( int enchant_count ) |
| 455 { | |
| 456 int avalible_items; // ebx@1 | |
| 457 int i; // edx@8 | |
| 458 __int16 item_index_tabl[138]; // [sp+Ch] [bp-118h]@1 | |
| 459 | |
| 460 avalible_items = 0; | |
| 461 memset (item_index_tabl,0,sizeof(item_index_tabl)); | |
| 462 | |
| 1349 | 463 for (i = 0; i < 138; ++i) |
| 464 { | |
| 465 if (( pOwnItems[i].uItemID>0)&&(pOwnItems[i].uItemID <= 134)) | |
| 466 item_index_tabl[avalible_items++] = i; | |
| 467 } | |
| 1012 | 468 |
| 469 if ( avalible_items ) | |
| 470 { | |
| 471 if ( enchant_count ) | |
| 472 { | |
| 1349 | 473 for ( i = 0; i < enchant_count; ++i ) |
| 474 { | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
475 if (!(pInventoryItemList[item_index_tabl[i]].uAttributes&ITEM_HARDENED)) |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
476 pInventoryItemList[item_index_tabl[rand() % avalible_items]].uAttributes |= ITEM_HARDENED; |
| 1349 | 477 } |
| 0 | 478 } |
| 479 else | |
| 480 { | |
| 1012 | 481 for ( i = 0; i < avalible_items; ++i ) |
| 482 { | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
483 pInventoryItemList[item_index_tabl[i]].uAttributes |= ITEM_HARDENED; |
| 1349 | 484 } |
| 485 } | |
| 486 } | |
| 0 | 487 } |
| 488 | |
| 489 //----- (004948B1) -------------------------------------------------------- | |
| 187 | 490 void Player::PlaySound(PlayerSpeech speech, int a3) |
| 491 { | |
| 1351 | 492 signed int speechCount = 0; // esi@4 |
| 493 signed int expressionCount = 0; // esi@4 | |
| 494 int pickedVariant; // esi@10 | |
| 248 | 495 CHARACTER_EXPRESSION_ID expression; // ebx@17 |
| 1406 | 496 signed int pSoundID; // ecx@19 |
| 1351 | 497 int speechVariantArray[5]; // [sp+Ch] [bp-1Ch]@7 |
| 498 int expressionVariantArray[5]; | |
| 499 unsigned int pickedSoundID; // [sp+30h] [bp+8h]@4 | |
| 500 unsigned int expressionDuration = 0; | |
| 187 | 501 |
| 1351 | 502 pickedSoundID = 0; |
| 203 | 503 if (uVoicesVolumeMultiplier) |
| 0 | 504 { |
| 1351 | 505 for (int i = 0; i < 2; i++) |
| 506 { | |
| 1406 | 507 if ( SoundSetAction[speech][i] ) |
| 508 { | |
| 509 speechVariantArray[speechCount] = SoundSetAction[speech][i]; | |
| 1351 | 510 speechCount++; |
| 511 } | |
| 512 } | |
| 513 if ( speechCount ) | |
| 514 { | |
| 515 pickedVariant = speechVariantArray[rand() % speechCount]; | |
| 516 int numberOfSubvariants = byte_4ECF08[pickedVariant - 1][uVoiceID]; | |
| 517 if (numberOfSubvariants > 0) | |
| 518 { | |
| 519 pickedSoundID = rand() % numberOfSubvariants + 2 * (pickedVariant + 50 * uVoiceID) + 4998; | |
| 1406 | 520 pAudioPlayer->PlaySound((SoundID)pickedSoundID, PID(OBJECT_Player, uActiveCharacter + 39), 0, -1, 0, 0, (int)(pSoundVolumeLevels[uVoicesVolumeMultiplier] * 128.0f), 0); |
| 1351 | 521 } |
| 522 } | |
| 523 } | |
| 524 | |
| 525 for (int i = 0; i < 5; i++) | |
| 526 { | |
| 1406 | 527 if ( SoundSetAction[speech][i + 3] ) |
| 528 { | |
| 529 expressionVariantArray[expressionCount] = SoundSetAction[speech][i + 3]; | |
| 1351 | 530 expressionCount++; |
| 531 } | |
| 532 } | |
| 533 if ( expressionCount ) | |
| 534 { | |
| 535 expression = (CHARACTER_EXPRESSION_ID)expressionVariantArray[rand() % expressionCount]; | |
| 536 if (expression == CHARACTER_EXPRESSION_21 && pickedSoundID ) | |
| 537 { | |
| 1406 | 538 pSoundID = 0; |
| 539 if ( pSoundList->sNumSounds ) | |
| 540 { | |
| 1351 | 541 for (int i = 0; i < pSoundList->sNumSounds; i++) |
| 0 | 542 { |
| 2113 | 543 if (pSoundList->pSL_Sounds[i].uSoundID == pickedSoundID) |
| 1406 | 544 pSoundID = i; |
| 0 | 545 } |
| 546 } | |
| 2113 | 547 if ( pSoundList->pSL_Sounds[pSoundID].pSoundData[0] ) |
| 1351 | 548 expressionDuration = (sLastTrackLengthMS << 7) / 1000; |
| 549 } | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
550 PlayEmotion(expression, expressionDuration); |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
551 } |
| 0 | 552 } |
| 553 // 4948B1: using guessed type int var_1C[5]; | |
| 554 | |
| 555 //----- (00494A25) -------------------------------------------------------- | |
| 187 | 556 void Player::PlayEmotion(CHARACTER_EXPRESSION_ID new_expression, int a3) |
| 557 { | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
558 unsigned int v3 = expression; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
559 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
|
560 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
561 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
562 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
563 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
|
564 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
565 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
566 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
567 else |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
568 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
569 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
|
570 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
571 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
|
572 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
573 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
574 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
575 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
576 } |
| 0 | 577 this->uExpressionTimePassed = 0; |
| 578 if ( !a3 ) | |
| 579 { | |
| 187 | 580 this->uExpressionTimeLength = 8 * pPlayerFrameTable->pFrames[a3].uAnimLength; |
| 581 } | |
|
1353
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
582 else |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
583 { |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
584 this->uExpressionTimeLength = 0; |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
585 } |
| 187 | 586 expression = new_expression; |
| 0 | 587 viewparams->bRedrawGameUI = 1; |
| 588 } | |
| 589 | |
| 590 //----- (0049327B) -------------------------------------------------------- | |
| 1355 | 591 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
|
592 { |
| 135 | 593 if ( this->classType == uClass ) |
| 0 | 594 { |
|
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
|
595 return true; |
| 0 | 596 } |
| 597 else | |
| 598 { | |
|
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
|
599 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
|
600 { |
|
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
|
601 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
|
602 } |
| 0 | 603 switch ( uClass ) |
| 604 { | |
| 605 case 0x1Au: | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
606 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 65)); |
| 0 | 607 case 0x1Bu: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
608 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 67)); |
| 0 | 609 case 0x22u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
610 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 77)); |
| 0 | 611 case 0x23u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
612 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 79)); |
| 0 | 613 break; |
| 614 default: | |
| 1545 | 615 Error("Should not be able to get here (%u)", uClass); |
| 0 | 616 break; |
| 617 } | |
|
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
|
618 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
|
619 } |
| 0 | 620 } |
| 621 | |
| 622 | |
| 623 //----- (00492C0B) -------------------------------------------------------- | |
| 624 bool Player::CanAct() | |
| 625 { | |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
626 if ( this->IsAsleep() || this->IsParalyzed() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
627 this->IsUnconcious() || this->IsDead() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
628 this->IsPertified() || this->IsEradicated() ) |
| 1355 | 629 return false; |
| 0 | 630 else |
| 1355 | 631 return true; |
| 0 | 632 } |
| 633 | |
| 634 //----- (00492C40) -------------------------------------------------------- | |
| 635 bool Player::CanSteal() | |
| 636 { | |
| 1355 | 637 return GetActualSkillLevel(PLAYER_SKILL_STEALING) != 0; |
| 0 | 638 } |
| 639 | |
| 640 //----- (00492C4E) -------------------------------------------------------- | |
| 641 bool Player::CanEquip_RaceAndAlignmentCheck(unsigned int uItemID) | |
| 642 { | |
|
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
|
643 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
|
644 { |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
645 case ITEM_RELIC_ETHRICS_STAFF: |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
646 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
|
647 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
|
648 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
|
649 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
|
650 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
|
651 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
|
652 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
|
653 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
|
654 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
|
655 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
|
656 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
|
657 default: return 1; break; |
|
1356
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
658 } |
|
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
659 } |
|
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
|
660 |
| 0 | 661 //----- (00492D65) -------------------------------------------------------- |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
662 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
|
663 { |
|
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
|
664 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
|
665 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
|
666 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
|
667 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
|
668 |
|
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
|
669 if ( pConditions[uConditionIdx] ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
670 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
671 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
672 if (!ConditionProcessor::IsPlayerAffected(this, uConditionIdx, a3)) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
673 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
674 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
675 } |
|
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
|
676 |
|
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
|
677 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
|
678 { |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
679 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
|
680 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
|
681 case Condition_Sleep: break; //nosound |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
682 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
|
683 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
|
684 case Condition_Insane: PlaySound(SPEECH_29, 0); break; |
| 2187 | 685 case Condition_Poison_Weak: |
| 686 case Condition_Poison_Medium: | |
| 687 case Condition_Poison_Severe: PlaySound(SPEECH_27, 0); break; | |
| 688 case Condition_Disease_Weak: | |
| 689 case Condition_Disease_Medium: | |
| 690 case Condition_Disease_Severe: PlaySound(SPEECH_28, 0);break; | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
691 case Condition_Paralyzed: break; //nosound |
| 1014 | 692 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
|
693 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
|
694 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
|
695 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
|
696 break; |
| 1014 | 697 case Condition_Dead: |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
698 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
|
699 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
|
700 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
|
701 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
|
702 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
|
703 break; |
| 1014 | 704 case Condition_Pertified: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
705 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
|
706 break; |
| 1014 | 707 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
|
708 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
|
709 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
|
710 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
|
711 if ( sMana > 0 ) |
| 1014 | 712 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
|
713 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
|
714 case Condition_Zombie: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
715 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
|
716 return; |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
717 pConditions.fill(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
|
718 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
|
719 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
|
720 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
|
721 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
|
722 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
|
723 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
|
724 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
725 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
|
726 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
|
727 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
728 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
|
729 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
730 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
|
731 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
|
732 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
733 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
|
734 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
|
735 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
736 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
737 players_before = 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
738 for (int i = 1; i < 5; ++i) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
739 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
740 if ( pPlayers[i]->CanAct() ) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
741 ++players_before; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
742 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
743 |
| 2187 | 744 pConditions[uConditionIdx] = pParty->uTimePlayed; |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
745 |
|
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 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
|
747 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
|
748 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
|
749 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
750 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
|
751 { |
|
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 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
|
753 ++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
|
754 } |
|
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 } |
|
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 if (( players_before == 2 ) && ( players_after == 1 )) |
| 2187 | 757 pPlayers[remainig_player]->PlaySound(SPEECH_107, 0);//ñêîðåå âñåãî îáíàä¸æûâàþùèé âîçãëàñ ïîñëåäíåãî |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
758 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
|
759 } |
| 0 | 760 |
| 761 //----- (00492528) -------------------------------------------------------- | |
| 762 bool Player::CanFitItem(unsigned int uSlot, unsigned int uItemID) | |
| 763 { | |
| 1363 | 764 Texture *texture; // esi@1 |
| 765 unsigned int slotWidth; // ebx@1 | |
| 766 unsigned int slotHeight; // [sp+1Ch] [bp+Ch]@1 | |
| 767 | |
| 768 texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); | |
| 769 slotWidth = GetSizeInInventorySlots(texture->uTextureWidth); | |
| 770 slotHeight = GetSizeInInventorySlots(texture->uTextureHeight); | |
| 0 | 771 if ( !areWeLoadingTexture ) |
| 772 { | |
| 1363 | 773 texture->Release(); |
| 1006 | 774 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 775 } |
| 1555 | 776 Assert(slotHeight > 0 && slotWidth > 0, "Items should have nonzero dimensions"); |
| 1363 | 777 if ( (slotWidth + uSlot % INVETORYSLOTSWIDTH) <= INVETORYSLOTSWIDTH && (slotHeight + uSlot / INVETORYSLOTSWIDTH) <= INVETORYSLOTSHEIGHT ) |
| 778 { | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
779 for (unsigned int x = 0; x < slotWidth; x++) |
| 1363 | 780 { |
|
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
|
781 for (unsigned int y = 0; y < slotHeight; y++) |
| 1363 | 782 { |
|
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
|
783 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
|
784 { |
|
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
|
785 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
|
786 } |
| 1363 | 787 } |
| 788 } | |
| 789 return true; | |
| 790 } | |
| 791 return false; | |
| 0 | 792 } |
| 793 // 506128: using guessed type int areWeLoadingTexture; | |
| 794 | |
| 795 //----- (004925E6) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
796 int Player::FindFreeInventoryListSlot() |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
797 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
798 for (int i = 0; i < 126; i++ ) |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
799 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
800 if (pInventoryItemList[i].uItemID == 0) |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
801 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
802 return i; |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
803 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
804 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
805 return -1; |
| 0 | 806 } |
| 807 | |
| 808 //----- (00492600) -------------------------------------------------------- | |
| 809 int Player::CreateItemInInventory(unsigned int uSlot, unsigned int uItemID) | |
| 810 { | |
| 811 int result; // eax@8 | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
812 signed int freeSlot; // [sp+8h] [bp-4h]@4 |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
813 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
814 freeSlot = FindFreeInventoryListSlot(); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
815 if ( freeSlot == -1 ) |
| 0 | 816 { |
| 817 if ( uActiveCharacter ) | |
| 201 | 818 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NoRoom, 0); |
|
1366
8f339c3bbdaf
Player::CreateItemInInventory small bugfix from previous change
Grumpy7
parents:
1365
diff
changeset
|
819 return 0; |
| 0 | 820 } |
| 821 else | |
| 822 { | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
823 PutItemArInventoryIndex(uItemID, freeSlot, uSlot); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
824 result = freeSlot + 1; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
825 this->pInventoryItemList[freeSlot].uItemID = uItemID; |
| 0 | 826 } |
| 827 return result; | |
| 828 } | |
| 829 // 506128: using guessed type int areWeLoadingTexture; | |
| 830 | |
| 831 //----- (00492700) -------------------------------------------------------- | |
| 832 int Player::HasSkill(unsigned int uSkillType) | |
| 833 { | |
| 1374 | 834 if ( uSkillType >= 37 || this->pActiveSkills[uSkillType] ) |
| 835 { | |
| 836 return 1; | |
| 0 | 837 } |
| 838 else | |
| 839 { | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
840 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[67], this->pName); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
841 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1374 | 842 return 0; |
| 843 } | |
| 0 | 844 } |
| 845 | |
| 846 //----- (00492745) -------------------------------------------------------- | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
847 void Player::WearItem( unsigned int uItemID ) |
| 0 | 848 { |
| 1010 | 849 int item_body_anch; // edi@6 |
| 850 int item_indx; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
851 item_indx = FindFreeInventoryListSlot(); |
| 1010 | 852 |
| 853 if ( item_indx != -1 ) | |
| 854 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
855 pInventoryItemList[item_indx].uItemID = uItemID; |
| 1374 | 856 item_body_anch = pEquipTypeToBodyAnchor[pItemsTable->pItems[uItemID].uEquipType]; |
| 857 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
|
858 pInventoryItemList[item_indx].uBodyAnchor = item_body_anch + 1; |
| 0 | 859 } |
| 860 } | |
| 861 | |
| 862 //----- (004927A8) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
863 int Player::AddItem(int index, unsigned int uItemID) |
| 0 | 864 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
865 if ( index == -1 ) |
| 0 | 866 { |
| 1385 | 867 for (int xcoord = 0; xcoord < INVETORYSLOTSWIDTH; xcoord++) |
| 868 { | |
|
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
|
869 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) |
| 0 | 870 { |
|
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
|
871 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
|
872 { |
|
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
|
873 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
|
874 } |
| 0 | 875 } |
| 1385 | 876 } |
| 0 | 877 return 0; |
| 878 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
879 if ( !CanFitItem(index, uItemID) ) |
| 0 | 880 { |
| 1754 | 881 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0); |
| 0 | 882 return 0; |
| 883 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
884 return CreateItemInInventory(index, uItemID); |
| 0 | 885 } |
| 886 | |
| 887 //----- (00492826) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
888 int Player::AddItem2(int index, ItemGen *Src) |
| 0 | 889 { |
| 890 pItemsTable->SetSpecialBonus(Src); | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
891 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
892 if ( index == -1 ) |
| 0 | 893 { |
|
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
|
894 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
|
895 { |
|
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
|
896 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) //TODO: change pInventoryMatrix to 2 dimensional array. |
| 1385 | 897 { |
|
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
|
898 if ( CanFitItem(ycoord * INVETORYSLOTSWIDTH + xcoord, Src->uItemID) ) |
| 0 | 899 { |
|
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
|
900 return CreateItemInInventory2(ycoord * INVETORYSLOTSWIDTH + xcoord, Src); |
| 0 | 901 } |
| 1385 | 902 } |
| 0 | 903 } |
| 904 return 0; | |
| 905 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
906 if ( !CanFitItem(index, Src->uItemID) ) |
| 0 | 907 return 0; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
908 return CreateItemInInventory2(index, Src); |
| 0 | 909 } |
| 910 | |
| 911 //----- (0049289C) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
912 int Player::CreateItemInInventory2( unsigned int index, ItemGen *Src ) |
| 0 | 913 { |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
914 signed int freeSlot; // ebx@1 |
| 0 | 915 int result; // eax@6 |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
916 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
917 freeSlot = FindFreeInventoryListSlot(); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
918 if ( freeSlot == -1 ) |
| 0 | 919 { |
| 920 result = 0; | |
| 921 } | |
| 922 else | |
| 923 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
924 PutItemArInventoryIndex(Src->uItemID, freeSlot, index); |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
925 memcpy(&pInventoryItemList[freeSlot], Src, sizeof(ItemGen)); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
926 result = freeSlot + 1; |
| 0 | 927 } |
| 928 return result; | |
| 929 } | |
| 930 // 506128: using guessed type int areWeLoadingTexture; | |
| 931 | |
| 932 //----- (0049298B) -------------------------------------------------------- | |
| 1385 | 933 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
|
934 { |
| 1014 | 935 Texture *item_texture; // esi@1 |
| 936 int *pInvPos; // esi@4 | |
| 937 unsigned int slot_width; // [sp+Ch] [bp-4h]@1 | |
| 938 unsigned int slot_height; // [sp+18h] [bp+8h]@1 | |
| 939 | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
940 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1014 | 941 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); |
| 942 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 943 if ( !areWeLoadingTexture ) |
| 944 { | |
| 1014 | 945 item_texture->Release(); |
| 1006 | 946 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 947 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
948 if ( slot_width > 0 ) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
949 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
950 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
951 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
952 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
953 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
|
954 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
955 } |
| 1014 | 956 } |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
957 pInventoryMatrix[index] = itemListPos + 1; |
| 0 | 958 } |
| 278 | 959 |
| 0 | 960 // 506128: using guessed type int areWeLoadingTexture; |
| 961 | |
| 962 //----- (00492A36) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
963 void Player::RemoveItemAtInventoryIndex( unsigned int index ) |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
964 { |
| 1014 | 965 ItemGen *item_in_slot; // ecx@1 |
| 966 Texture *item_texture; // esi@1 | |
| 967 unsigned int slot_height; // ebp@1 | |
| 968 int *pInvPos; // edx@4 | |
| 969 unsigned int slot_width; // [sp+14h] [bp+4h]@1 | |
| 970 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
971 item_in_slot = &this->pInventoryItemList[pInventoryMatrix[index]-1]; |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
972 item_texture = pIcons_LOD->LoadTexturePtr(item_in_slot->GetIconName(), TEXTURE_16BIT_PALETTE); |
| 1014 | 973 item_in_slot->Reset(); |
| 974 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); | |
| 975 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 976 if ( !areWeLoadingTexture ) |
| 977 { | |
| 1014 | 978 item_texture->Release(); |
| 1006 | 979 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 980 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
981 if ( slot_width > 0 ) |
| 1014 | 982 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
983 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
984 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
985 { |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
986 memset32(pInvPos, 0, slot_width); |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
987 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
988 } |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
989 } |
| 0 | 990 } |
| 991 // 506128: using guessed type int areWeLoadingTexture; | |
| 992 | |
| 993 //----- (00490EEE) -------------------------------------------------------- | |
| 1386 | 994 int Player::SelectPhrasesTransaction(ItemGen *pItem, int building_type, int BuildID_2Events, int ShopMenuType) //TODO: probably move this somewhere else, not really Player:: stuff |
| 995 { | |
| 996 unsigned int idemId; // edx@1 | |
| 997 signed int equipType; // esi@1 | |
| 998 float multiplier; // ST04_4@26 | |
| 999 int price; // edi@26 | |
| 1000 int merchantLevel; // [sp+10h] [bp-8h]@1 | |
| 1001 int itemValue; | |
| 1002 | |
| 1003 merchantLevel = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); | |
| 1004 idemId = pItem->uItemID; | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1005 equipType = pItem->GetItemEquipType(); |
| 1386 | 1006 itemValue = pItem->GetValue(); |
| 1007 | |
| 1008 switch (building_type) | |
| 1009 { | |
| 1411 | 1010 case BuildingType_WeaponShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1011 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1012 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1013 if (equipType > EQUIP_BOW) |
| 1386 | 1014 return 4; |
| 1015 break; | |
| 1411 | 1016 case BuildingType_ArmorShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1017 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1018 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1019 if ( equipType < EQUIP_ARMOUR || equipType > EQUIP_BOOTS) |
| 1386 | 1020 return 4; |
| 1021 break; | |
| 1411 | 1022 case BuildingType_MagicShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1023 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1024 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1025 if ( pItemsTable->pItems[idemId].uSkillType != PLAYER_SKILL_MISC ) |
| 1386 | 1026 return 4; |
| 1027 break; | |
| 1411 | 1028 case BuildingType_AlchemistShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1029 if ((idemId >= ITEM_ARTIFACT_HERMES_SANDALS && idemId < ITEM_RECIPE_REJUVENATION) || idemId > ITEM_RECIPE_BODY_RESISTANCE) |
| 1386 | 1030 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1031 if ( !(equipType == EQUIP_REAGENT || equipType == EQUIP_POTION || equipType == EQUIP_MESSAGE_SCROLL)) |
| 1386 | 1032 return 4; |
| 1033 break; | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1034 default: |
| 1545 | 1035 Error("(%u)", building_type); |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1036 break; |
| 1386 | 1037 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1038 if (pItem->IsStolen()) |
| 1386 | 1039 return 6; |
| 1040 | |
| 1041 multiplier = p2DEvents[BuildID_2Events - 1].fPriceMultiplier; | |
| 1042 switch (ShopMenuType) | |
| 1043 { | |
| 1044 case 2: | |
| 1045 price = GetBuyingPrice(itemValue, multiplier); | |
| 1046 break; | |
| 1047 case 3: | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1048 if (pItem->IsBroken()) |
| 1386 | 1049 price = 1; |
| 917 | 1050 else |
| 1386 | 1051 price = this->GetPriceSell(itemValue, multiplier); |
| 1052 break; | |
| 1053 case 4: | |
| 1054 price = this->GetPriceIdentification(multiplier); | |
| 1055 break; | |
| 1056 case 5: | |
| 1057 price = this->GetPriceRepair(itemValue, multiplier); | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1058 break; |
|
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1059 default: |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1060 Error("(%u)", ShopMenuType); |
| 1386 | 1061 break; |
| 1062 } | |
| 1063 if ( merchantLevel ) | |
| 1064 { | |
| 1065 if (price == itemValue) | |
| 1066 { | |
| 1067 return 3; | |
| 1068 } | |
| 917 | 1069 else |
| 1386 | 1070 { |
| 1071 return 2; | |
| 1072 } | |
| 1073 } | |
| 0 | 1074 else |
| 1386 | 1075 { |
| 1076 return 1; | |
| 1077 } | |
| 0 | 1078 } |
| 1079 | |
| 1080 //----- (0049107D) -------------------------------------------------------- | |
| 1081 int Player::GetBodybuilding() | |
| 1082 { | |
| 1010 | 1083 int v1; // al@1 |
| 0 | 1084 |
| 1085 v1 = GetActualSkillLevel(PLAYER_SKILL_BODYBUILDING); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1086 int multiplier = GetMultiplierForSkillLevel(v1, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1087 return multiplier * (v1 & 0x3F); |
| 0 | 1088 } |
| 1089 | |
| 1090 //----- (004910A8) -------------------------------------------------------- | |
| 607 | 1091 int Player::GetMeditation() |
| 0 | 1092 { |
| 1010 | 1093 int v1; // al@1 |
| 0 | 1094 |
| 1095 v1 = GetActualSkillLevel(PLAYER_SKILL_MEDITATION); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1096 int multiplier = GetMultiplierForSkillLevel(v1, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1097 return multiplier * (v1 & 0x3F); |
| 0 | 1098 } |
| 1099 | |
| 1100 //----- (004910D3) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1101 bool Player::CanIdentify( ItemGen *pItem ) |
| 0 | 1102 { |
| 1103 unsigned __int16 v2; // ax@1 | |
| 1104 int v5; // edi@7 | |
| 652 | 1105 if (CheckHiredNPCSpeciality(Scholar)) |
| 1106 return true; | |
| 0 | 1107 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1108 v2 = GetActualSkillLevel(PLAYER_SKILL_ITEM_ID); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1109 if ( (signed int)SkillToMastery(v2) >= 4 ) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1110 return true; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1111 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1112 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1113 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1114 return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St; |
| 0 | 1115 } |
| 1116 | |
| 1117 //----- (00491151) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1118 bool Player::CanRepair( ItemGen *pItem ) |
| 0 | 1119 { |
| 1120 unsigned __int16 v2; // ax@1 | |
| 1121 int v5; // edi@7 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1122 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1123 ITEM_EQUIP_TYPE equipType = pItem->GetItemEquipType(); |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1124 if (CheckHiredNPCSpeciality(Smith) && equipType <= 2 || |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1125 CheckHiredNPCSpeciality(Armorer) && equipType >= 3 && equipType <= 9 || |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1126 CheckHiredNPCSpeciality(Alchemist) && equipType >= 9 ) |
| 652 | 1127 return true; |
| 1128 | |
| 1010 | 1129 v2 = GetActualSkillLevel(PLAYER_SKILL_REPAIR); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1130 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 0 | 1131 return true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1132 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1133 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1134 v5 = multiplier * (v2 & 0x3F); |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1135 return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St; |
| 0 | 1136 } |
| 1137 | |
| 1138 //----- (004911F3) -------------------------------------------------------- | |
| 1139 int Player::GetMerchant() | |
| 1140 { | |
| 1141 unsigned __int16 v2; // ax@1 | |
| 1142 int v5; // edi@1 | |
| 1143 int v7; // eax@3 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1144 |
| 607 | 1145 v2 = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1146 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1147 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1148 |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
1149 v7 = pParty->GetPartyReputation(); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1150 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1151 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1152 if (v5 == 0) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1153 { |
| 0 | 1154 return -v7; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1155 } |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1156 return v5 - v7 + 7; |
| 0 | 1157 } |
| 1158 | |
| 1159 //----- (0049125A) -------------------------------------------------------- | |
| 1160 int Player::GetPerception() | |
| 1161 { | |
| 1162 unsigned __int16 v2; // ax@1 | |
| 1163 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1164 |
| 1010 | 1165 v2 = GetActualSkillLevel(PLAYER_SKILL_PERCEPTION); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1166 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1167 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1168 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1169 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1170 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1171 return v5; |
| 0 | 1172 } |
| 1173 | |
| 1174 //----- (004912B0) -------------------------------------------------------- | |
| 1175 int Player::GetDisarmTrap() | |
| 1176 { | |
| 1177 unsigned __int16 v2; // ax@1 | |
| 1178 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1179 |
| 1010 | 1180 v2 = GetActualSkillLevel(PLAYER_SKILL_TRAP_DISARM); |
| 0 | 1181 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 1182 return 10000; | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1183 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1184 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1185 if ( HasEnchantedItemEquipped(35) ) //only the real skill level is supposed to be added again, not the multiplied value |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1186 multiplier++; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1187 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1188 return v5; |
| 0 | 1189 } |
| 1190 | |
| 1191 //----- (00491317) -------------------------------------------------------- | |
| 1192 char Player::GetLearningPercent() | |
| 1193 { | |
| 1194 int v2; // eax@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1195 |
| 1010 | 1196 v2 = GetActualSkillLevel(PLAYER_SKILL_LEARNING); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1197 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1198 return multiplier * v2 + 9; |
| 0 | 1199 } |
| 1200 | |
| 1201 //----- (0048C6AF) -------------------------------------------------------- | |
| 1202 Player::Player() | |
| 1203 { | |
| 1204 memset(&pEquipment, 0, sizeof(PlayerEquipment)); | |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
1205 pInventoryMatrix.fill(0); |
| 0 | 1206 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
|
1207 pInventoryItemList[i].Reset(); |
| 0 | 1208 for (uint i = 0; i < 12; ++i) |
| 1209 pEquippedItems[i].Reset(); | |
| 1210 | |
| 1211 | |
| 1212 for (uint i = 0; i < 24; ++i) | |
| 1213 { | |
| 1214 pPlayerBuffs[i].uSkill = 0; | |
| 1215 pPlayerBuffs[i].uSkill = 0; | |
| 1216 pPlayerBuffs[i].uPower = 0; | |
| 1217 pPlayerBuffs[i].uExpireTime = 0; | |
| 1218 pPlayerBuffs[i].uCaster = 0; | |
| 1219 pPlayerBuffs[i].uFlags = 0; | |
| 1220 } | |
| 1221 | |
| 1222 pName[0] = 0; | |
| 1014 | 1223 uCurrentFace = 0; |
| 0 | 1224 uVoiceID = 0; |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
1225 pConditions.fill(0); |
| 0 | 1226 |
| 1227 field_BB = 0; | |
| 1228 | |
| 1229 uMight = uMightBonus = 0; | |
| 1230 uIntelligence = uIntelligenceBonus = 0; | |
| 1231 uWillpower = uWillpowerBonus = 0; | |
| 1232 uEndurance = uEnduranceBonus = 0; | |
| 1233 uSpeed = uSpeedBonus = 0; | |
| 1234 uAccuracy = uAccuracyBonus = 0; | |
| 1235 uLuck = uLuckBonus = 0; | |
| 1236 uLevel = sLevelModifier = 0; | |
| 1237 sAgeModifier = 0; | |
|
1388
60d4885eb107
sACModifier zeroed in player constructor so AC is not always 0(or -some value) ingame
Grumpy7
parents:
1387
diff
changeset
|
1238 sACModifier = 0; |
| 0 | 1239 |
| 1019 | 1240 // memset(field_1F5, 0, 30); |
| 1241 pure_luck_used=0; | |
| 1242 pure_speed_used=0; | |
| 1243 pure_intellect_used=0; | |
| 1244 pure_endurance_used=0; | |
| 1245 pure_willpower_used=0; | |
| 1246 pure_accuracy_used=0; | |
| 1247 pure_might_used=0; | |
| 0 | 1248 |
| 1249 sResFireBase = sResFireBonus = 0; | |
| 1250 sResAirBase = sResAirBonus = 0; | |
| 1251 sResWaterBase = sResWaterBonus = 0; | |
| 1252 sResEarthBase = sResEarthBonus = 0; | |
| 1253 sResMagicBase = sResMagicBonus = 0; | |
| 1254 sResSpiritBase = sResSpiritBonus = 0; | |
| 1255 sResMindBase = sResMindBonus = 0; | |
| 1256 sResBodyBase = sResBodyBonus = 0; | |
| 1257 sResLightBase = sResLightBonus = 0; | |
| 1258 sResDarkBase = sResDarkBonus = 0; | |
| 1259 | |
| 1260 uTimeToRecovery = 0; | |
| 1261 | |
| 1262 uSkillPoints = 0; | |
| 1263 | |
| 1264 sHealth = 0; | |
| 1265 uFullHealthBonus = 0; | |
| 1266 _health_related = 0; | |
| 1267 | |
| 1268 sMana = 0; | |
| 1269 uFullManaBonus = 0; | |
| 1270 _mana_related = 0; | |
| 1271 | |
| 1272 uQuickSpell = 0; | |
| 1826 | 1273 memset(pInstalledBeacons.data(), 0, 5 * sizeof(LloydBeacon)); |
| 0 | 1274 |
| 1275 _some_attack_bonus = 0; | |
| 1276 field_1A91 = 0; | |
| 1277 _melee_dmg_bonus = 0; | |
| 1278 field_1A93 = 0; | |
| 1279 _ranged_atk_bonus = 0; | |
| 1280 field_1A95 = 0; | |
| 1281 _ranged_dmg_bonus = 0; | |
| 1282 field_1A97 = 0; | |
| 1283 | |
| 130 | 1284 expression = CHARACTER_EXPRESSION_INVALID; |
| 0 | 1285 uExpressionTimePassed = 0; |
| 1286 uExpressionTimeLength = 0; | |
| 1287 | |
| 1288 uNumDivineInterventionCastsThisDay = 0; | |
| 1289 uNumArmageddonCasts = 0; | |
| 1290 uNumFireSpikeCasts = 0; | |
| 1291 | |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
1292 memset(field_1988, 0, sizeof(field_1988)); |
|
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
1293 memset(playerEventBits, 0, sizeof(playerEventBits)); |
| 0 | 1294 |
| 1295 field_E0 = 0; | |
| 1296 field_E4 = 0; | |
| 1297 field_E8 = 0; | |
| 1298 field_EC = 0; | |
| 1299 field_F0 = 0; | |
| 1300 field_F4 = 0; | |
| 1301 field_F8 = 0; | |
| 1302 field_FC = 0; | |
| 1303 field_100 = 0; | |
| 1304 field_104 = 0; | |
| 198 | 1305 |
|
554
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1306 _expression21_animtime = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1307 _expression21_frameset = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1308 |
| 198 | 1309 lastOpenedSpellbookPage = 0; |
| 0 | 1310 } |
| 1311 | |
| 1312 | |
| 1313 //----- (0048C855) -------------------------------------------------------- | |
| 1314 int Player::GetBaseStrength() | |
| 1315 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1316 return this->uMight + GetItemsBonus(CHARACTER_ATTRIBUTE_STRENGTH); |
| 0 | 1317 } |
| 1318 | |
| 1319 //----- (0048C86C) -------------------------------------------------------- | |
| 1320 int Player::GetBaseIntelligence() | |
| 1321 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1322 return this->uIntelligence + GetItemsBonus(CHARACTER_ATTRIBUTE_INTELLIGENCE); |
| 0 | 1323 } |
| 1324 | |
| 1325 //----- (0048C883) -------------------------------------------------------- | |
| 1326 int Player::GetBaseWillpower() | |
| 1327 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1328 return this->uWillpower + GetItemsBonus(CHARACTER_ATTRIBUTE_WILLPOWER); |
| 0 | 1329 } |
| 1330 | |
| 1331 //----- (0048C89A) -------------------------------------------------------- | |
| 1332 int Player::GetBaseEndurance() | |
| 1333 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1334 return this->uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE); |
| 0 | 1335 } |
| 1336 | |
| 1337 //----- (0048C8B1) -------------------------------------------------------- | |
| 1338 int Player::GetBaseAccuracy() | |
| 1339 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1340 return this->uAccuracy + GetItemsBonus(CHARACTER_ATTRIBUTE_ACCURACY); |
| 0 | 1341 } |
| 1342 | |
| 1343 //----- (0048C8C8) -------------------------------------------------------- | |
| 1344 int Player::GetBaseSpeed() | |
| 1345 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1346 return this->uSpeed + GetItemsBonus(CHARACTER_ATTRIBUTE_SPEED); |
| 0 | 1347 } |
| 1348 | |
| 1349 //----- (0048C8DF) -------------------------------------------------------- | |
| 1350 int Player::GetBaseLuck() | |
| 1351 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1352 return this->uLuck + GetItemsBonus(CHARACTER_ATTRIBUTE_LUCK); |
| 0 | 1353 } |
| 1354 | |
| 1355 //----- (0048C8F6) -------------------------------------------------------- | |
| 1356 int Player::GetBaseLevel() | |
| 1357 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1358 return this->uLevel + GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1359 } |
| 1360 | |
| 1361 //----- (0048C90D) -------------------------------------------------------- | |
| 1362 int Player::GetActualLevel() | |
| 1363 { | |
| 1364 return uLevel + sLevelModifier + | |
| 1365 GetMagicalBonus(CHARACTER_ATTRIBUTE_LEVEL) + | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1366 GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1367 } |
| 1368 | |
| 1369 //----- (0048C93C) -------------------------------------------------------- | |
| 1370 int Player::GetActualMight() | |
| 1371 { | |
|
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
|
1372 return GetActualAttribute(CHARACTER_ATTRIBUTE_STRENGTH, &Player::uMight, &Player::uMightBonus); |
| 0 | 1373 } |
| 1374 | |
| 1375 //----- (0048C9C2) -------------------------------------------------------- | |
| 1376 int Player::GetActualIntelligence() | |
| 1377 { | |
|
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
|
1378 return GetActualAttribute(CHARACTER_ATTRIBUTE_INTELLIGENCE, &Player::uIntelligence, &Player::uIntelligenceBonus); |
| 0 | 1379 } |
| 1380 | |
| 1381 //----- (0048CA3F) -------------------------------------------------------- | |
| 1382 int Player::GetActualWillpower() | |
| 1383 { | |
|
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
|
1384 return GetActualAttribute(CHARACTER_ATTRIBUTE_WILLPOWER, &Player::uWillpower, &Player::uWillpowerBonus); |
| 0 | 1385 } |
| 1386 | |
| 1387 //----- (0048CABC) -------------------------------------------------------- | |
| 1388 int Player::GetActualEndurance() | |
| 1389 { | |
|
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
|
1390 return GetActualAttribute(CHARACTER_ATTRIBUTE_ENDURANCE, &Player::uEndurance, &Player::uEnduranceBonus); |
| 0 | 1391 } |
| 1392 | |
| 1393 //----- (0048CB39) -------------------------------------------------------- | |
| 1394 int Player::GetActualAccuracy() | |
| 1395 { | |
|
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
|
1396 return GetActualAttribute(CHARACTER_ATTRIBUTE_ACCURACY, &Player::uAccuracy, &Player::uAccuracyBonus); |
| 0 | 1397 } |
| 1398 | |
| 1399 //----- (0048CBB6) -------------------------------------------------------- | |
| 1400 int Player::GetActualSpeed() | |
| 1401 { | |
|
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
|
1402 return GetActualAttribute(CHARACTER_ATTRIBUTE_SPEED, &Player::uSpeed, &Player::uSpeedBonus); |
| 0 | 1403 } |
| 1404 | |
| 1405 //----- (0048CC33) -------------------------------------------------------- | |
| 1406 int Player::GetActualLuck() | |
| 1407 { | |
| 1036 | 1408 signed int npc_luck_bonus; // [sp+10h] [bp-4h]@1 |
| 1409 | |
| 1410 npc_luck_bonus = 0; | |
| 652 | 1411 if ( CheckHiredNPCSpeciality(Fool) ) |
| 1036 | 1412 npc_luck_bonus = 5; |
| 652 | 1413 if ( CheckHiredNPCSpeciality(ChimneySweep) ) |
| 1036 | 1414 npc_luck_bonus += 20; |
| 652 | 1415 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1036 | 1416 npc_luck_bonus += 10; |
| 1324 | 1417 |
|
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
|
1418 return GetActualAttribute(CHARACTER_ATTRIBUTE_LUCK, &Player::uLuck, &Player::uLuckBonus) |
| 1325 | 1419 + npc_luck_bonus; |
| 1420 } | |
| 1421 | |
| 1422 //----- (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
|
1423 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
|
1424 { |
| 1324 | 1425 uint uActualAge = this->sAgeModifier + GetBaseAge(); |
| 1426 uint uAgeingMultiplier = 100; | |
| 1427 for (uint i = 0; i < 4; ++i) | |
| 1325 | 1428 { |
| 1324 | 1429 if (uActualAge >= pAgeingTable[i]) |
| 1325 | 1430 uAgeingMultiplier = pAgingAttributeModifier[attrId][i]; |
| 1431 else | |
| 1432 break; | |
| 1433 } | |
| 1434 | |
| 1980 | 1435 uchar uConditionMult = pConditionAttributeModifier[attrId][GetMajorConditionIdx()]; |
| 1325 | 1436 int magicBonus = GetMagicalBonus(attrId); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1437 int itemBonus = GetItemsBonus(attrId); |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1438 return uConditionMult * uAgeingMultiplier * this->*attrValue / 100 / 100 |
| 1325 | 1439 + 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
|
1440 + 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
|
1441 + this->*attrBonus; |
| 0 | 1442 } |
| 1443 | |
| 1444 //----- (0048CCF5) -------------------------------------------------------- | |
| 1684 | 1445 int Player::GetActualAttack( bool a2 ) |
| 0 | 1446 { |
| 1447 int v3; // eax@1 | |
| 1448 int v4; // edi@1 | |
| 1449 int v5; // ebx@1 | |
| 1450 int v6; // ebp@1 | |
| 1451 | |
| 1452 v3 = GetActualAccuracy(); | |
| 1036 | 1453 v4 = GetParameterBonus(v3); |
| 0 | 1454 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_ATTACK); |
| 1455 v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_ATTACK, a2); | |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1456 return v4 + v5 + v6 + GetMagicalBonus(CHARACTER_ATTRIBUTE_ATTACK) + this->_some_attack_bonus; |
| 0 | 1457 } |
| 1458 | |
| 1459 //----- (0048CD45) -------------------------------------------------------- | |
| 1460 int Player::GetMeleeDamageMinimal() | |
| 1461 { | |
| 1462 int v2; // eax@1 | |
| 1463 int v3; // esi@1 | |
| 1464 int v4; // esi@1 | |
| 1465 int v5; // esi@1 | |
| 1466 signed int result; // eax@1 | |
| 1036 | 1467 |
| 0 | 1468 v2 = GetActualMight(); |
| 1036 | 1469 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1470 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN) + v3; |
| 0 | 1471 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v4; |
| 1036 | 1472 result = _melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 1473 if ( result < 1 ) | |
| 1474 result = 1; | |
| 0 | 1475 return result; |
| 1476 } | |
| 1477 | |
| 1478 //----- (0048CD90) -------------------------------------------------------- | |
| 1479 int Player::GetMeleeDamageMaximal() | |
| 1480 { | |
| 1481 int v2; // eax@1 | |
| 1482 int v3; // esi@1 | |
| 1483 int v4; // esi@1 | |
| 1484 int v5; // esi@1 | |
| 1485 int v6; // esi@1 | |
| 1486 signed int result; // eax@1 | |
| 1487 | |
| 1488 v2 = GetActualMight(); | |
| 1036 | 1489 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1490 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX) + v3; |
| 0 | 1491 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v4; |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1492 v6 = this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 0 | 1493 result = 1; |
| 1494 if ( v6 >= 1 ) | |
| 1495 result = v6; | |
| 1496 return result; | |
| 1497 } | |
| 1498 | |
| 1499 //----- (0048CDDB) -------------------------------------------------------- | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1500 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
|
1501 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1502 int dmgSum; // esi@62 |
| 0 | 1503 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
|
1504 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
|
1505 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
|
1506 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1507 offHndWpnDmg = 0; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1508 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
|
1509 if ( IsUnarmed() ) |
| 0 | 1510 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1511 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
|
1512 } |
|
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
|
1513 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
|
1514 { |
| 1989 | 1515 if ( HasItemEquipped(EQUIP_TWO_HANDED) ) |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1516 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1517 ItemGen *mainHandItemGen = this->GetMainHandItem(); |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1518 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
|
1519 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
|
1520 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
|
1521 addOneDice = true; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1522 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
|
1523 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1524 if ( !ignoreOffhand ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1525 { |
| 1989 | 1526 if ( this->HasItemEquipped(EQUIP_SINGLE_HANDED) ) |
| 0 | 1527 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1528 ItemGen *offHandItemGen = (ItemGen *)&this->pInventoryItemList[this->pEquipment.uShield - 1]; |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1529 if ( offHandItemGen->GetItemEquipType() != EQUIP_SHIELD ) |
| 0 | 1530 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1531 offHndWpnDmg = CalculateMeleeDmgToEnemyWithWeapon(offHandItemGen, uTargetActorID, false); |
| 0 | 1532 } |
| 1533 } | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1534 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1535 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1536 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
|
1537 if ( !ignoreSkillBonus ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1538 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1539 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
|
1540 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
|
1541 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
|
1542 dmgSum += this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + mightAndSkillbonus; |
| 0 | 1543 } |
| 1544 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
|
1545 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
|
1546 result = dmgSum; |
| 0 | 1547 return result; |
| 1548 } | |
| 1549 | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1550 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1551 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
|
1552 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1553 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
|
1554 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
|
1555 if (addOneDice) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1556 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1557 diceCount++; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1558 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1559 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
|
1560 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
|
1561 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
|
1562 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1563 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
|
1564 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1565 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
|
1566 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
|
1567 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1568 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
|
1569 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
|
1570 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1571 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1572 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1573 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
|
1574 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1575 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1576 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1577 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
|
1578 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1579 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1580 } |
| 1822 | 1581 else if (MonsterStats::BelongsToSupertype(uTargetActorID, MONSTER_SUPERTYPE_ELF) && ( enchType == 63 || itemId == ITEM_RELIC_OLD_NICK)) |
| 1582 { | |
| 1583 totalDmg *= 2; | |
| 1584 } | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1585 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
|
1586 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1587 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1588 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1589 } |
| 2197 | 1590 if ( (signed int)SkillToMastery(this->pActiveSkills[PLAYER_SKILL_DAGGER]) >= 3 |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1591 && 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
|
1592 && 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
|
1593 totalDmg *= 3; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1594 return totalDmg; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1595 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1596 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1597 |
| 0 | 1598 //----- (0048D0B9) -------------------------------------------------------- |
| 1599 int Player::GetRangedAttack() | |
| 1600 { | |
| 1601 int v3; // edi@3 | |
| 2046 | 1602 //int v4; // eax@4 |
| 1603 //int v5; // edi@4 | |
| 0 | 1604 int v6; // edi@4 |
| 1605 int v7; // edi@4 | |
| 1606 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1607 ItemGen* mainHandItem = GetMainHandItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1608 if ( mainHandItem != nullptr && ( mainHandItem->uItemID < ITEM_BLASTER || mainHandItem->uItemID > ITEM_LASER_RIFLE )) |
| 0 | 1609 { |
| 2046 | 1610 //v4 = GetActualAccuracy(); |
| 1611 //v5 = GetParameterBonus(GetActualAccuracy()); | |
| 1612 v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + GetParameterBonus(GetActualAccuracy()); | |
| 0 | 1613 v7 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v6; |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1614 v3 = this->_ranged_atk_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v7; |
| 0 | 1615 } |
| 1616 else | |
| 1617 { | |
| 1684 | 1618 v3 = GetActualAttack(true); |
| 0 | 1619 } |
| 1620 return v3; | |
| 1621 } | |
| 1622 | |
| 1623 //----- (0048D124) -------------------------------------------------------- | |
| 1624 int Player::GetRangedDamageMin() | |
| 1625 { | |
| 1626 int v2; // edi@1 | |
| 1627 int v3; // edi@1 | |
| 1628 int v4; // edi@1 | |
| 1629 int result; // eax@6 | |
| 1630 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1631 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MIN); |
| 1040 | 1632 v3 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v2; |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1633 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1634 if ( v4 >= 1 ) |
| 1635 result = v4; | |
| 1636 else | |
| 1637 result = 0; | |
| 1638 return result; | |
| 1639 } | |
| 1640 | |
| 1641 //----- (0048D191) -------------------------------------------------------- | |
| 1642 int Player::GetRangedDamageMax() | |
| 1643 { | |
| 1644 int v2; // edi@1 | |
| 1645 int v3; // edi@1 | |
| 1646 int v4; // edi@1 | |
| 1647 int result; // eax@6 | |
| 1648 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1649 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MAX); |
| 1040 | 1650 v3 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v2; |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1651 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1652 if ( v4 >= 1 ) |
| 1653 result = v4; | |
| 1654 else | |
| 1655 result = 0; | |
| 1656 return result; | |
| 1657 } | |
| 1658 | |
| 1659 //----- (0048D1FE) -------------------------------------------------------- | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1660 int Player::CalculateRangedDamageTo( int a2 ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1661 { |
| 0 | 1662 ItemGen *v4; // ebx@2 |
| 1663 unsigned int v5; // edi@2 | |
| 1664 int v9; // esi@5 | |
| 1665 int v10; // ebx@6 | |
| 1666 signed int v15; // [sp+8h] [bp-Ch]@2 | |
| 1667 int v17; // [sp+10h] [bp-4h]@1 | |
| 1668 | |
| 1669 v17 = 0; | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1670 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1671 return 0; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1672 v4 = (ItemGen *)&this->pInventoryItemList[this->pEquipment.uBow-1]; |
| 0 | 1673 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
|
1674 v15 = pItemsTable->pItems[v5].uDamageRoll; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1675 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
|
1676 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1677 int v7 = rand() % v15; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1678 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
|
1679 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1680 v9 = pItemsTable->pItems[v5].uDamageMod + v17; |
| 0 | 1681 if ( a2 ) |
| 1682 { | |
| 377 | 1683 v10 = v4->uSpecEnchantmentType; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1684 if ( v10 == 64 && MonsterStats::BelongsToSupertype(a2, MONSTER_SUPERTYPE_UNDEAD)) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1685 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1686 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1687 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1688 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
|
1689 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1690 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1691 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1692 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
|
1693 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1694 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1695 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1696 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
|
1697 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1698 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1699 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1700 } |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1701 return v9 + this->GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS); |
| 0 | 1702 } |
| 1703 | |
| 1704 //----- (0048D2EA) -------------------------------------------------------- | |
| 1705 char *Player::GetMeleeDamageString() | |
| 1706 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1707 int min_damage; // edi@3 |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1708 int max_damage; // eax@3 |
| 0 | 1709 |
| 1710 static char player__getmeleedamagestring_static_buff[40]; // idb | |
| 1711 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1712 ItemGen* mainHandItem = GetMainHandItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1713 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1714 if (mainHandItem != nullptr && ( mainHandItem->uItemID >= 135 ) && ( mainHandItem->uItemID <= 159 )) |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1715 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1716 strcpy(player__getmeleedamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1717 return player__getmeleedamagestring_static_buff; |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1718 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1719 else if (mainHandItem != nullptr && (mainHandItem->uItemID == ITEM_BLASTER || mainHandItem->uItemID == ITEM_LASER_RIFLE)) |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1720 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1721 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1722 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1723 } |
| 0 | 1724 else |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1725 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1726 min_damage = GetMeleeDamageMinimal(); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1727 max_damage = GetMeleeDamageMaximal(); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1728 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1729 if ( min_damage == max_damage ) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1730 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1731 sprintf(player__getmeleedamagestring_static_buff, "%d", min_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1732 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1733 else |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1734 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1735 sprintf(player__getmeleedamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1736 } |
| 1036 | 1737 return player__getmeleedamagestring_static_buff; |
| 0 | 1738 } |
| 1739 | |
| 1740 //----- (0048D396) -------------------------------------------------------- | |
| 1741 char *Player::GetRangedDamageString() | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1742 { |
| 1036 | 1743 int min_damage; // edi@3 |
| 1744 int max_damage; // eax@3 | |
| 1745 | |
| 1746 static char player__getrangeddamagestring_static_buff[40]; // idb | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1747 |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1748 ItemGen* mainHandItem = GetMainHandItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1749 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1750 if (mainHandItem != nullptr && ( mainHandItem->uItemID >= 135 ) && ( mainHandItem->uItemID <= 159 )) |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1751 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1752 strcpy(player__getrangeddamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1753 return player__getrangeddamagestring_static_buff; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1754 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1755 else if (mainHandItem != nullptr && (mainHandItem->uItemID == ITEM_BLASTER || mainHandItem->uItemID == ITEM_LASER_RIFLE)) |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1756 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1757 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1758 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1759 } |
| 0 | 1760 else |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1761 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1762 min_damage = GetRangedDamageMin(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1763 max_damage = GetRangedDamageMax(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1764 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1765 if ( max_damage > 0) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1766 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1767 if ( min_damage == max_damage ) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1768 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1769 sprintf(player__getrangeddamagestring_static_buff, "%d", min_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1770 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1771 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1772 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1773 sprintf(player__getrangeddamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1774 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1775 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1776 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1777 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1778 strcpy(player__getrangeddamagestring_static_buff, "N/A"); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1779 } |
| 1036 | 1780 return player__getrangeddamagestring_static_buff; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1781 } |
| 0 | 1782 |
| 1783 //----- (0048D45A) -------------------------------------------------------- | |
| 1784 bool Player::CanTrainToNextLevel() | |
| 1785 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1786 int lvl = this->uLevel + 1; |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1787 int neededExp = ((lvl * (lvl - 1)) / 2 * 1000); |
| 1564 | 1788 return this->uExperience >= neededExp; |
| 0 | 1789 } |
| 1790 | |
| 1791 //----- (0048D498) -------------------------------------------------------- | |
| 1792 unsigned int Player::GetExperienceDisplayColor() | |
| 1793 { | |
| 1794 if ( CanTrainToNextLevel() ) | |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1795 return ui_character_bonus_text_color; |
| 0 | 1796 else |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1797 return ui_character_default_text_color; |
| 0 | 1798 } |
| 1799 | |
| 1800 //----- (0048D4B3) -------------------------------------------------------- | |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1801 int Player::CalculateIncommingDamage( DAMAGE_TYPE dmg_type, int dmg ) |
| 1561 | 1802 { |
| 1036 | 1803 int resist_value; // edi@8 |
| 1804 int player_luck; // eax@21 | |
| 1805 signed int res_rand_divider; // ebx@2 | |
| 1806 int armor_skill; // eax@29 | |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1807 |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1808 if ( classType == PLAYER_CLASS_LICH && (dmg_type == CHARACTER_ATTRIBUTE_RESIST_MIND || dmg_type == CHARACTER_ATTRIBUTE_RESIST_BODY || dmg_type == CHARACTER_ATTRIBUTE_RESIST_SPIRIT )) //TODO: determine if spirit resistance should be handled by body res. modifier |
|
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1809 return 0; |
|
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1810 |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1811 resist_value = 0; |
| 1036 | 1812 switch(dmg_type) |
| 1813 { | |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1814 case DMGT_FIRE: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_FIRE); break; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1815 case DMGT_ELECTR: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_AIR); break; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1816 case DMGT_COLD: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_WATER); break; |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1817 case DMGT_EARTH: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_EARTH); break; |
| 1036 | 1818 |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1819 case DMGT_SPIRIT: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_SPIRIT);break; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1820 case DMGT_MIND: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_MIND); break; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1821 case DMGT_BODY: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_BODY); break; |
| 1036 | 1822 } |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1823 |
| 1036 | 1824 player_luck = GetActualLuck(); |
| 1825 res_rand_divider = GetParameterBonus(player_luck) + resist_value + 30; | |
| 1826 | |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1827 if ( GetParameterBonus(player_luck) + resist_value > 0 ) |
| 1036 | 1828 { |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1829 for (int i = 0; i < 4; i++) |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1830 { |
| 1036 | 1831 if ( rand() % res_rand_divider >= 30 ) |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1832 dmg >>= 1; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1833 else |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1834 break; |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1835 } |
|
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1836 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1837 ItemGen* equippedArmor = GetArmorItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1838 if (( dmg_type == DMGT_PHISYCAL ) && ( equippedArmor != nullptr )) |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1839 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1840 if (!equippedArmor->IsBroken()) |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1841 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1842 armor_skill = equippedArmor->GetPlayerSkillType(); |
| 1036 | 1843 if ( armor_skill==PLAYER_SKILL_PLATE ) |
| 0 | 1844 { |
| 1036 | 1845 if ( SkillToMastery(pActiveSkills[PLAYER_SKILL_PLATE]) >= 3 ) |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1846 return dmg / 2; |
| 0 | 1847 } |
| 1036 | 1848 if (armor_skill==PLAYER_SKILL_CHAIN ) |
| 0 | 1849 { |
| 1036 | 1850 if (SkillToMastery(pActiveSkills[PLAYER_SKILL_CHAIN]) == 4) |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1851 return dmg * 2 / 3; |
| 0 | 1852 } |
| 1853 } | |
| 1036 | 1854 } |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1855 return dmg; |
| 0 | 1856 } |
| 1857 | |
| 1858 //----- (0048D62C) -------------------------------------------------------- | |
| 816 | 1859 ITEM_EQUIP_TYPE Player::GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1860 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1861 return GetNthEquippedIndexItem(uEquipSlot)->GetItemEquipType(); |
| 0 | 1862 } |
| 1863 | |
| 1864 //----- (0048D651) -------------------------------------------------------- | |
| 816 | 1865 PLAYER_SKILL_TYPE Player::GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1866 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1867 return (PLAYER_SKILL_TYPE)GetNthEquippedIndexItem(uEquipSlot)->GetPlayerSkillType(); |
| 0 | 1868 } |
| 1869 | |
| 1870 //----- (0048D676) -------------------------------------------------------- | |
| 1871 bool Player::IsUnarmed() | |
| 1872 { | |
| 1989 | 1873 return !HasItemEquipped(EQUIP_TWO_HANDED) && |
| 1874 (!HasItemEquipped(EQUIP_SINGLE_HANDED) || GetOffHandItem()->GetItemEquipType() == EQUIP_SHIELD); | |
| 0 | 1875 } |
| 1876 | |
| 1877 //----- (0048D6AA) -------------------------------------------------------- | |
| 1878 bool Player::HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex) | |
| 1879 { | |
| 1980 | 1880 uint i = pEquipment.pIndices[uEquipIndex]; |
| 0 | 1881 if (i) |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1882 return !pOwnItems[i - 1].IsBroken(); |
| 1036 | 1883 else |
| 1884 return false; | |
| 0 | 1885 } |
| 1886 | |
| 1887 //----- (0048D6D0) -------------------------------------------------------- | |
| 1888 bool Player::HasEnchantedItemEquipped(int uEnchantment) | |
| 1889 { | |
| 1890 for (uint i = 0; i < 16; ++i) | |
| 1891 { | |
| 1892 if (HasItemEquipped((ITEM_EQUIP_TYPE)i) && | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1893 GetNthEquippedIndexItem(i)->uSpecEnchantmentType == uEnchantment) |
| 0 | 1894 return true; |
| 1895 } | |
| 1896 return false; | |
| 1897 } | |
| 1898 | |
| 1899 //----- (0048D709) -------------------------------------------------------- | |
| 1080 | 1900 bool Player::WearsItem( int item_id, ITEM_EQUIP_TYPE equip_type ) |
| 1563 | 1901 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1902 return ( HasItemEquipped(equip_type) && GetNthEquippedIndexItem(equip_type)->uItemID == item_id ); |
| 1563 | 1903 } |
| 1904 | |
| 1905 bool Player::WearsItemAnyWhere(int item_id) | |
| 1906 { | |
| 1907 for (int i = 0; i < 16; i++) | |
| 1908 { | |
| 1909 if (WearsItem(item_id, (ITEM_EQUIP_TYPE) i)) | |
| 1910 { | |
| 1911 return true; | |
| 1912 } | |
| 1913 } | |
| 1914 return false; | |
| 0 | 1915 } |
| 1916 | |
| 1917 //----- (0048D76C) -------------------------------------------------------- | |
| 1686 | 1918 int Player::StealFromShop( ItemGen *itemToSteal, int extraStealDifficulty, int reputation, int a5, int *fineIfFailed ) //returns an int, but is the return value is compared to zero, so might change to bool |
| 0 | 1919 { |
| 1920 unsigned __int16 v6; // cx@8 | |
| 1921 int v7; // edi@8 | |
| 1922 unsigned int v8; // ebx@8 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1923 unsigned int itemvalue; // esi@8 |
| 0 | 1924 int v10; // eax@8 |
| 1686 | 1925 int currMaxItemValue; // edi@12 |
| 0 | 1926 |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1927 if ( !itemToSteal |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1928 || this->IsEradicated() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1929 || this->IsDead() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1930 || this->IsPertified() |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1931 || this->IsDrunk() |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1932 || this->IsUnconcious() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1933 || this->IsAsleep() ) |
| 0 | 1934 { |
| 1686 | 1935 return 0; |
| 0 | 1936 } |
| 1937 else | |
| 1938 { | |
| 2197 | 1939 v6 = this->pActiveSkills[PLAYER_SKILL_STEALING]; |
| 0 | 1940 v7 = v6 & 0x3F; |
| 1941 v8 = SkillToMastery(v6); | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1942 itemvalue = itemToSteal->GetValue(); |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1943 v10 = itemToSteal->GetItemEquipType(); |
| 1989 | 1944 if ( v10 == EQUIP_SINGLE_HANDED || v10 == EQUIP_TWO_HANDED || v10 == EQUIP_BOW ) |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1945 itemvalue *= 3; |
| 1686 | 1946 currMaxItemValue = StealingRandomBonuses[rand() % 5] + v7 * StealingMasteryBonuses[v8]; |
| 1947 *fineIfFailed = 100 * (reputation + extraStealDifficulty) + itemvalue; | |
| 1948 if (a5) | |
| 1949 { | |
| 1950 *fineIfFailed += 500; | |
| 1951 } | |
| 0 | 1952 if ( rand() % 100 >= 5 ) |
| 1953 { | |
| 1686 | 1954 if ( *fineIfFailed > currMaxItemValue ) |
| 1955 if (*fineIfFailed - currMaxItemValue < 500) | |
| 1956 { | |
| 1957 return 1; | |
| 1958 } | |
| 1959 else | |
| 1960 { | |
| 1961 return 0; | |
| 1962 } | |
| 0 | 1963 else |
| 1686 | 1964 return 2; |
| 0 | 1965 } |
| 1966 else | |
| 1967 { | |
| 1686 | 1968 return 0; |
| 1969 } | |
| 1970 } | |
| 0 | 1971 } |
| 1972 | |
| 1973 //----- (0048D88B) -------------------------------------------------------- | |
| 1974 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation) | |
| 1975 { | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1976 Actor *actroPtr; // edi@1 |
| 0 | 1977 int v7; // ebx@10 |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1978 unsigned int stealingMastery; // esi@10 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1979 int fineIfFailed; // esi@10 |
| 0 | 1980 int v11; // eax@13 |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1981 bool HasFullItemSlots; // ebx@15 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1982 unsigned __int16 carriedItemId; // si@21 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1983 unsigned int enchBonusSum; // esi@31 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1984 int *enchTypePtr; // eax@34 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1985 ItemGen tempItem; // [sp+8h] [bp-34h]@15 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1986 int currMaxItemValue; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1987 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1988 actroPtr = &pActors[uActorID]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1989 if ( !actroPtr |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1990 || this->IsEradicated() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1991 || this->IsDead() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1992 || this->IsPertified() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1993 || this->IsDrunk() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1994 || this->IsUnconcious() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1995 || this->IsAsleep() ) |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1996 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1997 return 0; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1998 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1999 if ( !(BYTE2(actroPtr->uAttributes) & 0x80) ) |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2000 actroPtr->SetRandomGoldIfTheresNoItem(); |
| 2197 | 2001 unsigned __int16 v6 = this->pActiveSkills[PLAYER_SKILL_STEALING]; |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2002 v7 = v6 & 0x3F; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2003 stealingMastery = SkillToMastery(v6); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2004 int v30 = StealingMasteryBonuses[stealingMastery]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2005 int v29 = StealingRandomBonuses[rand() % 5]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2006 fineIfFailed = actroPtr->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2007 currMaxItemValue = v29 + v7 * v30; |
| 1783 | 2008 if ( rand() % 100 < 5 || fineIfFailed > currMaxItemValue || BYTE2(actroPtr->uAttributes) & 8 ) |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2009 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2010 Actor::AggroSurroundingPeasants(uActorID, 1); |
| 2203 | 2011 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[376], this->pName);//"%s was caught stealing!" |
| 2012 ShowStatusBarString(pTmpBuf2.data(), 2); | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2013 return 0; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2014 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2015 else |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2016 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2017 v11 = rand(); |
| 1688 | 2018 if ( v11 % 100 >= 70 ) //stealing gold |
| 2019 { | |
| 2020 enchBonusSum = 0; | |
| 2021 for (int i = 0; i < v7; i++) | |
| 2022 enchBonusSum += rand() % StealingEnchantmentBonusForSkill[stealingMastery] + 1; | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2023 if ( actroPtr->array_000234[3].GetItemEquipType() != EQUIP_GOLD ) |
| 1688 | 2024 return 2; |
| 2025 enchTypePtr = &actroPtr->array_000234[3].uSpecEnchantmentType; | |
| 2026 if ( (int)enchBonusSum >= *enchTypePtr ) | |
| 2027 { | |
| 2028 actroPtr->array_000234[3].uItemID = 0; | |
| 2029 *enchTypePtr = 0; | |
| 2030 } | |
| 2031 else | |
| 2032 *enchTypePtr -= enchBonusSum; | |
| 2033 if ( enchBonusSum ) | |
| 2034 { | |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
2035 pParty->PartyFindsGold(enchBonusSum, 2); |
| 1688 | 2036 sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[302], this->pName, enchBonusSum); //%stole %d gold |
| 2037 } | |
| 2038 else | |
| 2039 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName); //%s failed to steal anything | |
| 2203 | 2040 ShowStatusBarString(pTmpBuf2.data(), 2); |
| 1688 | 2041 return 2; |
| 2042 } | |
| 2043 else if ( v11 % 100 >= 40 ) //stealing an item | |
| 2044 { | |
| 2045 tempItem.Reset(); | |
| 2046 HasFullItemSlots = false; | |
| 2047 int i; | |
| 2048 for (i = 0; i < 4; i++) | |
| 2049 { | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2050 if ( actroPtr->array_000234[i].uItemID != 0 && actroPtr->array_000234[i].GetItemEquipType() != EQUIP_GOLD ) |
| 1688 | 2051 break; |
| 2052 } | |
| 2053 if (i == 4) | |
| 2054 HasFullItemSlots = true; | |
| 2055 carriedItemId = actroPtr->uCarriedItemID; | |
| 2056 if ( carriedItemId != 0 || HasFullItemSlots ) | |
| 2057 { | |
| 2058 tempItem.Reset(); | |
| 2059 if ( carriedItemId != 0 ) | |
| 0 | 2060 { |
| 1688 | 2061 actroPtr->uCarriedItemID = 0; |
| 2062 tempItem.uItemID = carriedItemId; | |
| 2063 if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_WAND ) | |
| 2064 tempItem.uNumCharges = rand() % 6 + pItemsTable->pItems[carriedItemId].uDamageMod + 1; | |
| 2065 else if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_POTION && carriedItemId != ITEM_POTION_BOTTLE) | |
| 2066 tempItem.uEnchantmentType = 2 * rand() % 4 + 2; | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2067 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2068 else |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2069 { |
| 1688 | 2070 ItemGen* itemToSteal = &actroPtr->array_000234[rand() % 4]; |
| 2071 memcpy(&tempItem, itemToSteal, sizeof(tempItem)); | |
| 2072 itemToSteal->Reset(); | |
| 2073 carriedItemId = tempItem.uItemID; | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2074 } |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2075 if (carriedItemId != 0) // looks odd in current context, but avoids accessing zeroth element of pItemsTable->pItems |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2076 { |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
2077 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem(); |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2078 sprintf( |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2079 pTmpBuf2.data(), |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2080 pGlobalTXT_LocalizationStrings[304], // Official //TODO: add a normal "%d stole %d" message |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2081 this->pName, |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2082 pItemsTable->pItems[carriedItemId].pUnidentifiedName); |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2083 ShowStatusBarString(pTmpBuf2.data(), 2u); |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
2084 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem(); |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2085 memcpy(&pParty->pPickedItem, &tempItem, sizeof(ItemGen)); |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2086 pMouse->SetCursorBitmapFromItemID(carriedItemId); |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2087 return 2; |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2088 } |
| 0 | 2089 } |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2090 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2091 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName); //%s failed to steal anything |
| 2203 | 2092 ShowStatusBarString(pTmpBuf2.data(), 2); |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2093 return 2; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2094 } |
| 0 | 2095 } |
| 2096 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2097 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2098 // 4EDEC4: using guessed type int dword_4EDEC4[]; | |
| 2099 | |
| 2100 //----- (0048DBB9) -------------------------------------------------------- | |
| 2101 void Player::Heal(int amount) | |
| 2102 { | |
| 1010 | 2103 signed int max_health; // eax@3 |
| 2104 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2105 if ( !IsEradicated() && !IsDead() ) |
| 1010 | 2106 { |
| 2107 max_health = GetMaxHealth(); | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2108 if ( IsZombie() ) |
| 1010 | 2109 max_health /= 2; |
| 2110 sHealth += amount; | |
| 2111 if ( sHealth > max_health ) | |
| 2112 sHealth = max_health; | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2113 if ( IsUnconcious() ) |
| 1010 | 2114 { |
| 2115 if ( sHealth > 0 ) | |
| 2116 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2117 SetUnconcious(false); |
| 0 | 2118 } |
| 2119 } | |
| 2120 } | |
| 2121 } | |
| 2122 | |
| 2123 //----- (0048DC1E) -------------------------------------------------------- | |
| 1036 | 2124 int Player::ReceiveDamage( signed int amount, DAMAGE_TYPE dmg_type ) |
| 2125 { | |
| 2126 signed int recieved_dmg; // eax@1 | |
| 2127 bool broke_armor; | |
| 2128 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2129 SetAsleep(false); |
| 1036 | 2130 recieved_dmg = CalculateIncommingDamage(dmg_type, amount); |
| 2131 sHealth -= recieved_dmg; | |
| 2132 broke_armor = sHealth <= -10; | |
| 2133 if ( sHealth < 1 ) // | |
| 2134 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2135 if ( (sHealth + uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE) >= 1) |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2136 || pPlayerBuffs[PLAYER_BUFF_PRESERVATION].uExpireTime > 0 ) |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2137 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2138 SetCondUnconsciousWithBlockCheck(false); |
| 0 | 2139 } |
| 2140 else | |
| 2141 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2142 SetCondDeadWithBlockCheck(false); |
| 1036 | 2143 if ( sHealth > 0 ) |
| 2144 sHealth = 0; | |
| 2145 } | |
| 2146 if (broke_armor ) | |
| 2147 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2148 ItemGen* equippedArmor = GetArmorItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2149 if ( equippedArmor != nullptr ) |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2150 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2151 if ( !(equippedArmor->uAttributes & ITEM_HARDENED)) |
| 0 | 2152 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2153 equippedArmor->SetBroken(); |
| 0 | 2154 } |
| 2155 } | |
| 2156 } | |
| 2157 } | |
| 1036 | 2158 if ( recieved_dmg && CanAct() ) |
| 187 | 2159 PlaySound(SPEECH_24, 0); |
| 1036 | 2160 return recieved_dmg; |
| 0 | 2161 } |
| 2162 | |
| 2163 //----- (0048DCF6) -------------------------------------------------------- | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2164 int Player::ReceiveSpecialAttackEffect( int attType, struct Actor *pActor ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2165 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2166 SPECIAL_ATTACK_TYPE attTypeCast = (SPECIAL_ATTACK_TYPE) attType; |
| 0 | 2167 signed int v3; // edi@1 |
| 2168 signed int v4; // ebx@1 | |
| 2169 int v6; // eax@2 | |
| 2170 int v8; // eax@8 | |
| 2171 int v10; // eax@8 | |
| 2172 int v11; // ebx@8 | |
| 2173 ItemGen *v13; // eax@9 | |
| 2174 int v22; // eax@49 | |
| 2175 signed int v23; // ebx@49 | |
| 2176 void *v27; // ecx@76 | |
| 2177 char v46[140]; // [sp+Ch] [bp-94h]@13 | |
| 2178 unsigned int v47; // [sp+98h] [bp-8h]@1 | |
| 1692 | 2179 ItemGen* v48; // [sp+9Ch] [bp-4h]@1 |
| 2180 | |
| 0 | 2181 v4 = 0; |
| 2182 v47 = 0; | |
| 1783 | 2183 v48 = nullptr; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2184 switch ( attTypeCast ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2185 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2186 case SPECIAL_ATTACK_CURSE: |
| 0 | 2187 v6 = GetActualWillpower(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2188 v11 = GetParameterBonus(v6); |
| 1690 | 2189 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2190 case SPECIAL_ATTACK_WEAK: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2191 case SPECIAL_ATTACK_SLEEP: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2192 case SPECIAL_ATTACK_DRUNK: |
| 2187 | 2193 case SPECIAL_ATTACK_DISEASE_WEAK: |
| 2194 case SPECIAL_ATTACK_DISEASE_MEDIUM: | |
| 2195 case SPECIAL_ATTACK_DISEASE_SEVERE: | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2196 case SPECIAL_ATTACK_UNCONSCIOUS: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2197 case SPECIAL_ATTACK_AGING: |
| 0 | 2198 v6 = GetActualEndurance(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2199 v11 = GetParameterBonus(v6); |
| 1690 | 2200 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2201 case SPECIAL_ATTACK_INSANE: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2202 case SPECIAL_ATTACK_PARALYZED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2203 case SPECIAL_ATTACK_FEAR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2204 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_MIND); |
| 1690 | 2205 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2206 case SPECIAL_ATTACK_PETRIFIED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2207 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_EARTH); |
| 1690 | 2208 break; |
| 2187 | 2209 case SPECIAL_ATTACK_POISON_WEAK: |
| 2210 case SPECIAL_ATTACK_POISON_MEDIUM: | |
| 2211 case SPECIAL_ATTACK_POISON_SEVERE: | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2212 case SPECIAL_ATTACK_DEAD: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2213 case SPECIAL_ATTACK_ERADICATED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2214 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_BODY); |
| 1690 | 2215 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2216 case SPECIAL_ATTACK_MANA_DRAIN: |
| 0 | 2217 v8 = GetActualWillpower(); |
| 2218 v10 = GetActualIntelligence(); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2219 v11 = (GetParameterBonus(v10) + GetParameterBonus(v8)) / 2; |
| 0 | 2220 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2221 case SPECIAL_ATTACK_BREAK_ANY: |
| 1692 | 2222 for (int i = 0; i < 138; i++) |
| 2223 { | |
| 2224 v13 = &this->pInventoryItemList[i]; | |
| 2225 if ( v13->uItemID > 0 && v13->uItemID <= 134 && !v13->IsBroken()) | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2226 v46[v4++] = i; |
| 1692 | 2227 } |
| 1690 | 2228 if ( !v4 ) |
| 2229 return 0; | |
| 1692 | 2230 v48 = &this->pInventoryItemList[v46[rand() % v4]]; |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2231 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 1690 | 2232 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2233 case SPECIAL_ATTACK_BREAK_ARMOR: |
| 1692 | 2234 for (int i = 0; i < 16; i++ ) |
| 0 | 2235 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2236 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 0 | 2237 { |
| 1692 | 2238 if ( i == EQUIP_ARMOUR ) |
| 2239 v46[v4++] = this->pEquipment.uArmor - 1; | |
| 1989 | 2240 if ( (i == EQUIP_SINGLE_HANDED || i == EQUIP_TWO_HANDED) && GetEquippedItemEquipType((ITEM_EQUIP_TYPE)i) == EQUIP_SHIELD ) |
| 1692 | 2241 v46[v4++] = this->pEquipment.pIndices[i] - 1; |
| 0 | 2242 } |
| 1692 | 2243 } |
| 1690 | 2244 if ( !v4 ) |
| 2245 return 0; | |
| 1692 | 2246 v48 = &this->pInventoryItemList[v46[rand() % v4]]; |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2247 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 1690 | 2248 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2249 case SPECIAL_ATTACK_BREAK_WEAPON: |
| 1692 | 2250 for (int i = 0; i < 16; i++ ) |
| 0 | 2251 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2252 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 0 | 2253 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2254 if ( i == EQUIP_BOW ) |
| 1690 | 2255 v46[v4++] = LOBYTE(this->pEquipment.uBow) - 1; |
| 1989 | 2256 if ( (i == EQUIP_SINGLE_HANDED || i == EQUIP_TWO_HANDED) |
| 2257 && (GetEquippedItemEquipType((ITEM_EQUIP_TYPE)i) == EQUIP_SINGLE_HANDED || GetEquippedItemEquipType((ITEM_EQUIP_TYPE)i) == EQUIP_TWO_HANDED) ) | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2258 v46[v4++] = this->pEquipment.pIndices[i] - 1; |
| 0 | 2259 } |
| 1692 | 2260 } |
| 0 | 2261 if ( !v4 ) |
| 1690 | 2262 return 0; |
| 1692 | 2263 v48 = &this->pInventoryItemList[v46[rand() % v4]]; |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2264 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 0 | 2265 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2266 case SPECIAL_ATTACK_STEAL: |
| 1692 | 2267 for ( int i = 0; i < 126; i++ ) |
| 2268 { | |
| 2269 int ItemPosInList = this->pInventoryMatrix[i]; | |
| 2270 if (ItemPosInList > 0) | |
| 0 | 2271 { |
| 1692 | 2272 ItemGen* v21 = &this->pInventoryItemList[ItemPosInList - 1]; |
| 2273 if ( v21->uItemID > 0 && v21->uItemID <= 134 ) | |
| 0 | 2274 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2275 v46[v4++] = i; |
| 0 | 2276 } |
| 2277 } | |
| 1692 | 2278 } |
| 0 | 2279 if ( !v4 ) |
| 1690 | 2280 return 0; |
| 1692 | 2281 v47 = v46[rand() % v4]; |
| 0 | 2282 v6 = GetActualAccuracy(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2283 v11 = GetParameterBonus(v6); |
| 0 | 2284 break; |
| 2285 default: | |
| 2286 v11 = 0; | |
| 2287 break; | |
| 2288 } | |
| 2289 v22 = GetActualLuck(); | |
| 1036 | 2290 v23 = GetParameterBonus(v22) + v11 + 30; |
| 0 | 2291 if ( rand() % v23 >= 30 ) |
| 2292 { | |
| 1690 | 2293 return 0; |
| 0 | 2294 } |
| 2295 else | |
| 2296 { | |
| 1692 | 2297 for ( v3 = 0; v3 < 4; v3++ ) |
| 2298 { | |
| 2299 if ( this == pPlayers[v3 + 1] ) | |
| 2300 break; | |
| 2301 } | |
| 2302 | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2303 switch ( attTypeCast ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2304 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2305 case SPECIAL_ATTACK_CURSE: |
| 1692 | 2306 SetCondition(Condition_Cursed, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2307 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2308 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2309 return 1; | |
| 2310 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2311 case SPECIAL_ATTACK_WEAK: |
| 1692 | 2312 SetCondition(Condition_Weak, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2313 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2314 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2315 return 1; | |
| 2316 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2317 case SPECIAL_ATTACK_SLEEP: |
| 1692 | 2318 SetCondition(Condition_Sleep, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2319 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2320 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2321 return 1; | |
| 2322 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2323 case SPECIAL_ATTACK_DRUNK: |
| 1692 | 2324 SetCondition(Condition_Drunk, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2325 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2326 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2327 return 1; | |
| 2328 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2329 case SPECIAL_ATTACK_INSANE: |
| 1692 | 2330 SetCondition(Condition_Insane, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2331 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2332 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2333 return 1; | |
| 2334 break; | |
| 2187 | 2335 case SPECIAL_ATTACK_POISON_WEAK: |
| 2336 SetCondition(Condition_Poison_Weak, 1); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2337 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2338 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2339 return 1; |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2340 break; |
| 2187 | 2341 case SPECIAL_ATTACK_POISON_MEDIUM: |
| 2342 SetCondition(Condition_Poison_Medium, 1); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2343 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2344 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2345 return 1; |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2346 break; |
| 2187 | 2347 case SPECIAL_ATTACK_POISON_SEVERE: |
| 2348 SetCondition(Condition_Poison_Severe, 1); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2349 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2350 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2351 return 1; | |
| 2352 break; | |
| 2187 | 2353 case SPECIAL_ATTACK_DISEASE_WEAK: |
| 2354 SetCondition(Condition_Disease_Weak, 1); | |
|
1693
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2355 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2356 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2357 return 1; |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2358 break; |
| 2187 | 2359 case SPECIAL_ATTACK_DISEASE_MEDIUM: |
| 2360 SetCondition(Condition_Disease_Medium, 1); | |
|
1693
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2361 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2362 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2363 return 1; |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2364 break; |
| 2187 | 2365 case SPECIAL_ATTACK_DISEASE_SEVERE: |
| 2366 SetCondition(Condition_Disease_Severe, 1); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2367 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
| 0 | 2368 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 1690 | 2369 return 1; |
| 0 | 2370 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2371 case SPECIAL_ATTACK_PARALYZED: |
| 1692 | 2372 SetCondition(Condition_Paralyzed, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2373 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2374 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2375 return 1; | |
| 2376 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2377 case SPECIAL_ATTACK_UNCONSCIOUS: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2378 SetCondition(Condition_Unconcious, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2379 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2380 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2381 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2382 break; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2383 case SPECIAL_ATTACK_DEAD: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2384 SetCondition(Condition_Dead, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2385 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2386 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2387 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2388 break; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2389 case SPECIAL_ATTACK_PETRIFIED: |
| 1692 | 2390 SetCondition(Condition_Pertified, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2391 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2392 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2393 return 1; | |
| 2394 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2395 case SPECIAL_ATTACK_ERADICATED: |
| 1692 | 2396 SetCondition(Condition_Eradicated, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2397 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2398 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2399 return 1; | |
| 2400 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2401 case SPECIAL_ATTACK_BREAK_ANY: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2402 case SPECIAL_ATTACK_BREAK_ARMOR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2403 case SPECIAL_ATTACK_BREAK_WEAPON: |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2404 if ( !(v48->uAttributes & ITEM_HARDENED) ) |
| 1690 | 2405 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2406 PlaySound(SPEECH_40, 0); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2407 v48->SetBroken(); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2408 pAudioPlayer->PlaySound((SoundID)47, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2409 } |
| 2410 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2411 return 1; | |
| 2412 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2413 case SPECIAL_ATTACK_STEAL: |
| 1690 | 2414 PlaySound(SPEECH_40, 0); |
| 2415 v27 = pActor->array_000234; | |
| 2416 if ( pActor->array_000234[0].uItemID ) | |
| 2417 { | |
| 2418 v27 = &pActor->array_000234[1]; | |
| 2419 if ( pActor->array_000234[1].uItemID ) | |
| 2420 { | |
| 2421 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2422 return 1; | |
| 2423 } | |
| 2424 } | |
| 2425 memcpy(v27, &this->pInventoryItemList[this->pInventoryMatrix[v47]-1], 0x24u); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2426 RemoveItemAtInventoryIndex(v47); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2427 pAudioPlayer->PlaySound((SoundID)47, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2428 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2429 return 1; | |
| 2430 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2431 case SPECIAL_ATTACK_AGING: |
| 187 | 2432 PlaySound(SPEECH_42, 0); |
| 1690 | 2433 ++this->sAgeModifier; |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2434 pAudioPlayer->PlaySound((SoundID)226, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2435 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2436 return 1; | |
| 2437 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2438 case SPECIAL_ATTACK_MANA_DRAIN: |
| 1690 | 2439 PlaySound(SPEECH_41, 0); |
| 2440 this->sMana = 0; | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2441 pAudioPlayer->PlaySound((SoundID)226, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2442 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2443 return 1; | |
| 2444 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2445 case SPECIAL_ATTACK_FEAR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2446 SetCondition(Condition_Fear, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2447 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2448 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2449 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2450 break; |
| 0 | 2451 default: |
| 1690 | 2452 return 0; |
| 0 | 2453 } |
| 2454 } | |
| 2455 } | |
| 324 | 2456 |
| 0 | 2457 // 48DCF6: using guessed type char var_94[140]; |
| 2458 | |
| 2459 //----- (0048E1A3) -------------------------------------------------------- | |
| 2460 unsigned int Player::GetSpellSchool(unsigned int uSpellID) | |
| 2461 { | |
| 1091 | 2462 return pSpellStats->pInfos[uSpellID].uSchool; |
| 0 | 2463 } |
| 2464 | |
| 2465 //----- (0048E1B5) -------------------------------------------------------- | |
| 816 | 2466 int Player::GetAttackRecoveryTime(bool bRangedAttack) |
| 2467 { | |
| 2468 ItemGen *weapon = nullptr; | |
| 2469 uint weapon_recovery = base_recovery_times_per_weapon_type[0]; | |
| 2470 if (bRangedAttack) | |
| 0 | 2471 { |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2472 if ( HasItemEquipped(EQUIP_BOW) ) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2473 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2474 weapon = GetBowItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2475 weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()]; |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2476 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2477 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2478 else if ( IsUnarmed() == 1 && GetActualSkillLevel(PLAYER_SKILL_UNARMED) > 0) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2479 { |
| 816 | 2480 weapon_recovery = base_recovery_times_per_weapon_type[1]; |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2481 } |
| 1989 | 2482 else if ( HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 816 | 2483 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2484 weapon = GetMainHandItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2485 if (weapon->GetItemEquipType() == EQUIP_WAND) |
| 816 | 2486 { |
| 2487 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
| 2488 __debugbreak(); // looks like wands were two-handed weapons once, or supposed to be. should not get here now | |
| 2489 weapon_recovery = pSpellDatas[wand_spell_ids[weapon->uItemID - ITEM_WAND_FIRE]].uExpertLevelRecovery; | |
| 2490 } | |
| 0 | 2491 else |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2492 weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()]; |
| 816 | 2493 } |
| 1989 | 2494 if (HasItemEquipped(EQUIP_SINGLE_HANDED) && GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) != EQUIP_SHIELD) |
| 1010 | 2495 // ADD: shield check because shield recovery is added later and can be accidentally doubled |
| 816 | 2496 { |
| 1717 | 2497 if (base_recovery_times_per_weapon_type[GetOffHandItem()->GetPlayerSkillType()] > weapon_recovery) |
| 2498 { | |
| 1731 | 2499 weapon = GetOffHandItem(); |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2500 weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()]; |
| 816 | 2501 } |
| 2502 } | |
| 2503 | |
| 2504 uint armour_recovery = 0; | |
| 0 | 2505 if ( HasItemEquipped(EQUIP_ARMOUR) ) |
| 2506 { | |
| 1980 | 2507 uchar armour_skill_type = GetArmorItem()->GetPlayerSkillType(); |
| 816 | 2508 uint base_armour_recovery = base_recovery_times_per_weapon_type[armour_skill_type]; |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2509 float multiplier; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2510 |
| 816 | 2511 if (armour_skill_type == PLAYER_SKILL_LEATHER) |
| 2512 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2513 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0, 0, 0); |
| 816 | 2514 } |
| 2515 else if (armour_skill_type == PLAYER_SKILL_CHAIN) | |
| 2516 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2517 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0, 0); |
| 816 | 2518 } |
| 2519 else if (armour_skill_type == PLAYER_SKILL_PLATE) | |
| 2520 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2521 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0.5f, 0); |
| 0 | 2522 } |
| 2523 else | |
| 2524 { | |
| 1545 | 2525 Error("Unknown armour type"); // what kind of armour is that? |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2526 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 1.0f, 1.0f, 1.0f); |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2527 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2528 |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2529 armour_recovery = (uint)(base_armour_recovery * multiplier); |
| 816 | 2530 } |
| 2531 | |
| 2532 uint shield_recovery = 0; | |
| 1989 | 2533 if (HasItemEquipped(EQUIP_SINGLE_HANDED) && GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) == EQUIP_SHIELD) |
| 816 | 2534 { |
| 1980 | 2535 uchar skill_type = GetOffHandItem()->GetPlayerSkillType(); |
| 816 | 2536 |
| 2537 uint shield_base_recovery = base_recovery_times_per_weapon_type[skill_type]; | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2538 float multiplier = GetArmorRecoveryMultiplierFromSkillLevel(skill_type, 1.0f, 0, 0, 0); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2539 shield_recovery = (uint)(shield_base_recovery * multiplier); |
| 816 | 2540 } |
| 2541 | |
| 1036 | 2542 uint player_speed_recovery_reduction = GetParameterBonus(GetActualSpeed()), |
| 816 | 2543 sword_axe_bow_recovery_reduction = 0; |
| 2544 bool shooting_laser = false; | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2545 if (weapon != nullptr) |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2546 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2547 if (GetActualSkillLevel((PLAYER_SKILL_TYPE)weapon->GetPlayerSkillType()) && |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2548 (weapon->GetPlayerSkillType() == PLAYER_SKILL_SWORD || weapon->GetPlayerSkillType() == PLAYER_SKILL_AXE || weapon->GetPlayerSkillType() == PLAYER_SKILL_BOW) ) |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2549 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2550 if (SkillToMastery(pActiveSkills[weapon->GetPlayerSkillType()]) >= 2 ) // Expert Sword, Axe & Bow reduce recovery |
| 1759 | 2551 sword_axe_bow_recovery_reduction = pActiveSkills[weapon->GetPlayerSkillType()] & 0x3F; |
| 2552 } | |
| 2553 if (weapon->GetPlayerSkillType() == PLAYER_SKILL_BLASTER) | |
| 816 | 2554 shooting_laser = true; |
| 2555 } | |
| 2556 | |
| 2557 uint armsmaster_recovery_reduction = 0; | |
| 2558 if (!bRangedAttack && !shooting_laser) | |
| 2559 { | |
| 2560 if (uint armsmaster_level = GetActualSkillLevel(PLAYER_SKILL_ARMSMASTER)) | |
| 2561 { | |
| 2562 armsmaster_recovery_reduction = armsmaster_level & 0x3F; | |
| 2563 if (SkillToMastery(armsmaster_level) >= 4) | |
| 2564 armsmaster_recovery_reduction *= 2; | |
| 2565 } | |
| 2566 } | |
| 2567 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2568 uint hasteRecoveryReduction = 0; |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
2569 if (pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime > 0 || pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime > 0 ) |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2570 hasteRecoveryReduction = 25; |
| 816 | 2571 |
| 2572 uint weapon_enchantment_recovery_reduction = 0; | |
| 2573 if ( weapon ) | |
| 2574 { | |
| 2575 if (weapon->uSpecEnchantmentType == 59 || | |
| 2576 weapon->uSpecEnchantmentType == 41 || | |
| 2577 weapon->uSpecEnchantmentType == 500) | |
| 2578 weapon_enchantment_recovery_reduction = 20; | |
| 2579 } | |
| 2580 | |
| 2581 int recovery = weapon_recovery + | |
| 2582 armour_recovery + | |
| 2583 shield_recovery | |
| 2584 - armsmaster_recovery_reduction | |
| 2585 - weapon_enchantment_recovery_reduction | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2586 - hasteRecoveryReduction |
| 816 | 2587 - sword_axe_bow_recovery_reduction |
| 2588 - player_speed_recovery_reduction; | |
| 2589 | |
| 2590 if (recovery < 0) | |
| 2591 recovery = 0; | |
| 2592 return recovery; | |
| 0 | 2593 } |
| 2594 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2595 |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2596 //----- new -------------------------------------------------------- |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2597 float Player::GetArmorRecoveryMultiplierFromSkillLevel( unsigned char armour_skill_type, float mult1, float mult2, float mult3, float mult4 ) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2598 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2599 uint skill_mastery = SkillToMastery(pActiveSkills[armour_skill_type]); |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2600 switch (skill_mastery) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2601 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2602 case 1: return mult1; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2603 case 2: return mult2; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2604 case 3: return mult3; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2605 case 4: return mult4; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2606 } |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2607 Error("Unexpected input value: %d", armour_skill_type); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2608 return 0; |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2609 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2610 |
| 0 | 2611 //----- (0048E4F8) -------------------------------------------------------- |
| 2612 int Player::GetMaxHealth() | |
| 2613 { | |
| 2614 int v3; // esi@1 | |
| 2615 int v4; // esi@1 | |
| 2616 int v6; // esi@1 | |
| 2617 | |
| 1036 | 2618 v3 = GetParameterBonus(GetActualEndurance()); |
| 135 | 2619 v4 = pBaseHealthPerLevelByClass[classType] * (GetActualLevel() + v3); |
| 0 | 2620 v6 = uFullHealthBonus |
| 135 | 2621 + pBaseHealthByClass[classType / 4] |
| 0 | 2622 + GetSkillBonus(CHARACTER_ATTRIBUTE_HEALTH) |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2623 + GetItemsBonus(CHARACTER_ATTRIBUTE_HEALTH) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2624 return max(1, v6); |
| 0 | 2625 } |
| 2626 | |
| 2627 //----- (0048E565) -------------------------------------------------------- | |
| 2628 int Player::GetMaxMana() | |
| 2629 { | |
| 2630 int v2; // eax@2 | |
| 2631 int v3; // esi@4 | |
| 2632 int v4; // eax@5 | |
| 2633 int v5; // esi@5 | |
| 2634 int v6; // eax@5 | |
| 2635 int v7; // esi@6 | |
| 2636 int v8; // esi@6 | |
| 2637 int v9; // esi@6 | |
| 1116 | 2638 |
| 135 | 2639 switch (classType) |
| 0 | 2640 { |
| 1116 | 2641 case PLAYER_CLASS_ROGUE: |
| 2642 case PLAYER_CLASS_SPY: | |
| 2643 case PLAYER_CLASS_ASSASSIN: | |
| 2644 case PLAYER_CLASS_ARCHER: | |
| 2645 case PLAYER_CLASS_WARRIOR_MAGE: | |
| 2646 case PLAYER_CLASS_MASTER_ARCHER: | |
| 2647 case PLAYER_CLASS_SNIPER: | |
| 2648 case PLAYER_CLASS_SORCERER: | |
| 2649 case PLAYER_CLASS_WIZARD: | |
| 2650 case PLAYER_CLASS_ARCHMAGE: | |
| 2651 case PLAYER_CLASS_LICH: | |
| 0 | 2652 v2 = GetActualIntelligence(); |
| 1036 | 2653 v3 = GetParameterBonus(v2); |
| 1116 | 2654 break; |
| 2655 case PLAYER_CLASS_INITIATE: | |
| 2656 case PLAYER_CLASS_MASTER: | |
| 2657 case PLAYER_CLASS_NINJA: | |
| 2658 case PLAYER_CLASS_PALADIN: | |
| 2659 case PLAYER_CLASS_CRUSADER: | |
| 2660 case PLAYER_CLASS_HERO: | |
| 2661 case PLAYER_CLASS_VILLIAN: | |
| 2662 case PLAYER_CLASS_CLERIC: | |
| 2663 case PLAYER_CLASS_PRIEST: | |
| 2664 case PLAYER_CLASS_PRIEST_OF_SUN: | |
| 2665 case PLAYER_CLASS_PRIEST_OF_MOON: | |
| 0 | 2666 v2 = GetActualWillpower(); |
| 1036 | 2667 v3 = GetParameterBonus(v2); |
| 1116 | 2668 break; |
| 2669 case PLAYER_CLASS_HUNTER: | |
| 2670 case PLAYER_CLASS_RANGER_LORD: | |
| 2671 case PLAYER_CLASS_BOUNTY_HUNTER: | |
| 2672 case PLAYER_CLASS_DRUID: | |
| 2673 case PLAYER_CLASS_GREAT_DRUID: | |
| 2674 case PLAYER_CLASS_ARCH_DRUID: | |
| 2675 case PLAYER_CLASS_WARLOCK: | |
| 0 | 2676 v4 = GetActualWillpower(); |
| 1036 | 2677 v5 = GetParameterBonus(v4); |
| 0 | 2678 v6 = GetActualIntelligence(); |
| 1036 | 2679 v3 = GetParameterBonus(v6) + v5; |
| 0 | 2680 break; |
| 2681 default: | |
| 1116 | 2682 return 0; |
| 0 | 2683 break; |
| 2684 } | |
| 1116 | 2685 v7 = pBaseManaPerLevelByClass[classType] * (GetActualLevel() + v3); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2686 v8 = GetItemsBonus(CHARACTER_ATTRIBUTE_MANA) + v7; |
| 1116 | 2687 v9 = uFullManaBonus |
| 2688 + pBaseManaByClass[classType / 4] | |
| 2689 + GetSkillBonus(CHARACTER_ATTRIBUTE_MANA) | |
| 2690 + v8; | |
| 2691 return max(0,v9); | |
| 0 | 2692 } |
| 2693 | |
| 2694 //----- (0048E656) -------------------------------------------------------- | |
| 2695 int Player::GetBaseAC() | |
| 2696 { | |
| 2697 int v2; // eax@1 | |
| 2698 int v3; // esi@1 | |
| 2699 int v4; // esi@1 | |
| 2700 int v5; // esi@1 | |
| 2701 | |
| 2702 v2 = GetActualSpeed(); | |
| 1036 | 2703 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2704 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2705 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2706 return max(0, v5); |
| 0 | 2707 } |
| 2708 | |
| 2709 //----- (0048E68F) -------------------------------------------------------- | |
| 2710 int Player::GetActualAC() | |
| 2711 { | |
| 2712 int v2; // eax@1 | |
| 2713 int v3; // esi@1 | |
| 2714 int v4; // esi@1 | |
| 2715 int v5; // esi@1 | |
| 2716 int v6; // esi@1 | |
| 2717 | |
| 2718 v2 = GetActualSpeed(); | |
| 1036 | 2719 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2720 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2721 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2722 v6 = this->sACModifier + GetMagicalBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v5; |
|
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2723 return max(0, v6); |
| 0 | 2724 } |
| 2725 | |
| 2726 //----- (0048E6DC) -------------------------------------------------------- | |
| 2727 unsigned int Player::GetBaseAge() | |
| 2728 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2729 return (unsigned int)(((__int64)(pParty->uTimePlayed * 0.234375) / 60 / 60 / 24) / 7 / 4 / 12 - uBirthYear + game_starting_year); |
| 0 | 2730 } |
| 2731 | |
| 2732 //----- (0048E72C) -------------------------------------------------------- | |
| 2733 unsigned int Player::GetActualAge() | |
| 2734 { | |
| 2735 return this->sAgeModifier + GetBaseAge(); | |
| 2736 } | |
| 2737 | |
| 2738 //----- (0048E73F) -------------------------------------------------------- | |
| 2739 int Player::GetBaseResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2740 { | |
| 2741 int v7; // esi@20 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2742 int racialBonus = 0; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2743 __int16* resStat; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2744 |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2745 switch (a2) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2746 { |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2747 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2748 resStat = &sResFireBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2749 if (IsRaceGoblin()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2750 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2751 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2752 case CHARACTER_ATTRIBUTE_RESIST_AIR: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2753 resStat = &sResAirBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2754 if (IsRaceGoblin()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2755 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2756 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2757 case CHARACTER_ATTRIBUTE_RESIST_WATER: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2758 resStat = &sResWaterBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2759 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2760 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2761 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2762 case CHARACTER_ATTRIBUTE_RESIST_EARTH: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2763 resStat = &sResEarthBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2764 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2765 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2766 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2767 case CHARACTER_ATTRIBUTE_RESIST_MIND: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2768 resStat = &sResMindBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2769 if (IsRaceElf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2770 racialBonus = 10; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2771 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2772 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2773 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2774 resStat = &sResBodyBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2775 if (IsRaceHuman()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2776 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2777 break; |
| 1783 | 2778 default: |
| 2779 Error("Unknown attribute"); | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2780 } |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2781 v7 = GetItemsBonus(a2) + racialBonus; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2782 return v7 + *resStat; |
| 0 | 2783 } |
| 2784 | |
| 2785 //----- (0048E7D0) -------------------------------------------------------- | |
| 2786 int Player::GetActualResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2787 { | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2788 signed int v10 = 0; // [sp+14h] [bp-4h]@1 |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2789 __int16* resStat; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2790 int result; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2791 int baseRes; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2792 |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2793 int leatherArmorSkillLevel = GetActualSkillLevel(PLAYER_SKILL_LEATHER); |
| 652 | 2794 if ( CheckHiredNPCSpeciality(Enchanter) ) |
| 0 | 2795 v10 = 20; |
| 2796 if ( (a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE | |
| 2797 || a2 == CHARACTER_ATTRIBUTE_RESIST_AIR | |
| 2798 || a2 == CHARACTER_ATTRIBUTE_RESIST_WATER | |
| 2799 || a2 == CHARACTER_ATTRIBUTE_RESIST_EARTH) | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2800 && SkillToMastery(leatherArmorSkillLevel) == 4 |
| 0 | 2801 && HasItemEquipped(EQUIP_ARMOUR) |
| 2802 && GetEquippedItemSkillType(EQUIP_ARMOUR) == PLAYER_SKILL_LEATHER ) | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2803 v10 += leatherArmorSkillLevel & 0x3F; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2804 switch (a2) |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2805 { |
| 1783 | 2806 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
| 2807 resStat = &sResFireBonus; | |
| 2808 break; | |
| 2809 case CHARACTER_ATTRIBUTE_RESIST_AIR: | |
| 2810 resStat = &sResAirBonus; | |
| 2811 break; | |
| 2812 case CHARACTER_ATTRIBUTE_RESIST_WATER: | |
| 2813 resStat = &sResWaterBonus; | |
| 2814 break; | |
| 2815 case CHARACTER_ATTRIBUTE_RESIST_EARTH: | |
| 2816 resStat = &sResEarthBonus; | |
| 2817 break; | |
| 2818 case CHARACTER_ATTRIBUTE_RESIST_MIND: | |
| 2819 resStat = &sResMindBonus; | |
| 2820 break; | |
| 2821 case CHARACTER_ATTRIBUTE_RESIST_BODY: | |
| 2822 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: | |
| 2823 resStat = &sResBodyBonus; | |
| 2824 break; | |
| 2825 default: Error("Unexpected attribute"); | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2826 } |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2827 baseRes = GetBaseResistance(a2); |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2828 result = v10 + GetMagicalBonus(a2) + baseRes + *(resStat); |
| 0 | 2829 return result; |
| 2830 } | |
| 2831 | |
| 2832 //----- (0048E8F5) -------------------------------------------------------- | |
| 816 | 2833 bool Player::Recover(int dt) |
| 2834 { | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2835 int v3; // qax@1 |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2836 |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2837 v3 = (int)(dt * GetSpecialItemBonus(17) * 0.01 + dt); |
| 816 | 2838 |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
2839 //Log::Warning(L"Recover(dt = %u/%u - %u", dt, (uint)v3, (uint)uTimeToRecovery); |
| 816 | 2840 |
| 2841 if (uTimeToRecovery > v3) | |
| 2842 { | |
| 2843 uTimeToRecovery -= v3; | |
| 2844 return true; | |
| 0 | 2845 } |
| 2846 else | |
| 2847 { | |
| 816 | 2848 uTimeToRecovery = 0; |
| 2849 viewparams->bRedrawGameUI = true; | |
| 2850 if (!uActiveCharacter) | |
| 0 | 2851 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 2852 return false; |
| 2853 } | |
| 0 | 2854 } |
| 2855 | |
| 2856 //----- (0048E96A) -------------------------------------------------------- | |
| 816 | 2857 void Player::SetRecoveryTime(signed int rec) |
| 2858 { | |
| 1545 | 2859 Assert(rec >= 0); |
| 816 | 2860 |
| 2861 if (rec > uTimeToRecovery) | |
| 2862 uTimeToRecovery = rec; | |
| 2863 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2864 if (uActiveCharacter != 0 && pPlayers[uActiveCharacter] == this && !some_active_character) |
| 0 | 2865 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 2866 |
| 2867 viewparams->bRedrawGameUI = true; | |
| 0 | 2868 } |
| 2869 // 50C0C4: using guessed type int some_active_character; | |
| 2870 | |
| 2871 //----- (0048E9B7) -------------------------------------------------------- | |
| 2872 void Player::RandomizeName() | |
| 2873 { | |
| 2874 if (!uExpressionTimePassed) | |
| 2875 strcpy(pName, pNPCStats->pNPCNames[rand() % pNPCStats->uNumNPCNames[uSex]][uSex]); | |
| 2876 } | |
| 2877 | |
| 2878 //----- (0048E9F4) -------------------------------------------------------- | |
| 2879 unsigned int Player::GetMajorConditionIdx() | |
| 2880 { | |
| 2881 for (uint i = 0; i < 18; ++i) | |
| 2882 if (pConditions[pConditionImportancyTable[i]] != 0) | |
| 2883 return pConditionImportancyTable[i]; | |
| 2884 | |
| 2885 return 18; | |
| 2886 } | |
| 2887 | |
| 2888 //----- (0048EA1B) -------------------------------------------------------- | |
| 1036 | 2889 int Player::GetParameterBonus( int player_parameter ) |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2890 { |
| 1036 | 2891 int i; // eax@1 |
| 2892 i = 0; | |
| 2893 while (param_to_bonus_table[i]) | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2894 { |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2895 if (player_parameter >= param_to_bonus_table[i]) |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2896 break; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2897 ++i; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2898 } |
| 1036 | 2899 return parameter_to_bonus_value[i]; |
| 0 | 2900 } |
| 2901 | |
| 2902 //----- (0048EA46) -------------------------------------------------------- | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2903 int Player::GetSpecialItemBonus( int enchantmentId ) |
| 0 | 2904 { |
| 1989 | 2905 for (int i = EQUIP_SINGLE_HANDED; i < EQUIP_BOOK; ++i ) |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2906 { |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2907 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2908 { |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2909 if (enchantmentId == 17) |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2910 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2911 if ((GetNthEquippedIndexItem(i)->uSpecEnchantmentType == 17) || (GetNthEquippedIndexItem(i)->uItemID == 533)) //Elven Chainmail+Increases rate of Recovery |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2912 return 50; |
| 1032 | 2913 } |
|
1598
11bb463837b1
_48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus, forgot to commit actor.cpp
Grumpy7
parents:
1597
diff
changeset
|
2914 if (enchantmentId == 24) |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2915 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2916 if (GetNthEquippedIndexItem(i)->uSpecEnchantmentType == 24) //Increased Knockback. |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2917 return 5; |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2918 } |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2919 } |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2920 } |
| 1032 | 2921 return 0; |
| 0 | 2922 } |
| 2923 | |
| 2924 //----- (0048EAAE) -------------------------------------------------------- | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2925 int Player::GetItemsBonus( enum CHARACTER_ATTRIBUTE_TYPE attr, bool getOnlyMainHandDmg /*= false*/ ) |
| 0 | 2926 { |
| 2927 int v5; // edi@1 | |
| 2928 int v9; // eax@49 | |
| 2929 int v14; // ecx@58 | |
| 2930 int v15; // eax@58 | |
| 2931 int v17; // eax@62 | |
| 2932 int v22; // eax@76 | |
| 2933 int v25; // ecx@80 | |
| 2934 int v26; // edi@80 | |
| 2935 int v32; // eax@98 | |
| 2936 int v56; // eax@365 | |
| 2937 signed int v58; // [sp-4h] [bp-20h]@10 | |
| 2938 int v61; // [sp+10h] [bp-Ch]@1 | |
| 2939 int v62; // [sp+14h] [bp-8h]@1 | |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2940 ItemGen *currEquippedItem; // [sp+20h] [bp+4h]@101 |
| 1040 | 2941 bool no_skills; |
| 0 | 2942 |
| 2943 v5 = 0; | |
| 2944 v62 = 0; | |
| 2945 v61 = 0; | |
| 1040 | 2946 |
| 2947 no_skills=false; | |
| 0 | 2948 switch (attr) |
| 1599 | 2949 { |
| 2950 case CHARACTER_ATTRIBUTE_SKILL_ALCHEMY: v58 = PLAYER_SKILL_ALCHEMY; break; | |
| 2951 case CHARACTER_ATTRIBUTE_SKILL_STEALING: v58 = PLAYER_SKILL_STEALING; break; | |
| 2952 case CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM: v58 = PLAYER_SKILL_TRAP_DISARM; break; | |
| 2953 case CHARACTER_ATTRIBUTE_SKILL_ITEM_ID: v58 = PLAYER_SKILL_ITEM_ID; break; | |
| 2954 case CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID: v58 = PLAYER_SKILL_MONSTER_ID; break; | |
| 2955 case CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER: v58 = PLAYER_SKILL_ARMSMASTER; break; | |
| 2956 case CHARACTER_ATTRIBUTE_SKILL_DODGE: v58 = PLAYER_SKILL_DODGE; break; | |
| 2957 case CHARACTER_ATTRIBUTE_SKILL_UNARMED: v58 = PLAYER_SKILL_UNARMED; break; | |
| 2958 case CHARACTER_ATTRIBUTE_SKILL_FIRE: v58 = PLAYER_SKILL_FIRE; break; | |
| 2959 case CHARACTER_ATTRIBUTE_SKILL_AIR: v58 = PLAYER_SKILL_AIR; break; | |
| 2960 case CHARACTER_ATTRIBUTE_SKILL_WATER: v58 = PLAYER_SKILL_WATER; break; | |
| 2961 case CHARACTER_ATTRIBUTE_SKILL_EARTH: v58 = PLAYER_SKILL_EARTH; break; | |
| 2962 case CHARACTER_ATTRIBUTE_SKILL_SPIRIT: v58 = PLAYER_SKILL_SPIRIT; break; | |
| 2963 case CHARACTER_ATTRIBUTE_SKILL_MIND: v58 = PLAYER_SKILL_MIND; break; | |
| 2964 case CHARACTER_ATTRIBUTE_SKILL_BODY: v58 = PLAYER_SKILL_BODY; break; | |
| 2965 case CHARACTER_ATTRIBUTE_SKILL_LIGHT: v58 = PLAYER_SKILL_LIGHT; break; | |
| 2966 case CHARACTER_ATTRIBUTE_SKILL_DARK: v58 = PLAYER_SKILL_DARK; break; | |
| 2967 case CHARACTER_ATTRIBUTE_SKILL_MEDITATION: v58 = PLAYER_SKILL_MEDITATION; break; | |
| 2968 case CHARACTER_ATTRIBUTE_SKILL_BOW: v58 = PLAYER_SKILL_BOW; break; | |
| 2969 case CHARACTER_ATTRIBUTE_SKILL_SHIELD: v58 = PLAYER_SKILL_SHIELD; break; | |
| 2970 case CHARACTER_ATTRIBUTE_SKILL_LEARNING: v58 = PLAYER_SKILL_LEARNING; break; | |
| 2971 default: | |
| 1040 | 2972 no_skills=true; |
| 1599 | 2973 } |
| 1040 | 2974 if (!no_skills) |
| 1599 | 2975 { |
| 2976 if ( !this->pActiveSkills[v58] ) | |
| 2977 return 0; | |
| 2978 } | |
| 1040 | 2979 |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2980 switch(attr) //TODO would be nice to move these into separate functions |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2981 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2982 case CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2983 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: |
| 0 | 2984 if ( HasItemEquipped(EQUIP_BOW) ) |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2985 v5 = GetBowItem()->GetDamageMod(); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2986 return v5; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2987 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2988 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2989 case CHARACTER_ATTRIBUTE_RANGED_DMG_MIN: |
| 0 | 2990 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2991 return 0; |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2992 v5 = GetBowItem()->GetDamageMod(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2993 v56 = GetBowItem()->GetDamageDice(); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2994 return v5 + v56; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2995 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2996 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2997 case CHARACTER_ATTRIBUTE_RANGED_DMG_MAX: |
| 0 | 2998 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2999 return 0; |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3000 v5 = GetBowItem()->GetDamageDice() * GetBowItem()->GetDamageRoll(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3001 v56 = GetBowItem()->GetDamageMod(); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3002 return v5 + v56; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3003 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3004 case CHARACTER_ATTRIBUTE_LEVEL: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3005 if ( !Player::HasEnchantedItemEquipped(25) ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3006 return 0; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3007 return 5; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3008 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3009 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3010 case CHARACTER_ATTRIBUTE_MELEE_DMG_MAX: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3011 if ( IsUnarmed() ) |
| 0 | 3012 { |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3013 return 3; |
| 0 | 3014 } |
| 3015 else | |
| 3016 { | |
| 1989 | 3017 if ( this->HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 0 | 3018 { |
| 1989 | 3019 v22 = this->GetEquippedItemEquipType(EQUIP_TWO_HANDED); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3020 if ( v22 >= 0 && v22 <= 2) |
| 0 | 3021 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3022 ItemGen* mainHandItem = GetMainHandItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3023 v26 = mainHandItem->GetDamageRoll(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3024 if ( GetOffHandItem() != nullptr || mainHandItem->GetPlayerSkillType() != 4 ) |
| 0 | 3025 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3026 v25 = mainHandItem->GetDamageDice(); |
| 0 | 3027 } |
| 3028 else | |
| 3029 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3030 v25 = mainHandItem->GetDamageDice() + 1; |
| 0 | 3031 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3032 v5 = mainHandItem->GetDamageMod() + v25 * v26; |
| 0 | 3033 } |
| 3034 } | |
| 1989 | 3035 if ( getOnlyMainHandDmg || !this->HasItemEquipped(EQUIP_SINGLE_HANDED) || (GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) < 0 || GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) > 2)) |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3036 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3037 return v5; |
| 1040 | 3038 } |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3039 else |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3040 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3041 ItemGen* offHandItem = GetOffHandItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3042 v15 = offHandItem->GetDamageMod(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3043 v14 = offHandItem->GetDamageDice() * offHandItem->GetDamageRoll(); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3044 return v5 + v15 + v14; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3045 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3046 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3047 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3048 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3049 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3050 case CHARACTER_ATTRIBUTE_ATTACK: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3051 if ( IsUnarmed() ) |
| 1040 | 3052 { |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3053 return 0; |
| 1040 | 3054 } |
| 1989 | 3055 if ( this->HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 0 | 3056 { |
| 1989 | 3057 v17 = this->GetEquippedItemEquipType(EQUIP_TWO_HANDED); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3058 if ( v17 >= 0 && v17 <= 2) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3059 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3060 v5 = GetMainHandItem()->GetDamageMod(); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3061 } |
| 0 | 3062 } |
| 1989 | 3063 if ( getOnlyMainHandDmg || !this->HasItemEquipped(EQUIP_SINGLE_HANDED) || (this->GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) < 0) || this->GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) > 2 ) |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3064 return v5; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3065 else |
| 0 | 3066 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3067 v56 = GetOffHandItem()->GetDamageMod(); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3068 return v5 + v56; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3069 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3070 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3071 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3072 case CHARACTER_ATTRIBUTE_MELEE_DMG_MIN: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3073 if ( IsUnarmed() ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3074 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3075 return 1; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3076 } |
| 1989 | 3077 if ( this->HasItemEquipped(EQUIP_TWO_HANDED) ) |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3078 { |
| 1989 | 3079 v9 = this->GetEquippedItemEquipType(EQUIP_TWO_HANDED); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3080 if ( v9 >= 0 && v9 <= 2) |
| 0 | 3081 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3082 ItemGen* mainHandItem = GetMainHandItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3083 v5 = mainHandItem->GetDamageDice() + |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3084 mainHandItem->GetDamageMod(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3085 if ( GetOffHandItem() == nullptr && mainHandItem->GetPlayerSkillType() == 4) |
| 0 | 3086 { |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3087 ++v5; |
| 0 | 3088 } |
| 3089 } | |
| 3090 } | |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3091 |
| 1989 | 3092 if ( getOnlyMainHandDmg || !this->HasItemEquipped(EQUIP_SINGLE_HANDED) || (this->GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) < 0) || this->GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) > 2 ) |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3093 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3094 return v5; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3095 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3096 else |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3097 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3098 ItemGen* offHandItem = GetOffHandItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3099 v14 = offHandItem->GetDamageMod(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3100 v15 = offHandItem->GetDamageDice(); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3101 return v5 + v15 + v14; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3102 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3103 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3104 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3105 case CHARACTER_ATTRIBUTE_STRENGTH: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3106 case CHARACTER_ATTRIBUTE_INTELLIGENCE: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3107 case CHARACTER_ATTRIBUTE_WILLPOWER: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3108 case CHARACTER_ATTRIBUTE_ENDURANCE: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3109 case CHARACTER_ATTRIBUTE_ACCURACY: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3110 case CHARACTER_ATTRIBUTE_SPEED: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3111 case CHARACTER_ATTRIBUTE_LUCK: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3112 case CHARACTER_ATTRIBUTE_HEALTH: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3113 case CHARACTER_ATTRIBUTE_MANA: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3114 case CHARACTER_ATTRIBUTE_AC_BONUS: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3115 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3116 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3117 case CHARACTER_ATTRIBUTE_RESIST_AIR: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3118 case CHARACTER_ATTRIBUTE_RESIST_WATER: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3119 case CHARACTER_ATTRIBUTE_RESIST_EARTH: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3120 case CHARACTER_ATTRIBUTE_RESIST_MIND: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3121 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3122 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3123 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3124 case CHARACTER_ATTRIBUTE_SKILL_ALCHEMY: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3125 case CHARACTER_ATTRIBUTE_SKILL_STEALING: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3126 case CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3127 case CHARACTER_ATTRIBUTE_SKILL_ITEM_ID: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3128 case CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3129 case CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3130 case CHARACTER_ATTRIBUTE_SKILL_DODGE: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3131 case CHARACTER_ATTRIBUTE_SKILL_UNARMED: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3132 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3133 case CHARACTER_ATTRIBUTE_SKILL_FIRE: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3134 case CHARACTER_ATTRIBUTE_SKILL_AIR: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3135 case CHARACTER_ATTRIBUTE_SKILL_WATER: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3136 case CHARACTER_ATTRIBUTE_SKILL_EARTH: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3137 case CHARACTER_ATTRIBUTE_SKILL_SPIRIT: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3138 case CHARACTER_ATTRIBUTE_SKILL_MIND: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3139 case CHARACTER_ATTRIBUTE_SKILL_BODY: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3140 case CHARACTER_ATTRIBUTE_SKILL_LIGHT: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3141 case CHARACTER_ATTRIBUTE_SKILL_DARK: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3142 case CHARACTER_ATTRIBUTE_SKILL_MEDITATION: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3143 case CHARACTER_ATTRIBUTE_SKILL_BOW: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3144 case CHARACTER_ATTRIBUTE_SKILL_SHIELD: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3145 case CHARACTER_ATTRIBUTE_SKILL_LEARNING: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3146 for (int i = 0; i < 16; i++) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3147 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3148 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 1040 | 3149 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3150 currEquippedItem = GetNthEquippedIndexItem(i); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3151 if ( attr == CHARACTER_ATTRIBUTE_AC_BONUS ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3152 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3153 v32 = currEquippedItem->GetItemEquipType(); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3154 if ( v32 >= 3 && v32 <= 11 ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3155 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3156 v5 += currEquippedItem->GetDamageDice() + currEquippedItem->GetDamageMod(); |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3157 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3158 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3159 if ( pItemsTable->IsMaterialNonCommon(currEquippedItem) |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3160 && !pItemsTable->IsMaterialSpecial(currEquippedItem) ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3161 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3162 currEquippedItem->GetItemBonusArtifact(this, attr, &v62); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3163 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3164 else if ( currEquippedItem->uEnchantmentType != 0 ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3165 { |
| 2156 | 3166 if (this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uEnchantmentType - 1 == attr)//if (currEquippedItem->IsRegularEnchanmentForAttribute(attr)) |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3167 { |
| 2158 | 3168 if ( attr > CHARACTER_ATTRIBUTE_RESIST_BODY && v5 < currEquippedItem->m_enchantmentStrength )//for skills bonuses |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3169 v5 = currEquippedItem->m_enchantmentStrength; |
| 2159 | 3170 else // for resists and attributes bonuses |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3171 v5 += currEquippedItem->m_enchantmentStrength; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3172 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3173 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3174 else |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3175 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3176 currEquippedItem->GetItemBonusSpecialEnchantment(this, attr, &v5, &v61); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3177 } |
| 1040 | 3178 } |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3179 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3180 return v5 + v62 + v61; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3181 break; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3182 default: |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3183 return 0; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3184 } |
| 0 | 3185 } |
| 3186 | |
| 3187 //----- (0048F73C) -------------------------------------------------------- | |
| 3188 int Player::GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 3189 { | |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3190 int v3 = 0; // eax@4 |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3191 int v4 = 0; // ecx@5 |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3192 |
| 0 | 3193 switch ( a2 ) |
| 3194 { | |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3195 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3196 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_FIRE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3197 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_FIRE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3198 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3199 case CHARACTER_ATTRIBUTE_RESIST_AIR: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3200 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_AIR].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3201 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_AIR].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3202 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3203 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3204 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_BODY].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3205 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_BODY].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3206 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3207 case CHARACTER_ATTRIBUTE_RESIST_WATER: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3208 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_WATER].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3209 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_WATER].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3210 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3211 case CHARACTER_ATTRIBUTE_RESIST_EARTH: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3212 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_EARTH].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3213 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_EARTH].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3214 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3215 case CHARACTER_ATTRIBUTE_RESIST_MIND: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3216 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_MIND].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3217 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_MIND].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3218 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3219 case CHARACTER_ATTRIBUTE_ATTACK: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3220 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3221 v3 = this->pPlayerBuffs[PLAYER_BUFF_BLESS].uPower; //only player effect spell in both VI and VII |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3222 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3223 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3224 v3 = this->pPlayerBuffs[PLAYER_BUFF_HEROISM].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3225 v4 = pParty->pPartyBuffs[PARTY_BUFF_HEROISM].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3226 break; |
| 0 | 3227 case CHARACTER_ATTRIBUTE_STRENGTH: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3228 v3 = pPlayerBuffs[PLAYER_BUFF_STRENGTH].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3229 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3230 break; |
| 0 | 3231 case CHARACTER_ATTRIBUTE_INTELLIGENCE: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3232 v3 = pPlayerBuffs[PLAYER_BUFF_INTELLIGENCE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3233 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3234 break; |
| 0 | 3235 case CHARACTER_ATTRIBUTE_WILLPOWER: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3236 v3 = pPlayerBuffs[PLAYER_BUFF_WILLPOWER].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3237 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3238 break; |
| 0 | 3239 case CHARACTER_ATTRIBUTE_ENDURANCE: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3240 v3 = pPlayerBuffs[PLAYER_BUFF_ENDURANCE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3241 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3242 break; |
| 0 | 3243 case CHARACTER_ATTRIBUTE_ACCURACY: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3244 v3 = pPlayerBuffs[PLAYER_BUFF_ACCURACY].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3245 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3246 break; |
| 0 | 3247 case CHARACTER_ATTRIBUTE_SPEED: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3248 v3 = pPlayerBuffs[PLAYER_BUFF_SPEED].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3249 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3250 break; |
| 0 | 3251 case CHARACTER_ATTRIBUTE_LUCK: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3252 v3 = pPlayerBuffs[PLAYER_BUFF_LUCK].uPower; |
| 1167 | 3253 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3254 break; |
| 0 | 3255 case CHARACTER_ATTRIBUTE_AC_BONUS: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3256 v3 = this->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uPower; |
| 1167 | 3257 v4 = pParty->pPartyBuffs[PARTY_BUFF_STONE_SKIN].uPower; |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3258 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3259 } |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3260 return v3 + v4; |
| 0 | 3261 } |
| 3262 | |
| 3263 //----- (0048F882) -------------------------------------------------------- | |
| 1008 | 3264 int Player::GetActualSkillLevel( PLAYER_SKILL_TYPE uSkillType ) |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3265 { |
| 1064 | 3266 signed int bonus_value; // esi@1 |
| 3267 unsigned __int16 skill_value; // ax@126 | |
| 3268 int result; // al@127 | |
| 353 | 3269 |
| 1064 | 3270 bonus_value = 0; |
| 353 | 3271 switch (uSkillType) |
| 3272 { | |
| 3273 case PLAYER_SKILL_MONSTER_ID: | |
| 3274 { | |
| 652 | 3275 if ( CheckHiredNPCSpeciality(Hunter) ) |
| 1064 | 3276 bonus_value = 6; |
| 652 | 3277 if ( CheckHiredNPCSpeciality(Sage) ) |
| 1064 | 3278 bonus_value += 6; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3279 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID); |
| 353 | 3280 } |
| 3281 break; | |
| 3282 | |
| 3283 case PLAYER_SKILL_ARMSMASTER: | |
| 3284 { | |
| 652 | 3285 if ( CheckHiredNPCSpeciality(Armsmaster) ) |
| 1064 | 3286 bonus_value = 2; |
| 652 | 3287 if ( CheckHiredNPCSpeciality(Weaponsmaster) ) |
| 1064 | 3288 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3289 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER); |
| 353 | 3290 } |
| 3291 break; | |
| 3292 | |
| 3293 case PLAYER_SKILL_STEALING: | |
| 3294 { | |
| 652 | 3295 if (CheckHiredNPCSpeciality(Burglar)) |
| 1064 | 3296 bonus_value = 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3297 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_STEALING); |
| 353 | 3298 } |
| 3299 break; | |
| 3300 | |
| 3301 | |
| 3302 case PLAYER_SKILL_ALCHEMY: | |
| 3303 { | |
| 652 | 3304 if ( CheckHiredNPCSpeciality(Herbalist) ) |
| 1064 | 3305 bonus_value = 4; |
| 652 | 3306 if ( CheckHiredNPCSpeciality(Apothecary) ) |
| 1064 | 3307 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3308 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ALCHEMY); |
| 353 | 3309 } |
| 3310 break; | |
| 3311 | |
| 3312 case PLAYER_SKILL_LEARNING: | |
| 3313 { | |
| 652 | 3314 if ( CheckHiredNPCSpeciality(Teacher) ) |
| 1064 | 3315 bonus_value = 10; |
| 652 | 3316 if ( CheckHiredNPCSpeciality(Instructor) ) |
| 1064 | 3317 bonus_value += 15; |
| 652 | 3318 if ( CheckHiredNPCSpeciality(Scholar) ) |
| 1064 | 3319 bonus_value += 5; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3320 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LEARNING); |
| 353 | 3321 } |
| 3322 break; | |
| 3323 | |
| 3324 case PLAYER_SKILL_UNARMED: | |
| 3325 { | |
| 652 | 3326 if (CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3327 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3328 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_UNARMED); |
| 353 | 3329 } |
| 3330 break; | |
| 3331 | |
| 3332 case PLAYER_SKILL_DODGE: | |
| 3333 { | |
| 652 | 3334 if ( CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3335 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3336 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DODGE); |
| 353 | 3337 } |
| 3338 break; | |
| 3339 | |
| 3340 case PLAYER_SKILL_BOW: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3341 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BOW); |
| 353 | 3342 break; |
| 3343 case PLAYER_SKILL_SHIELD: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3344 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SHIELD); |
| 353 | 3345 break; |
| 3346 | |
| 3347 case PLAYER_SKILL_EARTH: | |
| 652 | 3348 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3349 bonus_value = 2; |
| 652 | 3350 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3351 bonus_value += 3; |
| 652 | 3352 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3353 bonus_value += 4; |
| 353 | 3354 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3355 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3356 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_EARTH); |
| 353 | 3357 break; |
| 3358 case PLAYER_SKILL_FIRE: | |
| 652 | 3359 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3360 bonus_value = 2; |
| 652 | 3361 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3362 bonus_value += 3; |
| 652 | 3363 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3364 bonus_value += 4; |
| 353 | 3365 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3366 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3367 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_FIRE); |
| 353 | 3368 break; |
| 3369 case PLAYER_SKILL_AIR: | |
| 652 | 3370 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3371 bonus_value = 2; |
| 652 | 3372 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3373 bonus_value += 3; |
| 652 | 3374 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3375 bonus_value += 4; |
| 353 | 3376 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3377 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3378 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_AIR); |
| 353 | 3379 break; |
| 3380 case PLAYER_SKILL_WATER: | |
| 652 | 3381 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3382 bonus_value = 2; |
| 652 | 3383 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3384 bonus_value += 3; |
| 652 | 3385 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3386 bonus_value += 4; |
| 353 | 3387 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3388 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3389 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_WATER); |
| 353 | 3390 break; |
| 3391 case PLAYER_SKILL_SPIRIT: | |
| 652 | 3392 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3393 bonus_value = 2; |
| 652 | 3394 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3395 bonus_value += 3; |
| 652 | 3396 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3397 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3398 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SPIRIT); |
| 353 | 3399 break; |
| 3400 case PLAYER_SKILL_MIND: | |
| 652 | 3401 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3402 bonus_value = 2; |
| 652 | 3403 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3404 bonus_value += 3; |
| 652 | 3405 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3406 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3407 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MIND); |
| 353 | 3408 break; |
| 3409 case PLAYER_SKILL_BODY: | |
| 652 | 3410 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3411 bonus_value = 2; |
| 652 | 3412 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3413 bonus_value += 3; |
| 652 | 3414 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3415 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3416 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BODY); |
| 353 | 3417 break; |
| 3418 case PLAYER_SKILL_LIGHT: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3419 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LIGHT); |
| 353 | 3420 break; |
| 3421 case PLAYER_SKILL_DARK: | |
| 3422 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3423 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DARK); |
| 353 | 3424 } |
| 3425 break; | |
| 3426 | |
| 3427 case PLAYER_SKILL_MERCHANT: | |
| 3428 { | |
| 652 | 3429 if ( CheckHiredNPCSpeciality(Trader) ) |
| 1064 | 3430 bonus_value = 4; |
| 652 | 3431 if ( CheckHiredNPCSpeciality(Merchant) ) |
| 1064 | 3432 bonus_value += 6; |
| 652 | 3433 if ( CheckHiredNPCSpeciality(Gypsy) ) |
| 1064 | 3434 bonus_value += 3; |
| 652 | 3435 if ( CheckHiredNPCSpeciality(Duper) ) |
| 1064 | 3436 bonus_value += 8; |
| 353 | 3437 } |
| 3438 break; | |
| 3439 | |
| 3440 case PLAYER_SKILL_PERCEPTION: | |
| 3441 { | |
| 652 | 3442 if ( CheckHiredNPCSpeciality(Scout) ) |
| 1064 | 3443 bonus_value = 6; |
| 652 | 3444 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1064 | 3445 bonus_value += 5; |
| 353 | 3446 } |
| 3447 break; | |
| 3448 | |
| 0 | 3449 case PLAYER_SKILL_ITEM_ID: |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3450 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ITEM_ID); |
| 0 | 3451 break; |
| 3452 case PLAYER_SKILL_MEDITATION: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3453 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MEDITATION); |
| 353 | 3454 break; |
| 0 | 3455 case PLAYER_SKILL_TRAP_DISARM: |
| 353 | 3456 { |
| 652 | 3457 if ( CheckHiredNPCSpeciality(Tinker) ) |
| 1064 | 3458 bonus_value = 4; |
| 652 | 3459 if ( CheckHiredNPCSpeciality(Locksmith) ) |
| 1064 | 3460 bonus_value += 6; |
| 652 | 3461 if ( CheckHiredNPCSpeciality(Burglar) ) |
| 1064 | 3462 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3463 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM); |
| 353 | 3464 } |
| 3465 break; | |
| 3466 } | |
| 3467 | |
| 1064 | 3468 skill_value = pActiveSkills[uSkillType]; |
| 3469 if ( bonus_value + (skill_value & 0x3F) < 60 ) | |
| 3470 result = bonus_value + skill_value; | |
| 0 | 3471 else |
| 1064 | 3472 result = skill_value & 0xFFFC | 0x3C; //al |
| 0 | 3473 return result; |
| 3474 } | |
| 3475 | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3476 |
| 0 | 3477 //----- (0048FC00) -------------------------------------------------------- |
| 1538 | 3478 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
|
3479 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3480 int armsMasterBonus; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3481 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3482 armsMasterBonus = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3483 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
|
3484 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
|
3485 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3486 int multiplier = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3487 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
|
3488 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3489 multiplier = GetMultiplierForSkillLevel(armmaster_skill, 0, 0, 1, 2); |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3490 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3491 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
|
3492 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3493 multiplier = GetMultiplierForSkillLevel(armmaster_skill, 0, 1, 1, 2); |
| 1064 | 3494 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3495 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
|
3496 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3497 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3498 switch(inSkill) |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3499 { |
|
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
|
3500 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
|
3501 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
|
3502 { |
|
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
|
3503 int bowSkillLevel = GetActualSkillLevel(PLAYER_SKILL_DODGE); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3504 int multiplier = GetMultiplierForSkillLevel(bowSkillLevel, 0, 0, 0, 1); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3505 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
|
3506 } |
|
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
|
3507 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
|
3508 break; |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3509 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
|
3510 { |
|
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
|
3511 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
|
3512 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
|
3513 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
|
3514 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3515 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3516 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
|
3517 { |
|
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
|
3518 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
|
3519 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
|
3520 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
|
3521 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3522 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3523 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
|
3524 { |
|
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
|
3525 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
|
3526 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
|
3527 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
|
3528 |
|
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
|
3529 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
|
3530 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3531 ItemGen* currItem = GetNthEquippedIndexItem(j); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3532 if (currItem != nullptr && (!currItem->IsBroken())) |
| 1538 | 3533 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3534 PLAYER_SKILL_TYPE itemSkillType = (PLAYER_SKILL_TYPE)currItem->GetPlayerSkillType(); |
| 1976 | 3535 int currArmorSkillLevel = 0; |
|
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
|
3536 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
|
3537 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
|
3538 { |
|
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
|
3539 case PLAYER_SKILL_STAFF: |
| 1976 | 3540 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3541 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 0, 1, 1, 1); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3542 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
|
3543 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
|
3544 case PLAYER_SKILL_SPEAR: |
| 1976 | 3545 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3546 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 0, 0, 0, 1); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3547 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
|
3548 case PLAYER_SKILL_SHIELD: |
| 1976 | 3549 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
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
|
3550 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3551 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 1, 1, 2, 2); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3552 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
|
3553 case PLAYER_SKILL_LEATHER: |
| 1976 | 3554 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
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
|
3555 wearingLeather = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3556 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 1, 1, 2, 2); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3557 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
|
3558 case PLAYER_SKILL_CHAIN: |
| 1976 | 3559 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
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
|
3560 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3561 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 1, 1, 1, 1); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3562 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
|
3563 case PLAYER_SKILL_PLATE: |
| 1976 | 3564 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
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
|
3565 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3566 multiplier = GetMultiplierForSkillLevel(currArmorSkillLevel, 1, 1, 1, 1); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3567 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
|
3568 } |
|
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
|
3569 ACSum += multiplier * (currArmorSkillLevel & 0x3F); |
| 1538 | 3570 } |
|
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
|
3571 } |
|
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
|
3572 |
|
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
|
3573 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
|
3574 int dodgeMastery = SkillToMastery(dodgeSkillLevel); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3575 int multiplier = GetMultiplierForSkillLevel(dodgeSkillLevel, 1, 2, 3, 3); |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3576 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
|
3577 { |
|
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
|
3578 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
|
3579 } |
|
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
|
3580 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
|
3581 } |
| 1538 | 3582 break; |
| 3583 case CHARACTER_ATTRIBUTE_ATTACK: | |
| 3584 if ( this->IsUnarmed() ) | |
| 3585 { | |
| 3586 int unarmedSkill = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3587 if (!unarmedSkill) | |
| 3588 { | |
| 3589 return 0; | |
| 3590 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3591 int multiplier = GetMultiplierForSkillLevel(unarmedSkill, 0, 1, 2, 2); |
| 1538 | 3592 return armsMasterBonus + multiplier * (unarmedSkill & 0x3F); |
| 3593 } | |
| 3594 for (int i = 0; i < 16; ++i) | |
| 3595 { | |
| 3596 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3597 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3598 ItemGen* currItem = GetNthEquippedIndexItem(i); |
| 1989 | 3599 if ( currItem->GetItemEquipType() <= EQUIP_TWO_HANDED) |
| 1533 | 3600 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3601 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItem->GetPlayerSkillType(); |
| 1538 | 3602 int currentItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 3603 if (currItemSkillType == PLAYER_SKILL_BLASTER) | |
| 3604 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3605 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); |
| 1538 | 3606 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3607 } | |
| 3608 else if (currItemSkillType == PLAYER_SKILL_STAFF && this->GetActualSkillLevel(PLAYER_SKILL_UNARMED) > 0) | |
| 3609 { | |
| 3610 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3611 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 2, 2); |
| 1538 | 3612 return multiplier * (unarmedSkillLevel & 0x3F) + armsMasterBonus + (currentItemSkillLevel & 0x3F); |
| 3613 } | |
| 3614 else | |
| 3615 { | |
| 3616 return armsMasterBonus + (currentItemSkillLevel & 0x3F); | |
| 3617 } | |
| 3618 } | |
| 3619 } | |
| 3620 } | |
| 3621 return 0; | |
| 3622 break; | |
| 3623 | |
| 3624 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: | |
| 3625 for (int i = 0; i < 16; i++) | |
| 3626 { | |
| 3627 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3628 { | |
| 2068 | 3629 ItemGen* currItemPtr = GetNthEquippedIndexItem(i); |
| 3630 if ( currItemPtr->GetItemEquipType() == EQUIP_TWO_HANDED || currItemPtr->GetItemEquipType() == EQUIP_SINGLE_HANDED ) | |
| 1538 | 3631 { |
| 2068 | 3632 PLAYER_SKILL_TYPE currentItemSkillType = (PLAYER_SKILL_TYPE)GetNthEquippedIndexItem(i)->GetPlayerSkillType(); |
| 3633 int currentItemSkillLevel = this->GetActualSkillLevel(currentItemSkillType); | |
| 3634 if ( currentItemSkillType == PLAYER_SKILL_BOW ) | |
| 3635 { | |
| 3636 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 1, 1); | |
| 3637 return multiplier * (currentItemSkillLevel & 0x3F); | |
| 3638 } | |
| 3639 else if ( currentItemSkillType == PLAYER_SKILL_BLASTER ) | |
| 3640 { | |
| 3641 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); | |
| 3642 return multiplier * (currentItemSkillLevel & 0x3F); | |
| 3643 } | |
| 1538 | 3644 } |
| 3645 } | |
| 3646 } | |
| 3647 return 0; | |
| 3648 break; | |
| 3649 | |
| 3650 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: | |
| 3651 if ( this->IsUnarmed() ) | |
| 3652 { | |
| 3653 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3654 if ( !unarmedSkillLevel ) | |
| 3655 { | |
| 3656 return 0; | |
| 3657 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3658 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 3659 return multiplier * (unarmedSkillLevel & 0x3F); |
| 3660 } | |
| 3661 for (int i = 0; i < 16; i++) | |
| 3662 { | |
| 3663 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3664 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3665 ItemGen* currItemPtr = GetNthEquippedIndexItem(i); |
| 1989 | 3666 if ( currItemPtr->GetItemEquipType() == EQUIP_TWO_HANDED || currItemPtr->GetItemEquipType() == EQUIP_SINGLE_HANDED ) |
| 1538 | 3667 { |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
3668 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItemPtr->GetPlayerSkillType(); |
| 1538 | 3669 int currItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 3670 int baseSkillBonus; | |
| 3671 int multiplier; | |
| 3672 switch (currItemSkillType) | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3673 { |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3674 case PLAYER_SKILL_STAFF: |
| 1538 | 3675 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
|
3676 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3677 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3678 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 3679 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
|
3680 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3681 else |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3682 { |
| 1538 | 3683 return armsMasterBonus; |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3684 } |
| 1538 | 3685 break; |
| 3686 | |
| 3687 case PLAYER_SKILL_DAGGER: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3688 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 1); |
| 1538 | 3689 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3690 return armsMasterBonus + baseSkillBonus; | |
| 3691 break; | |
| 3692 case PLAYER_SKILL_SWORD: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3693 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 0); |
| 1538 | 3694 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3695 return armsMasterBonus + baseSkillBonus; | |
| 3696 break; | |
| 3697 case PLAYER_SKILL_MACE: | |
| 3698 case PLAYER_SKILL_SPEAR: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3699 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 1, 1, 1); |
| 1538 | 3700 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3701 return armsMasterBonus + baseSkillBonus; | |
| 3702 break; | |
| 3703 case PLAYER_SKILL_AXE: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3704 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 1, 1); |
| 1538 | 3705 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3706 return armsMasterBonus + baseSkillBonus; | |
| 3707 break; | |
| 1535 | 3708 } |
| 1533 | 3709 } |
| 1535 | 3710 } |
| 1538 | 3711 } |
| 3712 return 0; | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3713 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3714 default: |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3715 return 0; |
| 1533 | 3716 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3717 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3718 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3719 unsigned int Player::GetMultiplierForSkillLevel(unsigned int skillValue, int mult1, int mult2, int mult3, int mult4) |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3720 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3721 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
|
3722 switch (masteryLvl) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3723 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3724 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
|
3725 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
|
3726 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
|
3727 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
|
3728 } |
| 1545 | 3729 Error("(%u)", masteryLvl); |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3730 return 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3731 } |
| 0 | 3732 //----- (00490109) -------------------------------------------------------- |
| 3733 // faces are: 0 1 2 3 human males | |
| 3734 // 4 5 6 7 human females | |
| 3735 // 8 9 elf males | |
| 3736 // 10 11 elf females | |
| 3737 // 12 13 dwarf males | |
| 3738 // 14 15 dwarf females | |
| 3739 // 16 17 goblin males | |
| 3740 // 18 19 goblin females | |
| 3741 // 20 lich male | |
| 3742 // 21 lich female | |
| 3743 // 22 underwater suits (unused) | |
| 3744 // 23 zombie male | |
| 3745 // 24 zombie female | |
| 3746 enum CHARACTER_RACE Player::GetRace() | |
| 3747 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3748 if ( uCurrentFace <= 7 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3749 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3750 return CHARACTER_RACE_HUMAN; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3751 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3752 else if ( uCurrentFace <= 11 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3753 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3754 return CHARACTER_RACE_ELF; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3755 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3756 else if ( uCurrentFace <= 15 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3757 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3758 return CHARACTER_RACE_DWARF; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3759 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3760 else if ( uCurrentFace <= 19 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3761 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3762 return CHARACTER_RACE_GOBLIN; |
| 0 | 3763 } |
| 3764 else | |
| 3765 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3766 return CHARACTER_RACE_HUMAN; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3767 } |
| 0 | 3768 } |
| 3769 | |
| 3770 //----- (00490141) -------------------------------------------------------- | |
| 187 | 3771 PLAYER_SEX Player::GetSexByVoice() |
| 0 | 3772 { |
| 3773 switch ( this->uVoiceID ) | |
| 3774 { | |
| 3775 case 0u: | |
| 3776 case 1u: | |
| 3777 case 2u: | |
| 3778 case 3u: | |
| 3779 case 8u: | |
| 3780 case 9u: | |
| 3781 case 0xCu: | |
| 3782 case 0xDu: | |
| 3783 case 0x10u: | |
| 3784 case 0x11u: | |
| 3785 case 0x14u: | |
| 3786 case 0x17u: | |
| 187 | 3787 return SEX_MALE; |
| 3788 | |
| 0 | 3789 case 4u: |
| 3790 case 5u: | |
| 3791 case 6u: | |
| 3792 case 7u: | |
| 3793 case 0xAu: | |
| 3794 case 0xBu: | |
| 3795 case 0xEu: | |
| 3796 case 0xFu: | |
| 3797 case 0x12u: | |
| 3798 case 0x13u: | |
| 3799 case 0x15u: | |
| 3800 case 0x18u: | |
| 187 | 3801 return SEX_FEMALE; |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3802 } |
| 1545 | 3803 Error("(%u)", this->uVoiceID); |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3804 return SEX_MALE; |
| 0 | 3805 } |
| 3806 | |
| 3807 //----- (00490188) -------------------------------------------------------- | |
| 3808 void Player::SetInitialStats() | |
| 3809 { | |
| 1980 | 3810 CHARACTER_RACE v1 = GetRace(); |
| 290 | 3811 uMight = StatTable[v1][0].uBaseValue; |
| 3812 uIntelligence = StatTable[v1][1].uBaseValue; | |
| 3813 uWillpower = StatTable[v1][2].uBaseValue; | |
| 3814 uEndurance = StatTable[v1][3].uBaseValue; | |
| 3815 uAccuracy = StatTable[v1][4].uBaseValue; | |
| 3816 uSpeed = StatTable[v1][5].uBaseValue; | |
| 3817 uLuck = StatTable[v1][6].uBaseValue; | |
| 0 | 3818 } |
| 3819 | |
| 3820 //----- (004901FC) -------------------------------------------------------- | |
| 1021 | 3821 void Player::SetSexByVoice() |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3822 { |
| 1021 | 3823 switch ( this->uVoiceID) |
| 0 | 3824 { |
| 3825 case 0: | |
| 3826 case 1: | |
| 3827 case 2: | |
| 3828 case 3: | |
| 3829 case 8: | |
| 3830 case 9: | |
| 3831 case 0xC: | |
| 3832 case 0xD: | |
| 3833 case 0x10: | |
| 3834 case 0x11: | |
| 3835 case 0x14: | |
| 3836 case 0x17: | |
| 1021 | 3837 this->uSex = SEX_MALE; |
| 0 | 3838 break; |
| 3839 case 4: | |
| 3840 case 5: | |
| 3841 case 6: | |
| 3842 case 7: | |
| 3843 case 0xA: | |
| 3844 case 0xB: | |
| 3845 case 0xE: | |
| 3846 case 0xF: | |
| 3847 case 0x12: | |
| 3848 case 0x13: | |
| 3849 case 0x15: | |
| 3850 case 0x18: | |
| 1021 | 3851 this->uSex = SEX_FEMALE; |
| 0 | 3852 break; |
| 3853 default: | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3854 Error("(%u)", this->uVoiceID); |
| 0 | 3855 break; |
| 3856 } | |
| 1021 | 3857 |
| 0 | 3858 } |
| 3859 | |
| 3860 //----- (0049024A) -------------------------------------------------------- | |
| 135 | 3861 void Player::Reset(PLAYER_CLASS_TYPE cls) |
| 0 | 3862 { |
| 3863 sLevelModifier = 0; | |
| 3864 sAgeModifier = 0; | |
| 3865 | |
| 135 | 3866 classType = cls; |
| 0 | 3867 uLuckBonus = 0; |
| 3868 uSpeedBonus = 0; | |
| 3869 uAccuracyBonus = 0; | |
| 3870 uEnduranceBonus = 0; | |
| 3871 uWillpowerBonus = 0; | |
| 3872 uIntelligenceBonus = 0; | |
| 3873 uMightBonus = 0; | |
| 3874 uLevel = 1; | |
| 3875 uExperience = 251 + rand() % 100; | |
| 3876 uBirthYear = 1147 - rand() % 6; | |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
3877 pActiveSkills.fill(0); |
|
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
3878 memset(_achieved_awards_bits, 0, sizeof(_achieved_awards_bits)); |
|
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
3879 memset(&spellbook, 0, sizeof(spellbook)); |
| 0 | 3880 |
| 3881 for (uint i = 0; i < 37; ++i) | |
| 3882 { | |
| 135 | 3883 if (pSkillAvailabilityPerClass[classType / 4][i] != 2) |
| 0 | 3884 continue; |
| 3885 | |
| 3886 pActiveSkills[i] = 1; | |
| 3887 | |
| 3888 switch (i) | |
| 3889 { | |
| 886 | 3890 case PLAYER_SKILL_FIRE: |
| 3891 spellbook.pFireSpellbook.bIsSpellAvailable[0] = true;//its temporary, for test spells | |
| 894 | 3892 |
| 3893 extern bool all_magic; | |
| 3894 if ( all_magic == true ) | |
| 3895 { | |
| 3896 pActiveSkills[PLAYER_SKILL_AIR] = 1; | |
| 3897 pActiveSkills[PLAYER_SKILL_WATER] = 1; | |
| 3898 pActiveSkills[PLAYER_SKILL_EARTH] = 1; | |
| 3899 spellbook.pFireSpellbook.bIsSpellAvailable[1] = true; | |
| 3900 spellbook.pFireSpellbook.bIsSpellAvailable[2] = true; | |
| 3901 spellbook.pFireSpellbook.bIsSpellAvailable[3] = true; | |
| 3902 spellbook.pFireSpellbook.bIsSpellAvailable[4] = true; | |
| 3903 spellbook.pFireSpellbook.bIsSpellAvailable[5] = true; | |
| 3904 spellbook.pFireSpellbook.bIsSpellAvailable[6] = true; | |
| 3905 spellbook.pFireSpellbook.bIsSpellAvailable[7] = true; | |
| 3906 spellbook.pFireSpellbook.bIsSpellAvailable[8] = true; | |
| 3907 spellbook.pFireSpellbook.bIsSpellAvailable[9] = true; | |
| 3908 spellbook.pFireSpellbook.bIsSpellAvailable[10] = true; | |
| 886 | 3909 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; |
| 569 | 3910 spellbook.pAirSpellbook.bIsSpellAvailable[1] = true; |
| 3911 spellbook.pAirSpellbook.bIsSpellAvailable[2] = true; | |
| 3912 spellbook.pAirSpellbook.bIsSpellAvailable[3] = true; | |
| 3913 spellbook.pAirSpellbook.bIsSpellAvailable[4] = true; | |
| 3914 spellbook.pAirSpellbook.bIsSpellAvailable[5] = true; | |
| 3915 spellbook.pAirSpellbook.bIsSpellAvailable[6] = true; | |
| 3916 spellbook.pAirSpellbook.bIsSpellAvailable[7] = true; | |
| 3917 spellbook.pAirSpellbook.bIsSpellAvailable[8] = true; | |
| 3918 spellbook.pAirSpellbook.bIsSpellAvailable[9] = true; | |
| 3919 spellbook.pAirSpellbook.bIsSpellAvailable[10] = true; | |
| 3920 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 3921 spellbook.pWaterSpellbook.bIsSpellAvailable[1] = true; | |
| 3922 spellbook.pWaterSpellbook.bIsSpellAvailable[2] = true; | |
| 3923 spellbook.pWaterSpellbook.bIsSpellAvailable[3] = true; | |
| 3924 spellbook.pWaterSpellbook.bIsSpellAvailable[4] = true; | |
| 3925 spellbook.pWaterSpellbook.bIsSpellAvailable[5] = true; | |
| 710 | 3926 spellbook.pWaterSpellbook.bIsSpellAvailable[6] = true; |
| 3927 spellbook.pWaterSpellbook.bIsSpellAvailable[7] = true; | |
| 3928 spellbook.pWaterSpellbook.bIsSpellAvailable[8] = true; | |
| 886 | 3929 spellbook.pWaterSpellbook.bIsSpellAvailable[9] = true; |
| 3930 spellbook.pWaterSpellbook.bIsSpellAvailable[10] = true; | |
| 894 | 3931 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; |
| 3932 spellbook.pEarthSpellbook.bIsSpellAvailable[1] = true; | |
| 3933 spellbook.pEarthSpellbook.bIsSpellAvailable[2] = true; | |
| 3934 spellbook.pEarthSpellbook.bIsSpellAvailable[3] = true; | |
| 3935 spellbook.pEarthSpellbook.bIsSpellAvailable[4] = true; | |
| 3936 spellbook.pEarthSpellbook.bIsSpellAvailable[5] = true; | |
| 3937 spellbook.pEarthSpellbook.bIsSpellAvailable[6] = true; | |
| 3938 spellbook.pEarthSpellbook.bIsSpellAvailable[7] = true; | |
| 3939 spellbook.pEarthSpellbook.bIsSpellAvailable[8] = true; | |
| 3940 spellbook.pEarthSpellbook.bIsSpellAvailable[9] = true; | |
| 3941 spellbook.pEarthSpellbook.bIsSpellAvailable[10] = true; | |
| 3942 } | |
| 486 | 3943 break; |
| 886 | 3944 case PLAYER_SKILL_AIR: |
| 3945 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; | |
| 3946 break; | |
| 3947 case PLAYER_SKILL_WATER: | |
| 3948 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 3949 break; | |
| 3950 case PLAYER_SKILL_EARTH: | |
| 3951 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; | |
| 3952 break; | |
| 3953 case PLAYER_SKILL_SPIRIT: | |
| 3954 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; | |
| 3955 break; | |
| 3956 case PLAYER_SKILL_MIND: | |
| 3957 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; | |
| 3958 break; | |
| 3959 case PLAYER_SKILL_BODY: | |
| 3960 spellbook.pBodySpellbook.bIsSpellAvailable[0] = true; | |
| 894 | 3961 |
| 3962 if ( all_magic == true ) | |
| 3963 { | |
| 3964 pActiveSkills[PLAYER_SKILL_MIND] = 1; | |
| 3965 pActiveSkills[PLAYER_SKILL_SPIRIT] = 1; | |
| 3966 spellbook.pBodySpellbook.bIsSpellAvailable[1] = true; | |
| 3967 spellbook.pBodySpellbook.bIsSpellAvailable[2] = true; | |
| 3968 spellbook.pBodySpellbook.bIsSpellAvailable[3] = true; | |
| 3969 spellbook.pBodySpellbook.bIsSpellAvailable[4] = true; | |
| 3970 spellbook.pBodySpellbook.bIsSpellAvailable[5] = true; | |
| 3971 spellbook.pBodySpellbook.bIsSpellAvailable[6] = true; | |
| 3972 spellbook.pBodySpellbook.bIsSpellAvailable[7] = true; | |
| 3973 spellbook.pBodySpellbook.bIsSpellAvailable[8] = true; | |
| 3974 spellbook.pBodySpellbook.bIsSpellAvailable[9] = true; | |
| 3975 spellbook.pBodySpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 3976 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 3977 spellbook.pMindSpellbook.bIsSpellAvailable[1] = true; |
| 3978 spellbook.pMindSpellbook.bIsSpellAvailable[2] = true; | |
| 3979 spellbook.pMindSpellbook.bIsSpellAvailable[3] = true; | |
| 3980 spellbook.pMindSpellbook.bIsSpellAvailable[4] = true; | |
| 3981 spellbook.pMindSpellbook.bIsSpellAvailable[5] = true; | |
| 3982 spellbook.pMindSpellbook.bIsSpellAvailable[6] = true; | |
| 3983 spellbook.pMindSpellbook.bIsSpellAvailable[7] = true; | |
| 3984 spellbook.pMindSpellbook.bIsSpellAvailable[8] = true; | |
| 3985 spellbook.pMindSpellbook.bIsSpellAvailable[9] = true; | |
| 3986 spellbook.pMindSpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 3987 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 3988 spellbook.pSpiritSpellbook.bIsSpellAvailable[1] = true; |
| 3989 spellbook.pSpiritSpellbook.bIsSpellAvailable[2] = true; | |
| 3990 spellbook.pSpiritSpellbook.bIsSpellAvailable[3] = true; | |
| 3991 spellbook.pSpiritSpellbook.bIsSpellAvailable[4] = true; | |
| 3992 spellbook.pSpiritSpellbook.bIsSpellAvailable[5] = true; | |
| 3993 spellbook.pSpiritSpellbook.bIsSpellAvailable[6] = true; | |
| 3994 spellbook.pSpiritSpellbook.bIsSpellAvailable[7] = true; | |
| 3995 spellbook.pSpiritSpellbook.bIsSpellAvailable[8] = true; | |
| 3996 spellbook.pSpiritSpellbook.bIsSpellAvailable[9] = true; | |
| 3997 spellbook.pSpiritSpellbook.bIsSpellAvailable[10] = true; | |
| 3998 } | |
| 569 | 3999 break; |
| 886 | 4000 case PLAYER_SKILL_LIGHT: |
| 4001 spellbook.pLightSpellbook.bIsSpellAvailable[0] = true; | |
| 4002 break; | |
| 4003 case PLAYER_SKILL_DARK: | |
| 4004 spellbook.pDarkSpellbook.bIsSpellAvailable[0] = true; | |
| 4005 break; | |
| 0 | 4006 } |
| 4007 } | |
| 4008 | |
| 2191 | 4009 memset(&pEquipment, 0, sizeof(PlayerEquipment)); |
| 4010 pInventoryMatrix.fill(0); | |
| 4011 for (uint i = 0; i < 126; ++i) | |
| 4012 pInventoryItemList[i].Reset(); | |
| 4013 for (uint i = 0; i < 12; ++i) | |
| 4014 pEquippedItems[i].Reset(); | |
| 4015 | |
| 0 | 4016 sHealth = GetMaxHealth(); |
| 4017 sMana = GetMaxMana(); | |
| 4018 } | |
| 4019 | |
| 4020 //----- (004903C9) -------------------------------------------------------- | |
| 821 | 4021 PLAYER_SKILL_TYPE Player::GetSkillIdxByOrder(signed int order) |
| 4022 { | |
|
1271
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4023 int counter; // edx@5 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4024 bool canBeInactive; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4025 unsigned char requiredValue; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4026 signed int offset; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4027 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4028 if ( order <= 1 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4029 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4030 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4031 requiredValue = 2; // 2 - primary skill |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4032 offset = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4033 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4034 else if ( order <= 3 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4035 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4036 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4037 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4038 offset = 2; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4039 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4040 else if ( order <= 12 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4041 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4042 canBeInactive = true; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4043 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4044 offset = 4; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4045 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4046 else |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4047 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4048 return (PLAYER_SKILL_TYPE)37; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4049 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4050 counter = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4051 for (int i = 0; i < 37; i++) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4052 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4053 if ( (this->pActiveSkills[i] || canBeInactive) && pSkillAvailabilityPerClass[classType / 4][i] == requiredValue ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4054 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4055 if ( counter == order - offset ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4056 return (PLAYER_SKILL_TYPE)i; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4057 ++counter; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4058 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4059 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4060 |
|
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
|
4061 return (PLAYER_SKILL_TYPE)37; |
| 0 | 4062 } |
| 4063 | |
| 4064 | |
| 4065 | |
| 4066 //----- (0049048D) -------------------------------------------------------- | |
| 4067 //unsigned __int16 PartyCreation_BtnMinusClick(Player *_this, int eAttribute) | |
| 4068 void Player::DecreaseAttribute(int eAttribute) | |
| 4069 { | |
| 4070 int pBaseValue; // ecx@1 | |
| 4071 int pDroppedStep; // ebx@1 | |
| 4072 int pStep; // esi@1 | |
| 4073 int uMinValue; // [sp+Ch] [bp-4h]@1 | |
| 4074 | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4075 int raceId = GetRace(); |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4076 pBaseValue = StatTable[raceId][eAttribute].uBaseValue; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4077 pDroppedStep = StatTable[raceId][eAttribute].uDroppedStep; |
| 0 | 4078 uMinValue = pBaseValue - 2; |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4079 pStep = StatTable[raceId][eAttribute].uBaseStep; |
| 1272 | 4080 unsigned short* AttrToChange = nullptr; |
| 4081 switch ( eAttribute ) | |
| 4082 { | |
| 4083 case CHARACTER_ATTRIBUTE_STRENGTH: | |
| 4084 AttrToChange = &this->uMight; | |
| 4085 break; | |
| 4086 case CHARACTER_ATTRIBUTE_INTELLIGENCE: | |
| 4087 AttrToChange = &this->uIntelligence; | |
| 4088 break; | |
| 4089 case CHARACTER_ATTRIBUTE_WILLPOWER: | |
| 4090 AttrToChange = &this->uWillpower; | |
| 4091 break; | |
| 4092 case CHARACTER_ATTRIBUTE_ENDURANCE: | |
| 4093 AttrToChange = &this->uEndurance; | |
| 4094 break; | |
| 4095 case CHARACTER_ATTRIBUTE_ACCURACY: | |
| 4096 AttrToChange = &this->uAccuracy; | |
| 4097 break; | |
| 4098 case CHARACTER_ATTRIBUTE_SPEED: | |
| 4099 AttrToChange = &this->uSpeed; | |
| 4100 break; | |
| 4101 case CHARACTER_ATTRIBUTE_LUCK: | |
| 4102 AttrToChange = &this->uLuck; | |
| 4103 break; | |
| 4104 } | |
| 4105 if ( *AttrToChange <= pBaseValue ) | |
| 4106 pStep = pDroppedStep; | |
| 4107 if ( *AttrToChange - pStep >= uMinValue ) | |
| 4108 *AttrToChange -= pStep; | |
| 0 | 4109 } |
| 4110 | |
| 4111 //----- (004905F5) -------------------------------------------------------- | |
| 1458 | 4112 //signed int PartyCreation_BtnPlusClick(Player *this, int eAttribute) |
| 1273 | 4113 void Player::IncreaseAttribute( int eAttribute ) |
| 4114 { | |
| 4115 int raceId; // eax@1 | |
| 4116 int maxValue; // ebx@1 | |
| 4117 signed int baseStep; // edi@1 | |
| 4118 signed int tmp; // eax@17 | |
| 0 | 4119 signed int result; // eax@18 |
| 1273 | 4120 int baseValue; // [sp+Ch] [bp-8h]@1 |
| 4121 signed int droppedStep; // [sp+10h] [bp-4h]@1 | |
| 4122 unsigned short* statToChange; | |
| 4123 | |
| 4124 raceId = GetRace(); | |
| 4125 maxValue = StatTable[raceId][eAttribute].uMaxValue; | |
| 4126 baseStep = StatTable[raceId][eAttribute].uBaseStep; | |
| 4127 baseValue = StatTable[raceId][eAttribute].uBaseValue; | |
| 4128 droppedStep = StatTable[raceId][eAttribute].uDroppedStep; | |
| 4129 PlayerCreation_GetUnspentAttributePointCount(); | |
| 4130 switch ( eAttribute ) | |
| 4131 { | |
| 4132 case 0: | |
| 4133 statToChange = &this->uMight; | |
| 4134 break; | |
| 4135 case 1: | |
| 4136 statToChange = &this->uIntelligence; | |
| 4137 break; | |
| 4138 case 2: | |
| 4139 statToChange = &this->uWillpower; | |
| 4140 break; | |
| 4141 case 3: | |
| 4142 statToChange = &this->uEndurance; | |
| 4143 break; | |
| 4144 case 4: | |
| 4145 statToChange = &this->uAccuracy; | |
| 4146 break; | |
| 4147 case 5: | |
| 4148 statToChange = &this->uSpeed; | |
| 4149 break; | |
| 4150 case 6: | |
| 4151 statToChange = &this->uLuck; | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
4152 break; |
| 1273 | 4153 default: |
| 1545 | 4154 Error("(%u)", eAttribute); |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
4155 break; |
| 1273 | 4156 } |
| 4157 if ( *statToChange < baseValue ) | |
| 4158 { | |
| 4159 tmp = baseStep; | |
| 4160 baseStep = droppedStep; | |
| 4161 droppedStep = tmp; | |
| 4162 } | |
| 4163 result = PlayerCreation_GetUnspentAttributePointCount(); | |
| 4164 if ( result >= droppedStep ) | |
| 4165 { | |
| 4166 if ( baseStep + *statToChange <= maxValue ) | |
| 4167 *statToChange += baseStep; | |
| 4168 } | |
| 0 | 4169 } |
| 4170 | |
| 4171 //----- (0049070F) -------------------------------------------------------- | |
| 4172 void Player::Zero() | |
| 4173 { | |
| 4174 this->sLevelModifier = 0; | |
| 4175 this->sACModifier = 0; | |
| 4176 this->uLuckBonus = 0; | |
| 4177 this->uAccuracyBonus = 0; | |
| 4178 this->uSpeedBonus = 0; | |
| 4179 this->uEnduranceBonus = 0; | |
| 4180 this->uWillpowerBonus = 0; | |
| 4181 this->uIntelligenceBonus = 0; | |
| 4182 this->uMightBonus = 0; | |
| 4183 this->field_100 = 0; | |
| 4184 this->field_FC = 0; | |
| 4185 this->field_F8 = 0; | |
| 4186 this->field_F4 = 0; | |
| 4187 this->field_F0 = 0; | |
| 4188 this->field_EC = 0; | |
| 4189 this->field_E8 = 0; | |
| 4190 this->field_E4 = 0; | |
| 4191 this->field_E0 = 0; | |
| 766 | 4192 memset(&this->sResFireBonus, 0, 0x16u); |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4193 this->field_1A97 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4194 this->_ranged_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4195 this->field_1A95 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4196 this->_ranged_atk_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4197 this->field_1A93 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4198 this->_melee_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4199 this->field_1A91 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4200 this->_some_attack_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4201 this->_mana_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4202 this->uFullManaBonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4203 this->_health_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4204 this->uFullHealthBonus = 0; |
| 0 | 4205 } |
| 4206 | |
| 4207 //----- (004907E7) -------------------------------------------------------- | |
| 299 | 4208 unsigned int Player::GetStatColor(int uStat) |
| 0 | 4209 { |
| 290 | 4210 int attribute_value; // edx@1 |
| 1393 | 4211 |
| 4212 int base_attribute_value = StatTable[GetRace()][uStat].uBaseValue; | |
| 0 | 4213 switch (uStat) |
| 4214 { | |
| 4215 case 0: attribute_value = uMight; break; | |
| 4216 case 1: attribute_value = uIntelligence; break; | |
| 4217 case 2: attribute_value = uWillpower; break; | |
| 4218 case 3: attribute_value = uEndurance; break; | |
| 290 | 4219 case 4: attribute_value = uAccuracy; break; |
| 4220 case 5: attribute_value = uSpeed; break; | |
| 0 | 4221 case 6: attribute_value = uLuck; break; |
| 1783 | 4222 default: Error("Unexpected attribute"); |
| 0 | 4223 }; |
| 4224 | |
| 1393 | 4225 if (attribute_value == base_attribute_value) |
| 4226 return ui_character_stat_default_color; | |
| 4227 else if (attribute_value > base_attribute_value) | |
| 4228 return ui_character_stat_buffed_color; | |
| 0 | 4229 else |
| 1393 | 4230 return ui_character_stat_debuffed_color; |
| 0 | 4231 } |
| 4232 | |
| 4233 //----- (004908A8) -------------------------------------------------------- | |
| 2187 | 4234 bool Player::DiscardConditionIfLastsLongerThan(unsigned int uCondition, signed __int64 uTime) |
| 4235 { | |
| 4236 if ( pConditions[uCondition] && (uTime < (signed long long)pConditions[uCondition]) ) | |
| 1014 | 4237 { |
| 1393 | 4238 pConditions[uCondition] = 0i64; |
| 1014 | 4239 return true; |
| 0 | 4240 } |
| 4241 else | |
| 1014 | 4242 return false; |
| 0 | 4243 } |
| 4244 | |
| 4245 //----- (004680ED) -------------------------------------------------------- | |
| 1019 | 4246 void Player::UseItem_DrinkPotion_etc(signed int player_num, int a3) |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4247 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4248 Player *playerAffected; // esi@1 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4249 signed int v5; // eax@17 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4250 int v8; // edx@39 |
| 1838 | 4251 const char *v13; // eax@45 |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4252 signed int v15; // edi@68 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4253 int v16; // edx@73 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4254 unsigned __int16 v17; // edi@73 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4255 unsigned int v18; // eax@73 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4256 const char *v22; // eax@84 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4257 int scroll_id; // esi@96 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4258 int v25; // eax@109 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4259 int v26; // eax@113 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4260 int new_mana_val; // edi@114 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4261 signed __int64 v28; // qax@120 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4262 __int64 v30; // edi@137 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4263 __int64 v32; // ST3C_4@137 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4264 __int64 v34; // ST34_4@137 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4265 unsigned __int16 v50; // [sp-Ch] [bp-38h]@120 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4266 const char *v66; // [sp-4h] [bp-30h]@69 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4267 signed int v67; // [sp-4h] [bp-30h]@77 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4268 const char *v68; // [sp-4h] [bp-30h]@89 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4269 char v72; // [sp+20h] [bp-Ch]@68 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4270 signed int v73; // [sp+24h] [bp-8h]@1 |
| 1838 | 4271 const char* v74; // [sp+24h] [bp-8h]@23 |
| 2163 | 4272 //Player *thisb; // [sp+28h] [bp-4h]@1 |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4273 unsigned int thisa; // [sp+28h] [bp-4h]@22 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4274 |
| 2163 | 4275 //thisb = this; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4276 playerAffected = &pParty->pPlayers[player_num-1]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4277 v73 = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4278 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4279 return; |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4280 if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_REAGENT ) |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4281 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4282 if ( pParty->pPickedItem.uItemID == 160 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4283 { |
| 2187 | 4284 playerAffected->SetCondition(Condition_Poison_Weak, 1); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4285 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4286 else if ( pParty->pPickedItem.uItemID == 161 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4287 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4288 new_mana_val = playerAffected->sMana; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4289 new_mana_val += 2; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4290 if ( new_mana_val > playerAffected->GetMaxMana() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4291 new_mana_val = playerAffected->GetMaxMana(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4292 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4293 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4294 else if ( pParty->pPickedItem.uItemID == 162 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4295 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4296 playerAffected->Heal(2); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4297 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4298 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4299 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4300 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4301 v68 = pParty->pPickedItem.GetDisplayName(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4302 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[36], v68);//"%s can not be used that way" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4303 ShowStatusBarString(pTmpBuf.data(), 2); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4304 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4305 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4306 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4307 pAudioPlayer->PlaySound((SoundID)211, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4308 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4309 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4310 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4311 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4312 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4313 if ( v73 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4314 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4315 if ( pParty->bTurnBasedModeOn ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4316 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4317 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; |
| 2163 | 4318 this->SetRecoveryTime(100); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4319 pTurnEngine->ApplyPlayerAction(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4320 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4321 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4322 { |
| 2163 | 4323 this->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4324 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4325 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4326 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4327 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4328 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4329 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4330 if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_POTION ) |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4331 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4332 switch ( pParty->pPickedItem.uItemID ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4333 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4334 case 221: //Catalyst |
| 2187 | 4335 playerAffected->SetCondition(Condition_Poison_Weak, 1); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4336 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4337 case 222: //Cure Wounds |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4338 v25 = pParty->pPickedItem.uEnchantmentType + 10; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4339 playerAffected->Heal(v25); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4340 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4341 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4342 case 223: //Magic Potion |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4343 v26 = pParty->pPickedItem.uEnchantmentType + 10; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4344 new_mana_val = playerAffected->sMana; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4345 new_mana_val += v26; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4346 if ( new_mana_val > playerAffected->GetMaxMana() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4347 new_mana_val = playerAffected->GetMaxMana(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4348 playerAffected->PlaySound(SPEECH_36, 0); |
| 2059 | 4349 playerAffected->sMana = new_mana_val; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4350 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4351 case 224: //Cure Weakness |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4352 playerAffected->pConditions[Condition_Weak] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4353 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4354 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4355 case 225: //Cure Disease |
| 2187 | 4356 playerAffected->pConditions[Condition_Disease_Severe] = 0i64; |
| 4357 playerAffected->pConditions[Condition_Disease_Medium] = 0i64; | |
| 4358 playerAffected->pConditions[Condition_Disease_Weak] = 0i64; | |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4359 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4360 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4361 case 226: //Cure Poison |
| 2187 | 4362 playerAffected->pConditions[Condition_Poison_Severe] = 0i64; |
| 4363 playerAffected->pConditions[Condition_Poison_Medium] = 0i64; | |
| 4364 playerAffected->pConditions[Condition_Poison_Weak] = 0i64; | |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4365 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4366 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4367 case 227: //Awaken |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4368 playerAffected->pConditions[Condition_Sleep] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4369 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4370 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4371 case 228: //Haste |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4372 if ( !playerAffected->pConditions[Condition_Weak] ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4373 { |
| 1021 | 4374 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4375 playerAffected->pPlayerBuffs[PLAYER_BUFF_HASTE].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4376 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4377 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4378 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4379 case 229: //Heroism |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4380 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4381 playerAffected->pPlayerBuffs[PLAYER_BUFF_HEROISM].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4382 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4383 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4384 case 230: //Bless |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4385 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4386 playerAffected->pPlayerBuffs[PLAYER_BUFF_BLESS].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4387 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4388 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4389 case 231: //Preservation |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4390 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4391 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4392 playerAffected->pPlayerBuffs[PLAYER_BUFF_PRESERVATION].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4393 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4394 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4395 case 232: //Shield |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4396 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4397 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4398 playerAffected->pPlayerBuffs[PLAYER_BUFF_SHIELD].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4399 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4400 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4401 case 234: //Stoneskin |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4402 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4403 playerAffected->pPlayerBuffs[PLAYER_BUFF_STONESKIN].Apply(pParty->uTimePlayed + v28, 3, 5, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4404 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4405 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4406 case 235: //Water Breathing |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4407 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335), |
| 1822 | 4408 playerAffected->pPlayerBuffs[PLAYER_BUFF_WATER_WALK].Apply(pParty->uTimePlayed +v28, 3, 5, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4409 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4410 case 237: //Remove Fear |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4411 playerAffected->pConditions[Condition_Fear] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4412 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4413 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4414 case 238: //Remove Curse |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4415 playerAffected->pConditions[Condition_Cursed] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4416 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4417 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4418 case 239: //Cure Insanity |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4419 playerAffected->pConditions[Condition_Insane] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4420 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4421 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4422 case 240: //Might Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4423 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4424 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4425 playerAffected->pPlayerBuffs[PLAYER_BUFF_STRENGTH].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4426 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4427 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4428 case 241: //Intellect Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4429 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4430 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4431 playerAffected->pPlayerBuffs[PLAYER_BUFF_INTELLIGENCE].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4432 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4433 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4434 case 242: //Personality Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4435 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4436 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4437 playerAffected->pPlayerBuffs[PLAYER_BUFF_WILLPOWER].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4438 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4439 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4440 case 243://Endurance Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4441 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4442 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4443 playerAffected->pPlayerBuffs[PLAYER_BUFF_ENDURANCE].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4444 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4445 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4446 case 244: //Speed Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4447 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4448 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4449 playerAffected->pPlayerBuffs[PLAYER_BUFF_SPEED].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4450 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4451 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4452 case 245: //Accuracy Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4453 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4454 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4455 playerAffected->pPlayerBuffs[PLAYER_BUFF_ACCURACY].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4456 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4457 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4458 case 251: //Cure Paralysis |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4459 playerAffected->pConditions[Condition_Paralyzed] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4460 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4461 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4462 case 252://Divine Restoration |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4463 v30 = playerAffected->pConditions[Condition_Dead]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4464 v32 = playerAffected->pConditions[Condition_Pertified]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4465 v34 = playerAffected->pConditions[Condition_Eradicated]; |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
4466 pConditions.fill(0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4467 playerAffected->pConditions[Condition_Dead] = v30; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4468 playerAffected->pConditions[Condition_Pertified] = v32; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4469 playerAffected->pConditions[Condition_Eradicated] = v34; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4470 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4471 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4472 case 253: //Divine Cure |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4473 v25 = 5 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4474 playerAffected->Heal(v25); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4475 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4476 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4477 case 254: //Divine Power |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4478 v26 = 5 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4479 new_mana_val = playerAffected->sMana; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4480 new_mana_val += v26; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4481 if ( new_mana_val > playerAffected->GetMaxMana() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4482 new_mana_val = playerAffected->GetMaxMana(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4483 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4484 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4485 case 255: //Luck Boost |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4486 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4487 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4488 playerAffected->pPlayerBuffs[PLAYER_BUFF_LUCK].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4489 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4490 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4491 case 256: //Fire Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4492 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4493 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4494 playerAffected->pPlayerBuffs[PLAYER_BUFF_RESIST_FIRE].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4495 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4496 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4497 case 257: //Air Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4498 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4499 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4500 playerAffected->pPlayerBuffs[PLAYER_BUFF_RESIST_AIR].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4501 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4502 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4503 case 258: //Water Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4504 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4505 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4506 playerAffected->pPlayerBuffs[PLAYER_BUFF_RESIST_WATER].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4507 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4508 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4509 case 259: //Earth Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4510 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4511 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4512 playerAffected->pPlayerBuffs[PLAYER_BUFF_RESIST_EARTH].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4513 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4514 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4515 case 260: //Mind Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4516 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4517 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4518 playerAffected->pPlayerBuffs[PLAYER_BUFF_RESIST_MIND].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4519 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4520 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4521 case 261: //Body Resistance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4522 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4523 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4524 playerAffected->pPlayerBuffs[PLAYER_BUFF_RESIST_BODY].Apply(pParty->uTimePlayed + v28, 0, v50, 0, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4525 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4526 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4527 case 262: //Stone to Flesh |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4528 playerAffected->pConditions[Condition_Pertified] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4529 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4530 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4531 case 264: //Pure Luck |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4532 if ( !playerAffected->pure_luck_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4533 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4534 playerAffected->uLuck += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4535 playerAffected->pure_luck_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4536 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4537 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4538 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4539 case 265: //Pure Speed |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4540 if ( !playerAffected->pure_speed_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4541 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4542 playerAffected->uSpeed += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4543 playerAffected->pure_speed_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4544 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4545 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4546 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4547 case 266: //Pure Intellect |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4548 if ( !playerAffected->pure_intellect_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4549 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4550 playerAffected->uIntelligence += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4551 playerAffected->pure_intellect_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4552 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4553 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4554 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4555 case 267: //Pure Endurance |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4556 if ( !playerAffected->pure_endurance_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4557 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4558 playerAffected->uEndurance += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4559 playerAffected->pure_endurance_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4560 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4561 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4562 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4563 case 268: //Pure Personality |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4564 if ( !playerAffected->pure_willpower_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4565 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4566 playerAffected->uWillpower += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4567 playerAffected->pure_willpower_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4568 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4569 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4570 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4571 case 269: //Pure Accuracy |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4572 if ( !playerAffected->pure_accuracy_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4573 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4574 playerAffected->uAccuracy += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4575 playerAffected->pure_accuracy_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4576 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4577 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4578 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4579 case 270: //Pure Might |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4580 if ( !playerAffected->pure_might_used ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4581 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4582 playerAffected->uMight += 50; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4583 playerAffected->pure_might_used = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4584 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4585 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4586 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4587 case 271: //Rejuvenation |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4588 playerAffected->sAgeModifier = 0; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4589 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4590 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4591 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4592 default: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4593 v68 = pParty->pPickedItem.GetDisplayName(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4594 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[36], v68);//"%s can not be used that way" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4595 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4596 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4597 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4598 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4599 pAudioPlayer->PlaySound((SoundID)210, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4600 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4601 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4602 // if ( !v73 ) v73 is always 1 at this point |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4603 // { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4604 // pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4605 // return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4606 // } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4607 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4608 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4609 if ( v73 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4610 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4611 if ( pParty->bTurnBasedModeOn ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4612 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4613 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; |
| 2163 | 4614 this->SetRecoveryTime(100); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4615 pTurnEngine->ApplyPlayerAction(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4616 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4617 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4618 { |
| 2163 | 4619 this->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4620 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4621 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4622 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4623 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4624 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4625 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4626 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4627 if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_SPELL_SCROLL ) |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4628 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4629 if ( pCurrentScreen == SCREEN_CASTING ) |
| 1032 | 4630 return; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4631 if ( !playerAffected->CanAct() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4632 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4633 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4634 v68 = aCharacterConditionNames[playerAffected->GetMajorConditionIdx()]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4635 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4636 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4637 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4638 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4639 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4640 if ( bUnderwater == 1 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4641 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4642 ShowStatusBarString(pGlobalTXT_LocalizationStrings[652], 2u);//"You can not do that while you are underwater!" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4643 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4644 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4645 } |
| 2154 | 4646 |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4647 scroll_id = pParty->pPickedItem.uItemID - 299; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4648 if ( scroll_id == 30 || scroll_id == 4 || scroll_id == 91 || scroll_id == 28 ) //Enchant Item scroll, Vampiric Weapon scroll ,Recharge Item ,Fire Aura |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4649 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4650 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4651 pGUIWindow_CurrentMenu->Release(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4652 pIcons_LOD->RemoveTexturesPackFromTextureList(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4653 pCurrentScreen = SCREEN_GAME; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4654 viewparams->bRedrawGameUI = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4655 _42777D_CastSpell_UseWand_ShootArrow(scroll_id, player_num - 1, 0x85u, 1, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4656 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4657 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4658 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4659 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4660 pMessageQueue_50C9E8->AddMessage(UIMSG_SpellScrollUse, scroll_id, player_num - 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4661 if ( pCurrentScreen && pGUIWindow_CurrentMenu |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4662 && (pGUIWindow_CurrentMenu->eWindowType != WINDOW_null)) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4663 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4664 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4665 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4666 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4667 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4668 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4669 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4670 if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_BOOK ) |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4671 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4672 v15 = pParty->pPickedItem.uItemID - 400; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4673 v72 = playerAffected->spellbook.bHaveSpell[pParty->pPickedItem.uItemID-400];//(char *)&v3->pConditions[0] + pParty->pPickedItem.uItemID + 2; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4674 if ( v72 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4675 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4676 v66 = pParty->pPickedItem.GetDisplayName(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4677 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[380], v66);//"You already know the %s spell" |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4678 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4679 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4680 return; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4681 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4682 if ( !playerAffected->CanAct() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4683 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4684 v66 = aCharacterConditionNames[playerAffected->GetMajorConditionIdx()]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4685 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v66);//"That player is %s" |
| 2187 | 4686 ShowStatusBarString(pTmpBuf.data(), 2); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4687 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4688 return; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4689 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4690 v16 = v15 % 11 + 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4691 v17 = playerAffected->pActiveSkills[v15 / 11 + 12]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4692 v18 = SkillToMastery(v17) - 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4693 switch (v18) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4694 { |
| 1032 | 4695 case 0: v67 = 4; break; |
| 4696 case 1: v67 = 7; break; | |
| 4697 case 2: v67 = 10; break; | |
| 4698 case 3: v67 = 11; break; | |
| 4699 default: | |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4700 v67 = player_num; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4701 } |
| 1032 | 4702 |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4703 if ( v16 > v67 || !v17 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4704 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4705 v22 = pParty->pPickedItem.GetDisplayName(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4706 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[381], v22); //"You don't have the skill to learn %s" |
| 2187 | 4707 ShowStatusBarString(pTmpBuf.data(), 2); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4708 playerAffected->PlaySound((PlayerSpeech)20, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4709 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4710 } |
| 2187 | 4711 playerAffected->spellbook.bHaveSpell[pParty->pPickedItem.uItemID-400] = 1; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4712 playerAffected->PlaySound(SPEECH_21, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4713 v73 = 0; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4714 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4715 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4716 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4717 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4718 if ( !v73 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4719 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4720 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4721 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4722 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4723 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4724 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4725 // if ( v73 ) v73 is always 0 at this point |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4726 // { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4727 // if ( pParty->bTurnBasedModeOn ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4728 // { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4729 // pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4730 // thisb->SetRecoveryTime(100); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4731 // pTurnEngine->ApplyPlayerAction(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4732 // } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4733 // else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4734 // { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4735 // thisb->SetRecoveryTime(flt_6BE3A4_debug_recmod1 * 213.3333333333333); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4736 // } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4737 // } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4738 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4739 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4740 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4741 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4742 if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_MESSAGE_SCROLL ) |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4743 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4744 if ( playerAffected->CanAct() ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4745 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4746 CreateMsgScrollWindow(pParty->pPickedItem.uItemID); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4747 playerAffected->PlaySound(SPEECH_37, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4748 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4749 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4750 v68 = aCharacterConditionNames[playerAffected->GetMajorConditionIdx()]; |
| 2156 | 4751 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68);//That player is %s |
| 4752 ShowStatusBarString(pTmpBuf.data(), 2); | |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4753 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4754 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4755 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4756 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4757 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4758 if (pParty->pPickedItem.uItemID == 616) //Genie Lamp |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4759 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4760 thisa = pParty->uCurrentMonthWeek + 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4761 if ( pParty->uCurrentMonth >= 7 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4762 v74 = NULL; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4763 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4764 v74 = aAttributeNames[pParty->uCurrentMonth]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4765 switch ( pParty->uCurrentMonth ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4766 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4767 case 0: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4768 playerAffected->uMight += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4769 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4770 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4771 case 1: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4772 playerAffected->uIntelligence += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4773 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4774 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4775 case 2: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4776 playerAffected->uWillpower += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4777 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4778 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4779 case 3: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4780 playerAffected->uEndurance += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4781 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4782 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4783 case 4: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4784 playerAffected->uAccuracy += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4785 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4786 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4787 case 5: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4788 playerAffected->uSpeed += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4789 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4790 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4791 case 6: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4792 playerAffected->uLuck += thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4793 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4794 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4795 case 7: |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
4796 pParty->PartyFindsGold(1000 * thisa, 0); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4797 sprintf(pTmpBuf.data(), "+%u %s", 1000 * thisa, pGlobalTXT_LocalizationStrings[97]);//"Gold" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4798 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4799 case 8: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4800 Party::GiveFood(5 * thisa); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4801 sprintf(pTmpBuf.data(), "+%u %s",5 * thisa , pGlobalTXT_LocalizationStrings[653]);//"Food" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4802 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4803 case 9u: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4804 playerAffected->uSkillPoints += 2 * thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4805 sprintf(pTmpBuf.data(), "+%u %s", 2 * thisa, pGlobalTXT_LocalizationStrings[LOCSTR_SKILL_POINTS]); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4806 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4807 case 10: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4808 playerAffected->uExperience += 2500 * thisa; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4809 sprintf(pTmpBuf.data(), "+%u %s", 2500 * thisa, pGlobalTXT_LocalizationStrings[LOCSTR_EXPIRIENCE]); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4810 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4811 case 11: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4812 v8 = rand() % 6; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4813 switch (v8) |
| 1032 | 4814 { |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4815 case 0: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4816 playerAffected->sResFireBase += thisa; |
| 2156 | 4817 v13 = pGlobalTXT_LocalizationStrings[87];//Fire |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4818 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4819 case 1: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4820 playerAffected->sResAirBase += thisa; |
| 2156 | 4821 v13 = pGlobalTXT_LocalizationStrings[6];//Air |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4822 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4823 case 2: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4824 playerAffected->sResWaterBase += thisa; |
| 2156 | 4825 v13 = pGlobalTXT_LocalizationStrings[240];//Water |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4826 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4827 case 3: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4828 playerAffected->sResEarthBase += thisa; |
| 2156 | 4829 v13 = pGlobalTXT_LocalizationStrings[70];//Earth |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4830 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4831 case 4: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4832 playerAffected->sResMindBase += thisa; |
| 2156 | 4833 v13 = pGlobalTXT_LocalizationStrings[142];//Mind |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4834 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4835 case 5: |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4836 playerAffected->sResBodyBase += thisa; |
| 2156 | 4837 v13 = pGlobalTXT_LocalizationStrings[29];//Body |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4838 break; |
| 1783 | 4839 default: ("Unexpected attribute"); |
| 4840 return; | |
| 1021 | 4841 } |
| 2156 | 4842 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v13, pGlobalTXT_LocalizationStrings[121]);//Permanent |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4843 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4844 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4845 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4846 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4847 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4848 pGame->pStru6Instance->SetPlayerBuffAnim(SPELL_QUEST_COMPLETED, player_num - 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4849 playerAffected->PlaySound(SPEECH_93, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4850 pAudioPlayer->PlaySound((SoundID)219, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4851 if ( pParty->uDaysPlayed == 6 || pParty->uDaysPlayed == 20 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4852 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4853 playerAffected->SetCondition(Condition_Eradicated, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4854 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4855 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4856 else if ( pParty->uDaysPlayed == 12 || pParty->uDaysPlayed == 26 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4857 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4858 playerAffected->SetCondition(Condition_Dead, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4859 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4860 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4861 else if ( pParty->uDaysPlayed == 4 || pParty->uDaysPlayed == 25 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4862 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4863 playerAffected->SetCondition(Condition_Pertified, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4864 pAudioPlayer->PlaySound((SoundID)215, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4865 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4866 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4867 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4868 else if ( pParty->pPickedItem.uItemID == 630 ) //Red Apple |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4869 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4870 Party::GiveFood(1u); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4871 pAudioPlayer->PlaySound(SOUND_EatApple, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4872 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4873 else if ( pParty->pPickedItem.uItemID == 632 ) //Lute |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4874 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4875 pAudioPlayer->PlaySound(SOUND_PlayLute, 0, 0, -1, 0, 0, 0, 0); |
| 1032 | 4876 return; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4877 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4878 else if ( pParty->pPickedItem.uItemID == 633 ) //Faerie Pipes |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4879 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4880 pAudioPlayer->PlaySound(SOUND_PlayFaeriePipes, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4881 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4882 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4883 else if ( pParty->pPickedItem.uItemID == 634 ) //Gryphonheart's Trumpet |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4884 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4885 pAudioPlayer->PlaySound(SOUND_PlayGryphonheartsTrumpet, 0, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4886 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4887 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4888 else if ( pParty->pPickedItem.uItemID == 646 ) //Horseshoe |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4889 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4890 pGame->pStru6Instance->SetPlayerBuffAnim(SPELL_QUEST_COMPLETED, player_num - 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4891 v5 = PID(OBJECT_Player, player_num + 49); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4892 pAudioPlayer->PlaySound(SOUND_20001, v5, 0, -1, 0, 0, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4893 playerAffected->AddVariable(VAR_NumSkillPoints, 2); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4894 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4895 else if ( pParty->pPickedItem.uItemID == 650 ) //Temple in a Bottle |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4896 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4897 TeleportToNWCDungeon(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4898 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4899 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4900 else |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4901 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4902 v68 = pParty->pPickedItem.GetDisplayName(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4903 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[36],v68);//"%s can not be used that way" |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
4904 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4905 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4906 return; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4907 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4908 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4909 pMouse->RemoveHoldingItem(); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4910 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4911 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4912 } |
| 0 | 4913 |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4914 bool CmpSkillValue(int valToCompare, int skillValue) |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4915 { |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4916 int v4; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4917 if ( valToCompare <= 63 ) |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4918 v4 = skillValue & 0x3F; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4919 else |
| 1822 | 4920 v4 = skillValue & skillValue; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4921 return v4 >= valToCompare; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4922 } |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4923 |
| 0 | 4924 //----- (00449BB4) -------------------------------------------------------- |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4925 bool Player::CompareVariable( enum VariableType VarNum, signed int pValue ) // in some cases this calls only calls v4 >= pValue, which i've changed to return false, since these values are supposed to be positive and v4 was -1 by default |
| 1731 | 4926 { |
| 4927 Assert(pValue >= 0, "Compare variable shouldn't have negative arguments"); | |
| 4928 | |
| 0 | 4929 signed int v4; // edi@1 |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4930 unsigned __int8 test_bit_value; // eax@25 |
| 1731 | 4931 unsigned __int8 byteWithRequestedBit; // cl@25 |
| 0 | 4932 DDM_DLV_Header *v19; // eax@122 |
| 4933 DDM_DLV_Header *v21; // eax@126 | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4934 int actStat; // ebx@161 |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4935 int baseStat; // eax@161 |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4936 |
| 1783 | 4937 |
| 4938 if ( (signed int)VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_74 ) | |
| 4939 return (unsigned __int8)stru_5E4C90_MapPersistVars.field_0[VarNum - VAR_MapPersistentVariable_0] > 0; // originally (unsigned __int8)byte_5E4C15[VarNum]; | |
| 4940 if ( (signed int)VarNum >= VAR_MapPersistentVariable_75 && VarNum <= VAR_MapPersistentVariable_99 ) | |
| 4941 return (unsigned __int8)stru_5E4C90_MapPersistVars._decor_events[VarNum - VAR_MapPersistentVariable_75] > 0; //not really sure whether the number gets up to 99, but can't ignore the possibility | |
| 4942 | |
| 4943 switch ( VarNum ) | |
| 4944 { | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4945 case VAR_Sex: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4946 return ( pValue == this->uSex ); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4947 case VAR_Class: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4948 return ( pValue == this->classType ); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4949 case VAR_Race: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4950 return pValue == GetRace(); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4951 case VAR_CurrentHP: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4952 return this->sHealth >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4953 case VAR_MaxHP: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4954 return (this->sHealth >= GetMaxHealth()); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4955 case VAR_CurrentSP: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4956 return this->sMana >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4957 case VAR_MaxSP: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4958 return (this->sMana >= GetMaxMana()); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4959 case VAR_ActualAC: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4960 return GetActualAC() >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4961 case VAR_ACModifier: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4962 return this->sACModifier >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4963 case VAR_BaseLevel: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4964 return this->uLevel >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4965 case VAR_LevelModifier: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4966 return this->sLevelModifier >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4967 case VAR_Age: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4968 return GetActualAge() >= (unsigned int)pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4969 case VAR_Award: |
| 1783 | 4970 return _449B57_test_bit(this->_achieved_awards_bits, pValue); |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4971 case VAR_Experience: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4972 return this->uExperience >= pValue; //TODO change pValue to long long |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4973 case VAR_QBits_QuestsDone: |
| 1783 | 4974 return _449B57_test_bit(pParty->_quest_bits, pValue); |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4975 case VAR_PlayerItemInHands: |
| 1919 | 4976 //for (int i = 0; i < 138; i++) |
| 4977 for (int i = 0; i < 126; i++) | |
| 0 | 4978 { |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4979 if (pInventoryItemList[i].uItemID == pValue) |
| 0 | 4980 { |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4981 return true; |
| 0 | 4982 } |
| 469 | 4983 } |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4984 return pParty->pPickedItem.uItemID == pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4985 case VAR_Hour: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4986 if ( (long long)(pParty->uTimePlayed * 0.234375) / 60 / 60 % 24 == pValue ) |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4987 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4988 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4989 case VAR_DayOfYear: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4990 if (((long long)(pParty->uTimePlayed * 0.234375) / 60 / 60) / 24 % 336 + 1 == pValue) |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4991 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4992 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4993 case VAR_DayOfWeek: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4994 if (((long long)(pParty->uTimePlayed * 0.234375) / 60 / 60) / 24 % 7) |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4995 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4996 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4997 case VAR_FixedGold: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4998 return pParty->uNumGold >= (unsigned int)pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4999 case VAR_FixedFood: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5000 return pParty->uNumFoodRations >= (unsigned int)pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5001 case VAR_MightBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5002 return this->uMightBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5003 case VAR_IntellectBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5004 return this->uIntelligenceBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5005 case VAR_PersonalityBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5006 return this->uWillpowerBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5007 case VAR_EnduranceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5008 return this->uEnduranceBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5009 case VAR_SpeedBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5010 return this->uSpeedBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5011 case VAR_AccuracyBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5012 return this->uAccuracyBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5013 case VAR_LuckBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5014 return this->uLuckBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5015 case VAR_BaseMight: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5016 return this->uMight >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5017 case VAR_BaseIntellect: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5018 return this->uIntelligence >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5019 case VAR_BasePersonality: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5020 return this->uWillpower >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5021 case VAR_BaseEndurance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5022 return this->uEndurance >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5023 case VAR_BaseSpeed: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5024 return this->uSpeed >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5025 case VAR_BaseAccuracy: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5026 return this->uAccuracy >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5027 case VAR_BaseLuck: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5028 return this->uLuck >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5029 case VAR_ActualMight: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5030 return GetActualMight() >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5031 case VAR_ActualIntellect: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5032 return GetActualIntelligence() >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5033 case VAR_ActualPersonality: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5034 return GetActualWillpower() >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5035 case VAR_ActualEndurance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5036 return GetActualEndurance() >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5037 case VAR_ActualSpeed: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5038 return GetActualSpeed() >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5039 case VAR_ActualAccuracy: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5040 return GetActualAccuracy() >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5041 case VAR_ActualLuck: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5042 return GetActualLuck() >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5043 case VAR_FireResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5044 return this->sResFireBase >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5045 case VAR_AirResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5046 return this->sResAirBase >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5047 case VAR_WaterResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5048 return this->sResWaterBase >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5049 case VAR_EarthResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5050 return this->sResEarthBase >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5051 case VAR_SpiritResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5052 return this->sResSpiritBase >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5053 case VAR_MindResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5054 return this->sResMindBase >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5055 case VAR_BodyResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5056 return this->sResBodyBase >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5057 case VAR_LightResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5058 return this->sResLightBase >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5059 case VAR_DarkResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5060 return this->sResDarkBase >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5061 case VAR_PhysicalResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5062 Error("Physical resistance isn't used in events"); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5063 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5064 case VAR_MagicResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5065 return this->sResMagicBase >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5066 case VAR_FireResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5067 return this->sResFireBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5068 case VAR_AirResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5069 return this->sResAirBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5070 case VAR_WaterResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5071 return this->sResWaterBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5072 case VAR_EarthResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5073 return this->sResEarthBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5074 case VAR_SpiritResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5075 return this->sResSpiritBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5076 case VAR_MindResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5077 return this->sResMindBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5078 case VAR_BodyResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5079 return this->sResBodyBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5080 case VAR_LightResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5081 return this->sResLightBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5082 case VAR_DarkResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5083 return this->sResDarkBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5084 case VAR_MagicResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5085 return this->sResMagicBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5086 case VAR_StaffSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5087 return CmpSkillValue(pValue, this->skillStaff); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5088 case VAR_SwordSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5089 return CmpSkillValue(pValue, this->skillSword); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5090 case VAR_DaggerSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5091 return CmpSkillValue(pValue, this->skillDagger); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5092 case VAR_AxeSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5093 return CmpSkillValue(pValue, this->skillAxe); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5094 case VAR_SpearSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5095 return CmpSkillValue(pValue, this->skillSpear); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5096 case VAR_BowSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5097 return CmpSkillValue(pValue, this->skillBow); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5098 case VAR_MaceSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5099 return CmpSkillValue(pValue, this->skillMace); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5100 case VAR_BlasterSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5101 return CmpSkillValue(pValue, this->skillBlaster); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5102 case VAR_ShieldSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5103 return CmpSkillValue(pValue, this->skillShield); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5104 case VAR_LeatherSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5105 return CmpSkillValue(pValue, this->skillLeather); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5106 case VAR_SkillChain: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5107 return CmpSkillValue(pValue, this->skillChain); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5108 case VAR_PlateSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5109 return CmpSkillValue(pValue, this->skillPlate); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5110 case VAR_FireSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5111 return CmpSkillValue(pValue, this->skillFire); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5112 case VAR_AirSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5113 return CmpSkillValue(pValue, this->skillAir); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5114 case VAR_WaterSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5115 return CmpSkillValue(pValue, this->skillWater); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5116 case VAR_EarthSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5117 return CmpSkillValue(pValue, this->skillEarth); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5118 case VAR_SpiritSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5119 return CmpSkillValue(pValue, this->skillSpirit); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5120 case VAR_MindSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5121 return CmpSkillValue(pValue, this->skillMind); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5122 case VAR_BodySkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5123 return CmpSkillValue(pValue, this->skillBody); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5124 case VAR_LightSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5125 return CmpSkillValue(pValue, this->skillLight); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5126 case VAR_DarkSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5127 return CmpSkillValue(pValue, this->skillDark); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5128 case VAR_IdentifyItemSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5129 return CmpSkillValue(pValue, this->skillItemId); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5130 case VAR_MerchantSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5131 return CmpSkillValue(pValue, this->skillMerchant); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5132 case VAR_RepairSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5133 return CmpSkillValue(pValue, this->skillRepair); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5134 case VAR_BodybuildingSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5135 return CmpSkillValue(pValue, this->skillBodybuilding); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5136 case VAR_MeditationSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5137 return CmpSkillValue(pValue, this->skillMeditation); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5138 case VAR_PerceptionSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5139 return CmpSkillValue(pValue, this->skillPerception); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5140 case VAR_DiplomacySkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5141 return CmpSkillValue(pValue, this->skillDiplomacy); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5142 case VAR_ThieverySkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5143 Error("Thievery isn't used in events"); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5144 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5145 case VAR_DisarmTrapSkill: //wasn't in the original |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5146 return CmpSkillValue(pValue, this->skillDisarmTrap); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5147 case VAR_DodgeSkill: //wasn't in the original |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5148 return CmpSkillValue(pValue, this->skillDodge); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5149 case VAR_UnarmedSkill: //wasn't in the original |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5150 return CmpSkillValue(pValue, this->skillUnarmed); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5151 case VAR_IdentifyMonsterSkill: //wasn't in the original |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5152 return CmpSkillValue(pValue, this->skillMonsterId); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5153 case VAR_ArmsmasterSkill: //wasn't in the original |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5154 return CmpSkillValue(pValue, this->skillArmsmaster); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5155 case VAR_StealingSkill: //wasn't in the original |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5156 return CmpSkillValue(pValue, this->skillStealing); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5157 case VAR_AlchemySkill: //wasn't in the original |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5158 return CmpSkillValue(pValue, this->skillAlchemy); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5159 case VAR_LearningSkill: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5160 return CmpSkillValue(pValue, this->skillLearning); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5161 case VAR_Cursed: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5162 return pConditions[Condition_Cursed] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5163 case VAR_Weak: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5164 return pConditions[Condition_Weak] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5165 case VAR_Asleep: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5166 return pConditions[Condition_Sleep] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5167 case VAR_Afraid: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5168 return pConditions[Condition_Fear] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5169 case VAR_Drunk: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5170 return pConditions[Condition_Drunk] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5171 case VAR_Insane: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5172 return pConditions[Condition_Insane] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5173 case VAR_PoisonedGreen: |
| 2187 | 5174 return pConditions[Condition_Poison_Weak] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5175 case VAR_DiseasedGreen: |
| 2187 | 5176 return pConditions[Condition_Disease_Weak] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5177 case VAR_PoisonedYellow: |
| 2187 | 5178 return pConditions[Condition_Poison_Medium] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5179 case VAR_DiseasedYellow: |
| 2187 | 5180 return pConditions[Condition_Disease_Medium] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5181 case VAR_PoisonedRed: |
| 2187 | 5182 return pConditions[Condition_Poison_Severe] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5183 case VAR_DiseasedRed: |
| 2187 | 5184 return pConditions[Condition_Disease_Severe] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5185 case VAR_Paralyzed: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5186 return pConditions[Condition_Paralyzed] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5187 case VAR_Unconsious: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5188 return pConditions[Condition_Unconcious] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5189 case VAR_Dead: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5190 return pConditions[Condition_Dead] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5191 case VAR_Stoned: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5192 return pConditions[Condition_Pertified] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5193 case VAR_Eradicated: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5194 return pConditions[Condition_Eradicated] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5195 case VAR_MajorCondition: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5196 v4 = GetMajorConditionIdx(); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5197 if ( v4 != 18 ) |
| 0 | 5198 { |
| 469 | 5199 return v4 >= pValue; |
| 5200 } | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5201 return true; |
| 1783 | 5202 case VAR_AutoNotes : //TODO: find out why the double subtraction. or whether this is even used |
| 5203 test_bit_value = 0x80u >> (pValue - 2) % 8; | |
| 5204 byteWithRequestedBit = pParty->_autonote_bits[(pValue - 2) /8]; | |
| 5205 return (test_bit_value & byteWithRequestedBit) != 0; | |
| 5206 case VAR_IsMightMoreThanBase: | |
| 5207 actStat = GetActualMight(); | |
| 5208 baseStat = GetBaseStrength(); | |
| 5209 return (actStat >= baseStat); | |
| 5210 case VAR_IsIntellectMoreThanBase: | |
| 5211 actStat = GetActualIntelligence(); | |
| 5212 baseStat = GetBaseIntelligence(); | |
| 5213 return (actStat >= baseStat); | |
| 5214 case VAR_IsPersonalityMoreThanBase: | |
| 5215 actStat = GetActualWillpower(); | |
| 5216 baseStat = GetBaseWillpower(); | |
| 5217 return (actStat >= baseStat); | |
| 5218 case VAR_IsEnduranceMoreThanBase: | |
| 5219 actStat = GetActualEndurance(); | |
| 5220 baseStat = GetBaseEndurance(); | |
| 5221 return (actStat >= baseStat); | |
| 5222 case VAR_IsSpeedMoreThanBase: | |
| 5223 actStat = GetActualSpeed(); | |
| 5224 baseStat = GetBaseSpeed(); | |
| 5225 return (actStat >= baseStat); | |
| 5226 case VAR_IsAccuracyMoreThanBase: | |
| 5227 actStat = GetActualAccuracy(); | |
| 5228 baseStat = GetBaseAccuracy(); | |
| 5229 return (actStat >= baseStat); | |
| 5230 case VAR_IsLuckMoreThanBase: | |
| 5231 actStat = GetActualLuck(); | |
| 5232 baseStat = GetBaseLuck(); | |
| 5233 return (actStat >= baseStat); | |
| 5234 case VAR_PlayerBits: | |
| 5235 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; | |
| 1822 | 5236 byteWithRequestedBit = this->playerEventBits[((signed __int16)pValue - 1)/8]; |
| 1783 | 5237 return ( test_bit_value & byteWithRequestedBit ) != 0; |
| 5238 case VAR_NPCs2: | |
| 5239 return pNPCStats->pNewNPCData[pValue].Hired(); | |
| 5240 case VAR_IsFlying: | |
| 5241 if ( pParty->bFlying | |
| 5242 && (pParty->pPartyBuffs[PARTY_BUFF_FLY].uExpireTime> 0) ) | |
| 5243 return true; | |
| 5244 return false; | |
| 5245 case VAR_HiredNPCHasSpeciality: | |
| 5246 return CheckHiredNPCSpeciality(pValue); | |
| 5247 case VAR_CircusPrises: //isn't used in MM6 since 0x1D6u is a book of regeneration | |
| 5248 v4 = 0; | |
| 5249 for (int playerNum = 0; playerNum < 4; playerNum++) | |
| 5250 { | |
| 5251 for (int invPos = 0; invPos < 138; invPos++) | |
| 5252 { | |
| 5253 int itemId = pParty->pPlayers[playerNum].pInventoryItemList[invPos].uItemID; | |
| 5254 switch ( itemId ) | |
| 5255 { | |
| 5256 case 0x1D6u: | |
| 5257 ++v4; | |
| 5258 break; | |
| 5259 case 0x1D7u: | |
| 5260 v4 += 3; | |
| 5261 break; | |
| 5262 case 0x1DDu: | |
| 5263 v4 += 5; | |
| 5264 break; | |
| 5265 } | |
| 5266 } | |
| 5267 } | |
| 5268 return v4 >= pValue; | |
| 5269 case VAR_NumSkillPoints: | |
| 5270 return this->uSkillPoints >= (unsigned int)pValue; | |
| 5271 case VAR_MonthIs: | |
| 5272 return (pParty->uCurrentMonth == (unsigned int)pValue); | |
| 5273 case VAR_Counter1: | |
| 5274 case VAR_Counter2: | |
| 5275 case VAR_Counter3: | |
| 5276 case VAR_Counter4: | |
| 5277 case VAR_Counter5: | |
| 5278 case VAR_Counter6: | |
| 5279 case VAR_Counter7: | |
| 5280 case VAR_Counter8: | |
| 5281 case VAR_Counter9: | |
| 5282 case VAR_Counter10: | |
| 5283 if (pParty->PartyTimes.CounterEventValues[VarNum - VAR_Counter1]) //originally (signed __int64)(__PAIR__(*(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44304], *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44300]) | |
| 5284 { | |
| 5285 return (pParty->PartyTimes.CounterEventValues[VarNum - VAR_Counter1] + 460800 * pValue * 0.033333335) <= pParty->uTimePlayed ; | |
| 5286 } | |
| 5287 case VAR_ReputationInCurrentLocation: | |
| 5288 v19 = &pOutdoor->ddm; | |
| 5289 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5290 v19 = &pIndoor->dlv; | |
| 5291 return (v19->uReputation >= pValue); | |
| 5292 case VAR_Unknown1: | |
| 5293 v21 = &pOutdoor->ddm; | |
| 5294 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5295 v21 = &pIndoor->dlv; | |
| 5296 return (v21->field_C_alert == pValue); //yes, equality, not >= | |
| 5297 case VAR_GoldInBank: | |
| 5298 return pParty->uNumGoldInBank >= (unsigned int)pValue; | |
| 5299 case VAR_NumDeaths: | |
| 5300 return pParty->uNumDeaths >= (unsigned int)pValue; | |
| 5301 case VAR_NumBounties: | |
| 5302 return pParty->uNumBountiesCollected >= (unsigned int)pValue; | |
| 5303 case VAR_PrisonTerms: | |
| 5304 return pParty->uNumPrisonTerms >= pValue; | |
| 5305 case VAR_ArenaWinsPage: | |
| 5306 return (unsigned __int8)pParty->uNumArenaPageWins >= pValue; | |
| 5307 case VAR_ArenaWinsSquire: | |
| 5308 return (unsigned __int8)pParty->uNumArenaSquireWins >= pValue; | |
| 5309 case VAR_ArenaWinsKnight: | |
| 5310 return (unsigned __int8)pParty->uNumArenaKnightWins >= pValue; | |
| 5311 case VAR_ArenaWinsLord: | |
| 5312 return pParty->uNumArenaLordWins >= pValue; | |
| 5313 case VAR_Invisible: | |
| 5314 return ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime > 0 ); | |
| 5315 case VAR_ItemEquipped: | |
| 5316 for (int i = 0; i < 16; i++) | |
| 5317 { | |
| 5318 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) && GetNthEquippedIndexItem(i)->uItemID == pValue ) | |
| 5319 { | |
| 5320 return true; | |
| 5321 } | |
| 5322 } | |
| 5323 return false; | |
| 5324 } | |
| 5325 | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5326 return false; |
| 0 | 5327 } |
| 5328 | |
| 5329 | |
| 5330 //----- (0044A5CB) -------------------------------------------------------- | |
| 492 | 5331 void Player::SetVariable(enum VariableType var_type, signed int var_value) |
| 5332 { | |
| 0 | 5333 unsigned int v6; // esi@13 |
| 5334 unsigned int v7; // esi@14 | |
| 5335 signed int v11; // eax@30 | |
| 5336 DDM_DLV_Header *v24; // ecx@148 | |
| 5337 ItemGen item; // [sp+Ch] [bp-28h]@52 | |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5338 |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5339 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5340 if ( var_type >= VAR_History_0 && var_type <= VAR_History_28) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5341 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5342 if (!pParty->PartyTimes.HistoryEventTimes[var_type - VAR_History_0]) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5343 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5344 pParty->PartyTimes.HistoryEventTimes[var_type - VAR_History_0] = pParty->uTimePlayed; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5345 if (pStorylineText->StoreLine[var_type - VAR_History_0].pText) |
| 492 | 5346 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5347 bFlashHistoryBook = 1; |
| 1822 | 5348 PlayAwardSound(); |
| 0 | 5349 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5350 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5351 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5352 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5353 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5354 if ( var_type >= VAR_MapPersistentVariable_0 && var_type <= VAR_MapPersistentVariable_99 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5355 { |
| 1822 | 5356 if ( var_type >= VAR_MapPersistentVariable_0 && var_type <= VAR_MapPersistentVariable_74 ) |
| 5357 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] = (char)var_value; // originally (unsigned __int8)byte_5E4C15[VarNum]; | |
| 5358 if ( var_type >= VAR_MapPersistentVariable_75 && var_type <= VAR_MapPersistentVariable_99 ) | |
| 5359 stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75] = (unsigned char)var_value; //not really sure whether the number gets up to 99, but can't ignore the possibility | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5360 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5361 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5362 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5363 if ( var_type >= VAR_UnknownTimeEvent0 && var_type <= VAR_UnknownTimeEvent19 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5364 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5365 pParty->PartyTimes._s_times[var_type - VAR_UnknownTimeEvent0] = pParty->uTimePlayed; //*(int *)&stru_AA1058[3].pSounds[8 * var_type + 44532] = LODWORD(pParty->uTimePlayed);, *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44536] = HIDWORD(pParty->uTimePlayed |
| 1822 | 5366 PlayAwardSound(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5367 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5368 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5369 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5370 switch ( var_type ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5371 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5372 case VAR_Sex: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5373 this->uSex = (PLAYER_SEX)var_value; |
| 1822 | 5374 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5375 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5376 case VAR_Class: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5377 this->classType = (PLAYER_CLASS_TYPE)var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5378 if ( (PLAYER_CLASS_TYPE)var_value == PLAYER_CLASS_LICH ) |
| 492 | 5379 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5380 for (int i = 0; i < 138; i++) |
| 0 | 5381 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5382 if (this->pOwnItems[i].uItemID == ITEM_LICH_JAR_EMPTY) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5383 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5384 this->pOwnItems[i].uItemID = ITEM_LICH_JAR_FULL; |
| 1822 | 5385 this->pOwnItems[i].uHolderPlayer = GetPlayerIndex() + 1; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5386 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5387 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5388 if ( this->sResFireBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5389 this->sResFireBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5390 if ( this->sResAirBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5391 this->sResAirBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5392 if ( this->sResWaterBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5393 this->sResWaterBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5394 if ( this->sResEarthBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5395 this->sResEarthBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5396 this->sResMindBase = 200; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5397 this->sResBodyBase = 200; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5398 v11 = this->GetSexByVoice(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5399 this->uPrevVoiceID = this->uVoiceID; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5400 this->uPrevFace = this->uCurrentFace; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5401 if ( v11 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5402 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5403 this->uCurrentFace = 21; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5404 this->uVoiceID = 21; |
| 0 | 5405 } |
| 5406 else | |
| 5407 { | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5408 this->uCurrentFace = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5409 this->uVoiceID = 20; |
| 0 | 5410 } |
| 1822 | 5411 ReloadPlayerPortraits(GetPlayerIndex(), this->uCurrentFace); |
| 0 | 5412 } |
| 1822 | 5413 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5414 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5415 case VAR_CurrentHP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5416 this->sHealth = var_value; |
| 1822 | 5417 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5418 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5419 case VAR_MaxHP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5420 this->sHealth = GetMaxHealth(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5421 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5422 case VAR_CurrentSP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5423 this->sMana = var_value; |
| 1822 | 5424 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5425 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5426 case VAR_MaxSP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5427 this->sMana = GetMaxMana(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5428 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5429 case VAR_ACModifier: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5430 this->sACModifier = (unsigned __int8)var_value; |
| 1822 | 5431 PlayAwardSound_Anim(); |
| 0 | 5432 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5433 case VAR_BaseLevel: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5434 this->uLevel = (unsigned __int8)var_value; |
| 1822 | 5435 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5436 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5437 case VAR_LevelModifier: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5438 this->sLevelModifier = (unsigned __int8)var_value; |
| 1822 | 5439 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5440 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5441 case VAR_Age: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5442 this->sAgeModifier = var_value; |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5443 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5444 case VAR_Award: |
| 1783 | 5445 if ( !_449B57_test_bit(this->_achieved_awards_bits, var_value) && pAwards[var_value].pText ) |
| 492 | 5446 { |
| 1822 | 5447 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5448 this->PlaySound(SPEECH_96, 0); |
| 0 | 5449 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5450 _449B7E_toggle_bit(this->_achieved_awards_bits, var_value, 1u); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5451 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5452 case VAR_Experience: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5453 this->uExperience = var_value; |
| 1822 | 5454 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5455 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5456 case VAR_QBits_QuestsDone: |
| 1783 | 5457 if ( !_449B57_test_bit(pParty->_quest_bits, var_value) && pQuestTable[var_value-1] ) |
| 0 | 5458 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5459 bFlashQuestBook = 1; |
| 1822 | 5460 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, GetPlayerIndex()); |
| 5461 PlayAwardSound(); | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5462 this->PlaySound(SPEECH_93, 0); |
| 0 | 5463 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5464 _449B7E_toggle_bit(pParty->_quest_bits, var_value, 1u); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5465 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5466 case VAR_PlayerItemInHands: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5467 item.Reset(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5468 item.uItemID = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5469 item.uAttributes = 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5470 pParty->SetHoldingItem(&item); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5471 if ( var_value >= ITEM_ARTIFACT_PUCK && var_value <= ITEM_RELIC_MEKORIGS_HAMMER ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5472 pParty->pIsArtifactFound[var_value-500] = 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5473 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5474 case VAR_FixedGold: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5475 Party::SetGold(var_value); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5476 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5477 case VAR_RandomGold: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5478 v6 = rand() % var_value + 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5479 Party::SetGold(v6); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5480 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[500], v6);// You have %lu gold |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5481 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5482 GameUI_DrawFoodAndGold(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5483 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5484 case VAR_FixedFood: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5485 Party::SetFood(var_value); |
| 1822 | 5486 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5487 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5488 case VAR_RandomFood: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5489 v7 = rand() % var_value + 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5490 Party::SetFood(v7); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5491 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[501], v7);// You have %lu food |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5492 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5493 GameUI_DrawFoodAndGold(); |
| 1822 | 5494 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5495 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5496 case VAR_BaseMight: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5497 this->uMight = (unsigned __int8)var_value; |
| 1822 | 5498 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5499 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5500 case VAR_BaseIntellect: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5501 this->uIntelligence = (unsigned __int8)var_value; |
| 1822 | 5502 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5503 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5504 case VAR_BasePersonality: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5505 this->uWillpower = (unsigned __int8)var_value; |
| 1822 | 5506 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5507 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5508 case VAR_BaseEndurance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5509 this->uEndurance = (unsigned __int8)var_value; |
| 1822 | 5510 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5511 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5512 case VAR_BaseSpeed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5513 this->uSpeed = (unsigned __int8)var_value; |
| 1822 | 5514 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5515 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5516 case VAR_BaseAccuracy: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5517 this->uAccuracy = (unsigned __int8)var_value; |
| 1822 | 5518 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5519 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5520 case VAR_BaseLuck: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5521 this->uLuck = (unsigned __int8)var_value; |
| 1822 | 5522 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5523 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5524 case VAR_MightBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5525 case VAR_ActualMight: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5526 this->uMightBonus = (unsigned __int8)var_value; |
| 1822 | 5527 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5528 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5529 case VAR_IntellectBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5530 case VAR_ActualIntellect: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5531 this->uIntelligenceBonus = (unsigned __int8)var_value; |
| 1822 | 5532 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5533 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5534 case VAR_PersonalityBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5535 case VAR_ActualPersonality: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5536 this->uWillpowerBonus = (unsigned __int8)var_value; |
| 1822 | 5537 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5538 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5539 case VAR_EnduranceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5540 case VAR_ActualEndurance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5541 this->uEnduranceBonus = (unsigned __int8)var_value; |
| 1822 | 5542 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5543 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5544 case VAR_SpeedBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5545 case VAR_ActualSpeed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5546 this->uSpeedBonus = (unsigned __int8)var_value; |
| 1822 | 5547 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5548 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5549 case VAR_AccuracyBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5550 case VAR_ActualAccuracy: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5551 this->uAccuracyBonus = (unsigned __int8)var_value; |
| 1822 | 5552 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5553 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5554 case VAR_LuckBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5555 case VAR_ActualLuck: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5556 this->uLuckBonus = (unsigned __int8)var_value; |
| 1822 | 5557 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5558 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5559 case VAR_FireResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5560 this->sResFireBase = (unsigned __int8)var_value; |
| 1822 | 5561 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5562 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5563 case VAR_AirResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5564 this->sResAirBase = (unsigned __int8)var_value; |
| 1822 | 5565 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5566 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5567 case VAR_WaterResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5568 this->sResWaterBase = (unsigned __int8)var_value; |
| 1822 | 5569 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5570 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5571 case VAR_EarthResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5572 this->sResEarthBase = (unsigned __int8)var_value; |
| 1822 | 5573 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5574 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5575 case VAR_SpiritResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5576 this->sResSpiritBase = (unsigned __int8)var_value; |
| 1822 | 5577 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5578 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5579 case VAR_MindResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5580 this->sResMindBase = (unsigned __int8)var_value; |
| 1822 | 5581 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5582 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5583 case VAR_BodyResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5584 this->sResBodyBase = (unsigned __int8)var_value; |
| 1822 | 5585 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5586 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5587 case VAR_LightResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5588 this->sResLightBase = (unsigned __int8)var_value; |
| 1822 | 5589 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5590 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5591 case VAR_DarkResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5592 this->sResDarkBase = (unsigned __int8)var_value; |
| 1822 | 5593 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5594 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5595 case VAR_MagicResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5596 this->sResMagicBase = (unsigned __int8)var_value; |
| 1822 | 5597 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5598 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5599 case VAR_FireResistanceBonus: |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5600 this->sResFireBonus = (unsigned __int8)var_value; |
| 1822 | 5601 PlayAwardSound_Anim_Face(SPEECH_91); |
| 0 | 5602 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5603 case VAR_AirResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5604 this->sResAirBonus = (unsigned __int8)var_value; |
| 1822 | 5605 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5606 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5607 case VAR_WaterResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5608 this->sResWaterBonus = (unsigned __int8)var_value; |
| 1822 | 5609 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5610 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5611 case VAR_EarthResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5612 this->sResEarthBonus = (unsigned __int8)var_value; |
| 1822 | 5613 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5614 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5615 case VAR_SpiritResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5616 this->sResSpiritBonus = (unsigned __int8)var_value; |
| 1822 | 5617 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5618 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5619 case VAR_MindResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5620 this->sResMindBonus = (unsigned __int8)var_value; |
| 1822 | 5621 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5622 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5623 case VAR_BodyResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5624 this->sResBodyBonus = (unsigned __int8)var_value; |
| 1822 | 5625 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5626 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5627 case VAR_LightResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5628 this->sResLightBonus = (unsigned __int8)var_value; |
| 1822 | 5629 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5630 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5631 case VAR_DarkResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5632 this->sResDarkBonus = (unsigned __int8)var_value; |
| 1822 | 5633 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5634 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5635 case VAR_PhysicalResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5636 Error("Physical res. bonus not used"); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5637 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5638 case VAR_MagicResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5639 this->sResMagicBonus = (unsigned __int8)var_value; |
| 1822 | 5640 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5641 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5642 case VAR_Cursed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5643 this->SetCondition(Condition_Cursed, 1); |
| 1822 | 5644 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5645 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5646 case VAR_Weak: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5647 this->SetCondition(Condition_Weak, 1); |
| 1822 | 5648 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5649 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5650 case VAR_Asleep: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5651 this->SetCondition(Condition_Sleep, 1); |
| 1822 | 5652 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5653 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5654 case VAR_Afraid: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5655 this->SetCondition(Condition_Fear, 1); |
| 1822 | 5656 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5657 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5658 case VAR_Drunk: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5659 this->SetCondition(Condition_Drunk, 1); |
| 1822 | 5660 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5661 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5662 case VAR_Insane: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5663 this->SetCondition(Condition_Insane, 1); |
| 1822 | 5664 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5665 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5666 case VAR_PoisonedGreen: |
| 2187 | 5667 this->SetCondition(Condition_Poison_Weak, 1); |
| 1822 | 5668 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5669 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5670 case VAR_DiseasedGreen: |
| 2187 | 5671 this->SetCondition(Condition_Disease_Weak, 1); |
| 1822 | 5672 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5673 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5674 case VAR_PoisonedYellow: |
| 2187 | 5675 this->SetCondition(Condition_Poison_Medium, 1); |
| 1822 | 5676 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5677 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5678 case VAR_DiseasedYellow: |
| 2187 | 5679 this->SetCondition(Condition_Disease_Medium, 1); |
| 1822 | 5680 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5681 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5682 case VAR_PoisonedRed: |
| 2187 | 5683 this->SetCondition(Condition_Poison_Severe, 1); |
| 1822 | 5684 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5685 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5686 case VAR_DiseasedRed: |
| 2187 | 5687 this->SetCondition(Condition_Disease_Severe, 1); |
| 1822 | 5688 PlayAwardSound_Anim(); |
| 1770 | 5689 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5690 case VAR_Paralyzed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5691 this->SetCondition(Condition_Paralyzed, 1); |
| 1822 | 5692 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5693 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5694 case VAR_Unconsious: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5695 this->SetCondition(Condition_Unconcious, 1); |
| 1822 | 5696 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5697 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5698 case VAR_Dead: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5699 this->SetCondition(Condition_Dead, 1); |
| 1822 | 5700 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5701 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5702 case VAR_Stoned: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5703 this->SetCondition(Condition_Pertified, 1); |
| 1822 | 5704 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5705 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5706 case VAR_Eradicated: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5707 this->SetCondition(Condition_Eradicated, 1); |
| 1822 | 5708 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5709 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5710 case VAR_MajorCondition: |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
5711 pConditions.fill(0); |
| 1822 | 5712 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5713 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5714 case VAR_AutoNotes: |
| 1783 | 5715 if ( !_449B57_test_bit(pParty->_autonote_bits, var_value) && pAutonoteTxt[var_value-1].pText ) |
|
1776
0f273c459f78
Player::SetVariable PlaySound and SetPlayerBuffAnim labels restored to original state
Grumpy7
parents:
1775
diff
changeset
|
5716 { |
| 1822 | 5717 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, GetPlayerIndex()); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5718 this->PlaySound(SPEECH_96, 0); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5719 bFlashAutonotesBook = 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5720 _506568_autonote_type = pAutonoteTxt[var_value-1].eType;// dword_72371C[2 * a3]; |
|
1776
0f273c459f78
Player::SetVariable PlaySound and SetPlayerBuffAnim labels restored to original state
Grumpy7
parents:
1775
diff
changeset
|
5721 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5722 _449B7E_toggle_bit(pParty->_autonote_bits, var_value, 1u); |
| 1822 | 5723 PlayAwardSound(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5724 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5725 case VAR_PlayerBits: |
| 1822 | 5726 _449B7E_toggle_bit((unsigned char *)playerEventBits, var_value, 1u); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5727 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5728 case VAR_NPCs2: |
|
1793
4dee76d79c78
dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents:
1792
diff
changeset
|
5729 pParty->hirelingScrollPosition = 0; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5730 LOBYTE(pNPCStats->pNewNPCData[var_value].uFlags) |= 0x80u; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5731 pParty->CountHirelings(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5732 viewparams->bRedrawGameUI = true; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5733 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5734 case VAR_NumSkillPoints: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5735 this->uSkillPoints = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5736 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5737 case VAR_Counter1: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5738 case VAR_Counter2: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5739 case VAR_Counter3: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5740 case VAR_Counter4: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5741 case VAR_Counter5: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5742 case VAR_Counter6: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5743 case VAR_Counter7: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5744 case VAR_Counter8: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5745 case VAR_Counter9: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5746 case VAR_Counter10: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5747 pParty->PartyTimes.CounterEventValues[var_type - VAR_Counter1] = pParty->uTimePlayed; // *(int *)&stru_AA1058[3].pSounds[8 * var_type + 44300] = LODWORD(pParty->uTimePlayed);*(int *)&stru_AA1058[3].pSounds[8 * var_type + 44304] = HIDWORD(pParty->uTimePlayed); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5748 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5749 case VAR_ReputationInCurrentLocation: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5750 v24 = &pOutdoor->ddm; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5751 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5752 v24 = &pIndoor->dlv; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5753 v24->uReputation = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5754 if ( var_value > 10000 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5755 v24->uReputation = 10000; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5756 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5757 case VAR_GoldInBank: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5758 pParty->uNumGoldInBank = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5759 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5760 case VAR_NumDeaths: |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5761 pParty->uNumDeaths = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5762 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5763 case VAR_NumBounties: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5764 pParty->uNumBountiesCollected = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5765 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5766 case VAR_PrisonTerms: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5767 pParty->uNumPrisonTerms = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5768 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5769 case VAR_ArenaWinsPage: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5770 pParty->uNumArenaPageWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5771 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5772 case VAR_ArenaWinsSquire: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5773 pParty->uNumArenaSquireWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5774 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5775 case VAR_ArenaWinsKnight: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5776 pParty->uNumArenaKnightWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5777 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5778 case VAR_ArenaWinsLord: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5779 pParty->uNumArenaLordWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5780 return; |
| 1782 | 5781 case VAR_StaffSkill: |
| 1822 | 5782 SetSkillByEvent(&Player::skillStaff, var_value); |
| 1782 | 5783 return; |
| 5784 case VAR_SwordSkill: | |
| 1822 | 5785 SetSkillByEvent(&Player::skillSword, var_value); |
| 1782 | 5786 return; |
| 5787 case VAR_DaggerSkill: | |
| 1822 | 5788 SetSkillByEvent(&Player::skillDagger, var_value); |
| 1782 | 5789 return; |
| 5790 case VAR_AxeSkill: | |
| 1822 | 5791 SetSkillByEvent(&Player::skillAxe, var_value); |
| 1782 | 5792 return; |
| 5793 case VAR_SpearSkill: | |
| 1822 | 5794 SetSkillByEvent(&Player::skillSpear, var_value); |
| 1782 | 5795 return; |
| 5796 case VAR_BowSkill: | |
| 1822 | 5797 SetSkillByEvent(&Player::skillBow, var_value); |
| 1782 | 5798 return; |
| 5799 case VAR_MaceSkill: | |
| 1822 | 5800 SetSkillByEvent(&Player::skillMace, var_value); |
| 1782 | 5801 return; |
| 5802 case VAR_BlasterSkill: | |
| 1822 | 5803 SetSkillByEvent(&Player::skillBlaster, var_value); |
| 1782 | 5804 return; |
| 5805 case VAR_ShieldSkill: | |
| 1822 | 5806 SetSkillByEvent(&Player::skillShield, var_value); |
| 1782 | 5807 return; |
| 5808 case VAR_LeatherSkill: | |
| 1822 | 5809 SetSkillByEvent(&Player::skillLeather, var_value); |
| 1782 | 5810 return; |
| 5811 case VAR_SkillChain: | |
| 1822 | 5812 SetSkillByEvent(&Player::skillChain, var_value); |
| 1782 | 5813 return; |
| 5814 case VAR_PlateSkill: | |
| 1822 | 5815 SetSkillByEvent(&Player::skillPlate, var_value); |
| 1782 | 5816 return; |
| 5817 case VAR_FireSkill: | |
| 1822 | 5818 SetSkillByEvent(&Player::skillFire, var_value); |
| 1782 | 5819 return; |
| 5820 case VAR_AirSkill: | |
| 1822 | 5821 SetSkillByEvent(&Player::skillAir, var_value); |
| 1782 | 5822 return; |
| 5823 case VAR_WaterSkill: | |
| 1822 | 5824 SetSkillByEvent(&Player::skillWater, var_value); |
| 1782 | 5825 return; |
| 5826 case VAR_EarthSkill: | |
| 1822 | 5827 SetSkillByEvent(&Player::skillEarth, var_value); |
| 1782 | 5828 return; |
| 5829 case VAR_SpiritSkill: | |
| 1822 | 5830 SetSkillByEvent(&Player::skillSpirit, var_value); |
| 1782 | 5831 return; |
| 5832 case VAR_MindSkill: | |
| 1822 | 5833 SetSkillByEvent(&Player::skillMind, var_value); |
| 1782 | 5834 return; |
| 5835 case VAR_BodySkill: | |
| 1822 | 5836 SetSkillByEvent(&Player::skillBody, var_value); |
| 1782 | 5837 return; |
| 5838 case VAR_LightSkill: | |
| 1822 | 5839 SetSkillByEvent(&Player::skillLight, var_value); |
| 1782 | 5840 return; |
| 5841 case VAR_DarkSkill: | |
| 1822 | 5842 SetSkillByEvent(&Player::skillDark, var_value); |
| 1782 | 5843 return; |
| 5844 case VAR_IdentifyItemSkill: | |
| 1822 | 5845 SetSkillByEvent(&Player::skillItemId, var_value); |
| 1782 | 5846 return; |
| 5847 case VAR_MerchantSkill: | |
| 1822 | 5848 SetSkillByEvent(&Player::skillMerchant, var_value); |
| 1782 | 5849 return; |
| 5850 case VAR_RepairSkill: | |
| 1822 | 5851 SetSkillByEvent(&Player::skillRepair, var_value); |
| 1782 | 5852 return; |
| 5853 case VAR_BodybuildingSkill: | |
| 1822 | 5854 SetSkillByEvent(&Player::skillBodybuilding, var_value); |
| 1782 | 5855 return; |
| 5856 case VAR_MeditationSkill: | |
| 1822 | 5857 SetSkillByEvent(&Player::skillMeditation, var_value); |
| 1782 | 5858 return; |
| 5859 case VAR_PerceptionSkill: | |
| 1822 | 5860 SetSkillByEvent(&Player::skillPerception, var_value); |
| 1782 | 5861 return; |
| 5862 case VAR_DiplomacySkill: | |
| 1822 | 5863 SetSkillByEvent(&Player::skillDiplomacy, var_value); |
| 1782 | 5864 return; |
| 5865 case VAR_ThieverySkill: | |
| 5866 Error ("Thieving unsupported"); | |
| 5867 return; | |
| 5868 case VAR_DisarmTrapSkill: | |
| 1822 | 5869 SetSkillByEvent(&Player::skillDisarmTrap, var_value); |
| 1782 | 5870 return; |
| 5871 case VAR_DodgeSkill: | |
| 1822 | 5872 SetSkillByEvent(&Player::skillDodge, var_value); |
| 1782 | 5873 return; |
| 5874 case VAR_UnarmedSkill: | |
| 1822 | 5875 SetSkillByEvent(&Player::skillUnarmed, var_value); |
| 1782 | 5876 return; |
| 5877 case VAR_IdentifyMonsterSkill: | |
| 1822 | 5878 SetSkillByEvent(&Player::skillMonsterId, var_value); |
| 1782 | 5879 return; |
| 5880 case VAR_ArmsmasterSkill: | |
| 1822 | 5881 SetSkillByEvent(&Player::skillArmsmaster, var_value); |
| 1782 | 5882 return; |
| 5883 case VAR_StealingSkill: | |
| 1822 | 5884 SetSkillByEvent(&Player::skillStealing, var_value); |
| 1782 | 5885 return; |
| 5886 case VAR_AlchemySkill: | |
| 1822 | 5887 SetSkillByEvent(&Player::skillAlchemy, var_value); |
| 1782 | 5888 return; |
| 5889 case VAR_LearningSkill: | |
| 1822 | 5890 SetSkillByEvent(&Player::skillLearning, var_value); |
| 1782 | 5891 return; |
| 5892 } | |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5893 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5894 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5895 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5896 //----- (new function) -------------------------------------------------------- |
| 1822 | 5897 void Player::PlayAwardSound() |
| 5898 { | |
| 5899 int playerIndex = GetPlayerIndex(); | |
| 5900 signed int v25 = 8 * playerIndex + 400; | |
| 5901 LOBYTE(v25) = PID(OBJECT_Player,playerIndex - 112); | |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5902 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
|
5903 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5904 |
| 1782 | 5905 //----- (new function) -------------------------------------------------------- |
| 1822 | 5906 void Player::PlayAwardSound_Anim() |
| 5907 { | |
| 5908 int playerIndex = GetPlayerIndex(); | |
| 5909 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, playerIndex); | |
| 5910 PlayAwardSound(); | |
| 1782 | 5911 } |
| 5912 | |
| 5913 //----- (new function) -------------------------------------------------------- | |
| 1822 | 5914 void Player::PlayAwardSound_Anim_Face( PlayerSpeech speech ) |
| 1782 | 5915 { |
| 5916 this->PlaySound(speech, 0); | |
| 1822 | 5917 PlayAwardSound_Anim(); |
| 1782 | 5918 } |
| 5919 | |
| 5920 //----- (new function) -------------------------------------------------------- | |
| 1822 | 5921 void Player::SetSkillByEvent( unsigned __int16 Player::* skillToSet, unsigned __int16 skillValue ) |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5922 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5923 unsigned __int16 currSkillValue = this->*skillToSet; |
| 1822 | 5924 if ( skillValue > 63 ) //the original had the condition reversed which was probably wrong |
| 5925 { | |
| 5926 this->*skillToSet = skillValue | currSkillValue & 63; | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5927 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5928 else |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5929 { |
| 1822 | 5930 this->*skillToSet = skillValue | currSkillValue & 0xC0; |
| 5931 } | |
| 5932 int playerIndex = GetPlayerIndex(); | |
| 5933 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, playerIndex); | |
| 5934 PlayAwardSound(); | |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5935 } |
| 0 | 5936 |
| 5937 //----- (0044AFFB) -------------------------------------------------------- | |
| 310 | 5938 void Player::AddVariable(enum VariableType var_type, signed int val) |
| 0 | 5939 { |
| 5940 int v6; // eax@15 | |
| 5941 unsigned int v7; // esi@18 | |
| 5942 DDM_DLV_Header *v27; // eax@153 | |
| 5943 ItemGen item; // [sp+Ch] [bp-2Ch]@45 | |
| 310 | 5944 |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5945 if ( var_type >= VAR_Counter1 && var_type <= VAR_Counter10) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5946 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5947 pParty->PartyTimes.CounterEventValues[var_type - VAR_Counter1] = pParty->uTimePlayed; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5948 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5949 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5950 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5951 if ( var_type >= VAR_UnknownTimeEvent0 && var_type <= VAR_UnknownTimeEvent19 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5952 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5953 pParty->PartyTimes._s_times[var_type - VAR_UnknownTimeEvent0] = pParty->uTimePlayed; |
| 1822 | 5954 PlayAwardSound(); |
| 1788 | 5955 return; |
| 0 | 5956 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5957 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5958 if ( var_type >= VAR_MapPersistentVariable_0 && var_type <= VAR_MapPersistentVariable_99 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5959 { |
| 1822 | 5960 |
| 5961 if ( var_type >= VAR_MapPersistentVariable_0 && var_type <= VAR_MapPersistentVariable_74 ) | |
| 5962 { | |
| 5963 if (255 - val > stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0]) | |
| 5964 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] += val; | |
| 5965 else | |
| 5966 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] = 255; | |
| 5967 } | |
| 5968 if ( (signed int)var_type >= VAR_MapPersistentVariable_75 && var_type <= VAR_MapPersistentVariable_99 ) | |
| 5969 { | |
| 5970 if (255 - val > stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75]) | |
| 5971 stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75] += val; | |
| 5972 else | |
| 5973 stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75] = 255; | |
| 5974 } | |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5975 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5976 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5977 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5978 if ( var_type >= VAR_History_0 && var_type <= VAR_History_28) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5979 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5980 if (!pParty->PartyTimes.HistoryEventTimes[var_type - VAR_History_0]) |
| 0 | 5981 { |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5982 pParty->PartyTimes.HistoryEventTimes[var_type - VAR_History_0] = pParty->uTimePlayed; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5983 if (pStorylineText->StoreLine[var_type - VAR_History_0].pText = 0) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5984 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5985 bFlashHistoryBook = 1; |
| 1822 | 5986 PlayAwardSound(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5987 } |
| 0 | 5988 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5989 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5990 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5991 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5992 switch ( var_type ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5993 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5994 case VAR_RandomGold: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5995 if ( val == 0 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5996 val = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5997 v6 = rand(); |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
5998 pParty->PartyFindsGold(v6 % val + 1, 1); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5999 GameUI_DrawFoodAndGold(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6000 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6001 case VAR_RandomFood: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6002 if ( val == 0 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6003 val = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6004 v7 = rand() % val + 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6005 Party::GiveFood(v7); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6006 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[502], v7);// You find %lu food |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6007 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6008 GameUI_DrawFoodAndGold(); |
| 1822 | 6009 PlayAwardSound(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6010 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6011 case VAR_Sex: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6012 this->uSex = (PLAYER_SEX)val; |
| 1822 | 6013 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6014 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6015 case VAR_Class: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6016 this->classType = (PLAYER_CLASS_TYPE)val; |
| 1822 | 6017 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6018 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6019 case VAR_CurrentHP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6020 this->sHealth = min(this->sHealth + val, this->GetMaxHealth() ); |
| 1822 | 6021 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6022 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6023 case VAR_MaxHP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6024 this->_health_related = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6025 this->uFullHealthBonus = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6026 this->sHealth = this->GetMaxHealth(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6027 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6028 case VAR_CurrentSP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6029 this->sMana = min(this->sMana + val, this->GetMaxMana() ); |
| 1822 | 6030 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6031 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6032 case VAR_MaxSP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6033 this->_mana_related = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6034 this->uFullManaBonus = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6035 this->sMana = GetMaxMana(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6036 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6037 case VAR_ACModifier: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6038 this->sACModifier = min(this->sACModifier + val, 255); |
| 1822 | 6039 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6040 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6041 case VAR_BaseLevel: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6042 this->uLevel = min(this->uLevel + val, 255); |
| 1822 | 6043 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6044 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6045 case VAR_LevelModifier: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6046 this->sLevelModifier = min(this->sLevelModifier + val, 255); |
| 1822 | 6047 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6048 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6049 case VAR_Age: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6050 this->sAgeModifier += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6051 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6052 case VAR_Award: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6053 if (_449B57_test_bit(this->_achieved_awards_bits, val) && pAwards[val].pText ) |
| 310 | 6054 { |
| 1822 | 6055 PlayAwardSound_Anim97_Face(SPEECH_96); |
| 0 | 6056 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6057 _449B7E_toggle_bit(this->_achieved_awards_bits, val, 1); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6058 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6059 case VAR_Experience: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6060 this->uExperience = min(this->uExperience + val, 4000000000i64); |
| 1822 | 6061 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6062 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6063 case VAR_QBits_QuestsDone: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6064 if ( !_449B57_test_bit(pParty->_quest_bits, val) && pQuestTable[val] ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6065 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6066 bFlashQuestBook = 1; |
| 1822 | 6067 PlayAwardSound_Anim97_Face(SPEECH_93); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6068 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6069 _449B7E_toggle_bit(pParty->_quest_bits, val, 1); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6070 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6071 case VAR_PlayerItemInHands: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6072 item.Reset(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6073 item.uAttributes = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6074 item.uItemID = val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6075 if ( val >= ITEM_ARTIFACT_PUCK && val <= ITEM_RELIC_MEKORIGS_HAMMER ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6076 pParty->pIsArtifactFound[val-500] = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6077 else if ( val >= ITEM_WAND_FIRE && val <= ITEM_WAND_INCENERATION ) |
| 0 | 6078 { |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6079 item.uNumCharges = rand() % 6 + item.GetDamageMod() + 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6080 item.uMaxCharges = LOBYTE(item.uNumCharges); |
| 0 | 6081 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6082 pParty->SetHoldingItem(&item); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6083 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6084 case VAR_FixedGold: |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
6085 pParty->PartyFindsGold(val, 1); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6086 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6087 case VAR_BaseMight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6088 this->uMight = min(this->uMight + val, 255); |
| 1822 | 6089 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6090 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6091 case VAR_BaseIntellect: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6092 this->uIntelligence = min(this->uIntelligence + val, 255); |
| 1822 | 6093 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6094 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6095 case VAR_BasePersonality: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6096 this->uWillpower = min(this->uWillpower + val, 255); |
| 1822 | 6097 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6098 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6099 case VAR_BaseEndurance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6100 this->uEndurance = min(this->uEndurance + val, 255); |
| 1822 | 6101 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6102 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6103 case VAR_BaseSpeed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6104 this->uSpeed = min(this->uSpeed + val, 255); |
| 1822 | 6105 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6106 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6107 case VAR_BaseAccuracy: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6108 this->uAccuracy = min(this->uAccuracy + val, 255); |
| 1822 | 6109 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6110 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6111 case VAR_BaseLuck: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6112 this->uLuck = min(this->uLuck + val, 255); |
| 1822 | 6113 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6114 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6115 case VAR_FixedFood: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6116 Party::GiveFood(val); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6117 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[502], val); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6118 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6119 if ( pParty->uNumFoodRations > 0xFFFF ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6120 Party::SetFood(0xFFFFu); |
| 1822 | 6121 PlayAwardSound(); |
| 1788 | 6122 return; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6123 case VAR_MightBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6124 case VAR_ActualMight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6125 this->uMightBonus = min(this->uMightBonus + val, 255); |
| 1822 | 6126 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6127 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6128 case VAR_IntellectBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6129 case VAR_ActualIntellect: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6130 this->uIntelligenceBonus = min(this->uIntelligenceBonus + val, 255); |
| 1822 | 6131 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6132 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6133 case VAR_PersonalityBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6134 case VAR_ActualPersonality: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6135 this->uWillpowerBonus = min(this->uWillpowerBonus + val, 255); |
| 1822 | 6136 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6137 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6138 case VAR_EnduranceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6139 case VAR_ActualEndurance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6140 this->uEnduranceBonus = min(this->uEnduranceBonus + val, 255); |
| 1822 | 6141 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6142 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6143 case VAR_SpeedBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6144 case VAR_ActualSpeed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6145 this->uSpeedBonus = min(this->uSpeedBonus + val, 255); |
| 1822 | 6146 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6147 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6148 case VAR_AccuracyBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6149 case VAR_ActualAccuracy: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6150 this->uAccuracyBonus = min(this->uAccuracyBonus + val, 255); |
| 1822 | 6151 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6152 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6153 case VAR_LuckBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6154 case VAR_ActualLuck: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6155 this->uLuckBonus = min(this->uLuckBonus + val, 255); |
| 1822 | 6156 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6157 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6158 case VAR_FireResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6159 this->sResFireBase = min(this->sResFireBase + val, 255); |
| 1822 | 6160 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6161 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6162 case VAR_AirResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6163 this->sResAirBase = min(this->sResAirBase + val, 255); |
| 1822 | 6164 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6165 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6166 case VAR_WaterResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6167 this->sResWaterBase = min(this->sResWaterBase + val, 255); |
| 1822 | 6168 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6169 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6170 case VAR_EarthResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6171 this->sResEarthBase = min(this->sResEarthBase + val, 255); |
| 1822 | 6172 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6173 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6174 case VAR_SpiritResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6175 this->sResSpiritBase = min(this->sResSpiritBase + val, 255); |
| 1822 | 6176 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6177 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6178 case VAR_MindResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6179 this->sResMindBase = min(this->sResMindBase + val, 255); |
| 1822 | 6180 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6181 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6182 case VAR_BodyResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6183 this->sResBodyBase = min(this->sResBodyBase + val, 255); |
| 1822 | 6184 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6185 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6186 case VAR_LightResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6187 this->sResLightBase = min(this->sResLightBase + val, 255); |
| 1822 | 6188 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6189 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6190 case VAR_DarkResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6191 this->sResDarkBase = min(this->sResDarkBase + val, 255); |
| 1822 | 6192 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6193 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6194 case VAR_MagicResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6195 this->sResMagicBase = min(this->sResMagicBase + val, 255); |
| 1822 | 6196 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6197 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6198 case VAR_FireResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6199 this->sResFireBonus = min(this->sResFireBonus + val, 255); |
| 1822 | 6200 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6201 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6202 case VAR_AirResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6203 this->sResAirBonus = min(this->sResAirBonus + val, 255); |
| 1822 | 6204 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6205 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6206 case VAR_WaterResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6207 this->sResWaterBonus = min(this->sResWaterBonus + val, 255); |
| 1822 | 6208 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6209 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6210 case VAR_EarthResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6211 this->sResEarthBonus = min(this->sResEarthBonus + val, 255); |
| 1822 | 6212 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6213 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6214 case VAR_SpiritResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6215 this->sResSpiritBonus = min(this->sResSpiritBonus + val, 255); |
| 1822 | 6216 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6217 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6218 case VAR_MindResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6219 this->sResMindBonus = min(this->sResMindBonus + val, 255); |
| 1822 | 6220 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6221 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6222 case VAR_BodyResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6223 this->sResBodyBonus = min(this->sResBodyBonus + val, 255); |
| 1822 | 6224 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6225 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6226 case VAR_LightResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6227 this->sResLightBonus = min(this->sResLightBonus + val, 255); |
| 1822 | 6228 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6229 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6230 case VAR_DarkResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6231 this->sResDarkBonus = min(this->sResDarkBonus + val, 255); |
| 1822 | 6232 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6233 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6234 case VAR_MagicResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6235 this->sResMagicBonus = min(this->sResMagicBonus + val, 255); |
| 1822 | 6236 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6237 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6238 case VAR_Cursed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6239 this->SetCondition(Condition_Cursed, 1); |
| 1822 | 6240 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6241 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6242 case VAR_Weak: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6243 this->SetCondition(Condition_Weak, 1); |
| 1822 | 6244 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6245 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6246 case VAR_Asleep: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6247 this->SetCondition(Condition_Sleep, 1); |
| 1822 | 6248 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6249 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6250 case VAR_Afraid: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6251 this->SetCondition(Condition_Fear, 1); |
| 1822 | 6252 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6253 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6254 case VAR_Drunk: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6255 this->SetCondition(Condition_Drunk, 1); |
| 1822 | 6256 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6257 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6258 case VAR_Insane: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6259 this->SetCondition(Condition_Insane, 1); |
| 1822 | 6260 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6261 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6262 case VAR_PoisonedGreen: |
| 2187 | 6263 this->SetCondition(Condition_Poison_Weak, 1); |
| 1822 | 6264 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6265 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6266 case VAR_DiseasedGreen: |
| 2187 | 6267 this->SetCondition(Condition_Disease_Weak, 1); |
| 1822 | 6268 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6269 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6270 case VAR_PoisonedYellow: |
| 2187 | 6271 this->SetCondition(Condition_Poison_Medium, 1); |
| 1822 | 6272 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6273 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6274 case VAR_DiseasedYellow: |
| 2187 | 6275 this->SetCondition(Condition_Disease_Medium, 1); |
| 1822 | 6276 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6277 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6278 case VAR_PoisonedRed: |
| 2187 | 6279 this->SetCondition(Condition_Poison_Severe, 1); |
| 1822 | 6280 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6281 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6282 case VAR_DiseasedRed: |
| 2187 | 6283 this->SetCondition(Condition_Disease_Severe, 1); |
| 1822 | 6284 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6285 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6286 case VAR_Paralyzed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6287 this->SetCondition(Condition_Paralyzed, 1); |
| 1822 | 6288 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6289 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6290 case VAR_Unconsious: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6291 this->SetCondition(Condition_Unconcious, 1); |
| 1822 | 6292 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6293 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6294 case VAR_Dead: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6295 this->SetCondition(Condition_Dead, 1); |
| 1822 | 6296 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6297 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6298 case VAR_Stoned: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6299 this->SetCondition(Condition_Pertified, 1); |
| 1822 | 6300 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6301 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6302 case VAR_Eradicated: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6303 this->SetCondition(Condition_Eradicated, 1); |
| 1822 | 6304 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6305 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6306 case VAR_MajorCondition : |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
6307 pConditions.fill(0); |
| 1822 | 6308 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6309 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6310 case VAR_AutoNotes: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6311 if ( !_449B57_test_bit(pParty->_autonote_bits, val) && pAutonoteTxt[val].pText ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6312 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6313 this->PlaySound(SPEECH_96, 0); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6314 bFlashAutonotesBook = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6315 _506568_autonote_type = pAutonoteTxt[val].eType; |
| 1822 | 6316 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, GetPlayerIndex()); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6317 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6318 _449B7E_toggle_bit(pParty->_autonote_bits, val, 1); |
| 1822 | 6319 PlayAwardSound(); |
| 0 | 6320 return; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6321 case VAR_PlayerBits: |
| 1822 | 6322 _449B7E_toggle_bit((unsigned char *)this->playerEventBits, val, 1u); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6323 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6324 case VAR_NPCs2: |
|
1793
4dee76d79c78
dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents:
1792
diff
changeset
|
6325 pParty->hirelingScrollPosition = 0; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6326 LOBYTE(pNPCStats->pNewNPCData[val].uFlags) |= 0x80u; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6327 pParty->CountHirelings(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6328 viewparams->bRedrawGameUI = true; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6329 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6330 case VAR_NumSkillPoints: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6331 this->uSkillPoints += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6332 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6333 case VAR_ReputationInCurrentLocation: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6334 v27 = &pOutdoor->ddm; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6335 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6336 v27 = &pIndoor->dlv; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6337 v27->uReputation += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6338 if ( v27->uReputation > 10000 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6339 v27->uReputation = 10000; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6340 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6341 case VAR_GoldInBank: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6342 pParty->uNumGoldInBank += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6343 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6344 case VAR_NumDeaths: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6345 pParty->uNumDeaths += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6346 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6347 case VAR_NumBounties: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6348 pParty->uNumBountiesCollected += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6349 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6350 case VAR_PrisonTerms: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6351 pParty->uNumPrisonTerms += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6352 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6353 case VAR_ArenaWinsPage: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6354 pParty->uNumArenaPageWins += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6355 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6356 case VAR_ArenaWinsSquire: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6357 pParty->uNumArenaSquireWins += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6358 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6359 case VAR_ArenaWinsKnight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6360 pParty->uNumArenaKnightWins += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6361 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6362 case VAR_ArenaWinsLord: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6363 pParty->uNumArenaLordWins += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6364 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6365 case VAR_StaffSkill: |
| 1822 | 6366 AddSkillByEvent(&Player::skillStaff, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6367 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6368 case VAR_SwordSkill: |
| 1822 | 6369 AddSkillByEvent(&Player::skillSword, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6370 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6371 case VAR_DaggerSkill: |
| 1822 | 6372 AddSkillByEvent(&Player::skillDagger, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6373 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6374 case VAR_AxeSkill: |
| 1822 | 6375 AddSkillByEvent(&Player::skillAxe, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6376 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6377 case VAR_SpearSkill: |
| 1822 | 6378 AddSkillByEvent(&Player::skillSpear, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6379 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6380 case VAR_BowSkill: |
| 1822 | 6381 AddSkillByEvent(&Player::skillBow, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6382 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6383 case VAR_MaceSkill: |
| 1822 | 6384 AddSkillByEvent(&Player::skillMace, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6385 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6386 case VAR_BlasterSkill: |
| 1822 | 6387 AddSkillByEvent(&Player::skillBlaster, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6388 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6389 case VAR_ShieldSkill: |
| 1822 | 6390 AddSkillByEvent(&Player::skillShield, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6391 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6392 case VAR_LeatherSkill: |
| 1822 | 6393 AddSkillByEvent(&Player::skillLeather, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6394 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6395 case VAR_SkillChain: |
| 1822 | 6396 AddSkillByEvent(&Player::skillChain, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6397 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6398 case VAR_PlateSkill: |
| 1822 | 6399 AddSkillByEvent(&Player::skillPlate, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6400 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6401 case VAR_FireSkill: |
| 1822 | 6402 AddSkillByEvent(&Player::skillFire, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6403 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6404 case VAR_AirSkill: |
| 1822 | 6405 AddSkillByEvent(&Player::skillAir, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6406 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6407 case VAR_WaterSkill: |
| 1822 | 6408 AddSkillByEvent(&Player::skillWater, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6409 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6410 case VAR_EarthSkill: |
| 1822 | 6411 AddSkillByEvent(&Player::skillEarth, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6412 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6413 case VAR_SpiritSkill: |
| 1822 | 6414 AddSkillByEvent(&Player::skillSpirit, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6415 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6416 case VAR_MindSkill: |
| 1822 | 6417 AddSkillByEvent(&Player::skillMind, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6418 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6419 case VAR_BodySkill: |
| 1822 | 6420 AddSkillByEvent(&Player::skillBody, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6421 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6422 case VAR_LightSkill: |
| 1822 | 6423 AddSkillByEvent(&Player::skillLight, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6424 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6425 case VAR_DarkSkill: |
| 1822 | 6426 AddSkillByEvent(&Player::skillDark, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6427 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6428 case VAR_IdentifyItemSkill: |
| 1822 | 6429 AddSkillByEvent(&Player::skillItemId, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6430 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6431 case VAR_MerchantSkill: |
| 1822 | 6432 AddSkillByEvent(&Player::skillMerchant, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6433 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6434 case VAR_RepairSkill: |
| 1822 | 6435 AddSkillByEvent(&Player::skillRepair, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6436 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6437 case VAR_BodybuildingSkill: |
| 1822 | 6438 AddSkillByEvent(&Player::skillBodybuilding, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6439 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6440 case VAR_MeditationSkill: |
| 1822 | 6441 AddSkillByEvent(&Player::skillMeditation, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6442 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6443 case VAR_PerceptionSkill: |
| 1822 | 6444 AddSkillByEvent(&Player::skillPerception, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6445 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6446 case VAR_DiplomacySkill: |
| 1822 | 6447 AddSkillByEvent(&Player::skillDiplomacy, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6448 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6449 case VAR_ThieverySkill: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6450 Error ("Thieving unsupported"); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6451 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6452 case VAR_DisarmTrapSkill: |
| 1822 | 6453 AddSkillByEvent(&Player::skillDisarmTrap, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6454 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6455 case VAR_DodgeSkill: |
| 1822 | 6456 AddSkillByEvent(&Player::skillDodge, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6457 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6458 case VAR_UnarmedSkill: |
| 1822 | 6459 AddSkillByEvent(&Player::skillUnarmed, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6460 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6461 case VAR_IdentifyMonsterSkill: |
| 1822 | 6462 AddSkillByEvent(&Player::skillMonsterId, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6463 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6464 case VAR_ArmsmasterSkill: |
| 1822 | 6465 AddSkillByEvent(&Player::skillArmsmaster, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6466 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6467 case VAR_StealingSkill: |
| 1822 | 6468 AddSkillByEvent(&Player::skillStealing, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6469 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6470 case VAR_AlchemySkill: |
| 1822 | 6471 AddSkillByEvent(&Player::skillAlchemy, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6472 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6473 case VAR_LearningSkill: |
| 1822 | 6474 AddSkillByEvent(&Player::skillLearning, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6475 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6476 default: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6477 return; |
| 0 | 6478 } |
| 6479 } | |
| 6480 | |
| 1791 | 6481 //----- (new function) -------------------------------------------------------- |
| 1822 | 6482 void Player::PlayAwardSound_Anim97() |
| 6483 { | |
| 6484 int playerIndex = GetPlayerIndex(); | |
| 6485 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, playerIndex); | |
| 6486 PlayAwardSound(); | |
| 1791 | 6487 } |
| 6488 | |
| 6489 //----- (new function) -------------------------------------------------------- | |
| 1822 | 6490 void Player::PlayAwardSound_Anim97_Face( PlayerSpeech speech ) |
| 1791 | 6491 { |
| 6492 this->PlaySound(speech, 0); | |
| 1822 | 6493 PlayAwardSound_Anim97(); |
| 1791 | 6494 } |
| 6495 | |
| 6496 //----- (new function) -------------------------------------------------------- | |
| 1822 | 6497 void Player::AddSkillByEvent( unsigned __int16 Player::* skillToSet, unsigned __int16 addSkillValue ) |
| 1791 | 6498 { |
| 6499 if ( addSkillValue > 63 ) | |
| 6500 { | |
| 6501 this->*skillToSet = (unsigned __int8)addSkillValue | this->*skillToSet & 63; | |
| 6502 } | |
| 6503 else | |
| 6504 { | |
| 6505 this->*skillToSet = min(this->*skillToSet + addSkillValue, 60) | this->*skillToSet & 0xC0; | |
| 6506 } | |
| 1822 | 6507 PlayAwardSound_Anim97(); |
| 1791 | 6508 return; |
| 6509 } | |
| 0 | 6510 |
| 6511 //----- (0044B9C4) -------------------------------------------------------- | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6512 void Player::SubtractVariable( enum VariableType VarNum, signed int pValue ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6513 { |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6514 DDM_DLV_Header *locationHeader; // eax@90 |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6515 int randGold; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6516 int randFood; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6517 int npcIndex; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6518 |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6519 if ( VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_99 ) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6520 { |
| 1822 | 6521 if ( VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_74 ) |
| 6522 { | |
| 6523 stru_5E4C90_MapPersistVars.field_0[VarNum - VAR_MapPersistentVariable_0] -= pValue; | |
| 6524 } | |
| 6525 if ( (signed int)VarNum >= VAR_MapPersistentVariable_75 && VarNum <= VAR_MapPersistentVariable_99 ) | |
| 6526 { | |
| 6527 stru_5E4C90_MapPersistVars._decor_events[VarNum - VAR_MapPersistentVariable_75] -= pValue; | |
| 6528 } | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6529 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6530 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6531 |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6532 switch (VarNum) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6533 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6534 case VAR_CurrentHP: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6535 ReceiveDamage((signed int)pValue, DMGT_PHISYCAL); |
| 1822 | 6536 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6537 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6538 case VAR_CurrentSP: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6539 this->sMana = max(this->sMana - pValue, 0); |
| 1822 | 6540 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6541 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6542 case VAR_ACModifier: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6543 this->sACModifier -= (unsigned __int8)pValue; |
| 1822 | 6544 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6545 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6546 case VAR_BaseLevel: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6547 this->uLevel -= (unsigned __int8)pValue; |
| 1822 | 6548 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6549 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6550 case VAR_LevelModifier: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6551 this->sLevelModifier -= (unsigned __int8)pValue; |
| 1822 | 6552 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6553 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6554 case VAR_Age: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6555 this->sAgeModifier -= (signed __int16)pValue; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6556 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6557 case VAR_Award: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6558 _449B7E_toggle_bit(this->_achieved_awards_bits, (signed __int16)pValue, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6559 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6560 case VAR_Experience: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6561 this->uExperience -= pValue; |
| 1822 | 6562 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6563 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6564 case VAR_QBits_QuestsDone: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6565 _449B7E_toggle_bit(pParty->_quest_bits, (__int16)pValue, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6566 this->PlaySound(SPEECH_96, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6567 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6568 case VAR_PlayerItemInHands: |
| 2025 | 6569 for ( uint i = 0; i < 16; ++i ) |
| 6570 { | |
| 6571 int id_ = this->pEquipment.pIndices[i]; | |
| 6572 if ( id_ > 0 ) | |
| 6573 { | |
| 6574 if ( this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID == pValue ) | |
| 6575 { | |
| 6576 this->pEquipment.pIndices[i] = 0; | |
| 6577 } | |
| 6578 } | |
| 6579 } | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6580 for (int i = 0; i < 126; i++) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6581 { |
| 2025 | 6582 int id_ = this->pInventoryMatrix[i]; |
| 6583 if ( id_ > 0 ) | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6584 { |
| 2025 | 6585 if ( this->pInventoryItemList[id_ - 1].uItemID == pValue ) |
| 6586 { | |
| 6587 RemoveItemAtInventoryIndex(i); | |
| 6588 return; | |
| 6589 } | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6590 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6591 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6592 if ( pParty->pPickedItem.uItemID == pValue ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6593 { |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6594 pMouse->RemoveHoldingItem(); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6595 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6596 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6597 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6598 case VAR_FixedGold: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6599 if ( (unsigned int)pValue > pParty->uNumGold ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6600 { |
|
1825
23deb6b09c8c
cancelEventProcessing to dword_5B65C4_cancelEventProcessing
Grumpy7
parents:
1822
diff
changeset
|
6601 dword_5B65C4_cancelEventProcessing = 1; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6602 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6603 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6604 Party::TakeGold((unsigned int)pValue); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6605 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6606 case VAR_RandomGold: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6607 randGold = rand() % (signed int)pValue + 1; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6608 if ( (unsigned int)randGold > pParty->uNumGold ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6609 randGold = pParty->uNumGold; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6610 Party::TakeGold(randGold); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6611 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[503], randGold); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6612 ShowStatusBarString(pTmpBuf.data(), 2); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6613 GameUI_DrawFoodAndGold(); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6614 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6615 case VAR_FixedFood: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6616 Party::TakeFood((unsigned int)pValue); |
| 1822 | 6617 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6618 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6619 case VAR_RandomFood: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6620 randFood = rand() % (signed int)pValue + 1; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6621 if ( (unsigned int)randFood > pParty->uNumFoodRations ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6622 randFood = pParty->uNumFoodRations; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6623 Party::TakeFood(randFood); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6624 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[504], randFood); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6625 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6626 GameUI_DrawFoodAndGold(); |
| 1822 | 6627 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6628 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6629 case VAR_MightBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6630 case VAR_ActualMight: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6631 this->uMightBonus -= (unsigned __int16)pValue; |
| 1822 | 6632 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6633 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6634 case VAR_IntellectBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6635 case VAR_ActualIntellect: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6636 this->uIntelligenceBonus -= (unsigned __int16)pValue; |
| 1822 | 6637 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6638 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6639 case VAR_PersonalityBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6640 case VAR_ActualPersonality: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6641 this->uWillpowerBonus -= (unsigned __int16)pValue; |
| 1822 | 6642 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6643 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6644 case VAR_EnduranceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6645 case VAR_ActualEndurance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6646 this->uEnduranceBonus -= (unsigned __int16)pValue; |
| 1822 | 6647 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6648 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6649 case VAR_SpeedBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6650 case VAR_ActualSpeed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6651 this->uSpeedBonus -= (unsigned __int16)pValue; |
| 1822 | 6652 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6653 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6654 case VAR_AccuracyBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6655 case VAR_ActualAccuracy: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6656 this->uAccuracyBonus -= (unsigned __int16)pValue; |
| 1822 | 6657 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6658 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6659 case VAR_LuckBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6660 case VAR_ActualLuck: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6661 this->uLuckBonus -= (unsigned __int16)pValue; |
| 1822 | 6662 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6663 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6664 case VAR_BaseMight: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6665 this->uMight -= (unsigned __int16)pValue; |
| 1822 | 6666 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6667 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6668 case VAR_BaseIntellect: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6669 this->uIntelligence -= (unsigned __int16)pValue; |
| 1822 | 6670 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6671 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6672 case VAR_BasePersonality: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6673 this->uWillpower -= (unsigned __int16)pValue; |
| 1822 | 6674 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6675 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6676 case VAR_BaseEndurance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6677 this->uEndurance -= (unsigned __int16)pValue; |
| 1822 | 6678 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6679 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6680 case VAR_BaseSpeed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6681 this->uSpeed -= (unsigned __int16)pValue; |
| 1822 | 6682 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6683 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6684 case VAR_BaseAccuracy: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6685 this->uAccuracy -= (unsigned __int16)pValue; |
| 1822 | 6686 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6687 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6688 case VAR_BaseLuck: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6689 this->uLuck -= (unsigned __int16)pValue; |
| 1822 | 6690 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6691 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6692 case VAR_FireResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6693 this->sResFireBase -= (signed __int16)pValue; |
| 1822 | 6694 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6695 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6696 case VAR_AirResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6697 this->sResAirBase -= (signed __int16)pValue; |
| 1822 | 6698 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6699 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6700 case VAR_WaterResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6701 this->sResWaterBase -= (signed __int16)pValue; |
| 1822 | 6702 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6703 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6704 case VAR_EarthResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6705 this->sResEarthBase -= (signed __int16)pValue; |
| 1822 | 6706 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6707 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6708 case VAR_SpiritResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6709 this->sResSpiritBase -= (signed __int16)pValue; |
| 1822 | 6710 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6711 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6712 case VAR_MindResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6713 this->sResMindBase -= (signed __int16)pValue; |
| 1822 | 6714 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6715 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6716 case VAR_BodyResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6717 this->sResBodyBase -= (signed __int16)pValue; |
| 1822 | 6718 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6719 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6720 case VAR_LightResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6721 this->sResLightBase -= (signed __int16)pValue; |
| 1822 | 6722 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6723 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6724 case VAR_DarkResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6725 this->sResDarkBase -= (signed __int16)pValue; |
| 1822 | 6726 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6727 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6728 case VAR_MagicResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6729 this->sResMagicBase -= (signed __int16)pValue; |
| 1822 | 6730 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6731 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6732 case VAR_FireResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6733 this->sResFireBonus -= (signed __int16)pValue; |
| 1822 | 6734 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6735 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6736 case VAR_AirResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6737 this->sResAirBonus -= (signed __int16)pValue; |
| 1822 | 6738 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6739 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6740 case VAR_WaterResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6741 this->sResWaterBonus -= (signed __int16)pValue; |
| 1822 | 6742 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6743 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6744 case VAR_EarthResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6745 this->sResEarthBonus -= (signed __int16)pValue; |
| 1822 | 6746 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6747 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6748 case VAR_SpiritResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6749 this->sResSpiritBonus -= (signed __int16)pValue; |
| 1822 | 6750 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6751 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6752 case VAR_MindResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6753 this->sResMindBonus -= (signed __int16)pValue; |
| 1822 | 6754 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6755 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6756 case VAR_BodyResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6757 this->sResBodyBonus -= (signed __int16)pValue; |
| 1822 | 6758 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6759 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6760 case VAR_LightResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6761 this->sResLightBonus -= (signed __int16)pValue; |
| 1822 | 6762 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6763 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6764 case VAR_DarkResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6765 this->sResDarkBonus -= (signed __int16)pValue; |
| 1822 | 6766 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6767 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6768 case VAR_MagicResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6769 this->sResMagicBonus -= (signed __int16)pValue; |
| 1822 | 6770 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6771 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6772 case VAR_StaffSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6773 this->skillStaff -= (unsigned __int8)pValue; |
| 1822 | 6774 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6775 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6776 case VAR_SwordSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6777 this->skillSword -= (unsigned __int8)pValue; |
| 1822 | 6778 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6779 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6780 case VAR_DaggerSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6781 this->skillDagger -= (unsigned __int8)pValue; |
| 1822 | 6782 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6783 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6784 case VAR_AxeSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6785 this->skillAxe -= (unsigned __int8)pValue; |
| 1822 | 6786 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6787 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6788 case VAR_SpearSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6789 this->skillSpear -= (unsigned __int8)pValue; |
| 1822 | 6790 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6791 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6792 case VAR_BowSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6793 this->skillBow -= (unsigned __int8)pValue; |
| 1822 | 6794 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6795 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6796 case VAR_MaceSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6797 this->skillMace -= (unsigned __int8)pValue; |
| 1822 | 6798 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6799 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6800 case VAR_BlasterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6801 this->skillBlaster -= (unsigned __int8)pValue; |
| 1822 | 6802 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6803 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6804 case VAR_ShieldSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6805 this->skillShield -= (unsigned __int8)pValue; |
| 1822 | 6806 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6807 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6808 case VAR_LeatherSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6809 this->skillLearning -= (unsigned __int8)pValue; |
| 1822 | 6810 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6811 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6812 case VAR_SkillChain: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6813 this->skillChain -= (unsigned __int8)pValue; |
| 1822 | 6814 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6815 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6816 case VAR_PlateSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6817 this->skillPlate -= (unsigned __int8)pValue; |
| 1822 | 6818 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6819 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6820 case VAR_FireSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6821 this->skillFire -= (unsigned __int8)pValue; |
| 1822 | 6822 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6823 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6824 case VAR_AirSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6825 this->skillAir -= (unsigned __int8)pValue; |
| 1822 | 6826 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6827 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6828 case VAR_WaterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6829 this->skillWater -= (unsigned __int8)pValue; |
| 1822 | 6830 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6831 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6832 case VAR_EarthSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6833 this->skillEarth -= (unsigned __int8)pValue; |
| 1822 | 6834 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6835 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6836 case VAR_SpiritSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6837 this->skillSpirit -= (unsigned __int8)pValue; |
| 1822 | 6838 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6839 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6840 case VAR_MindSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6841 this->skillMind -= (unsigned __int8)pValue; |
| 1822 | 6842 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6843 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6844 case VAR_BodySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6845 this->skillBody -= (unsigned __int8)pValue; |
| 1822 | 6846 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6847 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6848 case VAR_LightSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6849 this->skillLight -= (unsigned __int8)pValue; |
| 1822 | 6850 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6851 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6852 case VAR_DarkSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6853 this->skillDark -= (unsigned __int8)pValue; |
| 1822 | 6854 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6855 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6856 case VAR_IdentifyItemSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6857 this->skillItemId -= (unsigned __int8)pValue; |
| 1822 | 6858 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6859 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6860 case VAR_MerchantSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6861 this->skillMerchant -= (unsigned __int8)pValue; |
| 1822 | 6862 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6863 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6864 case VAR_RepairSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6865 this->skillRepair -= (unsigned __int8)pValue; |
| 1822 | 6866 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6867 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6868 case VAR_BodybuildingSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6869 this->skillBodybuilding -= (unsigned __int8)pValue; |
| 1822 | 6870 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6871 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6872 case VAR_MeditationSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6873 this->skillMeditation -= (unsigned __int8)pValue; |
| 1822 | 6874 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6875 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6876 case VAR_PerceptionSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6877 this->skillPerception -= (unsigned __int8)pValue; |
| 1822 | 6878 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6879 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6880 case VAR_DiplomacySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6881 this->skillDiplomacy -= (unsigned __int8)pValue; |
| 1822 | 6882 PlayAwardSound_Anim98(); |
| 6883 return; | |
| 6884 case VAR_ThieverySkill: | |
| 6885 Error ("Thieving unsupported"); | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6886 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6887 case VAR_DisarmTrapSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6888 this->skillDisarmTrap -= (unsigned __int8)pValue; |
| 1822 | 6889 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6890 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6891 case VAR_DodgeSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6892 this->skillDodge -= (unsigned __int8)pValue; |
| 1822 | 6893 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6894 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6895 case VAR_UnarmedSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6896 this->skillUnarmed -= (unsigned __int8)pValue; |
| 1822 | 6897 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6898 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6899 case VAR_IdentifyMonsterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6900 this->skillMonsterId -= (unsigned __int8)pValue; |
| 1822 | 6901 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6902 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6903 case VAR_ArmsmasterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6904 this->skillArmsmaster -= (unsigned __int8)pValue; |
| 1822 | 6905 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6906 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6907 case VAR_StealingSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6908 this->skillStealing -= (unsigned __int8)pValue; |
| 1822 | 6909 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6910 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6911 case VAR_AlchemySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6912 this->skillAlchemy -= (unsigned __int8)pValue; |
| 1822 | 6913 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6914 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6915 case VAR_LearningSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6916 this->skillLearning -= (unsigned __int8)pValue; |
| 1822 | 6917 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6918 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6919 case VAR_Cursed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6920 this->pConditions[Condition_Cursed] = 0; |
| 1822 | 6921 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6922 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6923 case VAR_Weak: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6924 this->pConditions[Condition_Weak] = 0; |
| 1822 | 6925 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6926 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6927 case VAR_Asleep: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6928 this->pConditions[Condition_Sleep] = 0; |
| 1822 | 6929 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6930 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6931 case VAR_Afraid: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6932 this->pConditions[Condition_Fear] = 0; |
| 1822 | 6933 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6934 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6935 case VAR_Drunk: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6936 this->pConditions[Condition_Drunk] = 0; |
| 1822 | 6937 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6938 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6939 case VAR_Insane: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6940 this->pConditions[Condition_Insane] = 0; |
| 1822 | 6941 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6942 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6943 case VAR_PoisonedGreen: |
| 2187 | 6944 this->pConditions[Condition_Poison_Weak] = 0; |
| 1822 | 6945 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6946 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6947 case VAR_DiseasedGreen: |
| 2187 | 6948 this->pConditions[Condition_Disease_Weak] = 0; |
| 1822 | 6949 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6950 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6951 case VAR_PoisonedYellow: |
| 2187 | 6952 this->pConditions[Condition_Poison_Medium] = 0; |
| 1822 | 6953 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6954 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6955 case VAR_DiseasedYellow: |
| 2187 | 6956 this->pConditions[Condition_Disease_Medium] = 0; |
| 1822 | 6957 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6958 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6959 case VAR_PoisonedRed: |
| 2187 | 6960 this->pConditions[Condition_Poison_Severe] = 0; |
| 1822 | 6961 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6962 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6963 case VAR_DiseasedRed: |
| 2187 | 6964 this->pConditions[Condition_Disease_Severe] = 0; |
| 1822 | 6965 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6966 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6967 case VAR_Paralyzed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6968 this->pConditions[Condition_Paralyzed] = 0; |
| 1822 | 6969 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6970 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6971 case VAR_Unconsious: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6972 this->pConditions[Condition_Unconcious] = 0; |
| 1822 | 6973 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6974 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6975 case VAR_Dead: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6976 this->pConditions[Condition_Dead] = 0; |
| 1822 | 6977 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6978 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6979 case VAR_Stoned: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6980 this->pConditions[Condition_Pertified] = 0; |
| 1822 | 6981 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6982 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6983 case VAR_Eradicated: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6984 this->pConditions[Condition_Eradicated] = 0; |
| 1822 | 6985 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6986 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6987 case VAR_AutoNotes: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6988 _449B7E_toggle_bit(pParty->_autonote_bits, pValue - 1, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6989 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6990 case VAR_NPCs2: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6991 npcIndex = 0; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6992 GetNewNPCData(sDialogue_SpeakingActorNPC_ID, &npcIndex); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6993 if ( npcIndex == pValue ) |
| 0 | 6994 { |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6995 npcIdToDismissAfterDialogue = pValue; |
| 0 | 6996 } |
| 6997 else | |
| 6998 { | |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6999 npcIdToDismissAfterDialogue = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7000 pParty->hirelingScrollPosition = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7001 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7002 pParty->CountHirelings(); |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7003 viewparams->bRedrawGameUI = true; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7004 } |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7005 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7006 case VAR_HiredNPCHasSpeciality: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7007 for (unsigned int i = 0; i < pNPCStats->uNumNewNPCs; i++) |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7008 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7009 if (pNPCStats->pNewNPCData[i].uProfession == pValue) |
| 0 | 7010 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7011 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
| 0 | 7012 } |
| 7013 } | |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7014 if ( pParty->pHirelings[0].uProfession == pValue ) |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
7015 memset(&pParty->pHirelings[0], 0, sizeof(NPCData)); |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7016 if ( pParty->pHirelings[1].uProfession == pValue ) |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7017 memset(&pParty->pHirelings[1], 0, sizeof(NPCData)); |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7018 pParty->hirelingScrollPosition = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7019 pParty->CountHirelings(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7020 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7021 case VAR_NumSkillPoints: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7022 if ((unsigned int)pValue <= this->uSkillPoints) |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7023 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7024 this->uSkillPoints -= pValue; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7025 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7026 else |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7027 { |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7028 this->uSkillPoints = 0; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7029 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7030 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7031 case VAR_ReputationInCurrentLocation: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7032 locationHeader = &pOutdoor->ddm; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7033 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7034 locationHeader = &pIndoor->dlv; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7035 locationHeader->uReputation -= pValue; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7036 if (locationHeader->uReputation < -10000) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7037 locationHeader->uReputation = -10000; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7038 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7039 case VAR_GoldInBank: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7040 if ( (unsigned int)pValue <= pParty->uNumGoldInBank ) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7041 { |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7042 pParty->uNumGoldInBank -= (unsigned int)pValue; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7043 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7044 else |
| 0 | 7045 { |
|
1825
23deb6b09c8c
cancelEventProcessing to dword_5B65C4_cancelEventProcessing
Grumpy7
parents:
1822
diff
changeset
|
7046 dword_5B65C4_cancelEventProcessing = 1; |
| 605 | 7047 } |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7048 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7049 case VAR_NumDeaths: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7050 pParty->uNumDeaths -= (unsigned int)pValue; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7051 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7052 case VAR_NumBounties: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7053 pParty->uNumBountiesCollected -= (unsigned int)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7054 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7055 case VAR_PrisonTerms: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7056 pParty->uNumPrisonTerms -= (int)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7057 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7058 case VAR_ArenaWinsPage: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7059 pParty->uNumArenaPageWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7060 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7061 case VAR_ArenaWinsSquire: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7062 pParty->uNumArenaSquireWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7063 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7064 case VAR_ArenaWinsKnight: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7065 pParty->uNumArenaKnightWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7066 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7067 case VAR_ArenaWinsLord: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7068 pParty->uNumArenaLordWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7069 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7070 } |
| 0 | 7071 } |
| 7072 // 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
|
7073 // 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
|
7074 |
| 1818 | 7075 //----- (new function) -------------------------------------------------------- |
| 1822 | 7076 void Player::PlayAwardSound_Anim98() |
| 7077 { | |
| 7078 int playerIndex = GetPlayerIndex(); | |
| 7079 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, playerIndex); | |
| 7080 PlayAwardSound(); | |
| 1818 | 7081 } |
| 7082 | |
| 7083 //----- (new function) -------------------------------------------------------- | |
| 1822 | 7084 void Player::PlayAwardSound_Anim98_Face( PlayerSpeech speech ) |
| 1818 | 7085 { |
| 7086 this->PlaySound(speech, 0); | |
| 1822 | 7087 PlayAwardSound_Anim98(); |
| 1818 | 7088 } |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7089 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7090 //----- (00467E7F) -------------------------------------------------------- |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7091 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
|
7092 { |
| 1822 | 7093 int itemAnchor; // ebx@1 |
| 7094 int itemInvLocation; // edx@1 | |
| 7095 int freeSlot; // eax@3 | |
| 1619 | 7096 ItemGen tempPickedItem; // [sp+Ch] [bp-30h]@1 |
| 7097 | |
| 7098 tempPickedItem.Reset(); | |
| 1822 | 7099 itemAnchor = pEquipTypeToBodyAnchor[uEquipType]; |
| 2156 | 7100 itemInvLocation = pPlayers[uActiveCharacter]->pEquipment.pIndices[itemAnchor]; |
| 7101 if ( itemInvLocation )//ïåðåîäåòüñÿ â äðóãóþ âåùü | |
| 1619 | 7102 { |
| 7103 memcpy(&tempPickedItem, &pParty->pPickedItem, sizeof(tempPickedItem)); | |
| 2156 | 7104 pPlayers[uActiveCharacter]->pInventoryItemList[itemInvLocation - 1].uBodyAnchor = 0; |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7105 pParty->pPickedItem.Reset(); |
| 2156 | 7106 pParty->SetHoldingItem(&pPlayers[uActiveCharacter]->pInventoryItemList[itemInvLocation - 1]); |
| 1822 | 7107 tempPickedItem.uBodyAnchor = itemAnchor + 1; |
| 2156 | 7108 memcpy(&pPlayers[uActiveCharacter]->pInventoryItemList[itemInvLocation - 1], &tempPickedItem, sizeof(ItemGen)); |
| 7109 pPlayers[uActiveCharacter]->pEquipment.pIndices[itemAnchor] = itemInvLocation; | |
| 7110 } | |
| 7111 else//îäåòü âåùü | |
| 7112 { | |
| 7113 freeSlot = pPlayers[uActiveCharacter]->FindFreeInventoryListSlot(); | |
| 1822 | 7114 if (freeSlot >= 0) |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7115 { |
| 1822 | 7116 pParty->pPickedItem.uBodyAnchor = itemAnchor + 1; |
| 2156 | 7117 memcpy(&pPlayers[uActiveCharacter]->pInventoryItemList[freeSlot], &pParty->pPickedItem, sizeof(ItemGen)); |
| 7118 pPlayers[uActiveCharacter]->pEquipment.pIndices[itemAnchor] = freeSlot + 1; | |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7119 pMouse->RemoveHoldingItem(); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7120 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7121 } |
| 1295 | 7122 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7123 |
| 1295 | 7124 //----- (0049387A) -------------------------------------------------------- |
| 1459 | 7125 int CycleCharacter(bool backwards) |
| 1295 | 7126 { |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7127 const int PARTYSIZE = 4; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7128 int valToAdd = backwards ? (PARTYSIZE - 2) : 0; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7129 int mult = backwards ? -1 : 1; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7130 |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7131 for (int i = 0; i < (PARTYSIZE - 1); i++) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7132 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7133 int currCharId = ((uActiveCharacter + mult * i + valToAdd) % PARTYSIZE) + 1; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7134 if ( pPlayers[currCharId]->uTimeToRecovery == 0 ) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7135 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7136 return currCharId; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7137 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7138 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7139 return uActiveCharacter; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7140 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7141 |
| 1297 | 7142 //----- (0043EE77) -------------------------------------------------------- |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7143 bool Player::HasUnderwaterSuitEquipped() //the original function took the player number as a parameter. if it was 0, the whole party was checked. calls with the parameter 0 have been changed to calls to this for every player |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7144 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7145 if (GetArmorItem() == nullptr || GetArmorItem()->uItemID != 604) |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7146 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7147 return false; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7148 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7149 return true; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7150 } |
| 1432 | 7151 |
| 1297 | 7152 //----- (0043EE15) -------------------------------------------------------- |
| 1822 | 7153 bool Player::HasItem( unsigned int uItemID, bool checkHeldItem ) |
| 7154 { | |
| 7155 if ( !checkHeldItem || pParty->pPickedItem.uItemID != uItemID ) | |
| 1297 | 7156 { |
| 7157 for ( uint i = 0; i < 126; ++i ) | |
| 7158 { | |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7159 if ( this->pInventoryMatrix[i] > 0 ) |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7160 { |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7161 if ( (unsigned int)this->pInventoryItemList[this->pInventoryMatrix[i] - 1].uItemID == uItemID ) |
| 1297 | 7162 return true; |
| 7163 } | |
| 7164 } | |
| 7165 for ( uint i = 0; i < 16; ++i ) | |
| 7166 { | |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7167 if ( this->pEquipment.pIndices[i] ) |
| 1297 | 7168 { |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7169 if ( (unsigned int)this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID == uItemID ) |
| 1297 | 7170 return true; |
| 7171 } | |
| 7172 } | |
| 1822 | 7173 return false; |
| 7174 } | |
| 7175 else | |
| 7176 { | |
| 7177 return true; | |
| 7178 } | |
| 1297 | 7179 } |
| 7180 //----- (0043EDB9) -------------------------------------------------------- | |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7181 bool ShouldLoadTexturesForRaceAndGender(unsigned int _this) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7182 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7183 CHARACTER_RACE race; // edi@2 |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7184 PLAYER_SEX sex; // eax@2 |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7185 |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7186 for (int i = 1; i <= 4; i++) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7187 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7188 race = pPlayers[i]->GetRace(); |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7189 sex = pPlayers[i]->GetSexByVoice(); |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7190 switch(_this) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7191 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7192 case 0: |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7193 if (( race == CHARACTER_RACE_HUMAN || race == CHARACTER_RACE_ELF || race == CHARACTER_RACE_GOBLIN ) && sex == SEX_MALE ) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7194 return true; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7195 break; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7196 case 1: |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7197 if (( race == CHARACTER_RACE_HUMAN || race == CHARACTER_RACE_ELF || race == CHARACTER_RACE_GOBLIN ) && sex == SEX_FEMALE ) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7198 return true; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7199 break; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7200 case 2: |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7201 if ( race == CHARACTER_RACE_DWARF && sex == SEX_MALE ) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7202 return true; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7203 break; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7204 case 3: |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7205 if ( race == CHARACTER_RACE_DWARF && sex == SEX_FEMALE ) |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7206 return true; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7207 break; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7208 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7209 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7210 return false; |
| 1297 | 7211 } |
| 7212 //----- (0043ED6F) -------------------------------------------------------- | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7213 bool IsDwarfPresentInParty(bool a1) |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7214 { |
| 1297 | 7215 for (uint i = 0; i < 4; ++i) |
| 7216 { | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7217 CHARACTER_RACE race = pParty->pPlayers[i].GetRace(); |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7218 |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7219 if (race == CHARACTER_RACE_DWARF && a1) |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7220 return true; |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7221 else if (race != CHARACTER_RACE_DWARF && !a1) |
| 1297 | 7222 return true; |
| 7223 } | |
| 7224 return false; | |
| 7225 } | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7226 |
| 1297 | 7227 //----- (00439FCB) -------------------------------------------------------- |
| 2006 | 7228 void __fastcall DamagePlayerFromMonster(unsigned int uObjID, int dmgSource, Vec3_int_ *pPos, signed int a4) |
| 1681 | 7229 { |
| 1649 | 7230 Player *playerPtr; // ebx@3 |
| 7231 Actor *actorPtr; // esi@3 | |
| 1681 | 7232 int spellId; // eax@38 |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7233 signed int recvdMagicDmg; // eax@139 |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7234 int v72[4]; // [sp+30h] [bp-24h]@164 |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7235 int healthBeforeRecvdDamage; // [sp+48h] [bp-Ch]@3 |
| 1297 | 7236 unsigned int uActorID; // [sp+4Ch] [bp-8h]@1 |
| 1681 | 7237 |
| 7238 uActorID = PID_ID(uObjID); | |
| 7239 if ( PID_TYPE(uObjID) != 2) | |
| 1297 | 7240 { |
| 1649 | 7241 playerPtr = &pParty->pPlayers[a4]; |
| 1681 | 7242 actorPtr = &pActors[uActorID]; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7243 healthBeforeRecvdDamage = playerPtr->sHealth; |
| 1681 | 7244 if ( PID_TYPE(uObjID) != 3 || !stru_50C198.ActorHitOrMiss(actorPtr, playerPtr) ) |
| 1297 | 7245 return; |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7246 ItemGen* equippedArmor = playerPtr->GetArmorItem(); |
| 1681 | 7247 SoundID soundToPlay; |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7248 if ( !equippedArmor |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7249 || equippedArmor->IsBroken() |
| 1649 | 7250 || |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7251 (equippedArmor->GetPlayerSkillType() != PLAYER_SKILL_CHAIN |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7252 && equippedArmor->GetPlayerSkillType() != PLAYER_SKILL_PLATE |
| 1649 | 7253 ) |
| 7254 ) | |
| 1297 | 7255 { |
| 1681 | 7256 int randVal = rand() % 4; |
| 7257 switch (randVal) | |
| 1297 | 7258 { |
| 1681 | 7259 case 0 : soundToPlay = (SoundID)108; break; |
| 7260 case 1 : soundToPlay = (SoundID)109; break; | |
| 7261 case 2 : soundToPlay = (SoundID)110; break; | |
| 7262 case 3 : soundToPlay = (SoundID)44; break; | |
| 1783 | 7263 default: Error("Unexpected sound value"); |
| 1297 | 7264 } |
| 7265 } | |
| 7266 else | |
| 7267 { | |
| 1681 | 7268 int randVal = rand() % 4; |
| 7269 switch (randVal) | |
| 1297 | 7270 { |
| 1681 | 7271 case 0 : soundToPlay = (SoundID)105; break; |
| 7272 case 1 : soundToPlay = (SoundID)106; break; | |
| 7273 case 2 : soundToPlay = (SoundID)107; break; | |
| 7274 case 3 : soundToPlay = (SoundID)45; break; | |
| 1783 | 7275 default: Error("Unexpected sound value"); |
| 1297 | 7276 } |
| 1648 | 7277 } |
| 1681 | 7278 pAudioPlayer->PlaySound(soundToPlay, PID(OBJECT_Player,a4 + 80), 0, -1, 0, 0, 0, 0); |
| 1876 | 7279 int dmgToReceive = actorPtr->_43B3E0_CalcDamage(dmgSource); |
| 1949 | 7280 if ( actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime > 0 ) |
| 1649 | 7281 { |
| 1949 | 7282 __int16 spellPower = actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uPower; |
| 1681 | 7283 if ( spellPower ) |
| 7284 dmgToReceive /= (signed int)spellPower; | |
| 7285 } | |
| 1682 | 7286 int damageType; |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7287 switch (dmgSource) |
| 1648 | 7288 { |
| 1682 | 7289 case 0: damageType = actorPtr->pMonsterInfo.uAttack1Type; |
| 1648 | 7290 break; |
| 1682 | 7291 case 1: damageType = actorPtr->pMonsterInfo.uAttack2Type; |
| 1648 | 7292 break; |
| 1681 | 7293 case 2: spellId = actorPtr->pMonsterInfo.uSpell1ID; |
| 1682 | 7294 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); |
| 1648 | 7295 break; |
| 1681 | 7296 case 3: spellId = actorPtr->pMonsterInfo.uSpell2ID; |
| 1682 | 7297 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); |
| 1648 | 7298 break; |
| 1682 | 7299 case 4: damageType = actorPtr->pMonsterInfo.field_3C_some_special_attack; |
| 1648 | 7300 break; |
| 7301 default: | |
| 1682 | 7302 case 5: damageType = 4; //yes, the original just assigned the value 4 |
| 1648 | 7303 break; |
| 7304 } | |
| 2061 | 7305 if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) ) |
| 1297 | 7306 { |
| 1682 | 7307 dmgToReceive = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); |
| 1822 | 7308 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) |
| 1297 | 7309 { |
| 1681 | 7310 int actorState = actorPtr->uAIState; |
| 7311 if ( actorState != Dying && actorState != Dead) | |
| 1297 | 7312 { |
| 1682 | 7313 int reflectedDamage = stru_50C198.CalcMagicalDamageToActor(actorPtr, damageType, dmgToReceive); |
| 1681 | 7314 actorPtr->sCurrentHP -= reflectedDamage; |
| 7315 if ( reflectedDamage >= 0 ) | |
| 1297 | 7316 { |
| 1649 | 7317 if ( actorPtr->sCurrentHP >= 1 ) |
| 1297 | 7318 { |
| 1682 | 7319 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); //todo extract this branch to a function once Actor::functions are changed to nonstatic actor functions |
| 1648 | 7320 Actor::AggroSurroundingPeasants(uActorID, 1); |
| 7321 } | |
| 7322 else | |
| 7323 { | |
| 2154 | 7324 if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS) |
| 1297 | 7325 { |
| 1681 | 7326 int splatRadius = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; |
| 7327 pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)splatRadius, 0, 0); | |
| 1297 | 7328 } |
| 1648 | 7329 Actor::Die(uActorID); |
| 7330 Actor::ApplyFineForKillingPeasant(uActorID); | |
| 7331 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 1649 | 7332 if ( actorPtr->pMonsterInfo.uExp ) |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
7333 pParty->GivePartyExp(pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].uExp); |
| 1681 | 7334 int speechToPlay = SPEECH_51; |
| 1648 | 7335 if ( rand() % 100 < 20 ) |
| 1681 | 7336 speechToPlay = actorPtr->pMonsterInfo.uHP >= 100 ? 2 : 1; |
| 7337 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0); | |
| 1297 | 7338 } |
| 7339 } | |
| 7340 } | |
| 7341 } | |
| 2061 | 7342 if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) |
|
1693
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
7343 && actorPtr->pMonsterInfo.uSpecialAttackType |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
7344 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel ) |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
7345 { |
|
1694
5ead2688a227
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect second attempt
Grumpy7
parents:
1693
diff
changeset
|
7346 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7347 } |
| 1297 | 7348 } |
| 7349 if ( !pParty->bTurnBasedModeOn ) | |
| 7350 { | |
| 1681 | 7351 int actEndurance = playerPtr->GetActualEndurance(); |
| 7352 int recoveryTime = (int)((20 - playerPtr->GetParameterBonus(actEndurance)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333); | |
| 7353 playerPtr->SetRecoveryTime(recoveryTime); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7354 } |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7355 int yellThreshold = playerPtr->GetMaxHealth() / 4; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7356 if ( yellThreshold < playerPtr->sHealth && yellThreshold >= healthBeforeRecvdDamage && playerPtr->sHealth > 0 ) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7357 { |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7358 playerPtr->PlaySound(SPEECH_48, 0); |
| 1297 | 7359 } |
| 7360 viewparams->bRedrawGameUI = 1; | |
| 7361 return; | |
| 7362 } | |
| 1648 | 7363 else |
| 7364 { | |
| 1681 | 7365 SpriteObject* v37 = &pSpriteObjects[uActorID]; |
| 7366 int uActorType = PID_TYPE(v37->spell_caster_pid); | |
| 7367 int uActorID = PID_ID(v37->spell_caster_pid); | |
| 7368 if ( uActorType == 2 ) | |
| 7369 { | |
| 7370 Player *playerPtr; // eax@81 | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7371 if ( a4 != -1 ) |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7372 { |
| 1681 | 7373 playerPtr = &pParty->pPlayers[a4]; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7374 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7375 else |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7376 { |
| 1822 | 7377 int activePlayerCounter = 0; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7378 for (int i = 1; i <= 4; i++) |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7379 { |
| 1822 | 7380 if (pPlayers[i]->CanAct()) |
| 7381 { | |
| 7382 v72[activePlayerCounter] = i; | |
| 7383 activePlayerCounter++; | |
| 7384 } | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7385 } |
| 1822 | 7386 if ( activePlayerCounter ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7387 { |
| 2006 | 7388 playerPtr = &pParty->pPlayers[v72[rand() % activePlayerCounter] - 1];//&stru_AA1058[3].pSounds[6972 * *(&v72 + rand() % v74) + 40552]; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7389 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7390 } |
| 1681 | 7391 int v68; |
| 7392 int v69; | |
| 7393 if ( uActorType != OBJECT_Player || v37->spell_id != SPELL_BOW_ARROW) | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7394 { |
| 1681 | 7395 int playerMaxHp = playerPtr->GetMaxHealth(); |
| 7396 v68 = _43AFE3_calc_spell_damage(v37->spell_id, v37->spell_level, v37->spell_skill, playerMaxHp); | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7397 v69 = LOBYTE(pSpellStats->pInfos[v37->spell_id].uSchool); |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7398 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7399 else |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7400 { |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7401 v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7402 v69 = 0; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7403 } |
| 1681 | 7404 playerPtr->ReceiveDamage(v68, (DAMAGE_TYPE)v69); |
| 2182 | 7405 if ( uActorType == OBJECT_Player && !_A750D8_player_speech_timer ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7406 { |
| 2182 | 7407 _A750D8_player_speech_timer = 256i64; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7408 PlayerSpeechID = SPEECH_44; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7409 uSpeakingCharacter = uActorID + 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7410 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7411 return; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7412 } |
| 1681 | 7413 else if ( uActorType == 3 ) |
| 7414 { | |
| 7415 Actor *actorPtr = &pActors[uActorID]; | |
| 1648 | 7416 if ( a4 == -1 ) |
| 1911 | 7417 a4 = stru_50C198.which_player_to_attack(actorPtr); |
| 1681 | 7418 Player *playerPtr = &pParty->pPlayers[a4]; |
| 1876 | 7419 int dmgToReceive = actorPtr->_43B3E0_CalcDamage(dmgSource); |
| 1681 | 7420 unsigned __int16 spriteType = v37->uType; |
| 1648 | 7421 if ( v37->uType == 545 ) |
| 1297 | 7422 { |
| 1681 | 7423 __int16 skillLevel = playerPtr->GetActualSkillLevel(PLAYER_SKILL_UNARMED); |
| 7424 if ( SkillToMastery(skillLevel) >= 4 && rand() % 100 < (skillLevel & 0x3F) ) | |
| 1648 | 7425 { |
| 1681 | 7426 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], playerPtr->pName); |
| 1648 | 7427 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1681 | 7428 playerPtr->PlaySound(SPEECH_6, 0); |
| 1648 | 7429 return; |
| 7430 } | |
| 1297 | 7431 } |
| 1681 | 7432 else if ( spriteType == 555 |
| 7433 || spriteType == 510 | |
| 7434 || spriteType == 500 | |
| 7435 || spriteType == 515 | |
| 7436 || spriteType == 505 | |
| 7437 || spriteType == 530 | |
| 7438 || spriteType == 525 | |
| 7439 || spriteType == 520 | |
| 7440 || spriteType == 535 | |
| 7441 || spriteType == 540 ) | |
| 1297 | 7442 { |
| 1681 | 7443 if ( !stru_50C198.ActorHitOrMiss(actorPtr, playerPtr) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7444 return; |
| 1822 | 7445 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_SHIELD].uExpireTime > 0 ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7446 dmgToReceive >>= 1; |
| 1681 | 7447 if ( playerPtr->HasEnchantedItemEquipped(36) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7448 dmgToReceive >>= 1; |
| 1681 | 7449 if ( playerPtr->HasEnchantedItemEquipped(69) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7450 dmgToReceive >>= 1; |
| 1681 | 7451 if ( playerPtr->HasItemEquipped(EQUIP_ARMOUR) |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7452 && playerPtr->GetArmorItem()->uItemID == ITEM_ARTIFACT_GOVERNORS_ARMOR ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7453 dmgToReceive >>= 1; |
| 1989 | 7454 if ( playerPtr->HasItemEquipped(EQUIP_TWO_HANDED)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7455 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7456 ItemGen* mainHandItem = playerPtr->GetMainHandItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7457 if ( mainHandItem->uItemID == ITEM_RELIC_KELEBRIM || mainHandItem->uItemID == ITEM_ARTIFACT_ELFBANE || (mainHandItem->GetItemEquipType() == EQUIP_SHIELD && SkillToMastery(playerPtr->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7458 dmgToReceive >>= 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7459 } |
| 1989 | 7460 if ( playerPtr->HasItemEquipped(EQUIP_SINGLE_HANDED)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7461 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7462 ItemGen* offHandItem = playerPtr->GetOffHandItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7463 if ( offHandItem->uItemID == ITEM_RELIC_KELEBRIM || offHandItem->uItemID == ITEM_ARTIFACT_ELFBANE || (offHandItem->GetItemEquipType() == EQUIP_SHIELD && SkillToMastery(playerPtr->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7464 dmgToReceive >>= 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7465 } |
| 1648 | 7466 } |
| 1949 | 7467 if ( actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime > 0 ) |
| 1648 | 7468 { |
| 1949 | 7469 int spellPower = actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uPower; |
| 1681 | 7470 if ( spellPower ) |
| 7471 dmgToReceive /= (signed int)spellPower; | |
| 1648 | 7472 } |
| 1681 | 7473 int damageType; |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7474 switch(dmgSource) |
| 1648 | 7475 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7476 case 0: |
| 1681 | 7477 damageType = actorPtr->pMonsterInfo.uAttack1Type; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7478 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7479 case 1: |
| 1681 | 7480 damageType = actorPtr->pMonsterInfo.uAttack2Type; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7481 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7482 case 2: |
| 1681 | 7483 spellId = actorPtr->pMonsterInfo.uSpell1ID; |
| 7484 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7485 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7486 case 3: |
| 1681 | 7487 spellId = actorPtr->pMonsterInfo.uSpell2ID; |
| 7488 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7489 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7490 case 4: |
| 1681 | 7491 damageType = actorPtr->pMonsterInfo.field_3C_some_special_attack; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7492 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7493 case 5: |
| 1681 | 7494 damageType = 4; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7495 break; |
| 1648 | 7496 } |
| 2061 | 7497 if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) ) |
| 1648 | 7498 { |
| 1681 | 7499 int reflectedDmg = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); |
| 1822 | 7500 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) |
| 1297 | 7501 { |
| 1681 | 7502 unsigned __int16 actorState = actorPtr->uAIState; |
| 7503 if ( actorState != Dying && actorState != Dead) | |
| 1297 | 7504 { |
| 1681 | 7505 recvdMagicDmg = stru_50C198.CalcMagicalDamageToActor(actorPtr, damageType, reflectedDmg); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7506 actorPtr->sCurrentHP -= recvdMagicDmg; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7507 if ( recvdMagicDmg >= 0 ) |
| 1297 | 7508 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7509 if ( actorPtr->sCurrentHP >= 1 ) |
| 1297 | 7510 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7511 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7512 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7513 } |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7514 else |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7515 { |
| 2154 | 7516 if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) |
| 1297 | 7517 { |
| 1681 | 7518 int splatRadius = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; |
| 7519 pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)splatRadius, 0, 0); | |
| 1297 | 7520 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7521 Actor::Die(uActorID); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7522 Actor::ApplyFineForKillingPeasant(uActorID); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7523 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7524 if ( actorPtr->pMonsterInfo.uExp ) |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
7525 pParty->GivePartyExp(pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].uExp); |
| 1681 | 7526 int speechToPlay = SPEECH_51; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7527 if ( rand() % 100 < 20 ) |
| 1681 | 7528 speechToPlay = actorPtr->pMonsterInfo.uHP >= 100 ? 2 : 1; |
| 7529 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0); | |
| 1297 | 7530 } |
| 7531 } | |
| 7532 } | |
| 7533 } | |
| 7534 } | |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7535 if ( !dmgSource |
| 2061 | 7536 && !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) |
|
1693
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
7537 && actorPtr->pMonsterInfo.uSpecialAttackType |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
7538 && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel ) |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
7539 { |
|
1694
5ead2688a227
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect second attempt
Grumpy7
parents:
1693
diff
changeset
|
7540 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7541 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7542 if ( !pParty->bTurnBasedModeOn ) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7543 { |
| 1681 | 7544 int actEnd = playerPtr->GetActualEndurance(); |
| 7545 int recTime = (int)((20 - playerPtr->GetParameterBonus(actEnd)) | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7546 * flt_6BE3A4_debug_recmod1 |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7547 * 2.133333333333333); |
| 1681 | 7548 playerPtr->SetRecoveryTime(recTime); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7549 } |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7550 return; |
| 1648 | 7551 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7552 else |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7553 { |
| 1648 | 7554 return; |
| 7555 } | |
| 1297 | 7556 } |
| 7557 } | |
| 7558 //----- (00421EA6) -------------------------------------------------------- | |
| 1683 | 7559 void Player::OnInventoryLeftClick() |
| 7560 { | |
| 1822 | 7561 signed int inventoryXCoord; // ecx@2 |
| 7562 int inventoryYCoord; // eax@2 | |
| 1682 | 7563 int invMatrixIndex; // eax@2 |
| 1822 | 7564 unsigned int enchantedItemPos; // eax@7 |
| 1682 | 7565 unsigned int pickedItemId; // esi@12 |
| 7566 unsigned int invItemIndex; // eax@12 | |
| 1822 | 7567 unsigned int itemPos; // eax@18 |
| 1682 | 7568 ItemGen tmpItem; // [sp+Ch] [bp-3Ch]@1 |
| 1297 | 7569 unsigned int pY; // [sp+3Ch] [bp-Ch]@2 |
| 7570 unsigned int pX; // [sp+40h] [bp-8h]@2 | |
| 2156 | 7571 CastSpellInfo *pSpellInfo; |
| 1297 | 7572 |
| 7573 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103 ) | |
| 7574 { | |
| 7575 pMouse->GetClickPos(&pX, &pY); | |
| 1822 | 7576 inventoryYCoord = (pY - 17) / 32; |
| 7577 inventoryXCoord = (pX - 14) / 32; | |
| 7578 invMatrixIndex = inventoryXCoord + (INVETORYSLOTSWIDTH * inventoryYCoord); | |
| 7579 if ( inventoryYCoord >= 0 && inventoryYCoord < INVETORYSLOTSHEIGHT && inventoryXCoord >= 0 && inventoryXCoord < INVETORYSLOTSWIDTH) | |
| 1682 | 7580 { |
| 1822 | 7581 if ( _50C9A0_IsEnchantingInProgress ) |
| 1297 | 7582 { |
| 1822 | 7583 enchantedItemPos = this->GetItemIDAtInventoryIndex(&invMatrixIndex); |
| 7584 if ( enchantedItemPos ) | |
| 1297 | 7585 { |
| 2156 | 7586 /* *((char *)pGUIWindow_Settings->ptr_1C + 8) &= 0x7Fu; |
| 1822 | 7587 *((short *)pGUIWindow_Settings->ptr_1C + 2) = uActiveCharacter - 1; |
| 7588 *((int *)pGUIWindow_Settings->ptr_1C + 3) = enchantedItemPos - 1; | |
| 2156 | 7589 *((short *)pGUIWindow_Settings->ptr_1C + 3) = invMatrixIndex;*/ |
| 7590 pSpellInfo = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C; | |
| 7591 pSpellInfo->uFlags &= 0x7F; | |
| 7592 pSpellInfo->uPlayerID_2 = uActiveCharacter - 1; | |
| 7593 pSpellInfo->spell_target_pid = enchantedItemPos - 1; | |
| 7594 pSpellInfo->field_6 = invMatrixIndex; | |
| 1822 | 7595 ptr_50C9A4_ItemToEnchant = &this->pInventoryItemList[enchantedItemPos-1]; |
| 7596 _50C9A0_IsEnchantingInProgress = 0; | |
| 7597 if ( pMessageQueue_50CBD0->uNumMessages ) | |
| 7598 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; | |
| 7599 pMouse->SetCursorBitmap("MICON1"); | |
| 7600 _50C9D0_AfterEnchClickEventId = 113; | |
| 7601 _50C9D4_AfterEnchClickEventSecondParam = 0; | |
| 7602 _50C9D8_AfterEnchClickEventTimeout = 256; | |
| 7603 } | |
| 7604 return; | |
| 7605 } | |
| 7606 if ( ptr_50C9A4_ItemToEnchant ) | |
| 7607 return; | |
| 7608 pickedItemId = pParty->pPickedItem.uItemID; | |
| 7609 invItemIndex = this->GetItemIDAtInventoryIndex(&invMatrixIndex); | |
| 7610 if (!pickedItemId) | |
| 7611 { | |
| 7612 if ( !invItemIndex ) | |
| 7613 return; | |
| 7614 else | |
| 7615 { | |
| 7616 memcpy(&pParty->pPickedItem, &this->pInventoryItemList[invItemIndex-1], sizeof(pParty->pPickedItem)); | |
| 7617 this->RemoveItemAtInventoryIndex(invMatrixIndex); | |
| 7618 pickedItemId = pParty->pPickedItem.uItemID; | |
| 7619 pMouse->SetCursorBitmap(pItemsTable->pItems[pickedItemId].pIconName); | |
| 1297 | 7620 return; |
| 7621 } | |
| 1822 | 7622 } |
| 7623 else | |
| 7624 { | |
| 7625 if ( invItemIndex ) | |
| 1297 | 7626 { |
| 1822 | 7627 ItemGen* invItemPtr = &this->pInventoryItemList[invItemIndex-1]; |
| 7628 memcpy(&tmpItem, invItemPtr, sizeof(tmpItem)); | |
| 7629 this->RemoveItemAtInventoryIndex(invMatrixIndex); | |
| 7630 int emptyIndex = this->AddItem2(invMatrixIndex, &pParty->pPickedItem); | |
| 7631 if ( !emptyIndex ) | |
| 1682 | 7632 { |
| 1822 | 7633 emptyIndex = this->AddItem2(-1, &pParty->pPickedItem); |
| 7634 if ( !emptyIndex ) | |
| 7635 { | |
| 7636 this->PutItemArInventoryIndex(tmpItem.uItemID, invItemIndex - 1, invMatrixIndex); | |
| 7637 memcpy(invItemPtr, &tmpItem, sizeof(ItemGen)); | |
| 7638 return; | |
| 7639 } | |
| 1682 | 7640 } |
| 1822 | 7641 memcpy(&pParty->pPickedItem, &tmpItem, sizeof(ItemGen)); |
| 7642 pMouse->SetCursorBitmap(pParty->pPickedItem.GetIconName()); | |
| 7643 return; | |
| 1297 | 7644 } |
| 1682 | 7645 else |
| 1297 | 7646 { |
| 1822 | 7647 itemPos = this->AddItem(invMatrixIndex, pickedItemId); |
| 7648 if ( itemPos ) | |
| 1297 | 7649 { |
| 1822 | 7650 memcpy(&this->pInventoryItemList[itemPos-1], &pParty->pPickedItem, sizeof(ItemGen)); |
| 7651 pMouse->RemoveHoldingItem(); | |
| 1682 | 7652 return; |
| 7653 } | |
| 1822 | 7654 itemPos = this->AddItem(-1, pickedItemId); |
| 7655 if ( itemPos ) | |
| 1682 | 7656 { |
| 1822 | 7657 memcpy(&this->pInventoryItemList[itemPos-1], &pParty->pPickedItem, sizeof(ItemGen)); |
| 7658 pMouse->RemoveHoldingItem(); | |
| 7659 return; | |
| 1297 | 7660 } |
| 7661 } | |
| 7662 } | |
| 7663 } | |
| 7664 } | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7665 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7666 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7667 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7668 bool Player::IsWeak() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7669 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7670 return pConditions[Condition_Weak] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7671 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7672 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7673 bool Player::IsDead() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7674 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7675 return pConditions[Condition_Dead] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7676 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7677 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7678 bool Player::IsEradicated() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7679 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7680 return pConditions[Condition_Eradicated] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7681 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7682 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7683 bool Player::IsZombie() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7684 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7685 return pConditions[Condition_Zombie] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7686 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7687 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7688 bool Player::IsCursed() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7689 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7690 return pConditions[Condition_Cursed] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7691 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7692 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7693 bool Player::IsPertified() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7694 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7695 return pConditions[Condition_Pertified] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7696 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7697 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7698 bool Player::IsUnconcious() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7699 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7700 return pConditions[Condition_Unconcious] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7701 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7702 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7703 bool Player::IsAsleep() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7704 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7705 return pConditions[Condition_Sleep] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7706 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7707 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7708 bool Player::IsParalyzed() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7709 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7710 return pConditions[Condition_Paralyzed] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7711 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7712 |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7713 bool Player::IsDrunk() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7714 { |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7715 return pConditions[Condition_Drunk] != 0; |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7716 } |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7717 |
| 2185 | 7718 void Player::SetCursed( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7719 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7720 pConditions[Condition_Cursed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7721 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7722 |
| 2185 | 7723 void Player::SetWeak( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7724 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7725 pConditions[Condition_Weak] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7726 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7727 |
| 2185 | 7728 void Player::SetAsleep( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7729 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7730 pConditions[Condition_Sleep] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7731 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7732 |
| 2185 | 7733 void Player::SetAfraid( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7734 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7735 pConditions[Condition_Fear] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7736 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7737 |
| 2185 | 7738 void Player::SetDrunk( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7739 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7740 pConditions[Condition_Drunk] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7741 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7742 |
| 2185 | 7743 void Player::SetInsane( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7744 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7745 pConditions[Condition_Insane] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7746 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7747 |
| 2187 | 7748 void Player::SetPoisonWeak( unsigned long long state ) |
| 7749 { | |
| 7750 pConditions[Condition_Poison_Weak] = state; | |
| 7751 } | |
| 7752 | |
| 7753 void Player::SetDiseaseWeak( unsigned long long state ) | |
| 7754 { | |
| 7755 pConditions[Condition_Disease_Weak] = state; | |
| 7756 } | |
| 7757 | |
| 7758 void Player::SetPoisonMedium( unsigned long long state ) | |
| 7759 { | |
| 7760 pConditions[Condition_Poison_Medium] = state; | |
| 7761 } | |
| 7762 | |
| 7763 void Player::SetDiseaseMedium( unsigned long long state ) | |
| 7764 { | |
| 7765 pConditions[Condition_Disease_Medium] = state; | |
| 7766 } | |
| 7767 | |
| 7768 void Player::SetPoisonSevere( unsigned long long state ) | |
| 7769 { | |
| 7770 pConditions[Condition_Poison_Severe] = state; | |
| 7771 } | |
| 7772 | |
| 7773 void Player::SetDiseaseSevere( unsigned long long state ) | |
| 7774 { | |
| 7775 pConditions[Condition_Disease_Severe] = state; | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7776 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7777 |
| 2185 | 7778 void Player::SetParalyzed( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7779 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7780 pConditions[Condition_Paralyzed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7781 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7782 |
| 2185 | 7783 void Player::SetUnconcious( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7784 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7785 pConditions[Condition_Unconcious] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7786 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7787 |
| 2185 | 7788 void Player::SetDead( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7789 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7790 pConditions[Condition_Dead] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7791 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7792 |
| 2185 | 7793 void Player::SetPertified( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7794 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7795 pConditions[Condition_Pertified] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7796 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7797 |
| 2185 | 7798 void Player::SetEradicated( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7799 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7800 pConditions[Condition_Eradicated] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7801 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7802 |
| 2185 | 7803 void Player::SetZombie( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7804 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7805 pConditions[Condition_Zombie] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7806 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7807 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7808 void Player::SetCondWeakWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7809 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7810 SetCondition(Condition_Weak, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7811 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7812 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7813 void Player::SetCondInsaneWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7814 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7815 SetCondition(Condition_Insane, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7816 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7817 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7818 void Player::SetCondDeadWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7819 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7820 SetCondition(Condition_Dead, blockable); |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7821 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7822 |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7823 void Player::SetCondUnconsciousWithBlockCheck( int blockable ) |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7824 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7825 SetCondition(Condition_Dead, blockable); |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
7826 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7827 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7828 ItemGen* Player::GetOffHandItem() |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7829 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7830 return GetItem(&PlayerEquipment::uShield); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7831 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7832 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7833 ItemGen* Player::GetMainHandItem() |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7834 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7835 return GetItem(&PlayerEquipment::uMainHand); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7836 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7837 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7838 ItemGen* Player::GetBowItem() |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7839 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7840 return GetItem(&PlayerEquipment::uBow); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7841 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7842 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7843 ItemGen* Player::GetArmorItem() |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7844 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7845 return GetItem(&PlayerEquipment::uArmor); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7846 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7847 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7848 ItemGen* Player::GetHelmItem() |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7849 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7850 return GetItem(&PlayerEquipment::uHelm); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7851 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7852 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7853 ItemGen* Player::GetBeltItem() |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7854 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7855 return GetItem(&PlayerEquipment::uBelt); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7856 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7857 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7858 ItemGen* Player::GetCloakItem() |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7859 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7860 return GetItem(&PlayerEquipment::uCloak); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7861 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7862 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7863 ItemGen* Player::GetGloveItem() |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7864 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7865 return GetItem(&PlayerEquipment::uGlove); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7866 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7867 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7868 ItemGen* Player::GetBootItem() |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7869 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7870 return GetItem(&PlayerEquipment::uBoot); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7871 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7872 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7873 ItemGen* Player::GetAmuletItem() |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7874 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7875 return GetItem(&PlayerEquipment::uAmulet); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7876 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7877 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7878 ItemGen* Player::GetNthRingItem(int ringNum) |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7879 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7880 return GetNthEquippedIndexItem(ringNum + 10); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7881 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7882 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7883 ItemGen* Player::GetNthEquippedIndexItem(int index) |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7884 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7885 if (this->pEquipment.pIndices[index] == 0) |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7886 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7887 return nullptr; |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7888 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7889 return &this->pInventoryItemList[this->pEquipment.pIndices[index] - 1]; |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7890 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7891 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7892 ItemGen* Player::GetItem(unsigned int PlayerEquipment::* itemPos) |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7893 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7894 if (this->pEquipment.*itemPos == 0) |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7895 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7896 return nullptr; |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7897 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7898 return &this->pInventoryItemList[this->pEquipment.*itemPos - 1]; |
| 1822 | 7899 } |
| 7900 | |
| 7901 int Player::GetPlayerIndex() | |
| 7902 { | |
| 7903 int uPlayerIdx = 0; | |
| 7904 if ( this == pPlayers[1] ) | |
| 7905 uPlayerIdx = 0; | |
| 7906 else if( this == pPlayers[2] ) | |
| 7907 uPlayerIdx = 1; | |
| 7908 else if ( this == pPlayers[3] ) | |
| 7909 uPlayerIdx = 2; | |
| 7910 else if ( this == pPlayers[4] ) | |
| 7911 uPlayerIdx = 3; | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
7912 else |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
7913 Error("Unexpected player pointer"); |
| 1826 | 7914 return uPlayerIdx; |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7915 } |