Skip to content

Commit

Permalink
reorganise code
Browse files Browse the repository at this point in the history
  • Loading branch information
itsjavi committed Sep 2, 2020
1 parent 2f2fa9b commit 8a7f7d9
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 40 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ showdown-data:
./src/scripts/transpile-showdown-data.sh

data:
node src/js/js-data-to-json.js
node src/js/data-exporter/js-data-to-json.js

data-sync: data
npx prettier --write ./assets/data
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const fs = require("fs");
const { output_dir } = require("./tools");
const abilities = require("./data/abilities");
const items = require("./data/items");
const learnsets = require("./data/learnsets");
const moves = require("./data/moves");
const pokemon = require("./data/pokemon");
const {output_dir} = require("./tools");
const abilities = require("./sources/abilities");
const items = require("./sources/items");
const learnsets = require("./sources/learnsets");
const moves = require("./sources/moves");
const pokemon = require("./sources/pokemon");

fs.writeFileSync(
output_dir + "/abilities.json",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
const {
vv,
lcvv,
slugize,
assets_dir,
list_files,
titleize,
print_joined_props,
aliasize,
} = require("../tools");
const fs = require("fs");
const items = require("./../../../node_modules/pokemon-showdown/.data-dist/abilities")
const items = require("pokemon-showdown/.data-dist/abilities")
.Abilities;

//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
const {
vv,
lcvv,
slugize,
assets_dir,
list_files,
titleize,
print_joined_props,
aliasize,
} = require("../tools");
const fs = require("fs");
const items = require("./../../../node_modules/pokemon-showdown/.data-dist/items")
const items = require("pokemon-showdown/.data-dist/items")
.Items;
//
// print_joined_props(items)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
const {
vv,
lcvv,
slugize,
assets_dir,
list_files,
titleize,
print_joined_props,
aliasize,
slugize
} = require("../tools");
const fs = require("fs");
const items = require("./../../../node_modules/pokemon-showdown/.data-dist/learnsets")
const items = require("pokemon-showdown/.data-dist/learnsets")
.Learnsets;
const nonstandard = require("./nonstandard-pokemon");

Expand Down
10 changes: 2 additions & 8 deletions src/js/data/moves.js → src/js/data-exporter/sources/moves.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
const {
vv,
lcvv,
slugize,
assets_dir,
list_files,
titleize,
print_joined_props,
aliasize,
slugize
} = require("../tools");
const fs = require("fs");
const items = require("./../../../node_modules/pokemon-showdown/.data-dist/moves")
const items = require("pokemon-showdown/.data-dist/moves")
.Moves;

//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const items = require("./../../../node_modules/pokemon-showdown/.data-dist/pokedex")
const items = require("pokemon-showdown/.data-dist/pokedex")
.Pokedex;

let non_standard_list = [];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
const {
vv,
lcvv,
slugize,
assets_dir,
list_files,
titleize,
print_joined_props,
aliasize,
} = require("../tools");
const fs = require("fs");
const items = require("./../../../node_modules/pokemon-showdown/.data-dist/pokedex")
const items = require("pokemon-showdown/.data-dist/pokedex")
.Pokedex;

// print_joined_props(items);
Expand Down
4 changes: 2 additions & 2 deletions src/js/tools.js → src/js/data-exporter/tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ module.exports = {
lcvv: lcvv,
slugize: slugize,
print_joined_props: print_joined_props,
assets_dir: __dirname + "/../../assets",
output_dir: __dirname + "/../../assets/data",
assets_dir: __dirname + "/../../../assets",
output_dir: __dirname + "/../../../assets/data",
list_files: list_files,
titleize: titleize,
aliasize: aliasize,
Expand Down

0 comments on commit 8a7f7d9

Please sign in to comment.