From f901db4b293df789e8f2c0fc3873864cb6bd3698 Mon Sep 17 00:00:00 2001 From: vikingowl Date: Sun, 30 Jan 2022 16:21:00 +0100 Subject: [PATCH] fixed #29 --- src/assets/images/weapons/ak47.svg | 41 ++ src/assets/images/weapons/aug.svg | 55 +++ src/assets/images/weapons/awp.svg | 52 +++ src/assets/images/weapons/bizon.svg | 481 ++++++++++++++++++++ src/assets/images/weapons/cz75a.svg | 53 +++ src/assets/images/weapons/deagle.svg | 44 ++ src/assets/images/weapons/elite.svg | 89 ++++ src/assets/images/weapons/famas.svg | 57 +++ src/assets/images/weapons/fiveseven.svg | 38 ++ src/assets/images/weapons/g3sg1.svg | 86 ++++ src/assets/images/weapons/galilar.svg | 64 +++ src/assets/images/weapons/glock.svg | 39 ++ src/assets/images/weapons/m249.svg | 77 ++++ src/assets/images/weapons/m4a1.svg | 52 +++ src/assets/images/weapons/m4a1_silencer.svg | 55 +++ src/assets/images/weapons/mac10.svg | 50 ++ src/assets/images/weapons/mag7.svg | 282 ++++++++++++ src/assets/images/weapons/mp5sd.svg | 32 ++ src/assets/images/weapons/mp7.svg | 333 ++++++++++++++ src/assets/images/weapons/mp9.svg | 217 +++++++++ src/assets/images/weapons/negev.svg | 400 ++++++++++++++++ src/assets/images/weapons/nova.svg | 280 ++++++++++++ src/assets/images/weapons/p2000.svg | 37 ++ src/assets/images/weapons/p250.svg | 184 ++++++++ src/assets/images/weapons/p90.svg | 50 ++ src/assets/images/weapons/revolver.svg | 59 +++ src/assets/images/weapons/sawedoff.svg | 233 ++++++++++ src/assets/images/weapons/scar20.svg | 339 ++++++++++++++ src/assets/images/weapons/sg556.svg | 258 +++++++++++ src/assets/images/weapons/shield.svg | 11 + src/assets/images/weapons/ssg08.svg | 318 +++++++++++++ src/assets/images/weapons/taser.svg | 38 ++ src/assets/images/weapons/tec9.svg | 250 ++++++++++ src/assets/images/weapons/ump45.svg | 87 ++++ src/assets/images/weapons/usp_silencer.svg | 37 ++ src/assets/images/weapons/xm1014.svg | 61 +++ src/components/DamageSite.vue | 2 +- src/components/HitgroupPuppet.vue | 281 ++++++++---- src/utils/Display.js | 47 ++ src/utils/index.js | 3 +- 40 files changed, 5090 insertions(+), 82 deletions(-) create mode 100644 src/assets/images/weapons/ak47.svg create mode 100644 src/assets/images/weapons/aug.svg create mode 100644 src/assets/images/weapons/awp.svg create mode 100644 src/assets/images/weapons/bizon.svg create mode 100644 src/assets/images/weapons/cz75a.svg create mode 100644 src/assets/images/weapons/deagle.svg create mode 100644 src/assets/images/weapons/elite.svg create mode 100644 src/assets/images/weapons/famas.svg create mode 100644 src/assets/images/weapons/fiveseven.svg create mode 100644 src/assets/images/weapons/g3sg1.svg create mode 100644 src/assets/images/weapons/galilar.svg create mode 100644 src/assets/images/weapons/glock.svg create mode 100644 src/assets/images/weapons/m249.svg create mode 100644 src/assets/images/weapons/m4a1.svg create mode 100644 src/assets/images/weapons/m4a1_silencer.svg create mode 100644 src/assets/images/weapons/mac10.svg create mode 100644 src/assets/images/weapons/mag7.svg create mode 100644 src/assets/images/weapons/mp5sd.svg create mode 100644 src/assets/images/weapons/mp7.svg create mode 100644 src/assets/images/weapons/mp9.svg create mode 100644 src/assets/images/weapons/negev.svg create mode 100644 src/assets/images/weapons/nova.svg create mode 100644 src/assets/images/weapons/p2000.svg create mode 100644 src/assets/images/weapons/p250.svg create mode 100644 src/assets/images/weapons/p90.svg create mode 100644 src/assets/images/weapons/revolver.svg create mode 100644 src/assets/images/weapons/sawedoff.svg create mode 100644 src/assets/images/weapons/scar20.svg create mode 100644 src/assets/images/weapons/sg556.svg create mode 100644 src/assets/images/weapons/shield.svg create mode 100644 src/assets/images/weapons/ssg08.svg create mode 100644 src/assets/images/weapons/taser.svg create mode 100644 src/assets/images/weapons/tec9.svg create mode 100644 src/assets/images/weapons/ump45.svg create mode 100644 src/assets/images/weapons/usp_silencer.svg create mode 100644 src/assets/images/weapons/xm1014.svg diff --git a/src/assets/images/weapons/ak47.svg b/src/assets/images/weapons/ak47.svg new file mode 100644 index 0000000..a9a96e0 --- /dev/null +++ b/src/assets/images/weapons/ak47.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/aug.svg b/src/assets/images/weapons/aug.svg new file mode 100644 index 0000000..d0ab91a --- /dev/null +++ b/src/assets/images/weapons/aug.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/awp.svg b/src/assets/images/weapons/awp.svg new file mode 100644 index 0000000..fc72485 --- /dev/null +++ b/src/assets/images/weapons/awp.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/bizon.svg b/src/assets/images/weapons/bizon.svg new file mode 100644 index 0000000..b64560e --- /dev/null +++ b/src/assets/images/weapons/bizon.svg @@ -0,0 +1,481 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/cz75a.svg b/src/assets/images/weapons/cz75a.svg new file mode 100644 index 0000000..447b5b4 --- /dev/null +++ b/src/assets/images/weapons/cz75a.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/deagle.svg b/src/assets/images/weapons/deagle.svg new file mode 100644 index 0000000..49e74ef --- /dev/null +++ b/src/assets/images/weapons/deagle.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/elite.svg b/src/assets/images/weapons/elite.svg new file mode 100644 index 0000000..60e799c --- /dev/null +++ b/src/assets/images/weapons/elite.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/famas.svg b/src/assets/images/weapons/famas.svg new file mode 100644 index 0000000..f7cc10c --- /dev/null +++ b/src/assets/images/weapons/famas.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/fiveseven.svg b/src/assets/images/weapons/fiveseven.svg new file mode 100644 index 0000000..11acf64 --- /dev/null +++ b/src/assets/images/weapons/fiveseven.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/g3sg1.svg b/src/assets/images/weapons/g3sg1.svg new file mode 100644 index 0000000..6b9bbb1 --- /dev/null +++ b/src/assets/images/weapons/g3sg1.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/galilar.svg b/src/assets/images/weapons/galilar.svg new file mode 100644 index 0000000..48ce1fe --- /dev/null +++ b/src/assets/images/weapons/galilar.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/glock.svg b/src/assets/images/weapons/glock.svg new file mode 100644 index 0000000..1266eeb --- /dev/null +++ b/src/assets/images/weapons/glock.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/m249.svg b/src/assets/images/weapons/m249.svg new file mode 100644 index 0000000..ff6209e --- /dev/null +++ b/src/assets/images/weapons/m249.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/m4a1.svg b/src/assets/images/weapons/m4a1.svg new file mode 100644 index 0000000..2256d37 --- /dev/null +++ b/src/assets/images/weapons/m4a1.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/m4a1_silencer.svg b/src/assets/images/weapons/m4a1_silencer.svg new file mode 100644 index 0000000..92e9419 --- /dev/null +++ b/src/assets/images/weapons/m4a1_silencer.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/mac10.svg b/src/assets/images/weapons/mac10.svg new file mode 100644 index 0000000..e062fb0 --- /dev/null +++ b/src/assets/images/weapons/mac10.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/mag7.svg b/src/assets/images/weapons/mag7.svg new file mode 100644 index 0000000..121c112 --- /dev/null +++ b/src/assets/images/weapons/mag7.svg @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/mp5sd.svg b/src/assets/images/weapons/mp5sd.svg new file mode 100644 index 0000000..ba9ac3d --- /dev/null +++ b/src/assets/images/weapons/mp5sd.svg @@ -0,0 +1,32 @@ + + + + + + diff --git a/src/assets/images/weapons/mp7.svg b/src/assets/images/weapons/mp7.svg new file mode 100644 index 0000000..4a7eb42 --- /dev/null +++ b/src/assets/images/weapons/mp7.svg @@ -0,0 +1,333 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/mp9.svg b/src/assets/images/weapons/mp9.svg new file mode 100644 index 0000000..ed6814c --- /dev/null +++ b/src/assets/images/weapons/mp9.svg @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/negev.svg b/src/assets/images/weapons/negev.svg new file mode 100644 index 0000000..efbf397 --- /dev/null +++ b/src/assets/images/weapons/negev.svg @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/nova.svg b/src/assets/images/weapons/nova.svg new file mode 100644 index 0000000..3a900e6 --- /dev/null +++ b/src/assets/images/weapons/nova.svg @@ -0,0 +1,280 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/p2000.svg b/src/assets/images/weapons/p2000.svg new file mode 100644 index 0000000..479d0c9 --- /dev/null +++ b/src/assets/images/weapons/p2000.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/p250.svg b/src/assets/images/weapons/p250.svg new file mode 100644 index 0000000..8afed22 --- /dev/null +++ b/src/assets/images/weapons/p250.svg @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/p90.svg b/src/assets/images/weapons/p90.svg new file mode 100644 index 0000000..784268b --- /dev/null +++ b/src/assets/images/weapons/p90.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/revolver.svg b/src/assets/images/weapons/revolver.svg new file mode 100644 index 0000000..d0e13b3 --- /dev/null +++ b/src/assets/images/weapons/revolver.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/sawedoff.svg b/src/assets/images/weapons/sawedoff.svg new file mode 100644 index 0000000..70d65ec --- /dev/null +++ b/src/assets/images/weapons/sawedoff.svg @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/scar20.svg b/src/assets/images/weapons/scar20.svg new file mode 100644 index 0000000..bd40d68 --- /dev/null +++ b/src/assets/images/weapons/scar20.svg @@ -0,0 +1,339 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/sg556.svg b/src/assets/images/weapons/sg556.svg new file mode 100644 index 0000000..6c9934d --- /dev/null +++ b/src/assets/images/weapons/sg556.svg @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/shield.svg b/src/assets/images/weapons/shield.svg new file mode 100644 index 0000000..ff1bf1a --- /dev/null +++ b/src/assets/images/weapons/shield.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/src/assets/images/weapons/ssg08.svg b/src/assets/images/weapons/ssg08.svg new file mode 100644 index 0000000..551bad1 --- /dev/null +++ b/src/assets/images/weapons/ssg08.svg @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/taser.svg b/src/assets/images/weapons/taser.svg new file mode 100644 index 0000000..d8094a4 --- /dev/null +++ b/src/assets/images/weapons/taser.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/tec9.svg b/src/assets/images/weapons/tec9.svg new file mode 100644 index 0000000..1e80d60 --- /dev/null +++ b/src/assets/images/weapons/tec9.svg @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/ump45.svg b/src/assets/images/weapons/ump45.svg new file mode 100644 index 0000000..716c7d4 --- /dev/null +++ b/src/assets/images/weapons/ump45.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/usp_silencer.svg b/src/assets/images/weapons/usp_silencer.svg new file mode 100644 index 0000000..575201a --- /dev/null +++ b/src/assets/images/weapons/usp_silencer.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + diff --git a/src/assets/images/weapons/xm1014.svg b/src/assets/images/weapons/xm1014.svg new file mode 100644 index 0000000..b69056e --- /dev/null +++ b/src/assets/images/weapons/xm1014.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + diff --git a/src/components/DamageSite.vue b/src/components/DamageSite.vue index 78d6957..46743bb 100644 --- a/src/components/DamageSite.vue +++ b/src/components/DamageSite.vue @@ -5,7 +5,7 @@
-

