diff --git a/src/ui_resources/HangarXPLOR.Settings.html b/src/ui_resources/HangarXPLOR.Settings.html index c9e4904..3dfd1bf 100644 --- a/src/ui_resources/HangarXPLOR.Settings.html +++ b/src/ui_resources/HangarXPLOR.Settings.html @@ -2,9 +2,28 @@ HangarXPLOR Settings - +

Settings

+

Disclaimer: This is really ugly for now. I'm sorry.

+

Actions

+ + \ No newline at end of file diff --git a/src/ui_resources/HangarXPLOR.Settings.js b/src/ui_resources/HangarXPLOR.Settings.js index d978970..8f56ae5 100644 --- a/src/ui_resources/HangarXPLOR.Settings.js +++ b/src/ui_resources/HangarXPLOR.Settings.js @@ -1,3 +1,11 @@ -/* eslint no-console: "off" */ -console.log('Hi'); \ No newline at end of file +document.getElementById('clearCache').addEventListener("click", function() { + chrome.storage.sync.get(null, function(settings) { + settings._cacheSalt = btoa(Math.random()); + + chrome.storage.sync.set(settings, () => { + chrome.tabs.reload(); + window.close(); + }); + }); +}); diff --git a/src/web_resources/HangarXPLOR.Download.js b/src/web_resources/HangarXPLOR.Download.js index 5edfea4..b5e1bc0 100644 --- a/src/web_resources/HangarXPLOR.Download.js +++ b/src/web_resources/HangarXPLOR.Download.js @@ -47,6 +47,7 @@ HangarXPLOR._callbacks = HangarXPLOR._callbacks || {}; ship.name = $('.title', $ship).text(); ship.name = ship.name.replace(/^\s*(?:Aegis|Anvil|Banu|Drake|Esperia|Kruger|MISC|Origin|RSI|Tumbril|Vanduul|Xi'an)[^a-z0-9]+/gi, ''); ship.name = ship.name.replace(/^\s*(?:Aegis|Anvil|Banu|Drake|Esperia|Kruger|MISC|Origin|RSI|Tumbril|Vanduul|Xi'an)[^a-z0-9]+/gi, ''); + ship.nickname = $('.custom-name-text', $ship).text(); ship.lti = pledge.lti; ship.warbond = pledge.warbond; ship.package_id = pledge.id; @@ -74,6 +75,7 @@ HangarXPLOR._callbacks = HangarXPLOR._callbacks || {}; var $target = $(HangarXPLOR._selected.length > 0 ? HangarXPLOR._selected : HangarXPLOR._inventory); + // TODO: CSV support will need to be careful of user-entered data... var buffer = "Manufacturer, Ship, Lti, Warbond, ID, Pledge, Cost, Date\n"; buffer = buffer + HangarXPLOR.GetShipList($target).map(function(ship) { return [ '"' + ship.manufacturer + '"', '"' + ship.name + '"', ship.lti, ship.warbond, ship.package_id, '"' + ship.pledge + '"', '"' + ship.cost + '"', '"' + ship.pledge_date + '"' ].join(',')}).join('\n') diff --git a/src/web_resources/HangarXPLOR.DrawUI.js b/src/web_resources/HangarXPLOR.DrawUI.js index a2db961..db5c55f 100644 --- a/src/web_resources/HangarXPLOR.DrawUI.js +++ b/src/web_resources/HangarXPLOR.DrawUI.js @@ -33,6 +33,7 @@ HangarXPLOR.DrawUI = function() { Value: 'IsModel', Text: 'Models', Selected: HangarXPLOR._type == 'IsModel' }, { Value: 'IsPlant', Text: 'Plants', Selected: HangarXPLOR._type == 'IsPlant' }, { Value: 'IsPoster', Text: 'Posters', Selected: HangarXPLOR._type == 'IsPoster' }, + { Value: 'IsNameable', Text: 'Nameable', Class: 'split', Selected: HangarXPLOR._type == 'IsNameable' }, ], '158px', 'js-custom-filter', function(e, value) { HangarXPLOR._type = value; HangarXPLOR.SaveSettings(); HangarXPLOR.Render(); HangarXPLOR.RefreshPager(); /* HangarXPLOR.ResetBulkUI(); */ })); $controls1.append(HangarXPLOR.Dropdown([ diff --git a/src/web_resources/HangarXPLOR.Filter.js b/src/web_resources/HangarXPLOR.Filter.js index abe7eb6..c3870e5 100644 --- a/src/web_resources/HangarXPLOR.Filter.js +++ b/src/web_resources/HangarXPLOR.Filter.js @@ -1,106 +1,114 @@ var HangarXPLOR = HangarXPLOR || {}; -HangarXPLOR.Filter = function(list, filter) -{ +HangarXPLOR.Filter = function (list, filter) { switch (filter) { case "HasLTI": - list = $.grep(list, function(item) { return item.hasLTI; }); + list = $.grep(list, function (item) { return item.hasLTI }); break; case "!HasLTI": - list = $.grep(list, function(item) { return !item.hasLTI; }); + list = $.grep(list, function (item) { return !item.hasLTI }); break; case "IsGiftable": - list = $.grep(list, function(item) { return item.isGiftable; }); + list = $.grep(list, function (item) { return item.isGiftable }); break; case "!IsGiftable": - list = $.grep(list, function(item) { return !item.isGiftable; }); + list = $.grep(list, function (item) { return !item.isGiftable }); break; case "IsShip": - list = $.grep(list, function(item) { return item.isShip && !item.isPackage; }); + list = $.grep(list, function (item) { return item.isShip && !item.isPackage }); break; case "HasShip": - list = $.grep(list, function(item) { return item.hasShip; }); + list = $.grep(list, function (item) { return item.hasShip }); + break; + case "IsNameable": + list = $.grep(list, function (item) { return item.isNameable }); + break; + case "HasNickname": + list = $.grep(list, function (item) { return item.hasNickname }); + break; + case "!HasNickname": + list = $.grep(list, function (item) { return !item.hasNickname }); break; case "IsPackage": - list = $.grep(list, function(item) { return item.isPackage; }); + list = $.grep(list, function (item) { return item.isPackage }); break; case "!IsPackage": - list = $.grep(list, function(item) { return !item.isPackage && item.hasShip; }); + list = $.grep(list, function (item) { return !item.isPackage && item.hasShip }); break; case "IsWarbond": - list = $.grep(list, function(item) { return item.isWarbond && (item.hasShip || item.isUpgrade); }); + list = $.grep(list, function (item) { return item.isWarbond && (item.hasShip || item.isUpgrade) }); break; case "!IsWarbond": - list = $.grep(list, function(item) { return !item.isWarbond && (item.hasShip || item.isUpgrade); }); + list = $.grep(list, function (item) { return !item.isWarbond && (item.hasShip || item.isUpgrade) }); break; case "IsCombo": - list = $.grep(list, function(item) { return item.isCombo; }); + list = $.grep(list, function (item) { return item.isCombo }); break; case "IsUpgrade": - list = $.grep(list, function(item) { return item.isUpgrade; }); + list = $.grep(list, function (item) { return item.isUpgrade }); break; case "IsUpgraded": - list = $.grep(list, function(item) { return item.isUpgraded; }); + list = $.grep(list, function (item) { return item.isUpgraded }); break; case "!IsUpgraded": - list = $.grep(list, function(item) { return !item.isUpgraded; }); + list = $.grep(list, function (item) { return !item.isUpgraded }); break; case "IsAddOn": - list = $.grep(list, function(item) { return item.isAddOn; }); + list = $.grep(list, function (item) { return item.isAddOn }); break; case "IsPaint": - list = $.grep(list, function(item) { return item.isPaint; }); + list = $.grep(list, function (item) { return item.isPaint }); break; case "IsExtra": - list = $.grep(list, function(item) { return item.isAddOn || item.isUpgrade; }); + list = $.grep(list, function (item) { return item.isAddOn || item.isUpgrade }); break; case "IsFlair": - list = $.grep(list, function(item) { return item.isFlair; }); + list = $.grep(list, function (item) { return item.isFlair }); break; case "HasValue": - list = $.grep(list, function(item) { return item.hasValue; }); + list = $.grep(list, function (item) { return item.hasValue }); break; case "!HasValue": - list = $.grep(list, function(item) { return !item.hasValue; }); + list = $.grep(list, function (item) { return !item.hasValue }); break; case "IsMeltable": - list = $.grep(list, function(item) { return item.isMeltable; }); + list = $.grep(list, function (item) { return item.isMeltable }); break; case "!IsMeltable": - list = $.grep(list, function(item) { return !item.isMeltable; }); + list = $.grep(list, function (item) { return !item.isMeltable }); break; case "IsModel": - list = $.grep(list, function(item) { return item.isModel; }); + list = $.grep(list, function (item) { return item.isModel }); break; case "IsPoster": - list = $.grep(list, function(item) { return item.isPoster; }); + list = $.grep(list, function (item) { return item.isPoster }); break; case "IsPlant": - list = $.grep(list, function(item) { return item.isSpacePlant; }); + list = $.grep(list, function (item) { return item.isSpacePlant }); break; case "IsDecoration": - list = $.grep(list, function(item) { return item.isDecoration; }); + list = $.grep(list, function (item) { return item.isDecoration }); break; case "IsComponent": - list = $.grep(list, function(item) { return item.isComponent; }); + list = $.grep(list, function (item) { return item.isComponent }); break; case "IsReward": - list = $.grep(list, function(item) { return item.isReward; }); + list = $.grep(list, function (item) { return item.isReward }); break; case "!IsReward": - list = $.grep(list, function(item) { return !item.isReward; }); + list = $.grep(list, function (item) { return !item.isReward }); break; case "IsSelected": - list = $.grep(list, function(item) { return item.isSelected; }); + list = $.grep(list, function (item) { return item.isSelected }); break; case "IsFreeCCU": - list = $.grep(list, function(item) { return item.isUpgrade && !item.hasValue; }); + list = $.grep(list, function (item) { return item.isUpgrade && !item.hasValue }); break; case "!IsFreeCCU": - list = $.grep(list, function(item) { return !item.isUpgrade || item.hasValue; }); + list = $.grep(list, function (item) { return !item.isUpgrade || item.hasValue }); break; } - + return list; } diff --git a/src/web_resources/HangarXPLOR.LoadSettings.js b/src/web_resources/HangarXPLOR.LoadSettings.js index fbe3626..3c351a7 100644 --- a/src/web_resources/HangarXPLOR.LoadSettings.js +++ b/src/web_resources/HangarXPLOR.LoadSettings.js @@ -6,24 +6,29 @@ HangarXPLOR.LoadSettings = function(callback) chrome.storage.sync.get(null, function(settings) { settings = settings || {}; - HangarXPLOR = HangarXPLOR || {}; - HangarXPLOR._type = settings._type || 'All'; - HangarXPLOR._sort = settings._sort || 'Purchased'; - HangarXPLOR._pageNo = settings._pageNo || 1; - HangarXPLOR._pageCount = settings._pageCount || 10; - HangarXPLOR._logEnabled = settings._logEnabled || false; - HangarXPLOR._cacheHash = settings._cacheHash || 0; - HangarXPLOR._cacheSalt = settings._cacheSalt || btoa(Math.random()); + HangarXPLOR = HangarXPLOR || {}; + HangarXPLOR._type = settings._type || 'All'; + HangarXPLOR._sort = settings._sort || 'Purchased'; + HangarXPLOR._pageNo = settings._pageNo || 1; + HangarXPLOR._pageCount = settings._pageCount || 10; + HangarXPLOR._logEnabled = settings._logEnabled || false; + HangarXPLOR._cacheHash = settings._cacheHash || 0; + HangarXPLOR._cacheSalt = settings._cacheSalt || btoa(Math.random()); - HangarXPLOR._feature = HangarXPLOR._feature || {}; - HangarXPLOR._feature.LTI = settings._feature_LTI || ''; - HangarXPLOR._feature.Warbond = settings._feature_Warbond || ''; - HangarXPLOR._feature.Giftable = settings._feature_Giftable || ''; - HangarXPLOR._feature.Meltable = settings._feature_Meltable || ''; - HangarXPLOR._feature.Upgraded = settings._feature_Upgraded || ''; - HangarXPLOR._feature.Valuable = settings._feature_Valuable || ''; - HangarXPLOR._feature.Reward = settings._feature_Reward || ''; - HangarXPLOR._feature.Summary = settings._feature_Summary || 'cash'; + HangarXPLOR._feature = HangarXPLOR._feature || {}; + HangarXPLOR._feature.LTI = settings._feature_LTI || ''; + HangarXPLOR._feature.Warbond = settings._feature_Warbond || ''; + HangarXPLOR._feature.Giftable = settings._feature_Giftable || ''; + HangarXPLOR._feature.Meltable = settings._feature_Meltable || ''; + HangarXPLOR._feature.Upgraded = settings._feature_Upgraded || ''; + HangarXPLOR._feature.Valuable = settings._feature_Valuable || ''; + HangarXPLOR._feature.Reward = settings._feature_Reward || ''; + HangarXPLOR._feature.Summary = settings._feature_Summary || 'cash'; + + HangarXPLOR._setting = HangarXPLOR._setting || {}; + HangarXPLOR._setting.NoPledgeID = settings._setting_NoPledgeID || false; + HangarXPLOR._setting.NoPrefix = settings._setting_NoPrefix || false; + HangarXPLOR._setting.NoNickname = settings._setting_NoNickname || false; HangarXPLOR.Log('Loaded Settings', settings); diff --git a/src/web_resources/HangarXPLOR.ProcessItem.js b/src/web_resources/HangarXPLOR.ProcessItem.js index 02dd107..9a7d926 100644 --- a/src/web_resources/HangarXPLOR.ProcessItem.js +++ b/src/web_resources/HangarXPLOR.ProcessItem.js @@ -86,6 +86,7 @@ HangarXPLOR.ProcessItem = function() pledgeName = pledgeName.replace(/^Original and Veteran Backers Reward/i, 'Reward - AMX-1 Repair Bot'); pledgeName = pledgeName.replace(/^Hangar Fees Reward/i, 'Reward - Free Hangar Fees'); pledgeName = pledgeName.replace(/^Christmas 2014 reward!/i, 'Reward - Holiday Wreath - Christmas 2014'); + pledgeName = pledgeName.replace(/^Christmas Reward!/i, 'Reward - Holiday Wreath - Christmas 2015'); pledgeName = pledgeName.replace(/^#YOU'RE A STAR CITIZEN/i, 'Reward - Vanguard Harbinger - You\'re A Star Citizen'); pledgeName = pledgeName.replace(/^15 Million Reward/i, 'Reward - Digital 42-page Upgrade Handbook - 15 Million'); pledgeName = pledgeName.replace(/^16 Million Reward/i, 'Reward - Laser Pistol side arm- 16 Million'); @@ -93,30 +94,43 @@ HangarXPLOR.ProcessItem = function() pledgeName = pledgeName.replace(/^19 Million Reward/i, 'Reward - Jane\'s Fighting Ships style manual - 19 Million'); pledgeName = pledgeName.replace(/^20 Million Reward/i, 'Reward - Fishtank Mark 1 - 20 Million'); pledgeName = pledgeName.replace(/^23 Million Reward/i, 'Reward - Takuetsu Prestige Khartu-Al Model - 23 Million'); + pledgeName = pledgeName.replace(/^200 Million Commemorative Coin/i, 'Reward - Commemorative Coin - 200 Million'); + pledgeName = pledgeName.replace(/^300 Million Reward/i, 'Reward - S-38 \'One Empire\' Pistol - 300 Million'); pledgeName = pledgeName.replace(/^(\d+)M (Reward - .+)$/i, '$2 - $1 Million'); - pledgeName = pledgeName.replace(/^(Decorations - |Add-Ons - )?"?PAX Australia (\d+)( Trophy)?"?/i, 'Trophy - PAX Australia $2'); - pledgeName = pledgeName.replace(/^(Decorations - |Add-Ons - )?"?Gamescom (\d+)( Trophy)?"?/i, 'Trophy - Gamescom $2'); - pledgeName = pledgeName.replace(/^(Decorations - |Add-Ons - )?"?CitizenCon (\d+)( Subscriber)?( Trophy)?"?/i, 'Trophy - CitizenCon $2'); + pledgeName = pledgeName.replace(/^(Decorations - |Add-Ons - )?"?PAX Australia (\d+)(.*?) Trophy"?/i, 'Trophy - PAX Australia $2'); + pledgeName = pledgeName.replace(/^(Decorations - |Add-Ons - )?"?Gamescom (\d+)(.*?) Trophy"?/i, 'Trophy - Gamescom $2'); + pledgeName = pledgeName.replace(/^(Decorations - |Add-Ons - )?"?CitizenCon (\d+)( Subscriber)? Trophy"?/i, 'Trophy - CitizenCon $2'); + pledgeName = pledgeName.replace(/^(Decorations - |Add-Ons - )?"?CitizenCon (\d+)"?/i, 'Reward - CitizenCon $2'); + pledgeName = pledgeName.replace(/^(Decorations - |Add-Ons - )?(.*?) Painting/i, 'Decoration - $2 Painting'); + pledgeName = pledgeName.replace(/^(Decorations - |Add-Ons - )?(.*?) Statue/i, 'Decoration - $2 Statue'); + pledgeName = pledgeName.replace(/^(Decorations - |Add-Ons - )?(.*?) Model/i, 'Models - $2'); pledgeName = pledgeName.replace(/^December 2014 Backer Reward/i, 'Reward - Takuetsu Mustang Model - December 2014'); pledgeName = pledgeName.replace(/^(Hornet|Freelancer|Decorations - CitizenCon \d+) Poster/i, 'Posters - $1'); pledgeName = pledgeName.replace(/ Poster$/i, ''); + pledgeName = pledgeName.replace(/^(.*) (Helmet|Armor|Armor Set)$/i, 'Equipment - $1 $2'); + pledgeName = pledgeName.replace(/^Masters of Design Series ?- ?(.*)$/i, 'Decoration - $1'); + pledgeName = pledgeName.replace(/(.*) T-Shirt$/i, 'Equipment - $1 T-Shirt'); + pledgeName = pledgeName.replace(/T-Shirt (.*)$/i, 'Equipment - $1 T-Shirt'); + pledgeName = pledgeName.replace(/^(.*) Best in Show Livery Upgrade/i, 'Paints - $1 Best in Show Livery'); pledgeName = pledgeName.replace(/^Space Globe /i, 'Space Globes '); pledgeName = pledgeName.replace(/^Standalone Ship - Drake Dragonfly Ride Together Two-Pack/i, 'Combo - Drake Dragonfly Ride Together Two-Pack'); pledgeName = pledgeName.replace(/^Add-ons - (.*) Mega(?: |-)Pack$/i, 'Combo - $1 Mega Pack'); pledgeName = pledgeName.replace(/ - Holiday 20\d\d$/i, ''); pledgeName = pledgeName.replace(/"Be A Hero"$/i, 'Be A Hero'); pledgeName = pledgeName.replace(/^Cross-Chassis Upgrades/i, 'Ship Upgrades'); - pledgeName = pledgeName.replace(/^(.*) Skin$/i, 'Skins - $1'); + pledgeName = pledgeName.replace(/^(.*) Skin$/i, 'Paints - $1'); pledgeName = pledgeName.replace(/^Freelancer MIS upgrade$/i, 'Ship Upgrades - Freelancer MIS Upgrade'); pledgeName = pledgeName.replace(/^F7A Military Hornet Upgrade$/i, 'Ship Upgrades - F7A Military Hornet Upgrade'); pledgeName = pledgeName.replace(/ Upgrade$/i, ''); pledgeName = pledgeName.replace(/^You Got Our Backs (Electro Skin Hull)$/i, 'Ship Upgrades - You Got Our Backs (Electro Skin Hull)'); pledgeName = pledgeName.replace(/^Next Generation Aurora$/i, 'Package - Next Generation Aurora - LTI'); pledgeName = pledgeName.replace(/Discount Pack/i, 'Pack'); + pledgeName = pledgeName.replace(/Watch the Skies Tip Line Reward/i, 'Reward - Watch the Skies Tip Line'); pledgeName = pledgeName.replace(/Tumbril Cyclone LTI Presale/i, 'Tumbril Cyclone - LTI'); pledgeName = pledgeName.replace(/^(Aegis Dynamics Idris Corvette|Aegis Dynamics Retaliator Heavy Bomber|Anvil Gladiator Bomber|Banu Merchantman|Captured Vanduul Fighter|Drake Interplanetary Caterpillar|Idris Corvette|MISC Freelancer|MISC Starfarer Tanker|ORIGIN M50 Interceptor|RSI Aurora LN|RSI Aurora LX|RSI Constellation|ORIGIN 350R Racer|Xi'An Scout - +Khartu)( - LTI)?$/i, 'Standalone Ship - $1$2'); pledgeName = pledgeName.replace(/^(Digital )?(Advanced Hunter|Arbiter|Bounty Hunter|Colonel|Cutlass|Freelancer|Mercenary|Pirate|Rear Admiral|Scout|Specter|Weekend Warrior)( - LTI)?$/i, 'Package - $1$2$3'); pledgeName = pledgeName.replace(" ", " ").trim(); + // TODO: Add pre-processing for Reliant Variants Here if required // Package - Mustang Omega : AMD Edition @@ -133,35 +147,41 @@ HangarXPLOR.ProcessItem = function() this.pledgeValue = $('.js-pledge-value', this).val(); this.componentName = $component.prev().text(); this.shipName = $.map($ship, $.text).join(", "); + + // These just standardize some naming this.shipName = this.shipName.replace('Origin 600i Exploration Module', 'Origin 600i'); this.shipName = this.shipName.replace('M50 Interceptor', 'M50'); this.shipName = this.shipName.replace('M50', 'M50 Interceptor'); this.shipName = this.shipName.replace('Hornet F7C', 'F7C Hornet'); + this.nickname = $('.custom-name-text', this).text(); this.meltValue = parseFloat(this.pledgeValue.replace("$", "").replace(",", "").replace(" USD", "")); if (this.meltValue != this.meltValue) this.meltValue = 0; // NaN safety this.hasValue = this.meltValue > 0; this.hasLTI = $('.title:contains(Lifetime Insurance)', this).length > 0; this.hasShip = $ship.length > 0; + this.hasNickname = this.nickname.length > 0; this.isMeltable = $('.js-reclaim', this).length > 0; this.isUpgraded = $('.upgraded', this).length > 0; + this.isNameable = $('.contains-nameable', this).length > 0; this.isGiftable = $('.label:contains(Gift)', this).length > 0 && this.meltValue < 1001; this.isPackage = ($('.title:contains(Squadron 42 Digital Download)', this).length + $('.title:contains(Star Citizen Digital Download)', this).length) > 0; this.isShip = $ship.length == 1; this.isCombo = $ship.length > 1; this.isUpgrade = (titleParts[0] == "Ship Upgrades" || titleParts[0] == "Upgrade"); this.isAddOn = (titleParts[0] == "Add-Ons"); - this.isPaint = (titleParts[0] == "Paints"); + this.isPaint = (titleParts[0] == "Paints") || (pledgeName.indexOf("Livery") > 0) || $('.kind:contains(Skin)', this).length > 0; this.isTrophy = (titleParts[0] == "Trophy"); this.isPoster = (titleParts[0] == "Posters"); this.isFishtank = (titleParts[0] == "Fishtank"); this.isReward = (titleParts[0] == "Reward" || pledgeName.indexOf("VIP") == 0 || pledgeName.indexOf("Referral") == 0); // TODO: Add UEE Towel and Omni Role Combat Armor (ORC) MK9 to this (May 09, 2014) this.isSpacePlant = (titleParts[0] == "Space Plant"); this.isSpaceGlobe = (titleParts[0] == "Space Globes"); - this.isModel = (pledgeName.indexOf("Takuetsu") > -1); + this.isModel = (pledgeName.indexOf("Takuetsu") > -1) || (pledgeName.indexOf("Models - ") > -1); this.isFlair = $('.kind:contains(Hangar decoration)', this).length > 0; this.isDecoration = !this.isModel && !this.isPoster && this.isFlair && !this.isFishtank &&!this.isPlant; this.isComponent = $('.kind:contains(Component)', this).length > 0; + this.isEquipment = $('.kind:contains(FPS Equipment)', this).length > 0; this.isWarbond = this.originalName.toLowerCase().indexOf('warbond') > -1 || this.originalName.toLowerCase().indexOf(' wb') > -1; this.isSelected = false; @@ -188,7 +208,7 @@ HangarXPLOR.ProcessItem = function() } } } - + if (this.isComponent && !this.hasShip) { for (i = 0, j = HangarXPLOR._components.length; i < j; i++) { if (this.componentName.toLowerCase().indexOf(HangarXPLOR._components[i].name.toLowerCase()) > -1) { @@ -207,6 +227,14 @@ HangarXPLOR.ProcessItem = function() if (titleParts.length == 1) titleParts[1] = pledgeName; if (this.isShip) titleParts[1] = this.shipName; + + if (this.isDecoration) titleParts[0] = "Decoration"; + if (this.isModel) titleParts[0] = "Model"; + if (this.isEquipment) titleParts[0] = "Equipment"; + if (this.isComponent) titleParts[0] = "Component"; + if ((this.isDecoration ? 1 : 0) + + (this.isEquipment ? 1 : 0) + + (this.isPaint ? 1 : 0) > 1) titleParts[0] = "Loot"; if (this.isShip) titleParts[0] = "Ship"; if (this.isCombo) titleParts[0] = "Combo"; if (this.isPackage) titleParts[0] = "Package"; @@ -217,16 +245,18 @@ HangarXPLOR.ProcessItem = function() $wrapper.append($("
", { class: 'items-col pledge-col' }).append($('