From 2f7ff17253a4296acdcf29981ebaa14ac2e9817a Mon Sep 17 00:00:00 2001 From: hppeng Date: Sat, 17 Dec 2022 01:11:19 -0800 Subject: [PATCH] HOTFIX: load crash bug with old versions --- js/load.js | 1 + js/load_tome.js | 13 ++++++++----- py_script/items_common.py | 7 +++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/js/load.js b/js/load.js index 45f3ebd..3ca2614 100644 --- a/js/load.js +++ b/js/load.js @@ -104,6 +104,7 @@ async function load_old_version(version_str) { clean_item(item); } let sets_ = result.sets; + sets = new Map(); for (const set in sets_) { sets.set(set, sets_[set]); } diff --git a/js/load_tome.js b/js/load_tome.js index f4fdf39..327d694 100644 --- a/js/load_tome.js +++ b/js/load_tome.js @@ -133,11 +133,13 @@ async function load_tome_init() { }); } -let none_tomes = [ +const none_tomes_info = [ ["tome", "weaponTome", "No Weapon Tome"], ["tome", "armorTome", "No Armor Tome"], ["tome", "guildTome", "No Guild Tome"] ]; +let none_tomes; + function init_tome_maps() { //warp tomeMap = new Map(); @@ -149,12 +151,13 @@ function init_tome_maps() { tomeLists.set(it, []); } + none_tomes = []; for (let i = 0; i < 3; i++) { let tome = Object(); tome.slots = 0; - tome.category = none_tomes[i][0]; - tome.type = none_tomes[i][1]; - tome.name = none_tomes[i][2]; + tome.category = none_tomes_info[i][0]; + tome.type = none_tomes_info[i][1]; + tome.name = none_tomes_info[i][2]; tome.displayName = tome.name; tome.set = null; tome.quest = null; @@ -173,7 +176,7 @@ function init_tome_maps() { //dependency - load.js clean_item(tome); - none_tomes[i] = tome; + none_tomes.push(tome); } tomes = tomes.concat(none_tomes); for (const tome of tomes) { diff --git a/py_script/items_common.py b/py_script/items_common.py index 41768ee..0edcb27 100644 --- a/py_script/items_common.py +++ b/py_script/items_common.py @@ -95,6 +95,13 @@ translate_mappings = { "airDamageBonus": "aDamPct", "thunderDamageBonus": "tDamPct", "earthDamageBonus": "eDamPct", + "elementalDamageBonus": "rDamPct", + "fireDamageBonusRaw": "fDamRaw", + "waterDamageBonusRaw": "wDamRaw", + "airDamageBonusRaw": "aDamRaw", + "thunderDamageBonusRaw": "tDamRaw", + "earthDamageBonusRaw": "eDamRaw", + "elementalDamageBonusRaw": "rDamRaw", "bonusFireDefense": "fDefPct", "bonusWaterDefense": "wDefPct", "bonusAirDefense": "aDefPct",