Merge branch 'dev' of github.com:hppeng-wynn/hppeng-wynn.github.io into dev

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];

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
+#this script does not change sets or tomes. use the dedicated set and tome update scripts to update.
-# 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
 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"]:

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)

py_script/update_tomes_in_items.py

@@ -0,0 +1,42 @@
+import os
+import json
+
+'''takes updated data in tomes.json and updates the tome map'''
+
+#read in tomes json file
+with open("../tomes.json", "r") as tomesfile: 
+    tome_data = json.load(tomesfile)
+
+tomes = dict()
+tome_mapping = dict()
+
+
+max_id = 0
+for tome in tome_data:
+    if "tomeID" in tome:
+        if tome["tomeID"] > max_id: 
+            max_id = tome["tomeID"]
+        tome_mapping[tome["name"]] = tome["tomeID"]
+i = max_id + 1
+
+for tome in tome_data:
+    if "tomeID" not in tome:
+        tome["tomeID"] = i
+        tome_mapping[tome["name"]] = i
+        i += 1
+    
+    tomes[tome["name"]] = tome
+
+
+'''
+with open("clean.json", "w") as outfile:
+    json.dump(data, outfile, indent=2)
+with open("compress.json", "w") as outfile:
+    json.dump(data, outfile)
+'''
+with open("tome_map.json", "w") as outfile:
+    json.dump(tome_mapping, outfile, indent = 2)
+with open("../tomes2.json", "w") as outfile:
+    json.dump(tome_data, outfile, indent = 2)
+
+

tome_map.json

@@ -0,0 +1,57 @@
+{
+  "Retaliating Tome of Armour Mastery I": 0,
+  "Retaliating Tome of Armour Mastery II": 1,
+  "Destructive Tome of Armour Mastery I": 2,
+  "Destructive Tome of Armour Mastery II": 3,
+  "Sorcerer's Tome of Armour Mastery I": 4,
+  "Sorcerer's Tome of Armour Mastery II": 5,
+  "Everlasting Tome of Armour Mastery I": 6,
+  "Everlasting Tome of Armour Mastery II": 7,
+  "Vampiric Tome of Armour Mastery I": 8,
+  "Vampiric Tome of Armour Mastery II": 9,
+  "Greedy Tome of Armour Mastery I": 10,
+  "Greedy Tome of Armour Mastery II": 11,
+  "Weightless Tome of Armour Mastery I": 12,
+  "Weightless Tome of Armour Mastery II": 13,
+  "Blooming Tome of Armour Mastery II": 14,
+  "Pulsing Tome of Armour Mastery II": 15,
+  "Oceanic Tome of Armour Mastery II": 16,
+  "Courageous Tome of Armour Mastery II": 17,
+  "Clouded Tome of Armour Mastery II": 18,
+  "Radiant Tome of Armour Mastery II": 19,
+  "Tome of Weapon Mastery I": 20,
+  "Earthbound Tome of Weapon Mastery I": 21,
+  "Earthbound Tome of Weapon Mastery II": 22,
+  "Nimble Tome of Weapon Mastery I": 23,
+  "Nimble Tome of Weapon Mastery II": 24,
+  "Mystical Tome of Weapon Mastery I": 25,
+  "Mystical Tome of Weapon Mastery II": 26,
+  "Warding Tome of Weapon Mastery I": 27,
+  "Warding Tome of Weapon Mastery II": 28,
+  "Athletic Tome of Weapon Mastery I": 29,
+  "Athletic Tome of Weapon Mastery II": 30,
+  "Cosmic Tome of Weapon Mastery I": 31,
+  "Cosmic Tome of Weapon Mastery II": 32,
+  "Seismic Tome of Weapon Mastery II": 33,
+  "Voltaic Tome of Weapon Mastery II": 34,
+  "Abyssal Tome of Weapon Mastery II": 35,
+  "Infernal Tome of Weapon Mastery II": 36,
+  "Cyclonic Tome of Weapon Mastery II": 37,
+  "Astral Tome of Weapon Mastery II": 38,
+  "Brute's Tome of Allegiance": 39,
+  "Sadist's Tome of Allegiance": 40,
+  "Mastermind's Tome of Allegiance": 41,
+  "Arsonist's Tome of Allegiance": 42,
+  "Ghost's Tome of Allegiance": 43,
+  "Psychopath's Tome of Allegiance": 44,
+  "Loner's Tome of Allegiance": 45,
+  "Warlock's Tome of Allegiance": 46,
+  "Destroyer's Tome of Allegiance": 47,
+  "Devil's Tome of Allegiance": 48,
+  "Alchemist's Tome of Allegiance": 49,
+  "Barbarian's Tome of Allegiance": 50,
+  "Freelancer's Tome of Allegiance": 51,
+  "Sycophant's Tome of Allegiance": 52,
+  "Fanatic's Tome of Allegiance": 53,
+  "Assimilator's Tome of Allegiance": 54
+}

