1
0
mirror of https://github.com/kihashi/stardew_community_checklist.git synced 2025-10-19 08:03:17 +00:00

Merge branch 'master' into gh-pages

This commit is contained in:
John Cleaver 2016-04-03 17:07:34 -04:00
commit 359e058b2f
3 changed files with 123 additions and 3 deletions

View File

@ -519,6 +519,94 @@
"seasons": ["fall", "winter"],
"skills": ["fishing"],
"bundles": [12]
},
{
"id": 65,
"name": "Largemouth Bass",
"source": "Found in Lakes, Daytime, All Seasons.",
"seasons": ["spring", "summer", "fall", "winter"],
"skills": ["fishing"],
"bundles": [13]
},
{
"id": 66,
"name": "Carp",
"source": "Found in Lakes, Anytime, All Seasons.",
"seasons": ["spring", "summer", "fall", "winter"],
"skills": ["fishing"],
"bundles": [13]
},
{
"id": 67,
"name": "Bullhead",
"source": "Found in Lakes, Anytime, All Seasons.",
"seasons": ["spring", "summer", "fall", "winter"],
"skills": ["fishing"],
"bundles": [13]
},
{
"id": 68,
"name": "Sturgeon",
"source": "Found in Lakes, Daytime, Summer and Winter.",
"seasons": ["summer", "winter"],
"skills": ["fishing"],
"bundles": [13]
},
{
"id": 69,
"name": "Sardine",
"source": "Found in the Ocean, Daytime, Spring, Fall, and Winter.",
"seasons": ["spring", "fall", "winter"],
"skills": ["fishing"],
"bundles": [14]
},
{
"id": 70,
"name": "Tuna",
"source": "Found in the Ocean, Daytime, Summer and Winter.",
"seasons": ["summer", "winter"],
"skills": ["fishing"],
"bundles": [14]
},
{
"id": 71,
"name": "Red Snapper",
"source": "Found in the Ocean, Daytime, Summer and Fall. Only when raining.",
"seasons": ["summer", "fall"],
"skills": ["fishing"],
"bundles": [14]
},
{
"id": 72,
"name": "Tilapia",
"source": "Found in the Ocean, Daytime, Summer and Fall.",
"seasons": ["summer", "fall"],
"skills": ["fishing"],
"bundles": [14]
},
{
"id": 73,
"name": "Walleye",
"source": "Found in Rivers, Nighttime, Fall and Winter. Only when raining.",
"seasons": ["fall", "winter"],
"skills": ["fishing"],
"bundles": [15]
},
{
"id": 74,
"name": "Bream",
"source": "Found in Rivers, Nighttime, All Seasons.",
"seasons": ["spring", "summer", "fall", "winter"],
"skills": ["fishing"],
"bundles": [15]
},
{
"id": 75,
"name": "Eel",
"source": "Found in the Ocean, Nighttime, Spring or Fall. Only when raining.",
"seasons": ["spring", "fall"],
"skills": ["fishing"],
"bundles": [15]
}
],
"bundles": [

View File

@ -141,9 +141,25 @@
</nav>
</div>
<div class="column">
<h3 class="title">{{ static.bundles[active_bundle].name }}</h3>
<progress class="progress is-info" value="{{ user_data[active_bundle].length }}"
max="{{ static.bundles[active_bundle].items_required }}"></progress>
<div class="columns">
<div class="column">
<h3 class="title">{{ static.bundles[active_bundle].name }}</h3>
<h5 class="subtitle">{{ static.bundles[active_bundle].reward }}</h5>
<progress class="progress is-info"
value="{{ user_data[active_bundle].length }}"
max="{{ static.bundles[active_bundle].items_required }}"></progress>
</div>
<div class="column">
<h3 class="title">{{ static.rooms[static.bundles[active_bundle].room].name }}</h3>
<h5 class="subtitle">{{ static.rooms[static.bundles[active_bundle].room].reward }}</h5>
<progress class="progress is-info"
value="{{ getRoomItemsChecked(static.bundles[active_bundle].room) }}"
max="{{ getRoomItemsRequired(static.bundles[active_bundle].room) }}"
>
</progress>
</div>
</div>
<div class="columns is-multiline">
<div class="column is-3 is-flex" v-for="item in static.items | inBundle active_bundle">
<div class="card is-fullwidth is-flex eq-line">

16
main.js
View File

@ -116,6 +116,22 @@ var v = new Vue({
}
}
return "";
},
getRoomItemsRequired: function(roomId) {
return this.static.bundles.reduce(function(previousValue, nextValue){
if(nextValue.room === roomId){
return previousValue + nextValue.items_required;
}
else{
return previousValue;
}
}, 0)
},
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);
}
}
});