fix(types): match on class-category on weapons (#822)

Author: TobiTenno

build/parser.mjs

@@ -908,12 +908,39 @@ class Parser {
   addAdditionalWikiaData(item, category, wikiaData) {
     if (!['weapons', 'warframes', 'mods', 'upgrades', 'sentinels'].includes(category.toLowerCase())) return;
 
+    const slots = [
+      ['Secondary'], // 0
+      ['Primary', 'Hound', 'Beast', 'Archgun', 'Robotic', 'Archgun (Atmosphere)', 'Amp'], // 1
+      [], // 2
+      [], // 3
+      ['Archgun'], // 4
+      ['Melee', 'Archmelee'], // 5
+      [], // 6
+      ['Archgun (Atmosphere)', 'Exalted', 'Secondary', 'Primary', 'Melee', 'Archgun', 'Archmelee'], // 7
+      [],
+      [],
+      [],
+      [],
+      [],
+      [],
+      ['Railjack Turret'], // 14
+    ];
+
     let wikiCategory = category.toLowerCase();
     if (category === 'Upgrades') wikiCategory = 'mods';
     if (item.category === 'Archwing') wikiCategory = 'archwings';
     if (category === 'Sentinels') wikiCategory = 'companions';
 
-    const wikiaItem = wikiaData[wikiCategory].filter((i) => i).find((i) => i.uniqueName === item.uniqueName);
+    const wikiaItem = wikiaData[wikiCategory]
+      .filter((i) => i)
+      .find((i) => {
+        const uMatch = i.uniqueName === item.uniqueName;
+        let nMatch = true;
+        if (category.toLowerCase() === 'weapons' && typeof item.slot !== 'undefined') {
+          nMatch = slots[item.slot]?.includes(i.slot);
+        }
+        return uMatch && nMatch;
+      });
     if (!wikiaItem) return;
     item.wikiAvailable = true;
 

build/wikia/transformers/transformPolarity.mjs

@@ -2,11 +2,16 @@ import POLARITIES from './polarities.mjs';
 
 const transform = (field) => {
   let output;
-  if (field) {
-    output = (POLARITIES[field] || field || '').toLowerCase();
-    if (output && !output.length) output = undefined;
-    if (output === 'none') output = undefined;
+  try {
+    if (field) {
+      output = String(POLARITIES[field] ?? field ?? '').toLowerCase();
+      if (output && !output.length) output = undefined;
+      if (output === 'none') output = undefined;
+    }
+  } catch (error) {
+    console.error('Error transforming polarity:', field, error);
   }
+
   return output;
 };
 

build/wikia/transformers/transformWeapon.mjs

@@ -203,6 +203,7 @@ export default (oldWeapon, imageUrls, blueprints) => {
       Attack10,
       Attacks,
       InternalName,
+      Slot,
     } = oldWeapon;
 
     newWeapon = {
@@ -212,6 +213,7 @@ export default (oldWeapon, imageUrls, blueprints) => {
       url: `https://wiki.warframe.com/w/${encodeURIComponent(Name.replace(/\s/g, '_'))}`,
       mr: Mastery || 0,
       type: Class || Type,
+      class: Class,
       riven_disposition: Disposition,
       ...(ChargeAttack &&
         ChargeAttack.StatusChance && { status_chance: Number((Number(ChargeAttack.StatusChance) * 100).toFixed(2)) }),
@@ -223,6 +225,7 @@ export default (oldWeapon, imageUrls, blueprints) => {
       marketCost: blueprints[Name] && blueprints[Name].MarketCost,
       bpCost: blueprints[Name] && blueprints[Name].BPCost,
       thumbnail: imageUrls[Image] || imageUrls[Image.replace(/_/g, ' ')],
+      slot: Slot,
       attacks: [
         NormalAttack && parseAttack(NormalAttack),
         Attack1 && parseAttack(Attack1),

config/itemTypes.json

@@ -994,6 +994,10 @@
     "id": "/Mods/TransmuteCores",
     "name": "Transmutation Mod"
   },
+  {
+    "id": "/Upgrades/Mods/Antiques/",
+    "name": "Tektolyst Artifact Mod"
+  },
   {
     "id": "Upgrades/Mods/.*Mod",
     "regex": true,
@@ -1062,4 +1066,4 @@
     "id": "Challenges/Seasons",
     "name": "Nightwave Challenge"
   }
-]
+]