Skip to content

Separate count and fir_count and convert to dict #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DimaVartanian wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Separate count and fir_count and convert to dict #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2060233
Separate count and fir_count and convert to dict
DimaVartanian Mar 22, 2021
0644405
Convert names to lower case to fix duplicate rows due to inconsistent…
Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 19 additions & 31 deletions scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ def Import():
questsOutput = outputDir + "/quest.json"
hideoutOutput = outputDir + "/hideout.json"

questItemList = []
hideoutItemList = []
questItemList = {}
hideoutItemList = {}

# Create quest object
for line in questText.splitlines():
Expand All @@ -36,24 +36,16 @@ def Import():
if (match):
matchSplit = match.groups()[0] .split('|')
if (len(matchSplit) > 0):
# If the item already exists, make sure findInRaid is set if it should be for any of them
itemExists = False
for obj in questItemList:
if obj["name"] == matchSplit[0]:
itemExists = True
obj["count"] = obj["count"] + GetAmount(line)
if (item["raid"] or findInRaid):
item["raid"] = True

# Only add items once
if (not itemExists):
name = matchSplit[0].lower()
if name in questItemList:
item = questItemList[name]
else:
item = {}
item["wiki"] = "https://escapefromtarkov.gamepedia.com/" + matchSplit[0]
item["name"] = matchSplit[0]
item["count"] = GetAmount(line)

item["raid"] = findInRaid
questItemList.append(item)
item["name"] = name
item["wiki"] = "https://escapefromtarkov.gamepedia.com/" + name
questItemList[name] = item
countKey = "fir_count" if findInRaid else "count"
item[countKey] = item.get(countKey) or 0 + GetAmount(line)

# Create hideout object
for line in hideoutText.splitlines():
Expand All @@ -62,19 +54,15 @@ def Import():
if (match):
matchSplit = match.groups()[0] .split('|')
if (len(matchSplit) > 0):
itemExists = False
for obj in hideoutItemList:
if obj["name"] == matchSplit[0]:
itemExists = True
obj["count"] = obj["count"] + GetAmount(line)

if not itemExists:
name = matchSplit[0].lower()
if name in hideoutItemList:
item = hideoutItemList[name]
else:
item = {}
item["wiki"] = "https://escapefromtarkov.gamepedia.com/" + matchSplit[0]
item["name"] = matchSplit[0]
item["count"] = GetAmount(line)

hideoutItemList.append(item)
hideoutItemList[name] = item
item["name"] = name
item["wiki"] = "https://escapefromtarkov.gamepedia.com/" + name
item["count"] = item.get("count") or 0 + GetAmount(line)

# Create quest.json
if not os.path.exists(os.path.dirname(questsOutput)):
Expand Down