diff --git a/desktop/resources/wizard/experiment.png b/desktop/resources/wizard/experiment.png index 19bff487..fdd169b4 100644 Binary files a/desktop/resources/wizard/experiment.png and b/desktop/resources/wizard/experiment.png differ diff --git a/desktop/resources/wizard/experiment.pxa/25.pxi b/desktop/resources/wizard/experiment.pxa/25.pxi index 42a913f9..1e0fd13d 100644 Binary files a/desktop/resources/wizard/experiment.pxa/25.pxi and b/desktop/resources/wizard/experiment.pxa/25.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/26.pxi b/desktop/resources/wizard/experiment.pxa/26.pxi index 2a695b52..1833052b 100644 Binary files a/desktop/resources/wizard/experiment.pxa/26.pxi and b/desktop/resources/wizard/experiment.pxa/26.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/27.pxi b/desktop/resources/wizard/experiment.pxa/27.pxi index 6b952016..69857c52 100644 Binary files a/desktop/resources/wizard/experiment.pxa/27.pxi and b/desktop/resources/wizard/experiment.pxa/27.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/28.pxi b/desktop/resources/wizard/experiment.pxa/28.pxi index e97e8f30..18688df4 100644 Binary files a/desktop/resources/wizard/experiment.pxa/28.pxi and b/desktop/resources/wizard/experiment.pxa/28.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/37.pxi b/desktop/resources/wizard/experiment.pxa/37.pxi new file mode 100644 index 00000000..b680f4a2 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/37.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/38.pxi b/desktop/resources/wizard/experiment.pxa/38.pxi new file mode 100644 index 00000000..c49956e9 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/38.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/CelData.plist b/desktop/resources/wizard/experiment.pxa/CelData.plist index 34937242..4fe51de2 100644 --- a/desktop/resources/wizard/experiment.pxa/CelData.plist +++ b/desktop/resources/wizard/experiment.pxa/CelData.plist @@ -150,5 +150,13 @@ duration 0.20000000298023224 + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index a4b882cf..16e0e03f 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -108,7 +108,7 @@ (aget safelock-sheet 0 i))) candle (utils/make-anim (texture "inside-house/candle.png") [34 32] 0.2 [1 0 1 2]) candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] ) - experiment-left (utils/flip (utils/make-anim (texture "wizard/experiment.png" ) [45 55] 0.075 [0 0 0 0 0 0 0 0 0 0 1 1 2 2 2 2 3 3 3 4 4 5 5 6 6 6 6 6 6 7 8 9 9 10 10 11 11 12 12 12 12 12 12 12 12 12 12 12 13 13 14 14 14 14 14 15 15 16 16 17 17 18 18 18 18 19 20 21 21 21 21 21 21 22 23 22 23 22 23 22 23 23 23 23 23 23 23 23 24 24 24 24 24 24 24 24 24 25 26 27 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 29 29 28 28 28 28 29 29 28 28 28 28 28 28 28 28 30 30 30 30 31 32 33 31 31 31 31 31 31 31 31 34 35 36 36 36 36 36 36 36 36 36] ))] + experiment-left (utils/flip (utils/make-anim (texture "wizard/experiment.png" ) [45 55] 0.075 [0 0 0 0 0 0 0 0 0 0 1 1 2 2 2 2 3 3 3 4 4 5 5 6 6 6 6 6 6 7 8 9 9 10 10 11 11 12 12 12 12 12 12 12 12 12 12 12 13 13 14 14 14 14 14 15 15 16 16 17 17 18 18 18 18 19 20 21 21 21 21 21 21 22 23 22 23 22 23 22 23 23 23 23 23 23 23 23 24 24 24 24 24 24 24 24 24 25 26 27 37 38 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 29 29 28 28 28 28 29 29 28 28 28 28 28 28 28 28 30 30 30 30 31 32 33 31 31 31 31 31 31 31 31 34 35 36 36 36 36 36 36 36 36 36] ))] (rooms/make :music :inside-fangald :interactions {:down-dir {:box [151 0 320 20] :script (actions/get-script entities