From 974b9ee0d87aef2ce7875f834aedd0ee87a68449 Mon Sep 17 00:00:00 2001 From: hppeng-wynn <77039964+hppeng-wynn@users.noreply.github.com> Date: Mon, 15 Aug 2022 22:32:49 -0700 Subject: [PATCH] Move all builder js files into their own folder (#208) * Move all builder js files into their own folder * Minify index.html * Fix comment in atree constants readme Co-authored-by: hppeng --- builder/doc.html | 16 +- builder/index.html | 2 +- builder/index_full.html | 17 +- builder2.html | 1001 ----------------- js/README_atree_constants.md | 6 - js/builder/README_atree_constants.md | 6 + js/{ => builder}/atree.js | 0 js/{ => builder}/atree_constants.js | 0 js/{ => builder}/atree_constants_min.js | 0 js/{ => builder}/build.js | 0 js/{ => builder}/build_encode_decode.js | 0 js/{ => builder}/builder.js | 0 .../builder_constants.js} | 0 js/{ => builder}/builder_graph.js | 2 +- js/{ => builder}/optimize.js | 0 js/custom.js | 2 +- js/display.js | 3 +- 17 files changed, 27 insertions(+), 1028 deletions(-) delete mode 100644 builder2.html delete mode 100644 js/README_atree_constants.md create mode 100644 js/builder/README_atree_constants.md rename js/{ => builder}/atree.js (100%) rename js/{ => builder}/atree_constants.js (100%) rename js/{ => builder}/atree_constants_min.js (100%) rename js/{ => builder}/build.js (100%) rename js/{ => builder}/build_encode_decode.js (100%) rename js/{ => builder}/builder.js (100%) rename js/{build_constants.js => builder/builder_constants.js} (100%) rename js/{ => builder}/builder_graph.js (99%) rename js/{ => builder}/optimize.js (100%) diff --git a/builder/doc.html b/builder/doc.html index b6697d1..a45e85e 100644 --- a/builder/doc.html +++ b/builder/doc.html @@ -1305,7 +1305,6 @@ - @@ -1313,13 +1312,14 @@ - - - - - - - + + + + + + + +
diff --git a/builder/index.html b/builder/index.html index 08583b9..94a8230 100644 --- a/builder/index.html +++ b/builder/index.html @@ -1,2 +1,2 @@ - WynnBuilder
Join the discord today to suggest new features, submit bug reports, and hangout/talk to devs!

Equipments

Ability Tree

0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
Level:
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Active boosts
Earth
Thunder
Water
Fire
Air
Curse (Active)
Concentration (Passive)
Detailed
Summary
Input a weapon to see abilities!

Made by hppeng, ferricles, and reschan with Atlas Inc (JavaScript required to function, nothing works without js)

Hard refresh the page (Ctrl+Shift+R on windows/chrome) if it isn't updating correctly.

+ WynnBuilder
Join the discord today to suggest new features, submit bug reports, and hangout/talk to devs!

Equipments

Ability Tree

0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
Level:
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Active boosts
Earth
Thunder
Water
Fire
Air
Curse (Active)
Concentration (Passive)
Detailed
Summary
Input a weapon to see abilities!

Made by hppeng, ferricles, and reschan with Atlas Inc (JavaScript required to function, nothing works without js)

Hard refresh the page (Ctrl+Shift+R on windows/chrome) if it isn't updating correctly.

diff --git a/builder/index_full.html b/builder/index_full.html index 90a3fe2..e9c1054 100644 --- a/builder/index_full.html +++ b/builder/index_full.html @@ -1303,7 +1303,6 @@ - @@ -1311,13 +1310,13 @@ - - - - - - - - + + + + + + + + diff --git a/builder2.html b/builder2.html deleted file mode 100644 index 356f470..0000000 --- a/builder2.html +++ /dev/null @@ -1,1001 +0,0 @@ - - - - - - - - - - - - - - - - - WynnBuilder - - -
-
-
-
-
-
- -

- Forum thread (instructions/help) -

-
-
-
-
-
-
-
Raw after % bby (also % caps at -100)
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
-
- - - -

- 		-
- -

- 		-
- - - -

-
-
- - - -

- 		-
- -

- 		-
- - - -

-
-
- - - -

- 		-
- -

- 		-
- - - -

-
-
- - - -

- 		-
- -

- 		-
- - - -

-
-
-
- - - -

- 		-
-
- -

- 		-
-
- -

-
-
-
- - - - - - - -
-
- - 		-
- - 		-
- - 		-
- -
-
-
-
-
-
- -
-
- Manually Assigned: 0 -
-
- Original Value: 0 -
-
-
-
-
-
-
- -
-
- Manually Assigned: 0 -
-
- Original Value: 0 -
-
-
-
-
-
-
- -
-
- Manually Assigned: 0 -
-
- Original Value: 0 -
-
-
-
-
-
-
- -
-
- Manually Assigned: 0 -
-
- Original Value: 0 -
-
-
-
-
-
-
- -
-
- Manually Assigned: 0 -
-
- Original Value: 0 -
-
-
-
-
-
-
-
- - -
- -
- -
-
-
- - -
- - -
- - -
-
-
-
-

Made by hppeng and ferricles with Atlas Inc (JavaScript required to function, nothing works without js)

-

Hard refresh the page (Ctrl+Shift+R on windows/chrome) if it isn't updating correctly.

-
- -
-
- - - - - - - - - - - - - - - - - diff --git a/js/README_atree_constants.md b/js/README_atree_constants.md deleted file mode 100644 index 242f9bc..0000000 --- a/js/README_atree_constants.md +++ /dev/null @@ -1,6 +0,0 @@ -How to convert: - -0. start in the `js` directory -1. edit `atree_constants.js` -2. run `python3 ../py_script/atree-generateID.py -3. check that the site still works diff --git a/js/builder/README_atree_constants.md b/js/builder/README_atree_constants.md new file mode 100644 index 0000000..29b3e0b --- /dev/null +++ b/js/builder/README_atree_constants.md @@ -0,0 +1,6 @@ +How to convert: + +0. start in the `builder/js` directory +1. edit `atree_constants.js` +2. run `python3 ../../py_script/atree-generateID.py +3. check that the site still works diff --git a/js/atree.js b/js/builder/atree.js similarity index 100% rename from js/atree.js rename to js/builder/atree.js diff --git a/js/atree_constants.js b/js/builder/atree_constants.js similarity index 100% rename from js/atree_constants.js rename to js/builder/atree_constants.js diff --git a/js/atree_constants_min.js b/js/builder/atree_constants_min.js similarity index 100% rename from js/atree_constants_min.js rename to js/builder/atree_constants_min.js diff --git a/js/build.js b/js/builder/build.js similarity index 100% rename from js/build.js rename to js/builder/build.js diff --git a/js/build_encode_decode.js b/js/builder/build_encode_decode.js similarity index 100% rename from js/build_encode_decode.js rename to js/builder/build_encode_decode.js diff --git a/js/builder.js b/js/builder/builder.js similarity index 100% rename from js/builder.js rename to js/builder/builder.js diff --git a/js/build_constants.js b/js/builder/builder_constants.js similarity index 100% rename from js/build_constants.js rename to js/builder/builder_constants.js diff --git a/js/builder_graph.js b/js/builder/builder_graph.js similarity index 99% rename from js/builder_graph.js rename to js/builder/builder_graph.js index 7315a24..2f68ed3 100644 --- a/js/builder_graph.js +++ b/js/builder/builder_graph.js @@ -1078,7 +1078,7 @@ function builder_graph_init() { // Phase 3/3: Set up atree stuff. let class_node = new PlayerClassNode('builder-class').link_to(build_node); - // These two are defined in `atree.js` + // These two are defined in `builder/atree.js` atree_node.link_to(class_node, 'player-class'); atree_merge.link_to(class_node, 'player-class'); pre_scale_agg_node.link_to(atree_raw_stats, 'atree-raw-stats'); diff --git a/js/optimize.js b/js/builder/optimize.js similarity index 100% rename from js/optimize.js rename to js/builder/optimize.js diff --git a/js/custom.js b/js/custom.js index 171a470..42ec3f7 100644 --- a/js/custom.js +++ b/js/custom.js @@ -188,7 +188,7 @@ function getCustomFromHash(hash) { /** An object representing a Custom Item. Mostly for vanity purposes. * @dep Requires the use of nonRolledIDs and rolledIDs from display_constants.js. - * @dep Requires the use of attackSpeeds from build.js. + * @dep Requires the use of attackSpeeds from `builder/build.js`. */ class Custom { /** diff --git a/js/display.js b/js/display.js index 094c508..d9b20c1 100644 --- a/js/display.js +++ b/js/display.js @@ -72,7 +72,8 @@ function displayBuildStats(parent_id,build,command_group,stats){ let active_elem; let elemental_format = false; - //TODO this is put here for readability, consolidate with definition in build.js + //TODO this is put here for readability, consolidate with definition in `builder/build.js` + // TODO amend: uuhhhhh these two constants have diverged too far... let staticIDs = ["hp", "eDef", "tDef", "wDef", "fDef", "aDef"]; for (const command of display_commands) {