From 61271483fbffc7362bdfebbe52ef2ab89b3dea35 Mon Sep 17 00:00:00 2001 From: Matt Isenhower Date: Thu, 3 Jan 2019 09:21:08 -0800 Subject: [PATCH] Update gear abilities from Inkipedia This also fixes an issue with the gear updater script. --- src/common/data/brands.json | 6 +- src/common/data/gear.json | 228 +++++++++++++++++--------------- src/common/data/skills.json | 19 ++- src/utility/retrieveGearData.js | 3 +- 4 files changed, 143 insertions(+), 113 deletions(-) diff --git a/src/common/data/brands.json b/src/common/data/brands.json index 24b12ef..9950edf 100644 --- a/src/common/data/brands.json +++ b/src/common/data/brands.json @@ -24,7 +24,7 @@ "name": "Takoroka" }, "15": { - "frequent_skill": "13", + "frequent_skill": "201", "id": "15", "image": "/images/brand/0b09659e2770389dcb23d911359175e8686f85f5.png", "name": "Annaki" @@ -36,7 +36,7 @@ "name": "Enperry" }, "17": { - "frequent_skill": "13", + "frequent_skill": "201", "id": "17", "image": "/images/brand/4b05e494bf9a547b4d625fd52dcdd930a6c4defc.png", "name": "Toni Kensa" @@ -84,7 +84,7 @@ "name": "Splash Mob" }, "9": { - "frequent_skill": "12", + "frequent_skill": "200", "id": "9", "image": "/images/brand/80648c6e427eae4d32677797fa1be7c0e253fda5.png", "name": "Inkline" diff --git a/src/common/data/gear.json b/src/common/data/gear.json index fcfd958..9ef77ab 100644 --- a/src/common/data/gear.json +++ b/src/common/data/gear.json @@ -12,7 +12,7 @@ "name": "Anchor Sweat", "price": 2800, "rarity": 1, - "skill": "13" + "skill": "201" }, { "brand": "15", @@ -40,7 +40,7 @@ "name": "Annaki Flannel Hoodie", "price": 9999, "rarity": 2, - "skill": "12" + "skill": "200" }, { "brand": "15", @@ -89,14 +89,14 @@ "name": "Baby-Jelly Shirt", "price": 1350, "rarity": 0, - "skill": "12" + "skill": "200" }, { "brand": "8", "name": "Baby-Jelly Shirt & Tie", "price": 3800, "rarity": 1, - "skill": "13" + "skill": "201" }, { "brand": "6", @@ -131,7 +131,7 @@ "name": "Black 8-Bit FishFry", "price": 600, "rarity": 0, - "skill": "12" + "skill": "200" }, { "brand": "0", @@ -222,7 +222,7 @@ "name": "Black Velour Octoking Tee", "price": 2950, "rarity": 1, - "skill": "13" + "skill": "201" }, { "brand": "6", @@ -257,7 +257,7 @@ "name": "Brown FA-11 Bomber", "price": null, "rarity": 1, - "skill": "12" + "skill": "200" }, { "brand": "0", @@ -278,14 +278,14 @@ "name": "Carnivore Tee", "price": 500, "rarity": 0, - "skill": "12" + "skill": "200" }, { "brand": "2", "name": "Chili Octo Aloha", "price": 4850, "rarity": 1, - "skill": "12" + "skill": "200" }, { "brand": "9", @@ -306,7 +306,7 @@ "name": "Chirpy Chips Band Tee", "price": 900, "rarity": 0, - "skill": "13" + "skill": "201" }, { "brand": "11", @@ -334,14 +334,14 @@ "name": "Cycle King Jersey", "price": 8900, "rarity": 2, - "skill": "12" + "skill": "200" }, { "brand": "1", "name": "Cycling Shirt", "price": 2900, "rarity": 1, - "skill": "13" + "skill": "201" }, { "brand": "1", @@ -369,14 +369,14 @@ "name": "Dark Urban Vest", "price": 10000, "rarity": 2, - "skill": "13" + "skill": "201" }, { "brand": "4", "name": "Deep-Octo Satin Jacket", "price": 12300, "rarity": 2, - "skill": "13" + "skill": "201" }, { "brand": "7", @@ -385,6 +385,13 @@ "rarity": 2, "skill": "9" }, + { + "brand": "99", + "name": "Enchanted Robe", + "price": null, + "rarity": 1, + "skill": "106" + }, { "brand": "9", "name": "Eggplant Mountain Coat", @@ -455,6 +462,13 @@ "rarity": 1, "skill": "105" }, + { + "brand": "99", + "name": "Fresh Fish Gloves", + "price": null, + "rarity": 1, + "skill": "9" + }, { "brand": "98", "name": "Fresh Octo Tee", @@ -516,7 +530,7 @@ "name": "Gray FA-11 Bomber", "price": null, "rarity": 1, - "skill": "13" + "skill": "201" }, { "brand": "7", @@ -663,7 +677,7 @@ "name": "Inkopolis Squaps Jersey", "price": 1250, "rarity": 0, - "skill": "13" + "skill": "201" }, { "brand": "9", @@ -796,7 +810,7 @@ "name": "Mint Tee", "price": 400, "rarity": 0, - "skill": "12" + "skill": "200" }, { "brand": "2", @@ -945,13 +959,6 @@ "rarity": 1, "skill": "4" }, - { - "brand": "97", - "name": "Online Jersey", - "price": null, - "rarity": 2, - "skill": "4" - }, { "brand": "8", "name": "Orange Cardigan", @@ -999,7 +1006,7 @@ "name": "Pink Hoodie", "price": 3400, "rarity": 1, - "skill": "12" + "skill": "200" }, { "brand": "8", @@ -1062,7 +1069,7 @@ "name": "Red Cuttlegear LS", "price": 5800, "rarity": 1, - "skill": "12" + "skill": "200" }, { "brand": "15", @@ -1125,7 +1132,7 @@ "name": "Retro Sweat", "price": 9000, "rarity": 2, - "skill": "12" + "skill": "200" }, { "brand": "3", @@ -1167,7 +1174,7 @@ "name": "Sage Polo", "price": 400, "rarity": 0, - "skill": "13" + "skill": "201" }, { "brand": "8", @@ -1251,7 +1258,7 @@ "name": "Sky-Blue Squideye", "price": 500, "rarity": 0, - "skill": "13" + "skill": "201" }, { "brand": "16", @@ -1265,7 +1272,7 @@ "name": "Slipstream United", "price": 1800, "rarity": 1, - "skill": "12" + "skill": "200" }, { "brand": "0", @@ -1328,7 +1335,7 @@ "name": "Squidstar Waistcoat", "price": 650, "rarity": 0, - "skill": "13" + "skill": "201" }, { "brand": "99", @@ -1337,6 +1344,13 @@ "rarity": 1, "skill": "6" }, + { + "brand": "99", + "name": "Steel Platemail", + "price": null, + "rarity": 1, + "skill": "1" + }, { "brand": "9", "name": "Striped Peaks LS", @@ -1365,13 +1379,6 @@ "rarity": 0, "skill": "5" }, - { - "brand": "0", - "name": "SWC Logo Tee", - "price": null, - "rarity": 2, - "skill": "4" - }, { "brand": "11", "name": "Takoroka Crazy Baseball LS", @@ -1412,7 +1419,7 @@ "name": "Takoroka Windcrusher", "price": 8500, "rarity": 2, - "skill": "13" + "skill": "201" }, { "brand": "10", @@ -1615,7 +1622,7 @@ "name": "Zekko Baseball LS", "price": 800, "rarity": 0, - "skill": "12" + "skill": "200" }, { "brand": "4", @@ -1682,13 +1689,6 @@ "rarity": 2, "skill": "101" }, - { - "brand": "0", - "name": "Anglerfish Mask", - "price": null, - "rarity": 2, - "skill": "0" - }, { "brand": "15", "name": "Annaki Beret", @@ -1757,7 +1757,7 @@ "name": "Black FishFry Bandana", "price": 1250, "rarity": 0, - "skill": "12" + "skill": "200" }, { "brand": "6", @@ -1820,7 +1820,7 @@ "name": "Cycle King Cap", "price": 2400, "rarity": 1, - "skill": "12" + "skill": "200" }, { "brand": "1", @@ -1855,7 +1855,7 @@ "name": "Do-Rag, Cap, & Glasses", "price": 9500, "rarity": 2, - "skill": "13" + "skill": "201" }, { "brand": "4", @@ -1871,12 +1871,19 @@ "rarity": 2, "skill": "0" }, + { + "brand": "99", + "name": "Enchanted Hat", + "price": null, + "rarity": 1, + "skill": "0" + }, { "brand": "17", "name": "Face Visor", "price": 10300, "rarity": 2, - "skill": "12" + "skill": "200" }, { "brand": "10", @@ -1918,7 +1925,14 @@ "name": "Forge Mask", "price": 1400, "rarity": 0, - "skill": "13" + "skill": "201" + }, + { + "brand": "99", + "name": "Fresh Fish Head", + "price": null, + "rarity": 1, + "skill": "103" }, { "brand": "6", @@ -1988,14 +2002,7 @@ "name": "Hockey Helmet", "price": 9900, "rarity": 2, - "skill": "13" - }, - { - "brand": "0", - "name": "Hockey Mask", - "price": null, - "rarity": 2, - "skill": "2" + "skill": "201" }, { "brand": "7", @@ -2067,13 +2074,6 @@ "rarity": 0, "skill": "11" }, - { - "brand": "0", - "name": "Kyonshi Hat", - "price": null, - "rarity": 2, - "skill": "3" - }, { "brand": "9", "name": "Lightweight Cap", @@ -2081,13 +2081,6 @@ "rarity": 0, "skill": "4" }, - { - "brand": "0", - "name": "Li'l Devil Horns", - "price": null, - "rarity": 2, - "skill": "1" - }, { "brand": "2", "name": "Long-Billed Cap", @@ -2156,7 +2149,7 @@ "name": "Octo Tackle Helmet Deco", "price": 8888, "rarity": 2, - "skill": "12" + "skill": "200" }, { "brand": "6", @@ -2198,7 +2191,7 @@ "name": "Painter's Mask", "price": 4500, "rarity": 1, - "skill": "13" + "skill": "201" }, { "brand": "2", @@ -2212,14 +2205,14 @@ "name": "Patched Hat", "price": 3600, "rarity": 1, - "skill": "13" + "skill": "201" }, { "brand": "99", "name": "Pearlescent Crown", "price": null, "rarity": 1, - "skill": "13" + "skill": "200" }, { "brand": "5", @@ -2240,7 +2233,7 @@ "name": "Power Mask", "price": null, "rarity": 1, - "skill": "12" + "skill": "200" }, { "brand": "99", @@ -2359,7 +2352,7 @@ "name": "Splash Goggles", "price": 2800, "rarity": 1, - "skill": "12" + "skill": "200" }, { "brand": "7", @@ -2445,6 +2438,13 @@ "rarity": 2, "skill": "4" }, + { + "brand": "99", + "name": "Steel Helm", + "price": null, + "rarity": 1, + "skill": "5" + }, { "brand": "7", "name": "Straw Boater", @@ -2506,7 +2506,7 @@ "name": "Takoroka Mesh", "price": 400, "rarity": 0, - "skill": "12" + "skill": "200" }, { "brand": "11", @@ -2597,7 +2597,7 @@ "name": "Yamagiri Beanie", "price": 1280, "rarity": 0, - "skill": "13" + "skill": "201" }, { "brand": "4", @@ -2676,7 +2676,7 @@ "name": "Banana Basics", "price": 400, "rarity": 0, - "skill": "12" + "skill": "200" }, { "brand": "9", @@ -2697,7 +2697,7 @@ "name": "Black Dakroniks", "price": 1500, "rarity": 1, - "skill": "13" + "skill": "201" }, { "brand": "4", @@ -2753,7 +2753,7 @@ "name": "Blue Lo-Tops", "price": 800, "rarity": 0, - "skill": "12" + "skill": "200" }, { "brand": "3", @@ -2874,12 +2874,26 @@ "rarity": 2, "skill": "1" }, + { + "brand": "99", + "name": "Enchanted Boots", + "price": null, + "rarity": 1, + "skill": "3" + }, + { + "brand": "99", + "name": "Fresh Fish Feet", + "price": null, + "rarity": 1, + "skill": "8" + }, { "brand": "99", "name": "Fringed Loafers", "price": null, "rarity": 1, - "skill": "13" + "skill": "201" }, { "brand": "1", @@ -2893,7 +2907,7 @@ "name": "Gray Sea-Slug Hi-Tops", "price": 8500, "rarity": 2, - "skill": "12" + "skill": "200" }, { "brand": "3", @@ -2914,7 +2928,7 @@ "name": "Green Laceups", "price": 1300, "rarity": 0, - "skill": "13" + "skill": "201" }, { "brand": "9", @@ -2956,7 +2970,7 @@ "name": "Hunting Boots", "price": 11500, "rarity": 2, - "skill": "12" + "skill": "200" }, { "brand": "10", @@ -2998,7 +3012,7 @@ "name": "Luminous Delta Straps", "price": 5000, "rarity": 1, - "skill": "13" + "skill": "201" }, { "brand": "99", @@ -3126,13 +3140,6 @@ "rarity": 1, "skill": "3" }, - { - "brand": "16", - "name": "Online Squidkid V", - "price": null, - "rarity": 2, - "skill": "109" - }, { "brand": "11", "name": "Orange Arrows", @@ -3229,7 +3236,7 @@ "name": "Power Boots Mk I", "price": null, "rarity": 1, - "skill": "12" + "skill": "200" }, { "brand": "9", @@ -3243,14 +3250,14 @@ "name": "Punk Blacks", "price": 8800, "rarity": 2, - "skill": "13" + "skill": "201" }, { "brand": "3", "name": "Punk Cherries", "price": 9000, "rarity": 2, - "skill": "12" + "skill": "200" }, { "brand": "3", @@ -3369,7 +3376,7 @@ "name": "Roasted Brogues", "price": 1200, "rarity": 0, - "skill": "12" + "skill": "200" }, { "brand": "99", @@ -3439,14 +3446,14 @@ "name": "Soccer Shoes", "price": 9600, "rarity": 2, - "skill": "12" + "skill": "200" }, { "brand": "2", "name": "Squid-Stitch Slip-Ons", "price": 1500, "rarity": 1, - "skill": "12" + "skill": "200" }, { "brand": "99", @@ -3462,6 +3469,13 @@ "rarity": 0, "skill": "8" }, + { + "brand": "99", + "name": "Steel Greaves", + "price": null, + "rarity": 1, + "skill": "110" + }, { "brand": "8", "name": "Strapping Reds", @@ -3502,7 +3516,7 @@ "name": "Sun & Shade Squidkid IV", "price": 13000, "rarity": 2, - "skill": "13" + "skill": "201" }, { "brand": "9", @@ -3614,7 +3628,7 @@ "name": "Yellow FishFry Sandals", "price": 2880, "rarity": 1, - "skill": "13" + "skill": "201" }, { "brand": "10", @@ -3628,14 +3642,14 @@ "name": "Yellow Seahorses", "price": 1500, "rarity": 1, - "skill": "12" + "skill": "200" }, { "brand": "10", "name": "Yellow-Mesh Sneakers", "price": 1300, "rarity": 0, - "skill": "13" + "skill": "201" }, { "brand": "1", diff --git a/src/common/data/skills.json b/src/common/data/skills.json index 4bbb073..16e5e20 100644 --- a/src/common/data/skills.json +++ b/src/common/data/skills.json @@ -16,7 +16,7 @@ }, "100": { "id": "100", - "image": "/images/skill/492691ed2a7ce7ec694bf88d3ea1f692b7da1692.png", + "image": "/images/skill/073a44668f534002ed111b4d66ee840990eeb13e.png", "name": "Opening Gambit" }, "101": { @@ -81,7 +81,7 @@ }, "12": { "id": "12", - "image": "/images/skill/35f4ec4284fc5a19da58ffb1a7988eb26eb8bd7f.png", + "image": "/images/skill/95ee4ef2d545064c933e28f41791b4004afa3880.png", "name": "Bomb Defense Up" }, "13": { @@ -94,6 +94,21 @@ "image": "/images/skill/c14f4471b26e0f918c736b5c17e03212290f4541.png", "name": "Ink Recovery Up" }, + "200": { + "id": "200", + "image": "/images/skill/0a29f0ce326a81a5ddb3a7abab1816a25fefdc7c.png", + "name": "Bomb Defense Up DX" + }, + "201": { + "id": "201", + "image": "/images/skill/39f3e937b709d378c178ef2bf00d9a7295b8159d.png", + "name": "Main Power Up" + }, + "255": { + "id": "255", + "image": "/images/skill/46f9b6fc3a2aafdc0c688dec8cadb54aa6f8ace6.png", + "name": "question mark" + }, "3": { "id": "3", "image": "/images/skill/7de1bdfd875ef470b6066c17bed726b5b5113d48.png", diff --git a/src/utility/retrieveGearData.js b/src/utility/retrieveGearData.js index 51a63cf..34d6d05 100644 --- a/src/utility/retrieveGearData.js +++ b/src/utility/retrieveGearData.js @@ -1,5 +1,6 @@ const delay = require('delay'); -const splatnet = require('@/common/splatnet'); +const SplatNet = require('@/common/splatnet'); +const splatnet = new SplatNet(); /** * We can't retrieve gear/brand/skill data directly.