From f0db5fe3d0c0609504906afdcc26072a04520b34 Mon Sep 17 00:00:00 2001
From: cha0s <git@cha0s.io>
Date: Fri, 31 May 2019 15:59:29 -0500
Subject: [PATCH] fun: optional growAt, fast tomatoes

---
 common/traits/plant.trait.js           |   9 +++++++--
 resource/tomato-stage-1.png            | Bin 216 -> 187 bytes
 resource/tomato-stage-2.png            | Bin 241 -> 197 bytes
 resource/tomato-stage-3.png            | Bin 313 -> 367 bytes
 resource/tomato-stage-4.png            | Bin 296 -> 384 bytes
 server/fixtures/tomato-plant.entity.js |  17 ++++++++---------
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/common/traits/plant.trait.js b/common/traits/plant.trait.js
index bf56d42..96ff62c 100644
--- a/common/traits/plant.trait.js
+++ b/common/traits/plant.trait.js
@@ -68,6 +68,9 @@ export class Plant extends decorate(Trait) {
       growToNextStage: () => {
         const growthStage = this.entity.growthStage;
         const stageSpec = this.params.stageSpecs[growthStage];
+        if (!('growAt' in stageSpec)) {
+          return;
+        }
         this.growthElapsed = stageSpec.growAt;
         this.entity.growthStage = growthStage + 1;
       },
@@ -81,8 +84,10 @@ export class Plant extends decorate(Trait) {
       const stageSpec = this.params.stageSpecs[growthStage];
       // TODO variance
       this.growthElapsed += elapsed;
-      if (this.growthElapsed >= stageSpec.growAt) {
-        this.entity.growthStage = growthStage + 1;
+      if ('growAt' in stageSpec) {
+        if (this.growthElapsed >= stageSpec.growAt) {
+          this.entity.growthStage = growthStage + 1;
+        }
       }
     }
   }
diff --git a/resource/tomato-stage-1.png b/resource/tomato-stage-1.png
index 68fae6ed679adb0a416b0844e83d894b63d2f827..a9f63d1f017694289ddb83cf7ae1aeb1c546fb38 100644
GIT binary patch
delta 116
zcmcb?xSMf;mf?Q}AY8C_`D6wL2F?PH$YKTtZeb8+WSBKa0w~B{;_2(k{+LxxTwUF%
z<=*Ov(Ha)Yo-U3d7N?UFBv_keUaSxKy?%etTl=GJ4<@He@jeecaNqy~!xLfFU#sMn
RqyUXz@O1TaS?83{1OUe-D5U@Z

delta 145
zcmdnZc!P0*mf?JclML5&?mT2;U|`@Z@Q5sCVBi)8VMc~ob0mO*>?NMQuI!IlWf}EV
zB)v*aCq`?8I(WJ`hFF|Vo>TwHidnUxv(d@m1doTw^%NjpvYuPwr4;v#Jr*bS8a!<L
u|DTip&;Q9e3}@D}a!E_JN19wZ!oc8kO(gcL?S_7!`3#<}elF{r5}E+=(lMt1

diff --git a/resource/tomato-stage-2.png b/resource/tomato-stage-2.png
index f3fcc5b13f873c08ff985119b54be0c7eeb878d6..81ebda206182b28fa4d316297a7a0276d7ea0d7a 100644
GIT binary patch
delta 126
zcmey!c$9I1mf?Q}AY8C_`D6wL2F?PH$YKTtZeb8+WSBKa0w~B{;_2(k{+LxxTwUdM
zZ@=KgXbmS_PZ!4!i_^&o60AKtRKA3-`rE!yzwQ2^m3^GkS?qjWBpXhfrbs$W6L&k<
a!Ng$C&&A6brY8?HjKR~@&t;ucLK6TL|0m7>

delta 170
zcmX@g_>pmfmf?JclML5&?mT2;U|`@Z@Q5sCVBi)8VMc~ob0mO*>?NMQuI!IlWf}GL
ze$JnxJuzA%FVfS+F~s6@@|^llR?MmmosCWgCwM$euBQO;lJ(pYFQvF|>^afo{jr7p
z-~YrnOs%~=D!UnGFZ-#!-grUvObva7-E6WO9(>YfW@c{w=Vkh7uYtwliE2PM^jb<L
U@t)qC3$&QQ)78&qol`;+0A>k2O8@`>

diff --git a/resource/tomato-stage-3.png b/resource/tomato-stage-3.png
index c05ac6e2dc610270bbc37e19fcff03f3d99f6a72..4cdb449c5e5e96847e76041b769894206a755375 100644
GIT binary patch
delta 297
zcmV+^0oMMx0`CHlDlz{6{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2jc}F0WBtPd%h5nTPT0mNkl<ZILoDyu?@m76hz-gsj@;EDx_2tk&-d!+-Cy@aG3$J
z0X1dDAQCk#h3Q<=nkrK4*dd53Pxk%0e_t-Q2Xpk#6M!Rv^L~(!+l7Qx##v>&$LIYZ
zRvC0%Erhd>=*GLmrl<If4d|aImx|#Dv`xwJdWhwhDW0Zsb2n|?4hok$s|;2d36_Ud
z20+3n61I@Co@!y!4gi_#zvS%=%_37{{lkdpx}tD7j0p$2uAqi)yiY<BRJpYFWe2{C
vt#{BiB>>0kVfAzLlz+u)ge~~n!QTQO^%qxpZFh<~00000NkvXXu0mjf#`=O$

delta 243
zcmV<P01W@{0=WW^Dlwk`$pF_Z+~EcQ000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2jc}D0WcYicsII{TPS~_Nkl<ZILl+4fATs5C4h;6LNM?Kupo01%{3YHSE~KTrMN(0
zBO^f<ya{{4@FwgDisAx=jf`)?o-ovy8UM%Yg83(}GccTDV8mv7%c--B1igR@OnBfA
zxA|iDEk@+1XThf!-S0JK#{Z?mxc(!%62*WTGvogZW)SCMGYB`EHyH7yL}Wv-#Q@GQ
tNHo`EU|?Wi&|j&BS2I--664U%OaK{KIw9>~g3kZ|002ovPDHLkV1nFVWRw5^

diff --git a/resource/tomato-stage-4.png b/resource/tomato-stage-4.png
index 78a71130f1704e9e83798900fd8af7e4d8eb3200..f7651c64d9136f0394250e0d4be9a2ef69f1a875 100644
GIT binary patch
delta 314
zcmZ3%)WAGJ%kVz~5H8red@=(A180FpWHAE+w=f7ZGR&GI0Tg5}@$_|Nf6OY+sH>HB
z_LKF*XpQ<8o-U3d7N?Wv)PJ&KHVQDk{^$IG0|zGT4dQjJ$@-zo1_W)l)z=#<bsHN#
zV3@C8cleYWd(R6!2ez})vH$h6s++E+HR(C93(NiZ9}d*b|5=G=!-LQE>+Qsyzj>K<
zh!<2evrhk?=yyJD<*|U*`)3DU-6QyFYSkUK1Aih<AE-NU;6hu$s}}Zu|CbxxY5Mf4
zv%3{!-LcS<2}hXDs9GFaAo%J{u|`+c-*V%7-;Q7Dxy;JSC7sxK;snr{9R;DbZW0fC
zLAEDLc!lVw%*r-00D>3Ji-o7BO%f7{^qeW-u#sECjDf+uF+%3?r-p7|Krnc^`njxg
HN@xNAon(cR

delta 226
zcmZo*Ucod$%Wyu!Nrvk>cOJ4aFfecyctjR6FmMZlFeAgPITAoY_7YEDSN6xOvWy01
z>MOY(PmI>6pWx}@7-Dfcc~1Q&D`wS(&PFGL4{RG0iiOUaO7<DJ{7FwpNH`H!$>;j;
zN`W#P5VYM^e=XTr<k)z~%`GQqkKPQR#>2U6Y-_qM<{ryp&@*`0_`g2po`a#o)jfi%
z{|m-7oDk+=j;Y&MyJ?=_UG1J9K}u&{{@^((#n$<37LOVa5d6}<%5jY8C}(Hki*z-H
Xrc?Tx=QTY8IheuI)z4*}Q$iB}%5hZ2

diff --git a/server/fixtures/tomato-plant.entity.js b/server/fixtures/tomato-plant.entity.js
index 47f21b5..c5f5a03 100644
--- a/server/fixtures/tomato-plant.entity.js
+++ b/server/fixtures/tomato-plant.entity.js
@@ -20,22 +20,22 @@ export function tomatoPlantJSON() {
               uri: '/tomato-stage-0.png',
             },
             'stage-1': {
-              offset: [0, 0],
+              offset: [0, 3],
               size: [16, 16],
               uri: '/tomato-stage-1.png',
             },
             'stage-2': {
-              offset: [0, 0],
+              offset: [0, 3],
               size: [16, 16],
               uri: '/tomato-stage-2.png',
             },
             'stage-3': {
-              offset: [0, 0],
+              offset: [0, 3],
               size: [16, 16],
               uri: '/tomato-stage-3.png',
             },
             'stage-4': {
-              offset: [0, 0],
+              offset: [0, 3],
               size: [16, 16],
               uri: '/tomato-stage-4.png',
             },
@@ -46,23 +46,22 @@ export function tomatoPlantJSON() {
         params: {
           stageSpecs: {
             0: {
-              growAt: 20,
+              growAt: 2,
               image: 'initial',
             },
             1: {
-              growAt: 40,
+              growAt: 4,
               image: 'stage-1',
             },
             2: {
-              growAt: 60,
+              growAt: 6,
               image: 'stage-2',
             },
             3: {
-              growAt: 80,
+              growAt: 8,
               image: 'stage-3',
             },
             4: {
-              growAt: 99999999,
               image: 'stage-4',
             },
           }