Skip to content

Commit

Permalink
Fixed Item Types
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrAntares
MrAntares authored Oct 18, 2024
1 parent 8372aa3 commit 6ed4ee6
Show file tree
Hide file tree
Showing 21 changed files with 120 additions and 101 deletions.
14 changes: 8 additions & 6 deletions src/DB/Items/ItemType.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
});
2 changes: 1 addition & 1 deletion src/UI/Components/CartItems/CartItems.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/UI/Components/Equipment/EquipmentV0/EquipmentV0.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 );
Expand Down
4 changes: 2 additions & 2 deletions src/UI/Components/Equipment/EquipmentV1/EquipmentV1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 );
Expand Down
4 changes: 2 additions & 2 deletions src/UI/Components/Equipment/EquipmentV2/EquipmentV2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 );
Expand Down
4 changes: 2 additions & 2 deletions src/UI/Components/Equipment/EquipmentV3/EquipmentV3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 );
Expand Down
29 changes: 16 additions & 13 deletions src/UI/Components/Inventory/InventoryV0/InventoryV0.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand All @@ -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 );
Expand Down Expand Up @@ -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';
Expand Down
38 changes: 21 additions & 17 deletions src/UI/Components/Inventory/InventoryV1/InventoryV1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand All @@ -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 );
Expand Down Expand Up @@ -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';
Expand Down Expand Up @@ -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:
Expand All @@ -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;
Expand Down
38 changes: 21 additions & 17 deletions src/UI/Components/Inventory/InventoryV2/InventoryV2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand All @@ -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 );
Expand Down Expand Up @@ -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';
Expand Down Expand Up @@ -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:
Expand All @@ -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;
Expand Down
Loading

0 comments on commit 6ed4ee6

Please sign in to comment.