Mercurial > mm7
annotate Player.cpp @ 2157:c6d8253d4cbc
Слияние
| author | Ritor1 |
|---|---|
| date | Fri, 10 Jan 2014 17:42:57 +0600 |
| parents | eaaaa50d34e9 9bd7522cdbbb |
| children | 10f03a70ab6d |
| 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; |
| 1014 | 685 case Condition_Poison1: |
| 686 case Condition_Poison2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
687 case Condition_Poison3: PlaySound(SPEECH_27, 0); break; |
| 1014 | 688 case Condition_Disease1: |
| 689 case Condition_Disease2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
690 case Condition_Disease3: PlaySound(SPEECH_28, 0);break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
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 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
744 pConditions[uConditionIdx] = 1; |
|
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 )) |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
757 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
758 pPlayers[remainig_player]->PlaySound(SPEECH_107, 0); |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
759 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
760 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
|
761 } |
| 0 | 762 |
| 763 //----- (00492528) -------------------------------------------------------- | |
| 764 bool Player::CanFitItem(unsigned int uSlot, unsigned int uItemID) | |
| 765 { | |
| 1363 | 766 Texture *texture; // esi@1 |
| 767 unsigned int slotWidth; // ebx@1 | |
| 768 unsigned int slotHeight; // [sp+1Ch] [bp+Ch]@1 | |
| 769 | |
| 770 texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); | |
| 771 slotWidth = GetSizeInInventorySlots(texture->uTextureWidth); | |
| 772 slotHeight = GetSizeInInventorySlots(texture->uTextureHeight); | |
| 0 | 773 if ( !areWeLoadingTexture ) |
| 774 { | |
| 1363 | 775 texture->Release(); |
| 1006 | 776 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 777 } |
| 1555 | 778 Assert(slotHeight > 0 && slotWidth > 0, "Items should have nonzero dimensions"); |
| 1363 | 779 if ( (slotWidth + uSlot % INVETORYSLOTSWIDTH) <= INVETORYSLOTSWIDTH && (slotHeight + uSlot / INVETORYSLOTSWIDTH) <= INVETORYSLOTSHEIGHT ) |
| 780 { | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
781 for (unsigned int x = 0; x < slotWidth; x++) |
| 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 for (unsigned int y = 0; y < slotHeight; y++) |
| 1363 | 784 { |
|
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
|
785 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
|
786 { |
|
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
|
787 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
|
788 } |
| 1363 | 789 } |
| 790 } | |
| 791 return true; | |
| 792 } | |
| 793 return false; | |
| 0 | 794 } |
| 795 // 506128: using guessed type int areWeLoadingTexture; | |
| 796 | |
| 797 //----- (004925E6) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
798 int Player::FindFreeInventoryListSlot() |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
799 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
800 for (int i = 0; i < 126; i++ ) |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
801 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
802 if (pInventoryItemList[i].uItemID == 0) |
|
1365
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 return i; |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
805 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
806 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
807 return -1; |
| 0 | 808 } |
| 809 | |
| 810 //----- (00492600) -------------------------------------------------------- | |
| 811 int Player::CreateItemInInventory(unsigned int uSlot, unsigned int uItemID) | |
| 812 { | |
| 813 int result; // eax@8 | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
814 signed int freeSlot; // [sp+8h] [bp-4h]@4 |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
815 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
816 freeSlot = FindFreeInventoryListSlot(); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
817 if ( freeSlot == -1 ) |
| 0 | 818 { |
| 819 if ( uActiveCharacter ) | |
| 201 | 820 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NoRoom, 0); |
|
1366
8f339c3bbdaf
Player::CreateItemInInventory small bugfix from previous change
Grumpy7
parents:
1365
diff
changeset
|
821 return 0; |
| 0 | 822 } |
| 823 else | |
| 824 { | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
825 PutItemArInventoryIndex(uItemID, freeSlot, uSlot); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
826 result = freeSlot + 1; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
827 this->pInventoryItemList[freeSlot].uItemID = uItemID; |
| 0 | 828 } |
| 829 return result; | |
| 830 } | |
| 831 // 506128: using guessed type int areWeLoadingTexture; | |
| 832 | |
| 833 //----- (00492700) -------------------------------------------------------- | |
| 834 int Player::HasSkill(unsigned int uSkillType) | |
| 835 { | |
| 1374 | 836 if ( uSkillType >= 37 || this->pActiveSkills[uSkillType] ) |
| 837 { | |
| 838 return 1; | |
| 0 | 839 } |
| 840 else | |
| 841 { | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
842 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[67], this->pName); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
843 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1374 | 844 return 0; |
| 845 } | |
| 0 | 846 } |
| 847 | |
| 848 //----- (00492745) -------------------------------------------------------- | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
849 void Player::WearItem( unsigned int uItemID ) |
| 0 | 850 { |
| 1010 | 851 int item_body_anch; // edi@6 |
| 852 int item_indx; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
853 item_indx = FindFreeInventoryListSlot(); |
| 1010 | 854 |
| 855 if ( item_indx != -1 ) | |
| 856 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
857 pInventoryItemList[item_indx].uItemID = uItemID; |
| 1374 | 858 item_body_anch = pEquipTypeToBodyAnchor[pItemsTable->pItems[uItemID].uEquipType]; |
| 859 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
|
860 pInventoryItemList[item_indx].uBodyAnchor = item_body_anch + 1; |
| 0 | 861 } |
| 862 } | |
| 863 | |
| 864 //----- (004927A8) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
865 int Player::AddItem(int index, unsigned int uItemID) |
| 0 | 866 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
867 if ( index == -1 ) |
| 0 | 868 { |
| 1385 | 869 for (int xcoord = 0; xcoord < INVETORYSLOTSWIDTH; xcoord++) |
| 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 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) |
| 0 | 872 { |
|
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
|
873 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
|
874 { |
|
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
|
875 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
|
876 } |
| 0 | 877 } |
| 1385 | 878 } |
| 0 | 879 return 0; |
| 880 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
881 if ( !CanFitItem(index, uItemID) ) |
| 0 | 882 { |
| 1754 | 883 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0); |
| 0 | 884 return 0; |
| 885 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
886 return CreateItemInInventory(index, uItemID); |
| 0 | 887 } |
| 888 | |
| 889 //----- (00492826) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
890 int Player::AddItem2(int index, ItemGen *Src) |
| 0 | 891 { |
| 892 pItemsTable->SetSpecialBonus(Src); | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
893 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
894 if ( index == -1 ) |
| 0 | 895 { |
|
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
|
896 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
|
897 { |
|
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 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) //TODO: change pInventoryMatrix to 2 dimensional array. |
| 1385 | 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 if ( CanFitItem(ycoord * INVETORYSLOTSWIDTH + xcoord, Src->uItemID) ) |
| 0 | 901 { |
|
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
|
902 return CreateItemInInventory2(ycoord * INVETORYSLOTSWIDTH + xcoord, Src); |
| 0 | 903 } |
| 1385 | 904 } |
| 0 | 905 } |
| 906 return 0; | |
| 907 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
908 if ( !CanFitItem(index, Src->uItemID) ) |
| 0 | 909 return 0; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
910 return CreateItemInInventory2(index, Src); |
| 0 | 911 } |
| 912 | |
| 913 //----- (0049289C) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
914 int Player::CreateItemInInventory2( unsigned int index, ItemGen *Src ) |
| 0 | 915 { |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
916 signed int freeSlot; // ebx@1 |
| 0 | 917 int result; // eax@6 |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
918 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
919 freeSlot = FindFreeInventoryListSlot(); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
920 if ( freeSlot == -1 ) |
| 0 | 921 { |
| 922 result = 0; | |
| 923 } | |
| 924 else | |
| 925 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
926 PutItemArInventoryIndex(Src->uItemID, freeSlot, index); |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
927 memcpy(&pInventoryItemList[freeSlot], Src, sizeof(ItemGen)); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
928 result = freeSlot + 1; |
| 0 | 929 } |
| 930 return result; | |
| 931 } | |
| 932 // 506128: using guessed type int areWeLoadingTexture; | |
| 933 | |
| 934 //----- (0049298B) -------------------------------------------------------- | |
| 1385 | 935 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
|
936 { |
| 1014 | 937 Texture *item_texture; // esi@1 |
| 938 int *pInvPos; // esi@4 | |
| 939 unsigned int slot_width; // [sp+Ch] [bp-4h]@1 | |
| 940 unsigned int slot_height; // [sp+18h] [bp+8h]@1 | |
| 941 | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
942 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1014 | 943 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); |
| 944 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 945 if ( !areWeLoadingTexture ) |
| 946 { | |
| 1014 | 947 item_texture->Release(); |
| 1006 | 948 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 949 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
950 if ( slot_width > 0 ) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
951 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
952 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
953 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
954 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
955 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
|
956 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
957 } |
| 1014 | 958 } |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
959 pInventoryMatrix[index] = itemListPos + 1; |
| 0 | 960 } |
| 278 | 961 |
| 0 | 962 // 506128: using guessed type int areWeLoadingTexture; |
| 963 | |
| 964 //----- (00492A36) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
965 void Player::RemoveItemAtInventoryIndex( unsigned int index ) |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
966 { |
| 1014 | 967 ItemGen *item_in_slot; // ecx@1 |
| 968 Texture *item_texture; // esi@1 | |
| 969 unsigned int slot_height; // ebp@1 | |
| 970 int *pInvPos; // edx@4 | |
| 971 unsigned int slot_width; // [sp+14h] [bp+4h]@1 | |
| 972 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
973 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
|
974 item_texture = pIcons_LOD->LoadTexturePtr(item_in_slot->GetIconName(), TEXTURE_16BIT_PALETTE); |
| 1014 | 975 item_in_slot->Reset(); |
| 976 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); | |
| 977 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 978 if ( !areWeLoadingTexture ) |
| 979 { | |
| 1014 | 980 item_texture->Release(); |
| 1006 | 981 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 982 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
983 if ( slot_width > 0 ) |
| 1014 | 984 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
985 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
986 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
987 { |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
988 memset32(pInvPos, 0, slot_width); |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
989 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
990 } |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
991 } |
| 0 | 992 } |
| 993 // 506128: using guessed type int areWeLoadingTexture; | |
| 994 | |
| 995 //----- (00490EEE) -------------------------------------------------------- | |
| 1386 | 996 int Player::SelectPhrasesTransaction(ItemGen *pItem, int building_type, int BuildID_2Events, int ShopMenuType) //TODO: probably move this somewhere else, not really Player:: stuff |
| 997 { | |
| 998 unsigned int idemId; // edx@1 | |
| 999 signed int equipType; // esi@1 | |
| 1000 float multiplier; // ST04_4@26 | |
| 1001 int price; // edi@26 | |
| 1002 int merchantLevel; // [sp+10h] [bp-8h]@1 | |
| 1003 int itemValue; | |
| 1004 | |
| 1005 merchantLevel = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); | |
| 1006 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
|
1007 equipType = pItem->GetItemEquipType(); |
| 1386 | 1008 itemValue = pItem->GetValue(); |
| 1009 | |
| 1010 switch (building_type) | |
| 1011 { | |
| 1411 | 1012 case BuildingType_WeaponShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1013 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1014 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1015 if (equipType > EQUIP_BOW) |
| 1386 | 1016 return 4; |
| 1017 break; | |
| 1411 | 1018 case BuildingType_ArmorShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1019 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1020 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1021 if ( equipType < EQUIP_ARMOUR || equipType > EQUIP_BOOTS) |
| 1386 | 1022 return 4; |
| 1023 break; | |
| 1411 | 1024 case BuildingType_MagicShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1025 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1026 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1027 if ( pItemsTable->pItems[idemId].uSkillType != PLAYER_SKILL_MISC ) |
| 1386 | 1028 return 4; |
| 1029 break; | |
| 1411 | 1030 case BuildingType_AlchemistShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1031 if ((idemId >= ITEM_ARTIFACT_HERMES_SANDALS && idemId < ITEM_RECIPE_REJUVENATION) || idemId > ITEM_RECIPE_BODY_RESISTANCE) |
| 1386 | 1032 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1033 if ( !(equipType == EQUIP_REAGENT || equipType == EQUIP_POTION || equipType == EQUIP_MESSAGE_SCROLL)) |
| 1386 | 1034 return 4; |
| 1035 break; | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1036 default: |
| 1545 | 1037 Error("(%u)", building_type); |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1038 break; |
| 1386 | 1039 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1040 if (pItem->IsStolen()) |
| 1386 | 1041 return 6; |
| 1042 | |
| 1043 multiplier = p2DEvents[BuildID_2Events - 1].fPriceMultiplier; | |
| 1044 switch (ShopMenuType) | |
| 1045 { | |
| 1046 case 2: | |
| 1047 price = GetBuyingPrice(itemValue, multiplier); | |
| 1048 break; | |
| 1049 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
|
1050 if (pItem->IsBroken()) |
| 1386 | 1051 price = 1; |
| 917 | 1052 else |
| 1386 | 1053 price = this->GetPriceSell(itemValue, multiplier); |
| 1054 break; | |
| 1055 case 4: | |
| 1056 price = this->GetPriceIdentification(multiplier); | |
| 1057 break; | |
| 1058 case 5: | |
| 1059 price = this->GetPriceRepair(itemValue, multiplier); | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1060 break; |
|
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1061 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
|
1062 Error("(%u)", ShopMenuType); |
| 1386 | 1063 break; |
| 1064 } | |
| 1065 if ( merchantLevel ) | |
| 1066 { | |
| 1067 if (price == itemValue) | |
| 1068 { | |
| 1069 return 3; | |
| 1070 } | |
| 917 | 1071 else |
| 1386 | 1072 { |
| 1073 return 2; | |
| 1074 } | |
| 1075 } | |
| 0 | 1076 else |
| 1386 | 1077 { |
| 1078 return 1; | |
| 1079 } | |
| 0 | 1080 } |
| 1081 | |
| 1082 //----- (0049107D) -------------------------------------------------------- | |
| 1083 int Player::GetBodybuilding() | |
| 1084 { | |
| 1010 | 1085 int v1; // al@1 |
| 0 | 1086 |
| 1087 v1 = GetActualSkillLevel(PLAYER_SKILL_BODYBUILDING); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1088 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
|
1089 return multiplier * (v1 & 0x3F); |
| 0 | 1090 } |
| 1091 | |
| 1092 //----- (004910A8) -------------------------------------------------------- | |
| 607 | 1093 int Player::GetMeditation() |
| 0 | 1094 { |
| 1010 | 1095 int v1; // al@1 |
| 0 | 1096 |
| 1097 v1 = GetActualSkillLevel(PLAYER_SKILL_MEDITATION); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1098 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
|
1099 return multiplier * (v1 & 0x3F); |
| 0 | 1100 } |
| 1101 | |
| 1102 //----- (004910D3) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1103 bool Player::CanIdentify( ItemGen *pItem ) |
| 0 | 1104 { |
| 1105 unsigned __int16 v2; // ax@1 | |
| 1106 int v5; // edi@7 | |
| 652 | 1107 if (CheckHiredNPCSpeciality(Scholar)) |
| 1108 return true; | |
| 0 | 1109 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1110 v2 = GetActualSkillLevel(PLAYER_SKILL_ITEM_ID); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1111 if ( (signed int)SkillToMastery(v2) >= 4 ) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1112 return true; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1113 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1114 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
|
1115 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1116 return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St; |
| 0 | 1117 } |
| 1118 | |
| 1119 //----- (00491151) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1120 bool Player::CanRepair( ItemGen *pItem ) |
| 0 | 1121 { |
| 1122 unsigned __int16 v2; // ax@1 | |
| 1123 int v5; // edi@7 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1124 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1125 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
|
1126 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
|
1127 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
|
1128 CheckHiredNPCSpeciality(Alchemist) && equipType >= 9 ) |
| 652 | 1129 return true; |
| 1130 | |
| 1010 | 1131 v2 = GetActualSkillLevel(PLAYER_SKILL_REPAIR); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1132 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 0 | 1133 return true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1134 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1135 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
|
1136 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
|
1137 return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St; |
| 0 | 1138 } |
| 1139 | |
| 1140 //----- (004911F3) -------------------------------------------------------- | |
| 1141 int Player::GetMerchant() | |
| 1142 { | |
| 1143 unsigned __int16 v2; // ax@1 | |
| 1144 int v5; // edi@1 | |
| 1145 int v7; // eax@3 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1146 |
| 607 | 1147 v2 = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1148 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1149 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1150 |
|
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
|
1151 v7 = pParty->GetPartyReputation(); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1152 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1153 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1154 if (v5 == 0) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1155 { |
| 0 | 1156 return -v7; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1157 } |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1158 return v5 - v7 + 7; |
| 0 | 1159 } |
| 1160 | |
| 1161 //----- (0049125A) -------------------------------------------------------- | |
| 1162 int Player::GetPerception() | |
| 1163 { | |
| 1164 unsigned __int16 v2; // ax@1 | |
| 1165 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1166 |
| 1010 | 1167 v2 = GetActualSkillLevel(PLAYER_SKILL_PERCEPTION); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1168 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1169 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1170 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1171 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
|
1172 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1173 return v5; |
| 0 | 1174 } |
| 1175 | |
| 1176 //----- (004912B0) -------------------------------------------------------- | |
| 1177 int Player::GetDisarmTrap() | |
| 1178 { | |
| 1179 unsigned __int16 v2; // ax@1 | |
| 1180 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1181 |
| 1010 | 1182 v2 = GetActualSkillLevel(PLAYER_SKILL_TRAP_DISARM); |
| 0 | 1183 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 1184 return 10000; | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1185 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1186 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
|
1187 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
|
1188 multiplier++; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1189 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1190 return v5; |
| 0 | 1191 } |
| 1192 | |
| 1193 //----- (00491317) -------------------------------------------------------- | |
| 1194 char Player::GetLearningPercent() | |
| 1195 { | |
| 1196 int v2; // eax@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1197 |
| 1010 | 1198 v2 = GetActualSkillLevel(PLAYER_SKILL_LEARNING); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1199 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
|
1200 return multiplier * v2 + 9; |
| 0 | 1201 } |
| 1202 | |
| 1203 //----- (0048C6AF) -------------------------------------------------------- | |
| 1204 Player::Player() | |
| 1205 { | |
| 1206 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
|
1207 pInventoryMatrix.fill(0); |
| 0 | 1208 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
|
1209 pInventoryItemList[i].Reset(); |
| 0 | 1210 for (uint i = 0; i < 12; ++i) |
| 1211 pEquippedItems[i].Reset(); | |
| 1212 | |
| 1213 | |
| 1214 for (uint i = 0; i < 24; ++i) | |
| 1215 { | |
| 1216 pPlayerBuffs[i].uSkill = 0; | |
| 1217 pPlayerBuffs[i].uSkill = 0; | |
| 1218 pPlayerBuffs[i].uPower = 0; | |
| 1219 pPlayerBuffs[i].uExpireTime = 0; | |
| 1220 pPlayerBuffs[i].uCaster = 0; | |
| 1221 pPlayerBuffs[i].uFlags = 0; | |
| 1222 } | |
| 1223 | |
| 1224 pName[0] = 0; | |
| 1014 | 1225 uCurrentFace = 0; |
| 0 | 1226 uVoiceID = 0; |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
1227 pConditions.fill(0); |
| 0 | 1228 |
| 1229 field_BB = 0; | |
| 1230 | |
| 1231 uMight = uMightBonus = 0; | |
| 1232 uIntelligence = uIntelligenceBonus = 0; | |
| 1233 uWillpower = uWillpowerBonus = 0; | |
| 1234 uEndurance = uEnduranceBonus = 0; | |
| 1235 uSpeed = uSpeedBonus = 0; | |
| 1236 uAccuracy = uAccuracyBonus = 0; | |
| 1237 uLuck = uLuckBonus = 0; | |
| 1238 uLevel = sLevelModifier = 0; | |
| 1239 sAgeModifier = 0; | |
|
1388
60d4885eb107
sACModifier zeroed in player constructor so AC is not always 0(or -some value) ingame
Grumpy7
parents:
1387
diff
changeset
|
1240 sACModifier = 0; |
| 0 | 1241 |
| 1019 | 1242 // memset(field_1F5, 0, 30); |
| 1243 pure_luck_used=0; | |
| 1244 pure_speed_used=0; | |
| 1245 pure_intellect_used=0; | |
| 1246 pure_endurance_used=0; | |
| 1247 pure_willpower_used=0; | |
| 1248 pure_accuracy_used=0; | |
| 1249 pure_might_used=0; | |
| 0 | 1250 |
| 1251 sResFireBase = sResFireBonus = 0; | |
| 1252 sResAirBase = sResAirBonus = 0; | |
| 1253 sResWaterBase = sResWaterBonus = 0; | |
| 1254 sResEarthBase = sResEarthBonus = 0; | |
| 1255 sResMagicBase = sResMagicBonus = 0; | |
| 1256 sResSpiritBase = sResSpiritBonus = 0; | |
| 1257 sResMindBase = sResMindBonus = 0; | |
| 1258 sResBodyBase = sResBodyBonus = 0; | |
| 1259 sResLightBase = sResLightBonus = 0; | |
| 1260 sResDarkBase = sResDarkBonus = 0; | |
| 1261 | |
| 1262 uTimeToRecovery = 0; | |
| 1263 | |
| 1264 uSkillPoints = 0; | |
| 1265 | |
| 1266 sHealth = 0; | |
| 1267 uFullHealthBonus = 0; | |
| 1268 _health_related = 0; | |
| 1269 | |
| 1270 sMana = 0; | |
| 1271 uFullManaBonus = 0; | |
| 1272 _mana_related = 0; | |
| 1273 | |
| 1274 uQuickSpell = 0; | |
| 1826 | 1275 memset(pInstalledBeacons.data(), 0, 5 * sizeof(LloydBeacon)); |
| 0 | 1276 |
| 1277 _some_attack_bonus = 0; | |
| 1278 field_1A91 = 0; | |
| 1279 _melee_dmg_bonus = 0; | |
| 1280 field_1A93 = 0; | |
| 1281 _ranged_atk_bonus = 0; | |
| 1282 field_1A95 = 0; | |
| 1283 _ranged_dmg_bonus = 0; | |
| 1284 field_1A97 = 0; | |
| 1285 | |
| 130 | 1286 expression = CHARACTER_EXPRESSION_INVALID; |
| 0 | 1287 uExpressionTimePassed = 0; |
| 1288 uExpressionTimeLength = 0; | |
| 1289 | |
| 1290 uNumDivineInterventionCastsThisDay = 0; | |
| 1291 uNumArmageddonCasts = 0; | |
| 1292 uNumFireSpikeCasts = 0; | |
| 1293 | |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
1294 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
|
1295 memset(playerEventBits, 0, sizeof(playerEventBits)); |
| 0 | 1296 |
| 1297 field_E0 = 0; | |
| 1298 field_E4 = 0; | |
| 1299 field_E8 = 0; | |
| 1300 field_EC = 0; | |
| 1301 field_F0 = 0; | |
| 1302 field_F4 = 0; | |
| 1303 field_F8 = 0; | |
| 1304 field_FC = 0; | |
| 1305 field_100 = 0; | |
| 1306 field_104 = 0; | |
| 198 | 1307 |
|
554
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1308 _expression21_animtime = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1309 _expression21_frameset = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1310 |
| 198 | 1311 lastOpenedSpellbookPage = 0; |
| 0 | 1312 } |
| 1313 | |
| 1314 | |
| 1315 //----- (0048C855) -------------------------------------------------------- | |
| 1316 int Player::GetBaseStrength() | |
| 1317 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1318 return this->uMight + GetItemsBonus(CHARACTER_ATTRIBUTE_STRENGTH); |
| 0 | 1319 } |
| 1320 | |
| 1321 //----- (0048C86C) -------------------------------------------------------- | |
| 1322 int Player::GetBaseIntelligence() | |
| 1323 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1324 return this->uIntelligence + GetItemsBonus(CHARACTER_ATTRIBUTE_INTELLIGENCE); |
| 0 | 1325 } |
| 1326 | |
| 1327 //----- (0048C883) -------------------------------------------------------- | |
| 1328 int Player::GetBaseWillpower() | |
| 1329 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1330 return this->uWillpower + GetItemsBonus(CHARACTER_ATTRIBUTE_WILLPOWER); |
| 0 | 1331 } |
| 1332 | |
| 1333 //----- (0048C89A) -------------------------------------------------------- | |
| 1334 int Player::GetBaseEndurance() | |
| 1335 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1336 return this->uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE); |
| 0 | 1337 } |
| 1338 | |
| 1339 //----- (0048C8B1) -------------------------------------------------------- | |
| 1340 int Player::GetBaseAccuracy() | |
| 1341 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1342 return this->uAccuracy + GetItemsBonus(CHARACTER_ATTRIBUTE_ACCURACY); |
| 0 | 1343 } |
| 1344 | |
| 1345 //----- (0048C8C8) -------------------------------------------------------- | |
| 1346 int Player::GetBaseSpeed() | |
| 1347 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1348 return this->uSpeed + GetItemsBonus(CHARACTER_ATTRIBUTE_SPEED); |
| 0 | 1349 } |
| 1350 | |
| 1351 //----- (0048C8DF) -------------------------------------------------------- | |
| 1352 int Player::GetBaseLuck() | |
| 1353 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1354 return this->uLuck + GetItemsBonus(CHARACTER_ATTRIBUTE_LUCK); |
| 0 | 1355 } |
| 1356 | |
| 1357 //----- (0048C8F6) -------------------------------------------------------- | |
| 1358 int Player::GetBaseLevel() | |
| 1359 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1360 return this->uLevel + GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1361 } |
| 1362 | |
| 1363 //----- (0048C90D) -------------------------------------------------------- | |
| 1364 int Player::GetActualLevel() | |
| 1365 { | |
| 1366 return uLevel + sLevelModifier + | |
| 1367 GetMagicalBonus(CHARACTER_ATTRIBUTE_LEVEL) + | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1368 GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1369 } |
| 1370 | |
| 1371 //----- (0048C93C) -------------------------------------------------------- | |
| 1372 int Player::GetActualMight() | |
| 1373 { | |
|
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
|
1374 return GetActualAttribute(CHARACTER_ATTRIBUTE_STRENGTH, &Player::uMight, &Player::uMightBonus); |
| 0 | 1375 } |
| 1376 | |
| 1377 //----- (0048C9C2) -------------------------------------------------------- | |
| 1378 int Player::GetActualIntelligence() | |
| 1379 { | |
|
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
|
1380 return GetActualAttribute(CHARACTER_ATTRIBUTE_INTELLIGENCE, &Player::uIntelligence, &Player::uIntelligenceBonus); |
| 0 | 1381 } |
| 1382 | |
| 1383 //----- (0048CA3F) -------------------------------------------------------- | |
| 1384 int Player::GetActualWillpower() | |
| 1385 { | |
|
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
|
1386 return GetActualAttribute(CHARACTER_ATTRIBUTE_WILLPOWER, &Player::uWillpower, &Player::uWillpowerBonus); |
| 0 | 1387 } |
| 1388 | |
| 1389 //----- (0048CABC) -------------------------------------------------------- | |
| 1390 int Player::GetActualEndurance() | |
| 1391 { | |
|
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
|
1392 return GetActualAttribute(CHARACTER_ATTRIBUTE_ENDURANCE, &Player::uEndurance, &Player::uEnduranceBonus); |
| 0 | 1393 } |
| 1394 | |
| 1395 //----- (0048CB39) -------------------------------------------------------- | |
| 1396 int Player::GetActualAccuracy() | |
| 1397 { | |
|
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
|
1398 return GetActualAttribute(CHARACTER_ATTRIBUTE_ACCURACY, &Player::uAccuracy, &Player::uAccuracyBonus); |
| 0 | 1399 } |
| 1400 | |
| 1401 //----- (0048CBB6) -------------------------------------------------------- | |
| 1402 int Player::GetActualSpeed() | |
| 1403 { | |
|
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
|
1404 return GetActualAttribute(CHARACTER_ATTRIBUTE_SPEED, &Player::uSpeed, &Player::uSpeedBonus); |
| 0 | 1405 } |
| 1406 | |
| 1407 //----- (0048CC33) -------------------------------------------------------- | |
| 1408 int Player::GetActualLuck() | |
| 1409 { | |
| 1036 | 1410 signed int npc_luck_bonus; // [sp+10h] [bp-4h]@1 |
| 1411 | |
| 1412 npc_luck_bonus = 0; | |
| 652 | 1413 if ( CheckHiredNPCSpeciality(Fool) ) |
| 1036 | 1414 npc_luck_bonus = 5; |
| 652 | 1415 if ( CheckHiredNPCSpeciality(ChimneySweep) ) |
| 1036 | 1416 npc_luck_bonus += 20; |
| 652 | 1417 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1036 | 1418 npc_luck_bonus += 10; |
| 1324 | 1419 |
|
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
|
1420 return GetActualAttribute(CHARACTER_ATTRIBUTE_LUCK, &Player::uLuck, &Player::uLuckBonus) |
| 1325 | 1421 + npc_luck_bonus; |
| 1422 } | |
| 1423 | |
| 1424 //----- (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
|
1425 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
|
1426 { |
| 1324 | 1427 uint uActualAge = this->sAgeModifier + GetBaseAge(); |
| 1428 uint uAgeingMultiplier = 100; | |
| 1429 for (uint i = 0; i < 4; ++i) | |
| 1325 | 1430 { |
| 1324 | 1431 if (uActualAge >= pAgeingTable[i]) |
| 1325 | 1432 uAgeingMultiplier = pAgingAttributeModifier[attrId][i]; |
| 1433 else | |
| 1434 break; | |
| 1435 } | |
| 1436 | |
| 1980 | 1437 uchar uConditionMult = pConditionAttributeModifier[attrId][GetMajorConditionIdx()]; |
| 1325 | 1438 int magicBonus = GetMagicalBonus(attrId); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1439 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
|
1440 return uConditionMult * uAgeingMultiplier * this->*attrValue / 100 / 100 |
| 1325 | 1441 + 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
|
1442 + 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
|
1443 + this->*attrBonus; |
| 0 | 1444 } |
| 1445 | |
| 1446 //----- (0048CCF5) -------------------------------------------------------- | |
| 1684 | 1447 int Player::GetActualAttack( bool a2 ) |
| 0 | 1448 { |
| 1449 int v3; // eax@1 | |
| 1450 int v4; // edi@1 | |
| 1451 int v5; // ebx@1 | |
| 1452 int v6; // ebp@1 | |
| 1453 | |
| 1454 v3 = GetActualAccuracy(); | |
| 1036 | 1455 v4 = GetParameterBonus(v3); |
| 0 | 1456 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_ATTACK); |
| 1457 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
|
1458 return v4 + v5 + v6 + GetMagicalBonus(CHARACTER_ATTRIBUTE_ATTACK) + this->_some_attack_bonus; |
| 0 | 1459 } |
| 1460 | |
| 1461 //----- (0048CD45) -------------------------------------------------------- | |
| 1462 int Player::GetMeleeDamageMinimal() | |
| 1463 { | |
| 1464 int v2; // eax@1 | |
| 1465 int v3; // esi@1 | |
| 1466 int v4; // esi@1 | |
| 1467 int v5; // esi@1 | |
| 1468 signed int result; // eax@1 | |
| 1036 | 1469 |
| 0 | 1470 v2 = GetActualMight(); |
| 1036 | 1471 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1472 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN) + v3; |
| 0 | 1473 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v4; |
| 1036 | 1474 result = _melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 1475 if ( result < 1 ) | |
| 1476 result = 1; | |
| 0 | 1477 return result; |
| 1478 } | |
| 1479 | |
| 1480 //----- (0048CD90) -------------------------------------------------------- | |
| 1481 int Player::GetMeleeDamageMaximal() | |
| 1482 { | |
| 1483 int v2; // eax@1 | |
| 1484 int v3; // esi@1 | |
| 1485 int v4; // esi@1 | |
| 1486 int v5; // esi@1 | |
| 1487 int v6; // esi@1 | |
| 1488 signed int result; // eax@1 | |
| 1489 | |
| 1490 v2 = GetActualMight(); | |
| 1036 | 1491 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1492 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX) + v3; |
| 0 | 1493 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
|
1494 v6 = this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 0 | 1495 result = 1; |
| 1496 if ( v6 >= 1 ) | |
| 1497 result = v6; | |
| 1498 return result; | |
| 1499 } | |
| 1500 | |
| 1501 //----- (0048CDDB) -------------------------------------------------------- | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1502 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
|
1503 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1504 int dmgSum; // esi@62 |
| 0 | 1505 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
|
1506 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
|
1507 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
|
1508 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1509 offHndWpnDmg = 0; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1510 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
|
1511 if ( IsUnarmed() ) |
| 0 | 1512 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1513 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
|
1514 } |
|
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
|
1515 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
|
1516 { |
| 1989 | 1517 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
|
1518 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1519 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
|
1520 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
|
1521 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
|
1522 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
|
1523 addOneDice = true; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1524 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
|
1525 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1526 if ( !ignoreOffhand ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1527 { |
| 1989 | 1528 if ( this->HasItemEquipped(EQUIP_SINGLE_HANDED) ) |
| 0 | 1529 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1530 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
|
1531 if ( offHandItemGen->GetItemEquipType() != EQUIP_SHIELD ) |
| 0 | 1532 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1533 offHndWpnDmg = CalculateMeleeDmgToEnemyWithWeapon(offHandItemGen, uTargetActorID, false); |
| 0 | 1534 } |
| 1535 } | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1536 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1537 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1538 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
|
1539 if ( !ignoreSkillBonus ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1540 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1541 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
|
1542 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
|
1543 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
|
1544 dmgSum += this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + mightAndSkillbonus; |
| 0 | 1545 } |
| 1546 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
|
1547 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
|
1548 result = dmgSum; |
| 0 | 1549 return result; |
| 1550 } | |
| 1551 | |
|
1550
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 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
|
1554 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1555 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
|
1556 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
|
1557 if (addOneDice) |
|
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 diceCount++; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1560 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1561 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
|
1562 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
|
1563 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
|
1564 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1565 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
|
1566 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1567 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
|
1568 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
|
1569 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1570 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
|
1571 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
|
1572 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1573 totalDmg *= 2; |
|
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 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
|
1576 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1577 totalDmg *= 2; |
|
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 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
|
1580 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1581 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1582 } |
| 1822 | 1583 else if (MonsterStats::BelongsToSupertype(uTargetActorID, MONSTER_SUPERTYPE_ELF) && ( enchType == 63 || itemId == ITEM_RELIC_OLD_NICK)) |
| 1584 { | |
| 1585 totalDmg *= 2; | |
| 1586 } | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1587 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
|
1588 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1589 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1590 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1591 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1592 if ( (signed int)SkillToMastery(this->pActiveSkills[2]) >= 3 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1593 && 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
|
1594 && 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
|
1595 totalDmg *= 3; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1596 return totalDmg; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1597 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1598 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1599 |
| 0 | 1600 //----- (0048D0B9) -------------------------------------------------------- |
| 1601 int Player::GetRangedAttack() | |
| 1602 { | |
| 1603 int v3; // edi@3 | |
| 2046 | 1604 //int v4; // eax@4 |
| 1605 //int v5; // edi@4 | |
| 0 | 1606 int v6; // edi@4 |
| 1607 int v7; // edi@4 | |
| 1608 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1609 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
|
1610 if ( mainHandItem != nullptr && ( mainHandItem->uItemID < ITEM_BLASTER || mainHandItem->uItemID > ITEM_LASER_RIFLE )) |
| 0 | 1611 { |
| 2046 | 1612 //v4 = GetActualAccuracy(); |
| 1613 //v5 = GetParameterBonus(GetActualAccuracy()); | |
| 1614 v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + GetParameterBonus(GetActualAccuracy()); | |
| 0 | 1615 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
|
1616 v3 = this->_ranged_atk_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v7; |
| 0 | 1617 } |
| 1618 else | |
| 1619 { | |
| 1684 | 1620 v3 = GetActualAttack(true); |
| 0 | 1621 } |
| 1622 return v3; | |
| 1623 } | |
| 1624 | |
| 1625 //----- (0048D124) -------------------------------------------------------- | |
| 1626 int Player::GetRangedDamageMin() | |
| 1627 { | |
| 1628 int v2; // edi@1 | |
| 1629 int v3; // edi@1 | |
| 1630 int v4; // edi@1 | |
| 1631 int result; // eax@6 | |
| 1632 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1633 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MIN); |
| 1040 | 1634 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
|
1635 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1636 if ( v4 >= 1 ) |
| 1637 result = v4; | |
| 1638 else | |
| 1639 result = 0; | |
| 1640 return result; | |
| 1641 } | |
| 1642 | |
| 1643 //----- (0048D191) -------------------------------------------------------- | |
| 1644 int Player::GetRangedDamageMax() | |
| 1645 { | |
| 1646 int v2; // edi@1 | |
| 1647 int v3; // edi@1 | |
| 1648 int v4; // edi@1 | |
| 1649 int result; // eax@6 | |
| 1650 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1651 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MAX); |
| 1040 | 1652 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
|
1653 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1654 if ( v4 >= 1 ) |
| 1655 result = v4; | |
| 1656 else | |
| 1657 result = 0; | |
| 1658 return result; | |
| 1659 } | |
| 1660 | |
| 1661 //----- (0048D1FE) -------------------------------------------------------- | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1662 int Player::CalculateRangedDamageTo( int a2 ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1663 { |
| 0 | 1664 ItemGen *v4; // ebx@2 |
| 1665 unsigned int v5; // edi@2 | |
| 1666 int v9; // esi@5 | |
| 1667 int v10; // ebx@6 | |
| 1668 signed int v15; // [sp+8h] [bp-Ch]@2 | |
| 1669 int v17; // [sp+10h] [bp-4h]@1 | |
| 1670 | |
| 1671 v17 = 0; | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1672 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1673 return 0; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1674 v4 = (ItemGen *)&this->pInventoryItemList[this->pEquipment.uBow-1]; |
| 0 | 1675 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
|
1676 v15 = pItemsTable->pItems[v5].uDamageRoll; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1677 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
|
1678 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1679 int v7 = rand() % v15; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1680 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
|
1681 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1682 v9 = pItemsTable->pItems[v5].uDamageMod + v17; |
| 0 | 1683 if ( a2 ) |
| 1684 { | |
| 377 | 1685 v10 = v4->uSpecEnchantmentType; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1686 if ( v10 == 64 && MonsterStats::BelongsToSupertype(a2, MONSTER_SUPERTYPE_UNDEAD)) |
|
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 v9 *= 2; |
|
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 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
|
1691 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1692 v9 *= 2; |
|
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 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
|
1695 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1696 v9 *= 2; |
|
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 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
|
1699 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1700 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1701 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1702 } |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1703 return v9 + this->GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS); |
| 0 | 1704 } |
| 1705 | |
| 1706 //----- (0048D2EA) -------------------------------------------------------- | |
| 1707 char *Player::GetMeleeDamageString() | |
| 1708 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1709 int min_damage; // edi@3 |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1710 int max_damage; // eax@3 |
| 0 | 1711 |
| 1712 static char player__getmeleedamagestring_static_buff[40]; // idb | |
| 1713 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1714 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
|
1715 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1716 if (mainHandItem != nullptr && ( mainHandItem->uItemID >= 135 ) && ( mainHandItem->uItemID <= 159 )) |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1717 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1718 strcpy(player__getmeleedamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1719 return player__getmeleedamagestring_static_buff; |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1720 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1721 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
|
1722 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1723 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1724 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1725 } |
| 0 | 1726 else |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1727 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1728 min_damage = GetMeleeDamageMinimal(); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1729 max_damage = GetMeleeDamageMaximal(); |
|
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 if ( min_damage == max_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 sprintf(player__getmeleedamagestring_static_buff, "%d", min_damage); |
|
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 else |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1736 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1737 sprintf(player__getmeleedamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1738 } |
| 1036 | 1739 return player__getmeleedamagestring_static_buff; |
| 0 | 1740 } |
| 1741 | |
| 1742 //----- (0048D396) -------------------------------------------------------- | |
| 1743 char *Player::GetRangedDamageString() | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1744 { |
| 1036 | 1745 int min_damage; // edi@3 |
| 1746 int max_damage; // eax@3 | |
| 1747 | |
| 1748 static char player__getrangeddamagestring_static_buff[40]; // idb | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1749 |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1750 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
|
1751 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1752 if (mainHandItem != nullptr && ( mainHandItem->uItemID >= 135 ) && ( mainHandItem->uItemID <= 159 )) |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1753 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1754 strcpy(player__getrangeddamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1755 return player__getrangeddamagestring_static_buff; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1756 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1757 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
|
1758 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1759 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1760 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1761 } |
| 0 | 1762 else |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1763 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1764 min_damage = GetRangedDamageMin(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1765 max_damage = GetRangedDamageMax(); |
|
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 ( max_damage > 0) |
|
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 if ( min_damage == max_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 sprintf(player__getrangeddamagestring_static_buff, "%d", min_damage); |
|
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 else |
|
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 sprintf(player__getrangeddamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1776 } |
|
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 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1779 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1780 strcpy(player__getrangeddamagestring_static_buff, "N/A"); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1781 } |
| 1036 | 1782 return player__getrangeddamagestring_static_buff; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1783 } |
| 0 | 1784 |
| 1785 //----- (0048D45A) -------------------------------------------------------- | |
| 1786 bool Player::CanTrainToNextLevel() | |
| 1787 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1788 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
|
1789 int neededExp = ((lvl * (lvl - 1)) / 2 * 1000); |
| 1564 | 1790 return this->uExperience >= neededExp; |
| 0 | 1791 } |
| 1792 | |
| 1793 //----- (0048D498) -------------------------------------------------------- | |
| 1794 unsigned int Player::GetExperienceDisplayColor() | |
| 1795 { | |
| 1796 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
|
1797 return ui_character_bonus_text_color; |
| 0 | 1798 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
|
1799 return ui_character_default_text_color; |
| 0 | 1800 } |
| 1801 | |
| 1802 //----- (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
|
1803 int Player::CalculateIncommingDamage( DAMAGE_TYPE dmg_type, int dmg ) |
| 1561 | 1804 { |
| 1036 | 1805 int resist_value; // edi@8 |
| 1806 int player_luck; // eax@21 | |
| 1807 signed int res_rand_divider; // ebx@2 | |
| 1808 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
|
1809 |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1810 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
|
1811 return 0; |
|
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1812 |
|
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
|
1813 resist_value = 0; |
| 1036 | 1814 switch(dmg_type) |
| 1815 { | |
|
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
|
1816 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
|
1817 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
|
1818 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
|
1819 case DMGT_EARTH: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_EARTH); break; |
| 1036 | 1820 |
|
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
|
1821 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
|
1822 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
|
1823 case DMGT_BODY: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_BODY); break; |
| 1036 | 1824 } |
|
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
|
1825 |
| 1036 | 1826 player_luck = GetActualLuck(); |
| 1827 res_rand_divider = GetParameterBonus(player_luck) + resist_value + 30; | |
| 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 if ( GetParameterBonus(player_luck) + resist_value > 0 ) |
| 1036 | 1830 { |
|
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
|
1831 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
|
1832 { |
| 1036 | 1833 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
|
1834 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
|
1835 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
|
1836 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
|
1837 } |
|
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
|
1838 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1839 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
|
1840 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
|
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 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
|
1843 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1844 armor_skill = equippedArmor->GetPlayerSkillType(); |
| 1036 | 1845 if ( armor_skill==PLAYER_SKILL_PLATE ) |
| 0 | 1846 { |
| 1036 | 1847 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
|
1848 return dmg / 2; |
| 0 | 1849 } |
| 1036 | 1850 if (armor_skill==PLAYER_SKILL_CHAIN ) |
| 0 | 1851 { |
| 1036 | 1852 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
|
1853 return dmg * 2 / 3; |
| 0 | 1854 } |
| 1855 } | |
| 1036 | 1856 } |
|
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
|
1857 return dmg; |
| 0 | 1858 } |
| 1859 | |
| 1860 //----- (0048D62C) -------------------------------------------------------- | |
| 816 | 1861 ITEM_EQUIP_TYPE Player::GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1862 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1863 return GetNthEquippedIndexItem(uEquipSlot)->GetItemEquipType(); |
| 0 | 1864 } |
| 1865 | |
| 1866 //----- (0048D651) -------------------------------------------------------- | |
| 816 | 1867 PLAYER_SKILL_TYPE Player::GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1868 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1869 return (PLAYER_SKILL_TYPE)GetNthEquippedIndexItem(uEquipSlot)->GetPlayerSkillType(); |
| 0 | 1870 } |
| 1871 | |
| 1872 //----- (0048D676) -------------------------------------------------------- | |
| 1873 bool Player::IsUnarmed() | |
| 1874 { | |
| 1989 | 1875 return !HasItemEquipped(EQUIP_TWO_HANDED) && |
| 1876 (!HasItemEquipped(EQUIP_SINGLE_HANDED) || GetOffHandItem()->GetItemEquipType() == EQUIP_SHIELD); | |
| 0 | 1877 } |
| 1878 | |
| 1879 //----- (0048D6AA) -------------------------------------------------------- | |
| 1880 bool Player::HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex) | |
| 1881 { | |
| 1980 | 1882 uint i = pEquipment.pIndices[uEquipIndex]; |
| 0 | 1883 if (i) |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1884 return !pOwnItems[i - 1].IsBroken(); |
| 1036 | 1885 else |
| 1886 return false; | |
| 0 | 1887 } |
| 1888 | |
| 1889 //----- (0048D6D0) -------------------------------------------------------- | |
| 1890 bool Player::HasEnchantedItemEquipped(int uEnchantment) | |
| 1891 { | |
| 1892 for (uint i = 0; i < 16; ++i) | |
| 1893 { | |
| 1894 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
|
1895 GetNthEquippedIndexItem(i)->uSpecEnchantmentType == uEnchantment) |
| 0 | 1896 return true; |
| 1897 } | |
| 1898 return false; | |
| 1899 } | |
| 1900 | |
| 1901 //----- (0048D709) -------------------------------------------------------- | |
| 1080 | 1902 bool Player::WearsItem( int item_id, ITEM_EQUIP_TYPE equip_type ) |
| 1563 | 1903 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1904 return ( HasItemEquipped(equip_type) && GetNthEquippedIndexItem(equip_type)->uItemID == item_id ); |
| 1563 | 1905 } |
| 1906 | |
| 1907 bool Player::WearsItemAnyWhere(int item_id) | |
| 1908 { | |
| 1909 for (int i = 0; i < 16; i++) | |
| 1910 { | |
| 1911 if (WearsItem(item_id, (ITEM_EQUIP_TYPE) i)) | |
| 1912 { | |
| 1913 return true; | |
| 1914 } | |
| 1915 } | |
| 1916 return false; | |
| 0 | 1917 } |
| 1918 | |
| 1919 //----- (0048D76C) -------------------------------------------------------- | |
| 1686 | 1920 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 | 1921 { |
| 1922 unsigned __int16 v6; // cx@8 | |
| 1923 int v7; // edi@8 | |
| 1924 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
|
1925 unsigned int itemvalue; // esi@8 |
| 0 | 1926 int v10; // eax@8 |
| 1686 | 1927 int currMaxItemValue; // edi@12 |
| 0 | 1928 |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1929 if ( !itemToSteal |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1930 || this->IsEradicated() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1931 || this->IsDead() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1932 || this->IsPertified() |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1933 || this->IsDrunk() |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1934 || this->IsUnconcious() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1935 || this->IsAsleep() ) |
| 0 | 1936 { |
| 1686 | 1937 return 0; |
| 0 | 1938 } |
| 1939 else | |
| 1940 { | |
| 1941 v6 = this->pActiveSkills[34]; | |
| 1942 v7 = v6 & 0x3F; | |
| 1943 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
|
1944 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
|
1945 v10 = itemToSteal->GetItemEquipType(); |
| 1989 | 1946 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
|
1947 itemvalue *= 3; |
| 1686 | 1948 currMaxItemValue = StealingRandomBonuses[rand() % 5] + v7 * StealingMasteryBonuses[v8]; |
| 1949 *fineIfFailed = 100 * (reputation + extraStealDifficulty) + itemvalue; | |
| 1950 if (a5) | |
| 1951 { | |
| 1952 *fineIfFailed += 500; | |
| 1953 } | |
| 0 | 1954 if ( rand() % 100 >= 5 ) |
| 1955 { | |
| 1686 | 1956 if ( *fineIfFailed > currMaxItemValue ) |
| 1957 if (*fineIfFailed - currMaxItemValue < 500) | |
| 1958 { | |
| 1959 return 1; | |
| 1960 } | |
| 1961 else | |
| 1962 { | |
| 1963 return 0; | |
| 1964 } | |
| 0 | 1965 else |
| 1686 | 1966 return 2; |
| 0 | 1967 } |
| 1968 else | |
| 1969 { | |
| 1686 | 1970 return 0; |
| 1971 } | |
| 1972 } | |
| 0 | 1973 } |
| 1974 | |
| 1975 //----- (0048D88B) -------------------------------------------------------- | |
| 1976 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation) | |
| 1977 { | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1978 Actor *actroPtr; // edi@1 |
| 0 | 1979 int v7; // ebx@10 |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1980 unsigned int stealingMastery; // esi@10 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1981 int fineIfFailed; // esi@10 |
| 0 | 1982 int v11; // eax@13 |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1983 bool HasFullItemSlots; // ebx@15 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1984 unsigned __int16 carriedItemId; // si@21 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1985 unsigned int enchBonusSum; // esi@31 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1986 int *enchTypePtr; // eax@34 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1987 ItemGen tempItem; // [sp+8h] [bp-34h]@15 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1988 int currMaxItemValue; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1989 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1990 actroPtr = &pActors[uActorID]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1991 if ( !actroPtr |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1992 || this->IsEradicated() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1993 || this->IsDead() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1994 || this->IsPertified() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1995 || this->IsDrunk() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1996 || this->IsUnconcious() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1997 || this->IsAsleep() ) |
|
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 return 0; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2000 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2001 pGlobalTXT_LocalizationStrings[1]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2002 if ( !(BYTE2(actroPtr->uAttributes) & 0x80) ) |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2003 actroPtr->SetRandomGoldIfTheresNoItem(); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2004 unsigned __int16 v6 = this->pActiveSkills[34]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2005 v7 = v6 & 0x3F; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2006 stealingMastery = SkillToMastery(v6); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2007 int v30 = StealingMasteryBonuses[stealingMastery]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2008 int v29 = StealingRandomBonuses[rand() % 5]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2009 fineIfFailed = actroPtr->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2010 currMaxItemValue = v29 + v7 * v30; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2011 pGlobalTXT_LocalizationStrings[200]; |
| 1783 | 2012 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
|
2013 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2014 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2015 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[376], this->pName); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2016 ShowStatusBarString(pTmpBuf2.data(), 2u); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2017 return 0; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2018 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2019 else |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2020 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2021 v11 = rand(); |
| 1688 | 2022 if ( v11 % 100 >= 70 ) //stealing gold |
| 2023 { | |
| 2024 enchBonusSum = 0; | |
| 2025 for (int i = 0; i < v7; i++) | |
| 2026 { | |
| 2027 enchBonusSum += rand() % StealingEnchantmentBonusForSkill[stealingMastery] + 1; | |
| 2028 } | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2029 if ( actroPtr->array_000234[3].GetItemEquipType() != EQUIP_GOLD ) |
| 1688 | 2030 return 2; |
| 2031 enchTypePtr = &actroPtr->array_000234[3].uSpecEnchantmentType; | |
| 2032 if ( (int)enchBonusSum >= *enchTypePtr ) | |
| 2033 { | |
| 2034 actroPtr->array_000234[3].uItemID = 0; | |
| 2035 *enchTypePtr = 0; | |
| 2036 } | |
| 2037 else | |
| 2038 { | |
| 2039 *enchTypePtr -= enchBonusSum; | |
| 2040 } | |
| 2041 if ( enchBonusSum ) | |
| 2042 { | |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
2043 pParty->PartyFindsGold(enchBonusSum, 2); |
| 1688 | 2044 sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[302], this->pName, enchBonusSum); //%stole %d gold |
| 2045 } | |
| 2046 else | |
| 2047 { | |
| 2048 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName); //%s failed to steal anything | |
| 2049 } | |
| 2050 ShowStatusBarString(pTmpBuf2.data(), 2u); | |
| 2051 return 2; | |
| 2052 } | |
| 2053 else if ( v11 % 100 >= 40 ) //stealing an item | |
| 2054 { | |
| 2055 tempItem.Reset(); | |
| 2056 HasFullItemSlots = false; | |
| 2057 int i; | |
| 2058 for (i = 0; i < 4; i++) | |
| 2059 { | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2060 if ( actroPtr->array_000234[i].uItemID != 0 && actroPtr->array_000234[i].GetItemEquipType() != EQUIP_GOLD ) |
| 1688 | 2061 break; |
| 2062 } | |
| 2063 if (i == 4) | |
| 2064 HasFullItemSlots = true; | |
| 2065 carriedItemId = actroPtr->uCarriedItemID; | |
| 2066 if ( carriedItemId != 0 || HasFullItemSlots ) | |
| 2067 { | |
| 2068 tempItem.Reset(); | |
| 2069 if ( carriedItemId != 0 ) | |
| 0 | 2070 { |
| 1688 | 2071 actroPtr->uCarriedItemID = 0; |
| 2072 tempItem.uItemID = carriedItemId; | |
| 2073 if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_WAND ) | |
| 2074 tempItem.uNumCharges = rand() % 6 + pItemsTable->pItems[carriedItemId].uDamageMod + 1; | |
| 2075 else if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_POTION && carriedItemId != ITEM_POTION_BOTTLE) | |
| 2076 tempItem.uEnchantmentType = 2 * rand() % 4 + 2; | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2077 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2078 else |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2079 { |
| 1688 | 2080 ItemGen* itemToSteal = &actroPtr->array_000234[rand() % 4]; |
| 2081 memcpy(&tempItem, itemToSteal, sizeof(tempItem)); | |
| 2082 itemToSteal->Reset(); | |
| 2083 carriedItemId = tempItem.uItemID; | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2084 } |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2085 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
|
2086 { |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
2087 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
|
2088 sprintf( |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2089 pTmpBuf2.data(), |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2090 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
|
2091 this->pName, |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2092 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
|
2093 ShowStatusBarString(pTmpBuf2.data(), 2u); |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
2094 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
|
2095 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
|
2096 pMouse->SetCursorBitmapFromItemID(carriedItemId); |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2097 return 2; |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2098 } |
| 0 | 2099 } |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2100 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2101 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName); //%s failed to steal anything |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2102 ShowStatusBarString(pTmpBuf2.data(), 2u); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2103 return 2; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2104 } |
| 0 | 2105 } |
| 2106 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2107 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2108 // 4EDEC4: using guessed type int dword_4EDEC4[]; | |
| 2109 | |
| 2110 //----- (0048DBB9) -------------------------------------------------------- | |
| 2111 void Player::Heal(int amount) | |
| 2112 { | |
| 1010 | 2113 signed int max_health; // eax@3 |
| 2114 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2115 if ( !IsEradicated() && !IsDead() ) |
| 1010 | 2116 { |
| 2117 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
|
2118 if ( IsZombie() ) |
| 1010 | 2119 max_health /= 2; |
| 2120 sHealth += amount; | |
| 2121 if ( sHealth > max_health ) | |
| 2122 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
|
2123 if ( IsUnconcious() ) |
| 1010 | 2124 { |
| 2125 if ( sHealth > 0 ) | |
| 2126 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2127 SetUnconcious(false); |
| 0 | 2128 } |
| 2129 } | |
| 2130 } | |
| 2131 } | |
| 2132 | |
| 2133 //----- (0048DC1E) -------------------------------------------------------- | |
| 1036 | 2134 int Player::ReceiveDamage( signed int amount, DAMAGE_TYPE dmg_type ) |
| 2135 { | |
| 2136 signed int recieved_dmg; // eax@1 | |
| 2137 bool broke_armor; | |
| 2138 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2139 SetAsleep(false); |
| 1036 | 2140 recieved_dmg = CalculateIncommingDamage(dmg_type, amount); |
| 2141 sHealth -= recieved_dmg; | |
| 2142 broke_armor = sHealth <= -10; | |
| 2143 if ( sHealth < 1 ) // | |
| 2144 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2145 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
|
2146 || 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
|
2147 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2148 SetCondUnconsciousWithBlockCheck(false); |
| 0 | 2149 } |
| 2150 else | |
| 2151 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2152 SetCondDeadWithBlockCheck(false); |
| 1036 | 2153 if ( sHealth > 0 ) |
| 2154 sHealth = 0; | |
| 2155 } | |
| 2156 if (broke_armor ) | |
| 2157 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2158 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
|
2159 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
|
2160 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2161 if ( !(equippedArmor->uAttributes & ITEM_HARDENED)) |
| 0 | 2162 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2163 equippedArmor->SetBroken(); |
| 0 | 2164 } |
| 2165 } | |
| 2166 } | |
| 2167 } | |
| 1036 | 2168 if ( recieved_dmg && CanAct() ) |
| 187 | 2169 PlaySound(SPEECH_24, 0); |
| 1036 | 2170 return recieved_dmg; |
| 0 | 2171 } |
| 2172 | |
| 2173 //----- (0048DCF6) -------------------------------------------------------- | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2174 int Player::ReceiveSpecialAttackEffect( int attType, struct Actor *pActor ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2175 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2176 SPECIAL_ATTACK_TYPE attTypeCast = (SPECIAL_ATTACK_TYPE) attType; |
| 0 | 2177 signed int v3; // edi@1 |
| 2178 signed int v4; // ebx@1 | |
| 2179 int v6; // eax@2 | |
| 2180 int v8; // eax@8 | |
| 2181 int v10; // eax@8 | |
| 2182 int v11; // ebx@8 | |
| 2183 ItemGen *v13; // eax@9 | |
| 2184 int v22; // eax@49 | |
| 2185 signed int v23; // ebx@49 | |
| 2186 void *v27; // ecx@76 | |
| 2187 char v46[140]; // [sp+Ch] [bp-94h]@13 | |
| 2188 unsigned int v47; // [sp+98h] [bp-8h]@1 | |
| 1692 | 2189 ItemGen* v48; // [sp+9Ch] [bp-4h]@1 |
| 2190 | |
| 0 | 2191 v4 = 0; |
| 2192 v47 = 0; | |
| 1783 | 2193 v48 = nullptr; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2194 switch ( attTypeCast ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2195 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2196 case SPECIAL_ATTACK_CURSE: |
| 0 | 2197 v6 = GetActualWillpower(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2198 v11 = GetParameterBonus(v6); |
| 1690 | 2199 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2200 case SPECIAL_ATTACK_WEAK: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2201 case SPECIAL_ATTACK_SLEEP: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2202 case SPECIAL_ATTACK_DRUNK: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2203 case SPECIAL_ATTACK_DISEASE1: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2204 case SPECIAL_ATTACK_DISEASE2: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2205 case SPECIAL_ATTACK_DISEASE3: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2206 case SPECIAL_ATTACK_UNCONSCIOUS: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2207 case SPECIAL_ATTACK_AGING: |
| 0 | 2208 v6 = GetActualEndurance(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2209 v11 = GetParameterBonus(v6); |
| 1690 | 2210 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2211 case SPECIAL_ATTACK_INSANE: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2212 case SPECIAL_ATTACK_PARALYZED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2213 case SPECIAL_ATTACK_FEAR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2214 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_MIND); |
| 1690 | 2215 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2216 case SPECIAL_ATTACK_PETRIFIED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2217 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_EARTH); |
| 1690 | 2218 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2219 case SPECIAL_ATTACK_POISON1: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2220 case SPECIAL_ATTACK_POISON2: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2221 case SPECIAL_ATTACK_POISON3: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2222 case SPECIAL_ATTACK_DEAD: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2223 case SPECIAL_ATTACK_ERADICATED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2224 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_BODY); |
| 1690 | 2225 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2226 case SPECIAL_ATTACK_MANA_DRAIN: |
| 0 | 2227 v8 = GetActualWillpower(); |
| 2228 v10 = GetActualIntelligence(); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2229 v11 = (GetParameterBonus(v10) + GetParameterBonus(v8)) / 2; |
| 0 | 2230 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2231 case SPECIAL_ATTACK_BREAK_ANY: |
| 1692 | 2232 for (int i = 0; i < 138; i++) |
| 2233 { | |
| 2234 v13 = &this->pInventoryItemList[i]; | |
| 2235 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
|
2236 v46[v4++] = i; |
| 1692 | 2237 } |
| 1690 | 2238 if ( !v4 ) |
| 2239 return 0; | |
| 1692 | 2240 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
|
2241 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 1690 | 2242 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2243 case SPECIAL_ATTACK_BREAK_ARMOR: |
| 1692 | 2244 for (int i = 0; i < 16; i++ ) |
| 0 | 2245 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2246 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 0 | 2247 { |
| 1692 | 2248 if ( i == EQUIP_ARMOUR ) |
| 2249 v46[v4++] = this->pEquipment.uArmor - 1; | |
| 1989 | 2250 if ( (i == EQUIP_SINGLE_HANDED || i == EQUIP_TWO_HANDED) && GetEquippedItemEquipType((ITEM_EQUIP_TYPE)i) == EQUIP_SHIELD ) |
| 1692 | 2251 v46[v4++] = this->pEquipment.pIndices[i] - 1; |
| 0 | 2252 } |
| 1692 | 2253 } |
| 1690 | 2254 if ( !v4 ) |
| 2255 return 0; | |
| 1692 | 2256 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
|
2257 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 1690 | 2258 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2259 case SPECIAL_ATTACK_BREAK_WEAPON: |
| 1692 | 2260 for (int i = 0; i < 16; i++ ) |
| 0 | 2261 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2262 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 0 | 2263 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2264 if ( i == EQUIP_BOW ) |
| 1690 | 2265 v46[v4++] = LOBYTE(this->pEquipment.uBow) - 1; |
| 1989 | 2266 if ( (i == EQUIP_SINGLE_HANDED || i == EQUIP_TWO_HANDED) |
| 2267 && (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
|
2268 v46[v4++] = this->pEquipment.pIndices[i] - 1; |
| 0 | 2269 } |
| 1692 | 2270 } |
| 0 | 2271 if ( !v4 ) |
| 1690 | 2272 return 0; |
| 1692 | 2273 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
|
2274 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 0 | 2275 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2276 case SPECIAL_ATTACK_STEAL: |
| 1692 | 2277 for ( int i = 0; i < 126; i++ ) |
| 2278 { | |
| 2279 int ItemPosInList = this->pInventoryMatrix[i]; | |
| 2280 if (ItemPosInList > 0) | |
| 0 | 2281 { |
| 1692 | 2282 ItemGen* v21 = &this->pInventoryItemList[ItemPosInList - 1]; |
| 2283 if ( v21->uItemID > 0 && v21->uItemID <= 134 ) | |
| 0 | 2284 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2285 v46[v4++] = i; |
| 0 | 2286 } |
| 2287 } | |
| 1692 | 2288 } |
| 0 | 2289 if ( !v4 ) |
| 1690 | 2290 return 0; |
| 1692 | 2291 v47 = v46[rand() % v4]; |
| 0 | 2292 v6 = GetActualAccuracy(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2293 v11 = GetParameterBonus(v6); |
| 0 | 2294 break; |
| 2295 default: | |
| 2296 v11 = 0; | |
| 2297 break; | |
| 2298 } | |
| 2299 v22 = GetActualLuck(); | |
| 1036 | 2300 v23 = GetParameterBonus(v22) + v11 + 30; |
| 0 | 2301 if ( rand() % v23 >= 30 ) |
| 2302 { | |
| 1690 | 2303 return 0; |
| 0 | 2304 } |
| 2305 else | |
| 2306 { | |
| 1692 | 2307 for ( v3 = 0; v3 < 4; v3++ ) |
| 2308 { | |
| 2309 if ( this == pPlayers[v3 + 1] ) | |
| 2310 break; | |
| 2311 } | |
| 2312 | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2313 switch ( attTypeCast ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2314 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2315 case SPECIAL_ATTACK_CURSE: |
| 1692 | 2316 SetCondition(Condition_Cursed, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2317 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2318 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2319 return 1; | |
| 2320 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2321 case SPECIAL_ATTACK_WEAK: |
| 1692 | 2322 SetCondition(Condition_Weak, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2323 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2324 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2325 return 1; | |
| 2326 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2327 case SPECIAL_ATTACK_SLEEP: |
| 1692 | 2328 SetCondition(Condition_Sleep, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2329 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2330 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2331 return 1; | |
| 2332 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2333 case SPECIAL_ATTACK_DRUNK: |
| 1692 | 2334 SetCondition(Condition_Drunk, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2335 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2336 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2337 return 1; | |
| 2338 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2339 case SPECIAL_ATTACK_INSANE: |
| 1692 | 2340 SetCondition(Condition_Insane, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2341 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2342 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2343 return 1; | |
| 2344 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2345 case SPECIAL_ATTACK_POISON1: |
| 1692 | 2346 SetCondition(Condition_Poison1, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2347 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
|
2348 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2349 return 1; |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2350 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2351 case SPECIAL_ATTACK_POISON2: |
| 1692 | 2352 SetCondition(Condition_Poison2, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2353 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
|
2354 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2355 return 1; |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2356 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2357 case SPECIAL_ATTACK_POISON3: |
| 1692 | 2358 SetCondition(Condition_Poison3, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2359 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2360 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2361 return 1; | |
| 2362 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2363 case SPECIAL_ATTACK_DISEASE1: |
|
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
|
2364 SetCondition(Condition_Disease1, 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
|
2365 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
|
2366 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
|
2367 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
|
2368 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2369 case SPECIAL_ATTACK_DISEASE2: |
|
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
|
2370 SetCondition(Condition_Disease2, 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
|
2371 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
|
2372 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
|
2373 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
|
2374 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2375 case SPECIAL_ATTACK_DISEASE3: |
| 1692 | 2376 SetCondition(Condition_Disease3, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2377 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
| 0 | 2378 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 1690 | 2379 return 1; |
| 0 | 2380 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2381 case SPECIAL_ATTACK_PARALYZED: |
| 1692 | 2382 SetCondition(Condition_Paralyzed, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2383 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2384 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2385 return 1; | |
| 2386 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2387 case SPECIAL_ATTACK_UNCONSCIOUS: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2388 SetCondition(Condition_Unconcious, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2389 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
|
2390 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2391 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2392 break; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2393 case SPECIAL_ATTACK_DEAD: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2394 SetCondition(Condition_Dead, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2395 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
|
2396 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2397 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2398 break; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2399 case SPECIAL_ATTACK_PETRIFIED: |
| 1692 | 2400 SetCondition(Condition_Pertified, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2401 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2402 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2403 return 1; | |
| 2404 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2405 case SPECIAL_ATTACK_ERADICATED: |
| 1692 | 2406 SetCondition(Condition_Eradicated, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2407 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2408 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2409 return 1; | |
| 2410 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2411 case SPECIAL_ATTACK_BREAK_ANY: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2412 case SPECIAL_ATTACK_BREAK_ARMOR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2413 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
|
2414 if ( !(v48->uAttributes & ITEM_HARDENED) ) |
| 1690 | 2415 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2416 PlaySound(SPEECH_40, 0); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2417 v48->SetBroken(); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2418 pAudioPlayer->PlaySound((SoundID)47, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2419 } |
| 2420 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2421 return 1; | |
| 2422 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2423 case SPECIAL_ATTACK_STEAL: |
| 1690 | 2424 PlaySound(SPEECH_40, 0); |
| 2425 v27 = pActor->array_000234; | |
| 2426 if ( pActor->array_000234[0].uItemID ) | |
| 2427 { | |
| 2428 v27 = &pActor->array_000234[1]; | |
| 2429 if ( pActor->array_000234[1].uItemID ) | |
| 2430 { | |
| 2431 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2432 return 1; | |
| 2433 } | |
| 2434 } | |
| 2435 memcpy(v27, &this->pInventoryItemList[this->pInventoryMatrix[v47]-1], 0x24u); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2436 RemoveItemAtInventoryIndex(v47); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2437 pAudioPlayer->PlaySound((SoundID)47, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2438 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2439 return 1; | |
| 2440 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2441 case SPECIAL_ATTACK_AGING: |
| 187 | 2442 PlaySound(SPEECH_42, 0); |
| 1690 | 2443 ++this->sAgeModifier; |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2444 pAudioPlayer->PlaySound((SoundID)226, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2445 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2446 return 1; | |
| 2447 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2448 case SPECIAL_ATTACK_MANA_DRAIN: |
| 1690 | 2449 PlaySound(SPEECH_41, 0); |
| 2450 this->sMana = 0; | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2451 pAudioPlayer->PlaySound((SoundID)226, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2452 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2453 return 1; | |
| 2454 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2455 case SPECIAL_ATTACK_FEAR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2456 SetCondition(Condition_Fear, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2457 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
|
2458 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2459 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2460 break; |
| 0 | 2461 default: |
| 1690 | 2462 return 0; |
| 0 | 2463 } |
| 2464 } | |
| 2465 } | |
| 324 | 2466 |
| 0 | 2467 // 48DCF6: using guessed type char var_94[140]; |
| 2468 | |
| 2469 //----- (0048E1A3) -------------------------------------------------------- | |
| 2470 unsigned int Player::GetSpellSchool(unsigned int uSpellID) | |
| 2471 { | |
| 1091 | 2472 return pSpellStats->pInfos[uSpellID].uSchool; |
| 0 | 2473 } |
| 2474 | |
| 2475 //----- (0048E1B5) -------------------------------------------------------- | |
| 816 | 2476 int Player::GetAttackRecoveryTime(bool bRangedAttack) |
| 2477 { | |
| 2478 ItemGen *weapon = nullptr; | |
| 2479 uint weapon_recovery = base_recovery_times_per_weapon_type[0]; | |
| 2480 if (bRangedAttack) | |
| 0 | 2481 { |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2482 if ( HasItemEquipped(EQUIP_BOW) ) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
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 = GetBowItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2485 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
|
2486 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2487 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2488 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
|
2489 { |
| 816 | 2490 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
|
2491 } |
| 1989 | 2492 else if ( HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 816 | 2493 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2494 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
|
2495 if (weapon->GetItemEquipType() == EQUIP_WAND) |
| 816 | 2496 { |
| 2497 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
| 2498 __debugbreak(); // looks like wands were two-handed weapons once, or supposed to be. should not get here now | |
| 2499 weapon_recovery = pSpellDatas[wand_spell_ids[weapon->uItemID - ITEM_WAND_FIRE]].uExpertLevelRecovery; | |
| 2500 } | |
| 0 | 2501 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
|
2502 weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()]; |
| 816 | 2503 } |
| 1989 | 2504 if (HasItemEquipped(EQUIP_SINGLE_HANDED) && GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) != EQUIP_SHIELD) |
| 1010 | 2505 // ADD: shield check because shield recovery is added later and can be accidentally doubled |
| 816 | 2506 { |
| 1717 | 2507 if (base_recovery_times_per_weapon_type[GetOffHandItem()->GetPlayerSkillType()] > weapon_recovery) |
| 2508 { | |
| 1731 | 2509 weapon = GetOffHandItem(); |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2510 weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()]; |
| 816 | 2511 } |
| 2512 } | |
| 2513 | |
| 2514 uint armour_recovery = 0; | |
| 0 | 2515 if ( HasItemEquipped(EQUIP_ARMOUR) ) |
| 2516 { | |
| 1980 | 2517 uchar armour_skill_type = GetArmorItem()->GetPlayerSkillType(); |
| 816 | 2518 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
|
2519 float multiplier; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2520 |
| 816 | 2521 if (armour_skill_type == PLAYER_SKILL_LEATHER) |
| 2522 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2523 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0, 0, 0); |
| 816 | 2524 } |
| 2525 else if (armour_skill_type == PLAYER_SKILL_CHAIN) | |
| 2526 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2527 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0, 0); |
| 816 | 2528 } |
| 2529 else if (armour_skill_type == PLAYER_SKILL_PLATE) | |
| 2530 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2531 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0.5f, 0); |
| 0 | 2532 } |
| 2533 else | |
| 2534 { | |
| 1545 | 2535 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
|
2536 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
|
2537 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2538 |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2539 armour_recovery = (uint)(base_armour_recovery * multiplier); |
| 816 | 2540 } |
| 2541 | |
| 2542 uint shield_recovery = 0; | |
| 1989 | 2543 if (HasItemEquipped(EQUIP_SINGLE_HANDED) && GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) == EQUIP_SHIELD) |
| 816 | 2544 { |
| 1980 | 2545 uchar skill_type = GetOffHandItem()->GetPlayerSkillType(); |
| 816 | 2546 |
| 2547 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
|
2548 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
|
2549 shield_recovery = (uint)(shield_base_recovery * multiplier); |
| 816 | 2550 } |
| 2551 | |
| 1036 | 2552 uint player_speed_recovery_reduction = GetParameterBonus(GetActualSpeed()), |
| 816 | 2553 sword_axe_bow_recovery_reduction = 0; |
| 2554 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
|
2555 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
|
2556 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2557 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
|
2558 (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
|
2559 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2560 if (SkillToMastery(pActiveSkills[weapon->GetPlayerSkillType()]) >= 2 ) // Expert Sword, Axe & Bow reduce recovery |
| 1759 | 2561 sword_axe_bow_recovery_reduction = pActiveSkills[weapon->GetPlayerSkillType()] & 0x3F; |
| 2562 } | |
| 2563 if (weapon->GetPlayerSkillType() == PLAYER_SKILL_BLASTER) | |
| 816 | 2564 shooting_laser = true; |
| 2565 } | |
| 2566 | |
| 2567 uint armsmaster_recovery_reduction = 0; | |
| 2568 if (!bRangedAttack && !shooting_laser) | |
| 2569 { | |
| 2570 if (uint armsmaster_level = GetActualSkillLevel(PLAYER_SKILL_ARMSMASTER)) | |
| 2571 { | |
| 2572 armsmaster_recovery_reduction = armsmaster_level & 0x3F; | |
| 2573 if (SkillToMastery(armsmaster_level) >= 4) | |
| 2574 armsmaster_recovery_reduction *= 2; | |
| 2575 } | |
| 2576 } | |
| 2577 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2578 uint hasteRecoveryReduction = 0; |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
2579 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
|
2580 hasteRecoveryReduction = 25; |
| 816 | 2581 |
| 2582 uint weapon_enchantment_recovery_reduction = 0; | |
| 2583 if ( weapon ) | |
| 2584 { | |
| 2585 if (weapon->uSpecEnchantmentType == 59 || | |
| 2586 weapon->uSpecEnchantmentType == 41 || | |
| 2587 weapon->uSpecEnchantmentType == 500) | |
| 2588 weapon_enchantment_recovery_reduction = 20; | |
| 2589 } | |
| 2590 | |
| 2591 int recovery = weapon_recovery + | |
| 2592 armour_recovery + | |
| 2593 shield_recovery | |
| 2594 - armsmaster_recovery_reduction | |
| 2595 - weapon_enchantment_recovery_reduction | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2596 - hasteRecoveryReduction |
| 816 | 2597 - sword_axe_bow_recovery_reduction |
| 2598 - player_speed_recovery_reduction; | |
| 2599 | |
| 2600 if (recovery < 0) | |
| 2601 recovery = 0; | |
| 2602 return recovery; | |
| 0 | 2603 } |
| 2604 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2605 |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2606 //----- new -------------------------------------------------------- |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2607 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
|
2608 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2609 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
|
2610 switch (skill_mastery) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2611 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2612 case 1: return mult1; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2613 case 2: return mult2; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2614 case 3: return mult3; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2615 case 4: return mult4; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2616 } |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2617 Error("Unexpected input value: %d", armour_skill_type); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2618 return 0; |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2619 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2620 |
| 0 | 2621 //----- (0048E4F8) -------------------------------------------------------- |
| 2622 int Player::GetMaxHealth() | |
| 2623 { | |
| 2624 int v3; // esi@1 | |
| 2625 int v4; // esi@1 | |
| 2626 int v6; // esi@1 | |
| 2627 | |
| 1036 | 2628 v3 = GetParameterBonus(GetActualEndurance()); |
| 135 | 2629 v4 = pBaseHealthPerLevelByClass[classType] * (GetActualLevel() + v3); |
| 0 | 2630 v6 = uFullHealthBonus |
| 135 | 2631 + pBaseHealthByClass[classType / 4] |
| 0 | 2632 + GetSkillBonus(CHARACTER_ATTRIBUTE_HEALTH) |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2633 + GetItemsBonus(CHARACTER_ATTRIBUTE_HEALTH) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2634 return max(1, v6); |
| 0 | 2635 } |
| 2636 | |
| 2637 //----- (0048E565) -------------------------------------------------------- | |
| 2638 int Player::GetMaxMana() | |
| 2639 { | |
| 2640 int v2; // eax@2 | |
| 2641 int v3; // esi@4 | |
| 2642 int v4; // eax@5 | |
| 2643 int v5; // esi@5 | |
| 2644 int v6; // eax@5 | |
| 2645 int v7; // esi@6 | |
| 2646 int v8; // esi@6 | |
| 2647 int v9; // esi@6 | |
| 1116 | 2648 |
| 135 | 2649 switch (classType) |
| 0 | 2650 { |
| 1116 | 2651 case PLAYER_CLASS_ROGUE: |
| 2652 case PLAYER_CLASS_SPY: | |
| 2653 case PLAYER_CLASS_ASSASSIN: | |
| 2654 case PLAYER_CLASS_ARCHER: | |
| 2655 case PLAYER_CLASS_WARRIOR_MAGE: | |
| 2656 case PLAYER_CLASS_MASTER_ARCHER: | |
| 2657 case PLAYER_CLASS_SNIPER: | |
| 2658 case PLAYER_CLASS_SORCERER: | |
| 2659 case PLAYER_CLASS_WIZARD: | |
| 2660 case PLAYER_CLASS_ARCHMAGE: | |
| 2661 case PLAYER_CLASS_LICH: | |
| 0 | 2662 v2 = GetActualIntelligence(); |
| 1036 | 2663 v3 = GetParameterBonus(v2); |
| 1116 | 2664 break; |
| 2665 case PLAYER_CLASS_INITIATE: | |
| 2666 case PLAYER_CLASS_MASTER: | |
| 2667 case PLAYER_CLASS_NINJA: | |
| 2668 case PLAYER_CLASS_PALADIN: | |
| 2669 case PLAYER_CLASS_CRUSADER: | |
| 2670 case PLAYER_CLASS_HERO: | |
| 2671 case PLAYER_CLASS_VILLIAN: | |
| 2672 case PLAYER_CLASS_CLERIC: | |
| 2673 case PLAYER_CLASS_PRIEST: | |
| 2674 case PLAYER_CLASS_PRIEST_OF_SUN: | |
| 2675 case PLAYER_CLASS_PRIEST_OF_MOON: | |
| 0 | 2676 v2 = GetActualWillpower(); |
| 1036 | 2677 v3 = GetParameterBonus(v2); |
| 1116 | 2678 break; |
| 2679 case PLAYER_CLASS_HUNTER: | |
| 2680 case PLAYER_CLASS_RANGER_LORD: | |
| 2681 case PLAYER_CLASS_BOUNTY_HUNTER: | |
| 2682 case PLAYER_CLASS_DRUID: | |
| 2683 case PLAYER_CLASS_GREAT_DRUID: | |
| 2684 case PLAYER_CLASS_ARCH_DRUID: | |
| 2685 case PLAYER_CLASS_WARLOCK: | |
| 0 | 2686 v4 = GetActualWillpower(); |
| 1036 | 2687 v5 = GetParameterBonus(v4); |
| 0 | 2688 v6 = GetActualIntelligence(); |
| 1036 | 2689 v3 = GetParameterBonus(v6) + v5; |
| 0 | 2690 break; |
| 2691 default: | |
| 1116 | 2692 return 0; |
| 0 | 2693 break; |
| 2694 } | |
| 1116 | 2695 v7 = pBaseManaPerLevelByClass[classType] * (GetActualLevel() + v3); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2696 v8 = GetItemsBonus(CHARACTER_ATTRIBUTE_MANA) + v7; |
| 1116 | 2697 v9 = uFullManaBonus |
| 2698 + pBaseManaByClass[classType / 4] | |
| 2699 + GetSkillBonus(CHARACTER_ATTRIBUTE_MANA) | |
| 2700 + v8; | |
| 2701 return max(0,v9); | |
| 0 | 2702 } |
| 2703 | |
| 2704 //----- (0048E656) -------------------------------------------------------- | |
| 2705 int Player::GetBaseAC() | |
| 2706 { | |
| 2707 int v2; // eax@1 | |
| 2708 int v3; // esi@1 | |
| 2709 int v4; // esi@1 | |
| 2710 int v5; // esi@1 | |
| 2711 | |
| 2712 v2 = GetActualSpeed(); | |
| 1036 | 2713 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2714 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2715 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2716 return max(0, v5); |
| 0 | 2717 } |
| 2718 | |
| 2719 //----- (0048E68F) -------------------------------------------------------- | |
| 2720 int Player::GetActualAC() | |
| 2721 { | |
| 2722 int v2; // eax@1 | |
| 2723 int v3; // esi@1 | |
| 2724 int v4; // esi@1 | |
| 2725 int v5; // esi@1 | |
| 2726 int v6; // esi@1 | |
| 2727 | |
| 2728 v2 = GetActualSpeed(); | |
| 1036 | 2729 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2730 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2731 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2732 v6 = this->sACModifier + GetMagicalBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v5; |
|
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2733 return max(0, v6); |
| 0 | 2734 } |
| 2735 | |
| 2736 //----- (0048E6DC) -------------------------------------------------------- | |
| 2737 unsigned int Player::GetBaseAge() | |
| 2738 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2739 return (unsigned int)(((__int64)(pParty->uTimePlayed * 0.234375) / 60 / 60 / 24) / 7 / 4 / 12 - uBirthYear + game_starting_year); |
| 0 | 2740 } |
| 2741 | |
| 2742 //----- (0048E72C) -------------------------------------------------------- | |
| 2743 unsigned int Player::GetActualAge() | |
| 2744 { | |
| 2745 return this->sAgeModifier + GetBaseAge(); | |
| 2746 } | |
| 2747 | |
| 2748 //----- (0048E73F) -------------------------------------------------------- | |
| 2749 int Player::GetBaseResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2750 { | |
| 2751 int v7; // esi@20 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2752 int racialBonus = 0; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2753 __int16* resStat; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2754 |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2755 switch (a2) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2756 { |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2757 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2758 resStat = &sResFireBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2759 if (IsRaceGoblin()) |
|
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_AIR: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2763 resStat = &sResAirBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2764 if (IsRaceGoblin()) |
|
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_WATER: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2768 resStat = &sResWaterBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2769 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2770 racialBonus = 5; |
|
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_EARTH: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2773 resStat = &sResEarthBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2774 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2775 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2776 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2777 case CHARACTER_ATTRIBUTE_RESIST_MIND: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2778 resStat = &sResMindBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2779 if (IsRaceElf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2780 racialBonus = 10; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2781 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2782 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2783 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2784 resStat = &sResBodyBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2785 if (IsRaceHuman()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2786 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2787 break; |
| 1783 | 2788 default: |
| 2789 Error("Unknown attribute"); | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2790 } |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2791 v7 = GetItemsBonus(a2) + racialBonus; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2792 return v7 + *resStat; |
| 0 | 2793 } |
| 2794 | |
| 2795 //----- (0048E7D0) -------------------------------------------------------- | |
| 2796 int Player::GetActualResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2797 { | |
|
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
|
2798 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
|
2799 __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
|
2800 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
|
2801 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
|
2802 |
|
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 int leatherArmorSkillLevel = GetActualSkillLevel(PLAYER_SKILL_LEATHER); |
| 652 | 2804 if ( CheckHiredNPCSpeciality(Enchanter) ) |
| 0 | 2805 v10 = 20; |
| 2806 if ( (a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE | |
| 2807 || a2 == CHARACTER_ATTRIBUTE_RESIST_AIR | |
| 2808 || a2 == CHARACTER_ATTRIBUTE_RESIST_WATER | |
| 2809 || 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
|
2810 && SkillToMastery(leatherArmorSkillLevel) == 4 |
| 0 | 2811 && HasItemEquipped(EQUIP_ARMOUR) |
| 2812 && 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
|
2813 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
|
2814 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
|
2815 { |
| 1783 | 2816 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
| 2817 resStat = &sResFireBonus; | |
| 2818 break; | |
| 2819 case CHARACTER_ATTRIBUTE_RESIST_AIR: | |
| 2820 resStat = &sResAirBonus; | |
| 2821 break; | |
| 2822 case CHARACTER_ATTRIBUTE_RESIST_WATER: | |
| 2823 resStat = &sResWaterBonus; | |
| 2824 break; | |
| 2825 case CHARACTER_ATTRIBUTE_RESIST_EARTH: | |
| 2826 resStat = &sResEarthBonus; | |
| 2827 break; | |
| 2828 case CHARACTER_ATTRIBUTE_RESIST_MIND: | |
| 2829 resStat = &sResMindBonus; | |
| 2830 break; | |
| 2831 case CHARACTER_ATTRIBUTE_RESIST_BODY: | |
| 2832 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: | |
| 2833 resStat = &sResBodyBonus; | |
| 2834 break; | |
| 2835 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
|
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 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
|
2838 result = v10 + GetMagicalBonus(a2) + baseRes + *(resStat); |
| 0 | 2839 return result; |
| 2840 } | |
| 2841 | |
| 2842 //----- (0048E8F5) -------------------------------------------------------- | |
| 816 | 2843 bool Player::Recover(int dt) |
| 2844 { | |
|
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
|
2845 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
|
2846 |
|
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
|
2847 v3 = (int)(dt * GetSpecialItemBonus(17) * 0.01 + dt); |
| 816 | 2848 |
|
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
|
2849 //Log::Warning(L"Recover(dt = %u/%u - %u", dt, (uint)v3, (uint)uTimeToRecovery); |
| 816 | 2850 |
| 2851 if (uTimeToRecovery > v3) | |
| 2852 { | |
| 2853 uTimeToRecovery -= v3; | |
| 2854 return true; | |
| 0 | 2855 } |
| 2856 else | |
| 2857 { | |
| 816 | 2858 uTimeToRecovery = 0; |
| 2859 viewparams->bRedrawGameUI = true; | |
| 2860 if (!uActiveCharacter) | |
| 0 | 2861 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 2862 return false; |
| 2863 } | |
| 0 | 2864 } |
| 2865 | |
| 2866 //----- (0048E96A) -------------------------------------------------------- | |
| 816 | 2867 void Player::SetRecoveryTime(signed int rec) |
| 2868 { | |
| 1545 | 2869 Assert(rec >= 0); |
| 816 | 2870 |
| 2871 if (rec > uTimeToRecovery) | |
| 2872 uTimeToRecovery = rec; | |
| 2873 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2874 if (uActiveCharacter != 0 && pPlayers[uActiveCharacter] == this && !some_active_character) |
| 0 | 2875 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 2876 |
| 2877 viewparams->bRedrawGameUI = true; | |
| 0 | 2878 } |
| 2879 // 50C0C4: using guessed type int some_active_character; | |
| 2880 | |
| 2881 //----- (0048E9B7) -------------------------------------------------------- | |
| 2882 void Player::RandomizeName() | |
| 2883 { | |
| 2884 if (!uExpressionTimePassed) | |
| 2885 strcpy(pName, pNPCStats->pNPCNames[rand() % pNPCStats->uNumNPCNames[uSex]][uSex]); | |
| 2886 } | |
| 2887 | |
| 2888 //----- (0048E9F4) -------------------------------------------------------- | |
| 2889 unsigned int Player::GetMajorConditionIdx() | |
| 2890 { | |
| 2891 for (uint i = 0; i < 18; ++i) | |
| 2892 if (pConditions[pConditionImportancyTable[i]] != 0) | |
| 2893 return pConditionImportancyTable[i]; | |
| 2894 | |
| 2895 return 18; | |
| 2896 } | |
| 2897 | |
| 2898 //----- (0048EA1B) -------------------------------------------------------- | |
| 1036 | 2899 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
|
2900 { |
| 1036 | 2901 int i; // eax@1 |
| 2902 i = 0; | |
| 2903 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
|
2904 { |
|
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
|
2905 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
|
2906 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
|
2907 ++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 } |
| 1036 | 2909 return parameter_to_bonus_value[i]; |
| 0 | 2910 } |
| 2911 | |
| 2912 //----- (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
|
2913 int Player::GetSpecialItemBonus( int enchantmentId ) |
| 0 | 2914 { |
| 1989 | 2915 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
|
2916 { |
|
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 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
|
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 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
|
2920 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2921 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
|
2922 return 50; |
| 1032 | 2923 } |
|
1598
11bb463837b1
_48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus, forgot to commit actor.cpp
Grumpy7
parents:
1597
diff
changeset
|
2924 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
|
2925 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2926 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
|
2927 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
|
2928 } |
|
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
|
2929 } |
|
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
|
2930 } |
| 1032 | 2931 return 0; |
| 0 | 2932 } |
| 2933 | |
| 2934 //----- (0048EAAE) -------------------------------------------------------- | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2935 int Player::GetItemsBonus( enum CHARACTER_ATTRIBUTE_TYPE attr, bool getOnlyMainHandDmg /*= false*/ ) |
| 0 | 2936 { |
| 2937 int v5; // edi@1 | |
| 2938 int v9; // eax@49 | |
| 2939 int v14; // ecx@58 | |
| 2940 int v15; // eax@58 | |
| 2941 int v17; // eax@62 | |
| 2942 int v22; // eax@76 | |
| 2943 int v25; // ecx@80 | |
| 2944 int v26; // edi@80 | |
| 2945 int v32; // eax@98 | |
| 2946 int v56; // eax@365 | |
| 2947 signed int v58; // [sp-4h] [bp-20h]@10 | |
| 2948 int v61; // [sp+10h] [bp-Ch]@1 | |
| 2949 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
|
2950 ItemGen *currEquippedItem; // [sp+20h] [bp+4h]@101 |
| 1040 | 2951 bool no_skills; |
| 0 | 2952 |
| 2953 v5 = 0; | |
| 2954 v62 = 0; | |
| 2955 v61 = 0; | |
| 1040 | 2956 |
| 2957 no_skills=false; | |
| 0 | 2958 switch (attr) |
| 1599 | 2959 { |
| 2960 case CHARACTER_ATTRIBUTE_SKILL_ALCHEMY: v58 = PLAYER_SKILL_ALCHEMY; break; | |
| 2961 case CHARACTER_ATTRIBUTE_SKILL_STEALING: v58 = PLAYER_SKILL_STEALING; break; | |
| 2962 case CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM: v58 = PLAYER_SKILL_TRAP_DISARM; break; | |
| 2963 case CHARACTER_ATTRIBUTE_SKILL_ITEM_ID: v58 = PLAYER_SKILL_ITEM_ID; break; | |
| 2964 case CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID: v58 = PLAYER_SKILL_MONSTER_ID; break; | |
| 2965 case CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER: v58 = PLAYER_SKILL_ARMSMASTER; break; | |
| 2966 case CHARACTER_ATTRIBUTE_SKILL_DODGE: v58 = PLAYER_SKILL_DODGE; break; | |
| 2967 case CHARACTER_ATTRIBUTE_SKILL_UNARMED: v58 = PLAYER_SKILL_UNARMED; break; | |
| 2968 case CHARACTER_ATTRIBUTE_SKILL_FIRE: v58 = PLAYER_SKILL_FIRE; break; | |
| 2969 case CHARACTER_ATTRIBUTE_SKILL_AIR: v58 = PLAYER_SKILL_AIR; break; | |
| 2970 case CHARACTER_ATTRIBUTE_SKILL_WATER: v58 = PLAYER_SKILL_WATER; break; | |
| 2971 case CHARACTER_ATTRIBUTE_SKILL_EARTH: v58 = PLAYER_SKILL_EARTH; break; | |
| 2972 case CHARACTER_ATTRIBUTE_SKILL_SPIRIT: v58 = PLAYER_SKILL_SPIRIT; break; | |
| 2973 case CHARACTER_ATTRIBUTE_SKILL_MIND: v58 = PLAYER_SKILL_MIND; break; | |
| 2974 case CHARACTER_ATTRIBUTE_SKILL_BODY: v58 = PLAYER_SKILL_BODY; break; | |
| 2975 case CHARACTER_ATTRIBUTE_SKILL_LIGHT: v58 = PLAYER_SKILL_LIGHT; break; | |
| 2976 case CHARACTER_ATTRIBUTE_SKILL_DARK: v58 = PLAYER_SKILL_DARK; break; | |
| 2977 case CHARACTER_ATTRIBUTE_SKILL_MEDITATION: v58 = PLAYER_SKILL_MEDITATION; break; | |
| 2978 case CHARACTER_ATTRIBUTE_SKILL_BOW: v58 = PLAYER_SKILL_BOW; break; | |
| 2979 case CHARACTER_ATTRIBUTE_SKILL_SHIELD: v58 = PLAYER_SKILL_SHIELD; break; | |
| 2980 case CHARACTER_ATTRIBUTE_SKILL_LEARNING: v58 = PLAYER_SKILL_LEARNING; break; | |
| 2981 default: | |
| 1040 | 2982 no_skills=true; |
| 1599 | 2983 } |
| 1040 | 2984 if (!no_skills) |
| 1599 | 2985 { |
| 2986 if ( !this->pActiveSkills[v58] ) | |
| 2987 return 0; | |
| 2988 } | |
| 1040 | 2989 |
|
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
|
2990 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
|
2991 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2992 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
|
2993 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: |
| 0 | 2994 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
|
2995 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
|
2996 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
|
2997 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
|
2998 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 case CHARACTER_ATTRIBUTE_RANGED_DMG_MIN: |
| 0 | 3000 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
|
3001 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
|
3002 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
|
3003 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
|
3004 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
|
3005 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
|
3006 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 case CHARACTER_ATTRIBUTE_RANGED_DMG_MAX: |
| 0 | 3008 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
|
3009 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
|
3010 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
|
3011 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
|
3012 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
|
3013 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3014 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
|
3015 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
|
3016 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
|
3017 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
|
3018 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
|
3019 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3021 if ( IsUnarmed() ) |
| 0 | 3022 { |
|
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
|
3023 return 3; |
| 0 | 3024 } |
| 3025 else | |
| 3026 { | |
| 1989 | 3027 if ( this->HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 0 | 3028 { |
| 1989 | 3029 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
|
3030 if ( v22 >= 0 && v22 <= 2) |
| 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 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
|
3033 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
|
3034 if ( GetOffHandItem() != nullptr || mainHandItem->GetPlayerSkillType() != 4 ) |
| 0 | 3035 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3036 v25 = mainHandItem->GetDamageDice(); |
| 0 | 3037 } |
| 3038 else | |
| 3039 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3040 v25 = mainHandItem->GetDamageDice() + 1; |
| 0 | 3041 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3042 v5 = mainHandItem->GetDamageMod() + v25 * v26; |
| 0 | 3043 } |
| 3044 } | |
| 1989 | 3045 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
|
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 return v5; |
| 1040 | 3048 } |
|
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
|
3049 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
|
3050 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3051 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
|
3052 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
|
3053 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
|
3054 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
|
3055 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3056 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3057 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
|
3058 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3060 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
|
3061 if ( IsUnarmed() ) |
| 1040 | 3062 { |
|
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
|
3063 return 0; |
| 1040 | 3064 } |
| 1989 | 3065 if ( this->HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 0 | 3066 { |
| 1989 | 3067 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
|
3068 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
|
3069 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3070 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
|
3071 } |
| 0 | 3072 } |
| 1989 | 3073 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
|
3074 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
|
3075 else |
| 0 | 3076 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3077 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
|
3078 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
|
3079 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3081 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3082 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
|
3083 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
|
3084 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3085 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
|
3086 } |
| 1989 | 3087 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
|
3088 { |
| 1989 | 3089 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
|
3090 if ( v9 >= 0 && v9 <= 2) |
| 0 | 3091 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3092 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
|
3093 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
|
3094 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
|
3095 if ( GetOffHandItem() == nullptr && mainHandItem->GetPlayerSkillType() == 4) |
| 0 | 3096 { |
|
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
|
3097 ++v5; |
| 0 | 3098 } |
| 3099 } | |
| 3100 } | |
|
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 |
| 1989 | 3102 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
|
3103 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3105 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3107 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3108 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
|
3109 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
|
3110 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
|
3111 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
|
3112 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3114 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3116 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
|
3117 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
|
3118 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
|
3119 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
|
3120 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
|
3121 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
|
3122 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
|
3123 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
|
3124 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
|
3125 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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_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
|
3127 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
|
3128 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
|
3129 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
|
3130 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
|
3131 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
|
3132 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
|
3133 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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_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
|
3135 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
|
3136 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
|
3137 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
|
3138 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
|
3139 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
|
3140 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
|
3141 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
|
3142 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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_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
|
3144 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
|
3145 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
|
3146 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
|
3147 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
|
3148 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
|
3149 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
|
3150 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
|
3151 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
|
3152 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
|
3153 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
|
3154 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
|
3155 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
|
3156 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
|
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 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 1040 | 3159 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3160 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
|
3161 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
|
3162 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3163 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
|
3164 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
|
3165 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3166 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
|
3167 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3168 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3169 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
|
3170 && !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
|
3171 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3172 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
|
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 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
|
3175 { |
| 2156 | 3176 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
|
3177 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3178 if ( attr > CHARACTER_ATTRIBUTE_RESIST_BODY && v5 < currEquippedItem->m_enchantmentStrength ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3179 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
|
3180 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
|
3181 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
|
3182 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3185 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3186 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
|
3187 } |
| 1040 | 3188 } |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3189 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3190 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
|
3191 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
|
3192 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
|
3193 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
|
3194 } |
| 0 | 3195 } |
| 3196 | |
| 3197 //----- (0048F73C) -------------------------------------------------------- | |
| 3198 int Player::GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 3199 { | |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3200 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
|
3201 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
|
3202 |
| 0 | 3203 switch ( a2 ) |
| 3204 { | |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3205 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
|
3206 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
|
3207 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
|
3208 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3209 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
|
3210 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
|
3211 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
|
3212 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3213 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
|
3214 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
|
3215 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
|
3216 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3217 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
|
3218 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
|
3219 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
|
3220 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3221 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
|
3222 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
|
3223 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
|
3224 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3225 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
|
3226 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
|
3227 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
|
3228 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3229 case CHARACTER_ATTRIBUTE_ATTACK: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3230 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
|
3231 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
|
3232 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3233 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
|
3234 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
|
3235 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
|
3236 break; |
| 0 | 3237 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
|
3238 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
|
3239 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
|
3240 break; |
| 0 | 3241 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
|
3242 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
|
3243 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
|
3244 break; |
| 0 | 3245 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
|
3246 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
|
3247 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
|
3248 break; |
| 0 | 3249 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
|
3250 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
|
3251 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
|
3252 break; |
| 0 | 3253 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
|
3254 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
|
3255 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
|
3256 break; |
| 0 | 3257 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
|
3258 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
|
3259 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
|
3260 break; |
| 0 | 3261 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
|
3262 v3 = pPlayerBuffs[PLAYER_BUFF_LUCK].uPower; |
| 1167 | 3263 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
|
3264 break; |
| 0 | 3265 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
|
3266 v3 = this->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uPower; |
| 1167 | 3267 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
|
3268 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3269 } |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3270 return v3 + v4; |
| 0 | 3271 } |
| 3272 | |
| 3273 //----- (0048F882) -------------------------------------------------------- | |
| 1008 | 3274 int Player::GetActualSkillLevel( PLAYER_SKILL_TYPE uSkillType ) |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3275 { |
| 1064 | 3276 signed int bonus_value; // esi@1 |
| 3277 unsigned __int16 skill_value; // ax@126 | |
| 3278 int result; // al@127 | |
| 353 | 3279 |
| 1064 | 3280 bonus_value = 0; |
| 353 | 3281 switch (uSkillType) |
| 3282 { | |
| 3283 case PLAYER_SKILL_MONSTER_ID: | |
| 3284 { | |
| 652 | 3285 if ( CheckHiredNPCSpeciality(Hunter) ) |
| 1064 | 3286 bonus_value = 6; |
| 652 | 3287 if ( CheckHiredNPCSpeciality(Sage) ) |
| 1064 | 3288 bonus_value += 6; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3289 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID); |
| 353 | 3290 } |
| 3291 break; | |
| 3292 | |
| 3293 case PLAYER_SKILL_ARMSMASTER: | |
| 3294 { | |
| 652 | 3295 if ( CheckHiredNPCSpeciality(Armsmaster) ) |
| 1064 | 3296 bonus_value = 2; |
| 652 | 3297 if ( CheckHiredNPCSpeciality(Weaponsmaster) ) |
| 1064 | 3298 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3299 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER); |
| 353 | 3300 } |
| 3301 break; | |
| 3302 | |
| 3303 case PLAYER_SKILL_STEALING: | |
| 3304 { | |
| 652 | 3305 if (CheckHiredNPCSpeciality(Burglar)) |
| 1064 | 3306 bonus_value = 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3307 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_STEALING); |
| 353 | 3308 } |
| 3309 break; | |
| 3310 | |
| 3311 | |
| 3312 case PLAYER_SKILL_ALCHEMY: | |
| 3313 { | |
| 652 | 3314 if ( CheckHiredNPCSpeciality(Herbalist) ) |
| 1064 | 3315 bonus_value = 4; |
| 652 | 3316 if ( CheckHiredNPCSpeciality(Apothecary) ) |
| 1064 | 3317 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3318 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ALCHEMY); |
| 353 | 3319 } |
| 3320 break; | |
| 3321 | |
| 3322 case PLAYER_SKILL_LEARNING: | |
| 3323 { | |
| 652 | 3324 if ( CheckHiredNPCSpeciality(Teacher) ) |
| 1064 | 3325 bonus_value = 10; |
| 652 | 3326 if ( CheckHiredNPCSpeciality(Instructor) ) |
| 1064 | 3327 bonus_value += 15; |
| 652 | 3328 if ( CheckHiredNPCSpeciality(Scholar) ) |
| 1064 | 3329 bonus_value += 5; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3330 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LEARNING); |
| 353 | 3331 } |
| 3332 break; | |
| 3333 | |
| 3334 case PLAYER_SKILL_UNARMED: | |
| 3335 { | |
| 652 | 3336 if (CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3337 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3338 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_UNARMED); |
| 353 | 3339 } |
| 3340 break; | |
| 3341 | |
| 3342 case PLAYER_SKILL_DODGE: | |
| 3343 { | |
| 652 | 3344 if ( CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3345 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3346 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DODGE); |
| 353 | 3347 } |
| 3348 break; | |
| 3349 | |
| 3350 case PLAYER_SKILL_BOW: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3351 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BOW); |
| 353 | 3352 break; |
| 3353 case PLAYER_SKILL_SHIELD: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3354 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SHIELD); |
| 353 | 3355 break; |
| 3356 | |
| 3357 case PLAYER_SKILL_EARTH: | |
| 652 | 3358 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3359 bonus_value = 2; |
| 652 | 3360 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3361 bonus_value += 3; |
| 652 | 3362 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3363 bonus_value += 4; |
| 353 | 3364 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3365 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3366 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_EARTH); |
| 353 | 3367 break; |
| 3368 case PLAYER_SKILL_FIRE: | |
| 652 | 3369 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3370 bonus_value = 2; |
| 652 | 3371 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3372 bonus_value += 3; |
| 652 | 3373 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3374 bonus_value += 4; |
| 353 | 3375 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3376 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3377 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_FIRE); |
| 353 | 3378 break; |
| 3379 case PLAYER_SKILL_AIR: | |
| 652 | 3380 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3381 bonus_value = 2; |
| 652 | 3382 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3383 bonus_value += 3; |
| 652 | 3384 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3385 bonus_value += 4; |
| 353 | 3386 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3387 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3388 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_AIR); |
| 353 | 3389 break; |
| 3390 case PLAYER_SKILL_WATER: | |
| 652 | 3391 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3392 bonus_value = 2; |
| 652 | 3393 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3394 bonus_value += 3; |
| 652 | 3395 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3396 bonus_value += 4; |
| 353 | 3397 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3398 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3399 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_WATER); |
| 353 | 3400 break; |
| 3401 case PLAYER_SKILL_SPIRIT: | |
| 652 | 3402 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3403 bonus_value = 2; |
| 652 | 3404 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3405 bonus_value += 3; |
| 652 | 3406 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3407 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3408 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SPIRIT); |
| 353 | 3409 break; |
| 3410 case PLAYER_SKILL_MIND: | |
| 652 | 3411 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3412 bonus_value = 2; |
| 652 | 3413 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3414 bonus_value += 3; |
| 652 | 3415 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3416 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3417 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MIND); |
| 353 | 3418 break; |
| 3419 case PLAYER_SKILL_BODY: | |
| 652 | 3420 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3421 bonus_value = 2; |
| 652 | 3422 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3423 bonus_value += 3; |
| 652 | 3424 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3425 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3426 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BODY); |
| 353 | 3427 break; |
| 3428 case PLAYER_SKILL_LIGHT: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3429 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LIGHT); |
| 353 | 3430 break; |
| 3431 case PLAYER_SKILL_DARK: | |
| 3432 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3433 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DARK); |
| 353 | 3434 } |
| 3435 break; | |
| 3436 | |
| 3437 case PLAYER_SKILL_MERCHANT: | |
| 3438 { | |
| 652 | 3439 if ( CheckHiredNPCSpeciality(Trader) ) |
| 1064 | 3440 bonus_value = 4; |
| 652 | 3441 if ( CheckHiredNPCSpeciality(Merchant) ) |
| 1064 | 3442 bonus_value += 6; |
| 652 | 3443 if ( CheckHiredNPCSpeciality(Gypsy) ) |
| 1064 | 3444 bonus_value += 3; |
| 652 | 3445 if ( CheckHiredNPCSpeciality(Duper) ) |
| 1064 | 3446 bonus_value += 8; |
| 353 | 3447 } |
| 3448 break; | |
| 3449 | |
| 3450 case PLAYER_SKILL_PERCEPTION: | |
| 3451 { | |
| 652 | 3452 if ( CheckHiredNPCSpeciality(Scout) ) |
| 1064 | 3453 bonus_value = 6; |
| 652 | 3454 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1064 | 3455 bonus_value += 5; |
| 353 | 3456 } |
| 3457 break; | |
| 3458 | |
| 0 | 3459 case PLAYER_SKILL_ITEM_ID: |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3460 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ITEM_ID); |
| 0 | 3461 break; |
| 3462 case PLAYER_SKILL_MEDITATION: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3463 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MEDITATION); |
| 353 | 3464 break; |
| 0 | 3465 case PLAYER_SKILL_TRAP_DISARM: |
| 353 | 3466 { |
| 652 | 3467 if ( CheckHiredNPCSpeciality(Tinker) ) |
| 1064 | 3468 bonus_value = 4; |
| 652 | 3469 if ( CheckHiredNPCSpeciality(Locksmith) ) |
| 1064 | 3470 bonus_value += 6; |
| 652 | 3471 if ( CheckHiredNPCSpeciality(Burglar) ) |
| 1064 | 3472 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3473 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM); |
| 353 | 3474 } |
| 3475 break; | |
| 3476 } | |
| 3477 | |
| 1064 | 3478 skill_value = pActiveSkills[uSkillType]; |
| 3479 if ( bonus_value + (skill_value & 0x3F) < 60 ) | |
| 3480 result = bonus_value + skill_value; | |
| 0 | 3481 else |
| 1064 | 3482 result = skill_value & 0xFFFC | 0x3C; //al |
| 0 | 3483 return result; |
| 3484 } | |
| 3485 | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3486 |
| 0 | 3487 //----- (0048FC00) -------------------------------------------------------- |
| 1538 | 3488 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
|
3489 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3490 int armsMasterBonus; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3491 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3492 armsMasterBonus = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3493 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
|
3494 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
|
3495 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3496 int multiplier = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3497 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
|
3498 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3499 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
|
3500 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3501 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
|
3502 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3503 multiplier = GetMultiplierForSkillLevel(armmaster_skill, 0, 1, 1, 2); |
| 1064 | 3504 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3505 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
|
3506 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3507 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3508 switch(inSkill) |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3509 { |
|
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 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
|
3511 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
|
3512 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 int bowSkillLevel = GetActualSkillLevel(PLAYER_SKILL_DODGE); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3514 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
|
3515 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
|
3516 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 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
|
3518 break; |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3519 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
|
3520 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 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
|
3522 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
|
3523 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
|
3524 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3525 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3526 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
|
3527 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 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
|
3529 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
|
3530 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
|
3531 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3532 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3533 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
|
3534 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3535 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
|
3536 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
|
3537 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
|
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 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
|
3540 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3541 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
|
3542 if (currItem != nullptr && (!currItem->IsBroken())) |
| 1538 | 3543 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3544 PLAYER_SKILL_TYPE itemSkillType = (PLAYER_SKILL_TYPE)currItem->GetPlayerSkillType(); |
| 1976 | 3545 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
|
3546 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
|
3547 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
|
3548 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3549 case PLAYER_SKILL_STAFF: |
| 1976 | 3550 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3551 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
|
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_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
|
3554 case PLAYER_SKILL_SPEAR: |
| 1976 | 3555 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3556 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
|
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_SHIELD: |
| 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, 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
|
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_LEATHER: |
| 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 wearingLeather = 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, 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
|
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 case PLAYER_SKILL_CHAIN: |
| 1976 | 3569 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
|
3570 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3571 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
|
3572 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
|
3573 case PLAYER_SKILL_PLATE: |
| 1976 | 3574 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
|
3575 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3576 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
|
3577 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
|
3578 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 ACSum += multiplier * (currArmorSkillLevel & 0x3F); |
| 1538 | 3580 } |
|
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
|
3581 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3582 |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3583 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
|
3584 int dodgeMastery = SkillToMastery(dodgeSkillLevel); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3585 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
|
3586 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
|
3587 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3588 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
|
3589 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3590 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
|
3591 } |
| 1538 | 3592 break; |
| 3593 case CHARACTER_ATTRIBUTE_ATTACK: | |
| 3594 if ( this->IsUnarmed() ) | |
| 3595 { | |
| 3596 int unarmedSkill = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3597 if (!unarmedSkill) | |
| 3598 { | |
| 3599 return 0; | |
| 3600 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3601 int multiplier = GetMultiplierForSkillLevel(unarmedSkill, 0, 1, 2, 2); |
| 1538 | 3602 return armsMasterBonus + multiplier * (unarmedSkill & 0x3F); |
| 3603 } | |
| 3604 for (int i = 0; i < 16; ++i) | |
| 3605 { | |
| 3606 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3607 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3608 ItemGen* currItem = GetNthEquippedIndexItem(i); |
| 1989 | 3609 if ( currItem->GetItemEquipType() <= EQUIP_TWO_HANDED) |
| 1533 | 3610 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3611 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItem->GetPlayerSkillType(); |
| 1538 | 3612 int currentItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 3613 if (currItemSkillType == PLAYER_SKILL_BLASTER) | |
| 3614 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3615 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); |
| 1538 | 3616 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3617 } | |
| 3618 else if (currItemSkillType == PLAYER_SKILL_STAFF && this->GetActualSkillLevel(PLAYER_SKILL_UNARMED) > 0) | |
| 3619 { | |
| 3620 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
|
3621 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 2, 2); |
| 1538 | 3622 return multiplier * (unarmedSkillLevel & 0x3F) + armsMasterBonus + (currentItemSkillLevel & 0x3F); |
| 3623 } | |
| 3624 else | |
| 3625 { | |
| 3626 return armsMasterBonus + (currentItemSkillLevel & 0x3F); | |
| 3627 } | |
| 3628 } | |
| 3629 } | |
| 3630 } | |
| 3631 return 0; | |
| 3632 break; | |
| 3633 | |
| 3634 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: | |
| 3635 for (int i = 0; i < 16; i++) | |
| 3636 { | |
| 3637 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3638 { | |
| 2068 | 3639 ItemGen* currItemPtr = GetNthEquippedIndexItem(i); |
| 3640 if ( currItemPtr->GetItemEquipType() == EQUIP_TWO_HANDED || currItemPtr->GetItemEquipType() == EQUIP_SINGLE_HANDED ) | |
| 1538 | 3641 { |
| 2068 | 3642 PLAYER_SKILL_TYPE currentItemSkillType = (PLAYER_SKILL_TYPE)GetNthEquippedIndexItem(i)->GetPlayerSkillType(); |
| 3643 int currentItemSkillLevel = this->GetActualSkillLevel(currentItemSkillType); | |
| 3644 if ( currentItemSkillType == PLAYER_SKILL_BOW ) | |
| 3645 { | |
| 3646 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 1, 1); | |
| 3647 return multiplier * (currentItemSkillLevel & 0x3F); | |
| 3648 } | |
| 3649 else if ( currentItemSkillType == PLAYER_SKILL_BLASTER ) | |
| 3650 { | |
| 3651 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); | |
| 3652 return multiplier * (currentItemSkillLevel & 0x3F); | |
| 3653 } | |
| 1538 | 3654 } |
| 3655 } | |
| 3656 } | |
| 3657 return 0; | |
| 3658 break; | |
| 3659 | |
| 3660 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: | |
| 3661 if ( this->IsUnarmed() ) | |
| 3662 { | |
| 3663 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3664 if ( !unarmedSkillLevel ) | |
| 3665 { | |
| 3666 return 0; | |
| 3667 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3668 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 3669 return multiplier * (unarmedSkillLevel & 0x3F); |
| 3670 } | |
| 3671 for (int i = 0; i < 16; i++) | |
| 3672 { | |
| 3673 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3674 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3675 ItemGen* currItemPtr = GetNthEquippedIndexItem(i); |
| 1989 | 3676 if ( currItemPtr->GetItemEquipType() == EQUIP_TWO_HANDED || currItemPtr->GetItemEquipType() == EQUIP_SINGLE_HANDED ) |
| 1538 | 3677 { |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
3678 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItemPtr->GetPlayerSkillType(); |
| 1538 | 3679 int currItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 3680 int baseSkillBonus; | |
| 3681 int multiplier; | |
| 3682 switch (currItemSkillType) | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3683 { |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3684 case PLAYER_SKILL_STAFF: |
| 1538 | 3685 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
|
3686 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3687 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
|
3688 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 3689 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
|
3690 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3691 else |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3692 { |
| 1538 | 3693 return armsMasterBonus; |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3694 } |
| 1538 | 3695 break; |
| 3696 | |
| 3697 case PLAYER_SKILL_DAGGER: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3698 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 1); |
| 1538 | 3699 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3700 return armsMasterBonus + baseSkillBonus; | |
| 3701 break; | |
| 3702 case PLAYER_SKILL_SWORD: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3703 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 0); |
| 1538 | 3704 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3705 return armsMasterBonus + baseSkillBonus; | |
| 3706 break; | |
| 3707 case PLAYER_SKILL_MACE: | |
| 3708 case PLAYER_SKILL_SPEAR: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3709 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 1, 1, 1); |
| 1538 | 3710 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3711 return armsMasterBonus + baseSkillBonus; | |
| 3712 break; | |
| 3713 case PLAYER_SKILL_AXE: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3714 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 1, 1); |
| 1538 | 3715 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3716 return armsMasterBonus + baseSkillBonus; | |
| 3717 break; | |
| 1535 | 3718 } |
| 1533 | 3719 } |
| 1535 | 3720 } |
| 1538 | 3721 } |
| 3722 return 0; | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3723 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3724 default: |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3725 return 0; |
| 1533 | 3726 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3727 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3728 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3729 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
|
3730 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3731 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
|
3732 switch (masteryLvl) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3733 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3734 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
|
3735 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
|
3736 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
|
3737 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
|
3738 } |
| 1545 | 3739 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
|
3740 return 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3741 } |
| 0 | 3742 //----- (00490109) -------------------------------------------------------- |
| 3743 // faces are: 0 1 2 3 human males | |
| 3744 // 4 5 6 7 human females | |
| 3745 // 8 9 elf males | |
| 3746 // 10 11 elf females | |
| 3747 // 12 13 dwarf males | |
| 3748 // 14 15 dwarf females | |
| 3749 // 16 17 goblin males | |
| 3750 // 18 19 goblin females | |
| 3751 // 20 lich male | |
| 3752 // 21 lich female | |
| 3753 // 22 underwater suits (unused) | |
| 3754 // 23 zombie male | |
| 3755 // 24 zombie female | |
| 3756 enum CHARACTER_RACE Player::GetRace() | |
| 3757 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3758 if ( uCurrentFace <= 7 ) |
|
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 return CHARACTER_RACE_HUMAN; |
|
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 else if ( uCurrentFace <= 11 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3763 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3764 return CHARACTER_RACE_ELF; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3765 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3766 else if ( uCurrentFace <= 15 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3767 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3768 return CHARACTER_RACE_DWARF; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3769 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3770 else if ( uCurrentFace <= 19 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3771 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3772 return CHARACTER_RACE_GOBLIN; |
| 0 | 3773 } |
| 3774 else | |
| 3775 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3776 return CHARACTER_RACE_HUMAN; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3777 } |
| 0 | 3778 } |
| 3779 | |
| 3780 //----- (00490141) -------------------------------------------------------- | |
| 187 | 3781 PLAYER_SEX Player::GetSexByVoice() |
| 0 | 3782 { |
| 3783 switch ( this->uVoiceID ) | |
| 3784 { | |
| 3785 case 0u: | |
| 3786 case 1u: | |
| 3787 case 2u: | |
| 3788 case 3u: | |
| 3789 case 8u: | |
| 3790 case 9u: | |
| 3791 case 0xCu: | |
| 3792 case 0xDu: | |
| 3793 case 0x10u: | |
| 3794 case 0x11u: | |
| 3795 case 0x14u: | |
| 3796 case 0x17u: | |
| 187 | 3797 return SEX_MALE; |
| 3798 | |
| 0 | 3799 case 4u: |
| 3800 case 5u: | |
| 3801 case 6u: | |
| 3802 case 7u: | |
| 3803 case 0xAu: | |
| 3804 case 0xBu: | |
| 3805 case 0xEu: | |
| 3806 case 0xFu: | |
| 3807 case 0x12u: | |
| 3808 case 0x13u: | |
| 3809 case 0x15u: | |
| 3810 case 0x18u: | |
| 187 | 3811 return SEX_FEMALE; |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3812 } |
| 1545 | 3813 Error("(%u)", this->uVoiceID); |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3814 return SEX_MALE; |
| 0 | 3815 } |
| 3816 | |
| 3817 //----- (00490188) -------------------------------------------------------- | |
| 3818 void Player::SetInitialStats() | |
| 3819 { | |
| 1980 | 3820 CHARACTER_RACE v1 = GetRace(); |
| 290 | 3821 uMight = StatTable[v1][0].uBaseValue; |
| 3822 uIntelligence = StatTable[v1][1].uBaseValue; | |
| 3823 uWillpower = StatTable[v1][2].uBaseValue; | |
| 3824 uEndurance = StatTable[v1][3].uBaseValue; | |
| 3825 uAccuracy = StatTable[v1][4].uBaseValue; | |
| 3826 uSpeed = StatTable[v1][5].uBaseValue; | |
| 3827 uLuck = StatTable[v1][6].uBaseValue; | |
| 0 | 3828 } |
| 3829 | |
| 3830 //----- (004901FC) -------------------------------------------------------- | |
| 1021 | 3831 void Player::SetSexByVoice() |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3832 { |
| 1021 | 3833 switch ( this->uVoiceID) |
| 0 | 3834 { |
| 3835 case 0: | |
| 3836 case 1: | |
| 3837 case 2: | |
| 3838 case 3: | |
| 3839 case 8: | |
| 3840 case 9: | |
| 3841 case 0xC: | |
| 3842 case 0xD: | |
| 3843 case 0x10: | |
| 3844 case 0x11: | |
| 3845 case 0x14: | |
| 3846 case 0x17: | |
| 1021 | 3847 this->uSex = SEX_MALE; |
| 0 | 3848 break; |
| 3849 case 4: | |
| 3850 case 5: | |
| 3851 case 6: | |
| 3852 case 7: | |
| 3853 case 0xA: | |
| 3854 case 0xB: | |
| 3855 case 0xE: | |
| 3856 case 0xF: | |
| 3857 case 0x12: | |
| 3858 case 0x13: | |
| 3859 case 0x15: | |
| 3860 case 0x18: | |
| 1021 | 3861 this->uSex = SEX_FEMALE; |
| 0 | 3862 break; |
| 3863 default: | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3864 Error("(%u)", this->uVoiceID); |
| 0 | 3865 break; |
| 3866 } | |
| 1021 | 3867 |
| 0 | 3868 } |
| 3869 | |
| 3870 //----- (0049024A) -------------------------------------------------------- | |
| 135 | 3871 void Player::Reset(PLAYER_CLASS_TYPE cls) |
| 0 | 3872 { |
| 3873 sLevelModifier = 0; | |
| 3874 sAgeModifier = 0; | |
| 3875 | |
| 135 | 3876 classType = cls; |
| 0 | 3877 uLuckBonus = 0; |
| 3878 uSpeedBonus = 0; | |
| 3879 uAccuracyBonus = 0; | |
| 3880 uEnduranceBonus = 0; | |
| 3881 uWillpowerBonus = 0; | |
| 3882 uIntelligenceBonus = 0; | |
| 3883 uMightBonus = 0; | |
| 3884 uLevel = 1; | |
| 3885 uExperience = 251 + rand() % 100; | |
| 3886 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
|
3887 pActiveSkills.fill(0); |
|
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
3888 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
|
3889 memset(&spellbook, 0, sizeof(spellbook)); |
| 0 | 3890 |
| 3891 for (uint i = 0; i < 37; ++i) | |
| 3892 { | |
| 135 | 3893 if (pSkillAvailabilityPerClass[classType / 4][i] != 2) |
| 0 | 3894 continue; |
| 3895 | |
| 3896 pActiveSkills[i] = 1; | |
| 3897 | |
| 3898 switch (i) | |
| 3899 { | |
| 886 | 3900 case PLAYER_SKILL_FIRE: |
| 3901 spellbook.pFireSpellbook.bIsSpellAvailable[0] = true;//its temporary, for test spells | |
| 894 | 3902 |
| 3903 extern bool all_magic; | |
| 3904 if ( all_magic == true ) | |
| 3905 { | |
| 3906 pActiveSkills[PLAYER_SKILL_AIR] = 1; | |
| 3907 pActiveSkills[PLAYER_SKILL_WATER] = 1; | |
| 3908 pActiveSkills[PLAYER_SKILL_EARTH] = 1; | |
| 3909 spellbook.pFireSpellbook.bIsSpellAvailable[1] = true; | |
| 3910 spellbook.pFireSpellbook.bIsSpellAvailable[2] = true; | |
| 3911 spellbook.pFireSpellbook.bIsSpellAvailable[3] = true; | |
| 3912 spellbook.pFireSpellbook.bIsSpellAvailable[4] = true; | |
| 3913 spellbook.pFireSpellbook.bIsSpellAvailable[5] = true; | |
| 3914 spellbook.pFireSpellbook.bIsSpellAvailable[6] = true; | |
| 3915 spellbook.pFireSpellbook.bIsSpellAvailable[7] = true; | |
| 3916 spellbook.pFireSpellbook.bIsSpellAvailable[8] = true; | |
| 3917 spellbook.pFireSpellbook.bIsSpellAvailable[9] = true; | |
| 3918 spellbook.pFireSpellbook.bIsSpellAvailable[10] = true; | |
| 886 | 3919 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; |
| 569 | 3920 spellbook.pAirSpellbook.bIsSpellAvailable[1] = true; |
| 3921 spellbook.pAirSpellbook.bIsSpellAvailable[2] = true; | |
| 3922 spellbook.pAirSpellbook.bIsSpellAvailable[3] = true; | |
| 3923 spellbook.pAirSpellbook.bIsSpellAvailable[4] = true; | |
| 3924 spellbook.pAirSpellbook.bIsSpellAvailable[5] = true; | |
| 3925 spellbook.pAirSpellbook.bIsSpellAvailable[6] = true; | |
| 3926 spellbook.pAirSpellbook.bIsSpellAvailable[7] = true; | |
| 3927 spellbook.pAirSpellbook.bIsSpellAvailable[8] = true; | |
| 3928 spellbook.pAirSpellbook.bIsSpellAvailable[9] = true; | |
| 3929 spellbook.pAirSpellbook.bIsSpellAvailable[10] = true; | |
| 3930 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 3931 spellbook.pWaterSpellbook.bIsSpellAvailable[1] = true; | |
| 3932 spellbook.pWaterSpellbook.bIsSpellAvailable[2] = true; | |
| 3933 spellbook.pWaterSpellbook.bIsSpellAvailable[3] = true; | |
| 3934 spellbook.pWaterSpellbook.bIsSpellAvailable[4] = true; | |
| 3935 spellbook.pWaterSpellbook.bIsSpellAvailable[5] = true; | |
| 710 | 3936 spellbook.pWaterSpellbook.bIsSpellAvailable[6] = true; |
| 3937 spellbook.pWaterSpellbook.bIsSpellAvailable[7] = true; | |
| 3938 spellbook.pWaterSpellbook.bIsSpellAvailable[8] = true; | |
| 886 | 3939 spellbook.pWaterSpellbook.bIsSpellAvailable[9] = true; |
| 3940 spellbook.pWaterSpellbook.bIsSpellAvailable[10] = true; | |
| 894 | 3941 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; |
| 3942 spellbook.pEarthSpellbook.bIsSpellAvailable[1] = true; | |
| 3943 spellbook.pEarthSpellbook.bIsSpellAvailable[2] = true; | |
| 3944 spellbook.pEarthSpellbook.bIsSpellAvailable[3] = true; | |
| 3945 spellbook.pEarthSpellbook.bIsSpellAvailable[4] = true; | |
| 3946 spellbook.pEarthSpellbook.bIsSpellAvailable[5] = true; | |
| 3947 spellbook.pEarthSpellbook.bIsSpellAvailable[6] = true; | |
| 3948 spellbook.pEarthSpellbook.bIsSpellAvailable[7] = true; | |
| 3949 spellbook.pEarthSpellbook.bIsSpellAvailable[8] = true; | |
| 3950 spellbook.pEarthSpellbook.bIsSpellAvailable[9] = true; | |
| 3951 spellbook.pEarthSpellbook.bIsSpellAvailable[10] = true; | |
| 3952 } | |
| 486 | 3953 break; |
| 886 | 3954 case PLAYER_SKILL_AIR: |
| 3955 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; | |
| 3956 break; | |
| 3957 case PLAYER_SKILL_WATER: | |
| 3958 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 3959 break; | |
| 3960 case PLAYER_SKILL_EARTH: | |
| 3961 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; | |
| 3962 break; | |
| 3963 case PLAYER_SKILL_SPIRIT: | |
| 3964 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; | |
| 3965 break; | |
| 3966 case PLAYER_SKILL_MIND: | |
| 3967 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; | |
| 3968 break; | |
| 3969 case PLAYER_SKILL_BODY: | |
| 3970 spellbook.pBodySpellbook.bIsSpellAvailable[0] = true; | |
| 894 | 3971 |
| 3972 if ( all_magic == true ) | |
| 3973 { | |
| 3974 pActiveSkills[PLAYER_SKILL_MIND] = 1; | |
| 3975 pActiveSkills[PLAYER_SKILL_SPIRIT] = 1; | |
| 3976 spellbook.pBodySpellbook.bIsSpellAvailable[1] = true; | |
| 3977 spellbook.pBodySpellbook.bIsSpellAvailable[2] = true; | |
| 3978 spellbook.pBodySpellbook.bIsSpellAvailable[3] = true; | |
| 3979 spellbook.pBodySpellbook.bIsSpellAvailable[4] = true; | |
| 3980 spellbook.pBodySpellbook.bIsSpellAvailable[5] = true; | |
| 3981 spellbook.pBodySpellbook.bIsSpellAvailable[6] = true; | |
| 3982 spellbook.pBodySpellbook.bIsSpellAvailable[7] = true; | |
| 3983 spellbook.pBodySpellbook.bIsSpellAvailable[8] = true; | |
| 3984 spellbook.pBodySpellbook.bIsSpellAvailable[9] = true; | |
| 3985 spellbook.pBodySpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 3986 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 3987 spellbook.pMindSpellbook.bIsSpellAvailable[1] = true; |
| 3988 spellbook.pMindSpellbook.bIsSpellAvailable[2] = true; | |
| 3989 spellbook.pMindSpellbook.bIsSpellAvailable[3] = true; | |
| 3990 spellbook.pMindSpellbook.bIsSpellAvailable[4] = true; | |
| 3991 spellbook.pMindSpellbook.bIsSpellAvailable[5] = true; | |
| 3992 spellbook.pMindSpellbook.bIsSpellAvailable[6] = true; | |
| 3993 spellbook.pMindSpellbook.bIsSpellAvailable[7] = true; | |
| 3994 spellbook.pMindSpellbook.bIsSpellAvailable[8] = true; | |
| 3995 spellbook.pMindSpellbook.bIsSpellAvailable[9] = true; | |
| 3996 spellbook.pMindSpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 3997 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 3998 spellbook.pSpiritSpellbook.bIsSpellAvailable[1] = true; |
| 3999 spellbook.pSpiritSpellbook.bIsSpellAvailable[2] = true; | |
| 4000 spellbook.pSpiritSpellbook.bIsSpellAvailable[3] = true; | |
| 4001 spellbook.pSpiritSpellbook.bIsSpellAvailable[4] = true; | |
| 4002 spellbook.pSpiritSpellbook.bIsSpellAvailable[5] = true; | |
| 4003 spellbook.pSpiritSpellbook.bIsSpellAvailable[6] = true; | |
| 4004 spellbook.pSpiritSpellbook.bIsSpellAvailable[7] = true; | |
| 4005 spellbook.pSpiritSpellbook.bIsSpellAvailable[8] = true; | |
| 4006 spellbook.pSpiritSpellbook.bIsSpellAvailable[9] = true; | |
| 4007 spellbook.pSpiritSpellbook.bIsSpellAvailable[10] = true; | |
| 4008 } | |
| 569 | 4009 break; |
| 886 | 4010 case PLAYER_SKILL_LIGHT: |
| 4011 spellbook.pLightSpellbook.bIsSpellAvailable[0] = true; | |
| 4012 break; | |
| 4013 case PLAYER_SKILL_DARK: | |
| 4014 spellbook.pDarkSpellbook.bIsSpellAvailable[0] = true; | |
| 4015 break; | |
| 0 | 4016 } |
| 4017 } | |
| 4018 | |
| 4019 sHealth = GetMaxHealth(); | |
| 4020 sMana = GetMaxMana(); | |
| 4021 } | |
| 4022 | |
| 4023 //----- (004903C9) -------------------------------------------------------- | |
| 821 | 4024 PLAYER_SKILL_TYPE Player::GetSkillIdxByOrder(signed int order) |
| 4025 { | |
|
1271
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4026 int counter; // edx@5 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4027 bool canBeInactive; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4028 unsigned char requiredValue; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4029 signed int offset; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4030 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4031 if ( order <= 1 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4032 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4033 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4034 requiredValue = 2; // 2 - primary skill |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4035 offset = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4036 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4037 else if ( order <= 3 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4038 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4039 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4040 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4041 offset = 2; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4042 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4043 else if ( order <= 12 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4044 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4045 canBeInactive = true; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4046 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4047 offset = 4; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4048 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4049 else |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4050 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4051 return (PLAYER_SKILL_TYPE)37; |
|
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 counter = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4054 for (int i = 0; i < 37; i++) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4055 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4056 if ( (this->pActiveSkills[i] || canBeInactive) && pSkillAvailabilityPerClass[classType / 4][i] == requiredValue ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4057 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4058 if ( counter == order - offset ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4059 return (PLAYER_SKILL_TYPE)i; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4060 ++counter; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4061 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4062 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4063 |
|
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
|
4064 return (PLAYER_SKILL_TYPE)37; |
| 0 | 4065 } |
| 4066 | |
| 4067 | |
| 4068 | |
| 4069 //----- (0049048D) -------------------------------------------------------- | |
| 4070 //unsigned __int16 PartyCreation_BtnMinusClick(Player *_this, int eAttribute) | |
| 4071 void Player::DecreaseAttribute(int eAttribute) | |
| 4072 { | |
| 4073 int pBaseValue; // ecx@1 | |
| 4074 int pDroppedStep; // ebx@1 | |
| 4075 int pStep; // esi@1 | |
| 4076 int uMinValue; // [sp+Ch] [bp-4h]@1 | |
| 4077 | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4078 int raceId = GetRace(); |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4079 pBaseValue = StatTable[raceId][eAttribute].uBaseValue; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4080 pDroppedStep = StatTable[raceId][eAttribute].uDroppedStep; |
| 0 | 4081 uMinValue = pBaseValue - 2; |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4082 pStep = StatTable[raceId][eAttribute].uBaseStep; |
| 1272 | 4083 unsigned short* AttrToChange = nullptr; |
| 4084 switch ( eAttribute ) | |
| 4085 { | |
| 4086 case CHARACTER_ATTRIBUTE_STRENGTH: | |
| 4087 AttrToChange = &this->uMight; | |
| 4088 break; | |
| 4089 case CHARACTER_ATTRIBUTE_INTELLIGENCE: | |
| 4090 AttrToChange = &this->uIntelligence; | |
| 4091 break; | |
| 4092 case CHARACTER_ATTRIBUTE_WILLPOWER: | |
| 4093 AttrToChange = &this->uWillpower; | |
| 4094 break; | |
| 4095 case CHARACTER_ATTRIBUTE_ENDURANCE: | |
| 4096 AttrToChange = &this->uEndurance; | |
| 4097 break; | |
| 4098 case CHARACTER_ATTRIBUTE_ACCURACY: | |
| 4099 AttrToChange = &this->uAccuracy; | |
| 4100 break; | |
| 4101 case CHARACTER_ATTRIBUTE_SPEED: | |
| 4102 AttrToChange = &this->uSpeed; | |
| 4103 break; | |
| 4104 case CHARACTER_ATTRIBUTE_LUCK: | |
| 4105 AttrToChange = &this->uLuck; | |
| 4106 break; | |
| 4107 } | |
| 4108 if ( *AttrToChange <= pBaseValue ) | |
| 4109 pStep = pDroppedStep; | |
| 4110 if ( *AttrToChange - pStep >= uMinValue ) | |
| 4111 *AttrToChange -= pStep; | |
| 0 | 4112 } |
| 4113 | |
| 4114 //----- (004905F5) -------------------------------------------------------- | |
| 1458 | 4115 //signed int PartyCreation_BtnPlusClick(Player *this, int eAttribute) |
| 1273 | 4116 void Player::IncreaseAttribute( int eAttribute ) |
| 4117 { | |
| 4118 int raceId; // eax@1 | |
| 4119 int maxValue; // ebx@1 | |
| 4120 signed int baseStep; // edi@1 | |
| 4121 signed int tmp; // eax@17 | |
| 0 | 4122 signed int result; // eax@18 |
| 1273 | 4123 int baseValue; // [sp+Ch] [bp-8h]@1 |
| 4124 signed int droppedStep; // [sp+10h] [bp-4h]@1 | |
| 4125 unsigned short* statToChange; | |
| 4126 | |
| 4127 raceId = GetRace(); | |
| 4128 maxValue = StatTable[raceId][eAttribute].uMaxValue; | |
| 4129 baseStep = StatTable[raceId][eAttribute].uBaseStep; | |
| 4130 baseValue = StatTable[raceId][eAttribute].uBaseValue; | |
| 4131 droppedStep = StatTable[raceId][eAttribute].uDroppedStep; | |
| 4132 PlayerCreation_GetUnspentAttributePointCount(); | |
| 4133 switch ( eAttribute ) | |
| 4134 { | |
| 4135 case 0: | |
| 4136 statToChange = &this->uMight; | |
| 4137 break; | |
| 4138 case 1: | |
| 4139 statToChange = &this->uIntelligence; | |
| 4140 break; | |
| 4141 case 2: | |
| 4142 statToChange = &this->uWillpower; | |
| 4143 break; | |
| 4144 case 3: | |
| 4145 statToChange = &this->uEndurance; | |
| 4146 break; | |
| 4147 case 4: | |
| 4148 statToChange = &this->uAccuracy; | |
| 4149 break; | |
| 4150 case 5: | |
| 4151 statToChange = &this->uSpeed; | |
| 4152 break; | |
| 4153 case 6: | |
| 4154 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
|
4155 break; |
| 1273 | 4156 default: |
| 1545 | 4157 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
|
4158 break; |
| 1273 | 4159 } |
| 4160 if ( *statToChange < baseValue ) | |
| 4161 { | |
| 4162 tmp = baseStep; | |
| 4163 baseStep = droppedStep; | |
| 4164 droppedStep = tmp; | |
| 4165 } | |
| 4166 result = PlayerCreation_GetUnspentAttributePointCount(); | |
| 4167 if ( result >= droppedStep ) | |
| 4168 { | |
| 4169 if ( baseStep + *statToChange <= maxValue ) | |
| 4170 *statToChange += baseStep; | |
| 4171 } | |
| 0 | 4172 } |
| 4173 | |
| 4174 //----- (0049070F) -------------------------------------------------------- | |
| 4175 void Player::Zero() | |
| 4176 { | |
| 4177 this->sLevelModifier = 0; | |
| 4178 this->sACModifier = 0; | |
| 4179 this->uLuckBonus = 0; | |
| 4180 this->uAccuracyBonus = 0; | |
| 4181 this->uSpeedBonus = 0; | |
| 4182 this->uEnduranceBonus = 0; | |
| 4183 this->uWillpowerBonus = 0; | |
| 4184 this->uIntelligenceBonus = 0; | |
| 4185 this->uMightBonus = 0; | |
| 4186 this->field_100 = 0; | |
| 4187 this->field_FC = 0; | |
| 4188 this->field_F8 = 0; | |
| 4189 this->field_F4 = 0; | |
| 4190 this->field_F0 = 0; | |
| 4191 this->field_EC = 0; | |
| 4192 this->field_E8 = 0; | |
| 4193 this->field_E4 = 0; | |
| 4194 this->field_E0 = 0; | |
| 766 | 4195 memset(&this->sResFireBonus, 0, 0x16u); |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4196 this->field_1A97 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4197 this->_ranged_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4198 this->field_1A95 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4199 this->_ranged_atk_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4200 this->field_1A93 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4201 this->_melee_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4202 this->field_1A91 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4203 this->_some_attack_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4204 this->_mana_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4205 this->uFullManaBonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4206 this->_health_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4207 this->uFullHealthBonus = 0; |
| 0 | 4208 } |
| 4209 | |
| 4210 //----- (004907E7) -------------------------------------------------------- | |
| 299 | 4211 unsigned int Player::GetStatColor(int uStat) |
| 0 | 4212 { |
| 290 | 4213 int attribute_value; // edx@1 |
| 1393 | 4214 |
| 4215 int base_attribute_value = StatTable[GetRace()][uStat].uBaseValue; | |
| 0 | 4216 switch (uStat) |
| 4217 { | |
| 4218 case 0: attribute_value = uMight; break; | |
| 4219 case 1: attribute_value = uIntelligence; break; | |
| 4220 case 2: attribute_value = uWillpower; break; | |
| 4221 case 3: attribute_value = uEndurance; break; | |
| 290 | 4222 case 4: attribute_value = uAccuracy; break; |
| 4223 case 5: attribute_value = uSpeed; break; | |
| 0 | 4224 case 6: attribute_value = uLuck; break; |
| 1783 | 4225 default: Error("Unexpected attribute"); |
| 0 | 4226 }; |
| 4227 | |
| 1393 | 4228 if (attribute_value == base_attribute_value) |
| 4229 return ui_character_stat_default_color; | |
| 4230 else if (attribute_value > base_attribute_value) | |
| 4231 return ui_character_stat_buffed_color; | |
| 0 | 4232 else |
| 1393 | 4233 return ui_character_stat_debuffed_color; |
| 0 | 4234 } |
| 4235 | |
| 4236 //----- (004908A8) -------------------------------------------------------- | |
| 4237 bool Player::DiscardConditionIfLastsLongerThan(unsigned int uCondition, unsigned __int64 uTime) | |
| 4238 { | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
4239 if ( pConditions[uCondition] && (uTime < (unsigned long long)pConditions[uCondition]) ) |
| 1014 | 4240 { |
| 1393 | 4241 pConditions[uCondition] = 0i64; |
| 1014 | 4242 return true; |
| 0 | 4243 } |
| 4244 else | |
| 1014 | 4245 return false; |
| 0 | 4246 } |
| 4247 | |
| 4248 //----- (004680ED) -------------------------------------------------------- | |
| 1019 | 4249 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
|
4250 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4251 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
|
4252 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
|
4253 int v8; // edx@39 |
| 1838 | 4254 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
|
4255 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
|
4256 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
|
4257 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
|
4258 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
|
4259 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
|
4260 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
|
4261 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
|
4262 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
|
4263 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
|
4264 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
|
4265 __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
|
4266 __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
|
4267 __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
|
4268 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
|
4269 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
|
4270 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
|
4271 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
|
4272 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
|
4273 signed int v73; // [sp+24h] [bp-8h]@1 |
| 1838 | 4274 const char* v74; // [sp+24h] [bp-8h]@23 |
|
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
|
4275 Player *thisb; // [sp+28h] [bp-4h]@1 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4276 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
|
4277 |
|
f5b13e6be493
Player::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 thisb = this; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4279 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
|
4280 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
|
4281 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
|
4282 return; |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4283 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
|
4284 { |
|
f5b13e6be493
Player::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 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
|
4286 { |
|
f5b13e6be493
Player::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 playerAffected->SetCondition(Condition_Poison1, 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4288 } |
|
f5b13e6be493
Player::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 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
|
4290 { |
|
f5b13e6be493
Player::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->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
|
4292 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
|
4293 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
|
4294 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
|
4295 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
|
4296 } |
|
f5b13e6be493
Player::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 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
|
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 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
|
4300 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
|
4301 } |
|
f5b13e6be493
Player::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 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
|
4303 { |
|
f5b13e6be493
Player::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 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
|
4305 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
|
4306 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
|
4307 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
|
4308 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
|
4309 } |
|
f5b13e6be493
Player::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 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
|
4311 |
|
f5b13e6be493
Player::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 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
|
4313 { |
|
f5b13e6be493
Player::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 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
|
4315 } |
|
f5b13e6be493
Player::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 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
|
4317 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4318 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
|
4319 { |
|
f5b13e6be493
Player::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 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
|
4321 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
|
4322 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
|
4323 } |
|
f5b13e6be493
Player::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 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
|
4325 { |
| 1684 | 4326 thisb->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4327 } |
|
f5b13e6be493
Player::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 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
|
4330 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
|
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 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4333 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
|
4334 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4335 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
|
4336 { |
|
f5b13e6be493
Player::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 221: //Catalyst |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4338 playerAffected->SetCondition(Condition_Poison1, 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4339 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
|
4340 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
|
4341 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
|
4342 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
|
4343 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
|
4344 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
|
4345 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
|
4346 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
|
4347 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
|
4348 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
|
4349 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
|
4350 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
|
4351 playerAffected->PlaySound(SPEECH_36, 0); |
| 2059 | 4352 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
|
4353 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
|
4354 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
|
4355 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
|
4356 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
|
4357 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
|
4358 case 225: //Cure Disease |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4359 playerAffected->pConditions[Condition_Disease3] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4360 playerAffected->pConditions[Condition_Disease2] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4361 playerAffected->pConditions[Condition_Disease1] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4362 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
|
4363 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
|
4364 case 226: //Cure Poison |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4365 playerAffected->pConditions[Condition_Poison3] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4366 playerAffected->pConditions[Condition_Poison2] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4367 playerAffected->pConditions[Condition_Poison1] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4368 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
|
4369 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
|
4370 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
|
4371 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
|
4372 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
|
4373 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
|
4374 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
|
4375 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
|
4376 { |
| 1021 | 4377 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4378 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
|
4379 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
|
4380 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4381 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
|
4382 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
|
4383 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4384 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
|
4385 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
|
4386 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
|
4387 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
|
4388 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4389 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
|
4390 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
|
4391 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
|
4392 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
|
4393 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
|
4394 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4395 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
|
4396 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
|
4397 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
|
4398 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
|
4399 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
|
4400 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4401 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
|
4402 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
|
4403 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
|
4404 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
|
4405 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4406 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
|
4407 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
|
4408 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
|
4409 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
|
4410 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335), |
| 1822 | 4411 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
|
4412 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
|
4413 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
|
4414 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
|
4415 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
|
4416 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
|
4417 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
|
4418 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
|
4419 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
|
4420 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
|
4421 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
|
4422 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
|
4423 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
|
4424 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
|
4425 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
|
4426 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
|
4427 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4428 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
|
4429 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
|
4430 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
|
4431 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
|
4432 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
|
4433 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4434 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
|
4435 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
|
4436 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
|
4437 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
|
4438 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
|
4439 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4440 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
|
4441 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
|
4442 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
|
4443 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
|
4444 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
|
4445 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4446 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
|
4447 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
|
4448 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
|
4449 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
|
4450 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
|
4451 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4452 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
|
4453 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
|
4454 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
|
4455 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
|
4456 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
|
4457 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4458 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
|
4459 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
|
4460 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
|
4461 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
|
4462 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
|
4463 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4464 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
|
4465 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
|
4466 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
|
4467 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
|
4468 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
|
4469 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
|
4470 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
|
4471 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
|
4472 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
|
4473 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
|
4474 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
|
4475 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
|
4476 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
|
4477 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
|
4478 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
|
4479 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
|
4480 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
|
4481 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
|
4482 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
|
4483 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
|
4484 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
|
4485 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
|
4486 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
|
4487 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
|
4488 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
|
4489 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
|
4490 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4491 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
|
4492 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
|
4493 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
|
4494 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
|
4495 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
|
4496 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4497 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
|
4498 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
|
4499 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
|
4500 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
|
4501 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
|
4502 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4503 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
|
4504 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
|
4505 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
|
4506 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
|
4507 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
|
4508 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4509 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
|
4510 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
|
4511 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
|
4512 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
|
4513 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
|
4514 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4515 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
|
4516 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
|
4517 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
|
4518 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
|
4519 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
|
4520 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4521 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
|
4522 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
|
4523 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
|
4524 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
|
4525 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
|
4526 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4527 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
|
4528 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
|
4529 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
|
4530 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
|
4531 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
|
4532 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
|
4533 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
|
4534 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
|
4535 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
|
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->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
|
4538 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
|
4539 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4540 playerAffected->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
|
4541 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
|
4542 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
|
4543 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
|
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->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
|
4546 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
|
4547 } |
|
f5b13e6be493
Player::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 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
|
4549 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
|
4550 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
|
4551 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
|
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->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
|
4554 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
|
4555 } |
|
f5b13e6be493
Player::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 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
|
4557 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
|
4558 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
|
4559 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
|
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->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
|
4562 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
|
4563 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4564 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4565 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4566 case 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
|
4567 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
|
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->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
|
4570 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
|
4571 } |
|
f5b13e6be493
Player::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 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
|
4573 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
|
4574 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
|
4575 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
|
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->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
|
4578 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
|
4579 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4580 playerAffected->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
|
4581 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
|
4582 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
|
4583 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
|
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->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
|
4586 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
|
4587 } |
|
f5b13e6be493
Player::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->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
|
4589 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
|
4590 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
|
4591 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
|
4592 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
|
4593 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
|
4594 |
|
f5b13e6be493
Player::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 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
|
4596 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
|
4597 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
|
4598 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
|
4599 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
|
4600 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
|
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 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
|
4603 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
|
4604 { |
|
f5b13e6be493
Player::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 // 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
|
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 // 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
|
4608 // 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
|
4609 // } |
|
f5b13e6be493
Player::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 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
|
4611 } |
|
f5b13e6be493
Player::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 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
|
4613 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4614 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
|
4615 { |
|
f5b13e6be493
Player::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 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
|
4617 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
|
4618 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
|
4619 } |
|
f5b13e6be493
Player::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 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
|
4621 { |
| 1684 | 4622 thisb->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4623 } |
|
f5b13e6be493
Player::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 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
|
4626 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
|
4627 } |
|
f5b13e6be493
Player::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 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4630 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
|
4631 { |
|
f5b13e6be493
Player::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 if ( pCurrentScreen == SCREEN_CASTING ) |
| 1032 | 4633 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
|
4634 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
|
4635 { |
|
f5b13e6be493
Player::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 |
|
f5b13e6be493
Player::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 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
|
4638 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
|
4639 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
|
4640 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
|
4641 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
|
4642 } |
|
f5b13e6be493
Player::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 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
|
4644 { |
|
f5b13e6be493
Player::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 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
|
4646 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
|
4647 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
|
4648 } |
| 2154 | 4649 |
|
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
|
4650 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
|
4651 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
|
4652 { |
|
f5b13e6be493
Player::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 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
|
4654 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
|
4655 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
|
4656 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
|
4657 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
|
4658 _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
|
4659 } |
|
f5b13e6be493
Player::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 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
|
4661 { |
|
f5b13e6be493
Player::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 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
|
4663 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
|
4664 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
|
4665 && (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
|
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 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
|
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 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4670 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
|
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 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4673 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
|
4674 { |
|
f5b13e6be493
Player::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 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
|
4676 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
|
4677 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
|
4678 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4679 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
|
4680 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
|
4681 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4682 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4683 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
|
4684 } |
|
f5b13e6be493
Player::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 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
|
4686 { |
|
f5b13e6be493
Player::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 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
|
4688 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v66);//"That player is %s" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4689 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
|
4690 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4691 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
|
4692 } |
|
f5b13e6be493
Player::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 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
|
4694 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
|
4695 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
|
4696 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
|
4697 { |
| 1032 | 4698 case 0: v67 = 4; break; |
| 4699 case 1: v67 = 7; break; | |
| 4700 case 2: v67 = 10; break; | |
| 4701 case 3: v67 = 11; break; | |
| 4702 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
|
4703 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
|
4704 } |
| 1032 | 4705 |
|
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
|
4706 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
|
4707 { |
|
f5b13e6be493
Player::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 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
|
4709 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[381], v22); //"You don't have the skill to learn %s" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4710 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
|
4711 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
|
4712 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
|
4713 } |
|
f5b13e6be493
Player::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 // v72 = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4715 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
|
4716 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
|
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 |
|
f5b13e6be493
Player::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 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
|
4720 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4721 if ( !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
|
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 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
|
4724 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
|
4725 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4726 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
|
4727 } |
|
f5b13e6be493
Player::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 // 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
|
4729 // { |
|
f5b13e6be493
Player::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 // 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
|
4731 // { |
|
f5b13e6be493
Player::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 // 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
|
4733 // 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
|
4734 // 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
|
4735 // } |
|
f5b13e6be493
Player::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 // 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
|
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 // 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
|
4739 // } |
|
f5b13e6be493
Player::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 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
|
4742 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
|
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 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4745 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
|
4746 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4747 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
|
4748 { |
|
f5b13e6be493
Player::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 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
|
4750 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
|
4751 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
|
4752 } |
|
f5b13e6be493
Player::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 v68 = aCharacterConditionNames[playerAffected->GetMajorConditionIdx()]; |
| 2156 | 4754 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68);//That player is %s |
| 4755 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
|
4756 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
|
4757 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
|
4758 } |
|
f5b13e6be493
Player::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 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
|
4760 { |
|
f5b13e6be493
Player::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->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
|
4762 { |
|
f5b13e6be493
Player::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 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
|
4764 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
|
4765 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
|
4766 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
|
4767 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
|
4768 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
|
4769 { |
|
f5b13e6be493
Player::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 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
|
4771 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
|
4772 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
|
4773 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
|
4774 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
|
4775 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
|
4776 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
|
4777 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
|
4778 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
|
4779 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
|
4780 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
|
4781 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
|
4782 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
|
4783 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
|
4784 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
|
4785 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
|
4786 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
|
4787 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
|
4788 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
|
4789 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
|
4790 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
|
4791 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
|
4792 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
|
4793 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
|
4794 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
|
4795 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
|
4796 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
|
4797 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
|
4798 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
|
4799 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
|
4800 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
|
4801 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
|
4802 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
|
4803 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
|
4804 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
|
4805 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
|
4806 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
|
4807 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
|
4808 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
|
4809 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
|
4810 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
|
4811 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
|
4812 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
|
4813 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
|
4814 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
|
4815 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
|
4816 switch (v8) |
| 1032 | 4817 { |
|
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 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
|
4819 playerAffected->sResFireBase += thisa; |
| 2156 | 4820 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
|
4821 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
|
4822 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
|
4823 playerAffected->sResAirBase += thisa; |
| 2156 | 4824 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
|
4825 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
|
4826 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
|
4827 playerAffected->sResWaterBase += thisa; |
| 2156 | 4828 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
|
4829 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
|
4830 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
|
4831 playerAffected->sResEarthBase += thisa; |
| 2156 | 4832 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
|
4833 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
|
4834 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
|
4835 playerAffected->sResMindBase += thisa; |
| 2156 | 4836 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
|
4837 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
|
4838 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
|
4839 playerAffected->sResBodyBase += thisa; |
| 2156 | 4840 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
|
4841 break; |
| 1783 | 4842 default: ("Unexpected attribute"); |
| 4843 return; | |
| 1021 | 4844 } |
| 2156 | 4845 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
|
4846 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
|
4847 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4848 } |
|
f5b13e6be493
Player::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 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
|
4850 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
|
4851 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
|
4852 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
|
4853 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
|
4854 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
|
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 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
|
4857 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
|
4858 } |
|
f5b13e6be493
Player::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 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
|
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 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
|
4862 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
|
4863 } |
|
f5b13e6be493
Player::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 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
|
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 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
|
4867 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
|
4868 } |
|
f5b13e6be493
Player::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 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
|
4870 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4871 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
|
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 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
|
4874 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
|
4875 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4876 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
|
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 pAudioPlayer->PlaySound(SOUND_PlayLute, 0, 0, -1, 0, 0, 0, 0); |
| 1032 | 4879 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
|
4880 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4881 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
|
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 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
|
4884 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
|
4885 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4886 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
|
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 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
|
4889 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
|
4890 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4891 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
|
4892 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4893 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
|
4894 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
|
4895 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
|
4896 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
|
4897 } |
|
f5b13e6be493
Player::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 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
|
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 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
|
4901 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
|
4902 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4903 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
|
4904 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4905 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
|
4906 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
|
4907 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4908 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4909 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
|
4910 } |
|
f5b13e6be493
Player::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 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
|
4913 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
|
4914 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4915 } |
| 0 | 4916 |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4917 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
|
4918 { |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4919 int v4; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4920 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
|
4921 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
|
4922 else |
| 1822 | 4923 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
|
4924 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
|
4925 } |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4926 |
| 0 | 4927 //----- (00449BB4) -------------------------------------------------------- |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4928 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 | 4929 { |
| 4930 Assert(pValue >= 0, "Compare variable shouldn't have negative arguments"); | |
| 4931 | |
| 0 | 4932 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
|
4933 unsigned __int8 test_bit_value; // eax@25 |
| 1731 | 4934 unsigned __int8 byteWithRequestedBit; // cl@25 |
| 0 | 4935 DDM_DLV_Header *v19; // eax@122 |
| 4936 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
|
4937 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
|
4938 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
|
4939 |
| 1783 | 4940 |
| 4941 if ( (signed int)VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_74 ) | |
| 4942 return (unsigned __int8)stru_5E4C90_MapPersistVars.field_0[VarNum - VAR_MapPersistentVariable_0] > 0; // originally (unsigned __int8)byte_5E4C15[VarNum]; | |
| 4943 if ( (signed int)VarNum >= VAR_MapPersistentVariable_75 && VarNum <= VAR_MapPersistentVariable_99 ) | |
| 4944 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 | |
| 4945 | |
| 4946 switch ( VarNum ) | |
| 4947 { | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4948 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
|
4949 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
|
4950 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
|
4951 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
|
4952 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
|
4953 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
|
4954 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
|
4955 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
|
4956 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
|
4957 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
|
4958 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
|
4959 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
|
4960 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
|
4961 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
|
4962 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
|
4963 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
|
4964 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
|
4965 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
|
4966 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
|
4967 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
|
4968 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
|
4969 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
|
4970 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
|
4971 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
|
4972 case VAR_Award: |
| 1783 | 4973 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
|
4974 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
|
4975 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
|
4976 case VAR_QBits_QuestsDone: |
| 1783 | 4977 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
|
4978 case VAR_PlayerItemInHands: |
| 1919 | 4979 //for (int i = 0; i < 138; i++) |
| 4980 for (int i = 0; i < 126; i++) | |
| 0 | 4981 { |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4982 if (pInventoryItemList[i].uItemID == pValue) |
| 0 | 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 true; |
| 0 | 4985 } |
| 469 | 4986 } |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4987 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
|
4988 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
|
4989 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
|
4990 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4991 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4992 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
|
4993 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
|
4994 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4995 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4996 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
|
4997 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
|
4998 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4999 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5000 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
|
5001 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
|
5002 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
|
5003 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
|
5004 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
|
5005 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
|
5006 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
|
5007 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
|
5008 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
|
5009 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
|
5010 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
|
5011 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
|
5012 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
|
5013 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
|
5014 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
|
5015 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
|
5016 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
|
5017 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
|
5018 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
|
5019 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
|
5020 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
|
5021 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
|
5022 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
|
5023 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
|
5024 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
|
5025 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
|
5026 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
|
5027 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
|
5028 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
|
5029 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
|
5030 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
|
5031 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
|
5032 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
|
5033 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
|
5034 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
|
5035 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
|
5036 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
|
5037 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
|
5038 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
|
5039 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
|
5040 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
|
5041 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
|
5042 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
|
5043 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
|
5044 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
|
5045 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
|
5046 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
|
5047 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
|
5048 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
|
5049 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
|
5050 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
|
5051 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
|
5052 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
|
5053 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
|
5054 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
|
5055 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
|
5056 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
|
5057 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
|
5058 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
|
5059 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
|
5060 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
|
5061 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
|
5062 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
|
5063 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
|
5064 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
|
5065 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
|
5066 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5067 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
|
5068 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
|
5069 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
|
5070 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
|
5071 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
|
5072 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
|
5073 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
|
5074 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
|
5075 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
|
5076 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
|
5077 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
|
5078 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
|
5079 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
|
5080 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
|
5081 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
|
5082 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
|
5083 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
|
5084 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
|
5085 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
|
5086 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
|
5087 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
|
5088 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
|
5089 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
|
5090 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
|
5091 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
|
5092 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
|
5093 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
|
5094 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
|
5095 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
|
5096 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
|
5097 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
|
5098 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
|
5099 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
|
5100 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
|
5101 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
|
5102 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
|
5103 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
|
5104 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
|
5105 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
|
5106 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
|
5107 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
|
5108 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
|
5109 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
|
5110 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
|
5111 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
|
5112 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
|
5113 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
|
5114 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
|
5115 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
|
5116 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
|
5117 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
|
5118 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
|
5119 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
|
5120 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
|
5121 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
|
5122 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
|
5123 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
|
5124 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
|
5125 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
|
5126 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
|
5127 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
|
5128 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
|
5129 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
|
5130 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
|
5131 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
|
5132 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
|
5133 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
|
5134 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
|
5135 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
|
5136 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
|
5137 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
|
5138 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
|
5139 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
|
5140 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
|
5141 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
|
5142 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
|
5143 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
|
5144 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
|
5145 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
|
5146 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
|
5147 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5148 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
|
5149 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
|
5150 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
|
5151 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
|
5152 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
|
5153 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
|
5154 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
|
5155 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
|
5156 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
|
5157 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
|
5158 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
|
5159 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
|
5160 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
|
5161 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
|
5162 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
|
5163 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
|
5164 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
|
5165 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
|
5166 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
|
5167 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
|
5168 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
|
5169 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
|
5170 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
|
5171 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
|
5172 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
|
5173 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
|
5174 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
|
5175 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
|
5176 case VAR_PoisonedGreen: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5177 return pConditions[Condition_Poison1] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5178 case VAR_DiseasedGreen: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5179 return pConditions[Condition_Disease1] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5180 case VAR_PoisonedYellow: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5181 return pConditions[Condition_Poison2] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5182 case VAR_DiseasedYellow: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5183 return pConditions[Condition_Disease2] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5184 case VAR_PoisonedRed: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5185 return pConditions[Condition_Poison3] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5186 case VAR_DiseasedRed: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5187 return pConditions[Condition_Disease3] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5188 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
|
5189 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
|
5190 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
|
5191 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
|
5192 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
|
5193 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
|
5194 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
|
5195 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
|
5196 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
|
5197 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
|
5198 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
|
5199 v4 = GetMajorConditionIdx(); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5200 if ( v4 != 18 ) |
| 0 | 5201 { |
| 469 | 5202 return v4 >= pValue; |
| 5203 } | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5204 return true; |
| 1783 | 5205 case VAR_AutoNotes : //TODO: find out why the double subtraction. or whether this is even used |
| 5206 test_bit_value = 0x80u >> (pValue - 2) % 8; | |
| 5207 byteWithRequestedBit = pParty->_autonote_bits[(pValue - 2) /8]; | |
| 5208 return (test_bit_value & byteWithRequestedBit) != 0; | |
| 5209 case VAR_IsMightMoreThanBase: | |
| 5210 actStat = GetActualMight(); | |
| 5211 baseStat = GetBaseStrength(); | |
| 5212 return (actStat >= baseStat); | |
| 5213 case VAR_IsIntellectMoreThanBase: | |
| 5214 actStat = GetActualIntelligence(); | |
| 5215 baseStat = GetBaseIntelligence(); | |
| 5216 return (actStat >= baseStat); | |
| 5217 case VAR_IsPersonalityMoreThanBase: | |
| 5218 actStat = GetActualWillpower(); | |
| 5219 baseStat = GetBaseWillpower(); | |
| 5220 return (actStat >= baseStat); | |
| 5221 case VAR_IsEnduranceMoreThanBase: | |
| 5222 actStat = GetActualEndurance(); | |
| 5223 baseStat = GetBaseEndurance(); | |
| 5224 return (actStat >= baseStat); | |
| 5225 case VAR_IsSpeedMoreThanBase: | |
| 5226 actStat = GetActualSpeed(); | |
| 5227 baseStat = GetBaseSpeed(); | |
| 5228 return (actStat >= baseStat); | |
| 5229 case VAR_IsAccuracyMoreThanBase: | |
| 5230 actStat = GetActualAccuracy(); | |
| 5231 baseStat = GetBaseAccuracy(); | |
| 5232 return (actStat >= baseStat); | |
| 5233 case VAR_IsLuckMoreThanBase: | |
| 5234 actStat = GetActualLuck(); | |
| 5235 baseStat = GetBaseLuck(); | |
| 5236 return (actStat >= baseStat); | |
| 5237 case VAR_PlayerBits: | |
| 5238 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; | |
| 1822 | 5239 byteWithRequestedBit = this->playerEventBits[((signed __int16)pValue - 1)/8]; |
| 1783 | 5240 return ( test_bit_value & byteWithRequestedBit ) != 0; |
| 5241 case VAR_NPCs2: | |
| 5242 return pNPCStats->pNewNPCData[pValue].Hired(); | |
| 5243 case VAR_IsFlying: | |
| 5244 if ( pParty->bFlying | |
| 5245 && (pParty->pPartyBuffs[PARTY_BUFF_FLY].uExpireTime> 0) ) | |
| 5246 return true; | |
| 5247 return false; | |
| 5248 case VAR_HiredNPCHasSpeciality: | |
| 5249 return CheckHiredNPCSpeciality(pValue); | |
| 5250 case VAR_CircusPrises: //isn't used in MM6 since 0x1D6u is a book of regeneration | |
| 5251 v4 = 0; | |
| 5252 for (int playerNum = 0; playerNum < 4; playerNum++) | |
| 5253 { | |
| 5254 for (int invPos = 0; invPos < 138; invPos++) | |
| 5255 { | |
| 5256 int itemId = pParty->pPlayers[playerNum].pInventoryItemList[invPos].uItemID; | |
| 5257 switch ( itemId ) | |
| 5258 { | |
| 5259 case 0x1D6u: | |
| 5260 ++v4; | |
| 5261 break; | |
| 5262 case 0x1D7u: | |
| 5263 v4 += 3; | |
| 5264 break; | |
| 5265 case 0x1DDu: | |
| 5266 v4 += 5; | |
| 5267 break; | |
| 5268 } | |
| 5269 } | |
| 5270 } | |
| 5271 return v4 >= pValue; | |
| 5272 case VAR_NumSkillPoints: | |
| 5273 return this->uSkillPoints >= (unsigned int)pValue; | |
| 5274 case VAR_MonthIs: | |
| 5275 return (pParty->uCurrentMonth == (unsigned int)pValue); | |
| 5276 case VAR_Counter1: | |
| 5277 case VAR_Counter2: | |
| 5278 case VAR_Counter3: | |
| 5279 case VAR_Counter4: | |
| 5280 case VAR_Counter5: | |
| 5281 case VAR_Counter6: | |
| 5282 case VAR_Counter7: | |
| 5283 case VAR_Counter8: | |
| 5284 case VAR_Counter9: | |
| 5285 case VAR_Counter10: | |
| 5286 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]) | |
| 5287 { | |
| 5288 return (pParty->PartyTimes.CounterEventValues[VarNum - VAR_Counter1] + 460800 * pValue * 0.033333335) <= pParty->uTimePlayed ; | |
| 5289 } | |
| 5290 case VAR_ReputationInCurrentLocation: | |
| 5291 v19 = &pOutdoor->ddm; | |
| 5292 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5293 v19 = &pIndoor->dlv; | |
| 5294 return (v19->uReputation >= pValue); | |
| 5295 case VAR_Unknown1: | |
| 5296 v21 = &pOutdoor->ddm; | |
| 5297 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5298 v21 = &pIndoor->dlv; | |
| 5299 return (v21->field_C_alert == pValue); //yes, equality, not >= | |
| 5300 case VAR_GoldInBank: | |
| 5301 return pParty->uNumGoldInBank >= (unsigned int)pValue; | |
| 5302 case VAR_NumDeaths: | |
| 5303 return pParty->uNumDeaths >= (unsigned int)pValue; | |
| 5304 case VAR_NumBounties: | |
| 5305 return pParty->uNumBountiesCollected >= (unsigned int)pValue; | |
| 5306 case VAR_PrisonTerms: | |
| 5307 return pParty->uNumPrisonTerms >= pValue; | |
| 5308 case VAR_ArenaWinsPage: | |
| 5309 return (unsigned __int8)pParty->uNumArenaPageWins >= pValue; | |
| 5310 case VAR_ArenaWinsSquire: | |
| 5311 return (unsigned __int8)pParty->uNumArenaSquireWins >= pValue; | |
| 5312 case VAR_ArenaWinsKnight: | |
| 5313 return (unsigned __int8)pParty->uNumArenaKnightWins >= pValue; | |
| 5314 case VAR_ArenaWinsLord: | |
| 5315 return pParty->uNumArenaLordWins >= pValue; | |
| 5316 case VAR_Invisible: | |
| 5317 return ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime > 0 ); | |
| 5318 case VAR_ItemEquipped: | |
| 5319 for (int i = 0; i < 16; i++) | |
| 5320 { | |
| 5321 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) && GetNthEquippedIndexItem(i)->uItemID == pValue ) | |
| 5322 { | |
| 5323 return true; | |
| 5324 } | |
| 5325 } | |
| 5326 return false; | |
| 5327 } | |
| 5328 | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5329 return false; |
| 0 | 5330 } |
| 5331 | |
| 5332 | |
| 5333 //----- (0044A5CB) -------------------------------------------------------- | |
| 492 | 5334 void Player::SetVariable(enum VariableType var_type, signed int var_value) |
| 5335 { | |
| 0 | 5336 unsigned int v6; // esi@13 |
| 5337 unsigned int v7; // esi@14 | |
| 5338 signed int v11; // eax@30 | |
| 5339 DDM_DLV_Header *v24; // ecx@148 | |
| 5340 ItemGen item; // [sp+Ch] [bp-28h]@52 | |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5341 |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5342 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5343 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
|
5344 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5345 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
|
5346 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5347 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
|
5348 if (pStorylineText->StoreLine[var_type - VAR_History_0].pText) |
| 492 | 5349 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5350 bFlashHistoryBook = 1; |
| 1822 | 5351 PlayAwardSound(); |
| 0 | 5352 } |
|
1780
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 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5355 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5356 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5357 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
|
5358 { |
| 1822 | 5359 if ( var_type >= VAR_MapPersistentVariable_0 && var_type <= VAR_MapPersistentVariable_74 ) |
| 5360 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] = (char)var_value; // originally (unsigned __int8)byte_5E4C15[VarNum]; | |
| 5361 if ( var_type >= VAR_MapPersistentVariable_75 && var_type <= VAR_MapPersistentVariable_99 ) | |
| 5362 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
|
5363 return; |
|
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 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5366 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
|
5367 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5368 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 | 5369 PlayAwardSound(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5370 return; |
|
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 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5373 switch ( var_type ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5374 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5375 case VAR_Sex: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5376 this->uSex = (PLAYER_SEX)var_value; |
| 1822 | 5377 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5378 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5379 case VAR_Class: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5380 this->classType = (PLAYER_CLASS_TYPE)var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5381 if ( (PLAYER_CLASS_TYPE)var_value == PLAYER_CLASS_LICH ) |
| 492 | 5382 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5383 for (int i = 0; i < 138; i++) |
| 0 | 5384 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5385 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
|
5386 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5387 this->pOwnItems[i].uItemID = ITEM_LICH_JAR_FULL; |
| 1822 | 5388 this->pOwnItems[i].uHolderPlayer = GetPlayerIndex() + 1; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5389 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5390 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5391 if ( this->sResFireBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5392 this->sResFireBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5393 if ( this->sResAirBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5394 this->sResAirBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5395 if ( this->sResWaterBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5396 this->sResWaterBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5397 if ( this->sResEarthBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5398 this->sResEarthBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5399 this->sResMindBase = 200; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5400 this->sResBodyBase = 200; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5401 v11 = this->GetSexByVoice(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5402 this->uPrevVoiceID = this->uVoiceID; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5403 this->uPrevFace = this->uCurrentFace; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5404 if ( v11 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5405 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5406 this->uCurrentFace = 21; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5407 this->uVoiceID = 21; |
| 0 | 5408 } |
| 5409 else | |
| 5410 { | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5411 this->uCurrentFace = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5412 this->uVoiceID = 20; |
| 0 | 5413 } |
| 1822 | 5414 ReloadPlayerPortraits(GetPlayerIndex(), this->uCurrentFace); |
| 0 | 5415 } |
| 1822 | 5416 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5417 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5418 case VAR_CurrentHP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5419 this->sHealth = var_value; |
| 1822 | 5420 PlayAwardSound_Anim(); |
|
1780
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_MaxHP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5423 this->sHealth = GetMaxHealth(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5424 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5425 case VAR_CurrentSP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5426 this->sMana = var_value; |
| 1822 | 5427 PlayAwardSound_Anim(); |
|
1780
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_MaxSP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5430 this->sMana = GetMaxMana(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5431 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5432 case VAR_ACModifier: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5433 this->sACModifier = (unsigned __int8)var_value; |
| 1822 | 5434 PlayAwardSound_Anim(); |
| 0 | 5435 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5436 case VAR_BaseLevel: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5437 this->uLevel = (unsigned __int8)var_value; |
| 1822 | 5438 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5439 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5440 case VAR_LevelModifier: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5441 this->sLevelModifier = (unsigned __int8)var_value; |
| 1822 | 5442 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5443 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5444 case VAR_Age: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5445 this->sAgeModifier = var_value; |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5446 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5447 case VAR_Award: |
| 1783 | 5448 if ( !_449B57_test_bit(this->_achieved_awards_bits, var_value) && pAwards[var_value].pText ) |
| 492 | 5449 { |
| 1822 | 5450 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5451 this->PlaySound(SPEECH_96, 0); |
| 0 | 5452 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5453 _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
|
5454 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5455 case VAR_Experience: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5456 this->uExperience = var_value; |
| 1822 | 5457 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5458 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5459 case VAR_QBits_QuestsDone: |
| 1783 | 5460 if ( !_449B57_test_bit(pParty->_quest_bits, var_value) && pQuestTable[var_value-1] ) |
| 0 | 5461 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5462 bFlashQuestBook = 1; |
| 1822 | 5463 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, GetPlayerIndex()); |
| 5464 PlayAwardSound(); | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5465 this->PlaySound(SPEECH_93, 0); |
| 0 | 5466 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5467 _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
|
5468 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5469 case VAR_PlayerItemInHands: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5470 item.Reset(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5471 item.uItemID = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5472 item.uAttributes = 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5473 pParty->SetHoldingItem(&item); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5474 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
|
5475 pParty->pIsArtifactFound[var_value-500] = 1; |
|
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_FixedGold: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5478 Party::SetGold(var_value); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5479 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5480 case VAR_RandomGold: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5481 v6 = rand() % var_value + 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5482 Party::SetGold(v6); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5483 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
|
5484 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5485 GameUI_DrawFoodAndGold(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5486 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5487 case VAR_FixedFood: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5488 Party::SetFood(var_value); |
| 1822 | 5489 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5490 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5491 case VAR_RandomFood: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5492 v7 = rand() % var_value + 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5493 Party::SetFood(v7); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5494 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
|
5495 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5496 GameUI_DrawFoodAndGold(); |
| 1822 | 5497 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5498 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5499 case VAR_BaseMight: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5500 this->uMight = (unsigned __int8)var_value; |
| 1822 | 5501 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5502 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5503 case VAR_BaseIntellect: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5504 this->uIntelligence = (unsigned __int8)var_value; |
| 1822 | 5505 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5506 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5507 case VAR_BasePersonality: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5508 this->uWillpower = (unsigned __int8)var_value; |
| 1822 | 5509 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5510 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5511 case VAR_BaseEndurance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5512 this->uEndurance = (unsigned __int8)var_value; |
| 1822 | 5513 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5514 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5515 case VAR_BaseSpeed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5516 this->uSpeed = (unsigned __int8)var_value; |
| 1822 | 5517 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5518 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5519 case VAR_BaseAccuracy: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5520 this->uAccuracy = (unsigned __int8)var_value; |
| 1822 | 5521 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5522 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5523 case VAR_BaseLuck: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5524 this->uLuck = (unsigned __int8)var_value; |
| 1822 | 5525 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5526 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5527 case VAR_MightBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5528 case VAR_ActualMight: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5529 this->uMightBonus = (unsigned __int8)var_value; |
| 1822 | 5530 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5531 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5532 case VAR_IntellectBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5533 case VAR_ActualIntellect: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5534 this->uIntelligenceBonus = (unsigned __int8)var_value; |
| 1822 | 5535 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5536 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5537 case VAR_PersonalityBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5538 case VAR_ActualPersonality: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5539 this->uWillpowerBonus = (unsigned __int8)var_value; |
| 1822 | 5540 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5541 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5542 case VAR_EnduranceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5543 case VAR_ActualEndurance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5544 this->uEnduranceBonus = (unsigned __int8)var_value; |
| 1822 | 5545 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5546 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5547 case VAR_SpeedBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5548 case VAR_ActualSpeed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5549 this->uSpeedBonus = (unsigned __int8)var_value; |
| 1822 | 5550 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5551 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5552 case VAR_AccuracyBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5553 case VAR_ActualAccuracy: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5554 this->uAccuracyBonus = (unsigned __int8)var_value; |
| 1822 | 5555 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5556 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5557 case VAR_LuckBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5558 case VAR_ActualLuck: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5559 this->uLuckBonus = (unsigned __int8)var_value; |
| 1822 | 5560 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5561 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5562 case VAR_FireResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5563 this->sResFireBase = (unsigned __int8)var_value; |
| 1822 | 5564 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5565 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5566 case VAR_AirResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5567 this->sResAirBase = (unsigned __int8)var_value; |
| 1822 | 5568 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5569 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5570 case VAR_WaterResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5571 this->sResWaterBase = (unsigned __int8)var_value; |
| 1822 | 5572 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5573 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5574 case VAR_EarthResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5575 this->sResEarthBase = (unsigned __int8)var_value; |
| 1822 | 5576 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5577 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5578 case VAR_SpiritResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5579 this->sResSpiritBase = (unsigned __int8)var_value; |
| 1822 | 5580 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5581 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5582 case VAR_MindResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5583 this->sResMindBase = (unsigned __int8)var_value; |
| 1822 | 5584 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5585 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5586 case VAR_BodyResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5587 this->sResBodyBase = (unsigned __int8)var_value; |
| 1822 | 5588 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5589 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5590 case VAR_LightResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5591 this->sResLightBase = (unsigned __int8)var_value; |
| 1822 | 5592 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5593 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5594 case VAR_DarkResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5595 this->sResDarkBase = (unsigned __int8)var_value; |
| 1822 | 5596 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5597 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5598 case VAR_MagicResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5599 this->sResMagicBase = (unsigned __int8)var_value; |
| 1822 | 5600 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5601 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5602 case VAR_FireResistanceBonus: |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5603 this->sResFireBonus = (unsigned __int8)var_value; |
| 1822 | 5604 PlayAwardSound_Anim_Face(SPEECH_91); |
| 0 | 5605 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5606 case VAR_AirResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5607 this->sResAirBonus = (unsigned __int8)var_value; |
| 1822 | 5608 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5609 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5610 case VAR_WaterResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5611 this->sResWaterBonus = (unsigned __int8)var_value; |
| 1822 | 5612 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5613 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5614 case VAR_EarthResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5615 this->sResEarthBonus = (unsigned __int8)var_value; |
| 1822 | 5616 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5617 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5618 case VAR_SpiritResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5619 this->sResSpiritBonus = (unsigned __int8)var_value; |
| 1822 | 5620 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5621 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5622 case VAR_MindResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5623 this->sResMindBonus = (unsigned __int8)var_value; |
| 1822 | 5624 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5625 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5626 case VAR_BodyResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5627 this->sResBodyBonus = (unsigned __int8)var_value; |
| 1822 | 5628 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5629 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5630 case VAR_LightResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5631 this->sResLightBonus = (unsigned __int8)var_value; |
| 1822 | 5632 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5633 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5634 case VAR_DarkResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5635 this->sResDarkBonus = (unsigned __int8)var_value; |
| 1822 | 5636 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
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_PhysicalResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5639 Error("Physical res. bonus not used"); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5640 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5641 case VAR_MagicResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5642 this->sResMagicBonus = (unsigned __int8)var_value; |
| 1822 | 5643 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5644 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5645 case VAR_Cursed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5646 this->SetCondition(Condition_Cursed, 1); |
| 1822 | 5647 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5648 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5649 case VAR_Weak: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5650 this->SetCondition(Condition_Weak, 1); |
| 1822 | 5651 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5652 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5653 case VAR_Asleep: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5654 this->SetCondition(Condition_Sleep, 1); |
| 1822 | 5655 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5656 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5657 case VAR_Afraid: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5658 this->SetCondition(Condition_Fear, 1); |
| 1822 | 5659 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5660 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5661 case VAR_Drunk: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5662 this->SetCondition(Condition_Drunk, 1); |
| 1822 | 5663 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5664 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5665 case VAR_Insane: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5666 this->SetCondition(Condition_Insane, 1); |
| 1822 | 5667 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5668 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5669 case VAR_PoisonedGreen: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5670 this->SetCondition(Condition_Poison1, 1); |
| 1822 | 5671 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5672 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5673 case VAR_DiseasedGreen: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5674 this->SetCondition(Condition_Disease1, 1); |
| 1822 | 5675 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5676 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5677 case VAR_PoisonedYellow: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5678 this->SetCondition(Condition_Poison2, 1); |
| 1822 | 5679 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5680 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5681 case VAR_DiseasedYellow: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5682 this->SetCondition(Condition_Disease2, 1); |
| 1822 | 5683 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5684 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5685 case VAR_PoisonedRed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5686 this->SetCondition(Condition_Poison3, 1); |
| 1822 | 5687 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5688 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5689 case VAR_DiseasedRed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5690 this->SetCondition(Condition_Disease3, 1); |
| 1822 | 5691 PlayAwardSound_Anim(); |
| 1770 | 5692 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5693 case VAR_Paralyzed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5694 this->SetCondition(Condition_Paralyzed, 1); |
| 1822 | 5695 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5696 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5697 case VAR_Unconsious: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5698 this->SetCondition(Condition_Unconcious, 1); |
| 1822 | 5699 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5700 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5701 case VAR_Dead: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5702 this->SetCondition(Condition_Dead, 1); |
| 1822 | 5703 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5704 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5705 case VAR_Stoned: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5706 this->SetCondition(Condition_Pertified, 1); |
| 1822 | 5707 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5708 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5709 case VAR_Eradicated: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5710 this->SetCondition(Condition_Eradicated, 1); |
| 1822 | 5711 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5712 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5713 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
|
5714 pConditions.fill(0); |
| 1822 | 5715 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5716 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5717 case VAR_AutoNotes: |
| 1783 | 5718 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
|
5719 { |
| 1822 | 5720 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, GetPlayerIndex()); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5721 this->PlaySound(SPEECH_96, 0); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5722 bFlashAutonotesBook = 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5723 _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
|
5724 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5725 _449B7E_toggle_bit(pParty->_autonote_bits, var_value, 1u); |
| 1822 | 5726 PlayAwardSound(); |
|
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_PlayerBits: |
| 1822 | 5729 _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
|
5730 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5731 case VAR_NPCs2: |
|
1793
4dee76d79c78
dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents:
1792
diff
changeset
|
5732 pParty->hirelingScrollPosition = 0; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5733 LOBYTE(pNPCStats->pNewNPCData[var_value].uFlags) |= 0x80u; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5734 pParty->CountHirelings(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5735 viewparams->bRedrawGameUI = true; |
|
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_NumSkillPoints: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5738 this->uSkillPoints = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5739 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5740 case VAR_Counter1: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5741 case VAR_Counter2: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5742 case VAR_Counter3: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5743 case VAR_Counter4: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5744 case VAR_Counter5: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5745 case VAR_Counter6: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5746 case VAR_Counter7: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5747 case VAR_Counter8: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5748 case VAR_Counter9: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5749 case VAR_Counter10: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5750 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
|
5751 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5752 case VAR_ReputationInCurrentLocation: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5753 v24 = &pOutdoor->ddm; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5754 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5755 v24 = &pIndoor->dlv; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5756 v24->uReputation = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5757 if ( var_value > 10000 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5758 v24->uReputation = 10000; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5759 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5760 case VAR_GoldInBank: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5761 pParty->uNumGoldInBank = var_value; |
|
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_NumDeaths: |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5764 pParty->uNumDeaths = 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_NumBounties: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5767 pParty->uNumBountiesCollected = 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_PrisonTerms: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5770 pParty->uNumPrisonTerms = 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_ArenaWinsPage: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5773 pParty->uNumArenaPageWins = 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_ArenaWinsSquire: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5776 pParty->uNumArenaSquireWins = 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_ArenaWinsKnight: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5779 pParty->uNumArenaKnightWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5780 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5781 case VAR_ArenaWinsLord: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5782 pParty->uNumArenaLordWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5783 return; |
| 1782 | 5784 case VAR_StaffSkill: |
| 1822 | 5785 SetSkillByEvent(&Player::skillStaff, var_value); |
| 1782 | 5786 return; |
| 5787 case VAR_SwordSkill: | |
| 1822 | 5788 SetSkillByEvent(&Player::skillSword, var_value); |
| 1782 | 5789 return; |
| 5790 case VAR_DaggerSkill: | |
| 1822 | 5791 SetSkillByEvent(&Player::skillDagger, var_value); |
| 1782 | 5792 return; |
| 5793 case VAR_AxeSkill: | |
| 1822 | 5794 SetSkillByEvent(&Player::skillAxe, var_value); |
| 1782 | 5795 return; |
| 5796 case VAR_SpearSkill: | |
| 1822 | 5797 SetSkillByEvent(&Player::skillSpear, var_value); |
| 1782 | 5798 return; |
| 5799 case VAR_BowSkill: | |
| 1822 | 5800 SetSkillByEvent(&Player::skillBow, var_value); |
| 1782 | 5801 return; |
| 5802 case VAR_MaceSkill: | |
| 1822 | 5803 SetSkillByEvent(&Player::skillMace, var_value); |
| 1782 | 5804 return; |
| 5805 case VAR_BlasterSkill: | |
| 1822 | 5806 SetSkillByEvent(&Player::skillBlaster, var_value); |
| 1782 | 5807 return; |
| 5808 case VAR_ShieldSkill: | |
| 1822 | 5809 SetSkillByEvent(&Player::skillShield, var_value); |
| 1782 | 5810 return; |
| 5811 case VAR_LeatherSkill: | |
| 1822 | 5812 SetSkillByEvent(&Player::skillLeather, var_value); |
| 1782 | 5813 return; |
| 5814 case VAR_SkillChain: | |
| 1822 | 5815 SetSkillByEvent(&Player::skillChain, var_value); |
| 1782 | 5816 return; |
| 5817 case VAR_PlateSkill: | |
| 1822 | 5818 SetSkillByEvent(&Player::skillPlate, var_value); |
| 1782 | 5819 return; |
| 5820 case VAR_FireSkill: | |
| 1822 | 5821 SetSkillByEvent(&Player::skillFire, var_value); |
| 1782 | 5822 return; |
| 5823 case VAR_AirSkill: | |
| 1822 | 5824 SetSkillByEvent(&Player::skillAir, var_value); |
| 1782 | 5825 return; |
| 5826 case VAR_WaterSkill: | |
| 1822 | 5827 SetSkillByEvent(&Player::skillWater, var_value); |
| 1782 | 5828 return; |
| 5829 case VAR_EarthSkill: | |
| 1822 | 5830 SetSkillByEvent(&Player::skillEarth, var_value); |
| 1782 | 5831 return; |
| 5832 case VAR_SpiritSkill: | |
| 1822 | 5833 SetSkillByEvent(&Player::skillSpirit, var_value); |
| 1782 | 5834 return; |
| 5835 case VAR_MindSkill: | |
| 1822 | 5836 SetSkillByEvent(&Player::skillMind, var_value); |
| 1782 | 5837 return; |
| 5838 case VAR_BodySkill: | |
| 1822 | 5839 SetSkillByEvent(&Player::skillBody, var_value); |
| 1782 | 5840 return; |
| 5841 case VAR_LightSkill: | |
| 1822 | 5842 SetSkillByEvent(&Player::skillLight, var_value); |
| 1782 | 5843 return; |
| 5844 case VAR_DarkSkill: | |
| 1822 | 5845 SetSkillByEvent(&Player::skillDark, var_value); |
| 1782 | 5846 return; |
| 5847 case VAR_IdentifyItemSkill: | |
| 1822 | 5848 SetSkillByEvent(&Player::skillItemId, var_value); |
| 1782 | 5849 return; |
| 5850 case VAR_MerchantSkill: | |
| 1822 | 5851 SetSkillByEvent(&Player::skillMerchant, var_value); |
| 1782 | 5852 return; |
| 5853 case VAR_RepairSkill: | |
| 1822 | 5854 SetSkillByEvent(&Player::skillRepair, var_value); |
| 1782 | 5855 return; |
| 5856 case VAR_BodybuildingSkill: | |
| 1822 | 5857 SetSkillByEvent(&Player::skillBodybuilding, var_value); |
| 1782 | 5858 return; |
| 5859 case VAR_MeditationSkill: | |
| 1822 | 5860 SetSkillByEvent(&Player::skillMeditation, var_value); |
| 1782 | 5861 return; |
| 5862 case VAR_PerceptionSkill: | |
| 1822 | 5863 SetSkillByEvent(&Player::skillPerception, var_value); |
| 1782 | 5864 return; |
| 5865 case VAR_DiplomacySkill: | |
| 1822 | 5866 SetSkillByEvent(&Player::skillDiplomacy, var_value); |
| 1782 | 5867 return; |
| 5868 case VAR_ThieverySkill: | |
| 5869 Error ("Thieving unsupported"); | |
| 5870 return; | |
| 5871 case VAR_DisarmTrapSkill: | |
| 1822 | 5872 SetSkillByEvent(&Player::skillDisarmTrap, var_value); |
| 1782 | 5873 return; |
| 5874 case VAR_DodgeSkill: | |
| 1822 | 5875 SetSkillByEvent(&Player::skillDodge, var_value); |
| 1782 | 5876 return; |
| 5877 case VAR_UnarmedSkill: | |
| 1822 | 5878 SetSkillByEvent(&Player::skillUnarmed, var_value); |
| 1782 | 5879 return; |
| 5880 case VAR_IdentifyMonsterSkill: | |
| 1822 | 5881 SetSkillByEvent(&Player::skillMonsterId, var_value); |
| 1782 | 5882 return; |
| 5883 case VAR_ArmsmasterSkill: | |
| 1822 | 5884 SetSkillByEvent(&Player::skillArmsmaster, var_value); |
| 1782 | 5885 return; |
| 5886 case VAR_StealingSkill: | |
| 1822 | 5887 SetSkillByEvent(&Player::skillStealing, var_value); |
| 1782 | 5888 return; |
| 5889 case VAR_AlchemySkill: | |
| 1822 | 5890 SetSkillByEvent(&Player::skillAlchemy, var_value); |
| 1782 | 5891 return; |
| 5892 case VAR_LearningSkill: | |
| 1822 | 5893 SetSkillByEvent(&Player::skillLearning, var_value); |
| 1782 | 5894 return; |
| 5895 } | |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5896 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5897 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5898 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5899 //----- (new function) -------------------------------------------------------- |
| 1822 | 5900 void Player::PlayAwardSound() |
| 5901 { | |
| 5902 int playerIndex = GetPlayerIndex(); | |
| 5903 signed int v25 = 8 * playerIndex + 400; | |
| 5904 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
|
5905 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
|
5906 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5907 |
| 1782 | 5908 //----- (new function) -------------------------------------------------------- |
| 1822 | 5909 void Player::PlayAwardSound_Anim() |
| 5910 { | |
| 5911 int playerIndex = GetPlayerIndex(); | |
| 5912 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, playerIndex); | |
| 5913 PlayAwardSound(); | |
| 1782 | 5914 } |
| 5915 | |
| 5916 //----- (new function) -------------------------------------------------------- | |
| 1822 | 5917 void Player::PlayAwardSound_Anim_Face( PlayerSpeech speech ) |
| 1782 | 5918 { |
| 5919 this->PlaySound(speech, 0); | |
| 1822 | 5920 PlayAwardSound_Anim(); |
| 1782 | 5921 } |
| 5922 | |
| 5923 //----- (new function) -------------------------------------------------------- | |
| 1822 | 5924 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
|
5925 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5926 unsigned __int16 currSkillValue = this->*skillToSet; |
| 1822 | 5927 if ( skillValue > 63 ) //the original had the condition reversed which was probably wrong |
| 5928 { | |
| 5929 this->*skillToSet = skillValue | currSkillValue & 63; | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5930 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5931 else |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5932 { |
| 1822 | 5933 this->*skillToSet = skillValue | currSkillValue & 0xC0; |
| 5934 } | |
| 5935 int playerIndex = GetPlayerIndex(); | |
| 5936 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, playerIndex); | |
| 5937 PlayAwardSound(); | |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5938 } |
| 0 | 5939 |
| 5940 //----- (0044AFFB) -------------------------------------------------------- | |
| 310 | 5941 void Player::AddVariable(enum VariableType var_type, signed int val) |
| 0 | 5942 { |
| 5943 int v6; // eax@15 | |
| 5944 unsigned int v7; // esi@18 | |
| 5945 DDM_DLV_Header *v27; // eax@153 | |
| 5946 ItemGen item; // [sp+Ch] [bp-2Ch]@45 | |
| 310 | 5947 |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5948 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
|
5949 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5950 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
|
5951 return; |
|
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 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5954 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
|
5955 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5956 pParty->PartyTimes._s_times[var_type - VAR_UnknownTimeEvent0] = pParty->uTimePlayed; |
| 1822 | 5957 PlayAwardSound(); |
| 1788 | 5958 return; |
| 0 | 5959 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5960 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5961 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
|
5962 { |
| 1822 | 5963 |
| 5964 if ( var_type >= VAR_MapPersistentVariable_0 && var_type <= VAR_MapPersistentVariable_74 ) | |
| 5965 { | |
| 5966 if (255 - val > stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0]) | |
| 5967 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] += val; | |
| 5968 else | |
| 5969 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] = 255; | |
| 5970 } | |
| 5971 if ( (signed int)var_type >= VAR_MapPersistentVariable_75 && var_type <= VAR_MapPersistentVariable_99 ) | |
| 5972 { | |
| 5973 if (255 - val > stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75]) | |
| 5974 stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75] += val; | |
| 5975 else | |
| 5976 stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75] = 255; | |
| 5977 } | |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5978 return; |
|
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 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5981 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
|
5982 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5983 if (!pParty->PartyTimes.HistoryEventTimes[var_type - VAR_History_0]) |
| 0 | 5984 { |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5985 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
|
5986 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
|
5987 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5988 bFlashHistoryBook = 1; |
| 1822 | 5989 PlayAwardSound(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5990 } |
| 0 | 5991 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5992 return; |
|
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 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5995 switch ( var_type ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5996 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5997 case VAR_RandomGold: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5998 if ( val == 0 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5999 val = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6000 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
|
6001 pParty->PartyFindsGold(v6 % val + 1, 1); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6002 GameUI_DrawFoodAndGold(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6003 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6004 case VAR_RandomFood: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6005 if ( val == 0 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6006 val = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6007 v7 = rand() % val + 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6008 Party::GiveFood(v7); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6009 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
|
6010 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6011 GameUI_DrawFoodAndGold(); |
| 1822 | 6012 PlayAwardSound(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6013 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6014 case VAR_Sex: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6015 this->uSex = (PLAYER_SEX)val; |
| 1822 | 6016 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6017 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6018 case VAR_Class: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6019 this->classType = (PLAYER_CLASS_TYPE)val; |
| 1822 | 6020 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6021 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6022 case VAR_CurrentHP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6023 this->sHealth = min(this->sHealth + val, this->GetMaxHealth() ); |
| 1822 | 6024 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6025 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6026 case VAR_MaxHP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6027 this->_health_related = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6028 this->uFullHealthBonus = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6029 this->sHealth = this->GetMaxHealth(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6030 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6031 case VAR_CurrentSP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6032 this->sMana = min(this->sMana + val, this->GetMaxMana() ); |
| 1822 | 6033 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6034 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6035 case VAR_MaxSP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6036 this->_mana_related = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6037 this->uFullManaBonus = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6038 this->sMana = GetMaxMana(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6039 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6040 case VAR_ACModifier: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6041 this->sACModifier = min(this->sACModifier + val, 255); |
| 1822 | 6042 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6043 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6044 case VAR_BaseLevel: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6045 this->uLevel = min(this->uLevel + val, 255); |
| 1822 | 6046 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6047 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6048 case VAR_LevelModifier: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6049 this->sLevelModifier = min(this->sLevelModifier + val, 255); |
| 1822 | 6050 PlayAwardSound_Anim97(); |
|
1792
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_Age: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6053 this->sAgeModifier += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6054 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6055 case VAR_Award: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6056 if (_449B57_test_bit(this->_achieved_awards_bits, val) && pAwards[val].pText ) |
| 310 | 6057 { |
| 1822 | 6058 PlayAwardSound_Anim97_Face(SPEECH_96); |
| 0 | 6059 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6060 _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
|
6061 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6062 case VAR_Experience: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6063 this->uExperience = min(this->uExperience + val, 4000000000i64); |
| 1822 | 6064 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6065 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6066 case VAR_QBits_QuestsDone: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6067 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
|
6068 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6069 bFlashQuestBook = 1; |
| 1822 | 6070 PlayAwardSound_Anim97_Face(SPEECH_93); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6071 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6072 _449B7E_toggle_bit(pParty->_quest_bits, val, 1); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6073 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6074 case VAR_PlayerItemInHands: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6075 item.Reset(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6076 item.uAttributes = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6077 item.uItemID = val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6078 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
|
6079 pParty->pIsArtifactFound[val-500] = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6080 else if ( val >= ITEM_WAND_FIRE && val <= ITEM_WAND_INCENERATION ) |
| 0 | 6081 { |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6082 item.uNumCharges = rand() % 6 + item.GetDamageMod() + 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6083 item.uMaxCharges = LOBYTE(item.uNumCharges); |
| 0 | 6084 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6085 pParty->SetHoldingItem(&item); |
|
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_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
|
6088 pParty->PartyFindsGold(val, 1); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6089 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6090 case VAR_BaseMight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6091 this->uMight = min(this->uMight + val, 255); |
| 1822 | 6092 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6093 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6094 case VAR_BaseIntellect: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6095 this->uIntelligence = min(this->uIntelligence + val, 255); |
| 1822 | 6096 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6097 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6098 case VAR_BasePersonality: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6099 this->uWillpower = min(this->uWillpower + val, 255); |
| 1822 | 6100 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6101 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6102 case VAR_BaseEndurance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6103 this->uEndurance = min(this->uEndurance + val, 255); |
| 1822 | 6104 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6105 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6106 case VAR_BaseSpeed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6107 this->uSpeed = min(this->uSpeed + val, 255); |
| 1822 | 6108 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6109 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6110 case VAR_BaseAccuracy: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6111 this->uAccuracy = min(this->uAccuracy + val, 255); |
| 1822 | 6112 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6113 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6114 case VAR_BaseLuck: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6115 this->uLuck = min(this->uLuck + val, 255); |
| 1822 | 6116 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6117 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6118 case VAR_FixedFood: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6119 Party::GiveFood(val); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6120 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[502], val); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6121 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6122 if ( pParty->uNumFoodRations > 0xFFFF ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6123 Party::SetFood(0xFFFFu); |
| 1822 | 6124 PlayAwardSound(); |
| 1788 | 6125 return; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6126 case VAR_MightBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6127 case VAR_ActualMight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6128 this->uMightBonus = min(this->uMightBonus + val, 255); |
| 1822 | 6129 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6130 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6131 case VAR_IntellectBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6132 case VAR_ActualIntellect: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6133 this->uIntelligenceBonus = min(this->uIntelligenceBonus + val, 255); |
| 1822 | 6134 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6135 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6136 case VAR_PersonalityBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6137 case VAR_ActualPersonality: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6138 this->uWillpowerBonus = min(this->uWillpowerBonus + val, 255); |
| 1822 | 6139 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6140 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6141 case VAR_EnduranceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6142 case VAR_ActualEndurance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6143 this->uEnduranceBonus = min(this->uEnduranceBonus + val, 255); |
| 1822 | 6144 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6145 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6146 case VAR_SpeedBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6147 case VAR_ActualSpeed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6148 this->uSpeedBonus = min(this->uSpeedBonus + val, 255); |
| 1822 | 6149 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6150 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6151 case VAR_AccuracyBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6152 case VAR_ActualAccuracy: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6153 this->uAccuracyBonus = min(this->uAccuracyBonus + val, 255); |
| 1822 | 6154 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6155 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6156 case VAR_LuckBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6157 case VAR_ActualLuck: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6158 this->uLuckBonus = min(this->uLuckBonus + val, 255); |
| 1822 | 6159 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6160 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6161 case VAR_FireResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6162 this->sResFireBase = min(this->sResFireBase + val, 255); |
| 1822 | 6163 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6164 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6165 case VAR_AirResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6166 this->sResAirBase = min(this->sResAirBase + val, 255); |
| 1822 | 6167 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6168 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6169 case VAR_WaterResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6170 this->sResWaterBase = min(this->sResWaterBase + val, 255); |
| 1822 | 6171 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6172 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6173 case VAR_EarthResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6174 this->sResEarthBase = min(this->sResEarthBase + val, 255); |
| 1822 | 6175 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6176 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6177 case VAR_SpiritResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6178 this->sResSpiritBase = min(this->sResSpiritBase + val, 255); |
| 1822 | 6179 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6180 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6181 case VAR_MindResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6182 this->sResMindBase = min(this->sResMindBase + val, 255); |
| 1822 | 6183 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6184 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6185 case VAR_BodyResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6186 this->sResBodyBase = min(this->sResBodyBase + val, 255); |
| 1822 | 6187 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6188 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6189 case VAR_LightResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6190 this->sResLightBase = min(this->sResLightBase + val, 255); |
| 1822 | 6191 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6192 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6193 case VAR_DarkResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6194 this->sResDarkBase = min(this->sResDarkBase + val, 255); |
| 1822 | 6195 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6196 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6197 case VAR_MagicResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6198 this->sResMagicBase = min(this->sResMagicBase + val, 255); |
| 1822 | 6199 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6200 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6201 case VAR_FireResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6202 this->sResFireBonus = min(this->sResFireBonus + val, 255); |
| 1822 | 6203 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6204 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6205 case VAR_AirResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6206 this->sResAirBonus = min(this->sResAirBonus + val, 255); |
| 1822 | 6207 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6208 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6209 case VAR_WaterResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6210 this->sResWaterBonus = min(this->sResWaterBonus + val, 255); |
| 1822 | 6211 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6212 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6213 case VAR_EarthResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6214 this->sResEarthBonus = min(this->sResEarthBonus + val, 255); |
| 1822 | 6215 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6216 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6217 case VAR_SpiritResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6218 this->sResSpiritBonus = min(this->sResSpiritBonus + val, 255); |
| 1822 | 6219 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6220 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6221 case VAR_MindResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6222 this->sResMindBonus = min(this->sResMindBonus + val, 255); |
| 1822 | 6223 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6224 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6225 case VAR_BodyResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6226 this->sResBodyBonus = min(this->sResBodyBonus + val, 255); |
| 1822 | 6227 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6228 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6229 case VAR_LightResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6230 this->sResLightBonus = min(this->sResLightBonus + val, 255); |
| 1822 | 6231 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6232 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6233 case VAR_DarkResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6234 this->sResDarkBonus = min(this->sResDarkBonus + val, 255); |
| 1822 | 6235 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6236 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6237 case VAR_MagicResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6238 this->sResMagicBonus = min(this->sResMagicBonus + val, 255); |
| 1822 | 6239 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6240 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6241 case VAR_Cursed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6242 this->SetCondition(Condition_Cursed, 1); |
| 1822 | 6243 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6244 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6245 case VAR_Weak: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6246 this->SetCondition(Condition_Weak, 1); |
| 1822 | 6247 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6248 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6249 case VAR_Asleep: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6250 this->SetCondition(Condition_Sleep, 1); |
| 1822 | 6251 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6252 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6253 case VAR_Afraid: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6254 this->SetCondition(Condition_Fear, 1); |
| 1822 | 6255 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6256 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6257 case VAR_Drunk: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6258 this->SetCondition(Condition_Drunk, 1); |
| 1822 | 6259 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6260 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6261 case VAR_Insane: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6262 this->SetCondition(Condition_Insane, 1); |
| 1822 | 6263 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6264 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6265 case VAR_PoisonedGreen: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6266 this->SetCondition(Condition_Poison1, 1); |
| 1822 | 6267 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6268 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6269 case VAR_DiseasedGreen: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6270 this->SetCondition(Condition_Disease1, 1); |
| 1822 | 6271 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6272 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6273 case VAR_PoisonedYellow: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6274 this->SetCondition(Condition_Poison2, 1); |
| 1822 | 6275 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6276 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6277 case VAR_DiseasedYellow: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6278 this->SetCondition(Condition_Disease2, 1); |
| 1822 | 6279 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6280 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6281 case VAR_PoisonedRed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6282 this->SetCondition(Condition_Poison3, 1); |
| 1822 | 6283 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6284 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6285 case VAR_DiseasedRed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6286 this->SetCondition(Condition_Disease3, 1); |
| 1822 | 6287 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6288 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6289 case VAR_Paralyzed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6290 this->SetCondition(Condition_Paralyzed, 1); |
| 1822 | 6291 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6292 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6293 case VAR_Unconsious: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6294 this->SetCondition(Condition_Unconcious, 1); |
| 1822 | 6295 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6296 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6297 case VAR_Dead: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6298 this->SetCondition(Condition_Dead, 1); |
| 1822 | 6299 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6300 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6301 case VAR_Stoned: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6302 this->SetCondition(Condition_Pertified, 1); |
| 1822 | 6303 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6304 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6305 case VAR_Eradicated: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6306 this->SetCondition(Condition_Eradicated, 1); |
| 1822 | 6307 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6308 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6309 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
|
6310 pConditions.fill(0); |
| 1822 | 6311 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6312 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6313 case VAR_AutoNotes: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6314 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
|
6315 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6316 this->PlaySound(SPEECH_96, 0); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6317 bFlashAutonotesBook = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6318 _506568_autonote_type = pAutonoteTxt[val].eType; |
| 1822 | 6319 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, GetPlayerIndex()); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6320 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6321 _449B7E_toggle_bit(pParty->_autonote_bits, val, 1); |
| 1822 | 6322 PlayAwardSound(); |
| 0 | 6323 return; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6324 case VAR_PlayerBits: |
| 1822 | 6325 _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
|
6326 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6327 case VAR_NPCs2: |
|
1793
4dee76d79c78
dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents:
1792
diff
changeset
|
6328 pParty->hirelingScrollPosition = 0; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6329 LOBYTE(pNPCStats->pNewNPCData[val].uFlags) |= 0x80u; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6330 pParty->CountHirelings(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6331 viewparams->bRedrawGameUI = true; |
|
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_NumSkillPoints: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6334 this->uSkillPoints += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6335 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6336 case VAR_ReputationInCurrentLocation: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6337 v27 = &pOutdoor->ddm; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6338 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6339 v27 = &pIndoor->dlv; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6340 v27->uReputation += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6341 if ( v27->uReputation > 10000 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6342 v27->uReputation = 10000; |
|
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_GoldInBank: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6345 pParty->uNumGoldInBank += 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_NumDeaths: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6348 pParty->uNumDeaths += 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_NumBounties: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6351 pParty->uNumBountiesCollected += 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_PrisonTerms: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6354 pParty->uNumPrisonTerms += 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_ArenaWinsPage: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6357 pParty->uNumArenaPageWins += 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_ArenaWinsSquire: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6360 pParty->uNumArenaSquireWins += 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_ArenaWinsKnight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6363 pParty->uNumArenaKnightWins += 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_ArenaWinsLord: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6366 pParty->uNumArenaLordWins += val; |
|
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_StaffSkill: |
| 1822 | 6369 AddSkillByEvent(&Player::skillStaff, 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_SwordSkill: |
| 1822 | 6372 AddSkillByEvent(&Player::skillSword, 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_DaggerSkill: |
| 1822 | 6375 AddSkillByEvent(&Player::skillDagger, 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_AxeSkill: |
| 1822 | 6378 AddSkillByEvent(&Player::skillAxe, 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_SpearSkill: |
| 1822 | 6381 AddSkillByEvent(&Player::skillSpear, 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_BowSkill: |
| 1822 | 6384 AddSkillByEvent(&Player::skillBow, 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_MaceSkill: |
| 1822 | 6387 AddSkillByEvent(&Player::skillMace, 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_BlasterSkill: |
| 1822 | 6390 AddSkillByEvent(&Player::skillBlaster, 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_ShieldSkill: |
| 1822 | 6393 AddSkillByEvent(&Player::skillShield, 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_LeatherSkill: |
| 1822 | 6396 AddSkillByEvent(&Player::skillLeather, 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_SkillChain: |
| 1822 | 6399 AddSkillByEvent(&Player::skillChain, 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_PlateSkill: |
| 1822 | 6402 AddSkillByEvent(&Player::skillPlate, 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_FireSkill: |
| 1822 | 6405 AddSkillByEvent(&Player::skillFire, 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_AirSkill: |
| 1822 | 6408 AddSkillByEvent(&Player::skillAir, 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_WaterSkill: |
| 1822 | 6411 AddSkillByEvent(&Player::skillWater, 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_EarthSkill: |
| 1822 | 6414 AddSkillByEvent(&Player::skillEarth, 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_SpiritSkill: |
| 1822 | 6417 AddSkillByEvent(&Player::skillSpirit, 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_MindSkill: |
| 1822 | 6420 AddSkillByEvent(&Player::skillMind, 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_BodySkill: |
| 1822 | 6423 AddSkillByEvent(&Player::skillBody, 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_LightSkill: |
| 1822 | 6426 AddSkillByEvent(&Player::skillLight, 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_DarkSkill: |
| 1822 | 6429 AddSkillByEvent(&Player::skillDark, 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_IdentifyItemSkill: |
| 1822 | 6432 AddSkillByEvent(&Player::skillItemId, 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_MerchantSkill: |
| 1822 | 6435 AddSkillByEvent(&Player::skillMerchant, 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_RepairSkill: |
| 1822 | 6438 AddSkillByEvent(&Player::skillRepair, 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_BodybuildingSkill: |
| 1822 | 6441 AddSkillByEvent(&Player::skillBodybuilding, 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_MeditationSkill: |
| 1822 | 6444 AddSkillByEvent(&Player::skillMeditation, 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_PerceptionSkill: |
| 1822 | 6447 AddSkillByEvent(&Player::skillPerception, 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_DiplomacySkill: |
| 1822 | 6450 AddSkillByEvent(&Player::skillDiplomacy, val); |
|
1792
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_ThieverySkill: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6453 Error ("Thieving unsupported"); |
|
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_DisarmTrapSkill: |
| 1822 | 6456 AddSkillByEvent(&Player::skillDisarmTrap, 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_DodgeSkill: |
| 1822 | 6459 AddSkillByEvent(&Player::skillDodge, 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_UnarmedSkill: |
| 1822 | 6462 AddSkillByEvent(&Player::skillUnarmed, 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_IdentifyMonsterSkill: |
| 1822 | 6465 AddSkillByEvent(&Player::skillMonsterId, 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_ArmsmasterSkill: |
| 1822 | 6468 AddSkillByEvent(&Player::skillArmsmaster, 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_StealingSkill: |
| 1822 | 6471 AddSkillByEvent(&Player::skillStealing, 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_AlchemySkill: |
| 1822 | 6474 AddSkillByEvent(&Player::skillAlchemy, 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 case VAR_LearningSkill: |
| 1822 | 6477 AddSkillByEvent(&Player::skillLearning, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6478 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6479 default: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6480 return; |
| 0 | 6481 } |
| 6482 } | |
| 6483 | |
| 1791 | 6484 //----- (new function) -------------------------------------------------------- |
| 1822 | 6485 void Player::PlayAwardSound_Anim97() |
| 6486 { | |
| 6487 int playerIndex = GetPlayerIndex(); | |
| 6488 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, playerIndex); | |
| 6489 PlayAwardSound(); | |
| 1791 | 6490 } |
| 6491 | |
| 6492 //----- (new function) -------------------------------------------------------- | |
| 1822 | 6493 void Player::PlayAwardSound_Anim97_Face( PlayerSpeech speech ) |
| 1791 | 6494 { |
| 6495 this->PlaySound(speech, 0); | |
| 1822 | 6496 PlayAwardSound_Anim97(); |
| 1791 | 6497 } |
| 6498 | |
| 6499 //----- (new function) -------------------------------------------------------- | |
| 1822 | 6500 void Player::AddSkillByEvent( unsigned __int16 Player::* skillToSet, unsigned __int16 addSkillValue ) |
| 1791 | 6501 { |
| 6502 if ( addSkillValue > 63 ) | |
| 6503 { | |
| 6504 this->*skillToSet = (unsigned __int8)addSkillValue | this->*skillToSet & 63; | |
| 6505 } | |
| 6506 else | |
| 6507 { | |
| 6508 this->*skillToSet = min(this->*skillToSet + addSkillValue, 60) | this->*skillToSet & 0xC0; | |
| 6509 } | |
| 1822 | 6510 PlayAwardSound_Anim97(); |
| 1791 | 6511 return; |
| 6512 } | |
| 0 | 6513 |
| 6514 //----- (0044B9C4) -------------------------------------------------------- | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6515 void Player::SubtractVariable( enum VariableType VarNum, signed int pValue ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6516 { |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6517 DDM_DLV_Header *locationHeader; // eax@90 |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6518 int randGold; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6519 int randFood; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6520 int npcIndex; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6521 |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6522 if ( VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_99 ) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6523 { |
| 1822 | 6524 if ( VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_74 ) |
| 6525 { | |
| 6526 stru_5E4C90_MapPersistVars.field_0[VarNum - VAR_MapPersistentVariable_0] -= pValue; | |
| 6527 } | |
| 6528 if ( (signed int)VarNum >= VAR_MapPersistentVariable_75 && VarNum <= VAR_MapPersistentVariable_99 ) | |
| 6529 { | |
| 6530 stru_5E4C90_MapPersistVars._decor_events[VarNum - VAR_MapPersistentVariable_75] -= pValue; | |
| 6531 } | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6532 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6533 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6534 |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6535 switch (VarNum) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6536 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6537 case VAR_CurrentHP: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6538 ReceiveDamage((signed int)pValue, DMGT_PHISYCAL); |
| 1822 | 6539 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6540 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6541 case VAR_CurrentSP: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6542 this->sMana = max(this->sMana - pValue, 0); |
| 1822 | 6543 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6544 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6545 case VAR_ACModifier: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6546 this->sACModifier -= (unsigned __int8)pValue; |
| 1822 | 6547 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6548 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6549 case VAR_BaseLevel: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6550 this->uLevel -= (unsigned __int8)pValue; |
| 1822 | 6551 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6552 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6553 case VAR_LevelModifier: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6554 this->sLevelModifier -= (unsigned __int8)pValue; |
| 1822 | 6555 PlayAwardSound_Anim98(); |
|
1820
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_Age: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6558 this->sAgeModifier -= (signed __int16)pValue; |
|
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_Award: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6561 _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
|
6562 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6563 case VAR_Experience: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6564 this->uExperience -= pValue; |
| 1822 | 6565 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6566 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6567 case VAR_QBits_QuestsDone: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6568 _449B7E_toggle_bit(pParty->_quest_bits, (__int16)pValue, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6569 this->PlaySound(SPEECH_96, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6570 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6571 case VAR_PlayerItemInHands: |
| 2025 | 6572 for ( uint i = 0; i < 16; ++i ) |
| 6573 { | |
| 6574 int id_ = this->pEquipment.pIndices[i]; | |
| 6575 if ( id_ > 0 ) | |
| 6576 { | |
| 6577 if ( this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID == pValue ) | |
| 6578 { | |
| 6579 this->pEquipment.pIndices[i] = 0; | |
| 6580 } | |
| 6581 } | |
| 6582 } | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6583 for (int i = 0; i < 126; i++) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6584 { |
| 2025 | 6585 int id_ = this->pInventoryMatrix[i]; |
| 6586 if ( id_ > 0 ) | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6587 { |
| 2025 | 6588 if ( this->pInventoryItemList[id_ - 1].uItemID == pValue ) |
| 6589 { | |
| 6590 RemoveItemAtInventoryIndex(i); | |
| 6591 return; | |
| 6592 } | |
|
1820
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 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6595 if ( pParty->pPickedItem.uItemID == pValue ) |
|
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 pMouse->RemoveHoldingItem(); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6598 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6599 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6600 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6601 case VAR_FixedGold: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6602 if ( (unsigned int)pValue > pParty->uNumGold ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6603 { |
|
1825
23deb6b09c8c
cancelEventProcessing to dword_5B65C4_cancelEventProcessing
Grumpy7
parents:
1822
diff
changeset
|
6604 dword_5B65C4_cancelEventProcessing = 1; |
|
1820
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 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6607 Party::TakeGold((unsigned int)pValue); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6608 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6609 case VAR_RandomGold: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6610 randGold = rand() % (signed int)pValue + 1; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6611 if ( (unsigned int)randGold > pParty->uNumGold ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6612 randGold = pParty->uNumGold; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6613 Party::TakeGold(randGold); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6614 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[503], randGold); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6615 ShowStatusBarString(pTmpBuf.data(), 2); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6616 GameUI_DrawFoodAndGold(); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6617 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6618 case VAR_FixedFood: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6619 Party::TakeFood((unsigned int)pValue); |
| 1822 | 6620 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6621 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6622 case VAR_RandomFood: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6623 randFood = rand() % (signed int)pValue + 1; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6624 if ( (unsigned int)randFood > pParty->uNumFoodRations ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6625 randFood = pParty->uNumFoodRations; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6626 Party::TakeFood(randFood); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6627 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[504], randFood); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6628 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6629 GameUI_DrawFoodAndGold(); |
| 1822 | 6630 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6631 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6632 case VAR_MightBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6633 case VAR_ActualMight: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6634 this->uMightBonus -= (unsigned __int16)pValue; |
| 1822 | 6635 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6636 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6637 case VAR_IntellectBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6638 case VAR_ActualIntellect: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6639 this->uIntelligenceBonus -= (unsigned __int16)pValue; |
| 1822 | 6640 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6641 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6642 case VAR_PersonalityBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6643 case VAR_ActualPersonality: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6644 this->uWillpowerBonus -= (unsigned __int16)pValue; |
| 1822 | 6645 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6646 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6647 case VAR_EnduranceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6648 case VAR_ActualEndurance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6649 this->uEnduranceBonus -= (unsigned __int16)pValue; |
| 1822 | 6650 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6651 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6652 case VAR_SpeedBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6653 case VAR_ActualSpeed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6654 this->uSpeedBonus -= (unsigned __int16)pValue; |
| 1822 | 6655 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6656 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6657 case VAR_AccuracyBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6658 case VAR_ActualAccuracy: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6659 this->uAccuracyBonus -= (unsigned __int16)pValue; |
| 1822 | 6660 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6661 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6662 case VAR_LuckBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6663 case VAR_ActualLuck: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6664 this->uLuckBonus -= (unsigned __int16)pValue; |
| 1822 | 6665 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6666 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6667 case VAR_BaseMight: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6668 this->uMight -= (unsigned __int16)pValue; |
| 1822 | 6669 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6670 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6671 case VAR_BaseIntellect: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6672 this->uIntelligence -= (unsigned __int16)pValue; |
| 1822 | 6673 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6674 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6675 case VAR_BasePersonality: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6676 this->uWillpower -= (unsigned __int16)pValue; |
| 1822 | 6677 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6678 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6679 case VAR_BaseEndurance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6680 this->uEndurance -= (unsigned __int16)pValue; |
| 1822 | 6681 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6682 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6683 case VAR_BaseSpeed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6684 this->uSpeed -= (unsigned __int16)pValue; |
| 1822 | 6685 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6686 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6687 case VAR_BaseAccuracy: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6688 this->uAccuracy -= (unsigned __int16)pValue; |
| 1822 | 6689 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6690 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6691 case VAR_BaseLuck: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6692 this->uLuck -= (unsigned __int16)pValue; |
| 1822 | 6693 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6694 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6695 case VAR_FireResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6696 this->sResFireBase -= (signed __int16)pValue; |
| 1822 | 6697 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6698 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6699 case VAR_AirResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6700 this->sResAirBase -= (signed __int16)pValue; |
| 1822 | 6701 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6702 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6703 case VAR_WaterResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6704 this->sResWaterBase -= (signed __int16)pValue; |
| 1822 | 6705 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6706 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6707 case VAR_EarthResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6708 this->sResEarthBase -= (signed __int16)pValue; |
| 1822 | 6709 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6710 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6711 case VAR_SpiritResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6712 this->sResSpiritBase -= (signed __int16)pValue; |
| 1822 | 6713 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6714 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6715 case VAR_MindResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6716 this->sResMindBase -= (signed __int16)pValue; |
| 1822 | 6717 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6718 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6719 case VAR_BodyResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6720 this->sResBodyBase -= (signed __int16)pValue; |
| 1822 | 6721 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6722 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6723 case VAR_LightResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6724 this->sResLightBase -= (signed __int16)pValue; |
| 1822 | 6725 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6726 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6727 case VAR_DarkResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6728 this->sResDarkBase -= (signed __int16)pValue; |
| 1822 | 6729 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6730 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6731 case VAR_MagicResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6732 this->sResMagicBase -= (signed __int16)pValue; |
| 1822 | 6733 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6734 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6735 case VAR_FireResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6736 this->sResFireBonus -= (signed __int16)pValue; |
| 1822 | 6737 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6738 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6739 case VAR_AirResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6740 this->sResAirBonus -= (signed __int16)pValue; |
| 1822 | 6741 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6742 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6743 case VAR_WaterResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6744 this->sResWaterBonus -= (signed __int16)pValue; |
| 1822 | 6745 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6746 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6747 case VAR_EarthResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6748 this->sResEarthBonus -= (signed __int16)pValue; |
| 1822 | 6749 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6750 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6751 case VAR_SpiritResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6752 this->sResSpiritBonus -= (signed __int16)pValue; |
| 1822 | 6753 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6754 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6755 case VAR_MindResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6756 this->sResMindBonus -= (signed __int16)pValue; |
| 1822 | 6757 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6758 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6759 case VAR_BodyResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6760 this->sResBodyBonus -= (signed __int16)pValue; |
| 1822 | 6761 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6762 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6763 case VAR_LightResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6764 this->sResLightBonus -= (signed __int16)pValue; |
| 1822 | 6765 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6766 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6767 case VAR_DarkResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6768 this->sResDarkBonus -= (signed __int16)pValue; |
| 1822 | 6769 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6770 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6771 case VAR_MagicResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6772 this->sResMagicBonus -= (signed __int16)pValue; |
| 1822 | 6773 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6774 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6775 case VAR_StaffSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6776 this->skillStaff -= (unsigned __int8)pValue; |
| 1822 | 6777 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6778 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6779 case VAR_SwordSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6780 this->skillSword -= (unsigned __int8)pValue; |
| 1822 | 6781 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6782 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6783 case VAR_DaggerSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6784 this->skillDagger -= (unsigned __int8)pValue; |
| 1822 | 6785 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6786 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6787 case VAR_AxeSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6788 this->skillAxe -= (unsigned __int8)pValue; |
| 1822 | 6789 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6790 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6791 case VAR_SpearSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6792 this->skillSpear -= (unsigned __int8)pValue; |
| 1822 | 6793 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6794 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6795 case VAR_BowSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6796 this->skillBow -= (unsigned __int8)pValue; |
| 1822 | 6797 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6798 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6799 case VAR_MaceSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6800 this->skillMace -= (unsigned __int8)pValue; |
| 1822 | 6801 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6802 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6803 case VAR_BlasterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6804 this->skillBlaster -= (unsigned __int8)pValue; |
| 1822 | 6805 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6806 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6807 case VAR_ShieldSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6808 this->skillShield -= (unsigned __int8)pValue; |
| 1822 | 6809 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6810 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6811 case VAR_LeatherSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6812 this->skillLearning -= (unsigned __int8)pValue; |
| 1822 | 6813 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6814 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6815 case VAR_SkillChain: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6816 this->skillChain -= (unsigned __int8)pValue; |
| 1822 | 6817 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6818 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6819 case VAR_PlateSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6820 this->skillPlate -= (unsigned __int8)pValue; |
| 1822 | 6821 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6822 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6823 case VAR_FireSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6824 this->skillFire -= (unsigned __int8)pValue; |
| 1822 | 6825 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6826 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6827 case VAR_AirSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6828 this->skillAir -= (unsigned __int8)pValue; |
| 1822 | 6829 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6830 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6831 case VAR_WaterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6832 this->skillWater -= (unsigned __int8)pValue; |
| 1822 | 6833 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6834 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6835 case VAR_EarthSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6836 this->skillEarth -= (unsigned __int8)pValue; |
| 1822 | 6837 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6838 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6839 case VAR_SpiritSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6840 this->skillSpirit -= (unsigned __int8)pValue; |
| 1822 | 6841 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6842 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6843 case VAR_MindSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6844 this->skillMind -= (unsigned __int8)pValue; |
| 1822 | 6845 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6846 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6847 case VAR_BodySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6848 this->skillBody -= (unsigned __int8)pValue; |
| 1822 | 6849 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6850 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6851 case VAR_LightSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6852 this->skillLight -= (unsigned __int8)pValue; |
| 1822 | 6853 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6854 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6855 case VAR_DarkSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6856 this->skillDark -= (unsigned __int8)pValue; |
| 1822 | 6857 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6858 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6859 case VAR_IdentifyItemSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6860 this->skillItemId -= (unsigned __int8)pValue; |
| 1822 | 6861 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6862 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6863 case VAR_MerchantSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6864 this->skillMerchant -= (unsigned __int8)pValue; |
| 1822 | 6865 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6866 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6867 case VAR_RepairSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6868 this->skillRepair -= (unsigned __int8)pValue; |
| 1822 | 6869 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6870 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6871 case VAR_BodybuildingSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6872 this->skillBodybuilding -= (unsigned __int8)pValue; |
| 1822 | 6873 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6874 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6875 case VAR_MeditationSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6876 this->skillMeditation -= (unsigned __int8)pValue; |
| 1822 | 6877 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6878 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6879 case VAR_PerceptionSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6880 this->skillPerception -= (unsigned __int8)pValue; |
| 1822 | 6881 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6882 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6883 case VAR_DiplomacySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6884 this->skillDiplomacy -= (unsigned __int8)pValue; |
| 1822 | 6885 PlayAwardSound_Anim98(); |
| 6886 return; | |
| 6887 case VAR_ThieverySkill: | |
| 6888 Error ("Thieving unsupported"); | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6889 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6890 case VAR_DisarmTrapSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6891 this->skillDisarmTrap -= (unsigned __int8)pValue; |
| 1822 | 6892 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6893 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6894 case VAR_DodgeSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6895 this->skillDodge -= (unsigned __int8)pValue; |
| 1822 | 6896 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6897 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6898 case VAR_UnarmedSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6899 this->skillUnarmed -= (unsigned __int8)pValue; |
| 1822 | 6900 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6901 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6902 case VAR_IdentifyMonsterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6903 this->skillMonsterId -= (unsigned __int8)pValue; |
| 1822 | 6904 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6905 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6906 case VAR_ArmsmasterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6907 this->skillArmsmaster -= (unsigned __int8)pValue; |
| 1822 | 6908 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6909 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6910 case VAR_StealingSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6911 this->skillStealing -= (unsigned __int8)pValue; |
| 1822 | 6912 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6913 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6914 case VAR_AlchemySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6915 this->skillAlchemy -= (unsigned __int8)pValue; |
| 1822 | 6916 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6917 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6918 case VAR_LearningSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6919 this->skillLearning -= (unsigned __int8)pValue; |
| 1822 | 6920 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6921 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6922 case VAR_Cursed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6923 this->pConditions[Condition_Cursed] = 0; |
| 1822 | 6924 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6925 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6926 case VAR_Weak: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6927 this->pConditions[Condition_Weak] = 0; |
| 1822 | 6928 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6929 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6930 case VAR_Asleep: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6931 this->pConditions[Condition_Sleep] = 0; |
| 1822 | 6932 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6933 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6934 case VAR_Afraid: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6935 this->pConditions[Condition_Fear] = 0; |
| 1822 | 6936 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6937 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6938 case VAR_Drunk: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6939 this->pConditions[Condition_Drunk] = 0; |
| 1822 | 6940 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6941 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6942 case VAR_Insane: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6943 this->pConditions[Condition_Insane] = 0; |
| 1822 | 6944 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6945 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6946 case VAR_PoisonedGreen: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6947 this->pConditions[Condition_Poison1] = 0; |
| 1822 | 6948 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6949 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6950 case VAR_DiseasedGreen: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6951 this->pConditions[Condition_Disease1] = 0; |
| 1822 | 6952 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6953 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6954 case VAR_PoisonedYellow: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6955 this->pConditions[Condition_Poison2] = 0; |
| 1822 | 6956 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6957 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6958 case VAR_DiseasedYellow: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6959 this->pConditions[Condition_Disease2] = 0; |
| 1822 | 6960 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6961 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6962 case VAR_PoisonedRed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6963 this->pConditions[Condition_Poison3] = 0; |
| 1822 | 6964 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6965 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6966 case VAR_DiseasedRed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6967 this->pConditions[Condition_Disease3] = 0; |
| 1822 | 6968 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6969 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6970 case VAR_Paralyzed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6971 this->pConditions[Condition_Paralyzed] = 0; |
| 1822 | 6972 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6973 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6974 case VAR_Unconsious: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6975 this->pConditions[Condition_Unconcious] = 0; |
| 1822 | 6976 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6977 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6978 case VAR_Dead: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6979 this->pConditions[Condition_Dead] = 0; |
| 1822 | 6980 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6981 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6982 case VAR_Stoned: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6983 this->pConditions[Condition_Pertified] = 0; |
| 1822 | 6984 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6985 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6986 case VAR_Eradicated: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6987 this->pConditions[Condition_Eradicated] = 0; |
| 1822 | 6988 PlayAwardSound_Anim98(); |
|
1820
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_AutoNotes: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6991 _449B7E_toggle_bit(pParty->_autonote_bits, pValue - 1, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6992 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6993 case VAR_NPCs2: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6994 npcIndex = 0; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6995 GetNewNPCData(sDialogue_SpeakingActorNPC_ID, &npcIndex); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6996 if ( npcIndex == pValue ) |
| 0 | 6997 { |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6998 npcIdToDismissAfterDialogue = pValue; |
| 0 | 6999 } |
| 7000 else | |
| 7001 { | |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7002 npcIdToDismissAfterDialogue = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7003 pParty->hirelingScrollPosition = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7004 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7005 pParty->CountHirelings(); |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7006 viewparams->bRedrawGameUI = true; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7007 } |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7008 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7009 case VAR_HiredNPCHasSpeciality: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7010 for (unsigned int i = 0; i < pNPCStats->uNumNewNPCs; i++) |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7011 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7012 if (pNPCStats->pNewNPCData[i].uProfession == pValue) |
| 0 | 7013 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7014 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
| 0 | 7015 } |
| 7016 } | |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7017 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
|
7018 memset(&pParty->pHirelings[0], 0, sizeof(NPCData)); |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7019 if ( pParty->pHirelings[1].uProfession == pValue ) |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7020 memset(&pParty->pHirelings[1], 0, sizeof(NPCData)); |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7021 pParty->hirelingScrollPosition = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7022 pParty->CountHirelings(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7023 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7024 case VAR_NumSkillPoints: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7025 if ((unsigned int)pValue <= this->uSkillPoints) |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7026 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7027 this->uSkillPoints -= pValue; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7028 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7029 else |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7030 { |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7031 this->uSkillPoints = 0; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7032 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7033 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7034 case VAR_ReputationInCurrentLocation: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7035 locationHeader = &pOutdoor->ddm; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7036 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7037 locationHeader = &pIndoor->dlv; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7038 locationHeader->uReputation -= pValue; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7039 if (locationHeader->uReputation < -10000) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7040 locationHeader->uReputation = -10000; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7041 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7042 case VAR_GoldInBank: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7043 if ( (unsigned int)pValue <= pParty->uNumGoldInBank ) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7044 { |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7045 pParty->uNumGoldInBank -= (unsigned int)pValue; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7046 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7047 else |
| 0 | 7048 { |
|
1825
23deb6b09c8c
cancelEventProcessing to dword_5B65C4_cancelEventProcessing
Grumpy7
parents:
1822
diff
changeset
|
7049 dword_5B65C4_cancelEventProcessing = 1; |
| 605 | 7050 } |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7051 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7052 case VAR_NumDeaths: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7053 pParty->uNumDeaths -= (unsigned int)pValue; |
|
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_NumBounties: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7056 pParty->uNumBountiesCollected -= (unsigned 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_PrisonTerms: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7059 pParty->uNumPrisonTerms -= (int)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_ArenaWinsPage: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7062 pParty->uNumArenaPageWins -= (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_ArenaWinsSquire: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7065 pParty->uNumArenaSquireWins -= (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_ArenaWinsKnight: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7068 pParty->uNumArenaKnightWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7069 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7070 case VAR_ArenaWinsLord: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7071 pParty->uNumArenaLordWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7072 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7073 } |
| 0 | 7074 } |
| 7075 // 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
|
7076 // 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
|
7077 |
| 1818 | 7078 //----- (new function) -------------------------------------------------------- |
| 1822 | 7079 void Player::PlayAwardSound_Anim98() |
| 7080 { | |
| 7081 int playerIndex = GetPlayerIndex(); | |
| 7082 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, playerIndex); | |
| 7083 PlayAwardSound(); | |
| 1818 | 7084 } |
| 7085 | |
| 7086 //----- (new function) -------------------------------------------------------- | |
| 1822 | 7087 void Player::PlayAwardSound_Anim98_Face( PlayerSpeech speech ) |
| 1818 | 7088 { |
| 7089 this->PlaySound(speech, 0); | |
| 1822 | 7090 PlayAwardSound_Anim98(); |
| 1818 | 7091 } |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7092 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7093 //----- (00467E7F) -------------------------------------------------------- |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7094 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
|
7095 { |
| 1822 | 7096 int itemAnchor; // ebx@1 |
| 7097 int itemInvLocation; // edx@1 | |
| 7098 int freeSlot; // eax@3 | |
| 1619 | 7099 ItemGen tempPickedItem; // [sp+Ch] [bp-30h]@1 |
| 7100 | |
| 7101 tempPickedItem.Reset(); | |
| 1822 | 7102 itemAnchor = pEquipTypeToBodyAnchor[uEquipType]; |
| 2156 | 7103 itemInvLocation = pPlayers[uActiveCharacter]->pEquipment.pIndices[itemAnchor]; |
| 7104 if ( itemInvLocation )// | |
| 1619 | 7105 { |
| 7106 memcpy(&tempPickedItem, &pParty->pPickedItem, sizeof(tempPickedItem)); | |
| 2156 | 7107 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
|
7108 pParty->pPickedItem.Reset(); |
| 2156 | 7109 pParty->SetHoldingItem(&pPlayers[uActiveCharacter]->pInventoryItemList[itemInvLocation - 1]); |
| 1822 | 7110 tempPickedItem.uBodyAnchor = itemAnchor + 1; |
| 2156 | 7111 memcpy(&pPlayers[uActiveCharacter]->pInventoryItemList[itemInvLocation - 1], &tempPickedItem, sizeof(ItemGen)); |
| 7112 pPlayers[uActiveCharacter]->pEquipment.pIndices[itemAnchor] = itemInvLocation; | |
| 7113 } | |
| 7114 else// | |
| 7115 { | |
| 7116 freeSlot = pPlayers[uActiveCharacter]->FindFreeInventoryListSlot(); | |
| 1822 | 7117 if (freeSlot >= 0) |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7118 { |
| 1822 | 7119 pParty->pPickedItem.uBodyAnchor = itemAnchor + 1; |
| 2156 | 7120 memcpy(&pPlayers[uActiveCharacter]->pInventoryItemList[freeSlot], &pParty->pPickedItem, sizeof(ItemGen)); |
| 7121 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
|
7122 pMouse->RemoveHoldingItem(); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7123 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7124 } |
| 1295 | 7125 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7126 |
| 1295 | 7127 //----- (0049387A) -------------------------------------------------------- |
| 1459 | 7128 int CycleCharacter(bool backwards) |
| 1295 | 7129 { |
|
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
|
7130 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
|
7131 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
|
7132 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
|
7133 |
|
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 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
|
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 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
|
7137 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
|
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 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
|
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 } |
|
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
|
7142 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
|
7143 } |
|
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 |
| 1297 | 7145 //----- (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
|
7146 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
|
7147 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7148 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
|
7149 { |
|
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 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
|
7151 } |
|
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
|
7152 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
|
7153 } |
| 1432 | 7154 |
| 1297 | 7155 //----- (0043EE15) -------------------------------------------------------- |
| 1822 | 7156 bool Player::HasItem( unsigned int uItemID, bool checkHeldItem ) |
| 7157 { | |
| 7158 if ( !checkHeldItem || pParty->pPickedItem.uItemID != uItemID ) | |
| 1297 | 7159 { |
| 7160 for ( uint i = 0; i < 126; ++i ) | |
| 7161 { | |
|
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
|
7162 if ( this->pInventoryMatrix[i] > 0 ) |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7163 { |
|
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
|
7164 if ( (unsigned int)this->pInventoryItemList[this->pInventoryMatrix[i] - 1].uItemID == uItemID ) |
| 1297 | 7165 return true; |
| 7166 } | |
| 7167 } | |
| 7168 for ( uint i = 0; i < 16; ++i ) | |
| 7169 { | |
|
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
|
7170 if ( this->pEquipment.pIndices[i] ) |
| 1297 | 7171 { |
|
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
|
7172 if ( (unsigned int)this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID == uItemID ) |
| 1297 | 7173 return true; |
| 7174 } | |
| 7175 } | |
| 1822 | 7176 return false; |
| 7177 } | |
| 7178 else | |
| 7179 { | |
| 7180 return true; | |
| 7181 } | |
| 1297 | 7182 } |
| 7183 //----- (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
|
7184 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
|
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 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
|
7187 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
|
7188 |
|
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 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
|
7190 { |
|
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 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
|
7192 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
|
7193 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
|
7194 { |
|
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 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
|
7196 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
|
7197 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
|
7198 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
|
7199 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
|
7200 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
|
7201 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
|
7202 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
|
7203 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
|
7204 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
|
7205 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
|
7206 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
|
7207 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
|
7208 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
|
7209 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
|
7210 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
|
7211 } |
|
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
|
7212 } |
|
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
|
7213 return false; |
| 1297 | 7214 } |
| 7215 //----- (0043ED6F) -------------------------------------------------------- | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7216 bool IsDwarfPresentInParty(bool a1) |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7217 { |
| 1297 | 7218 for (uint i = 0; i < 4; ++i) |
| 7219 { | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7220 CHARACTER_RACE race = pParty->pPlayers[i].GetRace(); |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7221 |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7222 if (race == CHARACTER_RACE_DWARF && a1) |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7223 return true; |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7224 else if (race != CHARACTER_RACE_DWARF && !a1) |
| 1297 | 7225 return true; |
| 7226 } | |
| 7227 return false; | |
| 7228 } | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7229 |
| 1297 | 7230 //----- (00439FCB) -------------------------------------------------------- |
| 2006 | 7231 void __fastcall DamagePlayerFromMonster(unsigned int uObjID, int dmgSource, Vec3_int_ *pPos, signed int a4) |
| 1681 | 7232 { |
| 1649 | 7233 Player *playerPtr; // ebx@3 |
| 7234 Actor *actorPtr; // esi@3 | |
| 1681 | 7235 int spellId; // eax@38 |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7236 signed int recvdMagicDmg; // eax@139 |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7237 int v72[4]; // [sp+30h] [bp-24h]@164 |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7238 int healthBeforeRecvdDamage; // [sp+48h] [bp-Ch]@3 |
| 1297 | 7239 unsigned int uActorID; // [sp+4Ch] [bp-8h]@1 |
| 1681 | 7240 |
| 7241 uActorID = PID_ID(uObjID); | |
| 7242 if ( PID_TYPE(uObjID) != 2) | |
| 1297 | 7243 { |
| 1649 | 7244 playerPtr = &pParty->pPlayers[a4]; |
| 1681 | 7245 actorPtr = &pActors[uActorID]; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7246 healthBeforeRecvdDamage = playerPtr->sHealth; |
| 1681 | 7247 if ( PID_TYPE(uObjID) != 3 || !stru_50C198.ActorHitOrMiss(actorPtr, playerPtr) ) |
| 1297 | 7248 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
|
7249 ItemGen* equippedArmor = playerPtr->GetArmorItem(); |
| 1681 | 7250 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
|
7251 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
|
7252 || equippedArmor->IsBroken() |
| 1649 | 7253 || |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7254 (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
|
7255 && equippedArmor->GetPlayerSkillType() != PLAYER_SKILL_PLATE |
| 1649 | 7256 ) |
| 7257 ) | |
| 1297 | 7258 { |
| 1681 | 7259 int randVal = rand() % 4; |
| 7260 switch (randVal) | |
| 1297 | 7261 { |
| 1681 | 7262 case 0 : soundToPlay = (SoundID)108; break; |
| 7263 case 1 : soundToPlay = (SoundID)109; break; | |
| 7264 case 2 : soundToPlay = (SoundID)110; break; | |
| 7265 case 3 : soundToPlay = (SoundID)44; break; | |
| 1783 | 7266 default: Error("Unexpected sound value"); |
| 1297 | 7267 } |
| 7268 } | |
| 7269 else | |
| 7270 { | |
| 1681 | 7271 int randVal = rand() % 4; |
| 7272 switch (randVal) | |
| 1297 | 7273 { |
| 1681 | 7274 case 0 : soundToPlay = (SoundID)105; break; |
| 7275 case 1 : soundToPlay = (SoundID)106; break; | |
| 7276 case 2 : soundToPlay = (SoundID)107; break; | |
| 7277 case 3 : soundToPlay = (SoundID)45; break; | |
| 1783 | 7278 default: Error("Unexpected sound value"); |
| 1297 | 7279 } |
| 1648 | 7280 } |
| 1681 | 7281 pAudioPlayer->PlaySound(soundToPlay, PID(OBJECT_Player,a4 + 80), 0, -1, 0, 0, 0, 0); |
| 1876 | 7282 int dmgToReceive = actorPtr->_43B3E0_CalcDamage(dmgSource); |
| 1949 | 7283 if ( actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime > 0 ) |
| 1649 | 7284 { |
| 1949 | 7285 __int16 spellPower = actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uPower; |
| 1681 | 7286 if ( spellPower ) |
| 7287 dmgToReceive /= (signed int)spellPower; | |
| 7288 } | |
| 1682 | 7289 int damageType; |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7290 switch (dmgSource) |
| 1648 | 7291 { |
| 1682 | 7292 case 0: damageType = actorPtr->pMonsterInfo.uAttack1Type; |
| 1648 | 7293 break; |
| 1682 | 7294 case 1: damageType = actorPtr->pMonsterInfo.uAttack2Type; |
| 1648 | 7295 break; |
| 1681 | 7296 case 2: spellId = actorPtr->pMonsterInfo.uSpell1ID; |
| 1682 | 7297 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); |
| 1648 | 7298 break; |
| 1681 | 7299 case 3: spellId = actorPtr->pMonsterInfo.uSpell2ID; |
| 1682 | 7300 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); |
| 1648 | 7301 break; |
| 1682 | 7302 case 4: damageType = actorPtr->pMonsterInfo.field_3C_some_special_attack; |
| 1648 | 7303 break; |
| 7304 default: | |
| 1682 | 7305 case 5: damageType = 4; //yes, the original just assigned the value 4 |
| 1648 | 7306 break; |
| 7307 } | |
| 2061 | 7308 if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) ) |
| 1297 | 7309 { |
| 1682 | 7310 dmgToReceive = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); |
| 1822 | 7311 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) |
| 1297 | 7312 { |
| 1681 | 7313 int actorState = actorPtr->uAIState; |
| 7314 if ( actorState != Dying && actorState != Dead) | |
| 1297 | 7315 { |
| 1682 | 7316 int reflectedDamage = stru_50C198.CalcMagicalDamageToActor(actorPtr, damageType, dmgToReceive); |
| 1681 | 7317 actorPtr->sCurrentHP -= reflectedDamage; |
| 7318 if ( reflectedDamage >= 0 ) | |
| 1297 | 7319 { |
| 1649 | 7320 if ( actorPtr->sCurrentHP >= 1 ) |
| 1297 | 7321 { |
| 1682 | 7322 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 | 7323 Actor::AggroSurroundingPeasants(uActorID, 1); |
| 7324 } | |
| 7325 else | |
| 7326 { | |
| 2154 | 7327 if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS) |
| 1297 | 7328 { |
| 1681 | 7329 int splatRadius = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; |
| 7330 pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)splatRadius, 0, 0); | |
| 1297 | 7331 } |
| 1648 | 7332 Actor::Die(uActorID); |
| 7333 Actor::ApplyFineForKillingPeasant(uActorID); | |
| 7334 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 1649 | 7335 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
|
7336 pParty->GivePartyExp(pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].uExp); |
| 1681 | 7337 int speechToPlay = SPEECH_51; |
| 1648 | 7338 if ( rand() % 100 < 20 ) |
| 1681 | 7339 speechToPlay = actorPtr->pMonsterInfo.uHP >= 100 ? 2 : 1; |
| 7340 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0); | |
| 1297 | 7341 } |
| 7342 } | |
| 7343 } | |
| 7344 } | |
| 2061 | 7345 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
|
7346 && 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
|
7347 && 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
|
7348 { |
|
1694
5ead2688a227
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect second attempt
Grumpy7
parents:
1693
diff
changeset
|
7349 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7350 } |
| 1297 | 7351 } |
| 7352 if ( !pParty->bTurnBasedModeOn ) | |
| 7353 { | |
| 1681 | 7354 int actEndurance = playerPtr->GetActualEndurance(); |
| 7355 int recoveryTime = (int)((20 - playerPtr->GetParameterBonus(actEndurance)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333); | |
| 7356 playerPtr->SetRecoveryTime(recoveryTime); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7357 } |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7358 int yellThreshold = playerPtr->GetMaxHealth() / 4; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7359 if ( yellThreshold < playerPtr->sHealth && yellThreshold >= healthBeforeRecvdDamage && playerPtr->sHealth > 0 ) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7360 { |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7361 playerPtr->PlaySound(SPEECH_48, 0); |
| 1297 | 7362 } |
| 7363 viewparams->bRedrawGameUI = 1; | |
| 7364 return; | |
| 7365 } | |
| 1648 | 7366 else |
| 7367 { | |
| 1681 | 7368 SpriteObject* v37 = &pSpriteObjects[uActorID]; |
| 7369 int uActorType = PID_TYPE(v37->spell_caster_pid); | |
| 7370 int uActorID = PID_ID(v37->spell_caster_pid); | |
| 7371 if ( uActorType == 2 ) | |
| 7372 { | |
| 7373 Player *playerPtr; // eax@81 | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7374 if ( a4 != -1 ) |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7375 { |
| 1681 | 7376 playerPtr = &pParty->pPlayers[a4]; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7377 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7378 else |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7379 { |
| 1822 | 7380 int activePlayerCounter = 0; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7381 for (int i = 1; i <= 4; i++) |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7382 { |
| 1822 | 7383 if (pPlayers[i]->CanAct()) |
| 7384 { | |
| 7385 v72[activePlayerCounter] = i; | |
| 7386 activePlayerCounter++; | |
| 7387 } | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7388 } |
| 1822 | 7389 if ( activePlayerCounter ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7390 { |
| 2006 | 7391 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
|
7392 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7393 } |
| 1681 | 7394 int v68; |
| 7395 int v69; | |
| 7396 if ( uActorType != OBJECT_Player || v37->spell_id != SPELL_BOW_ARROW) | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7397 { |
| 1681 | 7398 int playerMaxHp = playerPtr->GetMaxHealth(); |
| 7399 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
|
7400 v69 = LOBYTE(pSpellStats->pInfos[v37->spell_id].uSchool); |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7401 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7402 else |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7403 { |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7404 v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7405 v69 = 0; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7406 } |
| 1681 | 7407 playerPtr->ReceiveDamage(v68, (DAMAGE_TYPE)v69); |
| 7408 if ( uActorType == OBJECT_Player && !qword_A750D8 ) | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7409 { |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7410 qword_A750D8 = 256i64; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7411 PlayerSpeechID = SPEECH_44; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7412 uSpeakingCharacter = uActorID + 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7413 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7414 return; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7415 } |
| 1681 | 7416 else if ( uActorType == 3 ) |
| 7417 { | |
| 7418 Actor *actorPtr = &pActors[uActorID]; | |
| 1648 | 7419 if ( a4 == -1 ) |
| 1911 | 7420 a4 = stru_50C198.which_player_to_attack(actorPtr); |
| 1681 | 7421 Player *playerPtr = &pParty->pPlayers[a4]; |
| 1876 | 7422 int dmgToReceive = actorPtr->_43B3E0_CalcDamage(dmgSource); |
| 1681 | 7423 unsigned __int16 spriteType = v37->uType; |
| 1648 | 7424 if ( v37->uType == 545 ) |
| 1297 | 7425 { |
| 1681 | 7426 __int16 skillLevel = playerPtr->GetActualSkillLevel(PLAYER_SKILL_UNARMED); |
| 7427 if ( SkillToMastery(skillLevel) >= 4 && rand() % 100 < (skillLevel & 0x3F) ) | |
| 1648 | 7428 { |
| 1681 | 7429 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], playerPtr->pName); |
| 1648 | 7430 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1681 | 7431 playerPtr->PlaySound(SPEECH_6, 0); |
| 1648 | 7432 return; |
| 7433 } | |
| 1297 | 7434 } |
| 1681 | 7435 else if ( spriteType == 555 |
| 7436 || spriteType == 510 | |
| 7437 || spriteType == 500 | |
| 7438 || spriteType == 515 | |
| 7439 || spriteType == 505 | |
| 7440 || spriteType == 530 | |
| 7441 || spriteType == 525 | |
| 7442 || spriteType == 520 | |
| 7443 || spriteType == 535 | |
| 7444 || spriteType == 540 ) | |
| 1297 | 7445 { |
| 1681 | 7446 if ( !stru_50C198.ActorHitOrMiss(actorPtr, playerPtr) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7447 return; |
| 1822 | 7448 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_SHIELD].uExpireTime > 0 ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7449 dmgToReceive >>= 1; |
| 1681 | 7450 if ( playerPtr->HasEnchantedItemEquipped(36) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7451 dmgToReceive >>= 1; |
| 1681 | 7452 if ( playerPtr->HasEnchantedItemEquipped(69) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7453 dmgToReceive >>= 1; |
| 1681 | 7454 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
|
7455 && playerPtr->GetArmorItem()->uItemID == ITEM_ARTIFACT_GOVERNORS_ARMOR ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7456 dmgToReceive >>= 1; |
| 1989 | 7457 if ( playerPtr->HasItemEquipped(EQUIP_TWO_HANDED)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7458 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7459 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
|
7460 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
|
7461 dmgToReceive >>= 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7462 } |
| 1989 | 7463 if ( playerPtr->HasItemEquipped(EQUIP_SINGLE_HANDED)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7464 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7465 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
|
7466 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
|
7467 dmgToReceive >>= 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7468 } |
| 1648 | 7469 } |
| 1949 | 7470 if ( actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime > 0 ) |
| 1648 | 7471 { |
| 1949 | 7472 int spellPower = actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uPower; |
| 1681 | 7473 if ( spellPower ) |
| 7474 dmgToReceive /= (signed int)spellPower; | |
| 1648 | 7475 } |
| 1681 | 7476 int damageType; |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7477 switch(dmgSource) |
| 1648 | 7478 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7479 case 0: |
| 1681 | 7480 damageType = actorPtr->pMonsterInfo.uAttack1Type; |
|
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 1: |
| 1681 | 7483 damageType = actorPtr->pMonsterInfo.uAttack2Type; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7484 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7485 case 2: |
| 1681 | 7486 spellId = actorPtr->pMonsterInfo.uSpell1ID; |
| 7487 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7488 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7489 case 3: |
| 1681 | 7490 spellId = actorPtr->pMonsterInfo.uSpell2ID; |
| 7491 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); | |
|
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 4: |
| 1681 | 7494 damageType = actorPtr->pMonsterInfo.field_3C_some_special_attack; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7495 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7496 case 5: |
| 1681 | 7497 damageType = 4; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7498 break; |
| 1648 | 7499 } |
| 2061 | 7500 if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) ) |
| 1648 | 7501 { |
| 1681 | 7502 int reflectedDmg = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); |
| 1822 | 7503 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) |
| 1297 | 7504 { |
| 1681 | 7505 unsigned __int16 actorState = actorPtr->uAIState; |
| 7506 if ( actorState != Dying && actorState != Dead) | |
| 1297 | 7507 { |
| 1681 | 7508 recvdMagicDmg = stru_50C198.CalcMagicalDamageToActor(actorPtr, damageType, reflectedDmg); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7509 actorPtr->sCurrentHP -= recvdMagicDmg; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7510 if ( recvdMagicDmg >= 0 ) |
| 1297 | 7511 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7512 if ( actorPtr->sCurrentHP >= 1 ) |
| 1297 | 7513 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7514 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7515 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7516 } |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7517 else |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7518 { |
| 2154 | 7519 if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) |
| 1297 | 7520 { |
| 1681 | 7521 int splatRadius = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; |
| 7522 pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)splatRadius, 0, 0); | |
| 1297 | 7523 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7524 Actor::Die(uActorID); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7525 Actor::ApplyFineForKillingPeasant(uActorID); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7526 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7527 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
|
7528 pParty->GivePartyExp(pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].uExp); |
| 1681 | 7529 int speechToPlay = SPEECH_51; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7530 if ( rand() % 100 < 20 ) |
| 1681 | 7531 speechToPlay = actorPtr->pMonsterInfo.uHP >= 100 ? 2 : 1; |
| 7532 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0); | |
| 1297 | 7533 } |
| 7534 } | |
| 7535 } | |
| 7536 } | |
| 7537 } | |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7538 if ( !dmgSource |
| 2061 | 7539 && !(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
|
7540 && 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
|
7541 && 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
|
7542 { |
|
1694
5ead2688a227
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect second attempt
Grumpy7
parents:
1693
diff
changeset
|
7543 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7544 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7545 if ( !pParty->bTurnBasedModeOn ) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7546 { |
| 1681 | 7547 int actEnd = playerPtr->GetActualEndurance(); |
| 7548 int recTime = (int)((20 - playerPtr->GetParameterBonus(actEnd)) | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7549 * flt_6BE3A4_debug_recmod1 |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7550 * 2.133333333333333); |
| 1681 | 7551 playerPtr->SetRecoveryTime(recTime); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7552 } |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7553 return; |
| 1648 | 7554 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7555 else |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7556 { |
| 1648 | 7557 return; |
| 7558 } | |
| 1297 | 7559 } |
| 7560 } | |
| 7561 //----- (00421EA6) -------------------------------------------------------- | |
| 1683 | 7562 void Player::OnInventoryLeftClick() |
| 7563 { | |
| 1822 | 7564 signed int inventoryXCoord; // ecx@2 |
| 7565 int inventoryYCoord; // eax@2 | |
| 1682 | 7566 int invMatrixIndex; // eax@2 |
| 1822 | 7567 unsigned int enchantedItemPos; // eax@7 |
| 1682 | 7568 unsigned int pickedItemId; // esi@12 |
| 7569 unsigned int invItemIndex; // eax@12 | |
| 1822 | 7570 unsigned int itemPos; // eax@18 |
| 1682 | 7571 ItemGen tmpItem; // [sp+Ch] [bp-3Ch]@1 |
| 1297 | 7572 unsigned int pY; // [sp+3Ch] [bp-Ch]@2 |
| 7573 unsigned int pX; // [sp+40h] [bp-8h]@2 | |
| 2156 | 7574 CastSpellInfo *pSpellInfo; |
| 1297 | 7575 |
| 7576 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103 ) | |
| 7577 { | |
| 7578 pMouse->GetClickPos(&pX, &pY); | |
| 1822 | 7579 inventoryYCoord = (pY - 17) / 32; |
| 7580 inventoryXCoord = (pX - 14) / 32; | |
| 7581 invMatrixIndex = inventoryXCoord + (INVETORYSLOTSWIDTH * inventoryYCoord); | |
| 7582 if ( inventoryYCoord >= 0 && inventoryYCoord < INVETORYSLOTSHEIGHT && inventoryXCoord >= 0 && inventoryXCoord < INVETORYSLOTSWIDTH) | |
| 1682 | 7583 { |
| 1822 | 7584 if ( _50C9A0_IsEnchantingInProgress ) |
| 1297 | 7585 { |
| 1822 | 7586 enchantedItemPos = this->GetItemIDAtInventoryIndex(&invMatrixIndex); |
| 7587 if ( enchantedItemPos ) | |
| 1297 | 7588 { |
| 2156 | 7589 /* *((char *)pGUIWindow_Settings->ptr_1C + 8) &= 0x7Fu; |
| 1822 | 7590 *((short *)pGUIWindow_Settings->ptr_1C + 2) = uActiveCharacter - 1; |
| 7591 *((int *)pGUIWindow_Settings->ptr_1C + 3) = enchantedItemPos - 1; | |
| 2156 | 7592 *((short *)pGUIWindow_Settings->ptr_1C + 3) = invMatrixIndex;*/ |
| 7593 pSpellInfo = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C; | |
| 7594 pSpellInfo->uFlags &= 0x7F; | |
| 7595 pSpellInfo->uPlayerID_2 = uActiveCharacter - 1; | |
| 7596 pSpellInfo->spell_target_pid = enchantedItemPos - 1; | |
| 7597 pSpellInfo->field_6 = invMatrixIndex; | |
| 1822 | 7598 ptr_50C9A4_ItemToEnchant = &this->pInventoryItemList[enchantedItemPos-1]; |
| 7599 _50C9A0_IsEnchantingInProgress = 0; | |
| 7600 if ( pMessageQueue_50CBD0->uNumMessages ) | |
| 7601 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; | |
| 7602 pMouse->SetCursorBitmap("MICON1"); | |
| 7603 _50C9D0_AfterEnchClickEventId = 113; | |
| 7604 _50C9D4_AfterEnchClickEventSecondParam = 0; | |
| 7605 _50C9D8_AfterEnchClickEventTimeout = 256; | |
| 7606 } | |
| 7607 return; | |
| 7608 } | |
| 7609 if ( ptr_50C9A4_ItemToEnchant ) | |
| 7610 return; | |
| 7611 pickedItemId = pParty->pPickedItem.uItemID; | |
| 7612 invItemIndex = this->GetItemIDAtInventoryIndex(&invMatrixIndex); | |
| 7613 if (!pickedItemId) | |
| 7614 { | |
| 7615 if ( !invItemIndex ) | |
| 7616 return; | |
| 7617 else | |
| 7618 { | |
| 7619 memcpy(&pParty->pPickedItem, &this->pInventoryItemList[invItemIndex-1], sizeof(pParty->pPickedItem)); | |
| 7620 this->RemoveItemAtInventoryIndex(invMatrixIndex); | |
| 7621 pickedItemId = pParty->pPickedItem.uItemID; | |
| 7622 pMouse->SetCursorBitmap(pItemsTable->pItems[pickedItemId].pIconName); | |
| 1297 | 7623 return; |
| 7624 } | |
| 1822 | 7625 } |
| 7626 else | |
| 7627 { | |
| 7628 if ( invItemIndex ) | |
| 1297 | 7629 { |
| 1822 | 7630 ItemGen* invItemPtr = &this->pInventoryItemList[invItemIndex-1]; |
| 7631 memcpy(&tmpItem, invItemPtr, sizeof(tmpItem)); | |
| 7632 this->RemoveItemAtInventoryIndex(invMatrixIndex); | |
| 7633 int emptyIndex = this->AddItem2(invMatrixIndex, &pParty->pPickedItem); | |
| 7634 if ( !emptyIndex ) | |
| 1682 | 7635 { |
| 1822 | 7636 emptyIndex = this->AddItem2(-1, &pParty->pPickedItem); |
| 7637 if ( !emptyIndex ) | |
| 7638 { | |
| 7639 this->PutItemArInventoryIndex(tmpItem.uItemID, invItemIndex - 1, invMatrixIndex); | |
| 7640 memcpy(invItemPtr, &tmpItem, sizeof(ItemGen)); | |
| 7641 return; | |
| 7642 } | |
| 1682 | 7643 } |
| 1822 | 7644 memcpy(&pParty->pPickedItem, &tmpItem, sizeof(ItemGen)); |
| 7645 pMouse->SetCursorBitmap(pParty->pPickedItem.GetIconName()); | |
| 7646 return; | |
| 1297 | 7647 } |
| 1682 | 7648 else |
| 1297 | 7649 { |
| 1822 | 7650 itemPos = this->AddItem(invMatrixIndex, pickedItemId); |
| 7651 if ( itemPos ) | |
| 1297 | 7652 { |
| 1822 | 7653 memcpy(&this->pInventoryItemList[itemPos-1], &pParty->pPickedItem, sizeof(ItemGen)); |
| 7654 pMouse->RemoveHoldingItem(); | |
| 1682 | 7655 return; |
| 7656 } | |
| 1822 | 7657 itemPos = this->AddItem(-1, pickedItemId); |
| 7658 if ( itemPos ) | |
| 1682 | 7659 { |
| 1822 | 7660 memcpy(&this->pInventoryItemList[itemPos-1], &pParty->pPickedItem, sizeof(ItemGen)); |
| 7661 pMouse->RemoveHoldingItem(); | |
| 7662 return; | |
| 1297 | 7663 } |
| 7664 } | |
| 7665 } | |
| 7666 } | |
| 7667 } | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7668 } |
|
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 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7671 bool Player::IsWeak() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7672 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7673 return pConditions[Condition_Weak] != 0; |
|
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 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7676 bool Player::IsDead() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7677 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7678 return pConditions[Condition_Dead] != 0; |
|
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 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7681 bool Player::IsEradicated() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7682 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7683 return pConditions[Condition_Eradicated] != 0; |
|
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 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7686 bool Player::IsZombie() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7687 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7688 return pConditions[Condition_Zombie] != 0; |
|
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 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7691 bool Player::IsCursed() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7692 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7693 return pConditions[Condition_Cursed] != 0; |
|
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 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7696 bool Player::IsPertified() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7697 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7698 return pConditions[Condition_Pertified] != 0; |
|
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 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7701 bool Player::IsUnconcious() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7702 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7703 return pConditions[Condition_Unconcious] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7704 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7705 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7706 bool Player::IsAsleep() |
|
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 return pConditions[Condition_Sleep] != 0; |
|
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 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7711 bool Player::IsParalyzed() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7712 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7713 return pConditions[Condition_Paralyzed] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7714 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7715 |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7716 bool Player::IsDrunk() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7717 { |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7718 return pConditions[Condition_Drunk] != 0; |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7719 } |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7720 |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7721 void Player::SetCursed( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7722 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7723 pConditions[Condition_Cursed] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7726 void Player::SetWeak( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7727 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7728 pConditions[Condition_Weak] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7731 void Player::SetAsleep( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7732 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7733 pConditions[Condition_Sleep] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7736 void Player::SetAfraid( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7737 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7738 pConditions[Condition_Fear] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7741 void Player::SetDrunk( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7742 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7743 pConditions[Condition_Drunk] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7746 void Player::SetInsane( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7747 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7748 pConditions[Condition_Insane] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7749 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7750 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7751 void Player::SetPoison1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7752 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7753 pConditions[Condition_Poison1] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7754 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7755 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7756 void Player::SetDisease1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7757 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7758 pConditions[Condition_Disease1] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7759 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7760 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7761 void Player::SetPoison2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7762 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7763 pConditions[Condition_Poison2] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7764 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7765 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7766 void Player::SetDisease2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7767 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7768 pConditions[Condition_Disease2] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7769 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7770 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7771 void Player::SetPoison3( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7772 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7773 pConditions[Condition_Poison3] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7774 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7775 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7776 void Player::SetDisease3( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7777 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7778 pConditions[Condition_Disease3] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7781 void Player::SetParalyzed( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7782 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7783 pConditions[Condition_Paralyzed] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7786 void Player::SetUnconcious( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7787 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7788 pConditions[Condition_Unconcious] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7791 void Player::SetDead( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7792 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7793 pConditions[Condition_Dead] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7796 void Player::SetPertified( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7797 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7798 pConditions[Condition_Pertified] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7801 void Player::SetEradicated( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7802 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7803 pConditions[Condition_Eradicated] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7806 void Player::SetZombie( bool state ) |
|
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 pConditions[Condition_Zombie] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7811 void Player::SetCondWeakWithBlockCheck( int blockable ) |
|
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 SetCondition(Condition_Weak, 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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7816 void Player::SetCondInsaneWithBlockCheck( int blockable ) |
|
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 SetCondition(Condition_Insane, 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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7821 void Player::SetCondDeadWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7822 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7823 SetCondition(Condition_Dead, blockable); |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7824 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7825 |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7826 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
|
7827 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7828 SetCondition(Condition_Dead, blockable); |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
7829 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7830 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7831 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7836 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7841 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7846 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7851 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7856 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7861 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7866 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7871 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7876 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7881 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7886 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
|
7887 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7888 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
|
7889 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7890 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
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7895 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
|
7896 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7897 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
|
7898 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7899 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
|
7900 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7901 return &this->pInventoryItemList[this->pEquipment.*itemPos - 1]; |
| 1822 | 7902 } |
| 7903 | |
| 7904 int Player::GetPlayerIndex() | |
| 7905 { | |
| 7906 int uPlayerIdx = 0; | |
| 7907 if ( this == pPlayers[1] ) | |
| 7908 uPlayerIdx = 0; | |
| 7909 else if( this == pPlayers[2] ) | |
| 7910 uPlayerIdx = 1; | |
| 7911 else if ( this == pPlayers[3] ) | |
| 7912 uPlayerIdx = 2; | |
| 7913 else if ( this == pPlayers[4] ) | |
| 7914 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
|
7915 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
|
7916 Error("Unexpected player pointer"); |
| 1826 | 7917 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
|
7918 } |