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

Merge branch 'atree' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into atree-ui-tweaks

Browse source
This commit is contained in:
reschan 2022-07-23 10:58:09 +07:00
commit fa719927ee
9 changed files with 79 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builder/index.html
View file

File diff suppressed because one or more lines are too long

114
clean.json
View file

@ -76176,8 +76176,8 @@
"sdPct": 14, "sdPct": 14,
"mdPct": 14, "mdPct": 14,
"jh": 1, "jh": 1,
"mr": -1, "mr": -5,
"ms": -1 "ms": -5
}, },
{ {
"hprRaw": 50, "hprRaw": 50,
@ -76205,19 +76205,19 @@
"bonuses": [ "bonuses": [
{}, {},
{ {
"ms": 1, "ms": 5,
"dex": 2, "dex": 2,
"sdRaw": 15, "sdRaw": 15,
"mdRaw": 5 "mdRaw": 5
}, },
{ {
"ms": 1, "ms": 5,
"dex": 6, "dex": 6,
"sdRaw": 35, "sdRaw": 35,
"mdRaw": 10 "mdRaw": 10
}, },
{ {
"ms": 3, "ms": 15,
"dex": 20, "dex": 20,
"sdRaw": 65, "sdRaw": 65,
"mdRaw": 70 "mdRaw": 70
@ -76277,10 +76277,10 @@
{}, {},
{}, {},
{ {
"mr": 5, "mr": 25,
"sdPct": 75, "sdPct": 75,
"mdPct": 75, "mdPct": 75,
"ms": 5, "ms": 25,
"ls": 400, "ls": 400,
"hprRaw": 600 "hprRaw": 600
} }
@ -76405,24 +76405,24 @@
"bonuses": [ "bonuses": [
{}, {},
{ {
"mr": -1, "mr": -5,
"ms": 2, "ms": 10,
"sdRaw": 40, "sdRaw": 40,
"wDamPct": 5, "wDamPct": 5,
"tDamPct": 5, "tDamPct": 5,
"eDamPct": -34 "eDamPct": -34
}, },
{ {
"mr": -2, "mr": -10,
"ms": 4, "ms": 20,
"sdRaw": 115, "sdRaw": 115,
"wDamPct": 10, "wDamPct": 10,
"tDamPct": 10, "tDamPct": 10,
"eDamPct": -67 "eDamPct": -67
}, },
{ {
"mr": -3, "mr": -15,
"ms": 6, "ms": 30,
"sdRaw": 230, "sdRaw": 230,
"wDamPct": 32, "wDamPct": 32,
"tDamPct": 32, "tDamPct": 32,
@ -76459,7 +76459,7 @@
"spRegen": 15 "spRegen": 15
}, },
{ {
"mr": 2, "mr": 10,
"sdPct": 25, "sdPct": 25,
"mdPct": 25, "mdPct": 25,
"xpb": 50, "xpb": 50,
@ -76545,7 +76545,7 @@
"bonuses": [ "bonuses": [
{}, {},
{ {
"mr": 2, "mr": 10,
"xpb": 40, "xpb": 40,
"def": 25, "def": 25,
"fDamPct": 20, "fDamPct": 20,
@ -76689,21 +76689,21 @@
{}, {},
{ {
"hprPct": -10, "hprPct": -10,
"mr": 1, "mr": 5,
"sdPct": 6, "sdPct": 6,
"ref": 10, "ref": 10,
"thorns": 8 "thorns": 8
}, },
{ {
"hprPct": -20, "hprPct": -20,
"mr": 2, "mr": 10,
"sdPct": 14, "sdPct": 14,
"ref": 35, "ref": 35,
"thorns": 24 "thorns": 24
}, },
{ {
"hprPct": -30, "hprPct": -30,
"mr": 4, "mr": 20,
"sdPct": 30, "sdPct": 30,
"ref": 75, "ref": 75,
"thorns": 70 "thorns": 70
@ -76719,9 +76719,9 @@
{}, {},
{ {
"mdPct": 30, "mdPct": 30,
"ms": 2, "ms": 10,
"spd": 25, "spd": 25,
"spPct2": -40 "spPct2": -28
} }
] ]
}, },
@ -76743,46 +76743,46 @@
"lb": 5 "lb": 5
}, },
{ {
"mr": 1, "mr": 5,
"xpb": 10, "xpb": 10,
"lb": 10, "lb": 10,
"spRaw2": -1, "spRaw2": -5,
"hpBonus": 125 "hpBonus": 125
}, },
{ {
"mr": 1, "mr": 5,
"xpb": 15, "xpb": 15,
"lb": 15, "lb": 15,
"spRaw2": -1, "spRaw2": -5,
"hpBonus": 425 "hpBonus": 425
}, },
{ {
"mr": 2, "mr": 10,
"xpb": 35, "xpb": 35,
"lb": 35, "lb": 35,
"hpBonus": 1325, "hpBonus": 1325,
"spRaw2": -1, "spRaw2": -5,
"spRaw4": -1 "spRaw4": -5
}, },
{ {
"mr": 2, "mr": 10,
"xpb": 55, "xpb": 55,
"lb": 55, "lb": 55,
"hpBonus": 2575, "hpBonus": 2575,
"spRaw2": -1, "spRaw2": -5,
"spRaw4": -1 "spRaw4": -5
}, },
{ {
"mr": 3, "mr": 15,
"xpb": 80, "xpb": 80,
"lb": 80, "lb": 80,
"hpBonus": 4450, "hpBonus": 4450,
"spRaw1": -1, "spRaw1": -5,
"spRaw2": -1, "spRaw2": -5,
"spRaw4": -1 "spRaw4": -5
}, },
{ {
"mr": 4, "mr": 20,
"xpb": 100, "xpb": 100,
"lb": 100, "lb": 100,
"str": 15, "str": 15,
@ -76791,10 +76791,10 @@
"agi": 15, "agi": 15,
"def": 15, "def": 15,
"hpBonus": 8270, "hpBonus": 8270,
"spRaw1": -1, "spRaw1": -5,
"spRaw2": -1, "spRaw2": -5,
"spRaw3": -1, "spRaw3": -5,
"spRaw4": -1 "spRaw4": -5
} }
] ]
}, },
@ -76816,8 +76816,8 @@
"xpb": 25, "xpb": 25,
"spRegen": 10, "spRegen": 10,
"sdPct": 8, "sdPct": 8,
"spPct1": -12, "spPct1": -8,
"spPct3": -12 "spPct3": -8
} }
] ]
}, },
@ -76858,11 +76858,11 @@
"bonuses": [ "bonuses": [
{}, {},
{ {
"mr": 2, "mr": 10,
"sdPct": 15, "sdPct": 15,
"mdPct": -15, "mdPct": -15,
"sdRaw": 30, "sdRaw": 30,
"spPct2": -50 "spPct2": -35
} }
] ]
}, },
@ -77126,7 +77126,7 @@
"bonuses": [ "bonuses": [
{}, {},
{ {
"mr": 2, "mr": 10,
"mdPct": -24, "mdPct": -24,
"int": 5, "int": 5,
"wDamPct": 10, "wDamPct": 10,
@ -77134,7 +77134,7 @@
"wDefPct": 16 "wDefPct": 16
}, },
{ {
"mr": 5, "mr": 25,
"mdPct": -54, "mdPct": -54,
"int": 15, "int": 15,
"wDamPct": 20, "wDamPct": 20,
@ -77142,7 +77142,7 @@
"wDefPct": 36 "wDefPct": 36
}, },
{ {
"mr": 8, "mr": 40,
"mdPct": -90, "mdPct": -90,
"int": 25, "int": 25,
"wDamPct": 40, "wDamPct": 40,
@ -77168,7 +77168,7 @@
"aDefPct": 20, "aDefPct": 20,
"tDefPct": 20, "tDefPct": 20,
"eDefPct": 20, "eDefPct": 20,
"ms": 1 "ms": 5
}, },
{ {
"xpb": 50, "xpb": 50,
@ -77178,7 +77178,7 @@
"aDefPct": 50, "aDefPct": 50,
"tDefPct": 50, "tDefPct": 50,
"eDefPct": 50, "eDefPct": 50,
"ms": 2 "ms": 10
}, },
{ {
"xpb": 75, "xpb": 75,
@ -77189,7 +77189,7 @@
"tDefPct": 100, "tDefPct": 100,
"eDefPct": 100, "eDefPct": 100,
"sdPct": 40, "sdPct": 40,
"ms": 6 "ms": 30
} }
] ]
}, },
@ -77203,7 +77203,7 @@
"bonuses": [ "bonuses": [
{}, {},
{ {
"mr": 1, "mr": 5,
"sdPct": -10, "sdPct": -10,
"mdPct": -15, "mdPct": -15,
"def": 7, "def": 7,
@ -77212,7 +77212,7 @@
"aDamPct": 15 "aDamPct": 15
}, },
{ {
"mr": 3, "mr": 15,
"sdPct": -20, "sdPct": -20,
"mdPct": -40, "mdPct": -40,
"def": 15, "def": 15,
@ -77221,7 +77221,7 @@
"aDamPct": 40 "aDamPct": 40
}, },
{ {
"mr": 6, "mr": 30,
"sdPct": -40, "sdPct": -40,
"mdPct": -85, "mdPct": -85,
"def": 40, "def": 40,
@ -77283,7 +77283,7 @@
"sdPct": -33, "sdPct": -33,
"mdPct": -33, "mdPct": -33,
"ls": 90, "ls": 90,
"ms": 2, "ms": 10,
"sdRaw": 160, "sdRaw": 160,
"mdRaw": 105, "mdRaw": 105,
"atkTier": 1 "atkTier": 1
@ -77304,7 +77304,7 @@
"hprRaw": 90 "hprRaw": 90
}, },
{ {
"mr": 5, "mr": 25,
"int": 20, "int": 20,
"def": 20, "def": 20,
"hpBonus": 1500, "hpBonus": 1500,
@ -77324,19 +77324,19 @@
"bonuses": [ "bonuses": [
{}, {},
{ {
"mr": 1, "mr": 5,
"xpb": 5, "xpb": 5,
"lb": 10, "lb": 10,
"hpBonus": 55 "hpBonus": 55
}, },
{ {
"mr": 2, "mr": 10,
"xpb": 10, "xpb": 10,
"lb": 25, "lb": 25,
"hpBonus": 170 "hpBonus": 170
}, },
{ {
"mr": 4, "mr": 20,
"xpb": 25, "xpb": 25,
"lb": 50, "lb": 50,
"int": 20, "int": 20,

2
compress.json
View file

File diff suppressed because one or more lines are too long

2
js/atree.js
View file

@ -674,7 +674,7 @@ const atree_make_interactives = new (class extends ComputeNode {
} }
else if (slider_behavior === 'merge') { else if (slider_behavior === 'merge') {
slider_map.set(slider_name, { slider_map.set(slider_name, {
label_name: slider_name, label_name: slider_name+' ('+ability.display_name+')',
max: slider_max, max: slider_max,
step: slider_step, step: slider_step,
id: "ability-slider"+ability.id, id: "ability-slider"+ability.id,

2
js/atree_constants.js
View file

@ -823,8 +823,6 @@ const atrees = {
{ {
"display_name": "Escape Artist", "display_name": "Escape Artist",
"desc": "When casting Escape, release 120 arrows towards the ground.", "desc": "When casting Escape, release 120 arrows towards the ground.",
"archetype": "Boltslinger",
"archetype_req": 0,
"base_abil": "Escape", "base_abil": "Escape",
"parents": [ "parents": [
"Better Guardian Angels", "Better Guardian Angels",

2
js/atree_constants_min.js
View file

File diff suppressed because one or more lines are too long

10
js/display.js
View file

@ -866,7 +866,7 @@ function displayNextCosts(_stats, spell, spellIdx) {
let int_needed = document.createElement("b"); let int_needed = document.createElement("b");
if (init_cost.textContent === "1") { if (init_cost.textContent === "1") {
int_needed.textContent = ": n/a (+0)"; int_needed.textContent = ": n/a (+0)";
}else { //do math } else { //do math
let target = getSpellCost(stats, spellIdx, spell.cost) - 1; let target = getSpellCost(stats, spellIdx, spell.cost) - 1;
let needed = intel; let needed = intel;
let noUpdate = false; let noUpdate = false;
@ -1386,10 +1386,9 @@ function getSpellCost(stats, spell) {
} }
function getBaseSpellCost(stats, spell) { function getBaseSpellCost(stats, spell) {
// old intelligence: let cost = spell.cost * (1 - skillPointsToPercentage(stats.get('int')) * skillpoint_final_mult[2]);
let cost = Math.ceil(spell.cost * (1 - skillPointsToPercentage(stats.get('int')) * skillpoint_final_mult[2]));
cost += stats.get("spRaw"+spell.base_spell); cost += stats.get("spRaw"+spell.base_spell);
return Math.floor(cost * (1 + stats.get("spPct"+spell.base_spell) / 100)); return cost * (1 + stats.get("spPct"+spell.base_spell) / 100);
} }
@ -1408,7 +1407,7 @@ function displaySpellDamage(parent_elem, overallparent_elem, stats, spell, spell
title_elem.appendChild(first.cloneNode(true)); //cloneNode is needed here. title_elem.appendChild(first.cloneNode(true)); //cloneNode is needed here.
title_elemavg.appendChild(first); title_elemavg.appendChild(first);
let second = make_elem("span", ["Mana"], { textContent: getSpellCost(stats, spell) }); let second = make_elem("span", ["Mana"], { textContent: getSpellCost(stats, spell).toFixed(2) });
title_elem.appendChild(second.cloneNode(true)); title_elem.appendChild(second.cloneNode(true));
title_elemavg.appendChild(second); title_elemavg.appendChild(second);
@ -1425,7 +1424,6 @@ function displaySpellDamage(parent_elem, overallparent_elem, stats, spell, spell
overallparent_elem.append(title_elemavg); overallparent_elem.append(title_elemavg);
// if ('cost' in spell) { // if ('cost' in spell) {
// :( ...... ?
// overallparent_elem.append(displayNextCosts(stats, spell, spellIdx)); // overallparent_elem.append(displayNextCosts(stats, spell, spellIdx));
// } // }

2
js/load.js
View file

@ -1,4 +1,4 @@
const DB_VERSION = 99; const DB_VERSION = 100;
// @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;

12
py_script/merge_items.py
View file

@ -83,6 +83,18 @@ for item in old_items:
#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 bonus in set_info['bonuses']:
for k, v in mul_keys.items():
if k in bonus:
# SUPER JANKY ROUNDING
tentimes = round(bonus[k] * v)
rem = tentimes % 10
val = math.floor(round_near(tentimes / 10))
if rem >= 5:
val += 1
bonus[k] = val
for item in items: for item in items:
for key in delete_keys: for key in delete_keys:
if key in item: if key in item: