From 1880854064f919d38e2ce2ee3981b4daf9e87b2f Mon Sep 17 00:00:00 2001 From: ferricles Date: Wed, 5 Jan 2022 12:42:01 -0800 Subject: [PATCH] created separate files for merging sets and tomes into item DB --- js/load.js | 5 ++++- py_script/transform_merge.py | 18 +++++------------- py_script/update_sets_in_items.py | 25 +++++++++++++++++++++++++ py_script/update_tomes_in_items.py | 27 +++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 14 deletions(-) create mode 100644 py_script/update_sets_in_items.py create mode 100644 py_script/update_tomes_in_items.py diff --git a/js/load.js b/js/load.js index 043273b..4aedf3a 100644 --- a/js/load.js +++ b/js/load.js @@ -221,8 +221,11 @@ function init_maps() { ["accessory", "bracelet", "No Bracelet"], ["accessory", "necklace", "No Necklace"], ["weapon", "dagger", "No Weapon"], + ["tome", "weaponTome", "No Weapon Tome"], + ["tome", "armorTome", "No Armour Tome"], + ["tome", "guildTome", "No Guild Tome"] ]; - for (let i = 0; i < 9; i++) { + for (let i = 0; i < 12; i++) { let item = Object(); item.slots = 0; item.category = noneItems[i][0]; diff --git a/py_script/transform_merge.py b/py_script/transform_merge.py index 6c77b98..49a962d 100644 --- a/py_script/transform_merge.py +++ b/py_script/transform_merge.py @@ -9,6 +9,7 @@ AMBIVALENCE IS REMOVED! """ import json +import os with open("dump.json", "r") as infile: data = json.load(infile) @@ -18,23 +19,14 @@ with open("updated.json", "r") as oldfile: items = data["items"] old_items = old_data["items"] +old_tomes = old_data["tomes"] if "request" in data: del data["request"] -# import os -# sets = dict() -# for filename in os.listdir('sets'): -# if "json" not in filename: -# continue -# set_name = filename[1:].split(".")[0].replace("+", " ").replace("%27", "'") -# with open("sets/"+filename) as set_info: -# set_obj = json.load(set_info) -# for item in set_obj["items"]: -# item_set_map[item] = set_name -# sets[set_name] = set_obj -# -# data["sets"] = sets +#this script does not change sets or tomes. use the dedicated set and tome update scripts to update. data["sets"] = old_data["sets"] +data["tomes"] = old_data["tomes"] + item_set_map = dict() for set_name, set_data in data["sets"].items(): for item_name in set_data["items"]: diff --git a/py_script/update_sets_in_items.py b/py_script/update_sets_in_items.py new file mode 100644 index 0000000..fc4dd7d --- /dev/null +++ b/py_script/update_sets_in_items.py @@ -0,0 +1,25 @@ +import os + +'''takes the data in updated.json and the jsons in the sets folder to update the sets in the db.''' + +with open("updated.json", "r") as oldfile: + data = json.load(oldfile) + +#This probably does not work. I have not checked :) +sets = dict() +for filename in os.listdir('sets'): + if "json" not in filename: + continue + set_name = filename[1:].split(".")[0].replace("+", " ").replace("%27", "'") + with open("sets/"+filename) as set_info: + set_obj = json.load(set_info) + for item in set_obj["items"]: + item_set_map[item] = set_name + sets[set_name] = set_obj + +data["sets"] = sets + +with open("clean.json", "w") as outfile: + json.dump(data, outfile, indent=2) +with open("compress.json", "w") as outfile: + json.dump(data, outfile) \ No newline at end of file diff --git a/py_script/update_tomes_in_items.py b/py_script/update_tomes_in_items.py new file mode 100644 index 0000000..a83daaa --- /dev/null +++ b/py_script/update_tomes_in_items.py @@ -0,0 +1,27 @@ +import os + +'''takes the data in updated.json and tomes.json to update the tomes in the db.''' + +with open("updated.json", "r") as oldfile: + data = json.load(oldfile) +with open("tomes.json", "r") as tomesfile: + tome_data = json.load(tomesfile) + +#This probably does not work. I have not checked :) +tomes = dict() +for filename in os.listdir('sets'): + if "json" not in filename: + continue + set_name = filename[1:].split(".")[0].replace("+", " ").replace("%27", "'") + with open("sets/"+filename) as set_info: + set_obj = json.load(set_info) + for item in set_obj["items"]: + item_set_map[item] = set_name + sets[set_name] = set_obj + +data["sets"] = sets + +with open("clean.json", "w") as outfile: + json.dump(data, outfile, indent=2) +with open("compress.json", "w") as outfile: + json.dump(data, outfile)