Mercurial > mm7
annotate Items.h @ 1846:7954c2f385b5
m
author | Ritor1 |
---|---|
date | Sun, 13 Oct 2013 23:57:11 +0600 |
parents | a3e86ec5d3ce |
children | 7840fe323f67 |
rev | line source |
---|---|
0 | 1 #pragma once |
1202 | 2 #include <array> |
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
|
3 #include <map> |
1708
f8414042db1f
Moving NZIArray to a separate class, fixing a few inventory bugs
Grumpy7
parents:
1682
diff
changeset
|
4 #include "NZIArray.h" |
0 | 5 |
1036 | 6 enum DAMAGE_TYPE:unsigned int |
7 { | |
8 DMGT_FIRE = 0, | |
9 DMGT_ELECTR = 1, | |
10 DMGT_COLD = 2, | |
1559
1f3f01d39300
Player::CanTrainToNextLevel simplified, Player::GetExperienceDisplayColor shortened a bit Player::CalculateIncommingDamage + fixed resistances not working if no resistance bonus (ignored luck bonus)
Grumpy7
parents:
1553
diff
changeset
|
11 DMGT_EARTH = 3, |
1036 | 12 DMGT_PHISYCAL= 4, |
13 DMGT_5 = 5, | |
14 DMGT_SPIRIT = 6, | |
15 DMGT_MIND = 7, | |
16 DMGT_BODY = 8, | |
17 DMGT_DARK =10 | |
18 }; | |
0 | 19 |
20 | |
21 | |
22 /* 338 */ | |
463 | 23 enum ITEM_FLAGS :unsigned int |
0 | 24 { |
25 ITEM_IDENTIFIED = 0x1, | |
26 ITEM_BROKEN = 0x2, | |
27 ITEM_TEMP_BONUS = 0x8, | |
1455 | 28 ITEM_AURA_EFFECT_RED = 0x10,//16 |
29 ITEM_AURA_EFFECT_BLUE = 0x20,//32 | |
30 ITEM_AURA_EFFECT_GREEN = 0x40,//64 | |
31 ITEM_AURA_EFFECT_PURPLE = 0x80,//128 | |
0 | 32 ITEM_STOLEN = 0x100, |
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
33 ITEM_HARDENED = 0x200, |
0 | 34 }; |
35 | |
36 | |
377 | 37 enum ITEM_MATERIAL |
437 | 38 { |
377 | 39 MATERIAL_COMMON =0, |
40 MATERIAL_ARTEFACT = 1, | |
41 MATERIAL_RELIC = 2, | |
42 MATERIAL_SPECIAL = 3 | |
437 | 43 }; |
377 | 44 |
0 | 45 /* 330 */ |
46 enum ITEM_TYPE | |
47 { | |
48 ITEM_LONGSWORD_1 = 0x1, | |
49 ITEM_DAGGER_1 = 0xF, | |
50 ITEM_AXE_1 = 0x17, | |
51 ITEM_SPEAR_1 = 0x1F, | |
52 ITEM_CROSSBOW_1 = 0x2F, | |
53 ITEM_MACE_1 = 0x32, | |
54 ITEM_STAFF_1 = 0x3D, | |
816 | 55 ITEM_BLASTER = 64, |
56 ITEM_LASER_RIFLE = 65, | |
0 | 57 ITEM_LEATHER_1 = 0x42, |
58 ITEM_CHAINMAIL_1 = 0x47, | |
59 ITEM_PLATE_1 = 0x4C, | |
60 ITEM_BUCKLER_1 = 0x54, | |
61 ITEM_GAUNTLETS_1 = 0x6E, | |
62 ITEM_BOOTS_1 = 0x73, | |
490 | 63 ITEM_WAND_FIRE = 135, |
64 ITEM_WAND_STUN = 138, | |
0 | 65 ITEM_WAND_INCENERATION = 0x9F, |
1575 | 66 ITEM_REAGENT_WIDOWSWEEP_BERRIES = 200, |
0 | 67 ITEM_TROLL_BLOOD = 0xCA, |
68 ITEM_DRAGON_EYE = 0xCC, | |
69 ITEM_HARPY_FEATHER = 0xCF, | |
70 ITEM_DEVIL_ICHOR = 0xD6, | |
71 ITEM_OOZE_ECTOPLASM_BOTTLE = 0xD9, | |
1575 | 72 ITEM_REAGENT_PHILOSOPHERS_STONE = 219, |
73 ITEM_POTION_BOTTLE = 220, | |
74 ITEM_POTION_CATALYST = 221, | |
1576 | 75 ITEM_POTION_CURE_WOUNDS = 222, |
76 ITEM_POTION_CURE_DISEASE = 225, | |
77 ITEM_POTION_AWAKEN = 227, | |
78 ITEM_POTION_HASTE = 228, | |
1575 | 79 ITEM_POTION_RECHARGE_ITEM = 233, |
80 ITEM_POTION_HARDEN_ITEM = 236, | |
1576 | 81 ITEM_POTION_CURE_INSANITY = 239, |
82 ITEM_POTION_MIGHT_BOOST = 240, | |
1575 | 83 ITEM_POTION_ACCURACY_BOOST = 245, |
84 ITEM_POTION_FLAMING_POTION = 246, | |
85 ITEM_POTION_SWIFT_POTION = 250, | |
1576 | 86 ITEM_POTION_BODY_RESISTANE = 261, |
87 ITEM_POTION_STONE_TO_FLESH = 262, | |
1575 | 88 ITEM_POTION_SLAYING_POTION = 263, |
89 ITEM_POTION_REJUVENATION = 271, | |
1455 | 90 ITEM_SPELLBOOK_TORCHLIGHT = 400,//0x190 |
91 ITEM_SPELLBOOK_FIRE_STRIKE = 401,//0x191, | |
0 | 92 ITEM_SPELLBOOK_AIR_FEATHER_FALL = 0x19C, |
93 ITEM_SPELLBOOK_WATER_POISON_SPRAY = 0x1A7, | |
94 ITEM_SPELLBOOK_EARTH_SLOW = 0x1B2, | |
95 ITEM_SPELLBOOK_SPIRIT_BLESS = 0x1BD, | |
96 ITEM_SPELLBOOK_MIND_MIND_BLAST = 0x1C8, | |
97 ITEM_SPELLBOOK_BODY_FIRST_AID = 0x1D3, | |
98 ITEM_SPELLBOOK_BODY_HEAL = 0x1D6, | |
99 ITEM_SPELLBOOK_BODY_BREAK_POISON = 0x1D7, | |
100 ITEM_SPELLBOOK_LIGHT_LIGHT_BOLT = 0x1DD, | |
101 ITEM_SPELLBOOK_LIGHT_SUN_BURST = 0x1E6, | |
102 ITEM_SPELLBOOK_LIGHT_DIVINE_INTERVENTION = 0x1E7, | |
1455 | 103 ITEM_ARTIFACT_PUCK = 500,//0x1F4, |
1548 | 104 ITEM_ARTIFACT_IRON_FEATHER = 501, |
105 ITEM_ARTIFACT_WALLACE = 502, | |
106 ITEM_ARTIFACT_CORSAIR = 503, | |
1648 | 107 ITEM_ARTIFACT_GOVERNORS_ARMOR = 504,//1F8 |
513 | 108 ITEM_ARTIFACT_YORUBA = 505,//1F9 |
305 | 109 ITEM_ARTIFACT_SPLITTER = 506,//1FA |
1080 | 110 ITEM_ARTIFACT_GHOULSBANE = 507,//1FA |
1548 | 111 ITEM_ARTIFACT_GIBBET = 508,//1FA |
112 ITEM_ARTIFACT_CHARELE = 509,//1FA | |
1080 | 113 ITEM_ARTEFACT_ULLYSES =510, |
1548 | 114 ITEM_ARTEFACT_HANDS_OF_THE_MASTER =511, |
513 | 115 ITEM_ARTIFACT_LEAGUE_BOOTS = 512,//200 |
1548 | 116 ITEM_ARTIFACT_RULERS_RING = 513, |
117 ITEM_RELIC_MASH = 514, | |
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1202
diff
changeset
|
118 ITEM_RELIC_ETHRICS_STAFF = 515,//204 |
513 | 119 ITEM_RELIC_HARECS_LEATHER = 516,//204 |
1548 | 120 ITEM_RELIC_OLD_NICK = 517, |
121 ITEM_RELIC_AMUCK = 518, | |
122 ITEM_RELIC_GLORY_SHIELD = 519, | |
1080 | 123 ITEM_RELIC_KELEBRIM = 520,//208 |
513 | 124 ITEM_RELIC_TALEDONS_HELM = 521,//209 |
125 ITEM_RELIC_SCHOLARS_CAP = 522,//20A | |
126 ITEM_RELIC_PHYNAXIAN_CROWN = 523,//20B | |
127 ITEM_RILIC_TITANS_BELT = 524,//20C | |
128 ITEM_RELIC_TWILIGHT = 525,//20D | |
1548 | 129 ITEM_RELIC_ANIA_SELVING = 526, |
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1202
diff
changeset
|
130 ITEM_RELIC_JUSTICE = 527, |
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1202
diff
changeset
|
131 ITEM_RELIC_MEKORIGS_HAMMER = 528, |
831 | 132 ITEM_ARTIFACT_HERMES_SANDALS = 529, |
513 | 133 ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP = 530,//212 |
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1202
diff
changeset
|
134 ITEM_ARTIFACT_ELFBANE = 531,//212 |
513 | 135 ITEM_ARTIFACT_MINDS_EYE = 532,//214 |
136 ITEM_ELVEN_CHAINMAIL = 533,//215 | |
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1202
diff
changeset
|
137 ITEM_FORGE_GAUNTLETS = 534, |
831 | 138 ITEM_ARTIFACT_HEROS_BELT = 535,//217 |
139 ITEM_ARTIFACT_LADYS_ESCORT = 536, | |
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
|
140 ITEM_RARE_CLANKERS_AMULET = 537, |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
141 ITEM_RARE_LIETENANTS_CUTLASS = 538, |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
142 ITEM_RARE_MEDUSAS_MIRROR = 539, |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
143 ITEM_RARE_LADY_CARMINES_DAGGER = 540, |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
144 ITEM_RARE_VILLAINS_BLADE = 541, |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
145 ITEM_RARE_PERFECT_BOW = 542, |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
146 ITEM_RARE_PERFECT_BOW_FIXED = 543, |
513 | 147 ITEM_RARE_SHADOWS_MASK = 544,//220 |
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
|
148 ITEM_RARE_GHOST_RING = 545,//220 |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
149 ITEM_RARE_FAERIE_RING = 546,//220 |
513 | 150 ITEM_RARE_SUN_CLOAK = 547,//223 |
151 ITEM_RARE_MOON_CLOAK = 548,//224 | |
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
|
152 ITEM_RARE_ZOKKARS_AXE = 549,//224 |
513 | 153 ITEM_RARE_VAMPIRES_CAPE = 550,//226 |
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
|
154 ITEM_RARE_MINOTAURS_AXE = 551,//226 |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
155 ITEM_RARE_GROGNARDS_CUTLASS = 552,//226 |
1358
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1202
diff
changeset
|
156 ITEM_LICH_JAR_FULL = 601, |
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1202
diff
changeset
|
157 ITEM_WETSUIT = 604, |
61010a655c94
a few itemID changed to their enum values + added a few new ones
Grumpy7
parents:
1202
diff
changeset
|
158 ITEM_LICH_JAR_EMPTY = 615, |
1387
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1358
diff
changeset
|
159 ITEM_RECIPE_REJUVENATION = 740, |
297b6f192232
Player::SelectPhrasesTransaction finished, some constants changed to enum values, removed unused vars
Grumpy7
parents:
1358
diff
changeset
|
160 ITEM_RECIPE_BODY_RESISTANCE = 771, |
0 | 161 }; |
162 | |
163 /* 331 */ | |
816 | 164 enum ITEM_EQUIP_TYPE: unsigned __int8 |
0 | 165 { |
816 | 166 EQUIP_OFF_HAND = 0, |
167 EQUIP_MAIN_HAND = 1, | |
168 EQUIP_BOW = 2, | |
169 EQUIP_ARMOUR = 3, | |
170 EQUIP_SHIELD = 4, | |
171 EQUIP_HELMET = 5, | |
172 EQUIP_BELT = 6, | |
173 EQUIP_CLOAK = 7, | |
1082 | 174 EQUIP_GAUNTLETS = 8, |
175 EQUIP_BOOTS = 9, | |
816 | 176 EQUIP_RING = 10, |
177 EQUIP_AMULET = 11, | |
178 EQUIP_WAND = 12, | |
179 EQUIP_REAGENT = 13, | |
180 EQUIP_POTION = 14, | |
181 EQUIP_SPELL_SCROLL = 15, | |
182 EQUIP_BOOK = 16, | |
1080 | 183 EQIUP_ANY = 16, |
816 | 184 EQUIP_MESSAGE_SCROLL = 17, |
185 EQUIP_GOLD = 18, | |
186 EQUIP_GEM = 19, | |
187 EQUIP_NONE = 20 | |
0 | 188 }; |
189 | |
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
|
190 enum CHARACTER_ATTRIBUTE_TYPE; |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
191 struct Player; |
0 | 192 |
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
|
193 typedef struct 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
|
194 { |
1783 | 195 unsigned __int16 Player::* statPtr; |
196 int statBonus; | |
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
|
197 CEnchantment(int bonus, unsigned __int16 Player::* skillPtr = NULL): |
1783 | 198 statBonus(bonus), |
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
|
199 statPtr(skillPtr) |
1783 | 200 { |
201 } | |
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
|
202 } CEnchantment; |
0 | 203 |
204 /* 64 */ | |
205 #pragma pack(push, 1) | |
526 | 206 struct ItemGen //0x24 |
0 | 207 { |
208 //----- (0042EB25) -------------------------------------------------------- | |
1012 | 209 // inline ItemGen() |
210 // { | |
211 // Reset(); | |
212 // } | |
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
|
213 static void AddToMap(std::map<int, std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* > &maptoadd, |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
214 int 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
|
215 CHARACTER_ATTRIBUTE_TYPE attrId, |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
216 int bonusValue = 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
|
217 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
|
218 |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
219 static std::map<int, std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* > 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
|
220 static std::map<int, std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* > 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
|
221 static std::map<int, std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* > 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
|
222 |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
223 static void 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
|
224 static void 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
|
225 static void 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
|
226 |
4b79ff62df3a
Moved enchantment attribute bonus list to items.cpp/h, created static function that create the enchantments + helper functions to get the enchantment strength, moved the whole logic of Player::GetItemsBonus to a case
Grumpy7
parents:
1603
diff
changeset
|
227 void 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
|
228 void 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
|
229 bool IsRegularEnchanmentForAttribute(CHARACTER_ATTRIBUTE_TYPE attrToGet); |
0 | 230 |
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1559
diff
changeset
|
231 inline bool IsBroken() {return (uAttributes & ITEM_BROKEN) != 0;} |
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1559
diff
changeset
|
232 inline void SetBroken() {uAttributes |= ITEM_BROKEN;} |
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1559
diff
changeset
|
233 inline bool IsIdentified() {return (uAttributes & ITEM_IDENTIFIED) != 0;} |
315 | 234 inline void SetIdentified() {uAttributes |= ITEM_IDENTIFIED;} |
1567
9f8b3e904e14
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents:
1559
diff
changeset
|
235 inline bool IsStolen() {return (uAttributes & ITEM_STOLEN) != 0;} |
749 | 236 inline void SetStolen() {uAttributes |= ITEM_STOLEN;} |
271 | 237 |
0 | 238 bool GenerateArtifact(); |
239 unsigned int GetValue(); | |
240 const char *GetDisplayName(); | |
241 const char *GetIdentifiedName(); | |
242 void UpdateTempBonus(__int64 uTimePlayed); | |
243 void Reset(); | |
385 | 244 int _439DF3_get_additional_damage(int *a2, bool *vampiyr); |
0 | 245 |
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
246 ITEM_EQUIP_TYPE GetItemEquipType(); |
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
247 unsigned char GetPlayerSkillType(); |
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
248 char* GetIconName(); |
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
249 unsigned __int8 GetDamageDice(); |
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
250 unsigned __int8 GetDamageRoll(); |
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1708
diff
changeset
|
251 unsigned __int8 GetDamageMod(); |
0 | 252 |
1019 | 253 int uItemID; //0 |
254 int uEnchantmentType; //4 | |
1599 | 255 int m_enchantmentStrength; //8 |
1019 | 256 int uSpecEnchantmentType; // 25 +5 levels //0c |
816 | 257 // 16 Drain Hit Points from target. |
1553
b98812ead5d9
Get(skillname) functions cleaned up, using GetMultiplierForSkillLevel instead of nested conditions
Grumpy7
parents:
1548
diff
changeset
|
258 // 35 Increases chance of disarming. |
816 | 259 // 39 Double damage vs Demons. |
260 // 40 Double damage vs Dragons | |
261 // 45 +5 Speed and Accuracy | |
262 // 56 +5 Might and Endurance. | |
263 // 57 +5 Intellect and Personality. | |
264 // 58 Increased Value. | |
265 // 60 +3 Unarmed and Dodging skills | |
266 // 61 +3 Stealing and Disarm skills. | |
267 // 59 Increased Weapon speed. | |
268 // 63 Double Damage vs. Elves. | |
269 // 64 Double Damage vs. Undead. | |
270 // 67 Adds 5 points of Body damage and +2 Disarm skill. | |
271 // 68 Adds 6-8 points of Cold damage and +5 Armor Class. | |
831 | 272 // 71 Prevents drowning damage. |
273 // 72 Prevents falling damage. | |
1019 | 274 int uNumCharges; //10 |
275 unsigned int uAttributes; //14 | |
1759 | 276 unsigned __int8 uBodyAnchor; //18 |
277 char uMaxCharges; //19 | |
278 char uHolderPlayer; //1A | |
279 char field_1B; //1B | |
280 unsigned __int64 uExpireTime; //1C | |
0 | 281 }; |
282 #pragma pack(pop) | |
283 | |
284 | |
285 | |
286 /* 175 */ | |
287 #pragma pack(push, 1) | |
559 | 288 struct ItemDesc //30h |
229 | 289 { //Item # |Pic File|Name|Value|Equip Stat|Skill Group|Mod1|Mod2|material| |
290 ///ID/Rep/St|Not identified name|Sprite Index|VarA|VarB|Equip X|Equip Y|Notes | |
291 char *pIconName; //0 4 | |
292 char *pName; //4 8 | |
293 char *pUnidentifiedName; //8 c | |
294 char *pDescription; //0c 10 | |
295 unsigned int uValue; //10 14 | |
296 unsigned __int16 uSpriteID; //14 18 | |
297 __int16 field_1A; //16 | |
365 | 298 signed __int16 uEquipX; //18 1c |
299 signed __int16 uEquipY; //1a 1e | |
816 | 300 ITEM_EQUIP_TYPE uEquipType; //1c 20 |
229 | 301 unsigned __int8 uSkillType; //1d 21 |
302 unsigned __int8 uDamageDice; //1e 22 | |
303 unsigned __int8 uDamageRoll; //1f 23 | |
304 unsigned __int8 uDamageMod; //20 24 | |
305 unsigned __int8 uMaterial; //21 25 | |
306 char _additional_value; //22 26 | |
307 char _bonus_type; //23 27 | |
308 char _bonus_strength; //24 28 | |
309 char field_25; // 25 29 | |
310 char field_26; //26 2A | |
311 char field_27; // 27 2b | |
312 union | |
315 | 313 { |
229 | 314 unsigned __int8 uChanceByTreasureLvl[6]; |
315 struct { | |
316 unsigned __int8 uChanceByTreasureLvl1; // 28 2c | |
317 unsigned __int8 uChanceByTreasureLvl2; // 29 2d | |
318 unsigned __int8 uChanceByTreasureLvl3; // 2A 2e | |
319 unsigned __int8 uChanceByTreasureLvl4; // 2B 2f | |
320 unsigned __int8 uChanceByTreasureLvl5; // 2C 30 | |
321 unsigned __int8 uChanceByTreasureLvl6; // 2D 32 | |
322 }; | |
315 | 323 }; |
324 unsigned char uItemID_Rep_St; //2e 32 | |
325 char field_2f; | |
326 }; | |
0 | 327 #pragma pack(pop) |
328 | |
329 | |
330 | |
331 /* 177 */ | |
332 #pragma pack(push, 1) | |
333 struct ItemEnchantment | |
222 | 334 { //Bonus|Sta|Of Name|Arm|Shld|Helm|Belt|Cape|Gaunt|Boot|Ring|Amul |
335 char *pBonusStat; | |
336 char *pOfName; | |
337 /* union{ | |
338 struct { | |
339 unsigned char to_arm; | |
340 unsigned char to_shld; | |
341 unsigned char to_helm; | |
342 unsigned char to_belt; | |
343 unsigned char to_cape; | |
344 unsigned char to_gaunt; | |
345 unsigned char to_boot; | |
346 unsigned char to_ring; | |
347 unsigned char to_amul; | |
348 }; */ | |
349 unsigned char to_item[12]; | |
350 // }; | |
351 }; | |
0 | 352 #pragma pack(pop) |
353 | |
354 /* 178 */ | |
355 #pragma pack(push, 1) | |
559 | 356 struct ItemSpecialEnchantment //1Ch |
222 | 357 { //Bonus Stat|Name Add|W1|W2|Miss|Arm|Shld|Helm|Belt|Cape|Gaunt|Boot|Ring|Amul|Value|Lvl|Description fo special Bonuses and values |
358 | |
559 | 359 char *pBonusStatement; //0 |
360 char *pNameAdd; //4 | |
361 char to_item_apply[12]; //8 | |
362 int iValue; //14 | |
363 int iTreasureLevel; //18 | |
0 | 364 }; |
365 #pragma pack(pop) | |
366 | |
222 | 367 #pragma pack(push, 1) |
368 struct BonusRange | |
369 { | |
370 unsigned int minR; | |
371 unsigned int maxR; | |
372 }; | |
373 #pragma pack(pop) | |
193
821fd955c379
fixed potion data parsing. Somehow 3d render was affected
Gloval
parents:
0
diff
changeset
|
374 |
0 | 375 /* 176 */ |
376 #pragma pack(push, 1) | |
377 struct ItemsTable | |
378 { | |
379 void Initialize(); | |
380 void LoadPotions(); | |
381 void LoadPotionNotes(); | |
385 | 382 void GenerateItem(int treasure_level, unsigned int uTreasureType, ItemGen *pItem); |
0 | 383 void SetSpecialBonus(ItemGen *pItem); |
377 | 384 bool IsMaterialSpecial(ItemGen *pItem); |
385 bool IsMaterialNonCommon(ItemGen *pItem); | |
374 | 386 void Release(); |
0 | 387 |
222 | 388 int uAllItemsCount; |
1708
f8414042db1f
Moving NZIArray to a separate class, fixing a few inventory bugs
Grumpy7
parents:
1682
diff
changeset
|
389 NZIArray<ItemDesc, 800> pItems; //4-9604h |
222 | 390 ItemEnchantment pEnchantments[24]; //9604h |
229 | 391 ItemSpecialEnchantment pSpecialEnchantments[72]; //97E4h -9FC4h |
224 | 392 char field_9FC4[5000]; |
0 | 393 char field_B348[5000]; |
394 char field_C6D0[5000]; | |
395 char field_DA58[5000]; | |
229 | 396 char field_EDE0[384]; |
222 | 397 unsigned __int16 potion_data[50][50]; // 77B2h*2=EF64h -102ECh |
398 unsigned __int16 potion_note[50][50]; // 8176h*2=102ECh -11674h | |
399 char *pItemsTXT_Raw; //11674h | |
0 | 400 char *pRndItemsTXT_Raw; |
222 | 401 char *pStdItemsTXT_Raw; //1167Ch |
402 char *pSpcItemsTXT_Raw; //11680h | |
224 | 403 unsigned int uChanceByTreasureLvlSumm[6]; //11684 |
404 unsigned int uBonusChanceStandart[6]; //1169c | |
405 unsigned int uBonusChanceSpecial[6]; //116B4 | |
406 unsigned int uBonusChanceWpSpecial[6]; //116cc -116e4 | |
222 | 407 unsigned int pEnchantmentsSumm[9]; //116E4h -11708h |
408 BonusRange bonus_ranges[6]; //45C2h*4 =11708h | |
224 | 409 unsigned int pSpecialEnchantmentsSumm[24]; //11738h |
410 unsigned int pSpecialEnchantments_count; //11798h | |
0 | 411 char field_1179C; |
315 | 412 char field_1179D; |
413 char field_1179E; | |
414 char field_1179F; | |
0 | 415 }; |
416 #pragma pack(pop) | |
417 | |
463 | 418 void GenerateStandartShopItems(); |
419 void GenerateSpecialShopItems(); | |
598 | 420 void GenerateItemsInChest(); |
0 | 421 |
1202 | 422 extern std::array<const char, 5> uItemsAmountPerShopType; // weak |
1682 | 423 extern ItemGen *ptr_50C9A4_ItemToEnchant; |
0 | 424 |
377 | 425 extern struct ItemsTable *pItemsTable; |
426 | |
427 /* | |
428 +10 to all Resistances. 1 | |
429 +10 to all Seven Statistics. 2 | |
430 Explosive Impact! 3 | |
431 Adds 3-4 points of Cold damage. 4 | |
432 Adds 6-8 points of Cold damage. 5 | |
433 Adds 9-12 points of Cold damage. 6 | |
434 Adds 2-5 points of Electrical damage. 7 | |
435 Adds 4-10 points of Electrical damage. 8 | |
436 Adds 6-15 points of Electrical damage. 9 | |
437 Adds 1-6 points of Fire damage. 10 | |
438 Adds 2-12 points of Fire damage. 11 | |
439 Adds 3-18 points of Fire damage. 12 | |
440 Adds 5 points of Body damage. 13 | |
441 Adds 8 points of Body damage. 14 | |
442 Adds 12 points of Body damage. 15 | |
443 Drain Hit Points from target. 16 | |
444 Increases rate of Recovery. 17 | |
445 Wearer resistant to Diseases. 18 | |
446 Wearer resistant to Insanity. 19 | |
447 Wearer resistant to Paralysis. 20 | |
448 Wearer resistant to Poison. 21 | |
449 Wearer resistant to Sleep. 22 | |
450 Wearer resistant to Stone. 23 | |
451 Increased Knockback. 24 | |
452 +5 Level. 25 | |
453 Increases effect of all Air spells. 26 | |
454 Increases effect of all Body spells. 27 | |
455 Increases effect of all Dark spells. 28 | |
456 Increases effect of all Earth spells. 29 | |
457 Increases effect of all Fire spells. 30 | |
458 Increases effect of all Light spells. 31 | |
459 Increases effect of all Mind spells. 32 | |
460 Increases effect of all Spirit spells. 33 | |
461 Increases effect of all Water spells. 34 | |
462 Increases chance of Disarming. 35 | |
463 Half damage from all missile attacks. 36 | |
464 Regenerate Hit points over time. 37 | |
465 Regenerate Spell points over time. 38 | |
466 Double damage vs Demons. 39 | |
467 Double damage vs Dragons 40 | |
468 Drain Hit Points from target and Increased Weapon speed. 41 | |
469 +1 to Seven Stats, HP, SP, Armor, Resistances. 42 | |
470 +10 to Endurance, Armor, Hit points. 43 | |
471 +10 Hit points and Regenerate Hit points over time. 44 | |
472 +5 Speed and Accuracy. 45 | |
473 Adds 10-20 points of Fire damage and +25 Might. 46 | |
474 +10 Spell points and Regenerate Spell points over time. 47 | |
475 +15 Endurance and +5 Armor. 48 | |
476 +10 Intellect and Luck. 49 | |
477 +30 Fire Resistance and Regenerate Hit points over time. 50 | |
478 +10 Spell points, Speed, Intellect. 51 | |
479 +10 Endurance and Accuracy. 52 | |
480 +10 Might and Personality. 53 | |
481 +15 Endurance and Regenerate Hit points over time. 54 | |
482 +15 Luck and Regenerate Spell points over time. 55 | |
483 +5 Might and Endurance. 56 | |
484 +5 Intellect and Personality. 57 | |
485 Increased Value. 58 | |
486 Increased Weapon speed. 59 | |
487 +3 Unarmed and Dodging skills. 60 | |
488 +3 Stealing and Disarm skills. 61 | |
489 +3 ID Item and ID Monster skills. 62 | |
490 Double Damage vs. Elves. 63 | |
491 Double Damage vs. Undead. 64 | |
492 Double Damage vs. Titans. 65 | |
493 Regenerate Spell points and Hit points over time. 66 | |
494 Adds 5 points of Body damage and +2 Disarm skill. 67 | |
495 Adds 6-8 points of Cold damage and +5 Armor Class. 68 | |
496 +20 Air Resistance and Shielding. 69 | |
497 +10 Water Resistance and +2 Alchemy skill. 70 | |
498 Prevents damage from drowning. 71 | |
499 Prevents damage from falling. 72 | |
939 | 500 */ |
501 | |
502 | |
503 /* 391 */ | |
504 #pragma pack(push, 1) | |
505 struct stru351_summoned_item | |
506 { | |
507 int field_0_expire_second; | |
508 int field_4_expire_minute; | |
509 int field_8_expire_hour; | |
510 int field_C_expire_day; | |
511 int field_10_expire_week; | |
512 int field_14_exprie_month; | |
513 int field_18_expire_year; | |
514 }; | |
515 #pragma pack(pop) |