Damage by Hitgroup

+
diff --git a/src/components/HitgroupPuppet.vue b/src/components/HitgroupPuppet.vue index 2497880..9636d48 100644 --- a/src/components/HitgroupPuppet.vue +++ b/src/components/HitgroupPuppet.vue @@ -1,31 +1,64 @@ @@ -36,6 +69,7 @@ import {MapChart} from 'echarts/charts'; import {CanvasRenderer} from 'echarts/renderers'; import {onMounted, onUnmounted, reactive, ref, watch} from "vue"; import {useStore} from "vuex"; +import {DisplayWeapon} from '@/utils' import $ from 'jquery' @@ -57,7 +91,8 @@ export default { const data = reactive({ selectPlayer: 'All', selectWeapon: 'All', - eq_map: [] + eq_map: [], + weaponDmg: [] }) let myChart1 @@ -70,6 +105,16 @@ export default { return 650 } + const setDmgWidth = () => { + const windowWidth = getWindowWidth() + if (windowWidth >= 500) + return 500 + else + return windowWidth - 10 + } + + const dmgWidth = ref(setDmgWidth()) + const setHeight = () => { const windowWidth = getWindowWidth() if (windowWidth >= 751) @@ -83,6 +128,17 @@ export default { const width = ref(getWindowWidth()) const height = ref(setHeight()) + const processWeaponDmg = (id) => { + let value = '' + data.weaponDmg.forEach(w => { + if (Object.keys(w).toString() === id) { + value = Object.values(w).toString() + } + }) + + return value + } + const processPlayerWeapon = () => { let arr = [] if (data.selectPlayer === 'All') { @@ -152,7 +208,7 @@ export default { return arr2 } - const processDmg = () => { + const processDmg = (by = 'hitgroup') => { let arr = [] if (data.selectPlayer && data.selectWeapon) { switch (data.selectPlayer) { @@ -165,14 +221,26 @@ export default { // 1: hitgroup // 2: dmg if (weapon) { - if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { - let obj = {} - obj[weapon[1]] = weapon[2] - arr.push(obj) - } else if (data.selectWeapon === 'All') { - let obj = {} - obj[weapon[1]] = weapon[2] - arr.push(obj) + if (by === 'hitgroup') { + if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { + let obj = {} + obj[weapon[1]] = weapon[2] + arr.push(obj) + } else if (data.selectWeapon === 'All') { + let obj = {} + obj[weapon[1]] = weapon[2] + arr.push(obj) + } + } else if (by === 'weapon') { + if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { + let obj = {} + obj[weapon[0]] = weapon[2] + arr.push(obj) + } else if (data.selectWeapon === 'All') { + let obj = {} + obj[weapon[0]] = weapon[2] + arr.push(obj) + } } } }) @@ -192,14 +260,26 @@ export default { // 1: hitgroup // 2: dmg if (weapon) { - if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { - let obj = {} - obj[weapon[1]] = weapon[2] - arr.push(obj) - } else if (data.selectWeapon === 'All') { - let obj = {} - obj[weapon[1]] = weapon[2] - arr.push(obj) + if (by === 'hitgroup') { + if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { + let obj = {} + obj[weapon[1]] = weapon[2] + arr.push(obj) + } else if (data.selectWeapon === 'All') { + let obj = {} + obj[weapon[1]] = weapon[2] + arr.push(obj) + } + } else if (by === 'weapon') { + if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { + let obj = {} + obj[weapon[0]] = weapon[2] + arr.push(obj) + } else if (data.selectWeapon === 'All') { + let obj = {} + obj[weapon[0]] = weapon[2] + arr.push(obj) + } } } }) @@ -220,14 +300,26 @@ export default { // 1: hitgroup // 2: dmg if (weapon) { - if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { - let obj = {} - obj[weapon[1]] = weapon[2] - arr.push(obj) - } else if (data.selectWeapon === 'All') { - let obj = {} - obj[weapon[1]] = weapon[2] - arr.push(obj) + if (by === 'hitgroup') { + if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { + let obj = {} + obj[weapon[1]] = weapon[2] + arr.push(obj) + } else if (data.selectWeapon === 'All') { + let obj = {} + obj[weapon[1]] = weapon[2] + arr.push(obj) + } + } else if (by === 'weapon') { + if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { + let obj = {} + obj[weapon[0]] = weapon[2] + arr.push(obj) + } else if (data.selectWeapon === 'All') { + let obj = {} + obj[weapon[0]] = weapon[2] + arr.push(obj) + } } } }) @@ -247,14 +339,26 @@ export default { // 1: hitgroup // 2: dmg if (weapon) { - if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { - let obj = {} - obj[weapon[1]] = weapon[2] - arr.push(obj) - } else if (data.selectWeapon === 'All') { - let obj = {} - obj[weapon[1]] = weapon[2] - arr.push(obj) + if (by === 'hitgroup') { + if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { + let obj = {} + obj[weapon[1]] = weapon[2] + arr.push(obj) + } else if (data.selectWeapon === 'All') { + let obj = {} + obj[weapon[1]] = weapon[2] + arr.push(obj) + } + } else if (by === 'weapon') { + if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) { + let obj = {} + obj[weapon[0]] = weapon[2] + arr.push(obj) + } else if (data.selectWeapon === 'All') { + let obj = {} + obj[weapon[0]] = weapon[2] + arr.push(obj) + } } } }) @@ -267,10 +371,15 @@ export default { } else { arr = [] } - buildCharts(sumDmgArr(arr)) + + if (by === 'hitgroup') { + buildCharts(sumDmgArr(arr)) + } else if (by === 'weapon') { + data.weaponDmg = sumDmgArr(arr, 'weapon') + } } - const sumDmgArr = (arr) => { + const sumDmgArr = (arr, by = 'hitgroup') => { let holder = {}; arr.forEach(function (d) { @@ -284,12 +393,26 @@ export default { let arr2 = []; - for (let i = 1; i < 8; i++) { - if (holder[i] !== undefined) { - arr2.push(holder[i]) - } else { - arr2.push(0) + if (by === 'hitgroup') { + for (let i = 1; i < 8; i++) { + if (holder[i] !== undefined) { + arr2.push(holder[i]) + } else { + arr2.push(0) + } } + } else if (by === 'weapon') { + for (let i = 1; i < 312; i++) { + if (holder[i] !== undefined) { + let obj = {} + obj[i] = holder[i] + arr2.push(obj) + } + } + + arr2.sort((a, b) => { + return Object.values(b).toString() - Object.values(a).toString() + }) } return arr2 @@ -301,6 +424,7 @@ export default { if (arr[i] > max) max = arr[i] } + return max } @@ -380,6 +504,7 @@ export default { watch(() => props.stats, () => { processDmg() + processDmg('weapon') processPlayerWeapon() }) } @@ -393,6 +518,7 @@ export default { if (window.innerWidth <= 750) { width.value = getWindowWidth() - 20 height.value = setHeight() + dmgWidth.value = setDmgWidth() } buildCharts() @@ -402,34 +528,29 @@ export default { data.selectWeapon = 'All' processPlayerWeapon() processDmg() + processDmg('weapon') }) watch(() => data.selectWeapon, () => { processDmg() + processDmg('weapon') }) - return {props, data, store, processPlayerWeapon} + return {props, data, store, dmgWidth, processPlayerWeapon, processWeaponDmg, DisplayWeapon} } }