From 7b08b9cd80b499da41920f280f72ce62cf71235f Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Sun, 24 Mar 2024 09:04:54 -0400 Subject: [PATCH] deployables table --- app/statFunctions.js | 21 +++++++++++---------- app/views/Avatar.svelte | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/app/statFunctions.js b/app/statFunctions.js index ef3a50e..33627b2 100644 --- a/app/statFunctions.js +++ b/app/statFunctions.js @@ -112,7 +112,6 @@ export const weaponNames = [ { id: 57, name: 'Eraser' }, { id: 140, name: 'Beamer' }, { id: 146, name: 'Bolt Driver' }, -{ id: 148, name: 'Boomer' }, { id: 175, name: 'Knife (TR)' }, { id: 177, name: 'chaingun_p type weapon' }, { id: 233, name: 'Cycler' }, @@ -189,21 +188,13 @@ export const weaponNames = [ { id: 642, name: 'Eagle' }, { id: 643, name: 'Peregrine' }, { id: 671, name: 'Phantasm' }, -{ id: 685, name: 'Manned Field Turret' }, -{ id: 686, name: 'Osprey' }, -{ id: 687, name: 'Avenger' }, -{ id: 688, name: 'Orion' }, { id: 697, name: 'Prowler' }, { id: 707, name: 'Basilisk' }, { id: 710, name: 'Wraith' }, { id: 741, name: 'Router' }, { id: 759, name: 'Shuttle' }, { id: 784, name: 'Skyguard' }, -{ id: 819, name: 'Cerebus Turret' }, -{ id: 825, name: 'Shadow Turret' }, -{ id: 826, name: 'Spitfire Turret' }, { id: 847, name: 'Switchblade' }, -{ id: 849, name: 'Trap' }, { id: 860, name: 'Testobject?' }, { id: 862, name: 'Marauder' }, { id: 865, name: 'Thunderer' }, @@ -213,5 +204,15 @@ export const weaponNames = [ { id: 923, name: 'Vanguard' }, { id: 943, name: 'Sentry Turret' }, { id: 986, name: 'Vulture' }, -{ id: 997, name: 'Wasp' } +{ id: 997, name: 'Wasp' }, +{ id: 148, name: 'Boomer' }, +{ id: 388, name: 'HE Mine' }, +{ id: 685, name: 'Manned Field Turret' }, +{ id: 686, name: 'Osprey' }, +{ id: 687, name: 'Avenger' }, +{ id: 688, name: 'Orion' }, +{ id: 819, name: 'Cerebus Turret' }, +{ id: 825, name: 'Shadow Turret' }, +{ id: 826, name: 'Spitfire Turret' }, +{ id: 849, name: 'Trap' } ] \ No newline at end of file diff --git a/app/views/Avatar.svelte b/app/views/Avatar.svelte index 97ff65d..ed3fdd6 100644 --- a/app/views/Avatar.svelte +++ b/app/views/Avatar.svelte @@ -15,10 +15,12 @@ let iWeapons = []; let vehicles = []; + let deployables = []; let alert; let avatar = {}; let iWeaponsKillsSum let vehicleKillsSum + let deployableKillsSum let kdByDate = []; let url = params.id || avatar.id let face; @@ -60,7 +62,7 @@ async function get_iWeaponStats() { try { - const ids = [55, 56, 57, 140, 146, 148, 175, 233, 299, 304, 324, 334, 345, 396, 406, + const ids = [55, 56, 57, 140, 146, 175, 233, 299, 304, 324, 334, 345, 396, 406, 407, 411, 425, 429, 462, 468, 556, 587, 588, 589, 599, 673, 680, 701, 706, 714, 716, 730, 737, 817, 838, 845, 864, 888, 889, 890, 968, 969, 970]; const resp = await axios.get(weaponstatsUrl); @@ -96,14 +98,23 @@ iWeaponsKillsSum = iWeapons.reduce((total, weapon) => total + weapon.kills, 0); const vIds = [46, 60, 62, 66, 67, 68, 79, 83, 84, 118, 135, 179, 199, 200, 239, 259, 294, 335, 338, - 353, 432, 441, 446, 459, 470, 480, 532, 572, 632, 642, 643, 671, 685, 686, 687, 688, 697, - 707, 710, 741, 759, 784, 819, 825, 826, 847, 849, 860, 862, 865, 896, 898, 900, 923, 943, 986, 997]; + 353, 432, 441, 446, 459, 470, 480, 532, 572, 632, 642, 643, 671, 697, + 707, 710, 741, 759, 784, 847, 860, 862, 865, 896, 898, 900, 923, 943, 986, 997]; const filteredVehicles = stats.weapons.filter(weapon => { return vIds.includes(weapon.weapon_id); }); vehicles = filteredVehicles; vehicleKillsSum = vehicles.reduce((total, weapon) => total + weapon.kills, 0); + + const dIds = [148, 388, 685, 686, 687, 688, 819, 825, 826, 849]; + const filteredDeployables = stats.weapons.filter(weapon => { + return dIds.includes(weapon.weapon_id); + }); + + deployables = filteredDeployables; + deployableKillsSum = deployables.reduce((total, weapon) => total + weapon.kills, 0); + // Reset alert message if needed alert.message(""); } catch (e) { @@ -175,6 +186,7 @@ {/each} + Kills by Vehicle - Total: {vehicleKillsSum} @@ -190,6 +202,23 @@ {/each}
+ +Kills by Deployable - Total: {deployableKillsSum} + + + + + + + {#each deployables as ce} + + + + + {/each} + +
DeployableKills
{ce.weapon_id}{ce.kills}
+ Daily Stats