endernon/wynnbuilder-forked-for-changes
1
0
Fork 0
forked from morphNon/wynnbuilder-idk
Code Pull requests Activity

Patch 11 item changes

Browse source 
might have bugs...
This commit is contained in:
hppeng 2022-08-09 02:39:03 -07:00
parent 2230a939f5
commit 385a097cf7
8 changed files with 4985 additions and 2194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3993
clean.json
View file

File diff suppressed because it is too large Load diff

2
compress.json
View file

File diff suppressed because one or more lines are too long

190
ingreds_clean.json
View file

@ -200,8 +200,8 @@
"lvl": 75, "lvl": 75,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"sdPct": { "sdPct": {
"minimum": -22, "minimum": -22,
@ -9834,7 +9834,7 @@
"ids": { "ids": {
"mr": { "mr": {
"minimum": 0, "minimum": 0,
"maximum": 5 "maximum": 6
} }
}, },
"itemIDs": { "itemIDs": {
@ -10533,7 +10533,7 @@
"ids": { "ids": {
"ms": { "ms": {
"minimum": 0, "minimum": 0,
"maximum": 5 "maximum": 4
} }
}, },
"itemIDs": { "itemIDs": {
@ -10882,8 +10882,8 @@
"maximum": 15 "maximum": 15
}, },
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
} }
}, },
"itemIDs": { "itemIDs": {
@ -11906,8 +11906,8 @@
"maximum": -5 "maximum": -5
}, },
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"gXp": { "gXp": {
"minimum": 4, "minimum": 4,
@ -14594,8 +14594,8 @@
"lvl": 76, "lvl": 76,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"spd": { "spd": {
"minimum": -12, "minimum": -12,
@ -15404,8 +15404,8 @@
"lvl": 28, "lvl": 28,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"xpb": { "xpb": {
"minimum": -10, "minimum": -10,
@ -15569,8 +15569,8 @@
"lvl": 102, "lvl": 102,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"hpBonus": { "hpBonus": {
"minimum": -260, "minimum": -260,
@ -15684,8 +15684,8 @@
"lvl": 87, "lvl": 87,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"sdRaw": { "sdRaw": {
"minimum": 65, "minimum": 65,
@ -15762,8 +15762,8 @@
"lvl": 65, "lvl": 65,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
} }
}, },
"itemIDs": { "itemIDs": {
@ -16037,8 +16037,8 @@
"lvl": 77, "lvl": 77,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"hpBonus": { "hpBonus": {
"minimum": -775, "minimum": -775,
@ -16270,8 +16270,8 @@
"lvl": 50, "lvl": 50,
"ids": { "ids": {
"mr": { "mr": {
"minimum": -5, "minimum": -6,
"maximum": -5 "maximum": -6
}, },
"sdPct": { "sdPct": {
"minimum": 8, "minimum": 8,
@ -16355,8 +16355,8 @@
"lvl": 90, "lvl": 90,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"sdPct": { "sdPct": {
"minimum": 6, "minimum": 6,
@ -16396,8 +16396,8 @@
"lvl": 90, "lvl": 90,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"mdRaw": { "mdRaw": {
"minimum": 50, "minimum": 50,
@ -16734,8 +16734,8 @@
"maximum": 20 "maximum": 20
}, },
"ms": { "ms": {
"minimum": -5, "minimum": -4,
"maximum": -5 "maximum": -4
}, },
"fDamPct": { "fDamPct": {
"minimum": 10, "minimum": 10,
@ -16777,8 +16777,8 @@
"lvl": 99, "lvl": 99,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"sdPct": { "sdPct": {
"minimum": 10, "minimum": 10,
@ -16944,8 +16944,8 @@
"maximum": 10 "maximum": 10
}, },
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
} }
}, },
"itemIDs": { "itemIDs": {
@ -17488,12 +17488,12 @@
"lvl": 23, "lvl": 23,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"ms": { "ms": {
"minimum": 0, "minimum": 0,
"maximum": 5 "maximum": 4
} }
}, },
"itemIDs": { "itemIDs": {
@ -18623,8 +18623,8 @@
"maximum": -100 "maximum": -100
}, },
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"wDamPct": { "wDamPct": {
"minimum": 10, "minimum": 10,
@ -18908,8 +18908,8 @@
"lvl": 29, "lvl": 29,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"sdPct": { "sdPct": {
"minimum": -8, "minimum": -8,
@ -18947,8 +18947,8 @@
"lvl": 105, "lvl": 105,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"agi": { "agi": {
"minimum": 8, "minimum": 8,
@ -19535,8 +19535,8 @@
"lvl": 104, "lvl": 104,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"gXp": { "gXp": {
"minimum": 3, "minimum": 3,
@ -21060,8 +21060,8 @@
"lvl": 75, "lvl": 75,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"int": { "int": {
"minimum": 3, "minimum": 3,
@ -21387,12 +21387,12 @@
"lvl": 78, "lvl": 78,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"ms": { "ms": {
"minimum": -5, "minimum": -4,
"maximum": -5 "maximum": -4
}, },
"wDamPct": { "wDamPct": {
"minimum": 5, "minimum": 5,
@ -21550,8 +21550,8 @@
"lvl": 93, "lvl": 93,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"sdRaw": { "sdRaw": {
"minimum": 45, "minimum": 45,
@ -21595,8 +21595,8 @@
"lvl": 20, "lvl": 20,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"sdRaw": { "sdRaw": {
"minimum": 8, "minimum": 8,
@ -21958,8 +21958,8 @@
"lvl": 43, "lvl": 43,
"ids": { "ids": {
"mr": { "mr": {
"minimum": -5, "minimum": -6,
"maximum": -5 "maximum": -6
}, },
"sdPct": { "sdPct": {
"minimum": 11, "minimum": 11,
@ -22216,8 +22216,8 @@
"lvl": 75, "lvl": 75,
"ids": { "ids": {
"mr": { "mr": {
"minimum": -5, "minimum": -6,
"maximum": -5 "maximum": -6
}, },
"sdPct": { "sdPct": {
"minimum": 15, "minimum": 15,
@ -22714,8 +22714,8 @@
"lvl": 80, "lvl": 80,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"sdPct": { "sdPct": {
"minimum": -20, "minimum": -20,
@ -22911,8 +22911,8 @@
"lvl": 8, "lvl": 8,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"ref": { "ref": {
"minimum": 2, "minimum": 2,
@ -22988,8 +22988,8 @@
"lvl": 45, "lvl": 45,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 10, "minimum": 12,
"maximum": 10 "maximum": 12
} }
}, },
"itemIDs": { "itemIDs": {
@ -23583,8 +23583,8 @@
"lvl": 42, "lvl": 42,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
} }
}, },
"itemIDs": { "itemIDs": {
@ -23878,8 +23878,8 @@
"lvl": 50, "lvl": 50,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"sdPct": { "sdPct": {
"minimum": -12, "minimum": -12,
@ -23957,8 +23957,8 @@
"lvl": 55, "lvl": 55,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"spd": { "spd": {
"minimum": 8, "minimum": 8,
@ -24035,8 +24035,8 @@
"lvl": 43, "lvl": 43,
"ids": { "ids": {
"mr": { "mr": {
"minimum": -10, "minimum": -12,
"maximum": -10 "maximum": -12
}, },
"sdPct": { "sdPct": {
"minimum": 24, "minimum": 24,
@ -24120,8 +24120,8 @@
"maximum": 14 "maximum": 14
}, },
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"hprRaw": { "hprRaw": {
"minimum": 24, "minimum": 24,
@ -24160,8 +24160,8 @@
"lvl": 92, "lvl": 92,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"sdRaw": { "sdRaw": {
"minimum": 110, "minimum": 110,
@ -24373,8 +24373,8 @@
"lvl": 90, "lvl": 90,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"spd": { "spd": {
"minimum": 16, "minimum": 16,
@ -25193,8 +25193,8 @@
"maximum": 20 "maximum": 20
}, },
"mr": { "mr": {
"minimum": -5, "minimum": -6,
"maximum": -5 "maximum": -6
} }
}, },
"itemIDs": { "itemIDs": {
@ -25249,8 +25249,8 @@
"maximum": 20 "maximum": 20
}, },
"mr": { "mr": {
"minimum": -5, "minimum": -6,
"maximum": -5 "maximum": -6
} }
}, },
"itemIDs": { "itemIDs": {
@ -25285,8 +25285,8 @@
"lvl": 83, "lvl": 83,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 10, "minimum": 12,
"maximum": 10 "maximum": 12
} }
}, },
"itemIDs": { "itemIDs": {
@ -25544,8 +25544,8 @@
"lvl": 10, "lvl": 10,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
} }
}, },
"itemIDs": { "itemIDs": {
@ -26028,8 +26028,8 @@
"lvl": 47, "lvl": 47,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
}, },
"tDamPct": { "tDamPct": {
"minimum": 6, "minimum": 6,
@ -26200,8 +26200,8 @@
"lvl": 87, "lvl": 87,
"ids": { "ids": {
"mr": { "mr": {
"minimum": 5, "minimum": 6,
"maximum": 5 "maximum": 6
}, },
"eDamPct": { "eDamPct": {
"minimum": 10, "minimum": 10,
@ -26769,8 +26769,8 @@
"maximum": 12 "maximum": 12
}, },
"ms": { "ms": {
"minimum": 10, "minimum": 8,
"maximum": 10 "maximum": 8
}, },
"atkTier": { "atkTier": {
"minimum": -1, "minimum": -1,
@ -26971,8 +26971,8 @@
"lvl": 68, "lvl": 68,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 10, "minimum": 8,
"maximum": 10 "maximum": 8
} }
}, },
"itemIDs": { "itemIDs": {
@ -27344,8 +27344,8 @@
"lvl": 25, "lvl": 25,
"ids": { "ids": {
"ms": { "ms": {
"minimum": 5, "minimum": 4,
"maximum": 5 "maximum": 4
} }
}, },
"itemIDs": { "itemIDs": {

2
ingreds_compress.json
View file

File diff suppressed because one or more lines are too long

2
js/load.js
View file

@ -1,4 +1,4 @@
const DB_VERSION = 102; const DB_VERSION = 103;
// @See https://github.com/mdn/learning-area/blob/master/javascript/apis/client-side-storage/indexeddb/video-store/index.jsA // @See https://github.com/mdn/learning-area/blob/master/javascript/apis/client-side-storage/indexeddb/video-store/index.jsA
let db; let db;

2
js/load_ing.js
View file

@ -1,4 +1,4 @@
const ING_DB_VERSION = 14; const ING_DB_VERSION = 15;
// @See https://github.com/mdn/learning-area/blob/master/javascript/apis/client-side-storage/indexeddb/video-store/index.js // @See https://github.com/mdn/learning-area/blob/master/javascript/apis/client-side-storage/indexeddb/video-store/index.js

2946
py_script/merge.json
View file

File diff suppressed because it is too large Load diff

42
py_script/merge_items.py
View file

@ -45,17 +45,17 @@ for item in items:
# TEMP wynn2 migration # TEMP wynn2 migration
# note: 10x'd # note: 10x'd
mul_keys = { mul_keys_x10 = {
"spPct1": 7, "sppct1": 7,
"spPct2": 7, "sppct2": 7,
"spPct3": 7, "sppct3": 7,
"spPct4": 7, "sppct4": 7,
"spRaw1": 50, "spraw1": 50,
"spRaw2": 50, "spraw2": 50,
"spRaw3": 50, "spraw3": 50,
"spRaw4": 50, "spraw4": 50,
"mr": 50, "mr": 60,
"ms": 50 "ms": 40
} }
def round_near(x, eps=1e-5): def round_near(x, eps=1e-5):
@ -67,25 +67,25 @@ remap_items = []
#old_items_map = dict() #old_items_map = dict()
import math import math
for item in old_items: for item in old_items:
for k, v in mul_keys.items():
if k in item:
# SUPER JANKY ROUNDING
tentimes = round(item[k] * v)
rem = tentimes % 10
val = math.floor(round_near(tentimes / 10))
if rem >= 5:
val += 1
item[k] = val
if "remapID" in item: if "remapID" in item:
remap_items.append(item) remap_items.append(item)
elif item["name"] not in known_item_names: elif item["name"] not in known_item_names:
for k, v in mul_keys_x10.items():
if k in item:
# SUPER JANKY ROUNDING
tentimes = item[k] * v
rem = tentimes % 10
val = math.floor(round_near(tentimes / 10))
if rem >= 5:
val += 1
item[k] = val
items.append(item) items.append(item)
#print(f'Unknown old item: {item["name"]}!!!') #print(f'Unknown old item: {item["name"]}!!!')
#old_items_map[item["name"]] = item #old_items_map[item["name"]] = item
for set_name, set_info in old_data['sets'].items(): for set_name, set_info in old_data['sets'].items():
for bonus in set_info['bonuses']: for bonus in set_info['bonuses']:
for k, v in mul_keys.items(): for k, v in mul_keys_x10.items():
if k in bonus: if k in bonus:
# SUPER JANKY ROUNDING # SUPER JANKY ROUNDING
tentimes = round(bonus[k] * v) tentimes = round(bonus[k] * v)