Mercurial > mm7
annotate Player.cpp @ 2429:6d5877899730
* -novideo disables shop videos
* replaced bicubic resampling for linear
| author | a.parshin |
|---|---|
| date | Wed, 23 Jul 2014 19:42:39 +0300 |
| parents | f4af3b203f65 |
| children | 104fdbea0386 |
| rev | line source |
|---|---|
| 2415 | 1 #define _CRTDBG_MAP_ALLOC |
| 2 #include <stdlib.h> | |
| 3 #include <crtdbg.h> | |
| 4 | |
|
2253
aff7a7b072b7
adding _CRT_SECURE_NO_WARNINGS to get rid of a few hundrer annoying warnings + adding count parameter to swprintf
Grumpy7
parents:
2242
diff
changeset
|
5 #define _CRT_SECURE_NO_WARNINGS |
| 2336 | 6 #include "VectorTypes.h" |
| 1016 | 7 #include "stru6.h" |
| 2336 | 8 #include "mm7_unsorted_subs.h" |
| 9 #include "ErrorHandling.h" | |
| 1016 | 10 |
| 0 | 11 #include "Player.h" |
| 12 #include "PlayerFrameTable.h" | |
| 13 #include "AudioPlayer.h" | |
| 14 #include "Party.h" | |
| 816 | 15 #include "Log.h" |
| 0 | 16 #include "LOD.h" |
| 17 #include "GUIWindow.h" | |
| 18 #include "Viewport.h" | |
| 19 #include "Actor.h" | |
| 20 #include "Game.h" | |
| 21 #include "Mouse.h" | |
| 22 #include "TurnEngine.h" | |
| 23 #include "Events.h" | |
| 24 #include "Events2D.h" | |
| 25 #include "Outdoor.h" | |
| 26 #include "StorylineTextTable.h" | |
|
81
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
27 #include "Autonotes.h" |
|
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
28 #include "Awards.h" |
| 189 | 29 #include "texts.h" |
| 816 | 30 |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
31 #include "stru123.h" |
|
2331
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
32 #include "stru298.h" |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
33 #include "ObjectList.h" |
| 0 | 34 #include "mm7_data.h" |
|
828
0f56abdcce94
Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents:
821
diff
changeset
|
35 #include "MM7.h" |
| 1297 | 36 #include "SpriteObject.h" |
| 37 #include "DecalBuilder.h" | |
| 2156 | 38 #include "CastSpellInfo.h" |
| 2340 | 39 #include "OurMath.h" |
|
2350
7c10dfb6d802
Finishing moving all known UI functions to their appropriate headers
Grumpy7
parents:
2340
diff
changeset
|
40 #include "UI\UIPartyCreation.h" |
| 0 | 41 |
| 42 | |
| 43 | |
| 44 | |
| 2054 | 45 NZIArray<struct Player *, 5> pPlayers; |
| 46 | |
| 47 | |
| 0 | 48 /* 381 */ |
| 49 #pragma pack(push, 1) | |
| 290 | 50 struct PlayerCreation_AttributeProps |
| 0 | 51 { |
| 52 unsigned __int8 uBaseValue; | |
| 53 char uMaxValue; | |
| 54 char uDroppedStep; | |
| 55 char uBaseStep; | |
| 56 }; | |
| 57 #pragma pack(pop) | |
| 58 | |
| 59 | |
| 60 #pragma pack(push, 1) | |
| 290 | 61 |
| 62 | |
| 63 | |
| 0 | 64 #pragma pack(pop) |
| 290 | 65 PlayerCreation_AttributeProps StatTable[4][7] = //0x4ED7B0 |
| 66 { | |
| 67 {{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},}, | |
| 68 {{ 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},}, | |
| 69 {{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},}, | |
| 70 {{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 | 71 }; |
| 72 | |
| 73 | |
| 74 | |
| 1700 | 75 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 | 76 std::array<int, 5> StealingRandomBonuses = {-200, -100, 0, 100, 200}; //dword_4EDEB4 |
| 1700 | 77 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 | 78 |
| 79 | |
| 80 | |
| 81 // available skills per class ( 9 classes X 37 skills ) | |
| 82 // 0 - not available | |
| 83 // 1 - available | |
| 84 // 2 - primary skill | |
| 85 unsigned char pSkillAvailabilityPerClass[9][37] = // byte[] @ MM7.exe::004ED820 | |
| 86 { | |
| 87 {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}, | |
| 88 {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}, | |
| 89 {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}, | |
| 90 {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}, | |
| 91 {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}, | |
| 92 {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}, | |
| 93 {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}, | |
| 94 {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}, | |
| 95 {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 | |
| 96 }; | |
| 97 | |
| 98 | |
| 1374 | 99 unsigned char pEquipTypeToBodyAnchor[21] = // 4E8398 |
| 100 { | |
| 1989 | 101 1, // EQUIP_SINGLE_HANDED |
| 102 1, // EQUIP_TWO_HANDED | |
| 1374 | 103 2, // EQUIP_BOW |
| 104 3, // EQUIP_ARMOUR | |
| 105 0, // EQUIP_SHIELD | |
| 106 4, // EQUIP_HELMET | |
| 107 5, // EQUIP_BELT | |
| 108 6, // EQUIP_CLOAK | |
| 109 7, // EQUIP_GAUNTLETS | |
| 110 8, // EQUIP_BOOTS | |
| 111 10, // EQUIP_RING | |
| 112 9, // EQUIP_AMULET | |
| 113 1, // EQUIP_WAND | |
| 114 0, // EQUIP_REAGENT | |
| 115 0, // EQUIP_POTION | |
| 116 0, // EQUIP_SPELL_SCROLL | |
| 117 0, // EQUIP_BOOK | |
| 118 0, // EQUIP_MESSAGE_SCROLL | |
| 119 0, // EQUIP_GOLD | |
| 120 0, // EQUIP_GEM | |
| 121 0 // EQUIP_NONE | |
| 122 }; | |
| 0 | 123 |
| 124 | |
| 125 unsigned char pBaseHealthByClass[12] = {40, 35, 35, 30, 30, 30, 25, 20, 20, 0, 0, 0}; | |
| 126 unsigned char pBaseManaByClass[12] = { 0, 0, 0, 5, 5, 0, 10, 10, 15, 0, 0, 0}; | |
| 127 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}; | |
| 128 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}; | |
| 129 | |
| 1325 | 130 unsigned char pConditionAttributeModifier[7][19] = |
| 131 {{100, 100, 100, 120, 50, 200, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Might | |
| 132 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Intelligence | |
| 133 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Willpower | |
| 134 {100, 100, 100, 100, 50, 150, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Endurance | |
| 135 {100, 100, 100, 50, 10, 100, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Accuracy | |
| 136 {100, 100, 100, 120, 20, 120, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Speed | |
| 137 {100, 100, 100, 100, 200, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100}}; //Luck | |
| 138 | |
| 139 unsigned char pAgingAttributeModifier[7][4] = | |
| 140 {{100, 75, 40, 10}, //Might | |
| 141 {100, 150, 100, 10}, //Intelligence | |
| 142 {100, 150, 100, 10}, //Willpower | |
| 143 {100, 75, 40, 10}, //Endurance | |
| 144 {100, 100, 40, 10}, //Accuracy | |
| 145 {100, 100, 40, 10}, //Speed | |
| 146 {100, 100, 100, 100}}; //Luck | |
| 0 | 147 |
| 1684 | 148 unsigned int pAgeingTable[4] = {50, 100, 150, 0xFFFF}; |
| 0 | 149 |
|
1207
96a81634669e
arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents:
1205
diff
changeset
|
150 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 | 151 |
| 1036 | 152 short param_to_bonus_table[29] = {500, 400, 350, 300, 275, 250, 225, 200, 175, |
| 0 | 153 150, 125, 100, 75, 50, 40, 35, 30, 25, 21, |
| 1036 | 154 19, 17, 15, 13, 11, 9, 7, 5, 3, 0}; |
| 155 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 | 156 |
| 157 | |
| 816 | 158 unsigned short base_recovery_times_per_weapon_type[12] = |
| 159 { | |
| 160 100, // PLAYER_SKILL_STAFF && Unarmed withoud skill | |
| 161 90, // PLAYER_SKILL_SWORD && Unarmed with skill | |
| 162 60, // PLAYER_SKILL_DAGGER | |
| 163 100, // PLAYER_SKILL_AXE | |
| 164 80, // PLAYER_SKILL_SPEAR | |
| 165 100, // PLAYER_SKILL_BOW | |
| 166 80, // PLAYER_SKILL_MACE | |
| 167 30, // PLAYER_SKILL_BLASTER | |
| 168 10, // PLAYER_SKILL_SHIELD | |
| 169 10, // PLAYER_SKILL_LEATHER | |
| 170 20, // PLAYER_SKILL_CHAIN | |
| 171 30 // PLAYER_SKILL_PLATE | |
| 172 }; | |
| 173 | |
| 0 | 174 //----- (00490913) -------------------------------------------------------- |
| 1459 | 175 int PlayerCreation_GetUnspentAttributePointCount() |
| 0 | 176 { |
| 177 signed int v0; // edi@1 | |
| 1273 | 178 int raceId; // ebx@2 |
| 0 | 179 signed int v4; // eax@17 |
| 180 int v5; // edx@18 | |
| 181 signed int v6; // ecx@18 | |
| 1273 | 182 signed int remainingStatPoints; // [sp+Ch] [bp-8h]@1 |
| 183 | |
| 184 remainingStatPoints = 50; | |
| 0 | 185 v0 = 50; |
| 1273 | 186 for (int playerNum = 0; playerNum < 4; playerNum++) |
| 187 { | |
| 188 raceId = pParty->pPlayers[playerNum].GetRace(); | |
| 189 for (int statNum = 0; statNum <= 6; statNum++) | |
| 190 { | |
| 191 switch ( statNum ) | |
| 0 | 192 { |
| 1273 | 193 case 0: |
| 194 v0 = pParty->pPlayers[playerNum].uMight; | |
| 195 break; | |
| 196 case 1: | |
| 197 v0 = pParty->pPlayers[playerNum].uIntelligence; | |
| 198 break; | |
| 199 case 2: | |
| 200 v0 = pParty->pPlayers[playerNum].uWillpower; | |
| 201 break; | |
| 202 case 3: | |
| 203 v0 = pParty->pPlayers[playerNum].uEndurance; | |
| 204 break; | |
| 205 case 4: | |
| 206 v0 = pParty->pPlayers[playerNum].uAccuracy; | |
| 207 break; | |
| 208 case 5: | |
| 209 v0 = pParty->pPlayers[playerNum].uSpeed; | |
| 210 break; | |
| 211 case 6: | |
| 212 v0 = pParty->pPlayers[playerNum].uLuck; | |
| 213 break; | |
| 214 } | |
| 215 v4 = StatTable[raceId][statNum].uBaseValue; | |
| 216 if ( v0 >= v4 ) | |
| 217 { | |
| 218 v5 = StatTable[raceId][statNum].uDroppedStep; | |
| 219 v6 = StatTable[raceId][statNum].uBaseStep; | |
| 0 | 220 } |
| 221 else | |
| 222 { | |
| 1273 | 223 v5 = StatTable[raceId][statNum].uBaseStep; |
| 224 v6 = StatTable[raceId][statNum].uDroppedStep; | |
| 0 | 225 } |
| 1273 | 226 remainingStatPoints += v5 * (v4 - v0) / v6; |
| 227 } | |
| 228 } | |
| 229 return remainingStatPoints; | |
| 0 | 230 } |
| 231 | |
| 232 //----- (00427730) -------------------------------------------------------- | |
| 233 bool Player::CanCastSpell(unsigned int uRequiredMana) | |
| 234 { | |
| 1275 | 235 if (sMana >= (signed int)uRequiredMana) |
| 236 { | |
| 237 sMana -= (signed int)uRequiredMana; | |
| 488 | 238 return true; |
| 239 } | |
| 240 | |
| 241 pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0); | |
| 242 return false; | |
| 0 | 243 } |
| 244 | |
| 245 //----- (004BE2DD) -------------------------------------------------------- | |
| 1014 | 246 void Player::SalesProcess( unsigned int inventory_idnx, int item_index, int _2devent_idx ) |
| 247 { | |
| 0 | 248 float v6; // ST04_4@1 |
| 1014 | 249 signed int item_value; // eax@1 |
| 250 signed int sell_price; // ebx@1 | |
| 251 | |
| 252 item_value =pOwnItems[item_index].GetValue(); | |
| 253 v6 = p2DEvents[ _2devent_idx - 1].fPriceMultiplier; | |
| 254 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
|
255 if ( pOwnItems[item_index].IsBroken() ) |
| 1014 | 256 sell_price = 1; |
| 257 if ( sell_price < 1 ) | |
| 258 sell_price = 1; | |
| 259 RemoveItemAtInventoryIndex(inventory_idnx); | |
| 260 Party::SetGold(pParty->uNumGold + sell_price); | |
| 0 | 261 } |
| 262 | |
| 263 //----- (0043EEF3) -------------------------------------------------------- | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
264 bool Player::NothingOrJustBlastersEquipped() |
| 0 | 265 { |
| 1014 | 266 signed int item_idx; // esi@1 |
| 267 signed int item_id; // esi@1 | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
268 for (int i = 0; i < 16; ++i) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
269 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
270 item_idx = pEquipment.pIndices[i]; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
271 if (item_idx) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
272 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
273 item_id = pOwnItems[item_idx - 1].uItemID; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
274 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
|
275 return false; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
276 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
277 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
278 return true; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
279 } |
| 0 | 280 |
| 281 //----- (004B8040) -------------------------------------------------------- | |
| 1036 | 282 int Player::GetConditionDayOfWeek( unsigned int uCondition ) |
| 283 { | |
| 284 return (unsigned int)(((signed __int64)((double)this->pConditions[uCondition] * 0.234375) / 60 / 60) / 24) % 7 + 1; | |
| 0 | 285 } |
| 286 | |
| 287 //----- (004B807C) -------------------------------------------------------- | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
288 int Player::GetTempleHealCostModifier(float a2) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
289 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
290 unsigned int conditionIdx; // eax@1 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
291 int conditionTimeMultiplier; // esi@1 |
| 0 | 292 int v6; // eax@8 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
293 signed int result; // qax@13 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
294 signed int baseConditionMultiplier; // [sp+8h] [bp-8h]@4 |
| 1275 | 295 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
296 conditionIdx = GetMajorConditionIdx(); |
| 1275 | 297 if ( conditionIdx >= 14 && conditionIdx <= 16) |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
298 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
299 if ( conditionIdx <= 15 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
300 baseConditionMultiplier = 5; |
| 1783 | 301 else //if ( conditionIdx == 16 ) |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
302 baseConditionMultiplier = 10; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
303 conditionTimeMultiplier = GetConditionDayOfWeek(conditionIdx); |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
304 } |
| 1350 | 305 else |
| 306 { | |
| 1275 | 307 conditionTimeMultiplier = 1; |
| 308 baseConditionMultiplier = 1; | |
| 1350 | 309 if (conditionIdx < 14) |
| 310 { | |
| 311 for (int i = 0; i <= 13; i++) | |
| 312 { | |
| 313 v6 = GetConditionDayOfWeek(i); | |
| 314 if ( v6 > conditionTimeMultiplier ) | |
| 315 conditionTimeMultiplier = v6; | |
| 316 } | |
| 317 } | |
| 1275 | 318 } |
| 319 result = (int)((double)conditionTimeMultiplier * (double)baseConditionMultiplier * a2); | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
320 if ( result < 1 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
321 result = 1; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
322 return result; |
| 0 | 323 } |
| 324 | |
| 325 //----- (004B8102) -------------------------------------------------------- | |
| 917 | 326 int Player::GetPriceSell(int uRealValue, float price_multiplier) |
| 0 | 327 { |
| 328 signed int v3; // esi@1 | |
| 329 signed int result; // eax@3 | |
| 330 | |
| 1275 | 331 v3 = (signed int)((signed __int64)((double)uRealValue / (price_multiplier + 2.0)) + uRealValue * GetMerchant() / 100); |
| 917 | 332 if ( v3 > uRealValue ) |
| 333 v3 = uRealValue; | |
| 0 | 334 result = 1; |
| 335 if ( v3 >= 1 ) | |
| 336 result = v3; | |
| 337 return result; | |
| 338 } | |
| 339 | |
| 340 //----- (004B8142) -------------------------------------------------------- | |
| 749 | 341 int Player::GetBuyingPrice(unsigned int uRealValue, float price_multiplier) |
| 342 { | |
| 1275 | 343 uint price = (uint)(((100 - GetMerchant()) * (uRealValue * price_multiplier)) / 100); |
| 749 | 344 |
| 345 if (price < uRealValue) | |
| 346 price = uRealValue; | |
| 347 return price; | |
| 0 | 348 } |
| 349 | |
| 350 //----- (004B8179) -------------------------------------------------------- | |
| 916 | 351 int Player::GetPriceIdentification(float a2) |
| 0 | 352 { |
| 353 signed int v2; // esi@1 | |
| 354 int v3; // ecx@1 | |
| 355 signed int result; // eax@3 | |
| 356 | |
| 1275 | 357 v2 = (signed int)(a2 * 50.0); |
| 0 | 358 v3 = v2 * (100 - GetMerchant()) / 100; |
| 359 if ( v3 < v2 / 3 ) | |
| 360 v3 = v2 / 3; | |
| 361 result = 1; | |
| 362 if ( v3 >= 1 ) | |
| 363 result = v3; | |
| 364 return result; | |
| 365 } | |
| 366 | |
| 367 //----- (004B81C3) -------------------------------------------------------- | |
| 916 | 368 int Player::GetPriceRepair(int a2, float a3) |
| 0 | 369 { |
| 370 signed int v3; // esi@1 | |
| 371 int v4; // ecx@1 | |
| 372 signed int result; // eax@3 | |
| 373 | |
| 1275 | 374 v3 = (signed int)((double)a2 / (6.0 - a3)); |
| 0 | 375 v4 = v3 * (100 - GetMerchant()) / 100; |
| 376 if ( v4 < v3 / 3 ) | |
| 377 v4 = v3 / 3; | |
| 378 result = 1; | |
| 379 if ( v4 >= 1 ) | |
| 380 result = v4; | |
| 381 return result; | |
| 382 } | |
| 383 | |
| 384 //----- (004B8213) -------------------------------------------------------- | |
| 1275 | 385 int Player::GetBaseSellingPrice(int a2, float a3) |
| 386 { | |
| 387 signed int v3; // qax@1 | |
| 388 | |
| 389 v3 = (signed int)((double)a2 / (a3 + 2.0)); | |
| 390 if ( v3 < 1 ) | |
| 391 v3 = 1; | |
| 0 | 392 return v3; |
| 393 } | |
| 394 | |
| 395 //----- (004B8233) -------------------------------------------------------- | |
| 1275 | 396 int Player::GetBaseBuyingPrice(int a2, float a3) |
| 397 { | |
| 398 signed int v3; // qax@1 | |
| 399 | |
| 400 v3 = (signed int)((double)a2 * a3); | |
| 401 if ( v3 < 1 ) | |
| 402 v3 = 1; | |
| 0 | 403 return v3; |
| 404 } | |
| 405 | |
| 406 //----- (004B824B) -------------------------------------------------------- | |
| 1275 | 407 int Player::GetBaseIdentifyPrice(float a2) |
| 408 { | |
| 409 signed int v2; // qax@1 | |
| 410 | |
| 411 v2 = (signed int)(a2 * 50.0); | |
| 412 if ( v2 < 1 ) | |
| 413 v2 = 1; | |
| 0 | 414 return v2; |
| 415 } | |
| 416 | |
| 417 //----- (004B8265) -------------------------------------------------------- | |
| 1275 | 418 int Player::GetBaseRepairPrice(int a2, float a3) |
| 419 { | |
| 420 signed int v3; // qax@1 | |
| 421 | |
| 422 v3 = (signed int)((double)a2 / (6.0 - a3)); | |
| 423 if ( v3 < 1 ) | |
| 424 v3 = 1; | |
| 0 | 425 return v3; |
| 426 } | |
| 427 | |
| 428 //----- (004B6FF9) -------------------------------------------------------- | |
| 1348 | 429 bool Player::IsPlayerHealableByTemple() |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
430 { |
| 1348 | 431 if (this->sHealth >= GetMaxHealth() && this->sMana >= GetMaxMana() && GetMajorConditionIdx() == Condition_Good) |
| 432 return false; | |
| 433 else | |
| 434 { | |
| 435 if (GetMajorConditionIdx() == Condition_Zombie) | |
| 436 { | |
| 2156 | 437 if (((signed int)window_SpeakInHouse->ptr_1C == 78 || (signed int)window_SpeakInHouse->ptr_1C == 81 || (signed int)window_SpeakInHouse->ptr_1C == 82)) |
| 1348 | 438 return false; |
| 439 else | |
| 440 return true; | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
441 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
442 else |
| 1348 | 443 return true; |
| 2156 | 444 } |
| 445 } | |
| 0 | 446 |
| 447 //----- (00421E75) -------------------------------------------------------- | |
| 1012 | 448 unsigned int Player::GetItemIDAtInventoryIndex(int *pitem_index) |
| 449 { | |
| 450 int item_idx; // eax@1 | |
| 451 int inv_index; // eax@3 | |
| 452 | |
| 453 item_idx = *pitem_index; | |
| 454 if ( item_idx >125 || item_idx < 0 ) | |
| 455 return 0; | |
| 2156 | 456 inv_index = this->pInventoryMatrix[item_idx]; |
| 457 if ( inv_index < 0 ) | |
| 458 { | |
| 459 *pitem_index = -1 - inv_index; | |
| 460 inv_index = this->pInventoryMatrix[-1 - inv_index]; | |
| 461 } | |
| 1012 | 462 return inv_index; |
| 0 | 463 } |
| 464 | |
| 465 //----- (004160CA) -------------------------------------------------------- | |
| 1012 | 466 void Player::ItemsEnchant( int enchant_count ) |
| 467 { | |
| 468 int avalible_items; // ebx@1 | |
| 469 int i; // edx@8 | |
| 470 __int16 item_index_tabl[138]; // [sp+Ch] [bp-118h]@1 | |
| 471 | |
| 472 avalible_items = 0; | |
| 473 memset (item_index_tabl,0,sizeof(item_index_tabl)); | |
| 474 | |
| 1349 | 475 for (i = 0; i < 138; ++i) |
| 476 { | |
| 477 if (( pOwnItems[i].uItemID>0)&&(pOwnItems[i].uItemID <= 134)) | |
| 478 item_index_tabl[avalible_items++] = i; | |
| 479 } | |
| 1012 | 480 |
| 481 if ( avalible_items ) | |
| 482 { | |
| 483 if ( enchant_count ) | |
| 484 { | |
| 1349 | 485 for ( i = 0; i < enchant_count; ++i ) |
| 486 { | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
487 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
|
488 pInventoryItemList[item_index_tabl[rand() % avalible_items]].uAttributes |= ITEM_HARDENED; |
| 1349 | 489 } |
| 0 | 490 } |
| 491 else | |
| 492 { | |
| 1012 | 493 for ( i = 0; i < avalible_items; ++i ) |
| 494 { | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
495 pInventoryItemList[item_index_tabl[i]].uAttributes |= ITEM_HARDENED; |
| 1349 | 496 } |
| 497 } | |
| 498 } | |
| 0 | 499 } |
| 500 | |
| 501 //----- (004948B1) -------------------------------------------------------- | |
| 187 | 502 void Player::PlaySound(PlayerSpeech speech, int a3) |
| 503 { | |
| 1351 | 504 signed int speechCount = 0; // esi@4 |
| 505 signed int expressionCount = 0; // esi@4 | |
| 506 int pickedVariant; // esi@10 | |
| 248 | 507 CHARACTER_EXPRESSION_ID expression; // ebx@17 |
| 1406 | 508 signed int pSoundID; // ecx@19 |
| 1351 | 509 int speechVariantArray[5]; // [sp+Ch] [bp-1Ch]@7 |
| 510 int expressionVariantArray[5]; | |
| 511 unsigned int pickedSoundID; // [sp+30h] [bp+8h]@4 | |
| 512 unsigned int expressionDuration = 0; | |
| 187 | 513 |
| 1351 | 514 pickedSoundID = 0; |
| 203 | 515 if (uVoicesVolumeMultiplier) |
| 0 | 516 { |
| 1351 | 517 for (int i = 0; i < 2; i++) |
| 518 { | |
| 1406 | 519 if ( SoundSetAction[speech][i] ) |
| 520 { | |
| 521 speechVariantArray[speechCount] = SoundSetAction[speech][i]; | |
| 1351 | 522 speechCount++; |
| 523 } | |
| 524 } | |
| 525 if ( speechCount ) | |
| 526 { | |
| 527 pickedVariant = speechVariantArray[rand() % speechCount]; | |
| 528 int numberOfSubvariants = byte_4ECF08[pickedVariant - 1][uVoiceID]; | |
| 529 if (numberOfSubvariants > 0) | |
| 530 { | |
| 531 pickedSoundID = rand() % numberOfSubvariants + 2 * (pickedVariant + 50 * uVoiceID) + 4998; | |
| 1406 | 532 pAudioPlayer->PlaySound((SoundID)pickedSoundID, PID(OBJECT_Player, uActiveCharacter + 39), 0, -1, 0, 0, (int)(pSoundVolumeLevels[uVoicesVolumeMultiplier] * 128.0f), 0); |
| 1351 | 533 } |
| 534 } | |
| 535 } | |
| 536 | |
| 537 for (int i = 0; i < 5; i++) | |
| 538 { | |
| 1406 | 539 if ( SoundSetAction[speech][i + 3] ) |
| 540 { | |
| 541 expressionVariantArray[expressionCount] = SoundSetAction[speech][i + 3]; | |
| 1351 | 542 expressionCount++; |
| 543 } | |
| 544 } | |
| 545 if ( expressionCount ) | |
| 546 { | |
| 547 expression = (CHARACTER_EXPRESSION_ID)expressionVariantArray[rand() % expressionCount]; | |
| 548 if (expression == CHARACTER_EXPRESSION_21 && pickedSoundID ) | |
| 549 { | |
| 1406 | 550 pSoundID = 0; |
| 551 if ( pSoundList->sNumSounds ) | |
| 552 { | |
| 1351 | 553 for (int i = 0; i < pSoundList->sNumSounds; i++) |
| 0 | 554 { |
| 2113 | 555 if (pSoundList->pSL_Sounds[i].uSoundID == pickedSoundID) |
| 1406 | 556 pSoundID = i; |
| 0 | 557 } |
| 558 } | |
| 2113 | 559 if ( pSoundList->pSL_Sounds[pSoundID].pSoundData[0] ) |
| 1351 | 560 expressionDuration = (sLastTrackLengthMS << 7) / 1000; |
| 561 } | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
562 PlayEmotion(expression, expressionDuration); |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
563 } |
| 0 | 564 } |
| 565 // 4948B1: using guessed type int var_1C[5]; | |
| 566 | |
| 567 //----- (00494A25) -------------------------------------------------------- | |
| 187 | 568 void Player::PlayEmotion(CHARACTER_EXPRESSION_ID new_expression, int a3) |
| 569 { | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
570 unsigned int v3 = expression; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
571 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
|
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 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
|
576 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
577 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
578 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
579 else |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
580 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
581 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
|
582 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
583 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
|
584 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
585 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
586 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
587 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
588 } |
| 0 | 589 this->uExpressionTimePassed = 0; |
| 590 if ( !a3 ) | |
| 591 { | |
| 187 | 592 this->uExpressionTimeLength = 8 * pPlayerFrameTable->pFrames[a3].uAnimLength; |
| 593 } | |
|
1353
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
594 else |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
595 { |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
596 this->uExpressionTimeLength = 0; |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
597 } |
| 187 | 598 expression = new_expression; |
| 0 | 599 viewparams->bRedrawGameUI = 1; |
| 600 } | |
| 601 | |
| 602 //----- (0049327B) -------------------------------------------------------- | |
| 1355 | 603 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
|
604 { |
| 135 | 605 if ( this->classType == uClass ) |
| 0 | 606 { |
|
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
|
607 return true; |
| 0 | 608 } |
| 609 else | |
| 610 { | |
|
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
|
611 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
|
612 { |
|
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
|
613 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
|
614 } |
| 0 | 615 switch ( uClass ) |
| 616 { | |
| 617 case 0x1Au: | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
618 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 65)); |
| 0 | 619 case 0x1Bu: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
620 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 67)); |
| 0 | 621 case 0x22u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
622 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 77)); |
| 0 | 623 case 0x23u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
624 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 79)); |
| 0 | 625 break; |
| 626 default: | |
| 1545 | 627 Error("Should not be able to get here (%u)", uClass); |
| 0 | 628 break; |
| 629 } | |
|
1354
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
630 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
|
631 } |
| 0 | 632 } |
| 633 | |
| 634 | |
| 635 //----- (00492C0B) -------------------------------------------------------- | |
| 636 bool Player::CanAct() | |
| 637 { | |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
638 if ( this->IsAsleep() || this->IsParalyzed() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
639 this->IsUnconcious() || this->IsDead() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
640 this->IsPertified() || this->IsEradicated() ) |
| 1355 | 641 return false; |
| 0 | 642 else |
| 1355 | 643 return true; |
| 0 | 644 } |
| 645 | |
| 646 //----- (00492C40) -------------------------------------------------------- | |
| 647 bool Player::CanSteal() | |
| 648 { | |
| 1355 | 649 return GetActualSkillLevel(PLAYER_SKILL_STEALING) != 0; |
| 0 | 650 } |
| 651 | |
| 652 //----- (00492C4E) -------------------------------------------------------- | |
| 653 bool Player::CanEquip_RaceAndAlignmentCheck(unsigned int uItemID) | |
| 654 { | |
|
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
|
655 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
|
656 { |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
657 case ITEM_RELIC_ETHRICS_STAFF: |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
658 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
|
659 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
|
660 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
|
661 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
|
662 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
|
663 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
|
664 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
|
665 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
|
666 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
|
667 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
|
668 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
|
669 default: return 1; break; |
|
1356
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
670 } |
|
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
671 } |
|
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
|
672 |
| 0 | 673 //----- (00492D65) -------------------------------------------------------- |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
674 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
|
675 { |
|
a47d9282ea7c
Player::SetCondition 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 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
|
677 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
|
678 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
|
679 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
|
680 |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
681 if ( pConditions[uConditionIdx] ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
682 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
683 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
684 if (!ConditionProcessor::IsPlayerAffected(this, uConditionIdx, a3)) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
685 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
686 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
687 } |
|
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
|
688 |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
689 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
|
690 { |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
691 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
|
692 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
|
693 case Condition_Sleep: break; //nosound |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
694 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
|
695 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
|
696 case Condition_Insane: PlaySound(SPEECH_29, 0); break; |
| 2187 | 697 case Condition_Poison_Weak: |
| 698 case Condition_Poison_Medium: | |
| 699 case Condition_Poison_Severe: PlaySound(SPEECH_27, 0); break; | |
| 700 case Condition_Disease_Weak: | |
| 701 case Condition_Disease_Medium: | |
| 702 case Condition_Disease_Severe: PlaySound(SPEECH_28, 0);break; | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
703 case Condition_Paralyzed: break; //nosound |
| 1014 | 704 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
|
705 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
|
706 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
|
707 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
|
708 break; |
| 1014 | 709 case Condition_Dead: |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
710 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
|
711 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
|
712 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
|
713 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
|
714 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
|
715 break; |
| 1014 | 716 case Condition_Pertified: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
717 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
|
718 break; |
| 1014 | 719 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
|
720 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
|
721 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
|
722 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
|
723 if ( sMana > 0 ) |
| 1014 | 724 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
|
725 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
|
726 case Condition_Zombie: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
727 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
|
728 return; |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
729 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
|
730 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
|
731 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
|
732 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
|
733 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
|
734 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
|
735 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
|
736 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
737 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
|
738 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
|
739 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
740 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
|
741 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
742 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
|
743 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
|
744 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
745 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
|
746 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
|
747 } |
|
a47d9282ea7c
Player::SetCondition 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 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
749 players_before = 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
750 for (int i = 1; i < 5; ++i) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
751 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
752 if ( pPlayers[i]->CanAct() ) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
753 ++players_before; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
754 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
755 |
| 2187 | 756 pConditions[uConditionIdx] = pParty->uTimePlayed; |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
757 |
|
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
|
758 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
|
759 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
|
760 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
|
761 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
762 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
|
763 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
764 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
|
765 ++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
|
766 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
767 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
768 if (( players_before == 2 ) && ( players_after == 1 )) |
| 2187 | 769 pPlayers[remainig_player]->PlaySound(SPEECH_107, 0);//ñêîðåå âñåãî îáíàä¸æûâàþùèé âîçãëàñ ïîñëåäíåãî |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
770 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
|
771 } |
| 0 | 772 |
| 773 //----- (00492528) -------------------------------------------------------- | |
| 774 bool Player::CanFitItem(unsigned int uSlot, unsigned int uItemID) | |
| 775 { | |
| 1363 | 776 Texture *texture; // esi@1 |
| 777 unsigned int slotWidth; // ebx@1 | |
| 778 unsigned int slotHeight; // [sp+1Ch] [bp+Ch]@1 | |
| 779 | |
| 780 texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); | |
| 781 slotWidth = GetSizeInInventorySlots(texture->uTextureWidth); | |
| 782 slotHeight = GetSizeInInventorySlots(texture->uTextureHeight); | |
| 0 | 783 if ( !areWeLoadingTexture ) |
| 784 { | |
| 1363 | 785 texture->Release(); |
| 1006 | 786 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 787 } |
| 1555 | 788 Assert(slotHeight > 0 && slotWidth > 0, "Items should have nonzero dimensions"); |
| 1363 | 789 if ( (slotWidth + uSlot % INVETORYSLOTSWIDTH) <= INVETORYSLOTSWIDTH && (slotHeight + uSlot / INVETORYSLOTSWIDTH) <= INVETORYSLOTSHEIGHT ) |
| 790 { | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
791 for (unsigned int x = 0; x < slotWidth; x++) |
| 1363 | 792 { |
|
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
|
793 for (unsigned int y = 0; y < slotHeight; y++) |
| 1363 | 794 { |
|
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
|
795 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
|
796 { |
|
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
|
797 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
|
798 } |
| 1363 | 799 } |
| 800 } | |
| 801 return true; | |
| 802 } | |
| 803 return false; | |
| 0 | 804 } |
| 805 // 506128: using guessed type int areWeLoadingTexture; | |
| 806 | |
| 807 //----- (004925E6) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
808 int Player::FindFreeInventoryListSlot() |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
809 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
810 for (int i = 0; i < 126; i++ ) |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
811 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
812 if (pInventoryItemList[i].uItemID == 0) |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
813 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
814 return i; |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
815 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
816 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
817 return -1; |
| 0 | 818 } |
| 819 | |
| 820 //----- (00492600) -------------------------------------------------------- | |
| 821 int Player::CreateItemInInventory(unsigned int uSlot, unsigned int uItemID) | |
| 822 { | |
| 823 int result; // eax@8 | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
824 signed int freeSlot; // [sp+8h] [bp-4h]@4 |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
825 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
826 freeSlot = FindFreeInventoryListSlot(); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
827 if ( freeSlot == -1 ) |
| 0 | 828 { |
| 829 if ( uActiveCharacter ) | |
| 201 | 830 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NoRoom, 0); |
|
1366
8f339c3bbdaf
Player::CreateItemInInventory small bugfix from previous change
Grumpy7
parents:
1365
diff
changeset
|
831 return 0; |
| 0 | 832 } |
| 833 else | |
| 834 { | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
835 PutItemArInventoryIndex(uItemID, freeSlot, uSlot); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
836 result = freeSlot + 1; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
837 this->pInventoryItemList[freeSlot].uItemID = uItemID; |
| 0 | 838 } |
| 839 return result; | |
| 840 } | |
| 841 // 506128: using guessed type int areWeLoadingTexture; | |
| 842 | |
| 843 //----- (00492700) -------------------------------------------------------- | |
| 844 int Player::HasSkill(unsigned int uSkillType) | |
| 845 { | |
| 1374 | 846 if ( uSkillType >= 37 || this->pActiveSkills[uSkillType] ) |
| 847 { | |
| 848 return 1; | |
| 0 | 849 } |
| 850 else | |
| 851 { | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
852 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[67], this->pName); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
853 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1374 | 854 return 0; |
| 855 } | |
| 0 | 856 } |
| 857 | |
| 858 //----- (00492745) -------------------------------------------------------- | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
859 void Player::WearItem( unsigned int uItemID ) |
| 0 | 860 { |
| 1010 | 861 int item_body_anch; // edi@6 |
| 862 int item_indx; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
863 item_indx = FindFreeInventoryListSlot(); |
| 1010 | 864 |
| 865 if ( item_indx != -1 ) | |
| 866 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
867 pInventoryItemList[item_indx].uItemID = uItemID; |
| 1374 | 868 item_body_anch = pEquipTypeToBodyAnchor[pItemsTable->pItems[uItemID].uEquipType]; |
| 869 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
|
870 pInventoryItemList[item_indx].uBodyAnchor = item_body_anch + 1; |
| 0 | 871 } |
| 872 } | |
| 873 | |
| 874 //----- (004927A8) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
875 int Player::AddItem(int index, unsigned int uItemID) |
| 0 | 876 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
877 if ( index == -1 ) |
| 0 | 878 { |
| 1385 | 879 for (int xcoord = 0; xcoord < INVETORYSLOTSWIDTH; xcoord++) |
| 880 { | |
|
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
|
881 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) |
| 0 | 882 { |
|
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
|
883 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
|
884 { |
|
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
|
885 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
|
886 } |
| 0 | 887 } |
| 1385 | 888 } |
| 0 | 889 return 0; |
| 890 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
891 if ( !CanFitItem(index, uItemID) ) |
| 0 | 892 { |
| 1754 | 893 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0); |
| 0 | 894 return 0; |
| 895 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
896 return CreateItemInInventory(index, uItemID); |
| 0 | 897 } |
| 898 | |
| 899 //----- (00492826) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
900 int Player::AddItem2(int index, ItemGen *Src) |
| 0 | 901 { |
| 902 pItemsTable->SetSpecialBonus(Src); | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
903 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
904 if ( index == -1 ) |
| 0 | 905 { |
|
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
|
906 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
|
907 { |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
908 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) //TODO: change pInventoryMatrix to 2 dimensional array. |
| 1385 | 909 { |
|
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
|
910 if ( CanFitItem(ycoord * INVETORYSLOTSWIDTH + xcoord, Src->uItemID) ) |
| 0 | 911 { |
|
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
|
912 return CreateItemInInventory2(ycoord * INVETORYSLOTSWIDTH + xcoord, Src); |
| 0 | 913 } |
| 1385 | 914 } |
| 0 | 915 } |
| 916 return 0; | |
| 917 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
918 if ( !CanFitItem(index, Src->uItemID) ) |
| 0 | 919 return 0; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
920 return CreateItemInInventory2(index, Src); |
| 0 | 921 } |
| 922 | |
| 923 //----- (0049289C) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
924 int Player::CreateItemInInventory2( unsigned int index, ItemGen *Src ) |
| 0 | 925 { |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
926 signed int freeSlot; // ebx@1 |
| 0 | 927 int result; // eax@6 |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
928 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
929 freeSlot = FindFreeInventoryListSlot(); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
930 if ( freeSlot == -1 ) |
| 0 | 931 { |
| 932 result = 0; | |
| 933 } | |
| 934 else | |
| 935 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
936 PutItemArInventoryIndex(Src->uItemID, freeSlot, index); |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
937 memcpy(&pInventoryItemList[freeSlot], Src, sizeof(ItemGen)); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
938 result = freeSlot + 1; |
| 0 | 939 } |
| 940 return result; | |
| 941 } | |
| 942 // 506128: using guessed type int areWeLoadingTexture; | |
| 943 | |
| 944 //----- (0049298B) -------------------------------------------------------- | |
| 1385 | 945 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
|
946 { |
| 1014 | 947 Texture *item_texture; // esi@1 |
| 948 int *pInvPos; // esi@4 | |
| 949 unsigned int slot_width; // [sp+Ch] [bp-4h]@1 | |
| 950 unsigned int slot_height; // [sp+18h] [bp+8h]@1 | |
| 951 | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
952 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1014 | 953 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); |
| 954 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 955 if ( !areWeLoadingTexture ) |
| 956 { | |
| 1014 | 957 item_texture->Release(); |
| 1006 | 958 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 959 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
960 if ( slot_width > 0 ) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
961 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
962 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
963 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
964 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
965 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
|
966 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
967 } |
| 1014 | 968 } |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
969 pInventoryMatrix[index] = itemListPos + 1; |
| 0 | 970 } |
| 278 | 971 |
| 0 | 972 // 506128: using guessed type int areWeLoadingTexture; |
| 973 | |
| 974 //----- (00492A36) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
975 void Player::RemoveItemAtInventoryIndex( unsigned int index ) |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
976 { |
| 1014 | 977 ItemGen *item_in_slot; // ecx@1 |
| 978 Texture *item_texture; // esi@1 | |
| 979 unsigned int slot_height; // ebp@1 | |
| 980 int *pInvPos; // edx@4 | |
| 981 unsigned int slot_width; // [sp+14h] [bp+4h]@1 | |
| 982 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
983 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
|
984 item_texture = pIcons_LOD->LoadTexturePtr(item_in_slot->GetIconName(), TEXTURE_16BIT_PALETTE); |
| 1014 | 985 item_in_slot->Reset(); |
| 986 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); | |
| 987 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 988 if ( !areWeLoadingTexture ) |
| 989 { | |
| 1014 | 990 item_texture->Release(); |
| 1006 | 991 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 992 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
993 if ( slot_width > 0 ) |
| 1014 | 994 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
995 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
996 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
997 { |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
998 memset32(pInvPos, 0, slot_width); |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
999 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1000 } |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1001 } |
| 0 | 1002 } |
| 1003 // 506128: using guessed type int areWeLoadingTexture; | |
| 1004 | |
| 1005 //----- (00490EEE) -------------------------------------------------------- | |
| 1386 | 1006 int Player::SelectPhrasesTransaction(ItemGen *pItem, int building_type, int BuildID_2Events, int ShopMenuType) //TODO: probably move this somewhere else, not really Player:: stuff |
| 1007 { | |
| 1008 unsigned int idemId; // edx@1 | |
| 1009 signed int equipType; // esi@1 | |
| 1010 float multiplier; // ST04_4@26 | |
| 1011 int price; // edi@26 | |
| 1012 int merchantLevel; // [sp+10h] [bp-8h]@1 | |
| 1013 int itemValue; | |
| 1014 | |
| 1015 merchantLevel = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); | |
| 1016 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
|
1017 equipType = pItem->GetItemEquipType(); |
| 1386 | 1018 itemValue = pItem->GetValue(); |
| 1019 | |
| 1020 switch (building_type) | |
| 1021 { | |
| 1411 | 1022 case BuildingType_WeaponShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1023 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1024 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1025 if (equipType > EQUIP_BOW) |
| 1386 | 1026 return 4; |
| 1027 break; | |
| 1411 | 1028 case BuildingType_ArmorShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1029 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1030 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1031 if ( equipType < EQUIP_ARMOUR || equipType > EQUIP_BOOTS) |
| 1386 | 1032 return 4; |
| 1033 break; | |
| 1411 | 1034 case BuildingType_MagicShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1035 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1036 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1037 if ( pItemsTable->pItems[idemId].uSkillType != PLAYER_SKILL_MISC ) |
| 1386 | 1038 return 4; |
| 1039 break; | |
| 1411 | 1040 case BuildingType_AlchemistShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1041 if ((idemId >= ITEM_ARTIFACT_HERMES_SANDALS && idemId < ITEM_RECIPE_REJUVENATION) || idemId > ITEM_RECIPE_BODY_RESISTANCE) |
| 1386 | 1042 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1043 if ( !(equipType == EQUIP_REAGENT || equipType == EQUIP_POTION || equipType == EQUIP_MESSAGE_SCROLL)) |
| 1386 | 1044 return 4; |
| 1045 break; | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1046 default: |
| 1545 | 1047 Error("(%u)", building_type); |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1048 break; |
| 1386 | 1049 } |
|
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->IsStolen()) |
| 1386 | 1051 return 6; |
| 1052 | |
| 1053 multiplier = p2DEvents[BuildID_2Events - 1].fPriceMultiplier; | |
| 1054 switch (ShopMenuType) | |
| 1055 { | |
| 1056 case 2: | |
| 1057 price = GetBuyingPrice(itemValue, multiplier); | |
| 1058 break; | |
| 1059 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
|
1060 if (pItem->IsBroken()) |
| 1386 | 1061 price = 1; |
| 917 | 1062 else |
| 1386 | 1063 price = this->GetPriceSell(itemValue, multiplier); |
| 1064 break; | |
| 1065 case 4: | |
| 1066 price = this->GetPriceIdentification(multiplier); | |
| 1067 break; | |
| 1068 case 5: | |
| 1069 price = this->GetPriceRepair(itemValue, multiplier); | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1070 break; |
|
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1071 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
|
1072 Error("(%u)", ShopMenuType); |
| 1386 | 1073 break; |
| 1074 } | |
| 1075 if ( merchantLevel ) | |
| 1076 { | |
| 1077 if (price == itemValue) | |
| 1078 { | |
| 1079 return 3; | |
| 1080 } | |
| 917 | 1081 else |
| 1386 | 1082 { |
| 1083 return 2; | |
| 1084 } | |
| 1085 } | |
| 0 | 1086 else |
| 1386 | 1087 { |
| 1088 return 1; | |
| 1089 } | |
| 0 | 1090 } |
| 1091 | |
| 1092 //----- (0049107D) -------------------------------------------------------- | |
| 1093 int Player::GetBodybuilding() | |
| 1094 { | |
| 1010 | 1095 int v1; // al@1 |
| 0 | 1096 |
| 1097 v1 = GetActualSkillLevel(PLAYER_SKILL_BODYBUILDING); | |
|
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 //----- (004910A8) -------------------------------------------------------- | |
| 607 | 1103 int Player::GetMeditation() |
| 0 | 1104 { |
| 1010 | 1105 int v1; // al@1 |
| 0 | 1106 |
| 1107 v1 = GetActualSkillLevel(PLAYER_SKILL_MEDITATION); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1108 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
|
1109 return multiplier * (v1 & 0x3F); |
| 0 | 1110 } |
| 1111 | |
| 1112 //----- (004910D3) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1113 bool Player::CanIdentify( ItemGen *pItem ) |
| 0 | 1114 { |
| 1115 unsigned __int16 v2; // ax@1 | |
| 1116 int v5; // edi@7 | |
| 652 | 1117 if (CheckHiredNPCSpeciality(Scholar)) |
| 1118 return true; | |
| 0 | 1119 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1120 v2 = GetActualSkillLevel(PLAYER_SKILL_ITEM_ID); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1121 if ( (signed int)SkillToMastery(v2) >= 4 ) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1122 return true; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1123 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1124 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
|
1125 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1126 return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St; |
| 0 | 1127 } |
| 1128 | |
| 1129 //----- (00491151) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1130 bool Player::CanRepair( ItemGen *pItem ) |
| 0 | 1131 { |
| 1132 unsigned __int16 v2; // ax@1 | |
| 1133 int v5; // edi@7 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1134 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1135 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
|
1136 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
|
1137 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
|
1138 CheckHiredNPCSpeciality(Alchemist) && equipType >= 9 ) |
| 652 | 1139 return true; |
| 1140 | |
| 1010 | 1141 v2 = GetActualSkillLevel(PLAYER_SKILL_REPAIR); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1142 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 0 | 1143 return true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1144 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1145 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
|
1146 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
|
1147 return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St; |
| 0 | 1148 } |
| 1149 | |
| 1150 //----- (004911F3) -------------------------------------------------------- | |
| 1151 int Player::GetMerchant() | |
| 1152 { | |
| 1153 unsigned __int16 v2; // ax@1 | |
| 1154 int v5; // edi@1 | |
| 1155 int v7; // eax@3 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1156 |
| 607 | 1157 v2 = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1158 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1159 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1160 |
|
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
|
1161 v7 = pParty->GetPartyReputation(); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1162 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
|
1163 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1164 if (v5 == 0) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1165 { |
| 0 | 1166 return -v7; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1167 } |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1168 return v5 - v7 + 7; |
| 0 | 1169 } |
| 1170 | |
| 1171 //----- (0049125A) -------------------------------------------------------- | |
| 1172 int Player::GetPerception() | |
| 1173 { | |
| 1174 unsigned __int16 v2; // ax@1 | |
| 1175 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1176 |
| 1010 | 1177 v2 = GetActualSkillLevel(PLAYER_SKILL_PERCEPTION); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1178 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1179 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1180 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1181 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
|
1182 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1183 return v5; |
| 0 | 1184 } |
| 1185 | |
| 1186 //----- (004912B0) -------------------------------------------------------- | |
| 1187 int Player::GetDisarmTrap() | |
| 1188 { | |
| 1189 unsigned __int16 v2; // ax@1 | |
| 1190 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1191 |
| 1010 | 1192 v2 = GetActualSkillLevel(PLAYER_SKILL_TRAP_DISARM); |
| 0 | 1193 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 1194 return 10000; | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1195 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1196 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
|
1197 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
|
1198 multiplier++; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1199 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1200 return v5; |
| 0 | 1201 } |
| 1202 | |
| 1203 //----- (00491317) -------------------------------------------------------- | |
| 1204 char Player::GetLearningPercent() | |
| 1205 { | |
| 1206 int v2; // eax@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1207 |
| 1010 | 1208 v2 = GetActualSkillLevel(PLAYER_SKILL_LEARNING); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1209 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
|
1210 return multiplier * v2 + 9; |
| 0 | 1211 } |
| 1212 | |
| 1213 //----- (0048C6AF) -------------------------------------------------------- | |
| 1214 Player::Player() | |
| 1215 { | |
| 1216 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
|
1217 pInventoryMatrix.fill(0); |
| 0 | 1218 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
|
1219 pInventoryItemList[i].Reset(); |
| 0 | 1220 for (uint i = 0; i < 12; ++i) |
| 1221 pEquippedItems[i].Reset(); | |
| 1222 | |
| 1223 | |
| 1224 for (uint i = 0; i < 24; ++i) | |
| 1225 { | |
| 1226 pPlayerBuffs[i].uSkill = 0; | |
| 1227 pPlayerBuffs[i].uSkill = 0; | |
| 1228 pPlayerBuffs[i].uPower = 0; | |
| 1229 pPlayerBuffs[i].uExpireTime = 0; | |
| 1230 pPlayerBuffs[i].uCaster = 0; | |
| 1231 pPlayerBuffs[i].uFlags = 0; | |
| 1232 } | |
| 1233 | |
| 1234 pName[0] = 0; | |
| 1014 | 1235 uCurrentFace = 0; |
| 0 | 1236 uVoiceID = 0; |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
1237 pConditions.fill(0); |
| 0 | 1238 |
| 1239 field_BB = 0; | |
| 1240 | |
| 1241 uMight = uMightBonus = 0; | |
| 1242 uIntelligence = uIntelligenceBonus = 0; | |
| 1243 uWillpower = uWillpowerBonus = 0; | |
| 1244 uEndurance = uEnduranceBonus = 0; | |
| 1245 uSpeed = uSpeedBonus = 0; | |
| 1246 uAccuracy = uAccuracyBonus = 0; | |
| 1247 uLuck = uLuckBonus = 0; | |
| 1248 uLevel = sLevelModifier = 0; | |
| 1249 sAgeModifier = 0; | |
|
1388
60d4885eb107
sACModifier zeroed in player constructor so AC is not always 0(or -some value) ingame
Grumpy7
parents:
1387
diff
changeset
|
1250 sACModifier = 0; |
| 0 | 1251 |
| 1019 | 1252 // memset(field_1F5, 0, 30); |
| 1253 pure_luck_used=0; | |
| 1254 pure_speed_used=0; | |
| 1255 pure_intellect_used=0; | |
| 1256 pure_endurance_used=0; | |
| 1257 pure_willpower_used=0; | |
| 1258 pure_accuracy_used=0; | |
| 1259 pure_might_used=0; | |
| 0 | 1260 |
| 1261 sResFireBase = sResFireBonus = 0; | |
| 1262 sResAirBase = sResAirBonus = 0; | |
| 1263 sResWaterBase = sResWaterBonus = 0; | |
| 1264 sResEarthBase = sResEarthBonus = 0; | |
| 1265 sResMagicBase = sResMagicBonus = 0; | |
| 1266 sResSpiritBase = sResSpiritBonus = 0; | |
| 1267 sResMindBase = sResMindBonus = 0; | |
| 1268 sResBodyBase = sResBodyBonus = 0; | |
| 1269 sResLightBase = sResLightBonus = 0; | |
| 1270 sResDarkBase = sResDarkBonus = 0; | |
| 1271 | |
| 1272 uTimeToRecovery = 0; | |
| 1273 | |
| 1274 uSkillPoints = 0; | |
| 1275 | |
| 1276 sHealth = 0; | |
| 1277 uFullHealthBonus = 0; | |
| 1278 _health_related = 0; | |
| 1279 | |
| 1280 sMana = 0; | |
| 1281 uFullManaBonus = 0; | |
| 1282 _mana_related = 0; | |
| 1283 | |
| 1284 uQuickSpell = 0; | |
| 1826 | 1285 memset(pInstalledBeacons.data(), 0, 5 * sizeof(LloydBeacon)); |
| 0 | 1286 |
| 1287 _some_attack_bonus = 0; | |
| 1288 field_1A91 = 0; | |
| 1289 _melee_dmg_bonus = 0; | |
| 1290 field_1A93 = 0; | |
| 1291 _ranged_atk_bonus = 0; | |
| 1292 field_1A95 = 0; | |
| 1293 _ranged_dmg_bonus = 0; | |
| 1294 field_1A97 = 0; | |
| 1295 | |
| 130 | 1296 expression = CHARACTER_EXPRESSION_INVALID; |
| 0 | 1297 uExpressionTimePassed = 0; |
| 1298 uExpressionTimeLength = 0; | |
| 1299 | |
| 1300 uNumDivineInterventionCastsThisDay = 0; | |
| 1301 uNumArmageddonCasts = 0; | |
| 1302 uNumFireSpikeCasts = 0; | |
| 1303 | |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
1304 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
|
1305 memset(playerEventBits, 0, sizeof(playerEventBits)); |
| 0 | 1306 |
| 1307 field_E0 = 0; | |
| 1308 field_E4 = 0; | |
| 1309 field_E8 = 0; | |
| 1310 field_EC = 0; | |
| 1311 field_F0 = 0; | |
| 1312 field_F4 = 0; | |
| 1313 field_F8 = 0; | |
| 1314 field_FC = 0; | |
| 1315 field_100 = 0; | |
| 1316 field_104 = 0; | |
| 198 | 1317 |
|
554
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1318 _expression21_animtime = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1319 _expression21_frameset = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1320 |
| 198 | 1321 lastOpenedSpellbookPage = 0; |
| 0 | 1322 } |
| 1323 | |
| 1324 | |
| 1325 //----- (0048C855) -------------------------------------------------------- | |
| 1326 int Player::GetBaseStrength() | |
| 1327 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1328 return this->uMight + GetItemsBonus(CHARACTER_ATTRIBUTE_STRENGTH); |
| 0 | 1329 } |
| 1330 | |
| 1331 //----- (0048C86C) -------------------------------------------------------- | |
| 1332 int Player::GetBaseIntelligence() | |
| 1333 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1334 return this->uIntelligence + GetItemsBonus(CHARACTER_ATTRIBUTE_INTELLIGENCE); |
| 0 | 1335 } |
| 1336 | |
| 1337 //----- (0048C883) -------------------------------------------------------- | |
| 1338 int Player::GetBaseWillpower() | |
| 1339 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1340 return this->uWillpower + GetItemsBonus(CHARACTER_ATTRIBUTE_WILLPOWER); |
| 0 | 1341 } |
| 1342 | |
| 1343 //----- (0048C89A) -------------------------------------------------------- | |
| 1344 int Player::GetBaseEndurance() | |
| 1345 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1346 return this->uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE); |
| 0 | 1347 } |
| 1348 | |
| 1349 //----- (0048C8B1) -------------------------------------------------------- | |
| 1350 int Player::GetBaseAccuracy() | |
| 1351 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1352 return this->uAccuracy + GetItemsBonus(CHARACTER_ATTRIBUTE_ACCURACY); |
| 0 | 1353 } |
| 1354 | |
| 1355 //----- (0048C8C8) -------------------------------------------------------- | |
| 1356 int Player::GetBaseSpeed() | |
| 1357 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1358 return this->uSpeed + GetItemsBonus(CHARACTER_ATTRIBUTE_SPEED); |
| 0 | 1359 } |
| 1360 | |
| 1361 //----- (0048C8DF) -------------------------------------------------------- | |
| 1362 int Player::GetBaseLuck() | |
| 1363 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1364 return this->uLuck + GetItemsBonus(CHARACTER_ATTRIBUTE_LUCK); |
| 0 | 1365 } |
| 1366 | |
| 1367 //----- (0048C8F6) -------------------------------------------------------- | |
| 1368 int Player::GetBaseLevel() | |
| 1369 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1370 return this->uLevel + GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1371 } |
| 1372 | |
| 1373 //----- (0048C90D) -------------------------------------------------------- | |
| 1374 int Player::GetActualLevel() | |
| 1375 { | |
| 1376 return uLevel + sLevelModifier + | |
| 1377 GetMagicalBonus(CHARACTER_ATTRIBUTE_LEVEL) + | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1378 GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1379 } |
| 1380 | |
| 1381 //----- (0048C93C) -------------------------------------------------------- | |
| 1382 int Player::GetActualMight() | |
| 1383 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1384 return GetActualAttribute(CHARACTER_ATTRIBUTE_STRENGTH, &Player::uMight, &Player::uMightBonus); |
| 0 | 1385 } |
| 1386 | |
| 1387 //----- (0048C9C2) -------------------------------------------------------- | |
| 1388 int Player::GetActualIntelligence() | |
| 1389 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1390 return GetActualAttribute(CHARACTER_ATTRIBUTE_INTELLIGENCE, &Player::uIntelligence, &Player::uIntelligenceBonus); |
| 0 | 1391 } |
| 1392 | |
| 1393 //----- (0048CA3F) -------------------------------------------------------- | |
| 1394 int Player::GetActualWillpower() | |
| 1395 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1396 return GetActualAttribute(CHARACTER_ATTRIBUTE_WILLPOWER, &Player::uWillpower, &Player::uWillpowerBonus); |
| 0 | 1397 } |
| 1398 | |
| 1399 //----- (0048CABC) -------------------------------------------------------- | |
| 1400 int Player::GetActualEndurance() | |
| 1401 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1402 return GetActualAttribute(CHARACTER_ATTRIBUTE_ENDURANCE, &Player::uEndurance, &Player::uEnduranceBonus); |
| 0 | 1403 } |
| 1404 | |
| 1405 //----- (0048CB39) -------------------------------------------------------- | |
| 1406 int Player::GetActualAccuracy() | |
| 1407 { | |
|
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
|
1408 return GetActualAttribute(CHARACTER_ATTRIBUTE_ACCURACY, &Player::uAccuracy, &Player::uAccuracyBonus); |
| 0 | 1409 } |
| 1410 | |
| 1411 //----- (0048CBB6) -------------------------------------------------------- | |
| 1412 int Player::GetActualSpeed() | |
| 1413 { | |
|
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
|
1414 return GetActualAttribute(CHARACTER_ATTRIBUTE_SPEED, &Player::uSpeed, &Player::uSpeedBonus); |
| 0 | 1415 } |
| 1416 | |
| 1417 //----- (0048CC33) -------------------------------------------------------- | |
| 1418 int Player::GetActualLuck() | |
| 1419 { | |
| 1036 | 1420 signed int npc_luck_bonus; // [sp+10h] [bp-4h]@1 |
| 1421 | |
| 1422 npc_luck_bonus = 0; | |
| 652 | 1423 if ( CheckHiredNPCSpeciality(Fool) ) |
| 1036 | 1424 npc_luck_bonus = 5; |
| 652 | 1425 if ( CheckHiredNPCSpeciality(ChimneySweep) ) |
| 1036 | 1426 npc_luck_bonus += 20; |
| 652 | 1427 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1036 | 1428 npc_luck_bonus += 10; |
| 1324 | 1429 |
|
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
|
1430 return GetActualAttribute(CHARACTER_ATTRIBUTE_LUCK, &Player::uLuck, &Player::uLuckBonus) |
| 1325 | 1431 + npc_luck_bonus; |
| 1432 } | |
| 1433 | |
| 1434 //----- (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
|
1435 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
|
1436 { |
| 1324 | 1437 uint uActualAge = this->sAgeModifier + GetBaseAge(); |
| 1438 uint uAgeingMultiplier = 100; | |
| 1439 for (uint i = 0; i < 4; ++i) | |
| 1325 | 1440 { |
| 1324 | 1441 if (uActualAge >= pAgeingTable[i]) |
| 1325 | 1442 uAgeingMultiplier = pAgingAttributeModifier[attrId][i]; |
| 1443 else | |
| 1444 break; | |
| 1445 } | |
| 1446 | |
| 1980 | 1447 uchar uConditionMult = pConditionAttributeModifier[attrId][GetMajorConditionIdx()]; |
| 1325 | 1448 int magicBonus = GetMagicalBonus(attrId); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1449 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
|
1450 return uConditionMult * uAgeingMultiplier * this->*attrValue / 100 / 100 |
| 1325 | 1451 + 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
|
1452 + 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
|
1453 + this->*attrBonus; |
| 0 | 1454 } |
| 1455 | |
| 1456 //----- (0048CCF5) -------------------------------------------------------- | |
| 1684 | 1457 int Player::GetActualAttack( bool a2 ) |
| 0 | 1458 { |
| 1459 int v3; // eax@1 | |
| 1460 int v4; // edi@1 | |
| 1461 int v5; // ebx@1 | |
| 1462 int v6; // ebp@1 | |
| 1463 | |
| 1464 v3 = GetActualAccuracy(); | |
| 1036 | 1465 v4 = GetParameterBonus(v3); |
| 0 | 1466 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_ATTACK); |
| 1467 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
|
1468 return v4 + v5 + v6 + GetMagicalBonus(CHARACTER_ATTRIBUTE_ATTACK) + this->_some_attack_bonus; |
| 0 | 1469 } |
| 1470 | |
| 1471 //----- (0048CD45) -------------------------------------------------------- | |
| 1472 int Player::GetMeleeDamageMinimal() | |
| 1473 { | |
| 1474 int v2; // eax@1 | |
| 1475 int v3; // esi@1 | |
| 1476 int v4; // esi@1 | |
| 1477 int v5; // esi@1 | |
| 1478 signed int result; // eax@1 | |
| 1036 | 1479 |
| 0 | 1480 v2 = GetActualMight(); |
| 1036 | 1481 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1482 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN) + v3; |
| 0 | 1483 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v4; |
| 1036 | 1484 result = _melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 1485 if ( result < 1 ) | |
| 1486 result = 1; | |
| 0 | 1487 return result; |
| 1488 } | |
| 1489 | |
| 1490 //----- (0048CD90) -------------------------------------------------------- | |
| 1491 int Player::GetMeleeDamageMaximal() | |
| 1492 { | |
| 1493 int v2; // eax@1 | |
| 1494 int v3; // esi@1 | |
| 1495 int v4; // esi@1 | |
| 1496 int v5; // esi@1 | |
| 1497 int v6; // esi@1 | |
| 1498 signed int result; // eax@1 | |
| 1499 | |
| 1500 v2 = GetActualMight(); | |
| 1036 | 1501 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1502 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX) + v3; |
| 0 | 1503 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
|
1504 v6 = this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 0 | 1505 result = 1; |
| 1506 if ( v6 >= 1 ) | |
| 1507 result = v6; | |
| 1508 return result; | |
| 1509 } | |
| 1510 | |
| 1511 //----- (0048CDDB) -------------------------------------------------------- | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1512 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
|
1513 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1514 int dmgSum; // esi@62 |
| 0 | 1515 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
|
1516 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
|
1517 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
|
1518 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1519 offHndWpnDmg = 0; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1520 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
|
1521 if ( IsUnarmed() ) |
| 0 | 1522 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1523 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
|
1524 } |
|
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
|
1525 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
|
1526 { |
| 1989 | 1527 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
|
1528 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1529 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
|
1530 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
|
1531 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
|
1532 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
|
1533 addOneDice = true; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1534 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
|
1535 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1536 if ( !ignoreOffhand ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1537 { |
| 1989 | 1538 if ( this->HasItemEquipped(EQUIP_SINGLE_HANDED) ) |
| 0 | 1539 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1540 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
|
1541 if ( offHandItemGen->GetItemEquipType() != EQUIP_SHIELD ) |
| 0 | 1542 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1543 offHndWpnDmg = CalculateMeleeDmgToEnemyWithWeapon(offHandItemGen, uTargetActorID, false); |
| 0 | 1544 } |
| 1545 } | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1546 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1547 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1548 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
|
1549 if ( !ignoreSkillBonus ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1550 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1551 int might = GetActualMight(); |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1552 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
|
1553 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
|
1554 dmgSum += this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + mightAndSkillbonus; |
| 0 | 1555 } |
| 1556 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
|
1557 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
|
1558 result = dmgSum; |
| 0 | 1559 return result; |
| 1560 } | |
| 1561 | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1562 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1563 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
|
1564 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1565 int 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
|
1566 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
|
1567 if (addOneDice) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1568 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1569 diceCount++; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1570 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1571 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
|
1572 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
|
1573 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
|
1574 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1575 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
|
1576 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1577 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
|
1578 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
|
1579 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1580 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
|
1581 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
|
1582 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1583 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1584 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1585 else if (MonsterStats::BelongsToSupertype(uTargetActorID, MONSTER_SUPERTYPE_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
|
1586 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1587 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1588 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1589 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
|
1590 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1591 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1592 } |
| 1822 | 1593 else if (MonsterStats::BelongsToSupertype(uTargetActorID, MONSTER_SUPERTYPE_ELF) && ( enchType == 63 || itemId == ITEM_RELIC_OLD_NICK)) |
| 1594 { | |
| 1595 totalDmg *= 2; | |
| 1596 } | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1597 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
|
1598 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1599 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1600 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1601 } |
| 2197 | 1602 if ( (signed int)SkillToMastery(this->pActiveSkills[PLAYER_SKILL_DAGGER]) >= 3 |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1603 && 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
|
1604 && 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
|
1605 totalDmg *= 3; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1606 return totalDmg; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1607 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1608 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1609 |
| 0 | 1610 //----- (0048D0B9) -------------------------------------------------------- |
| 1611 int Player::GetRangedAttack() | |
| 1612 { | |
| 1613 int v3; // edi@3 | |
| 2046 | 1614 //int v4; // eax@4 |
| 1615 //int v5; // edi@4 | |
| 0 | 1616 int v6; // edi@4 |
| 1617 int v7; // edi@4 | |
| 1618 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1619 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
|
1620 if ( mainHandItem != nullptr && ( mainHandItem->uItemID < ITEM_BLASTER || mainHandItem->uItemID > ITEM_LASER_RIFLE )) |
| 0 | 1621 { |
| 2046 | 1622 //v4 = GetActualAccuracy(); |
| 1623 //v5 = GetParameterBonus(GetActualAccuracy()); | |
| 1624 v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + GetParameterBonus(GetActualAccuracy()); | |
| 0 | 1625 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
|
1626 v3 = this->_ranged_atk_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v7; |
| 0 | 1627 } |
| 1628 else | |
| 1629 { | |
| 1684 | 1630 v3 = GetActualAttack(true); |
| 0 | 1631 } |
| 1632 return v3; | |
| 1633 } | |
| 1634 | |
| 1635 //----- (0048D124) -------------------------------------------------------- | |
| 1636 int Player::GetRangedDamageMin() | |
| 1637 { | |
| 1638 int v2; // edi@1 | |
| 1639 int v3; // edi@1 | |
| 1640 int v4; // edi@1 | |
| 1641 int result; // eax@6 | |
| 1642 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1643 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MIN); |
| 1040 | 1644 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
|
1645 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1646 if ( v4 >= 1 ) |
| 1647 result = v4; | |
| 1648 else | |
| 1649 result = 0; | |
| 1650 return result; | |
| 1651 } | |
| 1652 | |
| 1653 //----- (0048D191) -------------------------------------------------------- | |
| 1654 int Player::GetRangedDamageMax() | |
| 1655 { | |
| 1656 int v2; // edi@1 | |
| 1657 int v3; // edi@1 | |
| 1658 int v4; // edi@1 | |
| 1659 int result; // eax@6 | |
| 1660 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1661 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MAX); |
| 1040 | 1662 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
|
1663 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1664 if ( v4 >= 1 ) |
| 1665 result = v4; | |
| 1666 else | |
| 1667 result = 0; | |
| 1668 return result; | |
| 1669 } | |
| 1670 | |
| 1671 //----- (0048D1FE) -------------------------------------------------------- | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1672 int Player::CalculateRangedDamageTo( int a2 ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1673 { |
| 0 | 1674 ItemGen *v4; // ebx@2 |
| 1675 unsigned int v5; // edi@2 | |
| 1676 int v9; // esi@5 | |
| 1677 int v10; // ebx@6 | |
| 1678 signed int v15; // [sp+8h] [bp-Ch]@2 | |
| 1679 int v17; // [sp+10h] [bp-4h]@1 | |
| 1680 | |
| 1681 v17 = 0; | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1682 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1683 return 0; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1684 v4 = (ItemGen *)&this->pInventoryItemList[this->pEquipment.uBow-1]; |
| 0 | 1685 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
|
1686 v15 = pItemsTable->pItems[v5].uDamageRoll; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1687 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
|
1688 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1689 int v7 = rand() % v15; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1690 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
|
1691 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1692 v9 = pItemsTable->pItems[v5].uDamageMod + v17; |
| 0 | 1693 if ( a2 ) |
| 1694 { | |
| 377 | 1695 v10 = v4->uSpecEnchantmentType; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1696 if ( v10 == 64 && MonsterStats::BelongsToSupertype(a2, MONSTER_SUPERTYPE_UNDEAD)) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1697 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1698 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1699 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1700 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
|
1701 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1702 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1703 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1704 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
|
1705 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1706 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1707 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1708 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
|
1709 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1710 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1711 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1712 } |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1713 return v9 + this->GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS); |
| 0 | 1714 } |
| 1715 | |
| 1716 //----- (0048D2EA) -------------------------------------------------------- | |
| 1717 char *Player::GetMeleeDamageString() | |
| 1718 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1719 int min_damage; // edi@3 |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1720 int max_damage; // eax@3 |
| 0 | 1721 |
| 1722 static char player__getmeleedamagestring_static_buff[40]; // idb | |
| 1723 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1724 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
|
1725 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1726 if (mainHandItem != nullptr && ( mainHandItem->uItemID >= 135 ) && ( mainHandItem->uItemID <= 159 )) |
|
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 strcpy(player__getmeleedamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1729 return player__getmeleedamagestring_static_buff; |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1730 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1731 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
|
1732 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1733 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1734 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1735 } |
| 0 | 1736 else |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1737 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1738 min_damage = GetMeleeDamageMinimal(); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1739 max_damage = GetMeleeDamageMaximal(); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1740 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1741 if ( min_damage == max_damage ) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1742 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1743 sprintf(player__getmeleedamagestring_static_buff, "%d", min_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1744 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1745 else |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1746 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1747 sprintf(player__getmeleedamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1748 } |
| 1036 | 1749 return player__getmeleedamagestring_static_buff; |
| 0 | 1750 } |
| 1751 | |
| 1752 //----- (0048D396) -------------------------------------------------------- | |
| 1753 char *Player::GetRangedDamageString() | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1754 { |
| 1036 | 1755 int min_damage; // edi@3 |
| 1756 int max_damage; // eax@3 | |
| 1757 | |
| 1758 static char player__getrangeddamagestring_static_buff[40]; // idb | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1759 |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1760 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
|
1761 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1762 if (mainHandItem != nullptr && ( mainHandItem->uItemID >= 135 ) && ( mainHandItem->uItemID <= 159 )) |
|
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 strcpy(player__getrangeddamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1765 return player__getrangeddamagestring_static_buff; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1766 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1767 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
|
1768 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1769 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1770 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1771 } |
| 0 | 1772 else |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1773 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1774 min_damage = GetRangedDamageMin(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1775 max_damage = GetRangedDamageMax(); |
|
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 if ( max_damage > 0) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1778 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1779 if ( min_damage == max_damage ) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1780 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1781 sprintf(player__getrangeddamagestring_static_buff, "%d", min_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1782 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1783 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1784 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1785 sprintf(player__getrangeddamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1786 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1787 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1788 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1789 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1790 strcpy(player__getrangeddamagestring_static_buff, "N/A"); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1791 } |
| 1036 | 1792 return player__getrangeddamagestring_static_buff; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1793 } |
| 0 | 1794 |
| 1795 //----- (0048D45A) -------------------------------------------------------- | |
| 1796 bool Player::CanTrainToNextLevel() | |
| 1797 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1798 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
|
1799 int neededExp = ((lvl * (lvl - 1)) / 2 * 1000); |
| 1564 | 1800 return this->uExperience >= neededExp; |
| 0 | 1801 } |
| 1802 | |
| 1803 //----- (0048D498) -------------------------------------------------------- | |
| 1804 unsigned int Player::GetExperienceDisplayColor() | |
| 1805 { | |
| 1806 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
|
1807 return ui_character_bonus_text_color; |
| 0 | 1808 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
|
1809 return ui_character_default_text_color; |
| 0 | 1810 } |
| 1811 | |
| 1812 //----- (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
|
1813 int Player::CalculateIncommingDamage( DAMAGE_TYPE dmg_type, int dmg ) |
| 1561 | 1814 { |
| 1036 | 1815 int resist_value; // edi@8 |
| 1816 int player_luck; // eax@21 | |
| 1817 signed int res_rand_divider; // ebx@2 | |
| 1818 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
|
1819 |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1820 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
|
1821 return 0; |
|
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1822 |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1823 resist_value = 0; |
| 1036 | 1824 switch(dmg_type) |
| 1825 { | |
|
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
|
1826 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
|
1827 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
|
1828 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
|
1829 case DMGT_EARTH: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_EARTH); break; |
| 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 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
|
1832 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
|
1833 case DMGT_BODY: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_BODY); break; |
| 1036 | 1834 } |
|
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
|
1835 |
| 1036 | 1836 player_luck = GetActualLuck(); |
| 1837 res_rand_divider = GetParameterBonus(player_luck) + resist_value + 30; | |
| 1838 | |
|
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
|
1839 if ( GetParameterBonus(player_luck) + resist_value > 0 ) |
| 1036 | 1840 { |
|
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
|
1841 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
|
1842 { |
| 1036 | 1843 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
|
1844 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
|
1845 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
|
1846 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
|
1847 } |
|
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 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1849 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
|
1850 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
|
1851 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1852 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
|
1853 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1854 armor_skill = equippedArmor->GetPlayerSkillType(); |
| 1036 | 1855 if ( armor_skill==PLAYER_SKILL_PLATE ) |
| 0 | 1856 { |
| 1036 | 1857 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
|
1858 return dmg / 2; |
| 0 | 1859 } |
| 1036 | 1860 if (armor_skill==PLAYER_SKILL_CHAIN ) |
| 0 | 1861 { |
| 1036 | 1862 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
|
1863 return dmg * 2 / 3; |
| 0 | 1864 } |
| 1865 } | |
| 1036 | 1866 } |
|
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
|
1867 return dmg; |
| 0 | 1868 } |
| 1869 | |
| 1870 //----- (0048D62C) -------------------------------------------------------- | |
| 816 | 1871 ITEM_EQUIP_TYPE Player::GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1872 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1873 return GetNthEquippedIndexItem(uEquipSlot)->GetItemEquipType(); |
| 0 | 1874 } |
| 1875 | |
| 1876 //----- (0048D651) -------------------------------------------------------- | |
| 816 | 1877 PLAYER_SKILL_TYPE Player::GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1878 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1879 return (PLAYER_SKILL_TYPE)GetNthEquippedIndexItem(uEquipSlot)->GetPlayerSkillType(); |
| 0 | 1880 } |
| 1881 | |
| 1882 //----- (0048D676) -------------------------------------------------------- | |
| 1883 bool Player::IsUnarmed() | |
| 1884 { | |
| 1989 | 1885 return !HasItemEquipped(EQUIP_TWO_HANDED) && |
| 1886 (!HasItemEquipped(EQUIP_SINGLE_HANDED) || GetOffHandItem()->GetItemEquipType() == EQUIP_SHIELD); | |
| 0 | 1887 } |
| 1888 | |
| 1889 //----- (0048D6AA) -------------------------------------------------------- | |
| 1890 bool Player::HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex) | |
| 1891 { | |
| 1980 | 1892 uint i = pEquipment.pIndices[uEquipIndex]; |
| 0 | 1893 if (i) |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1894 return !pOwnItems[i - 1].IsBroken(); |
| 1036 | 1895 else |
| 1896 return false; | |
| 0 | 1897 } |
| 1898 | |
| 1899 //----- (0048D6D0) -------------------------------------------------------- | |
| 1900 bool Player::HasEnchantedItemEquipped(int uEnchantment) | |
| 1901 { | |
| 1902 for (uint i = 0; i < 16; ++i) | |
| 1903 { | |
| 1904 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
|
1905 GetNthEquippedIndexItem(i)->uSpecEnchantmentType == uEnchantment) |
| 0 | 1906 return true; |
| 1907 } | |
| 1908 return false; | |
| 1909 } | |
| 1910 | |
| 1911 //----- (0048D709) -------------------------------------------------------- | |
| 1080 | 1912 bool Player::WearsItem( int item_id, ITEM_EQUIP_TYPE equip_type ) |
| 1563 | 1913 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1914 return ( HasItemEquipped(equip_type) && GetNthEquippedIndexItem(equip_type)->uItemID == item_id ); |
| 1563 | 1915 } |
| 1916 | |
| 1917 bool Player::WearsItemAnyWhere(int item_id) | |
| 1918 { | |
| 1919 for (int i = 0; i < 16; i++) | |
| 1920 { | |
| 1921 if (WearsItem(item_id, (ITEM_EQUIP_TYPE) i)) | |
| 1922 { | |
| 1923 return true; | |
| 1924 } | |
| 1925 } | |
| 1926 return false; | |
| 0 | 1927 } |
| 1928 | |
| 1929 //----- (0048D76C) -------------------------------------------------------- | |
| 1686 | 1930 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 | 1931 { |
| 1932 unsigned __int16 v6; // cx@8 | |
| 1933 int v7; // edi@8 | |
| 1934 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
|
1935 unsigned int itemvalue; // esi@8 |
| 0 | 1936 int v10; // eax@8 |
| 1686 | 1937 int currMaxItemValue; // edi@12 |
| 0 | 1938 |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1939 if ( !itemToSteal |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1940 || this->IsEradicated() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1941 || this->IsDead() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1942 || this->IsPertified() |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1943 || this->IsDrunk() |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1944 || this->IsUnconcious() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1945 || this->IsAsleep() ) |
| 0 | 1946 { |
| 1686 | 1947 return 0; |
| 0 | 1948 } |
| 1949 else | |
| 1950 { | |
| 2197 | 1951 v6 = this->pActiveSkills[PLAYER_SKILL_STEALING]; |
| 0 | 1952 v7 = v6 & 0x3F; |
| 1953 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
|
1954 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
|
1955 v10 = itemToSteal->GetItemEquipType(); |
| 1989 | 1956 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
|
1957 itemvalue *= 3; |
| 1686 | 1958 currMaxItemValue = StealingRandomBonuses[rand() % 5] + v7 * StealingMasteryBonuses[v8]; |
| 1959 *fineIfFailed = 100 * (reputation + extraStealDifficulty) + itemvalue; | |
| 1960 if (a5) | |
| 1961 { | |
| 1962 *fineIfFailed += 500; | |
| 1963 } | |
| 0 | 1964 if ( rand() % 100 >= 5 ) |
| 1965 { | |
| 1686 | 1966 if ( *fineIfFailed > currMaxItemValue ) |
| 1967 if (*fineIfFailed - currMaxItemValue < 500) | |
| 1968 { | |
| 1969 return 1; | |
| 1970 } | |
| 1971 else | |
| 1972 { | |
| 1973 return 0; | |
| 1974 } | |
| 0 | 1975 else |
| 1686 | 1976 return 2; |
| 0 | 1977 } |
| 1978 else | |
| 1979 { | |
| 1686 | 1980 return 0; |
| 1981 } | |
| 1982 } | |
| 0 | 1983 } |
| 1984 | |
| 1985 //----- (0048D88B) -------------------------------------------------------- | |
| 1986 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation) | |
| 1987 { | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1988 Actor *actroPtr; // edi@1 |
| 0 | 1989 int v7; // ebx@10 |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1990 unsigned int stealingMastery; // esi@10 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1991 int fineIfFailed; // esi@10 |
| 0 | 1992 int v11; // eax@13 |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1993 bool HasFullItemSlots; // ebx@15 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1994 unsigned __int16 carriedItemId; // si@21 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1995 unsigned int enchBonusSum; // esi@31 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1996 int *enchTypePtr; // eax@34 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1997 ItemGen tempItem; // [sp+8h] [bp-34h]@15 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1998 int currMaxItemValue; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1999 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2000 actroPtr = &pActors[uActorID]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2001 if ( !actroPtr |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2002 || this->IsEradicated() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2003 || this->IsDead() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2004 || this->IsPertified() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2005 || this->IsDrunk() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2006 || this->IsUnconcious() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2007 || this->IsAsleep() ) |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2008 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2009 return 0; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2010 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2011 if ( !(BYTE2(actroPtr->uAttributes) & 0x80) ) |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2012 actroPtr->SetRandomGoldIfTheresNoItem(); |
| 2197 | 2013 unsigned __int16 v6 = this->pActiveSkills[PLAYER_SKILL_STEALING]; |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2014 v7 = v6 & 0x3F; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2015 stealingMastery = SkillToMastery(v6); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2016 int v30 = StealingMasteryBonuses[stealingMastery]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2017 int v29 = StealingRandomBonuses[rand() % 5]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2018 fineIfFailed = actroPtr->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2019 currMaxItemValue = v29 + v7 * v30; |
| 1783 | 2020 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
|
2021 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2022 Actor::AggroSurroundingPeasants(uActorID, 1); |
| 2203 | 2023 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[376], this->pName);//"%s was caught stealing!" |
| 2024 ShowStatusBarString(pTmpBuf2.data(), 2); | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2025 return 0; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2026 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2027 else |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2028 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2029 v11 = rand(); |
| 1688 | 2030 if ( v11 % 100 >= 70 ) //stealing gold |
| 2031 { | |
| 2032 enchBonusSum = 0; | |
| 2033 for (int i = 0; i < v7; i++) | |
| 2034 enchBonusSum += rand() % StealingEnchantmentBonusForSkill[stealingMastery] + 1; | |
| 2276 | 2035 if ( actroPtr->ActorHasItems[3].GetItemEquipType() != EQUIP_GOLD ) |
| 1688 | 2036 return 2; |
| 2276 | 2037 enchTypePtr = &actroPtr->ActorHasItems[3].uSpecEnchantmentType; |
| 1688 | 2038 if ( (int)enchBonusSum >= *enchTypePtr ) |
| 2039 { | |
| 2276 | 2040 actroPtr->ActorHasItems[3].uItemID = 0; |
| 1688 | 2041 *enchTypePtr = 0; |
| 2042 } | |
| 2043 else | |
| 2044 *enchTypePtr -= enchBonusSum; | |
| 2045 if ( enchBonusSum ) | |
| 2046 { | |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
2047 pParty->PartyFindsGold(enchBonusSum, 2); |
| 1688 | 2048 sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[302], this->pName, enchBonusSum); //%stole %d gold |
| 2049 } | |
| 2050 else | |
| 2051 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName); //%s failed to steal anything | |
| 2203 | 2052 ShowStatusBarString(pTmpBuf2.data(), 2); |
| 1688 | 2053 return 2; |
| 2054 } | |
| 2055 else if ( v11 % 100 >= 40 ) //stealing an item | |
| 2056 { | |
| 2057 tempItem.Reset(); | |
| 2058 HasFullItemSlots = false; | |
| 2059 int i; | |
| 2060 for (i = 0; i < 4; i++) | |
| 2061 { | |
| 2276 | 2062 if ( actroPtr->ActorHasItems[i].uItemID != 0 && actroPtr->ActorHasItems[i].GetItemEquipType() != EQUIP_GOLD ) |
| 1688 | 2063 break; |
| 2064 } | |
| 2065 if (i == 4) | |
| 2066 HasFullItemSlots = true; | |
| 2067 carriedItemId = actroPtr->uCarriedItemID; | |
| 2068 if ( carriedItemId != 0 || HasFullItemSlots ) | |
| 2069 { | |
| 2070 tempItem.Reset(); | |
| 2071 if ( carriedItemId != 0 ) | |
| 0 | 2072 { |
| 1688 | 2073 actroPtr->uCarriedItemID = 0; |
| 2074 tempItem.uItemID = carriedItemId; | |
| 2075 if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_WAND ) | |
| 2076 tempItem.uNumCharges = rand() % 6 + pItemsTable->pItems[carriedItemId].uDamageMod + 1; | |
| 2077 else if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_POTION && carriedItemId != ITEM_POTION_BOTTLE) | |
| 2078 tempItem.uEnchantmentType = 2 * rand() % 4 + 2; | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2079 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2080 else |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2081 { |
| 2276 | 2082 ItemGen* itemToSteal = &actroPtr->ActorHasItems[rand() % 4]; |
| 1688 | 2083 memcpy(&tempItem, itemToSteal, sizeof(tempItem)); |
| 2084 itemToSteal->Reset(); | |
| 2085 carriedItemId = tempItem.uItemID; | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2086 } |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2087 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
|
2088 { |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
2089 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
|
2090 sprintf( |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2091 pTmpBuf2.data(), |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2092 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
|
2093 this->pName, |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2094 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
|
2095 ShowStatusBarString(pTmpBuf2.data(), 2u); |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
2096 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
|
2097 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
|
2098 pMouse->SetCursorBitmapFromItemID(carriedItemId); |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2099 return 2; |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2100 } |
| 0 | 2101 } |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2102 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2103 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName); //%s failed to steal anything |
| 2203 | 2104 ShowStatusBarString(pTmpBuf2.data(), 2); |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2105 return 2; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2106 } |
| 0 | 2107 } |
| 2108 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2109 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2110 // 4EDEC4: using guessed type int dword_4EDEC4[]; | |
| 2111 | |
| 2112 //----- (0048DBB9) -------------------------------------------------------- | |
| 2113 void Player::Heal(int amount) | |
| 2114 { | |
| 1010 | 2115 signed int max_health; // eax@3 |
| 2116 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2117 if ( !IsEradicated() && !IsDead() ) |
| 1010 | 2118 { |
| 2119 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
|
2120 if ( IsZombie() ) |
| 1010 | 2121 max_health /= 2; |
| 2122 sHealth += amount; | |
| 2123 if ( sHealth > max_health ) | |
| 2124 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
|
2125 if ( IsUnconcious() ) |
| 1010 | 2126 { |
| 2127 if ( sHealth > 0 ) | |
| 2128 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2129 SetUnconcious(false); |
| 0 | 2130 } |
| 2131 } | |
| 2132 } | |
| 2133 } | |
| 2134 | |
| 2135 //----- (0048DC1E) -------------------------------------------------------- | |
| 1036 | 2136 int Player::ReceiveDamage( signed int amount, DAMAGE_TYPE dmg_type ) |
| 2137 { | |
| 2138 signed int recieved_dmg; // eax@1 | |
| 2139 bool broke_armor; | |
| 2140 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2141 SetAsleep(false); |
| 1036 | 2142 recieved_dmg = CalculateIncommingDamage(dmg_type, amount); |
| 2143 sHealth -= recieved_dmg; | |
| 2144 broke_armor = sHealth <= -10; | |
| 2145 if ( sHealth < 1 ) // | |
| 2146 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2147 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
|
2148 || 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
|
2149 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2150 SetCondUnconsciousWithBlockCheck(false); |
| 0 | 2151 } |
| 2152 else | |
| 2153 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2154 SetCondDeadWithBlockCheck(false); |
| 1036 | 2155 if ( sHealth > 0 ) |
| 2156 sHealth = 0; | |
| 2157 } | |
| 2158 if (broke_armor ) | |
| 2159 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2160 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
|
2161 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
|
2162 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2163 if ( !(equippedArmor->uAttributes & ITEM_HARDENED)) |
| 0 | 2164 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2165 equippedArmor->SetBroken(); |
| 0 | 2166 } |
| 2167 } | |
| 2168 } | |
| 2169 } | |
| 1036 | 2170 if ( recieved_dmg && CanAct() ) |
| 187 | 2171 PlaySound(SPEECH_24, 0); |
| 1036 | 2172 return recieved_dmg; |
| 0 | 2173 } |
| 2174 | |
| 2175 //----- (0048DCF6) -------------------------------------------------------- | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2176 int Player::ReceiveSpecialAttackEffect( int attType, struct Actor *pActor ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2177 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2178 SPECIAL_ATTACK_TYPE attTypeCast = (SPECIAL_ATTACK_TYPE) attType; |
| 0 | 2179 signed int v3; // edi@1 |
| 2180 signed int v4; // ebx@1 | |
| 2181 int v6; // eax@2 | |
| 2182 int v8; // eax@8 | |
| 2183 int v10; // eax@8 | |
| 2184 int v11; // ebx@8 | |
| 2185 ItemGen *v13; // eax@9 | |
| 2186 int v22; // eax@49 | |
| 2187 signed int v23; // ebx@49 | |
| 2188 void *v27; // ecx@76 | |
| 2189 char v46[140]; // [sp+Ch] [bp-94h]@13 | |
| 2190 unsigned int v47; // [sp+98h] [bp-8h]@1 | |
| 1692 | 2191 ItemGen* v48; // [sp+9Ch] [bp-4h]@1 |
| 2192 | |
| 0 | 2193 v4 = 0; |
| 2194 v47 = 0; | |
| 1783 | 2195 v48 = nullptr; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2196 switch ( attTypeCast ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2197 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2198 case SPECIAL_ATTACK_CURSE: |
| 0 | 2199 v6 = GetActualWillpower(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2200 v11 = GetParameterBonus(v6); |
| 1690 | 2201 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2202 case SPECIAL_ATTACK_WEAK: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2203 case SPECIAL_ATTACK_SLEEP: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2204 case SPECIAL_ATTACK_DRUNK: |
| 2187 | 2205 case SPECIAL_ATTACK_DISEASE_WEAK: |
| 2206 case SPECIAL_ATTACK_DISEASE_MEDIUM: | |
| 2207 case SPECIAL_ATTACK_DISEASE_SEVERE: | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2208 case SPECIAL_ATTACK_UNCONSCIOUS: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2209 case SPECIAL_ATTACK_AGING: |
| 0 | 2210 v6 = GetActualEndurance(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2211 v11 = GetParameterBonus(v6); |
| 1690 | 2212 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2213 case SPECIAL_ATTACK_INSANE: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2214 case SPECIAL_ATTACK_PARALYZED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2215 case SPECIAL_ATTACK_FEAR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2216 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_MIND); |
| 1690 | 2217 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2218 case SPECIAL_ATTACK_PETRIFIED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2219 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_EARTH); |
| 1690 | 2220 break; |
| 2187 | 2221 case SPECIAL_ATTACK_POISON_WEAK: |
| 2222 case SPECIAL_ATTACK_POISON_MEDIUM: | |
| 2223 case SPECIAL_ATTACK_POISON_SEVERE: | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2224 case SPECIAL_ATTACK_DEAD: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2225 case SPECIAL_ATTACK_ERADICATED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2226 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_BODY); |
| 1690 | 2227 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2228 case SPECIAL_ATTACK_MANA_DRAIN: |
| 0 | 2229 v8 = GetActualWillpower(); |
| 2230 v10 = GetActualIntelligence(); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2231 v11 = (GetParameterBonus(v10) + GetParameterBonus(v8)) / 2; |
| 0 | 2232 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2233 case SPECIAL_ATTACK_BREAK_ANY: |
| 1692 | 2234 for (int i = 0; i < 138; i++) |
| 2235 { | |
| 2236 v13 = &this->pInventoryItemList[i]; | |
| 2237 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
|
2238 v46[v4++] = i; |
| 1692 | 2239 } |
| 1690 | 2240 if ( !v4 ) |
| 2241 return 0; | |
| 1692 | 2242 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
|
2243 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 1690 | 2244 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2245 case SPECIAL_ATTACK_BREAK_ARMOR: |
| 1692 | 2246 for (int i = 0; i < 16; i++ ) |
| 0 | 2247 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2248 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 0 | 2249 { |
| 1692 | 2250 if ( i == EQUIP_ARMOUR ) |
| 2251 v46[v4++] = this->pEquipment.uArmor - 1; | |
| 1989 | 2252 if ( (i == EQUIP_SINGLE_HANDED || i == EQUIP_TWO_HANDED) && GetEquippedItemEquipType((ITEM_EQUIP_TYPE)i) == EQUIP_SHIELD ) |
| 1692 | 2253 v46[v4++] = this->pEquipment.pIndices[i] - 1; |
| 0 | 2254 } |
| 1692 | 2255 } |
| 1690 | 2256 if ( !v4 ) |
| 2257 return 0; | |
| 1692 | 2258 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
|
2259 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 1690 | 2260 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2261 case SPECIAL_ATTACK_BREAK_WEAPON: |
| 1692 | 2262 for (int i = 0; i < 16; i++ ) |
| 0 | 2263 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2264 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 0 | 2265 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2266 if ( i == EQUIP_BOW ) |
| 1690 | 2267 v46[v4++] = LOBYTE(this->pEquipment.uBow) - 1; |
| 1989 | 2268 if ( (i == EQUIP_SINGLE_HANDED || i == EQUIP_TWO_HANDED) |
| 2269 && (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
|
2270 v46[v4++] = this->pEquipment.pIndices[i] - 1; |
| 0 | 2271 } |
| 1692 | 2272 } |
| 0 | 2273 if ( !v4 ) |
| 1690 | 2274 return 0; |
| 1692 | 2275 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
|
2276 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 0 | 2277 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2278 case SPECIAL_ATTACK_STEAL: |
| 1692 | 2279 for ( int i = 0; i < 126; i++ ) |
| 2280 { | |
| 2281 int ItemPosInList = this->pInventoryMatrix[i]; | |
| 2282 if (ItemPosInList > 0) | |
| 0 | 2283 { |
| 1692 | 2284 ItemGen* v21 = &this->pInventoryItemList[ItemPosInList - 1]; |
| 2285 if ( v21->uItemID > 0 && v21->uItemID <= 134 ) | |
| 0 | 2286 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2287 v46[v4++] = i; |
| 0 | 2288 } |
| 2289 } | |
| 1692 | 2290 } |
| 0 | 2291 if ( !v4 ) |
| 1690 | 2292 return 0; |
| 1692 | 2293 v47 = v46[rand() % v4]; |
| 0 | 2294 v6 = GetActualAccuracy(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2295 v11 = GetParameterBonus(v6); |
| 0 | 2296 break; |
| 2297 default: | |
| 2298 v11 = 0; | |
| 2299 break; | |
| 2300 } | |
| 2301 v22 = GetActualLuck(); | |
| 1036 | 2302 v23 = GetParameterBonus(v22) + v11 + 30; |
| 0 | 2303 if ( rand() % v23 >= 30 ) |
| 2304 { | |
| 1690 | 2305 return 0; |
| 0 | 2306 } |
| 2307 else | |
| 2308 { | |
| 1692 | 2309 for ( v3 = 0; v3 < 4; v3++ ) |
| 2310 { | |
| 2311 if ( this == pPlayers[v3 + 1] ) | |
| 2312 break; | |
| 2313 } | |
| 2314 | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2315 switch ( attTypeCast ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2316 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2317 case SPECIAL_ATTACK_CURSE: |
| 1692 | 2318 SetCondition(Condition_Cursed, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2319 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2320 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2321 return 1; | |
| 2322 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2323 case SPECIAL_ATTACK_WEAK: |
| 1692 | 2324 SetCondition(Condition_Weak, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2325 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2326 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2327 return 1; | |
| 2328 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2329 case SPECIAL_ATTACK_SLEEP: |
| 1692 | 2330 SetCondition(Condition_Sleep, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2331 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2332 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2333 return 1; | |
| 2334 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2335 case SPECIAL_ATTACK_DRUNK: |
| 1692 | 2336 SetCondition(Condition_Drunk, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2337 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2338 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2339 return 1; | |
| 2340 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2341 case SPECIAL_ATTACK_INSANE: |
| 1692 | 2342 SetCondition(Condition_Insane, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2343 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2344 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2345 return 1; | |
| 2346 break; | |
| 2187 | 2347 case SPECIAL_ATTACK_POISON_WEAK: |
| 2348 SetCondition(Condition_Poison_Weak, 1); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2349 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2350 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2351 return 1; |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2352 break; |
| 2187 | 2353 case SPECIAL_ATTACK_POISON_MEDIUM: |
| 2354 SetCondition(Condition_Poison_Medium, 1); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2355 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
|
2356 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2357 return 1; |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2358 break; |
| 2187 | 2359 case SPECIAL_ATTACK_POISON_SEVERE: |
| 2360 SetCondition(Condition_Poison_Severe, 1); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2361 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2362 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2363 return 1; | |
| 2364 break; | |
| 2187 | 2365 case SPECIAL_ATTACK_DISEASE_WEAK: |
| 2366 SetCondition(Condition_Disease_Weak, 1); | |
|
1693
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2367 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
|
2368 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
|
2369 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
|
2370 break; |
| 2187 | 2371 case SPECIAL_ATTACK_DISEASE_MEDIUM: |
| 2372 SetCondition(Condition_Disease_Medium, 1); | |
|
1693
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2373 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
|
2374 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
|
2375 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
|
2376 break; |
| 2187 | 2377 case SPECIAL_ATTACK_DISEASE_SEVERE: |
| 2378 SetCondition(Condition_Disease_Severe, 1); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2379 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
| 0 | 2380 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 1690 | 2381 return 1; |
| 0 | 2382 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2383 case SPECIAL_ATTACK_PARALYZED: |
| 1692 | 2384 SetCondition(Condition_Paralyzed, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2385 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2386 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2387 return 1; | |
| 2388 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2389 case SPECIAL_ATTACK_UNCONSCIOUS: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2390 SetCondition(Condition_Unconcious, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2391 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
|
2392 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2393 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2394 break; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2395 case SPECIAL_ATTACK_DEAD: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2396 SetCondition(Condition_Dead, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2397 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
|
2398 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2399 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2400 break; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2401 case SPECIAL_ATTACK_PETRIFIED: |
| 1692 | 2402 SetCondition(Condition_Pertified, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2403 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2404 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2405 return 1; | |
| 2406 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2407 case SPECIAL_ATTACK_ERADICATED: |
| 1692 | 2408 SetCondition(Condition_Eradicated, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2409 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2410 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2411 return 1; | |
| 2412 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2413 case SPECIAL_ATTACK_BREAK_ANY: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2414 case SPECIAL_ATTACK_BREAK_ARMOR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2415 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
|
2416 if ( !(v48->uAttributes & ITEM_HARDENED) ) |
| 1690 | 2417 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2418 PlaySound(SPEECH_40, 0); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2419 v48->SetBroken(); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2420 pAudioPlayer->PlaySound((SoundID)47, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2421 } |
| 2422 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2423 return 1; | |
| 2424 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2425 case SPECIAL_ATTACK_STEAL: |
| 1690 | 2426 PlaySound(SPEECH_40, 0); |
| 2276 | 2427 v27 = pActor->ActorHasItems; |
| 2428 if ( pActor->ActorHasItems[0].uItemID ) | |
| 1690 | 2429 { |
| 2276 | 2430 v27 = &pActor->ActorHasItems[1]; |
| 2431 if ( pActor->ActorHasItems[1].uItemID ) | |
| 1690 | 2432 { |
| 2433 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2434 return 1; | |
| 2435 } | |
| 2436 } | |
| 2437 memcpy(v27, &this->pInventoryItemList[this->pInventoryMatrix[v47]-1], 0x24u); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2438 RemoveItemAtInventoryIndex(v47); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2439 pAudioPlayer->PlaySound((SoundID)47, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2440 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2441 return 1; | |
| 2442 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2443 case SPECIAL_ATTACK_AGING: |
| 187 | 2444 PlaySound(SPEECH_42, 0); |
| 1690 | 2445 ++this->sAgeModifier; |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2446 pAudioPlayer->PlaySound((SoundID)226, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2447 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2448 return 1; | |
| 2449 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2450 case SPECIAL_ATTACK_MANA_DRAIN: |
| 1690 | 2451 PlaySound(SPEECH_41, 0); |
| 2452 this->sMana = 0; | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2453 pAudioPlayer->PlaySound((SoundID)226, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2454 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2455 return 1; | |
| 2456 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2457 case SPECIAL_ATTACK_FEAR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2458 SetCondition(Condition_Fear, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2459 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
|
2460 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2461 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2462 break; |
| 0 | 2463 default: |
| 1690 | 2464 return 0; |
| 0 | 2465 } |
| 2466 } | |
| 2467 } | |
| 324 | 2468 |
| 0 | 2469 // 48DCF6: using guessed type char var_94[140]; |
| 2470 | |
| 2471 //----- (0048E1A3) -------------------------------------------------------- | |
| 2472 unsigned int Player::GetSpellSchool(unsigned int uSpellID) | |
| 2473 { | |
| 1091 | 2474 return pSpellStats->pInfos[uSpellID].uSchool; |
| 0 | 2475 } |
| 2476 | |
| 2477 //----- (0048E1B5) -------------------------------------------------------- | |
| 816 | 2478 int Player::GetAttackRecoveryTime(bool bRangedAttack) |
| 2479 { | |
| 2480 ItemGen *weapon = nullptr; | |
| 2481 uint weapon_recovery = base_recovery_times_per_weapon_type[0]; | |
| 2482 if (bRangedAttack) | |
| 0 | 2483 { |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2484 if ( HasItemEquipped(EQUIP_BOW) ) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2485 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2486 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
|
2487 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
|
2488 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2489 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2490 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
|
2491 { |
| 816 | 2492 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
|
2493 } |
| 1989 | 2494 else if ( HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 816 | 2495 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2496 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
|
2497 if (weapon->GetItemEquipType() == EQUIP_WAND) |
| 816 | 2498 { |
| 2499 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
| 2500 __debugbreak(); // looks like wands were two-handed weapons once, or supposed to be. should not get here now | |
| 2501 weapon_recovery = pSpellDatas[wand_spell_ids[weapon->uItemID - ITEM_WAND_FIRE]].uExpertLevelRecovery; | |
| 2502 } | |
| 0 | 2503 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
|
2504 weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()]; |
| 816 | 2505 } |
| 1989 | 2506 if (HasItemEquipped(EQUIP_SINGLE_HANDED) && GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) != EQUIP_SHIELD) |
| 1010 | 2507 // ADD: shield check because shield recovery is added later and can be accidentally doubled |
| 816 | 2508 { |
| 1717 | 2509 if (base_recovery_times_per_weapon_type[GetOffHandItem()->GetPlayerSkillType()] > weapon_recovery) |
| 2510 { | |
| 1731 | 2511 weapon = GetOffHandItem(); |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2512 weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()]; |
| 816 | 2513 } |
| 2514 } | |
| 2515 | |
| 2516 uint armour_recovery = 0; | |
| 0 | 2517 if ( HasItemEquipped(EQUIP_ARMOUR) ) |
| 2518 { | |
| 1980 | 2519 uchar armour_skill_type = GetArmorItem()->GetPlayerSkillType(); |
| 816 | 2520 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
|
2521 float multiplier; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2522 |
| 816 | 2523 if (armour_skill_type == PLAYER_SKILL_LEATHER) |
| 2524 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2525 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0, 0, 0); |
| 816 | 2526 } |
| 2527 else if (armour_skill_type == PLAYER_SKILL_CHAIN) | |
| 2528 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2529 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0, 0); |
| 816 | 2530 } |
| 2531 else if (armour_skill_type == PLAYER_SKILL_PLATE) | |
| 2532 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2533 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0.5f, 0); |
| 0 | 2534 } |
| 2535 else | |
| 2536 { | |
| 1545 | 2537 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
|
2538 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
|
2539 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2540 |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2541 armour_recovery = (uint)(base_armour_recovery * multiplier); |
| 816 | 2542 } |
| 2543 | |
| 2544 uint shield_recovery = 0; | |
| 1989 | 2545 if (HasItemEquipped(EQUIP_SINGLE_HANDED) && GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) == EQUIP_SHIELD) |
| 816 | 2546 { |
| 1980 | 2547 uchar skill_type = GetOffHandItem()->GetPlayerSkillType(); |
| 816 | 2548 |
| 2549 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
|
2550 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
|
2551 shield_recovery = (uint)(shield_base_recovery * multiplier); |
| 816 | 2552 } |
| 2553 | |
| 1036 | 2554 uint player_speed_recovery_reduction = GetParameterBonus(GetActualSpeed()), |
| 816 | 2555 sword_axe_bow_recovery_reduction = 0; |
| 2556 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
|
2557 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
|
2558 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2559 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
|
2560 (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
|
2561 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2562 if (SkillToMastery(pActiveSkills[weapon->GetPlayerSkillType()]) >= 2 ) // Expert Sword, Axe & Bow reduce recovery |
| 1759 | 2563 sword_axe_bow_recovery_reduction = pActiveSkills[weapon->GetPlayerSkillType()] & 0x3F; |
| 2564 } | |
| 2565 if (weapon->GetPlayerSkillType() == PLAYER_SKILL_BLASTER) | |
| 816 | 2566 shooting_laser = true; |
| 2567 } | |
| 2568 | |
| 2569 uint armsmaster_recovery_reduction = 0; | |
| 2570 if (!bRangedAttack && !shooting_laser) | |
| 2571 { | |
| 2572 if (uint armsmaster_level = GetActualSkillLevel(PLAYER_SKILL_ARMSMASTER)) | |
| 2573 { | |
| 2574 armsmaster_recovery_reduction = armsmaster_level & 0x3F; | |
| 2575 if (SkillToMastery(armsmaster_level) >= 4) | |
| 2576 armsmaster_recovery_reduction *= 2; | |
| 2577 } | |
| 2578 } | |
| 2579 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2580 uint hasteRecoveryReduction = 0; |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
2581 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
|
2582 hasteRecoveryReduction = 25; |
| 816 | 2583 |
| 2584 uint weapon_enchantment_recovery_reduction = 0; | |
| 2585 if ( weapon ) | |
| 2586 { | |
| 2587 if (weapon->uSpecEnchantmentType == 59 || | |
| 2588 weapon->uSpecEnchantmentType == 41 || | |
| 2589 weapon->uSpecEnchantmentType == 500) | |
| 2590 weapon_enchantment_recovery_reduction = 20; | |
| 2591 } | |
| 2592 | |
| 2593 int recovery = weapon_recovery + | |
| 2594 armour_recovery + | |
| 2595 shield_recovery | |
| 2596 - armsmaster_recovery_reduction | |
| 2597 - weapon_enchantment_recovery_reduction | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2598 - hasteRecoveryReduction |
| 816 | 2599 - sword_axe_bow_recovery_reduction |
| 2600 - player_speed_recovery_reduction; | |
| 2601 | |
| 2602 if (recovery < 0) | |
| 2603 recovery = 0; | |
| 2604 return recovery; | |
| 0 | 2605 } |
| 2606 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2607 |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2608 //----- new -------------------------------------------------------- |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2609 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
|
2610 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2611 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
|
2612 switch (skill_mastery) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2613 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2614 case 1: return mult1; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2615 case 2: return mult2; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2616 case 3: return mult3; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2617 case 4: return mult4; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2618 } |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2619 Error("Unexpected input value: %d", armour_skill_type); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2620 return 0; |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2621 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2622 |
| 0 | 2623 //----- (0048E4F8) -------------------------------------------------------- |
| 2624 int Player::GetMaxHealth() | |
| 2625 { | |
| 2626 int v3; // esi@1 | |
| 2627 int v4; // esi@1 | |
| 2628 int v6; // esi@1 | |
| 2629 | |
| 1036 | 2630 v3 = GetParameterBonus(GetActualEndurance()); |
| 135 | 2631 v4 = pBaseHealthPerLevelByClass[classType] * (GetActualLevel() + v3); |
| 0 | 2632 v6 = uFullHealthBonus |
| 135 | 2633 + pBaseHealthByClass[classType / 4] |
| 0 | 2634 + GetSkillBonus(CHARACTER_ATTRIBUTE_HEALTH) |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2635 + GetItemsBonus(CHARACTER_ATTRIBUTE_HEALTH) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2636 return max(1, v6); |
| 0 | 2637 } |
| 2638 | |
| 2639 //----- (0048E565) -------------------------------------------------------- | |
| 2640 int Player::GetMaxMana() | |
| 2641 { | |
| 2642 int v2; // eax@2 | |
| 2643 int v3; // esi@4 | |
| 2644 int v4; // eax@5 | |
| 2645 int v5; // esi@5 | |
| 2646 int v6; // eax@5 | |
| 2647 int v7; // esi@6 | |
| 2648 int v8; // esi@6 | |
| 2649 int v9; // esi@6 | |
| 1116 | 2650 |
| 135 | 2651 switch (classType) |
| 0 | 2652 { |
| 1116 | 2653 case PLAYER_CLASS_ROGUE: |
| 2654 case PLAYER_CLASS_SPY: | |
| 2655 case PLAYER_CLASS_ASSASSIN: | |
| 2656 case PLAYER_CLASS_ARCHER: | |
| 2657 case PLAYER_CLASS_WARRIOR_MAGE: | |
| 2658 case PLAYER_CLASS_MASTER_ARCHER: | |
| 2659 case PLAYER_CLASS_SNIPER: | |
| 2660 case PLAYER_CLASS_SORCERER: | |
| 2661 case PLAYER_CLASS_WIZARD: | |
| 2662 case PLAYER_CLASS_ARCHMAGE: | |
| 2663 case PLAYER_CLASS_LICH: | |
| 0 | 2664 v2 = GetActualIntelligence(); |
| 1036 | 2665 v3 = GetParameterBonus(v2); |
| 1116 | 2666 break; |
| 2667 case PLAYER_CLASS_INITIATE: | |
| 2668 case PLAYER_CLASS_MASTER: | |
| 2669 case PLAYER_CLASS_NINJA: | |
| 2670 case PLAYER_CLASS_PALADIN: | |
| 2671 case PLAYER_CLASS_CRUSADER: | |
| 2672 case PLAYER_CLASS_HERO: | |
| 2673 case PLAYER_CLASS_VILLIAN: | |
| 2674 case PLAYER_CLASS_CLERIC: | |
| 2675 case PLAYER_CLASS_PRIEST: | |
| 2676 case PLAYER_CLASS_PRIEST_OF_SUN: | |
| 2677 case PLAYER_CLASS_PRIEST_OF_MOON: | |
| 0 | 2678 v2 = GetActualWillpower(); |
| 1036 | 2679 v3 = GetParameterBonus(v2); |
| 1116 | 2680 break; |
| 2681 case PLAYER_CLASS_HUNTER: | |
| 2682 case PLAYER_CLASS_RANGER_LORD: | |
| 2683 case PLAYER_CLASS_BOUNTY_HUNTER: | |
| 2684 case PLAYER_CLASS_DRUID: | |
| 2685 case PLAYER_CLASS_GREAT_DRUID: | |
| 2686 case PLAYER_CLASS_ARCH_DRUID: | |
| 2687 case PLAYER_CLASS_WARLOCK: | |
| 0 | 2688 v4 = GetActualWillpower(); |
| 1036 | 2689 v5 = GetParameterBonus(v4); |
| 0 | 2690 v6 = GetActualIntelligence(); |
| 1036 | 2691 v3 = GetParameterBonus(v6) + v5; |
| 0 | 2692 break; |
| 2693 default: | |
| 1116 | 2694 return 0; |
| 0 | 2695 break; |
| 2696 } | |
| 1116 | 2697 v7 = pBaseManaPerLevelByClass[classType] * (GetActualLevel() + v3); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2698 v8 = GetItemsBonus(CHARACTER_ATTRIBUTE_MANA) + v7; |
| 1116 | 2699 v9 = uFullManaBonus |
| 2700 + pBaseManaByClass[classType / 4] | |
| 2701 + GetSkillBonus(CHARACTER_ATTRIBUTE_MANA) | |
| 2702 + v8; | |
| 2703 return max(0,v9); | |
| 0 | 2704 } |
| 2705 | |
| 2706 //----- (0048E656) -------------------------------------------------------- | |
| 2707 int Player::GetBaseAC() | |
| 2708 { | |
| 2709 int v2; // eax@1 | |
| 2710 int v3; // esi@1 | |
| 2711 int v4; // esi@1 | |
| 2712 int v5; // esi@1 | |
| 2713 | |
| 2714 v2 = GetActualSpeed(); | |
| 1036 | 2715 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2716 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2717 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2718 return max(0, v5); |
| 0 | 2719 } |
| 2720 | |
| 2721 //----- (0048E68F) -------------------------------------------------------- | |
| 2722 int Player::GetActualAC() | |
| 2723 { | |
| 2724 int v2; // eax@1 | |
| 2725 int v3; // esi@1 | |
| 2726 int v4; // esi@1 | |
| 2727 int v5; // esi@1 | |
| 2728 int v6; // esi@1 | |
| 2729 | |
| 2730 v2 = GetActualSpeed(); | |
| 1036 | 2731 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2732 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2733 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2734 v6 = this->sACModifier + GetMagicalBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v5; |
|
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2735 return max(0, v6); |
| 0 | 2736 } |
| 2737 | |
| 2738 //----- (0048E6DC) -------------------------------------------------------- | |
| 2739 unsigned int Player::GetBaseAge() | |
| 2740 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2741 return (unsigned int)(((__int64)(pParty->uTimePlayed * 0.234375) / 60 / 60 / 24) / 7 / 4 / 12 - uBirthYear + game_starting_year); |
| 0 | 2742 } |
| 2743 | |
| 2744 //----- (0048E72C) -------------------------------------------------------- | |
| 2745 unsigned int Player::GetActualAge() | |
| 2746 { | |
| 2747 return this->sAgeModifier + GetBaseAge(); | |
| 2748 } | |
| 2749 | |
| 2750 //----- (0048E73F) -------------------------------------------------------- | |
| 2751 int Player::GetBaseResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2752 { | |
| 2753 int v7; // esi@20 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2754 int racialBonus = 0; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2755 __int16* resStat; |
|
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 switch (a2) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2758 { |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2759 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2760 resStat = &sResFireBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2761 if (IsRaceGoblin()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2762 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2763 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2764 case CHARACTER_ATTRIBUTE_RESIST_AIR: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2765 resStat = &sResAirBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2766 if (IsRaceGoblin()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2767 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2768 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2769 case CHARACTER_ATTRIBUTE_RESIST_WATER: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2770 resStat = &sResWaterBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2771 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2772 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2773 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2774 case CHARACTER_ATTRIBUTE_RESIST_EARTH: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2775 resStat = &sResEarthBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2776 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2777 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2778 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2779 case CHARACTER_ATTRIBUTE_RESIST_MIND: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2780 resStat = &sResMindBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2781 if (IsRaceElf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2782 racialBonus = 10; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2783 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2784 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2785 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2786 resStat = &sResBodyBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2787 if (IsRaceHuman()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2788 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2789 break; |
| 1783 | 2790 default: |
| 2791 Error("Unknown attribute"); | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2792 } |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2793 v7 = GetItemsBonus(a2) + racialBonus; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2794 return v7 + *resStat; |
| 0 | 2795 } |
| 2796 | |
| 2797 //----- (0048E7D0) -------------------------------------------------------- | |
| 2798 int Player::GetActualResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2799 { | |
|
1597
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2800 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
|
2801 __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
|
2802 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
|
2803 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
|
2804 |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2805 int leatherArmorSkillLevel = GetActualSkillLevel(PLAYER_SKILL_LEATHER); |
| 652 | 2806 if ( CheckHiredNPCSpeciality(Enchanter) ) |
| 0 | 2807 v10 = 20; |
| 2808 if ( (a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE | |
| 2809 || a2 == CHARACTER_ATTRIBUTE_RESIST_AIR | |
| 2810 || a2 == CHARACTER_ATTRIBUTE_RESIST_WATER | |
| 2811 || 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
|
2812 && SkillToMastery(leatherArmorSkillLevel) == 4 |
| 0 | 2813 && HasItemEquipped(EQUIP_ARMOUR) |
| 2814 && 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
|
2815 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
|
2816 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
|
2817 { |
| 1783 | 2818 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
| 2819 resStat = &sResFireBonus; | |
| 2820 break; | |
| 2821 case CHARACTER_ATTRIBUTE_RESIST_AIR: | |
| 2822 resStat = &sResAirBonus; | |
| 2823 break; | |
| 2824 case CHARACTER_ATTRIBUTE_RESIST_WATER: | |
| 2825 resStat = &sResWaterBonus; | |
| 2826 break; | |
| 2827 case CHARACTER_ATTRIBUTE_RESIST_EARTH: | |
| 2828 resStat = &sResEarthBonus; | |
| 2829 break; | |
| 2830 case CHARACTER_ATTRIBUTE_RESIST_MIND: | |
| 2831 resStat = &sResMindBonus; | |
| 2832 break; | |
| 2833 case CHARACTER_ATTRIBUTE_RESIST_BODY: | |
| 2834 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: | |
| 2835 resStat = &sResBodyBonus; | |
| 2836 break; | |
| 2837 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
|
2838 } |
|
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
|
2839 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
|
2840 result = v10 + GetMagicalBonus(a2) + baseRes + *(resStat); |
| 0 | 2841 return result; |
| 2842 } | |
| 2843 | |
| 2844 //----- (0048E8F5) -------------------------------------------------------- | |
| 816 | 2845 bool Player::Recover(int dt) |
| 2846 { | |
|
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
|
2847 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
|
2848 |
|
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
|
2849 v3 = (int)(dt * GetSpecialItemBonus(17) * 0.01 + dt); |
| 816 | 2850 |
|
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
|
2851 //Log::Warning(L"Recover(dt = %u/%u - %u", dt, (uint)v3, (uint)uTimeToRecovery); |
| 816 | 2852 |
| 2853 if (uTimeToRecovery > v3) | |
| 2854 { | |
| 2855 uTimeToRecovery -= v3; | |
| 2856 return true; | |
| 0 | 2857 } |
| 2858 else | |
| 2859 { | |
| 816 | 2860 uTimeToRecovery = 0; |
| 2861 viewparams->bRedrawGameUI = true; | |
| 2862 if (!uActiveCharacter) | |
| 0 | 2863 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 2864 return false; |
| 2865 } | |
| 0 | 2866 } |
| 2867 | |
| 2868 //----- (0048E96A) -------------------------------------------------------- | |
| 816 | 2869 void Player::SetRecoveryTime(signed int rec) |
| 2870 { | |
| 1545 | 2871 Assert(rec >= 0); |
| 816 | 2872 |
| 2873 if (rec > uTimeToRecovery) | |
| 2874 uTimeToRecovery = rec; | |
| 2875 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2876 if (uActiveCharacter != 0 && pPlayers[uActiveCharacter] == this && !some_active_character) |
| 0 | 2877 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 2878 |
| 2879 viewparams->bRedrawGameUI = true; | |
| 0 | 2880 } |
| 2881 // 50C0C4: using guessed type int some_active_character; | |
| 2882 | |
| 2883 //----- (0048E9B7) -------------------------------------------------------- | |
| 2884 void Player::RandomizeName() | |
| 2885 { | |
| 2886 if (!uExpressionTimePassed) | |
| 2887 strcpy(pName, pNPCStats->pNPCNames[rand() % pNPCStats->uNumNPCNames[uSex]][uSex]); | |
| 2888 } | |
| 2889 | |
| 2890 //----- (0048E9F4) -------------------------------------------------------- | |
| 2891 unsigned int Player::GetMajorConditionIdx() | |
| 2892 { | |
| 2893 for (uint i = 0; i < 18; ++i) | |
| 2894 if (pConditions[pConditionImportancyTable[i]] != 0) | |
| 2895 return pConditionImportancyTable[i]; | |
| 2896 | |
| 2897 return 18; | |
| 2898 } | |
| 2899 | |
| 2900 //----- (0048EA1B) -------------------------------------------------------- | |
| 1036 | 2901 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
|
2902 { |
| 1036 | 2903 int i; // eax@1 |
| 2904 i = 0; | |
| 2905 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
|
2906 { |
|
33a82b36c3e8
Player::GetActualResistance cleaned up, some minor changes in Player::Recover, _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus
Grumpy7
parents:
1595
diff
changeset
|
2907 if (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
|
2908 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
|
2909 ++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
|
2910 } |
| 1036 | 2911 return parameter_to_bonus_value[i]; |
| 0 | 2912 } |
| 2913 | |
| 2914 //----- (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
|
2915 int Player::GetSpecialItemBonus( int enchantmentId ) |
| 0 | 2916 { |
| 1989 | 2917 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
|
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 ( 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
|
2920 { |
|
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
|
2921 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
|
2922 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2923 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
|
2924 return 50; |
| 1032 | 2925 } |
|
1598
11bb463837b1
_48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus, forgot to commit actor.cpp
Grumpy7
parents:
1597
diff
changeset
|
2926 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
|
2927 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2928 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
|
2929 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
|
2930 } |
|
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
|
2931 } |
|
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
|
2932 } |
| 1032 | 2933 return 0; |
| 0 | 2934 } |
| 2935 | |
| 2936 //----- (0048EAAE) -------------------------------------------------------- | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2937 int Player::GetItemsBonus( enum CHARACTER_ATTRIBUTE_TYPE attr, bool getOnlyMainHandDmg /*= false*/ ) |
| 0 | 2938 { |
| 2939 int v5; // edi@1 | |
| 2940 int v9; // eax@49 | |
| 2941 int v14; // ecx@58 | |
| 2942 int v15; // eax@58 | |
| 2943 int v17; // eax@62 | |
| 2944 int v22; // eax@76 | |
| 2945 int v25; // ecx@80 | |
| 2946 int v26; // edi@80 | |
| 2947 int v32; // eax@98 | |
| 2948 int v56; // eax@365 | |
| 2949 signed int v58; // [sp-4h] [bp-20h]@10 | |
| 2950 int v61; // [sp+10h] [bp-Ch]@1 | |
| 2951 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
|
2952 ItemGen *currEquippedItem; // [sp+20h] [bp+4h]@101 |
| 1040 | 2953 bool no_skills; |
| 0 | 2954 |
| 2955 v5 = 0; | |
| 2956 v62 = 0; | |
| 2957 v61 = 0; | |
| 1040 | 2958 |
| 2959 no_skills=false; | |
| 0 | 2960 switch (attr) |
| 1599 | 2961 { |
| 2962 case CHARACTER_ATTRIBUTE_SKILL_ALCHEMY: v58 = PLAYER_SKILL_ALCHEMY; break; | |
| 2963 case CHARACTER_ATTRIBUTE_SKILL_STEALING: v58 = PLAYER_SKILL_STEALING; break; | |
| 2964 case CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM: v58 = PLAYER_SKILL_TRAP_DISARM; break; | |
| 2965 case CHARACTER_ATTRIBUTE_SKILL_ITEM_ID: v58 = PLAYER_SKILL_ITEM_ID; break; | |
| 2966 case CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID: v58 = PLAYER_SKILL_MONSTER_ID; break; | |
| 2967 case CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER: v58 = PLAYER_SKILL_ARMSMASTER; break; | |
| 2968 case CHARACTER_ATTRIBUTE_SKILL_DODGE: v58 = PLAYER_SKILL_DODGE; break; | |
| 2969 case CHARACTER_ATTRIBUTE_SKILL_UNARMED: v58 = PLAYER_SKILL_UNARMED; break; | |
| 2970 case CHARACTER_ATTRIBUTE_SKILL_FIRE: v58 = PLAYER_SKILL_FIRE; break; | |
| 2971 case CHARACTER_ATTRIBUTE_SKILL_AIR: v58 = PLAYER_SKILL_AIR; break; | |
| 2972 case CHARACTER_ATTRIBUTE_SKILL_WATER: v58 = PLAYER_SKILL_WATER; break; | |
| 2973 case CHARACTER_ATTRIBUTE_SKILL_EARTH: v58 = PLAYER_SKILL_EARTH; break; | |
| 2974 case CHARACTER_ATTRIBUTE_SKILL_SPIRIT: v58 = PLAYER_SKILL_SPIRIT; break; | |
| 2975 case CHARACTER_ATTRIBUTE_SKILL_MIND: v58 = PLAYER_SKILL_MIND; break; | |
| 2976 case CHARACTER_ATTRIBUTE_SKILL_BODY: v58 = PLAYER_SKILL_BODY; break; | |
| 2977 case CHARACTER_ATTRIBUTE_SKILL_LIGHT: v58 = PLAYER_SKILL_LIGHT; break; | |
| 2978 case CHARACTER_ATTRIBUTE_SKILL_DARK: v58 = PLAYER_SKILL_DARK; break; | |
| 2979 case CHARACTER_ATTRIBUTE_SKILL_MEDITATION: v58 = PLAYER_SKILL_MEDITATION; break; | |
| 2980 case CHARACTER_ATTRIBUTE_SKILL_BOW: v58 = PLAYER_SKILL_BOW; break; | |
| 2981 case CHARACTER_ATTRIBUTE_SKILL_SHIELD: v58 = PLAYER_SKILL_SHIELD; break; | |
| 2982 case CHARACTER_ATTRIBUTE_SKILL_LEARNING: v58 = PLAYER_SKILL_LEARNING; break; | |
| 2983 default: | |
| 1040 | 2984 no_skills=true; |
| 1599 | 2985 } |
| 1040 | 2986 if (!no_skills) |
| 1599 | 2987 { |
| 2988 if ( !this->pActiveSkills[v58] ) | |
| 2989 return 0; | |
| 2990 } | |
| 1040 | 2991 |
|
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
|
2992 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
|
2993 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
2994 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
|
2995 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: |
| 0 | 2996 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
|
2997 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
|
2998 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
|
2999 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
|
3000 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 case CHARACTER_ATTRIBUTE_RANGED_DMG_MIN: |
| 0 | 3002 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
|
3003 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
|
3004 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
|
3005 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
|
3006 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
|
3007 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
|
3008 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 case CHARACTER_ATTRIBUTE_RANGED_DMG_MAX: |
| 0 | 3010 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
|
3011 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
|
3012 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
|
3013 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
|
3014 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
|
3015 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3017 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
|
3018 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
|
3019 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
|
3020 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
|
3021 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3022 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
|
3023 if ( IsUnarmed() ) |
| 0 | 3024 { |
|
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
|
3025 return 3; |
| 0 | 3026 } |
| 3027 else | |
| 3028 { | |
| 1989 | 3029 if ( this->HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 0 | 3030 { |
| 1989 | 3031 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
|
3032 if ( v22 >= 0 && v22 <= 2) |
| 0 | 3033 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3034 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
|
3035 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
|
3036 if ( GetOffHandItem() != nullptr || mainHandItem->GetPlayerSkillType() != 4 ) |
| 0 | 3037 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3038 v25 = mainHandItem->GetDamageDice(); |
| 0 | 3039 } |
| 3040 else | |
| 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 v25 = mainHandItem->GetDamageDice() + 1; |
| 0 | 3043 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3044 v5 = mainHandItem->GetDamageMod() + v25 * v26; |
| 0 | 3045 } |
| 3046 } | |
| 1989 | 3047 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
|
3048 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3049 return v5; |
| 1040 | 3050 } |
|
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
|
3051 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
|
3052 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3053 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
|
3054 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
|
3055 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
|
3056 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
|
3057 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3060 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3062 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
|
3063 if ( IsUnarmed() ) |
| 1040 | 3064 { |
|
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
|
3065 return 0; |
| 1040 | 3066 } |
| 1989 | 3067 if ( this->HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 0 | 3068 { |
| 1989 | 3069 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
|
3070 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
|
3071 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3072 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
|
3073 } |
| 0 | 3074 } |
| 1989 | 3075 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
|
3076 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
|
3077 else |
| 0 | 3078 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3079 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
|
3080 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
|
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 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
|
3083 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3085 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
|
3086 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3087 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
|
3088 } |
| 1989 | 3089 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
|
3090 { |
| 1989 | 3091 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
|
3092 if ( v9 >= 0 && v9 <= 2) |
| 0 | 3093 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3094 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
|
3095 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
|
3096 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
|
3097 if ( GetOffHandItem() == nullptr && mainHandItem->GetPlayerSkillType() == 4) |
| 0 | 3098 { |
|
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
|
3099 ++v5; |
| 0 | 3100 } |
| 3101 } | |
| 3102 } | |
|
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 |
| 1989 | 3104 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
|
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 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
|
3107 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3108 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
|
3109 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3110 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
|
3111 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
|
3112 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
|
3113 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
|
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 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
|
3116 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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_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
|
3118 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
|
3119 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
|
3120 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
|
3121 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
|
3122 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
|
3123 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
|
3124 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
|
3125 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
|
3126 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
|
3127 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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_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
|
3129 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
|
3130 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
|
3131 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
|
3132 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
|
3133 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
|
3134 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
|
3135 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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_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
|
3137 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
|
3138 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
|
3139 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
|
3140 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
|
3141 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
|
3142 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
|
3143 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
|
3144 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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_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
|
3146 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
|
3147 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
|
3148 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
|
3149 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
|
3150 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
|
3151 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
|
3152 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
|
3153 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
|
3154 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
|
3155 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
|
3156 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
|
3157 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
|
3158 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
|
3159 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3160 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 1040 | 3161 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3162 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
|
3163 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
|
3164 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3165 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
|
3166 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
|
3167 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3168 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
|
3169 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3171 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
|
3172 && !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
|
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 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
|
3175 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3176 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
|
3177 { |
| 2156 | 3178 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
|
3179 { |
| 2158 | 3180 if ( attr > CHARACTER_ATTRIBUTE_RESIST_BODY && v5 < currEquippedItem->m_enchantmentStrength )//for skills bonuses |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3181 v5 = currEquippedItem->m_enchantmentStrength; |
| 2159 | 3182 else // for resists and attributes bonuses |
|
1604
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3183 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
|
3184 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3185 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3187 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3188 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
|
3189 } |
| 1040 | 3190 } |
|
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
|
3191 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3192 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
|
3193 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
|
3194 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
|
3195 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
|
3196 } |
| 0 | 3197 } |
| 3198 | |
| 3199 //----- (0048F73C) -------------------------------------------------------- | |
| 3200 int Player::GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 3201 { | |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3202 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
|
3203 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
|
3204 |
| 0 | 3205 switch ( a2 ) |
| 3206 { | |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3207 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3208 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_FIRE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3209 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_FIRE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3210 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3211 case CHARACTER_ATTRIBUTE_RESIST_AIR: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3212 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_AIR].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3213 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_AIR].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3214 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3215 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3216 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_BODY].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3217 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_BODY].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3218 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3219 case CHARACTER_ATTRIBUTE_RESIST_WATER: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3220 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
|
3221 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
|
3222 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3223 case CHARACTER_ATTRIBUTE_RESIST_EARTH: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3224 v3 = this->pPlayerBuffs[PLAYER_BUFF_RESIST_EARTH].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3225 v4 = pParty->pPartyBuffs[PARTY_BUFF_RESIST_EARTH].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3226 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3227 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
|
3228 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
|
3229 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
|
3230 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3231 case CHARACTER_ATTRIBUTE_ATTACK: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3232 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
|
3233 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
|
3234 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3235 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
|
3236 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
|
3237 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
|
3238 break; |
| 0 | 3239 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
|
3240 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
|
3241 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3242 break; |
| 0 | 3243 case CHARACTER_ATTRIBUTE_INTELLIGENCE: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3244 v3 = pPlayerBuffs[PLAYER_BUFF_INTELLIGENCE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3245 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3246 break; |
| 0 | 3247 case CHARACTER_ATTRIBUTE_WILLPOWER: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3248 v3 = pPlayerBuffs[PLAYER_BUFF_WILLPOWER].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3249 v4 = pParty->pPartyBuffs[PARTY_BUFF_DAY_OF_GODS].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3250 break; |
| 0 | 3251 case CHARACTER_ATTRIBUTE_ENDURANCE: |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3252 v3 = pPlayerBuffs[PLAYER_BUFF_ENDURANCE].uPower; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3253 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
|
3254 break; |
| 0 | 3255 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
|
3256 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
|
3257 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
|
3258 break; |
| 0 | 3259 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
|
3260 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
|
3261 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
|
3262 break; |
| 0 | 3263 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
|
3264 v3 = pPlayerBuffs[PLAYER_BUFF_LUCK].uPower; |
| 1167 | 3265 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
|
3266 break; |
| 0 | 3267 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
|
3268 v3 = this->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uPower; |
| 1167 | 3269 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
|
3270 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3271 } |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3272 return v3 + v4; |
| 0 | 3273 } |
| 3274 | |
| 3275 //----- (0048F882) -------------------------------------------------------- | |
| 1008 | 3276 int Player::GetActualSkillLevel( PLAYER_SKILL_TYPE uSkillType ) |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3277 { |
| 1064 | 3278 signed int bonus_value; // esi@1 |
| 3279 unsigned __int16 skill_value; // ax@126 | |
| 3280 int result; // al@127 | |
| 353 | 3281 |
| 1064 | 3282 bonus_value = 0; |
| 353 | 3283 switch (uSkillType) |
| 3284 { | |
| 3285 case PLAYER_SKILL_MONSTER_ID: | |
| 3286 { | |
| 652 | 3287 if ( CheckHiredNPCSpeciality(Hunter) ) |
| 1064 | 3288 bonus_value = 6; |
| 652 | 3289 if ( CheckHiredNPCSpeciality(Sage) ) |
| 1064 | 3290 bonus_value += 6; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3291 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID); |
| 353 | 3292 } |
| 3293 break; | |
| 3294 | |
| 3295 case PLAYER_SKILL_ARMSMASTER: | |
| 3296 { | |
| 652 | 3297 if ( CheckHiredNPCSpeciality(Armsmaster) ) |
| 1064 | 3298 bonus_value = 2; |
| 652 | 3299 if ( CheckHiredNPCSpeciality(Weaponsmaster) ) |
| 1064 | 3300 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3301 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER); |
| 353 | 3302 } |
| 3303 break; | |
| 3304 | |
| 3305 case PLAYER_SKILL_STEALING: | |
| 3306 { | |
| 652 | 3307 if (CheckHiredNPCSpeciality(Burglar)) |
| 1064 | 3308 bonus_value = 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3309 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_STEALING); |
| 353 | 3310 } |
| 3311 break; | |
| 3312 | |
| 3313 | |
| 3314 case PLAYER_SKILL_ALCHEMY: | |
| 3315 { | |
| 652 | 3316 if ( CheckHiredNPCSpeciality(Herbalist) ) |
| 1064 | 3317 bonus_value = 4; |
| 652 | 3318 if ( CheckHiredNPCSpeciality(Apothecary) ) |
| 1064 | 3319 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3320 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ALCHEMY); |
| 353 | 3321 } |
| 3322 break; | |
| 3323 | |
| 3324 case PLAYER_SKILL_LEARNING: | |
| 3325 { | |
| 652 | 3326 if ( CheckHiredNPCSpeciality(Teacher) ) |
| 1064 | 3327 bonus_value = 10; |
| 652 | 3328 if ( CheckHiredNPCSpeciality(Instructor) ) |
| 1064 | 3329 bonus_value += 15; |
| 652 | 3330 if ( CheckHiredNPCSpeciality(Scholar) ) |
| 1064 | 3331 bonus_value += 5; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3332 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LEARNING); |
| 353 | 3333 } |
| 3334 break; | |
| 3335 | |
| 3336 case PLAYER_SKILL_UNARMED: | |
| 3337 { | |
| 652 | 3338 if (CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3339 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3340 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_UNARMED); |
| 353 | 3341 } |
| 3342 break; | |
| 3343 | |
| 3344 case PLAYER_SKILL_DODGE: | |
| 3345 { | |
| 652 | 3346 if ( CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3347 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3348 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DODGE); |
| 353 | 3349 } |
| 3350 break; | |
| 3351 | |
| 3352 case PLAYER_SKILL_BOW: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3353 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BOW); |
| 353 | 3354 break; |
| 3355 case PLAYER_SKILL_SHIELD: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3356 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SHIELD); |
| 353 | 3357 break; |
| 3358 | |
| 3359 case PLAYER_SKILL_EARTH: | |
| 652 | 3360 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3361 bonus_value = 2; |
| 652 | 3362 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3363 bonus_value += 3; |
| 652 | 3364 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3365 bonus_value += 4; |
| 353 | 3366 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3367 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3368 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_EARTH); |
| 353 | 3369 break; |
| 3370 case PLAYER_SKILL_FIRE: | |
| 652 | 3371 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3372 bonus_value = 2; |
| 652 | 3373 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3374 bonus_value += 3; |
| 652 | 3375 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3376 bonus_value += 4; |
| 353 | 3377 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3378 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3379 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_FIRE); |
| 353 | 3380 break; |
| 3381 case PLAYER_SKILL_AIR: | |
| 652 | 3382 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3383 bonus_value = 2; |
| 652 | 3384 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3385 bonus_value += 3; |
| 652 | 3386 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3387 bonus_value += 4; |
| 353 | 3388 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3389 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3390 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_AIR); |
| 353 | 3391 break; |
| 3392 case PLAYER_SKILL_WATER: | |
| 652 | 3393 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3394 bonus_value = 2; |
| 652 | 3395 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3396 bonus_value += 3; |
| 652 | 3397 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3398 bonus_value += 4; |
| 353 | 3399 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3400 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3401 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_WATER); |
| 353 | 3402 break; |
| 3403 case PLAYER_SKILL_SPIRIT: | |
| 652 | 3404 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3405 bonus_value = 2; |
| 652 | 3406 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3407 bonus_value += 3; |
| 652 | 3408 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3409 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3410 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SPIRIT); |
| 353 | 3411 break; |
| 3412 case PLAYER_SKILL_MIND: | |
| 652 | 3413 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3414 bonus_value = 2; |
| 652 | 3415 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3416 bonus_value += 3; |
| 652 | 3417 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3418 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3419 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MIND); |
| 353 | 3420 break; |
| 3421 case PLAYER_SKILL_BODY: | |
| 652 | 3422 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3423 bonus_value = 2; |
| 652 | 3424 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3425 bonus_value += 3; |
| 652 | 3426 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3427 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3428 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BODY); |
| 353 | 3429 break; |
| 3430 case PLAYER_SKILL_LIGHT: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3431 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LIGHT); |
| 353 | 3432 break; |
| 3433 case PLAYER_SKILL_DARK: | |
| 3434 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3435 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DARK); |
| 353 | 3436 } |
| 3437 break; | |
| 3438 | |
| 3439 case PLAYER_SKILL_MERCHANT: | |
| 3440 { | |
| 652 | 3441 if ( CheckHiredNPCSpeciality(Trader) ) |
| 1064 | 3442 bonus_value = 4; |
| 652 | 3443 if ( CheckHiredNPCSpeciality(Merchant) ) |
| 1064 | 3444 bonus_value += 6; |
| 652 | 3445 if ( CheckHiredNPCSpeciality(Gypsy) ) |
| 1064 | 3446 bonus_value += 3; |
| 652 | 3447 if ( CheckHiredNPCSpeciality(Duper) ) |
| 1064 | 3448 bonus_value += 8; |
| 353 | 3449 } |
| 3450 break; | |
| 3451 | |
| 3452 case PLAYER_SKILL_PERCEPTION: | |
| 3453 { | |
| 652 | 3454 if ( CheckHiredNPCSpeciality(Scout) ) |
| 1064 | 3455 bonus_value = 6; |
| 652 | 3456 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1064 | 3457 bonus_value += 5; |
| 353 | 3458 } |
| 3459 break; | |
| 3460 | |
| 0 | 3461 case PLAYER_SKILL_ITEM_ID: |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3462 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ITEM_ID); |
| 0 | 3463 break; |
| 3464 case PLAYER_SKILL_MEDITATION: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3465 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MEDITATION); |
| 353 | 3466 break; |
| 0 | 3467 case PLAYER_SKILL_TRAP_DISARM: |
| 353 | 3468 { |
| 652 | 3469 if ( CheckHiredNPCSpeciality(Tinker) ) |
| 1064 | 3470 bonus_value = 4; |
| 652 | 3471 if ( CheckHiredNPCSpeciality(Locksmith) ) |
| 1064 | 3472 bonus_value += 6; |
| 652 | 3473 if ( CheckHiredNPCSpeciality(Burglar) ) |
| 1064 | 3474 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3475 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM); |
| 353 | 3476 } |
| 3477 break; | |
| 3478 } | |
| 3479 | |
| 1064 | 3480 skill_value = pActiveSkills[uSkillType]; |
| 3481 if ( bonus_value + (skill_value & 0x3F) < 60 ) | |
| 3482 result = bonus_value + skill_value; | |
| 0 | 3483 else |
| 1064 | 3484 result = skill_value & 0xFFFC | 0x3C; //al |
| 0 | 3485 return result; |
| 3486 } | |
| 3487 | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3488 |
| 0 | 3489 //----- (0048FC00) -------------------------------------------------------- |
| 1538 | 3490 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
|
3491 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3492 int armsMasterBonus; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3493 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3494 armsMasterBonus = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3495 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
|
3496 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
|
3497 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3498 int multiplier = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3499 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
|
3500 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3501 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
|
3502 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3503 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
|
3504 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3505 multiplier = GetMultiplierForSkillLevel(armmaster_skill, 0, 1, 1, 2); |
| 1064 | 3506 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3507 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
|
3508 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3509 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3510 switch(inSkill) |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3511 { |
|
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
|
3512 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
|
3513 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
|
3514 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 int bowSkillLevel = GetActualSkillLevel(PLAYER_SKILL_DODGE); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3516 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
|
3517 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
|
3518 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3519 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
|
3520 break; |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3521 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
|
3522 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 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
|
3524 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
|
3525 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
|
3526 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3527 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3528 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
|
3529 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 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
|
3531 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
|
3532 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
|
3533 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3534 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3535 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
|
3536 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 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
|
3538 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
|
3539 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
|
3540 |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3541 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
|
3542 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3543 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
|
3544 if (currItem != nullptr && (!currItem->IsBroken())) |
| 1538 | 3545 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3546 PLAYER_SKILL_TYPE itemSkillType = (PLAYER_SKILL_TYPE)currItem->GetPlayerSkillType(); |
| 1976 | 3547 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
|
3548 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
|
3549 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
|
3550 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3551 case PLAYER_SKILL_STAFF: |
| 1976 | 3552 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3553 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
|
3554 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
|
3555 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
|
3556 case PLAYER_SKILL_SPEAR: |
| 1976 | 3557 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3558 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
|
3559 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
|
3560 case PLAYER_SKILL_SHIELD: |
| 1976 | 3561 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
|
3562 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3563 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
|
3564 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
|
3565 case PLAYER_SKILL_LEATHER: |
| 1976 | 3566 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
|
3567 wearingLeather = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3568 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
|
3569 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
|
3570 case PLAYER_SKILL_CHAIN: |
| 1976 | 3571 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
|
3572 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3573 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
|
3574 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
|
3575 case PLAYER_SKILL_PLATE: |
| 1976 | 3576 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
|
3577 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3578 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
|
3579 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
|
3580 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 ACSum += multiplier * (currArmorSkillLevel & 0x3F); |
| 1538 | 3582 } |
|
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
|
3583 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3585 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
|
3586 int dodgeMastery = SkillToMastery(dodgeSkillLevel); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3587 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
|
3588 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
|
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 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
|
3591 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3592 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
|
3593 } |
| 1538 | 3594 break; |
| 3595 case CHARACTER_ATTRIBUTE_ATTACK: | |
| 3596 if ( this->IsUnarmed() ) | |
| 3597 { | |
| 3598 int unarmedSkill = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3599 if (!unarmedSkill) | |
| 3600 { | |
| 3601 return 0; | |
| 3602 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3603 int multiplier = GetMultiplierForSkillLevel(unarmedSkill, 0, 1, 2, 2); |
| 1538 | 3604 return armsMasterBonus + multiplier * (unarmedSkill & 0x3F); |
| 3605 } | |
| 3606 for (int i = 0; i < 16; ++i) | |
| 3607 { | |
| 3608 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3609 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3610 ItemGen* currItem = GetNthEquippedIndexItem(i); |
| 1989 | 3611 if ( currItem->GetItemEquipType() <= EQUIP_TWO_HANDED) |
| 1533 | 3612 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3613 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItem->GetPlayerSkillType(); |
| 1538 | 3614 int currentItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 3615 if (currItemSkillType == PLAYER_SKILL_BLASTER) | |
| 3616 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3617 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); |
| 1538 | 3618 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3619 } | |
| 3620 else if (currItemSkillType == PLAYER_SKILL_STAFF && this->GetActualSkillLevel(PLAYER_SKILL_UNARMED) > 0) | |
| 3621 { | |
| 3622 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
|
3623 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 2, 2); |
| 1538 | 3624 return multiplier * (unarmedSkillLevel & 0x3F) + armsMasterBonus + (currentItemSkillLevel & 0x3F); |
| 3625 } | |
| 3626 else | |
| 3627 { | |
| 3628 return armsMasterBonus + (currentItemSkillLevel & 0x3F); | |
| 3629 } | |
| 3630 } | |
| 3631 } | |
| 3632 } | |
| 3633 return 0; | |
| 3634 break; | |
| 3635 | |
| 3636 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: | |
| 3637 for (int i = 0; i < 16; i++) | |
| 3638 { | |
| 3639 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3640 { | |
| 2068 | 3641 ItemGen* currItemPtr = GetNthEquippedIndexItem(i); |
| 3642 if ( currItemPtr->GetItemEquipType() == EQUIP_TWO_HANDED || currItemPtr->GetItemEquipType() == EQUIP_SINGLE_HANDED ) | |
| 1538 | 3643 { |
| 2068 | 3644 PLAYER_SKILL_TYPE currentItemSkillType = (PLAYER_SKILL_TYPE)GetNthEquippedIndexItem(i)->GetPlayerSkillType(); |
| 3645 int currentItemSkillLevel = this->GetActualSkillLevel(currentItemSkillType); | |
| 3646 if ( currentItemSkillType == PLAYER_SKILL_BOW ) | |
| 3647 { | |
| 3648 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 1, 1); | |
| 3649 return multiplier * (currentItemSkillLevel & 0x3F); | |
| 3650 } | |
| 3651 else if ( currentItemSkillType == PLAYER_SKILL_BLASTER ) | |
| 3652 { | |
| 3653 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); | |
| 3654 return multiplier * (currentItemSkillLevel & 0x3F); | |
| 3655 } | |
| 1538 | 3656 } |
| 3657 } | |
| 3658 } | |
| 3659 return 0; | |
| 3660 break; | |
| 3661 | |
| 3662 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: | |
| 3663 if ( this->IsUnarmed() ) | |
| 3664 { | |
| 3665 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3666 if ( !unarmedSkillLevel ) | |
| 3667 { | |
| 3668 return 0; | |
| 3669 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3670 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 3671 return multiplier * (unarmedSkillLevel & 0x3F); |
| 3672 } | |
| 3673 for (int i = 0; i < 16; i++) | |
| 3674 { | |
| 3675 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3676 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3677 ItemGen* currItemPtr = GetNthEquippedIndexItem(i); |
| 1989 | 3678 if ( currItemPtr->GetItemEquipType() == EQUIP_TWO_HANDED || currItemPtr->GetItemEquipType() == EQUIP_SINGLE_HANDED ) |
| 1538 | 3679 { |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
3680 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItemPtr->GetPlayerSkillType(); |
| 1538 | 3681 int currItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 3682 int baseSkillBonus; | |
| 3683 int multiplier; | |
| 3684 switch (currItemSkillType) | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3685 { |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3686 case PLAYER_SKILL_STAFF: |
| 1538 | 3687 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
|
3688 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3689 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
|
3690 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 3691 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
|
3692 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3693 else |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3694 { |
| 1538 | 3695 return armsMasterBonus; |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3696 } |
| 1538 | 3697 break; |
| 3698 | |
| 3699 case PLAYER_SKILL_DAGGER: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3700 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 1); |
| 1538 | 3701 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3702 return armsMasterBonus + baseSkillBonus; | |
| 3703 break; | |
| 3704 case PLAYER_SKILL_SWORD: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3705 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 0); |
| 1538 | 3706 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3707 return armsMasterBonus + baseSkillBonus; | |
| 3708 break; | |
| 3709 case PLAYER_SKILL_MACE: | |
| 3710 case PLAYER_SKILL_SPEAR: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3711 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 1, 1, 1); |
| 1538 | 3712 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3713 return armsMasterBonus + baseSkillBonus; | |
| 3714 break; | |
| 3715 case PLAYER_SKILL_AXE: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3716 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 1, 1); |
| 1538 | 3717 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3718 return armsMasterBonus + baseSkillBonus; | |
| 3719 break; | |
| 1535 | 3720 } |
| 1533 | 3721 } |
| 1535 | 3722 } |
| 1538 | 3723 } |
| 3724 return 0; | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3725 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3726 default: |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3727 return 0; |
| 1533 | 3728 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3729 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3730 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3731 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
|
3732 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3733 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
|
3734 switch (masteryLvl) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3735 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3736 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
|
3737 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
|
3738 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
|
3739 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
|
3740 } |
| 1545 | 3741 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
|
3742 return 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3743 } |
| 0 | 3744 //----- (00490109) -------------------------------------------------------- |
| 3745 // faces are: 0 1 2 3 human males | |
| 3746 // 4 5 6 7 human females | |
| 3747 // 8 9 elf males | |
| 3748 // 10 11 elf females | |
| 3749 // 12 13 dwarf males | |
| 3750 // 14 15 dwarf females | |
| 3751 // 16 17 goblin males | |
| 3752 // 18 19 goblin females | |
| 3753 // 20 lich male | |
| 3754 // 21 lich female | |
| 3755 // 22 underwater suits (unused) | |
| 3756 // 23 zombie male | |
| 3757 // 24 zombie female | |
| 3758 enum CHARACTER_RACE Player::GetRace() | |
| 3759 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3760 if ( uCurrentFace <= 7 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3761 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3762 return CHARACTER_RACE_HUMAN; |
|
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 else if ( uCurrentFace <= 11 ) |
|
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 return CHARACTER_RACE_ELF; |
|
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 else if ( uCurrentFace <= 15 ) |
|
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 return CHARACTER_RACE_DWARF; |
|
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 else if ( uCurrentFace <= 19 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3773 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3774 return CHARACTER_RACE_GOBLIN; |
| 0 | 3775 } |
| 3776 else | |
| 3777 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3778 return CHARACTER_RACE_HUMAN; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3779 } |
| 0 | 3780 } |
| 3781 | |
| 3782 //----- (00490141) -------------------------------------------------------- | |
| 187 | 3783 PLAYER_SEX Player::GetSexByVoice() |
| 0 | 3784 { |
| 3785 switch ( this->uVoiceID ) | |
| 3786 { | |
| 3787 case 0u: | |
| 3788 case 1u: | |
| 3789 case 2u: | |
| 3790 case 3u: | |
| 3791 case 8u: | |
| 3792 case 9u: | |
| 3793 case 0xCu: | |
| 3794 case 0xDu: | |
| 3795 case 0x10u: | |
| 3796 case 0x11u: | |
| 3797 case 0x14u: | |
| 3798 case 0x17u: | |
| 187 | 3799 return SEX_MALE; |
| 3800 | |
| 0 | 3801 case 4u: |
| 3802 case 5u: | |
| 3803 case 6u: | |
| 3804 case 7u: | |
| 3805 case 0xAu: | |
| 3806 case 0xBu: | |
| 3807 case 0xEu: | |
| 3808 case 0xFu: | |
| 3809 case 0x12u: | |
| 3810 case 0x13u: | |
| 3811 case 0x15u: | |
| 3812 case 0x18u: | |
| 187 | 3813 return SEX_FEMALE; |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3814 } |
| 1545 | 3815 Error("(%u)", this->uVoiceID); |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3816 return SEX_MALE; |
| 0 | 3817 } |
| 3818 | |
| 3819 //----- (00490188) -------------------------------------------------------- | |
| 3820 void Player::SetInitialStats() | |
| 3821 { | |
| 1980 | 3822 CHARACTER_RACE v1 = GetRace(); |
| 290 | 3823 uMight = StatTable[v1][0].uBaseValue; |
| 3824 uIntelligence = StatTable[v1][1].uBaseValue; | |
| 3825 uWillpower = StatTable[v1][2].uBaseValue; | |
| 3826 uEndurance = StatTable[v1][3].uBaseValue; | |
| 3827 uAccuracy = StatTable[v1][4].uBaseValue; | |
| 3828 uSpeed = StatTable[v1][5].uBaseValue; | |
| 3829 uLuck = StatTable[v1][6].uBaseValue; | |
| 0 | 3830 } |
| 3831 | |
| 3832 //----- (004901FC) -------------------------------------------------------- | |
| 1021 | 3833 void Player::SetSexByVoice() |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3834 { |
| 1021 | 3835 switch ( this->uVoiceID) |
| 0 | 3836 { |
| 3837 case 0: | |
| 3838 case 1: | |
| 3839 case 2: | |
| 3840 case 3: | |
| 3841 case 8: | |
| 3842 case 9: | |
| 3843 case 0xC: | |
| 3844 case 0xD: | |
| 3845 case 0x10: | |
| 3846 case 0x11: | |
| 3847 case 0x14: | |
| 3848 case 0x17: | |
| 1021 | 3849 this->uSex = SEX_MALE; |
| 0 | 3850 break; |
| 3851 case 4: | |
| 3852 case 5: | |
| 3853 case 6: | |
| 3854 case 7: | |
| 3855 case 0xA: | |
| 3856 case 0xB: | |
| 3857 case 0xE: | |
| 3858 case 0xF: | |
| 3859 case 0x12: | |
| 3860 case 0x13: | |
| 3861 case 0x15: | |
| 3862 case 0x18: | |
| 1021 | 3863 this->uSex = SEX_FEMALE; |
| 0 | 3864 break; |
| 3865 default: | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3866 Error("(%u)", this->uVoiceID); |
| 0 | 3867 break; |
| 3868 } | |
| 1021 | 3869 |
| 0 | 3870 } |
| 3871 | |
| 3872 //----- (0049024A) -------------------------------------------------------- | |
| 135 | 3873 void Player::Reset(PLAYER_CLASS_TYPE cls) |
| 0 | 3874 { |
| 3875 sLevelModifier = 0; | |
| 3876 sAgeModifier = 0; | |
| 3877 | |
| 135 | 3878 classType = cls; |
| 0 | 3879 uLuckBonus = 0; |
| 3880 uSpeedBonus = 0; | |
| 3881 uAccuracyBonus = 0; | |
| 3882 uEnduranceBonus = 0; | |
| 3883 uWillpowerBonus = 0; | |
| 3884 uIntelligenceBonus = 0; | |
| 3885 uMightBonus = 0; | |
| 3886 uLevel = 1; | |
| 3887 uExperience = 251 + rand() % 100; | |
| 3888 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
|
3889 pActiveSkills.fill(0); |
|
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
3890 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
|
3891 memset(&spellbook, 0, sizeof(spellbook)); |
| 0 | 3892 |
| 3893 for (uint i = 0; i < 37; ++i) | |
| 3894 { | |
| 135 | 3895 if (pSkillAvailabilityPerClass[classType / 4][i] != 2) |
| 0 | 3896 continue; |
| 3897 | |
| 3898 pActiveSkills[i] = 1; | |
| 3899 | |
| 3900 switch (i) | |
| 3901 { | |
| 886 | 3902 case PLAYER_SKILL_FIRE: |
| 3903 spellbook.pFireSpellbook.bIsSpellAvailable[0] = true;//its temporary, for test spells | |
| 894 | 3904 |
| 3905 extern bool all_magic; | |
| 3906 if ( all_magic == true ) | |
| 3907 { | |
| 3908 pActiveSkills[PLAYER_SKILL_AIR] = 1; | |
| 3909 pActiveSkills[PLAYER_SKILL_WATER] = 1; | |
| 3910 pActiveSkills[PLAYER_SKILL_EARTH] = 1; | |
| 3911 spellbook.pFireSpellbook.bIsSpellAvailable[1] = true; | |
| 3912 spellbook.pFireSpellbook.bIsSpellAvailable[2] = true; | |
| 3913 spellbook.pFireSpellbook.bIsSpellAvailable[3] = true; | |
| 3914 spellbook.pFireSpellbook.bIsSpellAvailable[4] = true; | |
| 3915 spellbook.pFireSpellbook.bIsSpellAvailable[5] = true; | |
| 3916 spellbook.pFireSpellbook.bIsSpellAvailable[6] = true; | |
| 3917 spellbook.pFireSpellbook.bIsSpellAvailable[7] = true; | |
| 3918 spellbook.pFireSpellbook.bIsSpellAvailable[8] = true; | |
| 3919 spellbook.pFireSpellbook.bIsSpellAvailable[9] = true; | |
| 3920 spellbook.pFireSpellbook.bIsSpellAvailable[10] = true; | |
| 886 | 3921 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; |
| 569 | 3922 spellbook.pAirSpellbook.bIsSpellAvailable[1] = true; |
| 3923 spellbook.pAirSpellbook.bIsSpellAvailable[2] = true; | |
| 3924 spellbook.pAirSpellbook.bIsSpellAvailable[3] = true; | |
| 3925 spellbook.pAirSpellbook.bIsSpellAvailable[4] = true; | |
| 3926 spellbook.pAirSpellbook.bIsSpellAvailable[5] = true; | |
| 3927 spellbook.pAirSpellbook.bIsSpellAvailable[6] = true; | |
| 3928 spellbook.pAirSpellbook.bIsSpellAvailable[7] = true; | |
| 3929 spellbook.pAirSpellbook.bIsSpellAvailable[8] = true; | |
| 3930 spellbook.pAirSpellbook.bIsSpellAvailable[9] = true; | |
| 3931 spellbook.pAirSpellbook.bIsSpellAvailable[10] = true; | |
| 3932 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 3933 spellbook.pWaterSpellbook.bIsSpellAvailable[1] = true; | |
| 3934 spellbook.pWaterSpellbook.bIsSpellAvailable[2] = true; | |
| 3935 spellbook.pWaterSpellbook.bIsSpellAvailable[3] = true; | |
| 3936 spellbook.pWaterSpellbook.bIsSpellAvailable[4] = true; | |
| 3937 spellbook.pWaterSpellbook.bIsSpellAvailable[5] = true; | |
| 710 | 3938 spellbook.pWaterSpellbook.bIsSpellAvailable[6] = true; |
| 3939 spellbook.pWaterSpellbook.bIsSpellAvailable[7] = true; | |
| 3940 spellbook.pWaterSpellbook.bIsSpellAvailable[8] = true; | |
| 886 | 3941 spellbook.pWaterSpellbook.bIsSpellAvailable[9] = true; |
| 3942 spellbook.pWaterSpellbook.bIsSpellAvailable[10] = true; | |
| 894 | 3943 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; |
| 3944 spellbook.pEarthSpellbook.bIsSpellAvailable[1] = true; | |
| 3945 spellbook.pEarthSpellbook.bIsSpellAvailable[2] = true; | |
| 3946 spellbook.pEarthSpellbook.bIsSpellAvailable[3] = true; | |
| 3947 spellbook.pEarthSpellbook.bIsSpellAvailable[4] = true; | |
| 3948 spellbook.pEarthSpellbook.bIsSpellAvailable[5] = true; | |
| 3949 spellbook.pEarthSpellbook.bIsSpellAvailable[6] = true; | |
| 3950 spellbook.pEarthSpellbook.bIsSpellAvailable[7] = true; | |
| 3951 spellbook.pEarthSpellbook.bIsSpellAvailable[8] = true; | |
| 3952 spellbook.pEarthSpellbook.bIsSpellAvailable[9] = true; | |
| 3953 spellbook.pEarthSpellbook.bIsSpellAvailable[10] = true; | |
| 3954 } | |
| 486 | 3955 break; |
| 886 | 3956 case PLAYER_SKILL_AIR: |
| 3957 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; | |
| 3958 break; | |
| 3959 case PLAYER_SKILL_WATER: | |
| 3960 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 3961 break; | |
| 3962 case PLAYER_SKILL_EARTH: | |
| 3963 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; | |
| 3964 break; | |
| 3965 case PLAYER_SKILL_SPIRIT: | |
| 3966 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; | |
| 3967 break; | |
| 3968 case PLAYER_SKILL_MIND: | |
| 3969 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; | |
| 3970 break; | |
| 3971 case PLAYER_SKILL_BODY: | |
| 3972 spellbook.pBodySpellbook.bIsSpellAvailable[0] = true; | |
| 894 | 3973 |
| 3974 if ( all_magic == true ) | |
| 3975 { | |
| 3976 pActiveSkills[PLAYER_SKILL_MIND] = 1; | |
| 3977 pActiveSkills[PLAYER_SKILL_SPIRIT] = 1; | |
| 3978 spellbook.pBodySpellbook.bIsSpellAvailable[1] = true; | |
| 3979 spellbook.pBodySpellbook.bIsSpellAvailable[2] = true; | |
| 3980 spellbook.pBodySpellbook.bIsSpellAvailable[3] = true; | |
| 3981 spellbook.pBodySpellbook.bIsSpellAvailable[4] = true; | |
| 3982 spellbook.pBodySpellbook.bIsSpellAvailable[5] = true; | |
| 3983 spellbook.pBodySpellbook.bIsSpellAvailable[6] = true; | |
| 3984 spellbook.pBodySpellbook.bIsSpellAvailable[7] = true; | |
| 3985 spellbook.pBodySpellbook.bIsSpellAvailable[8] = true; | |
| 3986 spellbook.pBodySpellbook.bIsSpellAvailable[9] = true; | |
| 3987 spellbook.pBodySpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 3988 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 3989 spellbook.pMindSpellbook.bIsSpellAvailable[1] = true; |
| 3990 spellbook.pMindSpellbook.bIsSpellAvailable[2] = true; | |
| 3991 spellbook.pMindSpellbook.bIsSpellAvailable[3] = true; | |
| 3992 spellbook.pMindSpellbook.bIsSpellAvailable[4] = true; | |
| 3993 spellbook.pMindSpellbook.bIsSpellAvailable[5] = true; | |
| 3994 spellbook.pMindSpellbook.bIsSpellAvailable[6] = true; | |
| 3995 spellbook.pMindSpellbook.bIsSpellAvailable[7] = true; | |
| 3996 spellbook.pMindSpellbook.bIsSpellAvailable[8] = true; | |
| 3997 spellbook.pMindSpellbook.bIsSpellAvailable[9] = true; | |
| 3998 spellbook.pMindSpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 3999 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 4000 spellbook.pSpiritSpellbook.bIsSpellAvailable[1] = true; |
| 4001 spellbook.pSpiritSpellbook.bIsSpellAvailable[2] = true; | |
| 4002 spellbook.pSpiritSpellbook.bIsSpellAvailable[3] = true; | |
| 4003 spellbook.pSpiritSpellbook.bIsSpellAvailable[4] = true; | |
| 4004 spellbook.pSpiritSpellbook.bIsSpellAvailable[5] = true; | |
| 4005 spellbook.pSpiritSpellbook.bIsSpellAvailable[6] = true; | |
| 4006 spellbook.pSpiritSpellbook.bIsSpellAvailable[7] = true; | |
| 4007 spellbook.pSpiritSpellbook.bIsSpellAvailable[8] = true; | |
| 4008 spellbook.pSpiritSpellbook.bIsSpellAvailable[9] = true; | |
| 4009 spellbook.pSpiritSpellbook.bIsSpellAvailable[10] = true; | |
| 4010 } | |
| 569 | 4011 break; |
| 886 | 4012 case PLAYER_SKILL_LIGHT: |
| 4013 spellbook.pLightSpellbook.bIsSpellAvailable[0] = true; | |
| 4014 break; | |
| 4015 case PLAYER_SKILL_DARK: | |
| 4016 spellbook.pDarkSpellbook.bIsSpellAvailable[0] = true; | |
| 4017 break; | |
| 0 | 4018 } |
| 4019 } | |
| 4020 | |
| 2191 | 4021 memset(&pEquipment, 0, sizeof(PlayerEquipment)); |
| 4022 pInventoryMatrix.fill(0); | |
| 4023 for (uint i = 0; i < 126; ++i) | |
| 4024 pInventoryItemList[i].Reset(); | |
| 4025 for (uint i = 0; i < 12; ++i) | |
| 4026 pEquippedItems[i].Reset(); | |
| 4027 | |
| 0 | 4028 sHealth = GetMaxHealth(); |
| 4029 sMana = GetMaxMana(); | |
| 4030 } | |
| 4031 | |
| 4032 //----- (004903C9) -------------------------------------------------------- | |
| 821 | 4033 PLAYER_SKILL_TYPE Player::GetSkillIdxByOrder(signed int order) |
| 4034 { | |
|
1271
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4035 int counter; // edx@5 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4036 bool canBeInactive; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4037 unsigned char requiredValue; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4038 signed int offset; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4039 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4040 if ( order <= 1 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4041 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4042 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4043 requiredValue = 2; // 2 - primary skill |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4044 offset = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4045 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4046 else if ( order <= 3 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4047 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4048 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4049 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4050 offset = 2; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4051 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4052 else if ( order <= 12 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4053 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4054 canBeInactive = true; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4055 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4056 offset = 4; |
|
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 else |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4059 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4060 return (PLAYER_SKILL_TYPE)37; |
|
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 counter = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4063 for (int i = 0; i < 37; i++) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4064 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4065 if ( (this->pActiveSkills[i] || canBeInactive) && pSkillAvailabilityPerClass[classType / 4][i] == requiredValue ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4066 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4067 if ( counter == order - offset ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4068 return (PLAYER_SKILL_TYPE)i; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4069 ++counter; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4070 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4071 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4072 |
|
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
|
4073 return (PLAYER_SKILL_TYPE)37; |
| 0 | 4074 } |
| 4075 | |
| 4076 | |
| 4077 | |
| 4078 //----- (0049048D) -------------------------------------------------------- | |
| 4079 //unsigned __int16 PartyCreation_BtnMinusClick(Player *_this, int eAttribute) | |
| 4080 void Player::DecreaseAttribute(int eAttribute) | |
| 4081 { | |
| 4082 int pBaseValue; // ecx@1 | |
| 4083 int pDroppedStep; // ebx@1 | |
| 4084 int pStep; // esi@1 | |
| 4085 int uMinValue; // [sp+Ch] [bp-4h]@1 | |
| 4086 | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4087 int raceId = GetRace(); |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4088 pBaseValue = StatTable[raceId][eAttribute].uBaseValue; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4089 pDroppedStep = StatTable[raceId][eAttribute].uDroppedStep; |
| 0 | 4090 uMinValue = pBaseValue - 2; |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4091 pStep = StatTable[raceId][eAttribute].uBaseStep; |
| 1272 | 4092 unsigned short* AttrToChange = nullptr; |
| 4093 switch ( eAttribute ) | |
| 4094 { | |
| 4095 case CHARACTER_ATTRIBUTE_STRENGTH: | |
| 4096 AttrToChange = &this->uMight; | |
| 4097 break; | |
| 4098 case CHARACTER_ATTRIBUTE_INTELLIGENCE: | |
| 4099 AttrToChange = &this->uIntelligence; | |
| 4100 break; | |
| 4101 case CHARACTER_ATTRIBUTE_WILLPOWER: | |
| 4102 AttrToChange = &this->uWillpower; | |
| 4103 break; | |
| 4104 case CHARACTER_ATTRIBUTE_ENDURANCE: | |
| 4105 AttrToChange = &this->uEndurance; | |
| 4106 break; | |
| 4107 case CHARACTER_ATTRIBUTE_ACCURACY: | |
| 4108 AttrToChange = &this->uAccuracy; | |
| 4109 break; | |
| 4110 case CHARACTER_ATTRIBUTE_SPEED: | |
| 4111 AttrToChange = &this->uSpeed; | |
| 4112 break; | |
| 4113 case CHARACTER_ATTRIBUTE_LUCK: | |
| 4114 AttrToChange = &this->uLuck; | |
| 4115 break; | |
| 4116 } | |
| 4117 if ( *AttrToChange <= pBaseValue ) | |
| 4118 pStep = pDroppedStep; | |
| 4119 if ( *AttrToChange - pStep >= uMinValue ) | |
| 4120 *AttrToChange -= pStep; | |
| 0 | 4121 } |
| 4122 | |
| 4123 //----- (004905F5) -------------------------------------------------------- | |
| 1458 | 4124 //signed int PartyCreation_BtnPlusClick(Player *this, int eAttribute) |
| 1273 | 4125 void Player::IncreaseAttribute( int eAttribute ) |
| 4126 { | |
| 4127 int raceId; // eax@1 | |
| 4128 int maxValue; // ebx@1 | |
| 4129 signed int baseStep; // edi@1 | |
| 4130 signed int tmp; // eax@17 | |
| 0 | 4131 signed int result; // eax@18 |
| 1273 | 4132 int baseValue; // [sp+Ch] [bp-8h]@1 |
| 4133 signed int droppedStep; // [sp+10h] [bp-4h]@1 | |
| 4134 unsigned short* statToChange; | |
| 4135 | |
| 4136 raceId = GetRace(); | |
| 4137 maxValue = StatTable[raceId][eAttribute].uMaxValue; | |
| 4138 baseStep = StatTable[raceId][eAttribute].uBaseStep; | |
| 4139 baseValue = StatTable[raceId][eAttribute].uBaseValue; | |
| 4140 droppedStep = StatTable[raceId][eAttribute].uDroppedStep; | |
| 4141 PlayerCreation_GetUnspentAttributePointCount(); | |
| 4142 switch ( eAttribute ) | |
| 4143 { | |
| 4144 case 0: | |
| 4145 statToChange = &this->uMight; | |
| 4146 break; | |
| 4147 case 1: | |
| 4148 statToChange = &this->uIntelligence; | |
| 4149 break; | |
| 4150 case 2: | |
| 4151 statToChange = &this->uWillpower; | |
| 4152 break; | |
| 4153 case 3: | |
| 4154 statToChange = &this->uEndurance; | |
| 4155 break; | |
| 4156 case 4: | |
| 4157 statToChange = &this->uAccuracy; | |
| 4158 break; | |
| 4159 case 5: | |
| 4160 statToChange = &this->uSpeed; | |
| 4161 break; | |
| 4162 case 6: | |
| 4163 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
|
4164 break; |
| 1273 | 4165 default: |
| 1545 | 4166 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
|
4167 break; |
| 1273 | 4168 } |
| 4169 if ( *statToChange < baseValue ) | |
| 4170 { | |
| 4171 tmp = baseStep; | |
| 4172 baseStep = droppedStep; | |
| 4173 droppedStep = tmp; | |
| 4174 } | |
| 4175 result = PlayerCreation_GetUnspentAttributePointCount(); | |
| 4176 if ( result >= droppedStep ) | |
| 4177 { | |
| 4178 if ( baseStep + *statToChange <= maxValue ) | |
| 4179 *statToChange += baseStep; | |
| 4180 } | |
| 0 | 4181 } |
| 4182 | |
| 4183 //----- (0049070F) -------------------------------------------------------- | |
| 4184 void Player::Zero() | |
| 4185 { | |
| 4186 this->sLevelModifier = 0; | |
| 4187 this->sACModifier = 0; | |
| 4188 this->uLuckBonus = 0; | |
| 4189 this->uAccuracyBonus = 0; | |
| 4190 this->uSpeedBonus = 0; | |
| 4191 this->uEnduranceBonus = 0; | |
| 4192 this->uWillpowerBonus = 0; | |
| 4193 this->uIntelligenceBonus = 0; | |
| 4194 this->uMightBonus = 0; | |
| 4195 this->field_100 = 0; | |
| 4196 this->field_FC = 0; | |
| 4197 this->field_F8 = 0; | |
| 4198 this->field_F4 = 0; | |
| 4199 this->field_F0 = 0; | |
| 4200 this->field_EC = 0; | |
| 4201 this->field_E8 = 0; | |
| 4202 this->field_E4 = 0; | |
| 4203 this->field_E0 = 0; | |
| 766 | 4204 memset(&this->sResFireBonus, 0, 0x16u); |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4205 this->field_1A97 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4206 this->_ranged_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4207 this->field_1A95 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4208 this->_ranged_atk_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4209 this->field_1A93 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4210 this->_melee_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4211 this->field_1A91 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4212 this->_some_attack_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4213 this->_mana_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4214 this->uFullManaBonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4215 this->_health_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4216 this->uFullHealthBonus = 0; |
| 0 | 4217 } |
| 4218 | |
| 4219 //----- (004907E7) -------------------------------------------------------- | |
| 299 | 4220 unsigned int Player::GetStatColor(int uStat) |
| 0 | 4221 { |
| 290 | 4222 int attribute_value; // edx@1 |
| 1393 | 4223 |
| 4224 int base_attribute_value = StatTable[GetRace()][uStat].uBaseValue; | |
| 0 | 4225 switch (uStat) |
| 4226 { | |
| 4227 case 0: attribute_value = uMight; break; | |
| 4228 case 1: attribute_value = uIntelligence; break; | |
| 4229 case 2: attribute_value = uWillpower; break; | |
| 4230 case 3: attribute_value = uEndurance; break; | |
| 290 | 4231 case 4: attribute_value = uAccuracy; break; |
| 4232 case 5: attribute_value = uSpeed; break; | |
| 0 | 4233 case 6: attribute_value = uLuck; break; |
| 1783 | 4234 default: Error("Unexpected attribute"); |
| 0 | 4235 }; |
| 4236 | |
| 1393 | 4237 if (attribute_value == base_attribute_value) |
| 4238 return ui_character_stat_default_color; | |
| 4239 else if (attribute_value > base_attribute_value) | |
| 4240 return ui_character_stat_buffed_color; | |
| 0 | 4241 else |
| 1393 | 4242 return ui_character_stat_debuffed_color; |
| 0 | 4243 } |
| 4244 | |
| 4245 //----- (004908A8) -------------------------------------------------------- | |
| 2187 | 4246 bool Player::DiscardConditionIfLastsLongerThan(unsigned int uCondition, signed __int64 uTime) |
| 4247 { | |
| 4248 if ( pConditions[uCondition] && (uTime < (signed long long)pConditions[uCondition]) ) | |
| 1014 | 4249 { |
| 1393 | 4250 pConditions[uCondition] = 0i64; |
| 1014 | 4251 return true; |
| 0 | 4252 } |
| 4253 else | |
| 1014 | 4254 return false; |
| 0 | 4255 } |
| 4256 | |
| 4257 //----- (004680ED) -------------------------------------------------------- | |
| 1019 | 4258 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
|
4259 { |
|
f5b13e6be493
Player::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 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
|
4261 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
|
4262 int v8; // edx@39 |
| 1838 | 4263 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
|
4264 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
|
4265 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
|
4266 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
|
4267 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
|
4268 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
|
4269 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
|
4270 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
|
4271 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
|
4272 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
|
4273 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
|
4274 __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
|
4275 __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
|
4276 __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
|
4277 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
|
4278 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
|
4279 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
|
4280 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
|
4281 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
|
4282 signed int v73; // [sp+24h] [bp-8h]@1 |
| 1838 | 4283 const char* v74; // [sp+24h] [bp-8h]@23 |
| 2163 | 4284 //Player *thisb; // [sp+28h] [bp-4h]@1 |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4285 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
|
4286 |
| 2163 | 4287 //thisb = this; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4288 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
|
4289 v73 = 1; |
| 2242 | 4290 if ( pParty->bTurnBasedModeOn == true && (pTurnEngine->turn_stage == TE_WAIT || pTurnEngine->turn_stage == TE_MOVEMENT) ) |
|
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
|
4291 return; |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4292 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
|
4293 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4294 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
|
4295 { |
| 2187 | 4296 playerAffected->SetCondition(Condition_Poison_Weak, 1); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4297 } |
|
f5b13e6be493
Player::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 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
|
4299 { |
|
f5b13e6be493
Player::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 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
|
4301 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
|
4302 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
|
4303 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
|
4304 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
|
4305 } |
|
f5b13e6be493
Player::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 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
|
4307 { |
|
f5b13e6be493
Player::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 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
|
4309 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
|
4310 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4311 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
|
4312 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4313 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
|
4314 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
|
4315 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
|
4316 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
|
4317 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
|
4318 } |
|
f5b13e6be493
Player::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 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
|
4320 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4321 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
|
4322 { |
| 2402 | 4323 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 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
|
4324 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4325 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
|
4326 { |
|
f5b13e6be493
Player::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 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
|
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 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; |
| 2163 | 4330 this->SetRecoveryTime(100); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4331 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
|
4332 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4333 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
|
4334 { |
| 2163 | 4335 this->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
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 } |
|
f5b13e6be493
Player::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 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
|
4339 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
|
4340 } |
|
f5b13e6be493
Player::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 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4342 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
|
4343 { |
|
f5b13e6be493
Player::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 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
|
4345 { |
|
f5b13e6be493
Player::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 case 221: //Catalyst |
| 2187 | 4347 playerAffected->SetCondition(Condition_Poison_Weak, 1); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4348 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
|
4349 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
|
4350 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
|
4351 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
|
4352 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
|
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 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
|
4355 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
|
4356 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
|
4357 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
|
4358 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
|
4359 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
|
4360 playerAffected->PlaySound(SPEECH_36, 0); |
| 2059 | 4361 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
|
4362 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
|
4363 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
|
4364 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
|
4365 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4366 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4367 case 225: //Cure Disease |
| 2187 | 4368 playerAffected->pConditions[Condition_Disease_Severe] = 0i64; |
| 4369 playerAffected->pConditions[Condition_Disease_Medium] = 0i64; | |
| 4370 playerAffected->pConditions[Condition_Disease_Weak] = 0i64; | |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4371 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
|
4372 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
|
4373 case 226: //Cure Poison |
| 2187 | 4374 playerAffected->pConditions[Condition_Poison_Severe] = 0i64; |
| 4375 playerAffected->pConditions[Condition_Poison_Medium] = 0i64; | |
| 4376 playerAffected->pConditions[Condition_Poison_Weak] = 0i64; | |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4377 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
|
4378 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4379 case 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
|
4380 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
|
4381 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
|
4382 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
|
4383 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
|
4384 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
|
4385 { |
| 1021 | 4386 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4387 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
|
4388 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
|
4389 } |
|
f5b13e6be493
Player::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 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
|
4391 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
|
4392 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4393 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
|
4394 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
|
4395 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
|
4396 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
|
4397 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4398 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
|
4399 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4400 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4401 case 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
|
4402 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
|
4403 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4404 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
|
4405 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
|
4406 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
|
4407 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
|
4408 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
|
4409 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4410 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
|
4411 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
|
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 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
|
4414 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4415 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
|
4416 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4417 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4418 case 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
|
4419 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335), |
| 1822 | 4420 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
|
4421 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4422 case 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
|
4423 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
|
4424 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
|
4425 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
|
4426 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
|
4427 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
|
4428 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
|
4429 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
|
4430 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
|
4431 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
|
4432 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4433 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4434 case 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
|
4435 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4436 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4437 playerAffected->pPlayerBuffs[PLAYER_BUFF_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
|
4438 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4439 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4440 case 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
|
4441 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4442 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4443 playerAffected->pPlayerBuffs[PLAYER_BUFF_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
|
4444 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4445 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4446 case 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
|
4447 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4448 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4449 playerAffected->pPlayerBuffs[PLAYER_BUFF_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
|
4450 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4451 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4452 case 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
|
4453 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4454 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4455 playerAffected->pPlayerBuffs[PLAYER_BUFF_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
|
4456 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4457 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4458 case 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
|
4459 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
|
4460 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4461 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
|
4462 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
|
4463 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
|
4464 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
|
4465 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
|
4466 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4467 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
|
4468 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
|
4469 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
|
4470 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
|
4471 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
|
4472 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
|
4473 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
|
4474 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
|
4475 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
|
4476 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
|
4477 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
|
4478 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
|
4479 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
|
4480 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
|
4481 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
|
4482 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
|
4483 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
|
4484 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
|
4485 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
|
4486 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
|
4487 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
|
4488 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
|
4489 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
|
4490 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
|
4491 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
|
4492 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
|
4493 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
|
4494 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
|
4495 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4496 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4497 case 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
|
4498 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4499 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4500 playerAffected->pPlayerBuffs[PLAYER_BUFF_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
|
4501 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4502 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4503 case 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
|
4504 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4505 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4506 playerAffected->pPlayerBuffs[PLAYER_BUFF_RESIST_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
|
4507 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4508 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4509 case 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
|
4510 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4511 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4512 playerAffected->pPlayerBuffs[PLAYER_BUFF_RESIST_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
|
4513 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4514 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4515 case 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
|
4516 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4517 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4518 playerAffected->pPlayerBuffs[PLAYER_BUFF_RESIST_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
|
4519 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4520 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4521 case 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
|
4522 v50 = 3 * pParty->pPickedItem.uEnchantmentType; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4523 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4524 playerAffected->pPlayerBuffs[PLAYER_BUFF_RESIST_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
|
4525 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4526 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4527 case 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
|
4528 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
|
4529 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4530 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
|
4531 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
|
4532 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
|
4533 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
|
4534 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
|
4535 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4536 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
|
4537 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4538 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4539 case 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
|
4540 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
|
4541 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
|
4542 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
|
4543 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
|
4544 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
|
4545 { |
|
f5b13e6be493
Player::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->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
|
4547 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
|
4548 } |
|
f5b13e6be493
Player::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 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
|
4550 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
|
4551 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
|
4552 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
|
4553 { |
|
f5b13e6be493
Player::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->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
|
4555 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
|
4556 } |
|
f5b13e6be493
Player::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 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
|
4558 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
|
4559 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
|
4560 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
|
4561 { |
|
f5b13e6be493
Player::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->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
|
4563 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
|
4564 } |
|
f5b13e6be493
Player::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 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
|
4566 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
|
4567 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
|
4568 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
|
4569 { |
|
f5b13e6be493
Player::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->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
|
4571 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
|
4572 } |
|
f5b13e6be493
Player::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 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
|
4574 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
|
4575 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
|
4576 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
|
4577 { |
|
f5b13e6be493
Player::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->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
|
4579 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
|
4580 } |
|
f5b13e6be493
Player::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 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
|
4582 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
|
4583 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
|
4584 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
|
4585 { |
|
f5b13e6be493
Player::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->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
|
4587 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
|
4588 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4589 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4590 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4591 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
|
4592 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
|
4593 { |
|
f5b13e6be493
Player::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 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
|
4595 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
|
4596 } |
|
f5b13e6be493
Player::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 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
|
4598 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
|
4599 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
|
4600 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
|
4601 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
|
4602 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
|
4603 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4604 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
|
4605 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
|
4606 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
|
4607 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
|
4608 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
|
4609 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
|
4610 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4611 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
|
4612 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
|
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 ( !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
|
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 // 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
|
4617 // 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
|
4618 // } |
| 2402 | 4619 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 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
|
4620 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4621 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
|
4622 { |
|
f5b13e6be493
Player::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 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
|
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 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; |
| 2163 | 4626 this->SetRecoveryTime(100); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4627 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
|
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 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
|
4630 { |
| 2163 | 4631 this->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4632 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4633 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4634 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
|
4635 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
|
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 |
|
f5b13e6be493
Player::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 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4639 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
|
4640 { |
|
f5b13e6be493
Player::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 if ( pCurrentScreen == SCREEN_CASTING ) |
| 1032 | 4642 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
|
4643 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
|
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 |
|
f5b13e6be493
Player::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 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
|
4647 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
|
4648 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
|
4649 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
|
4650 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
|
4651 } |
|
f5b13e6be493
Player::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 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
|
4653 { |
|
f5b13e6be493
Player::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 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
|
4655 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
|
4656 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
|
4657 } |
| 2154 | 4658 |
|
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
|
4659 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
|
4660 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
|
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 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
|
4664 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
|
4665 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
|
4666 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
|
4667 _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
|
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 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
|
4670 { |
|
f5b13e6be493
Player::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 pMouse->RemoveHoldingItem(); |
| 2402 | 4672 pMessageQueue_50C9E8->AddGUIMessage(UIMSG_SpellScrollUse, scroll_id, player_num - 1); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4673 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
|
4674 && (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
|
4675 { |
| 2402 | 4676 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 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
|
4677 } |
|
f5b13e6be493
Player::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 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
|
4680 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4681 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4682 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
|
4683 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4684 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
|
4685 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
|
4686 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
|
4687 { |
|
f5b13e6be493
Player::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 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
|
4689 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
|
4690 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4691 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4692 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
|
4693 } |
|
f5b13e6be493
Player::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 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
|
4695 { |
|
f5b13e6be493
Player::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 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
|
4697 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v66);//"That player is %s" |
| 2187 | 4698 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
|
4699 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4700 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
|
4701 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4702 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
|
4703 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
|
4704 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
|
4705 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
|
4706 { |
| 1032 | 4707 case 0: v67 = 4; break; |
| 4708 case 1: v67 = 7; break; | |
| 4709 case 2: v67 = 10; break; | |
| 4710 case 3: v67 = 11; break; | |
| 4711 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
|
4712 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
|
4713 } |
| 1032 | 4714 |
|
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
|
4715 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
|
4716 { |
|
f5b13e6be493
Player::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 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
|
4718 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[381], v22); //"You don't have the skill to learn %s" |
| 2187 | 4719 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
|
4720 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
|
4721 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4722 } |
| 2187 | 4723 playerAffected->spellbook.bHaveSpell[pParty->pPickedItem.uItemID-400] = 1; |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4724 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
|
4725 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
|
4726 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4727 |
|
f5b13e6be493
Player::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 ( 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
|
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 ( !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
|
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 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
|
4733 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
|
4734 } |
| 2402 | 4735 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 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
|
4736 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4737 // 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
|
4738 // { |
|
f5b13e6be493
Player::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 // 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
|
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 // 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
|
4742 // 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
|
4743 // 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
|
4744 // } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4745 // 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
|
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 // 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
|
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 // } |
|
f5b13e6be493
Player::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 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
|
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 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4754 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
|
4755 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4756 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
|
4757 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4758 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
|
4759 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
|
4760 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
|
4761 } |
|
f5b13e6be493
Player::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 v68 = aCharacterConditionNames[playerAffected->GetMajorConditionIdx()]; |
| 2156 | 4763 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v68);//That player is %s |
| 4764 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
|
4765 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
|
4766 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
|
4767 } |
|
f5b13e6be493
Player::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 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
|
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 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
|
4771 { |
|
f5b13e6be493
Player::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 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
|
4773 if ( pParty->uCurrentMonth >= 7 ) |
|
2369
bddcaf5d5db2
removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents:
2355
diff
changeset
|
4774 v74 = nullptr; |
|
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
|
4775 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
|
4776 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
|
4777 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
|
4778 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4779 case 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
|
4780 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
|
4781 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4782 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4783 case 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
|
4784 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
|
4785 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4786 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4787 case 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
|
4788 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
|
4789 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4790 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4791 case 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
|
4792 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
|
4793 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v74, pGlobalTXT_LocalizationStrings[121]);//"Permanent" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4794 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4795 case 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
|
4796 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
|
4797 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
|
4798 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4799 case 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
|
4800 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
|
4801 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
|
4802 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4803 case 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
|
4804 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
|
4805 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
|
4806 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4807 case 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
|
4808 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
|
4809 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
|
4810 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4811 case 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
|
4812 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
|
4813 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
|
4814 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
|
4815 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
|
4816 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
|
4817 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
|
4818 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4819 case 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
|
4820 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
|
4821 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
|
4822 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4823 case 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
|
4824 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
|
4825 switch (v8) |
| 1032 | 4826 { |
|
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
|
4827 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
|
4828 playerAffected->sResFireBase += thisa; |
| 2156 | 4829 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
|
4830 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4831 case 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
|
4832 playerAffected->sResAirBase += thisa; |
| 2156 | 4833 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
|
4834 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4835 case 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
|
4836 playerAffected->sResWaterBase += thisa; |
| 2156 | 4837 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
|
4838 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
|
4839 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
|
4840 playerAffected->sResEarthBase += thisa; |
| 2156 | 4841 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
|
4842 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
|
4843 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
|
4844 playerAffected->sResMindBase += thisa; |
| 2156 | 4845 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
|
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 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
|
4848 playerAffected->sResBodyBase += thisa; |
| 2156 | 4849 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
|
4850 break; |
| 1783 | 4851 default: ("Unexpected attribute"); |
| 4852 return; | |
| 1021 | 4853 } |
| 2156 | 4854 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
|
4855 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
|
4856 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4857 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4858 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
|
4859 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
|
4860 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
|
4861 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
|
4862 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
|
4863 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
|
4864 { |
|
f5b13e6be493
Player::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 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
|
4866 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
|
4867 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4868 else if ( pParty->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
|
4869 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4870 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
|
4871 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
|
4872 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4873 else if ( pParty->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
|
4874 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4875 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
|
4876 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
|
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 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
|
4879 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4880 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
|
4881 { |
|
f5b13e6be493
Player::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 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
|
4883 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
|
4884 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4885 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
|
4886 { |
|
f5b13e6be493
Player::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 pAudioPlayer->PlaySound(SOUND_PlayLute, 0, 0, -1, 0, 0, 0, 0); |
| 1032 | 4888 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
|
4889 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4890 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
|
4891 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4892 pAudioPlayer->PlaySound(SOUND_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
|
4893 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
|
4894 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4895 else if ( pParty->pPickedItem.uItemID == 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
|
4896 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4897 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
|
4898 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4899 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4900 else 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
|
4901 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4902 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
|
4903 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
|
4904 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
|
4905 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
|
4906 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4907 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
|
4908 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4909 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
|
4910 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4911 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4912 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
|
4913 { |
|
f5b13e6be493
Player::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 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
|
4915 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
|
4916 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4917 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4918 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
|
4919 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4920 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4921 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
|
4922 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
|
4923 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4924 } |
| 0 | 4925 |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4926 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
|
4927 { |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4928 int v4; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4929 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
|
4930 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
|
4931 else |
| 1822 | 4932 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
|
4933 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
|
4934 } |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4935 |
| 0 | 4936 //----- (00449BB4) -------------------------------------------------------- |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4937 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 | 4938 { |
| 4939 Assert(pValue >= 0, "Compare variable shouldn't have negative arguments"); | |
| 4940 | |
| 0 | 4941 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
|
4942 unsigned __int8 test_bit_value; // eax@25 |
| 1731 | 4943 unsigned __int8 byteWithRequestedBit; // cl@25 |
| 0 | 4944 DDM_DLV_Header *v19; // eax@122 |
| 4945 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
|
4946 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
|
4947 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
|
4948 |
| 1783 | 4949 |
| 4950 if ( (signed int)VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_74 ) | |
| 4951 return (unsigned __int8)stru_5E4C90_MapPersistVars.field_0[VarNum - VAR_MapPersistentVariable_0] > 0; // originally (unsigned __int8)byte_5E4C15[VarNum]; | |
| 4952 if ( (signed int)VarNum >= VAR_MapPersistentVariable_75 && VarNum <= VAR_MapPersistentVariable_99 ) | |
| 4953 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 | |
| 4954 | |
| 4955 switch ( VarNum ) | |
| 4956 { | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4957 case VAR_Sex: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4958 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
|
4959 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
|
4960 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
|
4961 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
|
4962 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
|
4963 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
|
4964 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
|
4965 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
|
4966 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
|
4967 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
|
4968 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
|
4969 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
|
4970 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
|
4971 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
|
4972 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
|
4973 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
|
4974 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
|
4975 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
|
4976 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
|
4977 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
|
4978 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
|
4979 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
|
4980 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
|
4981 case VAR_Award: |
| 1783 | 4982 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
|
4983 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
|
4984 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
|
4985 case VAR_QBits_QuestsDone: |
| 1783 | 4986 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
|
4987 case VAR_PlayerItemInHands: |
| 1919 | 4988 //for (int i = 0; i < 138; i++) |
| 4989 for (int i = 0; i < 126; i++) | |
| 0 | 4990 { |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4991 if (pInventoryItemList[i].uItemID == pValue) |
| 0 | 4992 { |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4993 return true; |
| 0 | 4994 } |
| 469 | 4995 } |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4996 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
|
4997 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
|
4998 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
|
4999 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5000 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5001 case VAR_DayOfYear: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5002 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
|
5003 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5004 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5005 case VAR_DayOfWeek: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5006 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
|
5007 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5008 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5009 case VAR_FixedGold: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5010 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
|
5011 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
|
5012 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
|
5013 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
|
5014 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
|
5015 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
|
5016 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
|
5017 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
|
5018 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
|
5019 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
|
5020 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
|
5021 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
|
5022 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
|
5023 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
|
5024 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
|
5025 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
|
5026 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
|
5027 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
|
5028 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
|
5029 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
|
5030 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
|
5031 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
|
5032 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
|
5033 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
|
5034 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
|
5035 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
|
5036 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
|
5037 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
|
5038 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
|
5039 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
|
5040 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
|
5041 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
|
5042 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
|
5043 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
|
5044 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
|
5045 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
|
5046 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
|
5047 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
|
5048 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
|
5049 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
|
5050 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
|
5051 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
|
5052 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
|
5053 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
|
5054 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
|
5055 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
|
5056 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
|
5057 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
|
5058 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
|
5059 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
|
5060 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
|
5061 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
|
5062 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
|
5063 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
|
5064 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
|
5065 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
|
5066 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
|
5067 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
|
5068 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
|
5069 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
|
5070 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
|
5071 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
|
5072 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
|
5073 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
|
5074 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
|
5075 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5076 case VAR_MagicResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5077 return this->sResMagicBase >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5078 case VAR_FireResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5079 return this->sResFireBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5080 case VAR_AirResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5081 return this->sResAirBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5082 case VAR_WaterResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5083 return this->sResWaterBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5084 case VAR_EarthResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5085 return this->sResEarthBonus >= pValue; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5086 case VAR_SpiritResistanceBonus: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5087 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
|
5088 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
|
5089 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
|
5090 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
|
5091 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
|
5092 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
|
5093 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
|
5094 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
|
5095 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
|
5096 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
|
5097 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
|
5098 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
|
5099 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
|
5100 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
|
5101 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
|
5102 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
|
5103 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
|
5104 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
|
5105 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
|
5106 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
|
5107 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
|
5108 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
|
5109 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
|
5110 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
|
5111 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
|
5112 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
|
5113 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
|
5114 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
|
5115 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
|
5116 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
|
5117 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
|
5118 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
|
5119 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
|
5120 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
|
5121 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
|
5122 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
|
5123 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
|
5124 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
|
5125 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
|
5126 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
|
5127 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
|
5128 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
|
5129 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
|
5130 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
|
5131 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
|
5132 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
|
5133 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
|
5134 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
|
5135 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
|
5136 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
|
5137 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
|
5138 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
|
5139 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
|
5140 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
|
5141 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
|
5142 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
|
5143 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
|
5144 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
|
5145 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
|
5146 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
|
5147 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
|
5148 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
|
5149 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
|
5150 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
|
5151 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
|
5152 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
|
5153 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
|
5154 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
|
5155 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
|
5156 return false; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5157 case VAR_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
|
5158 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
|
5159 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
|
5160 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
|
5161 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
|
5162 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
|
5163 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
|
5164 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
|
5165 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
|
5166 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
|
5167 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
|
5168 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
|
5169 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
|
5170 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
|
5171 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
|
5172 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
|
5173 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
|
5174 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
|
5175 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
|
5176 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
|
5177 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
|
5178 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
|
5179 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
|
5180 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
|
5181 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
|
5182 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
|
5183 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
|
5184 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
|
5185 case VAR_PoisonedGreen: |
| 2187 | 5186 return pConditions[Condition_Poison_Weak] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5187 case VAR_DiseasedGreen: |
| 2187 | 5188 return pConditions[Condition_Disease_Weak] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5189 case VAR_PoisonedYellow: |
| 2187 | 5190 return pConditions[Condition_Poison_Medium] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5191 case VAR_DiseasedYellow: |
| 2187 | 5192 return pConditions[Condition_Disease_Medium] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5193 case VAR_PoisonedRed: |
| 2187 | 5194 return pConditions[Condition_Poison_Severe] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5195 case VAR_DiseasedRed: |
| 2187 | 5196 return pConditions[Condition_Disease_Severe] > 0; |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5197 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
|
5198 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
|
5199 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
|
5200 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
|
5201 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
|
5202 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
|
5203 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
|
5204 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
|
5205 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
|
5206 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
|
5207 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
|
5208 v4 = GetMajorConditionIdx(); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5209 if ( v4 != 18 ) |
| 0 | 5210 { |
| 469 | 5211 return v4 >= pValue; |
| 5212 } | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5213 return true; |
| 1783 | 5214 case VAR_AutoNotes : //TODO: find out why the double subtraction. or whether this is even used |
| 5215 test_bit_value = 0x80u >> (pValue - 2) % 8; | |
| 5216 byteWithRequestedBit = pParty->_autonote_bits[(pValue - 2) /8]; | |
| 5217 return (test_bit_value & byteWithRequestedBit) != 0; | |
| 5218 case VAR_IsMightMoreThanBase: | |
| 5219 actStat = GetActualMight(); | |
| 5220 baseStat = GetBaseStrength(); | |
| 5221 return (actStat >= baseStat); | |
| 5222 case VAR_IsIntellectMoreThanBase: | |
| 5223 actStat = GetActualIntelligence(); | |
| 5224 baseStat = GetBaseIntelligence(); | |
| 5225 return (actStat >= baseStat); | |
| 5226 case VAR_IsPersonalityMoreThanBase: | |
| 5227 actStat = GetActualWillpower(); | |
| 5228 baseStat = GetBaseWillpower(); | |
| 5229 return (actStat >= baseStat); | |
| 5230 case VAR_IsEnduranceMoreThanBase: | |
| 5231 actStat = GetActualEndurance(); | |
| 5232 baseStat = GetBaseEndurance(); | |
| 5233 return (actStat >= baseStat); | |
| 5234 case VAR_IsSpeedMoreThanBase: | |
| 5235 actStat = GetActualSpeed(); | |
| 5236 baseStat = GetBaseSpeed(); | |
| 5237 return (actStat >= baseStat); | |
| 5238 case VAR_IsAccuracyMoreThanBase: | |
| 5239 actStat = GetActualAccuracy(); | |
| 5240 baseStat = GetBaseAccuracy(); | |
| 5241 return (actStat >= baseStat); | |
| 5242 case VAR_IsLuckMoreThanBase: | |
| 5243 actStat = GetActualLuck(); | |
| 5244 baseStat = GetBaseLuck(); | |
| 5245 return (actStat >= baseStat); | |
| 5246 case VAR_PlayerBits: | |
| 5247 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; | |
| 1822 | 5248 byteWithRequestedBit = this->playerEventBits[((signed __int16)pValue - 1)/8]; |
| 1783 | 5249 return ( test_bit_value & byteWithRequestedBit ) != 0; |
| 5250 case VAR_NPCs2: | |
| 5251 return pNPCStats->pNewNPCData[pValue].Hired(); | |
| 5252 case VAR_IsFlying: | |
| 5253 if ( pParty->bFlying | |
| 5254 && (pParty->pPartyBuffs[PARTY_BUFF_FLY].uExpireTime> 0) ) | |
| 5255 return true; | |
| 5256 return false; | |
| 5257 case VAR_HiredNPCHasSpeciality: | |
| 5258 return CheckHiredNPCSpeciality(pValue); | |
| 5259 case VAR_CircusPrises: //isn't used in MM6 since 0x1D6u is a book of regeneration | |
| 5260 v4 = 0; | |
| 5261 for (int playerNum = 0; playerNum < 4; playerNum++) | |
| 5262 { | |
| 5263 for (int invPos = 0; invPos < 138; invPos++) | |
| 5264 { | |
| 5265 int itemId = pParty->pPlayers[playerNum].pInventoryItemList[invPos].uItemID; | |
| 5266 switch ( itemId ) | |
| 5267 { | |
| 5268 case 0x1D6u: | |
| 5269 ++v4; | |
| 5270 break; | |
| 5271 case 0x1D7u: | |
| 5272 v4 += 3; | |
| 5273 break; | |
| 5274 case 0x1DDu: | |
| 5275 v4 += 5; | |
| 5276 break; | |
| 5277 } | |
| 5278 } | |
| 5279 } | |
| 5280 return v4 >= pValue; | |
| 5281 case VAR_NumSkillPoints: | |
| 5282 return this->uSkillPoints >= (unsigned int)pValue; | |
| 5283 case VAR_MonthIs: | |
| 5284 return (pParty->uCurrentMonth == (unsigned int)pValue); | |
| 5285 case VAR_Counter1: | |
| 5286 case VAR_Counter2: | |
| 5287 case VAR_Counter3: | |
| 5288 case VAR_Counter4: | |
| 5289 case VAR_Counter5: | |
| 5290 case VAR_Counter6: | |
| 5291 case VAR_Counter7: | |
| 5292 case VAR_Counter8: | |
| 5293 case VAR_Counter9: | |
| 5294 case VAR_Counter10: | |
| 5295 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]) | |
| 5296 { | |
| 5297 return (pParty->PartyTimes.CounterEventValues[VarNum - VAR_Counter1] + 460800 * pValue * 0.033333335) <= pParty->uTimePlayed ; | |
| 5298 } | |
| 5299 case VAR_ReputationInCurrentLocation: | |
| 5300 v19 = &pOutdoor->ddm; | |
| 5301 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5302 v19 = &pIndoor->dlv; | |
| 5303 return (v19->uReputation >= pValue); | |
| 5304 case VAR_Unknown1: | |
| 5305 v21 = &pOutdoor->ddm; | |
| 5306 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5307 v21 = &pIndoor->dlv; | |
| 5308 return (v21->field_C_alert == pValue); //yes, equality, not >= | |
| 5309 case VAR_GoldInBank: | |
| 5310 return pParty->uNumGoldInBank >= (unsigned int)pValue; | |
| 5311 case VAR_NumDeaths: | |
| 5312 return pParty->uNumDeaths >= (unsigned int)pValue; | |
| 5313 case VAR_NumBounties: | |
| 5314 return pParty->uNumBountiesCollected >= (unsigned int)pValue; | |
| 5315 case VAR_PrisonTerms: | |
| 5316 return pParty->uNumPrisonTerms >= pValue; | |
| 5317 case VAR_ArenaWinsPage: | |
| 5318 return (unsigned __int8)pParty->uNumArenaPageWins >= pValue; | |
| 5319 case VAR_ArenaWinsSquire: | |
| 5320 return (unsigned __int8)pParty->uNumArenaSquireWins >= pValue; | |
| 5321 case VAR_ArenaWinsKnight: | |
| 5322 return (unsigned __int8)pParty->uNumArenaKnightWins >= pValue; | |
| 5323 case VAR_ArenaWinsLord: | |
| 5324 return pParty->uNumArenaLordWins >= pValue; | |
| 5325 case VAR_Invisible: | |
| 5326 return ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime > 0 ); | |
| 5327 case VAR_ItemEquipped: | |
| 5328 for (int i = 0; i < 16; i++) | |
| 5329 { | |
| 5330 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) && GetNthEquippedIndexItem(i)->uItemID == pValue ) | |
| 5331 { | |
| 5332 return true; | |
| 5333 } | |
| 5334 } | |
| 5335 return false; | |
| 5336 } | |
| 5337 | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5338 return false; |
| 0 | 5339 } |
| 5340 | |
| 5341 | |
| 5342 //----- (0044A5CB) -------------------------------------------------------- | |
| 492 | 5343 void Player::SetVariable(enum VariableType var_type, signed int var_value) |
| 5344 { | |
| 0 | 5345 unsigned int v6; // esi@13 |
| 5346 unsigned int v7; // esi@14 | |
| 5347 signed int v11; // eax@30 | |
| 5348 DDM_DLV_Header *v24; // ecx@148 | |
| 5349 ItemGen item; // [sp+Ch] [bp-28h]@52 | |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5350 |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5351 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5352 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
|
5353 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5354 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
|
5355 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5356 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
|
5357 if (pStorylineText->StoreLine[var_type - VAR_History_0].pText) |
| 492 | 5358 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5359 bFlashHistoryBook = 1; |
| 1822 | 5360 PlayAwardSound(); |
| 0 | 5361 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5362 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5363 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_MapPersistentVariable_0 && var_type <= VAR_MapPersistentVariable_99 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5367 { |
| 1822 | 5368 if ( var_type >= VAR_MapPersistentVariable_0 && var_type <= VAR_MapPersistentVariable_74 ) |
| 5369 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] = (char)var_value; // originally (unsigned __int8)byte_5E4C15[VarNum]; | |
| 5370 if ( var_type >= VAR_MapPersistentVariable_75 && var_type <= VAR_MapPersistentVariable_99 ) | |
| 5371 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
|
5372 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5373 } |
|
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 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
|
5376 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5377 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 | 5378 PlayAwardSound(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5379 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5380 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5381 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5382 switch ( var_type ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5383 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5384 case VAR_Sex: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5385 this->uSex = (PLAYER_SEX)var_value; |
| 1822 | 5386 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5387 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5388 case VAR_Class: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5389 this->classType = (PLAYER_CLASS_TYPE)var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5390 if ( (PLAYER_CLASS_TYPE)var_value == PLAYER_CLASS_LICH ) |
| 492 | 5391 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5392 for (int i = 0; i < 138; i++) |
| 0 | 5393 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5394 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
|
5395 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5396 this->pOwnItems[i].uItemID = ITEM_LICH_JAR_FULL; |
| 1822 | 5397 this->pOwnItems[i].uHolderPlayer = GetPlayerIndex() + 1; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5398 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5399 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5400 if ( this->sResFireBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5401 this->sResFireBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5402 if ( this->sResAirBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5403 this->sResAirBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5404 if ( this->sResWaterBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5405 this->sResWaterBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5406 if ( this->sResEarthBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5407 this->sResEarthBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5408 this->sResMindBase = 200; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5409 this->sResBodyBase = 200; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5410 v11 = this->GetSexByVoice(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5411 this->uPrevVoiceID = this->uVoiceID; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5412 this->uPrevFace = this->uCurrentFace; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5413 if ( v11 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5414 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5415 this->uCurrentFace = 21; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5416 this->uVoiceID = 21; |
| 0 | 5417 } |
| 5418 else | |
| 5419 { | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5420 this->uCurrentFace = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5421 this->uVoiceID = 20; |
| 0 | 5422 } |
| 1822 | 5423 ReloadPlayerPortraits(GetPlayerIndex(), this->uCurrentFace); |
| 0 | 5424 } |
| 1822 | 5425 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5426 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5427 case VAR_CurrentHP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5428 this->sHealth = var_value; |
| 1822 | 5429 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5430 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5431 case VAR_MaxHP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5432 this->sHealth = GetMaxHealth(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5433 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5434 case VAR_CurrentSP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5435 this->sMana = var_value; |
| 1822 | 5436 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5437 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5438 case VAR_MaxSP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5439 this->sMana = GetMaxMana(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5440 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5441 case VAR_ACModifier: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5442 this->sACModifier = (unsigned __int8)var_value; |
| 1822 | 5443 PlayAwardSound_Anim(); |
| 0 | 5444 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5445 case VAR_BaseLevel: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5446 this->uLevel = (unsigned __int8)var_value; |
| 1822 | 5447 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5448 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5449 case VAR_LevelModifier: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5450 this->sLevelModifier = (unsigned __int8)var_value; |
| 1822 | 5451 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5452 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5453 case VAR_Age: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5454 this->sAgeModifier = var_value; |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5455 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5456 case VAR_Award: |
| 1783 | 5457 if ( !_449B57_test_bit(this->_achieved_awards_bits, var_value) && pAwards[var_value].pText ) |
| 492 | 5458 { |
| 1822 | 5459 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5460 this->PlaySound(SPEECH_96, 0); |
| 0 | 5461 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5462 _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
|
5463 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5464 case VAR_Experience: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5465 this->uExperience = var_value; |
| 1822 | 5466 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5467 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5468 case VAR_QBits_QuestsDone: |
| 1783 | 5469 if ( !_449B57_test_bit(pParty->_quest_bits, var_value) && pQuestTable[var_value-1] ) |
| 0 | 5470 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5471 bFlashQuestBook = 1; |
| 1822 | 5472 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, GetPlayerIndex()); |
| 5473 PlayAwardSound(); | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5474 this->PlaySound(SPEECH_93, 0); |
| 0 | 5475 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5476 _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
|
5477 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5478 case VAR_PlayerItemInHands: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5479 item.Reset(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5480 item.uItemID = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5481 item.uAttributes = 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5482 pParty->SetHoldingItem(&item); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5483 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
|
5484 pParty->pIsArtifactFound[var_value-500] = 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5485 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5486 case VAR_FixedGold: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5487 Party::SetGold(var_value); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5488 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5489 case VAR_RandomGold: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5490 v6 = rand() % var_value + 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5491 Party::SetGold(v6); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5492 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
|
5493 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5494 GameUI_DrawFoodAndGold(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5495 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5496 case VAR_FixedFood: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5497 Party::SetFood(var_value); |
| 1822 | 5498 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5499 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5500 case VAR_RandomFood: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5501 v7 = rand() % var_value + 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5502 Party::SetFood(v7); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5503 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
|
5504 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5505 GameUI_DrawFoodAndGold(); |
| 1822 | 5506 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5507 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5508 case VAR_BaseMight: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5509 this->uMight = (unsigned __int8)var_value; |
| 1822 | 5510 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5511 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5512 case VAR_BaseIntellect: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5513 this->uIntelligence = (unsigned __int8)var_value; |
| 1822 | 5514 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5515 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5516 case VAR_BasePersonality: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5517 this->uWillpower = (unsigned __int8)var_value; |
| 1822 | 5518 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5519 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5520 case VAR_BaseEndurance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5521 this->uEndurance = (unsigned __int8)var_value; |
| 1822 | 5522 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5523 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5524 case VAR_BaseSpeed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5525 this->uSpeed = (unsigned __int8)var_value; |
| 1822 | 5526 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5527 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5528 case VAR_BaseAccuracy: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5529 this->uAccuracy = (unsigned __int8)var_value; |
| 1822 | 5530 PlayAwardSound_Anim_Face(SPEECH_92); |
|
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_BaseLuck: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5533 this->uLuck = (unsigned __int8)var_value; |
| 1822 | 5534 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5535 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5536 case VAR_MightBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5537 case VAR_ActualMight: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5538 this->uMightBonus = (unsigned __int8)var_value; |
| 1822 | 5539 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5540 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5541 case VAR_IntellectBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5542 case VAR_ActualIntellect: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5543 this->uIntelligenceBonus = (unsigned __int8)var_value; |
| 1822 | 5544 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5545 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5546 case VAR_PersonalityBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5547 case VAR_ActualPersonality: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5548 this->uWillpowerBonus = (unsigned __int8)var_value; |
| 1822 | 5549 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5550 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5551 case VAR_EnduranceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5552 case VAR_ActualEndurance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5553 this->uEnduranceBonus = (unsigned __int8)var_value; |
| 1822 | 5554 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5555 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5556 case VAR_SpeedBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5557 case VAR_ActualSpeed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5558 this->uSpeedBonus = (unsigned __int8)var_value; |
| 1822 | 5559 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5560 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5561 case VAR_AccuracyBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5562 case VAR_ActualAccuracy: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5563 this->uAccuracyBonus = (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_LuckBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5567 case VAR_ActualLuck: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5568 this->uLuckBonus = (unsigned __int8)var_value; |
| 1822 | 5569 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5570 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5571 case VAR_FireResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5572 this->sResFireBase = (unsigned __int8)var_value; |
| 1822 | 5573 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5574 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5575 case VAR_AirResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5576 this->sResAirBase = (unsigned __int8)var_value; |
| 1822 | 5577 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5578 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5579 case VAR_WaterResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5580 this->sResWaterBase = (unsigned __int8)var_value; |
| 1822 | 5581 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5582 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5583 case VAR_EarthResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5584 this->sResEarthBase = (unsigned __int8)var_value; |
| 1822 | 5585 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5586 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5587 case VAR_SpiritResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5588 this->sResSpiritBase = (unsigned __int8)var_value; |
| 1822 | 5589 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5590 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5591 case VAR_MindResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5592 this->sResMindBase = (unsigned __int8)var_value; |
| 1822 | 5593 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5594 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5595 case VAR_BodyResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5596 this->sResBodyBase = (unsigned __int8)var_value; |
| 1822 | 5597 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5598 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5599 case VAR_LightResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5600 this->sResLightBase = (unsigned __int8)var_value; |
| 1822 | 5601 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5602 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5603 case VAR_DarkResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5604 this->sResDarkBase = (unsigned __int8)var_value; |
| 1822 | 5605 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5606 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5607 case VAR_MagicResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5608 this->sResMagicBase = (unsigned __int8)var_value; |
| 1822 | 5609 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5610 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5611 case VAR_FireResistanceBonus: |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5612 this->sResFireBonus = (unsigned __int8)var_value; |
| 1822 | 5613 PlayAwardSound_Anim_Face(SPEECH_91); |
| 0 | 5614 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5615 case VAR_AirResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5616 this->sResAirBonus = (unsigned __int8)var_value; |
| 1822 | 5617 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5618 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5619 case VAR_WaterResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5620 this->sResWaterBonus = (unsigned __int8)var_value; |
| 1822 | 5621 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5622 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5623 case VAR_EarthResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5624 this->sResEarthBonus = (unsigned __int8)var_value; |
| 1822 | 5625 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5626 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5627 case VAR_SpiritResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5628 this->sResSpiritBonus = (unsigned __int8)var_value; |
| 1822 | 5629 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5630 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5631 case VAR_MindResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5632 this->sResMindBonus = (unsigned __int8)var_value; |
| 1822 | 5633 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5634 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5635 case VAR_BodyResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5636 this->sResBodyBonus = (unsigned __int8)var_value; |
| 1822 | 5637 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5638 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5639 case VAR_LightResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5640 this->sResLightBonus = (unsigned __int8)var_value; |
| 1822 | 5641 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5642 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5643 case VAR_DarkResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5644 this->sResDarkBonus = (unsigned __int8)var_value; |
| 1822 | 5645 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5646 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5647 case VAR_PhysicalResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5648 Error("Physical res. bonus not used"); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5649 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5650 case VAR_MagicResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5651 this->sResMagicBonus = (unsigned __int8)var_value; |
| 1822 | 5652 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5653 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5654 case VAR_Cursed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5655 this->SetCondition(Condition_Cursed, 1); |
| 1822 | 5656 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5657 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5658 case VAR_Weak: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5659 this->SetCondition(Condition_Weak, 1); |
| 1822 | 5660 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5661 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5662 case VAR_Asleep: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5663 this->SetCondition(Condition_Sleep, 1); |
| 1822 | 5664 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5665 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5666 case VAR_Afraid: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5667 this->SetCondition(Condition_Fear, 1); |
| 1822 | 5668 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5669 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5670 case VAR_Drunk: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5671 this->SetCondition(Condition_Drunk, 1); |
| 1822 | 5672 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5673 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5674 case VAR_Insane: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5675 this->SetCondition(Condition_Insane, 1); |
| 1822 | 5676 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5677 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5678 case VAR_PoisonedGreen: |
| 2187 | 5679 this->SetCondition(Condition_Poison_Weak, 1); |
| 1822 | 5680 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5681 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5682 case VAR_DiseasedGreen: |
| 2187 | 5683 this->SetCondition(Condition_Disease_Weak, 1); |
| 1822 | 5684 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5685 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5686 case VAR_PoisonedYellow: |
| 2187 | 5687 this->SetCondition(Condition_Poison_Medium, 1); |
| 1822 | 5688 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5689 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5690 case VAR_DiseasedYellow: |
| 2187 | 5691 this->SetCondition(Condition_Disease_Medium, 1); |
| 1822 | 5692 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5693 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5694 case VAR_PoisonedRed: |
| 2187 | 5695 this->SetCondition(Condition_Poison_Severe, 1); |
| 1822 | 5696 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5697 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5698 case VAR_DiseasedRed: |
| 2187 | 5699 this->SetCondition(Condition_Disease_Severe, 1); |
| 1822 | 5700 PlayAwardSound_Anim(); |
| 1770 | 5701 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5702 case VAR_Paralyzed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5703 this->SetCondition(Condition_Paralyzed, 1); |
| 1822 | 5704 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5705 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5706 case VAR_Unconsious: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5707 this->SetCondition(Condition_Unconcious, 1); |
| 1822 | 5708 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5709 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5710 case VAR_Dead: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5711 this->SetCondition(Condition_Dead, 1); |
| 1822 | 5712 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5713 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5714 case VAR_Stoned: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5715 this->SetCondition(Condition_Pertified, 1); |
| 1822 | 5716 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5717 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5718 case VAR_Eradicated: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5719 this->SetCondition(Condition_Eradicated, 1); |
| 1822 | 5720 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5721 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5722 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
|
5723 pConditions.fill(0); |
| 1822 | 5724 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5725 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5726 case VAR_AutoNotes: |
| 1783 | 5727 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
|
5728 { |
| 1822 | 5729 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, GetPlayerIndex()); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5730 this->PlaySound(SPEECH_96, 0); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5731 bFlashAutonotesBook = 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5732 _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
|
5733 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5734 _449B7E_toggle_bit(pParty->_autonote_bits, var_value, 1u); |
| 1822 | 5735 PlayAwardSound(); |
|
1780
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_PlayerBits: |
| 1822 | 5738 _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
|
5739 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5740 case VAR_NPCs2: |
|
1793
4dee76d79c78
dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents:
1792
diff
changeset
|
5741 pParty->hirelingScrollPosition = 0; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5742 LOBYTE(pNPCStats->pNewNPCData[var_value].uFlags) |= 0x80u; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5743 pParty->CountHirelings(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5744 viewparams->bRedrawGameUI = true; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5745 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5746 case VAR_NumSkillPoints: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5747 this->uSkillPoints = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5748 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5749 case VAR_Counter1: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5750 case VAR_Counter2: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5751 case VAR_Counter3: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5752 case VAR_Counter4: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5753 case VAR_Counter5: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5754 case VAR_Counter6: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5755 case VAR_Counter7: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5756 case VAR_Counter8: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5757 case VAR_Counter9: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5758 case VAR_Counter10: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5759 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
|
5760 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5761 case VAR_ReputationInCurrentLocation: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5762 v24 = &pOutdoor->ddm; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5763 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5764 v24 = &pIndoor->dlv; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5765 v24->uReputation = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5766 if ( var_value > 10000 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5767 v24->uReputation = 10000; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5768 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5769 case VAR_GoldInBank: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5770 pParty->uNumGoldInBank = var_value; |
|
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_NumDeaths: |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5773 pParty->uNumDeaths = 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_NumBounties: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5776 pParty->uNumBountiesCollected = 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_PrisonTerms: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5779 pParty->uNumPrisonTerms = 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_ArenaWinsPage: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5782 pParty->uNumArenaPageWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5783 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5784 case VAR_ArenaWinsSquire: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5785 pParty->uNumArenaSquireWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5786 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5787 case VAR_ArenaWinsKnight: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5788 pParty->uNumArenaKnightWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5789 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5790 case VAR_ArenaWinsLord: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5791 pParty->uNumArenaLordWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5792 return; |
| 1782 | 5793 case VAR_StaffSkill: |
| 1822 | 5794 SetSkillByEvent(&Player::skillStaff, var_value); |
| 1782 | 5795 return; |
| 5796 case VAR_SwordSkill: | |
| 1822 | 5797 SetSkillByEvent(&Player::skillSword, var_value); |
| 1782 | 5798 return; |
| 5799 case VAR_DaggerSkill: | |
| 1822 | 5800 SetSkillByEvent(&Player::skillDagger, var_value); |
| 1782 | 5801 return; |
| 5802 case VAR_AxeSkill: | |
| 1822 | 5803 SetSkillByEvent(&Player::skillAxe, var_value); |
| 1782 | 5804 return; |
| 5805 case VAR_SpearSkill: | |
| 1822 | 5806 SetSkillByEvent(&Player::skillSpear, var_value); |
| 1782 | 5807 return; |
| 5808 case VAR_BowSkill: | |
| 1822 | 5809 SetSkillByEvent(&Player::skillBow, var_value); |
| 1782 | 5810 return; |
| 5811 case VAR_MaceSkill: | |
| 1822 | 5812 SetSkillByEvent(&Player::skillMace, var_value); |
| 1782 | 5813 return; |
| 5814 case VAR_BlasterSkill: | |
| 1822 | 5815 SetSkillByEvent(&Player::skillBlaster, var_value); |
| 1782 | 5816 return; |
| 5817 case VAR_ShieldSkill: | |
| 1822 | 5818 SetSkillByEvent(&Player::skillShield, var_value); |
| 1782 | 5819 return; |
| 5820 case VAR_LeatherSkill: | |
| 1822 | 5821 SetSkillByEvent(&Player::skillLeather, var_value); |
| 1782 | 5822 return; |
| 5823 case VAR_SkillChain: | |
| 1822 | 5824 SetSkillByEvent(&Player::skillChain, var_value); |
| 1782 | 5825 return; |
| 5826 case VAR_PlateSkill: | |
| 1822 | 5827 SetSkillByEvent(&Player::skillPlate, var_value); |
| 1782 | 5828 return; |
| 5829 case VAR_FireSkill: | |
| 1822 | 5830 SetSkillByEvent(&Player::skillFire, var_value); |
| 1782 | 5831 return; |
| 5832 case VAR_AirSkill: | |
| 1822 | 5833 SetSkillByEvent(&Player::skillAir, var_value); |
| 1782 | 5834 return; |
| 5835 case VAR_WaterSkill: | |
| 1822 | 5836 SetSkillByEvent(&Player::skillWater, var_value); |
| 1782 | 5837 return; |
| 5838 case VAR_EarthSkill: | |
| 1822 | 5839 SetSkillByEvent(&Player::skillEarth, var_value); |
| 1782 | 5840 return; |
| 5841 case VAR_SpiritSkill: | |
| 1822 | 5842 SetSkillByEvent(&Player::skillSpirit, var_value); |
| 1782 | 5843 return; |
| 5844 case VAR_MindSkill: | |
| 1822 | 5845 SetSkillByEvent(&Player::skillMind, var_value); |
| 1782 | 5846 return; |
| 5847 case VAR_BodySkill: | |
| 1822 | 5848 SetSkillByEvent(&Player::skillBody, var_value); |
| 1782 | 5849 return; |
| 5850 case VAR_LightSkill: | |
| 1822 | 5851 SetSkillByEvent(&Player::skillLight, var_value); |
| 1782 | 5852 return; |
| 5853 case VAR_DarkSkill: | |
| 1822 | 5854 SetSkillByEvent(&Player::skillDark, var_value); |
| 1782 | 5855 return; |
| 5856 case VAR_IdentifyItemSkill: | |
| 1822 | 5857 SetSkillByEvent(&Player::skillItemId, var_value); |
| 1782 | 5858 return; |
| 5859 case VAR_MerchantSkill: | |
| 1822 | 5860 SetSkillByEvent(&Player::skillMerchant, var_value); |
| 1782 | 5861 return; |
| 5862 case VAR_RepairSkill: | |
| 1822 | 5863 SetSkillByEvent(&Player::skillRepair, var_value); |
| 1782 | 5864 return; |
| 5865 case VAR_BodybuildingSkill: | |
| 1822 | 5866 SetSkillByEvent(&Player::skillBodybuilding, var_value); |
| 1782 | 5867 return; |
| 5868 case VAR_MeditationSkill: | |
| 1822 | 5869 SetSkillByEvent(&Player::skillMeditation, var_value); |
| 1782 | 5870 return; |
| 5871 case VAR_PerceptionSkill: | |
| 1822 | 5872 SetSkillByEvent(&Player::skillPerception, var_value); |
| 1782 | 5873 return; |
| 5874 case VAR_DiplomacySkill: | |
| 1822 | 5875 SetSkillByEvent(&Player::skillDiplomacy, var_value); |
| 1782 | 5876 return; |
| 5877 case VAR_ThieverySkill: | |
| 5878 Error ("Thieving unsupported"); | |
| 5879 return; | |
| 5880 case VAR_DisarmTrapSkill: | |
| 1822 | 5881 SetSkillByEvent(&Player::skillDisarmTrap, var_value); |
| 1782 | 5882 return; |
| 5883 case VAR_DodgeSkill: | |
| 1822 | 5884 SetSkillByEvent(&Player::skillDodge, var_value); |
| 1782 | 5885 return; |
| 5886 case VAR_UnarmedSkill: | |
| 1822 | 5887 SetSkillByEvent(&Player::skillUnarmed, var_value); |
| 1782 | 5888 return; |
| 5889 case VAR_IdentifyMonsterSkill: | |
| 1822 | 5890 SetSkillByEvent(&Player::skillMonsterId, var_value); |
| 1782 | 5891 return; |
| 5892 case VAR_ArmsmasterSkill: | |
| 1822 | 5893 SetSkillByEvent(&Player::skillArmsmaster, var_value); |
| 1782 | 5894 return; |
| 5895 case VAR_StealingSkill: | |
| 1822 | 5896 SetSkillByEvent(&Player::skillStealing, var_value); |
| 1782 | 5897 return; |
| 5898 case VAR_AlchemySkill: | |
| 1822 | 5899 SetSkillByEvent(&Player::skillAlchemy, var_value); |
| 1782 | 5900 return; |
| 5901 case VAR_LearningSkill: | |
| 1822 | 5902 SetSkillByEvent(&Player::skillLearning, var_value); |
| 1782 | 5903 return; |
| 5904 } | |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5905 } |
|
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 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5908 //----- (new function) -------------------------------------------------------- |
| 1822 | 5909 void Player::PlayAwardSound() |
| 5910 { | |
| 5911 int playerIndex = GetPlayerIndex(); | |
| 5912 signed int v25 = 8 * playerIndex + 400; | |
| 5913 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
|
5914 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
|
5915 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5916 |
| 1782 | 5917 //----- (new function) -------------------------------------------------------- |
| 1822 | 5918 void Player::PlayAwardSound_Anim() |
| 5919 { | |
| 5920 int playerIndex = GetPlayerIndex(); | |
| 5921 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, playerIndex); | |
| 5922 PlayAwardSound(); | |
| 1782 | 5923 } |
| 5924 | |
| 5925 //----- (new function) -------------------------------------------------------- | |
| 1822 | 5926 void Player::PlayAwardSound_Anim_Face( PlayerSpeech speech ) |
| 1782 | 5927 { |
| 5928 this->PlaySound(speech, 0); | |
| 1822 | 5929 PlayAwardSound_Anim(); |
| 1782 | 5930 } |
| 5931 | |
| 5932 //----- (new function) -------------------------------------------------------- | |
| 1822 | 5933 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
|
5934 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5935 unsigned __int16 currSkillValue = this->*skillToSet; |
| 1822 | 5936 if ( skillValue > 63 ) //the original had the condition reversed which was probably wrong |
| 5937 { | |
| 5938 this->*skillToSet = skillValue | currSkillValue & 63; | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5939 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5940 else |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5941 { |
| 1822 | 5942 this->*skillToSet = skillValue | currSkillValue & 0xC0; |
| 5943 } | |
| 5944 int playerIndex = GetPlayerIndex(); | |
| 5945 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, playerIndex); | |
| 5946 PlayAwardSound(); | |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5947 } |
| 0 | 5948 |
| 5949 //----- (0044AFFB) -------------------------------------------------------- | |
| 310 | 5950 void Player::AddVariable(enum VariableType var_type, signed int val) |
| 0 | 5951 { |
| 5952 int v6; // eax@15 | |
| 5953 unsigned int v7; // esi@18 | |
| 5954 DDM_DLV_Header *v27; // eax@153 | |
| 5955 ItemGen item; // [sp+Ch] [bp-2Ch]@45 | |
| 310 | 5956 |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5957 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
|
5958 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5959 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
|
5960 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5961 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5962 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5963 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
|
5964 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5965 pParty->PartyTimes._s_times[var_type - VAR_UnknownTimeEvent0] = pParty->uTimePlayed; |
| 1822 | 5966 PlayAwardSound(); |
| 1788 | 5967 return; |
| 0 | 5968 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5969 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5970 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
|
5971 { |
| 1822 | 5972 |
| 5973 if ( var_type >= VAR_MapPersistentVariable_0 && var_type <= VAR_MapPersistentVariable_74 ) | |
| 5974 { | |
| 5975 if (255 - val > stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0]) | |
| 5976 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] += val; | |
| 5977 else | |
| 5978 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] = 255; | |
| 5979 } | |
| 5980 if ( (signed int)var_type >= VAR_MapPersistentVariable_75 && var_type <= VAR_MapPersistentVariable_99 ) | |
| 5981 { | |
| 5982 if (255 - val > stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75]) | |
| 5983 stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75] += val; | |
| 5984 else | |
| 5985 stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75] = 255; | |
| 5986 } | |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5987 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5988 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5989 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5990 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
|
5991 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5992 if (!pParty->PartyTimes.HistoryEventTimes[var_type - VAR_History_0]) |
| 0 | 5993 { |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5994 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
|
5995 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
|
5996 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5997 bFlashHistoryBook = 1; |
| 1822 | 5998 PlayAwardSound(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5999 } |
| 0 | 6000 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6001 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6002 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6003 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6004 switch ( var_type ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6005 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6006 case VAR_RandomGold: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6007 if ( val == 0 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6008 val = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6009 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
|
6010 pParty->PartyFindsGold(v6 % val + 1, 1); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6011 GameUI_DrawFoodAndGold(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6012 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6013 case VAR_RandomFood: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6014 if ( val == 0 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6015 val = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6016 v7 = rand() % val + 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6017 Party::GiveFood(v7); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6018 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
|
6019 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6020 GameUI_DrawFoodAndGold(); |
| 1822 | 6021 PlayAwardSound(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6022 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6023 case VAR_Sex: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6024 this->uSex = (PLAYER_SEX)val; |
| 1822 | 6025 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6026 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6027 case VAR_Class: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6028 this->classType = (PLAYER_CLASS_TYPE)val; |
| 1822 | 6029 PlayAwardSound_Anim97(); |
|
1792
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_CurrentHP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6032 this->sHealth = min(this->sHealth + val, this->GetMaxHealth() ); |
| 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_MaxHP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6036 this->_health_related = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6037 this->uFullHealthBonus = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6038 this->sHealth = this->GetMaxHealth(); |
|
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_CurrentSP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6041 this->sMana = min(this->sMana + val, this->GetMaxMana() ); |
| 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_MaxSP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6045 this->_mana_related = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6046 this->uFullManaBonus = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6047 this->sMana = GetMaxMana(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6048 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6049 case VAR_ACModifier: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6050 this->sACModifier = min(this->sACModifier + val, 255); |
| 1822 | 6051 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6052 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6053 case VAR_BaseLevel: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6054 this->uLevel = min(this->uLevel + val, 255); |
| 1822 | 6055 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6056 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6057 case VAR_LevelModifier: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6058 this->sLevelModifier = min(this->sLevelModifier + val, 255); |
| 1822 | 6059 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6060 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6061 case VAR_Age: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6062 this->sAgeModifier += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6063 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6064 case VAR_Award: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6065 if (_449B57_test_bit(this->_achieved_awards_bits, val) && pAwards[val].pText ) |
| 310 | 6066 { |
| 1822 | 6067 PlayAwardSound_Anim97_Face(SPEECH_96); |
| 0 | 6068 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6069 _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
|
6070 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6071 case VAR_Experience: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6072 this->uExperience = min(this->uExperience + val, 4000000000i64); |
| 1822 | 6073 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6074 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6075 case VAR_QBits_QuestsDone: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6076 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
|
6077 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6078 bFlashQuestBook = 1; |
| 1822 | 6079 PlayAwardSound_Anim97_Face(SPEECH_93); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6080 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6081 _449B7E_toggle_bit(pParty->_quest_bits, val, 1); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6082 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6083 case VAR_PlayerItemInHands: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6084 item.Reset(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6085 item.uAttributes = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6086 item.uItemID = val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6087 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
|
6088 pParty->pIsArtifactFound[val-500] = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6089 else if ( val >= ITEM_WAND_FIRE && val <= ITEM_WAND_INCENERATION ) |
| 0 | 6090 { |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6091 item.uNumCharges = rand() % 6 + item.GetDamageMod() + 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6092 item.uMaxCharges = LOBYTE(item.uNumCharges); |
| 0 | 6093 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6094 pParty->SetHoldingItem(&item); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6095 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6096 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
|
6097 pParty->PartyFindsGold(val, 1); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6098 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6099 case VAR_BaseMight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6100 this->uMight = min(this->uMight + val, 255); |
| 1822 | 6101 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6102 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6103 case VAR_BaseIntellect: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6104 this->uIntelligence = min(this->uIntelligence + val, 255); |
| 1822 | 6105 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6106 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6107 case VAR_BasePersonality: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6108 this->uWillpower = min(this->uWillpower + val, 255); |
| 1822 | 6109 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6110 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6111 case VAR_BaseEndurance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6112 this->uEndurance = min(this->uEndurance + val, 255); |
| 1822 | 6113 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6114 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6115 case VAR_BaseSpeed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6116 this->uSpeed = min(this->uSpeed + val, 255); |
| 1822 | 6117 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6118 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6119 case VAR_BaseAccuracy: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6120 this->uAccuracy = min(this->uAccuracy + val, 255); |
| 1822 | 6121 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6122 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6123 case VAR_BaseLuck: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6124 this->uLuck = min(this->uLuck + val, 255); |
| 1822 | 6125 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6126 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6127 case VAR_FixedFood: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6128 Party::GiveFood(val); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6129 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[502], val); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6130 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6131 if ( pParty->uNumFoodRations > 0xFFFF ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6132 Party::SetFood(0xFFFFu); |
| 1822 | 6133 PlayAwardSound(); |
| 1788 | 6134 return; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6135 case VAR_MightBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6136 case VAR_ActualMight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6137 this->uMightBonus = min(this->uMightBonus + val, 255); |
| 1822 | 6138 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6139 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6140 case VAR_IntellectBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6141 case VAR_ActualIntellect: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6142 this->uIntelligenceBonus = min(this->uIntelligenceBonus + val, 255); |
| 1822 | 6143 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6144 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6145 case VAR_PersonalityBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6146 case VAR_ActualPersonality: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6147 this->uWillpowerBonus = min(this->uWillpowerBonus + val, 255); |
| 1822 | 6148 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6149 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6150 case VAR_EnduranceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6151 case VAR_ActualEndurance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6152 this->uEnduranceBonus = min(this->uEnduranceBonus + val, 255); |
| 1822 | 6153 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6154 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6155 case VAR_SpeedBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6156 case VAR_ActualSpeed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6157 this->uSpeedBonus = min(this->uSpeedBonus + val, 255); |
| 1822 | 6158 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6159 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6160 case VAR_AccuracyBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6161 case VAR_ActualAccuracy: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6162 this->uAccuracyBonus = min(this->uAccuracyBonus + val, 255); |
| 1822 | 6163 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
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_LuckBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6166 case VAR_ActualLuck: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6167 this->uLuckBonus = min(this->uLuckBonus + val, 255); |
| 1822 | 6168 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6169 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6170 case VAR_FireResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6171 this->sResFireBase = min(this->sResFireBase + val, 255); |
| 1822 | 6172 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6173 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6174 case VAR_AirResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6175 this->sResAirBase = min(this->sResAirBase + val, 255); |
| 1822 | 6176 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6177 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6178 case VAR_WaterResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6179 this->sResWaterBase = min(this->sResWaterBase + val, 255); |
| 1822 | 6180 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6181 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6182 case VAR_EarthResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6183 this->sResEarthBase = min(this->sResEarthBase + val, 255); |
| 1822 | 6184 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6185 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6186 case VAR_SpiritResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6187 this->sResSpiritBase = min(this->sResSpiritBase + val, 255); |
| 1822 | 6188 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6189 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6190 case VAR_MindResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6191 this->sResMindBase = min(this->sResMindBase + val, 255); |
| 1822 | 6192 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6193 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6194 case VAR_BodyResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6195 this->sResBodyBase = min(this->sResBodyBase + val, 255); |
| 1822 | 6196 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6197 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6198 case VAR_LightResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6199 this->sResLightBase = min(this->sResLightBase + val, 255); |
| 1822 | 6200 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6201 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6202 case VAR_DarkResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6203 this->sResDarkBase = min(this->sResDarkBase + val, 255); |
| 1822 | 6204 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6205 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6206 case VAR_MagicResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6207 this->sResMagicBase = min(this->sResMagicBase + val, 255); |
| 1822 | 6208 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6209 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6210 case VAR_FireResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6211 this->sResFireBonus = min(this->sResFireBonus + val, 255); |
| 1822 | 6212 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6213 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6214 case VAR_AirResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6215 this->sResAirBonus = min(this->sResAirBonus + val, 255); |
| 1822 | 6216 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6217 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6218 case VAR_WaterResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6219 this->sResWaterBonus = min(this->sResWaterBonus + val, 255); |
| 1822 | 6220 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6221 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6222 case VAR_EarthResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6223 this->sResEarthBonus = min(this->sResEarthBonus + val, 255); |
| 1822 | 6224 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6225 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6226 case VAR_SpiritResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6227 this->sResSpiritBonus = min(this->sResSpiritBonus + val, 255); |
| 1822 | 6228 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6229 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6230 case VAR_MindResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6231 this->sResMindBonus = min(this->sResMindBonus + val, 255); |
| 1822 | 6232 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6233 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6234 case VAR_BodyResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6235 this->sResBodyBonus = min(this->sResBodyBonus + val, 255); |
| 1822 | 6236 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6237 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6238 case VAR_LightResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6239 this->sResLightBonus = min(this->sResLightBonus + val, 255); |
| 1822 | 6240 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6241 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6242 case VAR_DarkResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6243 this->sResDarkBonus = min(this->sResDarkBonus + val, 255); |
| 1822 | 6244 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6245 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6246 case VAR_MagicResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6247 this->sResMagicBonus = min(this->sResMagicBonus + val, 255); |
| 1822 | 6248 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6249 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6250 case VAR_Cursed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6251 this->SetCondition(Condition_Cursed, 1); |
| 1822 | 6252 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6253 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6254 case VAR_Weak: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6255 this->SetCondition(Condition_Weak, 1); |
| 1822 | 6256 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6257 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6258 case VAR_Asleep: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6259 this->SetCondition(Condition_Sleep, 1); |
| 1822 | 6260 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6261 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6262 case VAR_Afraid: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6263 this->SetCondition(Condition_Fear, 1); |
| 1822 | 6264 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6265 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6266 case VAR_Drunk: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6267 this->SetCondition(Condition_Drunk, 1); |
| 1822 | 6268 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6269 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6270 case VAR_Insane: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6271 this->SetCondition(Condition_Insane, 1); |
| 1822 | 6272 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6273 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6274 case VAR_PoisonedGreen: |
| 2187 | 6275 this->SetCondition(Condition_Poison_Weak, 1); |
| 1822 | 6276 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6277 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6278 case VAR_DiseasedGreen: |
| 2187 | 6279 this->SetCondition(Condition_Disease_Weak, 1); |
| 1822 | 6280 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6281 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6282 case VAR_PoisonedYellow: |
| 2187 | 6283 this->SetCondition(Condition_Poison_Medium, 1); |
| 1822 | 6284 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6285 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6286 case VAR_DiseasedYellow: |
| 2187 | 6287 this->SetCondition(Condition_Disease_Medium, 1); |
| 1822 | 6288 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6289 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6290 case VAR_PoisonedRed: |
| 2187 | 6291 this->SetCondition(Condition_Poison_Severe, 1); |
| 1822 | 6292 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6293 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6294 case VAR_DiseasedRed: |
| 2187 | 6295 this->SetCondition(Condition_Disease_Severe, 1); |
| 1822 | 6296 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6297 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6298 case VAR_Paralyzed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6299 this->SetCondition(Condition_Paralyzed, 1); |
| 1822 | 6300 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6301 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6302 case VAR_Unconsious: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6303 this->SetCondition(Condition_Unconcious, 1); |
| 1822 | 6304 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6305 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6306 case VAR_Dead: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6307 this->SetCondition(Condition_Dead, 1); |
| 1822 | 6308 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6309 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6310 case VAR_Stoned: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6311 this->SetCondition(Condition_Pertified, 1); |
| 1822 | 6312 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6313 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6314 case VAR_Eradicated: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6315 this->SetCondition(Condition_Eradicated, 1); |
| 1822 | 6316 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6317 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6318 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
|
6319 pConditions.fill(0); |
| 1822 | 6320 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6321 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6322 case VAR_AutoNotes: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6323 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
|
6324 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6325 this->PlaySound(SPEECH_96, 0); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6326 bFlashAutonotesBook = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6327 _506568_autonote_type = pAutonoteTxt[val].eType; |
| 1822 | 6328 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, GetPlayerIndex()); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6329 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6330 _449B7E_toggle_bit(pParty->_autonote_bits, val, 1); |
| 1822 | 6331 PlayAwardSound(); |
| 0 | 6332 return; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6333 case VAR_PlayerBits: |
| 1822 | 6334 _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
|
6335 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6336 case VAR_NPCs2: |
|
1793
4dee76d79c78
dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents:
1792
diff
changeset
|
6337 pParty->hirelingScrollPosition = 0; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6338 LOBYTE(pNPCStats->pNewNPCData[val].uFlags) |= 0x80u; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6339 pParty->CountHirelings(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6340 viewparams->bRedrawGameUI = true; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6341 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6342 case VAR_NumSkillPoints: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6343 this->uSkillPoints += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6344 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6345 case VAR_ReputationInCurrentLocation: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6346 v27 = &pOutdoor->ddm; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6347 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6348 v27 = &pIndoor->dlv; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6349 v27->uReputation += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6350 if ( v27->uReputation > 10000 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6351 v27->uReputation = 10000; |
|
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_GoldInBank: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6354 pParty->uNumGoldInBank += 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_NumDeaths: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6357 pParty->uNumDeaths += 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_NumBounties: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6360 pParty->uNumBountiesCollected += 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_PrisonTerms: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6363 pParty->uNumPrisonTerms += 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_ArenaWinsPage: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6366 pParty->uNumArenaPageWins += 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_ArenaWinsSquire: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6369 pParty->uNumArenaSquireWins += val; |
|
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_ArenaWinsKnight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6372 pParty->uNumArenaKnightWins += val; |
|
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_ArenaWinsLord: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6375 pParty->uNumArenaLordWins += val; |
|
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_StaffSkill: |
| 1822 | 6378 AddSkillByEvent(&Player::skillStaff, 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_SwordSkill: |
| 1822 | 6381 AddSkillByEvent(&Player::skillSword, 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_DaggerSkill: |
| 1822 | 6384 AddSkillByEvent(&Player::skillDagger, 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_AxeSkill: |
| 1822 | 6387 AddSkillByEvent(&Player::skillAxe, 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_SpearSkill: |
| 1822 | 6390 AddSkillByEvent(&Player::skillSpear, 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_BowSkill: |
| 1822 | 6393 AddSkillByEvent(&Player::skillBow, 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_MaceSkill: |
| 1822 | 6396 AddSkillByEvent(&Player::skillMace, 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_BlasterSkill: |
| 1822 | 6399 AddSkillByEvent(&Player::skillBlaster, 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_ShieldSkill: |
| 1822 | 6402 AddSkillByEvent(&Player::skillShield, 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_LeatherSkill: |
| 1822 | 6405 AddSkillByEvent(&Player::skillLeather, 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_SkillChain: |
| 1822 | 6408 AddSkillByEvent(&Player::skillChain, 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_PlateSkill: |
| 1822 | 6411 AddSkillByEvent(&Player::skillPlate, 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_FireSkill: |
| 1822 | 6414 AddSkillByEvent(&Player::skillFire, 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_AirSkill: |
| 1822 | 6417 AddSkillByEvent(&Player::skillAir, 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_WaterSkill: |
| 1822 | 6420 AddSkillByEvent(&Player::skillWater, 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_EarthSkill: |
| 1822 | 6423 AddSkillByEvent(&Player::skillEarth, 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_SpiritSkill: |
| 1822 | 6426 AddSkillByEvent(&Player::skillSpirit, 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_MindSkill: |
| 1822 | 6429 AddSkillByEvent(&Player::skillMind, 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_BodySkill: |
| 1822 | 6432 AddSkillByEvent(&Player::skillBody, 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_LightSkill: |
| 1822 | 6435 AddSkillByEvent(&Player::skillLight, 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_DarkSkill: |
| 1822 | 6438 AddSkillByEvent(&Player::skillDark, 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_IdentifyItemSkill: |
| 1822 | 6441 AddSkillByEvent(&Player::skillItemId, 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_MerchantSkill: |
| 1822 | 6444 AddSkillByEvent(&Player::skillMerchant, 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_RepairSkill: |
| 1822 | 6447 AddSkillByEvent(&Player::skillRepair, 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_BodybuildingSkill: |
| 1822 | 6450 AddSkillByEvent(&Player::skillBodybuilding, 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_MeditationSkill: |
| 1822 | 6453 AddSkillByEvent(&Player::skillMeditation, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6454 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6455 case VAR_PerceptionSkill: |
| 1822 | 6456 AddSkillByEvent(&Player::skillPerception, 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_DiplomacySkill: |
| 1822 | 6459 AddSkillByEvent(&Player::skillDiplomacy, 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_ThieverySkill: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6462 Error ("Thieving unsupported"); |
|
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_DisarmTrapSkill: |
| 1822 | 6465 AddSkillByEvent(&Player::skillDisarmTrap, 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_DodgeSkill: |
| 1822 | 6468 AddSkillByEvent(&Player::skillDodge, 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_UnarmedSkill: |
| 1822 | 6471 AddSkillByEvent(&Player::skillUnarmed, 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_IdentifyMonsterSkill: |
| 1822 | 6474 AddSkillByEvent(&Player::skillMonsterId, 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_ArmsmasterSkill: |
| 1822 | 6477 AddSkillByEvent(&Player::skillArmsmaster, 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 case VAR_StealingSkill: |
| 1822 | 6480 AddSkillByEvent(&Player::skillStealing, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6481 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6482 case VAR_AlchemySkill: |
| 1822 | 6483 AddSkillByEvent(&Player::skillAlchemy, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6484 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6485 case VAR_LearningSkill: |
| 1822 | 6486 AddSkillByEvent(&Player::skillLearning, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6487 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6488 default: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6489 return; |
| 0 | 6490 } |
| 6491 } | |
| 6492 | |
| 1791 | 6493 //----- (new function) -------------------------------------------------------- |
| 1822 | 6494 void Player::PlayAwardSound_Anim97() |
| 6495 { | |
| 6496 int playerIndex = GetPlayerIndex(); | |
| 6497 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, playerIndex); | |
| 6498 PlayAwardSound(); | |
| 1791 | 6499 } |
| 6500 | |
| 6501 //----- (new function) -------------------------------------------------------- | |
| 1822 | 6502 void Player::PlayAwardSound_Anim97_Face( PlayerSpeech speech ) |
| 1791 | 6503 { |
| 6504 this->PlaySound(speech, 0); | |
| 1822 | 6505 PlayAwardSound_Anim97(); |
| 1791 | 6506 } |
| 6507 | |
| 6508 //----- (new function) -------------------------------------------------------- | |
| 1822 | 6509 void Player::AddSkillByEvent( unsigned __int16 Player::* skillToSet, unsigned __int16 addSkillValue ) |
| 1791 | 6510 { |
| 6511 if ( addSkillValue > 63 ) | |
| 6512 { | |
| 6513 this->*skillToSet = (unsigned __int8)addSkillValue | this->*skillToSet & 63; | |
| 6514 } | |
| 6515 else | |
| 6516 { | |
| 6517 this->*skillToSet = min(this->*skillToSet + addSkillValue, 60) | this->*skillToSet & 0xC0; | |
| 6518 } | |
| 1822 | 6519 PlayAwardSound_Anim97(); |
| 1791 | 6520 return; |
| 6521 } | |
| 0 | 6522 |
| 6523 //----- (0044B9C4) -------------------------------------------------------- | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6524 void Player::SubtractVariable( enum VariableType VarNum, signed int pValue ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6525 { |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6526 DDM_DLV_Header *locationHeader; // eax@90 |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6527 int randGold; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6528 int randFood; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6529 int npcIndex; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6530 |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6531 if ( VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_99 ) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6532 { |
| 1822 | 6533 if ( VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_74 ) |
| 6534 { | |
| 6535 stru_5E4C90_MapPersistVars.field_0[VarNum - VAR_MapPersistentVariable_0] -= pValue; | |
| 6536 } | |
| 6537 if ( (signed int)VarNum >= VAR_MapPersistentVariable_75 && VarNum <= VAR_MapPersistentVariable_99 ) | |
| 6538 { | |
| 6539 stru_5E4C90_MapPersistVars._decor_events[VarNum - VAR_MapPersistentVariable_75] -= pValue; | |
| 6540 } | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6541 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6542 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6543 |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6544 switch (VarNum) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6545 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6546 case VAR_CurrentHP: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6547 ReceiveDamage((signed int)pValue, DMGT_PHISYCAL); |
| 1822 | 6548 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6549 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6550 case VAR_CurrentSP: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6551 this->sMana = max(this->sMana - pValue, 0); |
| 1822 | 6552 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6553 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6554 case VAR_ACModifier: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6555 this->sACModifier -= (unsigned __int8)pValue; |
| 1822 | 6556 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6557 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6558 case VAR_BaseLevel: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6559 this->uLevel -= (unsigned __int8)pValue; |
| 1822 | 6560 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6561 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6562 case VAR_LevelModifier: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6563 this->sLevelModifier -= (unsigned __int8)pValue; |
| 1822 | 6564 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6565 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6566 case VAR_Age: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6567 this->sAgeModifier -= (signed __int16)pValue; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6568 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6569 case VAR_Award: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6570 _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
|
6571 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6572 case VAR_Experience: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6573 this->uExperience -= pValue; |
| 1822 | 6574 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6575 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6576 case VAR_QBits_QuestsDone: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6577 _449B7E_toggle_bit(pParty->_quest_bits, (__int16)pValue, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6578 this->PlaySound(SPEECH_96, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6579 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6580 case VAR_PlayerItemInHands: |
| 2025 | 6581 for ( uint i = 0; i < 16; ++i ) |
| 6582 { | |
| 6583 int id_ = this->pEquipment.pIndices[i]; | |
| 6584 if ( id_ > 0 ) | |
| 6585 { | |
| 6586 if ( this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID == pValue ) | |
| 6587 { | |
| 6588 this->pEquipment.pIndices[i] = 0; | |
| 6589 } | |
| 6590 } | |
| 6591 } | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6592 for (int i = 0; i < 126; i++) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6593 { |
| 2025 | 6594 int id_ = this->pInventoryMatrix[i]; |
| 6595 if ( id_ > 0 ) | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6596 { |
| 2025 | 6597 if ( this->pInventoryItemList[id_ - 1].uItemID == pValue ) |
| 6598 { | |
| 6599 RemoveItemAtInventoryIndex(i); | |
| 6600 return; | |
| 6601 } | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6602 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6603 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6604 if ( pParty->pPickedItem.uItemID == pValue ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6605 { |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6606 pMouse->RemoveHoldingItem(); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6607 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6608 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6609 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6610 case VAR_FixedGold: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6611 if ( (unsigned int)pValue > pParty->uNumGold ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6612 { |
|
1825
23deb6b09c8c
cancelEventProcessing to dword_5B65C4_cancelEventProcessing
Grumpy7
parents:
1822
diff
changeset
|
6613 dword_5B65C4_cancelEventProcessing = 1; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6614 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6615 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6616 Party::TakeGold((unsigned int)pValue); |
|
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_RandomGold: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6619 randGold = rand() % (signed int)pValue + 1; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6620 if ( (unsigned int)randGold > pParty->uNumGold ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6621 randGold = pParty->uNumGold; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6622 Party::TakeGold(randGold); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6623 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[503], randGold); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6624 ShowStatusBarString(pTmpBuf.data(), 2); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6625 GameUI_DrawFoodAndGold(); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6626 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6627 case VAR_FixedFood: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6628 Party::TakeFood((unsigned int)pValue); |
| 1822 | 6629 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6630 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6631 case VAR_RandomFood: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6632 randFood = rand() % (signed int)pValue + 1; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6633 if ( (unsigned int)randFood > pParty->uNumFoodRations ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6634 randFood = pParty->uNumFoodRations; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6635 Party::TakeFood(randFood); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6636 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[504], randFood); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6637 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6638 GameUI_DrawFoodAndGold(); |
| 1822 | 6639 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6640 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6641 case VAR_MightBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6642 case VAR_ActualMight: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6643 this->uMightBonus -= (unsigned __int16)pValue; |
| 1822 | 6644 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6645 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6646 case VAR_IntellectBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6647 case VAR_ActualIntellect: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6648 this->uIntelligenceBonus -= (unsigned __int16)pValue; |
| 1822 | 6649 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6650 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6651 case VAR_PersonalityBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6652 case VAR_ActualPersonality: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6653 this->uWillpowerBonus -= (unsigned __int16)pValue; |
| 1822 | 6654 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6655 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6656 case VAR_EnduranceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6657 case VAR_ActualEndurance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6658 this->uEnduranceBonus -= (unsigned __int16)pValue; |
| 1822 | 6659 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6660 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6661 case VAR_SpeedBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6662 case VAR_ActualSpeed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6663 this->uSpeedBonus -= (unsigned __int16)pValue; |
| 1822 | 6664 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6665 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6666 case VAR_AccuracyBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6667 case VAR_ActualAccuracy: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6668 this->uAccuracyBonus -= (unsigned __int16)pValue; |
| 1822 | 6669 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
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_LuckBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6672 case VAR_ActualLuck: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6673 this->uLuckBonus -= (unsigned __int16)pValue; |
| 1822 | 6674 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6675 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6676 case VAR_BaseMight: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6677 this->uMight -= (unsigned __int16)pValue; |
| 1822 | 6678 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6679 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6680 case VAR_BaseIntellect: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6681 this->uIntelligence -= (unsigned __int16)pValue; |
| 1822 | 6682 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6683 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6684 case VAR_BasePersonality: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6685 this->uWillpower -= (unsigned __int16)pValue; |
| 1822 | 6686 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6687 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6688 case VAR_BaseEndurance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6689 this->uEndurance -= (unsigned __int16)pValue; |
| 1822 | 6690 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6691 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6692 case VAR_BaseSpeed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6693 this->uSpeed -= (unsigned __int16)pValue; |
| 1822 | 6694 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6695 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6696 case VAR_BaseAccuracy: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6697 this->uAccuracy -= (unsigned __int16)pValue; |
| 1822 | 6698 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6699 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6700 case VAR_BaseLuck: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6701 this->uLuck -= (unsigned __int16)pValue; |
| 1822 | 6702 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6703 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6704 case VAR_FireResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6705 this->sResFireBase -= (signed __int16)pValue; |
| 1822 | 6706 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6707 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6708 case VAR_AirResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6709 this->sResAirBase -= (signed __int16)pValue; |
| 1822 | 6710 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6711 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6712 case VAR_WaterResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6713 this->sResWaterBase -= (signed __int16)pValue; |
| 1822 | 6714 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6715 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6716 case VAR_EarthResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6717 this->sResEarthBase -= (signed __int16)pValue; |
| 1822 | 6718 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6719 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6720 case VAR_SpiritResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6721 this->sResSpiritBase -= (signed __int16)pValue; |
| 1822 | 6722 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6723 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6724 case VAR_MindResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6725 this->sResMindBase -= (signed __int16)pValue; |
| 1822 | 6726 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6727 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6728 case VAR_BodyResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6729 this->sResBodyBase -= (signed __int16)pValue; |
| 1822 | 6730 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6731 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6732 case VAR_LightResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6733 this->sResLightBase -= (signed __int16)pValue; |
| 1822 | 6734 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6735 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6736 case VAR_DarkResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6737 this->sResDarkBase -= (signed __int16)pValue; |
| 1822 | 6738 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6739 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6740 case VAR_MagicResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6741 this->sResMagicBase -= (signed __int16)pValue; |
| 1822 | 6742 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6743 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6744 case VAR_FireResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6745 this->sResFireBonus -= (signed __int16)pValue; |
| 1822 | 6746 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6747 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6748 case VAR_AirResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6749 this->sResAirBonus -= (signed __int16)pValue; |
| 1822 | 6750 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6751 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6752 case VAR_WaterResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6753 this->sResWaterBonus -= (signed __int16)pValue; |
| 1822 | 6754 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6755 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6756 case VAR_EarthResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6757 this->sResEarthBonus -= (signed __int16)pValue; |
| 1822 | 6758 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6759 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6760 case VAR_SpiritResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6761 this->sResSpiritBonus -= (signed __int16)pValue; |
| 1822 | 6762 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6763 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6764 case VAR_MindResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6765 this->sResMindBonus -= (signed __int16)pValue; |
| 1822 | 6766 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6767 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6768 case VAR_BodyResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6769 this->sResBodyBonus -= (signed __int16)pValue; |
| 1822 | 6770 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6771 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6772 case VAR_LightResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6773 this->sResLightBonus -= (signed __int16)pValue; |
| 1822 | 6774 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6775 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6776 case VAR_DarkResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6777 this->sResDarkBonus -= (signed __int16)pValue; |
| 1822 | 6778 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6779 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6780 case VAR_MagicResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6781 this->sResMagicBonus -= (signed __int16)pValue; |
| 1822 | 6782 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6783 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6784 case VAR_StaffSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6785 this->skillStaff -= (unsigned __int8)pValue; |
| 1822 | 6786 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6787 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6788 case VAR_SwordSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6789 this->skillSword -= (unsigned __int8)pValue; |
| 1822 | 6790 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6791 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6792 case VAR_DaggerSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6793 this->skillDagger -= (unsigned __int8)pValue; |
| 1822 | 6794 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6795 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6796 case VAR_AxeSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6797 this->skillAxe -= (unsigned __int8)pValue; |
| 1822 | 6798 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6799 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6800 case VAR_SpearSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6801 this->skillSpear -= (unsigned __int8)pValue; |
| 1822 | 6802 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6803 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6804 case VAR_BowSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6805 this->skillBow -= (unsigned __int8)pValue; |
| 1822 | 6806 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6807 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6808 case VAR_MaceSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6809 this->skillMace -= (unsigned __int8)pValue; |
| 1822 | 6810 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6811 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6812 case VAR_BlasterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6813 this->skillBlaster -= (unsigned __int8)pValue; |
| 1822 | 6814 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6815 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6816 case VAR_ShieldSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6817 this->skillShield -= (unsigned __int8)pValue; |
| 1822 | 6818 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6819 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6820 case VAR_LeatherSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6821 this->skillLearning -= (unsigned __int8)pValue; |
| 1822 | 6822 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6823 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6824 case VAR_SkillChain: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6825 this->skillChain -= (unsigned __int8)pValue; |
| 1822 | 6826 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6827 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6828 case VAR_PlateSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6829 this->skillPlate -= (unsigned __int8)pValue; |
| 1822 | 6830 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6831 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6832 case VAR_FireSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6833 this->skillFire -= (unsigned __int8)pValue; |
| 1822 | 6834 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6835 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6836 case VAR_AirSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6837 this->skillAir -= (unsigned __int8)pValue; |
| 1822 | 6838 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6839 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6840 case VAR_WaterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6841 this->skillWater -= (unsigned __int8)pValue; |
| 1822 | 6842 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6843 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6844 case VAR_EarthSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6845 this->skillEarth -= (unsigned __int8)pValue; |
| 1822 | 6846 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6847 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6848 case VAR_SpiritSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6849 this->skillSpirit -= (unsigned __int8)pValue; |
| 1822 | 6850 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6851 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6852 case VAR_MindSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6853 this->skillMind -= (unsigned __int8)pValue; |
| 1822 | 6854 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6855 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6856 case VAR_BodySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6857 this->skillBody -= (unsigned __int8)pValue; |
| 1822 | 6858 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6859 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6860 case VAR_LightSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6861 this->skillLight -= (unsigned __int8)pValue; |
| 1822 | 6862 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6863 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6864 case VAR_DarkSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6865 this->skillDark -= (unsigned __int8)pValue; |
| 1822 | 6866 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6867 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6868 case VAR_IdentifyItemSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6869 this->skillItemId -= (unsigned __int8)pValue; |
| 1822 | 6870 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6871 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6872 case VAR_MerchantSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6873 this->skillMerchant -= (unsigned __int8)pValue; |
| 1822 | 6874 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6875 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6876 case VAR_RepairSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6877 this->skillRepair -= (unsigned __int8)pValue; |
| 1822 | 6878 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6879 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6880 case VAR_BodybuildingSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6881 this->skillBodybuilding -= (unsigned __int8)pValue; |
| 1822 | 6882 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6883 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6884 case VAR_MeditationSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6885 this->skillMeditation -= (unsigned __int8)pValue; |
| 1822 | 6886 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6887 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6888 case VAR_PerceptionSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6889 this->skillPerception -= (unsigned __int8)pValue; |
| 1822 | 6890 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6891 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6892 case VAR_DiplomacySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6893 this->skillDiplomacy -= (unsigned __int8)pValue; |
| 1822 | 6894 PlayAwardSound_Anim98(); |
| 6895 return; | |
| 6896 case VAR_ThieverySkill: | |
| 6897 Error ("Thieving unsupported"); | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6898 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6899 case VAR_DisarmTrapSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6900 this->skillDisarmTrap -= (unsigned __int8)pValue; |
| 1822 | 6901 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6902 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6903 case VAR_DodgeSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6904 this->skillDodge -= (unsigned __int8)pValue; |
| 1822 | 6905 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6906 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6907 case VAR_UnarmedSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6908 this->skillUnarmed -= (unsigned __int8)pValue; |
| 1822 | 6909 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6910 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6911 case VAR_IdentifyMonsterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6912 this->skillMonsterId -= (unsigned __int8)pValue; |
| 1822 | 6913 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6914 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6915 case VAR_ArmsmasterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6916 this->skillArmsmaster -= (unsigned __int8)pValue; |
| 1822 | 6917 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6918 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6919 case VAR_StealingSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6920 this->skillStealing -= (unsigned __int8)pValue; |
| 1822 | 6921 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6922 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6923 case VAR_AlchemySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6924 this->skillAlchemy -= (unsigned __int8)pValue; |
| 1822 | 6925 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6926 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6927 case VAR_LearningSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6928 this->skillLearning -= (unsigned __int8)pValue; |
| 1822 | 6929 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6930 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6931 case VAR_Cursed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6932 this->pConditions[Condition_Cursed] = 0; |
| 1822 | 6933 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6934 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6935 case VAR_Weak: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6936 this->pConditions[Condition_Weak] = 0; |
| 1822 | 6937 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6938 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6939 case VAR_Asleep: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6940 this->pConditions[Condition_Sleep] = 0; |
| 1822 | 6941 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6942 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6943 case VAR_Afraid: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6944 this->pConditions[Condition_Fear] = 0; |
| 1822 | 6945 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6946 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6947 case VAR_Drunk: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6948 this->pConditions[Condition_Drunk] = 0; |
| 1822 | 6949 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6950 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6951 case VAR_Insane: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6952 this->pConditions[Condition_Insane] = 0; |
| 1822 | 6953 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6954 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6955 case VAR_PoisonedGreen: |
| 2187 | 6956 this->pConditions[Condition_Poison_Weak] = 0; |
| 1822 | 6957 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6958 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6959 case VAR_DiseasedGreen: |
| 2187 | 6960 this->pConditions[Condition_Disease_Weak] = 0; |
| 1822 | 6961 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6962 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6963 case VAR_PoisonedYellow: |
| 2187 | 6964 this->pConditions[Condition_Poison_Medium] = 0; |
| 1822 | 6965 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6966 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6967 case VAR_DiseasedYellow: |
| 2187 | 6968 this->pConditions[Condition_Disease_Medium] = 0; |
| 1822 | 6969 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6970 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6971 case VAR_PoisonedRed: |
| 2187 | 6972 this->pConditions[Condition_Poison_Severe] = 0; |
| 1822 | 6973 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6974 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6975 case VAR_DiseasedRed: |
| 2187 | 6976 this->pConditions[Condition_Disease_Severe] = 0; |
| 1822 | 6977 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6978 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6979 case VAR_Paralyzed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6980 this->pConditions[Condition_Paralyzed] = 0; |
| 1822 | 6981 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6982 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6983 case VAR_Unconsious: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6984 this->pConditions[Condition_Unconcious] = 0; |
| 1822 | 6985 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6986 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6987 case VAR_Dead: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6988 this->pConditions[Condition_Dead] = 0; |
| 1822 | 6989 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6990 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6991 case VAR_Stoned: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6992 this->pConditions[Condition_Pertified] = 0; |
| 1822 | 6993 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6994 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6995 case VAR_Eradicated: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6996 this->pConditions[Condition_Eradicated] = 0; |
| 1822 | 6997 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6998 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6999 case VAR_AutoNotes: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7000 _449B7E_toggle_bit(pParty->_autonote_bits, pValue - 1, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7001 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7002 case VAR_NPCs2: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7003 npcIndex = 0; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7004 GetNewNPCData(sDialogue_SpeakingActorNPC_ID, &npcIndex); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7005 if ( npcIndex == pValue ) |
| 0 | 7006 { |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7007 npcIdToDismissAfterDialogue = pValue; |
| 0 | 7008 } |
| 7009 else | |
| 7010 { | |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7011 npcIdToDismissAfterDialogue = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7012 pParty->hirelingScrollPosition = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7013 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7014 pParty->CountHirelings(); |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7015 viewparams->bRedrawGameUI = true; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7016 } |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7017 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7018 case VAR_HiredNPCHasSpeciality: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7019 for (unsigned int i = 0; i < pNPCStats->uNumNewNPCs; i++) |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7020 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7021 if (pNPCStats->pNewNPCData[i].uProfession == pValue) |
| 0 | 7022 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7023 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
| 0 | 7024 } |
| 7025 } | |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7026 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
|
7027 memset(&pParty->pHirelings[0], 0, sizeof(NPCData)); |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7028 if ( pParty->pHirelings[1].uProfession == pValue ) |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7029 memset(&pParty->pHirelings[1], 0, sizeof(NPCData)); |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7030 pParty->hirelingScrollPosition = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7031 pParty->CountHirelings(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7032 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7033 case VAR_NumSkillPoints: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7034 if ((unsigned int)pValue <= this->uSkillPoints) |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7035 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7036 this->uSkillPoints -= pValue; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7037 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7038 else |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7039 { |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7040 this->uSkillPoints = 0; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7041 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7042 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7043 case VAR_ReputationInCurrentLocation: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7044 locationHeader = &pOutdoor->ddm; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7045 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7046 locationHeader = &pIndoor->dlv; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7047 locationHeader->uReputation -= pValue; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7048 if (locationHeader->uReputation < -10000) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7049 locationHeader->uReputation = -10000; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7050 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7051 case VAR_GoldInBank: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7052 if ( (unsigned int)pValue <= pParty->uNumGoldInBank ) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7053 { |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7054 pParty->uNumGoldInBank -= (unsigned int)pValue; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7055 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7056 else |
| 0 | 7057 { |
|
1825
23deb6b09c8c
cancelEventProcessing to dword_5B65C4_cancelEventProcessing
Grumpy7
parents:
1822
diff
changeset
|
7058 dword_5B65C4_cancelEventProcessing = 1; |
| 605 | 7059 } |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7060 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7061 case VAR_NumDeaths: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7062 pParty->uNumDeaths -= (unsigned int)pValue; |
|
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_NumBounties: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7065 pParty->uNumBountiesCollected -= (unsigned int)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_PrisonTerms: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7068 pParty->uNumPrisonTerms -= (int)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_ArenaWinsPage: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7071 pParty->uNumArenaPageWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7072 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7073 case VAR_ArenaWinsSquire: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7074 pParty->uNumArenaSquireWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7075 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7076 case VAR_ArenaWinsKnight: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7077 pParty->uNumArenaKnightWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7078 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7079 case VAR_ArenaWinsLord: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7080 pParty->uNumArenaLordWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7081 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7082 } |
| 0 | 7083 } |
| 7084 // 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
|
7085 // 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
|
7086 |
| 1818 | 7087 //----- (new function) -------------------------------------------------------- |
| 1822 | 7088 void Player::PlayAwardSound_Anim98() |
| 7089 { | |
| 7090 int playerIndex = GetPlayerIndex(); | |
| 7091 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, playerIndex); | |
| 7092 PlayAwardSound(); | |
| 1818 | 7093 } |
| 7094 | |
| 7095 //----- (new function) -------------------------------------------------------- | |
| 1822 | 7096 void Player::PlayAwardSound_Anim98_Face( PlayerSpeech speech ) |
| 1818 | 7097 { |
| 7098 this->PlaySound(speech, 0); | |
| 1822 | 7099 PlayAwardSound_Anim98(); |
| 1818 | 7100 } |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7101 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7102 //----- (00467E7F) -------------------------------------------------------- |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7103 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
|
7104 { |
| 1822 | 7105 int itemAnchor; // ebx@1 |
| 7106 int itemInvLocation; // edx@1 | |
| 7107 int freeSlot; // eax@3 | |
| 1619 | 7108 ItemGen tempPickedItem; // [sp+Ch] [bp-30h]@1 |
| 7109 | |
| 7110 tempPickedItem.Reset(); | |
| 1822 | 7111 itemAnchor = pEquipTypeToBodyAnchor[uEquipType]; |
| 2156 | 7112 itemInvLocation = pPlayers[uActiveCharacter]->pEquipment.pIndices[itemAnchor]; |
| 7113 if ( itemInvLocation )//ïåðåîäåòüñÿ â äðóãóþ âåùü | |
| 1619 | 7114 { |
| 7115 memcpy(&tempPickedItem, &pParty->pPickedItem, sizeof(tempPickedItem)); | |
| 2156 | 7116 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
|
7117 pParty->pPickedItem.Reset(); |
| 2156 | 7118 pParty->SetHoldingItem(&pPlayers[uActiveCharacter]->pInventoryItemList[itemInvLocation - 1]); |
| 1822 | 7119 tempPickedItem.uBodyAnchor = itemAnchor + 1; |
| 2156 | 7120 memcpy(&pPlayers[uActiveCharacter]->pInventoryItemList[itemInvLocation - 1], &tempPickedItem, sizeof(ItemGen)); |
| 7121 pPlayers[uActiveCharacter]->pEquipment.pIndices[itemAnchor] = itemInvLocation; | |
| 7122 } | |
| 7123 else//îäåòü âåùü | |
| 7124 { | |
| 7125 freeSlot = pPlayers[uActiveCharacter]->FindFreeInventoryListSlot(); | |
| 1822 | 7126 if (freeSlot >= 0) |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7127 { |
| 1822 | 7128 pParty->pPickedItem.uBodyAnchor = itemAnchor + 1; |
| 2156 | 7129 memcpy(&pPlayers[uActiveCharacter]->pInventoryItemList[freeSlot], &pParty->pPickedItem, sizeof(ItemGen)); |
| 7130 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
|
7131 pMouse->RemoveHoldingItem(); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7132 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7133 } |
| 1295 | 7134 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7135 |
| 1295 | 7136 //----- (0049387A) -------------------------------------------------------- |
| 1459 | 7137 int CycleCharacter(bool backwards) |
| 1295 | 7138 { |
|
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
|
7139 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
|
7140 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
|
7141 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
|
7142 |
|
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 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
|
7144 { |
|
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
|
7145 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
|
7146 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
|
7147 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7148 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
|
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 } |
|
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 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
|
7152 } |
|
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 |
| 1297 | 7154 //----- (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
|
7155 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
|
7156 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7157 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
|
7158 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7159 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
|
7160 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7161 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
|
7162 } |
| 1432 | 7163 |
| 1297 | 7164 //----- (0043EE15) -------------------------------------------------------- |
| 1822 | 7165 bool Player::HasItem( unsigned int uItemID, bool checkHeldItem ) |
| 7166 { | |
| 7167 if ( !checkHeldItem || pParty->pPickedItem.uItemID != uItemID ) | |
| 1297 | 7168 { |
| 7169 for ( uint i = 0; i < 126; ++i ) | |
| 7170 { | |
|
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
|
7171 if ( this->pInventoryMatrix[i] > 0 ) |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7172 { |
|
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
|
7173 if ( (unsigned int)this->pInventoryItemList[this->pInventoryMatrix[i] - 1].uItemID == uItemID ) |
| 1297 | 7174 return true; |
| 7175 } | |
| 7176 } | |
| 7177 for ( uint i = 0; i < 16; ++i ) | |
| 7178 { | |
|
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
|
7179 if ( this->pEquipment.pIndices[i] ) |
| 1297 | 7180 { |
|
1620
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7181 if ( (unsigned int)this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID == uItemID ) |
| 1297 | 7182 return true; |
| 7183 } | |
| 7184 } | |
| 1822 | 7185 return false; |
| 7186 } | |
| 7187 else | |
| 7188 { | |
| 7189 return true; | |
| 7190 } | |
| 1297 | 7191 } |
| 7192 //----- (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
|
7193 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
|
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 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
|
7196 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
|
7197 |
|
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 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
|
7199 { |
|
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 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
|
7201 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
|
7202 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
|
7203 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7204 case 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
|
7205 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
|
7206 return true; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7207 break; |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7208 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
|
7209 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
|
7210 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
|
7211 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
|
7212 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
|
7213 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
|
7214 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
|
7215 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
|
7216 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
|
7217 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
|
7218 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
|
7219 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
|
7220 } |
|
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
|
7221 } |
|
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
|
7222 return false; |
| 1297 | 7223 } |
| 7224 //----- (0043ED6F) -------------------------------------------------------- | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7225 bool IsDwarfPresentInParty(bool a1) |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7226 { |
| 1297 | 7227 for (uint i = 0; i < 4; ++i) |
| 7228 { | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7229 CHARACTER_RACE race = pParty->pPlayers[i].GetRace(); |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7230 |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7231 if (race == CHARACTER_RACE_DWARF && a1) |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7232 return true; |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7233 else if (race != CHARACTER_RACE_DWARF && !a1) |
| 1297 | 7234 return true; |
| 7235 } | |
| 7236 return false; | |
| 7237 } | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7238 |
| 1297 | 7239 //----- (00439FCB) -------------------------------------------------------- |
| 2006 | 7240 void __fastcall DamagePlayerFromMonster(unsigned int uObjID, int dmgSource, Vec3_int_ *pPos, signed int a4) |
| 1681 | 7241 { |
| 1649 | 7242 Player *playerPtr; // ebx@3 |
| 7243 Actor *actorPtr; // esi@3 | |
| 1681 | 7244 int spellId; // eax@38 |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7245 signed int recvdMagicDmg; // eax@139 |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7246 int v72[4]; // [sp+30h] [bp-24h]@164 |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7247 int healthBeforeRecvdDamage; // [sp+48h] [bp-Ch]@3 |
| 1297 | 7248 unsigned int uActorID; // [sp+4Ch] [bp-8h]@1 |
| 1681 | 7249 |
| 7250 uActorID = PID_ID(uObjID); | |
| 7251 if ( PID_TYPE(uObjID) != 2) | |
| 1297 | 7252 { |
| 1649 | 7253 playerPtr = &pParty->pPlayers[a4]; |
| 1681 | 7254 actorPtr = &pActors[uActorID]; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7255 healthBeforeRecvdDamage = playerPtr->sHealth; |
|
2291
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7256 if ( PID_TYPE(uObjID) != 3 || !actorPtr->ActorHitOrMiss(playerPtr) ) |
| 1297 | 7257 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
|
7258 ItemGen* equippedArmor = playerPtr->GetArmorItem(); |
| 1681 | 7259 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
|
7260 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
|
7261 || equippedArmor->IsBroken() |
| 1649 | 7262 || |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7263 (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
|
7264 && equippedArmor->GetPlayerSkillType() != PLAYER_SKILL_PLATE |
| 1649 | 7265 ) |
| 7266 ) | |
| 1297 | 7267 { |
| 1681 | 7268 int randVal = rand() % 4; |
| 7269 switch (randVal) | |
| 1297 | 7270 { |
| 1681 | 7271 case 0 : soundToPlay = (SoundID)108; break; |
| 7272 case 1 : soundToPlay = (SoundID)109; break; | |
| 7273 case 2 : soundToPlay = (SoundID)110; break; | |
| 7274 case 3 : soundToPlay = (SoundID)44; break; | |
| 1783 | 7275 default: Error("Unexpected sound value"); |
| 1297 | 7276 } |
| 7277 } | |
| 7278 else | |
| 7279 { | |
| 1681 | 7280 int randVal = rand() % 4; |
| 7281 switch (randVal) | |
| 1297 | 7282 { |
| 1681 | 7283 case 0 : soundToPlay = (SoundID)105; break; |
| 7284 case 1 : soundToPlay = (SoundID)106; break; | |
| 7285 case 2 : soundToPlay = (SoundID)107; break; | |
| 7286 case 3 : soundToPlay = (SoundID)45; break; | |
| 1783 | 7287 default: Error("Unexpected sound value"); |
| 1297 | 7288 } |
| 1648 | 7289 } |
| 1681 | 7290 pAudioPlayer->PlaySound(soundToPlay, PID(OBJECT_Player,a4 + 80), 0, -1, 0, 0, 0, 0); |
| 1876 | 7291 int dmgToReceive = actorPtr->_43B3E0_CalcDamage(dmgSource); |
| 1949 | 7292 if ( actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime > 0 ) |
| 1649 | 7293 { |
| 1949 | 7294 __int16 spellPower = actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uPower; |
| 1681 | 7295 if ( spellPower ) |
| 7296 dmgToReceive /= (signed int)spellPower; | |
| 7297 } | |
| 1682 | 7298 int damageType; |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7299 switch (dmgSource) |
| 1648 | 7300 { |
| 1682 | 7301 case 0: damageType = actorPtr->pMonsterInfo.uAttack1Type; |
| 1648 | 7302 break; |
| 1682 | 7303 case 1: damageType = actorPtr->pMonsterInfo.uAttack2Type; |
| 1648 | 7304 break; |
| 1681 | 7305 case 2: spellId = actorPtr->pMonsterInfo.uSpell1ID; |
| 1682 | 7306 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); |
| 1648 | 7307 break; |
| 1681 | 7308 case 3: spellId = actorPtr->pMonsterInfo.uSpell2ID; |
| 1682 | 7309 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); |
| 1648 | 7310 break; |
| 1682 | 7311 case 4: damageType = actorPtr->pMonsterInfo.field_3C_some_special_attack; |
| 1648 | 7312 break; |
| 7313 default: | |
| 1682 | 7314 case 5: damageType = 4; //yes, the original just assigned the value 4 |
| 1648 | 7315 break; |
| 7316 } | |
| 2061 | 7317 if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) ) |
| 1297 | 7318 { |
| 1682 | 7319 dmgToReceive = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); |
| 1822 | 7320 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) |
| 1297 | 7321 { |
| 1681 | 7322 int actorState = actorPtr->uAIState; |
| 7323 if ( actorState != Dying && actorState != Dead) | |
| 1297 | 7324 { |
|
2293
b0f10ef66e00
stru319::CalcMagicalDamageToActor moved to Actor class
Grumpy7
parents:
2292
diff
changeset
|
7325 int reflectedDamage = actorPtr->CalcMagicalDamageToActor((DAMAGE_TYPE)damageType, dmgToReceive); |
| 1681 | 7326 actorPtr->sCurrentHP -= reflectedDamage; |
| 7327 if ( reflectedDamage >= 0 ) | |
| 1297 | 7328 { |
| 1649 | 7329 if ( actorPtr->sCurrentHP >= 1 ) |
| 1297 | 7330 { |
| 1682 | 7331 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 | 7332 Actor::AggroSurroundingPeasants(uActorID, 1); |
| 7333 } | |
| 7334 else | |
| 7335 { | |
| 2154 | 7336 if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS) |
| 1297 | 7337 { |
| 1681 | 7338 int splatRadius = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; |
| 7339 pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)splatRadius, 0, 0); | |
| 1297 | 7340 } |
| 1648 | 7341 Actor::Die(uActorID); |
| 7342 Actor::ApplyFineForKillingPeasant(uActorID); | |
| 7343 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 1649 | 7344 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
|
7345 pParty->GivePartyExp(pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].uExp); |
| 1681 | 7346 int speechToPlay = SPEECH_51; |
| 1648 | 7347 if ( rand() % 100 < 20 ) |
| 1681 | 7348 speechToPlay = actorPtr->pMonsterInfo.uHP >= 100 ? 2 : 1; |
| 7349 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0); | |
| 1297 | 7350 } |
| 7351 } | |
| 7352 } | |
| 7353 } | |
| 2061 | 7354 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
|
7355 && 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
|
7356 && 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
|
7357 { |
|
1694
5ead2688a227
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect second attempt
Grumpy7
parents:
1693
diff
changeset
|
7358 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7359 } |
| 1297 | 7360 } |
| 7361 if ( !pParty->bTurnBasedModeOn ) | |
| 7362 { | |
| 1681 | 7363 int actEndurance = playerPtr->GetActualEndurance(); |
| 7364 int recoveryTime = (int)((20 - playerPtr->GetParameterBonus(actEndurance)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333); | |
| 7365 playerPtr->SetRecoveryTime(recoveryTime); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7366 } |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7367 int yellThreshold = playerPtr->GetMaxHealth() / 4; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7368 if ( yellThreshold < playerPtr->sHealth && yellThreshold >= healthBeforeRecvdDamage && playerPtr->sHealth > 0 ) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7369 { |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7370 playerPtr->PlaySound(SPEECH_48, 0); |
| 1297 | 7371 } |
| 7372 viewparams->bRedrawGameUI = 1; | |
| 7373 return; | |
| 7374 } | |
| 1648 | 7375 else |
| 7376 { | |
| 1681 | 7377 SpriteObject* v37 = &pSpriteObjects[uActorID]; |
| 7378 int uActorType = PID_TYPE(v37->spell_caster_pid); | |
| 7379 int uActorID = PID_ID(v37->spell_caster_pid); | |
| 7380 if ( uActorType == 2 ) | |
| 7381 { | |
| 7382 Player *playerPtr; // eax@81 | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7383 if ( a4 != -1 ) |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7384 { |
| 1681 | 7385 playerPtr = &pParty->pPlayers[a4]; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7386 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7387 else |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7388 { |
| 1822 | 7389 int activePlayerCounter = 0; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7390 for (int i = 1; i <= 4; i++) |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7391 { |
| 1822 | 7392 if (pPlayers[i]->CanAct()) |
| 7393 { | |
| 7394 v72[activePlayerCounter] = i; | |
| 7395 activePlayerCounter++; | |
| 7396 } | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7397 } |
| 1822 | 7398 if ( activePlayerCounter ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7399 { |
| 2006 | 7400 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
|
7401 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7402 } |
| 1681 | 7403 int v68; |
| 7404 int v69; | |
| 7405 if ( uActorType != OBJECT_Player || v37->spell_id != SPELL_BOW_ARROW) | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7406 { |
| 1681 | 7407 int playerMaxHp = playerPtr->GetMaxHealth(); |
| 7408 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
|
7409 v69 = LOBYTE(pSpellStats->pInfos[v37->spell_id].uSchool); |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7410 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7411 else |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7412 { |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7413 v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7414 v69 = 0; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7415 } |
| 1681 | 7416 playerPtr->ReceiveDamage(v68, (DAMAGE_TYPE)v69); |
| 2182 | 7417 if ( uActorType == OBJECT_Player && !_A750D8_player_speech_timer ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7418 { |
| 2182 | 7419 _A750D8_player_speech_timer = 256i64; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7420 PlayerSpeechID = SPEECH_44; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7421 uSpeakingCharacter = uActorID + 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7422 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7423 return; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7424 } |
| 1681 | 7425 else if ( uActorType == 3 ) |
| 7426 { | |
| 7427 Actor *actorPtr = &pActors[uActorID]; | |
| 1648 | 7428 if ( a4 == -1 ) |
| 1911 | 7429 a4 = stru_50C198.which_player_to_attack(actorPtr); |
| 1681 | 7430 Player *playerPtr = &pParty->pPlayers[a4]; |
| 1876 | 7431 int dmgToReceive = actorPtr->_43B3E0_CalcDamage(dmgSource); |
| 1681 | 7432 unsigned __int16 spriteType = v37->uType; |
| 1648 | 7433 if ( v37->uType == 545 ) |
| 1297 | 7434 { |
| 1681 | 7435 __int16 skillLevel = playerPtr->GetActualSkillLevel(PLAYER_SKILL_UNARMED); |
| 7436 if ( SkillToMastery(skillLevel) >= 4 && rand() % 100 < (skillLevel & 0x3F) ) | |
| 1648 | 7437 { |
| 1681 | 7438 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], playerPtr->pName); |
| 1648 | 7439 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1681 | 7440 playerPtr->PlaySound(SPEECH_6, 0); |
| 1648 | 7441 return; |
| 7442 } | |
| 1297 | 7443 } |
| 1681 | 7444 else if ( spriteType == 555 |
| 7445 || spriteType == 510 | |
| 7446 || spriteType == 500 | |
| 7447 || spriteType == 515 | |
| 7448 || spriteType == 505 | |
| 7449 || spriteType == 530 | |
| 7450 || spriteType == 525 | |
| 7451 || spriteType == 520 | |
| 7452 || spriteType == 535 | |
| 7453 || spriteType == 540 ) | |
| 1297 | 7454 { |
|
2291
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7455 if ( !actorPtr->ActorHitOrMiss(playerPtr) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7456 return; |
| 1822 | 7457 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_SHIELD].uExpireTime > 0 ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7458 dmgToReceive >>= 1; |
| 1681 | 7459 if ( playerPtr->HasEnchantedItemEquipped(36) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7460 dmgToReceive >>= 1; |
| 1681 | 7461 if ( playerPtr->HasEnchantedItemEquipped(69) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7462 dmgToReceive >>= 1; |
| 1681 | 7463 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
|
7464 && playerPtr->GetArmorItem()->uItemID == ITEM_ARTIFACT_GOVERNORS_ARMOR ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7465 dmgToReceive >>= 1; |
| 1989 | 7466 if ( playerPtr->HasItemEquipped(EQUIP_TWO_HANDED)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7467 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7468 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
|
7469 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
|
7470 dmgToReceive >>= 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7471 } |
| 1989 | 7472 if ( playerPtr->HasItemEquipped(EQUIP_SINGLE_HANDED)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7473 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7474 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
|
7475 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
|
7476 dmgToReceive >>= 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7477 } |
| 1648 | 7478 } |
| 1949 | 7479 if ( actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime > 0 ) |
| 1648 | 7480 { |
| 1949 | 7481 int spellPower = actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uPower; |
| 1681 | 7482 if ( spellPower ) |
| 7483 dmgToReceive /= (signed int)spellPower; | |
| 1648 | 7484 } |
| 1681 | 7485 int damageType; |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7486 switch(dmgSource) |
| 1648 | 7487 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7488 case 0: |
| 1681 | 7489 damageType = actorPtr->pMonsterInfo.uAttack1Type; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7490 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7491 case 1: |
| 1681 | 7492 damageType = actorPtr->pMonsterInfo.uAttack2Type; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7493 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7494 case 2: |
| 1681 | 7495 spellId = actorPtr->pMonsterInfo.uSpell1ID; |
| 7496 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7497 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7498 case 3: |
| 1681 | 7499 spellId = actorPtr->pMonsterInfo.uSpell2ID; |
| 7500 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7501 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7502 case 4: |
| 1681 | 7503 damageType = actorPtr->pMonsterInfo.field_3C_some_special_attack; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7504 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7505 case 5: |
| 1681 | 7506 damageType = 4; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7507 break; |
| 1648 | 7508 } |
| 2061 | 7509 if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) ) |
| 1648 | 7510 { |
| 1681 | 7511 int reflectedDmg = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); |
| 1822 | 7512 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) |
| 1297 | 7513 { |
| 1681 | 7514 unsigned __int16 actorState = actorPtr->uAIState; |
| 7515 if ( actorState != Dying && actorState != Dead) | |
| 1297 | 7516 { |
|
2293
b0f10ef66e00
stru319::CalcMagicalDamageToActor moved to Actor class
Grumpy7
parents:
2292
diff
changeset
|
7517 recvdMagicDmg = actorPtr->CalcMagicalDamageToActor((DAMAGE_TYPE)damageType, reflectedDmg); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7518 actorPtr->sCurrentHP -= recvdMagicDmg; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7519 if ( recvdMagicDmg >= 0 ) |
| 1297 | 7520 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7521 if ( actorPtr->sCurrentHP >= 1 ) |
| 1297 | 7522 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7523 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7524 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7525 } |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7526 else |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7527 { |
| 2154 | 7528 if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) |
| 1297 | 7529 { |
| 1681 | 7530 int splatRadius = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; |
| 7531 pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)splatRadius, 0, 0); | |
| 1297 | 7532 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7533 Actor::Die(uActorID); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7534 Actor::ApplyFineForKillingPeasant(uActorID); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7535 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7536 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
|
7537 pParty->GivePartyExp(pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].uExp); |
| 1681 | 7538 int speechToPlay = SPEECH_51; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7539 if ( rand() % 100 < 20 ) |
| 1681 | 7540 speechToPlay = actorPtr->pMonsterInfo.uHP >= 100 ? 2 : 1; |
| 7541 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0); | |
| 1297 | 7542 } |
| 7543 } | |
| 7544 } | |
| 7545 } | |
| 7546 } | |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7547 if ( !dmgSource |
| 2061 | 7548 && !(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
|
7549 && 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
|
7550 && 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
|
7551 { |
|
1694
5ead2688a227
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect second attempt
Grumpy7
parents:
1693
diff
changeset
|
7552 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7553 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7554 if ( !pParty->bTurnBasedModeOn ) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7555 { |
| 1681 | 7556 int actEnd = playerPtr->GetActualEndurance(); |
| 7557 int recTime = (int)((20 - playerPtr->GetParameterBonus(actEnd)) | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7558 * flt_6BE3A4_debug_recmod1 |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7559 * 2.133333333333333); |
| 1681 | 7560 playerPtr->SetRecoveryTime(recTime); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7561 } |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7562 return; |
| 1648 | 7563 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7564 else |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7565 { |
| 1648 | 7566 return; |
| 7567 } | |
| 1297 | 7568 } |
| 7569 } | |
| 7570 //----- (00421EA6) -------------------------------------------------------- | |
| 1683 | 7571 void Player::OnInventoryLeftClick() |
| 7572 { | |
| 1822 | 7573 signed int inventoryXCoord; // ecx@2 |
| 7574 int inventoryYCoord; // eax@2 | |
| 1682 | 7575 int invMatrixIndex; // eax@2 |
| 1822 | 7576 unsigned int enchantedItemPos; // eax@7 |
| 1682 | 7577 unsigned int pickedItemId; // esi@12 |
| 7578 unsigned int invItemIndex; // eax@12 | |
| 1822 | 7579 unsigned int itemPos; // eax@18 |
| 1682 | 7580 ItemGen tmpItem; // [sp+Ch] [bp-3Ch]@1 |
| 1297 | 7581 unsigned int pY; // [sp+3Ch] [bp-Ch]@2 |
| 7582 unsigned int pX; // [sp+40h] [bp-8h]@2 | |
| 2156 | 7583 CastSpellInfo *pSpellInfo; |
| 1297 | 7584 |
| 7585 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103 ) | |
| 7586 { | |
| 7587 pMouse->GetClickPos(&pX, &pY); | |
| 1822 | 7588 inventoryYCoord = (pY - 17) / 32; |
| 7589 inventoryXCoord = (pX - 14) / 32; | |
| 7590 invMatrixIndex = inventoryXCoord + (INVETORYSLOTSWIDTH * inventoryYCoord); | |
| 7591 if ( inventoryYCoord >= 0 && inventoryYCoord < INVETORYSLOTSHEIGHT && inventoryXCoord >= 0 && inventoryXCoord < INVETORYSLOTSWIDTH) | |
| 1682 | 7592 { |
| 1822 | 7593 if ( _50C9A0_IsEnchantingInProgress ) |
| 1297 | 7594 { |
| 1822 | 7595 enchantedItemPos = this->GetItemIDAtInventoryIndex(&invMatrixIndex); |
| 7596 if ( enchantedItemPos ) | |
| 1297 | 7597 { |
| 2156 | 7598 /* *((char *)pGUIWindow_Settings->ptr_1C + 8) &= 0x7Fu; |
| 1822 | 7599 *((short *)pGUIWindow_Settings->ptr_1C + 2) = uActiveCharacter - 1; |
| 7600 *((int *)pGUIWindow_Settings->ptr_1C + 3) = enchantedItemPos - 1; | |
| 2156 | 7601 *((short *)pGUIWindow_Settings->ptr_1C + 3) = invMatrixIndex;*/ |
| 7602 pSpellInfo = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C; | |
| 7603 pSpellInfo->uFlags &= 0x7F; | |
| 7604 pSpellInfo->uPlayerID_2 = uActiveCharacter - 1; | |
| 7605 pSpellInfo->spell_target_pid = enchantedItemPos - 1; | |
| 7606 pSpellInfo->field_6 = invMatrixIndex; | |
| 1822 | 7607 ptr_50C9A4_ItemToEnchant = &this->pInventoryItemList[enchantedItemPos-1]; |
| 7608 _50C9A0_IsEnchantingInProgress = 0; | |
| 7609 if ( pMessageQueue_50CBD0->uNumMessages ) | |
| 7610 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; | |
| 7611 pMouse->SetCursorBitmap("MICON1"); | |
| 7612 _50C9D0_AfterEnchClickEventId = 113; | |
| 7613 _50C9D4_AfterEnchClickEventSecondParam = 0; | |
| 7614 _50C9D8_AfterEnchClickEventTimeout = 256; | |
| 7615 } | |
| 7616 return; | |
| 7617 } | |
| 7618 if ( ptr_50C9A4_ItemToEnchant ) | |
| 7619 return; | |
| 7620 pickedItemId = pParty->pPickedItem.uItemID; | |
| 7621 invItemIndex = this->GetItemIDAtInventoryIndex(&invMatrixIndex); | |
| 7622 if (!pickedItemId) | |
| 7623 { | |
| 7624 if ( !invItemIndex ) | |
| 7625 return; | |
| 7626 else | |
| 7627 { | |
| 7628 memcpy(&pParty->pPickedItem, &this->pInventoryItemList[invItemIndex-1], sizeof(pParty->pPickedItem)); | |
| 7629 this->RemoveItemAtInventoryIndex(invMatrixIndex); | |
| 7630 pickedItemId = pParty->pPickedItem.uItemID; | |
| 7631 pMouse->SetCursorBitmap(pItemsTable->pItems[pickedItemId].pIconName); | |
| 1297 | 7632 return; |
| 7633 } | |
| 1822 | 7634 } |
| 7635 else | |
| 7636 { | |
| 7637 if ( invItemIndex ) | |
| 1297 | 7638 { |
| 1822 | 7639 ItemGen* invItemPtr = &this->pInventoryItemList[invItemIndex-1]; |
| 7640 memcpy(&tmpItem, invItemPtr, sizeof(tmpItem)); | |
| 7641 this->RemoveItemAtInventoryIndex(invMatrixIndex); | |
| 7642 int emptyIndex = this->AddItem2(invMatrixIndex, &pParty->pPickedItem); | |
| 7643 if ( !emptyIndex ) | |
| 1682 | 7644 { |
| 1822 | 7645 emptyIndex = this->AddItem2(-1, &pParty->pPickedItem); |
| 7646 if ( !emptyIndex ) | |
| 7647 { | |
| 7648 this->PutItemArInventoryIndex(tmpItem.uItemID, invItemIndex - 1, invMatrixIndex); | |
| 7649 memcpy(invItemPtr, &tmpItem, sizeof(ItemGen)); | |
| 7650 return; | |
| 7651 } | |
| 1682 | 7652 } |
| 1822 | 7653 memcpy(&pParty->pPickedItem, &tmpItem, sizeof(ItemGen)); |
| 7654 pMouse->SetCursorBitmap(pParty->pPickedItem.GetIconName()); | |
| 7655 return; | |
| 1297 | 7656 } |
| 1682 | 7657 else |
| 1297 | 7658 { |
| 1822 | 7659 itemPos = this->AddItem(invMatrixIndex, pickedItemId); |
| 7660 if ( itemPos ) | |
| 1297 | 7661 { |
| 1822 | 7662 memcpy(&this->pInventoryItemList[itemPos-1], &pParty->pPickedItem, sizeof(ItemGen)); |
| 7663 pMouse->RemoveHoldingItem(); | |
| 1682 | 7664 return; |
| 7665 } | |
| 1822 | 7666 itemPos = this->AddItem(-1, pickedItemId); |
| 7667 if ( itemPos ) | |
| 1682 | 7668 { |
| 1822 | 7669 memcpy(&this->pInventoryItemList[itemPos-1], &pParty->pPickedItem, sizeof(ItemGen)); |
| 7670 pMouse->RemoveHoldingItem(); | |
| 7671 return; | |
| 1297 | 7672 } |
| 7673 } | |
| 7674 } | |
| 7675 } | |
| 7676 } | |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7679 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7680 bool Player::IsWeak() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7681 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7682 return pConditions[Condition_Weak] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7683 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7684 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7685 bool Player::IsDead() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7686 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7687 return pConditions[Condition_Dead] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7688 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7689 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7690 bool Player::IsEradicated() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7691 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7692 return pConditions[Condition_Eradicated] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7693 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7694 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7695 bool Player::IsZombie() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7696 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7697 return pConditions[Condition_Zombie] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7698 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7699 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7700 bool Player::IsCursed() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7701 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7702 return pConditions[Condition_Cursed] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7703 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7704 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7705 bool Player::IsPertified() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7706 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7707 return pConditions[Condition_Pertified] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7708 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7709 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7710 bool Player::IsUnconcious() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7711 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7712 return pConditions[Condition_Unconcious] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7713 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7714 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7715 bool Player::IsAsleep() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7716 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7717 return pConditions[Condition_Sleep] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7718 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7719 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7720 bool Player::IsParalyzed() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7721 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7722 return pConditions[Condition_Paralyzed] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7723 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7724 |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7725 bool Player::IsDrunk() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7726 { |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7727 return pConditions[Condition_Drunk] != 0; |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7728 } |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7729 |
| 2185 | 7730 void Player::SetCursed( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7731 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7732 pConditions[Condition_Cursed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7733 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7734 |
| 2185 | 7735 void Player::SetWeak( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7736 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7737 pConditions[Condition_Weak] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7738 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7739 |
| 2185 | 7740 void Player::SetAsleep( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7741 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7742 pConditions[Condition_Sleep] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7743 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7744 |
| 2185 | 7745 void Player::SetAfraid( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7746 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7747 pConditions[Condition_Fear] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7748 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7749 |
| 2185 | 7750 void Player::SetDrunk( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7751 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7752 pConditions[Condition_Drunk] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7753 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7754 |
| 2185 | 7755 void Player::SetInsane( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7756 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7757 pConditions[Condition_Insane] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7758 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7759 |
| 2187 | 7760 void Player::SetPoisonWeak( unsigned long long state ) |
| 7761 { | |
| 7762 pConditions[Condition_Poison_Weak] = state; | |
| 7763 } | |
| 7764 | |
| 7765 void Player::SetDiseaseWeak( unsigned long long state ) | |
| 7766 { | |
| 7767 pConditions[Condition_Disease_Weak] = state; | |
| 7768 } | |
| 7769 | |
| 7770 void Player::SetPoisonMedium( unsigned long long state ) | |
| 7771 { | |
| 7772 pConditions[Condition_Poison_Medium] = state; | |
| 7773 } | |
| 7774 | |
| 7775 void Player::SetDiseaseMedium( unsigned long long state ) | |
| 7776 { | |
| 7777 pConditions[Condition_Disease_Medium] = state; | |
| 7778 } | |
| 7779 | |
| 7780 void Player::SetPoisonSevere( unsigned long long state ) | |
| 7781 { | |
| 7782 pConditions[Condition_Poison_Severe] = state; | |
| 7783 } | |
| 7784 | |
| 7785 void Player::SetDiseaseSevere( unsigned long long state ) | |
| 7786 { | |
| 7787 pConditions[Condition_Disease_Severe] = state; | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7788 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7789 |
| 2185 | 7790 void Player::SetParalyzed( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7791 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7792 pConditions[Condition_Paralyzed] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7793 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7794 |
| 2185 | 7795 void Player::SetUnconcious( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7796 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7797 pConditions[Condition_Unconcious] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7798 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7799 |
| 2185 | 7800 void Player::SetDead( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7801 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7802 pConditions[Condition_Dead] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7803 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7804 |
| 2185 | 7805 void Player::SetPertified( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7806 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7807 pConditions[Condition_Pertified] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7808 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7809 |
| 2185 | 7810 void Player::SetEradicated( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7811 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7812 pConditions[Condition_Eradicated] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7813 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7814 |
| 2185 | 7815 void Player::SetZombie( unsigned long long state ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7816 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7817 pConditions[Condition_Zombie] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7818 } |
|
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 void Player::SetCondWeakWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7821 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7822 SetCondition(Condition_Weak, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7823 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7824 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7825 void Player::SetCondInsaneWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7826 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7827 SetCondition(Condition_Insane, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7828 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7829 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7830 void Player::SetCondDeadWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7831 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7832 SetCondition(Condition_Dead, blockable); |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7833 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7834 |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7835 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
|
7836 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7837 SetCondition(Condition_Dead, blockable); |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
7838 } |
|
1714
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 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
|
7841 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7842 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
|
7843 } |
|
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 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
|
7846 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7847 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
|
7848 } |
|
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 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
|
7851 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7852 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
|
7853 } |
|
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 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
|
7856 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7857 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
|
7858 } |
|
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 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
|
7861 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7862 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
|
7863 } |
|
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 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
|
7866 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7867 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
|
7868 } |
|
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 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
|
7871 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7872 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
|
7873 } |
|
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 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
|
7876 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7877 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
|
7878 } |
|
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 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
|
7881 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7882 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
|
7883 } |
|
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 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
|
7886 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7887 return 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
|
7888 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7889 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7890 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
|
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 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
|
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::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
|
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.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
|
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.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
|
7902 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7903 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7904 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
|
7905 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7906 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
|
7907 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7908 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
|
7909 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7910 return &this->pInventoryItemList[this->pEquipment.*itemPos - 1]; |
| 1822 | 7911 } |
| 7912 | |
| 7913 int Player::GetPlayerIndex() | |
| 7914 { | |
| 7915 int uPlayerIdx = 0; | |
| 7916 if ( this == pPlayers[1] ) | |
| 7917 uPlayerIdx = 0; | |
| 7918 else if( this == pPlayers[2] ) | |
| 7919 uPlayerIdx = 1; | |
| 7920 else if ( this == pPlayers[3] ) | |
| 7921 uPlayerIdx = 2; | |
| 7922 else if ( this == pPlayers[4] ) | |
| 7923 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
|
7924 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
|
7925 Error("Unexpected player pointer"); |
| 1826 | 7926 return uPlayerIdx; |
|
2291
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7927 } |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7928 |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7929 //----- (004272F5) -------------------------------------------------------- |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7930 bool Player::PlayerHitOrMiss(Actor *pActor, int a3, int a4) |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7931 { |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7932 signed int naturalArmor; // esi@1 |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7933 signed int armorBuff; // edi@1 |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7934 int effectiveActorArmor; // esi@8 |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7935 int attBonus; // eax@9 |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7936 int v9; // edx@11 |
| 2334 | 7937 // unsigned __int8 v12; // sf@13 |
| 7938 // unsigned __int8 v13; // of@13 | |
|
2291
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7939 int attPositiveMod; // edx@14 |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7940 int attNegativeMod; // eax@14 |
| 2334 | 7941 // signed int result; // eax@17 |
|
2291
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7942 |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7943 naturalArmor = pActor->pMonsterInfo.uAC; |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7944 armorBuff = 0; |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7945 if ( pActor->pActorBuffs[ACTOR_BUFF_SOMETHING_THAT_HALVES_AC].uExpireTime > 0 ) |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7946 naturalArmor /= 2; |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7947 if ( pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 ) |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7948 armorBuff = pActor->pActorBuffs[ACTOR_BUFF_SHIELD].uPower; |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7949 if ( pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime > 0 && pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower > armorBuff ) |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7950 armorBuff = pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower; |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7951 effectiveActorArmor = armorBuff + naturalArmor; |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7952 if ( a3 ) |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7953 attBonus = this->GetRangedAttack(); |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7954 else |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7955 attBonus = this->GetActualAttack(false); |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7956 v9 = rand() % (effectiveActorArmor + 2 * attBonus + 30); |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7957 attPositiveMod = a4 + v9; |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7958 if ( a3 == 2 ) |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7959 { |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7960 attNegativeMod = ((effectiveActorArmor + 15) / 2) + effectiveActorArmor + 15; |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7961 } |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7962 else if ( a3 == 3 ) |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7963 { |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7964 attNegativeMod = 2 * effectiveActorArmor + 30; |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7965 } |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7966 else |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7967 { |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7968 attNegativeMod = effectiveActorArmor + 15; |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7969 } |
|
69661f22ff03
stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Grumpy7
parents:
2276
diff
changeset
|
7970 return (attPositiveMod > attNegativeMod); |
|
2331
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7971 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7972 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7973 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7974 //----- (0042ECB5) -------------------------------------------------------- |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7975 void Player::_42ECB5_PlayerAttacksActor() |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7976 { |
| 2334 | 7977 // char *v5; // eax@8 |
| 7978 // unsigned int v9; // ecx@21 | |
| 7979 // char *v11; // eax@26 | |
| 7980 // unsigned int v12; // eax@47 | |
| 7981 // SoundID v24; // [sp-4h] [bp-40h]@58 | |
|
2331
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7982 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7983 //result = pParty->pPlayers[uActiveCharacter-1].CanAct(); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7984 Player* player = &pParty->pPlayers[uActiveCharacter - 1]; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7985 if (!player->CanAct()) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7986 return; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7987 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7988 CastSpellInfoHelpers::_427D48(); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7989 //v3 = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7990 if (pParty->Invisible()) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7991 pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].Reset(); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7992 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7993 //v31 = player->pEquipment.uBow; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7994 int bow_idx = player->pEquipment.uBow; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7995 if (bow_idx && player->pInventoryItemList[bow_idx - 1].IsBroken()) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7996 bow_idx = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7997 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7998 //v32 = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
7999 int wand_item_id = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8000 //v33 = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8001 //v4 = v1->pEquipment.uMainHand; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8002 int laser_weapon_item_id = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8003 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8004 int main_hand_idx = player->pEquipment.uMainHand; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8005 if (main_hand_idx) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8006 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8007 ItemGen* item = &player->pInventoryItemList[main_hand_idx - 1]; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8008 //v5 = (char *)v1 + 36 * v4; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8009 if (!item->IsBroken()) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8010 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8011 //v28b = &v1->pInventoryItems[v4].uItemID; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8012 //v6 = v1->pInventoryItems[v4].uItemID;//*((int *)v5 + 124); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8013 if (item->GetItemEquipType() == EQUIP_WAND) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8014 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8015 if (item->uNumCharges <= 0) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8016 player->pEquipment.uMainHand = 0; // wand discharged - unequip |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8017 else |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8018 wand_item_id = item->uItemID;//*((int *)v5 + 124); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8019 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8020 else if (item->uItemID == ITEM_BLASTER || item->uItemID == ITEM_LASER_RIFLE) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8021 laser_weapon_item_id = item->uItemID;//*((int *)v5 + 124); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8022 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8023 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8024 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8025 //v30 = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8026 //v29 = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8027 //v28 = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8028 //v7 = pMouse->uPointingObjectID; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8029 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8030 int target_pid = pMouse->uPointingObjectID; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8031 int target_type = PID_TYPE(target_pid), |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8032 target_id = PID_ID(target_pid); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8033 if (target_type != OBJECT_Actor || !pActors[target_id].CanAct()) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8034 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8035 target_pid = stru_50C198.FindClosestActor(5120, 0, 0); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8036 target_type = PID_TYPE(target_pid); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8037 target_id = PID_ID(target_pid); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8038 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8039 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8040 Actor* actor = &pActors[target_id]; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8041 int actor_distance = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8042 if (target_type == OBJECT_Actor) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8043 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8044 int distance_x = actor->vPosition.x - pParty->vPosition.x, |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8045 distance_y = actor->vPosition.y - pParty->vPosition.y, |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8046 distance_z = actor->vPosition.z - pParty->vPosition.z; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8047 actor_distance = integer_sqrt(distance_x * distance_x + distance_y * distance_y + distance_z * distance_z) - actor->uActorRadius; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8048 if (actor_distance < 0) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8049 actor_distance = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8050 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8051 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8052 bool shooting_bow = false, |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8053 shotting_laser = false, |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8054 shooting_wand = false, |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8055 melee_attack = false; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8056 if (laser_weapon_item_id) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8057 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8058 shotting_laser = true; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8059 _42777D_CastSpell_UseWand_ShootArrow(SPELL_LASER_PROJECTILE, uActiveCharacter - 1, 0, 0, uActiveCharacter + 8); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8060 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8061 else if (wand_item_id) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8062 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8063 shooting_wand = true; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8064 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8065 int main_hand_idx = player->pEquipment.uMainHand; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8066 _42777D_CastSpell_UseWand_ShootArrow(wand_spell_ids[player->pInventoryItemList[main_hand_idx - 1].uItemID - ITEM_WAND_FIRE], uActiveCharacter - 1, 8, 0, uActiveCharacter + 8); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8067 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8068 if (!--player->pInventoryItemList[main_hand_idx - 1].uNumCharges) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8069 player->pEquipment.uMainHand = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8070 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8071 else if (target_type == OBJECT_Actor && actor_distance <= 407.2) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8072 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8073 melee_attack = true; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8074 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8075 Vec3_int_ a3; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8076 a3.x = actor->vPosition.x - pParty->vPosition.x; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8077 a3.y = actor->vPosition.y - pParty->vPosition.y; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8078 a3.z = actor->vPosition.z - pParty->vPosition.z; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8079 Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8080 |
|
2338
1e865e8690ba
Moving some function declarations from unsorted subs to Actor.h and SpriteObject.h
Grumpy7
parents:
2336
diff
changeset
|
8081 Actor::DamageMonsterFromParty(PID(OBJECT_Player, uActiveCharacter - 1), target_id, &a3); |
|
2331
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8082 if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_TWO_HANDED) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_SINGLE_HANDED)) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8083 _42FA66_do_explosive_impact(actor->vPosition.x, actor->vPosition.y, actor->vPosition.z + actor->uActorHeight / 2, 0, 512, uActiveCharacter); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8084 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8085 else if (bow_idx) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8086 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8087 shooting_bow = true; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8088 _42777D_CastSpell_UseWand_ShootArrow(SPELL_BOW_ARROW, uActiveCharacter - 1, 0, 0, 0); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8089 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8090 else |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8091 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8092 melee_attack = true; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8093 ; // actor out of range or no actor; no ranged weapon so melee attacking air |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8094 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8095 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8096 if (!pParty->bTurnBasedModeOn && melee_attack) // wands, bows & lasers will add recovery while shooting spell effect |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8097 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8098 int recovery = player->GetAttackRecoveryTime(false); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8099 if (recovery < 30 ) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8100 recovery = 30; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8101 player->SetRecoveryTime(flt_6BE3A4_debug_recmod1 * (double)recovery * 2.133333333333333); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8102 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8103 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8104 int v34 = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8105 if (shooting_wand) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8106 return; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8107 else if (shooting_bow) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8108 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8109 v34 = 5; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8110 player->PlaySound(SPEECH_50, 0); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8111 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8112 if (shotting_laser) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8113 v34 = 7; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8114 else |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8115 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8116 int main_hand_idx = player->pEquipment.uMainHand; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8117 if (player->HasItemEquipped(EQUIP_TWO_HANDED)) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8118 v34 = player->pInventoryItemList[main_hand_idx - 1].GetPlayerSkillType(); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8119 pTurnEngine->ApplyPlayerAction(); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8120 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8121 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8122 switch (v34) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8123 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8124 case 0: pAudioPlayer->PlaySound(SOUND_81, 0, 0, -1, 0, 0, 0, 0); break; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8125 case 1: pAudioPlayer->PlaySound(SOUND_84, 0, 0, -1, 0, 0, 0, 0); break; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8126 case 2: pAudioPlayer->PlaySound(SOUND_85, 0, 0, -1, 0, 0, 0, 0); break; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8127 case 3: pAudioPlayer->PlaySound(SOUND_78, 0, 0, -1, 0, 0, 0, 0); break; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8128 case 4: pAudioPlayer->PlaySound(SOUND_80, 0, 0, -1, 0, 0, 0, 0); break; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8129 case 5: pAudioPlayer->PlaySound(SOUND_71, 0, 0, -1, 0, 0, 0, 0); break; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8130 case 6: pAudioPlayer->PlaySound(SOUND_83, 0, 0, -1, 0, 0, 0, 0); break; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8131 case 7: pAudioPlayer->PlaySound(SOUND_67, 0, 0, -1, 0, 0, 0, 0); break; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8132 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8133 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8134 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8135 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8136 //----- (0042FA66) -------------------------------------------------------- |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8137 void Player::_42FA66_do_explosive_impact(int a1, int a2, int a3, int a4, __int16 a5, signed int a6) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8138 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8139 unsigned __int16 v9; // ax@5 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8140 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8141 SpriteObject a1a; // [sp+Ch] [bp-74h]@1 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8142 //SpriteObject::SpriteObject(&a1a); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8143 a1a.uType = 600; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8144 a1a.stru_24.Reset(); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8145 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8146 a1a.spell_id = SPELL_FIRE_FIREBALL; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8147 a1a.spell_level = 8; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8148 a1a.spell_skill = 3; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8149 v9 = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8150 for ( uint i = 0; i < pObjectList->uNumObjects; ++i ) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8151 { |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8152 if ( a1a.uType == pObjectList->pObjects[i].uObjectID ) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8153 v9 = i; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8154 } |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8155 a1a.uObjectDescID = v9; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8156 a1a.vPosition.x = a1; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8157 a1a.vPosition.y = a2; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8158 a1a.vPosition.z = a3; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8159 a1a.uAttributes = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8160 a1a.uSectorID = pIndoor->GetSector(a1, a2, a3); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8161 a1a.uSpriteFrameID = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8162 a1a.spell_target_pid = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8163 a1a.field_60_distance_related_prolly_lod = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8164 a1a.uFacing = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8165 a1a.uSoundID = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8166 if ( a6 >= 1 || a6 <= 4 ) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8167 a1a.spell_caster_pid = PID(OBJECT_Player, a6 - 1); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8168 else |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8169 a1a.spell_caster_pid = 0; |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8170 |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8171 int id = a1a.Create(0, 0, 0, 0); |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8172 if (id != -1) |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8173 AttackerInfo.Add(PID(OBJECT_Item, id), a5, SLOWORD(a1a.vPosition.x), SLOWORD(a1a.vPosition.y), |
|
9551756f46c4
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Grumpy7
parents:
2293
diff
changeset
|
8174 SLOWORD(a1a.vPosition.z), 0, 0); |
| 2355 | 8175 } |
| 8176 | |
| 8177 //----- (00458244) -------------------------------------------------------- | |
| 8178 unsigned int SkillToMastery( unsigned int skill_value ) | |
| 8179 { | |
| 8180 switch (skill_value & 0x1C0) | |
| 8181 { | |
| 8182 case 0x100: return 4; // Grandmaster | |
| 8183 case 0x80: return 3; // Master | |
| 8184 case 0x40: return 2; // Expert | |
| 8185 case 0x00: return 1; // Normal | |
| 8186 } | |
| 8187 assert(false); | |
| 8188 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
|
8189 } |