From 707a2a41cd2abbbb7c28fb2948e5c6c61bacd168 Mon Sep 17 00:00:00 2001 From: K-Fitzpatick Date: Sat, 22 Jul 2017 15:35:29 -0500 Subject: [PATCH 1/3] Add seasonal crops to planner The base price is the minimal sell value of the possible crops. `index` and `stages` were taken from the .xnb format. The images are the appropriate season. --- config.json | 60 +++++++++++++++++++++++++++++++++++ images/crops/wild_fall.png | Bin 0 -> 346 bytes images/crops/wild_spring.png | Bin 0 -> 417 bytes images/crops/wild_summer.png | Bin 0 -> 388 bytes images/crops/wild_winter.png | Bin 0 -> 379 bytes 5 files changed, 60 insertions(+) create mode 100644 images/crops/wild_fall.png create mode 100644 images/crops/wild_spring.png create mode 100644 images/crops/wild_summer.png create mode 100644 images/crops/wild_winter.png diff --git a/config.json b/config.json index dd38cfb..b39f12b 100644 --- a/config.json +++ b/config.json @@ -718,6 +718,66 @@ 3, 3 ] + }, + { + "buy": 0, + "harvest": {}, + "id": "wild_spring", + "index": 495, + "name": "Spring Forage", + "seasons": [ + "spring" + ], + "sell": 30, + "stages": [ + 3, + 4 + ] + }, + { + "buy": 0, + "harvest": {}, + "id": "wild_summer", + "index": 496, + "name": "Summer Forage", + "seasons": [ + "summer" + ], + "sell": 50, + "stages": [ + 3, + 4 + ] + }, + { + "buy": 0, + "harvest": {}, + "id": "wild_fall", + "index": 497, + "name": "Fall Forage", + "seasons": [ + "fall" + ], + "sell": 20, + "stages": [ + 3, + 4 + ] + }, + { + "buy": 0, + "harvest": {}, + "id": "wild_winter", + "index": 498, + "name": "Winter Forage", + "seasons": [ + "winter" + ], + "sell": 60, + "stages": [ + 3, + 4 + ] } ], "fertilizer": [ diff --git a/images/crops/wild_fall.png b/images/crops/wild_fall.png new file mode 100644 index 0000000000000000000000000000000000000000..d02f649dc01c50f080f6afd3f99015f6208295ae GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0V%NUl;bY=j*Qgf5 z;9JHlq{9AyEn{7Si(ylu(D^e$PXzw@%5(MyP5LzJ`^>+KGPgbXefj#$%QwEb88F)% zT_it2>h}7s?XnrS`A!B-W4+XVMvNn2yX%j>s`vZ*wWiGCu_{>mhtHrdh}~Jz_b*@J z@50xi3$LVHV0+Jmn8p<4`K3NM`a~B>t_y3DuowWi(sD`Oz o*@NT%3nP@$^?{s2_6KIDYvx5pdM}-I7U*>bPgg&ebxsLQ0L|Bj#Q*>R literal 0 HcmV?d00001 diff --git a/images/crops/wild_spring.png b/images/crops/wild_spring.png new file mode 100644 index 0000000000000000000000000000000000000000..7028273f393d3ad9d66e3eddb3b374428db69534 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0V%Nu zYG~Tqzkr8BoxC}qQ5>p3{zZXBz&EidE4UU y9N3pU;|yY4Xd*xP6WF(f3lFlj?O>OXVBo$S7R`MAf&egB89ZJ6T-G@yGywqatDPx#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0U1d|K~z{r?bfks z!cZ87;S(J~SBK!D4yEFvxaK0-sh8nYGkF1Bly1EWJ6XE8DW%TMSi~h1LP{ZnPz6gI z{;xw0X-)#E$5YR<*M`8?L#t|!!V_&1lXz_qb=GZ;d4Z0c`7^c~>wH!mXG1c%?CXcPK`WIMeLhA&XPrEf-W;Ml0YfqQ?K>pO6D`-LjTWN?PcX0=?Sh(00N)Zak=IV|*F i=+N{D$)@-VFt!Iq;6|GqJc@|`0000Nn{1`ISV`@iy0V%NE;5@P$Z{}a zbEHnvCt(e+if$RewIZ)3gkGRF$$yUt>6K3(EB@=GSEOFXpWGEjO|wc3>BhTt#rU*-zyk8fxD z;q&cTrG%okzr?}xEq4SAlJ@h&8`nHL`tI+{zS)dD8+cc={o_4ym-%I+q?^tj-kufP zj0}=q-%W6-ozX0)xt~S(-CNt94b={%XYv~ke?N4y{s4#F=fc?!-q-f!I+&ixPcT?@ z&`!9V|HJ2Z54e8w-EPR5ah>7+w}&6{75zel1C8asp3jjE;QcHWAPbbssAKN?%(VVm WmZS_z>Ly@-F?hQAxvX Date: Sat, 22 Jul 2017 15:39:17 -0500 Subject: [PATCH 2/3] Add Winter to crop search filter Now that winter has crops to search for. --- scripts/planner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/planner.js b/scripts/planner.js index 09950d6..372483d 100644 --- a/scripts/planner.js +++ b/scripts/planner.js @@ -112,7 +112,7 @@ function planner_controller($scope){ for (var i = 0; i < self.days.length; i++) self.days[i] = i + 1; self.seasons = [new Season(0), new Season(1), new Season(2), new Season(3)]; self.cseason = self.seasons[0]; - self.cinfo_settings.season_options = [self.seasons[0], self.seasons[1], self.seasons[2]]; + self.cinfo_settings.season_options = self.seasons; // Enable bootstrap tooltips $("body").tooltip({selector: "[data-toggle=tooltip]", trigger: "hover", container: "body"}); From 1f3aceafc3cd6c534d08a729d765d6706e0042ed Mon Sep 17 00:00:00 2001 From: K-Fitzpatick Date: Sat, 22 Jul 2017 16:00:25 -0500 Subject: [PATCH 3/3] Add explicit wiki_page for seasonal seeds Without this commit the link will just go to `/Crops#Wild_` for seasonal crops, which will just be the top of the Crops page. --- config.json | 4 ++++ scripts/planner.js | 2 ++ 2 files changed, 6 insertions(+) diff --git a/config.json b/config.json index b39f12b..59354b9 100644 --- a/config.json +++ b/config.json @@ -725,6 +725,7 @@ "id": "wild_spring", "index": 495, "name": "Spring Forage", + "wiki_page": "Spring_Seeds", "seasons": [ "spring" ], @@ -740,6 +741,7 @@ "id": "wild_summer", "index": 496, "name": "Summer Forage", + "wiki_page": "Summer_Seeds", "seasons": [ "summer" ], @@ -755,6 +757,7 @@ "id": "wild_fall", "index": 497, "name": "Fall Forage", + "wiki_page": "Fall_Seeds", "seasons": [ "fall" ], @@ -770,6 +773,7 @@ "id": "wild_winter", "index": 498, "name": "Winter Forage", + "wiki_page": "Winter_Seeds", "seasons": [ "winter" ], diff --git a/scripts/planner.js b/scripts/planner.js index 372483d..a771fc0 100644 --- a/scripts/planner.js +++ b/scripts/planner.js @@ -991,6 +991,7 @@ function planner_controller($scope){ self.seasons = data.seasons; self.stages = data.stages; self.regrow = data.regrow; + self.wiki_page = data.wiki_page; if (data.wild) self.wild = true; // Harvest data @@ -1064,6 +1065,7 @@ function planner_controller($scope){ // Get url to Stardew Valley wiki Crop.prototype.get_url = function(){ + if (this.wiki_page) return "http://stardewvalleywiki.com/"+this.wiki_page; var fragment = this.id.split("_"); for (var i=0; i