diff --git a/src/DB/Items/ItemType.js b/src/DB/Items/ItemType.js index 33f834d3..494dff78 100644 --- a/src/DB/Items/ItemType.js +++ b/src/DB/Items/ItemType.js @@ -15,15 +15,17 @@ define(function() return { HEALING: 0, + UNKNOWN: 1, USABLE: 2, ETC: 3, - WEAPON: 4, - EQUIP: 5, + ARMOR: 4, + WEAPON: 5, CARD: 6, PETEGG: 7, - PETEQUIP: 8, - AMMO: 10, - USABLE_SKILL: 11, - USABLE_UNK: 18 + PETARMOR: 8, + AMMO: 10, + DELAYCONSUME: 11, + SHADOWGEAR: 12, + CASH: 18 }; }); diff --git a/src/UI/Components/CartItems/CartItems.js b/src/UI/Components/CartItems/CartItems.js index d6a7b93f..aef2ca05 100644 --- a/src/UI/Components/CartItems/CartItems.js +++ b/src/UI/Components/CartItems/CartItems.js @@ -623,7 +623,7 @@ define(function(require) } let quantity = ' ea'; - if ((item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) && + if ((item.type === ItemType.WEAPON || item.type === ItemType.ARMOR) && item.Options.filter(Option => Option.index !== 0).length > 0) { quantity = ' Quantity'; diff --git a/src/UI/Components/Equipment/EquipmentV0/EquipmentV0.js b/src/UI/Components/Equipment/EquipmentV0/EquipmentV0.js index cd640d6e..48bb8662 100644 --- a/src/UI/Components/Equipment/EquipmentV0/EquipmentV0.js +++ b/src/UI/Components/Equipment/EquipmentV0/EquipmentV0.js @@ -511,7 +511,7 @@ define(function(require) if (data.type === 'item') { item = data.data; - if ((item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) && + if ((item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.SHADOWGEAR) && item.IsIdentified && !item.IsDamaged) { selector = getSelectorFromLocation( 'location' in item ? item.location : item.WearLocation); ui = EquipmentV0.ui.find(selector); @@ -557,7 +557,7 @@ define(function(require) if (data && data.type === 'item') { item = data.data; - if ((item.type === ItemType.WEAPON || item.type === ItemType.EQUIP || item.type === ItemType.AMMO) && + if ((item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.AMMO || item.type === ItemType.SHADOWGEAR) && item.IsIdentified && !item.IsDamaged) { EquipmentV0.ui.find('td').css('backgroundImage','none'); EquipmentV0.onEquipItem( item.index, 'location' in item ? item.location : item.WearState ); diff --git a/src/UI/Components/Equipment/EquipmentV1/EquipmentV1.js b/src/UI/Components/Equipment/EquipmentV1/EquipmentV1.js index 5f622336..7701a315 100644 --- a/src/UI/Components/Equipment/EquipmentV1/EquipmentV1.js +++ b/src/UI/Components/Equipment/EquipmentV1/EquipmentV1.js @@ -623,7 +623,7 @@ define(function(require) if (data.type === 'item') { item = data.data; - if ((item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) && + if ((item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.SHADOWGEAR) && item.IsIdentified && !item.IsDamaged) { selector = getSelectorFromLocation( 'location' in item ? item.location : item.WearLocation); ui = EquipmentV1.ui.find(selector); @@ -669,7 +669,7 @@ define(function(require) if (data && data.type === 'item') { item = data.data; - if ((item.type === ItemType.WEAPON || item.type === ItemType.EQUIP || item.type === ItemType.AMMO) && + if ((item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.AMMO || item.type === ItemType.SHADOWGEAR) && item.IsIdentified && !item.IsDamaged) { EquipmentV1.ui.find('td').css('backgroundImage','none'); EquipmentV1.onEquipItem( item.index, 'location' in item ? item.location : item.WearState ); diff --git a/src/UI/Components/Equipment/EquipmentV2/EquipmentV2.js b/src/UI/Components/Equipment/EquipmentV2/EquipmentV2.js index 5eabb29c..122cd27b 100644 --- a/src/UI/Components/Equipment/EquipmentV2/EquipmentV2.js +++ b/src/UI/Components/Equipment/EquipmentV2/EquipmentV2.js @@ -624,7 +624,7 @@ define(function(require) if (data.type === 'item') { item = data.data; - if ((item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) && + if ((item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.SHADOWGEAR) && item.IsIdentified && !item.IsDamaged) { selector = getSelectorFromLocation( 'location' in item ? item.location : item.WearLocation); ui = EquipmentV2.ui.find(selector); @@ -670,7 +670,7 @@ define(function(require) if (data && data.type === 'item') { item = data.data; - if ((item.type === ItemType.WEAPON || item.type === ItemType.EQUIP || item.type === ItemType.AMMO) && + if ((item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.AMMO || item.type === ItemType.SHADOWGEAR) && item.IsIdentified && !item.IsDamaged) { EquipmentV2.ui.find('td').css('backgroundImage','none'); EquipmentV2.onEquipItem( item.index, 'location' in item ? item.location : item.WearState ); diff --git a/src/UI/Components/Equipment/EquipmentV3/EquipmentV3.js b/src/UI/Components/Equipment/EquipmentV3/EquipmentV3.js index cd58614b..ae97c7b0 100644 --- a/src/UI/Components/Equipment/EquipmentV3/EquipmentV3.js +++ b/src/UI/Components/Equipment/EquipmentV3/EquipmentV3.js @@ -707,7 +707,7 @@ define(function(require) if (data.type === 'item') { item = data.data; - if ((item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) && + if ((item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.SHADOWGEAR) && item.IsIdentified && !item.IsDamaged) { selector = getSelectorFromLocation( 'location' in item ? item.location : item.WearLocation); ui = EquipmentV3.ui.find(selector); @@ -753,7 +753,7 @@ define(function(require) if (data && data.type === 'item') { item = data.data; - if ((item.type === ItemType.WEAPON || item.type === ItemType.EQUIP || item.type === ItemType.AMMO) && + if ((item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.AMMO || item.type === ItemType.SHADOWGEAR) && item.IsIdentified && !item.IsDamaged) { EquipmentV3.ui.find('td').css('backgroundImage','none'); EquipmentV3.onEquipItem( item.index, 'location' in item ? item.location : item.WearState ); diff --git a/src/UI/Components/Inventory/InventoryV0/InventoryV0.js b/src/UI/Components/Inventory/InventoryV0/InventoryV0.js index f7d9d8e7..bfe03315 100644 --- a/src/UI/Components/Inventory/InventoryV0/InventoryV0.js +++ b/src/UI/Components/Inventory/InventoryV0/InventoryV0.js @@ -394,15 +394,16 @@ define(function(require) switch (item.type) { case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_SKILL: - case ItemType.USABLE_UNK: + case ItemType.DELAYCONSUME: + case ItemType.CASH: tab = InventoryV0.TAB.USABLE; break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: case ItemType.PETEGG: - case ItemType.PETEQUIP: + case ItemType.PETARMOR: + case ItemType.SHADOWGEAR: tab = InventoryV0.TAB.EQUIP; break; @@ -445,15 +446,16 @@ define(function(require) switch (item.type) { case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_SKILL: - case ItemType.USABLE_UNK: + case ItemType.DELAYCONSUME: + case ItemType.CASH: tab = InventoryV0.TAB.USABLE; break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: case ItemType.PETEGG: - case ItemType.PETEQUIP: + case ItemType.PETARMOR: + case ItemType.SHADOWGEAR: tab = InventoryV0.TAB.EQUIP; break; @@ -595,7 +597,7 @@ define(function(require) // Usable item case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_UNK: + case ItemType.CASH: InventoryV0.onUseItem( item.index ); break; @@ -604,13 +606,14 @@ define(function(require) InventoryV0.onUseCard( item.index ); break; - case ItemType.USABLE_SKILL: + case ItemType.DELAYCONSUME: break; // Equip item case ItemType.WEAPON: - case ItemType.EQUIP: - case ItemType.PETEQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: + case ItemType.PETARMOR: case ItemType.AMMO: if (item.IsIdentified && !item.IsDamaged) { InventoryV0.onEquipItem( item.index, item.location ); @@ -866,7 +869,7 @@ define(function(require) } let quantity = ' ea'; - if (item.Options && (item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) && + if (item.Options && (item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.SHADOWGEAR) && item.Options.filter(Option => Option.index !== 0).length > 0) { quantity = ' Quantity'; diff --git a/src/UI/Components/Inventory/InventoryV1/InventoryV1.js b/src/UI/Components/Inventory/InventoryV1/InventoryV1.js index 937ab9ec..bfc89ea7 100644 --- a/src/UI/Components/Inventory/InventoryV1/InventoryV1.js +++ b/src/UI/Components/Inventory/InventoryV1/InventoryV1.js @@ -443,15 +443,16 @@ define(function(require) switch (item.type) { case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_SKILL: - case ItemType.USABLE_UNK: + case ItemType.DELAYCONSUME: + case ItemType.CASH: tab = InventoryV1.TAB.USABLE; break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: case ItemType.PETEGG: - case ItemType.PETEQUIP: + case ItemType.PETARMOR: tab = InventoryV1.TAB.EQUIP; break; @@ -495,15 +496,16 @@ define(function(require) switch (item.type) { case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_SKILL: - case ItemType.USABLE_UNK: + case ItemType.DELAYCONSUME: + case ItemType.CASH: tab = InventoryV1.TAB.USABLE; break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: case ItemType.PETEGG: - case ItemType.PETEQUIP: + case ItemType.PETARMOR: tab = InventoryV1.TAB.EQUIP; break; @@ -649,7 +651,7 @@ define(function(require) // Usable item case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_UNK: + case ItemType.CASH: InventoryV1.onUseItem( item.index ); break; @@ -658,13 +660,14 @@ define(function(require) InventoryV1.onUseCard( item.index ); break; - case ItemType.USABLE_SKILL: + case ItemType.DELAYCONSUME: break; // Equip item case ItemType.WEAPON: - case ItemType.EQUIP: - case ItemType.PETEQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: + case ItemType.PETARMOR: case ItemType.AMMO: if (item.IsIdentified && !item.IsDamaged) { InventoryV1.onEquipItem( item.index, item.location ); @@ -935,7 +938,7 @@ define(function(require) } let quantity = ' ea'; - if (item.Options && (item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) && + if (item.Options && (item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.SHADOWGEAR) && item.Options.filter(Option => Option.index !== 0).length > 0) { quantity = ' Quantity'; @@ -1159,8 +1162,8 @@ define(function(require) switch (item.type) { case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_SKILL: - case ItemType.USABLE_UNK: + case ItemType.DELAYCONSUME: + case ItemType.CASH: case ItemType.ETC: case ItemType.CARD: case ItemType.AMMO: @@ -1169,9 +1172,10 @@ define(function(require) break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: case ItemType.PETEGG: - case ItemType.PETEQUIP: + case ItemType.PETARMOR: // Equipment: PlaceETCTab = flag & 4; favoriteval = 4; break; diff --git a/src/UI/Components/Inventory/InventoryV2/InventoryV2.js b/src/UI/Components/Inventory/InventoryV2/InventoryV2.js index 1de1aab2..7567ab93 100644 --- a/src/UI/Components/Inventory/InventoryV2/InventoryV2.js +++ b/src/UI/Components/Inventory/InventoryV2/InventoryV2.js @@ -451,15 +451,16 @@ define(function(require) switch (item.type) { case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_SKILL: - case ItemType.USABLE_UNK: + case ItemType.DELAYCONSUME: + case ItemType.CASH: tab = InventoryV2.TAB.USABLE; break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: case ItemType.PETEGG: - case ItemType.PETEQUIP: + case ItemType.PETARMOR: tab = InventoryV2.TAB.EQUIP; break; @@ -503,15 +504,16 @@ define(function(require) switch (item.type) { case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_SKILL: - case ItemType.USABLE_UNK: + case ItemType.DELAYCONSUME: + case ItemType.CASH: tab = InventoryV2.TAB.USABLE; break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: case ItemType.PETEGG: - case ItemType.PETEQUIP: + case ItemType.PETARMOR: tab = InventoryV2.TAB.EQUIP; break; @@ -698,7 +700,7 @@ define(function(require) // Usable item case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_UNK: + case ItemType.CASH: InventoryV2.onUseItem( item.index ); break; @@ -707,13 +709,14 @@ define(function(require) InventoryV2.onUseCard( item.index ); break; - case ItemType.USABLE_SKILL: + case ItemType.DELAYCONSUME: break; // Equip item case ItemType.WEAPON: - case ItemType.EQUIP: - case ItemType.PETEQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: + case ItemType.PETARMOR: case ItemType.AMMO: if (item.IsIdentified && !item.IsDamaged) { InventoryV2.onEquipItem( item.index, item.location ); @@ -984,7 +987,7 @@ define(function(require) } let quantity = ' ea'; - if (item.Options && (item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) && + if (item.Options && (item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.SHADOWGEAR) && item.Options.filter(Option => Option.index !== 0).length > 0) { quantity = ' Quantity'; @@ -1208,8 +1211,8 @@ define(function(require) switch (item.type) { case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_SKILL: - case ItemType.USABLE_UNK: + case ItemType.DELAYCONSUME: + case ItemType.CASH: case ItemType.ETC: case ItemType.CARD: case ItemType.AMMO: @@ -1218,9 +1221,10 @@ define(function(require) break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: case ItemType.PETEGG: - case ItemType.PETEQUIP: + case ItemType.PETARMOR: // Equipment: PlaceETCTab = flag & 4; favoriteval = 4; break; diff --git a/src/UI/Components/Inventory/InventoryV3/InventoryV3.js b/src/UI/Components/Inventory/InventoryV3/InventoryV3.js index e942ed28..b79d8165 100644 --- a/src/UI/Components/Inventory/InventoryV3/InventoryV3.js +++ b/src/UI/Components/Inventory/InventoryV3/InventoryV3.js @@ -467,15 +467,16 @@ define(function(require) switch (item.type) { case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_SKILL: - case ItemType.USABLE_UNK: + case ItemType.DELAYCONSUME: + case ItemType.CASH: tab = InventoryV3.TAB.USABLE; break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: case ItemType.PETEGG: - case ItemType.PETEQUIP: + case ItemType.PETARMOR: tab = InventoryV3.TAB.EQUIP; break; @@ -519,15 +520,16 @@ define(function(require) switch (item.type) { case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_SKILL: - case ItemType.USABLE_UNK: + case ItemType.DELAYCONSUME: + case ItemType.CASH: tab = InventoryV3.TAB.USABLE; break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: case ItemType.PETEGG: - case ItemType.PETEQUIP: + case ItemType.PETARMOR: tab = InventoryV3.TAB.EQUIP; break; @@ -726,7 +728,7 @@ define(function(require) // Usable item case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_UNK: + case ItemType.CASH: InventoryV3.onUseItem( item.index ); break; @@ -735,17 +737,18 @@ define(function(require) InventoryV3.onUseCard( item.index ); break; - case ItemType.USABLE_SKILL: + case ItemType.DELAYCONSUME: break; // Equip item case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: if (hasRefineFlag && Refine.isRefineOpen()) { Refine.onRequestItemRefine(item); break; } - case ItemType.PETEQUIP: + case ItemType.PETARMOR: case ItemType.AMMO: if (item.IsIdentified && !item.IsDamaged) { InventoryV3.onEquipItem( item.index, item.location ); @@ -1016,7 +1019,7 @@ define(function(require) } let quantity = ' ea'; - if (item.Options && (item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) && + if (item.Options && (item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.SHADOWGEAR) && item.Options.filter(Option => Option.index !== 0).length > 0) { quantity = ' Quantity'; @@ -1240,8 +1243,8 @@ define(function(require) switch (item.type) { case ItemType.HEALING: case ItemType.USABLE: - case ItemType.USABLE_SKILL: - case ItemType.USABLE_UNK: + case ItemType.DELAYCONSUME: + case ItemType.CASH: case ItemType.ETC: case ItemType.CARD: case ItemType.AMMO: @@ -1250,9 +1253,10 @@ define(function(require) break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: case ItemType.PETEGG: - case ItemType.PETEQUIP: + case ItemType.PETARMOR: // Equipment: PlaceETCTab = flag & 4; favoriteval = 4; break; diff --git a/src/UI/Components/ItemCompare/ItemCompare.js b/src/UI/Components/ItemCompare/ItemCompare.js index 475379f4..2929b1e2 100644 --- a/src/UI/Components/ItemCompare/ItemCompare.js +++ b/src/UI/Components/ItemCompare/ItemCompare.js @@ -153,7 +153,7 @@ define(function(require) var customname = ''; var hideslots = false; - if(item.type == ItemType.WEAPON && item.location == 0){ //Pet Egg + if(item.type == ItemType.ARMOR && item.location == 0){ //Pet Egg hideslots = true; } @@ -253,7 +253,8 @@ define(function(require) break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: if (hideslots){ cardList.parent().hide(); break; diff --git a/src/UI/Components/ItemInfo/ItemInfo.js b/src/UI/Components/ItemInfo/ItemInfo.js index 9c7e8c8c..938dea2a 100644 --- a/src/UI/Components/ItemInfo/ItemInfo.js +++ b/src/UI/Components/ItemInfo/ItemInfo.js @@ -160,7 +160,7 @@ define(function(require) var customname = ''; var hideslots = false; - if(item.type == ItemType.WEAPON && item.location == 0){ //Pet Egg + if(item.type == ItemType.ARMOR && item.location == 0){ //Pet Egg hideslots = true; } @@ -283,7 +283,8 @@ define(function(require) break; case ItemType.WEAPON: - case ItemType.EQUIP: + case ItemType.ARMOR: + case ItemType.SHADOWGEAR: if (hideslots){ cardList.parent().hide(); break; diff --git a/src/UI/Components/ItemReform/ItemReform.js b/src/UI/Components/ItemReform/ItemReform.js index d11d84ba..b9850a2f 100644 --- a/src/UI/Components/ItemReform/ItemReform.js +++ b/src/UI/Components/ItemReform/ItemReform.js @@ -463,7 +463,7 @@ define(function(require) if (!mat_item) { inventory_mat_count = 0; } else { - inventory_mat_count = (mat_item.type === ItemType.WEAPON || mat_item.type === ItemType.EQUIP) ? 1 : mat_item.count; + inventory_mat_count = (mat_item.type === ItemType.WEAPON || mat_item.type === ItemType.ARMOR) ? 1 : mat_item.count; } if (inventory_mat_count >= material.Amount) { diff --git a/src/UI/Components/LaphineSys/LaphineSys.js b/src/UI/Components/LaphineSys/LaphineSys.js index 4cd7a4b9..b721de14 100644 --- a/src/UI/Components/LaphineSys/LaphineSys.js +++ b/src/UI/Components/LaphineSys/LaphineSys.js @@ -238,7 +238,7 @@ define(function(require) LaphineUIState.sourceItems.forEach(sourceItem => { let matchingItems = GetInventoryItemsById(sourceItem.id); matchingItems.forEach(inventoryItem => { - let count = (inventoryItem.type === ItemType.WEAPON || inventoryItem.type === ItemType.EQUIP) ? 1 : inventoryItem.count; + let count = (inventoryItem.type === ItemType.WEAPON || inventoryItem.type === ItemType.ARMOR) ? 1 : inventoryItem.count; onAddMaterialItem( inventoryItem, count, sourceItem.count, sourceItem.name); }); }); @@ -254,7 +254,7 @@ define(function(require) // Determine if the item is selectable based on item type and corresponding criteria let isSelectable; - if (item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) { + if (item.type === ItemType.WEAPON || item.type === ItemType.ARMOR) { isSelectable = item.RefiningLevel >= LaphineUIState.needRefineMin && item.RefiningLevel <= LaphineUIState.needRefineMax; } else { @@ -384,7 +384,7 @@ define(function(require) // Check if the clicked item has the class 'unselectable' if (jQuery(this).hasClass('unselectable')) { let message; - if (item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) { + if (item.type === ItemType.WEAPON || item.type === ItemType.ARMOR) { if (item.RefiningLevel > LaphineUIState.needRefineMax) { message = DB.getMessage(3644); showMessage(message); @@ -413,7 +413,7 @@ define(function(require) let sourceItem = LaphineUIState.sourceItems.find(si => si.id === item.ITID); // Determine the count based on item type - let itemCount = (item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) ? 1 : sourceItem.count; + let itemCount = (item.type === ItemType.WEAPON || item.type === ItemType.ARMOR) ? 1 : sourceItem.count; let newItem = jQuery('
' + '
'+ @@ -537,7 +537,7 @@ define(function(require) if (item.ITID === itemId && idx === itemIndex) { itemExists = true; selectedItem = jQuery(this); - let tempCount = (item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) ? 1 : item.count; + let tempCount = (item.type === ItemType.WEAPON || item.type === ItemType.ARMOR) ? 1 : item.count; if (increase) { jQuery(this).removeClass('unselectable'); jQuery(this).find('.amount').text(tempCount); @@ -560,7 +560,7 @@ define(function(require) if (increase && !itemExists) { let item = Inventory.getUI().getItemByIndex(itemIndex); if (item) { - let inventory_count = (item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) ? 1 : item.count; + let inventory_count = (item.type === ItemType.WEAPON || item.type === ItemType.ARMOR) ? 1 : item.count; let sourceItem = LaphineUIState.sourceItems.find(sourceItem => sourceItem.id === itemId); let source_needcount = sourceItem.count; let source_iconname = sourceItem.name; @@ -756,7 +756,7 @@ define(function(require) // Check if the clicked item has the class 'unselectable' if (jQuery(this).hasClass('unselectable')) { let message; - if (item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) { + if (item.type === ItemType.WEAPON || item.type === ItemType.ARMOR) { if (item.RefiningLevel > LaphineUIState.needRefineMax) { message = DB.getMessage(3644); showMessage(message); diff --git a/src/UI/Components/LaphineUpg/LaphineUpg.js b/src/UI/Components/LaphineUpg/LaphineUpg.js index 3c382b40..837b8492 100644 --- a/src/UI/Components/LaphineUpg/LaphineUpg.js +++ b/src/UI/Components/LaphineUpg/LaphineUpg.js @@ -260,7 +260,7 @@ define(function(require) let isValid = true; // Check refining level for weapons and equipment - if ((inventoryItem.type === ItemType.WEAPON || inventoryItem.type === ItemType.EQUIP) && + if ((inventoryItem.type === ItemType.WEAPON || inventoryItem.type === ItemType.ARMOR) && (inventoryItem.RefiningLevel < LaphineUpgUIState.needRefineMin || inventoryItem.RefiningLevel > LaphineUpgUIState.needRefineMax)) { isValid = false; diff --git a/src/UI/Components/NpcStore/NpcStore.js b/src/UI/Components/NpcStore/NpcStore.js index 8a7e726b..c089cd6f 100644 --- a/src/UI/Components/NpcStore/NpcStore.js +++ b/src/UI/Components/NpcStore/NpcStore.js @@ -687,9 +687,10 @@ define(function(require) item = isAdding ? _input[index] : _output[index]; isStackable = ( item.type !== ItemType.WEAPON && - item.type !== ItemType.EQUIP && + item.type !== ItemType.ARMOR && + item.type !== ItemType.SHADOWGEAR && item.type !== ItemType.PETEGG && - item.type !== ItemType.PETEQUIP + item.type !== ItemType.PETARMOR ); if (isAdding) { diff --git a/src/UI/Components/ShortCut/ShortCut.js b/src/UI/Components/ShortCut/ShortCut.js index 7fabbcb3..4fd21631 100644 --- a/src/UI/Components/ShortCut/ShortCut.js +++ b/src/UI/Components/ShortCut/ShortCut.js @@ -334,7 +334,7 @@ define(function(require) name = DB.getItemName(item); // If equipment, do not display count - if (item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) { + if (item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.SHADOWGEAR) { count = 1; } diff --git a/src/UI/Components/Storage/Storage.js b/src/UI/Components/Storage/Storage.js index 1ed4e6a2..cc575b4d 100644 --- a/src/UI/Components/Storage/Storage.js +++ b/src/UI/Components/Storage/Storage.js @@ -14,7 +14,6 @@ define(function(require) * Dependencies */ var DB = require('DB/DBManager'); - var ItemType = require('DB/Items/ItemType'); var jQuery = require('Utils/jquery'); var Client = require('Core/Client'); var Preferences = require('Core/Preferences'); diff --git a/src/UI/Components/SwitchEquip/SwitchEquip.js b/src/UI/Components/SwitchEquip/SwitchEquip.js index 3406baaa..2362e934 100644 --- a/src/UI/Components/SwitchEquip/SwitchEquip.js +++ b/src/UI/Components/SwitchEquip/SwitchEquip.js @@ -354,7 +354,7 @@ define(function(require) if (data.type === 'item') { item = data.data; - if ((item.type === ItemType.WEAPON || item.type === ItemType.EQUIP) && + if ((item.type === ItemType.WEAPON || item.type === ItemType.ARMOR) && item.IsIdentified && !item.IsDamaged) { selector = getSelectorFromLocation( 'location' in item ? item.location : item.WearLocation); ui = SwitchEquip.ui.find(selector); @@ -400,7 +400,7 @@ define(function(require) if (data && data.type === 'item') { item = data.data; - if ((item.type === ItemType.WEAPON || item.type === ItemType.EQUIP || item.type === ItemType.AMMO) && + if ((item.type === ItemType.WEAPON || item.type === ItemType.ARMOR || item.type === ItemType.AMMO) && item.IsIdentified && !item.IsDamaged) { SwitchEquip.ui.find('td').css('backgroundImage','none'); SwitchEquip.onAddSwitchEquip( item.index, 'location' in item ? item.location : item.WearState ); diff --git a/src/UI/Components/Vending/Vending.js b/src/UI/Components/Vending/Vending.js index f68fb621..705214db 100644 --- a/src/UI/Components/Vending/Vending.js +++ b/src/UI/Components/Vending/Vending.js @@ -100,9 +100,10 @@ define(function(require) function isItemStackable(item){ if( item.type === ItemType.WEAPON || - item.type === ItemType.EQUIP || + item.type === ItemType.ARMOR || + item.type === ItemType.SHADOWGEAR || item.type === ItemType.PETEGG || - item.type === ItemType.PETEQUIP + item.type === ItemType.PETARMOR ){ return false; } else { diff --git a/src/UI/Components/VendingShop/VendingShop.js b/src/UI/Components/VendingShop/VendingShop.js index bebd5ff1..27cb05b9 100644 --- a/src/UI/Components/VendingShop/VendingShop.js +++ b/src/UI/Components/VendingShop/VendingShop.js @@ -18,7 +18,6 @@ define(function(require) * Dependencies */ var DB = require('DB/DBManager'); - var ItemType = require('DB/Items/ItemType'); var jQuery = require('Utils/jquery'); var Network = require('Network/NetworkManager'); var PACKET = require('Network/PacketStructure');