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