diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 39245fbd..d8144dea 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -18,13 +18,6 @@ + mark the squeaky board a bit + you can drink the strength potion while in blood clots hand + try to have dialogue for every wrong interaction -+ When you have an item and you click somewhere on the screen that - is not a possible interaction, Tick should move to that location, - instead of saying "I don't know what to do with that" -+ when you use the slingshot on Bloodclot his lightening gem does - not disappear, but then when he picks you up to eat you it is gone, - then when he puts you down it appears again, then it is gone again - during the animation when he drinks the potion. + Click on cauldron should tell you what you need to add diff --git a/desktop/resources/space/broken-jewel.png b/desktop/resources/space/broken-jewel.png index 9a3df669..be62fb6c 100644 Binary files a/desktop/resources/space/broken-jewel.png and b/desktop/resources/space/broken-jewel.png differ diff --git a/desktop/resources/space/explode.pxa/0.pxi b/desktop/resources/space/explode.pxa/0.pxi index ff067460..125552ad 100644 Binary files a/desktop/resources/space/explode.pxa/0.pxi and b/desktop/resources/space/explode.pxa/0.pxi differ diff --git a/desktop/resources/space/explode.pxa/1.pxi b/desktop/resources/space/explode.pxa/1.pxi index c326db33..99ab57a4 100644 Binary files a/desktop/resources/space/explode.pxa/1.pxi and b/desktop/resources/space/explode.pxa/1.pxi differ diff --git a/desktop/resources/space/explode.pxa/10.pxi b/desktop/resources/space/explode.pxa/10.pxi index 4a0f2fda..fc6a3a6b 100644 Binary files a/desktop/resources/space/explode.pxa/10.pxi and b/desktop/resources/space/explode.pxa/10.pxi differ diff --git a/desktop/resources/space/explode.pxa/11.pxi b/desktop/resources/space/explode.pxa/11.pxi index ae494730..fd50239e 100644 Binary files a/desktop/resources/space/explode.pxa/11.pxi and b/desktop/resources/space/explode.pxa/11.pxi differ diff --git a/desktop/resources/space/explode.pxa/12.pxi b/desktop/resources/space/explode.pxa/12.pxi index 8a38f4a8..0d9f3982 100644 Binary files a/desktop/resources/space/explode.pxa/12.pxi and b/desktop/resources/space/explode.pxa/12.pxi differ diff --git a/desktop/resources/space/explode.pxa/13.pxi b/desktop/resources/space/explode.pxa/13.pxi index cc199ae5..605b23d9 100644 Binary files a/desktop/resources/space/explode.pxa/13.pxi and b/desktop/resources/space/explode.pxa/13.pxi differ diff --git a/desktop/resources/space/explode.pxa/14.pxi b/desktop/resources/space/explode.pxa/14.pxi index cd8aaa44..2c8a3f86 100644 Binary files a/desktop/resources/space/explode.pxa/14.pxi and b/desktop/resources/space/explode.pxa/14.pxi differ diff --git a/desktop/resources/space/explode.pxa/15.pxi b/desktop/resources/space/explode.pxa/15.pxi index 83aedfb7..1a2513b2 100644 Binary files a/desktop/resources/space/explode.pxa/15.pxi and b/desktop/resources/space/explode.pxa/15.pxi differ diff --git a/desktop/resources/space/explode.pxa/16.pxi b/desktop/resources/space/explode.pxa/16.pxi index b1b20ff1..aecac718 100644 Binary files a/desktop/resources/space/explode.pxa/16.pxi and b/desktop/resources/space/explode.pxa/16.pxi differ diff --git a/desktop/resources/space/explode.pxa/17.pxi b/desktop/resources/space/explode.pxa/17.pxi index 76f3dd01..3d7f2c44 100644 Binary files a/desktop/resources/space/explode.pxa/17.pxi and b/desktop/resources/space/explode.pxa/17.pxi differ diff --git a/desktop/resources/space/explode.pxa/18.pxi b/desktop/resources/space/explode.pxa/18.pxi index 47d9ce11..8fa6dfd2 100644 Binary files a/desktop/resources/space/explode.pxa/18.pxi and b/desktop/resources/space/explode.pxa/18.pxi differ diff --git a/desktop/resources/space/explode.pxa/19.pxi b/desktop/resources/space/explode.pxa/19.pxi index c43858ed..222306d1 100644 Binary files a/desktop/resources/space/explode.pxa/19.pxi and b/desktop/resources/space/explode.pxa/19.pxi differ diff --git a/desktop/resources/space/explode.pxa/2.pxi b/desktop/resources/space/explode.pxa/2.pxi index f418e8d1..f1dd85b9 100644 Binary files a/desktop/resources/space/explode.pxa/2.pxi and b/desktop/resources/space/explode.pxa/2.pxi differ diff --git a/desktop/resources/space/explode.pxa/3.pxi b/desktop/resources/space/explode.pxa/3.pxi index c547ff15..8db3b08d 100644 Binary files a/desktop/resources/space/explode.pxa/3.pxi and b/desktop/resources/space/explode.pxa/3.pxi differ diff --git a/desktop/resources/space/explode.pxa/4.pxi b/desktop/resources/space/explode.pxa/4.pxi index 07cace4f..012c02d8 100644 Binary files a/desktop/resources/space/explode.pxa/4.pxi and b/desktop/resources/space/explode.pxa/4.pxi differ diff --git a/desktop/resources/space/explode.pxa/5.pxi b/desktop/resources/space/explode.pxa/5.pxi index 2c5a77ed..ad7c8220 100644 Binary files a/desktop/resources/space/explode.pxa/5.pxi and b/desktop/resources/space/explode.pxa/5.pxi differ diff --git a/desktop/resources/space/explode.pxa/6.pxi b/desktop/resources/space/explode.pxa/6.pxi index 3fbc19fd..aa45f9f3 100644 Binary files a/desktop/resources/space/explode.pxa/6.pxi and b/desktop/resources/space/explode.pxa/6.pxi differ diff --git a/desktop/resources/space/explode.pxa/7.pxi b/desktop/resources/space/explode.pxa/7.pxi index 344137e2..dc62abb3 100644 Binary files a/desktop/resources/space/explode.pxa/7.pxi and b/desktop/resources/space/explode.pxa/7.pxi differ diff --git a/desktop/resources/space/explode.pxa/8.pxi b/desktop/resources/space/explode.pxa/8.pxi index 055217b7..42f4bf1f 100644 Binary files a/desktop/resources/space/explode.pxa/8.pxi and b/desktop/resources/space/explode.pxa/8.pxi differ diff --git a/desktop/resources/space/explode.pxa/9.pxi b/desktop/resources/space/explode.pxa/9.pxi index 2473c376..9a68d482 100644 Binary files a/desktop/resources/space/explode.pxa/9.pxi and b/desktop/resources/space/explode.pxa/9.pxi differ diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index 175a5890..3a5b73d4 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -281,7 +281,7 @@ :x 37 :y 85 :baseline 241 :walk bullet) :broken-jewel (assoc (texture "space/broken-jewel.png") - :x 222 :y 172 :baseline 240) + :x 225 :y 170 :baseline 240) :collision "space/collision.png" :scale-fn (constantly 1.5) :start-pos [35 45]