Merge branch 'master' into dev

This commit is contained in:
b 2021-01-12 01:12:50 -06:00
commit 18bdcf86f8
6 changed files with 328 additions and 315 deletions

View file

@ -128,7 +128,7 @@
"int": 0, "int": 0,
"def": -5, "def": -5,
"agi": -5, "agi": -5,
"ls": 215, "ls": 165,
"ms": 1, "ms": 1,
"eSteal": 8, "eSteal": 8,
"expd": 20, "expd": 20,
@ -305,7 +305,7 @@
"hprRaw": 115, "hprRaw": 115,
"xpb": 15, "xpb": 15,
"hpBonus": 962, "hpBonus": 962,
"spRegen": 33, "spRegen": 25,
"ref": 15, "ref": 15,
"wDefPct": 15, "wDefPct": 15,
"aDefPct": 15, "aDefPct": 15,
@ -374,7 +374,7 @@
"def": 5, "def": 5,
"agi": 5, "agi": 5,
"mr": 1, "mr": 1,
"hprRaw": 137, "hprRaw": 105,
"ls": 155, "ls": 155,
"ms": 1, "ms": 1,
"thorns": 18, "thorns": 18,
@ -477,7 +477,7 @@
"def": 8, "def": 8,
"agi": 0, "agi": 0,
"ls": 220, "ls": 220,
"expd": 33, "expd": 25,
"atkTier": -10, "atkTier": -10,
"mdRaw": 2100, "mdRaw": 2100,
"eDamPct": 15, "eDamPct": 15,
@ -550,7 +550,7 @@
"atkTier": 1, "atkTier": 1,
"sdPct": -25, "sdPct": -25,
"mdPct": -8, "mdPct": -8,
"mdRaw": 241, "mdRaw": 185,
"id": 10115 "id": 10115
}, },
{ {
@ -585,7 +585,7 @@
"ls": 215, "ls": 215,
"ms": 2, "ms": 2,
"spd": 16, "spd": 16,
"mdRaw": 345, "mdRaw": 265,
"id": 10116 "id": 10116
}, },
{ {
@ -615,7 +615,7 @@
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"mr": 2, "mr": 2,
"ls": 215, "ls": 165,
"ms": -3, "ms": -3,
"sdPct": 20, "sdPct": 20,
"sdRaw": 160, "sdRaw": 160,
@ -710,7 +710,7 @@
"mdRaw": 260, "mdRaw": 260,
"fDamPct": 15, "fDamPct": 15,
"aDamPct": 15, "aDamPct": 15,
"wDefPct": -45, "wDefPct": -35,
"id": 10120 "id": 10120
}, },
{ {
@ -805,7 +805,7 @@
"int": 8, "int": 8,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"mdPct": -71, "mdPct": -55,
"tDamPct": 40, "tDamPct": 40,
"wDamPct": 40, "wDamPct": 40,
"spRaw1": 1, "spRaw1": 1,
@ -1047,7 +1047,7 @@
"hprPct": -30, "hprPct": -30,
"hprRaw": -500, "hprRaw": -500,
"xpb": 15, "xpb": 15,
"lb": 33, "lb": 25,
"spd": -6, "spd": -6,
"sdPct": 21, "sdPct": 21,
"mdPct": 21, "mdPct": 21,
@ -1086,7 +1086,7 @@
"hpBonus": 450, "hpBonus": 450,
"mdRaw": 235, "mdRaw": 235,
"tDamPct": 7, "tDamPct": 7,
"wDamPct": -19, "wDamPct": -15,
"fDamPct": 7, "fDamPct": 7,
"id": 10131 "id": 10131
}, },
@ -1192,10 +1192,10 @@
"mr": 2, "mr": 2,
"hprPct": 100, "hprPct": 100,
"hprRaw": 269, "hprRaw": 269,
"spd": 33, "spd": 25,
"ref": 33, "ref": 25,
"eDamPct": -97, "eDamPct": -75,
"tDamPct": -97, "tDamPct": -75,
"fDefPct": 50, "fDefPct": 50,
"aDefPct": 50, "aDefPct": 50,
"id": 10134 "id": 10134
@ -1327,7 +1327,7 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"ls": 137, "ls": 105,
"spd": 12, "spd": 12,
"spRegen": -12, "spRegen": -12,
"id": 10138 "id": 10138
@ -1435,7 +1435,7 @@
"mr": -1, "mr": -1,
"hprPct": 35, "hprPct": 35,
"hprRaw": 150, "hprRaw": 150,
"ls": 449, "ls": 345,
"spd": -20, "spd": -20,
"atkTier": -1, "atkTier": -1,
"hpBonus": 500, "hpBonus": 500,
@ -1510,11 +1510,11 @@
"sdPct": -5, "sdPct": -5,
"mdPct": -5, "mdPct": -5,
"fDamPct": 17, "fDamPct": 17,
"eDefPct": 7, "eDefPct": 5,
"tDefPct": 7, "tDefPct": 5,
"wDefPct": 7, "wDefPct": 5,
"fDefPct": 7, "fDefPct": 5,
"aDefPct": 7, "aDefPct": 5,
"id": 10143 "id": 10143
}, },
{ {
@ -1679,7 +1679,7 @@
"def": -99, "def": -99,
"agi": 5, "agi": 5,
"mr": 1, "mr": 1,
"ls": -461, "ls": -355,
"ms": 3, "ms": 3,
"sdPct": 31, "sdPct": 31,
"mdRaw": 275, "mdRaw": 275,
@ -1715,7 +1715,7 @@
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"thorns": 1, "thorns": 1,
"expd": 85, "expd": 65,
"atkTier": 2, "atkTier": 2,
"ref": 1, "ref": 1,
"mdPct": -45, "mdPct": -45,
@ -1750,7 +1750,7 @@
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"mr": 2, "mr": 2,
"xpb": 33, "xpb": 25,
"spRegen": 7, "spRegen": 7,
"ref": 10, "ref": 10,
"id": 10150 "id": 10150
@ -1812,7 +1812,7 @@
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"hprRaw": -125, "hprRaw": -125,
"ls": 267, "ls": 205,
"ms": 1, "ms": 1,
"poison": 675, "poison": 675,
"spRegen": -10, "spRegen": -10,
@ -1882,7 +1882,7 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"spd": 7, "spd": 5,
"mdRaw": 220, "mdRaw": 220,
"tDamPct": 15, "tDamPct": 15,
"id": 10154 "id": 10154
@ -1917,7 +1917,7 @@
"ms": 1, "ms": 1,
"xpb": 11, "xpb": 11,
"atkTier": 1, "atkTier": 1,
"spRegen": 33, "spRegen": 25,
"eDamPct": 19, "eDamPct": 19,
"wDamPct": 19, "wDamPct": 19,
"tDefPct": -40, "tDefPct": -40,
@ -1954,7 +1954,7 @@
"mdPct": 10, "mdPct": 10,
"eDamPct": 19, "eDamPct": 19,
"eDefPct": 23, "eDefPct": 23,
"aDefPct": -19, "aDefPct": -15,
"id": 10156 "id": 10156
}, },
{ {
@ -2051,7 +2051,7 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"hprRaw": -175, "hprRaw": -135,
"ms": 2, "ms": 2,
"expd": 20, "expd": 20,
"sdPct": 15, "sdPct": 15,
@ -2089,10 +2089,10 @@
"int": 5, "int": 5,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"hprRaw": 111, "hprRaw": 85,
"xpb": 20, "xpb": 20,
"lb": 15, "lb": 15,
"spRegen": 33, "spRegen": 25,
"ref": 50, "ref": 50,
"id": 10160 "id": 10160
}, },
@ -2195,7 +2195,7 @@
"agi": 10, "agi": 10,
"spd": 15, "spd": 15,
"atkTier": 1, "atkTier": 1,
"sdPct": -19, "sdPct": -15,
"mdPct": -20, "mdPct": -20,
"tDamPct": 11, "tDamPct": 11,
"aDamPct": 11, "aDamPct": 11,
@ -2270,7 +2270,7 @@
"spRegen": 18, "spRegen": 18,
"sdPct": 9, "sdPct": 9,
"mdPct": -18, "mdPct": -18,
"aDefPct": 59, "aDefPct": 45,
"id": 10165 "id": 10165
}, },
{ {
@ -2432,8 +2432,8 @@
"agi": 0, "agi": 0,
"spd": 8, "spd": 8,
"atkTier": 1, "atkTier": 1,
"mdPct": 33, "mdPct": 25,
"mdRaw": 85, "mdRaw": 65,
"eDefPct": -100, "eDefPct": -100,
"tDefPct": -100, "tDefPct": -100,
"wDefPct": -100, "wDefPct": -100,
@ -2517,7 +2517,7 @@
"sdRaw": 210, "sdRaw": 210,
"mdPct": 23, "mdPct": 23,
"aDamPct": -50, "aDamPct": -50,
"aDefPct": -19, "aDefPct": -15,
"id": 10172 "id": 10172
}, },
{ {
@ -2600,10 +2600,10 @@
"int": 3, "int": 3,
"def": 3, "def": 3,
"agi": 3, "agi": 3,
"hprPct": 33, "hprPct": 25,
"hprRaw": 100, "hprRaw": 100,
"sdPct": 15, "sdPct": 15,
"sdRaw": 189, "sdRaw": 145,
"mdPct": 10, "mdPct": 10,
"mdRaw": 190, "mdRaw": 190,
"id": 10175 "id": 10175
@ -2675,12 +2675,12 @@
"def": 5, "def": 5,
"agi": 5, "agi": 5,
"mr": 3, "mr": 3,
"hprRaw": -253, "hprRaw": -195,
"ls": -305, "ls": -235,
"ms": 1, "ms": 1,
"spd": 20, "spd": 20,
"sdPct": 21, "sdPct": 21,
"sdRaw": 267, "sdRaw": 205,
"mdPct": -50, "mdPct": -50,
"eDefPct": -20, "eDefPct": -20,
"jh": 1, "jh": 1,
@ -2887,7 +2887,7 @@
"agi": 8, "agi": 8,
"mr": 1, "mr": 1,
"ref": 23, "ref": 23,
"sdRaw": 267, "sdRaw": 205,
"wDamPct": 13, "wDamPct": 13,
"aDamPct": 13, "aDamPct": 13,
"wDefPct": 13, "wDefPct": 13,
@ -3072,8 +3072,8 @@
"ls": -225, "ls": -225,
"ms": 3, "ms": 3,
"spd": 13, "spd": 13,
"sdPct": 33, "sdPct": 25,
"sdRaw": 293, "sdRaw": 225,
"mdPct": -25, "mdPct": -25,
"mdRaw": -225, "mdRaw": -225,
"id": 10188 "id": 10188
@ -3109,7 +3109,7 @@
"agi": 0, "agi": 0,
"hprPct": 18, "hprPct": 18,
"hprRaw": 110, "hprRaw": 110,
"hpBonus": 553, "hpBonus": 425,
"spRegen": 15, "spRegen": 15,
"ref": 8, "ref": 8,
"aDamPct": -7, "aDamPct": -7,
@ -3289,12 +3289,12 @@
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"mr": 2, "mr": 2,
"sdPct": 33, "sdPct": 25,
"tDamPct": 10, "tDamPct": 10,
"wDamPct": 10, "wDamPct": 10,
"eDefPct": -19, "eDefPct": -15,
"fDefPct": -19, "fDefPct": -15,
"aDefPct": -19, "aDefPct": -15,
"jh": 3, "jh": 3,
"id": 10194 "id": 10194
}, },
@ -3389,7 +3389,7 @@
"agi": 0, "agi": 0,
"mr": -1, "mr": -1,
"hprPct": -20, "hprPct": -20,
"ls": 189, "ls": 145,
"ms": 1, "ms": 1,
"atkTier": -18, "atkTier": -18,
"poison": 3500, "poison": 3500,
@ -3582,9 +3582,9 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"expd": 33, "expd": 25,
"mdPct": 10, "mdPct": 10,
"eDamPct": 33, "eDamPct": 25,
"aDefPct": -10, "aDefPct": -10,
"id": 10203 "id": 10203
}, },
@ -3615,7 +3615,7 @@
"agi": 0, "agi": 0,
"thorns": 10, "thorns": 10,
"atkTier": -3, "atkTier": -3,
"sdRaw": 111, "sdRaw": 85,
"mdRaw": 115, "mdRaw": 115,
"id": 10204 "id": 10204
}, },
@ -3683,10 +3683,10 @@
"int": 10, "int": 10,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"spRegen": 33, "spRegen": 25,
"ref": 33, "ref": 25,
"sdRaw": 371, "sdRaw": 285,
"mdPct": -19, "mdPct": -15,
"eDamPct": -80, "eDamPct": -80,
"id": 10206 "id": 10206
}, },
@ -3751,7 +3751,7 @@
"ls": 190, "ls": 190,
"ms": 2, "ms": 2,
"atkTier": -10, "atkTier": -10,
"spRegen": -19, "spRegen": -15,
"sdPct": 20, "sdPct": 20,
"mdPct": 70, "mdPct": 70,
"eDamPct": 15, "eDamPct": 15,
@ -3877,7 +3877,7 @@
"agi": 5, "agi": 5,
"mr": 4, "mr": 4,
"hprRaw": 170, "hprRaw": 170,
"ls": -305, "ls": -235,
"expd": 30, "expd": 30,
"spd": -20, "spd": -20,
"sdPct": 14, "sdPct": 14,
@ -3916,8 +3916,8 @@
"ms": -3, "ms": -3,
"sdPct": 10, "sdPct": 10,
"sdRaw": 300, "sdRaw": 300,
"eDamPct": 33, "eDamPct": 25,
"tDamPct": 33, "tDamPct": 25,
"id": 10213 "id": 10213
}, },
{ {
@ -3946,14 +3946,14 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"ls": 293, "ls": 225,
"thorns": 20, "thorns": 20,
"sdPct": -8, "sdPct": -8,
"mdPct": 12, "mdPct": 12,
"mdRaw": 345, "mdRaw": 265,
"tDefPct": -10, "tDefPct": -10,
"wDefPct": 33, "wDefPct": 25,
"aDefPct": -19, "aDefPct": -15,
"id": 10214 "id": 10214
}, },
{ {
@ -4190,7 +4190,7 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"hprRaw": 163, "hprRaw": 125,
"thorns": 24, "thorns": 24,
"expd": 40, "expd": 40,
"poison": 1800, "poison": 1800,
@ -4224,9 +4224,9 @@
"int": 0, "int": 0,
"def": 7, "def": 7,
"agi": 0, "agi": 0,
"hprPct": 85, "hprPct": 65,
"hprRaw": -65, "hprRaw": -65,
"spd": -19, "spd": -15,
"eDamPct": 12, "eDamPct": 12,
"fDamPct": 12, "fDamPct": 12,
"eDefPct": 12, "eDefPct": 12,
@ -4264,9 +4264,9 @@
"def": 12, "def": 12,
"agi": 0, "agi": 0,
"mr": 3, "mr": 3,
"hprRaw": -565, "hprRaw": -435,
"hpBonus": 1800, "hpBonus": 1800,
"wDamPct": 33, "wDamPct": 25,
"spRaw3": 1, "spRaw3": 1,
"id": 10223 "id": 10223
}, },
@ -4472,7 +4472,7 @@
"ms": 3, "ms": 3,
"thorns": 13, "thorns": 13,
"ref": 9, "ref": 9,
"tDamPct": -19, "tDamPct": -15,
"eDefPct": 20, "eDefPct": 20,
"tDefPct": 20, "tDefPct": 20,
"id": 10229 "id": 10229
@ -4543,8 +4543,8 @@
"def": 0, "def": 0,
"agi": -5, "agi": -5,
"xpb": 15, "xpb": 15,
"thorns": -19, "thorns": -15,
"ref": -19, "ref": -15,
"sdPct": 20, "sdPct": 20,
"mdPct": 20, "mdPct": 20,
"tDamPct": 15, "tDamPct": 15,
@ -4622,8 +4622,8 @@
"spRegen": 23, "spRegen": 23,
"wDamPct": 200, "wDamPct": 200,
"fDamPct": 20, "fDamPct": 20,
"eDefPct": 59, "eDefPct": 45,
"tDefPct": 59, "tDefPct": 45,
"spRaw1": -5, "spRaw1": -5,
"id": 10233 "id": 10233
}, },
@ -4727,7 +4727,7 @@
"agi": 0, "agi": 0,
"hprPct": -25, "hprPct": -25,
"ls": 240, "ls": 240,
"spd": 33, "spd": 25,
"sdPct": -7, "sdPct": -7,
"mdPct": 20, "mdPct": 20,
"mdRaw": 230, "mdRaw": 230,
@ -4933,7 +4933,7 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 10, "agi": 10,
"ref": 85, "ref": 65,
"eDefPct": 21, "eDefPct": 21,
"tDefPct": 18, "tDefPct": 18,
"wDefPct": 18, "wDefPct": 18,
@ -4973,7 +4973,7 @@
"hprPct": -21, "hprPct": -21,
"ls": 215, "ls": 215,
"spd": 21, "spd": 21,
"mdRaw": 267, "mdRaw": 205,
"eDamPct": 21, "eDamPct": 21,
"fDamPct": 21, "fDamPct": 21,
"aDamPct": 21, "aDamPct": 21,
@ -5005,7 +5005,7 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"ls": 501, "ls": 385,
"ms": 2, "ms": 2,
"atkTier": 3, "atkTier": 3,
"poison": 4000, "poison": 4000,
@ -5108,7 +5108,7 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"hprRaw": -201, "hprRaw": -155,
"ms": 2, "ms": 2,
"atkTier": -7, "atkTier": -7,
"spRegen": -150, "spRegen": -150,
@ -5235,7 +5235,7 @@
"ms": 1, "ms": 1,
"eSteal": 6, "eSteal": 6,
"spd": 16, "spd": 16,
"sdRaw": 293, "sdRaw": 225,
"mdRaw": 255, "mdRaw": 255,
"fDefPct": -20, "fDefPct": -20,
"sprintReg": 12, "sprintReg": 12,
@ -5369,7 +5369,7 @@
"spd": -8, "spd": -8,
"poison": 360, "poison": 360,
"mdPct": 13, "mdPct": 13,
"mdRaw": 215, "mdRaw": 165,
"eDamPct": 13, "eDamPct": 13,
"fDefPct": -10, "fDefPct": -10,
"id": 10255 "id": 10255
@ -5440,10 +5440,10 @@
"hprPct": -12, "hprPct": -12,
"ms": 1, "ms": 1,
"sdPct": 12, "sdPct": 12,
"eDamPct": -19, "eDamPct": -15,
"tDamPct": 15, "tDamPct": 15,
"wDamPct": 15, "wDamPct": 15,
"fDamPct": -19, "fDamPct": -15,
"fDefPct": -14, "fDefPct": -14,
"id": 10257 "id": 10257
}, },
@ -5475,8 +5475,8 @@
"def": 0, "def": 0,
"agi": 15, "agi": 15,
"hprRaw": 192, "hprRaw": 192,
"expd": 33, "expd": 25,
"mdRaw": 423, "mdRaw": 325,
"fDamPct": 20, "fDamPct": 20,
"aDamPct": 20, "aDamPct": 20,
"wDefPct": -40, "wDefPct": -40,
@ -5632,13 +5632,13 @@
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"mr": 1, "mr": 1,
"thorns": 33, "thorns": 25,
"ref": 33, "ref": 25,
"sdPct": -50, "sdPct": -50,
"mdPct": -60, "mdPct": -60,
"tDamPct": -25, "tDamPct": -25,
"wDamPct": 40, "wDamPct": 40,
"wDefPct": 33, "wDefPct": 25,
"id": 10263 "id": 10263
}, },
{ {
@ -5926,10 +5926,10 @@
"int": 15, "int": 15,
"def": -15, "def": -15,
"agi": 0, "agi": 0,
"ls": 423, "ls": 325,
"spd": 15, "spd": 15,
"sdPct": 33, "sdPct": 25,
"mdRaw": 423, "mdRaw": 325,
"fDamPct": -40, "fDamPct": -40,
"id": 10272 "id": 10272
}, },
@ -5994,7 +5994,7 @@
"agi": 0, "agi": 0,
"spd": 20, "spd": 20,
"mdRaw": 400, "mdRaw": 400,
"sprint": -149, "sprint": -115,
"sprintReg": 320, "sprintReg": 320,
"id": 10274 "id": 10274
}, },
@ -6228,7 +6228,7 @@
"mr": 4, "mr": 4,
"spRegen": 20, "spRegen": 20,
"ref": 20, "ref": 20,
"mdPct": -71, "mdPct": -55,
"wDamPct": 55, "wDamPct": 55,
"id": 10281 "id": 10281
}, },
@ -6372,8 +6372,8 @@
"expd": 22, "expd": 22,
"spd": -20, "spd": -20,
"atkTier": -1, "atkTier": -1,
"eDamPct": 33, "eDamPct": 25,
"aDamPct": 33, "aDamPct": 25,
"wDefPct": 26, "wDefPct": 26,
"spRaw4": -1, "spRaw4": -1,
"id": 10285 "id": 10285
@ -6410,7 +6410,7 @@
"hprRaw": -571, "hprRaw": -571,
"expd": 15, "expd": 15,
"atkTier": 1, "atkTier": 1,
"poison": 683, "poison": 525,
"mdPct": 10, "mdPct": 10,
"tDamPct": 10, "tDamPct": 10,
"fDamPct": 10, "fDamPct": 10,
@ -6445,11 +6445,11 @@
"agi": 0, "agi": 0,
"ms": 2, "ms": 2,
"spd": 7, "spd": 7,
"sdRaw": 293, "sdRaw": 225,
"wDamPct": 15, "wDamPct": 15,
"fDamPct": 15, "fDamPct": 15,
"tDefPct": -30, "tDefPct": -30,
"aDefPct": -19, "aDefPct": -15,
"id": 10287 "id": 10287
}, },
{ {
@ -6630,7 +6630,7 @@
"tDamPct": -20, "tDamPct": -20,
"wDamPct": 15, "wDamPct": 15,
"fDamPct": 15, "fDamPct": 15,
"eDefPct": -19, "eDefPct": -15,
"tDefPct": -40, "tDefPct": -40,
"id": 10292 "id": 10292
}, },
@ -6776,10 +6776,10 @@
"spRegen": 15, "spRegen": 15,
"ref": 20, "ref": 20,
"sdPct": 30, "sdPct": 30,
"mdPct": -19, "mdPct": -15,
"wDamPct": 7, "wDamPct": 5,
"fDamPct": 15, "fDamPct": 15,
"aDefPct": 7, "aDefPct": 5,
"id": 10296 "id": 10296
}, },
{ {
@ -6812,7 +6812,7 @@
"xpb": 30, "xpb": 30,
"spd": 20, "spd": 20,
"ref": 30, "ref": 30,
"aDamPct": 33, "aDamPct": 25,
"aDefPct": 10, "aDefPct": 10,
"spRaw2": -4, "spRaw2": -4,
"jh": 2, "jh": 2,
@ -6846,7 +6846,7 @@
"agi": 0, "agi": 0,
"mr": -3, "mr": -3,
"ms": 3, "ms": 3,
"sdRaw": 267, "sdRaw": 205,
"mdPct": 15, "mdPct": 15,
"mdRaw": 230, "mdRaw": 230,
"tDamPct": 15, "tDamPct": 15,
@ -6882,7 +6882,7 @@
"agi": 0, "agi": 0,
"mr": -1, "mr": -1,
"ms": -1, "ms": -1,
"sdPct": 33, "sdPct": 25,
"tDamPct": 9, "tDamPct": 9,
"wDamPct": 9, "wDamPct": 9,
"tDefPct": 9, "tDefPct": 9,
@ -7023,7 +7023,7 @@
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"ms": 1, "ms": 1,
"spd": -19, "spd": -15,
"mdPct": 22, "mdPct": 22,
"mdRaw": 295, "mdRaw": 295,
"eDamPct": 22, "eDamPct": 22,
@ -7118,12 +7118,12 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"hprPct": -19, "hprPct": -15,
"ls": 190, "ls": 190,
"ms": 1, "ms": 1,
"spd": 11, "spd": 11,
"tDamPct": 21, "tDamPct": 21,
"eDefPct": -19, "eDefPct": -15,
"id": 10306 "id": 10306
}, },
{ {
@ -7446,7 +7446,7 @@
"hprRaw": 100, "hprRaw": 100,
"thorns": 7, "thorns": 7,
"expd": 15, "expd": 15,
"poison": 319, "poison": 245,
"eDamPct": 10, "eDamPct": 10,
"eDefPct": 15, "eDefPct": 15,
"id": 10315 "id": 10315
@ -7514,8 +7514,8 @@
"mr": 1, "mr": 1,
"spd": 15, "spd": 15,
"sdPct": 21, "sdPct": 21,
"eDamPct": -19, "eDamPct": -15,
"tDamPct": -19, "tDamPct": -15,
"wDamPct": 8, "wDamPct": 8,
"fDamPct": 8, "fDamPct": 8,
"aDamPct": 15, "aDamPct": 15,
@ -7591,8 +7591,8 @@
"spRegen": 15, "spRegen": 15,
"ref": 15, "ref": 15,
"sdPct": 15, "sdPct": 15,
"tDamPct": 7, "tDamPct": 5,
"wDamPct": 7, "wDamPct": 5,
"id": 10319 "id": 10319
}, },
{ {
@ -7619,10 +7619,10 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"hprRaw": 163, "hprRaw": 125,
"ls": -145, "ls": -145,
"sdPct": -19, "sdPct": -15,
"mdPct": 33, "mdPct": 25,
"id": 10320 "id": 10320
}, },
{ {
@ -7689,7 +7689,7 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"xpb": 7, "xpb": 5,
"id": 10322 "id": 10322
}, },
{ {
@ -7722,7 +7722,7 @@
"spd": 18, "spd": 18,
"sdPct": 19, "sdPct": 19,
"mdPct": 12, "mdPct": 12,
"eDamPct": -19, "eDamPct": -15,
"aDamPct": 20, "aDamPct": 20,
"eDefPct": -25, "eDefPct": -25,
"aDefPct": 8, "aDefPct": 8,
@ -7795,7 +7795,7 @@
"hprRaw": -145, "hprRaw": -145,
"ms": 1, "ms": 1,
"atkTier": 1, "atkTier": 1,
"sdPct": -19, "sdPct": -15,
"mdPct": 30, "mdPct": 30,
"mdRaw": -154, "mdRaw": -154,
"tDamPct": 10, "tDamPct": 10,
@ -8011,7 +8011,7 @@
"expd": 31, "expd": 31,
"atkTier": 1, "atkTier": 1,
"poison": 577, "poison": 577,
"mdPct": -19, "mdPct": -15,
"eDamPct": 13, "eDamPct": 13,
"tDamPct": 13, "tDamPct": 13,
"id": 10331 "id": 10331
@ -8251,7 +8251,7 @@
"ms": -1, "ms": -1,
"mdPct": 30, "mdPct": 30,
"tDamPct": 30, "tDamPct": 30,
"eDefPct": -71, "eDefPct": -55,
"wDefPct": -45, "wDefPct": -45,
"spPct2": -26, "spPct2": -26,
"spPct3": -19, "spPct3": -19,
@ -8288,7 +8288,7 @@
"agi": 0, "agi": 0,
"ls": 210, "ls": 210,
"mdPct": 50, "mdPct": 50,
"eDamPct": 7, "eDamPct": 5,
"tDamPct": -20, "tDamPct": -20,
"wDamPct": -20, "wDamPct": -20,
"fDamPct": -20, "fDamPct": -20,
@ -8323,7 +8323,7 @@
"agi": 0, "agi": 0,
"mr": 2, "mr": 2,
"ref": 30, "ref": 30,
"mdPct": -19, "mdPct": -15,
"wDefPct": 15, "wDefPct": 15,
"fDefPct": 7, "fDefPct": 7,
"id": 10340 "id": 10340
@ -8357,8 +8357,8 @@
"agi": 0, "agi": 0,
"hprPct": -25, "hprPct": -25,
"hprRaw": -150, "hprRaw": -150,
"expd": 33, "expd": 25,
"sdPct": 33, "sdPct": 25,
"sdRaw": 211, "sdRaw": 211,
"wDamPct": 20, "wDamPct": 20,
"fDamPct": 20, "fDamPct": 20,
@ -8535,8 +8535,8 @@
"agi": 0, "agi": 0,
"hprRaw": -101, "hprRaw": -101,
"ls": 150, "ls": 150,
"xpb": 33, "xpb": 25,
"lb": 33, "lb": 25,
"spPct2": -58, "spPct2": -58,
"spPct4": -19, "spPct4": -19,
"jh": 2, "jh": 2,
@ -8809,7 +8809,7 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"ls": -357, "ls": -275,
"ms": 1, "ms": 1,
"spd": 50, "spd": 50,
"mdPct": 14, "mdPct": 14,
@ -9028,7 +9028,7 @@
"ms": -1, "ms": -1,
"poison": 720, "poison": 720,
"eDamPct": 20, "eDamPct": 20,
"aDamPct": -19, "aDamPct": -15,
"eDefPct": 12, "eDefPct": 12,
"id": 10360 "id": 10360
}, },
@ -9061,7 +9061,7 @@
"agi": 0, "agi": 0,
"hprPct": 30, "hprPct": 30,
"ls": 200, "ls": 200,
"thorns": 33, "thorns": 25,
"expd": 20, "expd": 20,
"atkTier": -4, "atkTier": -4,
"mdRaw": 700, "mdRaw": 700,
@ -9133,7 +9133,7 @@
"def": 9, "def": 9,
"agi": 0, "agi": 0,
"spd": 9, "spd": 9,
"sdPct": -19, "sdPct": -15,
"mdPct": 12, "mdPct": 12,
"mdRaw": 380, "mdRaw": 380,
"tDamPct": -10, "tDamPct": -10,
@ -9164,14 +9164,14 @@
"int": -10, "int": -10,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"hprPct": 33, "hprPct": 25,
"hprRaw": 215, "hprRaw": 165,
"ls": 319, "ls": 245,
"thorns": -30, "thorns": -30,
"hpBonus": 769, "hpBonus": 769,
"ref": -30, "ref": -30,
"sdPct": -19, "sdPct": -15,
"mdPct": -19, "mdPct": -15,
"id": 10364 "id": 10364
}, },
{ {
@ -9436,8 +9436,8 @@
"agi": -4, "agi": -4,
"mr": 2, "mr": 2,
"ms": 2, "ms": 2,
"spRegen": 7, "spRegen": 5,
"sdPct": 7, "sdPct": 5,
"mdPct": -20, "mdPct": -20,
"id": 10372 "id": 10372
}, },
@ -9469,11 +9469,11 @@
"int": 0, "int": 0,
"def": 9, "def": 9,
"agi": 0, "agi": 0,
"hprPct": 33, "hprPct": 25,
"ls": 319, "ls": 245,
"sdRaw": 230, "sdRaw": 230,
"mdPct": -19, "mdPct": -15,
"eDamPct": -45, "eDamPct": -35,
"tDamPct": 14, "tDamPct": 14,
"fDamPct": 14, "fDamPct": 14,
"id": 10373 "id": 10373
@ -9686,7 +9686,7 @@
"spd": 15, "spd": 15,
"sdPct": 31, "sdPct": 31,
"tDamPct": 10, "tDamPct": 10,
"tDefPct": -19, "tDefPct": -15,
"wDefPct": -20, "wDefPct": -20,
"id": 10379 "id": 10379
}, },
@ -9756,11 +9756,11 @@
"agi": 0, "agi": 0,
"thorns": 15, "thorns": 15,
"spd": 15, "spd": 15,
"atkTier": -19, "atkTier": -15,
"ref": 15, "ref": 15,
"mdRaw": 2400, "mdRaw": 2400,
"tDamPct": 15, "tDamPct": 15,
"wDamPct": -19, "wDamPct": -15,
"fDamPct": 15, "fDamPct": 15,
"id": 10381 "id": 10381
}, },
@ -10023,10 +10023,10 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"hprRaw": 163, "hprRaw": 125,
"atkTier": 1, "atkTier": 1,
"mdPct": -19, "mdPct": -15,
"mdRaw": 215, "mdRaw": 165,
"tDamPct": 10, "tDamPct": 10,
"id": 10389 "id": 10389
}, },
@ -10065,7 +10065,7 @@
"ms": -1, "ms": -1,
"thorns": 40, "thorns": 40,
"hpBonus": 475, "hpBonus": 475,
"ref": 33, "ref": 25,
"id": 10390 "id": 10390
}, },
{ {
@ -10124,7 +10124,7 @@
"def": 0, "def": 0,
"agi": 0, "agi": 0,
"hprRaw": -100, "hprRaw": -100,
"expd": 33, "expd": 25,
"spd": 20, "spd": 20,
"sdPct": 30, "sdPct": 30,
"mdPct": 30, "mdPct": 30,
@ -10196,8 +10196,8 @@
"int": 0, "int": 0,
"def": 0, "def": 0,
"agi": -13, "agi": -13,
"spd": -19, "spd": -15,
"sdRaw": 319, "sdRaw": 245,
"mdRaw": 195, "mdRaw": 195,
"tDamPct": 30, "tDamPct": 30,
"aDamPct": -50, "aDamPct": -50,

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

View file

@ -1,4 +1,4 @@
const DB_VERSION = 13; const DB_VERSION = 14;
// @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
let db; let db;

View file

@ -11,7 +11,7 @@ console.log(url_tag);
* END testing section * END testing section
*/ */
const BUILD_VERSION = "6.8.1"; const BUILD_VERSION = "6.8.2";
document.getElementById("header").textContent = "WynnBuilder version "+BUILD_VERSION+" (db version "+DB_VERSION+")"; document.getElementById("header").textContent = "WynnBuilder version "+BUILD_VERSION+" (db version "+DB_VERSION+")";

View file

@ -151,8 +151,6 @@ for item in items:
item[v] = item[k] item[v] = item[k]
del item[k] del item[k]
if "skin" in item:
if not (item["name"] in id_map): if not (item["name"] in id_map):
id_map[item["name"]] = len(id_map) id_map[item["name"]] = len(id_map)
print(f'New item: {item["name"]}') print(f'New item: {item["name"]}')
@ -162,8 +160,6 @@ for item in items:
if item["name"] in item_set_map: if item["name"] in item_set_map:
item["set"] = item_set_map[item["name"]] item["set"] = item_set_map[item["name"]]
exit(1)
with open("1_20_ci.json", "r") as ci_file: with open("1_20_ci.json", "r") as ci_file:
ci_items = json.load(ci_file) ci_items = json.load(ci_file)
items.extend(ci_items) items.extend(ci_items)