diff --git a/desktop/resources/ego/grow.png b/desktop/resources/ego/grow.png index e107234b..c0e56787 100644 Binary files a/desktop/resources/ego/grow.png and b/desktop/resources/ego/grow.png differ diff --git a/desktop/resources/ego/grow.pxa/1.pxi b/desktop/resources/ego/grow.pxa/1.pxi index 787e225a..359bd30a 100644 Binary files a/desktop/resources/ego/grow.pxa/1.pxi and b/desktop/resources/ego/grow.pxa/1.pxi differ diff --git a/desktop/resources/ego/grow.pxa/2.pxi b/desktop/resources/ego/grow.pxa/2.pxi index eb2eefa8..787e225a 100644 Binary files a/desktop/resources/ego/grow.pxa/2.pxi and b/desktop/resources/ego/grow.pxa/2.pxi differ diff --git a/desktop/resources/ego/grow.pxa/3.pxi b/desktop/resources/ego/grow.pxa/3.pxi index 5caea141..eb2eefa8 100644 Binary files a/desktop/resources/ego/grow.pxa/3.pxi and b/desktop/resources/ego/grow.pxa/3.pxi differ diff --git a/desktop/resources/ego/grow.pxa/CelData.plist b/desktop/resources/ego/grow.pxa/CelData.plist index f0b74d60..1ff35422 100644 --- a/desktop/resources/ego/grow.pxa/CelData.plist +++ b/desktop/resources/ego/grow.pxa/CelData.plist @@ -18,5 +18,9 @@ duration 1 + + duration + 1 + diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index beb4f8bc..b0def159 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -108,7 +108,7 @@ (texture (aget fire-sheet 0 i)))) fire-3-anim (animation 0.1 (for [i [0 1 2 2 2 2 3 2 3 2 2 2 4 5 6 7 2 2 2 8 9 10 11 2 2 2 2 2 2 2 2 0]] (texture (aget fire-sheet 0 i)))) - grow (animation 0.1 (for [i [0 2 0 0 0 0 2 0 0 0 2 2 0 0 0 1 1 0 0 1 0 0 1 0 1 0 1 0 1 0 1 0 1 2 1 2 1 2 1 2 1 3 2 3 2 3 2 3]] + grow (animation 0.1 (for [i [0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 3 0 0 0 0 3 0 0 0 3 3 0 0 0 2 2 0 0 2 0 0 2 0 2 0 2 0 2 0 2 0 2 3 2 3 2 3 2 3 2 4 3 4 3 4 3 4]] (texture (aget grow-sheet 0 i)))) ego {:right {:walk walk-right :stand stand-anim @@ -153,7 +153,6 @@ items/flask-1-with-cream-of-mushroom (actions/get-script entities (actions/talk entities :ego "Blegh! Gross!")) items/flask-1-strength (actions/get-script entities (actions/talk entities :ego "I'll just take a sip!") - (actions/talk entities :ego "Woah! I feel something!!") (actions/play-animation entities :ego :grow :stop? false)) items/recipe (actions/get-script entities (actions/do-dialogue entities :ego "The recipe says:"