From da93548b7d35ef87fd234319257daa5600da3022 Mon Sep 17 00:00:00 2001 From: Gogodr Date: Thu, 21 Jul 2022 20:45:01 -0500 Subject: [PATCH] add missing engraving books, fix thousands parsing for currency exchange --- README.md | 4 ++++ modules/config.py | 2 +- modules/market_data/engraving_recipe.py | 26 ++++++++++++++++++++++++- modules/scan.py | 2 +- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7502f0e..5602218 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,10 @@ In order to contribute to the LostArk Marketplace database, the contributor must Audio files from [MixKit](https://mixkit.co/) ### Changelog +### 0.8.12.1 +- Fix thousands parsing of currency exchange +- Add missing engraving books + ### 0.8.11.1 - Crystal name change diff --git a/modules/config.py b/modules/config.py index 94bac96..c663f4e 100644 --- a/modules/config.py +++ b/modules/config.py @@ -15,7 +15,7 @@ class Config(metaclass=Singleton): - version = "0.8.11.1" + version = "0.8.12.1" region: str game_region: str debug = False diff --git a/modules/market_data/engraving_recipe.py b/modules/market_data/engraving_recipe.py index e79f336..6784f63 100644 --- a/modules/market_data/engraving_recipe.py +++ b/modules/market_data/engraving_recipe.py @@ -113,7 +113,7 @@ 'category': 'Engraving Recipe', 'subcategory': None }, - '[Scrapper] Ultimate Skill: Taijutsu Engraving Recipe': { + '[Scrapper] Ultimate Skill: Taijutsu ...': { 'name': '[Scrapper] Ultimate Skill: Taijutsu Engraving Recipe', 'amount': 1, 'category': 'Engraving Recipe', @@ -191,6 +191,30 @@ 'category': 'Engraving Recipe', 'subcategory': None }, + '[Destroyer] Gravity Training ...': { + 'name': '[Destroyer] Gravity Training Engraving Recipe', + 'amount': 1, + 'category': 'Engraving Recipe', + 'subcategory': None + }, + '[Destroyer] Rage Hammer Engravin...': { + 'name': '[Destroyer] Rage Hammer Engraving Recipe', + 'amount': 1, + 'category': 'Engraving Recipe', + 'subcategory': None + }, + '[Arcanist] Grace of the Empress ...': { + 'name': '[Arcanist] Grace of the Empress Engraving Recipe', + 'amount': 1, + 'category': 'Engraving Recipe', + 'subcategory': None + }, + '[Arcanist] Order of the Emperor ...': { + 'name': '[Arcanist] Order of the Emperor Engraving Recipe', + 'amount': 1, + 'category': 'Engraving Recipe', + 'subcategory': None + }, 'Adrenaline Engraving Recipe': { 'name': 'Adrenaline Engraving Recipe', 'amount': 1, diff --git a/modules/scan.py b/modules/scan.py index 76bfe16..40c6e63 100644 --- a/modules/scan.py +++ b/modules/scan.py @@ -235,7 +235,7 @@ def process_crystal_table(self): rect = Rect(rect_start.x, rect_start.y, rect_start.x + scanMap[self.tab]['w'], rect_start.y + scanMap[self.tab]['h']) - price = int(self.get_text(rect, False)) + price = int(self.get_text(rect, False).replace(".","").replace(",","")) if Config().debug: self.debug_screenshot = cv2.rectangle(