Mercurial > mm7
diff Items.h @ 816:cfc65feef029
* Player Recovery Times
* Player Attack fixes
* Debug log to timers
author | Nomad |
---|---|
date | Tue, 26 Mar 2013 12:40:27 +0200 |
parents | f39fbeb65b28 |
children | 9c3f28b31b4a |
line wrap: on
line diff
--- a/Items.h Tue Mar 26 06:40:04 2013 +0200 +++ b/Items.h Tue Mar 26 12:40:27 2013 +0200 @@ -4,7 +4,6 @@ - /* 338 */ enum ITEM_FLAGS :unsigned int { @@ -34,8 +33,8 @@ ITEM_CROSSBOW_1 = 0x2F, ITEM_MACE_1 = 0x32, ITEM_STAFF_1 = 0x3D, - ITEM_BLASTER = 65, - ITEM_LASER_RIFLE = 66, + ITEM_BLASTER = 64, + ITEM_LASER_RIFLE = 65, ITEM_LEATHER_1 = 0x42, ITEM_CHAINMAIL_1 = 0x47, ITEM_PLATE_1 = 0x4C, @@ -87,29 +86,29 @@ }; /* 331 */ -enum ITEM_EQUIP_TYPE +enum ITEM_EQUIP_TYPE: unsigned __int8 { - EQUIP_ONE_OR_TWO_HANDS = 0, - EQUIP_TWO_HANDED = 1, - EQUIP_BOW = 2, - EQUIP_ARMOUR = 3, - EQUIP_SHIELD = 4, - EQUIP_HELMET = 5, - EQUIP_BELT = 6, - EQUIP_CLOAK = 7, - EQUIP_GAUNTLETS = 8, - EQUIP_BOOTS = 9, - EQUIP_RING = 10, - EQUIP_AMULET = 11, - EQUIP_WAND = 12, - EQUIP_REAGENT = 13, - EQUIP_POTION = 14, - EQUIP_SPELL_SCROLL = 15, - EQUIP_BOOK = 16, - EQUIP_MESSAGE_SCROLL = 17, - EQUIP_GOLD = 18, - EQUIP_GEM = 19, - EQUIP_NONE = 20 + EQUIP_OFF_HAND = 0, + EQUIP_MAIN_HAND = 1, + EQUIP_BOW = 2, + EQUIP_ARMOUR = 3, + EQUIP_SHIELD = 4, + EQUIP_HELMET = 5, + EQUIP_BELT = 6, + EQUIP_CLOAK = 7, + EQUIP_GAUNTLETS = 8, + EQUIP_BOOTS = 9, + EQUIP_RING = 10, + EQUIP_AMULET = 11, + EQUIP_WAND = 12, + EQUIP_REAGENT = 13, + EQUIP_POTION = 14, + EQUIP_SPELL_SCROLL = 15, + EQUIP_BOOK = 16, + EQUIP_MESSAGE_SCROLL = 17, + EQUIP_GOLD = 18, + EQUIP_GEM = 19, + EQUIP_NONE = 20 }; @@ -143,7 +142,21 @@ int uItemID; int uEnchantmentType; int _bonus_strength; - int uSpecEnchantmentType; // 25: +5 levels + int uSpecEnchantmentType; // 25 +5 levels + // 16 Drain Hit Points from target. + // 39 Double damage vs Demons. + // 40 Double damage vs Dragons + // 45 +5 Speed and Accuracy + // 56 +5 Might and Endurance. + // 57 +5 Intellect and Personality. + // 58 Increased Value. + // 60 +3 Unarmed and Dodging skills + // 61 +3 Stealing and Disarm skills. + // 59 Increased Weapon speed. + // 63 Double Damage vs. Elves. + // 64 Double Damage vs. Undead. + // 67 Adds 5 points of Body damage and +2 Disarm skill. + // 68 Adds 6-8 points of Cold damage and +5 Armor Class. int uNumCharges; unsigned int uAttributes; unsigned __int8 uBodyAnchor; @@ -170,7 +183,7 @@ __int16 field_1A; //16 signed __int16 uEquipX; //18 1c signed __int16 uEquipY; //1a 1e - unsigned __int8 uEquipType; //1c 20 + ITEM_EQUIP_TYPE uEquipType; //1c 20 unsigned __int8 uSkillType; //1d 21 unsigned __int8 uDamageDice; //1e 22 unsigned __int8 uDamageRoll; //1f 23