Mercurial > mm7
annotate Player.cpp @ 2030:47ab41698f9d
sudden drop in flight fix
| author | Ritor1 |
|---|---|
| date | Mon, 18 Nov 2013 13:17:12 +0600 |
| parents | 4000f8184c29 |
| children | da35dc35d635 |
| rev | line source |
|---|---|
|
1165
29a8defbad9e
temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents:
1116
diff
changeset
|
1 #ifdef _MSC_VER |
|
29a8defbad9e
temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents:
1116
diff
changeset
|
2 #define _CRT_SECURE_NO_WARNINGS |
|
29a8defbad9e
temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents:
1116
diff
changeset
|
3 #endif |
|
29a8defbad9e
temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents:
1116
diff
changeset
|
4 |
| 1016 | 5 #include "stru6.h" |
| 6 | |
| 0 | 7 #include "Player.h" |
| 8 #include "PlayerFrameTable.h" | |
| 9 #include "AudioPlayer.h" | |
| 10 #include "Party.h" | |
| 816 | 11 #include "Log.h" |
| 0 | 12 #include "LOD.h" |
| 13 #include "GUIWindow.h" | |
| 14 #include "Viewport.h" | |
| 15 #include "Actor.h" | |
| 16 #include "Game.h" | |
| 17 #include "Mouse.h" | |
| 18 #include "TurnEngine.h" | |
| 19 #include "Events.h" | |
| 20 #include "Events2D.h" | |
| 21 #include "Outdoor.h" | |
| 22 #include "StorylineTextTable.h" | |
|
81
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
23 #include "Autonotes.h" |
|
377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
zipi
parents:
45
diff
changeset
|
24 #include "Awards.h" |
| 189 | 25 #include "texts.h" |
| 816 | 26 |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
27 #include "stru123.h" |
| 0 | 28 #include "mm7_data.h" |
|
828
0f56abdcce94
Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents:
821
diff
changeset
|
29 #include "MM7.h" |
| 1297 | 30 #include "SpriteObject.h" |
| 31 #include "DecalBuilder.h" | |
| 0 | 32 |
| 33 | |
| 34 | |
| 35 | |
| 36 | |
| 37 /* 381 */ | |
| 38 #pragma pack(push, 1) | |
| 290 | 39 struct PlayerCreation_AttributeProps |
| 0 | 40 { |
| 41 unsigned __int8 uBaseValue; | |
| 42 char uMaxValue; | |
| 43 char uDroppedStep; | |
| 44 char uBaseStep; | |
| 45 }; | |
| 46 #pragma pack(pop) | |
| 47 | |
| 48 | |
| 49 #pragma pack(push, 1) | |
| 290 | 50 |
| 51 | |
| 52 | |
| 0 | 53 #pragma pack(pop) |
| 290 | 54 PlayerCreation_AttributeProps StatTable[4][7] = //0x4ED7B0 |
| 55 { | |
| 56 {{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},}, | |
| 57 {{ 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},}, | |
| 58 {{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},}, | |
| 59 {{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 | 60 }; |
| 61 | |
| 62 | |
| 63 | |
| 1700 | 64 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 | 65 std::array<int, 5> StealingRandomBonuses = {-200, -100, 0, 100, 200}; //dword_4EDEB4 |
| 1700 | 66 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 | 67 |
| 68 | |
| 69 | |
| 70 // available skills per class ( 9 classes X 37 skills ) | |
| 71 // 0 - not available | |
| 72 // 1 - available | |
| 73 // 2 - primary skill | |
| 74 unsigned char pSkillAvailabilityPerClass[9][37] = // byte[] @ MM7.exe::004ED820 | |
| 75 { | |
| 76 {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}, | |
| 77 {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}, | |
| 78 {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}, | |
| 79 {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}, | |
| 80 {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}, | |
| 81 {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}, | |
| 82 {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}, | |
| 83 {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}, | |
| 84 {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 | |
| 85 }; | |
| 86 | |
| 87 | |
| 1374 | 88 unsigned char pEquipTypeToBodyAnchor[21] = // 4E8398 |
| 89 { | |
| 1989 | 90 1, // EQUIP_SINGLE_HANDED |
| 91 1, // EQUIP_TWO_HANDED | |
| 1374 | 92 2, // EQUIP_BOW |
| 93 3, // EQUIP_ARMOUR | |
| 94 0, // EQUIP_SHIELD | |
| 95 4, // EQUIP_HELMET | |
| 96 5, // EQUIP_BELT | |
| 97 6, // EQUIP_CLOAK | |
| 98 7, // EQUIP_GAUNTLETS | |
| 99 8, // EQUIP_BOOTS | |
| 100 10, // EQUIP_RING | |
| 101 9, // EQUIP_AMULET | |
| 102 1, // EQUIP_WAND | |
| 103 0, // EQUIP_REAGENT | |
| 104 0, // EQUIP_POTION | |
| 105 0, // EQUIP_SPELL_SCROLL | |
| 106 0, // EQUIP_BOOK | |
| 107 0, // EQUIP_MESSAGE_SCROLL | |
| 108 0, // EQUIP_GOLD | |
| 109 0, // EQUIP_GEM | |
| 110 0 // EQUIP_NONE | |
| 111 }; | |
| 0 | 112 |
| 113 | |
| 114 unsigned char pBaseHealthByClass[12] = {40, 35, 35, 30, 30, 30, 25, 20, 20, 0, 0, 0}; | |
| 115 unsigned char pBaseManaByClass[12] = { 0, 0, 0, 5, 5, 0, 10, 10, 15, 0, 0, 0}; | |
| 116 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}; | |
| 117 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}; | |
| 118 | |
| 1325 | 119 unsigned char pConditionAttributeModifier[7][19] = |
| 120 {{100, 100, 100, 120, 50, 200, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Might | |
| 121 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Intelligence | |
| 122 {100, 100, 100, 50, 25, 10, 100, 100, 75, 60, 50, 30, 100, 100, 100, 100, 100, 1, 100}, //Willpower | |
| 123 {100, 100, 100, 100, 50, 150, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 100, 100}, //Endurance | |
| 124 {100, 100, 100, 50, 10, 100, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Accuracy | |
| 125 {100, 100, 100, 120, 20, 120, 75, 60, 50, 30, 25, 10, 100, 100, 100, 100, 100, 50, 100}, //Speed | |
| 126 {100, 100, 100, 100, 200, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100}}; //Luck | |
| 127 | |
| 128 unsigned char pAgingAttributeModifier[7][4] = | |
| 129 {{100, 75, 40, 10}, //Might | |
| 130 {100, 150, 100, 10}, //Intelligence | |
| 131 {100, 150, 100, 10}, //Willpower | |
| 132 {100, 75, 40, 10}, //Endurance | |
| 133 {100, 100, 40, 10}, //Accuracy | |
| 134 {100, 100, 40, 10}, //Speed | |
| 135 {100, 100, 100, 100}}; //Luck | |
| 0 | 136 |
| 1684 | 137 unsigned int pAgeingTable[4] = {50, 100, 150, 0xFFFF}; |
| 0 | 138 |
|
1207
96a81634669e
arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents:
1205
diff
changeset
|
139 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 | 140 |
| 1036 | 141 short param_to_bonus_table[29] = {500, 400, 350, 300, 275, 250, 225, 200, 175, |
| 0 | 142 150, 125, 100, 75, 50, 40, 35, 30, 25, 21, |
| 1036 | 143 19, 17, 15, 13, 11, 9, 7, 5, 3, 0}; |
| 144 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 | 145 |
| 146 | |
| 816 | 147 unsigned short base_recovery_times_per_weapon_type[12] = |
| 148 { | |
| 149 100, // PLAYER_SKILL_STAFF && Unarmed withoud skill | |
| 150 90, // PLAYER_SKILL_SWORD && Unarmed with skill | |
| 151 60, // PLAYER_SKILL_DAGGER | |
| 152 100, // PLAYER_SKILL_AXE | |
| 153 80, // PLAYER_SKILL_SPEAR | |
| 154 100, // PLAYER_SKILL_BOW | |
| 155 80, // PLAYER_SKILL_MACE | |
| 156 30, // PLAYER_SKILL_BLASTER | |
| 157 10, // PLAYER_SKILL_SHIELD | |
| 158 10, // PLAYER_SKILL_LEATHER | |
| 159 20, // PLAYER_SKILL_CHAIN | |
| 160 30 // PLAYER_SKILL_PLATE | |
| 161 }; | |
| 162 | |
| 0 | 163 //----- (00490913) -------------------------------------------------------- |
| 1459 | 164 int PlayerCreation_GetUnspentAttributePointCount() |
| 0 | 165 { |
| 166 signed int v0; // edi@1 | |
| 1273 | 167 int raceId; // ebx@2 |
| 0 | 168 signed int v4; // eax@17 |
| 169 int v5; // edx@18 | |
| 170 signed int v6; // ecx@18 | |
| 1273 | 171 signed int remainingStatPoints; // [sp+Ch] [bp-8h]@1 |
| 172 | |
| 173 remainingStatPoints = 50; | |
| 0 | 174 v0 = 50; |
| 1273 | 175 for (int playerNum = 0; playerNum < 4; playerNum++) |
| 176 { | |
| 177 raceId = pParty->pPlayers[playerNum].GetRace(); | |
| 178 for (int statNum = 0; statNum <= 6; statNum++) | |
| 179 { | |
| 180 switch ( statNum ) | |
| 0 | 181 { |
| 1273 | 182 case 0: |
| 183 v0 = pParty->pPlayers[playerNum].uMight; | |
| 184 break; | |
| 185 case 1: | |
| 186 v0 = pParty->pPlayers[playerNum].uIntelligence; | |
| 187 break; | |
| 188 case 2: | |
| 189 v0 = pParty->pPlayers[playerNum].uWillpower; | |
| 190 break; | |
| 191 case 3: | |
| 192 v0 = pParty->pPlayers[playerNum].uEndurance; | |
| 193 break; | |
| 194 case 4: | |
| 195 v0 = pParty->pPlayers[playerNum].uAccuracy; | |
| 196 break; | |
| 197 case 5: | |
| 198 v0 = pParty->pPlayers[playerNum].uSpeed; | |
| 199 break; | |
| 200 case 6: | |
| 201 v0 = pParty->pPlayers[playerNum].uLuck; | |
| 202 break; | |
| 203 } | |
| 204 v4 = StatTable[raceId][statNum].uBaseValue; | |
| 205 if ( v0 >= v4 ) | |
| 206 { | |
| 207 v5 = StatTable[raceId][statNum].uDroppedStep; | |
| 208 v6 = StatTable[raceId][statNum].uBaseStep; | |
| 0 | 209 } |
| 210 else | |
| 211 { | |
| 1273 | 212 v5 = StatTable[raceId][statNum].uBaseStep; |
| 213 v6 = StatTable[raceId][statNum].uDroppedStep; | |
| 0 | 214 } |
| 1273 | 215 remainingStatPoints += v5 * (v4 - v0) / v6; |
| 216 } | |
| 217 } | |
| 218 return remainingStatPoints; | |
| 0 | 219 } |
| 220 | |
| 221 | |
| 222 | |
| 223 //----- (00427730) -------------------------------------------------------- | |
| 224 bool Player::CanCastSpell(unsigned int uRequiredMana) | |
| 225 { | |
| 1275 | 226 if (sMana >= (signed int)uRequiredMana) |
| 227 { | |
| 228 sMana -= (signed int)uRequiredMana; | |
| 488 | 229 return true; |
| 230 } | |
| 231 | |
| 232 pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0); | |
| 233 return false; | |
| 0 | 234 } |
| 235 | |
| 236 | |
| 237 //----- (004BE2DD) -------------------------------------------------------- | |
| 1014 | 238 void Player::SalesProcess( unsigned int inventory_idnx, int item_index, int _2devent_idx ) |
| 239 { | |
| 0 | 240 float v6; // ST04_4@1 |
| 1014 | 241 signed int item_value; // eax@1 |
| 242 signed int sell_price; // ebx@1 | |
| 243 | |
| 244 item_value =pOwnItems[item_index].GetValue(); | |
| 245 v6 = p2DEvents[ _2devent_idx - 1].fPriceMultiplier; | |
| 246 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
|
247 if ( pOwnItems[item_index].IsBroken() ) |
| 1014 | 248 sell_price = 1; |
| 249 if ( sell_price < 1 ) | |
| 250 sell_price = 1; | |
| 251 RemoveItemAtInventoryIndex(inventory_idnx); | |
| 252 Party::SetGold(pParty->uNumGold + sell_price); | |
| 0 | 253 } |
| 254 | |
| 255 | |
| 256 | |
| 257 //----- (0043EEF3) -------------------------------------------------------- | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
258 bool Player::NothingOrJustBlastersEquipped() |
| 0 | 259 { |
| 1014 | 260 signed int item_idx; // esi@1 |
| 261 signed int item_id; // esi@1 | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
262 for (int i = 0; i < 16; ++i) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
263 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
264 item_idx = pEquipment.pIndices[i]; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
265 if (item_idx) |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
266 { |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
267 item_id = pOwnItems[item_idx - 1].uItemID; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
268 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
|
269 return false; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
270 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
271 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
272 return true; |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
273 } |
| 1014 | 274 |
| 0 | 275 |
| 276 | |
| 277 | |
| 278 //----- (004B8040) -------------------------------------------------------- | |
| 1036 | 279 int Player::GetConditionDayOfWeek( unsigned int uCondition ) |
| 280 { | |
| 281 return (unsigned int)(((signed __int64)((double)this->pConditions[uCondition] * 0.234375) / 60 / 60) / 24) % 7 + 1; | |
| 0 | 282 } |
| 283 | |
| 284 //----- (004B807C) -------------------------------------------------------- | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
285 int Player::GetTempleHealCostModifier(float a2) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
286 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
287 unsigned int conditionIdx; // eax@1 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
288 int conditionTimeMultiplier; // esi@1 |
| 0 | 289 int v6; // eax@8 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
290 signed int result; // qax@13 |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
291 signed int baseConditionMultiplier; // [sp+8h] [bp-8h]@4 |
| 1275 | 292 |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
293 conditionIdx = GetMajorConditionIdx(); |
| 1275 | 294 if ( conditionIdx >= 14 && conditionIdx <= 16) |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
295 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
296 if ( conditionIdx <= 15 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
297 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
298 baseConditionMultiplier = 5; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
299 } |
| 1783 | 300 else //if ( conditionIdx == 16 ) |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
301 { |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
302 baseConditionMultiplier = 10; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
303 } |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
304 conditionTimeMultiplier = GetConditionDayOfWeek(conditionIdx); |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
305 } |
| 1350 | 306 else |
| 307 { | |
| 1275 | 308 conditionTimeMultiplier = 1; |
| 309 baseConditionMultiplier = 1; | |
| 1350 | 310 if (conditionIdx < 14) |
| 311 { | |
| 312 for (int i = 0; i <= 13; i++) | |
| 313 { | |
| 314 v6 = GetConditionDayOfWeek(i); | |
| 315 if ( v6 > conditionTimeMultiplier ) | |
| 316 conditionTimeMultiplier = v6; | |
| 317 } | |
| 318 } | |
| 1275 | 319 } |
| 320 result = (int)((double)conditionTimeMultiplier * (double)baseConditionMultiplier * a2); | |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
321 if ( result < 1 ) |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
322 result = 1; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
323 return result; |
| 0 | 324 } |
| 325 | |
| 326 //----- (004B8102) -------------------------------------------------------- | |
| 917 | 327 int Player::GetPriceSell(int uRealValue, float price_multiplier) |
| 0 | 328 { |
| 329 signed int v3; // esi@1 | |
| 330 signed int result; // eax@3 | |
| 331 | |
| 1275 | 332 v3 = (signed int)((signed __int64)((double)uRealValue / (price_multiplier + 2.0)) + uRealValue * GetMerchant() / 100); |
| 917 | 333 if ( v3 > uRealValue ) |
| 334 v3 = uRealValue; | |
| 0 | 335 result = 1; |
| 336 if ( v3 >= 1 ) | |
| 337 result = v3; | |
| 338 return result; | |
| 339 } | |
| 340 | |
| 341 //----- (004B8142) -------------------------------------------------------- | |
| 749 | 342 int Player::GetBuyingPrice(unsigned int uRealValue, float price_multiplier) |
| 343 { | |
| 1275 | 344 uint price = (uint)(((100 - GetMerchant()) * (uRealValue * price_multiplier)) / 100); |
| 749 | 345 |
| 346 if (price < uRealValue) | |
| 347 price = uRealValue; | |
| 348 return price; | |
| 0 | 349 } |
| 350 | |
| 351 //----- (004B8179) -------------------------------------------------------- | |
| 916 | 352 int Player::GetPriceIdentification(float a2) |
| 0 | 353 { |
| 354 signed int v2; // esi@1 | |
| 355 int v3; // ecx@1 | |
| 356 signed int result; // eax@3 | |
| 357 | |
| 1275 | 358 v2 = (signed int)(a2 * 50.0); |
| 0 | 359 v3 = v2 * (100 - GetMerchant()) / 100; |
| 360 if ( v3 < v2 / 3 ) | |
| 361 v3 = v2 / 3; | |
| 362 result = 1; | |
| 363 if ( v3 >= 1 ) | |
| 364 result = v3; | |
| 365 return result; | |
| 366 } | |
| 367 | |
| 368 //----- (004B81C3) -------------------------------------------------------- | |
| 916 | 369 int Player::GetPriceRepair(int a2, float a3) |
| 0 | 370 { |
| 371 signed int v3; // esi@1 | |
| 372 int v4; // ecx@1 | |
| 373 signed int result; // eax@3 | |
| 374 | |
| 1275 | 375 v3 = (signed int)((double)a2 / (6.0 - a3)); |
| 0 | 376 v4 = v3 * (100 - GetMerchant()) / 100; |
| 377 if ( v4 < v3 / 3 ) | |
| 378 v4 = v3 / 3; | |
| 379 result = 1; | |
| 380 if ( v4 >= 1 ) | |
| 381 result = v4; | |
| 382 return result; | |
| 383 } | |
| 384 | |
| 385 //----- (004B8213) -------------------------------------------------------- | |
| 1275 | 386 int Player::GetBaseSellingPrice(int a2, float a3) |
| 387 { | |
| 388 signed int v3; // qax@1 | |
| 389 | |
| 390 v3 = (signed int)((double)a2 / (a3 + 2.0)); | |
| 391 if ( v3 < 1 ) | |
| 392 v3 = 1; | |
| 0 | 393 return v3; |
| 394 } | |
| 395 | |
| 396 //----- (004B8233) -------------------------------------------------------- | |
| 1275 | 397 int Player::GetBaseBuyingPrice(int a2, float a3) |
| 398 { | |
| 399 signed int v3; // qax@1 | |
| 400 | |
| 401 v3 = (signed int)((double)a2 * a3); | |
| 402 if ( v3 < 1 ) | |
| 403 v3 = 1; | |
| 0 | 404 return v3; |
| 405 } | |
| 406 | |
| 407 //----- (004B824B) -------------------------------------------------------- | |
| 1275 | 408 int Player::GetBaseIdentifyPrice(float a2) |
| 409 { | |
| 410 signed int v2; // qax@1 | |
| 411 | |
| 412 v2 = (signed int)(a2 * 50.0); | |
| 413 if ( v2 < 1 ) | |
| 414 v2 = 1; | |
| 0 | 415 return v2; |
| 416 } | |
| 417 | |
| 418 //----- (004B8265) -------------------------------------------------------- | |
| 1275 | 419 int Player::GetBaseRepairPrice(int a2, float a3) |
| 420 { | |
| 421 signed int v3; // qax@1 | |
| 422 | |
| 423 v3 = (signed int)((double)a2 / (6.0 - a3)); | |
| 424 if ( v3 < 1 ) | |
| 425 v3 = 1; | |
| 0 | 426 return v3; |
| 427 } | |
| 428 | |
| 429 | |
| 430 | |
| 431 | |
| 432 | |
| 433 //----- (004B6FF9) -------------------------------------------------------- | |
| 1348 | 434 bool Player::IsPlayerHealableByTemple() |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
435 { |
| 0 | 436 signed int v2; // eax@1 |
| 336 | 437 v2 = (signed int)window_SpeakInHouse->ptr_1C; |
| 1348 | 438 if (this->sHealth >= GetMaxHealth() && this->sMana >= GetMaxMana() && GetMajorConditionIdx() == Condition_Good) |
| 439 { | |
| 440 return false; | |
| 441 } | |
| 442 else | |
| 443 { | |
| 444 if (GetMajorConditionIdx() == Condition_Zombie) | |
| 445 { | |
| 446 if ((v2 == 78 || v2 == 81 || v2 == 82)) | |
| 447 { | |
| 448 return false; | |
| 449 } | |
| 450 else | |
| 451 { | |
| 452 return true; | |
| 453 } | |
|
1346
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
454 } |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
455 else |
|
1434b36f4bdb
Player::_43EEF3 renamed to NothingOrJustBlastersEquipped
Grumpy7
parents:
1325
diff
changeset
|
456 { |
| 1348 | 457 return true; |
| 458 } | |
|
1278
ce8ea73e7678
changed Player::_4B6FF9 to Player::IsPlayerHealableByTemple
Grumpy7
parents:
1276
diff
changeset
|
459 } |
| 0 | 460 } |
| 461 | |
| 462 | |
| 463 | |
| 464 //----- (00421E75) -------------------------------------------------------- | |
| 1012 | 465 unsigned int Player::GetItemIDAtInventoryIndex(int *pitem_index) |
| 466 { | |
| 467 int item_idx; // eax@1 | |
| 468 int inv_index; // eax@3 | |
| 469 | |
| 1351 | 470 |
| 1012 | 471 item_idx = *pitem_index; |
| 472 if ( item_idx >125 || item_idx < 0 ) | |
| 473 { | |
| 474 return 0; | |
| 475 } | |
| 476 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
477 inv_index = this->pInventoryMatrix[item_idx]; |
| 1012 | 478 if ( inv_index < 0 ) |
| 479 { | |
| 480 *pitem_index = -1 - inv_index; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
481 inv_index = this->pInventoryMatrix[-1 - inv_index]; |
| 1012 | 482 } |
| 483 | |
| 484 return inv_index; | |
| 0 | 485 } |
| 486 | |
| 487 | |
| 488 | |
| 489 //----- (004160CA) -------------------------------------------------------- | |
| 1012 | 490 void Player::ItemsEnchant( int enchant_count ) |
| 491 { | |
| 492 int avalible_items; // ebx@1 | |
| 493 int i; // edx@8 | |
| 494 __int16 item_index_tabl[138]; // [sp+Ch] [bp-118h]@1 | |
| 495 | |
| 496 avalible_items = 0; | |
| 497 memset (item_index_tabl,0,sizeof(item_index_tabl)); | |
| 498 | |
| 1349 | 499 for (i = 0; i < 138; ++i) |
| 500 { | |
| 501 if (( pOwnItems[i].uItemID>0)&&(pOwnItems[i].uItemID <= 134)) | |
| 502 item_index_tabl[avalible_items++] = i; | |
| 503 } | |
| 1012 | 504 |
| 505 if ( avalible_items ) | |
| 506 { | |
| 507 if ( enchant_count ) | |
| 508 { | |
| 1349 | 509 for ( i = 0; i < enchant_count; ++i ) |
| 510 { | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
511 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
|
512 pInventoryItemList[item_index_tabl[rand() % avalible_items]].uAttributes |= ITEM_HARDENED; |
| 1349 | 513 } |
| 0 | 514 } |
| 515 else | |
| 516 { | |
| 1012 | 517 for ( i = 0; i < avalible_items; ++i ) |
| 518 { | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
519 pInventoryItemList[item_index_tabl[i]].uAttributes |= ITEM_HARDENED; |
| 1349 | 520 } |
| 521 } | |
| 522 } | |
| 0 | 523 } |
| 524 | |
| 525 //----- (004948B1) -------------------------------------------------------- | |
| 187 | 526 void Player::PlaySound(PlayerSpeech speech, int a3) |
| 527 { | |
| 1351 | 528 signed int speechCount = 0; // esi@4 |
| 529 signed int expressionCount = 0; // esi@4 | |
| 530 int pickedVariant; // esi@10 | |
| 248 | 531 CHARACTER_EXPRESSION_ID expression; // ebx@17 |
| 1406 | 532 signed int pSoundID; // ecx@19 |
| 1351 | 533 int speechVariantArray[5]; // [sp+Ch] [bp-1Ch]@7 |
| 534 int expressionVariantArray[5]; | |
| 535 unsigned int pickedSoundID; // [sp+30h] [bp+8h]@4 | |
| 536 unsigned int expressionDuration = 0; | |
| 187 | 537 |
| 1351 | 538 pickedSoundID = 0; |
| 203 | 539 if (uVoicesVolumeMultiplier) |
| 0 | 540 { |
| 1351 | 541 for (int i = 0; i < 2; i++) |
| 542 { | |
| 1406 | 543 if ( SoundSetAction[speech][i] ) |
| 544 { | |
| 545 speechVariantArray[speechCount] = SoundSetAction[speech][i]; | |
| 1351 | 546 speechCount++; |
| 547 } | |
| 548 } | |
| 549 if ( speechCount ) | |
| 550 { | |
| 551 pickedVariant = speechVariantArray[rand() % speechCount]; | |
| 552 int numberOfSubvariants = byte_4ECF08[pickedVariant - 1][uVoiceID]; | |
| 553 if (numberOfSubvariants > 0) | |
| 554 { | |
| 555 pickedSoundID = rand() % numberOfSubvariants + 2 * (pickedVariant + 50 * uVoiceID) + 4998; | |
| 1406 | 556 pAudioPlayer->PlaySound((SoundID)pickedSoundID, PID(OBJECT_Player, uActiveCharacter + 39), 0, -1, 0, 0, (int)(pSoundVolumeLevels[uVoicesVolumeMultiplier] * 128.0f), 0); |
| 1351 | 557 } |
| 558 } | |
| 559 } | |
| 560 | |
| 561 for (int i = 0; i < 5; i++) | |
| 562 { | |
| 1406 | 563 if ( SoundSetAction[speech][i + 3] ) |
| 564 { | |
| 565 expressionVariantArray[expressionCount] = SoundSetAction[speech][i + 3]; | |
| 1351 | 566 expressionCount++; |
| 567 } | |
| 568 } | |
| 569 if ( expressionCount ) | |
| 570 { | |
| 571 expression = (CHARACTER_EXPRESSION_ID)expressionVariantArray[rand() % expressionCount]; | |
| 572 if (expression == CHARACTER_EXPRESSION_21 && pickedSoundID ) | |
| 573 { | |
| 1406 | 574 pSoundID = 0; |
| 575 if ( pSoundList->sNumSounds ) | |
| 576 { | |
| 1351 | 577 for (int i = 0; i < pSoundList->sNumSounds; i++) |
| 0 | 578 { |
| 1406 | 579 if (pSoundList->pSounds[i].uSoundID == pickedSoundID) |
| 580 pSoundID = i; | |
| 0 | 581 } |
| 582 } | |
| 1406 | 583 if ( pSoundList->pSounds[pSoundID].pSoundData[0] ) |
| 1351 | 584 expressionDuration = (sLastTrackLengthMS << 7) / 1000; |
| 585 } | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
586 PlayEmotion(expression, expressionDuration); |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
587 } |
| 0 | 588 } |
| 589 // 4948B1: using guessed type int var_1C[5]; | |
| 590 | |
| 591 //----- (00494A25) -------------------------------------------------------- | |
| 187 | 592 void Player::PlayEmotion(CHARACTER_EXPRESSION_ID new_expression, int a3) |
| 593 { | |
|
1352
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
594 unsigned int v3 = expression; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
595 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
|
596 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
597 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
598 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
599 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
|
600 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
601 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
602 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
603 else |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
604 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
605 if (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
|
606 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
607 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
|
608 { |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
609 return; |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
610 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
611 } |
|
88f80476c99c
Player::PlayEmotion simplified main condition, renamed a few expression enum vals
Grumpy7
parents:
1351
diff
changeset
|
612 } |
| 0 | 613 this->uExpressionTimePassed = 0; |
| 614 if ( !a3 ) | |
| 615 { | |
| 187 | 616 this->uExpressionTimeLength = 8 * pPlayerFrameTable->pFrames[a3].uAnimLength; |
| 617 } | |
|
1353
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
618 else |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
619 { |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
620 this->uExpressionTimeLength = 0; |
|
8f69f77a0067
Player::PlayEmotion removed unused variables, deleted a useless secion of code (unused calculations)
Grumpy7
parents:
1352
diff
changeset
|
621 } |
| 187 | 622 expression = new_expression; |
| 0 | 623 viewparams->bRedrawGameUI = 1; |
| 624 } | |
| 625 | |
| 626 //----- (0049327B) -------------------------------------------------------- | |
| 1355 | 627 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
|
628 { |
| 135 | 629 if ( this->classType == uClass ) |
| 0 | 630 { |
|
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
|
631 return true; |
| 0 | 632 } |
| 633 else | |
| 634 { | |
|
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
|
635 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
|
636 { |
|
05becb008006
Player::_49327B to Player::ProfessionOrGuildFlagsCorrect, removed a huge section of the function that's never used (only 4 inputs used)
Grumpy7
parents:
1353
diff
changeset
|
637 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
|
638 } |
| 0 | 639 switch ( uClass ) |
| 640 { | |
| 641 case 0x1Au: | |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
642 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 65)); |
| 0 | 643 case 0x1Bu: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
644 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 67)); |
| 0 | 645 case 0x22u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
646 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 77)); |
| 0 | 647 case 0x23u: |
|
1460
ff2118028c71
renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents:
1455
diff
changeset
|
648 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 79)); |
| 0 | 649 break; |
| 650 default: | |
| 1545 | 651 Error("Should not be able to get here (%u)", uClass); |
| 0 | 652 break; |
| 653 } | |
|
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
|
654 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
|
655 } |
| 0 | 656 } |
| 657 | |
| 658 | |
| 659 //----- (00492C0B) -------------------------------------------------------- | |
| 660 bool Player::CanAct() | |
| 661 { | |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
662 if ( this->IsAsleep() || this->IsParalyzed() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
663 this->IsUnconcious() || this->IsDead() || |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
664 this->IsPertified() || this->IsEradicated() ) |
| 1355 | 665 return false; |
| 0 | 666 else |
| 1355 | 667 return true; |
| 0 | 668 } |
| 669 | |
| 670 //----- (00492C40) -------------------------------------------------------- | |
| 671 bool Player::CanSteal() | |
| 672 { | |
| 1355 | 673 return GetActualSkillLevel(PLAYER_SKILL_STEALING) != 0; |
| 0 | 674 } |
| 675 | |
| 676 //----- (00492C4E) -------------------------------------------------------- | |
| 677 bool Player::CanEquip_RaceAndAlignmentCheck(unsigned int uItemID) | |
| 678 { | |
|
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
|
679 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
|
680 { |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
681 case ITEM_RELIC_ETHRICS_STAFF: |
|
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1357
diff
changeset
|
682 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
|
683 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
|
684 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
|
685 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
|
686 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
|
687 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
|
688 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
|
689 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
|
690 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
|
691 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
|
692 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
|
693 default: return 1; break; |
|
1356
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
694 } |
|
301e227439e7
Player::CanEquip_RaceAndAlignmentCheck condition reorganizing, label removal, using GetSexByVoice()
Grumpy7
parents:
1355
diff
changeset
|
695 } |
|
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
|
696 |
| 0 | 697 //----- (00492D65) -------------------------------------------------------- |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
698 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
|
699 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
700 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
|
701 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
|
702 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
|
703 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
|
704 |
|
a47d9282ea7c
Player::SetCondition 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 if ( pConditions[uConditionIdx] ) |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
706 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
707 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
708 if (!ConditionProcessor::IsPlayerAffected(this, uConditionIdx, a3)) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
709 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
710 return; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
711 } |
|
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
|
712 |
|
a47d9282ea7c
Player::SetCondition 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 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
|
714 { |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
715 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
|
716 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
|
717 case Condition_Sleep: break; //nosound |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
718 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
|
719 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
|
720 case Condition_Insane: PlaySound(SPEECH_29, 0); break; |
| 1014 | 721 case Condition_Poison1: |
| 722 case Condition_Poison2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
723 case Condition_Poison3: PlaySound(SPEECH_27, 0); break; |
| 1014 | 724 case Condition_Disease1: |
| 725 case Condition_Disease2: | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
726 case Condition_Disease3: PlaySound(SPEECH_28, 0);break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
727 case Condition_Paralyzed: break; //nosound |
| 1014 | 728 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
|
729 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
|
730 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
|
731 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
|
732 break; |
| 1014 | 733 case Condition_Dead: |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
734 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
|
735 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
|
736 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
|
737 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
|
738 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
|
739 break; |
| 1014 | 740 case Condition_Pertified: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
741 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
|
742 break; |
| 1014 | 743 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
|
744 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
|
745 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
|
746 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
|
747 if ( sMana > 0 ) |
| 1014 | 748 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
|
749 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
|
750 case Condition_Zombie: |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
751 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
|
752 return; |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
753 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
|
754 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
|
755 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
|
756 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
|
757 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
|
758 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
|
759 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
|
760 { |
|
a47d9282ea7c
Player::SetCondition 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 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
|
762 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
|
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 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
|
765 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
766 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
|
767 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
|
768 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
769 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
|
770 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
|
771 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
772 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
773 players_before = 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
774 for (int i = 1; i < 5; ++i) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
775 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
776 if ( pPlayers[i]->CanAct() ) |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
777 ++players_before; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
778 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
779 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
780 pConditions[uConditionIdx] = 1; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
781 |
|
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
|
782 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
|
783 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
|
784 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
|
785 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
786 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
|
787 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
788 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
|
789 ++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
|
790 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
791 } |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
792 if (( players_before == 2 ) && ( players_after == 1 )) |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
793 { |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
794 pPlayers[remainig_player]->PlaySound(SPEECH_107, 0); |
|
a47d9282ea7c
Player::SetCondition added spaces for readability, fixed stoning and poisioning bug wit prot. from magic, using IsMale() function instead of case
Grumpy7
parents:
1359
diff
changeset
|
795 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
796 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
|
797 } |
| 0 | 798 |
| 799 //----- (00492528) -------------------------------------------------------- | |
| 800 bool Player::CanFitItem(unsigned int uSlot, unsigned int uItemID) | |
| 801 { | |
| 1363 | 802 Texture *texture; // esi@1 |
| 803 unsigned int slotWidth; // ebx@1 | |
| 804 unsigned int slotHeight; // [sp+1Ch] [bp+Ch]@1 | |
| 805 | |
| 806 texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); | |
| 807 slotWidth = GetSizeInInventorySlots(texture->uTextureWidth); | |
| 808 slotHeight = GetSizeInInventorySlots(texture->uTextureHeight); | |
| 0 | 809 if ( !areWeLoadingTexture ) |
| 810 { | |
| 1363 | 811 texture->Release(); |
| 1006 | 812 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 813 } |
| 1555 | 814 Assert(slotHeight > 0 && slotWidth > 0, "Items should have nonzero dimensions"); |
| 1363 | 815 if ( (slotWidth + uSlot % INVETORYSLOTSWIDTH) <= INVETORYSLOTSWIDTH && (slotHeight + uSlot / INVETORYSLOTSWIDTH) <= INVETORYSLOTSHEIGHT ) |
| 816 { | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
817 for (unsigned int x = 0; x < slotWidth; x++) |
| 1363 | 818 { |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
819 for (unsigned int y = 0; y < slotHeight; y++) |
| 1363 | 820 { |
|
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
|
821 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
|
822 { |
|
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
|
823 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
|
824 } |
| 1363 | 825 } |
| 826 } | |
| 827 return true; | |
| 828 } | |
| 829 return false; | |
| 0 | 830 } |
| 831 // 506128: using guessed type int areWeLoadingTexture; | |
| 832 | |
| 833 //----- (004925E6) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
834 int Player::FindFreeInventoryListSlot() |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
835 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
836 for (int i = 0; i < 126; i++ ) |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
837 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
838 if (pInventoryItemList[i].uItemID == 0) |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
839 { |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
840 return i; |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
841 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
842 } |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
843 return -1; |
| 0 | 844 } |
| 845 | |
| 846 //----- (00492600) -------------------------------------------------------- | |
| 847 int Player::CreateItemInInventory(unsigned int uSlot, unsigned int uItemID) | |
| 848 { | |
| 849 int result; // eax@8 | |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
850 signed int freeSlot; // [sp+8h] [bp-4h]@4 |
|
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
851 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
852 freeSlot = FindFreeInventoryListSlot(); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
853 if ( freeSlot == -1 ) |
| 0 | 854 { |
| 855 if ( uActiveCharacter ) | |
| 201 | 856 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NoRoom, 0); |
|
1366
8f339c3bbdaf
Player::CreateItemInInventory small bugfix from previous change
Grumpy7
parents:
1365
diff
changeset
|
857 return 0; |
| 0 | 858 } |
| 859 else | |
| 860 { | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
861 PutItemArInventoryIndex(uItemID, freeSlot, uSlot); |
|
1365
b691c96d8e06
Player::FindFreeInventorySlot and Player::CreateItemInInventory refactoring
Grumpy7
parents:
1363
diff
changeset
|
862 result = freeSlot + 1; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
863 this->pInventoryItemList[freeSlot].uItemID = uItemID; |
| 0 | 864 } |
| 865 return result; | |
| 866 } | |
| 867 // 506128: using guessed type int areWeLoadingTexture; | |
| 868 | |
| 869 //----- (00492700) -------------------------------------------------------- | |
| 870 int Player::HasSkill(unsigned int uSkillType) | |
| 871 { | |
| 1374 | 872 if ( uSkillType >= 37 || this->pActiveSkills[uSkillType] ) |
| 873 { | |
| 874 return 1; | |
| 0 | 875 } |
| 876 else | |
| 877 { | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
878 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[67], this->pName); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1167
diff
changeset
|
879 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1374 | 880 return 0; |
| 881 } | |
| 0 | 882 } |
| 883 | |
| 884 //----- (00492745) -------------------------------------------------------- | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
885 void Player::WearItem( unsigned int uItemID ) |
| 0 | 886 { |
| 1010 | 887 int item_body_anch; // edi@6 |
| 888 int item_indx; | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
889 item_indx = FindFreeInventoryListSlot(); |
| 1010 | 890 |
| 891 if ( item_indx != -1 ) | |
| 892 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
893 pInventoryItemList[item_indx].uItemID = uItemID; |
| 1374 | 894 item_body_anch = pEquipTypeToBodyAnchor[pItemsTable->pItems[uItemID].uEquipType]; |
| 895 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
|
896 pInventoryItemList[item_indx].uBodyAnchor = item_body_anch + 1; |
| 0 | 897 } |
| 898 } | |
| 899 | |
| 900 //----- (004927A8) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
901 int Player::AddItem(int index, unsigned int uItemID) |
| 0 | 902 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
903 if ( index == -1 ) |
| 0 | 904 { |
| 1385 | 905 for (int xcoord = 0; xcoord < INVETORYSLOTSWIDTH; xcoord++) |
| 906 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
907 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) |
| 0 | 908 { |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
909 if ( CanFitItem(ycoord * INVETORYSLOTSWIDTH + xcoord, uItemID) ) |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
910 { |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
911 return CreateItemInInventory(ycoord * INVETORYSLOTSWIDTH + xcoord, uItemID); |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
912 } |
| 0 | 913 } |
| 1385 | 914 } |
| 0 | 915 return 0; |
| 916 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
917 if ( !CanFitItem(index, uItemID) ) |
| 0 | 918 { |
| 1754 | 919 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0); |
| 0 | 920 return 0; |
| 921 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
922 return CreateItemInInventory(index, uItemID); |
| 0 | 923 } |
| 924 | |
| 925 //----- (00492826) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
926 int Player::AddItem2(int index, ItemGen *Src) |
| 0 | 927 { |
| 928 pItemsTable->SetSpecialBonus(Src); | |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
929 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
930 if ( index == -1 ) |
| 0 | 931 { |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
932 for (int xcoord = 0; xcoord < INVETORYSLOTSWIDTH; xcoord++) |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
933 { |
|
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
934 for (int ycoord = 0; ycoord < INVETORYSLOTSHEIGHT; ycoord++) //TODO: change pInventoryMatrix to 2 dimensional array. |
| 1385 | 935 { |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
936 if ( CanFitItem(ycoord * INVETORYSLOTSWIDTH + xcoord, Src->uItemID) ) |
| 0 | 937 { |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
938 return CreateItemInInventory2(ycoord * INVETORYSLOTSWIDTH + xcoord, Src); |
| 0 | 939 } |
| 1385 | 940 } |
| 0 | 941 } |
| 942 return 0; | |
| 943 } | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
944 if ( !CanFitItem(index, Src->uItemID) ) |
| 0 | 945 return 0; |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
946 return CreateItemInInventory2(index, Src); |
| 0 | 947 } |
| 948 | |
| 949 //----- (0049289C) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
950 int Player::CreateItemInInventory2( unsigned int index, ItemGen *Src ) |
| 0 | 951 { |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
952 signed int freeSlot; // ebx@1 |
| 0 | 953 int result; // eax@6 |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
954 |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
955 freeSlot = FindFreeInventoryListSlot(); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
956 if ( freeSlot == -1 ) |
| 0 | 957 { |
| 958 result = 0; | |
| 959 } | |
| 960 else | |
| 961 { | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
962 PutItemArInventoryIndex(Src->uItemID, freeSlot, index); |
|
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
963 memcpy(&pInventoryItemList[freeSlot], Src, sizeof(ItemGen)); |
|
1382
132a6a0d5cef
Player::AddItem2, Player::CreateItemInInventory2 cleanup
Grumpy7
parents:
1374
diff
changeset
|
964 result = freeSlot + 1; |
| 0 | 965 } |
| 966 return result; | |
| 967 } | |
| 968 // 506128: using guessed type int areWeLoadingTexture; | |
| 969 | |
| 970 //----- (0049298B) -------------------------------------------------------- | |
| 1385 | 971 void Player::PutItemArInventoryIndex( int uItemID, int itemListPos, int index ) //originally accepted ItemGen* but needed only its uItemID |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
972 { |
| 1014 | 973 Texture *item_texture; // esi@1 |
| 974 int *pInvPos; // esi@4 | |
| 975 unsigned int slot_width; // [sp+Ch] [bp-4h]@1 | |
| 976 unsigned int slot_height; // [sp+18h] [bp+8h]@1 | |
| 977 | |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
978 item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[uItemID].pIconName, TEXTURE_16BIT_PALETTE); |
| 1014 | 979 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); |
| 980 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 981 if ( !areWeLoadingTexture ) |
| 982 { | |
| 1014 | 983 item_texture->Release(); |
| 1006 | 984 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 985 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
986 if ( slot_width > 0 ) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
987 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
988 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
989 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
990 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
991 memset32(pInvPos, -1 - index, slot_width);//TODO: try to come up with a better solution. negative values are used when drawing the inventory - nothing is drawn |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
992 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
993 } |
| 1014 | 994 } |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
995 pInventoryMatrix[index] = itemListPos + 1; |
| 0 | 996 } |
| 278 | 997 |
| 0 | 998 // 506128: using guessed type int areWeLoadingTexture; |
| 999 | |
| 1000 //----- (00492A36) -------------------------------------------------------- | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1001 void Player::RemoveItemAtInventoryIndex( unsigned int index ) |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1002 { |
| 1014 | 1003 ItemGen *item_in_slot; // ecx@1 |
| 1004 Texture *item_texture; // esi@1 | |
| 1005 unsigned int slot_height; // ebp@1 | |
| 1006 int *pInvPos; // edx@4 | |
| 1007 unsigned int slot_width; // [sp+14h] [bp+4h]@1 | |
| 1008 | |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1009 item_in_slot = &this->pInventoryItemList[pInventoryMatrix[index]-1]; |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1010 item_texture = pIcons_LOD->LoadTexturePtr(item_in_slot->GetIconName(), TEXTURE_16BIT_PALETTE); |
| 1014 | 1011 item_in_slot->Reset(); |
| 1012 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth); | |
| 1013 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight); | |
| 0 | 1014 if ( !areWeLoadingTexture ) |
| 1015 { | |
| 1014 | 1016 item_texture->Release(); |
| 1006 | 1017 pIcons_LOD->SyncLoadedFilesCount(); |
| 0 | 1018 } |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1019 if ( slot_width > 0 ) |
| 1014 | 1020 { |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
1021 pInvPos = &pInventoryMatrix[index]; |
|
1383
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1022 for (unsigned int i = 0; i < slot_height; i++) |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1023 { |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1024 memset32(pInvPos, 0, slot_width); |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1025 pInvPos += INVETORYSLOTSWIDTH; |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1026 } |
|
0a4254e80036
Player::PutItemArInventoryIndex, Player::RemoveItemAtInventoryIndex cleanup, slightly simplified
Grumpy7
parents:
1382
diff
changeset
|
1027 } |
| 0 | 1028 } |
| 1029 // 506128: using guessed type int areWeLoadingTexture; | |
| 1030 | |
| 1031 //----- (00490EEE) -------------------------------------------------------- | |
| 1386 | 1032 int Player::SelectPhrasesTransaction(ItemGen *pItem, int building_type, int BuildID_2Events, int ShopMenuType) //TODO: probably move this somewhere else, not really Player:: stuff |
| 1033 { | |
| 1034 unsigned int idemId; // edx@1 | |
| 1035 signed int equipType; // esi@1 | |
| 1036 float multiplier; // ST04_4@26 | |
| 1037 int price; // edi@26 | |
| 1038 int merchantLevel; // [sp+10h] [bp-8h]@1 | |
| 1039 int itemValue; | |
| 1040 | |
| 1041 merchantLevel = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); | |
| 1042 idemId = pItem->uItemID; | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1043 equipType = pItem->GetItemEquipType(); |
| 1386 | 1044 itemValue = pItem->GetValue(); |
| 1045 | |
| 1046 switch (building_type) | |
| 1047 { | |
| 1411 | 1048 case BuildingType_WeaponShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1049 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1050 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1051 if (equipType > EQUIP_BOW) |
| 1386 | 1052 return 4; |
| 1053 break; | |
| 1411 | 1054 case BuildingType_ArmorShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1055 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1056 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1057 if ( equipType < EQUIP_ARMOUR || equipType > EQUIP_BOOTS) |
| 1386 | 1058 return 4; |
| 1059 break; | |
| 1411 | 1060 case BuildingType_MagicShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1061 if (idemId >= ITEM_ARTIFACT_HERMES_SANDALS) |
| 1386 | 1062 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1063 if ( pItemsTable->pItems[idemId].uSkillType != PLAYER_SKILL_MISC ) |
| 1386 | 1064 return 4; |
| 1065 break; | |
| 1411 | 1066 case BuildingType_AlchemistShop: |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1067 if ((idemId >= ITEM_ARTIFACT_HERMES_SANDALS && idemId < ITEM_RECIPE_REJUVENATION) || idemId > ITEM_RECIPE_BODY_RESISTANCE) |
| 1386 | 1068 return 5; |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1069 if ( !(equipType == EQUIP_REAGENT || equipType == EQUIP_POTION || equipType == EQUIP_MESSAGE_SCROLL)) |
| 1386 | 1070 return 4; |
| 1071 break; | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1072 default: |
| 1545 | 1073 Error("(%u)", building_type); |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1074 break; |
| 1386 | 1075 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1076 if (pItem->IsStolen()) |
| 1386 | 1077 return 6; |
| 1078 | |
| 1079 multiplier = p2DEvents[BuildID_2Events - 1].fPriceMultiplier; | |
| 1080 switch (ShopMenuType) | |
| 1081 { | |
| 1082 case 2: | |
| 1083 price = GetBuyingPrice(itemValue, multiplier); | |
| 1084 break; | |
| 1085 case 3: | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1086 if (pItem->IsBroken()) |
| 1386 | 1087 price = 1; |
| 917 | 1088 else |
| 1386 | 1089 price = this->GetPriceSell(itemValue, multiplier); |
| 1090 break; | |
| 1091 case 4: | |
| 1092 price = this->GetPriceIdentification(multiplier); | |
| 1093 break; | |
| 1094 case 5: | |
| 1095 price = this->GetPriceRepair(itemValue, multiplier); | |
|
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1096 break; |
|
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1386
diff
changeset
|
1097 default: |
|
1558
30db6d265ceb
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
Grumpy7
parents:
1555
diff
changeset
|
1098 Error("(%u)", ShopMenuType); |
| 1386 | 1099 break; |
| 1100 } | |
| 1101 if ( merchantLevel ) | |
| 1102 { | |
| 1103 if (price == itemValue) | |
| 1104 { | |
| 1105 return 3; | |
| 1106 } | |
| 917 | 1107 else |
| 1386 | 1108 { |
| 1109 return 2; | |
| 1110 } | |
| 1111 } | |
| 0 | 1112 else |
| 1386 | 1113 { |
| 1114 return 1; | |
| 1115 } | |
| 0 | 1116 } |
| 1117 | |
| 1118 //----- (0049107D) -------------------------------------------------------- | |
| 1119 int Player::GetBodybuilding() | |
| 1120 { | |
| 1010 | 1121 int v1; // al@1 |
| 0 | 1122 |
| 1123 v1 = GetActualSkillLevel(PLAYER_SKILL_BODYBUILDING); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1124 int multiplier = GetMultiplierForSkillLevel(v1, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1125 return multiplier * (v1 & 0x3F); |
| 0 | 1126 } |
| 1127 | |
| 1128 //----- (004910A8) -------------------------------------------------------- | |
| 607 | 1129 int Player::GetMeditation() |
| 0 | 1130 { |
| 1010 | 1131 int v1; // al@1 |
| 0 | 1132 |
| 1133 v1 = GetActualSkillLevel(PLAYER_SKILL_MEDITATION); | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1134 int multiplier = GetMultiplierForSkillLevel(v1, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1135 return multiplier * (v1 & 0x3F); |
| 0 | 1136 } |
| 1137 | |
| 1138 //----- (004910D3) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1139 bool Player::CanIdentify( ItemGen *pItem ) |
| 0 | 1140 { |
| 1141 unsigned __int16 v2; // ax@1 | |
| 1142 int v5; // edi@7 | |
| 652 | 1143 if (CheckHiredNPCSpeciality(Scholar)) |
| 1144 return true; | |
| 0 | 1145 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1146 v2 = GetActualSkillLevel(PLAYER_SKILL_ITEM_ID); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1147 if ( (signed int)SkillToMastery(v2) >= 4 ) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1148 return true; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1149 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1150 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1151 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1152 return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St; |
| 0 | 1153 } |
| 1154 | |
| 1155 //----- (00491151) -------------------------------------------------------- | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1156 bool Player::CanRepair( ItemGen *pItem ) |
| 0 | 1157 { |
| 1158 unsigned __int16 v2; // ax@1 | |
| 1159 int v5; // edi@7 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1160 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1161 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
|
1162 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
|
1163 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
|
1164 CheckHiredNPCSpeciality(Alchemist) && equipType >= 9 ) |
| 652 | 1165 return true; |
| 1166 | |
| 1010 | 1167 v2 = GetActualSkillLevel(PLAYER_SKILL_REPAIR); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1168 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 0 | 1169 return true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1170 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1171 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1172 v5 = multiplier * (v2 & 0x3F); |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1173 return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St; |
| 0 | 1174 } |
| 1175 | |
| 1176 //----- (004911F3) -------------------------------------------------------- | |
| 1177 int Player::GetMerchant() | |
| 1178 { | |
| 1179 unsigned __int16 v2; // ax@1 | |
| 1180 int v5; // edi@1 | |
| 1181 int v7; // eax@3 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1182 |
| 607 | 1183 v2 = GetActualSkillLevel(PLAYER_SKILL_MERCHANT); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1184 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1185 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1186 |
|
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
|
1187 v7 = pParty->GetPartyReputation(); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1188 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
|
1189 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1190 if (v5 == 0) |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1191 { |
| 0 | 1192 return -v7; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1193 } |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1194 return v5 - v7 + 7; |
| 0 | 1195 } |
| 1196 | |
| 1197 //----- (0049125A) -------------------------------------------------------- | |
| 1198 int Player::GetPerception() | |
| 1199 { | |
| 1200 unsigned __int16 v2; // ax@1 | |
| 1201 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1202 |
| 1010 | 1203 v2 = GetActualSkillLevel(PLAYER_SKILL_PERCEPTION); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1204 if ( SkillToMastery(v2) >= 4 ) |
| 0 | 1205 return 10000; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1206 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1207 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
|
1208 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1209 return v5; |
| 0 | 1210 } |
| 1211 | |
| 1212 //----- (004912B0) -------------------------------------------------------- | |
| 1213 int Player::GetDisarmTrap() | |
| 1214 { | |
| 1215 unsigned __int16 v2; // ax@1 | |
| 1216 int v5; // edi@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1217 |
| 1010 | 1218 v2 = GetActualSkillLevel(PLAYER_SKILL_TRAP_DISARM); |
| 0 | 1219 if ( (signed int)SkillToMastery(v2) >= 4 ) |
| 1220 return 10000; | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1221 |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1222 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
|
1223 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
|
1224 multiplier++; |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1225 v5 = multiplier * (v2 & 0x3F); |
|
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1226 return v5; |
| 0 | 1227 } |
| 1228 | |
| 1229 //----- (00491317) -------------------------------------------------------- | |
| 1230 char Player::GetLearningPercent() | |
| 1231 { | |
| 1232 int v2; // eax@1 | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1233 |
| 1010 | 1234 v2 = GetActualSkillLevel(PLAYER_SKILL_LEARNING); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
1235 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
|
1236 return multiplier * v2 + 9; |
| 0 | 1237 } |
| 1238 | |
| 1239 //----- (0048C6AF) -------------------------------------------------------- | |
| 1240 Player::Player() | |
| 1241 { | |
| 1242 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
|
1243 pInventoryMatrix.fill(0); |
| 0 | 1244 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
|
1245 pInventoryItemList[i].Reset(); |
| 0 | 1246 for (uint i = 0; i < 12; ++i) |
| 1247 pEquippedItems[i].Reset(); | |
| 1248 | |
| 1249 | |
| 1250 for (uint i = 0; i < 24; ++i) | |
| 1251 { | |
| 1252 pPlayerBuffs[i].uSkill = 0; | |
| 1253 pPlayerBuffs[i].uSkill = 0; | |
| 1254 pPlayerBuffs[i].uPower = 0; | |
| 1255 pPlayerBuffs[i].uExpireTime = 0; | |
| 1256 pPlayerBuffs[i].uCaster = 0; | |
| 1257 pPlayerBuffs[i].uFlags = 0; | |
| 1258 } | |
| 1259 | |
| 1260 pName[0] = 0; | |
| 1014 | 1261 uCurrentFace = 0; |
| 0 | 1262 uVoiceID = 0; |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
1263 pConditions.fill(0); |
| 0 | 1264 |
| 1265 field_BB = 0; | |
| 1266 | |
| 1267 uMight = uMightBonus = 0; | |
| 1268 uIntelligence = uIntelligenceBonus = 0; | |
| 1269 uWillpower = uWillpowerBonus = 0; | |
| 1270 uEndurance = uEnduranceBonus = 0; | |
| 1271 uSpeed = uSpeedBonus = 0; | |
| 1272 uAccuracy = uAccuracyBonus = 0; | |
| 1273 uLuck = uLuckBonus = 0; | |
| 1274 uLevel = sLevelModifier = 0; | |
| 1275 sAgeModifier = 0; | |
|
1388
60d4885eb107
sACModifier zeroed in player constructor so AC is not always 0(or -some value) ingame
Grumpy7
parents:
1387
diff
changeset
|
1276 sACModifier = 0; |
| 0 | 1277 |
| 1019 | 1278 // memset(field_1F5, 0, 30); |
| 1279 pure_luck_used=0; | |
| 1280 pure_speed_used=0; | |
| 1281 pure_intellect_used=0; | |
| 1282 pure_endurance_used=0; | |
| 1283 pure_willpower_used=0; | |
| 1284 pure_accuracy_used=0; | |
| 1285 pure_might_used=0; | |
| 0 | 1286 |
| 1287 sResFireBase = sResFireBonus = 0; | |
| 1288 sResAirBase = sResAirBonus = 0; | |
| 1289 sResWaterBase = sResWaterBonus = 0; | |
| 1290 sResEarthBase = sResEarthBonus = 0; | |
| 1291 sResMagicBase = sResMagicBonus = 0; | |
| 1292 sResSpiritBase = sResSpiritBonus = 0; | |
| 1293 sResMindBase = sResMindBonus = 0; | |
| 1294 sResBodyBase = sResBodyBonus = 0; | |
| 1295 sResLightBase = sResLightBonus = 0; | |
| 1296 sResDarkBase = sResDarkBonus = 0; | |
| 1297 | |
| 1298 uTimeToRecovery = 0; | |
| 1299 | |
| 1300 uSkillPoints = 0; | |
| 1301 | |
| 1302 sHealth = 0; | |
| 1303 uFullHealthBonus = 0; | |
| 1304 _health_related = 0; | |
| 1305 | |
| 1306 sMana = 0; | |
| 1307 uFullManaBonus = 0; | |
| 1308 _mana_related = 0; | |
| 1309 | |
| 1310 uQuickSpell = 0; | |
| 1826 | 1311 memset(pInstalledBeacons.data(), 0, 5 * sizeof(LloydBeacon)); |
| 0 | 1312 |
| 1313 _some_attack_bonus = 0; | |
| 1314 field_1A91 = 0; | |
| 1315 _melee_dmg_bonus = 0; | |
| 1316 field_1A93 = 0; | |
| 1317 _ranged_atk_bonus = 0; | |
| 1318 field_1A95 = 0; | |
| 1319 _ranged_dmg_bonus = 0; | |
| 1320 field_1A97 = 0; | |
| 1321 | |
| 130 | 1322 expression = CHARACTER_EXPRESSION_INVALID; |
| 0 | 1323 uExpressionTimePassed = 0; |
| 1324 uExpressionTimeLength = 0; | |
| 1325 | |
| 1326 uNumDivineInterventionCastsThisDay = 0; | |
| 1327 uNumArmageddonCasts = 0; | |
| 1328 uNumFireSpikeCasts = 0; | |
| 1329 | |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
1330 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
|
1331 memset(playerEventBits, 0, sizeof(playerEventBits)); |
| 0 | 1332 |
| 1333 field_E0 = 0; | |
| 1334 field_E4 = 0; | |
| 1335 field_E8 = 0; | |
| 1336 field_EC = 0; | |
| 1337 field_F0 = 0; | |
| 1338 field_F4 = 0; | |
| 1339 field_F8 = 0; | |
| 1340 field_FC = 0; | |
| 1341 field_100 = 0; | |
| 1342 field_104 = 0; | |
| 198 | 1343 |
|
554
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1344 _expression21_animtime = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1345 _expression21_frameset = 0; |
|
9caf59edb1ee
Cave and Temple load and even doesn't crash (for a while).
Nomad
parents:
521
diff
changeset
|
1346 |
| 198 | 1347 lastOpenedSpellbookPage = 0; |
| 0 | 1348 } |
| 1349 | |
| 1350 | |
| 1351 //----- (0048C855) -------------------------------------------------------- | |
| 1352 int Player::GetBaseStrength() | |
| 1353 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1354 return this->uMight + GetItemsBonus(CHARACTER_ATTRIBUTE_STRENGTH); |
| 0 | 1355 } |
| 1356 | |
| 1357 //----- (0048C86C) -------------------------------------------------------- | |
| 1358 int Player::GetBaseIntelligence() | |
| 1359 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1360 return this->uIntelligence + GetItemsBonus(CHARACTER_ATTRIBUTE_INTELLIGENCE); |
| 0 | 1361 } |
| 1362 | |
| 1363 //----- (0048C883) -------------------------------------------------------- | |
| 1364 int Player::GetBaseWillpower() | |
| 1365 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1366 return this->uWillpower + GetItemsBonus(CHARACTER_ATTRIBUTE_WILLPOWER); |
| 0 | 1367 } |
| 1368 | |
| 1369 //----- (0048C89A) -------------------------------------------------------- | |
| 1370 int Player::GetBaseEndurance() | |
| 1371 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1372 return this->uEndurance + GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE); |
| 0 | 1373 } |
| 1374 | |
| 1375 //----- (0048C8B1) -------------------------------------------------------- | |
| 1376 int Player::GetBaseAccuracy() | |
| 1377 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1378 return this->uAccuracy + GetItemsBonus(CHARACTER_ATTRIBUTE_ACCURACY); |
| 0 | 1379 } |
| 1380 | |
| 1381 //----- (0048C8C8) -------------------------------------------------------- | |
| 1382 int Player::GetBaseSpeed() | |
| 1383 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1384 return this->uSpeed + GetItemsBonus(CHARACTER_ATTRIBUTE_SPEED); |
| 0 | 1385 } |
| 1386 | |
| 1387 //----- (0048C8DF) -------------------------------------------------------- | |
| 1388 int Player::GetBaseLuck() | |
| 1389 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1390 return this->uLuck + GetItemsBonus(CHARACTER_ATTRIBUTE_LUCK); |
| 0 | 1391 } |
| 1392 | |
| 1393 //----- (0048C8F6) -------------------------------------------------------- | |
| 1394 int Player::GetBaseLevel() | |
| 1395 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1396 return this->uLevel + GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1397 } |
| 1398 | |
| 1399 //----- (0048C90D) -------------------------------------------------------- | |
| 1400 int Player::GetActualLevel() | |
| 1401 { | |
| 1402 return uLevel + sLevelModifier + | |
| 1403 GetMagicalBonus(CHARACTER_ATTRIBUTE_LEVEL) + | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1404 GetItemsBonus(CHARACTER_ATTRIBUTE_LEVEL); |
| 0 | 1405 } |
| 1406 | |
| 1407 //----- (0048C93C) -------------------------------------------------------- | |
| 1408 int Player::GetActualMight() | |
| 1409 { | |
|
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
|
1410 return GetActualAttribute(CHARACTER_ATTRIBUTE_STRENGTH, &Player::uMight, &Player::uMightBonus); |
| 0 | 1411 } |
| 1412 | |
| 1413 //----- (0048C9C2) -------------------------------------------------------- | |
| 1414 int Player::GetActualIntelligence() | |
| 1415 { | |
|
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
|
1416 return GetActualAttribute(CHARACTER_ATTRIBUTE_INTELLIGENCE, &Player::uIntelligence, &Player::uIntelligenceBonus); |
| 0 | 1417 } |
| 1418 | |
| 1419 //----- (0048CA3F) -------------------------------------------------------- | |
| 1420 int Player::GetActualWillpower() | |
| 1421 { | |
|
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
|
1422 return GetActualAttribute(CHARACTER_ATTRIBUTE_WILLPOWER, &Player::uWillpower, &Player::uWillpowerBonus); |
| 0 | 1423 } |
| 1424 | |
| 1425 //----- (0048CABC) -------------------------------------------------------- | |
| 1426 int Player::GetActualEndurance() | |
| 1427 { | |
|
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
|
1428 return GetActualAttribute(CHARACTER_ATTRIBUTE_ENDURANCE, &Player::uEndurance, &Player::uEnduranceBonus); |
| 0 | 1429 } |
| 1430 | |
| 1431 //----- (0048CB39) -------------------------------------------------------- | |
| 1432 int Player::GetActualAccuracy() | |
| 1433 { | |
|
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
|
1434 return GetActualAttribute(CHARACTER_ATTRIBUTE_ACCURACY, &Player::uAccuracy, &Player::uAccuracyBonus); |
| 0 | 1435 } |
| 1436 | |
| 1437 //----- (0048CBB6) -------------------------------------------------------- | |
| 1438 int Player::GetActualSpeed() | |
| 1439 { | |
|
1552
d253172de469
Player::CanFitItem, AddItem, AddItem2 changed changed the retarded 2 dimensional array traversal, changed GetActualAttribute input parameters to get rid of the attrid case
Grumpy7
parents:
1551
diff
changeset
|
1440 return GetActualAttribute(CHARACTER_ATTRIBUTE_SPEED, &Player::uSpeed, &Player::uSpeedBonus); |
| 0 | 1441 } |
| 1442 | |
| 1443 //----- (0048CC33) -------------------------------------------------------- | |
| 1444 int Player::GetActualLuck() | |
| 1445 { | |
| 1036 | 1446 signed int npc_luck_bonus; // [sp+10h] [bp-4h]@1 |
| 1447 | |
| 1448 npc_luck_bonus = 0; | |
| 652 | 1449 if ( CheckHiredNPCSpeciality(Fool) ) |
| 1036 | 1450 npc_luck_bonus = 5; |
| 652 | 1451 if ( CheckHiredNPCSpeciality(ChimneySweep) ) |
| 1036 | 1452 npc_luck_bonus += 20; |
| 652 | 1453 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1036 | 1454 npc_luck_bonus += 10; |
| 1324 | 1455 |
|
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
|
1456 return GetActualAttribute(CHARACTER_ATTRIBUTE_LUCK, &Player::uLuck, &Player::uLuckBonus) |
| 1325 | 1457 + npc_luck_bonus; |
| 1458 } | |
| 1459 | |
| 1460 //----- (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
|
1461 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
|
1462 { |
| 1324 | 1463 uint uActualAge = this->sAgeModifier + GetBaseAge(); |
| 1464 uint uAgeingMultiplier = 100; | |
| 1465 for (uint i = 0; i < 4; ++i) | |
| 1325 | 1466 { |
| 1324 | 1467 if (uActualAge >= pAgeingTable[i]) |
| 1325 | 1468 uAgeingMultiplier = pAgingAttributeModifier[attrId][i]; |
| 1469 else | |
| 1470 break; | |
| 1471 } | |
| 1472 | |
| 1980 | 1473 uchar uConditionMult = pConditionAttributeModifier[attrId][GetMajorConditionIdx()]; |
| 1325 | 1474 int magicBonus = GetMagicalBonus(attrId); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1475 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
|
1476 return uConditionMult * uAgeingMultiplier * this->*attrValue / 100 / 100 |
| 1325 | 1477 + 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
|
1478 + 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
|
1479 + this->*attrBonus; |
| 0 | 1480 } |
| 1481 | |
| 1482 //----- (0048CCF5) -------------------------------------------------------- | |
| 1684 | 1483 int Player::GetActualAttack( bool a2 ) |
| 0 | 1484 { |
| 1485 int v3; // eax@1 | |
| 1486 int v4; // edi@1 | |
| 1487 int v5; // ebx@1 | |
| 1488 int v6; // ebp@1 | |
| 1489 | |
| 1490 v3 = GetActualAccuracy(); | |
| 1036 | 1491 v4 = GetParameterBonus(v3); |
| 0 | 1492 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_ATTACK); |
| 1493 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
|
1494 return v4 + v5 + v6 + GetMagicalBonus(CHARACTER_ATTRIBUTE_ATTACK) + this->_some_attack_bonus; |
| 0 | 1495 } |
| 1496 | |
| 1497 //----- (0048CD45) -------------------------------------------------------- | |
| 1498 int Player::GetMeleeDamageMinimal() | |
| 1499 { | |
| 1500 int v2; // eax@1 | |
| 1501 int v3; // esi@1 | |
| 1502 int v4; // esi@1 | |
| 1503 int v5; // esi@1 | |
| 1504 signed int result; // eax@1 | |
| 1036 | 1505 |
| 0 | 1506 v2 = GetActualMight(); |
| 1036 | 1507 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1508 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN) + v3; |
| 0 | 1509 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v4; |
| 1036 | 1510 result = _melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 1511 if ( result < 1 ) | |
| 1512 result = 1; | |
| 0 | 1513 return result; |
| 1514 } | |
| 1515 | |
| 1516 //----- (0048CD90) -------------------------------------------------------- | |
| 1517 int Player::GetMeleeDamageMaximal() | |
| 1518 { | |
| 1519 int v2; // eax@1 | |
| 1520 int v3; // esi@1 | |
| 1521 int v4; // esi@1 | |
| 1522 int v5; // esi@1 | |
| 1523 int v6; // esi@1 | |
| 1524 signed int result; // eax@1 | |
| 1525 | |
| 1526 v2 = GetActualMight(); | |
| 1036 | 1527 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1528 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX) + v3; |
| 0 | 1529 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
|
1530 v6 = this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + v5; |
| 0 | 1531 result = 1; |
| 1532 if ( v6 >= 1 ) | |
| 1533 result = v6; | |
| 1534 return result; | |
| 1535 } | |
| 1536 | |
| 1537 //----- (0048CDDB) -------------------------------------------------------- | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1538 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
|
1539 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1540 int dmgSum; // esi@62 |
| 0 | 1541 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
|
1542 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
|
1543 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
|
1544 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1545 offHndWpnDmg = 0; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1546 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
|
1547 if ( IsUnarmed() ) |
| 0 | 1548 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1549 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
|
1550 } |
|
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
|
1551 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
|
1552 { |
| 1989 | 1553 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
|
1554 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1555 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
|
1556 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
|
1557 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
|
1558 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
|
1559 addOneDice = true; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1560 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
|
1561 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1562 if ( !ignoreOffhand ) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1563 { |
| 1989 | 1564 if ( this->HasItemEquipped(EQUIP_SINGLE_HANDED) ) |
| 0 | 1565 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1566 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
|
1567 if ( offHandItemGen->GetItemEquipType() != EQUIP_SHIELD ) |
| 0 | 1568 { |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1569 offHndWpnDmg = CalculateMeleeDmgToEnemyWithWeapon(offHandItemGen, uTargetActorID, false); |
| 0 | 1570 } |
| 1571 } | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1572 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1573 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1574 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
|
1575 if ( !ignoreSkillBonus ) |
|
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 might = GetActualMight(); |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1578 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
|
1579 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
|
1580 dmgSum += this->_melee_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS) + mightAndSkillbonus; |
| 0 | 1581 } |
| 1582 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
|
1583 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
|
1584 result = dmgSum; |
| 0 | 1585 return result; |
| 1586 } | |
| 1587 | |
|
1550
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 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
|
1590 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1591 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
|
1592 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
|
1593 if (addOneDice) |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1594 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1595 diceCount++; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1596 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1597 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
|
1598 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
|
1599 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
|
1600 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1601 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
|
1602 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1603 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
|
1604 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
|
1605 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1606 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
|
1607 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
|
1608 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1609 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1610 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1611 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
|
1612 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1613 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1614 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1615 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
|
1616 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1617 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1618 } |
| 1822 | 1619 else if (MonsterStats::BelongsToSupertype(uTargetActorID, MONSTER_SUPERTYPE_ELF) && ( enchType == 63 || itemId == ITEM_RELIC_OLD_NICK)) |
| 1620 { | |
| 1621 totalDmg *= 2; | |
| 1622 } | |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1623 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
|
1624 { |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1625 totalDmg *= 2; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1626 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1627 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1628 if ( (signed int)SkillToMastery(this->pActiveSkills[2]) >= 3 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1629 && 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
|
1630 && 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
|
1631 totalDmg *= 3; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1632 return totalDmg; |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1633 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1634 |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1635 |
| 0 | 1636 //----- (0048D0B9) -------------------------------------------------------- |
| 1637 int Player::GetRangedAttack() | |
| 1638 { | |
| 1639 int v3; // edi@3 | |
| 1640 int v4; // eax@4 | |
| 1641 int v5; // edi@4 | |
| 1642 int v6; // edi@4 | |
| 1643 int v7; // edi@4 | |
| 1644 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1645 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
|
1646 if ( mainHandItem != nullptr && ( mainHandItem->uItemID < ITEM_BLASTER || mainHandItem->uItemID > ITEM_LASER_RIFLE )) |
| 0 | 1647 { |
| 1648 v4 = GetActualAccuracy(); | |
| 1036 | 1649 v5 = GetParameterBonus(v4); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1650 v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v5; |
| 0 | 1651 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
|
1652 v3 = this->_ranged_atk_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v7; |
| 0 | 1653 } |
| 1654 else | |
| 1655 { | |
| 1684 | 1656 v3 = GetActualAttack(true); |
| 0 | 1657 } |
| 1658 return v3; | |
| 1659 } | |
| 1660 | |
| 1661 //----- (0048D124) -------------------------------------------------------- | |
| 1662 int Player::GetRangedDamageMin() | |
| 1663 { | |
| 1664 int v2; // edi@1 | |
| 1665 int v3; // edi@1 | |
| 1666 int v4; // edi@1 | |
| 1667 int result; // eax@6 | |
| 1668 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1669 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MIN); |
| 1040 | 1670 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
|
1671 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1672 if ( v4 >= 1 ) |
| 1673 result = v4; | |
| 1674 else | |
| 1675 result = 0; | |
| 1676 return result; | |
| 1677 } | |
| 1678 | |
| 1679 //----- (0048D191) -------------------------------------------------------- | |
| 1680 int Player::GetRangedDamageMax() | |
| 1681 { | |
| 1682 int v2; // edi@1 | |
| 1683 int v3; // edi@1 | |
| 1684 int v4; // edi@1 | |
| 1685 int result; // eax@6 | |
| 1686 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1687 v2 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_MAX); |
| 1040 | 1688 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
|
1689 v4 = this->_ranged_dmg_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS) + v3; |
| 0 | 1690 if ( v4 >= 1 ) |
| 1691 result = v4; | |
| 1692 else | |
| 1693 result = 0; | |
| 1694 return result; | |
| 1695 } | |
| 1696 | |
| 1697 //----- (0048D1FE) -------------------------------------------------------- | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1698 int Player::CalculateRangedDamageTo( int a2 ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1699 { |
| 0 | 1700 ItemGen *v4; // ebx@2 |
| 1701 unsigned int v5; // edi@2 | |
| 1702 int v9; // esi@5 | |
| 1703 int v10; // ebx@6 | |
| 1704 signed int v15; // [sp+8h] [bp-Ch]@2 | |
| 1705 int v17; // [sp+10h] [bp-4h]@1 | |
| 1706 | |
| 1707 v17 = 0; | |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1708 if ( !HasItemEquipped(EQUIP_BOW) ) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1709 return 0; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1710 v4 = (ItemGen *)&this->pInventoryItemList[this->pEquipment.uBow-1]; |
| 0 | 1711 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
|
1712 v15 = pItemsTable->pItems[v5].uDamageRoll; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1713 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
|
1714 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1715 int v7 = rand() % v15; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1716 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
|
1717 } |
|
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1718 v9 = pItemsTable->pItems[v5].uDamageMod + v17; |
| 0 | 1719 if ( a2 ) |
| 1720 { | |
| 377 | 1721 v10 = v4->uSpecEnchantmentType; |
|
1551
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1722 if ( v10 == 64 && MonsterStats::BelongsToSupertype(a2, MONSTER_SUPERTYPE_UNDEAD)) |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1723 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1724 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1725 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1726 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
|
1727 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1728 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1729 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1730 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
|
1731 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1732 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1733 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1734 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
|
1735 { |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1736 v9 *= 2; |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1737 } |
|
a9e8d2a7abb5
Player::CalculateRangedDamageTo, finishing cleanup accidentally commited in previous commit
Grumpy7
parents:
1550
diff
changeset
|
1738 } |
|
1550
cdb7fafede0c
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
Grumpy7
parents:
1549
diff
changeset
|
1739 return v9 + this->GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS); |
| 0 | 1740 } |
| 1741 | |
| 1742 //----- (0048D2EA) -------------------------------------------------------- | |
| 1743 char *Player::GetMeleeDamageString() | |
| 1744 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1745 int min_damage; // edi@3 |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1746 int max_damage; // eax@3 |
| 0 | 1747 |
| 1748 static char player__getmeleedamagestring_static_buff[40]; // idb | |
| 1749 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1750 ItemGen* mainHandItem = GetMainHandItem(); |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1751 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1752 if (mainHandItem != nullptr && ( mainHandItem->uItemID >= 135 ) && ( mainHandItem->uItemID <= 159 )) |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1753 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1754 strcpy(player__getmeleedamagestring_static_buff, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1755 return player__getmeleedamagestring_static_buff; |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1756 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1757 else if (mainHandItem != nullptr && (mainHandItem->uItemID == ITEM_BLASTER || mainHandItem->uItemID == ITEM_LASER_RIFLE)) |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1758 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1759 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1760 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1761 } |
| 0 | 1762 else |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1763 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1764 min_damage = GetMeleeDamageMinimal(); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1765 max_damage = GetMeleeDamageMaximal(); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1766 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1767 if ( min_damage == max_damage ) |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1768 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1769 sprintf(player__getmeleedamagestring_static_buff, "%d", min_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1770 } |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1771 else |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1772 { |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1773 sprintf(player__getmeleedamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1774 } |
| 1036 | 1775 return player__getmeleedamagestring_static_buff; |
| 0 | 1776 } |
| 1777 | |
| 1778 //----- (0048D396) -------------------------------------------------------- | |
| 1779 char *Player::GetRangedDamageString() | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1780 { |
| 1036 | 1781 int min_damage; // edi@3 |
| 1782 int max_damage; // eax@3 | |
| 1783 | |
| 1784 static char player__getrangeddamagestring_static_buff[40]; // idb | |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1785 |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1786 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
|
1787 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1788 if (mainHandItem != nullptr && ( mainHandItem->uItemID >= 135 ) && ( mainHandItem->uItemID <= 159 )) |
|
1547
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, pGlobalTXT_LocalizationStrings[595]); //"Wand" |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1791 return player__getrangeddamagestring_static_buff; |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1792 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1793 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
|
1794 { |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1795 min_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MIN, true); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
1796 max_damage = GetItemsBonus(CHARACTER_ATTRIBUTE_MELEE_DMG_MAX, true); |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1797 } |
| 0 | 1798 else |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1799 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1800 min_damage = GetRangedDamageMin(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1801 max_damage = GetRangedDamageMax(); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1802 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1803 if ( max_damage > 0) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1804 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1805 if ( min_damage == max_damage ) |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1806 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1807 sprintf(player__getrangeddamagestring_static_buff, "%d", min_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1808 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1809 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1810 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1811 sprintf(player__getrangeddamagestring_static_buff, "%d - %d", min_damage, max_damage); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1812 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1813 } |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1814 else |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1815 { |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1816 strcpy(player__getrangeddamagestring_static_buff, "N/A"); |
|
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1817 } |
| 1036 | 1818 return player__getrangeddamagestring_static_buff; |
|
1547
778916dfa666
Player::GetRangedDamageString fix + some small chnages
Grumpy7
parents:
1539
diff
changeset
|
1819 } |
| 0 | 1820 |
| 1821 //----- (0048D45A) -------------------------------------------------------- | |
| 1822 bool Player::CanTrainToNextLevel() | |
| 1823 { | |
|
1565
58420268d87d
fixing Player::GetMeleeDamageString and Player::CanTrainToNextLevel
Grumpy7
parents:
1564
diff
changeset
|
1824 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
|
1825 int neededExp = ((lvl * (lvl - 1)) / 2 * 1000); |
| 1564 | 1826 return this->uExperience >= neededExp; |
| 0 | 1827 } |
| 1828 | |
| 1829 //----- (0048D498) -------------------------------------------------------- | |
| 1830 unsigned int Player::GetExperienceDisplayColor() | |
| 1831 { | |
| 1832 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
|
1833 return ui_character_bonus_text_color; |
| 0 | 1834 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
|
1835 return ui_character_default_text_color; |
| 0 | 1836 } |
| 1837 | |
| 1838 //----- (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
|
1839 int Player::CalculateIncommingDamage( DAMAGE_TYPE dmg_type, int dmg ) |
| 1561 | 1840 { |
| 1036 | 1841 int resist_value; // edi@8 |
| 1842 int player_luck; // eax@21 | |
| 1843 signed int res_rand_divider; // ebx@2 | |
| 1844 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
|
1845 |
|
1560
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1846 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
|
1847 return 0; |
|
a0cd6465ae0d
Player::CalculateIncommingDamage, liches shouldn't be immune to damage if above 200 resistance to it
Grumpy7
parents:
1559
diff
changeset
|
1848 |
|
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
|
1849 resist_value = 0; |
| 1036 | 1850 switch(dmg_type) |
| 1851 { | |
|
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
|
1852 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
|
1853 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
|
1854 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
|
1855 case DMGT_EARTH: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_EARTH); break; |
| 1036 | 1856 |
|
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1558
diff
changeset
|
1857 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
|
1858 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
|
1859 case DMGT_BODY: resist_value = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_BODY); break; |
| 1036 | 1860 } |
|
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
|
1861 |
| 1036 | 1862 player_luck = GetActualLuck(); |
| 1863 res_rand_divider = GetParameterBonus(player_luck) + resist_value + 30; | |
| 1864 | |
|
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
|
1865 if ( GetParameterBonus(player_luck) + resist_value > 0 ) |
| 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 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
|
1868 { |
| 1036 | 1869 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
|
1870 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
|
1871 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
|
1872 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
|
1873 } |
|
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
|
1874 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1875 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
|
1876 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
|
1877 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1878 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
|
1879 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1880 armor_skill = equippedArmor->GetPlayerSkillType(); |
| 1036 | 1881 if ( armor_skill==PLAYER_SKILL_PLATE ) |
| 0 | 1882 { |
| 1036 | 1883 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
|
1884 return dmg / 2; |
| 0 | 1885 } |
| 1036 | 1886 if (armor_skill==PLAYER_SKILL_CHAIN ) |
| 0 | 1887 { |
| 1036 | 1888 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
|
1889 return dmg * 2 / 3; |
| 0 | 1890 } |
| 1891 } | |
| 1036 | 1892 } |
|
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
|
1893 return dmg; |
| 0 | 1894 } |
| 1895 | |
| 1896 //----- (0048D62C) -------------------------------------------------------- | |
| 816 | 1897 ITEM_EQUIP_TYPE Player::GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1898 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1899 return GetNthEquippedIndexItem(uEquipSlot)->GetItemEquipType(); |
| 0 | 1900 } |
| 1901 | |
| 1902 //----- (0048D651) -------------------------------------------------------- | |
| 816 | 1903 PLAYER_SKILL_TYPE Player::GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot) |
| 1904 { | |
|
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 return (PLAYER_SKILL_TYPE)GetNthEquippedIndexItem(uEquipSlot)->GetPlayerSkillType(); |
| 0 | 1906 } |
| 1907 | |
| 1908 //----- (0048D676) -------------------------------------------------------- | |
| 1909 bool Player::IsUnarmed() | |
| 1910 { | |
| 1989 | 1911 return !HasItemEquipped(EQUIP_TWO_HANDED) && |
| 1912 (!HasItemEquipped(EQUIP_SINGLE_HANDED) || GetOffHandItem()->GetItemEquipType() == EQUIP_SHIELD); | |
| 0 | 1913 } |
| 1914 | |
| 1915 //----- (0048D6AA) -------------------------------------------------------- | |
| 1916 bool Player::HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex) | |
| 1917 { | |
| 1980 | 1918 uint i = pEquipment.pIndices[uEquipIndex]; |
| 0 | 1919 if (i) |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
1920 return !pOwnItems[i - 1].IsBroken(); |
| 1036 | 1921 else |
| 1922 return false; | |
| 0 | 1923 } |
| 1924 | |
| 1925 //----- (0048D6D0) -------------------------------------------------------- | |
| 1926 bool Player::HasEnchantedItemEquipped(int uEnchantment) | |
| 1927 { | |
| 1928 for (uint i = 0; i < 16; ++i) | |
| 1929 { | |
| 1930 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
|
1931 GetNthEquippedIndexItem(i)->uSpecEnchantmentType == uEnchantment) |
| 0 | 1932 return true; |
| 1933 } | |
| 1934 return false; | |
| 1935 } | |
| 1936 | |
| 1937 //----- (0048D709) -------------------------------------------------------- | |
| 1080 | 1938 bool Player::WearsItem( int item_id, ITEM_EQUIP_TYPE equip_type ) |
| 1563 | 1939 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
1940 return ( HasItemEquipped(equip_type) && GetNthEquippedIndexItem(equip_type)->uItemID == item_id ); |
| 1563 | 1941 } |
| 1942 | |
| 1943 bool Player::WearsItemAnyWhere(int item_id) | |
| 1944 { | |
| 1945 for (int i = 0; i < 16; i++) | |
| 1946 { | |
| 1947 if (WearsItem(item_id, (ITEM_EQUIP_TYPE) i)) | |
| 1948 { | |
| 1949 return true; | |
| 1950 } | |
| 1951 } | |
| 1952 return false; | |
| 0 | 1953 } |
| 1954 | |
| 1955 //----- (0048D76C) -------------------------------------------------------- | |
| 1686 | 1956 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 | 1957 { |
| 1958 unsigned __int16 v6; // cx@8 | |
| 1959 int v7; // edi@8 | |
| 1960 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
|
1961 unsigned int itemvalue; // esi@8 |
| 0 | 1962 int v10; // eax@8 |
| 1686 | 1963 int currMaxItemValue; // edi@12 |
| 0 | 1964 |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
1965 if ( !itemToSteal |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1966 || this->IsEradicated() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1967 || this->IsDead() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1968 || this->IsPertified() |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
1969 || this->IsDrunk() |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1970 || this->IsUnconcious() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
1971 || this->IsAsleep() ) |
| 0 | 1972 { |
| 1686 | 1973 return 0; |
| 0 | 1974 } |
| 1975 else | |
| 1976 { | |
| 1977 v6 = this->pActiveSkills[34]; | |
| 1978 v7 = v6 & 0x3F; | |
| 1979 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
|
1980 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
|
1981 v10 = itemToSteal->GetItemEquipType(); |
| 1989 | 1982 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
|
1983 itemvalue *= 3; |
| 1686 | 1984 currMaxItemValue = StealingRandomBonuses[rand() % 5] + v7 * StealingMasteryBonuses[v8]; |
| 1985 *fineIfFailed = 100 * (reputation + extraStealDifficulty) + itemvalue; | |
| 1986 if (a5) | |
| 1987 { | |
| 1988 *fineIfFailed += 500; | |
| 1989 } | |
| 0 | 1990 if ( rand() % 100 >= 5 ) |
| 1991 { | |
| 1686 | 1992 if ( *fineIfFailed > currMaxItemValue ) |
| 1993 if (*fineIfFailed - currMaxItemValue < 500) | |
| 1994 { | |
| 1995 return 1; | |
| 1996 } | |
| 1997 else | |
| 1998 { | |
| 1999 return 0; | |
| 2000 } | |
| 0 | 2001 else |
| 1686 | 2002 return 2; |
| 0 | 2003 } |
| 2004 else | |
| 2005 { | |
| 1686 | 2006 return 0; |
| 2007 } | |
| 2008 } | |
| 0 | 2009 } |
| 2010 | |
| 2011 //----- (0048D88B) -------------------------------------------------------- | |
| 2012 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation) | |
| 2013 { | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2014 Actor *actroPtr; // edi@1 |
| 0 | 2015 int v7; // ebx@10 |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2016 unsigned int stealingMastery; // esi@10 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2017 int fineIfFailed; // esi@10 |
| 0 | 2018 int v11; // eax@13 |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2019 bool HasFullItemSlots; // ebx@15 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2020 unsigned __int16 carriedItemId; // si@21 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2021 unsigned int enchBonusSum; // esi@31 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2022 int *enchTypePtr; // eax@34 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2023 ItemGen tempItem; // [sp+8h] [bp-34h]@15 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2024 int currMaxItemValue; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2025 |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2026 actroPtr = &pActors[uActorID]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2027 if ( !actroPtr |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2028 || this->IsEradicated() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2029 || this->IsDead() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2030 || this->IsPertified() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2031 || this->IsDrunk() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2032 || this->IsUnconcious() |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2033 || this->IsAsleep() ) |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2034 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2035 return 0; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2036 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2037 pGlobalTXT_LocalizationStrings[1]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2038 if ( !(BYTE2(actroPtr->uAttributes) & 0x80) ) |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2039 actroPtr->SetRandomGoldIfTheresNoItem(); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2040 unsigned __int16 v6 = this->pActiveSkills[34]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2041 v7 = v6 & 0x3F; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2042 stealingMastery = SkillToMastery(v6); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2043 int v30 = StealingMasteryBonuses[stealingMastery]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2044 int v29 = StealingRandomBonuses[rand() % 5]; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2045 fineIfFailed = actroPtr->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2046 currMaxItemValue = v29 + v7 * v30; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2047 pGlobalTXT_LocalizationStrings[200]; |
| 1783 | 2048 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
|
2049 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2050 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2051 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[376], this->pName); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2052 ShowStatusBarString(pTmpBuf2.data(), 2u); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2053 return 0; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2054 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2055 else |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2056 { |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2057 v11 = rand(); |
| 1688 | 2058 if ( v11 % 100 >= 70 ) //stealing gold |
| 2059 { | |
| 2060 enchBonusSum = 0; | |
| 2061 for (int i = 0; i < v7; i++) | |
| 2062 { | |
| 2063 enchBonusSum += rand() % StealingEnchantmentBonusForSkill[stealingMastery] + 1; | |
| 2064 } | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2065 if ( actroPtr->array_000234[3].GetItemEquipType() != EQUIP_GOLD ) |
| 1688 | 2066 return 2; |
| 2067 enchTypePtr = &actroPtr->array_000234[3].uSpecEnchantmentType; | |
| 2068 if ( (int)enchBonusSum >= *enchTypePtr ) | |
| 2069 { | |
| 2070 actroPtr->array_000234[3].uItemID = 0; | |
| 2071 *enchTypePtr = 0; | |
| 2072 } | |
| 2073 else | |
| 2074 { | |
| 2075 *enchTypePtr -= enchBonusSum; | |
| 2076 } | |
| 2077 if ( enchBonusSum ) | |
| 2078 { | |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
2079 pParty->PartyFindsGold(enchBonusSum, 2); |
| 1688 | 2080 sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[302], this->pName, enchBonusSum); //%stole %d gold |
| 2081 } | |
| 2082 else | |
| 2083 { | |
| 2084 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName); //%s failed to steal anything | |
| 2085 } | |
| 2086 ShowStatusBarString(pTmpBuf2.data(), 2u); | |
| 2087 return 2; | |
| 2088 } | |
| 2089 else if ( v11 % 100 >= 40 ) //stealing an item | |
| 2090 { | |
| 2091 tempItem.Reset(); | |
| 2092 HasFullItemSlots = false; | |
| 2093 int i; | |
| 2094 for (i = 0; i < 4; i++) | |
| 2095 { | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2096 if ( actroPtr->array_000234[i].uItemID != 0 && actroPtr->array_000234[i].GetItemEquipType() != EQUIP_GOLD ) |
| 1688 | 2097 break; |
| 2098 } | |
| 2099 if (i == 4) | |
| 2100 HasFullItemSlots = true; | |
| 2101 carriedItemId = actroPtr->uCarriedItemID; | |
| 2102 if ( carriedItemId != 0 || HasFullItemSlots ) | |
| 2103 { | |
| 2104 tempItem.Reset(); | |
| 2105 if ( carriedItemId != 0 ) | |
| 0 | 2106 { |
| 1688 | 2107 actroPtr->uCarriedItemID = 0; |
| 2108 tempItem.uItemID = carriedItemId; | |
| 2109 if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_WAND ) | |
| 2110 tempItem.uNumCharges = rand() % 6 + pItemsTable->pItems[carriedItemId].uDamageMod + 1; | |
| 2111 else if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_POTION && carriedItemId != ITEM_POTION_BOTTLE) | |
| 2112 tempItem.uEnchantmentType = 2 * rand() % 4 + 2; | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2113 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2114 else |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2115 { |
| 1688 | 2116 ItemGen* itemToSteal = &actroPtr->array_000234[rand() % 4]; |
| 2117 memcpy(&tempItem, itemToSteal, sizeof(tempItem)); | |
| 2118 itemToSteal->Reset(); | |
| 2119 carriedItemId = tempItem.uItemID; | |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2120 } |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2121 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
|
2122 { |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
2123 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
|
2124 sprintf( |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2125 pTmpBuf2.data(), |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2126 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
|
2127 this->pName, |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2128 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
|
2129 ShowStatusBarString(pTmpBuf2.data(), 2u); |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
2130 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
|
2131 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
|
2132 pMouse->SetCursorBitmapFromItemID(carriedItemId); |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2133 return 2; |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2134 } |
| 0 | 2135 } |
|
1687
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2136 } |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2137 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName); //%s failed to steal anything |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2138 ShowStatusBarString(pTmpBuf2.data(), 2u); |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2139 return 2; |
|
5f01f1ed97f4
Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR
Grumpy7
parents:
1686
diff
changeset
|
2140 } |
| 0 | 2141 } |
| 2142 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
| 2143 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
| 2144 // 4EDEC4: using guessed type int dword_4EDEC4[]; | |
| 2145 | |
| 2146 //----- (0048DBB9) -------------------------------------------------------- | |
| 2147 void Player::Heal(int amount) | |
| 2148 { | |
| 1010 | 2149 signed int max_health; // eax@3 |
| 2150 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2151 if ( !IsEradicated() && !IsDead() ) |
| 1010 | 2152 { |
| 2153 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
|
2154 if ( IsZombie() ) |
| 1010 | 2155 max_health /= 2; |
| 2156 sHealth += amount; | |
| 2157 if ( sHealth > max_health ) | |
| 2158 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
|
2159 if ( IsUnconcious() ) |
| 1010 | 2160 { |
| 2161 if ( sHealth > 0 ) | |
| 2162 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2163 SetUnconcious(false); |
| 0 | 2164 } |
| 2165 } | |
| 2166 } | |
| 2167 } | |
| 2168 | |
| 2169 //----- (0048DC1E) -------------------------------------------------------- | |
| 1036 | 2170 int Player::ReceiveDamage( signed int amount, DAMAGE_TYPE dmg_type ) |
| 2171 { | |
| 2172 signed int recieved_dmg; // eax@1 | |
| 2173 bool broke_armor; | |
| 2174 | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2175 SetAsleep(false); |
| 1036 | 2176 recieved_dmg = CalculateIncommingDamage(dmg_type, amount); |
| 2177 sHealth -= recieved_dmg; | |
| 2178 broke_armor = sHealth <= -10; | |
| 2179 if ( sHealth < 1 ) // | |
| 2180 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2181 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
|
2182 || 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
|
2183 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2184 SetCondUnconsciousWithBlockCheck(false); |
| 0 | 2185 } |
| 2186 else | |
| 2187 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
2188 SetCondDeadWithBlockCheck(false); |
| 1036 | 2189 if ( sHealth > 0 ) |
| 2190 sHealth = 0; | |
| 2191 } | |
| 2192 if (broke_armor ) | |
| 2193 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2194 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
|
2195 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
|
2196 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2197 if ( !(equippedArmor->uAttributes & ITEM_HARDENED)) |
| 0 | 2198 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2199 equippedArmor->SetBroken(); |
| 0 | 2200 } |
| 2201 } | |
| 2202 } | |
| 2203 } | |
| 1036 | 2204 if ( recieved_dmg && CanAct() ) |
| 187 | 2205 PlaySound(SPEECH_24, 0); |
| 1036 | 2206 return recieved_dmg; |
| 0 | 2207 } |
| 2208 | |
| 2209 //----- (0048DCF6) -------------------------------------------------------- | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2210 int Player::ReceiveSpecialAttackEffect( int attType, struct Actor *pActor ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2211 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2212 SPECIAL_ATTACK_TYPE attTypeCast = (SPECIAL_ATTACK_TYPE) attType; |
| 0 | 2213 signed int v3; // edi@1 |
| 2214 signed int v4; // ebx@1 | |
| 2215 int v6; // eax@2 | |
| 2216 int v8; // eax@8 | |
| 2217 int v10; // eax@8 | |
| 2218 int v11; // ebx@8 | |
| 2219 ItemGen *v13; // eax@9 | |
| 2220 int v22; // eax@49 | |
| 2221 signed int v23; // ebx@49 | |
| 2222 void *v27; // ecx@76 | |
| 2223 char v46[140]; // [sp+Ch] [bp-94h]@13 | |
| 2224 unsigned int v47; // [sp+98h] [bp-8h]@1 | |
| 1692 | 2225 ItemGen* v48; // [sp+9Ch] [bp-4h]@1 |
| 2226 | |
| 0 | 2227 v4 = 0; |
| 2228 v47 = 0; | |
| 1783 | 2229 v48 = nullptr; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2230 switch ( attTypeCast ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2231 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2232 case SPECIAL_ATTACK_CURSE: |
| 0 | 2233 v6 = GetActualWillpower(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2234 v11 = GetParameterBonus(v6); |
| 1690 | 2235 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2236 case SPECIAL_ATTACK_WEAK: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2237 case SPECIAL_ATTACK_SLEEP: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2238 case SPECIAL_ATTACK_DRUNK: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2239 case SPECIAL_ATTACK_DISEASE1: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2240 case SPECIAL_ATTACK_DISEASE2: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2241 case SPECIAL_ATTACK_DISEASE3: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2242 case SPECIAL_ATTACK_UNCONSCIOUS: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2243 case SPECIAL_ATTACK_AGING: |
| 0 | 2244 v6 = GetActualEndurance(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2245 v11 = GetParameterBonus(v6); |
| 1690 | 2246 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2247 case SPECIAL_ATTACK_INSANE: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2248 case SPECIAL_ATTACK_PARALYZED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2249 case SPECIAL_ATTACK_FEAR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2250 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_MIND); |
| 1690 | 2251 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2252 case SPECIAL_ATTACK_PETRIFIED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2253 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_EARTH); |
| 1690 | 2254 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2255 case SPECIAL_ATTACK_POISON1: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2256 case SPECIAL_ATTACK_POISON2: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2257 case SPECIAL_ATTACK_POISON3: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2258 case SPECIAL_ATTACK_DEAD: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2259 case SPECIAL_ATTACK_ERADICATED: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2260 v11 = GetActualResistance(CHARACTER_ATTRIBUTE_RESIST_BODY); |
| 1690 | 2261 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2262 case SPECIAL_ATTACK_MANA_DRAIN: |
| 0 | 2263 v8 = GetActualWillpower(); |
| 2264 v10 = GetActualIntelligence(); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2265 v11 = (GetParameterBonus(v10) + GetParameterBonus(v8)) / 2; |
| 0 | 2266 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2267 case SPECIAL_ATTACK_BREAK_ANY: |
| 1692 | 2268 for (int i = 0; i < 138; i++) |
| 2269 { | |
| 2270 v13 = &this->pInventoryItemList[i]; | |
| 2271 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
|
2272 v46[v4++] = i; |
| 1692 | 2273 } |
| 1690 | 2274 if ( !v4 ) |
| 2275 return 0; | |
| 1692 | 2276 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
|
2277 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 1690 | 2278 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2279 case SPECIAL_ATTACK_BREAK_ARMOR: |
| 1692 | 2280 for (int i = 0; i < 16; i++ ) |
| 0 | 2281 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2282 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 0 | 2283 { |
| 1692 | 2284 if ( i == EQUIP_ARMOUR ) |
| 2285 v46[v4++] = this->pEquipment.uArmor - 1; | |
| 1989 | 2286 if ( (i == EQUIP_SINGLE_HANDED || i == EQUIP_TWO_HANDED) && GetEquippedItemEquipType((ITEM_EQUIP_TYPE)i) == EQUIP_SHIELD ) |
| 1692 | 2287 v46[v4++] = this->pEquipment.pIndices[i] - 1; |
| 0 | 2288 } |
| 1692 | 2289 } |
| 1690 | 2290 if ( !v4 ) |
| 2291 return 0; | |
| 1692 | 2292 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
|
2293 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 1690 | 2294 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2295 case SPECIAL_ATTACK_BREAK_WEAPON: |
| 1692 | 2296 for (int i = 0; i < 16; i++ ) |
| 0 | 2297 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2298 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 0 | 2299 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2300 if ( i == EQUIP_BOW ) |
| 1690 | 2301 v46[v4++] = LOBYTE(this->pEquipment.uBow) - 1; |
| 1989 | 2302 if ( (i == EQUIP_SINGLE_HANDED || i == EQUIP_TWO_HANDED) |
| 2303 && (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
|
2304 v46[v4++] = this->pEquipment.pIndices[i] - 1; |
| 0 | 2305 } |
| 1692 | 2306 } |
| 0 | 2307 if ( !v4 ) |
| 1690 | 2308 return 0; |
| 1692 | 2309 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
|
2310 v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod()); |
| 0 | 2311 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2312 case SPECIAL_ATTACK_STEAL: |
| 1692 | 2313 for ( int i = 0; i < 126; i++ ) |
| 2314 { | |
| 2315 int ItemPosInList = this->pInventoryMatrix[i]; | |
| 2316 if (ItemPosInList > 0) | |
| 0 | 2317 { |
| 1692 | 2318 ItemGen* v21 = &this->pInventoryItemList[ItemPosInList - 1]; |
| 2319 if ( v21->uItemID > 0 && v21->uItemID <= 134 ) | |
| 0 | 2320 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2321 v46[v4++] = i; |
| 0 | 2322 } |
| 2323 } | |
| 1692 | 2324 } |
| 0 | 2325 if ( !v4 ) |
| 1690 | 2326 return 0; |
| 1692 | 2327 v47 = v46[rand() % v4]; |
| 0 | 2328 v6 = GetActualAccuracy(); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2329 v11 = GetParameterBonus(v6); |
| 0 | 2330 break; |
| 2331 default: | |
| 2332 v11 = 0; | |
| 2333 break; | |
| 2334 } | |
| 2335 v22 = GetActualLuck(); | |
| 1036 | 2336 v23 = GetParameterBonus(v22) + v11 + 30; |
| 0 | 2337 if ( rand() % v23 >= 30 ) |
| 2338 { | |
| 1690 | 2339 return 0; |
| 0 | 2340 } |
| 2341 else | |
| 2342 { | |
| 1692 | 2343 for ( v3 = 0; v3 < 4; v3++ ) |
| 2344 { | |
| 2345 if ( this == pPlayers[v3 + 1] ) | |
| 2346 break; | |
| 2347 } | |
| 2348 | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2349 switch ( attTypeCast ) |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2350 { |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2351 case SPECIAL_ATTACK_CURSE: |
| 1692 | 2352 SetCondition(Condition_Cursed, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2353 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2354 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2355 return 1; | |
| 2356 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2357 case SPECIAL_ATTACK_WEAK: |
| 1692 | 2358 SetCondition(Condition_Weak, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2359 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2360 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2361 return 1; | |
| 2362 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2363 case SPECIAL_ATTACK_SLEEP: |
| 1692 | 2364 SetCondition(Condition_Sleep, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2365 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2366 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2367 return 1; | |
| 2368 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2369 case SPECIAL_ATTACK_DRUNK: |
| 1692 | 2370 SetCondition(Condition_Drunk, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2371 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2372 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2373 return 1; | |
| 2374 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2375 case SPECIAL_ATTACK_INSANE: |
| 1692 | 2376 SetCondition(Condition_Insane, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2377 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2378 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2379 return 1; | |
| 2380 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2381 case SPECIAL_ATTACK_POISON1: |
| 1692 | 2382 SetCondition(Condition_Poison1, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2383 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
|
2384 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2385 return 1; |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2386 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2387 case SPECIAL_ATTACK_POISON2: |
| 1692 | 2388 SetCondition(Condition_Poison2, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2389 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
|
2390 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2391 return 1; |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2392 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2393 case SPECIAL_ATTACK_POISON3: |
| 1692 | 2394 SetCondition(Condition_Poison3, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2395 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2396 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2397 return 1; | |
| 2398 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2399 case SPECIAL_ATTACK_DISEASE1: |
|
1693
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2400 SetCondition(Condition_Disease1, 1); |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2401 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
|
2402 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
|
2403 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
|
2404 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2405 case SPECIAL_ATTACK_DISEASE2: |
|
1693
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2406 SetCondition(Condition_Disease2, 1); |
|
861ede68187a
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect, some case reordering, fixing getting only disease3 instead of disease1 and ignoring disease2 and 3, uSpecialAttack to uSpecialAttackType, uSpecialAttackType to uSpecialAttackLevel
Grumpy7
parents:
1692
diff
changeset
|
2407 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
|
2408 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
|
2409 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
|
2410 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2411 case SPECIAL_ATTACK_DISEASE3: |
| 1692 | 2412 SetCondition(Condition_Disease3, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2413 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0); |
| 0 | 2414 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 1690 | 2415 return 1; |
| 0 | 2416 break; |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2417 case SPECIAL_ATTACK_PARALYZED: |
| 1692 | 2418 SetCondition(Condition_Paralyzed, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2419 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2420 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2421 return 1; | |
| 2422 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2423 case SPECIAL_ATTACK_UNCONSCIOUS: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2424 SetCondition(Condition_Unconcious, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2425 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
|
2426 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2427 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2428 break; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2429 case SPECIAL_ATTACK_DEAD: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2430 SetCondition(Condition_Dead, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2431 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
|
2432 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2433 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2434 break; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2435 case SPECIAL_ATTACK_PETRIFIED: |
| 1692 | 2436 SetCondition(Condition_Pertified, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2437 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2438 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2439 return 1; | |
| 2440 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2441 case SPECIAL_ATTACK_ERADICATED: |
| 1692 | 2442 SetCondition(Condition_Eradicated, 1); |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2443 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2444 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2445 return 1; | |
| 2446 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2447 case SPECIAL_ATTACK_BREAK_ANY: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2448 case SPECIAL_ATTACK_BREAK_ARMOR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2449 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
|
2450 if ( !(v48->uAttributes & ITEM_HARDENED) ) |
| 1690 | 2451 { |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2452 PlaySound(SPEECH_40, 0); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2453 v48->SetBroken(); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2454 pAudioPlayer->PlaySound((SoundID)47, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2455 } |
| 2456 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2457 return 1; | |
| 2458 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2459 case SPECIAL_ATTACK_STEAL: |
| 1690 | 2460 PlaySound(SPEECH_40, 0); |
| 2461 v27 = pActor->array_000234; | |
| 2462 if ( pActor->array_000234[0].uItemID ) | |
| 2463 { | |
| 2464 v27 = &pActor->array_000234[1]; | |
| 2465 if ( pActor->array_000234[1].uItemID ) | |
| 2466 { | |
| 2467 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); | |
| 2468 return 1; | |
| 2469 } | |
| 2470 } | |
| 2471 memcpy(v27, &this->pInventoryItemList[this->pInventoryMatrix[v47]-1], 0x24u); | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2472 RemoveItemAtInventoryIndex(v47); |
|
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2473 pAudioPlayer->PlaySound((SoundID)47, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2474 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2475 return 1; | |
| 2476 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2477 case SPECIAL_ATTACK_AGING: |
| 187 | 2478 PlaySound(SPEECH_42, 0); |
| 1690 | 2479 ++this->sAgeModifier; |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2480 pAudioPlayer->PlaySound((SoundID)226, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2481 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2482 return 1; | |
| 2483 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2484 case SPECIAL_ATTACK_MANA_DRAIN: |
| 1690 | 2485 PlaySound(SPEECH_41, 0); |
| 2486 this->sMana = 0; | |
|
1691
1c880907575f
Player::_48DCF6 substituted unnecessary vars by their values
Grumpy7
parents:
1690
diff
changeset
|
2487 pAudioPlayer->PlaySound((SoundID)226, 0, 0, -1, 0, 0, 0, 0); |
| 1690 | 2488 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
| 2489 return 1; | |
| 2490 break; | |
|
1695
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2491 case SPECIAL_ATTACK_FEAR: |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2492 SetCondition(Condition_Fear, 1); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2493 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
|
2494 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2495 return 1; |
|
33df22a5e376
Player::ReceiveSpecialAttackEffect finishing cleanup, special attack type enum created
Grumpy7
parents:
1694
diff
changeset
|
2496 break; |
| 0 | 2497 default: |
| 1690 | 2498 return 0; |
| 0 | 2499 } |
| 2500 } | |
| 2501 } | |
| 324 | 2502 |
| 0 | 2503 // 48DCF6: using guessed type char var_94[140]; |
| 2504 | |
| 2505 //----- (0048E1A3) -------------------------------------------------------- | |
| 2506 unsigned int Player::GetSpellSchool(unsigned int uSpellID) | |
| 2507 { | |
| 1091 | 2508 return pSpellStats->pInfos[uSpellID].uSchool; |
| 0 | 2509 } |
| 2510 | |
| 2511 //----- (0048E1B5) -------------------------------------------------------- | |
| 816 | 2512 int Player::GetAttackRecoveryTime(bool bRangedAttack) |
| 2513 { | |
| 2514 ItemGen *weapon = nullptr; | |
| 2515 uint weapon_recovery = base_recovery_times_per_weapon_type[0]; | |
| 2516 if (bRangedAttack) | |
| 0 | 2517 { |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2518 if ( HasItemEquipped(EQUIP_BOW) ) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2519 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2520 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
|
2521 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
|
2522 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2523 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2524 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
|
2525 { |
| 816 | 2526 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
|
2527 } |
| 1989 | 2528 else if ( HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 816 | 2529 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2530 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
|
2531 if (weapon->GetItemEquipType() == EQUIP_WAND) |
| 816 | 2532 { |
| 2533 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
| 2534 __debugbreak(); // looks like wands were two-handed weapons once, or supposed to be. should not get here now | |
| 2535 weapon_recovery = pSpellDatas[wand_spell_ids[weapon->uItemID - ITEM_WAND_FIRE]].uExpertLevelRecovery; | |
| 2536 } | |
| 0 | 2537 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
|
2538 weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()]; |
| 816 | 2539 } |
| 1989 | 2540 if (HasItemEquipped(EQUIP_SINGLE_HANDED) && GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) != EQUIP_SHIELD) |
| 1010 | 2541 // ADD: shield check because shield recovery is added later and can be accidentally doubled |
| 816 | 2542 { |
| 1717 | 2543 if (base_recovery_times_per_weapon_type[GetOffHandItem()->GetPlayerSkillType()] > weapon_recovery) |
| 2544 { | |
| 1731 | 2545 weapon = GetOffHandItem(); |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
2546 weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()]; |
| 816 | 2547 } |
| 2548 } | |
| 2549 | |
| 2550 uint armour_recovery = 0; | |
| 0 | 2551 if ( HasItemEquipped(EQUIP_ARMOUR) ) |
| 2552 { | |
| 1980 | 2553 uchar armour_skill_type = GetArmorItem()->GetPlayerSkillType(); |
| 816 | 2554 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
|
2555 float multiplier; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2556 |
| 816 | 2557 if (armour_skill_type == PLAYER_SKILL_LEATHER) |
| 2558 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2559 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0, 0, 0); |
| 816 | 2560 } |
| 2561 else if (armour_skill_type == PLAYER_SKILL_CHAIN) | |
| 2562 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2563 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0, 0); |
| 816 | 2564 } |
| 2565 else if (armour_skill_type == PLAYER_SKILL_PLATE) | |
| 2566 { | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2567 multiplier = GetArmorRecoveryMultiplierFromSkillLevel(armour_skill_type, 1.0f, 0.5f, 0.5f, 0); |
| 0 | 2568 } |
| 2569 else | |
| 2570 { | |
| 1545 | 2571 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
|
2572 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
|
2573 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2574 |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2575 armour_recovery = (uint)(base_armour_recovery * multiplier); |
| 816 | 2576 } |
| 2577 | |
| 2578 uint shield_recovery = 0; | |
| 1989 | 2579 if (HasItemEquipped(EQUIP_SINGLE_HANDED) && GetEquippedItemEquipType(EQUIP_SINGLE_HANDED) == EQUIP_SHIELD) |
| 816 | 2580 { |
| 1980 | 2581 uchar skill_type = GetOffHandItem()->GetPlayerSkillType(); |
| 816 | 2582 |
| 2583 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
|
2584 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
|
2585 shield_recovery = (uint)(shield_base_recovery * multiplier); |
| 816 | 2586 } |
| 2587 | |
| 1036 | 2588 uint player_speed_recovery_reduction = GetParameterBonus(GetActualSpeed()), |
| 816 | 2589 sword_axe_bow_recovery_reduction = 0; |
| 2590 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
|
2591 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
|
2592 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2593 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
|
2594 (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
|
2595 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2596 if (SkillToMastery(pActiveSkills[weapon->GetPlayerSkillType()]) >= 2 ) // Expert Sword, Axe & Bow reduce recovery |
| 1759 | 2597 sword_axe_bow_recovery_reduction = pActiveSkills[weapon->GetPlayerSkillType()] & 0x3F; |
| 2598 } | |
| 2599 if (weapon->GetPlayerSkillType() == PLAYER_SKILL_BLASTER) | |
| 816 | 2600 shooting_laser = true; |
| 2601 } | |
| 2602 | |
| 2603 uint armsmaster_recovery_reduction = 0; | |
| 2604 if (!bRangedAttack && !shooting_laser) | |
| 2605 { | |
| 2606 if (uint armsmaster_level = GetActualSkillLevel(PLAYER_SKILL_ARMSMASTER)) | |
| 2607 { | |
| 2608 armsmaster_recovery_reduction = armsmaster_level & 0x3F; | |
| 2609 if (SkillToMastery(armsmaster_level) >= 4) | |
| 2610 armsmaster_recovery_reduction *= 2; | |
| 2611 } | |
| 2612 } | |
| 2613 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2614 uint hasteRecoveryReduction = 0; |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
2615 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
|
2616 hasteRecoveryReduction = 25; |
| 816 | 2617 |
| 2618 uint weapon_enchantment_recovery_reduction = 0; | |
| 2619 if ( weapon ) | |
| 2620 { | |
| 2621 if (weapon->uSpecEnchantmentType == 59 || | |
| 2622 weapon->uSpecEnchantmentType == 41 || | |
| 2623 weapon->uSpecEnchantmentType == 500) | |
| 2624 weapon_enchantment_recovery_reduction = 20; | |
| 2625 } | |
| 2626 | |
| 2627 int recovery = weapon_recovery + | |
| 2628 armour_recovery + | |
| 2629 shield_recovery | |
| 2630 - armsmaster_recovery_reduction | |
| 2631 - weapon_enchantment_recovery_reduction | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2632 - hasteRecoveryReduction |
| 816 | 2633 - sword_axe_bow_recovery_reduction |
| 2634 - player_speed_recovery_reduction; | |
| 2635 | |
| 2636 if (recovery < 0) | |
| 2637 recovery = 0; | |
| 2638 return recovery; | |
| 0 | 2639 } |
| 2640 | |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2641 |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2642 //----- new -------------------------------------------------------- |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2643 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
|
2644 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2645 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
|
2646 switch (skill_mastery) |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2647 { |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2648 case 1: return mult1; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2649 case 2: return mult2; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2650 case 3: return mult3; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2651 case 4: return mult4; break; |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2652 } |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2653 Error("Unexpected input value: %d", armour_skill_type); |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2654 return 0; |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2655 } |
|
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
2656 |
| 0 | 2657 //----- (0048E4F8) -------------------------------------------------------- |
| 2658 int Player::GetMaxHealth() | |
| 2659 { | |
| 2660 int v3; // esi@1 | |
| 2661 int v4; // esi@1 | |
| 2662 int v6; // esi@1 | |
| 2663 | |
| 1036 | 2664 v3 = GetParameterBonus(GetActualEndurance()); |
| 135 | 2665 v4 = pBaseHealthPerLevelByClass[classType] * (GetActualLevel() + v3); |
| 0 | 2666 v6 = uFullHealthBonus |
| 135 | 2667 + pBaseHealthByClass[classType / 4] |
| 0 | 2668 + GetSkillBonus(CHARACTER_ATTRIBUTE_HEALTH) |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2669 + GetItemsBonus(CHARACTER_ATTRIBUTE_HEALTH) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2670 return max(1, v6); |
| 0 | 2671 } |
| 2672 | |
| 2673 //----- (0048E565) -------------------------------------------------------- | |
| 2674 int Player::GetMaxMana() | |
| 2675 { | |
| 2676 int v2; // eax@2 | |
| 2677 int v3; // esi@4 | |
| 2678 int v4; // eax@5 | |
| 2679 int v5; // esi@5 | |
| 2680 int v6; // eax@5 | |
| 2681 int v7; // esi@6 | |
| 2682 int v8; // esi@6 | |
| 2683 int v9; // esi@6 | |
| 1116 | 2684 |
| 135 | 2685 switch (classType) |
| 0 | 2686 { |
| 1116 | 2687 case PLAYER_CLASS_ROGUE: |
| 2688 case PLAYER_CLASS_SPY: | |
| 2689 case PLAYER_CLASS_ASSASSIN: | |
| 2690 case PLAYER_CLASS_ARCHER: | |
| 2691 case PLAYER_CLASS_WARRIOR_MAGE: | |
| 2692 case PLAYER_CLASS_MASTER_ARCHER: | |
| 2693 case PLAYER_CLASS_SNIPER: | |
| 2694 case PLAYER_CLASS_SORCERER: | |
| 2695 case PLAYER_CLASS_WIZARD: | |
| 2696 case PLAYER_CLASS_ARCHMAGE: | |
| 2697 case PLAYER_CLASS_LICH: | |
| 0 | 2698 v2 = GetActualIntelligence(); |
| 1036 | 2699 v3 = GetParameterBonus(v2); |
| 1116 | 2700 break; |
| 2701 case PLAYER_CLASS_INITIATE: | |
| 2702 case PLAYER_CLASS_MASTER: | |
| 2703 case PLAYER_CLASS_NINJA: | |
| 2704 case PLAYER_CLASS_PALADIN: | |
| 2705 case PLAYER_CLASS_CRUSADER: | |
| 2706 case PLAYER_CLASS_HERO: | |
| 2707 case PLAYER_CLASS_VILLIAN: | |
| 2708 case PLAYER_CLASS_CLERIC: | |
| 2709 case PLAYER_CLASS_PRIEST: | |
| 2710 case PLAYER_CLASS_PRIEST_OF_SUN: | |
| 2711 case PLAYER_CLASS_PRIEST_OF_MOON: | |
| 0 | 2712 v2 = GetActualWillpower(); |
| 1036 | 2713 v3 = GetParameterBonus(v2); |
| 1116 | 2714 break; |
| 2715 case PLAYER_CLASS_HUNTER: | |
| 2716 case PLAYER_CLASS_RANGER_LORD: | |
| 2717 case PLAYER_CLASS_BOUNTY_HUNTER: | |
| 2718 case PLAYER_CLASS_DRUID: | |
| 2719 case PLAYER_CLASS_GREAT_DRUID: | |
| 2720 case PLAYER_CLASS_ARCH_DRUID: | |
| 2721 case PLAYER_CLASS_WARLOCK: | |
| 0 | 2722 v4 = GetActualWillpower(); |
| 1036 | 2723 v5 = GetParameterBonus(v4); |
| 0 | 2724 v6 = GetActualIntelligence(); |
| 1036 | 2725 v3 = GetParameterBonus(v6) + v5; |
| 0 | 2726 break; |
| 2727 default: | |
| 1116 | 2728 return 0; |
| 0 | 2729 break; |
| 2730 } | |
| 1116 | 2731 v7 = pBaseManaPerLevelByClass[classType] * (GetActualLevel() + v3); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2732 v8 = GetItemsBonus(CHARACTER_ATTRIBUTE_MANA) + v7; |
| 1116 | 2733 v9 = uFullManaBonus |
| 2734 + pBaseManaByClass[classType / 4] | |
| 2735 + GetSkillBonus(CHARACTER_ATTRIBUTE_MANA) | |
| 2736 + v8; | |
| 2737 return max(0,v9); | |
| 0 | 2738 } |
| 2739 | |
| 2740 //----- (0048E656) -------------------------------------------------------- | |
| 2741 int Player::GetBaseAC() | |
| 2742 { | |
| 2743 int v2; // eax@1 | |
| 2744 int v3; // esi@1 | |
| 2745 int v4; // esi@1 | |
| 2746 int v5; // esi@1 | |
| 2747 | |
| 2748 v2 = GetActualSpeed(); | |
| 1036 | 2749 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2750 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2751 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2752 return max(0, v5); |
| 0 | 2753 } |
| 2754 | |
| 2755 //----- (0048E68F) -------------------------------------------------------- | |
| 2756 int Player::GetActualAC() | |
| 2757 { | |
| 2758 int v2; // eax@1 | |
| 2759 int v3; // esi@1 | |
| 2760 int v4; // esi@1 | |
| 2761 int v5; // esi@1 | |
| 2762 int v6; // esi@1 | |
| 2763 | |
| 2764 v2 = GetActualSpeed(); | |
| 1036 | 2765 v3 = GetParameterBonus(v2); |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2766 v4 = GetItemsBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v3; |
| 0 | 2767 v5 = GetSkillBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v4; |
|
1594
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2768 v6 = this->sACModifier + GetMagicalBonus(CHARACTER_ATTRIBUTE_AC_BONUS) + v5; |
|
c0238b60d0f2
Player::GetMaxHealth, GetBaseAC, GetActualAC minor cleanups
Grumpy7
parents:
1593
diff
changeset
|
2769 return max(0, v6); |
| 0 | 2770 } |
| 2771 | |
| 2772 //----- (0048E6DC) -------------------------------------------------------- | |
| 2773 unsigned int Player::GetBaseAge() | |
| 2774 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2775 return (unsigned int)(((__int64)(pParty->uTimePlayed * 0.234375) / 60 / 60 / 24) / 7 / 4 / 12 - uBirthYear + game_starting_year); |
| 0 | 2776 } |
| 2777 | |
| 2778 //----- (0048E72C) -------------------------------------------------------- | |
| 2779 unsigned int Player::GetActualAge() | |
| 2780 { | |
| 2781 return this->sAgeModifier + GetBaseAge(); | |
| 2782 } | |
| 2783 | |
| 2784 //----- (0048E73F) -------------------------------------------------------- | |
| 2785 int Player::GetBaseResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2786 { | |
| 2787 int v7; // esi@20 | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2788 int racialBonus = 0; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2789 __int16* resStat; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2790 |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2791 switch (a2) |
|
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 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2794 resStat = &sResFireBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2795 if (IsRaceGoblin()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2796 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2797 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2798 case CHARACTER_ATTRIBUTE_RESIST_AIR: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2799 resStat = &sResAirBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2800 if (IsRaceGoblin()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2801 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2802 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2803 case CHARACTER_ATTRIBUTE_RESIST_WATER: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2804 resStat = &sResWaterBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2805 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2806 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2807 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2808 case CHARACTER_ATTRIBUTE_RESIST_EARTH: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2809 resStat = &sResEarthBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2810 if (IsRaceDwarf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2811 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2812 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2813 case CHARACTER_ATTRIBUTE_RESIST_MIND: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2814 resStat = &sResMindBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2815 if (IsRaceElf()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2816 racialBonus = 10; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2817 break; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2818 case CHARACTER_ATTRIBUTE_RESIST_BODY: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2819 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2820 resStat = &sResBodyBase; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2821 if (IsRaceHuman()) |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2822 racialBonus = 5; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2823 break; |
| 1783 | 2824 default: |
| 2825 Error("Unknown attribute"); | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2826 } |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2827 v7 = GetItemsBonus(a2) + racialBonus; |
|
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2828 return v7 + *resStat; |
| 0 | 2829 } |
| 2830 | |
| 2831 //----- (0048E7D0) -------------------------------------------------------- | |
| 2832 int Player::GetActualResistance(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 2833 { | |
|
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
|
2834 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
|
2835 __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
|
2836 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
|
2837 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
|
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 int leatherArmorSkillLevel = GetActualSkillLevel(PLAYER_SKILL_LEATHER); |
| 652 | 2840 if ( CheckHiredNPCSpeciality(Enchanter) ) |
| 0 | 2841 v10 = 20; |
| 2842 if ( (a2 == CHARACTER_ATTRIBUTE_RESIST_FIRE | |
| 2843 || a2 == CHARACTER_ATTRIBUTE_RESIST_AIR | |
| 2844 || a2 == CHARACTER_ATTRIBUTE_RESIST_WATER | |
| 2845 || 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
|
2846 && SkillToMastery(leatherArmorSkillLevel) == 4 |
| 0 | 2847 && HasItemEquipped(EQUIP_ARMOUR) |
| 2848 && 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
|
2849 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
|
2850 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
|
2851 { |
| 1783 | 2852 case CHARACTER_ATTRIBUTE_RESIST_FIRE: |
| 2853 resStat = &sResFireBonus; | |
| 2854 break; | |
| 2855 case CHARACTER_ATTRIBUTE_RESIST_AIR: | |
| 2856 resStat = &sResAirBonus; | |
| 2857 break; | |
| 2858 case CHARACTER_ATTRIBUTE_RESIST_WATER: | |
| 2859 resStat = &sResWaterBonus; | |
| 2860 break; | |
| 2861 case CHARACTER_ATTRIBUTE_RESIST_EARTH: | |
| 2862 resStat = &sResEarthBonus; | |
| 2863 break; | |
| 2864 case CHARACTER_ATTRIBUTE_RESIST_MIND: | |
| 2865 resStat = &sResMindBonus; | |
| 2866 break; | |
| 2867 case CHARACTER_ATTRIBUTE_RESIST_BODY: | |
| 2868 case CHARACTER_ATTRIBUTE_RESIST_SPIRIT: | |
| 2869 resStat = &sResBodyBonus; | |
| 2870 break; | |
| 2871 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
|
2872 } |
|
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
|
2873 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
|
2874 result = v10 + GetMagicalBonus(a2) + baseRes + *(resStat); |
| 0 | 2875 return result; |
| 2876 } | |
| 2877 | |
| 2878 //----- (0048E8F5) -------------------------------------------------------- | |
| 816 | 2879 bool Player::Recover(int dt) |
| 2880 { | |
|
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
|
2881 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
|
2882 |
|
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
|
2883 v3 = (int)(dt * GetSpecialItemBonus(17) * 0.01 + dt); |
| 816 | 2884 |
|
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
|
2885 //Log::Warning(L"Recover(dt = %u/%u - %u", dt, (uint)v3, (uint)uTimeToRecovery); |
| 816 | 2886 |
| 2887 if (uTimeToRecovery > v3) | |
| 2888 { | |
| 2889 uTimeToRecovery -= v3; | |
| 2890 return true; | |
| 0 | 2891 } |
| 2892 else | |
| 2893 { | |
| 816 | 2894 uTimeToRecovery = 0; |
| 2895 viewparams->bRedrawGameUI = true; | |
| 2896 if (!uActiveCharacter) | |
| 0 | 2897 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 2898 return false; |
| 2899 } | |
| 0 | 2900 } |
| 2901 | |
| 2902 //----- (0048E96A) -------------------------------------------------------- | |
| 816 | 2903 void Player::SetRecoveryTime(signed int rec) |
| 2904 { | |
| 1545 | 2905 Assert(rec >= 0); |
| 816 | 2906 |
| 2907 if (rec > uTimeToRecovery) | |
| 2908 uTimeToRecovery = rec; | |
| 2909 | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2910 if (uActiveCharacter != 0 && pPlayers[uActiveCharacter] == this && !some_active_character) |
| 0 | 2911 uActiveCharacter = pParty->GetNextActiveCharacter(); |
| 816 | 2912 |
| 2913 viewparams->bRedrawGameUI = true; | |
| 0 | 2914 } |
| 2915 // 50C0C4: using guessed type int some_active_character; | |
| 2916 | |
| 2917 //----- (0048E9B7) -------------------------------------------------------- | |
| 2918 void Player::RandomizeName() | |
| 2919 { | |
| 2920 if (!uExpressionTimePassed) | |
| 2921 strcpy(pName, pNPCStats->pNPCNames[rand() % pNPCStats->uNumNPCNames[uSex]][uSex]); | |
| 2922 } | |
| 2923 | |
| 2924 //----- (0048E9F4) -------------------------------------------------------- | |
| 2925 unsigned int Player::GetMajorConditionIdx() | |
| 2926 { | |
| 2927 for (uint i = 0; i < 18; ++i) | |
| 2928 if (pConditions[pConditionImportancyTable[i]] != 0) | |
| 2929 return pConditionImportancyTable[i]; | |
| 2930 | |
| 2931 return 18; | |
| 2932 } | |
| 2933 | |
| 2934 //----- (0048EA1B) -------------------------------------------------------- | |
| 1036 | 2935 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
|
2936 { |
| 1036 | 2937 int i; // eax@1 |
| 2938 i = 0; | |
| 2939 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
|
2940 { |
|
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
|
2941 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
|
2942 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
|
2943 ++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
|
2944 } |
| 1036 | 2945 return parameter_to_bonus_value[i]; |
| 0 | 2946 } |
| 2947 | |
| 2948 //----- (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
|
2949 int Player::GetSpecialItemBonus( int enchantmentId ) |
| 0 | 2950 { |
| 1989 | 2951 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
|
2952 { |
|
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
|
2953 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
|
2954 { |
|
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
|
2955 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
|
2956 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2957 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
|
2958 return 50; |
| 1032 | 2959 } |
|
1598
11bb463837b1
_48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus, forgot to commit actor.cpp
Grumpy7
parents:
1597
diff
changeset
|
2960 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
|
2961 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
2962 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
|
2963 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
|
2964 } |
|
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
|
2965 } |
|
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
|
2966 } |
| 1032 | 2967 return 0; |
| 0 | 2968 } |
| 2969 | |
| 2970 //----- (0048EAAE) -------------------------------------------------------- | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
2971 int Player::GetItemsBonus( enum CHARACTER_ATTRIBUTE_TYPE attr, bool getOnlyMainHandDmg /*= false*/ ) |
| 0 | 2972 { |
| 2973 int v5; // edi@1 | |
| 2974 int v9; // eax@49 | |
| 2975 int v14; // ecx@58 | |
| 2976 int v15; // eax@58 | |
| 2977 int v17; // eax@62 | |
| 2978 int v22; // eax@76 | |
| 2979 int v25; // ecx@80 | |
| 2980 int v26; // edi@80 | |
| 2981 int v32; // eax@98 | |
| 2982 int v56; // eax@365 | |
| 2983 signed int v58; // [sp-4h] [bp-20h]@10 | |
| 2984 int v61; // [sp+10h] [bp-Ch]@1 | |
| 2985 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
|
2986 ItemGen *currEquippedItem; // [sp+20h] [bp+4h]@101 |
| 1040 | 2987 bool no_skills; |
| 0 | 2988 |
| 2989 v5 = 0; | |
| 2990 v62 = 0; | |
| 2991 v61 = 0; | |
| 1040 | 2992 |
| 2993 no_skills=false; | |
| 0 | 2994 switch (attr) |
| 1599 | 2995 { |
| 2996 case CHARACTER_ATTRIBUTE_SKILL_ALCHEMY: v58 = PLAYER_SKILL_ALCHEMY; break; | |
| 2997 case CHARACTER_ATTRIBUTE_SKILL_STEALING: v58 = PLAYER_SKILL_STEALING; break; | |
| 2998 case CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM: v58 = PLAYER_SKILL_TRAP_DISARM; break; | |
| 2999 case CHARACTER_ATTRIBUTE_SKILL_ITEM_ID: v58 = PLAYER_SKILL_ITEM_ID; break; | |
| 3000 case CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID: v58 = PLAYER_SKILL_MONSTER_ID; break; | |
| 3001 case CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER: v58 = PLAYER_SKILL_ARMSMASTER; break; | |
| 3002 case CHARACTER_ATTRIBUTE_SKILL_DODGE: v58 = PLAYER_SKILL_DODGE; break; | |
| 3003 case CHARACTER_ATTRIBUTE_SKILL_UNARMED: v58 = PLAYER_SKILL_UNARMED; break; | |
| 3004 case CHARACTER_ATTRIBUTE_SKILL_FIRE: v58 = PLAYER_SKILL_FIRE; break; | |
| 3005 case CHARACTER_ATTRIBUTE_SKILL_AIR: v58 = PLAYER_SKILL_AIR; break; | |
| 3006 case CHARACTER_ATTRIBUTE_SKILL_WATER: v58 = PLAYER_SKILL_WATER; break; | |
| 3007 case CHARACTER_ATTRIBUTE_SKILL_EARTH: v58 = PLAYER_SKILL_EARTH; break; | |
| 3008 case CHARACTER_ATTRIBUTE_SKILL_SPIRIT: v58 = PLAYER_SKILL_SPIRIT; break; | |
| 3009 case CHARACTER_ATTRIBUTE_SKILL_MIND: v58 = PLAYER_SKILL_MIND; break; | |
| 3010 case CHARACTER_ATTRIBUTE_SKILL_BODY: v58 = PLAYER_SKILL_BODY; break; | |
| 3011 case CHARACTER_ATTRIBUTE_SKILL_LIGHT: v58 = PLAYER_SKILL_LIGHT; break; | |
| 3012 case CHARACTER_ATTRIBUTE_SKILL_DARK: v58 = PLAYER_SKILL_DARK; break; | |
| 3013 case CHARACTER_ATTRIBUTE_SKILL_MEDITATION: v58 = PLAYER_SKILL_MEDITATION; break; | |
| 3014 case CHARACTER_ATTRIBUTE_SKILL_BOW: v58 = PLAYER_SKILL_BOW; break; | |
| 3015 case CHARACTER_ATTRIBUTE_SKILL_SHIELD: v58 = PLAYER_SKILL_SHIELD; break; | |
| 3016 case CHARACTER_ATTRIBUTE_SKILL_LEARNING: v58 = PLAYER_SKILL_LEARNING; break; | |
| 3017 default: | |
| 1040 | 3018 no_skills=true; |
| 1599 | 3019 } |
| 1040 | 3020 if (!no_skills) |
| 1599 | 3021 { |
| 3022 if ( !this->pActiveSkills[v58] ) | |
| 3023 return 0; | |
| 3024 } | |
| 1040 | 3025 |
|
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
|
3026 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
|
3027 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3028 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
|
3029 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: |
| 0 | 3030 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
|
3031 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
|
3032 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
|
3033 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
|
3034 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3035 case CHARACTER_ATTRIBUTE_RANGED_DMG_MIN: |
| 0 | 3036 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
|
3037 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
|
3038 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
|
3039 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
|
3040 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
|
3041 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
|
3042 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3043 case CHARACTER_ATTRIBUTE_RANGED_DMG_MAX: |
| 0 | 3044 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
|
3045 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
|
3046 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
|
3047 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
|
3048 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
|
3049 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3050 case CHARACTER_ATTRIBUTE_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
|
3051 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
|
3052 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
|
3053 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
|
3054 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
|
3055 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3056 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
|
3057 if ( IsUnarmed() ) |
| 0 | 3058 { |
|
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
|
3059 return 3; |
| 0 | 3060 } |
| 3061 else | |
| 3062 { | |
| 1989 | 3063 if ( this->HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 0 | 3064 { |
| 1989 | 3065 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
|
3066 if ( v22 >= 0 && v22 <= 2) |
| 0 | 3067 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3068 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
|
3069 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
|
3070 if ( GetOffHandItem() != nullptr || mainHandItem->GetPlayerSkillType() != 4 ) |
| 0 | 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 v25 = mainHandItem->GetDamageDice(); |
| 0 | 3073 } |
| 3074 else | |
| 3075 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3076 v25 = mainHandItem->GetDamageDice() + 1; |
| 0 | 3077 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3078 v5 = mainHandItem->GetDamageMod() + v25 * v26; |
| 0 | 3079 } |
| 3080 } | |
| 1989 | 3081 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
|
3082 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 return v5; |
| 1040 | 3084 } |
|
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
|
3085 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
|
3086 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3087 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
|
3088 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
|
3089 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
|
3090 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
|
3091 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3093 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
|
3094 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3095 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
|
3096 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
|
3097 if ( IsUnarmed() ) |
| 1040 | 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 return 0; |
| 1040 | 3100 } |
| 1989 | 3101 if ( this->HasItemEquipped(EQUIP_TWO_HANDED) ) |
| 0 | 3102 { |
| 1989 | 3103 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
|
3104 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
|
3105 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3106 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
|
3107 } |
| 0 | 3108 } |
| 1989 | 3109 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
|
3110 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
|
3111 else |
| 0 | 3112 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3113 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
|
3114 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
|
3115 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3116 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
|
3117 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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_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
|
3119 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
|
3120 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3122 } |
| 1989 | 3123 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
|
3124 { |
| 1989 | 3125 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
|
3126 if ( v9 >= 0 && v9 <= 2) |
| 0 | 3127 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3128 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
|
3129 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
|
3130 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
|
3131 if ( GetOffHandItem() == nullptr && mainHandItem->GetPlayerSkillType() == 4) |
| 0 | 3132 { |
|
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
|
3133 ++v5; |
| 0 | 3134 } |
| 3135 } | |
| 3136 } | |
|
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
|
3137 |
| 1989 | 3138 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
|
3139 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3141 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3143 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3144 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
|
3145 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
|
3146 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
|
3147 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
|
3148 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3150 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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_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
|
3152 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
|
3153 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
|
3154 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
|
3155 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
|
3156 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
|
3157 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
|
3158 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
|
3159 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
|
3160 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
|
3161 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3162 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
|
3163 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
|
3164 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
|
3165 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
|
3166 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
|
3167 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
|
3168 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
|
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 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
|
3171 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
|
3172 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
|
3173 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
|
3174 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
|
3175 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
|
3176 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
|
3177 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
|
3178 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 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
|
3180 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
|
3181 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
|
3182 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
|
3183 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
|
3184 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
|
3185 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
|
3186 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
|
3187 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
|
3188 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
|
3189 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
|
3190 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
|
3191 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
|
3192 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
|
3193 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create 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 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) ) |
| 1040 | 3195 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3196 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
|
3197 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
|
3198 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3199 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
|
3200 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
|
3201 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3202 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
|
3203 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3204 } |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3205 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
|
3206 && !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
|
3207 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3208 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
|
3209 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3210 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
|
3211 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3212 if (currEquippedItem->IsRegularEnchanmentForAttribute(attr)) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3213 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3214 if ( attr > CHARACTER_ATTRIBUTE_RESIST_BODY && v5 < currEquippedItem->m_enchantmentStrength ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3215 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
|
3216 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
|
3217 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
|
3218 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3219 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3220 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
|
3221 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3222 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
|
3223 } |
| 1040 | 3224 } |
|
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
|
3225 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1601
diff
changeset
|
3226 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
|
3227 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
|
3228 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
|
3229 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
|
3230 } |
| 0 | 3231 } |
| 3232 | |
| 3233 //----- (0048F73C) -------------------------------------------------------- | |
| 3234 int Player::GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2) | |
| 3235 { | |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3236 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
|
3237 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
|
3238 |
| 0 | 3239 switch ( a2 ) |
| 3240 { | |
|
1605
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3241 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
|
3242 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
|
3243 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
|
3244 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3245 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
|
3246 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
|
3247 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
|
3248 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3249 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
|
3250 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
|
3251 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
|
3252 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3253 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
|
3254 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
|
3255 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
|
3256 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3257 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
|
3258 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
|
3259 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
|
3260 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3261 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
|
3262 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
|
3263 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
|
3264 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3265 case CHARACTER_ATTRIBUTE_ATTACK: |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3266 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
|
3267 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
|
3268 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3269 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
|
3270 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
|
3271 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
|
3272 break; |
| 0 | 3273 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
|
3274 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
|
3275 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
|
3276 break; |
| 0 | 3277 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
|
3278 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
|
3279 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
|
3280 break; |
| 0 | 3281 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
|
3282 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
|
3283 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
|
3284 break; |
| 0 | 3285 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
|
3286 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
|
3287 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
|
3288 break; |
| 0 | 3289 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
|
3290 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
|
3291 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
|
3292 break; |
| 0 | 3293 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
|
3294 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
|
3295 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
|
3296 break; |
| 0 | 3297 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
|
3298 v3 = pPlayerBuffs[PLAYER_BUFF_LUCK].uPower; |
| 1167 | 3299 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
|
3300 break; |
| 0 | 3301 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
|
3302 v3 = this->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uPower; |
| 1167 | 3303 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
|
3304 break; |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3305 } |
|
434b796cdfd3
Player::GetMagicalBonus cleaned up, identified a few player only effect spells used in mm6
Grumpy7
parents:
1604
diff
changeset
|
3306 return v3 + v4; |
| 0 | 3307 } |
| 3308 | |
| 3309 //----- (0048F882) -------------------------------------------------------- | |
| 1008 | 3310 int Player::GetActualSkillLevel( PLAYER_SKILL_TYPE uSkillType ) |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3311 { |
| 1064 | 3312 signed int bonus_value; // esi@1 |
| 3313 unsigned __int16 skill_value; // ax@126 | |
| 3314 int result; // al@127 | |
| 353 | 3315 |
| 1064 | 3316 bonus_value = 0; |
| 353 | 3317 switch (uSkillType) |
| 3318 { | |
| 3319 case PLAYER_SKILL_MONSTER_ID: | |
| 3320 { | |
| 652 | 3321 if ( CheckHiredNPCSpeciality(Hunter) ) |
| 1064 | 3322 bonus_value = 6; |
| 652 | 3323 if ( CheckHiredNPCSpeciality(Sage) ) |
| 1064 | 3324 bonus_value += 6; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3325 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID); |
| 353 | 3326 } |
| 3327 break; | |
| 3328 | |
| 3329 case PLAYER_SKILL_ARMSMASTER: | |
| 3330 { | |
| 652 | 3331 if ( CheckHiredNPCSpeciality(Armsmaster) ) |
| 1064 | 3332 bonus_value = 2; |
| 652 | 3333 if ( CheckHiredNPCSpeciality(Weaponsmaster) ) |
| 1064 | 3334 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3335 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER); |
| 353 | 3336 } |
| 3337 break; | |
| 3338 | |
| 3339 case PLAYER_SKILL_STEALING: | |
| 3340 { | |
| 652 | 3341 if (CheckHiredNPCSpeciality(Burglar)) |
| 1064 | 3342 bonus_value = 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3343 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_STEALING); |
| 353 | 3344 } |
| 3345 break; | |
| 3346 | |
| 3347 | |
| 3348 case PLAYER_SKILL_ALCHEMY: | |
| 3349 { | |
| 652 | 3350 if ( CheckHiredNPCSpeciality(Herbalist) ) |
| 1064 | 3351 bonus_value = 4; |
| 652 | 3352 if ( CheckHiredNPCSpeciality(Apothecary) ) |
| 1064 | 3353 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3354 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ALCHEMY); |
| 353 | 3355 } |
| 3356 break; | |
| 3357 | |
| 3358 case PLAYER_SKILL_LEARNING: | |
| 3359 { | |
| 652 | 3360 if ( CheckHiredNPCSpeciality(Teacher) ) |
| 1064 | 3361 bonus_value = 10; |
| 652 | 3362 if ( CheckHiredNPCSpeciality(Instructor) ) |
| 1064 | 3363 bonus_value += 15; |
| 652 | 3364 if ( CheckHiredNPCSpeciality(Scholar) ) |
| 1064 | 3365 bonus_value += 5; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3366 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LEARNING); |
| 353 | 3367 } |
| 3368 break; | |
| 3369 | |
| 3370 case PLAYER_SKILL_UNARMED: | |
| 3371 { | |
| 652 | 3372 if (CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3373 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3374 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_UNARMED); |
| 353 | 3375 } |
| 3376 break; | |
| 3377 | |
| 3378 case PLAYER_SKILL_DODGE: | |
| 3379 { | |
| 652 | 3380 if ( CheckHiredNPCSpeciality(Monk) ) |
| 1064 | 3381 bonus_value = 2; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3382 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DODGE); |
| 353 | 3383 } |
| 3384 break; | |
| 3385 | |
| 3386 case PLAYER_SKILL_BOW: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3387 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BOW); |
| 353 | 3388 break; |
| 3389 case PLAYER_SKILL_SHIELD: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3390 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SHIELD); |
| 353 | 3391 break; |
| 3392 | |
| 3393 case PLAYER_SKILL_EARTH: | |
| 652 | 3394 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3395 bonus_value = 2; |
| 652 | 3396 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3397 bonus_value += 3; |
| 652 | 3398 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3399 bonus_value += 4; |
| 353 | 3400 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3401 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3402 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_EARTH); |
| 353 | 3403 break; |
| 3404 case PLAYER_SKILL_FIRE: | |
| 652 | 3405 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3406 bonus_value = 2; |
| 652 | 3407 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3408 bonus_value += 3; |
| 652 | 3409 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3410 bonus_value += 4; |
| 353 | 3411 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3412 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3413 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_FIRE); |
| 353 | 3414 break; |
| 3415 case PLAYER_SKILL_AIR: | |
| 652 | 3416 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3417 bonus_value = 2; |
| 652 | 3418 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3419 bonus_value += 3; |
| 652 | 3420 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3421 bonus_value += 4; |
| 353 | 3422 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3423 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3424 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_AIR); |
| 353 | 3425 break; |
| 3426 case PLAYER_SKILL_WATER: | |
| 652 | 3427 if ( CheckHiredNPCSpeciality(Apprentice) ) |
| 1064 | 3428 bonus_value = 2; |
| 652 | 3429 if ( CheckHiredNPCSpeciality(Mystic) ) |
| 1064 | 3430 bonus_value += 3; |
| 652 | 3431 if ( CheckHiredNPCSpeciality(Spellmaster) ) |
| 1064 | 3432 bonus_value += 4; |
| 353 | 3433 if ( classType == PLAYER_CLASS_WARLOCK && PartyHasDragon() ) |
| 1064 | 3434 bonus_value += 3; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3435 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_WATER); |
| 353 | 3436 break; |
| 3437 case PLAYER_SKILL_SPIRIT: | |
| 652 | 3438 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3439 bonus_value = 2; |
| 652 | 3440 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3441 bonus_value += 3; |
| 652 | 3442 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3443 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3444 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_SPIRIT); |
| 353 | 3445 break; |
| 3446 case PLAYER_SKILL_MIND: | |
| 652 | 3447 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3448 bonus_value = 2; |
| 652 | 3449 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3450 bonus_value += 3; |
| 652 | 3451 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3452 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3453 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MIND); |
| 353 | 3454 break; |
| 3455 case PLAYER_SKILL_BODY: | |
| 652 | 3456 if ( CheckHiredNPCSpeciality(Acolyte2) ) |
| 1064 | 3457 bonus_value = 2; |
| 652 | 3458 if ( CheckHiredNPCSpeciality(Initiate) ) |
| 1064 | 3459 bonus_value += 3; |
| 652 | 3460 if ( CheckHiredNPCSpeciality(Prelate) ) |
| 1064 | 3461 bonus_value += 4; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3462 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_BODY); |
| 353 | 3463 break; |
| 3464 case PLAYER_SKILL_LIGHT: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3465 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_LIGHT); |
| 353 | 3466 break; |
| 3467 case PLAYER_SKILL_DARK: | |
| 3468 { | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3469 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_DARK); |
| 353 | 3470 } |
| 3471 break; | |
| 3472 | |
| 3473 case PLAYER_SKILL_MERCHANT: | |
| 3474 { | |
| 652 | 3475 if ( CheckHiredNPCSpeciality(Trader) ) |
| 1064 | 3476 bonus_value = 4; |
| 652 | 3477 if ( CheckHiredNPCSpeciality(Merchant) ) |
| 1064 | 3478 bonus_value += 6; |
| 652 | 3479 if ( CheckHiredNPCSpeciality(Gypsy) ) |
| 1064 | 3480 bonus_value += 3; |
| 652 | 3481 if ( CheckHiredNPCSpeciality(Duper) ) |
| 1064 | 3482 bonus_value += 8; |
| 353 | 3483 } |
| 3484 break; | |
| 3485 | |
| 3486 case PLAYER_SKILL_PERCEPTION: | |
| 3487 { | |
| 652 | 3488 if ( CheckHiredNPCSpeciality(Scout) ) |
| 1064 | 3489 bonus_value = 6; |
| 652 | 3490 if ( CheckHiredNPCSpeciality(Psychic) ) |
| 1064 | 3491 bonus_value += 5; |
| 353 | 3492 } |
| 3493 break; | |
| 3494 | |
| 0 | 3495 case PLAYER_SKILL_ITEM_ID: |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3496 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_ITEM_ID); |
| 0 | 3497 break; |
| 3498 case PLAYER_SKILL_MEDITATION: | |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3499 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_MEDITATION); |
| 353 | 3500 break; |
| 0 | 3501 case PLAYER_SKILL_TRAP_DISARM: |
| 353 | 3502 { |
| 652 | 3503 if ( CheckHiredNPCSpeciality(Tinker) ) |
| 1064 | 3504 bonus_value = 4; |
| 652 | 3505 if ( CheckHiredNPCSpeciality(Locksmith) ) |
| 1064 | 3506 bonus_value += 6; |
| 652 | 3507 if ( CheckHiredNPCSpeciality(Burglar) ) |
| 1064 | 3508 bonus_value += 8; |
|
1595
a52a01aaf439
Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents:
1594
diff
changeset
|
3509 bonus_value += GetItemsBonus(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM); |
| 353 | 3510 } |
| 3511 break; | |
| 3512 } | |
| 3513 | |
| 1064 | 3514 skill_value = pActiveSkills[uSkillType]; |
| 3515 if ( bonus_value + (skill_value & 0x3F) < 60 ) | |
| 3516 result = bonus_value + skill_value; | |
| 0 | 3517 else |
| 1064 | 3518 result = skill_value & 0xFFFC | 0x3C; //al |
| 0 | 3519 return result; |
| 3520 } | |
| 3521 | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3522 |
| 0 | 3523 //----- (0048FC00) -------------------------------------------------------- |
| 1538 | 3524 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
|
3525 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3526 int armsMasterBonus; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3527 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3528 armsMasterBonus = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3529 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
|
3530 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
|
3531 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3532 int multiplier = 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3533 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
|
3534 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3535 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
|
3536 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3537 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
|
3538 { |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3539 multiplier = GetMultiplierForSkillLevel(armmaster_skill, 0, 1, 1, 2); |
| 1064 | 3540 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3541 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
|
3542 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3543 |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3544 switch(inSkill) |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3545 { |
|
1539
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3546 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
|
3547 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
|
3548 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3549 int bowSkillLevel = GetActualSkillLevel(PLAYER_SKILL_DODGE); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3550 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
|
3551 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
|
3552 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3553 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
|
3554 break; |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3555 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
|
3556 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3557 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
|
3558 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
|
3559 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
|
3560 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3561 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3562 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
|
3563 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 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
|
3565 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
|
3566 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
|
3567 } |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3568 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3569 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
|
3570 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3571 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
|
3572 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
|
3573 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
|
3574 |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, 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 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
|
3576 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3577 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
|
3578 if (currItem != nullptr && (!currItem->IsBroken())) |
| 1538 | 3579 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3580 PLAYER_SKILL_TYPE itemSkillType = (PLAYER_SKILL_TYPE)currItem->GetPlayerSkillType(); |
| 1976 | 3581 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
|
3582 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
|
3583 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
|
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 case PLAYER_SKILL_STAFF: |
| 1976 | 3586 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3587 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
|
3588 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
|
3589 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
|
3590 case PLAYER_SKILL_SPEAR: |
| 1976 | 3591 currArmorSkillLevel = GetActualSkillLevel(itemSkillType); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3592 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
|
3593 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
|
3594 case PLAYER_SKILL_SHIELD: |
| 1976 | 3595 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
|
3596 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3597 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
|
3598 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
|
3599 case PLAYER_SKILL_LEATHER: |
| 1976 | 3600 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
|
3601 wearingLeather = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3602 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
|
3603 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
|
3604 case PLAYER_SKILL_CHAIN: |
| 1976 | 3605 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
|
3606 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3607 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
|
3608 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
|
3609 case PLAYER_SKILL_PLATE: |
| 1976 | 3610 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
|
3611 wearingArmor = true; |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3612 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
|
3613 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
|
3614 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3615 ACSum += multiplier * (currArmorSkillLevel & 0x3F); |
| 1538 | 3616 } |
|
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
|
3617 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3618 |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3619 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
|
3620 int dodgeMastery = SkillToMastery(dodgeSkillLevel); |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3621 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
|
3622 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
|
3623 { |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3624 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
|
3625 } |
|
5cf28ec7322d
Player:GetSkillBonus cleanup, added back some brackets, because of var declarations, moved here CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS from GetRangedDamageMin and GetRangedDamageMax
Grumpy7
parents:
1538
diff
changeset
|
3626 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
|
3627 } |
| 1538 | 3628 break; |
| 3629 case CHARACTER_ATTRIBUTE_ATTACK: | |
| 3630 if ( this->IsUnarmed() ) | |
| 3631 { | |
| 3632 int unarmedSkill = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3633 if (!unarmedSkill) | |
| 3634 { | |
| 3635 return 0; | |
| 3636 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3637 int multiplier = GetMultiplierForSkillLevel(unarmedSkill, 0, 1, 2, 2); |
| 1538 | 3638 return armsMasterBonus + multiplier * (unarmedSkill & 0x3F); |
| 3639 } | |
| 3640 for (int i = 0; i < 16; ++i) | |
| 3641 { | |
| 3642 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3643 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3644 ItemGen* currItem = GetNthEquippedIndexItem(i); |
| 1989 | 3645 if ( currItem->GetItemEquipType() <= EQUIP_TWO_HANDED) |
| 1533 | 3646 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3647 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItem->GetPlayerSkillType(); |
| 1538 | 3648 int currentItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 3649 if (currItemSkillType == PLAYER_SKILL_BLASTER) | |
| 3650 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3651 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); |
| 1538 | 3652 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3653 } | |
| 3654 else if (currItemSkillType == PLAYER_SKILL_STAFF && this->GetActualSkillLevel(PLAYER_SKILL_UNARMED) > 0) | |
| 3655 { | |
| 3656 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
|
3657 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 2, 2); |
| 1538 | 3658 return multiplier * (unarmedSkillLevel & 0x3F) + armsMasterBonus + (currentItemSkillLevel & 0x3F); |
| 3659 } | |
| 3660 else | |
| 3661 { | |
| 3662 return armsMasterBonus + (currentItemSkillLevel & 0x3F); | |
| 3663 } | |
| 3664 } | |
| 3665 } | |
| 3666 } | |
| 3667 return 0; | |
| 3668 break; | |
| 3669 | |
| 3670 case CHARACTER_ATTRIBUTE_RANGED_ATTACK: | |
| 3671 for (int i = 0; i < 16; i++) | |
| 3672 { | |
| 3673 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3674 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3675 PLAYER_SKILL_TYPE currentItemSkillType = (PLAYER_SKILL_TYPE)GetNthEquippedIndexItem(i)->GetPlayerSkillType(); |
| 1538 | 3676 int currentItemSkillLevel = this->GetActualSkillLevel(currentItemSkillType); |
| 3677 if ( currentItemSkillType == PLAYER_SKILL_BOW ) | |
| 3678 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3679 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 1, 1); |
| 1538 | 3680 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3681 } | |
| 3682 else if ( currentItemSkillType == PLAYER_SKILL_BLASTER ) | |
| 3683 { | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3684 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 2, 3, 5); |
| 1538 | 3685 return multiplier * (currentItemSkillLevel & 0x3F); |
| 3686 } | |
| 3687 } | |
| 3688 } | |
| 3689 return 0; | |
| 3690 break; | |
| 3691 | |
| 3692 case CHARACTER_ATTRIBUTE_MELEE_DMG_BONUS: | |
| 3693 if ( this->IsUnarmed() ) | |
| 3694 { | |
| 3695 int unarmedSkillLevel = this->GetActualSkillLevel(PLAYER_SKILL_UNARMED); | |
| 3696 if ( !unarmedSkillLevel ) | |
| 3697 { | |
| 3698 return 0; | |
| 3699 } | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3700 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 3701 return multiplier * (unarmedSkillLevel & 0x3F); |
| 3702 } | |
| 3703 for (int i = 0; i < 16; i++) | |
| 3704 { | |
| 3705 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) | |
| 3706 { | |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
3707 ItemGen* currItemPtr = GetNthEquippedIndexItem(i); |
| 1989 | 3708 if ( currItemPtr->GetItemEquipType() == EQUIP_TWO_HANDED || currItemPtr->GetItemEquipType() == EQUIP_SINGLE_HANDED ) |
| 1538 | 3709 { |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
3710 PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItemPtr->GetPlayerSkillType(); |
| 1538 | 3711 int currItemSkillLevel = this->GetActualSkillLevel(currItemSkillType); |
| 3712 int baseSkillBonus; | |
| 3713 int multiplier; | |
| 3714 switch (currItemSkillType) | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3715 { |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3716 case PLAYER_SKILL_STAFF: |
| 1538 | 3717 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
|
3718 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3719 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
|
3720 int multiplier = GetMultiplierForSkillLevel(unarmedSkillLevel, 0, 1, 2, 2); |
| 1538 | 3721 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
|
3722 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3723 else |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3724 { |
| 1538 | 3725 return armsMasterBonus; |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3726 } |
| 1538 | 3727 break; |
| 3728 | |
| 3729 case PLAYER_SKILL_DAGGER: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3730 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 1); |
| 1538 | 3731 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3732 return armsMasterBonus + baseSkillBonus; | |
| 3733 break; | |
| 3734 case PLAYER_SKILL_SWORD: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3735 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 0, 0); |
| 1538 | 3736 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3737 return armsMasterBonus + baseSkillBonus; | |
| 3738 break; | |
| 3739 case PLAYER_SKILL_MACE: | |
| 3740 case PLAYER_SKILL_SPEAR: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3741 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 1, 1, 1); |
| 1538 | 3742 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3743 return armsMasterBonus + baseSkillBonus; | |
| 3744 break; | |
| 3745 case PLAYER_SKILL_AXE: | |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3746 multiplier = GetMultiplierForSkillLevel(currItemSkillLevel, 0, 0, 1, 1); |
| 1538 | 3747 baseSkillBonus = multiplier * (currItemSkillLevel & 0x3F); |
| 3748 return armsMasterBonus + baseSkillBonus; | |
| 3749 break; | |
| 1535 | 3750 } |
| 1533 | 3751 } |
| 1535 | 3752 } |
| 1538 | 3753 } |
| 3754 return 0; | |
|
1534
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3755 break; |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3756 default: |
|
d4bc1cb9d953
Player::GetSkillBonus put input value in case, removed labels (introduced a bit of code duplicity)
Grumpy7
parents:
1533
diff
changeset
|
3757 return 0; |
| 1533 | 3758 } |
|
1537
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3759 } |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3760 |
|
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1552
diff
changeset
|
3761 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
|
3762 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3763 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
|
3764 switch (masteryLvl) |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3765 { |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3766 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
|
3767 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
|
3768 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
|
3769 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
|
3770 } |
| 1545 | 3771 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
|
3772 return 0; |
|
fed56133bf8a
Player:GetSkillBonus cleanup, multiplier evaluation moved to a separate function, variable clanup, renaming, scope reduction
Grumpy7
parents:
1536
diff
changeset
|
3773 } |
| 0 | 3774 //----- (00490109) -------------------------------------------------------- |
| 3775 // faces are: 0 1 2 3 human males | |
| 3776 // 4 5 6 7 human females | |
| 3777 // 8 9 elf males | |
| 3778 // 10 11 elf females | |
| 3779 // 12 13 dwarf males | |
| 3780 // 14 15 dwarf females | |
| 3781 // 16 17 goblin males | |
| 3782 // 18 19 goblin females | |
| 3783 // 20 lich male | |
| 3784 // 21 lich female | |
| 3785 // 22 underwater suits (unused) | |
| 3786 // 23 zombie male | |
| 3787 // 24 zombie female | |
| 3788 enum CHARACTER_RACE Player::GetRace() | |
| 3789 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3790 if ( uCurrentFace <= 7 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3791 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3792 return CHARACTER_RACE_HUMAN; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3793 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3794 else if ( uCurrentFace <= 11 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3795 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3796 return CHARACTER_RACE_ELF; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3797 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3798 else if ( uCurrentFace <= 15 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3799 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3800 return CHARACTER_RACE_DWARF; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3801 } |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3802 else if ( uCurrentFace <= 19 ) |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3803 { |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3804 return CHARACTER_RACE_GOBLIN; |
| 0 | 3805 } |
| 3806 else | |
| 3807 { | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3808 return CHARACTER_RACE_HUMAN; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3809 } |
| 0 | 3810 } |
| 3811 | |
| 3812 //----- (00490141) -------------------------------------------------------- | |
| 187 | 3813 PLAYER_SEX Player::GetSexByVoice() |
| 0 | 3814 { |
| 3815 switch ( this->uVoiceID ) | |
| 3816 { | |
| 3817 case 0u: | |
| 3818 case 1u: | |
| 3819 case 2u: | |
| 3820 case 3u: | |
| 3821 case 8u: | |
| 3822 case 9u: | |
| 3823 case 0xCu: | |
| 3824 case 0xDu: | |
| 3825 case 0x10u: | |
| 3826 case 0x11u: | |
| 3827 case 0x14u: | |
| 3828 case 0x17u: | |
| 187 | 3829 return SEX_MALE; |
| 3830 | |
| 0 | 3831 case 4u: |
| 3832 case 5u: | |
| 3833 case 6u: | |
| 3834 case 7u: | |
| 3835 case 0xAu: | |
| 3836 case 0xBu: | |
| 3837 case 0xEu: | |
| 3838 case 0xFu: | |
| 3839 case 0x12u: | |
| 3840 case 0x13u: | |
| 3841 case 0x15u: | |
| 3842 case 0x18u: | |
| 187 | 3843 return SEX_FEMALE; |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3844 } |
| 1545 | 3845 Error("(%u)", this->uVoiceID); |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
3846 return SEX_MALE; |
| 0 | 3847 } |
| 3848 | |
| 3849 //----- (00490188) -------------------------------------------------------- | |
| 3850 void Player::SetInitialStats() | |
| 3851 { | |
| 1980 | 3852 CHARACTER_RACE v1 = GetRace(); |
| 290 | 3853 uMight = StatTable[v1][0].uBaseValue; |
| 3854 uIntelligence = StatTable[v1][1].uBaseValue; | |
| 3855 uWillpower = StatTable[v1][2].uBaseValue; | |
| 3856 uEndurance = StatTable[v1][3].uBaseValue; | |
| 3857 uAccuracy = StatTable[v1][4].uBaseValue; | |
| 3858 uSpeed = StatTable[v1][5].uBaseValue; | |
| 3859 uLuck = StatTable[v1][6].uBaseValue; | |
| 0 | 3860 } |
| 3861 | |
| 3862 //----- (004901FC) -------------------------------------------------------- | |
| 1021 | 3863 void Player::SetSexByVoice() |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3864 { |
| 1021 | 3865 switch ( this->uVoiceID) |
| 0 | 3866 { |
| 3867 case 0: | |
| 3868 case 1: | |
| 3869 case 2: | |
| 3870 case 3: | |
| 3871 case 8: | |
| 3872 case 9: | |
| 3873 case 0xC: | |
| 3874 case 0xD: | |
| 3875 case 0x10: | |
| 3876 case 0x11: | |
| 3877 case 0x14: | |
| 3878 case 0x17: | |
| 1021 | 3879 this->uSex = SEX_MALE; |
| 0 | 3880 break; |
| 3881 case 4: | |
| 3882 case 5: | |
| 3883 case 6: | |
| 3884 case 7: | |
| 3885 case 0xA: | |
| 3886 case 0xB: | |
| 3887 case 0xE: | |
| 3888 case 0xF: | |
| 3889 case 0x12: | |
| 3890 case 0x13: | |
| 3891 case 0x15: | |
| 3892 case 0x18: | |
| 1021 | 3893 this->uSex = SEX_FEMALE; |
| 0 | 3894 break; |
| 3895 default: | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
3896 Error("(%u)", this->uVoiceID); |
| 0 | 3897 break; |
| 3898 } | |
| 1021 | 3899 |
| 0 | 3900 } |
| 3901 | |
| 3902 //----- (0049024A) -------------------------------------------------------- | |
| 135 | 3903 void Player::Reset(PLAYER_CLASS_TYPE cls) |
| 0 | 3904 { |
| 3905 sLevelModifier = 0; | |
| 3906 sAgeModifier = 0; | |
| 3907 | |
| 135 | 3908 classType = cls; |
| 0 | 3909 uLuckBonus = 0; |
| 3910 uSpeedBonus = 0; | |
| 3911 uAccuracyBonus = 0; | |
| 3912 uEnduranceBonus = 0; | |
| 3913 uWillpowerBonus = 0; | |
| 3914 uIntelligenceBonus = 0; | |
| 3915 uMightBonus = 0; | |
| 3916 uLevel = 1; | |
| 3917 uExperience = 251 + rand() % 100; | |
| 3918 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
|
3919 pActiveSkills.fill(0); |
|
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
3920 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
|
3921 memset(&spellbook, 0, sizeof(spellbook)); |
| 0 | 3922 |
| 3923 for (uint i = 0; i < 37; ++i) | |
| 3924 { | |
| 135 | 3925 if (pSkillAvailabilityPerClass[classType / 4][i] != 2) |
| 0 | 3926 continue; |
| 3927 | |
| 3928 pActiveSkills[i] = 1; | |
| 3929 | |
| 3930 switch (i) | |
| 3931 { | |
| 886 | 3932 case PLAYER_SKILL_FIRE: |
| 3933 spellbook.pFireSpellbook.bIsSpellAvailable[0] = true;//its temporary, for test spells | |
| 894 | 3934 |
| 3935 extern bool all_magic; | |
| 3936 if ( all_magic == true ) | |
| 3937 { | |
| 3938 pActiveSkills[PLAYER_SKILL_AIR] = 1; | |
| 3939 pActiveSkills[PLAYER_SKILL_WATER] = 1; | |
| 3940 pActiveSkills[PLAYER_SKILL_EARTH] = 1; | |
| 3941 spellbook.pFireSpellbook.bIsSpellAvailable[1] = true; | |
| 3942 spellbook.pFireSpellbook.bIsSpellAvailable[2] = true; | |
| 3943 spellbook.pFireSpellbook.bIsSpellAvailable[3] = true; | |
| 3944 spellbook.pFireSpellbook.bIsSpellAvailable[4] = true; | |
| 3945 spellbook.pFireSpellbook.bIsSpellAvailable[5] = true; | |
| 3946 spellbook.pFireSpellbook.bIsSpellAvailable[6] = true; | |
| 3947 spellbook.pFireSpellbook.bIsSpellAvailable[7] = true; | |
| 3948 spellbook.pFireSpellbook.bIsSpellAvailable[8] = true; | |
| 3949 spellbook.pFireSpellbook.bIsSpellAvailable[9] = true; | |
| 3950 spellbook.pFireSpellbook.bIsSpellAvailable[10] = true; | |
| 886 | 3951 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; |
| 569 | 3952 spellbook.pAirSpellbook.bIsSpellAvailable[1] = true; |
| 3953 spellbook.pAirSpellbook.bIsSpellAvailable[2] = true; | |
| 3954 spellbook.pAirSpellbook.bIsSpellAvailable[3] = true; | |
| 3955 spellbook.pAirSpellbook.bIsSpellAvailable[4] = true; | |
| 3956 spellbook.pAirSpellbook.bIsSpellAvailable[5] = true; | |
| 3957 spellbook.pAirSpellbook.bIsSpellAvailable[6] = true; | |
| 3958 spellbook.pAirSpellbook.bIsSpellAvailable[7] = true; | |
| 3959 spellbook.pAirSpellbook.bIsSpellAvailable[8] = true; | |
| 3960 spellbook.pAirSpellbook.bIsSpellAvailable[9] = true; | |
| 3961 spellbook.pAirSpellbook.bIsSpellAvailable[10] = true; | |
| 3962 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 3963 spellbook.pWaterSpellbook.bIsSpellAvailable[1] = true; | |
| 3964 spellbook.pWaterSpellbook.bIsSpellAvailable[2] = true; | |
| 3965 spellbook.pWaterSpellbook.bIsSpellAvailable[3] = true; | |
| 3966 spellbook.pWaterSpellbook.bIsSpellAvailable[4] = true; | |
| 3967 spellbook.pWaterSpellbook.bIsSpellAvailable[5] = true; | |
| 710 | 3968 spellbook.pWaterSpellbook.bIsSpellAvailable[6] = true; |
| 3969 spellbook.pWaterSpellbook.bIsSpellAvailable[7] = true; | |
| 3970 spellbook.pWaterSpellbook.bIsSpellAvailable[8] = true; | |
| 886 | 3971 spellbook.pWaterSpellbook.bIsSpellAvailable[9] = true; |
| 3972 spellbook.pWaterSpellbook.bIsSpellAvailable[10] = true; | |
| 894 | 3973 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; |
| 3974 spellbook.pEarthSpellbook.bIsSpellAvailable[1] = true; | |
| 3975 spellbook.pEarthSpellbook.bIsSpellAvailable[2] = true; | |
| 3976 spellbook.pEarthSpellbook.bIsSpellAvailable[3] = true; | |
| 3977 spellbook.pEarthSpellbook.bIsSpellAvailable[4] = true; | |
| 3978 spellbook.pEarthSpellbook.bIsSpellAvailable[5] = true; | |
| 3979 spellbook.pEarthSpellbook.bIsSpellAvailable[6] = true; | |
| 3980 spellbook.pEarthSpellbook.bIsSpellAvailable[7] = true; | |
| 3981 spellbook.pEarthSpellbook.bIsSpellAvailable[8] = true; | |
| 3982 spellbook.pEarthSpellbook.bIsSpellAvailable[9] = true; | |
| 3983 spellbook.pEarthSpellbook.bIsSpellAvailable[10] = true; | |
| 3984 } | |
| 486 | 3985 break; |
| 886 | 3986 case PLAYER_SKILL_AIR: |
| 3987 spellbook.pAirSpellbook.bIsSpellAvailable[0] = true; | |
| 3988 break; | |
| 3989 case PLAYER_SKILL_WATER: | |
| 3990 spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true; | |
| 3991 break; | |
| 3992 case PLAYER_SKILL_EARTH: | |
| 3993 spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true; | |
| 3994 break; | |
| 3995 case PLAYER_SKILL_SPIRIT: | |
| 3996 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; | |
| 3997 break; | |
| 3998 case PLAYER_SKILL_MIND: | |
| 3999 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; | |
| 4000 break; | |
| 4001 case PLAYER_SKILL_BODY: | |
| 4002 spellbook.pBodySpellbook.bIsSpellAvailable[0] = true; | |
| 894 | 4003 |
| 4004 if ( all_magic == true ) | |
| 4005 { | |
| 4006 pActiveSkills[PLAYER_SKILL_MIND] = 1; | |
| 4007 pActiveSkills[PLAYER_SKILL_SPIRIT] = 1; | |
| 4008 spellbook.pBodySpellbook.bIsSpellAvailable[1] = true; | |
| 4009 spellbook.pBodySpellbook.bIsSpellAvailable[2] = true; | |
| 4010 spellbook.pBodySpellbook.bIsSpellAvailable[3] = true; | |
| 4011 spellbook.pBodySpellbook.bIsSpellAvailable[4] = true; | |
| 4012 spellbook.pBodySpellbook.bIsSpellAvailable[5] = true; | |
| 4013 spellbook.pBodySpellbook.bIsSpellAvailable[6] = true; | |
| 4014 spellbook.pBodySpellbook.bIsSpellAvailable[7] = true; | |
| 4015 spellbook.pBodySpellbook.bIsSpellAvailable[8] = true; | |
| 4016 spellbook.pBodySpellbook.bIsSpellAvailable[9] = true; | |
| 4017 spellbook.pBodySpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 4018 spellbook.pMindSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 4019 spellbook.pMindSpellbook.bIsSpellAvailable[1] = true; |
| 4020 spellbook.pMindSpellbook.bIsSpellAvailable[2] = true; | |
| 4021 spellbook.pMindSpellbook.bIsSpellAvailable[3] = true; | |
| 4022 spellbook.pMindSpellbook.bIsSpellAvailable[4] = true; | |
| 4023 spellbook.pMindSpellbook.bIsSpellAvailable[5] = true; | |
| 4024 spellbook.pMindSpellbook.bIsSpellAvailable[6] = true; | |
| 4025 spellbook.pMindSpellbook.bIsSpellAvailable[7] = true; | |
| 4026 spellbook.pMindSpellbook.bIsSpellAvailable[8] = true; | |
| 4027 spellbook.pMindSpellbook.bIsSpellAvailable[9] = true; | |
| 4028 spellbook.pMindSpellbook.bIsSpellAvailable[10] = true; | |
| 924 | 4029 spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true; |
| 894 | 4030 spellbook.pSpiritSpellbook.bIsSpellAvailable[1] = true; |
| 4031 spellbook.pSpiritSpellbook.bIsSpellAvailable[2] = true; | |
| 4032 spellbook.pSpiritSpellbook.bIsSpellAvailable[3] = true; | |
| 4033 spellbook.pSpiritSpellbook.bIsSpellAvailable[4] = true; | |
| 4034 spellbook.pSpiritSpellbook.bIsSpellAvailable[5] = true; | |
| 4035 spellbook.pSpiritSpellbook.bIsSpellAvailable[6] = true; | |
| 4036 spellbook.pSpiritSpellbook.bIsSpellAvailable[7] = true; | |
| 4037 spellbook.pSpiritSpellbook.bIsSpellAvailable[8] = true; | |
| 4038 spellbook.pSpiritSpellbook.bIsSpellAvailable[9] = true; | |
| 4039 spellbook.pSpiritSpellbook.bIsSpellAvailable[10] = true; | |
| 4040 } | |
| 569 | 4041 break; |
| 886 | 4042 case PLAYER_SKILL_LIGHT: |
| 4043 spellbook.pLightSpellbook.bIsSpellAvailable[0] = true; | |
| 4044 break; | |
| 4045 case PLAYER_SKILL_DARK: | |
| 4046 spellbook.pDarkSpellbook.bIsSpellAvailable[0] = true; | |
| 4047 break; | |
| 0 | 4048 } |
| 4049 } | |
| 4050 | |
| 4051 sHealth = GetMaxHealth(); | |
| 4052 sMana = GetMaxMana(); | |
| 4053 } | |
| 4054 | |
| 4055 //----- (004903C9) -------------------------------------------------------- | |
| 821 | 4056 PLAYER_SKILL_TYPE Player::GetSkillIdxByOrder(signed int order) |
| 4057 { | |
|
1271
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4058 int counter; // edx@5 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4059 bool canBeInactive; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4060 unsigned char requiredValue; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4061 signed int offset; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4062 |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4063 if ( order <= 1 ) |
|
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 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4066 requiredValue = 2; // 2 - primary skill |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4067 offset = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4068 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4069 else if ( order <= 3 ) |
|
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 canBeInactive = false; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4072 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4073 offset = 2; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4074 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4075 else if ( order <= 12 ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4076 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4077 canBeInactive = true; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4078 requiredValue = 1; // 1 - available |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4079 offset = 4; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4080 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4081 else |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4082 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4083 return (PLAYER_SKILL_TYPE)37; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4084 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4085 counter = 0; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4086 for (int i = 0; i < 37; i++) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4087 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4088 if ( (this->pActiveSkills[i] || canBeInactive) && pSkillAvailabilityPerClass[classType / 4][i] == requiredValue ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4089 { |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4090 if ( counter == order - offset ) |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4091 return (PLAYER_SKILL_TYPE)i; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4092 ++counter; |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4093 } |
|
5a3f48b370d5
Player::GetSkillIdxByOrder cleanup - extracting common branch bodies
Grumpy7
parents:
1270
diff
changeset
|
4094 } |
|
1409
c9e3b93ec570
Highlighted locations with "using uninitialized variable" warning.
Nomad
parents:
1407
diff
changeset
|
4095 |
|
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
|
4096 return (PLAYER_SKILL_TYPE)37; |
| 0 | 4097 } |
| 4098 | |
| 4099 | |
| 4100 | |
| 4101 //----- (0049048D) -------------------------------------------------------- | |
| 4102 //unsigned __int16 PartyCreation_BtnMinusClick(Player *_this, int eAttribute) | |
| 4103 void Player::DecreaseAttribute(int eAttribute) | |
| 4104 { | |
| 4105 int pBaseValue; // ecx@1 | |
| 4106 int pDroppedStep; // ebx@1 | |
| 4107 int pStep; // esi@1 | |
| 4108 int uMinValue; // [sp+Ch] [bp-4h]@1 | |
| 4109 | |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4110 int raceId = GetRace(); |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4111 pBaseValue = StatTable[raceId][eAttribute].uBaseValue; |
|
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4112 pDroppedStep = StatTable[raceId][eAttribute].uDroppedStep; |
| 0 | 4113 uMinValue = pBaseValue - 2; |
|
1617
8e3c6d7631f1
Player::GetRace cleaned up + removed a few unused vars
Grumpy7
parents:
1605
diff
changeset
|
4114 pStep = StatTable[raceId][eAttribute].uBaseStep; |
| 1272 | 4115 unsigned short* AttrToChange = nullptr; |
| 4116 switch ( eAttribute ) | |
| 4117 { | |
| 4118 case CHARACTER_ATTRIBUTE_STRENGTH: | |
| 4119 AttrToChange = &this->uMight; | |
| 4120 break; | |
| 4121 case CHARACTER_ATTRIBUTE_INTELLIGENCE: | |
| 4122 AttrToChange = &this->uIntelligence; | |
| 4123 break; | |
| 4124 case CHARACTER_ATTRIBUTE_WILLPOWER: | |
| 4125 AttrToChange = &this->uWillpower; | |
| 4126 break; | |
| 4127 case CHARACTER_ATTRIBUTE_ENDURANCE: | |
| 4128 AttrToChange = &this->uEndurance; | |
| 4129 break; | |
| 4130 case CHARACTER_ATTRIBUTE_ACCURACY: | |
| 4131 AttrToChange = &this->uAccuracy; | |
| 4132 break; | |
| 4133 case CHARACTER_ATTRIBUTE_SPEED: | |
| 4134 AttrToChange = &this->uSpeed; | |
| 4135 break; | |
| 4136 case CHARACTER_ATTRIBUTE_LUCK: | |
| 4137 AttrToChange = &this->uLuck; | |
| 4138 break; | |
| 4139 } | |
| 4140 if ( *AttrToChange <= pBaseValue ) | |
| 4141 pStep = pDroppedStep; | |
| 4142 if ( *AttrToChange - pStep >= uMinValue ) | |
| 4143 *AttrToChange -= pStep; | |
| 0 | 4144 } |
| 4145 | |
| 4146 //----- (004905F5) -------------------------------------------------------- | |
| 1458 | 4147 //signed int PartyCreation_BtnPlusClick(Player *this, int eAttribute) |
| 1273 | 4148 void Player::IncreaseAttribute( int eAttribute ) |
| 4149 { | |
| 4150 int raceId; // eax@1 | |
| 4151 int maxValue; // ebx@1 | |
| 4152 signed int baseStep; // edi@1 | |
| 4153 signed int tmp; // eax@17 | |
| 0 | 4154 signed int result; // eax@18 |
| 1273 | 4155 int baseValue; // [sp+Ch] [bp-8h]@1 |
| 4156 signed int droppedStep; // [sp+10h] [bp-4h]@1 | |
| 4157 unsigned short* statToChange; | |
| 4158 | |
| 4159 raceId = GetRace(); | |
| 4160 maxValue = StatTable[raceId][eAttribute].uMaxValue; | |
| 4161 baseStep = StatTable[raceId][eAttribute].uBaseStep; | |
| 4162 baseValue = StatTable[raceId][eAttribute].uBaseValue; | |
| 4163 droppedStep = StatTable[raceId][eAttribute].uDroppedStep; | |
| 4164 PlayerCreation_GetUnspentAttributePointCount(); | |
| 4165 switch ( eAttribute ) | |
| 4166 { | |
| 4167 case 0: | |
| 4168 statToChange = &this->uMight; | |
| 4169 break; | |
| 4170 case 1: | |
| 4171 statToChange = &this->uIntelligence; | |
| 4172 break; | |
| 4173 case 2: | |
| 4174 statToChange = &this->uWillpower; | |
| 4175 break; | |
| 4176 case 3: | |
| 4177 statToChange = &this->uEndurance; | |
| 4178 break; | |
| 4179 case 4: | |
| 4180 statToChange = &this->uAccuracy; | |
| 4181 break; | |
| 4182 case 5: | |
| 4183 statToChange = &this->uSpeed; | |
| 4184 break; | |
| 4185 case 6: | |
| 4186 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
|
4187 break; |
| 1273 | 4188 default: |
| 1545 | 4189 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
|
4190 break; |
| 1273 | 4191 } |
| 4192 if ( *statToChange < baseValue ) | |
| 4193 { | |
| 4194 tmp = baseStep; | |
| 4195 baseStep = droppedStep; | |
| 4196 droppedStep = tmp; | |
| 4197 } | |
| 4198 result = PlayerCreation_GetUnspentAttributePointCount(); | |
| 4199 if ( result >= droppedStep ) | |
| 4200 { | |
| 4201 if ( baseStep + *statToChange <= maxValue ) | |
| 4202 *statToChange += baseStep; | |
| 4203 } | |
| 0 | 4204 } |
| 4205 | |
| 4206 //----- (0049070F) -------------------------------------------------------- | |
| 4207 void Player::Zero() | |
| 4208 { | |
| 4209 this->sLevelModifier = 0; | |
| 4210 this->sACModifier = 0; | |
| 4211 this->uLuckBonus = 0; | |
| 4212 this->uAccuracyBonus = 0; | |
| 4213 this->uSpeedBonus = 0; | |
| 4214 this->uEnduranceBonus = 0; | |
| 4215 this->uWillpowerBonus = 0; | |
| 4216 this->uIntelligenceBonus = 0; | |
| 4217 this->uMightBonus = 0; | |
| 4218 this->field_100 = 0; | |
| 4219 this->field_FC = 0; | |
| 4220 this->field_F8 = 0; | |
| 4221 this->field_F4 = 0; | |
| 4222 this->field_F0 = 0; | |
| 4223 this->field_EC = 0; | |
| 4224 this->field_E8 = 0; | |
| 4225 this->field_E4 = 0; | |
| 4226 this->field_E0 = 0; | |
| 766 | 4227 memset(&this->sResFireBonus, 0, 0x16u); |
|
1274
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4228 this->field_1A97 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4229 this->_ranged_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4230 this->field_1A95 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4231 this->_ranged_atk_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4232 this->field_1A93 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4233 this->_melee_dmg_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4234 this->field_1A91 = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4235 this->_some_attack_bonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4236 this->_mana_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4237 this->uFullManaBonus = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4238 this->_health_related = 0; |
|
351bc06722f2
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
Grumpy7
parents:
1273
diff
changeset
|
4239 this->uFullHealthBonus = 0; |
| 0 | 4240 } |
| 4241 | |
| 4242 //----- (004907E7) -------------------------------------------------------- | |
| 299 | 4243 unsigned int Player::GetStatColor(int uStat) |
| 0 | 4244 { |
| 290 | 4245 int attribute_value; // edx@1 |
| 1393 | 4246 |
| 4247 int base_attribute_value = StatTable[GetRace()][uStat].uBaseValue; | |
| 0 | 4248 switch (uStat) |
| 4249 { | |
| 4250 case 0: attribute_value = uMight; break; | |
| 4251 case 1: attribute_value = uIntelligence; break; | |
| 4252 case 2: attribute_value = uWillpower; break; | |
| 4253 case 3: attribute_value = uEndurance; break; | |
| 290 | 4254 case 4: attribute_value = uAccuracy; break; |
| 4255 case 5: attribute_value = uSpeed; break; | |
| 0 | 4256 case 6: attribute_value = uLuck; break; |
| 1783 | 4257 default: Error("Unexpected attribute"); |
| 0 | 4258 }; |
| 4259 | |
| 1393 | 4260 if (attribute_value == base_attribute_value) |
| 4261 return ui_character_stat_default_color; | |
| 4262 else if (attribute_value > base_attribute_value) | |
| 4263 return ui_character_stat_buffed_color; | |
| 0 | 4264 else |
| 1393 | 4265 return ui_character_stat_debuffed_color; |
| 0 | 4266 } |
| 4267 | |
| 4268 //----- (004908A8) -------------------------------------------------------- | |
| 4269 bool Player::DiscardConditionIfLastsLongerThan(unsigned int uCondition, unsigned __int64 uTime) | |
| 4270 { | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
4271 if ( pConditions[uCondition] && (uTime < (unsigned long long)pConditions[uCondition]) ) |
| 1014 | 4272 { |
| 1393 | 4273 pConditions[uCondition] = 0i64; |
| 1014 | 4274 return true; |
| 0 | 4275 } |
| 4276 else | |
| 1014 | 4277 return false; |
| 0 | 4278 } |
| 4279 | |
| 4280 //----- (004680ED) -------------------------------------------------------- | |
| 1019 | 4281 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
|
4282 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4283 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
|
4284 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
|
4285 int v8; // edx@39 |
| 1838 | 4286 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
|
4287 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
|
4288 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
|
4289 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
|
4290 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
|
4291 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
|
4292 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
|
4293 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
|
4294 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
|
4295 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
|
4296 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
|
4297 __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
|
4298 __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
|
4299 __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
|
4300 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
|
4301 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
|
4302 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
|
4303 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
|
4304 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
|
4305 signed int v73; // [sp+24h] [bp-8h]@1 |
| 1838 | 4306 const char* v74; // [sp+24h] [bp-8h]@23 |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4307 Player *thisb; // [sp+28h] [bp-4h]@1 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4308 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
|
4309 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4310 thisb = this; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4311 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
|
4312 v73 = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4313 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4314 return; |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4315 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
|
4316 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4317 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
|
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 playerAffected->SetCondition(Condition_Poison1, 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4320 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4321 else 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
|
4322 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4323 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
|
4324 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
|
4325 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
|
4326 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
|
4327 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
|
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 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
|
4330 { |
|
f5b13e6be493
Player::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 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
|
4332 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
|
4333 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4334 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
|
4335 { |
|
f5b13e6be493
Player::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 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
|
4337 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
|
4338 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
|
4339 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
|
4340 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
|
4341 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4342 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
|
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 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
|
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 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4347 } |
|
f5b13e6be493
Player::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 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
|
4349 { |
|
f5b13e6be493
Player::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 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
|
4351 { |
|
f5b13e6be493
Player::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 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
|
4353 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
|
4354 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
|
4355 } |
|
f5b13e6be493
Player::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 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
|
4357 { |
| 1684 | 4358 thisb->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4359 } |
|
f5b13e6be493
Player::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 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4361 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
|
4362 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
|
4363 } |
|
f5b13e6be493
Player::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 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4365 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
|
4366 { |
|
f5b13e6be493
Player::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 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
|
4368 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4369 case 221: //Catalyst |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4370 playerAffected->SetCondition(Condition_Poison1, 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4371 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
|
4372 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
|
4373 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
|
4374 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
|
4375 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
|
4376 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
|
4377 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
|
4378 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
|
4379 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
|
4380 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
|
4381 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
|
4382 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
|
4383 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
|
4384 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
|
4385 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
|
4386 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
|
4387 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4388 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4389 case 225: //Cure Disease |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4390 playerAffected->pConditions[Condition_Disease3] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4391 playerAffected->pConditions[Condition_Disease2] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4392 playerAffected->pConditions[Condition_Disease1] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4393 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4394 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4395 case 226: //Cure Poison |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4396 playerAffected->pConditions[Condition_Poison3] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4397 playerAffected->pConditions[Condition_Poison2] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4398 playerAffected->pConditions[Condition_Poison1] = 0i64; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
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 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
|
4402 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
|
4403 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
|
4404 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
|
4405 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
|
4406 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
|
4407 { |
| 1021 | 4408 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4409 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
|
4410 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
|
4411 } |
|
f5b13e6be493
Player::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 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
|
4414 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4415 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
|
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 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
|
4419 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4420 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
|
4421 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
|
4422 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
|
4423 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
|
4424 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
|
4425 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4426 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
|
4427 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
|
4428 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
|
4429 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
|
4430 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
|
4431 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4432 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
|
4433 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
|
4434 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
|
4435 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
|
4436 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4437 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
|
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 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
|
4441 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335), |
| 1822 | 4442 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
|
4443 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
|
4444 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
|
4445 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
|
4446 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
|
4447 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
|
4448 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
|
4449 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
|
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 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
|
4453 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
|
4454 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
|
4455 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
|
4456 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
|
4457 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
|
4458 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4459 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
|
4460 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4461 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4462 case 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
|
4463 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
|
4464 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4465 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
|
4466 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
|
4467 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
|
4468 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
|
4469 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
|
4470 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4471 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
|
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 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
|
4475 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
|
4476 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4477 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
|
4478 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4479 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4480 case 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
|
4481 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
|
4482 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4483 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
|
4484 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
|
4485 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
|
4486 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
|
4487 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
|
4488 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4489 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
|
4490 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
|
4491 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
|
4492 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
|
4493 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
|
4494 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
|
4495 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
|
4496 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
|
4497 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
|
4498 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
|
4499 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
|
4500 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
|
4501 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
|
4502 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
|
4503 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
|
4504 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4505 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4506 case 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
|
4507 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
|
4508 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
|
4509 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
|
4510 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
|
4511 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
|
4512 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
|
4513 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
|
4514 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
|
4515 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
|
4516 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
|
4517 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
|
4518 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
|
4519 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
|
4520 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
|
4521 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4522 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
|
4523 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
|
4524 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
|
4525 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
|
4526 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
|
4527 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4528 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
|
4529 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4530 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4531 case 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
|
4532 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
|
4533 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4534 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
|
4535 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
|
4536 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
|
4537 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
|
4538 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
|
4539 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4540 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
|
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 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
|
4544 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
|
4545 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4546 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
|
4547 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
|
4548 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
|
4549 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
|
4550 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
|
4551 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4552 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
|
4553 playerAffected->PlaySound(SPEECH_36, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4554 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4555 case 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
|
4556 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
|
4557 v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEnchantmentType) * 0.033333335); |
| 1822 | 4558 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
|
4559 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
|
4560 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
|
4561 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
|
4562 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
|
4563 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
|
4564 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
|
4565 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
|
4566 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
|
4567 { |
|
f5b13e6be493
Player::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 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
|
4569 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
|
4570 } |
|
f5b13e6be493
Player::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->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
|
4572 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
|
4573 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
|
4574 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
|
4575 { |
|
f5b13e6be493
Player::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 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
|
4577 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
|
4578 } |
|
f5b13e6be493
Player::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->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
|
4580 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
|
4581 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
|
4582 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
|
4583 { |
|
f5b13e6be493
Player::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 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
|
4585 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
|
4586 } |
|
f5b13e6be493
Player::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->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
|
4588 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
|
4589 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
|
4590 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
|
4591 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4592 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
|
4593 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
|
4594 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4595 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
|
4596 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
|
4597 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
|
4598 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
|
4599 { |
|
f5b13e6be493
Player::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->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
|
4601 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
|
4602 } |
|
f5b13e6be493
Player::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 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
|
4604 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
|
4605 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
|
4606 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
|
4607 { |
|
f5b13e6be493
Player::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 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
|
4609 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
|
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 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
|
4612 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
|
4613 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
|
4614 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
|
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 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
|
4617 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
|
4618 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4619 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
|
4620 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
|
4621 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
|
4622 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
|
4623 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
|
4624 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
|
4625 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4626 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
|
4627 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
|
4628 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
|
4629 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
|
4630 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
|
4631 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
|
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 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
|
4634 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
|
4635 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4636 // 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
|
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 // 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
|
4639 // 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
|
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 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4642 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4643 if ( 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
|
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 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
|
4646 { |
|
f5b13e6be493
Player::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 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
|
4648 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
|
4649 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
|
4650 } |
|
f5b13e6be493
Player::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 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
|
4652 { |
| 1684 | 4653 thisb->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4654 } |
|
f5b13e6be493
Player::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 } |
|
f5b13e6be493
Player::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 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
|
4657 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
|
4658 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4659 |
|
f5b13e6be493
Player::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 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4661 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
|
4662 { |
|
f5b13e6be493
Player::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 if ( pCurrentScreen == SCREEN_CASTING ) |
| 1032 | 4664 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
|
4665 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
|
4666 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4667 |
|
f5b13e6be493
Player::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 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
|
4669 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
|
4670 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
|
4671 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
|
4672 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
|
4673 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4674 if ( 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
|
4675 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4676 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
|
4677 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
|
4678 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
|
4679 } |
|
f5b13e6be493
Player::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 dword_50C9AC = 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
|
4681 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
|
4682 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
|
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 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
|
4685 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
|
4686 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
|
4687 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
|
4688 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
|
4689 _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
|
4690 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4691 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
|
4692 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4693 _720984_unused = 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
|
4694 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
|
4695 pMessageQueue_50C9E8->AddMessage(UIMSG_SpellScrollUse, scroll_id, player_num - 1); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4696 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
|
4697 && (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
|
4698 { |
|
f5b13e6be493
Player::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 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4700 } |
|
f5b13e6be493
Player::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 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
|
4703 } |
|
f5b13e6be493
Player::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 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4705 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
|
4706 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4707 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
|
4708 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
|
4709 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
|
4710 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4711 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
|
4712 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
|
4713 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4714 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4715 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
|
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 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
|
4718 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4719 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
|
4720 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[382], v66);//"That player is %s" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4721 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
|
4722 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4723 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
|
4724 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4725 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
|
4726 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
|
4727 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
|
4728 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
|
4729 { |
| 1032 | 4730 case 0: v67 = 4; break; |
| 4731 case 1: v67 = 7; break; | |
| 4732 case 2: v67 = 10; break; | |
| 4733 case 3: v67 = 11; break; | |
| 4734 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
|
4735 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
|
4736 } |
| 1032 | 4737 |
|
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
|
4738 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
|
4739 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4740 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
|
4741 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[381], v22); //"You don't have the skill to learn %s" |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4742 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
|
4743 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
|
4744 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
|
4745 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4746 // v72 = 1; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4747 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
|
4748 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
|
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 |
|
f5b13e6be493
Player::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 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
|
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 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
|
4754 { |
|
f5b13e6be493
Player::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 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
|
4756 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
|
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 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4759 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4760 // 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
|
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 // 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
|
4763 // { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4764 // 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
|
4765 // 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
|
4766 // 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
|
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 // 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
|
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 // } |
|
f5b13e6be493
Player::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 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
|
4774 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
|
4775 } |
|
f5b13e6be493
Player::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 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
4777 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
|
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 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
|
4780 { |
|
f5b13e6be493
Player::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 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
|
4782 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
|
4783 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
|
4784 } |
|
f5b13e6be493
Player::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 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
|
4786 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
|
4787 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
|
4788 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
|
4789 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
|
4790 } |
|
f5b13e6be493
Player::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 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
|
4792 { |
|
f5b13e6be493
Player::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 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
|
4794 { |
|
f5b13e6be493
Player::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 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
|
4796 if ( pParty->uCurrentMonth >= 7 ) |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4797 v74 = NULL; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4798 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
|
4799 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
|
4800 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
|
4801 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4802 case 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
|
4803 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
|
4804 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
|
4805 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4806 case 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
|
4807 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
|
4808 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
|
4809 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4810 case 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
|
4811 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
|
4812 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
|
4813 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4814 case 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
|
4815 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
|
4816 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
|
4817 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
|
4818 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
|
4819 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
|
4820 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
|
4821 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4822 case 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
|
4823 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
|
4824 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
|
4825 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4826 case 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
|
4827 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
|
4828 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
|
4829 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4830 case 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
|
4831 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
|
4832 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
|
4833 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4834 case 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
|
4835 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
|
4836 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
|
4837 break; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4838 case 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
|
4839 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
|
4840 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
|
4841 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
|
4842 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
|
4843 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
|
4844 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
|
4845 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
|
4846 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
|
4847 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
|
4848 switch (v8) |
| 1032 | 4849 { |
|
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 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
|
4851 playerAffected->sResFireBase += 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
|
4852 v13 = pGlobalTXT_LocalizationStrings[87]; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4853 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
|
4854 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
|
4855 playerAffected->sResAirBase += 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
|
4856 v13 = pGlobalTXT_LocalizationStrings[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
|
4857 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
|
4858 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
|
4859 playerAffected->sResWaterBase += 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
|
4860 v13 = pGlobalTXT_LocalizationStrings[240]; |
|
f5b13e6be493
Player::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 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
|
4862 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
|
4863 playerAffected->sResEarthBase += 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
|
4864 v13 = pGlobalTXT_LocalizationStrings[70]; |
|
f5b13e6be493
Player::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 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
|
4866 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
|
4867 playerAffected->sResMindBase += 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
|
4868 v13 = pGlobalTXT_LocalizationStrings[142]; |
|
f5b13e6be493
Player::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 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
|
4870 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
|
4871 playerAffected->sResBodyBase += 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
|
4872 v13 = pGlobalTXT_LocalizationStrings[29]; |
|
f5b13e6be493
Player::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 break; |
| 1783 | 4874 default: ("Unexpected attribute"); |
| 4875 return; | |
| 1021 | 4876 } |
|
1618
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4877 sprintf(pTmpBuf.data(), "+%u %s %s", thisa, v13, pGlobalTXT_LocalizationStrings[121]); |
|
f5b13e6be493
Player::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 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
|
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 } |
|
f5b13e6be493
Player::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 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
|
4882 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
|
4883 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
|
4884 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
|
4885 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
|
4886 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
|
4887 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4888 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
|
4889 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
|
4890 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4891 else if ( pParty->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
|
4892 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4893 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
|
4894 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
|
4895 } |
|
f5b13e6be493
Player::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 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
|
4897 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4898 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
|
4899 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
|
4900 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4901 return; |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4902 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4903 else 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
|
4904 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4905 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
|
4906 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
|
4907 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4908 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
|
4909 { |
|
f5b13e6be493
Player::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 pAudioPlayer->PlaySound(SOUND_PlayLute, 0, 0, -1, 0, 0, 0, 0); |
| 1032 | 4911 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
|
4912 } |
|
f5b13e6be493
Player::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 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
|
4914 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4915 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
|
4916 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
|
4917 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4918 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
|
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 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
|
4921 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
|
4922 } |
|
f5b13e6be493
Player::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 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
|
4924 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4925 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
|
4926 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
|
4927 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
|
4928 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
|
4929 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4930 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
|
4931 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4932 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
|
4933 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
|
4934 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4935 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
|
4936 { |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4937 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
|
4938 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
|
4939 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1032 | 4940 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); |
| 1021 | 4941 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
|
4942 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4943 |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4944 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
|
4945 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
|
4946 } |
|
f5b13e6be493
Player::UseItem_DrinkPotion_etc some minor edits(brace indentation, a few warnings), commented out 2 sections which never get used
Grumpy7
parents:
1617
diff
changeset
|
4947 } |
| 0 | 4948 |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4949 |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4950 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
|
4951 { |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4952 int v4; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4953 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
|
4954 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
|
4955 else |
| 1822 | 4956 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
|
4957 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
|
4958 } |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4959 |
| 0 | 4960 //----- (00449BB4) -------------------------------------------------------- |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4961 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 | 4962 { |
| 4963 Assert(pValue >= 0, "Compare variable shouldn't have negative arguments"); | |
| 4964 | |
| 0 | 4965 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
|
4966 unsigned __int8 test_bit_value; // eax@25 |
| 1731 | 4967 unsigned __int8 byteWithRequestedBit; // cl@25 |
| 0 | 4968 DDM_DLV_Header *v19; // eax@122 |
| 4969 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
|
4970 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
|
4971 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
|
4972 |
| 1783 | 4973 |
| 4974 if ( (signed int)VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_74 ) | |
| 4975 return (unsigned __int8)stru_5E4C90_MapPersistVars.field_0[VarNum - VAR_MapPersistentVariable_0] > 0; // originally (unsigned __int8)byte_5E4C15[VarNum]; | |
| 4976 if ( (signed int)VarNum >= VAR_MapPersistentVariable_75 && VarNum <= VAR_MapPersistentVariable_99 ) | |
| 4977 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 | |
| 4978 | |
| 4979 switch ( VarNum ) | |
| 4980 { | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
4981 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
|
4982 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
|
4983 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
|
4984 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
|
4985 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
|
4986 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
|
4987 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
|
4988 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
|
4989 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
|
4990 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
|
4991 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
|
4992 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
|
4993 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
|
4994 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
|
4995 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
|
4996 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
|
4997 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
|
4998 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
|
4999 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
|
5000 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
|
5001 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
|
5002 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
|
5003 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
|
5004 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
|
5005 case VAR_Award: |
| 1783 | 5006 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
|
5007 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
|
5008 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
|
5009 case VAR_QBits_QuestsDone: |
| 1783 | 5010 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
|
5011 case VAR_PlayerItemInHands: |
| 1919 | 5012 //for (int i = 0; i < 138; i++) |
| 5013 for (int i = 0; i < 126; i++) | |
| 0 | 5014 { |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5015 if (pInventoryItemList[i].uItemID == pValue) |
| 0 | 5016 { |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5017 return true; |
| 0 | 5018 } |
| 469 | 5019 } |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5020 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
|
5021 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
|
5022 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
|
5023 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5024 return false; |
|
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_DayOfYear: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5026 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
|
5027 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5028 return false; |
|
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_DayOfWeek: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5030 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
|
5031 return true; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5032 return false; |
|
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_FixedGold: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5034 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
|
5035 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
|
5036 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
|
5037 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
|
5038 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
|
5039 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
|
5040 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
|
5041 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
|
5042 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
|
5043 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
|
5044 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
|
5045 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
|
5046 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
|
5047 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
|
5048 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
|
5049 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
|
5050 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
|
5051 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
|
5052 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
|
5053 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
|
5054 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
|
5055 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
|
5056 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
|
5057 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
|
5058 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
|
5059 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
|
5060 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
|
5061 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
|
5062 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
|
5063 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
|
5064 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
|
5065 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
|
5066 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
|
5067 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
|
5068 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
|
5069 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
|
5070 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
|
5071 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
|
5072 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
|
5073 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
|
5074 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
|
5075 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
|
5076 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
|
5077 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
|
5078 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
|
5079 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
|
5080 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
|
5081 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
|
5082 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
|
5083 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
|
5084 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
|
5085 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
|
5086 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
|
5087 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
|
5088 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
|
5089 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
|
5090 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
|
5091 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
|
5092 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
|
5093 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
|
5094 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
|
5095 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
|
5096 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
|
5097 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
|
5098 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
|
5099 return false; |
|
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_MagicResistance: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5101 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
|
5102 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
|
5103 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
|
5104 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
|
5105 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
|
5106 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
|
5107 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
|
5108 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
|
5109 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
|
5110 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
|
5111 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
|
5112 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
|
5113 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
|
5114 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
|
5115 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
|
5116 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
|
5117 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
|
5118 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
|
5119 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
|
5120 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
|
5121 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
|
5122 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
|
5123 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
|
5124 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
|
5125 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
|
5126 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
|
5127 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
|
5128 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
|
5129 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
|
5130 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
|
5131 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
|
5132 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
|
5133 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
|
5134 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
|
5135 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
|
5136 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
|
5137 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
|
5138 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
|
5139 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
|
5140 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
|
5141 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
|
5142 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
|
5143 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
|
5144 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
|
5145 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
|
5146 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
|
5147 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
|
5148 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
|
5149 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
|
5150 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
|
5151 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
|
5152 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
|
5153 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
|
5154 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
|
5155 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
|
5156 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
|
5157 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
|
5158 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
|
5159 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
|
5160 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
|
5161 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
|
5162 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
|
5163 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
|
5164 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
|
5165 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
|
5166 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
|
5167 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
|
5168 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
|
5169 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
|
5170 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
|
5171 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
|
5172 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
|
5173 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
|
5174 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
|
5175 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
|
5176 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
|
5177 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
|
5178 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
|
5179 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
|
5180 return false; |
|
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_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
|
5182 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
|
5183 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
|
5184 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
|
5185 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
|
5186 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
|
5187 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
|
5188 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
|
5189 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
|
5190 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
|
5191 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
|
5192 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
|
5193 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
|
5194 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
|
5195 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
|
5196 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
|
5197 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
|
5198 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
|
5199 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
|
5200 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
|
5201 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
|
5202 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
|
5203 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
|
5204 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
|
5205 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
|
5206 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
|
5207 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
|
5208 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
|
5209 case VAR_PoisonedGreen: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5210 return pConditions[Condition_Poison1] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5211 case VAR_DiseasedGreen: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5212 return pConditions[Condition_Disease1] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5213 case VAR_PoisonedYellow: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5214 return pConditions[Condition_Poison2] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5215 case VAR_DiseasedYellow: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5216 return pConditions[Condition_Disease2] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5217 case VAR_PoisonedRed: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5218 return pConditions[Condition_Poison3] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5219 case VAR_DiseasedRed: |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5220 return pConditions[Condition_Disease3] > 0; |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5221 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
|
5222 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
|
5223 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
|
5224 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
|
5225 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
|
5226 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
|
5227 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
|
5228 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
|
5229 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
|
5230 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
|
5231 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
|
5232 v4 = GetMajorConditionIdx(); |
|
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5233 if ( v4 != 18 ) |
| 0 | 5234 { |
| 469 | 5235 return v4 >= pValue; |
| 5236 } | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5237 return true; |
| 1783 | 5238 case VAR_AutoNotes : //TODO: find out why the double subtraction. or whether this is even used |
| 5239 test_bit_value = 0x80u >> (pValue - 2) % 8; | |
| 5240 byteWithRequestedBit = pParty->_autonote_bits[(pValue - 2) /8]; | |
| 5241 return (test_bit_value & byteWithRequestedBit) != 0; | |
| 5242 case VAR_IsMightMoreThanBase: | |
| 5243 actStat = GetActualMight(); | |
| 5244 baseStat = GetBaseStrength(); | |
| 5245 return (actStat >= baseStat); | |
| 5246 case VAR_IsIntellectMoreThanBase: | |
| 5247 actStat = GetActualIntelligence(); | |
| 5248 baseStat = GetBaseIntelligence(); | |
| 5249 return (actStat >= baseStat); | |
| 5250 case VAR_IsPersonalityMoreThanBase: | |
| 5251 actStat = GetActualWillpower(); | |
| 5252 baseStat = GetBaseWillpower(); | |
| 5253 return (actStat >= baseStat); | |
| 5254 case VAR_IsEnduranceMoreThanBase: | |
| 5255 actStat = GetActualEndurance(); | |
| 5256 baseStat = GetBaseEndurance(); | |
| 5257 return (actStat >= baseStat); | |
| 5258 case VAR_IsSpeedMoreThanBase: | |
| 5259 actStat = GetActualSpeed(); | |
| 5260 baseStat = GetBaseSpeed(); | |
| 5261 return (actStat >= baseStat); | |
| 5262 case VAR_IsAccuracyMoreThanBase: | |
| 5263 actStat = GetActualAccuracy(); | |
| 5264 baseStat = GetBaseAccuracy(); | |
| 5265 return (actStat >= baseStat); | |
| 5266 case VAR_IsLuckMoreThanBase: | |
| 5267 actStat = GetActualLuck(); | |
| 5268 baseStat = GetBaseLuck(); | |
| 5269 return (actStat >= baseStat); | |
| 5270 case VAR_PlayerBits: | |
| 5271 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8; | |
| 1822 | 5272 byteWithRequestedBit = this->playerEventBits[((signed __int16)pValue - 1)/8]; |
| 1783 | 5273 return ( test_bit_value & byteWithRequestedBit ) != 0; |
| 5274 case VAR_NPCs2: | |
| 5275 return pNPCStats->pNewNPCData[pValue].Hired(); | |
| 5276 case VAR_IsFlying: | |
| 5277 if ( pParty->bFlying | |
| 5278 && (pParty->pPartyBuffs[PARTY_BUFF_FLY].uExpireTime> 0) ) | |
| 5279 return true; | |
| 5280 return false; | |
| 5281 case VAR_HiredNPCHasSpeciality: | |
| 5282 return CheckHiredNPCSpeciality(pValue); | |
| 5283 case VAR_CircusPrises: //isn't used in MM6 since 0x1D6u is a book of regeneration | |
| 5284 v4 = 0; | |
| 5285 for (int playerNum = 0; playerNum < 4; playerNum++) | |
| 5286 { | |
| 5287 for (int invPos = 0; invPos < 138; invPos++) | |
| 5288 { | |
| 5289 int itemId = pParty->pPlayers[playerNum].pInventoryItemList[invPos].uItemID; | |
| 5290 switch ( itemId ) | |
| 5291 { | |
| 5292 case 0x1D6u: | |
| 5293 ++v4; | |
| 5294 break; | |
| 5295 case 0x1D7u: | |
| 5296 v4 += 3; | |
| 5297 break; | |
| 5298 case 0x1DDu: | |
| 5299 v4 += 5; | |
| 5300 break; | |
| 5301 } | |
| 5302 } | |
| 5303 } | |
| 5304 return v4 >= pValue; | |
| 5305 case VAR_NumSkillPoints: | |
| 5306 return this->uSkillPoints >= (unsigned int)pValue; | |
| 5307 case VAR_MonthIs: | |
| 5308 return (pParty->uCurrentMonth == (unsigned int)pValue); | |
| 5309 case VAR_Counter1: | |
| 5310 case VAR_Counter2: | |
| 5311 case VAR_Counter3: | |
| 5312 case VAR_Counter4: | |
| 5313 case VAR_Counter5: | |
| 5314 case VAR_Counter6: | |
| 5315 case VAR_Counter7: | |
| 5316 case VAR_Counter8: | |
| 5317 case VAR_Counter9: | |
| 5318 case VAR_Counter10: | |
| 5319 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]) | |
| 5320 { | |
| 5321 return (pParty->PartyTimes.CounterEventValues[VarNum - VAR_Counter1] + 460800 * pValue * 0.033333335) <= pParty->uTimePlayed ; | |
| 5322 } | |
| 5323 case VAR_ReputationInCurrentLocation: | |
| 5324 v19 = &pOutdoor->ddm; | |
| 5325 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5326 v19 = &pIndoor->dlv; | |
| 5327 return (v19->uReputation >= pValue); | |
| 5328 case VAR_Unknown1: | |
| 5329 v21 = &pOutdoor->ddm; | |
| 5330 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 5331 v21 = &pIndoor->dlv; | |
| 5332 return (v21->field_C_alert == pValue); //yes, equality, not >= | |
| 5333 case VAR_GoldInBank: | |
| 5334 return pParty->uNumGoldInBank >= (unsigned int)pValue; | |
| 5335 case VAR_NumDeaths: | |
| 5336 return pParty->uNumDeaths >= (unsigned int)pValue; | |
| 5337 case VAR_NumBounties: | |
| 5338 return pParty->uNumBountiesCollected >= (unsigned int)pValue; | |
| 5339 case VAR_PrisonTerms: | |
| 5340 return pParty->uNumPrisonTerms >= pValue; | |
| 5341 case VAR_ArenaWinsPage: | |
| 5342 return (unsigned __int8)pParty->uNumArenaPageWins >= pValue; | |
| 5343 case VAR_ArenaWinsSquire: | |
| 5344 return (unsigned __int8)pParty->uNumArenaSquireWins >= pValue; | |
| 5345 case VAR_ArenaWinsKnight: | |
| 5346 return (unsigned __int8)pParty->uNumArenaKnightWins >= pValue; | |
| 5347 case VAR_ArenaWinsLord: | |
| 5348 return pParty->uNumArenaLordWins >= pValue; | |
| 5349 case VAR_Invisible: | |
| 5350 return ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime > 0 ); | |
| 5351 case VAR_ItemEquipped: | |
| 5352 for (int i = 0; i < 16; i++) | |
| 5353 { | |
| 5354 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) && GetNthEquippedIndexItem(i)->uItemID == pValue ) | |
| 5355 { | |
| 5356 return true; | |
| 5357 } | |
| 5358 } | |
| 5359 return false; | |
| 5360 } | |
| 5361 | |
|
1736
c6fe09a06712
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
Grumpy7
parents:
1731
diff
changeset
|
5362 return false; |
| 0 | 5363 } |
| 5364 | |
| 5365 | |
| 5366 //----- (0044A5CB) -------------------------------------------------------- | |
| 492 | 5367 void Player::SetVariable(enum VariableType var_type, signed int var_value) |
| 5368 { | |
| 0 | 5369 unsigned int v6; // esi@13 |
| 5370 unsigned int v7; // esi@14 | |
| 5371 signed int v11; // eax@30 | |
| 5372 DDM_DLV_Header *v24; // ecx@148 | |
| 5373 ItemGen item; // [sp+Ch] [bp-28h]@52 | |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5374 |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5375 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5376 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
|
5377 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5378 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
|
5379 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5380 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
|
5381 if (pStorylineText->StoreLine[var_type - VAR_History_0].pText) |
| 492 | 5382 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5383 bFlashHistoryBook = 1; |
| 1822 | 5384 PlayAwardSound(); |
| 0 | 5385 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5386 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5387 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5388 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5389 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5390 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
|
5391 { |
| 1822 | 5392 if ( var_type >= VAR_MapPersistentVariable_0 && var_type <= VAR_MapPersistentVariable_74 ) |
| 5393 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] = (char)var_value; // originally (unsigned __int8)byte_5E4C15[VarNum]; | |
| 5394 if ( var_type >= VAR_MapPersistentVariable_75 && var_type <= VAR_MapPersistentVariable_99 ) | |
| 5395 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
|
5396 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5397 } |
|
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 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
|
5400 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5401 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 | 5402 PlayAwardSound(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5403 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5404 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5405 |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5406 switch ( var_type ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5407 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5408 case VAR_Sex: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5409 this->uSex = (PLAYER_SEX)var_value; |
| 1822 | 5410 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5411 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5412 case VAR_Class: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5413 this->classType = (PLAYER_CLASS_TYPE)var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5414 if ( (PLAYER_CLASS_TYPE)var_value == PLAYER_CLASS_LICH ) |
| 492 | 5415 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5416 for (int i = 0; i < 138; i++) |
| 0 | 5417 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5418 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
|
5419 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5420 this->pOwnItems[i].uItemID = ITEM_LICH_JAR_FULL; |
| 1822 | 5421 this->pOwnItems[i].uHolderPlayer = GetPlayerIndex() + 1; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5422 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5423 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5424 if ( this->sResFireBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5425 this->sResFireBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5426 if ( this->sResAirBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5427 this->sResAirBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5428 if ( this->sResWaterBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5429 this->sResWaterBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5430 if ( this->sResEarthBase < 20 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5431 this->sResEarthBase = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5432 this->sResMindBase = 200; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5433 this->sResBodyBase = 200; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5434 v11 = this->GetSexByVoice(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5435 this->uPrevVoiceID = this->uVoiceID; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5436 this->uPrevFace = this->uCurrentFace; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5437 if ( v11 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5438 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5439 this->uCurrentFace = 21; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5440 this->uVoiceID = 21; |
| 0 | 5441 } |
| 5442 else | |
| 5443 { | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5444 this->uCurrentFace = 20; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5445 this->uVoiceID = 20; |
| 0 | 5446 } |
| 1822 | 5447 ReloadPlayerPortraits(GetPlayerIndex(), this->uCurrentFace); |
| 0 | 5448 } |
| 1822 | 5449 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5450 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5451 case VAR_CurrentHP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5452 this->sHealth = var_value; |
| 1822 | 5453 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5454 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5455 case VAR_MaxHP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5456 this->sHealth = GetMaxHealth(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5457 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5458 case VAR_CurrentSP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5459 this->sMana = var_value; |
| 1822 | 5460 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5461 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5462 case VAR_MaxSP: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5463 this->sMana = GetMaxMana(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5464 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5465 case VAR_ACModifier: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5466 this->sACModifier = (unsigned __int8)var_value; |
| 1822 | 5467 PlayAwardSound_Anim(); |
| 0 | 5468 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5469 case VAR_BaseLevel: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5470 this->uLevel = (unsigned __int8)var_value; |
| 1822 | 5471 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5472 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5473 case VAR_LevelModifier: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5474 this->sLevelModifier = (unsigned __int8)var_value; |
| 1822 | 5475 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5476 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5477 case VAR_Age: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5478 this->sAgeModifier = var_value; |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5479 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5480 case VAR_Award: |
| 1783 | 5481 if ( !_449B57_test_bit(this->_achieved_awards_bits, var_value) && pAwards[var_value].pText ) |
| 492 | 5482 { |
| 1822 | 5483 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5484 this->PlaySound(SPEECH_96, 0); |
| 0 | 5485 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5486 _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
|
5487 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5488 case VAR_Experience: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5489 this->uExperience = var_value; |
| 1822 | 5490 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5491 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5492 case VAR_QBits_QuestsDone: |
| 1783 | 5493 if ( !_449B57_test_bit(pParty->_quest_bits, var_value) && pQuestTable[var_value-1] ) |
| 0 | 5494 { |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5495 bFlashQuestBook = 1; |
| 1822 | 5496 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, GetPlayerIndex()); |
| 5497 PlayAwardSound(); | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5498 this->PlaySound(SPEECH_93, 0); |
| 0 | 5499 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5500 _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
|
5501 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5502 case VAR_PlayerItemInHands: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5503 item.Reset(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5504 item.uItemID = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5505 item.uAttributes = 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5506 pParty->SetHoldingItem(&item); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5507 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
|
5508 pParty->pIsArtifactFound[var_value-500] = 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5509 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5510 case VAR_FixedGold: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5511 Party::SetGold(var_value); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5512 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5513 case VAR_RandomGold: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5514 v6 = rand() % var_value + 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5515 Party::SetGold(v6); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5516 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
|
5517 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5518 GameUI_DrawFoodAndGold(); |
|
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_FixedFood: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5521 Party::SetFood(var_value); |
| 1822 | 5522 PlayAwardSound_Anim(); |
|
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_RandomFood: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5525 v7 = rand() % var_value + 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5526 Party::SetFood(v7); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5527 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
|
5528 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5529 GameUI_DrawFoodAndGold(); |
| 1822 | 5530 PlayAwardSound_Anim(); |
|
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_BaseMight: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5533 this->uMight = (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_BaseIntellect: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5537 this->uIntelligence = (unsigned __int8)var_value; |
| 1822 | 5538 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5539 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5540 case VAR_BasePersonality: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5541 this->uWillpower = (unsigned __int8)var_value; |
| 1822 | 5542 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5543 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5544 case VAR_BaseEndurance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5545 this->uEndurance = (unsigned __int8)var_value; |
| 1822 | 5546 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5547 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5548 case VAR_BaseSpeed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5549 this->uSpeed = (unsigned __int8)var_value; |
| 1822 | 5550 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5551 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5552 case VAR_BaseAccuracy: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5553 this->uAccuracy = (unsigned __int8)var_value; |
| 1822 | 5554 PlayAwardSound_Anim_Face(SPEECH_92); |
|
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_BaseLuck: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5557 this->uLuck = (unsigned __int8)var_value; |
| 1822 | 5558 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5559 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5560 case VAR_MightBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5561 case VAR_ActualMight: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5562 this->uMightBonus = (unsigned __int8)var_value; |
| 1822 | 5563 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5564 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5565 case VAR_IntellectBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5566 case VAR_ActualIntellect: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5567 this->uIntelligenceBonus = (unsigned __int8)var_value; |
| 1822 | 5568 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5569 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5570 case VAR_PersonalityBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5571 case VAR_ActualPersonality: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5572 this->uWillpowerBonus = (unsigned __int8)var_value; |
| 1822 | 5573 PlayAwardSound_Anim_Face(SPEECH_91); |
|
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_EnduranceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5576 case VAR_ActualEndurance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5577 this->uEnduranceBonus = (unsigned __int8)var_value; |
| 1822 | 5578 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5579 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5580 case VAR_SpeedBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5581 case VAR_ActualSpeed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5582 this->uSpeedBonus = (unsigned __int8)var_value; |
| 1822 | 5583 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5584 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5585 case VAR_AccuracyBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5586 case VAR_ActualAccuracy: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5587 this->uAccuracyBonus = (unsigned __int8)var_value; |
| 1822 | 5588 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5589 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5590 case VAR_LuckBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5591 case VAR_ActualLuck: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5592 this->uLuckBonus = (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_FireResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5596 this->sResFireBase = (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_AirResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5600 this->sResAirBase = (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_WaterResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5604 this->sResWaterBase = (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_EarthResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5608 this->sResEarthBase = (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_SpiritResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5612 this->sResSpiritBase = (unsigned __int8)var_value; |
| 1822 | 5613 PlayAwardSound_Anim_Face(SPEECH_92); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5614 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5615 case VAR_MindResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5616 this->sResMindBase = (unsigned __int8)var_value; |
| 1822 | 5617 PlayAwardSound_Anim_Face(SPEECH_92); |
|
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_BodyResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5620 this->sResBodyBase = (unsigned __int8)var_value; |
| 1822 | 5621 PlayAwardSound_Anim_Face(SPEECH_92); |
|
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_LightResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5624 this->sResLightBase = (unsigned __int8)var_value; |
| 1822 | 5625 PlayAwardSound_Anim_Face(SPEECH_92); |
|
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_DarkResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5628 this->sResDarkBase = (unsigned __int8)var_value; |
| 1822 | 5629 PlayAwardSound_Anim_Face(SPEECH_92); |
|
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_MagicResistance: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5632 this->sResMagicBase = (unsigned __int8)var_value; |
| 1822 | 5633 PlayAwardSound_Anim_Face(SPEECH_92); |
|
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_FireResistanceBonus: |
|
1766
110727780974
Player::SetVariable restarting function refatcoring
Grumpy7
parents:
1760
diff
changeset
|
5636 this->sResFireBonus = (unsigned __int8)var_value; |
| 1822 | 5637 PlayAwardSound_Anim_Face(SPEECH_91); |
| 0 | 5638 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5639 case VAR_AirResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5640 this->sResAirBonus = (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_WaterResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5644 this->sResWaterBonus = (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_EarthResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5648 this->sResEarthBonus = (unsigned __int8)var_value; |
| 1822 | 5649 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5650 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5651 case VAR_SpiritResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5652 this->sResSpiritBonus = (unsigned __int8)var_value; |
| 1822 | 5653 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5654 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5655 case VAR_MindResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5656 this->sResMindBonus = (unsigned __int8)var_value; |
| 1822 | 5657 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5658 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5659 case VAR_BodyResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5660 this->sResBodyBonus = (unsigned __int8)var_value; |
| 1822 | 5661 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5662 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5663 case VAR_LightResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5664 this->sResLightBonus = (unsigned __int8)var_value; |
| 1822 | 5665 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5666 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5667 case VAR_DarkResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5668 this->sResDarkBonus = (unsigned __int8)var_value; |
| 1822 | 5669 PlayAwardSound_Anim_Face(SPEECH_91); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5670 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5671 case VAR_PhysicalResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5672 Error("Physical res. bonus not used"); |
|
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_MagicResistanceBonus: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5675 this->sResMagicBonus = (unsigned __int8)var_value; |
| 1822 | 5676 PlayAwardSound_Anim_Face(SPEECH_91); |
|
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_Cursed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5679 this->SetCondition(Condition_Cursed, 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_Weak: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5683 this->SetCondition(Condition_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_Asleep: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5687 this->SetCondition(Condition_Sleep, 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_Afraid: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5691 this->SetCondition(Condition_Fear, 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_Drunk: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5695 this->SetCondition(Condition_Drunk, 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_Insane: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5699 this->SetCondition(Condition_Insane, 1); |
| 1822 | 5700 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5701 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5702 case VAR_PoisonedGreen: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5703 this->SetCondition(Condition_Poison1, 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_DiseasedGreen: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5707 this->SetCondition(Condition_Disease1, 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_PoisonedYellow: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5711 this->SetCondition(Condition_Poison2, 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_DiseasedYellow: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5715 this->SetCondition(Condition_Disease2, 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_PoisonedRed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5719 this->SetCondition(Condition_Poison3, 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_DiseasedRed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5723 this->SetCondition(Condition_Disease3, 1); |
| 1822 | 5724 PlayAwardSound_Anim(); |
| 1770 | 5725 return; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5726 case VAR_Paralyzed: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5727 this->SetCondition(Condition_Paralyzed, 1); |
| 1822 | 5728 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5729 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5730 case VAR_Unconsious: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5731 this->SetCondition(Condition_Unconcious, 1); |
| 1822 | 5732 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5733 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5734 case VAR_Dead: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5735 this->SetCondition(Condition_Dead, 1); |
| 1822 | 5736 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5737 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5738 case VAR_Stoned: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5739 this->SetCondition(Condition_Pertified, 1); |
| 1822 | 5740 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5741 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5742 case VAR_Eradicated: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5743 this->SetCondition(Condition_Eradicated, 1); |
| 1822 | 5744 PlayAwardSound_Anim(); |
|
1780
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_MajorCondition: |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
5747 pConditions.fill(0); |
| 1822 | 5748 PlayAwardSound_Anim(); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5749 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5750 case VAR_AutoNotes: |
| 1783 | 5751 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
|
5752 { |
| 1822 | 5753 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, GetPlayerIndex()); |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5754 this->PlaySound(SPEECH_96, 0); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5755 bFlashAutonotesBook = 1; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5756 _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
|
5757 } |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5758 _449B7E_toggle_bit(pParty->_autonote_bits, var_value, 1u); |
| 1822 | 5759 PlayAwardSound(); |
|
1780
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_PlayerBits: |
| 1822 | 5762 _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
|
5763 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5764 case VAR_NPCs2: |
|
1793
4dee76d79c78
dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents:
1792
diff
changeset
|
5765 pParty->hirelingScrollPosition = 0; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5766 LOBYTE(pNPCStats->pNewNPCData[var_value].uFlags) |= 0x80u; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5767 pParty->CountHirelings(); |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5768 viewparams->bRedrawGameUI = true; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5769 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5770 case VAR_NumSkillPoints: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5771 this->uSkillPoints = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5772 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5773 case VAR_Counter1: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5774 case VAR_Counter2: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5775 case VAR_Counter3: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5776 case VAR_Counter4: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5777 case VAR_Counter5: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5778 case VAR_Counter6: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5779 case VAR_Counter7: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5780 case VAR_Counter8: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5781 case VAR_Counter9: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5782 case VAR_Counter10: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5783 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
|
5784 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5785 case VAR_ReputationInCurrentLocation: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5786 v24 = &pOutdoor->ddm; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5787 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5788 v24 = &pIndoor->dlv; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5789 v24->uReputation = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5790 if ( var_value > 10000 ) |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5791 v24->uReputation = 10000; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5792 return; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5793 case VAR_GoldInBank: |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5794 pParty->uNumGoldInBank = var_value; |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5795 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5796 case VAR_NumDeaths: |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5797 pParty->uNumDeaths = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5798 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5799 case VAR_NumBounties: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5800 pParty->uNumBountiesCollected = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5801 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5802 case VAR_PrisonTerms: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5803 pParty->uNumPrisonTerms = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5804 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5805 case VAR_ArenaWinsPage: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5806 pParty->uNumArenaPageWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5807 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5808 case VAR_ArenaWinsSquire: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5809 pParty->uNumArenaSquireWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5810 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5811 case VAR_ArenaWinsKnight: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5812 pParty->uNumArenaKnightWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5813 return; |
|
1259
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5814 case VAR_ArenaWinsLord: |
|
d6e5b6b76612
Player::SetVariable cleanup - removing unused variables and function calls with them, some case shuffling
Grumpy7
parents:
1258
diff
changeset
|
5815 pParty->uNumArenaLordWins = var_value; |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5816 return; |
| 1782 | 5817 case VAR_StaffSkill: |
| 1822 | 5818 SetSkillByEvent(&Player::skillStaff, var_value); |
| 1782 | 5819 return; |
| 5820 case VAR_SwordSkill: | |
| 1822 | 5821 SetSkillByEvent(&Player::skillSword, var_value); |
| 1782 | 5822 return; |
| 5823 case VAR_DaggerSkill: | |
| 1822 | 5824 SetSkillByEvent(&Player::skillDagger, var_value); |
| 1782 | 5825 return; |
| 5826 case VAR_AxeSkill: | |
| 1822 | 5827 SetSkillByEvent(&Player::skillAxe, var_value); |
| 1782 | 5828 return; |
| 5829 case VAR_SpearSkill: | |
| 1822 | 5830 SetSkillByEvent(&Player::skillSpear, var_value); |
| 1782 | 5831 return; |
| 5832 case VAR_BowSkill: | |
| 1822 | 5833 SetSkillByEvent(&Player::skillBow, var_value); |
| 1782 | 5834 return; |
| 5835 case VAR_MaceSkill: | |
| 1822 | 5836 SetSkillByEvent(&Player::skillMace, var_value); |
| 1782 | 5837 return; |
| 5838 case VAR_BlasterSkill: | |
| 1822 | 5839 SetSkillByEvent(&Player::skillBlaster, var_value); |
| 1782 | 5840 return; |
| 5841 case VAR_ShieldSkill: | |
| 1822 | 5842 SetSkillByEvent(&Player::skillShield, var_value); |
| 1782 | 5843 return; |
| 5844 case VAR_LeatherSkill: | |
| 1822 | 5845 SetSkillByEvent(&Player::skillLeather, var_value); |
| 1782 | 5846 return; |
| 5847 case VAR_SkillChain: | |
| 1822 | 5848 SetSkillByEvent(&Player::skillChain, var_value); |
| 1782 | 5849 return; |
| 5850 case VAR_PlateSkill: | |
| 1822 | 5851 SetSkillByEvent(&Player::skillPlate, var_value); |
| 1782 | 5852 return; |
| 5853 case VAR_FireSkill: | |
| 1822 | 5854 SetSkillByEvent(&Player::skillFire, var_value); |
| 1782 | 5855 return; |
| 5856 case VAR_AirSkill: | |
| 1822 | 5857 SetSkillByEvent(&Player::skillAir, var_value); |
| 1782 | 5858 return; |
| 5859 case VAR_WaterSkill: | |
| 1822 | 5860 SetSkillByEvent(&Player::skillWater, var_value); |
| 1782 | 5861 return; |
| 5862 case VAR_EarthSkill: | |
| 1822 | 5863 SetSkillByEvent(&Player::skillEarth, var_value); |
| 1782 | 5864 return; |
| 5865 case VAR_SpiritSkill: | |
| 1822 | 5866 SetSkillByEvent(&Player::skillSpirit, var_value); |
| 1782 | 5867 return; |
| 5868 case VAR_MindSkill: | |
| 1822 | 5869 SetSkillByEvent(&Player::skillMind, var_value); |
| 1782 | 5870 return; |
| 5871 case VAR_BodySkill: | |
| 1822 | 5872 SetSkillByEvent(&Player::skillBody, var_value); |
| 1782 | 5873 return; |
| 5874 case VAR_LightSkill: | |
| 1822 | 5875 SetSkillByEvent(&Player::skillLight, var_value); |
| 1782 | 5876 return; |
| 5877 case VAR_DarkSkill: | |
| 1822 | 5878 SetSkillByEvent(&Player::skillDark, var_value); |
| 1782 | 5879 return; |
| 5880 case VAR_IdentifyItemSkill: | |
| 1822 | 5881 SetSkillByEvent(&Player::skillItemId, var_value); |
| 1782 | 5882 return; |
| 5883 case VAR_MerchantSkill: | |
| 1822 | 5884 SetSkillByEvent(&Player::skillMerchant, var_value); |
| 1782 | 5885 return; |
| 5886 case VAR_RepairSkill: | |
| 1822 | 5887 SetSkillByEvent(&Player::skillRepair, var_value); |
| 1782 | 5888 return; |
| 5889 case VAR_BodybuildingSkill: | |
| 1822 | 5890 SetSkillByEvent(&Player::skillBodybuilding, var_value); |
| 1782 | 5891 return; |
| 5892 case VAR_MeditationSkill: | |
| 1822 | 5893 SetSkillByEvent(&Player::skillMeditation, var_value); |
| 1782 | 5894 return; |
| 5895 case VAR_PerceptionSkill: | |
| 1822 | 5896 SetSkillByEvent(&Player::skillPerception, var_value); |
| 1782 | 5897 return; |
| 5898 case VAR_DiplomacySkill: | |
| 1822 | 5899 SetSkillByEvent(&Player::skillDiplomacy, var_value); |
| 1782 | 5900 return; |
| 5901 case VAR_ThieverySkill: | |
| 5902 Error ("Thieving unsupported"); | |
| 5903 return; | |
| 5904 case VAR_DisarmTrapSkill: | |
| 1822 | 5905 SetSkillByEvent(&Player::skillDisarmTrap, var_value); |
| 1782 | 5906 return; |
| 5907 case VAR_DodgeSkill: | |
| 1822 | 5908 SetSkillByEvent(&Player::skillDodge, var_value); |
| 1782 | 5909 return; |
| 5910 case VAR_UnarmedSkill: | |
| 1822 | 5911 SetSkillByEvent(&Player::skillUnarmed, var_value); |
| 1782 | 5912 return; |
| 5913 case VAR_IdentifyMonsterSkill: | |
| 1822 | 5914 SetSkillByEvent(&Player::skillMonsterId, var_value); |
| 1782 | 5915 return; |
| 5916 case VAR_ArmsmasterSkill: | |
| 1822 | 5917 SetSkillByEvent(&Player::skillArmsmaster, var_value); |
| 1782 | 5918 return; |
| 5919 case VAR_StealingSkill: | |
| 1822 | 5920 SetSkillByEvent(&Player::skillStealing, var_value); |
| 1782 | 5921 return; |
| 5922 case VAR_AlchemySkill: | |
| 1822 | 5923 SetSkillByEvent(&Player::skillAlchemy, var_value); |
| 1782 | 5924 return; |
| 5925 case VAR_LearningSkill: | |
| 1822 | 5926 SetSkillByEvent(&Player::skillLearning, var_value); |
| 1782 | 5927 return; |
| 5928 } | |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5929 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5930 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5931 |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5932 //----- (new function) -------------------------------------------------------- |
| 1822 | 5933 void Player::PlayAwardSound() |
| 5934 { | |
| 5935 int playerIndex = GetPlayerIndex(); | |
| 5936 signed int v25 = 8 * playerIndex + 400; | |
| 5937 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
|
5938 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
|
5939 } |
|
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5940 |
| 1782 | 5941 //----- (new function) -------------------------------------------------------- |
| 1822 | 5942 void Player::PlayAwardSound_Anim() |
| 5943 { | |
| 5944 int playerIndex = GetPlayerIndex(); | |
| 5945 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, playerIndex); | |
| 5946 PlayAwardSound(); | |
| 1782 | 5947 } |
| 5948 | |
| 5949 //----- (new function) -------------------------------------------------------- | |
| 1822 | 5950 void Player::PlayAwardSound_Anim_Face( PlayerSpeech speech ) |
| 1782 | 5951 { |
| 5952 this->PlaySound(speech, 0); | |
| 1822 | 5953 PlayAwardSound_Anim(); |
| 1782 | 5954 } |
| 5955 | |
| 5956 //----- (new function) -------------------------------------------------------- | |
| 1822 | 5957 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
|
5958 { |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5959 unsigned __int16 currSkillValue = this->*skillToSet; |
| 1822 | 5960 if ( skillValue > 63 ) //the original had the condition reversed which was probably wrong |
| 5961 { | |
| 5962 this->*skillToSet = skillValue | currSkillValue & 63; | |
|
1780
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5963 } |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5964 else |
|
01b3c314e9be
Player::SetVariable moved most of the conditions into a switch
Grumpy7
parents:
1779
diff
changeset
|
5965 { |
| 1822 | 5966 this->*skillToSet = skillValue | currSkillValue & 0xC0; |
| 5967 } | |
| 5968 int playerIndex = GetPlayerIndex(); | |
| 5969 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, playerIndex); | |
| 5970 PlayAwardSound(); | |
|
1258
eb1a22f7dfef
Player::SetVariable cleanup - removed some labels at the cost of 2 extra small functions
Grumpy7
parents:
1251
diff
changeset
|
5971 } |
| 0 | 5972 |
| 5973 //----- (0044AFFB) -------------------------------------------------------- | |
| 310 | 5974 void Player::AddVariable(enum VariableType var_type, signed int val) |
| 0 | 5975 { |
| 5976 int v6; // eax@15 | |
| 5977 unsigned int v7; // esi@18 | |
| 5978 DDM_DLV_Header *v27; // eax@153 | |
| 5979 ItemGen item; // [sp+Ch] [bp-2Ch]@45 | |
| 310 | 5980 |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5981 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
|
5982 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5983 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
|
5984 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5985 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5986 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5987 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
|
5988 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5989 pParty->PartyTimes._s_times[var_type - VAR_UnknownTimeEvent0] = pParty->uTimePlayed; |
| 1822 | 5990 PlayAwardSound(); |
| 1788 | 5991 return; |
| 0 | 5992 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5993 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
5994 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
|
5995 { |
| 1822 | 5996 |
| 5997 if ( var_type >= VAR_MapPersistentVariable_0 && var_type <= VAR_MapPersistentVariable_74 ) | |
| 5998 { | |
| 5999 if (255 - val > stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0]) | |
| 6000 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] += val; | |
| 6001 else | |
| 6002 stru_5E4C90_MapPersistVars.field_0[var_type - VAR_MapPersistentVariable_0] = 255; | |
| 6003 } | |
| 6004 if ( (signed int)var_type >= VAR_MapPersistentVariable_75 && var_type <= VAR_MapPersistentVariable_99 ) | |
| 6005 { | |
| 6006 if (255 - val > stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75]) | |
| 6007 stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75] += val; | |
| 6008 else | |
| 6009 stru_5E4C90_MapPersistVars._decor_events[var_type - VAR_MapPersistentVariable_75] = 255; | |
| 6010 } | |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6011 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6012 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6013 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6014 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
|
6015 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6016 if (!pParty->PartyTimes.HistoryEventTimes[var_type - VAR_History_0]) |
| 0 | 6017 { |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6018 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
|
6019 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
|
6020 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6021 bFlashHistoryBook = 1; |
| 1822 | 6022 PlayAwardSound(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6023 } |
| 0 | 6024 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6025 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6026 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6027 |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6028 switch ( var_type ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6029 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6030 case VAR_RandomGold: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6031 if ( val == 0 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6032 val = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6033 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
|
6034 pParty->PartyFindsGold(v6 % val + 1, 1); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6035 GameUI_DrawFoodAndGold(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6036 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6037 case VAR_RandomFood: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6038 if ( val == 0 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6039 val = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6040 v7 = rand() % val + 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6041 Party::GiveFood(v7); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6042 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
|
6043 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6044 GameUI_DrawFoodAndGold(); |
| 1822 | 6045 PlayAwardSound(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6046 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6047 case VAR_Sex: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6048 this->uSex = (PLAYER_SEX)val; |
| 1822 | 6049 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6050 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6051 case VAR_Class: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6052 this->classType = (PLAYER_CLASS_TYPE)val; |
| 1822 | 6053 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6054 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6055 case VAR_CurrentHP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6056 this->sHealth = min(this->sHealth + val, this->GetMaxHealth() ); |
| 1822 | 6057 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6058 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6059 case VAR_MaxHP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6060 this->_health_related = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6061 this->uFullHealthBonus = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6062 this->sHealth = this->GetMaxHealth(); |
|
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_CurrentSP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6065 this->sMana = min(this->sMana + val, this->GetMaxMana() ); |
| 1822 | 6066 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6067 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6068 case VAR_MaxSP: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6069 this->_mana_related = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6070 this->uFullManaBonus = 0; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6071 this->sMana = GetMaxMana(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6072 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6073 case VAR_ACModifier: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6074 this->sACModifier = min(this->sACModifier + val, 255); |
| 1822 | 6075 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6076 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6077 case VAR_BaseLevel: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6078 this->uLevel = min(this->uLevel + val, 255); |
| 1822 | 6079 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6080 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6081 case VAR_LevelModifier: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6082 this->sLevelModifier = min(this->sLevelModifier + val, 255); |
| 1822 | 6083 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6084 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6085 case VAR_Age: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6086 this->sAgeModifier += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6087 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6088 case VAR_Award: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6089 if (_449B57_test_bit(this->_achieved_awards_bits, val) && pAwards[val].pText ) |
| 310 | 6090 { |
| 1822 | 6091 PlayAwardSound_Anim97_Face(SPEECH_96); |
| 0 | 6092 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6093 _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
|
6094 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6095 case VAR_Experience: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6096 this->uExperience = min(this->uExperience + val, 4000000000i64); |
| 1822 | 6097 PlayAwardSound_Anim97(); |
|
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_QBits_QuestsDone: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6100 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
|
6101 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6102 bFlashQuestBook = 1; |
| 1822 | 6103 PlayAwardSound_Anim97_Face(SPEECH_93); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6104 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6105 _449B7E_toggle_bit(pParty->_quest_bits, val, 1); |
|
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_PlayerItemInHands: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6108 item.Reset(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6109 item.uAttributes = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6110 item.uItemID = val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6111 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
|
6112 pParty->pIsArtifactFound[val-500] = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6113 else if ( val >= ITEM_WAND_FIRE && val <= ITEM_WAND_INCENERATION ) |
| 0 | 6114 { |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6115 item.uNumCharges = rand() % 6 + item.GetDamageMod() + 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6116 item.uMaxCharges = LOBYTE(item.uNumCharges); |
| 0 | 6117 } |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6118 pParty->SetHoldingItem(&item); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6119 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6120 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
|
6121 pParty->PartyFindsGold(val, 1); |
|
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_BaseMight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6124 this->uMight = min(this->uMight + 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_BaseIntellect: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6128 this->uIntelligence = min(this->uIntelligence + val, 255); |
| 1822 | 6129 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6130 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6131 case VAR_BasePersonality: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6132 this->uWillpower = min(this->uWillpower + val, 255); |
| 1822 | 6133 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6134 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6135 case VAR_BaseEndurance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6136 this->uEndurance = min(this->uEndurance + val, 255); |
| 1822 | 6137 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6138 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6139 case VAR_BaseSpeed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6140 this->uSpeed = min(this->uSpeed + val, 255); |
| 1822 | 6141 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6142 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6143 case VAR_BaseAccuracy: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6144 this->uAccuracy = min(this->uAccuracy + val, 255); |
| 1822 | 6145 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6146 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6147 case VAR_BaseLuck: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6148 this->uLuck = min(this->uLuck + val, 255); |
| 1822 | 6149 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6150 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6151 case VAR_FixedFood: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6152 Party::GiveFood(val); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6153 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[502], val); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6154 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6155 if ( pParty->uNumFoodRations > 0xFFFF ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6156 Party::SetFood(0xFFFFu); |
| 1822 | 6157 PlayAwardSound(); |
| 1788 | 6158 return; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6159 case VAR_MightBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6160 case VAR_ActualMight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6161 this->uMightBonus = min(this->uMightBonus + val, 255); |
| 1822 | 6162 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6163 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6164 case VAR_IntellectBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6165 case VAR_ActualIntellect: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6166 this->uIntelligenceBonus = min(this->uIntelligenceBonus + val, 255); |
| 1822 | 6167 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6168 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6169 case VAR_PersonalityBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6170 case VAR_ActualPersonality: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6171 this->uWillpowerBonus = min(this->uWillpowerBonus + val, 255); |
| 1822 | 6172 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
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_EnduranceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6175 case VAR_ActualEndurance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6176 this->uEnduranceBonus = min(this->uEnduranceBonus + val, 255); |
| 1822 | 6177 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6178 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6179 case VAR_SpeedBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6180 case VAR_ActualSpeed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6181 this->uSpeedBonus = min(this->uSpeedBonus + val, 255); |
| 1822 | 6182 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6183 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6184 case VAR_AccuracyBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6185 case VAR_ActualAccuracy: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6186 this->uAccuracyBonus = min(this->uAccuracyBonus + val, 255); |
| 1822 | 6187 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6188 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6189 case VAR_LuckBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6190 case VAR_ActualLuck: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6191 this->uLuckBonus = min(this->uLuckBonus + val, 255); |
| 1822 | 6192 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
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_FireResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6195 this->sResFireBase = min(this->sResFireBase + 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_AirResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6199 this->sResAirBase = min(this->sResAirBase + 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_WaterResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6203 this->sResWaterBase = min(this->sResWaterBase + 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_EarthResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6207 this->sResEarthBase = min(this->sResEarthBase + 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_SpiritResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6211 this->sResSpiritBase = min(this->sResSpiritBase + val, 255); |
| 1822 | 6212 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
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_MindResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6215 this->sResMindBase = min(this->sResMindBase + val, 255); |
| 1822 | 6216 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
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_BodyResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6219 this->sResBodyBase = min(this->sResBodyBase + val, 255); |
| 1822 | 6220 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
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_LightResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6223 this->sResLightBase = min(this->sResLightBase + val, 255); |
| 1822 | 6224 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
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_DarkResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6227 this->sResDarkBase = min(this->sResDarkBase + val, 255); |
| 1822 | 6228 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
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_MagicResistance: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6231 this->sResMagicBase = min(this->sResMagicBase + val, 255); |
| 1822 | 6232 PlayAwardSound_Anim97_Face(SPEECH_92); |
|
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_FireResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6235 this->sResFireBonus = min(this->sResFireBonus + 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_AirResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6239 this->sResAirBonus = min(this->sResAirBonus + 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_WaterResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6243 this->sResWaterBonus = min(this->sResWaterBonus + 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_EarthResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6247 this->sResEarthBonus = min(this->sResEarthBonus + 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_SpiritResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6251 this->sResSpiritBonus = min(this->sResSpiritBonus + val, 255); |
| 1822 | 6252 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
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_MindResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6255 this->sResMindBonus = min(this->sResMindBonus + val, 255); |
| 1822 | 6256 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
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_BodyResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6259 this->sResBodyBonus = min(this->sResBodyBonus + val, 255); |
| 1822 | 6260 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
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_LightResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6263 this->sResLightBonus = min(this->sResLightBonus + val, 255); |
| 1822 | 6264 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
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_DarkResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6267 this->sResDarkBonus = min(this->sResDarkBonus + val, 255); |
| 1822 | 6268 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
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_MagicResistanceBonus: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6271 this->sResMagicBonus = min(this->sResMagicBonus + val, 255); |
| 1822 | 6272 PlayAwardSound_Anim97_Face(SPEECH_91); |
|
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_Cursed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6275 this->SetCondition(Condition_Cursed, 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_Weak: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6279 this->SetCondition(Condition_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_Asleep: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6283 this->SetCondition(Condition_Sleep, 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_Afraid: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6287 this->SetCondition(Condition_Fear, 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_Drunk: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6291 this->SetCondition(Condition_Drunk, 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_Insane: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6295 this->SetCondition(Condition_Insane, 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_PoisonedGreen: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6299 this->SetCondition(Condition_Poison1, 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_DiseasedGreen: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6303 this->SetCondition(Condition_Disease1, 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_PoisonedYellow: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6307 this->SetCondition(Condition_Poison2, 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_DiseasedYellow: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6311 this->SetCondition(Condition_Disease2, 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_PoisonedRed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6315 this->SetCondition(Condition_Poison3, 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_DiseasedRed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6319 this->SetCondition(Condition_Disease3, 1); |
| 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_Paralyzed: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6323 this->SetCondition(Condition_Paralyzed, 1); |
| 1822 | 6324 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6325 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6326 case VAR_Unconsious: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6327 this->SetCondition(Condition_Unconcious, 1); |
| 1822 | 6328 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6329 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6330 case VAR_Dead: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6331 this->SetCondition(Condition_Dead, 1); |
| 1822 | 6332 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6333 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6334 case VAR_Stoned: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6335 this->SetCondition(Condition_Pertified, 1); |
| 1822 | 6336 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6337 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6338 case VAR_Eradicated: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6339 this->SetCondition(Condition_Eradicated, 1); |
| 1822 | 6340 PlayAwardSound_Anim97(); |
|
1792
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_MajorCondition : |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
6343 pConditions.fill(0); |
| 1822 | 6344 PlayAwardSound_Anim97(); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6345 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6346 case VAR_AutoNotes: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6347 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
|
6348 { |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6349 this->PlaySound(SPEECH_96, 0); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6350 bFlashAutonotesBook = 1; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6351 _506568_autonote_type = pAutonoteTxt[val].eType; |
| 1822 | 6352 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, GetPlayerIndex()); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6353 } |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6354 _449B7E_toggle_bit(pParty->_autonote_bits, val, 1); |
| 1822 | 6355 PlayAwardSound(); |
| 0 | 6356 return; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6357 case VAR_PlayerBits: |
| 1822 | 6358 _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
|
6359 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6360 case VAR_NPCs2: |
|
1793
4dee76d79c78
dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents:
1792
diff
changeset
|
6361 pParty->hirelingScrollPosition = 0; |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6362 LOBYTE(pNPCStats->pNewNPCData[val].uFlags) |= 0x80u; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6363 pParty->CountHirelings(); |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6364 viewparams->bRedrawGameUI = true; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6365 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6366 case VAR_NumSkillPoints: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6367 this->uSkillPoints += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6368 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6369 case VAR_ReputationInCurrentLocation: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6370 v27 = &pOutdoor->ddm; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6371 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6372 v27 = &pIndoor->dlv; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6373 v27->uReputation += val; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6374 if ( v27->uReputation > 10000 ) |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6375 v27->uReputation = 10000; |
|
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_GoldInBank: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6378 pParty->uNumGoldInBank += val; |
|
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_NumDeaths: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6381 pParty->uNumDeaths += val; |
|
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_NumBounties: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6384 pParty->uNumBountiesCollected += val; |
|
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_PrisonTerms: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6387 pParty->uNumPrisonTerms += val; |
|
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_ArenaWinsPage: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6390 pParty->uNumArenaPageWins += val; |
|
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_ArenaWinsSquire: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6393 pParty->uNumArenaSquireWins += val; |
|
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_ArenaWinsKnight: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6396 pParty->uNumArenaKnightWins += val; |
|
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_ArenaWinsLord: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6399 pParty->uNumArenaLordWins += val; |
|
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_StaffSkill: |
| 1822 | 6402 AddSkillByEvent(&Player::skillStaff, 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_SwordSkill: |
| 1822 | 6405 AddSkillByEvent(&Player::skillSword, 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_DaggerSkill: |
| 1822 | 6408 AddSkillByEvent(&Player::skillDagger, 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_AxeSkill: |
| 1822 | 6411 AddSkillByEvent(&Player::skillAxe, 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_SpearSkill: |
| 1822 | 6414 AddSkillByEvent(&Player::skillSpear, 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_BowSkill: |
| 1822 | 6417 AddSkillByEvent(&Player::skillBow, 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_MaceSkill: |
| 1822 | 6420 AddSkillByEvent(&Player::skillMace, 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_BlasterSkill: |
| 1822 | 6423 AddSkillByEvent(&Player::skillBlaster, 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_ShieldSkill: |
| 1822 | 6426 AddSkillByEvent(&Player::skillShield, 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_LeatherSkill: |
| 1822 | 6429 AddSkillByEvent(&Player::skillLeather, 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_SkillChain: |
| 1822 | 6432 AddSkillByEvent(&Player::skillChain, 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_PlateSkill: |
| 1822 | 6435 AddSkillByEvent(&Player::skillPlate, 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_FireSkill: |
| 1822 | 6438 AddSkillByEvent(&Player::skillFire, 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_AirSkill: |
| 1822 | 6441 AddSkillByEvent(&Player::skillAir, 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_WaterSkill: |
| 1822 | 6444 AddSkillByEvent(&Player::skillWater, 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_EarthSkill: |
| 1822 | 6447 AddSkillByEvent(&Player::skillEarth, 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_SpiritSkill: |
| 1822 | 6450 AddSkillByEvent(&Player::skillSpirit, 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_MindSkill: |
| 1822 | 6453 AddSkillByEvent(&Player::skillMind, 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_BodySkill: |
| 1822 | 6456 AddSkillByEvent(&Player::skillBody, 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_LightSkill: |
| 1822 | 6459 AddSkillByEvent(&Player::skillLight, 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_DarkSkill: |
| 1822 | 6462 AddSkillByEvent(&Player::skillDark, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6463 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6464 case VAR_IdentifyItemSkill: |
| 1822 | 6465 AddSkillByEvent(&Player::skillItemId, 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_MerchantSkill: |
| 1822 | 6468 AddSkillByEvent(&Player::skillMerchant, 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_RepairSkill: |
| 1822 | 6471 AddSkillByEvent(&Player::skillRepair, 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_BodybuildingSkill: |
| 1822 | 6474 AddSkillByEvent(&Player::skillBodybuilding, 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_MeditationSkill: |
| 1822 | 6477 AddSkillByEvent(&Player::skillMeditation, 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_PerceptionSkill: |
| 1822 | 6480 AddSkillByEvent(&Player::skillPerception, 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_DiplomacySkill: |
| 1822 | 6483 AddSkillByEvent(&Player::skillDiplomacy, 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_ThieverySkill: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6486 Error ("Thieving unsupported"); |
|
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 case VAR_DisarmTrapSkill: |
| 1822 | 6489 AddSkillByEvent(&Player::skillDisarmTrap, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6490 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6491 case VAR_DodgeSkill: |
| 1822 | 6492 AddSkillByEvent(&Player::skillDodge, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6493 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6494 case VAR_UnarmedSkill: |
| 1822 | 6495 AddSkillByEvent(&Player::skillUnarmed, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6496 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6497 case VAR_IdentifyMonsterSkill: |
| 1822 | 6498 AddSkillByEvent(&Player::skillMonsterId, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6499 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6500 case VAR_ArmsmasterSkill: |
| 1822 | 6501 AddSkillByEvent(&Player::skillArmsmaster, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6502 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6503 case VAR_StealingSkill: |
| 1822 | 6504 AddSkillByEvent(&Player::skillStealing, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6505 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6506 case VAR_AlchemySkill: |
| 1822 | 6507 AddSkillByEvent(&Player::skillAlchemy, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6508 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6509 case VAR_LearningSkill: |
| 1822 | 6510 AddSkillByEvent(&Player::skillLearning, val); |
|
1792
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6511 return; |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6512 default: |
|
3155be890554
Player::AddVariable moving everything to a switch, cleaning up, finishing
Grumpy7
parents:
1791
diff
changeset
|
6513 return; |
| 0 | 6514 } |
| 6515 } | |
| 6516 | |
| 1791 | 6517 //----- (new function) -------------------------------------------------------- |
| 1822 | 6518 void Player::PlayAwardSound_Anim97() |
| 6519 { | |
| 6520 int playerIndex = GetPlayerIndex(); | |
| 6521 pGame->pStru6Instance->SetPlayerBuffAnim(0x97u, playerIndex); | |
| 6522 PlayAwardSound(); | |
| 1791 | 6523 } |
| 6524 | |
| 6525 //----- (new function) -------------------------------------------------------- | |
| 1822 | 6526 void Player::PlayAwardSound_Anim97_Face( PlayerSpeech speech ) |
| 1791 | 6527 { |
| 6528 this->PlaySound(speech, 0); | |
| 1822 | 6529 PlayAwardSound_Anim97(); |
| 1791 | 6530 } |
| 6531 | |
| 6532 //----- (new function) -------------------------------------------------------- | |
| 1822 | 6533 void Player::AddSkillByEvent( unsigned __int16 Player::* skillToSet, unsigned __int16 addSkillValue ) |
| 1791 | 6534 { |
| 6535 if ( addSkillValue > 63 ) | |
| 6536 { | |
| 6537 this->*skillToSet = (unsigned __int8)addSkillValue | this->*skillToSet & 63; | |
| 6538 } | |
| 6539 else | |
| 6540 { | |
| 6541 this->*skillToSet = min(this->*skillToSet + addSkillValue, 60) | this->*skillToSet & 0xC0; | |
| 6542 } | |
| 1822 | 6543 PlayAwardSound_Anim97(); |
| 1791 | 6544 return; |
| 6545 } | |
| 0 | 6546 |
| 6547 //----- (0044B9C4) -------------------------------------------------------- | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6548 void Player::SubtractVariable( enum VariableType VarNum, signed int pValue ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6549 { |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6550 DDM_DLV_Header *locationHeader; // eax@90 |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6551 int randGold; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6552 int randFood; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6553 int npcIndex; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6554 |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6555 if ( VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_99 ) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6556 { |
| 1822 | 6557 if ( VarNum >= VAR_MapPersistentVariable_0 && VarNum <= VAR_MapPersistentVariable_74 ) |
| 6558 { | |
| 6559 stru_5E4C90_MapPersistVars.field_0[VarNum - VAR_MapPersistentVariable_0] -= pValue; | |
| 6560 } | |
| 6561 if ( (signed int)VarNum >= VAR_MapPersistentVariable_75 && VarNum <= VAR_MapPersistentVariable_99 ) | |
| 6562 { | |
| 6563 stru_5E4C90_MapPersistVars._decor_events[VarNum - VAR_MapPersistentVariable_75] -= pValue; | |
| 6564 } | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6565 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6566 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6567 |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6568 switch (VarNum) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
6569 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6570 case VAR_CurrentHP: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6571 ReceiveDamage((signed int)pValue, DMGT_PHISYCAL); |
| 1822 | 6572 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6573 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6574 case VAR_CurrentSP: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6575 this->sMana = max(this->sMana - pValue, 0); |
| 1822 | 6576 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6577 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6578 case VAR_ACModifier: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6579 this->sACModifier -= (unsigned __int8)pValue; |
| 1822 | 6580 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6581 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6582 case VAR_BaseLevel: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6583 this->uLevel -= (unsigned __int8)pValue; |
| 1822 | 6584 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6585 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6586 case VAR_LevelModifier: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6587 this->sLevelModifier -= (unsigned __int8)pValue; |
| 1822 | 6588 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6589 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6590 case VAR_Age: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6591 this->sAgeModifier -= (signed __int16)pValue; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6592 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6593 case VAR_Award: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6594 _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
|
6595 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6596 case VAR_Experience: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6597 this->uExperience -= pValue; |
| 1822 | 6598 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6599 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6600 case VAR_QBits_QuestsDone: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6601 _449B7E_toggle_bit(pParty->_quest_bits, (__int16)pValue, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6602 this->PlaySound(SPEECH_96, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6603 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6604 case VAR_PlayerItemInHands: |
| 2025 | 6605 for ( uint i = 0; i < 16; ++i ) |
| 6606 { | |
| 6607 int id_ = this->pEquipment.pIndices[i]; | |
| 6608 if ( id_ > 0 ) | |
| 6609 { | |
| 6610 if ( this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID == pValue ) | |
| 6611 { | |
| 6612 this->pEquipment.pIndices[i] = 0; | |
| 6613 } | |
| 6614 } | |
| 6615 } | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6616 for (int i = 0; i < 126; i++) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6617 { |
| 2025 | 6618 int id_ = this->pInventoryMatrix[i]; |
| 6619 if ( id_ > 0 ) | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6620 { |
| 2025 | 6621 if ( this->pInventoryItemList[id_ - 1].uItemID == pValue ) |
| 6622 { | |
| 6623 RemoveItemAtInventoryIndex(i); | |
| 6624 return; | |
| 6625 } | |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6626 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6627 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6628 if ( pParty->pPickedItem.uItemID == pValue ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6629 { |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6630 pMouse->RemoveHoldingItem(); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6631 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6632 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6633 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6634 case VAR_FixedGold: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6635 if ( (unsigned int)pValue > pParty->uNumGold ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6636 { |
|
1825
23deb6b09c8c
cancelEventProcessing to dword_5B65C4_cancelEventProcessing
Grumpy7
parents:
1822
diff
changeset
|
6637 dword_5B65C4_cancelEventProcessing = 1; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6638 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6639 } |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6640 Party::TakeGold((unsigned int)pValue); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6641 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6642 case VAR_RandomGold: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6643 randGold = rand() % (signed int)pValue + 1; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6644 if ( (unsigned int)randGold > pParty->uNumGold ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6645 randGold = pParty->uNumGold; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6646 Party::TakeGold(randGold); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6647 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[503], randGold); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6648 ShowStatusBarString(pTmpBuf.data(), 2); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6649 GameUI_DrawFoodAndGold(); |
|
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_FixedFood: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6652 Party::TakeFood((unsigned int)pValue); |
| 1822 | 6653 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6654 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6655 case VAR_RandomFood: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6656 randFood = rand() % (signed int)pValue + 1; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6657 if ( (unsigned int)randFood > pParty->uNumFoodRations ) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6658 randFood = pParty->uNumFoodRations; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6659 Party::TakeFood(randFood); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6660 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[504], randFood); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6661 ShowStatusBarString(pTmpBuf.data(), 2u); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6662 GameUI_DrawFoodAndGold(); |
| 1822 | 6663 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6664 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6665 case VAR_MightBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6666 case VAR_ActualMight: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6667 this->uMightBonus -= (unsigned __int16)pValue; |
| 1822 | 6668 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6669 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6670 case VAR_IntellectBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6671 case VAR_ActualIntellect: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6672 this->uIntelligenceBonus -= (unsigned __int16)pValue; |
| 1822 | 6673 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6674 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6675 case VAR_PersonalityBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6676 case VAR_ActualPersonality: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6677 this->uWillpowerBonus -= (unsigned __int16)pValue; |
| 1822 | 6678 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
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_EnduranceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6681 case VAR_ActualEndurance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6682 this->uEnduranceBonus -= (unsigned __int16)pValue; |
| 1822 | 6683 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6684 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6685 case VAR_SpeedBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6686 case VAR_ActualSpeed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6687 this->uSpeedBonus -= (unsigned __int16)pValue; |
| 1822 | 6688 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6689 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6690 case VAR_AccuracyBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6691 case VAR_ActualAccuracy: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6692 this->uAccuracyBonus -= (unsigned __int16)pValue; |
| 1822 | 6693 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6694 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6695 case VAR_LuckBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6696 case VAR_ActualLuck: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6697 this->uLuckBonus -= (unsigned __int16)pValue; |
| 1822 | 6698 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
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_BaseMight: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6701 this->uMight -= (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_BaseIntellect: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6705 this->uIntelligence -= (unsigned __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_BasePersonality: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6709 this->uWillpower -= (unsigned __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_BaseEndurance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6713 this->uEndurance -= (unsigned __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_BaseSpeed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6717 this->uSpeed -= (unsigned __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_BaseAccuracy: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6721 this->uAccuracy -= (unsigned __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_BaseLuck: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6725 this->uLuck -= (unsigned __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_FireResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6729 this->sResFireBase -= (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_AirResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6733 this->sResAirBase -= (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_WaterResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6737 this->sResWaterBase -= (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_EarthResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6741 this->sResEarthBase -= (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_SpiritResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6745 this->sResSpiritBase -= (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_MindResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6749 this->sResMindBase -= (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_BodyResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6753 this->sResBodyBase -= (signed __int16)pValue; |
| 1822 | 6754 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
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_LightResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6757 this->sResLightBase -= (signed __int16)pValue; |
| 1822 | 6758 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
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_DarkResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6761 this->sResDarkBase -= (signed __int16)pValue; |
| 1822 | 6762 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
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_MagicResistance: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6765 this->sResMagicBase -= (signed __int16)pValue; |
| 1822 | 6766 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
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_FireResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6769 this->sResFireBonus -= (signed __int16)pValue; |
| 1822 | 6770 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
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_AirResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6773 this->sResAirBonus -= (signed __int16)pValue; |
| 1822 | 6774 this->PlayAwardSound_Anim98_Face(SPEECH_92); |
|
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_WaterResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6777 this->sResWaterBonus -= (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_EarthResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6781 this->sResEarthBonus -= (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_SpiritResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6785 this->sResSpiritBonus -= (signed __int16)pValue; |
| 1822 | 6786 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
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_MindResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6789 this->sResMindBonus -= (signed __int16)pValue; |
| 1822 | 6790 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
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_BodyResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6793 this->sResBodyBonus -= (signed __int16)pValue; |
| 1822 | 6794 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
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_LightResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6797 this->sResLightBonus -= (signed __int16)pValue; |
| 1822 | 6798 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
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_DarkResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6801 this->sResDarkBonus -= (signed __int16)pValue; |
| 1822 | 6802 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
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_MagicResistanceBonus: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6805 this->sResMagicBonus -= (signed __int16)pValue; |
| 1822 | 6806 this->PlayAwardSound_Anim98_Face(SPEECH_91); |
|
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_StaffSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6809 this->skillStaff -= (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_SwordSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6813 this->skillSword -= (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_DaggerSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6817 this->skillDagger -= (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_AxeSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6821 this->skillAxe -= (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_SpearSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6825 this->skillSpear -= (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_BowSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6829 this->skillBow -= (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_MaceSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6833 this->skillMace -= (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_BlasterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6837 this->skillBlaster -= (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_ShieldSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6841 this->skillShield -= (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_LeatherSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6845 this->skillLearning -= (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_SkillChain: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6849 this->skillChain -= (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_PlateSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6853 this->skillPlate -= (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_FireSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6857 this->skillFire -= (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_AirSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6861 this->skillAir -= (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_WaterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6865 this->skillWater -= (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_EarthSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6869 this->skillEarth -= (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_SpiritSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6873 this->skillSpirit -= (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_MindSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6877 this->skillMind -= (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_BodySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6881 this->skillBody -= (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_LightSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6885 this->skillLight -= (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_DarkSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6889 this->skillDark -= (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_IdentifyItemSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6893 this->skillItemId -= (unsigned __int8)pValue; |
| 1822 | 6894 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6895 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6896 case VAR_MerchantSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6897 this->skillMerchant -= (unsigned __int8)pValue; |
| 1822 | 6898 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6899 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6900 case VAR_RepairSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6901 this->skillRepair -= (unsigned __int8)pValue; |
| 1822 | 6902 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6903 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6904 case VAR_BodybuildingSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6905 this->skillBodybuilding -= (unsigned __int8)pValue; |
| 1822 | 6906 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6907 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6908 case VAR_MeditationSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6909 this->skillMeditation -= (unsigned __int8)pValue; |
| 1822 | 6910 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6911 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6912 case VAR_PerceptionSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6913 this->skillPerception -= (unsigned __int8)pValue; |
| 1822 | 6914 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6915 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6916 case VAR_DiplomacySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6917 this->skillDiplomacy -= (unsigned __int8)pValue; |
| 1822 | 6918 PlayAwardSound_Anim98(); |
| 6919 return; | |
| 6920 case VAR_ThieverySkill: | |
| 6921 Error ("Thieving unsupported"); | |
|
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_DisarmTrapSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6924 this->skillDisarmTrap -= (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_DodgeSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6928 this->skillDodge -= (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_UnarmedSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6932 this->skillUnarmed -= (unsigned __int8)pValue; |
| 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_IdentifyMonsterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6936 this->skillMonsterId -= (unsigned __int8)pValue; |
| 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_ArmsmasterSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6940 this->skillArmsmaster -= (unsigned __int8)pValue; |
| 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_StealingSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6944 this->skillStealing -= (unsigned __int8)pValue; |
| 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_AlchemySkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6948 this->skillAlchemy -= (unsigned __int8)pValue; |
| 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_LearningSkill: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6952 this->skillLearning -= (unsigned __int8)pValue; |
| 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_Cursed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6956 this->pConditions[Condition_Cursed] = 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_Weak: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6960 this->pConditions[Condition_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_Asleep: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6964 this->pConditions[Condition_Sleep] = 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_Afraid: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6968 this->pConditions[Condition_Fear] = 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_Drunk: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6972 this->pConditions[Condition_Drunk] = 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_Insane: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6976 this->pConditions[Condition_Insane] = 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_PoisonedGreen: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6980 this->pConditions[Condition_Poison1] = 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_DiseasedGreen: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6984 this->pConditions[Condition_Disease1] = 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_PoisonedYellow: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6988 this->pConditions[Condition_Poison2] = 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_DiseasedYellow: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6992 this->pConditions[Condition_Disease2] = 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_PoisonedRed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6996 this->pConditions[Condition_Poison3] = 0; |
| 1822 | 6997 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6998 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
6999 case VAR_DiseasedRed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7000 this->pConditions[Condition_Disease3] = 0; |
| 1822 | 7001 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7002 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7003 case VAR_Paralyzed: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7004 this->pConditions[Condition_Paralyzed] = 0; |
| 1822 | 7005 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7006 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7007 case VAR_Unconsious: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7008 this->pConditions[Condition_Unconcious] = 0; |
| 1822 | 7009 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7010 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7011 case VAR_Dead: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7012 this->pConditions[Condition_Dead] = 0; |
| 1822 | 7013 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7014 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7015 case VAR_Stoned: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7016 this->pConditions[Condition_Pertified] = 0; |
| 1822 | 7017 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7018 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7019 case VAR_Eradicated: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7020 this->pConditions[Condition_Eradicated] = 0; |
| 1822 | 7021 PlayAwardSound_Anim98(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7022 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7023 case VAR_AutoNotes: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7024 _449B7E_toggle_bit(pParty->_autonote_bits, pValue - 1, 0); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7025 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7026 case VAR_NPCs2: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7027 npcIndex = 0; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7028 GetNewNPCData(sDialogue_SpeakingActorNPC_ID, &npcIndex); |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7029 if ( npcIndex == pValue ) |
| 0 | 7030 { |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7031 npcIdToDismissAfterDialogue = pValue; |
| 0 | 7032 } |
| 7033 else | |
| 7034 { | |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7035 npcIdToDismissAfterDialogue = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7036 pParty->hirelingScrollPosition = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7037 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7038 pParty->CountHirelings(); |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7039 viewparams->bRedrawGameUI = true; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7040 } |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7041 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7042 case VAR_HiredNPCHasSpeciality: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7043 for (unsigned int i = 0; i < pNPCStats->uNumNewNPCs; i++) |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7044 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7045 if (pNPCStats->pNewNPCData[i].uProfession == pValue) |
| 0 | 7046 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7047 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
| 0 | 7048 } |
| 7049 } | |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7050 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
|
7051 memset(&pParty->pHirelings[0], 0, sizeof(NPCData)); |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7052 if ( pParty->pHirelings[1].uProfession == pValue ) |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7053 memset(&pParty->pHirelings[1], 0, sizeof(NPCData)); |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7054 pParty->hirelingScrollPosition = 0; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7055 pParty->CountHirelings(); |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7056 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7057 case VAR_NumSkillPoints: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7058 if ((unsigned int)pValue <= this->uSkillPoints) |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7059 { |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7060 this->uSkillPoints -= pValue; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7061 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7062 else |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7063 { |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7064 this->uSkillPoints = 0; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7065 } |
|
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_ReputationInCurrentLocation: |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7068 locationHeader = &pOutdoor->ddm; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7069 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7070 locationHeader = &pIndoor->dlv; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7071 locationHeader->uReputation -= pValue; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7072 if (locationHeader->uReputation < -10000) |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7073 locationHeader->uReputation = -10000; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7074 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7075 case VAR_GoldInBank: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7076 if ( (unsigned int)pValue <= pParty->uNumGoldInBank ) |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7077 { |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7078 pParty->uNumGoldInBank -= (unsigned int)pValue; |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7079 } |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7080 else |
| 0 | 7081 { |
|
1825
23deb6b09c8c
cancelEventProcessing to dword_5B65C4_cancelEventProcessing
Grumpy7
parents:
1822
diff
changeset
|
7082 dword_5B65C4_cancelEventProcessing = 1; |
| 605 | 7083 } |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7084 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7085 case VAR_NumDeaths: |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7086 pParty->uNumDeaths -= (unsigned int)pValue; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7087 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7088 case VAR_NumBounties: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7089 pParty->uNumBountiesCollected -= (unsigned int)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7090 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7091 case VAR_PrisonTerms: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7092 pParty->uNumPrisonTerms -= (int)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7093 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7094 case VAR_ArenaWinsPage: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7095 pParty->uNumArenaPageWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7096 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7097 case VAR_ArenaWinsSquire: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7098 pParty->uNumArenaSquireWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7099 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7100 case VAR_ArenaWinsKnight: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7101 pParty->uNumArenaKnightWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7102 return; |
|
1819
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7103 case VAR_ArenaWinsLord: |
|
1641ab7f21ec
Player::SubtractVariable moving everything to one switch
Grumpy7
parents:
1818
diff
changeset
|
7104 pParty->uNumArenaLordWins -= (char)pValue; |
|
1820
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7105 return; |
|
af7f08135ffb
Player::SubtractVariable changing return val to void, finishing cleanup
Grumpy7
parents:
1819
diff
changeset
|
7106 } |
| 0 | 7107 } |
| 7108 // 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
|
7109 // 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
|
7110 |
| 1818 | 7111 //----- (new function) -------------------------------------------------------- |
| 1822 | 7112 void Player::PlayAwardSound_Anim98() |
| 7113 { | |
| 7114 int playerIndex = GetPlayerIndex(); | |
| 7115 pGame->pStru6Instance->SetPlayerBuffAnim(0x98u, playerIndex); | |
| 7116 PlayAwardSound(); | |
| 1818 | 7117 } |
| 7118 | |
| 7119 //----- (new function) -------------------------------------------------------- | |
| 1822 | 7120 void Player::PlayAwardSound_Anim98_Face( PlayerSpeech speech ) |
| 1818 | 7121 { |
| 7122 this->PlaySound(speech, 0); | |
| 1822 | 7123 PlayAwardSound_Anim98(); |
| 1818 | 7124 } |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7125 |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7126 //----- (00467E7F) -------------------------------------------------------- |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7127 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
|
7128 { |
| 1822 | 7129 int itemAnchor; // ebx@1 |
| 7130 Player *currChar; // eax@1 | |
| 7131 int itemInvLocation; // edx@1 | |
| 7132 int freeSlot; // eax@3 | |
| 1619 | 7133 ItemGen tempPickedItem; // [sp+Ch] [bp-30h]@1 |
| 1822 | 7134 unsigned int *equipAnchor; // [sp+38h] [bp-4h]@1 |
| 1619 | 7135 |
| 7136 tempPickedItem.Reset(); | |
| 1822 | 7137 itemAnchor = pEquipTypeToBodyAnchor[uEquipType]; |
| 7138 currChar = pPlayers[uActiveCharacter]; | |
| 7139 equipAnchor = &currChar->pEquipment.pIndices[itemAnchor]; | |
| 7140 itemInvLocation = currChar->pEquipment.pIndices[itemAnchor]; | |
| 7141 if ( itemInvLocation ) | |
| 1619 | 7142 { |
| 7143 memcpy(&tempPickedItem, &pParty->pPickedItem, sizeof(tempPickedItem)); | |
| 1822 | 7144 currChar->pInventoryItemList[itemInvLocation - 1].uBodyAnchor = 0; |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7145 pParty->pPickedItem.Reset(); |
| 1822 | 7146 pParty->SetHoldingItem(&currChar->pInventoryItemList[itemInvLocation - 1]); |
| 7147 tempPickedItem.uBodyAnchor = itemAnchor + 1; | |
| 7148 memcpy(&currChar->pInventoryItemList[itemInvLocation - 1], &tempPickedItem, sizeof(ItemGen)); | |
| 7149 *equipAnchor = itemInvLocation; | |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7150 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7151 else |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7152 { |
| 1822 | 7153 freeSlot = currChar->FindFreeInventoryListSlot(); |
| 7154 if (freeSlot >= 0) | |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7155 { |
| 1822 | 7156 pParty->pPickedItem.uBodyAnchor = itemAnchor + 1; |
| 7157 memcpy(&currChar->pInventoryItemList[freeSlot], &pParty->pPickedItem, sizeof(ItemGen)); | |
| 7158 *equipAnchor = freeSlot + 1; | |
|
1276
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7159 pMouse->RemoveHoldingItem(); |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7160 } |
|
f11651288371
changed sub_467E7F_EquipBody to Player::EquipBody, some more header file stuff
Grumpy7
parents:
1275
diff
changeset
|
7161 } |
| 1295 | 7162 } |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7163 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7164 |
| 1295 | 7165 //----- (0049387A) -------------------------------------------------------- |
| 1459 | 7166 int CycleCharacter(bool backwards) |
| 1295 | 7167 { |
|
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
|
7168 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
|
7169 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
|
7170 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
|
7171 |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7172 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
|
7173 { |
|
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
|
7174 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
|
7175 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
|
7176 { |
|
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
|
7177 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
|
7178 } |
|
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 } |
|
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
|
7180 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
|
7181 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7182 |
| 1297 | 7183 //----- (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
|
7184 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
|
7185 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7186 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
|
7187 { |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7188 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
|
7189 } |
|
61ea994a1812
sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents:
1619
diff
changeset
|
7190 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
|
7191 } |
| 1432 | 7192 |
| 1297 | 7193 //----- (0043EE15) -------------------------------------------------------- |
| 1822 | 7194 bool Player::HasItem( unsigned int uItemID, bool checkHeldItem ) |
| 7195 { | |
| 7196 if ( !checkHeldItem || pParty->pPickedItem.uItemID != uItemID ) | |
| 1297 | 7197 { |
| 7198 for ( uint i = 0; i < 126; ++i ) | |
| 7199 { | |
|
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
|
7200 if ( this->pInventoryMatrix[i] > 0 ) |
|
1384
b51332ab228f
changed a few member variables in Player to slightly less confusing names
Grumpy7
parents:
1383
diff
changeset
|
7201 { |
|
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
|
7202 if ( (unsigned int)this->pInventoryItemList[this->pInventoryMatrix[i] - 1].uItemID == uItemID ) |
| 1297 | 7203 return true; |
| 7204 } | |
| 7205 } | |
| 7206 for ( uint i = 0; i < 16; ++i ) | |
| 7207 { | |
|
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
|
7208 if ( this->pEquipment.pIndices[i] ) |
| 1297 | 7209 { |
|
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
|
7210 if ( (unsigned int)this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID == uItemID ) |
| 1297 | 7211 return true; |
| 7212 } | |
| 7213 } | |
| 1822 | 7214 return false; |
| 7215 } | |
| 7216 else | |
| 7217 { | |
| 7218 return true; | |
| 7219 } | |
| 1297 | 7220 } |
| 7221 //----- (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
|
7222 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
|
7223 { |
|
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
|
7224 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
|
7225 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
|
7226 |
|
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
|
7227 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
|
7228 { |
|
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
|
7229 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
|
7230 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
|
7231 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
|
7232 { |
|
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
|
7233 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
|
7234 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
|
7235 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
|
7236 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
|
7237 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
|
7238 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
|
7239 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
|
7240 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
|
7241 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
|
7242 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
|
7243 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
|
7244 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
|
7245 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
|
7246 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
|
7247 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
|
7248 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
|
7249 } |
|
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
|
7250 } |
|
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
|
7251 return false; |
| 1297 | 7252 } |
| 7253 //----- (0043ED6F) -------------------------------------------------------- | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7254 bool IsDwarfPresentInParty(bool a1) |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7255 { |
| 1297 | 7256 for (uint i = 0; i < 4; ++i) |
| 7257 { | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7258 CHARACTER_RACE race = pParty->pPlayers[i].GetRace(); |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7259 |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7260 if (race == CHARACTER_RACE_DWARF && a1) |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7261 return true; |
|
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7262 else if (race != CHARACTER_RACE_DWARF && !a1) |
| 1297 | 7263 return true; |
| 7264 } | |
| 7265 return false; | |
| 7266 } | |
|
1647
511cd6dd1048
_43ED6F_check_party_races to IsDwarfPresentInParty
Grumpy7
parents:
1620
diff
changeset
|
7267 |
| 1649 | 7268 |
| 7269 | |
| 1297 | 7270 //----- (00439FCB) -------------------------------------------------------- |
| 2006 | 7271 void __fastcall DamagePlayerFromMonster(unsigned int uObjID, int dmgSource, Vec3_int_ *pPos, signed int a4) |
| 1681 | 7272 { |
| 1649 | 7273 Player *playerPtr; // ebx@3 |
| 7274 Actor *actorPtr; // esi@3 | |
| 1681 | 7275 int spellId; // eax@38 |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7276 signed int recvdMagicDmg; // eax@139 |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7277 int v72[4]; // [sp+30h] [bp-24h]@164 |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7278 int healthBeforeRecvdDamage; // [sp+48h] [bp-Ch]@3 |
| 1297 | 7279 unsigned int uActorID; // [sp+4Ch] [bp-8h]@1 |
| 1681 | 7280 |
| 7281 uActorID = PID_ID(uObjID); | |
| 7282 if ( PID_TYPE(uObjID) != 2) | |
| 1297 | 7283 { |
| 1649 | 7284 playerPtr = &pParty->pPlayers[a4]; |
| 1681 | 7285 actorPtr = &pActors[uActorID]; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7286 healthBeforeRecvdDamage = playerPtr->sHealth; |
| 1681 | 7287 if ( PID_TYPE(uObjID) != 3 || !stru_50C198.ActorHitOrMiss(actorPtr, playerPtr) ) |
| 1297 | 7288 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
|
7289 ItemGen* equippedArmor = playerPtr->GetArmorItem(); |
| 1681 | 7290 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
|
7291 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
|
7292 || equippedArmor->IsBroken() |
| 1649 | 7293 || |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7294 (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
|
7295 && equippedArmor->GetPlayerSkillType() != PLAYER_SKILL_PLATE |
| 1649 | 7296 ) |
| 7297 ) | |
| 1297 | 7298 { |
| 1681 | 7299 int randVal = rand() % 4; |
| 7300 switch (randVal) | |
| 1297 | 7301 { |
| 1681 | 7302 case 0 : soundToPlay = (SoundID)108; break; |
| 7303 case 1 : soundToPlay = (SoundID)109; break; | |
| 7304 case 2 : soundToPlay = (SoundID)110; break; | |
| 7305 case 3 : soundToPlay = (SoundID)44; break; | |
| 1783 | 7306 default: Error("Unexpected sound value"); |
| 1297 | 7307 } |
| 7308 } | |
| 7309 else | |
| 7310 { | |
| 1681 | 7311 int randVal = rand() % 4; |
| 7312 switch (randVal) | |
| 1297 | 7313 { |
| 1681 | 7314 case 0 : soundToPlay = (SoundID)105; break; |
| 7315 case 1 : soundToPlay = (SoundID)106; break; | |
| 7316 case 2 : soundToPlay = (SoundID)107; break; | |
| 7317 case 3 : soundToPlay = (SoundID)45; break; | |
| 1783 | 7318 default: Error("Unexpected sound value"); |
| 1297 | 7319 } |
| 1648 | 7320 } |
| 1681 | 7321 pAudioPlayer->PlaySound(soundToPlay, PID(OBJECT_Player,a4 + 80), 0, -1, 0, 0, 0, 0); |
| 1876 | 7322 int dmgToReceive = actorPtr->_43B3E0_CalcDamage(dmgSource); |
| 1949 | 7323 if ( actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime > 0 ) |
| 1649 | 7324 { |
| 1949 | 7325 __int16 spellPower = actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uPower; |
| 1681 | 7326 if ( spellPower ) |
| 7327 dmgToReceive /= (signed int)spellPower; | |
| 7328 } | |
| 1682 | 7329 int damageType; |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7330 switch (dmgSource) |
| 1648 | 7331 { |
| 1682 | 7332 case 0: damageType = actorPtr->pMonsterInfo.uAttack1Type; |
| 1648 | 7333 break; |
| 1682 | 7334 case 1: damageType = actorPtr->pMonsterInfo.uAttack2Type; |
| 1648 | 7335 break; |
| 1681 | 7336 case 2: spellId = actorPtr->pMonsterInfo.uSpell1ID; |
| 1682 | 7337 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); |
| 1648 | 7338 break; |
| 1681 | 7339 case 3: spellId = actorPtr->pMonsterInfo.uSpell2ID; |
| 1682 | 7340 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); |
| 1648 | 7341 break; |
| 1682 | 7342 case 4: damageType = actorPtr->pMonsterInfo.field_3C_some_special_attack; |
| 1648 | 7343 break; |
| 7344 default: | |
| 1682 | 7345 case 5: damageType = 4; //yes, the original just assigned the value 4 |
| 1648 | 7346 break; |
| 7347 } | |
| 1297 | 7348 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) |
| 7349 { | |
| 1682 | 7350 dmgToReceive = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); |
| 1822 | 7351 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) |
| 1297 | 7352 { |
| 1681 | 7353 int actorState = actorPtr->uAIState; |
| 7354 if ( actorState != Dying && actorState != Dead) | |
| 1297 | 7355 { |
| 1682 | 7356 int reflectedDamage = stru_50C198.CalcMagicalDamageToActor(actorPtr, damageType, dmgToReceive); |
| 1681 | 7357 actorPtr->sCurrentHP -= reflectedDamage; |
| 7358 if ( reflectedDamage >= 0 ) | |
| 1297 | 7359 { |
| 1649 | 7360 if ( actorPtr->sCurrentHP >= 1 ) |
| 1297 | 7361 { |
| 1682 | 7362 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 | 7363 Actor::AggroSurroundingPeasants(uActorID, 1); |
| 7364 } | |
| 7365 else | |
| 7366 { | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7367 if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pRenderer->pRenderD3D && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS) |
| 1297 | 7368 { |
| 1681 | 7369 int splatRadius = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; |
| 7370 pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)splatRadius, 0, 0); | |
| 1297 | 7371 } |
| 1648 | 7372 Actor::Die(uActorID); |
| 7373 Actor::ApplyFineForKillingPeasant(uActorID); | |
| 7374 Actor::AggroSurroundingPeasants(uActorID, 1); | |
| 1649 | 7375 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
|
7376 pParty->GivePartyExp(pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].uExp); |
| 1681 | 7377 int speechToPlay = SPEECH_51; |
| 1648 | 7378 if ( rand() % 100 < 20 ) |
| 1681 | 7379 speechToPlay = actorPtr->pMonsterInfo.uHP >= 100 ? 2 : 1; |
| 7380 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0); | |
| 1297 | 7381 } |
| 7382 } | |
| 7383 } | |
| 7384 } | |
| 7385 if ( !(dword_6BE368_debug_settings_2 & 0x10) | |
|
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
|
7386 && 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
|
7387 && 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
|
7388 { |
|
1694
5ead2688a227
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect second attempt
Grumpy7
parents:
1693
diff
changeset
|
7389 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7390 } |
| 1297 | 7391 } |
| 7392 if ( !pParty->bTurnBasedModeOn ) | |
| 7393 { | |
| 1681 | 7394 int actEndurance = playerPtr->GetActualEndurance(); |
| 7395 int recoveryTime = (int)((20 - playerPtr->GetParameterBonus(actEndurance)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333); | |
| 7396 playerPtr->SetRecoveryTime(recoveryTime); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7397 } |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7398 int yellThreshold = playerPtr->GetMaxHealth() / 4; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7399 if ( yellThreshold < playerPtr->sHealth && yellThreshold >= healthBeforeRecvdDamage && playerPtr->sHealth > 0 ) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7400 { |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7401 playerPtr->PlaySound(SPEECH_48, 0); |
| 1297 | 7402 } |
| 7403 viewparams->bRedrawGameUI = 1; | |
| 7404 return; | |
| 7405 } | |
| 1648 | 7406 else |
| 7407 { | |
| 1681 | 7408 SpriteObject* v37 = &pSpriteObjects[uActorID]; |
| 7409 int uActorType = PID_TYPE(v37->spell_caster_pid); | |
| 7410 int uActorID = PID_ID(v37->spell_caster_pid); | |
| 7411 if ( uActorType == 2 ) | |
| 7412 { | |
| 7413 Player *playerPtr; // eax@81 | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7414 if ( a4 != -1 ) |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7415 { |
| 1681 | 7416 playerPtr = &pParty->pPlayers[a4]; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7417 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7418 else |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7419 { |
| 1822 | 7420 int activePlayerCounter = 0; |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7421 for (int i = 1; i <= 4; i++) |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7422 { |
| 1822 | 7423 if (pPlayers[i]->CanAct()) |
| 7424 { | |
| 7425 v72[activePlayerCounter] = i; | |
| 7426 activePlayerCounter++; | |
| 7427 } | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7428 } |
| 1822 | 7429 if ( activePlayerCounter ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7430 { |
| 2006 | 7431 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
|
7432 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7433 } |
| 1681 | 7434 int v68; |
| 7435 int v69; | |
| 7436 if ( uActorType != OBJECT_Player || v37->spell_id != SPELL_BOW_ARROW) | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7437 { |
| 1681 | 7438 int playerMaxHp = playerPtr->GetMaxHealth(); |
| 7439 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
|
7440 v69 = LOBYTE(pSpellStats->pInfos[v37->spell_id].uSchool); |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7441 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7442 else |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7443 { |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7444 v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7445 v69 = 0; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7446 } |
| 1681 | 7447 playerPtr->ReceiveDamage(v68, (DAMAGE_TYPE)v69); |
| 7448 if ( uActorType == OBJECT_Player && !qword_A750D8 ) | |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7449 { |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7450 qword_A750D8 = 256i64; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7451 PlayerSpeechID = SPEECH_44; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7452 uSpeakingCharacter = uActorID + 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7453 } |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7454 return; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7455 } |
| 1681 | 7456 else if ( uActorType == 3 ) |
| 7457 { | |
| 7458 Actor *actorPtr = &pActors[uActorID]; | |
| 1648 | 7459 if ( a4 == -1 ) |
| 1911 | 7460 a4 = stru_50C198.which_player_to_attack(actorPtr); |
| 1681 | 7461 Player *playerPtr = &pParty->pPlayers[a4]; |
| 1876 | 7462 int dmgToReceive = actorPtr->_43B3E0_CalcDamage(dmgSource); |
| 1681 | 7463 unsigned __int16 spriteType = v37->uType; |
| 1648 | 7464 if ( v37->uType == 545 ) |
| 1297 | 7465 { |
| 1681 | 7466 __int16 skillLevel = playerPtr->GetActualSkillLevel(PLAYER_SKILL_UNARMED); |
| 7467 if ( SkillToMastery(skillLevel) >= 4 && rand() % 100 < (skillLevel & 0x3F) ) | |
| 1648 | 7468 { |
| 1681 | 7469 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], playerPtr->pName); |
| 1648 | 7470 ShowStatusBarString(pTmpBuf.data(), 2u); |
| 1681 | 7471 playerPtr->PlaySound(SPEECH_6, 0); |
| 1648 | 7472 return; |
| 7473 } | |
| 1297 | 7474 } |
| 1681 | 7475 else if ( spriteType == 555 |
| 7476 || spriteType == 510 | |
| 7477 || spriteType == 500 | |
| 7478 || spriteType == 515 | |
| 7479 || spriteType == 505 | |
| 7480 || spriteType == 530 | |
| 7481 || spriteType == 525 | |
| 7482 || spriteType == 520 | |
| 7483 || spriteType == 535 | |
| 7484 || spriteType == 540 ) | |
| 1297 | 7485 { |
| 1681 | 7486 if ( !stru_50C198.ActorHitOrMiss(actorPtr, playerPtr) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7487 return; |
| 1822 | 7488 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_SHIELD].uExpireTime > 0 ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7489 dmgToReceive >>= 1; |
| 1681 | 7490 if ( playerPtr->HasEnchantedItemEquipped(36) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7491 dmgToReceive >>= 1; |
| 1681 | 7492 if ( playerPtr->HasEnchantedItemEquipped(69) ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7493 dmgToReceive >>= 1; |
| 1681 | 7494 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
|
7495 && playerPtr->GetArmorItem()->uItemID == ITEM_ARTIFACT_GOVERNORS_ARMOR ) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7496 dmgToReceive >>= 1; |
| 1989 | 7497 if ( playerPtr->HasItemEquipped(EQUIP_TWO_HANDED)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7498 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7499 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
|
7500 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
|
7501 dmgToReceive >>= 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7502 } |
| 1989 | 7503 if ( playerPtr->HasItemEquipped(EQUIP_SINGLE_HANDED)) |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7504 { |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7505 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
|
7506 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
|
7507 dmgToReceive >>= 1; |
|
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7508 } |
| 1648 | 7509 } |
| 1949 | 7510 if ( actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime > 0 ) |
| 1648 | 7511 { |
| 1949 | 7512 int spellPower = actorPtr->pActorBuffs[ACTOR_BUFF_SHRINK].uPower; |
| 1681 | 7513 if ( spellPower ) |
| 7514 dmgToReceive /= (signed int)spellPower; | |
| 1648 | 7515 } |
| 1681 | 7516 int damageType; |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7517 switch(dmgSource) |
| 1648 | 7518 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7519 case 0: |
| 1681 | 7520 damageType = actorPtr->pMonsterInfo.uAttack1Type; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7521 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7522 case 1: |
| 1681 | 7523 damageType = actorPtr->pMonsterInfo.uAttack2Type; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7524 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7525 case 2: |
| 1681 | 7526 spellId = actorPtr->pMonsterInfo.uSpell1ID; |
| 7527 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7528 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7529 case 3: |
| 1681 | 7530 spellId = actorPtr->pMonsterInfo.uSpell2ID; |
| 7531 damageType = LOBYTE(pSpellStats->pInfos[spellId].uSchool); | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7532 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7533 case 4: |
| 1681 | 7534 damageType = actorPtr->pMonsterInfo.field_3C_some_special_attack; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7535 break; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7536 case 5: |
| 1681 | 7537 damageType = 4; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7538 break; |
| 1648 | 7539 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7540 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) |
| 1648 | 7541 { |
| 1681 | 7542 int reflectedDmg = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType); |
| 1822 | 7543 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) |
| 1297 | 7544 { |
| 1681 | 7545 unsigned __int16 actorState = actorPtr->uAIState; |
| 7546 if ( actorState != Dying && actorState != Dead) | |
| 1297 | 7547 { |
| 1681 | 7548 recvdMagicDmg = stru_50C198.CalcMagicalDamageToActor(actorPtr, damageType, reflectedDmg); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7549 actorPtr->sCurrentHP -= recvdMagicDmg; |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7550 if ( recvdMagicDmg >= 0 ) |
| 1297 | 7551 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7552 if ( actorPtr->sCurrentHP >= 1 ) |
| 1297 | 7553 { |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7554 Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7555 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7556 } |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7557 else |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7558 { |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7559 if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pRenderer->pRenderD3D && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) |
| 1297 | 7560 { |
| 1681 | 7561 int splatRadius = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; |
| 7562 pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)splatRadius, 0, 0); | |
| 1297 | 7563 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7564 Actor::Die(uActorID); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7565 Actor::ApplyFineForKillingPeasant(uActorID); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7566 Actor::AggroSurroundingPeasants(uActorID, 1); |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7567 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
|
7568 pParty->GivePartyExp(pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].uExp); |
| 1681 | 7569 int speechToPlay = SPEECH_51; |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7570 if ( rand() % 100 < 20 ) |
| 1681 | 7571 speechToPlay = actorPtr->pMonsterInfo.uHP >= 100 ? 2 : 1; |
| 7572 playerPtr->PlaySound((PlayerSpeech)speechToPlay, 0); | |
| 1297 | 7573 } |
| 7574 } | |
| 7575 } | |
| 7576 } | |
| 7577 } | |
|
1875
1d9e4b50bc7c
Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents:
1868
diff
changeset
|
7578 if ( !dmgSource |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7579 && !(dword_6BE368_debug_settings_2 & 0x10) |
|
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
|
7580 && 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
|
7581 && 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
|
7582 { |
|
1694
5ead2688a227
Player::_48DCF6 renamed to Player::ReceiveSpecialAttackEffect second attempt
Grumpy7
parents:
1693
diff
changeset
|
7583 playerPtr->ReceiveSpecialAttackEffect(actorPtr->pMonsterInfo.uSpecialAttackType, actorPtr); |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7584 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7585 if ( !pParty->bTurnBasedModeOn ) |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7586 { |
| 1681 | 7587 int actEnd = playerPtr->GetActualEndurance(); |
| 7588 int recTime = (int)((20 - playerPtr->GetParameterBonus(actEnd)) | |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7589 * flt_6BE3A4_debug_recmod1 |
|
1657
51a74615d956
DamagePlayerFromMonster continuing cleanup, part 3
Grumpy7
parents:
1656
diff
changeset
|
7590 * 2.133333333333333); |
| 1681 | 7591 playerPtr->SetRecoveryTime(recTime); |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7592 } |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7593 return; |
| 1648 | 7594 } |
|
1656
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7595 else |
|
56847118d50c
DamagePlayerFromMonster continuing cleanup, part 2
Grumpy7
parents:
1649
diff
changeset
|
7596 { |
| 1648 | 7597 return; |
| 7598 } | |
| 1297 | 7599 } |
| 7600 } | |
| 7601 //----- (00421EA6) -------------------------------------------------------- | |
| 1683 | 7602 void Player::OnInventoryLeftClick() |
| 7603 { | |
| 1822 | 7604 signed int inventoryXCoord; // ecx@2 |
| 7605 int inventoryYCoord; // eax@2 | |
| 1682 | 7606 int invMatrixIndex; // eax@2 |
| 1822 | 7607 unsigned int enchantedItemPos; // eax@7 |
| 1682 | 7608 unsigned int pickedItemId; // esi@12 |
| 7609 unsigned int invItemIndex; // eax@12 | |
| 1822 | 7610 unsigned int itemPos; // eax@18 |
| 1682 | 7611 ItemGen tmpItem; // [sp+Ch] [bp-3Ch]@1 |
| 1297 | 7612 unsigned int pY; // [sp+3Ch] [bp-Ch]@2 |
| 7613 unsigned int pX; // [sp+40h] [bp-8h]@2 | |
| 7614 | |
| 7615 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103 ) | |
| 7616 { | |
| 7617 pMouse->GetClickPos(&pX, &pY); | |
| 1822 | 7618 inventoryYCoord = (pY - 17) / 32; |
| 7619 inventoryXCoord = (pX - 14) / 32; | |
| 7620 invMatrixIndex = inventoryXCoord + (INVETORYSLOTSWIDTH * inventoryYCoord); | |
| 7621 if ( inventoryYCoord >= 0 && inventoryYCoord < INVETORYSLOTSHEIGHT && inventoryXCoord >= 0 && inventoryXCoord < INVETORYSLOTSWIDTH) | |
| 1682 | 7622 { |
| 1822 | 7623 if ( _50C9A0_IsEnchantingInProgress ) |
| 1297 | 7624 { |
| 1822 | 7625 enchantedItemPos = this->GetItemIDAtInventoryIndex(&invMatrixIndex); |
| 7626 if ( enchantedItemPos ) | |
| 1297 | 7627 { |
| 1822 | 7628 *((char *)pGUIWindow_Settings->ptr_1C + 8) &= 0x7Fu; |
| 7629 *((short *)pGUIWindow_Settings->ptr_1C + 2) = uActiveCharacter - 1; | |
| 7630 *((int *)pGUIWindow_Settings->ptr_1C + 3) = enchantedItemPos - 1; | |
| 7631 *((short *)pGUIWindow_Settings->ptr_1C + 3) = invMatrixIndex; | |
| 7632 ptr_50C9A4_ItemToEnchant = &this->pInventoryItemList[enchantedItemPos-1]; | |
| 7633 _50C9A0_IsEnchantingInProgress = 0; | |
| 7634 if ( pMessageQueue_50CBD0->uNumMessages ) | |
| 7635 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; | |
| 7636 pMouse->SetCursorBitmap("MICON1"); | |
| 7637 _50C9D0_AfterEnchClickEventId = 113; | |
| 7638 _50C9D4_AfterEnchClickEventSecondParam = 0; | |
| 7639 _50C9D8_AfterEnchClickEventTimeout = 256; | |
| 7640 } | |
| 7641 return; | |
| 7642 } | |
| 7643 if ( ptr_50C9A4_ItemToEnchant ) | |
| 7644 return; | |
| 7645 pickedItemId = pParty->pPickedItem.uItemID; | |
| 7646 invItemIndex = this->GetItemIDAtInventoryIndex(&invMatrixIndex); | |
| 7647 if (!pickedItemId) | |
| 7648 { | |
| 7649 if ( !invItemIndex ) | |
| 7650 return; | |
| 7651 else | |
| 7652 { | |
| 7653 memcpy(&pParty->pPickedItem, &this->pInventoryItemList[invItemIndex-1], sizeof(pParty->pPickedItem)); | |
| 7654 this->RemoveItemAtInventoryIndex(invMatrixIndex); | |
| 7655 pickedItemId = pParty->pPickedItem.uItemID; | |
| 7656 pMouse->SetCursorBitmap(pItemsTable->pItems[pickedItemId].pIconName); | |
| 1297 | 7657 return; |
| 7658 } | |
| 1822 | 7659 } |
| 7660 else | |
| 7661 { | |
| 7662 if ( invItemIndex ) | |
| 1297 | 7663 { |
| 1822 | 7664 ItemGen* invItemPtr = &this->pInventoryItemList[invItemIndex-1]; |
| 7665 memcpy(&tmpItem, invItemPtr, sizeof(tmpItem)); | |
| 7666 this->RemoveItemAtInventoryIndex(invMatrixIndex); | |
| 7667 int emptyIndex = this->AddItem2(invMatrixIndex, &pParty->pPickedItem); | |
| 7668 if ( !emptyIndex ) | |
| 1682 | 7669 { |
| 1822 | 7670 emptyIndex = this->AddItem2(-1, &pParty->pPickedItem); |
| 7671 if ( !emptyIndex ) | |
| 7672 { | |
| 7673 this->PutItemArInventoryIndex(tmpItem.uItemID, invItemIndex - 1, invMatrixIndex); | |
| 7674 memcpy(invItemPtr, &tmpItem, sizeof(ItemGen)); | |
| 7675 return; | |
| 7676 } | |
| 1682 | 7677 } |
| 1822 | 7678 memcpy(&pParty->pPickedItem, &tmpItem, sizeof(ItemGen)); |
| 7679 pMouse->SetCursorBitmap(pParty->pPickedItem.GetIconName()); | |
| 7680 return; | |
| 1297 | 7681 } |
| 1682 | 7682 else |
| 1297 | 7683 { |
| 1822 | 7684 itemPos = this->AddItem(invMatrixIndex, pickedItemId); |
| 7685 if ( itemPos ) | |
| 1297 | 7686 { |
| 1822 | 7687 memcpy(&this->pInventoryItemList[itemPos-1], &pParty->pPickedItem, sizeof(ItemGen)); |
| 7688 pMouse->RemoveHoldingItem(); | |
| 1682 | 7689 return; |
| 7690 } | |
| 1822 | 7691 itemPos = this->AddItem(-1, pickedItemId); |
| 7692 if ( itemPos ) | |
| 1682 | 7693 { |
| 1822 | 7694 memcpy(&this->pInventoryItemList[itemPos-1], &pParty->pPickedItem, sizeof(ItemGen)); |
| 7695 pMouse->RemoveHoldingItem(); | |
| 7696 return; | |
| 1297 | 7697 } |
| 7698 } | |
| 7699 } | |
| 7700 } | |
| 7701 } | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7702 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7703 |
|
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::IsWeak() |
|
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_Weak] != 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::IsDead() |
|
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_Dead] != 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::IsEradicated() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7716 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7717 return pConditions[Condition_Eradicated] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7718 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7719 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7720 bool Player::IsZombie() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7721 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7722 return pConditions[Condition_Zombie] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7723 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7724 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7725 bool Player::IsCursed() |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7726 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7727 return pConditions[Condition_Cursed] != 0; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7728 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7729 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7730 bool Player::IsPertified() |
|
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 return pConditions[Condition_Pertified] != 0; |
|
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 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7735 bool Player::IsUnconcious() |
|
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 return pConditions[Condition_Unconcious] != 0; |
|
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 |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7740 bool Player::IsAsleep() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7741 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7742 return pConditions[Condition_Sleep] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7743 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7744 |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7745 bool Player::IsParalyzed() |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7746 { |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7747 return pConditions[Condition_Paralyzed] != 0; |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7748 } |
|
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7749 |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7750 bool Player::IsDrunk() |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7751 { |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7752 return pConditions[Condition_Drunk] != 0; |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7753 } |
|
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1684
diff
changeset
|
7754 |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7755 void Player::SetCursed( bool state ) |
|
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_Cursed] = 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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7760 void Player::SetWeak( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7761 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7762 pConditions[Condition_Weak] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7763 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7764 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7765 void Player::SetAsleep( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7766 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7767 pConditions[Condition_Sleep] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7768 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7769 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7770 void Player::SetAfraid( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7771 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7772 pConditions[Condition_Fear] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7773 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7774 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7775 void Player::SetDrunk( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7776 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7777 pConditions[Condition_Drunk] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7778 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7779 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7780 void Player::SetInsane( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7781 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7782 pConditions[Condition_Insane] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7783 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7784 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7785 void Player::SetPoison1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7786 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7787 pConditions[Condition_Poison1] = state; |
|
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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7790 void Player::SetDisease1( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7791 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7792 pConditions[Condition_Disease1] = 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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7795 void Player::SetPoison2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7796 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7797 pConditions[Condition_Poison2] = 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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7800 void Player::SetDisease2( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7801 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7802 pConditions[Condition_Disease2] = 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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7805 void Player::SetPoison3( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7806 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7807 pConditions[Condition_Poison3] = 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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7810 void Player::SetDisease3( bool state ) |
|
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_Disease3] = 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 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7815 void Player::SetParalyzed( bool state ) |
|
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_Paralyzed] = 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::SetUnconcious( bool state ) |
|
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 pConditions[Condition_Unconcious] = state; |
|
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::SetDead( bool state ) |
|
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 pConditions[Condition_Dead] = state; |
|
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::SetPertified( bool state ) |
|
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 pConditions[Condition_Pertified] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7833 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7834 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7835 void Player::SetEradicated( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7836 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7837 pConditions[Condition_Eradicated] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7838 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7839 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7840 void Player::SetZombie( bool state ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7841 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7842 pConditions[Condition_Zombie] = state; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7843 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7844 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7845 void Player::SetCondWeakWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7846 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7847 SetCondition(Condition_Weak, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7848 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7849 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7850 void Player::SetCondInsaneWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7851 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7852 SetCondition(Condition_Insane, blockable); |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7853 } |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7854 |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7855 void Player::SetCondDeadWithBlockCheck( int blockable ) |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7856 { |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1360
diff
changeset
|
7857 SetCondition(Condition_Dead, blockable); |
|
1362
d6cf8ead9242
Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents:
1361
diff
changeset
|
7858 } |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7859 |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7860 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
|
7861 { |
|
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1565
diff
changeset
|
7862 SetCondition(Condition_Dead, blockable); |
|
1593
5658d0f3b5ee
Player::GetAttackRecoveryTime removing label, fixing shield skill being ignored, fixing haste being ignored
Grumpy7
parents:
1568
diff
changeset
|
7863 } |
|
1714
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::GetOffHandItem() |
|
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::uShield); |
|
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::GetMainHandItem() |
|
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::uMainHand); |
|
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::GetBowItem() |
|
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::uBow); |
|
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::GetArmorItem() |
|
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::uArmor); |
|
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::GetHelmItem() |
|
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::uHelm); |
|
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::GetBeltItem() |
|
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 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
|
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::GetCloakItem() |
|
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 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7900 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
|
7901 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7902 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
|
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 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7905 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
|
7906 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7907 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
|
7908 } |
|
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 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
|
7911 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7912 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
|
7913 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7914 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7915 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
|
7916 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7917 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
|
7918 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7919 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7920 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
|
7921 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7922 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
|
7923 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7924 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
|
7925 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7926 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
|
7927 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7928 |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7929 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
|
7930 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7931 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
|
7932 { |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7933 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
|
7934 } |
|
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7935 return &this->pInventoryItemList[this->pEquipment.*itemPos - 1]; |
| 1822 | 7936 } |
| 7937 | |
| 7938 int Player::GetPlayerIndex() | |
| 7939 { | |
| 7940 int uPlayerIdx = 0; | |
| 7941 if ( this == pPlayers[1] ) | |
| 7942 uPlayerIdx = 0; | |
| 7943 else if( this == pPlayers[2] ) | |
| 7944 uPlayerIdx = 1; | |
| 7945 else if ( this == pPlayers[3] ) | |
| 7946 uPlayerIdx = 2; | |
| 7947 else if ( this == pPlayers[4] ) | |
| 7948 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
|
7949 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
|
7950 Error("Unexpected player pointer"); |
| 1826 | 7951 return uPlayerIdx; |
|
1714
bafc79e65a4d
Item getter functions to reduce the number of ugly array accesses, fixing a bug with Player::setrecoverytime
Grumpy7
parents:
1710
diff
changeset
|
7952 } |