From b6bbad8952849e619587d23bdd511886c22918e6 Mon Sep 17 00:00:00 2001 From: Chaos02 Date: Sun, 6 Mar 2022 20:54:45 +0100 Subject: [PATCH 1/2] Updated Ammo Types colors `TODO: Use Color only for ammo types, display weapon type in interface instead:` ```Python # Get Available weapontypes here! url = 'https://apexlegends.fandom.com/wiki/Weapon' html = requests.get(url).content table_list = pd.read_html(html) WeaponData = table_list[0] #print(WeaponData) #WeaponData.to_csv('WeaponData.csv') # TODO cache? # TODO in cv: Approximately match Weapon names to this list for i in range(len(WeaponData)): FullNames[i] = WeaponData.loc[i][0] WepTypes[i] = WeaponData.loc[i][1] WepAmmo[i] = WeaponData.loc[i][2] ``` Need to find appropriate place for this code... --- overtrack/apex/collect/apex_game/weapons.py | 37 +++++++++++++-------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/overtrack/apex/collect/apex_game/weapons.py b/overtrack/apex/collect/apex_game/weapons.py index 29a8a75..1f1a57b 100644 --- a/overtrack/apex/collect/apex_game/weapons.py +++ b/overtrack/apex/collect/apex_game/weapons.py @@ -30,29 +30,40 @@ class Weapons: logger: ClassVar[logging.Logger] = logging.getLogger(__qualname__) WEAPON_COLOURS_SELECTED = { + #COLOR FORMAT: BGR + # TODO Only use for ammo type! + # Light - (45, 84, 125): (True, 'Light'), + (54, 84, 125): (True, 'Light'), (28, 42, 60): (False, 'Light'), - + # Heavy (89, 107, 56): (True, 'Heavy'), - (42, 51, 34): (False, 'Heavy'), - + (45, 52, 33): (False, 'Heavy'), + # Energy (40, 110, 90): (True, 'Energy'), (29, 55, 46): (False, 'Energy'), - + # Shotgun - (7, 32, 107): (True, 'Shotgun'), + (7, 32, 197): (True, 'Shotgun'), (10, 17, 48): (False, 'Shotgun'), - + # Sniper - (126, 42, 53): (True, 'Shotgun'), - (57, 20, 24): (False, 'Shotgun'), - - # Special - (17, 149, 178): (True, 'Special'), - (39, 78, 90): (False, 'Special'), + (75, 64, 143): (True, 'Sniper'), + (36, 31, 67): (False, 'Sniper'), + + # Arrows + (47, 124, 142): (True, 'Arrows'), + (36, 63, 71): (False, 'Arrows'), + + # Special (Carepackage) + (55, 1, 178): (True, 'Special'), + (31, 18, 84): (False, 'Special'), + + # Ability (Rampart) + (161, 60, 161): (True, 'Ability'), + (255, 255, 255): (False, 'Ability'), # TODO Impossible scenario! } WEAPON_COLOUR_MATCH_THRESHOLD = 30 From 27b2693e9b326126a8572c0290fc2e3b9784507c Mon Sep 17 00:00:00 2001 From: Markus Noack Date: Sun, 6 Mar 2022 21:16:02 +0100 Subject: [PATCH 2/2] Create README.md TODO: implement All-Contributors. --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..c834118 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +[![All Contributors](https://img.shields.io/badge/dynamic/json?color=orange&label=all%20contributors&query=%24.contributors.length&url=https%3A%2F%2Fraw.githubusercontent.com%2Fovertrack-gg%2Fovertrack-game-processing%2Fmaster%2F.all-contributorsrc&style=flat-square)](#contributors-) +[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) +[![Discord chat](https://img.shields.io/badge/chat-on_discord-008080.svg?style=flat-square&logo=discord)](https://discord.gg/JywstAB) + +# overtrack-game-processing +This Repository contains the backend, client code for [OverTrack](https://overtrack.gg)'s `Apex Legends` and `Valorant` game processing. +The Code for extracting data from gameplay footage can be found [here](https://github.com/overtrack-gg/overtrack-cv). + +