From f2bff6701eed36c74cea88b68e4dcbe863f0f338 Mon Sep 17 00:00:00 2001 From: Sempiternity87 Date: Tue, 10 Dec 2019 16:55:51 -0800 Subject: [PATCH 1/2] Started work on importing save file. --- .gitignore | 2 ++ package.json | 3 ++- src/components/Settings.vue | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 541a820..3793e40 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ yarn-error.log* *.ntvs* *.njsproj *.sln +/App.js +/package-lock.json diff --git a/package.json b/package.json index 7f4a717..2dd0bf9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,8 @@ "vue-clipboard2": "^0.3.0", "vue-router": "^3.0.1", "vuex": "^3.0.1", - "vuex-persistedstate": "^2.5.4" + "vuex-persistedstate": "^2.5.4", + "xml-js": "^1.6.11" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/components/Settings.vue b/src/components/Settings.vue index 0af4f28..75e1196 100644 --- a/src/components/Settings.vue +++ b/src/components/Settings.vue @@ -109,6 +109,13 @@ + + +
+
+ +
+
@@ -142,6 +149,7 @@ import { faCopy, faTrash, faCloudUploadAlt } from '@fortawesome/fontawesome-free import 'mdi-vue/ContentCopyIcon' import 'mdi-vue/UploadIcon' import 'mdi-vue/DeleteIcon' +import XmlJs from 'xml-js' export default { name: 'Settings', components: { @@ -225,6 +233,30 @@ export default { alert('Data Loaded!') } }, + OnFileChange: function (e) { + var files = e.target.files || e.dataTransfer.files + if (files.length) { + let file = files[0] + let reader = new FileReader() + reader.readAsText(file, 'UTF-8') + reader.onload = evt => { + let f = XmlJs.xml2js(evt.target.result, { compact: true, spaces: 2 }) + + console.log(f) + + let locations = f.SaveGame.locations.GameLocation + for (let i = 0; i < locations.length; i++) { + if (locations[i].name._text === 'CommunityCenter') { + console.log(locations[i]) + } + } + console.log('Done printing') + } + reader.onerror = evt => { + console.error(evt) + } + } + }, ConfirmDelete: function () { if (this.DeleteConfirm) { this.$store.commit('resetData') From 2e8599b9a8ffd9206a4ed11e927a344d77640902 Mon Sep 17 00:00:00 2001 From: Sempiternity87 Date: Wed, 11 Dec 2019 23:44:28 -0800 Subject: [PATCH 2/2] Updated bundles to correct IDs (according to the game). Added the Missing Bundle and associated items. --- .gitignore | 2 - src/assets/game_data/bundles.json | 195 +++++++-------- src/assets/game_data/items.json | 385 ++++++++++++++++++++---------- src/assets/game_data/rooms.json | 5 + 4 files changed, 362 insertions(+), 225 deletions(-) diff --git a/.gitignore b/.gitignore index 3793e40..541a820 100644 --- a/.gitignore +++ b/.gitignore @@ -12,5 +12,3 @@ yarn-error.log* *.ntvs* *.njsproj *.sln -/App.js -/package-lock.json diff --git a/src/assets/game_data/bundles.json b/src/assets/game_data/bundles.json index d606f91..7b31257 100644 --- a/src/assets/game_data/bundles.json +++ b/src/assets/game_data/bundles.json @@ -2,213 +2,220 @@ "bundles": [ { "id": 0, - "name": "Spring Foraging Bundle", - "room": 0, - "reward": "Spring Seeds (30)", - "items_required": 4 - }, - { - "id": 1, - "name": "Summer Foraging Bundle", - "room": 0, - "reward": "Summer Seeds (30)", - "items_required": 3 - }, - { - "id": 2, - "name": "Fall Foraging Bundle", - "room": 0, - "reward": "Fall Seeds (30)", - "items_required": 4 - }, - { - "id": 3, - "name": "Winter Foraging Bundle", - "room": 0, - "reward": "Winter Seeds (30)", - "items_required": 4 - }, - { - "id": 4, - "name": "Construction Bundle", - "room": 0, - "reward": "Charcoal Kiln", - "items_required": 4 - }, - { - "id": 5, - "name": "Exotic Foraging Bundle", - "room": 0, - "reward": "Autumn's Bounty (5)", - "items_required": 5 - }, - { - "id": 6, "name": "Spring Crops Bundle", "room": 1, "reward": "Speed-Gro (20)", "items_required": 4 }, { - "id": 7, + "id": 1, "name": "Summer Crops Bundle", "room": 1, "reward": "Quality Sprinkler", "items_required": 4 }, { - "id": 8, + "id": 2, "name": "Fall Crops Bundle", "room": 1, "reward": "Bee House", "items_required": 4 }, { - "id": 9, + "id": 3, "name": "Quality Crops Bundle", "room": 1, "reward": "Preserves Jar", "items_required": 3 }, { - "id": 10, + "id": 4, "name": "Animal Bundle", "room": 1, "reward": "Cheese Press", "items_required": 5 }, { - "id": 11, + "id": 5, "name": "Artisan Bundle", "room": 1, "reward": "Keg", "items_required": 6 }, { - "id": 12, + "id": 6, "name": "River Fish Bundle", "room": 2, "reward": "Bait (30)", "items_required": 4 }, { - "id": 13, + "id": 7, "name": "Lake Fish Bundle", "room": 2, "reward": "Dressed Spinner", "items_required": 4 }, { - "id": 14, + "id": 8, "name": "Ocean Fish Bundle", "room": 2, "reward": "Warp Totem Beach (5)", "items_required": 4 }, { - "id": 15, + "id": 9, "name": "Night Fishing Bundle", "room": 2, "reward": "Small Glow Ring", "items_required": 3 }, { - "id": 16, + "id": 10, "name": "Crab Pot Bundle", "room": 2, "reward": "Crab Pot (3)", "items_required": 5 }, { - "id": 17, + "id": 11, "name": "Specialty Fish Bundle", "room": 2, "reward": "Dish O' The Sea (5)", "items_required": 4 }, { - "id": 18, + "id": 13, + "name": "Spring Foraging Bundle", + "room": 0, + "reward": "Spring Seeds (30)", + "items_required": 4 + }, + { + "id": 14, + "name": "Summer Foraging Bundle", + "room": 0, + "reward": "Summer Seeds (30)", + "items_required": 3 + }, + { + "id": 15, + "name": "Fall Foraging Bundle", + "room": 0, + "reward": "Fall Seeds (30)", + "items_required": 4 + }, + { + "id": 16, + "name": "Winter Foraging Bundle", + "room": 0, + "reward": "Winter Seeds (30)", + "items_required": 4 + }, + { + "id": 17, + "name": "Construction Bundle", + "room": 0, + "reward": "Charcoal Kiln", + "items_required": 4 + }, + { + "id": 19, + "name": "Exotic Foraging Bundle", + "room": 0, + "reward": "Autumn's Bounty (5)", + "items_required": 5 + }, + { + "id": 20, "name": "Blacksmith's Bundle", "room": 3, "reward": "Furnace", "items_required": 3 }, { - "id": 19, + "id": 21, "name": "Geologists's Bundle", "room": 3, "reward": "Omni Geode (5)", "items_required": 4 }, { - "id": 20, + "id": 22, "name": "Adventurer's Bundle", "room": 3, "reward": "Small Magnet Ring", "items_required": 2 }, - { - "id": 21, - "name": "Chef's Bundle", - "room": 4, - "reward": "Pink Cake (x3)", - "items_required": 6 - }, - { - "id": 22, - "name": "Dye Bundle", - "room": 4, - "reward": "Seed Maker", - "items_required": 6 - }, { "id": 23, - "name": "Field Research Bundle", - "room": 4, - "reward": "Recycling Machine", - "items_required": 4 - }, - { - "id": 24, - "name": "Fodder Bundle", - "room": 4, - "reward": "Heater", - "items_required": 3 - }, - { - "id": 25, - "name": "Enchanter's Bundle", - "room": 4, - "reward": "Gold Bar (5)", - "items_required": 4 - }, - { - "id": 26, "name": "2,500 Bundle", "room": 5, "reward": "Chocolate Cake (3)", "items_required": 1 }, { - "id": 27, + "id": 24, "name": "5,000 Bundle", "room": 5, "reward": "Quality Fertilizer (30)", "items_required": 1 }, { - "id": 28, + "id": 25, "name": "10,000 Bundle", "room": 5, "reward": "Lightning Rod", "items_required": 1 }, { - "id": 29, + "id": 26, "name": "25,000 Bundle", "room": 5, "reward": "Crystalarium", "items_required": 1 + }, + { + "id": 31, + "name": "Chef's Bundle", + "room": 4, + "reward": "Pink Cake (x3)", + "items_required": 6 + }, + { + "id": 32, + "name": "Dye Bundle", + "room": 4, + "reward": "Seed Maker", + "items_required": 6 + }, + { + "id": 33, + "name": "Field Research Bundle", + "room": 4, + "reward": "Recycling Machine", + "items_required": 4 + }, + { + "id": 34, + "name": "Fodder Bundle", + "room": 4, + "reward": "Heater", + "items_required": 3 + }, + { + "id": 35, + "name": "Enchanter's Bundle", + "room": 4, + "reward": "Gold Bar (5)", + "items_required": 4 + }, + { + "id": 36, + "name": "The Missing Bundle", + "room": 6, + "reward": "Nothing", + "items_required": 5 } ] } diff --git a/src/assets/game_data/items.json b/src/assets/game_data/items.json index be34d0d..d72b049 100644 --- a/src/assets/game_data/items.json +++ b/src/assets/game_data/items.json @@ -3,7 +3,7 @@ { "bundles": [ { - "bundle_id": 0, + "bundle_id": 13, "count": 1, "id": 0 } @@ -21,7 +21,7 @@ { "bundles": [ { - "bundle_id": 0, + "bundle_id": 13, "count": 1, "id": 1 } @@ -39,7 +39,7 @@ { "bundles": [ { - "bundle_id": 0, + "bundle_id": 13, "count": 1, "id": 2 } @@ -57,7 +57,7 @@ { "bundles": [ { - "bundle_id": 0, + "bundle_id": 13, "count": 1, "id": 3 } @@ -75,7 +75,7 @@ { "bundles": [ { - "bundle_id": 1, + "bundle_id": 14, "count": 1, "id": 4 } @@ -95,7 +95,7 @@ { "bundles": [ { - "bundle_id": 1, + "bundle_id": 14, "count": 1, "id": 5 } @@ -113,7 +113,7 @@ { "bundles": [ { - "bundle_id": 1, + "bundle_id": 14, "count": 1, "id": 6 } @@ -131,7 +131,7 @@ { "bundles": [ { - "bundle_id": 2, + "bundle_id": 15, "count": 1, "id": 7 } @@ -149,7 +149,7 @@ { "bundles": [ { - "bundle_id": 2, + "bundle_id": 15, "count": 1, "id": 8 } @@ -167,7 +167,7 @@ { "bundles": [ { - "bundle_id": 2, + "bundle_id": 15, "count": 1, "id": 9 } @@ -185,7 +185,7 @@ { "bundles": [ { - "bundle_id": 2, + "bundle_id": 15, "count": 1, "id": 10 } @@ -203,7 +203,7 @@ { "bundles": [ { - "bundle_id": 3, + "bundle_id": 16, "count": 1, "id": 11 } @@ -225,7 +225,7 @@ { "bundles": [ { - "bundle_id": 3, + "bundle_id": 16, "count": 1, "id": 12 } @@ -247,7 +247,7 @@ { "bundles": [ { - "bundle_id": 3, + "bundle_id": 16, "count": 1, "id": 13 } @@ -265,7 +265,7 @@ { "bundles": [ { - "bundle_id": 3, + "bundle_id": 16, "count": 1, "id": 14 } @@ -283,12 +283,12 @@ { "bundles": [ { - "bundle_id": 4, + "bundle_id": 17, "count": 99, "id": 15 }, { - "bundle_id": 4, + "bundle_id": 17, "count": 99, "id": 16 } @@ -309,7 +309,7 @@ { "bundles": [ { - "bundle_id": 4, + "bundle_id": 17, "count": 99, "id": 17 } @@ -330,7 +330,7 @@ { "bundles": [ { - "bundle_id": 4, + "bundle_id": 17, "count": 10, "id": 18 } @@ -352,7 +352,7 @@ { "bundles": [ { - "bundle_id": 5, + "bundle_id": 19, "count": 1, "id": 19 } @@ -373,7 +373,7 @@ { "bundles": [ { - "bundle_id": 5, + "bundle_id": 19, "count": 1, "id": 20 } @@ -394,7 +394,7 @@ { "bundles": [ { - "bundle_id": 5, + "bundle_id": 19, "count": 1, "id": 21 } @@ -415,12 +415,12 @@ { "bundles": [ { - "bundle_id": 5, + "bundle_id": 19, "count": 1, "id": 22 }, { - "bundle_id": 22, + "bundle_id": 34, "count": 1, "id": 23 } @@ -442,12 +442,12 @@ { "bundles": [ { - "bundle_id": 5, + "bundle_id": 19, "count": 1, "id": 24 }, { - "bundle_id": 23, + "bundle_id": 32, "count": 1, "id": 25 } @@ -469,12 +469,12 @@ { "bundles": [ { - "bundle_id": 5, + "bundle_id": 19, "count": 1, "id": 26 }, { - "bundle_id": 21, + "bundle_id": 31, "count": 1, "id": 27 } @@ -495,12 +495,12 @@ { "bundles": [ { - "bundle_id": 5, + "bundle_id": 19, "count": 1, "id": 28 }, { - "bundle_id": 25, + "bundle_id": 33, "count": 1, "id": 29 } @@ -521,7 +521,7 @@ { "bundles": [ { - "bundle_id": 5, + "bundle_id": 19, "count": 1, "id": 30 } @@ -542,7 +542,7 @@ { "bundles": [ { - "bundle_id": 5, + "bundle_id": 19, "count": 1, "id": 31 } @@ -563,7 +563,7 @@ { "bundles": [ { - "bundle_id": 6, + "bundle_id": 0, "count": 1, "id": 32 } @@ -581,7 +581,7 @@ { "bundles": [ { - "bundle_id": 6, + "bundle_id": 0, "count": 1, "id": 33 } @@ -599,7 +599,7 @@ { "bundles": [ { - "bundle_id": 6, + "bundle_id": 0, "count": 1, "id": 34 } @@ -617,7 +617,7 @@ { "bundles": [ { - "bundle_id": 6, + "bundle_id": 0, "count": 1, "id": 35 } @@ -635,7 +635,7 @@ { "bundles": [ { - "bundle_id": 7, + "bundle_id": 1, "count": 1, "id": 36 } @@ -653,7 +653,7 @@ { "bundles": [ { - "bundle_id": 7, + "bundle_id": 1, "count": 1, "id": 37 } @@ -671,7 +671,7 @@ { "bundles": [ { - "bundle_id": 7, + "bundle_id": 1, "count": 1, "id": 38 } @@ -689,7 +689,7 @@ { "bundles": [ { - "bundle_id": 7, + "bundle_id": 1, "count": 1, "id": 39 } @@ -707,7 +707,7 @@ { "bundles": [ { - "bundle_id": 8, + "bundle_id": 2, "count": 1, "id": 40 } @@ -726,7 +726,7 @@ { "bundles": [ { - "bundle_id": 8, + "bundle_id": 2, "count": 1, "id": 41 } @@ -744,7 +744,7 @@ { "bundles": [ { - "bundle_id": 8, + "bundle_id": 2, "count": 1, "id": 42 } @@ -762,7 +762,7 @@ { "bundles": [ { - "bundle_id": 8, + "bundle_id": 2, "count": 1, "id": 43 } @@ -780,7 +780,7 @@ { "bundles": [ { - "bundle_id": 9, + "bundle_id": 3, "count": 5, "id": 44 } @@ -798,7 +798,7 @@ { "bundles": [ { - "bundle_id": 9, + "bundle_id": 3, "count": 5, "id": 45 } @@ -816,7 +816,7 @@ { "bundles": [ { - "bundle_id": 9, + "bundle_id": 3, "count": 5, "id": 46 } @@ -834,7 +834,7 @@ { "bundles": [ { - "bundle_id": 9, + "bundle_id": 3, "count": 5, "id": 47 } @@ -853,7 +853,7 @@ { "bundles": [ { - "bundle_id": 10, + "bundle_id": 4, "count": 1, "id": 48 } @@ -874,7 +874,7 @@ { "bundles": [ { - "bundle_id": 10, + "bundle_id": 4, "count": 1, "id": 49 } @@ -895,7 +895,7 @@ { "bundles": [ { - "bundle_id": 10, + "bundle_id": 4, "count": 1, "id": 50 } @@ -916,7 +916,7 @@ { "bundles": [ { - "bundle_id": 10, + "bundle_id": 4, "count": 1, "id": 51 } @@ -937,7 +937,7 @@ { "bundles": [ { - "bundle_id": 10, + "bundle_id": 4, "count": 1, "id": 52 } @@ -958,7 +958,7 @@ { "bundles": [ { - "bundle_id": 10, + "bundle_id": 4, "count": 1, "id": 53 } @@ -979,7 +979,7 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 54 } @@ -999,7 +999,7 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 55 } @@ -1021,7 +1021,7 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 56 } @@ -1042,7 +1042,7 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 57 } @@ -1063,7 +1063,7 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 58 } @@ -1083,7 +1083,7 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 59 } @@ -1105,12 +1105,12 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 60 }, { - "bundle_id": 24, + "bundle_id": 35, "count": 3, "id": 61 } @@ -1128,7 +1128,7 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 62 } @@ -1146,7 +1146,7 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 63 } @@ -1168,7 +1168,7 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 64 } @@ -1186,12 +1186,12 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 65 }, { - "bundle_id": 25, + "bundle_id": 33, "count": 1, "id": 66 } @@ -1209,7 +1209,7 @@ { "bundles": [ { - "bundle_id": 11, + "bundle_id": 5, "count": 1, "id": 67 } @@ -1231,7 +1231,7 @@ { "bundles": [ { - "bundle_id": 12, + "bundle_id": 6, "count": 1, "id": 68 } @@ -1250,7 +1250,7 @@ { "bundles": [ { - "bundle_id": 12, + "bundle_id": 6, "count": 1, "id": 69 } @@ -1269,7 +1269,7 @@ { "bundles": [ { - "bundle_id": 12, + "bundle_id": 6, "count": 1, "id": 70 } @@ -1289,7 +1289,7 @@ { "bundles": [ { - "bundle_id": 12, + "bundle_id": 6, "count": 1, "id": 71 } @@ -1308,7 +1308,7 @@ { "bundles": [ { - "bundle_id": 13, + "bundle_id": 7, "count": 1, "id": 72 } @@ -1329,7 +1329,7 @@ { "bundles": [ { - "bundle_id": 13, + "bundle_id": 7, "count": 1, "id": 73 } @@ -1350,7 +1350,7 @@ { "bundles": [ { - "bundle_id": 13, + "bundle_id": 7, "count": 1, "id": 74 } @@ -1371,7 +1371,7 @@ { "bundles": [ { - "bundle_id": 13, + "bundle_id": 7, "count": 1, "id": 75 } @@ -1390,7 +1390,7 @@ { "bundles": [ { - "bundle_id": 14, + "bundle_id": 8, "count": 1, "id": 76 } @@ -1410,7 +1410,7 @@ { "bundles": [ { - "bundle_id": 14, + "bundle_id": 8, "count": 1, "id": 77 } @@ -1429,7 +1429,7 @@ { "bundles": [ { - "bundle_id": 14, + "bundle_id": 8, "count": 1, "id": 78 } @@ -1448,7 +1448,7 @@ { "bundles": [ { - "bundle_id": 14, + "bundle_id": 8, "count": 1, "id": 79 } @@ -1467,7 +1467,7 @@ { "bundles": [ { - "bundle_id": 15, + "bundle_id": 9, "count": 1, "id": 80 } @@ -1486,7 +1486,7 @@ { "bundles": [ { - "bundle_id": 15, + "bundle_id": 9, "count": 1, "id": 81 } @@ -1507,7 +1507,7 @@ { "bundles": [ { - "bundle_id": 15, + "bundle_id": 9, "count": 1, "id": 82 } @@ -1526,7 +1526,7 @@ { "bundles": [ { - "bundle_id": 16, + "bundle_id": 11, "count": 1, "id": 83 } @@ -1547,7 +1547,7 @@ { "bundles": [ { - "bundle_id": 16, + "bundle_id": 11, "count": 1, "id": 84 } @@ -1568,7 +1568,7 @@ { "bundles": [ { - "bundle_id": 16, + "bundle_id": 11, "count": 1, "id": 85 } @@ -1590,7 +1590,7 @@ { "bundles": [ { - "bundle_id": 16, + "bundle_id": 11, "count": 1, "id": 86 } @@ -1612,7 +1612,7 @@ { "bundles": [ { - "bundle_id": 16, + "bundle_id": 11, "count": 1, "id": 87 } @@ -1634,7 +1634,7 @@ { "bundles": [ { - "bundle_id": 16, + "bundle_id": 11, "count": 1, "id": 88 } @@ -1655,7 +1655,7 @@ { "bundles": [ { - "bundle_id": 16, + "bundle_id": 11, "count": 1, "id": 89 } @@ -1676,7 +1676,7 @@ { "bundles": [ { - "bundle_id": 16, + "bundle_id": 11, "count": 1, "id": 90 } @@ -1697,7 +1697,7 @@ { "bundles": [ { - "bundle_id": 16, + "bundle_id": 11, "count": 1, "id": 91 } @@ -1719,7 +1719,7 @@ { "bundles": [ { - "bundle_id": 16, + "bundle_id": 11, "count": 1, "id": 92 } @@ -1741,7 +1741,7 @@ { "bundles": [ { - "bundle_id": 17, + "bundle_id": 10, "count": 1, "id": 93 } @@ -1759,7 +1759,7 @@ { "bundles": [ { - "bundle_id": 17, + "bundle_id": 10, "count": 1, "id": 94 } @@ -1781,7 +1781,7 @@ { "bundles": [ { - "bundle_id": 17, + "bundle_id": 10, "count": 1, "id": 95 } @@ -1803,7 +1803,7 @@ { "bundles": [ { - "bundle_id": 17, + "bundle_id": 10, "count": 1, "id": 96 } @@ -1824,7 +1824,7 @@ { "bundles": [ { - "bundle_id": 18, + "bundle_id": 20, "count": 1, "id": 97 } @@ -1845,7 +1845,7 @@ { "bundles": [ { - "bundle_id": 18, + "bundle_id": 20, "count": 1, "id": 98 } @@ -1866,7 +1866,7 @@ { "bundles": [ { - "bundle_id": 18, + "bundle_id": 20, "count": 1, "id": 99 } @@ -1887,7 +1887,7 @@ { "bundles": [ { - "bundle_id": 19, + "bundle_id": 21, "count": 1, "id": 100 } @@ -1908,7 +1908,7 @@ { "bundles": [ { - "bundle_id": 19, + "bundle_id": 21, "count": 1, "id": 101 } @@ -1929,7 +1929,7 @@ { "bundles": [ { - "bundle_id": 19, + "bundle_id": 21, "count": 1, "id": 102 } @@ -1950,7 +1950,7 @@ { "bundles": [ { - "bundle_id": 19, + "bundle_id": 21, "count": 1, "id": 103 } @@ -1971,7 +1971,7 @@ { "bundles": [ { - "bundle_id": 20, + "bundle_id": 22, "count": 99, "id": 104 } @@ -1992,7 +1992,7 @@ { "bundles": [ { - "bundle_id": 20, + "bundle_id": 22, "count": 10, "id": 105 } @@ -2013,7 +2013,7 @@ { "bundles": [ { - "bundle_id": 20, + "bundle_id": 22, "count": 1, "id": 106 } @@ -2034,7 +2034,7 @@ { "bundles": [ { - "bundle_id": 20, + "bundle_id": 22, "count": 1, "id": 107 } @@ -2055,7 +2055,7 @@ { "bundles": [ { - "bundle_id": 21, + "bundle_id": 31, "count": 1, "id": 108 } @@ -2073,7 +2073,7 @@ { "bundles": [ { - "bundle_id": 21, + "bundle_id": 31, "count": 1, "id": 109 } @@ -2093,7 +2093,7 @@ { "bundles": [ { - "bundle_id": 21, + "bundle_id": 31, "count": 1, "id": 110 } @@ -2111,7 +2111,7 @@ { "bundles": [ { - "bundle_id": 21, + "bundle_id": 31, "count": 1, "id": 111 } @@ -2132,7 +2132,7 @@ { "bundles": [ { - "bundle_id": 21, + "bundle_id": 31, "count": 1, "id": 112 } @@ -2153,7 +2153,7 @@ { "bundles": [ { - "bundle_id": 22, + "bundle_id": 34, "count": 1, "id": 113 } @@ -2174,7 +2174,7 @@ { "bundles": [ { - "bundle_id": 22, + "bundle_id": 34, "count": 1, "id": 114 } @@ -2193,7 +2193,7 @@ { "bundles": [ { - "bundle_id": 22, + "bundle_id": 34, "count": 1, "id": 115 } @@ -2214,7 +2214,7 @@ { "bundles": [ { - "bundle_id": 22, + "bundle_id": 34, "count": 1, "id": 116 } @@ -2235,7 +2235,7 @@ { "bundles": [ { - "bundle_id": 22, + "bundle_id": 34, "count": 1, "id": 117 } @@ -2253,7 +2253,7 @@ { "bundles": [ { - "bundle_id": 23, + "bundle_id": 32, "count": 1, "id": 118 } @@ -2271,7 +2271,7 @@ { "bundles": [ { - "bundle_id": 23, + "bundle_id": 32, "count": 1, "id": 119 } @@ -2292,7 +2292,7 @@ { "bundles": [ { - "bundle_id": 23, + "bundle_id": 32, "count": 1, "id": 120 } @@ -2313,7 +2313,7 @@ { "bundles": [ { - "bundle_id": 24, + "bundle_id": 35, "count": 10, "id": 121 } @@ -2332,7 +2332,7 @@ { "bundles": [ { - "bundle_id": 24, + "bundle_id": 35, "count": 10, "id": 122 } @@ -2353,7 +2353,7 @@ { "bundles": [ { - "bundle_id": 25, + "bundle_id": 35, "count": 1, "id": 123 } @@ -2375,7 +2375,7 @@ { "bundles": [ { - "bundle_id": 25, + "bundle_id": 33, "count": 1, "id": 124 } @@ -2397,7 +2397,7 @@ { "bundles": [ { - "bundle_id": 26, + "bundle_id": 23, "count": 1, "id": 125 } @@ -2422,7 +2422,7 @@ { "bundles": [ { - "bundle_id": 27, + "bundle_id": 24, "count": 1, "id": 126 } @@ -2447,7 +2447,7 @@ { "bundles": [ { - "bundle_id": 28, + "bundle_id": 25, "count": 1, "id": 127 } @@ -2472,7 +2472,7 @@ { "bundles": [ { - "bundle_id": 29, + "bundle_id": 26, "count": 1, "id": 128 } @@ -2493,6 +2493,133 @@ ], "id": 122, "source": "Collect 25,000 Gold and turn in." + }, + { + "bundles": [ + { + "bundle_id": 36, + "count": 1, + "id": 129 + } + ], + "name": "Wine (Silver Star)", + "skills": [ + "farming", + "foraging" + ], + "seasons": [ + "spring", + "summer", + "fall", + "winter" + ], + "id": 123, + "source": "Produced by putting most fruits into a keg." + }, + { + "bundles": [ + { + "bundle_id": 36, + "count": 1, + "id": 130 + } + ], + "name": "Dinosaur Mayonnaise", + "skills": [ + "farming" + ], + "seasons": [ + "spring", + "summer", + "fall", + "winter" + ], + "id": 124, + "source": "Made from a Dinosaur egg. Requires a Mayonnaise Machine" + }, + { + "bundles": [ + { + "bundle_id": 36, + "count": 1, + "id": 131 + } + ], + "name": "Prismatic Shard", + "skills": [ + "mining" + ], + "seasons": [ + "spring", + "summer", + "fall", + "winter" + ], + "id": 125, + "source": "Found in geodes. It is also a rare drop from Serpents, Mummies, Shadow Brutes, and Shadow Shaman" + }, + { + "bundles": [ + { + "bundle_id": 36, + "count": 5, + "id": 132 + } + ], + "name": "Ancient Fruit (Gold Star)", + "skills": [ + "farming" + ], + "seasons": [ + "spring", + "summer", + "fall" + ], + "id": 126, + "source": "Crops during Spring, Summer and Fall." + }, + { + "bundles": [ + { + "bundle_id": 36, + "count": 1, + "id": 133 + } + ], + "name": "Void Salmon (Gold Star)", + "skills": [ + "fishing" + ], + "seasons": [ + "spring", + "summer", + "fall", + "winter" + ], + "id": 127, + "source": "Found in Witch's Swamp, All Seasons." + }, + { + "bundles": [ + { + "bundle_id": 36, + "count": 1, + "id": 134 + } + ], + "name": "Caviar", + "skills": [ + "farming", + "fishing" + ], + "seasons": [ + "spring", + "summer", + "fall", + "winter" + ], + "id": 128, + "source": "Caviar is an Artisan Good made from the Preserves Jar using Sturgeon Roe." } ] } diff --git a/src/assets/game_data/rooms.json b/src/assets/game_data/rooms.json index 96afff5..30a4c77 100644 --- a/src/assets/game_data/rooms.json +++ b/src/assets/game_data/rooms.json @@ -29,6 +29,11 @@ "id": 5, "name": "Vault", "reward": "Bus Repair" + }, + { + "id": 6, + "name": "Abandoned JojaMart", + "reward": "Movie Theater" } ] }