diff --git a/data/images/creatures/fish/bluefish.sprite b/data/images/creatures/fish/bluefish.sprite new file mode 100644 index 00000000000..dc5d75e06bf --- /dev/null +++ b/data/images/creatures/fish/bluefish.sprite @@ -0,0 +1,31 @@ +(supertux-sprite + (action + (name "swim-left") + (hitbox 8 15 48 32) + (fps 12) + (images "swim_blue-0.png" + "swim_blue-1.png" + "swim_blue-2.png" + "swim_blue-3.png" + "swim_blue-4.png" + "swim_blue-5.png" + "swim_blue-6.png" + "swim_blue-7.png")) + + (action + (name "swim-right") + (hitbox 8 15 48 32) + (fps 12) + (mirror-action "swim-left")) + + (action + (name "iced-left") + (hitbox 2 10 48 32) + (images "swim_blue-0.png")) + + (action + (name "iced-right") + (hitbox 2 10 48 32) + (mirror-action "iced-left")) + +) diff --git a/data/images/creatures/fish/brownfish.sprite b/data/images/creatures/fish/brownfish.sprite new file mode 100644 index 00000000000..2de4ba67254 --- /dev/null +++ b/data/images/creatures/fish/brownfish.sprite @@ -0,0 +1,66 @@ +(supertux-sprite + (action + (name "swim-left") + (hitbox 9 10 46 46) + (fps 12) + (images "swim_brown-0.png" + "swim_brown-1.png" + "swim_brown-2.png" + "swim_brown-3.png" + "swim_brown-4.png" + "swim_brown-5.png" + "swim_brown-6.png" + "swim_brown-7.png")) + + (action + (name "swim-right") + (hitbox 11 10 46 46) + (fps 12) + (mirror-action "swim-left")) + + (action + (name "notice-left") + (hitbox 9 10 46 46) + (loops 1) + (fps 18) + (images "swim_brown-0.png" + "notice_brown-0.png" + "notice_brown-1.png" + "notice_brown-2.png" + "notice_brown-3.png")) + + (action + (name "notice-right") + (hitbox 11 10 46 46) + (loops 1) + (fps 18) + (mirror-action "notice-left")) + + (action + (name "chase-left") + (hitbox 9 10 46 46) + (fps 20) + (images "chase_brown-0.png" + "chase_brown-1.png" + "chase_brown-2.png" + "chase_brown-3.png" + "chase_brown-4.png" + "chase_brown-5.png")) + + (action + (name "chase-right") + (hitbox 11 10 46 46) + (fps 20) + (mirror-action "chase-left")) + + (action + (name "iced-left") + (hitbox 9 10 46 46) + (images "swim_brown-0.png")) + + (action + (name "iced-right") + (hitbox 11 10 46 46) + (mirror-action "iced-left")) + +) diff --git a/data/images/creatures/fish/chase_brown-0.png b/data/images/creatures/fish/chase_brown-0.png new file mode 100644 index 00000000000..092bd57b351 Binary files /dev/null and b/data/images/creatures/fish/chase_brown-0.png differ diff --git a/data/images/creatures/fish/chase_brown-1.png b/data/images/creatures/fish/chase_brown-1.png new file mode 100644 index 00000000000..6b69acbc2ee Binary files /dev/null and b/data/images/creatures/fish/chase_brown-1.png differ diff --git a/data/images/creatures/fish/chase_brown-2.png b/data/images/creatures/fish/chase_brown-2.png new file mode 100644 index 00000000000..bc4a7f769e3 Binary files /dev/null and b/data/images/creatures/fish/chase_brown-2.png differ diff --git a/data/images/creatures/fish/chase_brown-3.png b/data/images/creatures/fish/chase_brown-3.png new file mode 100644 index 00000000000..c14b8744b68 Binary files /dev/null and b/data/images/creatures/fish/chase_brown-3.png differ diff --git a/data/images/creatures/fish/chase_brown-4.png b/data/images/creatures/fish/chase_brown-4.png new file mode 100644 index 00000000000..24a5211d0a8 Binary files /dev/null and b/data/images/creatures/fish/chase_brown-4.png differ diff --git a/data/images/creatures/fish/chase_brown-5.png b/data/images/creatures/fish/chase_brown-5.png new file mode 100644 index 00000000000..ce1c68e37e7 Binary files /dev/null and b/data/images/creatures/fish/chase_brown-5.png differ diff --git a/data/images/creatures/fish/jump_blue-0.png b/data/images/creatures/fish/jump_blue-0.png new file mode 100644 index 00000000000..dc1d864d45c Binary files /dev/null and b/data/images/creatures/fish/jump_blue-0.png differ diff --git a/data/images/creatures/fish/jump_blue-1.png b/data/images/creatures/fish/jump_blue-1.png new file mode 100644 index 00000000000..d54bde88ac0 Binary files /dev/null and b/data/images/creatures/fish/jump_blue-1.png differ diff --git a/data/images/creatures/fish/jump_blue-2.png b/data/images/creatures/fish/jump_blue-2.png new file mode 100644 index 00000000000..1b3e7fed92b Binary files /dev/null and b/data/images/creatures/fish/jump_blue-2.png differ diff --git a/data/images/creatures/fish/jump_blue-3.png b/data/images/creatures/fish/jump_blue-3.png new file mode 100644 index 00000000000..189be72f95d Binary files /dev/null and b/data/images/creatures/fish/jump_blue-3.png differ diff --git a/data/images/creatures/fish/jump_blue-4.png b/data/images/creatures/fish/jump_blue-4.png new file mode 100644 index 00000000000..bf59d5dd226 Binary files /dev/null and b/data/images/creatures/fish/jump_blue-4.png differ diff --git a/data/images/creatures/fish/jump_blue-5.png b/data/images/creatures/fish/jump_blue-5.png new file mode 100644 index 00000000000..16b1661d3d7 Binary files /dev/null and b/data/images/creatures/fish/jump_blue-5.png differ diff --git a/data/images/creatures/fish/jump_blue-6.png b/data/images/creatures/fish/jump_blue-6.png new file mode 100644 index 00000000000..8b71a1852e7 Binary files /dev/null and b/data/images/creatures/fish/jump_blue-6.png differ diff --git a/data/images/creatures/fish/jump_blue-7.png b/data/images/creatures/fish/jump_blue-7.png new file mode 100644 index 00000000000..2c0f3159cb7 Binary files /dev/null and b/data/images/creatures/fish/jump_blue-7.png differ diff --git a/data/images/creatures/fish/jump_blue-8.png b/data/images/creatures/fish/jump_blue-8.png new file mode 100644 index 00000000000..e5fc4cee38d Binary files /dev/null and b/data/images/creatures/fish/jump_blue-8.png differ diff --git a/data/images/creatures/fish/jump_blue-9.png b/data/images/creatures/fish/jump_blue-9.png new file mode 100644 index 00000000000..d62f7777c6b Binary files /dev/null and b/data/images/creatures/fish/jump_blue-9.png differ diff --git a/data/images/creatures/fish/jumpfish.sprite b/data/images/creatures/fish/jumpfish.sprite index 78df318c5bf..0e386ee10af 100644 --- a/data/images/creatures/fish/jumpfish.sprite +++ b/data/images/creatures/fish/jumpfish.sprite @@ -1,59 +1,63 @@ -(supertux-sprite - (action - (name "normal") - (fps 12) - (loops 1) - (hitbox 9 21 31.8 31.8) - (images "jump-0.png" - "jump-0.png" - "jump-0.png" - "jump-1.png" - "jump-2.png" - "jump-3.png")) - - (action - (name "down") - (fps 15) - (loops 1) - (hitbox 9 29 31.8 31.8) - (images "jump-4.png" - "jump-5.png" - "jump-6.png" - "jump-7.png")) - - (action - (name "wait") - (fps 12) - (hitbox 19 9 31.8 31.8) - (images "wait-0.png" - "wait-1.png" - "wait-2.png" - "wait-3.png" - "wait-4.png" - "wait-5.png")) - - (action - (name "iced") - (hitbox 4 10 31.8 31.8) - (images "jump-0.png")) - - (action - (name "iced-down") - (hitbox 4 10 31.8 31.8) - (images "jump-7.png")) - - (action - (name "burning-left") - (fps 15) - (hitbox 4 29 31.8 31.8) - (images "burning-0.png" - "burning-1.png" - "burning-2.png" - "burning-3.png" - "burning-4.png" - "burning-5.png" - "burning-6.png" - "burning-7.png" - "burning-8.png" - "burning-9.png")) -) +(supertux-sprite + (action + (name "normal") + (fps 18) + (loops 1) + (hitbox 12 24 40 46) + (images "jump_blue-0.png" + "jump_blue-0.png" + "jump_blue-0.png" + "jump_blue-1.png" + "jump_blue-2.png" + "jump_blue-3.png")) + + (action + (name "down") + (fps 18) + (loops 1) + (hitbox 12 24 40 46) + (images "jump_blue-4.png" + "jump_blue-5.png" + "jump_blue-6.png" + "jump_blue-7.png" + "jump_blue-8.png" + "jump_blue-9.png")) + + (action + (name "wait") + (fps 15) + (hitbox 14 9 40 46) + (images "wait_blue-0.png" + "wait_blue-1.png" + "wait_blue-2.png" + "wait_blue-3.png" + "wait_blue-4.png" + "wait_blue-5.png" + "wait_blue-6.png" + "wait_blue-7.png")) + + (action + (name "iced") + (hitbox 12 24 40 46) + (images "jump_blue-3.png")) + + (action + (name "iced-down") + (hitbox 14 9 40 46) + (images "wait_blue-1.png")) + + (action + (name "burning-left") + (fps 15) + (hitbox 4 29 32 32) + (images "burning-0.png" + "burning-1.png" + "burning-2.png" + "burning-3.png" + "burning-4.png" + "burning-5.png" + "burning-6.png" + "burning-7.png" + "burning-8.png" + "burning-9.png")) +) diff --git a/data/images/creatures/fish/notice_brown-0.png b/data/images/creatures/fish/notice_brown-0.png new file mode 100644 index 00000000000..24a20ab6659 Binary files /dev/null and b/data/images/creatures/fish/notice_brown-0.png differ diff --git a/data/images/creatures/fish/notice_brown-1.png b/data/images/creatures/fish/notice_brown-1.png new file mode 100644 index 00000000000..00d2fabfb24 Binary files /dev/null and b/data/images/creatures/fish/notice_brown-1.png differ diff --git a/data/images/creatures/fish/notice_brown-2.png b/data/images/creatures/fish/notice_brown-2.png new file mode 100644 index 00000000000..8a8218188f8 Binary files /dev/null and b/data/images/creatures/fish/notice_brown-2.png differ diff --git a/data/images/creatures/fish/notice_brown-3.png b/data/images/creatures/fish/notice_brown-3.png new file mode 100644 index 00000000000..899232b3c8b Binary files /dev/null and b/data/images/creatures/fish/notice_brown-3.png differ diff --git a/data/images/creatures/fish/swim_blue-0.png b/data/images/creatures/fish/swim_blue-0.png new file mode 100644 index 00000000000..90472cef92d Binary files /dev/null and b/data/images/creatures/fish/swim_blue-0.png differ diff --git a/data/images/creatures/fish/swim_blue-1.png b/data/images/creatures/fish/swim_blue-1.png new file mode 100644 index 00000000000..b92bfe68f15 Binary files /dev/null and b/data/images/creatures/fish/swim_blue-1.png differ diff --git a/data/images/creatures/fish/swim_blue-2.png b/data/images/creatures/fish/swim_blue-2.png new file mode 100644 index 00000000000..d14374e8135 Binary files /dev/null and b/data/images/creatures/fish/swim_blue-2.png differ diff --git a/data/images/creatures/fish/swim_blue-3.png b/data/images/creatures/fish/swim_blue-3.png new file mode 100644 index 00000000000..8c22259675f Binary files /dev/null and b/data/images/creatures/fish/swim_blue-3.png differ diff --git a/data/images/creatures/fish/swim_blue-4.png b/data/images/creatures/fish/swim_blue-4.png new file mode 100644 index 00000000000..bcc8f6006c8 Binary files /dev/null and b/data/images/creatures/fish/swim_blue-4.png differ diff --git a/data/images/creatures/fish/swim_blue-5.png b/data/images/creatures/fish/swim_blue-5.png new file mode 100644 index 00000000000..47c59db8f8c Binary files /dev/null and b/data/images/creatures/fish/swim_blue-5.png differ diff --git a/data/images/creatures/fish/swim_blue-6.png b/data/images/creatures/fish/swim_blue-6.png new file mode 100644 index 00000000000..05fb55e9f5c Binary files /dev/null and b/data/images/creatures/fish/swim_blue-6.png differ diff --git a/data/images/creatures/fish/swim_blue-7.png b/data/images/creatures/fish/swim_blue-7.png new file mode 100644 index 00000000000..1b31368da2e Binary files /dev/null and b/data/images/creatures/fish/swim_blue-7.png differ diff --git a/data/images/creatures/fish/swim_brown-0.png b/data/images/creatures/fish/swim_brown-0.png new file mode 100644 index 00000000000..b6a43e0a481 Binary files /dev/null and b/data/images/creatures/fish/swim_brown-0.png differ diff --git a/data/images/creatures/fish/swim_brown-1.png b/data/images/creatures/fish/swim_brown-1.png new file mode 100644 index 00000000000..5c4dc6e1558 Binary files /dev/null and b/data/images/creatures/fish/swim_brown-1.png differ diff --git a/data/images/creatures/fish/swim_brown-2.png b/data/images/creatures/fish/swim_brown-2.png new file mode 100644 index 00000000000..9e2c1cfade2 Binary files /dev/null and b/data/images/creatures/fish/swim_brown-2.png differ diff --git a/data/images/creatures/fish/swim_brown-3.png b/data/images/creatures/fish/swim_brown-3.png new file mode 100644 index 00000000000..6eb85a3918a Binary files /dev/null and b/data/images/creatures/fish/swim_brown-3.png differ diff --git a/data/images/creatures/fish/swim_brown-4.png b/data/images/creatures/fish/swim_brown-4.png new file mode 100644 index 00000000000..27641a6fa60 Binary files /dev/null and b/data/images/creatures/fish/swim_brown-4.png differ diff --git a/data/images/creatures/fish/swim_brown-5.png b/data/images/creatures/fish/swim_brown-5.png new file mode 100644 index 00000000000..c375b4b68ba Binary files /dev/null and b/data/images/creatures/fish/swim_brown-5.png differ diff --git a/data/images/creatures/fish/swim_brown-6.png b/data/images/creatures/fish/swim_brown-6.png new file mode 100644 index 00000000000..622372fa4a4 Binary files /dev/null and b/data/images/creatures/fish/swim_brown-6.png differ diff --git a/data/images/creatures/fish/swim_brown-7.png b/data/images/creatures/fish/swim_brown-7.png new file mode 100644 index 00000000000..3884913689f Binary files /dev/null and b/data/images/creatures/fish/swim_brown-7.png differ diff --git a/data/images/creatures/fish/wait_blue-0.png b/data/images/creatures/fish/wait_blue-0.png new file mode 100644 index 00000000000..69a1eff28c3 Binary files /dev/null and b/data/images/creatures/fish/wait_blue-0.png differ diff --git a/data/images/creatures/fish/wait_blue-1.png b/data/images/creatures/fish/wait_blue-1.png new file mode 100644 index 00000000000..209d151e728 Binary files /dev/null and b/data/images/creatures/fish/wait_blue-1.png differ diff --git a/data/images/creatures/fish/wait_blue-2.png b/data/images/creatures/fish/wait_blue-2.png new file mode 100644 index 00000000000..818028c449d Binary files /dev/null and b/data/images/creatures/fish/wait_blue-2.png differ diff --git a/data/images/creatures/fish/wait_blue-3.png b/data/images/creatures/fish/wait_blue-3.png new file mode 100644 index 00000000000..0bc2fd8f5d0 Binary files /dev/null and b/data/images/creatures/fish/wait_blue-3.png differ diff --git a/data/images/creatures/fish/wait_blue-4.png b/data/images/creatures/fish/wait_blue-4.png new file mode 100644 index 00000000000..1cdbd40e497 Binary files /dev/null and b/data/images/creatures/fish/wait_blue-4.png differ diff --git a/data/images/creatures/fish/wait_blue-5.png b/data/images/creatures/fish/wait_blue-5.png new file mode 100644 index 00000000000..6f49a319368 Binary files /dev/null and b/data/images/creatures/fish/wait_blue-5.png differ diff --git a/data/images/creatures/fish/wait_blue-6.png b/data/images/creatures/fish/wait_blue-6.png new file mode 100644 index 00000000000..85bbc6bd695 Binary files /dev/null and b/data/images/creatures/fish/wait_blue-6.png differ diff --git a/data/images/creatures/fish/wait_blue-7.png b/data/images/creatures/fish/wait_blue-7.png new file mode 100644 index 00000000000..95f8b17ee2e Binary files /dev/null and b/data/images/creatures/fish/wait_blue-7.png differ diff --git a/data/images/engine/editor/objects.stoi b/data/images/engine/editor/objects.stoi index 863aa0a28b9..1537fad121b 100644 --- a/data/images/engine/editor/objects.stoi +++ b/data/images/engine/editor/objects.stoi @@ -119,7 +119,7 @@ (icon "images/creatures/mole/center.png")) (object (class "fish-jumping") - (icon "images/creatures/fish/jump-1.png")) + (icon "images/creatures/fish/forest/jump_blue-3.png")) (object (class "fish-chasing") (icon "images/creatures/fish/ice/swim_green-0.png"))