tomes.json

@@ -9,7 +9,9 @@
     "lvl": 60,
     "thorns": 6,
     "ref": 6,
-    "hpBonus": 120
+    "hpBonus": 120,
+    "fixID": false,
+    "tomeID": 0
   },
   {
     "name": "Retaliating Tome of Armour Mastery II",
@@ -20,7 +22,9 @@
     "restrict": "Soulbound",
     "lvl": 100,
     "thorns": 8,
-    "ref": 8
+    "ref": 8,
+    "fixID": false,
+    "tomeID": 1
   },
   {
     "name": "Destructive Tome of Armour Mastery I",
@@ -32,7 +36,9 @@
     "lvl": 60,
     "exploding": 5,
     "mdPct": 5,
-    "hpBonus": 120
+    "hpBonus": 120,
+    "fixID": false,
+    "tomeID": 2
   },
   {
     "name": "Destructive Tome of Armour Mastery II",
@@ -43,7 +49,9 @@
     "restrict": "Soulbound",
     "lvl": 100,
     "thorns": 6,
-    "reflection": 6
+    "reflection": 6,
+    "fixID": false,
+    "tomeID": 3
   },
   {
     "name": "Sorcerer's Tome of Armour Mastery I",
@@ -54,7 +62,9 @@
     "restrict": "Soulbound",
     "lvl": 60,
     "sdPct": 5,
-    "hpBonus": 120
+    "hpBonus": 120,
+    "fixID": false,
+    "tomeID": 4
   },
   {
     "name": "Sorcerer's Tome of Armour Mastery II",
@@ -64,7 +74,9 @@
     "drop": "never",
     "restrict": "Soulbound",
     "lvl": 100,
-    "sdPct": 6
+    "sdPct": 6,
+    "fixID": false,
+    "tomeID": 5
   },
   {
     "name": "Everlasting Tome of Armour Mastery I",
@@ -75,7 +87,9 @@
     "restrict": "Soulbound",
     "lvl": 60,
     "hprRaw": 15,
-    "hpBonus": 120
+    "hpBonus": 120,
+    "fixID": false,
+    "tomeID": 6
   },
   {
     "name": "Everlasting Tome of Armour Mastery II",
@@ -85,7 +99,9 @@
     "drop": "never",
     "restrict": "Soulbound",
     "lvl": 100,
-    "hprRaw": 60
+    "hprRaw": 60,
+    "fixID": false,
+    "tomeID": 7
   },
   {
     "name": "Vampiric Tome of Armour Mastery I",
@@ -96,7 +112,9 @@
     "restrict": "Soulbound",
     "lvl": 60,
     "ls": 25,
-    "hpBonus": 120
+    "hpBonus": 120,
+    "fixID": false,
+    "tomeID": 8
   },
   {
     "name": "Vampiric Tome of Armour Mastery II",
@@ -106,7 +124,9 @@
     "drop": "never",
     "restrict": "Soulbound",
     "lvl": 100,
-    "ls": 85
+    "ls": 85,
+    "fixID": false,
+    "tomeID": 9
   },
   {
     "name": "Greedy Tome of Armour Mastery I",
@@ -117,7 +137,9 @@
     "restrict": "Soulbound",
     "lvl": 60,
     "lb": 5,
-    "hpBonus": 120
+    "hpBonus": 120,
+    "fixID": false,
+    "tomeID": 10
   },
   {
     "name": "Greedy Tome of Armour Mastery II",
@@ -127,7 +149,9 @@
     "drop": "never",
     "restrict": "Soulbound",
     "lvl": 100,
-    "lb": 6
+    "lb": 6,
+    "fixID": false,
+    "tomeID": 11
   },
   {
     "name": "Weightless Tome of Armour Mastery I",
@@ -138,7 +162,9 @@
     "restrict": "Soulbound",
     "lvl": 60,
     "spd": 5,
-    "hpBonus": 120
+    "hpBonus": 120,
+    "fixID": false,
+    "tomeID": 12
   },
   {
     "name": "Weightless Tome of Armour Mastery II",
@@ -148,7 +174,9 @@
     "drop": "never",
     "restrict": "Soulbound",
     "lvl": 100,
-    "spd": 6
+    "spd": 6,
+    "fixID": false,
+    "tomeID": 13
   },
   {
     "name": "Blooming Tome of Armour Mastery II",
@@ -159,7 +187,9 @@
     "restrict": "Soulbound",
     "lvl": 100,
     "eDefPct": 10,
-    "hpBonus": 150
+    "hpBonus": 150,
+    "fixID": false,
+    "tomeID": 14
   },
   {
     "name": "Pulsing Tome of Armour Mastery II",
@@ -170,7 +200,9 @@
     "restrict": "Soulbound",
     "lvl": 100,
     "tDefPct": 10,
-    "hpBonus": 150
+    "hpBonus": 150,
+    "fixID": false,
+    "tomeID": 15
   },
   {
     "name": "Oceanic Tome of Armour Mastery II",
@@ -181,7 +213,9 @@
     "restrict": "Soulbound",
     "lvl": 100,
     "wDefPct": 10,
-    "hpBonus": 150
+    "hpBonus": 150,
+    "fixID": false,
+    "tomeID": 16
   },
   {
     "name": "Courageous Tome of Armour Mastery II",
@@ -192,7 +226,9 @@
     "restrict": "Soulbound",
     "lvl": 100,
     "fDefPct": 10,
-    "hpBonus": 150
+    "hpBonus": 150,
+    "fixID": false,
+    "tomeID": 17
   },
   {
     "name": "Clouded Tome of Armour Mastery II",
@@ -203,7 +239,9 @@
     "restrict": "Soulbound",
     "lvl": 100,
     "aDefPct": 10,
-    "hpBonus": 150
+    "hpBonus": 150,
+    "fixID": false,
+    "tomeID": 18
   },
   {
     "name": "Radiant Tome of Armour Mastery II",
@@ -218,7 +256,9 @@
     "wDefPct": 6,
     "fDefPct": 6,
     "aDefPct": 6,
-    "hpBonus": 150
+    "hpBonus": 150,
+    "fixID": false,
+    "tomeID": 19
   },
   {
     "name": "Tome of Weapon Mastery I",
@@ -228,7 +268,9 @@
     "drop": "never",
     "restrict": "Soulbound",
     "lvl": 60,
-    "dmgMobs": 6 
+    "dmgMobs": 6,
+    "fixID": false,
+    "tomeID": 20
   },
   {
     "name": "Earthbound Tome of Weapon Mastery I",
@@ -239,7 +281,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 7,
-    "str": 3 
+    "str": 3,
+    "fixID": false,
+    "tomeID": 21
   },
   {
     "name": "Earthbound Tome of Weapon Mastery II",
@@ -250,7 +294,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 8,
-    "str": 3 
+    "str": 3,
+    "fixID": false,
+    "tomeID": 22
   },
   {
     "name": "Nimble Tome of Weapon Mastery I",
@@ -261,7 +307,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 7,
-    "dex": 3 
+    "dex": 3,
+    "fixID": false,
+    "tomeID": 23
   },
   {
     "name": "Nimble Tome of Weapon Mastery II",
@@ -272,7 +320,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 8,
-    "dex": 3 
+    "dex": 3,
+    "fixID": false,
+    "tomeID": 24
   },
   {
     "name": "Mystical Tome of Weapon Mastery I",
@@ -283,7 +333,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 7,
-    "int": 3 
+    "int": 3,
+    "fixID": false,
+    "tomeID": 25
   },
   {
     "name": "Mystical Tome of Weapon Mastery II",
@@ -294,7 +346,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 8,
-    "int": 3 
+    "int": 3,
+    "fixID": false,
+    "tomeID": 26
   },
   {
     "name": "Warding Tome of Weapon Mastery I",
@@ -305,7 +359,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 7,
-    "def": 3 
+    "def": 3,
+    "fixID": false,
+    "tomeID": 27
   },
   {
     "name": "Warding Tome of Weapon Mastery II",
@@ -316,7 +372,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 8,
-    "def": 3 
+    "def": 3,
+    "fixID": false,
+    "tomeID": 28
   },
   {
     "name": "Athletic Tome of Weapon Mastery I",
@@ -327,7 +385,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 7,
-    "agi": 3 
+    "agi": 3,
+    "fixID": false,
+    "tomeID": 29
   },
   {
     "name": "Athletic Tome of Weapon Mastery II",
@@ -338,7 +398,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 8,
-    "agi": 3 
+    "agi": 3,
+    "fixID": false,
+    "tomeID": 30
   },
   {
     "name": "Cosmic Tome of Weapon Mastery I",
@@ -353,7 +415,9 @@
     "dex": 1,
     "int": 1,
     "def": 1,
-    "agi": 1
+    "agi": 1,
+    "fixID": false,
+    "tomeID": 31
   },
   {
     "name": "Cosmic Tome of Weapon Mastery II",
@@ -368,7 +432,9 @@
     "dex": 1,
     "int": 1,
     "def": 1,
-    "agi": 1
+    "agi": 1,
+    "fixID": false,
+    "tomeID": 32
   },
   {
     "name": "Seismic Tome of Weapon Mastery II",
@@ -379,7 +445,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 12,
-    "eDamPct": 7
+    "eDamPct": 7,
+    "fixID": false,
+    "tomeID": 33
   },
   {
     "name": "Voltaic Tome of Weapon Mastery II",
@@ -390,7 +458,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 12,
-    "tDamPct": 7
+    "tDamPct": 7,
+    "fixID": false,
+    "tomeID": 34
   },
   {
     "name": "Abyssal Tome of Weapon Mastery II",
@@ -401,7 +471,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 12,
-    "wDamPct": 7
+    "wDamPct": 7,
+    "fixID": false,
+    "tomeID": 35
   },
   {
     "name": "Infernal Tome of Weapon Mastery II",
@@ -412,7 +484,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 12,
-    "fDamPct": 7
+    "fDamPct": 7,
+    "fixID": false,
+    "tomeID": 36
   },
   {
     "name": "Cyclonic Tome of Weapon Mastery II",
@@ -423,7 +497,9 @@
     "restrict": "Soulbound",
     "lvl": 80,
     "dmgMobs": 12,
-    "aDamPct": 7
+    "aDamPct": 7,
+    "fixID": false,
+    "tomeID": 37
   },
   {
     "name": "Astral Tome of Weapon Mastery II",
@@ -438,7 +514,9 @@
     "tDamPct": 6,
     "wDamPct": 6,
     "fDamPct": 6,
-    "aDamPct": 6
+    "aDamPct": 6,
+    "fixID": false,
+    "tomeID": 38
   },
   {
     "name": "Brute's Tome of Allegiance",
@@ -449,7 +527,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "str": 3,
-    "eDamPct": 2
+    "eDamPct": 2,
+    "fixID": false,
+    "tomeID": 39
   },
   {
     "name": "Sadist's Tome of Allegiance",
@@ -460,7 +540,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "dex": 3,
-    "tDamPct": 2
+    "tDamPct": 2,
+    "fixID": false,
+    "tomeID": 40
   },
   {
     "name": "Mastermind's Tome of Allegiance",
@@ -471,7 +553,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "int": 3,
-    "wDamPct": 2
+    "wDamPct": 2,
+    "fixID": false,
+    "tomeID": 41
   },
   {
     "name": "Arsonist's Tome of Allegiance",
@@ -482,7 +566,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "def": 3,
-    "fDamPct": 2
+    "fDamPct": 2,
+    "fixID": false,
+    "tomeID": 42
   },
   {
     "name": "Ghost's Tome of Allegiance",
@@ -493,7 +579,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "agi": 3,
-    "aDamPct": 2
+    "aDamPct": 2,
+    "fixID": false,
+    "tomeID": 43
   },
   {
     "name": "Psychopath's Tome of Allegiance",
@@ -504,7 +592,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "str": 2,
-    "dex": 2
+    "dex": 2,
+    "fixID": false,
+    "tomeID": 44
   },
   {
     "name": "Loner's Tome of Allegiance",
@@ -515,7 +605,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "str": 2,
-    "int": 2
+    "int": 2,
+    "fixID": false,
+    "tomeID": 45
   },
   {
     "name": "Warlock's Tome of Allegiance",
@@ -526,7 +618,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "dex": 2,
-    "int": 2
+    "int": 2,
+    "fixID": false,
+    "tomeID": 46
   },
   {
     "name": "Destroyer's Tome of Allegiance",
@@ -537,7 +631,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "str": 2,
-    "def": 2
+    "def": 2,
+    "fixID": false,
+    "tomeID": 47
   },
   {
     "name": "Devil's Tome of Allegiance",
@@ -548,7 +644,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "dex": 2,
-    "def": 2
+    "def": 2,
+    "fixID": false,
+    "tomeID": 48
   },
   {
     "name": "Alchemist's Tome of Allegiance",
@@ -559,7 +657,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "int": 2,
-    "def": 2
+    "def": 2,
+    "fixID": false,
+    "tomeID": 49
   },
   {
     "name": "Barbarian's Tome of Allegiance",
@@ -570,7 +670,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "str": 2,
-    "agi": 2
+    "agi": 2,
+    "fixID": false,
+    "tomeID": 50
   },
   {
     "name": "Freelancer's Tome of Allegiance",
@@ -581,7 +683,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "dex": 2,
-    "agi": 2
+    "agi": 2,
+    "fixID": false,
+    "tomeID": 51
   },
   {
     "name": "Sycophant's Tome of Allegiance",
@@ -592,7 +696,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "int": 2,
-    "agi": 2
+    "agi": 2,
+    "fixID": false,
+    "tomeID": 52
   },
   {
     "name": "Fanatic's Tome of Allegiance",
@@ -603,7 +709,9 @@
     "restrict": "Untradable",
     "lvl": 100,
     "def": 2,
-    "agi": 2
+    "agi": 2,
+    "fixID": false,
+    "tomeID": 53
   },
   {
     "name": "Assimilator's Tome of Allegiance",
@@ -617,6 +725,8 @@
     "dex": 1,
     "int": 1,
     "def": 1,
-    "agi": 1
+    "agi": 1,
+    "fixID": false,
+    "tomeID": 54
   }
 ]