Skip to content

Commit

Permalink
fix data build, remove misc items for now
Browse files Browse the repository at this point in the history
  • Loading branch information
atomicptr committed Dec 22, 2018
1 parent 7f240ae commit fb4161f
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion data/all.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/all.slim.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/blueprintLocations.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/builds/4fcb757e500aa7e4214cee56b479bfb2.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/builds/builds.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"hash":"b5f19d0b86d5bfeb50b20cd2a07fb6b6","timestamp":1499468934344},{"hash":"9adfc2ff2a1b7431a16b2a88b27094dd","timestamp":1503400873925},{"hash":"907e7f73e1163e236247a5b4aa62661b","timestamp":1504029673532},{"hash":"7eaadf9d3f1101c0f30f4ba34b362c5b","timestamp":1504371680700},{"hash":"729e8f66ac3201654f6b7d3c074c7a6e","timestamp":1507849240980},{"hash":"1dc93287b5f78ed8ba5bca351864b391","timestamp":1508194828680},{"hash":"a2ef5d96249343707333cfa804b14a13","timestamp":1508511664554},{"hash":"59354a1341f5d806c8fc7b199f2caca3","timestamp":1511377735452},{"hash":"c3d5b343ee7adbffd64b24b15b27c042","timestamp":1511470868820},{"hash":"56853d86edb65cc29e77df3e82310c98","timestamp":1511978479312},{"hash":"139bd54a9597f15167ca529548a8d2b7","timestamp":1511985659003},{"hash":"65d3783accd79fd62ac41b9ae7ae8c9b","timestamp":1512424851455},{"hash":"016549f82f1b6d478bc77b64425bae28","timestamp":1513112468795},{"hash":"08c7810247309d021add95c8bbad0c6a","timestamp":1513990809625},{"hash":"d93d001031609e24ef49e114dbb0d519","timestamp":1516928411738},{"hash":"db5ca519b88750072558e6709071ad76","timestamp":1517443210555},{"hash":"c7dc1d5cf94ac41958f180eab888bffa","timestamp":1517947211664},{"hash":"17a8f3d1650d75f0847b161a9a3ebbc2","timestamp":1518264009247},{"hash":"8da415db0961135889a71015b4a750e8","timestamp":1518566412123},{"hash":"4ce891abf73c89a1cfe2aa9b7ef4746a","timestamp":1518811211540},{"hash":"dea76de87dae21ea0915a40d3cd74301","timestamp":1519934411282},{"hash":"fdbc381fbc47c27514c756ba8219a224","timestamp":1521568828525},{"hash":"70ce63d294560b7fd0684a41595240f7","timestamp":1521669610681},{"hash":"380827f9235de5a1185b0350d3c827f1","timestamp":1522954817429},{"hash":"fa5360ceaf941a2bdcafa9a148c358fc","timestamp":1523383211240},{"hash":"a41e2e9f487a3028c315990b5130d822","timestamp":1523394012195},{"hash":"31f5a49b9000520bc3298327128afb98","timestamp":1524236412918},{"hash":"d47a826e5c3a8dc7a37fe6f468f41a57","timestamp":1524729614145,"modified":1524690737000},{"hash":"888d284f1b3af25d5689af8d252a3106","timestamp":1526569212093,"modified":1526569000000},{"hash":"9c26b601e6df24b1435fa45adbd22b97","timestamp":1529096410324,"modified":1529093251000},{"hash":"843153acb26f901bf857db3134cf9b74","timestamp":1529434808974,"modified":1529431414000},{"hash":"9678f802fc2fcb3c3de53d3e86e0a8db","timestamp":1529528411827,"modified":1529527661000},{"hash":"bc8c35353ea05d3e5cca5f3658168162","timestamp":1532458810986,"modified":1532456056000},{"hash":"80b2bd3d704ccece5fba4659ff95e289","timestamp":1535148011792,"modified":1535147132000},{"hash":"dcfdb216c942b1b36d31bd6d4d08b4cc","timestamp":1537902016159,"modified":1537898171000},{"hash":"2edfd2f58542f5161e089e6ac76338cd","timestamp":1539352845801,"modified":1539352130000},{"hash":"4890cb0607f3886c420571a4942cffe9","timestamp":1541714411342,"modified":1541710993000},{"hash":"3b0d5144b3102f9afc89661b4834307e","timestamp":1541779213598,"modified":1541776722000},{"hash":"6e77072c64136db3c2b19c89f5825437","timestamp":1541804412057,"modified":1541802569000},{"hash":"f76165d2afffd59f66483d3851238f3d","timestamp":1542146413108,"modified":1542143233000},{"hash":"781f0046d23abb11d8909eb18424e3ab","timestamp":1545145214904,"modified":1545143845000},{"hash":"5886799c5cb12baf02adb059f69eb28e","timestamp":1545170413997,"modified":1545170183000},{"hash":"37d621cb658b2d31e6ce25ffe8833d29","timestamp":1545235215312,"modified":1545235083000}]
[{"hash":"b5f19d0b86d5bfeb50b20cd2a07fb6b6","timestamp":1499468934344},{"hash":"9adfc2ff2a1b7431a16b2a88b27094dd","timestamp":1503400873925},{"hash":"907e7f73e1163e236247a5b4aa62661b","timestamp":1504029673532},{"hash":"7eaadf9d3f1101c0f30f4ba34b362c5b","timestamp":1504371680700},{"hash":"729e8f66ac3201654f6b7d3c074c7a6e","timestamp":1507849240980},{"hash":"1dc93287b5f78ed8ba5bca351864b391","timestamp":1508194828680},{"hash":"a2ef5d96249343707333cfa804b14a13","timestamp":1508511664554},{"hash":"59354a1341f5d806c8fc7b199f2caca3","timestamp":1511377735452},{"hash":"c3d5b343ee7adbffd64b24b15b27c042","timestamp":1511470868820},{"hash":"56853d86edb65cc29e77df3e82310c98","timestamp":1511978479312},{"hash":"139bd54a9597f15167ca529548a8d2b7","timestamp":1511985659003},{"hash":"65d3783accd79fd62ac41b9ae7ae8c9b","timestamp":1512424851455},{"hash":"016549f82f1b6d478bc77b64425bae28","timestamp":1513112468795},{"hash":"08c7810247309d021add95c8bbad0c6a","timestamp":1513990809625},{"hash":"d93d001031609e24ef49e114dbb0d519","timestamp":1516928411738},{"hash":"db5ca519b88750072558e6709071ad76","timestamp":1517443210555},{"hash":"c7dc1d5cf94ac41958f180eab888bffa","timestamp":1517947211664},{"hash":"17a8f3d1650d75f0847b161a9a3ebbc2","timestamp":1518264009247},{"hash":"8da415db0961135889a71015b4a750e8","timestamp":1518566412123},{"hash":"4ce891abf73c89a1cfe2aa9b7ef4746a","timestamp":1518811211540},{"hash":"dea76de87dae21ea0915a40d3cd74301","timestamp":1519934411282},{"hash":"fdbc381fbc47c27514c756ba8219a224","timestamp":1521568828525},{"hash":"70ce63d294560b7fd0684a41595240f7","timestamp":1521669610681},{"hash":"380827f9235de5a1185b0350d3c827f1","timestamp":1522954817429},{"hash":"fa5360ceaf941a2bdcafa9a148c358fc","timestamp":1523383211240},{"hash":"a41e2e9f487a3028c315990b5130d822","timestamp":1523394012195},{"hash":"31f5a49b9000520bc3298327128afb98","timestamp":1524236412918},{"hash":"d47a826e5c3a8dc7a37fe6f468f41a57","timestamp":1524729614145,"modified":1524690737000},{"hash":"888d284f1b3af25d5689af8d252a3106","timestamp":1526569212093,"modified":1526569000000},{"hash":"9c26b601e6df24b1435fa45adbd22b97","timestamp":1529096410324,"modified":1529093251000},{"hash":"843153acb26f901bf857db3134cf9b74","timestamp":1529434808974,"modified":1529431414000},{"hash":"9678f802fc2fcb3c3de53d3e86e0a8db","timestamp":1529528411827,"modified":1529527661000},{"hash":"bc8c35353ea05d3e5cca5f3658168162","timestamp":1532458810986,"modified":1532456056000},{"hash":"80b2bd3d704ccece5fba4659ff95e289","timestamp":1535148011792,"modified":1535147132000},{"hash":"dcfdb216c942b1b36d31bd6d4d08b4cc","timestamp":1537902016159,"modified":1537898171000},{"hash":"2edfd2f58542f5161e089e6ac76338cd","timestamp":1539352845801,"modified":1539352130000},{"hash":"4890cb0607f3886c420571a4942cffe9","timestamp":1541714411342,"modified":1541710993000},{"hash":"3b0d5144b3102f9afc89661b4834307e","timestamp":1541779213598,"modified":1541776722000},{"hash":"6e77072c64136db3c2b19c89f5825437","timestamp":1541804412057,"modified":1541802569000},{"hash":"f76165d2afffd59f66483d3851238f3d","timestamp":1542146413108,"modified":1542143233000},{"hash":"781f0046d23abb11d8909eb18424e3ab","timestamp":1545145214904,"modified":1545143845000},{"hash":"5886799c5cb12baf02adb059f69eb28e","timestamp":1545170413997,"modified":1545170183000},{"hash":"37d621cb658b2d31e6ce25ffe8833d29","timestamp":1545235215312,"modified":1545235083000},{"hash":"4fcb757e500aa7e4214cee56b479bfb2","timestamp":1545488495551,"modified":1545267361000}]
2 changes: 1 addition & 1 deletion data/enemyBlueprintTables.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/enemyModTables.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/info.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"hash":"37d621cb658b2d31e6ce25ffe8833d29","timestamp":1545235215312,"modified":1545235083000}
{"hash":"4fcb757e500aa7e4214cee56b479bfb2","timestamp":1545488495551,"modified":1545267361000}
2 changes: 1 addition & 1 deletion data/modLocations.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions generateData.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ request(config.dropDataUrl, (err, res, body) => {
sortieRewards: require("./lib/sortieRewards.js")($),
keyRewards: require("./lib/keyRewards.js")($),
cetusBountyRewards: require("./lib/cetusBountyRewards.js")($),
miscItems: require("./lib/miscItems.js")($),
//miscItems: require("./lib/miscItems.js")($),
solarisBountyRewards: require("./lib/solarisBountyRewards.js")($),
}

Expand Down Expand Up @@ -131,7 +131,7 @@ request(config.dropDataUrl, (err, res, body) => {
fs.writeFileSync(path.resolve(__dirname, "data", "solarisBountyRewards.json"), JSON.stringify({solarisBountyRewards: data.solarisBountyRewards}, null, jsonFormat))

console.log("Writing... /data/miscItems.json")
fs.writeFileSync(path.resolve(__dirname, "data", "miscItems.json"), JSON.stringify({miscItems: data.miscItems}, null, jsonFormat))
//fs.writeFileSync(path.resolve(__dirname, "data", "miscItems.json"), JSON.stringify({miscItems: data.miscItems}, null, jsonFormat))

trymkdir(path.resolve(__dirname, `data`, `missionRewards`))

Expand Down
2 changes: 1 addition & 1 deletion lib/blueprintLocations.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const {hash, parseChance} = require("./utils.js")

module.exports = function($) {
const table = $("#blueprintLocations").next("table")
const table = $("#blueprintByDrop").next("table")
const tbody = table.children()['0']

let item = null
Expand Down
2 changes: 1 addition & 1 deletion lib/enemyBlueprintTables.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const {hash, parseChance} = require("./utils.js")

module.exports = function($) {
const table = $("#enemyBlueprintTables").next("table")
const table = $("#blueprintByAvatar").next("table")
const tbody = table.children()['0']

let enemy = null
Expand Down
2 changes: 1 addition & 1 deletion lib/enemyModTables.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const {hash, checkUniqueHash, parseChance} = require("./utils.js")

module.exports = function($) {
const table = $("#enemyModTables").next("table")
const table = $("#modByAvatar").next("table")
const tbody = table.children()['0']

let enemy = null
Expand Down
2 changes: 1 addition & 1 deletion lib/modLocations.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const {hash, checkUniqueHash, parseChance} = require("./utils.js")

module.exports = function($) {
const table = $("#modLocations").next("table")
const table = $("#modByDrop").next("table")
const tbody = table.children()['0']

let mod = null
Expand Down
4 changes: 2 additions & 2 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ module.exports = {
}

// misc enemy drops
for (let enemy of data.miscItems) {
/*for (let enemy of data.miscItems) {
for (let item of enemy.items) {
newData.push({
place: enemy.enemyName,
Expand All @@ -222,7 +222,7 @@ module.exports = {
chance: (((enemy.enemyItemDropChance / 100) * (item.chance / 100)) * 100).toFixed(2)
})
}
}
}*/

// Manually clean up the rewards list.
newData.forEach((reward) => {
Expand Down

0 comments on commit fb4161f

Please sign in to comment.