diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 0023ab77..43e76097 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -7,7 +7,6 @@ + sudden night befoe switching + too small area for bars + more visible crowbar -+ peddler stuff should be gone at night + sack lunch should spoil + swinging axe at second doesn't seem right + fight with blergh at end isn't great @@ -15,3 +14,4 @@ + secret lever + shopkeep sigh + proper save/settings file location ++ grandma visual glitches diff --git a/desktop/resources/ego/base.png b/desktop/resources/ego/base.png index a4e31e31..7a744678 100644 Binary files a/desktop/resources/ego/base.png and b/desktop/resources/ego/base.png differ diff --git a/desktop/resources/ego/get-sick.png b/desktop/resources/ego/get-sick.png index 5d1e145c..9d74fce2 100644 Binary files a/desktop/resources/ego/get-sick.png and b/desktop/resources/ego/get-sick.png differ diff --git a/desktop/resources/ego/get-sick.pxa/0.pxi b/desktop/resources/ego/get-sick.pxa/0.pxi new file mode 100644 index 00000000..1fef209f Binary files /dev/null and b/desktop/resources/ego/get-sick.pxa/0.pxi differ diff --git a/desktop/resources/ego/get-sick.pxa/1.pxi b/desktop/resources/ego/get-sick.pxa/1.pxi new file mode 100644 index 00000000..58db6352 Binary files /dev/null and b/desktop/resources/ego/get-sick.pxa/1.pxi differ diff --git a/desktop/resources/ego/get-sick.pxa/2.pxi b/desktop/resources/ego/get-sick.pxa/2.pxi new file mode 100644 index 00000000..aff7ff1d Binary files /dev/null and b/desktop/resources/ego/get-sick.pxa/2.pxi differ diff --git a/desktop/resources/ego/get-sick.pxa/3.pxi b/desktop/resources/ego/get-sick.pxa/3.pxi new file mode 100644 index 00000000..9416d717 Binary files /dev/null and b/desktop/resources/ego/get-sick.pxa/3.pxi differ diff --git a/desktop/resources/ego/get-sick.pxa/4.pxi b/desktop/resources/ego/get-sick.pxa/4.pxi new file mode 100644 index 00000000..870ce416 Binary files /dev/null and b/desktop/resources/ego/get-sick.pxa/4.pxi differ diff --git a/desktop/resources/ego/get-sick.pxa/5.pxi b/desktop/resources/ego/get-sick.pxa/5.pxi new file mode 100644 index 00000000..9d2b19f5 Binary files /dev/null and b/desktop/resources/ego/get-sick.pxa/5.pxi differ diff --git a/desktop/resources/ego/get-sick.pxa/CelData.plist b/desktop/resources/ego/get-sick.pxa/CelData.plist new file mode 100644 index 00000000..245204bc --- /dev/null +++ b/desktop/resources/ego/get-sick.pxa/CelData.plist @@ -0,0 +1,30 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index b5d2af22..6c8afd57 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -343,7 +343,7 @@ void main() jump (utils/make-anim "ego/swing.png" [36 75] 0.2 (flatten [[1 2]])) swing (utils/make-anim "ego/swing.png" [36 75] 0.145 (flatten [[3 4 5 6 7 ]])) grow-talk (utils/make-anim "ego/grow-talk.png" [18 36] 0.2 (range 2)) - get-sick (animation 0.3 (map (partial get [(aget talk-sheet 0 0 ) (texture "ego/get-sick.png")]) [0 1 1 1 1 1 1 1 1 1 1 1]) ) + get-sick (utils/make-anim "ego/get-sick.png" [18 36] 0.1 (flatten [(range 6) (repeat 10 5) (reverse (range 6) ) 0 0 0 0 0 0])) spear (utils/make-anim "ego/spear.png" [18 100] 0.2 [0 1 2 3 2 3 2 3 2 3 2 1 0]) crowbar (utils/make-anim "ego/crowbar.png" [36 36] 0.1 [0 0 0 1 1 2 2 2 2 2 3 2 3 2 3 2 3 2 3 3 3 1 1 0 0 0]) shoot (utils/make-anim "ego/shoot.png" [24 36] 0.075 [0 0 0 1 1 2 2 2 2 2 2 2 2 3 4 5 4])