Mercurial > mm7
annotate Items.cpp @ 2371:43f29cb2e6ed
.
| author | Ritor1 |
|---|---|
| date | Sun, 01 Jun 2014 15:17:20 +0600 |
| parents | a574a80e7012 |
| children | bddcaf5d5db2 |
| rev | line source |
|---|---|
|
2253
aff7a7b072b7
adding _CRT_SECURE_NO_WARNINGS to get rid of a few hundrer annoying warnings + adding count parameter to swprintf
Grumpy7
parents:
2250
diff
changeset
|
1 #define _CRT_SECURE_NO_WARNINGS |
| 0 | 2 #include <stdlib.h> |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
3 #include <string> |
| 2355 | 4 #include "UI\UIHouses.h" |
| 2349 | 5 #include "GUIButton.h" |
| 2336 | 6 #include "mm7_unsorted_subs.h" |
| 7 #include "ErrorHandling.h" | |
| 0 | 8 |
| 9 #include "Items.h" | |
| 10 #include "MapInfo.h" | |
| 461 | 11 #include "GUIWindow.h" |
| 12 #include "Events2D.h" | |
| 13 #include "Chest.h" | |
| 0 | 14 #include "LOD.h" |
| 15 #include "Monsters.h" | |
| 16 #include "Party.h" | |
| 17 #include "FactionTable.h" | |
| 18 #include "StorylineTextTable.h" | |
| 189 | 19 #include "texts.h" |
| 0 | 20 #include "mm7_data.h" |
| 2340 | 21 #include "OurMath.h" |
| 0 | 22 |
| 23 | |
| 463 | 24 struct ITEM_VARIATION |
| 25 { | |
| 26 unsigned __int16 treasure_level; | |
| 27 unsigned __int16 item_class[4]; | |
| 28 }; | |
| 29 | |
| 30 | |
| 1202 | 31 std::array<const char, 5> uItemsAmountPerShopType={ 0, 6, 8, 12, 12}; |
| 463 | 32 |
| 526 | 33 const ITEM_VARIATION shopWeap_variation_ord[15] ={ |
| 463 | 34 { 0, { 0, 0, 0, 0 }}, |
| 35 { 1, { 23, 27, 20, 20 }}, | |
| 36 { 1, { 23, 24, 28, 20 }}, | |
| 37 { 2, { 23, 24, 25, 20 }}, | |
| 38 { 2, { 27, 27, 26, 26 }}, | |
| 39 { 4, { 24, 30, 25, 27 }}, | |
| 40 { 4, { 24, 30, 25, 27 }}, | |
| 41 { 3, { 30, 24, 20, 20 }}, | |
| 42 { 2, { 20, 20, 20, 20 }}, | |
| 43 { 3, { 27, 27, 26, 26 }}, | |
| 44 { 3, { 28, 28, 25, 25 }}, | |
| 45 { 2, { 23, 23, 24, 24 }}, | |
| 46 { 3, { 23, 23, 26, 26 }}, | |
| 47 { 2, { 30, 26, 26, 26 }}, | |
| 48 { 2, { 28, 25, 28, 29 }}}; | |
| 49 | |
| 526 | 50 const ITEM_VARIATION shopArmr_variation_ord[28] ={ |
| 463 | 51 { 1, { 35, 35, 38, 38 }}, |
| 52 { 1, { 31, 31, 31, 34 }}, | |
| 53 { 1, { 35, 35, 38, 38 }}, | |
| 54 { 1, { 31, 31, 32, 34 }}, | |
| 55 { 2, { 35, 35, 38, 38 }}, | |
| 56 { 2, { 31, 32, 32, 33 }}, | |
| 57 { 2, { 35, 35, 38, 38 }}, | |
| 58 { 2, { 31, 31, 32, 32 }}, | |
| 59 { 4, { 35, 35, 38, 38 }}, | |
| 60 { 4, { 31, 32, 33, 34 }}, | |
| 61 { 4, { 35, 35, 38, 38 }}, | |
| 62 { 4, { 31, 32, 33, 34 }}, | |
| 63 { 3, { 35, 35, 38, 38 }}, | |
| 64 { 3, { 31, 31, 31, 31 }}, | |
| 65 { 2, { 35, 35, 38, 38 }}, | |
| 66 { 2, { 31, 32, 34, 34 }}, | |
| 67 { 3, { 35, 35, 38, 38 }}, | |
| 68 { 3, { 31, 31, 32, 32 }}, | |
| 69 { 3, { 35, 35, 38, 38 }}, | |
| 70 { 3, { 32, 32, 32, 33 }}, | |
| 71 { 3, { 35, 35, 38, 38 }}, | |
| 72 { 3, { 31, 31, 31, 32 }}, | |
| 73 { 3, { 35, 35, 38, 38 }}, | |
| 74 { 3, { 33, 31, 32, 34 }}, | |
| 75 { 3, { 35, 35, 38, 38 }}, | |
| 76 { 3, { 33, 31, 32, 34 }}, | |
| 77 { 4, { 35, 35, 38, 38 }}, | |
| 78 { 4, { 33, 31, 32, 34 }}}; | |
| 79 | |
| 80 | |
| 81 | |
| 526 | 82 const unsigned __int16 shopMagic_treasure_lvl[14]= {0, 1, 1, 2, 2, 4, 4, 3, 2, 2, 2, 2, 2, 2}; |
| 83 const unsigned __int16 shopAlch_treasure_lvl[13] = {0, 1, 1, 2, 2, 3, 3, 4, 4, 2, 2, 2, 2}; | |
| 463 | 84 |
| 526 | 85 const ITEM_VARIATION shopWeap_variation_spc[15]={ |
| 463 | 86 { 0, { 0, 0, 0, 0 }}, |
| 470 | 87 { 2, { 25, 30, 20, 20}}, |
| 88 { 2, { 23, 24, 28, 20}}, | |
| 89 { 3, { 23, 24, 25, 20}}, | |
| 90 { 3, { 27, 27, 26, 26}}, | |
| 91 { 5, { 23, 26, 28, 27}}, | |
| 92 { 5, { 23, 26, 28, 27}}, | |
| 93 { 4, { 30, 24, 20, 20}}, | |
| 94 { 3, { 20, 20, 20, 20}}, | |
| 95 { 4, { 27, 27, 26, 26}}, | |
| 96 { 4, { 28, 28, 25, 25}}, | |
| 97 { 4, { 23, 23, 24, 24}}, | |
| 98 { 4, { 24, 24, 27, 20}}, | |
| 99 { 4, { 30, 26, 26, 26}}, | |
| 100 { 4, { 28, 25, 28, 29}}}; | |
| 463 | 101 |
| 526 | 102 const ITEM_VARIATION shopArmr_variation_spc[28]={ |
| 470 | 103 { 2, { 35, 35, 38, 38 }}, |
| 104 { 2, { 31, 31, 31, 34 }}, | |
| 105 { 2, { 35, 35, 38, 38 }}, | |
| 106 { 2, { 31, 31, 32, 34 }}, | |
| 107 { 3, { 35, 35, 38, 38 }}, | |
| 108 { 3, { 31, 32, 32, 33 }}, | |
| 109 { 3, { 35, 35, 38, 38 }}, | |
| 110 { 3, { 31, 31, 32, 32 }}, | |
| 111 { 5, { 35, 35, 38, 38 }}, | |
| 112 { 5, { 31, 32, 33, 34 }}, | |
| 113 { 5, { 35, 35, 38, 38 }}, | |
| 114 { 5, { 31, 32, 33, 34 }}, | |
| 115 { 4, { 35, 35, 38, 38 }}, | |
| 116 { 4, { 31, 31, 31, 31 }}, | |
| 117 { 3, { 35, 35, 38, 38 }}, | |
| 118 { 3, { 31, 32, 34, 34 }}, | |
| 119 { 4, { 35, 35, 38, 38 }}, | |
| 120 { 4, { 31, 31, 32, 33 }}, | |
| 121 { 4, { 35, 35, 38, 38 }}, | |
| 122 { 4, { 32, 32, 33, 34 }}, | |
| 123 { 4, { 35, 35, 38, 38 }}, | |
| 124 { 4, { 31, 31, 31, 32 }}, | |
| 125 { 4, { 35, 35, 38, 38 }}, | |
| 126 { 4, { 32, 32, 32, 32 }}, | |
| 127 { 4, { 35, 35, 38, 38 }}, | |
| 128 { 4, { 34, 34, 34, 34 }}, | |
| 129 { 5, { 35, 35, 38, 38 }}, | |
| 130 { 5, { 33, 33, 33, 33 }} | |
| 131 }; | |
| 463 | 132 |
| 526 | 133 const unsigned __int16 shopMagicSpc_treasure_lvl[14] = {0, 2, 2, 3, 3, 5, 5, 4, 3, 3, 3, 3, 3, 3}; |
| 134 const unsigned __int16 shopAlchSpc_treasure_lvl[13] = {0, 2, 2, 3, 3, 4, 4, 5, 5, 3, 2, 2, 2}; | |
| 135 | |
| 136 | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
137 std::array< std::array<char, 14>, 7> byte_4E8168={{ //byte_4E8178 |
| 526 | 138 { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, |
| 139 { 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}, | |
| 140 { 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3}, | |
| 141 { 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4}, | |
| 142 { 2, 2, 2, 2, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5}, | |
| 143 { 2, 2, 2, 2, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6}, | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
144 { 2, 2, 2, 2, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}}}; |
| 0 | 145 |
|
2285
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
146 int sub_4BE571_AddItemToSet(int valueToAdd, int *outPutSet, int elemsAlreadyPresent, int elemsNeeded); |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
147 int dword_F8B1DC_currentShopOption; // weak |
| 0 | 148 |
| 1682 | 149 ItemGen *ptr_50C9A4_ItemToEnchant; |
| 0 | 150 |
| 315 | 151 struct ItemsTable *pItemsTable; // 005D29E0 |
| 0 | 152 |
| 153 | |
| 154 | |
| 155 | |
| 156 | |
| 157 //----- (00439DF3) -------------------------------------------------------- | |
| 385 | 158 int ItemGen::_439DF3_get_additional_damage(int *damage_type, bool *draintargetHP) |
| 159 { | |
|
1933
5fcf6023f9c3
DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents:
1920
diff
changeset
|
160 *draintargetHP = false; |
| 385 | 161 *damage_type = 0; |
| 162 if ( !uItemID ) | |
| 163 return 0; | |
| 164 UpdateTempBonus(pParty->uTimePlayed); | |
| 165 if (uItemID == 501 ) //Iron Feather -sword | |
| 166 { | |
| 167 *damage_type = 1; | |
| 168 return rand() % 10 + 6; | |
| 169 } | |
| 170 if (uItemID == 507 ) //Ghoulsbane -axe | |
| 171 { | |
| 172 *damage_type = 0; | |
| 173 return rand() % 16 + 3; | |
| 174 } | |
| 175 if ( uItemID == 510 ) //Ullyses -bow | |
| 176 { | |
| 177 *damage_type = 2; | |
| 178 return rand() % 4 + 9; | |
| 179 } | |
| 180 if ( uItemID == 517 ) //Old Nick -dagger | |
| 181 { | |
| 182 *damage_type = 8; | |
| 183 return 8; | |
| 184 } | |
| 0 | 185 |
| 385 | 186 switch (uSpecEnchantmentType) |
| 187 { | |
| 188 case 4: //Adds 3-4 points of Cold damage. | |
| 189 *damage_type = 2; | |
| 190 return rand() % 2 + 3; | |
| 191 break; | |
| 192 case 5: //Adds 6-8 points of Cold damage. | |
| 193 *damage_type = 2; | |
| 194 return rand() % 3 + 6; | |
| 195 break; | |
| 196 case 6: //Adds 9-12 points of Cold damage. | |
| 197 *damage_type = 2; | |
| 198 return rand() % 4 + 9; | |
| 199 break; | |
| 200 case 7: //Adds 2-5 points of Electrical damage. | |
| 201 *damage_type = 1; | |
| 202 return rand() % 4 + 2; | |
| 203 break; | |
| 204 case 8: //Adds 4-10 points of Electrical damage. | |
| 205 *damage_type = 1; | |
| 206 return rand() % 7 + 4; | |
| 207 break; | |
| 208 case 9: //Adds 6-15 points of Electrical damage. | |
| 209 *damage_type = 1; | |
| 210 return rand() % 10 + 6; | |
| 211 break; | |
| 212 case 10: //Adds 1-6 points of Fire damage. | |
| 213 *damage_type = 0; | |
| 214 return GetDiceResult(1, 6); | |
| 215 break; | |
| 216 case 11: //Adds 2-12 points of Fire damage. | |
| 217 *damage_type = 0; | |
| 218 return GetDiceResult(2, 6); | |
| 219 break; | |
| 220 case 12: //Adds 3-18 points of Fire damage. | |
| 221 *damage_type = 0; | |
| 222 return GetDiceResult(3, 6); | |
| 223 break; | |
| 224 case 13: //Adds 5 points of Body damage. | |
| 225 *damage_type = 8; | |
| 226 return 5; | |
| 227 break; | |
| 228 case 14: //Adds 8 points of Body damage. | |
| 229 *damage_type = 8; | |
| 230 return 8; | |
| 231 break; | |
| 232 case 15: //Adds 12 points of Body damage. | |
| 233 *damage_type = 8; | |
| 234 return 12; | |
| 235 break; | |
| 236 case 16: //Drain Hit Points from target. | |
| 237 case 41: //Drain Hit Points from target and Increased Weapon speed. | |
| 238 *damage_type = 10; | |
| 239 *draintargetHP = true; | |
| 240 return 0; | |
| 241 break; | |
| 242 case 46: //Adds 10-20 points of Fire damage and +25 Might. | |
| 243 *damage_type = 0; | |
| 244 return rand() % 11 + 10; | |
| 245 break; | |
| 246 default: | |
| 247 *damage_type = 0; | |
| 248 return 0; | |
| 249 | |
| 250 } | |
| 251 | |
| 252 } | |
| 0 | 253 |
| 254 | |
| 255 //----- (00402F07) -------------------------------------------------------- | |
| 256 void ItemGen::Reset() | |
| 257 { | |
| 377 | 258 this->uHolderPlayer = 0; |
| 0 | 259 this->uAttributes = 0; |
| 260 this->uNumCharges = 0; | |
| 377 | 261 this->uSpecEnchantmentType = 0; |
| 1599 | 262 this->m_enchantmentStrength = 0; |
| 570 | 263 this->uEnchantmentType = 0; |
| 0 | 264 this->uItemID = 0; |
| 265 this->uBodyAnchor = 0; | |
| 266 this->uExpireTime = 0i64; | |
| 267 } | |
| 268 | |
| 269 //----- (00458260) -------------------------------------------------------- | |
| 270 void ItemGen::UpdateTempBonus(__int64 uTimePlayed) | |
| 271 { | |
| 463 | 272 if ( this->uAttributes & ITEM_TEMP_BONUS ) |
| 0 | 273 { |
| 274 if ( uTimePlayed > (signed __int64)this->uExpireTime ) | |
| 275 { | |
| 570 | 276 this->uEnchantmentType = 0; |
| 377 | 277 this->uSpecEnchantmentType = 0; |
| 463 | 278 this->uAttributes = this->uAttributes&(~ITEM_TEMP_BONUS); |
| 0 | 279 } |
| 280 } | |
| 281 } | |
| 282 | |
| 283 //----- (0045814E) -------------------------------------------------------- | |
| 374 | 284 void ItemsTable::Release() |
| 0 | 285 { |
| 286 if ( pMonstersTXT_Raw ) | |
| 1583 | 287 free(pMonstersTXT_Raw); |
| 0 | 288 if ( pMonsterPlacementTXT_Raw ) |
| 1583 | 289 free(pMonsterPlacementTXT_Raw); |
| 0 | 290 if ( pSkillDescTXT_Raw ) |
| 1583 | 291 free(pSkillDescTXT_Raw); |
| 374 | 292 if (pSpcItemsTXT_Raw ) |
| 1583 | 293 free(pSpcItemsTXT_Raw); |
| 374 | 294 if ( pStdItemsTXT_Raw ) |
| 1583 | 295 free(pStdItemsTXT_Raw); |
| 374 | 296 if ( pRndItemsTXT_Raw ) |
| 1583 | 297 free(pRndItemsTXT_Raw); |
| 374 | 298 if ( pItemsTXT_Raw ) |
| 1583 | 299 free(pItemsTXT_Raw); |
| 0 | 300 if ( pHostileTXT_Raw ) |
| 1583 | 301 free(pHostileTXT_Raw); |
| 0 | 302 if ( pHistoryTXT_Raw ) |
| 1583 | 303 free(pHistoryTXT_Raw); |
| 0 | 304 if ( pPotionsTXT_Raw ) |
| 1583 | 305 free(pPotionsTXT_Raw); |
| 0 | 306 if ( pPotionNotesTXT_Raw ) |
| 1583 | 307 free(pPotionNotesTXT_Raw); |
| 374 | 308 pSpcItemsTXT_Raw = NULL; |
| 309 pSkillDescTXT_Raw = NULL; | |
| 310 pStdItemsTXT_Raw = NULL; | |
| 311 pRndItemsTXT_Raw = NULL; | |
| 312 pItemsTXT_Raw = NULL; | |
| 0 | 313 } |
| 314 | |
| 1082 | 315 |
| 0 | 316 //----- (00456D84) -------------------------------------------------------- |
| 317 void ItemsTable::Initialize() | |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
318 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
319 std::map<std::string, ITEM_EQUIP_TYPE, ci_less> equipStatMap; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
320 equipStatMap["weapon"] = EQUIP_SINGLE_HANDED; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
321 equipStatMap["weapon2"] = EQUIP_TWO_HANDED; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
322 equipStatMap["weapon1or2"] = EQUIP_SINGLE_HANDED; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
323 equipStatMap["missile"] = EQUIP_BOW; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
324 equipStatMap["bow"] = EQUIP_BOW; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
325 equipStatMap["armor"] = EQUIP_ARMOUR; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
326 equipStatMap["shield"] = EQUIP_SHIELD; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
327 equipStatMap["helm"] = EQUIP_HELMET; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
328 equipStatMap["belt"] = EQUIP_BELT; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
329 equipStatMap["cloak"] = EQUIP_CLOAK; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
330 equipStatMap["gauntlets"] = EQUIP_GAUNTLETS; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
331 equipStatMap["boots"] = EQUIP_BOOTS; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
332 equipStatMap["ring"] = EQUIP_RING; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
333 equipStatMap["amulet"] = EQUIP_AMULET; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
334 equipStatMap["weaponw"] = EQUIP_WAND; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
335 equipStatMap["herb"] = EQUIP_REAGENT; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
336 equipStatMap["reagent"] = EQUIP_REAGENT; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
337 equipStatMap["bottle"] = EQUIP_POTION; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
338 equipStatMap["sscroll"] = EQUIP_SPELL_SCROLL; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
339 equipStatMap["book"] = EQUIP_BOOK; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
340 equipStatMap["mscroll"] = EQUIP_MESSAGE_SCROLL; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
341 equipStatMap["gold"] = EQUIP_GOLD; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
342 equipStatMap["gem"] = EQUIP_GEM; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
343 |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
344 std::map<std::string, PLAYER_SKILL_TYPE, ci_less> equipSkillMap; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
345 equipSkillMap["staff"] = PLAYER_SKILL_STAFF; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
346 equipSkillMap["sword"] = PLAYER_SKILL_SWORD; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
347 equipSkillMap["dagger"] = PLAYER_SKILL_DAGGER; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
348 equipSkillMap["axe"] = PLAYER_SKILL_AXE; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
349 equipSkillMap["spear"] = PLAYER_SKILL_SPEAR; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
350 equipSkillMap["bow"] = PLAYER_SKILL_BOW; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
351 equipSkillMap["mace"] = PLAYER_SKILL_MACE; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
352 equipSkillMap["blaster"] = PLAYER_SKILL_BLASTER; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
353 equipSkillMap["shield"] = PLAYER_SKILL_SHIELD; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
354 equipSkillMap["leather"] = PLAYER_SKILL_LEATHER; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
355 equipSkillMap["chain"] = PLAYER_SKILL_CHAIN; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
356 equipSkillMap["plate"] = PLAYER_SKILL_PLATE; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
357 equipSkillMap["club"] = PLAYER_SKILL_CLUB; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
358 |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
359 std::map<std::string, ITEM_MATERIAL, ci_less> materialMap; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
360 materialMap["artifact"] = MATERIAL_ARTEFACT; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
361 materialMap["relic"] = MATERIAL_RELIC; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
362 materialMap["special"] = MATERIAL_SPECIAL; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
363 |
| 2262 | 364 char* test_string; |
| 365 int item_counter; | |
| 224 | 366 |
| 367 pMapStats = new MapStats; | |
| 368 pMapStats->Initialize(); | |
| 369 | |
| 370 pMonsterStats = new MonsterStats; | |
| 371 pMonsterStats->Initialize(); | |
| 372 pMonsterStats->InitializePlacements(); | |
| 373 | |
| 374 pSpellStats = new SpellStats; | |
| 375 pSpellStats->Initialize(); | |
| 376 | |
| 377 LoadPotions(); | |
| 378 LoadPotionNotes(); | |
| 379 | |
| 380 pFactionTable = new FactionTable; | |
| 381 pFactionTable->Initialize(); | |
| 382 | |
| 383 pStorylineText = new StorylineText; | |
| 384 pStorylineText->Initialize(); | |
| 0 | 385 |
| 224 | 386 pStdItemsTXT_Raw = NULL; |
| 387 pStdItemsTXT_Raw = (char *)pEvents_LOD->LoadRaw("stditems.txt", 0); | |
| 388 strtok(pStdItemsTXT_Raw, "\r"); | |
| 389 strtok(NULL, "\r"); | |
| 390 strtok(NULL, "\r"); | |
| 391 strtok(NULL, "\r"); | |
| 392 //Standard Bonuses by Group | |
| 2282 | 393 for (int i=0;i<24;++i) |
| 224 | 394 { |
| 395 test_string = strtok(NULL, "\r") + 1; | |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
396 auto tokens = Tokenize(test_string, '\t'); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
397 pEnchantments[i].pBonusStat=RemoveQuotes(tokens[0]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
398 pEnchantments[i].pOfName=RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
399 for (int j = 0; j < 9; j++) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
400 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
401 pEnchantments[i].to_item[j]=atoi(tokens[j+2]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
402 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
403 } |
| 0 | 404 |
| 224 | 405 memset(&pEnchantmentsSumm, 0, 36); |
| 2282 | 406 for(int i=0;i<9;++i) |
| 224 | 407 { |
| 2282 | 408 for (int j=0;j<24;++j) |
| 224 | 409 pEnchantmentsSumm[i]+=pEnchantments[j].to_item[i]; |
| 410 } | |
| 0 | 411 |
| 224 | 412 //Bonus range for Standard by Level |
| 413 strtok(NULL, "\r"); | |
| 414 strtok(NULL, "\r"); | |
| 415 strtok(NULL, "\r"); | |
| 416 strtok(NULL, "\r"); | |
| 417 strtok(NULL, "\r"); | |
| 2282 | 418 for(int i=0;i<6;++i) //counted from 1 |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
419 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
420 test_string = strtok(NULL, "\r") + 1; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
421 auto tokens = Tokenize(test_string, '\t'); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
422 Assert(tokens.size() == 4, "Invalid number of tokens"); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
423 bonus_ranges[i].minR = atoi(tokens[2]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
424 bonus_ranges[i].maxR =atoi(tokens[3]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
425 } |
| 224 | 426 |
| 222 | 427 |
| 224 | 428 pSpcItemsTXT_Raw = 0; |
| 429 pSpcItemsTXT_Raw = (char *)pEvents_LOD->LoadRaw("spcitems.txt", 0); | |
| 430 strtok(pSpcItemsTXT_Raw, "\r"); | |
| 431 strtok(NULL, "\r"); | |
| 432 strtok(NULL, "\r"); | |
| 433 strtok(NULL, "\r"); | |
| 2282 | 434 for (int i=0;i<72;++i) |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
435 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
436 test_string = strtok(NULL, "\r") + 1; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
437 auto tokens = Tokenize(test_string, '\t'); |
| 2261 | 438 Assert(tokens.size() >= 17, "Invalid number of tokens"); |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
439 pSpecialEnchantments[i].pBonusStatement=RemoveQuotes(tokens[0]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
440 pSpecialEnchantments[i].pNameAdd= RemoveQuotes(tokens[1]); |
| 2262 | 441 for (int j = 0; j < 12; j++) |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
442 { |
| 2262 | 443 pSpecialEnchantments[i].to_item_apply[j]=atoi(tokens[j+2]); |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
444 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
445 int res; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
446 res=atoi(tokens[14]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
447 if(!res) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
448 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
449 ++tokens[14]; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
450 while (*tokens[14]==' ')//fix X 2 case |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
451 ++tokens[14]; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
452 res=atoi(tokens[14]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
453 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
454 pSpecialEnchantments[i].iValue=res; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
455 pSpecialEnchantments[i].iTreasureLevel= tolower(tokens[15][0]) - 97; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
456 } |
| 224 | 457 |
| 458 pSpecialEnchantments_count = 71; | |
| 459 memset(&pSpecialEnchantmentsSumm, 0, 96); | |
| 2282 | 460 for(int i=0;i<12;++i) |
| 224 | 461 { |
| 2262 | 462 for (unsigned int j=0;j<=pSpecialEnchantments_count;++j) |
| 224 | 463 pSpecialEnchantmentsSumm[i]+=pSpecialEnchantments[j].to_item_apply[i]; |
| 464 } | |
| 222 | 465 |
| 2355 | 466 InitializeBuildingResidents(); |
| 222 | 467 |
| 224 | 468 pItemsTXT_Raw = NULL; |
| 469 pItemsTXT_Raw = (char*) pEvents_LOD->LoadRaw("items.txt", 0); | |
| 470 strtok(pItemsTXT_Raw, "\r"); | |
| 471 strtok(NULL, "\r"); | |
| 472 uAllItemsCount = 0; | |
| 473 item_counter = 0; | |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
474 while (item_counter < 800) |
| 222 | 475 { |
| 476 test_string = strtok(NULL, "\r") + 1; | |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
477 auto tokens = Tokenize(test_string, '\t'); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
478 item_counter=atoi(tokens[0]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
479 uAllItemsCount=item_counter; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
480 pItems[item_counter].pIconName = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
481 pItems[item_counter].pName = RemoveQuotes(tokens[2]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
482 pItems[item_counter].uValue=atoi(tokens[3]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
483 auto findResult = equipStatMap.find(tokens[4]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
484 pItems[item_counter].uEquipType = findResult == equipStatMap.end() ? EQUIP_NONE : findResult->second; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
485 auto findResult2 = equipSkillMap.find(tokens[5]); |
| 2263 | 486 pItems[item_counter].uSkillType = findResult2 == equipSkillMap.end() ? PLAYER_SKILL_MISC : findResult2->second; |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
487 auto tokens2 = Tokenize(tokens[6], 'd'); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
488 if (tokens2.size() == 2) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
489 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
490 pItems[item_counter].uDamageDice=atoi(tokens2[0]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
491 pItems[item_counter].uDamageRoll=atoi(tokens2[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
492 } |
| 2261 | 493 else if (tolower(tokens2[0][0]) != 's') |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
494 { |
| 2261 | 495 pItems[item_counter].uDamageDice=atoi(tokens2[0]); |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
496 pItems[item_counter].uDamageRoll=1; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
497 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
498 else |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
499 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
500 pItems[item_counter].uDamageDice=0; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
501 pItems[item_counter].uDamageRoll=0; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
502 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
503 pItems[item_counter].uDamageMod=atoi(tokens[7]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
504 auto findResult3 = materialMap.find(tokens[8]); |
| 2263 | 505 pItems[item_counter].uMaterial = findResult3 == materialMap.end() ? MATERIAL_COMMON : findResult->second; |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
506 pItems[item_counter].uItemID_Rep_St=atoi(tokens[9]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
507 pItems[item_counter].pUnidentifiedName = RemoveQuotes(tokens[10]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
508 pItems[item_counter].uSpriteID=atoi(tokens[11]); |
| 224 | 509 |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
510 pItems[item_counter]._additional_value=0; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
511 pItems[item_counter]._bonus_type=0; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
512 if (pItems[item_counter].uMaterial==MATERIAL_SPECIAL) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
513 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
514 for(int ii=0; ii<24; ++ii) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
515 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
516 if (!_stricmp(tokens[12],pEnchantments[ii].pOfName)) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
517 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
518 pItems[item_counter]._bonus_type=ii+1; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
519 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
520 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
521 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
522 if (!pItems[item_counter]._bonus_type) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
523 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
524 for(int ii=0; ii<72; ++ii) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
525 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
526 if (!_stricmp(tokens[12],pSpecialEnchantments[ii].pNameAdd)) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
527 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
528 pItems[item_counter]._additional_value=ii+1; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
529 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
530 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
531 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
532 } |
| 224 | 533 |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
534 if ((pItems[item_counter].uMaterial==MATERIAL_SPECIAL)&&(pItems[item_counter]._bonus_type)) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
535 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
536 char b_s=atoi(tokens[13]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
537 if (b_s) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
538 pItems[item_counter]._bonus_strength=b_s; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
539 else |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
540 pItems[item_counter]._bonus_strength=1; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
541 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
542 else |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
543 pItems[item_counter]._bonus_strength=0; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
544 pItems[item_counter].uEquipX=atoi(tokens[14]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
545 pItems[item_counter].uEquipY=atoi(tokens[15]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
546 pItems[item_counter].pDescription = RemoveQuotes(tokens[16]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
547 item_counter++; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
548 } |
| 222 | 549 |
| 224 | 550 pRndItemsTXT_Raw = NULL; |
| 551 uAllItemsCount = item_counter; | |
| 552 pRndItemsTXT_Raw = (char *)pEvents_LOD->LoadRaw("rnditems.txt", 0); | |
| 553 strtok(pRndItemsTXT_Raw, "\r"); | |
| 554 strtok(NULL, "\r"); | |
| 555 strtok(NULL, "\r"); | |
| 556 strtok(NULL, "\r"); | |
| 2269 | 557 for (item_counter = 0; item_counter < 619; item_counter++) |
| 224 | 558 { |
| 559 test_string = strtok(NULL, "\r") + 1; | |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
560 auto tokens = Tokenize(test_string, '\t'); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
561 Assert(tokens.size() > 7, "Invalid number of tokens"); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
562 item_counter = atoi(tokens[0]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
563 pItems[item_counter].uChanceByTreasureLvl1=atoi(tokens[2]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
564 pItems[item_counter].uChanceByTreasureLvl2=atoi(tokens[3]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
565 pItems[item_counter].uChanceByTreasureLvl3=atoi(tokens[4]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
566 pItems[item_counter].uChanceByTreasureLvl4=atoi(tokens[5]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
567 pItems[item_counter].uChanceByTreasureLvl5=atoi(tokens[6]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
568 pItems[item_counter].uChanceByTreasureLvl6=atoi(tokens[7]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
569 } |
| 224 | 570 |
| 1006 | 571 //ChanceByTreasureLvl Summ - to calculate chance |
| 224 | 572 memset(&uChanceByTreasureLvlSumm, 0, 24); |
| 2282 | 573 for(int i=0;i<6;++i) |
| 224 | 574 { |
| 2282 | 575 for (int j=1;j<item_counter;++j) |
| 224 | 576 uChanceByTreasureLvlSumm[i]+=pItems[j].uChanceByTreasureLvl[i]; |
| 577 } | |
| 222 | 578 |
| 224 | 579 strtok(NULL, "\r"); |
| 580 strtok(NULL, "\r"); | |
| 581 strtok(NULL, "\r"); | |
| 582 strtok(NULL, "\r"); | |
| 583 strtok(NULL, "\r"); | |
| 2282 | 584 for (int i=0;i<3;++i) |
| 224 | 585 { |
| 586 test_string = strtok(NULL, "\r") + 1; | |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
587 auto tokens = Tokenize(test_string, '\t'); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
588 Assert(tokens.size() > 7, "Invalid number of tokens"); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
589 switch (i) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
590 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
591 case 0: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
592 uBonusChanceStandart[0]=atoi(tokens[2]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
593 uBonusChanceStandart[1]=atoi(tokens[3]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
594 uBonusChanceStandart[2]=atoi(tokens[4]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
595 uBonusChanceStandart[3]=atoi(tokens[5]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
596 uBonusChanceStandart[4]=atoi(tokens[6]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
597 uBonusChanceStandart[5]=atoi(tokens[7]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
598 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
599 case 1: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
600 uBonusChanceSpecial[0]=atoi(tokens[2]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
601 uBonusChanceSpecial[1]=atoi(tokens[3]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
602 uBonusChanceSpecial[2]=atoi(tokens[4]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
603 uBonusChanceSpecial[3]=atoi(tokens[5]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
604 uBonusChanceSpecial[4]=atoi(tokens[6]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
605 uBonusChanceSpecial[5]=atoi(tokens[7]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
606 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
607 case 2: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
608 uBonusChanceWpSpecial[0]=atoi(tokens[2]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
609 uBonusChanceWpSpecial[1]=atoi(tokens[3]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
610 uBonusChanceWpSpecial[2]=atoi(tokens[4]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
611 uBonusChanceWpSpecial[3]=atoi(tokens[5]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
612 uBonusChanceWpSpecial[4]=atoi(tokens[6]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
613 uBonusChanceWpSpecial[5]=atoi(tokens[7]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
614 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
615 } |
| 224 | 616 } |
| 222 | 617 |
| 705 | 618 if ( pRndItemsTXT_Raw ) |
| 619 { | |
| 1583 | 620 free(pRndItemsTXT_Raw); |
| 705 | 621 pRndItemsTXT_Raw = NULL; |
| 622 } | |
| 623 | |
| 224 | 624 pSkillDescTXT_Raw = NULL; |
| 625 pSkillDescTXT_Raw = (char *)pEvents_LOD->LoadRaw("skilldes.txt", 0); | |
| 626 strtok(pSkillDescTXT_Raw, "\r"); | |
| 2282 | 627 for (int i=0; i<37; ++i) |
| 224 | 628 { |
| 629 test_string = strtok(NULL, "\r") + 1; | |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
630 auto tokens = Tokenize(test_string, '\t'); |
| 2261 | 631 Assert(tokens.size() >= 6, "Invalid number of tokens"); |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
632 pSkillDesc[i] = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
633 pNormalSkillDesc[i] = RemoveQuotes(tokens[2]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
634 pExpertSkillDesc[i] = RemoveQuotes(tokens[3]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
635 pMasterSkillDesc[i] = RemoveQuotes(tokens[4]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
636 pGrandSkillDesc[i] = RemoveQuotes(tokens[5]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
637 } |
| 224 | 638 |
| 639 pStatsTXT_Raw = 0; | |
| 640 pStatsTXT_Raw = (char *)pEvents_LOD->LoadRaw("stats.txt", 0); | |
| 641 strtok(pStatsTXT_Raw, "\r"); | |
| 2282 | 642 for (int i=0; i<26; ++i) |
| 224 | 643 { |
| 644 test_string = strtok(NULL, "\r") + 1; | |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
645 auto tokens = Tokenize(test_string, '\t'); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
646 Assert(tokens.size() == 2, "Invalid number of tokens"); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
647 switch (i) |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
648 { |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
649 case 0: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
650 case 1: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
651 case 2: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
652 case 3: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
653 case 4: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
654 case 5: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
655 case 6: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
656 pAttributeDescriptions[i] = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
657 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
658 case 7: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
659 pHealthPointsAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
660 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
661 case 8: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
662 pArmourClassAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
663 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
664 case 9: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
665 pSpellPointsAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
666 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
667 case 10: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
668 pPlayerConditionAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
669 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
670 case 11: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
671 pFastSpellAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
672 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
673 case 12: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
674 pPlayerAgeAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
675 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
676 case 13: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
677 pPlayerLevelAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
678 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
679 case 14: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
680 pPlayerExperienceAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
681 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
682 case 15: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
683 pAttackBonusAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
684 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
685 case 16: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
686 pAttackDamageAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
687 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
688 case 17: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
689 pMissleBonusAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
690 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
691 case 18: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
692 pMissleDamageAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
693 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
694 case 19: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
695 pFireResistanceAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
696 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
697 case 20: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
698 pAirResistanceAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
699 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
700 case 21: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
701 pWaterResistanceAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
702 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
703 case 22: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
704 pEarthResistanceAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
705 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
706 case 23: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
707 pMindResistanceAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
708 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
709 case 24: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
710 pBodyResistanceAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
711 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
712 case 25: |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
713 pSkillPointsAttributeDescription = RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
714 break; |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
715 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
716 } |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
717 |
| 224 | 718 pClassTXT_Raw = 0; |
| 719 pClassTXT_Raw = (char *)pEvents_LOD->LoadRaw("class.txt", 0); | |
| 720 strtok(pClassTXT_Raw, "\r"); | |
| 2282 | 721 for (int i=0; i<36; ++i) |
| 224 | 722 { |
| 723 test_string = strtok(NULL, "\r") + 1; | |
|
2260
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
724 auto tokens = Tokenize(test_string, '\t'); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
725 Assert(tokens.size() == 3, "Invalid number of tokens"); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
726 pClassDescriptions[i]=RemoveQuotes(tokens[1]); |
|
eab43c3d7767
Using new tokenizer in Items.cpp initialize function
Grumpy7
parents:
2253
diff
changeset
|
727 } |
| 222 | 728 |
|
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:
1603
diff
changeset
|
729 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
730 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
731 ItemGen::PopulateSpecialBonusMap(); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
732 ItemGen::PopulateArtifactBonusMap(); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
733 ItemGen::PopulateRegularBonusMap(); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
734 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
735 |
| 224 | 736 } |
| 0 | 737 |
| 738 //----- (00456D17) -------------------------------------------------------- | |
| 739 void ItemsTable::SetSpecialBonus(ItemGen *pItem) | |
| 740 { | |
| 385 | 741 if ( pItems[pItem->uItemID].uMaterial == MATERIAL_SPECIAL ) |
| 0 | 742 { |
| 570 | 743 pItem->uEnchantmentType = pItems[pItem->uItemID]._bonus_type; |
| 385 | 744 pItem->uSpecEnchantmentType = pItems[pItem->uItemID]._additional_value; |
| 1599 | 745 pItem->m_enchantmentStrength = pItems[pItem->uItemID]._bonus_strength; |
| 0 | 746 } |
| 747 } | |
| 748 | |
| 749 //----- (00456D43) -------------------------------------------------------- | |
| 377 | 750 bool ItemsTable::IsMaterialSpecial(ItemGen *pItem) |
| 0 | 751 { |
| 377 | 752 return this->pItems[pItem->uItemID].uMaterial == MATERIAL_SPECIAL; |
| 0 | 753 } |
| 754 | |
| 755 //----- (00456D5E) -------------------------------------------------------- | |
| 377 | 756 bool ItemsTable::IsMaterialNonCommon(ItemGen *pItem) |
| 0 | 757 { |
| 385 | 758 return pItems[pItem->uItemID].uMaterial == MATERIAL_SPECIAL || |
| 759 pItems[pItem->uItemID].uMaterial == MATERIAL_RELIC || | |
| 760 pItems[pItem->uItemID].uMaterial == MATERIAL_ARTEFACT; | |
| 0 | 761 } |
| 762 | |
| 763 | |
| 764 //----- (00453B3C) -------------------------------------------------------- | |
| 765 void ItemsTable::LoadPotions() | |
|
2284
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
766 { |
| 0 | 767 |
|
2284
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
768 CHAR Text[90]; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
769 char* test_string; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
770 unsigned int uRow; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
771 unsigned int uColumn; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
772 unsigned __int8 potion_value; |
| 222 | 773 |
|
2284
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
774 if ( pPotionNotesTXT_Raw ) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
775 free(pPotionNotesTXT_Raw); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
776 pPotionNotesTXT_Raw = NULL; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
777 auto tokens = Tokenize("", '\t'); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
778 char* pPotionsTXT_Raw = (char *)pEvents_LOD->LoadRaw("potion.txt", 0); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
779 test_string = strtok(pPotionsTXT_Raw ,"\r") + 1; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
780 while (test_string) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
781 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
782 tokens = Tokenize(test_string, '\t'); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
783 if (!strcmp(tokens[0], "222")) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
784 break; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
785 test_string = strtok(NULL ,"\r") + 1; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
786 } |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
787 if (!test_string) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
788 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
789 MessageBoxA(0, "Error Pre-Parsing Potion Table", "Load Error", MB_ICONHAND|MB_CANCELTRYCONTINUE); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
790 return; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
791 } |
|
193
821fd955c379
fixed potion data parsing. Somehow 3d render was affected
Gloval
parents:
189
diff
changeset
|
792 |
|
2284
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
793 for (uRow = 0;uRow < 50; ++uRow) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
794 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
795 if (tokens.size() < 50) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
796 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
797 wsprintfA(Text, "Error Parsing Potion Table at Row: %d Column: %d", uRow, tokens.size()); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
798 MessageBoxA(0, Text, "Parsing Error", MB_ICONHAND|MB_CANCELTRYCONTINUE); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
799 return; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
800 } |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
801 for (uColumn = 0; uColumn < 50; ++uColumn) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
802 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
803 char* currValue = tokens[uColumn + 7]; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
804 potion_value = atoi(currValue); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
805 if ( !potion_value && tolower(currValue[0]) == 'e') |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
806 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
807 potion_value = atoi(currValue + 1); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
808 } |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
809 this->potion_data[uRow][uColumn]=potion_value; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
810 } |
|
193
821fd955c379
fixed potion data parsing. Somehow 3d render was affected
Gloval
parents:
189
diff
changeset
|
811 |
|
2284
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
812 test_string = strtok(NULL ,"\r") + 1; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
813 if (!test_string) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
814 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
815 wsprintfA(Text, "Error Parsing Potion Table at Row: %d Column: %d", uRow, 0); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
816 MessageBoxA(0, Text, "Parsing Error", MB_ICONHAND|MB_CANCELTRYCONTINUE); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
817 return; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
818 } |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
819 tokens = Tokenize(test_string, '\t'); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
820 } |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
821 } |
| 0 | 822 |
| 823 //----- (00453CE5) -------------------------------------------------------- | |
| 824 void ItemsTable::LoadPotionNotes() | |
|
2284
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
825 { |
| 222 | 826 |
|
2284
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
827 CHAR Text[90]; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
828 char* test_string; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
829 unsigned int uRow; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
830 unsigned int uColumn; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
831 unsigned __int8 potion_note; |
| 222 | 832 |
| 833 if ( pPotionNotesTXT_Raw ) | |
| 1583 | 834 free(pPotionNotesTXT_Raw); |
| 222 | 835 pPotionNotesTXT_Raw = NULL; |
|
2284
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
836 auto tokens = Tokenize("", '\t'); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
837 char* pPotionNotesTXT_Raw = (char *)pEvents_LOD->LoadRaw("potnotes.txt", 0); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
838 test_string = strtok(pPotionNotesTXT_Raw ,"\r") + 1; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
839 while (test_string) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
840 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
841 tokens = Tokenize(test_string, '\t'); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
842 if (!strcmp(tokens[0], "222")) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
843 break; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
844 test_string = strtok(NULL ,"\r") + 1; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
845 } |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
846 if (!test_string) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
847 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
848 MessageBoxA(0, "Error Pre-Parsing Potion Table", "Load Error", MB_ICONHAND|MB_CANCELTRYCONTINUE); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
849 return; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
850 } |
| 0 | 851 |
|
2284
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
852 for (uRow = 0;uRow < 50; ++uRow) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
853 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
854 if (tokens.size() < 50) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
855 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
856 wsprintfA(Text, "Error Parsing Potion Table at Row: %d Column: %d", uRow, tokens.size()); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
857 MessageBoxA(0, Text, "Parsing Error", MB_ICONHAND|MB_CANCELTRYCONTINUE); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
858 return; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
859 } |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
860 for (uColumn = 0; uColumn < 50; ++uColumn) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
861 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
862 char* currValue = tokens[uColumn + 7]; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
863 potion_note = atoi(currValue); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
864 if ( !potion_note && tolower(currValue[0]) == 'e') |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
865 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
866 potion_note = atoi(currValue + 1); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
867 } |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
868 this->potion_note[uRow][uColumn]=potion_note; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
869 } |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
870 |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
871 test_string = strtok(NULL ,"\r") + 1; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
872 if (!test_string) |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
873 { |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
874 wsprintfA(Text, "Error Parsing Potion Table at Row: %d Column: %d", uRow, 0); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
875 MessageBoxA(0, Text, "Parsing Error", MB_ICONHAND|MB_CANCELTRYCONTINUE); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
876 return; |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
877 } |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
878 tokens = Tokenize(test_string, '\t'); |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
879 } |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
880 |
|
40c4065234f8
Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Grumpy7
parents:
2282
diff
changeset
|
881 |
| 222 | 882 } |
| 0 | 883 |
| 884 | |
| 885 //----- (00456442) -------------------------------------------------------- | |
| 886 unsigned int ItemGen::GetValue() | |
| 463 | 887 { |
| 888 unsigned int uBaseValue; // edi@1 | |
| 889 unsigned int bonus; | |
| 0 | 890 |
| 463 | 891 uBaseValue = pItemsTable->pItems[this->uItemID].uValue; |
| 892 if ( this->uAttributes & ITEM_TEMP_BONUS || pItemsTable->IsMaterialNonCommon(this) ) | |
| 893 return uBaseValue; | |
| 570 | 894 if (uEnchantmentType ) |
| 1599 | 895 return uBaseValue + 100 * m_enchantmentStrength;; |
| 463 | 896 if (uSpecEnchantmentType ) |
| 897 { | |
| 898 bonus = pItemsTable->pSpecialEnchantments[uSpecEnchantmentType].iTreasureLevel; | |
| 899 if ( bonus > 10 ) | |
| 900 return uBaseValue + bonus; | |
| 901 else | |
| 902 return uBaseValue * bonus; | |
| 903 } | |
| 904 return uBaseValue; | |
| 905 } | |
| 0 | 906 |
| 907 //----- (00456499) -------------------------------------------------------- | |
| 908 const char *ItemGen::GetDisplayName() | |
| 909 { | |
|
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1545
diff
changeset
|
910 if (IsIdentified()) |
| 366 | 911 return GetIdentifiedName(); |
| 0 | 912 else |
| 366 | 913 return pItemsTable->pItems[uItemID].pUnidentifiedName; |
| 0 | 914 } |
| 915 | |
| 916 //----- (004564B3) -------------------------------------------------------- | |
| 917 const char *ItemGen::GetIdentifiedName() | |
| 918 { | |
| 377 | 919 unsigned __int8 equip_type; |
| 920 const char *player_name; | |
| 921 const char *nameModificator; | |
| 922 const char *format_str; | |
| 0 | 923 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
924 equip_type = GetItemEquipType(); |
| 377 | 925 if ( (equip_type == EQUIP_REAGENT) || (equip_type == EQUIP_POTION) || (equip_type == EQUIP_GOLD) ) |
| 0 | 926 { |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
927 sprintf(item__getname_buffer.data(), "%s", pItemsTable->pItems[uItemID].pName); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
928 return item__getname_buffer.data(); |
| 0 | 929 } |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
930 sprintf(item__getname_buffer.data(), "%s", pItemsTable->pItems[uItemID].pName); |
|
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1297
diff
changeset
|
931 if ( uItemID == ITEM_LICH_JAR_FULL ) //Lich Jar |
| 0 | 932 { |
| 377 | 933 if ( (uHolderPlayer >0 )&& (uHolderPlayer <= 4) ) |
| 0 | 934 { |
| 377 | 935 player_name = pPlayers[uHolderPlayer]->pName; |
| 936 if ( player_name[strlen(player_name) - 1] == 's' ) | |
| 937 format_str = pGlobalTXT_LocalizationStrings[655]; //"%s' Jar" | |
| 0 | 938 else |
| 377 | 939 format_str = pGlobalTXT_LocalizationStrings[654]; //"%s's Jar" |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
940 sprintf(item__getname_buffer.data(), format_str, pPlayers[uHolderPlayer]->pName); |
|
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
941 return item__getname_buffer.data(); |
| 0 | 942 } |
| 943 } | |
| 377 | 944 if ( !pItemsTable->IsMaterialNonCommon(this) ) |
| 0 | 945 { |
| 570 | 946 if ( uEnchantmentType ) |
| 0 | 947 { |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
948 strcat(item__getname_buffer.data(), " "); |
| 570 | 949 nameModificator = pItemsTable->pEnchantments[uEnchantmentType-1].pOfName; |
| 0 | 950 } |
| 951 else | |
| 952 { | |
| 377 | 953 if ( !uSpecEnchantmentType ) |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
954 return item__getname_buffer.data(); |
| 377 | 955 if ( uSpecEnchantmentType == 16 //Drain Hit Points from target. |
| 956 || uSpecEnchantmentType == 39 //Double damage vs Demons. | |
| 957 || uSpecEnchantmentType == 40 //Double damage vs Dragons | |
| 958 || uSpecEnchantmentType == 45 //+5 Speed and Accuracy | |
| 959 || uSpecEnchantmentType == 56 //+5 Might and Endurance. | |
| 960 || uSpecEnchantmentType == 57 //+5 Intellect and Personality. | |
| 961 || uSpecEnchantmentType == 58 //Increased Value. | |
| 962 || uSpecEnchantmentType == 60 //+3 Unarmed and Dodging skills | |
| 963 || uSpecEnchantmentType == 61 //+3 Stealing and Disarm skills. | |
| 964 || uSpecEnchantmentType == 59 //Increased Weapon speed. | |
| 965 || uSpecEnchantmentType == 63 //Double Damage vs. Elves. | |
| 966 || uSpecEnchantmentType == 64 //Double Damage vs. Undead. | |
| 967 || uSpecEnchantmentType == 67 //Adds 5 points of Body damage and +2 Disarm skill. | |
| 968 || uSpecEnchantmentType == 68 ) //Adds 6-8 points of Cold damage and +5 Armor Class. | |
| 969 { //enchantment and name positions inverted! | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
970 sprintf( item__getname_buffer.data(), "%s %s", |
| 377 | 971 pItemsTable->pSpecialEnchantments[uSpecEnchantmentType-1].pNameAdd, |
| 972 pItemsTable->pItems[uItemID].pName); | |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
973 return item__getname_buffer.data(); |
| 0 | 974 } |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
975 strcat(item__getname_buffer.data(), " "); |
| 377 | 976 nameModificator = pItemsTable->pSpecialEnchantments[uSpecEnchantmentType-1].pNameAdd; |
| 0 | 977 } |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
978 strcat(item__getname_buffer.data(), nameModificator); |
| 0 | 979 } |
|
1205
8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents:
1202
diff
changeset
|
980 return item__getname_buffer.data(); |
| 0 | 981 } |
| 982 | |
| 983 | |
| 984 //----- (00456620) -------------------------------------------------------- | |
| 385 | 985 void ItemsTable::GenerateItem(int treasure_level, unsigned int uTreasureType, ItemGen *out_item) |
| 2286 | 986 { |
| 987 int treasureLevelMinus1; // ebx@3 | |
| 559 | 988 int current_chance; // ebx@43 |
| 989 int tmp_chance; // ecx@47 | |
| 990 int v17; // ebx@57 | |
| 991 int v18; // edx@62 | |
| 2262 | 992 unsigned int special_chance; // edx@86 |
| 993 unsigned int v26; // edx@89 | |
| 559 | 994 unsigned int v27; // eax@89 |
| 995 int v32; // ecx@91 | |
| 996 int v33; // eax@91 | |
| 2334 | 997 // unsigned int v34; // eax@97 |
| 559 | 998 int v45; // eax@120 |
| 999 int v46; // edx@120 | |
| 1000 int j; // eax@121 | |
| 1001 int val_list[800]; // [sp+Ch] [bp-C88h]@33 | |
| 1002 int total_chance; // [sp+C8Ch] [bp-8h]@33 | |
| 1003 signed int v56; // [sp+CA0h] [bp+Ch]@55 | |
| 1004 int v57; // [sp+CA0h] [bp+Ch]@62 | |
| 1005 | |
| 1006 if (!out_item) | |
| 1583 | 1007 out_item = (ItemGen *)malloc(sizeof(ItemGen)); |
| 559 | 1008 memset(out_item, 0, sizeof(*out_item)); |
| 1009 | |
|
228
46ae2602aceb
Item generation doesn't crash (thou still generates weird stuff)
Nomad
parents:
224
diff
changeset
|
1010 |
| 2286 | 1011 treasureLevelMinus1 = treasure_level - 1; |
| 559 | 1012 if ( uTreasureType ) //generate known treasure type |
| 2286 | 1013 { |
| 559 | 1014 ITEM_EQUIP_TYPE requested_equip; |
| 1015 PLAYER_SKILL_TYPE requested_skill = PLAYER_SKILL_INVALID; | |
| 1016 switch (uTreasureType) | |
| 1017 { | |
| 1989 | 1018 case 20: requested_equip = EQUIP_SINGLE_HANDED; break; |
| 559 | 1019 case 21: requested_equip = EQUIP_ARMOUR; break; |
| 1020 case 22: requested_skill = PLAYER_SKILL_MISC; break; | |
| 1021 case 23: requested_skill = PLAYER_SKILL_SWORD; break; | |
| 1022 case 24: requested_skill = PLAYER_SKILL_DAGGER; break; | |
| 1023 case 25: requested_skill = PLAYER_SKILL_AXE; break; | |
| 1024 case 26: requested_skill = PLAYER_SKILL_SPEAR; break; | |
| 1025 case 27: requested_skill = PLAYER_SKILL_BOW; break; | |
| 1026 case 28: requested_skill = PLAYER_SKILL_MACE; break; | |
| 1027 case 29: requested_skill = PLAYER_SKILL_CLUB; break; | |
| 1028 case 30: requested_skill = PLAYER_SKILL_STAFF; break; | |
| 1029 case 31: requested_skill = PLAYER_SKILL_LEATHER; break; | |
| 1030 case 32: requested_skill = PLAYER_SKILL_CHAIN; break; | |
| 1031 case 33: requested_skill = PLAYER_SKILL_PLATE; break; | |
| 1032 case 34: requested_equip = EQUIP_SHIELD; break; | |
| 1033 case 35: requested_equip = EQUIP_HELMET; break; | |
| 1034 case 36: requested_equip = EQUIP_BELT; break; | |
| 1035 case 37: requested_equip = EQUIP_CLOAK; break; | |
| 1036 case 38: requested_equip = EQUIP_GAUNTLETS; break; | |
| 1037 case 39: requested_equip = EQUIP_BOOTS; break; | |
| 1038 case 40: requested_equip = EQUIP_RING; break; | |
| 1039 case 41: requested_equip = EQUIP_AMULET; break; | |
| 1040 case 42: requested_equip = EQUIP_WAND; break; | |
| 1041 case 43: requested_equip = EQUIP_SPELL_SCROLL; break; | |
| 1042 case 44: requested_equip = EQUIP_POTION; break; | |
| 1043 case 45: requested_equip = EQUIP_REAGENT; break; | |
| 1044 case 46: requested_equip = EQUIP_GEM; break; | |
| 1045 default: | |
| 1046 __debugbreak(); // check this condition | |
| 1047 requested_equip = (ITEM_EQUIP_TYPE)(uTreasureType - 1); | |
| 1048 break; | |
| 1049 } | |
| 1050 memset(val_list, 0, sizeof(val_list)); | |
| 1051 total_chance = 0; | |
| 1052 j=0; | |
| 1053 //a2a = 1; | |
| 1054 if (requested_skill == PLAYER_SKILL_INVALID) // no skill for this item needed | |
| 1055 { | |
| 1056 for (uint i = 1; i < 500; ++i) | |
| 1057 { | |
| 1058 if (pItems[i].uEquipType == requested_equip) | |
| 1059 { | |
| 1060 val_list[j] = i; | |
| 1061 ++j; | |
| 1062 total_chance += pItems[i].uChanceByTreasureLvl[treasure_level - 1]; | |
| 1063 } | |
| 1064 } | |
| 1065 } | |
| 1066 else //have needed skill | |
| 1067 { | |
| 1068 for (uint i = 1; i < 500; ++i) | |
| 1069 { | |
| 1070 if (pItems[i].uSkillType == requested_skill) | |
| 1071 { | |
| 1072 val_list[j] = i; | |
| 1073 ++j; | |
| 1074 total_chance += pItems[i].uChanceByTreasureLvl[treasure_level - 1]; | |
| 1075 } | |
| 1076 } | |
| 1077 } | |
| 1078 | |
| 1079 current_chance = 0; | |
| 1080 if ( total_chance ) | |
| 2286 | 1081 { |
| 1082 current_chance = rand() % total_chance + 1; | |
| 1083 tmp_chance = 0; | |
| 1084 j=0; | |
| 1085 while(tmp_chance < current_chance) | |
| 1086 { | |
| 1087 out_item->uItemID = val_list[j]; | |
| 1088 tmp_chance += pItems[val_list[j]].uChanceByTreasureLvl[treasure_level - 1]; | |
| 1089 ++j; | |
| 1090 } | |
| 0 | 1091 } |
| 2286 | 1092 else |
| 1093 { | |
| 1094 out_item->uItemID = 1; | |
| 1095 } | |
| 1096 } | |
| 559 | 1097 else |
| 2286 | 1098 { |
| 559 | 1099 //artifact |
| 2286 | 1100 if ( treasureLevelMinus1 == 5 ) |
| 1101 { | |
| 1102 v56 = 0; | |
| 1103 for(int i=0; i<29; ++i) | |
| 559 | 1104 v56 += pParty->pIsArtifactFound[i]; |
| 2286 | 1105 v17 = rand() % 29; |
| 1106 if ((rand() % 100 < 5) && !pParty->pIsArtifactFound[v17] && v56 < 13) | |
| 1107 { | |
| 559 | 1108 pParty->pIsArtifactFound[v17] = 1; |
| 1109 out_item->uAttributes = 0; | |
| 1110 out_item->uItemID = v17 + 500; | |
| 1111 SetSpecialBonus(out_item); | |
| 1112 return; | |
| 2286 | 1113 } |
| 1114 } | |
| 1115 | |
| 559 | 1116 v57 = 0; |
| 2286 | 1117 v18 = rand() % this->uChanceByTreasureLvlSumm[treasure_level - 1] + 1; |
| 1118 while (v57 < v18) | |
| 1119 { | |
| 1120 ++out_item->uItemID; | |
| 1121 v57 += pItems[out_item->uItemID].uChanceByTreasureLvl[treasureLevelMinus1]; | |
| 559 | 1122 } |
| 2286 | 1123 } |
| 1124 if (out_item->GetItemEquipType() == EQUIP_POTION && out_item->uItemID != ITEM_POTION_BOTTLE ) | |
| 1125 {// if it potion set potion spec | |
| 1126 out_item->uEnchantmentType = 0; | |
| 1127 for (int i=0; i<2; ++i) | |
| 1128 out_item->uEnchantmentType += rand() % 4 + 1; | |
| 1129 out_item->uEnchantmentType = out_item->uEnchantmentType * treasure_level; | |
| 1130 } | |
| 559 | 1131 |
| 1132 if ( out_item->uItemID == ITEM_SPELLBOOK_LIGHT_DIVINE_INTERVENTION | |
| 1133 && !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 239) ) | |
| 1134 out_item->uItemID = ITEM_SPELLBOOK_LIGHT_SUN_BURST; | |
| 2286 | 1135 if ( pItemsTable->pItems[out_item->uItemID].uItemID_Rep_St ) |
| 559 | 1136 out_item->uAttributes = 0; |
| 1137 else | |
| 1138 out_item->uAttributes = 1; | |
| 385 | 1139 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1140 if ( out_item->GetItemEquipType() != EQUIP_POTION ) |
| 559 | 1141 { |
| 1142 out_item->uSpecEnchantmentType = 0; | |
| 570 | 1143 out_item->uEnchantmentType = 0; |
| 559 | 1144 } |
| 1145 //try get special enhansment | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1146 switch (out_item->GetItemEquipType()) |
| 559 | 1147 { |
| 1989 | 1148 case EQUIP_SINGLE_HANDED: |
| 1149 case EQUIP_TWO_HANDED : | |
| 559 | 1150 case EQUIP_BOW : |
| 2286 | 1151 if ( !uBonusChanceWpSpecial[treasureLevelMinus1] ) |
| 559 | 1152 return; |
| 2286 | 1153 if ((uint)(rand() % 100)>=uBonusChanceWpSpecial[treasureLevelMinus1]) |
| 559 | 1154 return; |
| 1155 break; | |
| 1156 case EQUIP_ARMOUR : | |
| 1157 case EQUIP_SHIELD : | |
| 1158 case EQUIP_HELMET : | |
| 1159 case EQUIP_BELT : | |
| 1160 case EQUIP_CLOAK : | |
| 1161 case EQUIP_GAUNTLETS : | |
| 1162 case EQUIP_BOOTS : | |
| 1163 case EQUIP_RING : | |
| 570 | 1164 |
| 2286 | 1165 if ( !uBonusChanceStandart[treasureLevelMinus1] ) |
| 559 | 1166 return; |
| 1167 special_chance = rand() % 100; | |
| 2286 | 1168 if ( special_chance < uBonusChanceStandart[treasureLevelMinus1]) |
| 559 | 1169 { |
| 2286 | 1170 v26 = rand() %pEnchantmentsSumm[out_item->GetItemEquipType()-3] + 1; |
| 1171 v27 = 0; | |
| 1172 while(v27 < v26) | |
| 1173 { | |
| 570 | 1174 ++out_item->uEnchantmentType; |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1175 v27+=pEnchantments[out_item->uEnchantmentType].to_item[out_item->GetItemEquipType()-3]; |
| 2286 | 1176 } |
| 570 | 1177 |
| 2286 | 1178 v33 = rand() % (bonus_ranges[treasureLevelMinus1].maxR - bonus_ranges[treasureLevelMinus1].minR + 1); |
| 1179 out_item->m_enchantmentStrength = v33 + bonus_ranges[treasureLevelMinus1].minR; | |
| 570 | 1180 v32 = out_item->uEnchantmentType - 1; |
| 1181 if ( v32 == 21 || v32 == 22 || v32 == 23 ) //Armsmaster skill, Dodge skill, Unarmed skill | |
| 1599 | 1182 out_item->m_enchantmentStrength = out_item->m_enchantmentStrength/2; |
| 1183 if ( out_item->m_enchantmentStrength <= 0 ) | |
| 1184 out_item->m_enchantmentStrength = 1; | |
| 559 | 1185 return; |
| 1186 | |
| 1187 } | |
| 2286 | 1188 else if ( special_chance >= uBonusChanceStandart[treasureLevelMinus1] + uBonusChanceSpecial[treasureLevelMinus1] ) |
| 1189 return; | |
| 559 | 1190 break; |
| 1191 case EQUIP_WAND: | |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1192 out_item->uNumCharges = rand() % 6 + out_item->GetDamageMod() + 1; |
| 559 | 1193 out_item->uMaxCharges = out_item->uNumCharges; |
| 2286 | 1194 return; |
| 559 | 1195 default: |
| 224 | 1196 return; |
| 559 | 1197 } |
| 1198 | |
| 1199 j=0; | |
| 1200 int spc_sum=0; | |
| 1201 int spc; | |
| 1202 memset(&val_list, 0, 3200); | |
| 2262 | 1203 for (unsigned int i=0; i<pSpecialEnchantments_count;++i) |
| 2286 | 1204 { |
| 1205 int tr_lv= pSpecialEnchantments[i].iTreasureLevel; | |
| 1206 if ((treasure_level - 1 == 2) && ( tr_lv == 1 || tr_lv == 0 ) || | |
| 1207 (treasure_level - 1 == 3) && (tr_lv == 2 || tr_lv == 1 || tr_lv == 0) || | |
| 1208 (treasure_level - 1 == 4) && (tr_lv == 3 || tr_lv == 2 || tr_lv == 1) || | |
| 1209 (treasure_level - 1 == 5) && (tr_lv == 3) | |
| 1210 ) | |
| 1211 { | |
| 1212 spc=pSpecialEnchantments[i].to_item_apply[out_item->GetItemEquipType()]; | |
| 1213 spc_sum+=spc; | |
| 1214 if(spc) | |
| 559 | 1215 { |
| 2286 | 1216 val_list[j++]=i; |
| 559 | 1217 } |
| 2286 | 1218 } |
| 1219 } | |
| 559 | 1220 |
| 1221 v46 = rand()%spc_sum+1; | |
| 1222 j=0; | |
| 2286 | 1223 v45 = 0; |
| 1224 while (v45<v46) | |
| 1225 { | |
| 1226 ++j; | |
| 1227 out_item->uSpecEnchantmentType=val_list[j]; | |
| 1228 v45+=pSpecialEnchantments[val_list[j]].to_item_apply[out_item->GetItemEquipType()]; | |
| 1229 } | |
| 0 | 1230 } |
| 1231 | |
| 1232 //----- (004505CC) -------------------------------------------------------- | |
| 1233 bool ItemGen::GenerateArtifact() | |
| 1234 { | |
| 1235 signed int uNumArtifactsNotFound; // esi@1 | |
| 463 | 1236 int artifacts_list[32]; |
| 0 | 1237 |
| 385 | 1238 memset(artifacts_list, 0,sizeof(artifacts_list)); |
| 0 | 1239 uNumArtifactsNotFound = 0; |
| 385 | 1240 |
| 1241 for (int i=500;i<529;++i) | |
| 484 | 1242 if ( !pParty->pIsArtifactFound[i-500] ) |
| 385 | 1243 artifacts_list[uNumArtifactsNotFound++] = i; |
| 1244 | |
| 1245 Reset(); | |
| 0 | 1246 if ( uNumArtifactsNotFound ) |
| 1247 { | |
| 385 | 1248 uItemID = artifacts_list[rand() % uNumArtifactsNotFound]; |
| 1249 pItemsTable->SetSpecialBonus(this); | |
| 1250 return true; | |
| 0 | 1251 } |
| 1252 else | |
| 385 | 1253 return false; |
| 1254 | |
| 0 | 1255 } |
|
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:
1603
diff
changeset
|
1256 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1257 std::map<int, std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* >ItemGen::regularBonusMap; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1258 std::map<int, std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* >ItemGen::specialBonusMap; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1259 std::map<int, std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* >ItemGen::artifactBonusMap; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1260 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1261 #define NEWBONUSINTOSPECIALLIST(x,y) AddToMap(ItemGen::specialBonusMap, enchId, x, y); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1262 #define NEWBONUSINTOSPECIALLIST2(x,y,z) AddToMap(ItemGen::specialBonusMap, enchId, x, y, z); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1263 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1264 #define NEWBONUSINTOREGULARLIST(x) AddToMap(ItemGen::regularBonusMap, enchId, x); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1265 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1266 #define NEWBONUSINTOARTIFACTLIST(x,y) AddToMap(ItemGen::artifactBonusMap, itemId, x, y); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1267 #define NEWBONUSINTOARTIFACTLIST2(x,y,z) AddToMap(ItemGen::artifactBonusMap, itemId, x, y, z); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1268 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1269 void ItemGen::AddToMap( std::map<int, std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* > &maptoadd, int enchId, CHARACTER_ATTRIBUTE_TYPE attrId, int bonusValue /*= 0*/, unsigned __int16 Player::* skillPtr /*= NULL*/ ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1270 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1271 auto key = maptoadd.find(enchId); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1272 std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* currMap; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1273 if (key == maptoadd.end()) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1274 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1275 currMap = new std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1276 maptoadd[enchId] = currMap; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1277 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1278 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:
1603
diff
changeset
|
1279 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1280 currMap = key->second; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1281 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1282 Assert(currMap->find(attrId) == currMap->end(), "Attribute %d already present for enchantment %d", attrId, enchId); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1283 (*currMap)[attrId] = new CEnchantment(bonusValue, skillPtr); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1284 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1285 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1286 void ItemGen::PopulateSpecialBonusMap() |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1287 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1288 int enchId = 1;// of Protection, +10 to all Resistances |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1289 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_RESIST_FIRE, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1290 NEWBONUSINTOSPECIALLIST( CHARACTER_ATTRIBUTE_RESIST_AIR, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1291 NEWBONUSINTOSPECIALLIST( CHARACTER_ATTRIBUTE_RESIST_WATER, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1292 NEWBONUSINTOSPECIALLIST( CHARACTER_ATTRIBUTE_RESIST_EARTH, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1293 NEWBONUSINTOSPECIALLIST( CHARACTER_ATTRIBUTE_RESIST_MIND, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1294 NEWBONUSINTOSPECIALLIST( CHARACTER_ATTRIBUTE_RESIST_BODY, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1295 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1296 enchId = 2;//of The Gods, +10 to all Seven Statistics |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1297 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_STRENGTH, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1298 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_INTELLIGENCE, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1299 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_WILLPOWER, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1300 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1301 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_ACCURACY, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1302 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_SPEED, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1303 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_LUCK, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1304 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1305 enchId = 26;//of Air Magic |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1306 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_AIR,0, &Player::skillAir); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1307 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1308 enchId = 27;//of Body Magic |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1309 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_BODY,0, &Player::skillBody); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1310 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1311 enchId = 28;//of Dark Magic |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1312 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_DARK,0, &Player::skillDark); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1313 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1314 enchId = 29;//of Earth Magic |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1315 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_EARTH,0, &Player::skillEarth); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1316 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1317 enchId = 30;//of Fire Magic |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1318 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_FIRE,0, &Player::skillFire); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1319 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1320 enchId = 31;//of Light Magic |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1321 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_LIGHT,0, &Player::skillLight); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1322 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1323 enchId = 32;//of Mind Magic |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1324 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_MIND,0, &Player::skillMind); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1325 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1326 enchId = 33;//of Spirit Magic |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1327 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_SPIRIT,0, &Player::skillSpirit); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1328 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1329 enchId = 34;//of Water Magic |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1330 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_WATER,0, &Player::skillWater); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1331 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1332 enchId = 42;//of Doom |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1333 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_STRENGTH, 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:
1603
diff
changeset
|
1334 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_INTELLIGENCE, 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:
1603
diff
changeset
|
1335 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_WILLPOWER, 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:
1603
diff
changeset
|
1336 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 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:
1603
diff
changeset
|
1337 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_ACCURACY, 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:
1603
diff
changeset
|
1338 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_SPEED, 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:
1603
diff
changeset
|
1339 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_LUCK, 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:
1603
diff
changeset
|
1340 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_HEALTH, 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:
1603
diff
changeset
|
1341 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_MANA, 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:
1603
diff
changeset
|
1342 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_AC_BONUS, 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:
1603
diff
changeset
|
1343 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_RESIST_FIRE, 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:
1603
diff
changeset
|
1344 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_RESIST_AIR, 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:
1603
diff
changeset
|
1345 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_RESIST_WATER, 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:
1603
diff
changeset
|
1346 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_RESIST_EARTH, 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:
1603
diff
changeset
|
1347 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_RESIST_MIND, 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:
1603
diff
changeset
|
1348 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_RESIST_BODY, 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:
1603
diff
changeset
|
1349 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1350 enchId = 43;//of 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:
1603
diff
changeset
|
1351 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1352 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_AC_BONUS, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1353 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_HEALTH, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1354 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1355 enchId = 44;//of Life |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1356 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_HEALTH, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1357 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1358 enchId = 45;//Rogues |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1359 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_SPEED, 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:
1603
diff
changeset
|
1360 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_ACCURACY, 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:
1603
diff
changeset
|
1361 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1362 enchId = 46;//of The Dragon |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1363 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_STRENGTH, 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:
1603
diff
changeset
|
1364 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1365 enchId = 47;//of The Eclipse |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1366 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_MANA, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1367 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1368 enchId = 48;//of The Golem |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1369 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1370 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_AC_BONUS, 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:
1603
diff
changeset
|
1371 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1372 enchId = 49;//of The Moon |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1373 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_INTELLIGENCE, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1374 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_LUCK, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1375 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1376 enchId = 50;//of The Phoenix |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1377 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_RESIST_FIRE, 30); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1378 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1379 enchId = 51;//of The Sky |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1380 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_MANA, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1381 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_SPEED, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1382 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_INTELLIGENCE, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1383 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1384 enchId = 52;//of The Stars |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1385 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1386 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_ACCURACY, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1387 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1388 enchId = 53;//of The Sun |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1389 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_STRENGTH, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1390 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_WILLPOWER, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1391 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1392 enchId = 54;//of The Troll |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1393 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1394 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1395 enchId = 55;//of The Unicorn |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1396 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_LUCK, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1397 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1398 enchId = 56;//Warriors |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1399 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_STRENGTH, 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:
1603
diff
changeset
|
1400 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 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:
1603
diff
changeset
|
1401 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1402 enchId = 57;//Wizards |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1403 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_INTELLIGENCE, 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:
1603
diff
changeset
|
1404 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_WILLPOWER, 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:
1603
diff
changeset
|
1405 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1406 enchId = 60;//Monks' |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1407 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_DODGE, 3, &Player::skillDodge); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1408 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_UNARMED, 3, &Player::skillUnarmed); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1409 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1410 enchId = 61;//Thieves' |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1411 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM, 3, &Player::skillStealing); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1412 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_STEALING, 3, &Player::skillDisarmTrap); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1413 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1414 enchId = 62;//of Identifying |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1415 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_ITEM_ID, 3, &Player::skillItemId); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1416 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_MONSTER_ID, 3, &Player::skillMonsterId); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1417 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1418 enchId = 67;//Assassins' |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1419 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM, 2, &Player::skillDisarmTrap); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1420 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1421 enchId = 68;//Barbarians' |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1422 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_AC_BONUS, 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:
1603
diff
changeset
|
1423 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1424 enchId = 69;//of the Storm |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1425 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_RESIST_AIR, 20); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1426 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1427 enchId = 70;//of the Ocean |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1428 NEWBONUSINTOSPECIALLIST(CHARACTER_ATTRIBUTE_RESIST_WATER, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1429 NEWBONUSINTOSPECIALLIST2(CHARACTER_ATTRIBUTE_SKILL_ALCHEMY, 2, &Player::skillAlchemy); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1430 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1431 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1432 void ItemGen::PopulateRegularBonusMap() |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1433 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1434 int enchId = 1;//of Might |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1435 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1436 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1437 enchId = 2;//of Thought |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1438 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1439 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1440 enchId = 3;//of Charm |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1441 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1442 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1443 enchId = 4;//of Vigor |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1444 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1445 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1446 enchId = 5;//of Precision |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1447 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1448 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1449 enchId = 6;//of 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:
1603
diff
changeset
|
1450 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1451 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1452 enchId = 7;//of 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:
1603
diff
changeset
|
1453 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1454 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1455 enchId = 8;//of 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:
1603
diff
changeset
|
1456 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1457 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1458 enchId = 9;//of Magic |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1459 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1460 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1461 enchId = 10;//of Defense |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1462 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1463 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1464 enchId = 11;//of Fire Resistance |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1465 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1466 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1467 enchId = 12;//of Air Resistance |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1468 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1469 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1470 enchId = 13;//of Water Resistance |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1471 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1472 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1473 enchId = 14;//of Earth Resistance |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1474 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1475 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1476 enchId = 15;//of Mind Resistance |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1477 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1478 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1479 enchId = 16;//of Body Resistance |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1480 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1481 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1482 enchId = 17;//of 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:
1603
diff
changeset
|
1483 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1484 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1485 enchId = 18;//of 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:
1603
diff
changeset
|
1486 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1487 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1488 enchId = 19;//of Disarming |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1489 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1490 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1491 enchId = 20;//of Items |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1492 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1493 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1494 enchId = 21;//of Monsters |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1495 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1496 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1497 enchId = 22;//of Arms |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1498 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1499 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1500 enchId = 23;//of Dodging |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1501 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1502 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1503 enchId = 24;//of the Fist |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1504 NEWBONUSINTOREGULARLIST(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:
1603
diff
changeset
|
1505 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1506 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1507 void ItemGen::PopulateArtifactBonusMap() |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1508 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1509 int itemId; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1510 itemId = ITEM_ARTIFACT_PUCK; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1511 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 40); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1512 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1513 itemId = ITEM_ARTIFACT_IRON_FEATHER; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1514 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 40); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1515 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1516 itemId = ITEM_ARTIFACT_WALLACE; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1517 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_WILLPOWER, 40); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1518 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1519 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1520 itemId = ITEM_ARTIFACT_CORSAIR; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1521 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_LUCK, 40); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1522 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM, 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:
1603
diff
changeset
|
1523 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_STEALING, 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:
1603
diff
changeset
|
1524 |
| 1648 | 1525 itemId = ITEM_ARTIFACT_GOVERNORS_ARMOR; |
|
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:
1603
diff
changeset
|
1526 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1527 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_INTELLIGENCE, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1528 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_WILLPOWER, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1529 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1530 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_ACCURACY, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1531 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SPEED, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1532 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_LUCK, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1533 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1534 itemId = ITEM_ARTIFACT_YORUBA; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1535 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 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:
1603
diff
changeset
|
1536 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1537 itemId = ITEM_ARTIFACT_SPLITTER; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1538 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_FIRE, 50); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1539 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1540 itemId = ITEM_ARTEFACT_ULLYSES, |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1541 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_ACCURACY, 50); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1542 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1543 itemId = ITEM_ARTEFACT_HANDS_OF_THE_MASTER, |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1544 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_DODGE, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1545 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_UNARMED, 10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1546 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1547 itemId = ITEM_ARTIFACT_LEAGUE_BOOTS; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1548 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SPEED, 40); |
| 1826 | 1549 NEWBONUSINTOARTIFACTLIST2(CHARACTER_ATTRIBUTE_SKILL_WATER, 0, &Player::skillWater); |
|
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:
1603
diff
changeset
|
1550 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1551 itemId = ITEM_ARTIFACT_RULERS_RING; |
| 1826 | 1552 NEWBONUSINTOARTIFACTLIST2(CHARACTER_ATTRIBUTE_SKILL_MIND, 0, &Player::skillMind); |
| 1553 NEWBONUSINTOARTIFACTLIST2(CHARACTER_ATTRIBUTE_SKILL_DARK, 0, &Player::skillDark); | |
|
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:
1603
diff
changeset
|
1554 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1555 itemId = ITEM_RELIC_MASH; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1556 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 150); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1557 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_INTELLIGENCE, -40); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1558 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_WILLPOWER, -40); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1559 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SPEED, -40); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1560 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1561 itemId = ITEM_RELIC_ETHRICS_STAFF; |
| 1826 | 1562 NEWBONUSINTOARTIFACTLIST2(CHARACTER_ATTRIBUTE_SKILL_DARK, 0, &Player::skillDark); |
|
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:
1603
diff
changeset
|
1563 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_MEDITATION, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1564 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1565 itemId = ITEM_RELIC_HARECS_LEATHER; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1566 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM, 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:
1603
diff
changeset
|
1567 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_STEALING, 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:
1603
diff
changeset
|
1568 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_LUCK, 50); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1569 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_FIRE, -10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1570 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_WATER, -10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1571 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_AIR, -10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1572 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_EARTH, -10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1573 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_MIND, -10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1574 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_BODY, -10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1575 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1576 itemId = ITEM_RELIC_OLD_NICK; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1577 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_TRAP_DISARM, 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:
1603
diff
changeset
|
1578 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1579 itemId = ITEM_RELIC_AMUCK; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1580 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 100); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1581 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 100); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1582 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_AC_BONUS, -15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1583 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1584 itemId = ITEM_RELIC_GLORY_SHIELD; |
| 1826 | 1585 NEWBONUSINTOARTIFACTLIST2(CHARACTER_ATTRIBUTE_SKILL_SPIRIT, 0, &Player::skillSpirit); |
|
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:
1603
diff
changeset
|
1586 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_SHIELD, 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:
1603
diff
changeset
|
1587 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_MIND, -10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1588 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_BODY, -10); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1589 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1590 itemId = ITEM_RELIC_KELEBRIM; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1591 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 50); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1592 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_EARTH, -30); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1593 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1594 itemId = ITEM_RELIC_TALEDONS_HELM; |
| 1826 | 1595 NEWBONUSINTOARTIFACTLIST2(CHARACTER_ATTRIBUTE_SKILL_LIGHT, 0, &Player::skillLight); |
|
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:
1603
diff
changeset
|
1596 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_WILLPOWER, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1597 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1598 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_LUCK, -40); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1599 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1600 itemId = ITEM_RELIC_SCHOLARS_CAP; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1601 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_LEARNING, +15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1602 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_ENDURANCE, -50); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1603 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1604 itemId = ITEM_RELIC_PHYNAXIAN_CROWN; |
| 1826 | 1605 NEWBONUSINTOARTIFACTLIST2(CHARACTER_ATTRIBUTE_SKILL_FIRE, 0, &Player::skillFire); |
|
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:
1603
diff
changeset
|
1606 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_WATER, +50); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1607 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_WILLPOWER, 30); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1608 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_AC_BONUS, -20); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1609 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1610 itemId = ITEM_RILIC_TITANS_BELT; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1611 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 75); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1612 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SPEED, -40); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1613 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1614 itemId = ITEM_RELIC_TWILIGHT; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1615 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SPEED, 50); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1616 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_LUCK, 50); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1617 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_FIRE, -15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1618 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_WATER, -15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1619 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_AIR, -15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1620 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_EARTH, -15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1621 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_MIND, -15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1622 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_BODY, -15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1623 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1624 itemId = ITEM_RELIC_ANIA_SELVING; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1625 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_ACCURACY, 150); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1626 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_BOW, 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:
1603
diff
changeset
|
1627 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_AC_BONUS, -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:
1603
diff
changeset
|
1628 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1629 itemId = ITEM_RELIC_JUSTICE; |
| 1826 | 1630 NEWBONUSINTOARTIFACTLIST2(CHARACTER_ATTRIBUTE_SKILL_MIND, 0, &Player::skillMind); |
| 1631 NEWBONUSINTOARTIFACTLIST2(CHARACTER_ATTRIBUTE_SKILL_BODY, 0, &Player::skillBody); | |
|
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:
1603
diff
changeset
|
1632 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SPEED, -40); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1633 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1634 itemId = ITEM_RELIC_MEKORIGS_HAMMER; |
| 1826 | 1635 NEWBONUSINTOARTIFACTLIST2(CHARACTER_ATTRIBUTE_SKILL_SPIRIT, 0, &Player::skillSpirit); |
|
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:
1603
diff
changeset
|
1636 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 75); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1637 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_AIR, -50); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1638 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1639 itemId = ITEM_ARTIFACT_HERMES_SANDALS; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1640 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SPEED, 100); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1641 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_ACCURACY, 50); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1642 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_AIR, 50); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1643 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1644 itemId = ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1645 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_WILLPOWER, -20); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1646 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_INTELLIGENCE, -20); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1647 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1648 itemId = ITEM_ARTIFACT_MINDS_EYE; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1649 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_WILLPOWER, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1650 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_INTELLIGENCE, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1651 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1652 itemId = ITEM_ELVEN_CHAINMAIL; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1653 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SPEED, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1654 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_ACCURACY, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1655 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1656 itemId = ITEM_FORGE_GAUNTLETS; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1657 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1658 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_ENDURANCE, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1659 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_FIRE, 30); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1660 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1661 itemId = ITEM_ARTIFACT_HEROS_BELT; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1662 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 15); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1663 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER, 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:
1603
diff
changeset
|
1664 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1665 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1666 void ItemGen::GetItemBonusSpecialEnchantment( Player* owner, CHARACTER_ATTRIBUTE_TYPE attrToGet, int* additiveBonus, int* halfSkillBonus ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1667 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1668 auto bonusList = ItemGen::specialBonusMap.find(this->uSpecEnchantmentType); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1669 if (bonusList == ItemGen::specialBonusMap.end()) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1670 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1671 return; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1672 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1673 std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* currList = bonusList->second; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1674 if (currList->find(attrToGet) != currList->end()) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1675 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1676 CEnchantment* currBonus = (*currList)[attrToGet]; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1677 if (currBonus->statPtr != NULL) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1678 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1679 if (currBonus->statBonus == 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:
1603
diff
changeset
|
1680 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1681 *halfSkillBonus = owner->*currBonus->statPtr / 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:
1603
diff
changeset
|
1682 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1683 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:
1603
diff
changeset
|
1684 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1685 if (*additiveBonus < currBonus->statBonus) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1686 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1687 *additiveBonus = currBonus->statBonus; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1688 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1689 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1690 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1691 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:
1603
diff
changeset
|
1692 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1693 *additiveBonus += currBonus->statBonus; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1694 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1695 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1696 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1697 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1698 void ItemGen::GetItemBonusArtifact( Player* owner, CHARACTER_ATTRIBUTE_TYPE attrToGet, int* bonusSum ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1699 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1700 auto bonusList = ItemGen::artifactBonusMap.find(this->uItemID); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1701 if (bonusList == ItemGen::artifactBonusMap.end()) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1702 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1703 return; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1704 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1705 std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* currList = bonusList->second; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1706 if (currList->find(attrToGet) != currList->end()) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1707 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1708 CEnchantment* currBonus = (*currList)[attrToGet]; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1709 if (currBonus->statPtr != NULL) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1710 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1711 *bonusSum = owner->*currBonus->statPtr / 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:
1603
diff
changeset
|
1712 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1713 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:
1603
diff
changeset
|
1714 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1715 *bonusSum += currBonus->statBonus; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1716 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1717 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1718 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1719 |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1720 bool ItemGen::IsRegularEnchanmentForAttribute( CHARACTER_ATTRIBUTE_TYPE attrToGet ) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1721 { |
|
1685
2a309997c42f
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
Grumpy7
parents:
1682
diff
changeset
|
1722 auto bonusList = ItemGen::specialBonusMap.find(this->uEnchantmentType); |
|
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:
1603
diff
changeset
|
1723 if (bonusList == ItemGen::specialBonusMap.end()) |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1724 { |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1725 return false; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1726 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1727 std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* currList = bonusList->second; |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1728 return (currList->find(attrToGet) != currList->end()); |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1729 } |
|
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
1730 |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1731 ITEM_EQUIP_TYPE ItemGen::GetItemEquipType() |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1732 { |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1733 return pItemsTable->pItems[this->uItemID].uEquipType; |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1734 } |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1735 |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1736 unsigned char ItemGen::GetPlayerSkillType() |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1737 { |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1738 return pItemsTable->pItems[this->uItemID].uSkillType; |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1739 } |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1740 |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1741 char* ItemGen::GetIconName() |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1742 { |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1743 return pItemsTable->pItems[this->uItemID].pIconName; |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1744 } |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1745 |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1746 unsigned __int8 ItemGen::GetDamageDice() |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1747 { |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1748 return pItemsTable->pItems[this->uItemID].uDamageDice; |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1749 } |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1750 |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1751 unsigned __int8 ItemGen::GetDamageRoll() |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1752 { |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1753 return pItemsTable->pItems[this->uItemID].uDamageRoll; |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1754 } |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1755 |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1756 unsigned __int8 ItemGen::GetDamageMod() |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1757 { |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1758 return pItemsTable->pItems[this->uItemID].uDamageMod; |
|
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1685
diff
changeset
|
1759 } |
| 461 | 1760 //----- (004B8E3D) -------------------------------------------------------- |
| 463 | 1761 void GenerateStandartShopItems() |
| 1920 | 1762 { |
| 1763 signed int item_count; | |
| 1764 signed int shop_index; | |
| 1765 int treasure_lvl; | |
| 1766 int item_class; | |
| 1767 int mdf; | |
| 463 | 1768 |
| 1920 | 1769 shop_index = (signed int)window_SpeakInHouse->ptr_1C; |
| 1770 if ( uItemsAmountPerShopType[p2DEvents[shop_index - 1].uType] ) | |
| 1771 { | |
| 1772 for (item_count = 0; item_count < uItemsAmountPerShopType[p2DEvents[shop_index - 1].uType]; ++item_count ) | |
| 1773 { | |
| 1774 if (shop_index <= 14) //weapon shop | |
| 1775 { | |
| 1776 treasure_lvl = shopWeap_variation_ord[shop_index].treasure_level; | |
| 1777 item_class = shopWeap_variation_ord[shop_index].item_class[rand() % 4]; | |
| 1778 } | |
| 1779 else if (shop_index <= 28) //armor shop | |
| 1780 { | |
| 1781 mdf = 0; | |
| 1782 if (item_count > 3) | |
| 1783 ++mdf;// rechek offsets | |
| 1784 treasure_lvl = shopArmr_variation_ord[2*(shop_index - 15) + mdf].treasure_level; | |
| 1785 item_class = shopArmr_variation_ord[2*(shop_index - 15) + mdf].item_class[rand() % 4]; | |
| 1786 } | |
| 1787 else if (shop_index <= 41) //magic shop | |
| 1788 { | |
| 1789 treasure_lvl = shopMagic_treasure_lvl[shop_index - 28]; | |
| 1790 item_class = 22; //misc | |
| 1791 } | |
| 1792 else if (shop_index <= 53) //alchemist shop | |
| 1793 { | |
| 1794 if (item_count < 6) | |
| 1795 { | |
| 1796 pParty->StandartItemsInShops[shop_index][item_count].Reset(); | |
| 1797 pParty->StandartItemsInShops[shop_index][item_count].uItemID = 220; //potion bottle | |
| 1798 continue; | |
| 1799 } | |
| 1800 else | |
| 1801 { | |
| 1802 treasure_lvl = shopAlch_treasure_lvl[shop_index - 41]; | |
| 1803 item_class = 45; //reagent | |
| 1804 } | |
| 1805 } | |
| 1806 pItemsTable->GenerateItem(treasure_lvl, item_class, &pParty->StandartItemsInShops[shop_index][item_count]); | |
| 1807 pParty->StandartItemsInShops[shop_index][item_count].SetIdentified(); //identified | |
| 1808 } | |
| 1809 } | |
| 1810 pParty->InTheShopFlags[shop_index] = 0; | |
| 1811 } | |
| 463 | 1812 |
| 1813 //----- (004B8F94) -------------------------------------------------------- | |
| 1814 void GenerateSpecialShopItems() | |
| 1920 | 1815 { |
| 1816 signed int item_count; | |
| 1817 signed int shop_index; | |
| 1818 int treasure_lvl; | |
| 1819 int item_class; | |
| 1820 int mdf; | |
| 463 | 1821 |
| 1920 | 1822 shop_index = (signed int)window_SpeakInHouse->ptr_1C; |
| 1823 if ( uItemsAmountPerShopType[p2DEvents[shop_index - 1].uType] ) | |
| 1824 { | |
| 1825 for ( item_count = 0; item_count < uItemsAmountPerShopType[p2DEvents[shop_index - 1].uType]; ++item_count ) | |
| 1826 { | |
| 1827 if (shop_index <= 14) //weapon shop | |
| 1828 { | |
| 1829 treasure_lvl = shopWeap_variation_spc[shop_index].treasure_level; | |
| 1830 item_class = shopWeap_variation_spc[shop_index].item_class[rand() % 4]; | |
| 1831 } | |
| 1832 else if (shop_index <= 28) //armor shop | |
| 1833 { | |
| 1834 mdf = 0; | |
| 1835 if (item_count > 3) | |
| 1836 ++mdf; | |
| 1837 treasure_lvl = shopArmr_variation_spc[2*(shop_index - 15) + mdf].treasure_level; | |
| 1838 item_class = shopArmr_variation_spc[2*(shop_index - 15) + mdf].item_class[rand() % 4]; | |
| 1839 } | |
| 1840 else if (shop_index <= 41) //magic shop | |
| 1841 { | |
| 1842 treasure_lvl = shopMagicSpc_treasure_lvl[shop_index - 28]; | |
| 1843 item_class = 22; //misc | |
| 1844 } | |
| 1845 else if (shop_index <= 53) //alchemist shop | |
| 1846 { | |
| 1847 if (item_count < 6) | |
| 1848 { | |
| 1849 pParty->SpecialItemsInShops[shop_index][item_count].Reset(); | |
| 1850 pParty->SpecialItemsInShops[shop_index][item_count].uItemID = rand() % 32 + 740; //mscrool | |
| 1851 continue; | |
| 1852 } | |
| 1853 else | |
| 1854 { | |
| 1855 treasure_lvl = shopAlchSpc_treasure_lvl[shop_index - 41]; | |
| 1856 item_class = 44; //potion | |
| 1857 } | |
| 1858 } | |
| 1859 pItemsTable->GenerateItem(treasure_lvl, item_class, &pParty->SpecialItemsInShops[shop_index][item_count]); | |
| 1860 pParty->SpecialItemsInShops[shop_index][item_count].SetIdentified(); //identified | |
| 1861 } | |
| 1862 } | |
| 1863 pParty->InTheShopFlags[shop_index] = 0; | |
| 1864 } | |
| 461 | 1865 |
| 1866 | |
| 463 | 1867 //----- (00450218) -------------------------------------------------------- |
| 598 | 1868 void GenerateItemsInChest() |
| 526 | 1869 { |
|
2287
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1870 unsigned int mapType; // eax@1 |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1871 MapInfo *currMapInfo; // esi@1 |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1872 ItemGen *currItem; // ebx@2 |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1873 int additionaItemCount; // ebp@4 |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1874 int treasureLevelBot; // edi@4 |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1875 int treasureLevelTop; // esi@4 |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1876 signed int treasureLevelRange; // esi@4 |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1877 int resultTreasureLevel; // edx@4 |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1878 int goldAmount; // esi@8 |
| 598 | 1879 int v11; // ebp@25 |
| 1880 int v12; // esi@25 | |
|
2287
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1881 signed int whatToGenerateProb; // [sp+10h] [bp-18h]@1 |
| 461 | 1882 |
|
2287
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1883 mapType = pMapStats->GetMapInfo(pCurrentMapName); |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1884 currMapInfo = &pMapStats->pInfos[mapType]; |
| 598 | 1885 for(int i=1; i<20;++i) |
|
2287
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1886 { |
| 598 | 1887 for(int j=0; j<140;++j) |
|
2287
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1888 { |
| 526 | 1889 |
|
2287
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1890 currItem = &pChests[i].igChestItems[j]; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1891 if ( currItem->uItemID < 0 ) |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1892 { |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1893 additionaItemCount = rand() % 5; //additional items in chect |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1894 treasureLevelBot = byte_4E8168[abs(currItem->uItemID)-1][2*currMapInfo->Treasure_prob]; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1895 treasureLevelTop = byte_4E8168[abs(currItem->uItemID)-1][2*currMapInfo->Treasure_prob+1]; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1896 treasureLevelRange = treasureLevelTop - treasureLevelBot + 1; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1897 resultTreasureLevel = treasureLevelBot + rand() % treasureLevelRange; //treasure level |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1898 if (resultTreasureLevel<7) |
| 598 | 1899 { |
|
2287
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1900 v11 = 0; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1901 do |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1902 { |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1903 whatToGenerateProb = rand() % 100; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1904 if (whatToGenerateProb<20) |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1905 { |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1906 currItem->Reset(); |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1907 } |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1908 else if (whatToGenerateProb<60) //generate gold |
| 598 | 1909 { |
|
2287
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1910 goldAmount=0; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1911 currItem->Reset(); |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1912 switch (resultTreasureLevel) |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1913 { |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1914 case 1: //small gold |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1915 goldAmount = rand() % 51 + 50; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1916 currItem->uItemID = 197; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1917 break; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1918 case 2://small gold |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1919 goldAmount = rand() % 101 + 100; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1920 currItem->uItemID = 197; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1921 break; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1922 case 3: //medium |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1923 goldAmount = rand() % 301 + 200; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1924 currItem->uItemID = 198; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1925 break; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1926 case 4: //medium |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1927 goldAmount = rand() % 501 + 500; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1928 currItem->uItemID = 198; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1929 break; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1930 case 5: //big |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1931 goldAmount = rand() % 1001 + 1000; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1932 currItem->uItemID = 199; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1933 break; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1934 case 6: //big |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1935 goldAmount = rand() % 3001 + 2000; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1936 currItem->uItemID = 199; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1937 break; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1938 } |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1939 currItem->SetIdentified(); |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1940 currItem->uSpecEnchantmentType = goldAmount; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1941 } |
| 598 | 1942 else |
|
2287
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1943 { |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1944 pItemsTable->GenerateItem(resultTreasureLevel, 0, currItem); |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1945 } |
| 598 | 1946 v12 = 0; |
|
2287
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1947 while ( !(pChests[i].igChestItems[v12].uItemID==0) &&(v12<140)) |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1948 { |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1949 ++v12; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1950 } |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1951 if (v12 >= 140) |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1952 break; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1953 currItem=&pChests[i].igChestItems[v12]; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1954 v11++; |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1955 } while (v11 < additionaItemCount + 1); // + 1 because it's the item at pChests[i].igChestItems[j] and the additional ones |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1956 } |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1957 else |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1958 currItem->GenerateArtifact(); |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1959 } |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1960 } |
|
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1961 } |
| 598 | 1962 |
|
2287
4e3236a4ea63
GenerateItemsInChest cleaned up a bit, unified the two switches
Grumpy7
parents:
2286
diff
changeset
|
1963 } |
| 461 | 1964 |
| 1965 | |
| 1966 | |
| 1967 | |
| 463 | 1968 // 4505CC: using guessed type int var_A0[32]; |
| 1969 //----- (004B3703) -------------------------------------------------------- | |
| 473 | 1970 void FillAviableSkillsToTeach( int _this ) |
| 1971 { | |
| 1838 | 1972 const char *v30; // ecx@65 |
| 473 | 1973 unsigned int v29; // edx@56 |
| 1974 int v15; // ecx@19 | |
| 1975 int v33; // [sp-4h] [bp-2Ch]@23 | |
| 1976 int v34; // [sp-4h] [bp-2Ch]@43 | |
| 1977 int v21; // ecx@34 | |
| 1978 int v35[5]; // [sp+Ch] [bp-1Ch]@8 | |
| 1979 int v37=0; // [sp+24h] [bp-4h]@1* | |
| 1980 int i=0; | |
| 1981 | |
|
2285
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
1982 dword_F8B1DC_currentShopOption = 0; |
| 473 | 1983 |
| 1984 switch (_this) | |
| 463 | 1985 { |
| 473 | 1986 case 1: //shop weapon |
| 1987 for (int i=0; i<2; ++i) | |
| 1988 { | |
| 1989 for (int j=0; j<4; ++j) | |
| 1990 { | |
| 1991 if ( i ) | |
| 1992 v21 = shopWeap_variation_spc[(unsigned int)window_SpeakInHouse->ptr_1C].item_class[j]; | |
| 1993 else | |
| 1994 v21 = shopWeap_variation_ord[(unsigned int)window_SpeakInHouse->ptr_1C].item_class[j]; | |
| 463 | 1995 |
| 473 | 1996 switch (v21) |
| 463 | 1997 { |
| 473 | 1998 case 23: v34 = 37; break; |
| 1999 case 24: v34 = 38; break; | |
| 2000 case 25: v34 = 39; break; | |
| 2001 case 26: v34 = 40; break; | |
| 2002 case 27: v34 = 41; break; | |
| 2003 case 28: v34 = 42; break; | |
| 2004 case 30: v34 = 36; break; | |
| 2005 default: | |
| 2006 continue; | |
| 2007 } | |
|
2285
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2008 v37 = sub_4BE571_AddItemToSet(v34, v35, v37, 5); |
| 463 | 2009 } |
| 2010 } | |
| 473 | 2011 break; |
| 2012 case 2: //shop armor | |
| 2013 | |
| 2014 for (int i=0; i<2; ++i) | |
| 463 | 2015 { |
| 473 | 2016 for (int j=0; j<2; ++j) |
| 463 | 2017 { |
| 473 | 2018 for (int k=0; k<4; ++k) |
| 463 | 2019 { |
| 473 | 2020 if ( i ) |
| 2021 v15 = shopArmr_variation_spc[(unsigned int)window_SpeakInHouse->ptr_1C-15+j].item_class[k]; | |
| 2022 else | |
| 2023 v15 = shopArmr_variation_ord[(unsigned int)window_SpeakInHouse->ptr_1C-15+j].item_class[k]; | |
| 2024 switch (v15) | |
| 463 | 2025 { |
| 473 | 2026 case 31: v33 = 45; break; |
| 2027 case 32: v33 = 46; break; | |
| 2028 case 33: v33 = 47; break; | |
| 2029 case 34: v33 = 44; break; | |
| 2030 default: | |
| 2031 continue; | |
| 463 | 2032 } |
|
2285
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2033 v37 = sub_4BE571_AddItemToSet(v33, v35, v37, 5); |
| 463 | 2034 } |
| 2035 } | |
| 2036 } | |
| 473 | 2037 break; |
| 2038 case 3: //shop magic | |
| 2039 v37 = 2; | |
| 2040 v35[0] = 57; | |
| 2041 v35[1] = 59; | |
| 2042 break; | |
| 2043 case 4: //shop alchemist | |
| 2044 v37 = 2; | |
| 2045 v35[0] = 71; | |
| 2046 v35[1] = 68; | |
| 2047 break; | |
| 2048 case 21: //tavern | |
| 2049 v37 = 3; | |
| 2050 v35[0] = 70; | |
| 2051 v35[1] = 65; | |
| 2052 v35[2] = 62; | |
| 2053 break; | |
| 2054 case 23: //temple | |
| 2055 v37 = 3; | |
| 2056 v35[0] = 67; | |
| 2057 v35[1] = 66; | |
| 2058 v35[2] = 58; | |
| 2059 break; | |
| 2060 case 30: ///trainig | |
| 2061 v37 = 2; | |
| 2062 v35[0] = 69; | |
| 2063 v35[1] = 60; | |
| 2064 break; | |
| 2065 } | |
| 2066 for(i=0;i<v37;++i) | |
| 2067 { | |
| 2068 v29=v35[i]; | |
| 2069 switch(v29) | |
| 463 | 2070 { |
| 473 | 2071 case 40 :v30 = pSkillNames[4]; break; |
| 2072 case 5 : v30 = pSkillNames[23]; break; | |
| 2073 case 36 :v30 = pSkillNames[0]; break; | |
| 2074 case 37 :v30 = pSkillNames[1]; break; | |
| 2075 case 38 :v30 = pSkillNames[2]; break; | |
| 2076 case 39 :v30 = pSkillNames[3]; break; | |
| 2077 case 41 :v30 = pSkillNames[5]; break; | |
| 2078 case 42 :v30 = pSkillNames[6]; break; | |
| 2079 case 44 :v30 = pSkillNames[8]; break; | |
| 2080 case 45 :v30 = pSkillNames[9]; break; | |
| 2081 case 46 :v30 = pSkillNames[10]; break; | |
| 2082 case 47 :v30 = pSkillNames[11]; break; | |
| 2083 case 66 :v30 = pSkillNames[30]; break; | |
| 2084 case 57 :v30 = pSkillNames[21]; break; | |
| 2085 case 58 :v30 = pSkillNames[22]; break; | |
| 2086 case 60 :v30 = pSkillNames[24]; break; | |
| 2087 case 62 :v30 = pSkillNames[26]; break; | |
| 2088 case 65 :v30 = pSkillNames[29]; break; | |
| 2089 case 67:v30 = pSkillNames[31]; break; | |
| 2090 case 68:v30 = pSkillNames[32]; break; | |
| 2091 case 69:v30 = pSkillNames[33]; break; | |
| 2092 case 70:v30 = pSkillNames[34]; break; | |
| 2093 case 71:v30 = pSkillNames[35]; break; | |
| 2094 default: | |
| 463 | 2095 v30 = pGlobalTXT_LocalizationStrings[127]; //"No Text!" |
| 2096 } | |
|
2285
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2097 pShopOptions[dword_F8B1DC_currentShopOption] = const_cast<char *>(v30); |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2098 ++dword_F8B1DC_currentShopOption; |
| 473 | 2099 CreateButtonInColumn(i+1, v29); |
| 463 | 2100 } |
| 972 | 2101 pDialogueWindow->_41D08F_set_keyboard_control_group(i, 1, 0, 2); |
| 473 | 2102 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton; |
| 2103 } | |
| 475 | 2104 |
| 2105 //----- (004BE571) -------------------------------------------------------- | |
|
2285
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2106 int sub_4BE571_AddItemToSet(int valueToAdd, int *outPutSet, int elemsAlreadyPresent, int elemsNeeded) |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2107 { |
| 475 | 2108 int i; // esi@3 |
| 2109 | |
|
2285
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2110 if ( elemsAlreadyPresent < elemsNeeded ) |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2111 { |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2112 for ( i = 0; i < elemsAlreadyPresent; ++i ) |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2113 { |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2114 if ( valueToAdd == outPutSet[i] ) |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2115 return elemsAlreadyPresent; |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2116 } |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2117 outPutSet[elemsAlreadyPresent] = valueToAdd; |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2118 return elemsAlreadyPresent + 1; |
| 475 | 2119 } |
|
2285
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2120 return elemsNeeded; |
|
4fd03103be62
sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Grumpy7
parents:
2284
diff
changeset
|
2121 } |
| 1297 | 2122 //----- (0043C91D) -------------------------------------------------------- |
| 2288 | 2123 int GetItemTextureFilename(char *pOut, signed int item_id, int index, int shoulder) |
| 1297 | 2124 { |
| 2125 int result; // eax@2 | |
| 475 | 2126 |
| 1297 | 2127 result = 0; //BUG fn is void |
| 2288 | 2128 if ( item_id > 500 ) |
| 1297 | 2129 { |
| 2130 switch ( item_id ) | |
| 2131 { | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2132 case ITEM_RELIC_HARECS_LEATHER: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2133 if (byte_5111F6_OwnedArtifacts[2] != 0) |
| 2288 | 2134 item_id = 234; |
| 2135 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2136 case ITEM_ARTIFACT_YORUBA: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2137 if (byte_5111F6_OwnedArtifacts[1] != 0) |
| 2288 | 2138 item_id = 236; |
| 2139 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2140 case ITEM_ARTIFACT_GOVERNORS_ARMOR: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2141 if (byte_5111F6_OwnedArtifacts[0] != 0) |
| 2288 | 2142 item_id = 235; |
| 2143 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2144 case ITEM_ELVEN_CHAINMAIL: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2145 if (byte_5111F6_OwnedArtifacts[16] != 0) |
| 2288 | 2146 item_id = 73; |
| 2147 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2148 case ITEM_ARTIFACT_LEAGUE_BOOTS: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2149 if (byte_5111F6_OwnedArtifacts[3] != 0) |
| 2288 | 2150 item_id = 312; |
| 2151 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2152 case ITEM_RELIC_TALEDONS_HELM: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2153 if (byte_5111F6_OwnedArtifacts[4] != 0) |
| 2288 | 2154 item_id = 239; |
| 2155 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2156 case ITEM_RELIC_SCHOLARS_CAP: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2157 if (byte_5111F6_OwnedArtifacts[5] != 0) |
| 2288 | 2158 item_id = 240; |
| 2159 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2160 case ITEM_RELIC_PHYNAXIAN_CROWN: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2161 if (byte_5111F6_OwnedArtifacts[6] != 0) |
| 2288 | 2162 item_id = 241; |
| 2163 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2164 case ITEM_ARTIFACT_MINDS_EYE: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2165 if (byte_5111F6_OwnedArtifacts[7] != 0) |
| 2288 | 2166 item_id = 93; |
| 2167 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2168 case ITEM_RARE_SHADOWS_MASK: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2169 if (byte_5111F6_OwnedArtifacts[8] != 0) |
| 2288 | 2170 item_id = 344; |
| 2171 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2172 case ITEM_RILIC_TITANS_BELT: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2173 if (byte_5111F6_OwnedArtifacts[9] != 0) |
| 2288 | 2174 item_id = 324; |
| 2175 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2176 case ITEM_ARTIFACT_HEROS_BELT: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2177 if (byte_5111F6_OwnedArtifacts[10] != 0) |
| 2288 | 2178 item_id = 104; |
| 2179 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2180 case ITEM_RELIC_TWILIGHT: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2181 if (byte_5111F6_OwnedArtifacts[11] != 0) |
| 2288 | 2182 item_id = 325; |
| 2183 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2184 case ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2185 if (byte_5111F6_OwnedArtifacts[12] != 0) |
| 2288 | 2186 item_id = 330; |
| 2187 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2188 case ITEM_RARE_SUN_CLOAK: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2189 if (byte_5111F6_OwnedArtifacts[13] != 0) |
| 2288 | 2190 item_id = 347; |
| 2191 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2192 case ITEM_RARE_MOON_CLOAK: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2193 if (byte_5111F6_OwnedArtifacts[14] != 0) |
| 2288 | 2194 item_id = 348; |
| 2195 break; | |
|
2289
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2196 case ITEM_RARE_VAMPIRES_CAPE: |
|
60293358b4b3
byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Grumpy7
parents:
2288
diff
changeset
|
2197 if (byte_5111F6_OwnedArtifacts[15] != 0) |
| 2288 | 2198 item_id = 350; |
| 2199 break; | |
| 2200 default: | |
| 2201 return 0; | |
| 1297 | 2202 } |
| 2288 | 2203 } |
| 2204 | |
| 2205 switch (pItemsTable->pItems[item_id].uEquipType) | |
| 2206 { | |
| 2207 case EQUIP_ARMOUR: | |
| 1297 | 2208 if ( !shoulder ) |
| 2288 | 2209 return sprintf(pOut, "item%3.3dv%d", item_id, index); |
| 2210 else if ( shoulder == 1 ) | |
| 2211 return sprintf(pOut, "item%3.3dv%da1", item_id, index); | |
| 2212 else if ( shoulder == 2 ) | |
| 2213 return sprintf(pOut, "item%3.3dv%da2", item_id, index); | |
| 2214 break; | |
| 2215 case EQUIP_CLOAK: | |
| 2216 if ( !shoulder ) | |
| 2217 return sprintf(pOut, "item%3.3dv%d", item_id, index); | |
| 2218 else | |
| 2219 return sprintf(pOut, "item%3.3dv%da1", item_id, index); | |
| 2220 default: | |
| 2221 return sprintf(pOut, "item%3.3dv%d", item_id, index); | |
| 1297 | 2222 } |
| 2288 | 2223 |
| 1297 | 2224 result = item_id - 504; |
| 2225 return result; | |
| 2226 } | |
| 475 | 2227 |
| 2250 | 2228 |
| 2229 //----- (004BDAAF) -------------------------------------------------------- | |
| 2230 bool ItemGen::MerchandiseTest(int _2da_idx) | |
| 2231 { | |
| 2232 bool test; | |
| 2233 | |
| 2234 if ( (p2DEvents[_2da_idx - 1].uType != 4 || (signed int)this->uItemID < 740 || (signed int)this->uItemID > 771) | |
| 2235 && ((signed int)this->uItemID >= 600 || (signed int)this->uItemID >= 529 && (signed int)this->uItemID <= 599) || this->IsStolen()) | |
| 2236 return false; | |
| 2237 switch( p2DEvents[_2da_idx - 1].uType ) | |
| 2238 { | |
| 2239 case BuildingType_WeaponShop: | |
| 2240 { | |
| 2241 test = this->GetItemEquipType() <= EQUIP_BOW; | |
| 2242 break; | |
| 2243 } | |
| 2244 case BuildingType_ArmorShop: | |
| 2245 { | |
| 2246 test = this->GetItemEquipType() >= EQUIP_ARMOUR && this->GetItemEquipType() <= EQUIP_BOOTS; | |
| 2247 break; | |
| 2248 } | |
| 2249 case BuildingType_MagicShop: | |
| 2250 { | |
| 2251 test = this->GetPlayerSkillType() == PLAYER_SKILL_MISC || this->GetItemEquipType() == EQIUP_ANY; | |
| 2252 break; | |
| 2253 } | |
| 2254 case BuildingType_AlchemistShop: | |
| 2255 { | |
| 2256 test = this->GetItemEquipType() == EQUIP_REAGENT || this->GetItemEquipType() == EQUIP_POTION | |
| 2257 || (this->GetItemEquipType() > EQUIP_POTION && !(this->GetItemEquipType() != EQUIP_MESSAGE_SCROLL | |
| 2258 || (signed int)this->uItemID < 740) && this->uItemID != 771); | |
| 2259 break; | |
| 2260 } | |
| 2261 default: | |
| 2262 { | |
| 2263 test = false; | |
| 2264 break; | |
| 2265 } | |
| 2266 } | |
| 2267 return test; | |
| 2268 } |