From 819f81f02083fadc600cc556bc76059f33bf8145 Mon Sep 17 00:00:00 2001 From: Eric Brewster <54458170+TheSheepGoesBa@users.noreply.github.com> Date: Mon, 21 Feb 2022 01:05:13 -0800 Subject: [PATCH 1/3] Added Animal Items Values Excludes Leather and steak form cows --- .idea/.gitignore | 8 ++++++++ lib/farm.js | 30 ++++++++++++++++++++++++++++++ lib/player.js | 1 + 3 files changed, 39 insertions(+) create mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/lib/farm.js b/lib/farm.js index ae378f3..83597bd 100644 --- a/lib/farm.js +++ b/lib/farm.js @@ -109,12 +109,39 @@ const updateCrops = async (state, page, url) => { } } +const parseAnimalItems = (state, page) => { + let itemNames = [] + switch(state.lastView) { + case "coop": + itemNames = ["Eggs", "Feathers"] + break + case "pasture": + itemNames = ["Milk"] + break + case "raptors": + itemNames = ["Antlers", "Bobs"] + break + } + const animalItems = {} + const parser = new DOMParser() + const dom = parser.parseFromString(page, "text/html") + const items = dom.querySelectorAll(".card-content-inner > strong") + for (let i = 0; i < itemNames.length; i++) { + animalItems[itemNames[i]] = items[i].textContent + } + return animalItems +} + const visitCoop = async (state, page, url) => { state.lastView = "coop" + state.player.animalItems["Chickens"] = parseAnimalItems(state, page) + await state.player.save(state.db) } const visitPasture = async (state, page, url) => { state.lastView = "pasture" + state.player.animalItems["Cows"] = parseAnimalItems(state, page) + await state.player.save(state.db) } const visitPigPen = async (state, page, url) => { @@ -123,6 +150,9 @@ const visitPigPen = async (state, page, url) => { const visitPen = async (state, page, url) => { state.lastView = "raptors" + state.player.animalItems["Raptors"] = parseAnimalItems(state, page) + await state.player.save(state.db) + console.log(state.player.animalItems) } const visitHab = async (state, page, url) => { diff --git a/lib/player.js b/lib/player.js index a4c9953..19e62be 100644 --- a/lib/player.js +++ b/lib/player.js @@ -7,6 +7,7 @@ class Player { this.pets = {} this.cropImages = {} this.cropTimes = {} + this.animalItems = {} this.currentPerkset = null this.perksets = null this.settings = {} From a67f59ea10075c2fbb9798b0aaac2599c65553f6 Mon Sep 17 00:00:00 2001 From: Eric Brewster <54458170+TheSheepGoesBa@users.noreply.github.com> Date: Mon, 21 Feb 2022 01:07:03 -0800 Subject: [PATCH 2/3] Removed console.log --- lib/farm.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/farm.js b/lib/farm.js index a0ad2a6..da55f9c 100644 --- a/lib/farm.js +++ b/lib/farm.js @@ -153,7 +153,6 @@ const visitPen = async (state, page, url) => { state.lastView = "raptors" state.player.animalItems["Raptors"] = parseAnimalItems(state, page) await state.player.save(state.db) - console.log(state.player.animalItems) } const visitHab = async (state, page, url) => { From 47d0d4e3adbf342f9f1231d19b73fb178cf3ddcf Mon Sep 17 00:00:00 2001 From: Eric Brewster <54458170+TheSheepGoesBa@users.noreply.github.com> Date: Mon, 21 Feb 2022 01:08:36 -0800 Subject: [PATCH 3/3] Delete .gitignore --- .idea/.gitignore | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml