From 4210396b533a27035b8233a7557fe669ec89ed55 Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 16:59:27 -0400 Subject: [PATCH 01/12] Added items from the Crab pot Bundle. --- bundles.json | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/bundles.json b/bundles.json index 1cec947..c5742e1 100644 --- a/bundles.json +++ b/bundles.json @@ -607,6 +607,86 @@ "seasons": ["spring", "fall"], "skills": ["fishing"], "bundles": [15] + }, + { + "id": 76, + "name": "Lobster", + "source": "Gathered from Crab Pots.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing"], + "bundles": [16] + }, + { + "id": 77, + "name": "Crayfish", + "source": "Gathered from Crab Pots. Rivers, Spring", + "seasons": ["spring"], + "skills": ["fishing"], + "bundles": [16] + }, + { + "id": 78, + "name": "Crab", + "source": "Gathered from Crab Pots. Also drops from killing hermit crabs in The Mines.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing", "combat"], + "bundles": [16] + }, + { + "id": 79, + "name": "Cockle", + "source": "Gathered from Crab Pots. Can be foraged from areas with sand.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing", "foraging"], + "bundles": [16] + }, + { + "id": 80, + "name": "Mussel", + "source": "Gathered from Crab Pots. Can be foraged from areas with sand.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing", "foraging"], + "bundles": [16] + }, + { + "id": 81, + "name": "Shrimp", + "source": "Gathered from Crab Pots.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing"], + "bundles": [16] + }, + { + "id": 82, + "name": "Snail", + "source": "Gathered from Crab Pots.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing"], + "bundles": [16] + }, + { + "id": 83, + "name": "Periwinkle", + "source": "Gathered from Crab Pots.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing"], + "bundles": [16] + }, + { + "id": 84, + "name": "Oyster", + "source": "Gathered from Crab Pots. Can be foraged from areas with sand.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing", "foraging"], + "bundles": [16] + }, + { + "id": 85, + "name": "Clam", + "source": "Gathered from Crab Pots. Can be foraged from areas with sand.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing", "foraging"], + "bundles": [16] } ], "bundles": [ From b1ff378848380550ea223d6733c78fc3b7915463 Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 17:08:54 -0400 Subject: [PATCH 02/12] Added items from the specialty fish bundle. --- bundles.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/bundles.json b/bundles.json index c5742e1..2a3f6fb 100644 --- a/bundles.json +++ b/bundles.json @@ -687,6 +687,38 @@ "seasons": ["spring", "summer", "fall", "winter"], "skills": ["fishing", "foraging"], "bundles": [16] + }, + { + "id": 86, + "name": "Pufferfish", + "source": "Found in the Ocean, Early Afternoon, Summer. May also be purchased from the Traveling Cart.", + "seasons": ["summer"], + "skills": ["fishing"], + "bundles": [17] + }, + { + "id": 87, + "name": "Ghostfish", + "source": "Found in ponds in The Mines, Anytime, All Seasons. May also be dropped by Ghosts.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing", "combat"], + "bundles": [17] + }, + { + "id": 88, + "name": "Sandfish", + "source": "Found in the pond at Calico Desert. May also be purchased from the Traveling Cart.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing", "combat"], + "bundles": [17] + }, + { + "id": 89, + "name": "Woodskip", + "source": "Found in the Secret Woods, Anytime, All Seasons. May also be purchased from the Traveling Cart.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing"], + "bundles": [17] } ], "bundles": [ From f7924e20061431e7f9a0488da3bee097ee2fcc1b Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 17:38:24 -0400 Subject: [PATCH 03/12] Fixed a bug where room completion rate could be increased for opt. items Each bundle now counts for at most `items_required` for rooms. --- main.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.js b/main.js index 10fc5d6..71ebe70 100644 --- a/main.js +++ b/main.js @@ -130,8 +130,7 @@ var v = new Vue({ getRoomItemsChecked: function(roomId){ return this.static.bundles .filter(function(b){ return b.room === roomId; }) - .map(function(b){ return b.id; }) - .reduce(function(p, c){ return p + v.user_data[c].length; }, 0); + .reduce(function(p, c){ return p + Math.min(v.user_data[c.id].length, c.items_required); }, 0); } } }); From 9aa01bf19bcf2ecf6708a6893f28b8b3fe2fc77e Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 21:58:58 -0400 Subject: [PATCH 04/12] Added items from the blacksmith bundle. --- bundles.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/bundles.json b/bundles.json index 2a3f6fb..2b4e429 100644 --- a/bundles.json +++ b/bundles.json @@ -719,6 +719,30 @@ "seasons": ["spring", "summer", "fall", "winter"], "skills": ["fishing"], "bundles": [17] + }, + { + "id": 90, + "name": "Copper Bar", + "source": "Smelting copper ore in the furnace.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["mining"], + "bundles": [18] + }, + { + "id": 91, + "name": "Iron Bar", + "source": "Smelting iron ore in the furnace.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["mining"], + "bundles": [18] + }, + { + "id": 92, + "name": "Gold Bar", + "source": "Smelting gold ore in the furnace.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["mining"], + "bundles": [18] } ], "bundles": [ From 8b2d8013bb498fde17683301a65a212f3c5ddf7d Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 22:01:25 -0400 Subject: [PATCH 05/12] Added items from the geologist's bundle. --- bundles.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/bundles.json b/bundles.json index 2b4e429..bdb996c 100644 --- a/bundles.json +++ b/bundles.json @@ -743,6 +743,38 @@ "seasons": ["spring", "summer", "fall", "winter"], "skills": ["mining"], "bundles": [18] + }, + { + "id": 93, + "name": "Quartz", + "source": "Found on all levels of The Mines and in geodes.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["mining"], + "bundles": [19] + }, + { + "id": 94, + "name": "Earth Crystal", + "source": "Found on levels 1 - 39 of The Mines and in geodes.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["mining"], + "bundles": [19] + }, + { + "id": 95, + "name": "Frozen Tear", + "source": "Found on levels 40 - 79 of The Mines and in geodes.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["mining"], + "bundles": [19] + }, + { + "id": 96, + "name": "Fire Quartz", + "source": "Found on levels 80 - 120 of The Mines and in magma geodes.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["mining"], + "bundles": [19] } ], "bundles": [ From b9512e37de21cc362e80e4e2a33e0369cc2fe07b Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 22:03:26 -0400 Subject: [PATCH 06/12] Added items from the Adventurer's bundle. --- bundles.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/bundles.json b/bundles.json index bdb996c..32d48e8 100644 --- a/bundles.json +++ b/bundles.json @@ -775,6 +775,38 @@ "seasons": ["spring", "summer", "fall", "winter"], "skills": ["mining"], "bundles": [19] + }, + { + "id": 97, + "name": "Slime (99)", + "source": "Dropped by Slimes in The Mines.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["combat"], + "bundles": [20] + }, + { + "id": 98, + "name": "Bat Wing (10)", + "source": "Dropped by Bats in The Mines.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["combat"], + "bundles": [20] + }, + { + "id": 99, + "name": "Solar Essence", + "source": "Dropped by Ghosts in The Mines.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["combat"], + "bundles": [20] + }, + { + "id": 100, + "name": "Void Essence", + "source": "Dropped by Shadow Brutes in The Mines.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["combat"], + "bundles": [20] } ], "bundles": [ From 2490fcdd1c3f6f0a0266f64d8f998b3c86be7eda Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 22:11:09 -0400 Subject: [PATCH 07/12] Added items from the Chef's bundle. --- bundles.json | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/bundles.json b/bundles.json index 32d48e8..5d97bca 100644 --- a/bundles.json +++ b/bundles.json @@ -807,6 +807,46 @@ "seasons": ["spring", "summer", "fall", "winter"], "skills": ["combat"], "bundles": [20] + }, + { + "id": 101, + "name": "Fiddlehead Fern", + "source": "Found in the Secret Woods during Summer.", + "seasons": ["summer"], + "skills": ["foraging"], + "bundles": [21] + }, + { + "id": 102, + "name": "Truffle", + "source": "Found by pigs while grazing outdoors.", + "seasons": ["spring", "summer", "fall"], + "skills": ["farming"], + "bundles": [21] + }, + { + "id": 103, + "name": "Poppy", + "source": "Crops during Summer.", + "seasons": ["summer"], + "skills": ["farming"], + "bundles": [21] + }, + { + "id": 104, + "name": "Maki Roll", + "source": "Acquired by Cooking. Recipe available from the cooking channel on Summer 21 during odd years.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing"], + "bundles": [21] + }, + { + "id": 105, + "name": "Fried Egg", + "source": "Acquired by Cooking.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["farming"], + "bundles": [21] } ], "bundles": [ From 81d25d3800712c472a36ab9c6ea734a68f024896 Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 22:16:34 -0400 Subject: [PATCH 08/12] Added items from the dye bundle. --- bundles.json | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/bundles.json b/bundles.json index 5d97bca..4e64473 100644 --- a/bundles.json +++ b/bundles.json @@ -847,6 +847,46 @@ "seasons": ["spring", "summer", "fall", "winter"], "skills": ["farming"], "bundles": [21] + }, + { + "id": 106, + "name": "Sea Urchin", + "source": "Can be foraged on the far right side of the beach, accessible after using 300 wood to fix the bridge.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["foraging"], + "bundles": [22] + }, + { + "id": 107, + "name": "Sunflower", + "source": "Crops during Fall.", + "seasons": ["fall"], + "skills": ["farming"], + "bundles": [22] + }, + { + "id": 108, + "name": "Duck Feather", + "source": "Produced by ducks in the coop (similar to how chickens and ducks lay eggs)", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["farming"], + "bundles": [22] + }, + { + "id": 109, + "name": "Aquamarine", + "source": "Can be found in stones and boxes in The Mines.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["mining"], + "bundles": [22] + }, + { + "id": 110, + "name": "Red Cabbage", + "source": "Crops during the Summer. Seeds can be purchased from Pierre's Year 2 and onward. Can be purchased from the Traveling Cart", + "seasons": ["summer"], + "skills": ["farming"], + "bundles": [22] } ], "bundles": [ From 169d467da33f60a5b754500bddb3255dcbfea6ae Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 22:31:56 -0400 Subject: [PATCH 09/12] Added items from the field reserch bundle. --- bundles.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/bundles.json b/bundles.json index 4e64473..8bdb8f8 100644 --- a/bundles.json +++ b/bundles.json @@ -887,6 +887,30 @@ "seasons": ["summer"], "skills": ["farming"], "bundles": [22] + }, + { + "id": 111, + "name": "Nautilus Shell", + "source": "Found by foraging from the beach in the Winter.", + "seasons": ["winter"], + "skills": ["foraging"], + "bundles": [23] + }, + { + "id": 112, + "name": "Chub", + "source": "Can be found in the mountain lake and river during all seasons.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["fishing"], + "bundles": [23] + }, + { + "id": 113, + "name": "Frozen Geode", + "source": "Found on levels 40-79 of The Mines.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["mining"], + "bundles": [23] } ], "bundles": [ From 14a08e84774602f116459d4cfde633b784f6eee8 Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 22:59:13 -0400 Subject: [PATCH 10/12] Added items from the fodder bundle. --- bundles.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/bundles.json b/bundles.json index 8bdb8f8..3e8fb69 100644 --- a/bundles.json +++ b/bundles.json @@ -911,6 +911,22 @@ "seasons": ["spring", "summer", "fall", "winter"], "skills": ["mining"], "bundles": [23] + }, + { + "id": 114, + "name": "Wheat (10)", + "source": "Crops during Summer.", + "seasons": ["summer"], + "skills": ["farming"], + "bundles": [24] + }, + { + "id": 115, + "name": "Hay (10)", + "source": "Purchased from Marnie at The Ranch or created by using the sickle on grass once you have a silo.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["farming"], + "bundles": [24] } ], "bundles": [ From da185164a2874f63797aeae6636b9e5cd3f57dcb Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 23:02:25 -0400 Subject: [PATCH 11/12] Added the items from the enchanter's bundle. --- bundles.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/bundles.json b/bundles.json index 3e8fb69..af4c4fa 100644 --- a/bundles.json +++ b/bundles.json @@ -927,6 +927,30 @@ "seasons": ["spring", "summer", "fall", "winter"], "skills": ["farming"], "bundles": [24] + }, + { + "id": 116, + "name": "Oak Resin", + "source": "Harvested from oak trees using a Tapper.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["foraging"], + "bundles": [25] + }, + { + "id": 117, + "name": "Wine", + "source": "Produced by putting most fruits into a keg.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["farming", "foraging"], + "bundles": [25] + }, + { + "id": 118, + "name": "Rabbit's Foot", + "source": "Dropped by Rabbits in the Coop, also dropped by a Serpent in Skull Cavern (0.8%).", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["farming", "combat"], + "bundles": [25] } ], "bundles": [ From 2e8f4c19d13abc56e613e1b163a4af5e1c7dc037 Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 10 Apr 2016 23:06:31 -0400 Subject: [PATCH 12/12] Added the items from the Vault Room bundles. --- bundles.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/bundles.json b/bundles.json index af4c4fa..4d19792 100644 --- a/bundles.json +++ b/bundles.json @@ -951,6 +951,38 @@ "seasons": ["spring", "summer", "fall", "winter"], "skills": ["farming", "combat"], "bundles": [25] + }, + { + "id": 119, + "name": "2,500 Gold", + "source": "Collect 2,500 Gold and turn in.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["farming", "mining", "foraging", "fishing", "combat"], + "bundles": [26] + }, + { + "id": 120, + "name": "5,000 Gold", + "source": "Collect 5,000 Gold and turn in.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["farming", "mining", "foraging", "fishing", "combat"], + "bundles": [27] + }, + { + "id": 121, + "name": "10,000 Gold", + "source": "Collect 10,000 Gold and turn in.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["farming", "mining", "foraging", "fishing", "combat"], + "bundles": [28] + }, + { + "id": 122, + "name": "25,000 Gold", + "source": "Collect 25,000 Gold and turn in.", + "seasons": ["spring", "summer", "fall", "winter"], + "skills": ["farming", "mining", "foraging", "fishing", "combat"], + "bundles": [29] } ], "bundles": [