mm7: Items.cpp comparison

comparison Items.cpp @ 1709:8251e59fd7c1

ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens

author	Grumpy7
date	Tue, 24 Sep 2013 07:29:55 +0200
parents	2a309997c42f
children	bdac32c645c5

comparison

equal deleted inserted replaced

-:f8414042db1f
+:8251e59fd7c1
 unsigned __int8 equip_type;
 const char *player_name;
 const char *nameModificator;
 const char *format_str;
-equip_type = pItemsTable->pItems[uItemID].uEquipType;
+equip_type = GetItemEquipType();
 if ( (equip_type == EQUIP_REAGENT) || (equip_type == EQUIP_POTION) || (equip_type == EQUIP_GOLD) )
 {
 sprintf(item__getname_buffer.data(), "%s", pItemsTable->pItems[uItemID].pName);
 return item__getname_buffer.data();
 }
 tmp_chance += pItems[val_list[j]].uChanceByTreasureLvl[treasure_level - 1];
 }
 while ( tmp_chance < current_chance );
 }
-if (pItems[out_item->uItemID].uEquipType == EQUIP_POTION && out_item->uItemID != ITEM_POTION_BOTTLE )
+if (out_item->GetItemEquipType() == EQUIP_POTION && out_item->uItemID != ITEM_POTION_BOTTLE )
 {// if it potion set potion spec
 out_item->uEnchantmentType = 0;
 for (int i=0; i<2; ++i)
 out_item->uEnchantmentType += rand() % 4 + 1;
 out_item->uEnchantmentType = out_item->uEnchantmentType * treasure_level;
 if ( !v18 )
 out_item->uItemID = 1;
 if ( !out_item->uItemID )
 out_item->uItemID = 1;
-if (pItems[out_item->uItemID].uEquipType == EQUIP_POTION && out_item->uItemID != ITEM_POTION_BOTTLE )
+if (out_item->GetItemEquipType() == EQUIP_POTION && out_item->uItemID != ITEM_POTION_BOTTLE )
 {// if it potion set potion spec
 out_item->uEnchantmentType = 0;
 for (int i=0; i<2; ++i)
 out_item->uEnchantmentType += rand() % 4 + 1;
 out_item->uEnchantmentType = out_item->uEnchantmentType * treasure_level;
 if ( pItemsTable->pItems[out_item->uItemID + 1].uItemID_Rep_St )
 out_item->uAttributes = 0;
 else
 out_item->uAttributes = 1;
-if ( pItems[out_item->uItemID].uEquipType != EQUIP_POTION )
+if ( out_item->GetItemEquipType() != EQUIP_POTION )
 {
 out_item->uSpecEnchantmentType = 0;
 out_item->uEnchantmentType = 0;
 }
 //try get special enhansment
-switch (pItems[out_item->uItemID].uEquipType)
+switch (out_item->GetItemEquipType())
 {
 case EQUIP_OFF_HAND:
 case EQUIP_MAIN_HAND :
 case EQUIP_BOW :
 if ( !uBonusChanceWpSpecial[v6] )
 if ( !uBonusChanceStandart[v6] )
 return;
 special_chance = rand() % 100;
 if ( special_chance < uBonusChanceStandart[v6])
 {
-v26 = rand() %pEnchantmentsSumm[pItems[out_item->uItemID].uEquipType-3];
+v26 = rand() %pEnchantmentsSumm[out_item->GetItemEquipType()-3];
 out_item->uEnchantmentType = 0;
-v27=pEnchantments[out_item->uEnchantmentType].to_item[pItems[out_item->uItemID].uEquipType-3];
+v27=pEnchantments[out_item->uEnchantmentType].to_item[out_item->GetItemEquipType()-3];
 if (v26>v27 )
 {
 do
 {
 ++out_item->uEnchantmentType;
-v27+=pEnchantments[out_item->uEnchantmentType].to_item[pItems[out_item->uItemID].uEquipType-3];
+v27+=pEnchantments[out_item->uEnchantmentType].to_item[out_item->GetItemEquipType()-3];
 } while (v26>v27);
 }
 ++out_item->uEnchantmentType;
 v33 = rand() % (bonus_ranges[v6].maxR - bonus_ranges[v6].minR + 1);
 v34 = uBonusChanceStandart[v6] + uBonusChanceSpecial[v6];
 if ( special_chance>v34 )
 return;
 break;
 case EQUIP_WAND:
-out_item->uNumCharges = rand() % 6 + pItemsTable->pItems[out_item->uItemID].uDamageMod + 1;
+out_item->uNumCharges = rand() % 6 + out_item->GetDamageMod() + 1;
 out_item->uMaxCharges = out_item->uNumCharges;
 default:
 return;
 }
 switch ( treasure_level - 1 )
 {
 case 2:
 if ((tr_lv==1)||(tr_lv==0))
 {
-spc=pSpecialEnchantments[i].to_item_apply[pItems[out_item->uItemID].uEquipType];
+spc=pSpecialEnchantments[i].to_item_apply[out_item->GetItemEquipType()];
 spc_sum+=spc;
 if(spc)
 {
 val_list[j++]=i;
 }
 }
 break;
 case 3:
 if ((tr_lv==2)||(tr_lv==1)||(tr_lv==0))
 {
-spc=pSpecialEnchantments[i].to_item_apply[pItems[out_item->uItemID].uEquipType];
+spc=pSpecialEnchantments[i].to_item_apply[out_item->GetItemEquipType()];
 spc_sum+=spc;
 if(spc)
 {
 val_list[j++]=i;
 }
 }
 break;
 case 4:
 if ((tr_lv==3)||(tr_lv==2)||(tr_lv==1))
 {
-spc=pSpecialEnchantments[i].to_item_apply[pItems[out_item->uItemID].uEquipType];
+spc=pSpecialEnchantments[i].to_item_apply[out_item->GetItemEquipType()];
 spc_sum+=spc;
 if(spc)
 {
 val_list[j++]=i;
 }
 }
 break;
 case 5:
 if (tr_lv==3)
 {
-spc=pSpecialEnchantments[i].to_item_apply[pItems[out_item->uItemID].uEquipType];
+spc=pSpecialEnchantments[i].to_item_apply[out_item->GetItemEquipType()];
 spc_sum+=spc;
 if(spc)
 {
 val_list[j++]=i;
 }
 }
 v46 = rand()%spc_sum+1;
 j=0;
 out_item->uSpecEnchantmentType =val_list[j];
-v45=pSpecialEnchantments[val_list[j]].to_item_apply[pItems[out_item->uItemID].uEquipType];
+v45=pSpecialEnchantments[val_list[j]].to_item_apply[out_item->GetItemEquipType()];
 if (v45<v46)
 {
 do
 {
 ++j;
 out_item->uSpecEnchantmentType=val_list[j];
-v45+=pSpecialEnchantments[val_list[j]].to_item_apply[pItems[out_item->uItemID].uEquipType];
+v45+=pSpecialEnchantments[val_list[j]].to_item_apply[out_item->GetItemEquipType()];
 } while (v45<v46);
 }
 ++out_item->uSpecEnchantmentType;
 }
 std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* currList = bonusList->second;
 return (currList->find(attrToGet) != currList->end());
 return false;
 }
+ITEM_EQUIP_TYPE ItemGen::GetItemEquipType()
+{
+return pItemsTable->pItems[this->uItemID].uEquipType;
+}
+unsigned char ItemGen::GetPlayerSkillType()
+{
+return pItemsTable->pItems[this->uItemID].uSkillType;
+}
+char* ItemGen::GetIconName()
+{
+return pItemsTable->pItems[this->uItemID].pIconName;
+}
+unsigned __int8 ItemGen::GetDamageDice()
+{
+return pItemsTable->pItems[this->uItemID].uDamageDice;
+}
+unsigned __int8 ItemGen::GetDamageRoll()
+{
+return pItemsTable->pItems[this->uItemID].uDamageRoll;
+}
+unsigned __int8 ItemGen::GetDamageMod()
+{
+return pItemsTable->pItems[this->uItemID].uDamageMod;
+}
 //----- (004B8E3D) --------------------------------------------------------
 void GenerateStandartShopItems()
 	{
 	signed int item_count;
 	signed int shop_index;

Mercurial > mm7

comparison Items.cpp @ 1709:8251e59fd7c1