diff --git a/data/AUTHORS b/data/AUTHORS index 2c465f3808d..89d5bcdbf61 100644 --- a/data/AUTHORS +++ b/data/AUTHORS @@ -1,6 +1,6 @@ == Images == -Most graphics as of 0.7 were created by Rustybox, Eauix, WeLuvGoatz, FrostC and Bruhmoent. Check the log for details. +Most graphics as of 0.7 were created by Rustybox, Eauix, WeLuvGoatz, FrostC, FilipOK and Bruhmoent. Check the log for details. * images/background/icecliffs/icecliffs-*.png - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA diff --git a/data/images/background/corrupted_forest/corrupt_panorama.png b/data/images/background/corrupted_forest/corrupt_panorama.png new file mode 100644 index 00000000000..84be9998f7a Binary files /dev/null and b/data/images/background/corrupted_forest/corrupt_panorama.png differ diff --git a/data/images/background/corrupted_forest/corrupttrees.png b/data/images/background/corrupted_forest/corrupttrees.png new file mode 100644 index 00000000000..4ae9b1103ce Binary files /dev/null and b/data/images/background/corrupted_forest/corrupttrees.png differ diff --git a/data/images/background/corrupted_forest/corrupttrees_bottom.png b/data/images/background/corrupted_forest/corrupttrees_bottom.png new file mode 100644 index 00000000000..53d802b5f2e Binary files /dev/null and b/data/images/background/corrupted_forest/corrupttrees_bottom.png differ diff --git a/data/images/background/corrupted_forest/corruptwoodland.png b/data/images/background/corrupted_forest/corruptwoodland.png new file mode 100644 index 00000000000..5cf863a4c15 Binary files /dev/null and b/data/images/background/corrupted_forest/corruptwoodland.png differ diff --git a/data/images/background/corrupted_forest/mountain_panorama.png b/data/images/background/corrupted_forest/mountain_panorama.png new file mode 100644 index 00000000000..534e4abf56d Binary files /dev/null and b/data/images/background/corrupted_forest/mountain_panorama.png differ diff --git a/data/images/background/forest/mountain.png b/data/images/background/forest/mountain.png new file mode 100644 index 00000000000..d9992694b39 Binary files /dev/null and b/data/images/background/forest/mountain.png differ diff --git a/data/images/background/forest/mountain_trees.png b/data/images/background/forest/mountain_trees.png new file mode 100644 index 00000000000..a0fadf41749 Binary files /dev/null and b/data/images/background/forest/mountain_trees.png differ diff --git a/data/images/background/forest/trees_back.png b/data/images/background/forest/trees_back.png new file mode 100644 index 00000000000..f43d1879910 Binary files /dev/null and b/data/images/background/forest/trees_back.png differ diff --git a/data/images/background/forest/trees_bottom.png b/data/images/background/forest/trees_bottom.png new file mode 100644 index 00000000000..5d0e28fc678 Binary files /dev/null and b/data/images/background/forest/trees_bottom.png differ diff --git a/data/images/background/forest/woodland.png b/data/images/background/forest/woodland.png new file mode 100644 index 00000000000..77480e20d7e Binary files /dev/null and b/data/images/background/forest/woodland.png differ diff --git a/data/images/background/forest/woodland_bottom.png b/data/images/background/forest/woodland_bottom.png new file mode 100644 index 00000000000..f988f2d8eb4 Binary files /dev/null and b/data/images/background/forest/woodland_bottom.png differ diff --git a/data/images/background/misc/clouds.png b/data/images/background/misc/clouds.png index 2f26bc7a834..0e8f24564f4 100644 Binary files a/data/images/background/misc/clouds.png and b/data/images/background/misc/clouds.png differ diff --git a/data/images/background/misc/clouds_colorless.png b/data/images/background/misc/clouds_colorless.png index 8312edcc77e..71337297368 100644 Binary files a/data/images/background/misc/clouds_colorless.png and b/data/images/background/misc/clouds_colorless.png differ diff --git a/data/images/background/misc/clouds_storm.png b/data/images/background/misc/clouds_storm.png new file mode 100644 index 00000000000..74c8d72fcf6 Binary files /dev/null and b/data/images/background/misc/clouds_storm.png differ diff --git a/data/images/background/misc/skybox_storm.png b/data/images/background/misc/skybox_storm.png new file mode 100644 index 00000000000..c7a29a92fe8 Binary files /dev/null and b/data/images/background/misc/skybox_storm.png differ diff --git a/data/images/creatures/darttrap/granito/root_dart_down.png b/data/images/creatures/darttrap/granito/root_dart_down.png index ad777b03962..978b62b30e5 100644 Binary files a/data/images/creatures/darttrap/granito/root_dart_down.png and b/data/images/creatures/darttrap/granito/root_dart_down.png differ diff --git a/data/images/creatures/darttrap/granito/root_dart_left.png b/data/images/creatures/darttrap/granito/root_dart_left.png index 2923a8cec77..131d5c1cfd5 100644 Binary files a/data/images/creatures/darttrap/granito/root_dart_left.png and b/data/images/creatures/darttrap/granito/root_dart_left.png differ diff --git a/data/images/creatures/dispenser/invisible.png b/data/images/creatures/dispenser/invisible.png index fd14b6535da..f859538a118 100644 Binary files a/data/images/creatures/dispenser/invisible.png and b/data/images/creatures/dispenser/invisible.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-left0.png b/data/images/creatures/dispenser/rocket_launcher-broken-left0.png new file mode 100644 index 00000000000..e73af4bee12 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-left0.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-left1.png b/data/images/creatures/dispenser/rocket_launcher-broken-left1.png new file mode 100644 index 00000000000..a010433bc38 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-left1.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-left2.png b/data/images/creatures/dispenser/rocket_launcher-broken-left2.png new file mode 100644 index 00000000000..90e9bba2d94 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-left2.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-left3.png b/data/images/creatures/dispenser/rocket_launcher-broken-left3.png new file mode 100644 index 00000000000..38b8bc724b8 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-left3.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-left4.png b/data/images/creatures/dispenser/rocket_launcher-broken-left4.png new file mode 100644 index 00000000000..2decedaa827 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-left4.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-left5.png b/data/images/creatures/dispenser/rocket_launcher-broken-left5.png new file mode 100644 index 00000000000..c9a8ea2142a Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-left5.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-left6.png b/data/images/creatures/dispenser/rocket_launcher-broken-left6.png new file mode 100644 index 00000000000..9daa2b04a9a Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-left6.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-left7.png b/data/images/creatures/dispenser/rocket_launcher-broken-left7.png new file mode 100644 index 00000000000..eb5d11d9a83 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-left7.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-left8.png b/data/images/creatures/dispenser/rocket_launcher-broken-left8.png new file mode 100644 index 00000000000..2decedaa827 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-left8.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-right0.png b/data/images/creatures/dispenser/rocket_launcher-broken-right0.png new file mode 100644 index 00000000000..ab3da975204 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-right0.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-right1.png b/data/images/creatures/dispenser/rocket_launcher-broken-right1.png new file mode 100644 index 00000000000..814044f82be Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-right1.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-right2.png b/data/images/creatures/dispenser/rocket_launcher-broken-right2.png new file mode 100644 index 00000000000..f8c98438dd6 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-right2.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-right3.png b/data/images/creatures/dispenser/rocket_launcher-broken-right3.png new file mode 100644 index 00000000000..8efcbc751e8 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-right3.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-right4.png b/data/images/creatures/dispenser/rocket_launcher-broken-right4.png new file mode 100644 index 00000000000..98e11173144 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-right4.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-right5.png b/data/images/creatures/dispenser/rocket_launcher-broken-right5.png new file mode 100644 index 00000000000..862cf27c787 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-right5.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-right6.png b/data/images/creatures/dispenser/rocket_launcher-broken-right6.png new file mode 100644 index 00000000000..5b923e153d4 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-right6.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-right7.png b/data/images/creatures/dispenser/rocket_launcher-broken-right7.png new file mode 100644 index 00000000000..54fea030865 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-right7.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-broken-right8.png b/data/images/creatures/dispenser/rocket_launcher-broken-right8.png new file mode 100644 index 00000000000..98e11173144 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-broken-right8.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-frozen-left0.png b/data/images/creatures/dispenser/rocket_launcher-frozen-left0.png new file mode 100644 index 00000000000..588119d8fb5 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-frozen-left0.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-frozen-left1.png b/data/images/creatures/dispenser/rocket_launcher-frozen-left1.png new file mode 100644 index 00000000000..e28f1bef496 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-frozen-left1.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-frozen-left2.png b/data/images/creatures/dispenser/rocket_launcher-frozen-left2.png new file mode 100644 index 00000000000..68c69e95e36 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-frozen-left2.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-frozen-left3.png b/data/images/creatures/dispenser/rocket_launcher-frozen-left3.png new file mode 100644 index 00000000000..f9c817dd585 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-frozen-left3.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-frozen-left4.png b/data/images/creatures/dispenser/rocket_launcher-frozen-left4.png new file mode 100644 index 00000000000..8cebfef5ae3 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-frozen-left4.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-frozen-right0.png b/data/images/creatures/dispenser/rocket_launcher-frozen-right0.png new file mode 100644 index 00000000000..fa2f4bd3471 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-frozen-right0.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-frozen-right1.png b/data/images/creatures/dispenser/rocket_launcher-frozen-right1.png new file mode 100644 index 00000000000..bdfd7654a63 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-frozen-right1.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-frozen-right2.png b/data/images/creatures/dispenser/rocket_launcher-frozen-right2.png new file mode 100644 index 00000000000..f52204fc94a Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-frozen-right2.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-frozen-right3.png b/data/images/creatures/dispenser/rocket_launcher-frozen-right3.png new file mode 100644 index 00000000000..1ff2ddb11fc Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-frozen-right3.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-frozen-right4.png b/data/images/creatures/dispenser/rocket_launcher-frozen-right4.png new file mode 100644 index 00000000000..35a2e0811d0 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-frozen-right4.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-left.png b/data/images/creatures/dispenser/rocket_launcher-left.png new file mode 100644 index 00000000000..5c3acfb2c80 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-left.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-right.png b/data/images/creatures/dispenser/rocket_launcher-right.png new file mode 100644 index 00000000000..1298ce97e92 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-right.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-turning0.png b/data/images/creatures/dispenser/rocket_launcher-turning0.png new file mode 100644 index 00000000000..4b358de2810 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-turning0.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-turning1.png b/data/images/creatures/dispenser/rocket_launcher-turning1.png new file mode 100644 index 00000000000..20d26eecff2 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-turning1.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-turning2.png b/data/images/creatures/dispenser/rocket_launcher-turning2.png new file mode 100644 index 00000000000..c2bfcbbf483 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-turning2.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-turning3.png b/data/images/creatures/dispenser/rocket_launcher-turning3.png new file mode 100644 index 00000000000..ddd9666c7b2 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-turning3.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-turning4.png b/data/images/creatures/dispenser/rocket_launcher-turning4.png new file mode 100644 index 00000000000..95523e4efa3 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-turning4.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-turning5.png b/data/images/creatures/dispenser/rocket_launcher-turning5.png new file mode 100644 index 00000000000..917ee9ad0b9 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-turning5.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-turning6.png b/data/images/creatures/dispenser/rocket_launcher-turning6.png new file mode 100644 index 00000000000..8ec1c87f583 Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-turning6.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher-turning7.png b/data/images/creatures/dispenser/rocket_launcher-turning7.png new file mode 100644 index 00000000000..805df34f29e Binary files /dev/null and b/data/images/creatures/dispenser/rocket_launcher-turning7.png differ diff --git a/data/images/creatures/dispenser/rocket_launcher.sprite b/data/images/creatures/dispenser/rocket_launcher.sprite new file mode 100644 index 00000000000..9e0d69d2959 --- /dev/null +++ b/data/images/creatures/dispenser/rocket_launcher.sprite @@ -0,0 +1,101 @@ +(supertux-sprite + (action + (name "working-left") + (hitbox 20 61 55 35) + (images "rocket_launcher-left.png")) + + (action + (name "broken-left") + (loops 1) + (fps 20) + (hitbox 20 61 55 35) + (images "rocket_launcher-broken-left0.png" + "rocket_launcher-broken-left1.png" + "rocket_launcher-broken-left2.png" + "rocket_launcher-broken-left3.png" + "rocket_launcher-broken-left4.png" + "rocket_launcher-broken-left5.png" + "rocket_launcher-broken-left6.png" + "rocket_launcher-broken-left7.png" + "rocket_launcher-broken-left6.png" + "rocket_launcher-broken-left5.png" + "rocket_launcher-broken-left8.png" + "rocket_launcher-broken-left5.png")) + + (action + (name "iced-left") + (loops 1) + (fps 24) + (hitbox 20 61 55 35) + (images "rocket_launcher-frozen-left0.png" + "rocket_launcher-frozen-left1.png" + "rocket_launcher-frozen-left2.png" + "rocket_launcher-frozen-left3.png" + "rocket_launcher-frozen-left4.png")) + + (action + (name "working-right") + (hitbox 20 61 55 35) + (images "rocket_launcher-right.png")) + + (action + (name "broken-right") + (hitbox 20 61 55 35) + (loops 1) + (fps 20) + (images "rocket_launcher-broken-right0.png" + "rocket_launcher-broken-right1.png" + "rocket_launcher-broken-right2.png" + "rocket_launcher-broken-right3.png" + "rocket_launcher-broken-right4.png" + "rocket_launcher-broken-right5.png" + "rocket_launcher-broken-right6.png" + "rocket_launcher-broken-right7.png" + "rocket_launcher-broken-right6.png" + "rocket_launcher-broken-right5.png" + "rocket_launcher-broken-right8.png" + "rocket_launcher-broken-right5.png")) + + (action + (name "iced-right") + (loops 1) + (fps 24) + (hitbox 20 61 55 35) + (images "rocket_launcher-frozen-right0.png" + "rocket_launcher-frozen-right1.png" + "rocket_launcher-frozen-right2.png" + "rocket_launcher-frozen-right3.png" + "rocket_launcher-frozen-right4.png")) + + (action + (name "turn-left") + (loops 1) + (fps 18) + (hitbox 20 61 55 35) + (images "rocket_launcher-turning7.png" + "rocket_launcher-turning6.png" + "rocket_launcher-turning5.png" + "rocket_launcher-turning4.png" + "rocket_launcher-turning3.png" + "rocket_launcher-turning2.png" + "rocket_launcher-turning1.png" + "rocket_launcher-turning0.png" + "rocket_launcher-left.png")) + + (action + (name "turn-right") + (loops 1) + (fps 18) + (hitbox 20 61 55 35) + (images "rocket_launcher-turning0.png" + "rocket_launcher-turning1.png" + "rocket_launcher-turning2.png" + "rocket_launcher-turning3.png" + "rocket_launcher-turning4.png" + "rocket_launcher-turning5.png" + "rocket_launcher-turning6.png" + "rocket_launcher-turning7.png" + "rocket_launcher-right.png") + ) +) + diff --git a/data/images/creatures/granito/corrupted/big/root_spike.png b/data/images/creatures/granito/corrupted/big/root_spike.png index a08b1705d6a..01f5b1fcae6 100644 Binary files a/data/images/creatures/granito/corrupted/big/root_spike.png and b/data/images/creatures/granito/corrupted/big/root_spike.png differ diff --git a/data/images/creatures/totem/squished.png b/data/images/creatures/totem/squished.png index 2ace1c850d9..3c280af6daa 100644 Binary files a/data/images/creatures/totem/squished.png and b/data/images/creatures/totem/squished.png differ diff --git a/data/images/creatures/totem/stacked.png b/data/images/creatures/totem/stacked.png index a1795e2ba48..8848d88b19f 100644 Binary files a/data/images/creatures/totem/stacked.png and b/data/images/creatures/totem/stacked.png differ diff --git a/data/images/creatures/totem/totem.sprite b/data/images/creatures/totem/totem.sprite index 031704f4f5c..c5cb4a88ee8 100644 --- a/data/images/creatures/totem/totem.sprite +++ b/data/images/creatures/totem/totem.sprite @@ -2,7 +2,8 @@ (action (hitbox 0 2 48 49) (name "walking-left") - (images "walking1.png" "walking2.png" "walking3.png" "walking4.png") + (fps 12.0) + (images "walking1.png" "walking2.png" "walking3.png" "walking4.png" "walking5.png" "walking6.png" "walking7.png" "walking8.png") ) (action (hitbox 0 2 48 49) diff --git a/data/images/creatures/totem/walking1.png b/data/images/creatures/totem/walking1.png index f5e2224d810..6c9e08081d6 100644 Binary files a/data/images/creatures/totem/walking1.png and b/data/images/creatures/totem/walking1.png differ diff --git a/data/images/creatures/totem/walking2.png b/data/images/creatures/totem/walking2.png index 83e49c0ccb0..b66b9b326e3 100644 Binary files a/data/images/creatures/totem/walking2.png and b/data/images/creatures/totem/walking2.png differ diff --git a/data/images/creatures/totem/walking3.png b/data/images/creatures/totem/walking3.png index e11e1fb6e46..b9335902074 100644 Binary files a/data/images/creatures/totem/walking3.png and b/data/images/creatures/totem/walking3.png differ diff --git a/data/images/creatures/totem/walking4.png b/data/images/creatures/totem/walking4.png index 48297a9ae06..a9d0c9b7fb3 100644 Binary files a/data/images/creatures/totem/walking4.png and b/data/images/creatures/totem/walking4.png differ diff --git a/data/images/creatures/totem/walking5.png b/data/images/creatures/totem/walking5.png new file mode 100644 index 00000000000..de15053f79d Binary files /dev/null and b/data/images/creatures/totem/walking5.png differ diff --git a/data/images/creatures/totem/walking6.png b/data/images/creatures/totem/walking6.png new file mode 100644 index 00000000000..547f7e43bc2 Binary files /dev/null and b/data/images/creatures/totem/walking6.png differ diff --git a/data/images/creatures/totem/walking7.png b/data/images/creatures/totem/walking7.png new file mode 100644 index 00000000000..72e44c92356 Binary files /dev/null and b/data/images/creatures/totem/walking7.png differ diff --git a/data/images/creatures/totem/walking8.png b/data/images/creatures/totem/walking8.png new file mode 100644 index 00000000000..901f530c62c Binary files /dev/null and b/data/images/creatures/totem/walking8.png differ diff --git a/data/images/decal/misc/Antena1.png b/data/images/decal/misc/Antena1.png new file mode 100644 index 00000000000..4d6a72d91c4 Binary files /dev/null and b/data/images/decal/misc/Antena1.png differ diff --git a/data/images/decal/misc/Antena2.png b/data/images/decal/misc/Antena2.png index 757fe838419..24c8ecb3ee7 100755 Binary files a/data/images/decal/misc/Antena2.png and b/data/images/decal/misc/Antena2.png differ diff --git a/data/images/decal/misc/nolok-statue-big.png b/data/images/decal/misc/nolok-statue-big.png new file mode 100644 index 00000000000..e9edd4a4b27 Binary files /dev/null and b/data/images/decal/misc/nolok-statue-big.png differ diff --git a/data/images/decal/misc/overlay_crack-0.png b/data/images/decal/misc/overlay_crack-0.png new file mode 100644 index 00000000000..1003a5b697e Binary files /dev/null and b/data/images/decal/misc/overlay_crack-0.png differ diff --git a/data/images/decal/misc/overlay_crack-1.png b/data/images/decal/misc/overlay_crack-1.png new file mode 100644 index 00000000000..7768bbeb53f Binary files /dev/null and b/data/images/decal/misc/overlay_crack-1.png differ diff --git a/data/images/decal/misc/overlay_crack-2.png b/data/images/decal/misc/overlay_crack-2.png new file mode 100644 index 00000000000..f0b80466a3d Binary files /dev/null and b/data/images/decal/misc/overlay_crack-2.png differ diff --git a/data/images/decal/misc/overlay_crack-3.png b/data/images/decal/misc/overlay_crack-3.png new file mode 100644 index 00000000000..f775a0b4ce8 Binary files /dev/null and b/data/images/decal/misc/overlay_crack-3.png differ diff --git a/data/images/engine/editor/powerup.png b/data/images/engine/editor/powerup.png index 3986f50d867..2d8e25abb82 100644 Binary files a/data/images/engine/editor/powerup.png and b/data/images/engine/editor/powerup.png differ diff --git a/data/images/engine/mobile/action.png b/data/images/engine/mobile/action.png index e6e05b83ce4..dd8b9db51d7 100644 Binary files a/data/images/engine/mobile/action.png and b/data/images/engine/mobile/action.png differ diff --git a/data/images/engine/mobile/cheats.png b/data/images/engine/mobile/cheats.png index 11c47491e66..a0158bb0515 100644 Binary files a/data/images/engine/mobile/cheats.png and b/data/images/engine/mobile/cheats.png differ diff --git a/data/images/engine/mobile/jump.png b/data/images/engine/mobile/jump.png index 286cd1a814d..4eef89fd099 100644 Binary files a/data/images/engine/mobile/jump.png and b/data/images/engine/mobile/jump.png differ diff --git a/data/images/objects/big_snowball/big_boulder.png b/data/images/objects/big_snowball/big_boulder.png new file mode 100644 index 00000000000..fe852f8af68 Binary files /dev/null and b/data/images/objects/big_snowball/big_boulder.png differ diff --git a/data/images/objects/big_snowball/big_boulder.sprite b/data/images/objects/big_snowball/big_boulder.sprite new file mode 100644 index 00000000000..d3824cc456c --- /dev/null +++ b/data/images/objects/big_snowball/big_boulder.sprite @@ -0,0 +1,11 @@ +(supertux-sprite + (action + (name "default") + (hitbox 15 14 136 136) + (images "big_boulder.png")) + + (action + (name "particle") + (hitbox 0 0 38 38) + (images "boulder_particle.png")) +) diff --git a/data/images/objects/big_snowball/big_snowball.sprite b/data/images/objects/big_snowball/big_snowball.sprite index 73ea8fd4c4b..9b2ace5132c 100644 --- a/data/images/objects/big_snowball/big_snowball.sprite +++ b/data/images/objects/big_snowball/big_snowball.sprite @@ -6,6 +6,6 @@ (action (name "particle") - (hitbox 2 2 29 28) + (hitbox 0 0 38 38) (images "big_snowball_particle.png")) ) diff --git a/data/images/objects/big_snowball/big_snowball_particle.png b/data/images/objects/big_snowball/big_snowball_particle.png index a3efecf4e26..6bbff9975c2 100644 Binary files a/data/images/objects/big_snowball/big_snowball_particle.png and b/data/images/objects/big_snowball/big_snowball_particle.png differ diff --git a/data/images/objects/big_snowball/boulder.png b/data/images/objects/big_snowball/boulder.png new file mode 100644 index 00000000000..7870f317504 Binary files /dev/null and b/data/images/objects/big_snowball/boulder.png differ diff --git a/data/images/objects/big_snowball/boulder.sprite b/data/images/objects/big_snowball/boulder.sprite new file mode 100644 index 00000000000..e83fe3a0020 --- /dev/null +++ b/data/images/objects/big_snowball/boulder.sprite @@ -0,0 +1,11 @@ +(supertux-sprite + (action + (name "default") + (hitbox 6 6 87 84) + (images "boulder.png")) + + (action + (name "particle") + (hitbox 0 0 38 38) + (images "boulder_particle.png")) +) diff --git a/data/images/objects/big_snowball/boulder_particle.png b/data/images/objects/big_snowball/boulder_particle.png new file mode 100644 index 00000000000..b622af92875 Binary files /dev/null and b/data/images/objects/big_snowball/boulder_particle.png differ diff --git a/data/images/objects/bonus_block/bonus-air_flower.png b/data/images/objects/bonus_block/bonus-air_flower.png index 64b996e6b97..36b6bab3f42 100644 Binary files a/data/images/objects/bonus_block/bonus-air_flower.png and b/data/images/objects/bonus_block/bonus-air_flower.png differ diff --git a/data/images/objects/bonus_block/bonus-earth_flower.png b/data/images/objects/bonus_block/bonus-earth_flower.png index 00f3c922a02..cdceb510d70 100644 Binary files a/data/images/objects/bonus_block/bonus-earth_flower.png and b/data/images/objects/bonus_block/bonus-earth_flower.png differ diff --git a/data/images/objects/bonus_block/bonus-fire_flower.png b/data/images/objects/bonus_block/bonus-fire_flower.png index 0debdbd41c0..6f54e5e98f4 100644 Binary files a/data/images/objects/bonus_block/bonus-fire_flower.png and b/data/images/objects/bonus_block/bonus-fire_flower.png differ diff --git a/data/images/objects/bonus_block/bonus-ice_flower.png b/data/images/objects/bonus_block/bonus-ice_flower.png index ab03adefe33..e1c61b73536 100644 Binary files a/data/images/objects/bonus_block/bonus-ice_flower.png and b/data/images/objects/bonus_block/bonus-ice_flower.png differ diff --git a/data/images/objects/bullets/fire_bullet-0.png b/data/images/objects/bullets/fire_bullet-0.png deleted file mode 100644 index 20d480515a8..00000000000 Binary files a/data/images/objects/bullets/fire_bullet-0.png and /dev/null differ diff --git a/data/images/objects/bullets/fire_bullet-1.png b/data/images/objects/bullets/fire_bullet-1.png deleted file mode 100644 index 71518dea6d5..00000000000 Binary files a/data/images/objects/bullets/fire_bullet-1.png and /dev/null differ diff --git a/data/images/objects/bullets/fire_bullet-2.png b/data/images/objects/bullets/fire_bullet-2.png deleted file mode 100644 index e5cccbb2002..00000000000 Binary files a/data/images/objects/bullets/fire_bullet-2.png and /dev/null differ diff --git a/data/images/objects/bullets/fire_bullet-3.png b/data/images/objects/bullets/fire_bullet-3.png deleted file mode 100644 index 0307c92e422..00000000000 Binary files a/data/images/objects/bullets/fire_bullet-3.png and /dev/null differ diff --git a/data/images/objects/bullets/fire_bullet.png b/data/images/objects/bullets/fire_bullet.png new file mode 100644 index 00000000000..441a4519f94 Binary files /dev/null and b/data/images/objects/bullets/fire_bullet.png differ diff --git a/data/images/objects/bullets/fire_tail-0.png b/data/images/objects/bullets/fire_tail-0.png new file mode 100644 index 00000000000..379d1367440 Binary files /dev/null and b/data/images/objects/bullets/fire_tail-0.png differ diff --git a/data/images/objects/bullets/fire_tail-1.png b/data/images/objects/bullets/fire_tail-1.png new file mode 100644 index 00000000000..e808cecaa20 Binary files /dev/null and b/data/images/objects/bullets/fire_tail-1.png differ diff --git a/data/images/objects/bullets/fire_tail-2.png b/data/images/objects/bullets/fire_tail-2.png new file mode 100644 index 00000000000..65c2728f5fa Binary files /dev/null and b/data/images/objects/bullets/fire_tail-2.png differ diff --git a/data/images/objects/bullets/fire_tail-3.png b/data/images/objects/bullets/fire_tail-3.png new file mode 100644 index 00000000000..79af3122b2b Binary files /dev/null and b/data/images/objects/bullets/fire_tail-3.png differ diff --git a/data/images/objects/bullets/fire_tail-4.png b/data/images/objects/bullets/fire_tail-4.png new file mode 100644 index 00000000000..35008319dd4 Binary files /dev/null and b/data/images/objects/bullets/fire_tail-4.png differ diff --git a/data/images/objects/bullets/firebullet.sprite b/data/images/objects/bullets/firebullet.sprite index dafa1f74683..833870ec40a 100644 --- a/data/images/objects/bullets/firebullet.sprite +++ b/data/images/objects/bullets/firebullet.sprite @@ -1,10 +1,12 @@ (supertux-sprite (action - (hitbox 2 2 12 12) - (fps 20) - (images "fire_bullet-0.png" - "fire_bullet-1.png" - "fire_bullet-2.png" - "fire_bullet-3.png") + (name "right") + (hitbox 0 0 21 21) + (images "fire_bullet.png") + ) + (action + (name "left") + (hitbox 0 0 21 21) + (mirror-action "right") ) ) diff --git a/data/images/objects/bullets/firebullet_tail.sprite b/data/images/objects/bullets/firebullet_tail.sprite new file mode 100644 index 00000000000..dd057ac9628 --- /dev/null +++ b/data/images/objects/bullets/firebullet_tail.sprite @@ -0,0 +1,11 @@ +(supertux-sprite + (action + (fps 20) + (hitbox -5 -5 0 0) + (images "fire_tail-4.png" + "fire_tail-3.png" + "fire_tail-2.png" + "fire_tail-1.png" + "fire_tail-0.png") + ) +) diff --git a/data/images/objects/bullets/ice_bullet-0.png b/data/images/objects/bullets/ice_bullet-0.png deleted file mode 100644 index 92f4aa0d1b4..00000000000 Binary files a/data/images/objects/bullets/ice_bullet-0.png and /dev/null differ diff --git a/data/images/objects/bullets/ice_bullet-1.png b/data/images/objects/bullets/ice_bullet-1.png deleted file mode 100644 index 3e492d91eb1..00000000000 Binary files a/data/images/objects/bullets/ice_bullet-1.png and /dev/null differ diff --git a/data/images/objects/bullets/ice_bullet-2.png b/data/images/objects/bullets/ice_bullet-2.png deleted file mode 100644 index 6bbe506d370..00000000000 Binary files a/data/images/objects/bullets/ice_bullet-2.png and /dev/null differ diff --git a/data/images/objects/bullets/ice_bullet-3.png b/data/images/objects/bullets/ice_bullet-3.png deleted file mode 100644 index eeb1128f51c..00000000000 Binary files a/data/images/objects/bullets/ice_bullet-3.png and /dev/null differ diff --git a/data/images/objects/bullets/ice_bullet.png b/data/images/objects/bullets/ice_bullet.png new file mode 100644 index 00000000000..a33692f89d8 Binary files /dev/null and b/data/images/objects/bullets/ice_bullet.png differ diff --git a/data/images/objects/bullets/ice_tail-0.png b/data/images/objects/bullets/ice_tail-0.png new file mode 100644 index 00000000000..379d1367440 Binary files /dev/null and b/data/images/objects/bullets/ice_tail-0.png differ diff --git a/data/images/objects/bullets/ice_tail-1.png b/data/images/objects/bullets/ice_tail-1.png new file mode 100644 index 00000000000..83fcdae49c4 Binary files /dev/null and b/data/images/objects/bullets/ice_tail-1.png differ diff --git a/data/images/objects/bullets/ice_tail-2.png b/data/images/objects/bullets/ice_tail-2.png new file mode 100644 index 00000000000..e2a39b1384b Binary files /dev/null and b/data/images/objects/bullets/ice_tail-2.png differ diff --git a/data/images/objects/bullets/ice_tail-3.png b/data/images/objects/bullets/ice_tail-3.png new file mode 100644 index 00000000000..9acd01cabc0 Binary files /dev/null and b/data/images/objects/bullets/ice_tail-3.png differ diff --git a/data/images/objects/bullets/ice_tail-4.png b/data/images/objects/bullets/ice_tail-4.png new file mode 100644 index 00000000000..2b61bec3dcb Binary files /dev/null and b/data/images/objects/bullets/ice_tail-4.png differ diff --git a/data/images/objects/bullets/icebullet.sprite b/data/images/objects/bullets/icebullet.sprite index c138bda89cd..3ce1935c039 100644 --- a/data/images/objects/bullets/icebullet.sprite +++ b/data/images/objects/bullets/icebullet.sprite @@ -1,9 +1,12 @@ (supertux-sprite - (action - (hitbox 2 2 12 12) - (fps 20) - (images "ice_bullet-0.png" - "ice_bullet-1.png" - "ice_bullet-2.png" - "ice_bullet-3.png")) + (action + (name "right") + (hitbox 0 0 21 21) + (images "ice_bullet.png") + ) + (action + (name "left") + (hitbox 0 0 21 21) + (mirror-action "right") + ) ) diff --git a/data/images/objects/bullets/icebullet_tail.sprite b/data/images/objects/bullets/icebullet_tail.sprite new file mode 100644 index 00000000000..aaa682512e3 --- /dev/null +++ b/data/images/objects/bullets/icebullet_tail.sprite @@ -0,0 +1,11 @@ +(supertux-sprite + (action + (fps 20) + (hitbox -5 -5 0 0) + (images "ice_tail-4.png" + "ice_tail-3.png" + "ice_tail-2.png" + "ice_tail-1.png" + "ice_tail-0.png") + ) +) diff --git a/data/images/objects/fallblock/ruin_brick_1x2.png b/data/images/objects/fallblock/ruin_brick_1x2.png new file mode 100644 index 00000000000..8fb758db8e8 Binary files /dev/null and b/data/images/objects/fallblock/ruin_brick_1x2.png differ diff --git a/data/images/objects/fallblock/ruin_brick_1x2.sprite b/data/images/objects/fallblock/ruin_brick_1x2.sprite new file mode 100644 index 00000000000..05a2c55090f --- /dev/null +++ b/data/images/objects/fallblock/ruin_brick_1x2.sprite @@ -0,0 +1,7 @@ +(supertux-sprite + (action + (name "normal") + (hitbox 0 0 64 32) + (images "ruin_brick_1x2.png") + ) +) \ No newline at end of file diff --git a/data/images/objects/keys/air.png b/data/images/objects/keys/air.png index d380bd6be5e..14abf245b6b 100644 Binary files a/data/images/objects/keys/air.png and b/data/images/objects/keys/air.png differ diff --git a/data/images/objects/keys/air_display.png b/data/images/objects/keys/air_display.deprecated.png similarity index 100% rename from data/images/objects/keys/air_display.png rename to data/images/objects/keys/air_display.deprecated.png diff --git a/data/images/objects/keys/earth.png b/data/images/objects/keys/earth.png index 621027e3090..321c3e5ae94 100644 Binary files a/data/images/objects/keys/earth.png and b/data/images/objects/keys/earth.png differ diff --git a/data/images/objects/keys/earth_display.png b/data/images/objects/keys/earth_display.deprecated.png similarity index 100% rename from data/images/objects/keys/earth_display.png rename to data/images/objects/keys/earth_display.deprecated.png diff --git a/data/images/objects/keys/fire.png b/data/images/objects/keys/fire.png index bb8e5d8cd4e..296103594b8 100644 Binary files a/data/images/objects/keys/fire.png and b/data/images/objects/keys/fire.png differ diff --git a/data/images/objects/keys/fire_display.png b/data/images/objects/keys/fire_display.deprecated.png similarity index 100% rename from data/images/objects/keys/fire_display.png rename to data/images/objects/keys/fire_display.deprecated.png diff --git a/data/images/objects/keys/k_outline.png b/data/images/objects/keys/k_outline.png index 68bf71636ad..48bbefecfc7 100644 Binary files a/data/images/objects/keys/k_outline.png and b/data/images/objects/keys/k_outline.png differ diff --git a/data/images/objects/keys/l_outline.png b/data/images/objects/keys/l_outline.png index 834f23677b4..39ee7feca3e 100644 Binary files a/data/images/objects/keys/l_outline.png and b/data/images/objects/keys/l_outline.png differ diff --git a/data/images/objects/keys/n_outline.png b/data/images/objects/keys/n_outline.png index 07927793874..2b88f62a4da 100644 Binary files a/data/images/objects/keys/n_outline.png and b/data/images/objects/keys/n_outline.png differ diff --git a/data/images/objects/keys/o_outline.png b/data/images/objects/keys/o_outline.png index 0e2b375e0dc..b4bbd76ab03 100644 Binary files a/data/images/objects/keys/o_outline.png and b/data/images/objects/keys/o_outline.png differ diff --git a/data/images/objects/keys/outline.png b/data/images/objects/keys/outline.deprecated.png similarity index 100% rename from data/images/objects/keys/outline.png rename to data/images/objects/keys/outline.deprecated.png diff --git a/data/images/objects/keys/sparkle-1.png b/data/images/objects/keys/sparkle-1.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-1.png rename to data/images/objects/keys/sparkle-1.deprecated.png diff --git a/data/images/objects/keys/sparkle-10.png b/data/images/objects/keys/sparkle-10.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-10.png rename to data/images/objects/keys/sparkle-10.deprecated.png diff --git a/data/images/objects/keys/sparkle-11.png b/data/images/objects/keys/sparkle-11.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-11.png rename to data/images/objects/keys/sparkle-11.deprecated.png diff --git a/data/images/objects/keys/sparkle-12.png b/data/images/objects/keys/sparkle-12.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-12.png rename to data/images/objects/keys/sparkle-12.deprecated.png diff --git a/data/images/objects/keys/sparkle-13.png b/data/images/objects/keys/sparkle-13.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-13.png rename to data/images/objects/keys/sparkle-13.deprecated.png diff --git a/data/images/objects/keys/sparkle-14.png b/data/images/objects/keys/sparkle-14.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-14.png rename to data/images/objects/keys/sparkle-14.deprecated.png diff --git a/data/images/objects/keys/sparkle-15.png b/data/images/objects/keys/sparkle-15.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-15.png rename to data/images/objects/keys/sparkle-15.deprecated.png diff --git a/data/images/objects/keys/sparkle-16.png b/data/images/objects/keys/sparkle-16.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-16.png rename to data/images/objects/keys/sparkle-16.deprecated.png diff --git a/data/images/objects/keys/sparkle-2.png b/data/images/objects/keys/sparkle-2.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-2.png rename to data/images/objects/keys/sparkle-2.deprecated.png diff --git a/data/images/objects/keys/sparkle-3.png b/data/images/objects/keys/sparkle-3.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-3.png rename to data/images/objects/keys/sparkle-3.deprecated.png diff --git a/data/images/objects/keys/sparkle-4.png b/data/images/objects/keys/sparkle-4.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-4.png rename to data/images/objects/keys/sparkle-4.deprecated.png diff --git a/data/images/objects/keys/sparkle-5.png b/data/images/objects/keys/sparkle-5.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-5.png rename to data/images/objects/keys/sparkle-5.deprecated.png diff --git a/data/images/objects/keys/sparkle-6.png b/data/images/objects/keys/sparkle-6.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-6.png rename to data/images/objects/keys/sparkle-6.deprecated.png diff --git a/data/images/objects/keys/sparkle-7.png b/data/images/objects/keys/sparkle-7.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-7.png rename to data/images/objects/keys/sparkle-7.deprecated.png diff --git a/data/images/objects/keys/sparkle-8.png b/data/images/objects/keys/sparkle-8.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-8.png rename to data/images/objects/keys/sparkle-8.deprecated.png diff --git a/data/images/objects/keys/sparkle-9.png b/data/images/objects/keys/sparkle-9.deprecated.png similarity index 100% rename from data/images/objects/keys/sparkle-9.png rename to data/images/objects/keys/sparkle-9.deprecated.png diff --git a/data/images/objects/keys/water.png b/data/images/objects/keys/water.png index b54223ac76b..509f4075185 100644 Binary files a/data/images/objects/keys/water.png and b/data/images/objects/keys/water.png differ diff --git a/data/images/objects/keys/water_display.png b/data/images/objects/keys/water_display.deprecated.png similarity index 100% rename from data/images/objects/keys/water_display.png rename to data/images/objects/keys/water_display.deprecated.png diff --git a/data/images/objects/keys/wood.png b/data/images/objects/keys/wood.png index a9a1da71c7d..046de331c51 100644 Binary files a/data/images/objects/keys/wood.png and b/data/images/objects/keys/wood.png differ diff --git a/data/images/objects/keys/wood_display.png b/data/images/objects/keys/wood_display.deprecated.png similarity index 100% rename from data/images/objects/keys/wood_display.png rename to data/images/objects/keys/wood_display.deprecated.png diff --git a/data/images/objects/magicblock/magicblock-solid.png b/data/images/objects/magicblock/magicblock-solid.png index f239f4411a0..315689f04e2 100644 Binary files a/data/images/objects/magicblock/magicblock-solid.png and b/data/images/objects/magicblock/magicblock-solid.png differ diff --git a/data/images/objects/radio/radio.sprite b/data/images/objects/radio/radio.sprite index a3fb538af92..89444ec6341 100644 --- a/data/images/objects/radio/radio.sprite +++ b/data/images/objects/radio/radio.sprite @@ -1,13 +1,17 @@ (supertux-sprite - (action - (name "quiet") - (hitbox 0 0 0 0) - (images "radio1.png")) - (action - (name "loud") - (hitbox 0 0 0 0) - (images "radio1.png" - "radio2.png" - "radio3.png") + (action + (name "quiet") + (hitbox 6 19 70 43) + (images "radio_inactive.png")) + (action + (name "loud") + (hitbox 6 19 70 43) + (fps 18) + (images "radio0.png" + "radio1.png" + "radio2.png" + "radio3.png" + "radio4.png" + "radio5.png") ) ) diff --git a/data/images/objects/radio/radio0.png b/data/images/objects/radio/radio0.png new file mode 100644 index 00000000000..9f37c5cb9ba Binary files /dev/null and b/data/images/objects/radio/radio0.png differ diff --git a/data/images/objects/radio/radio1.png b/data/images/objects/radio/radio1.png index 8294e567031..360f04981e4 100644 Binary files a/data/images/objects/radio/radio1.png and b/data/images/objects/radio/radio1.png differ diff --git a/data/images/objects/radio/radio2.png b/data/images/objects/radio/radio2.png index 83e8b1a32d0..830c645295f 100644 Binary files a/data/images/objects/radio/radio2.png and b/data/images/objects/radio/radio2.png differ diff --git a/data/images/objects/radio/radio3.png b/data/images/objects/radio/radio3.png index 1bec33dc9c2..76122d7d7b9 100644 Binary files a/data/images/objects/radio/radio3.png and b/data/images/objects/radio/radio3.png differ diff --git a/data/images/objects/radio/radio4.png b/data/images/objects/radio/radio4.png new file mode 100644 index 00000000000..3e7e5ce2d45 Binary files /dev/null and b/data/images/objects/radio/radio4.png differ diff --git a/data/images/objects/radio/radio5.png b/data/images/objects/radio/radio5.png new file mode 100644 index 00000000000..5e8f6c1fe0a Binary files /dev/null and b/data/images/objects/radio/radio5.png differ diff --git a/data/images/objects/radio/radio_inactive.png b/data/images/objects/radio/radio_inactive.png new file mode 100644 index 00000000000..68966cead13 Binary files /dev/null and b/data/images/objects/radio/radio_inactive.png differ diff --git a/data/images/objects/spotlight/spotlight_base.png b/data/images/objects/spotlight/spotlight_base.png index 06c919fbd18..e85154a7bb1 100644 Binary files a/data/images/objects/spotlight/spotlight_base.png and b/data/images/objects/spotlight/spotlight_base.png differ diff --git a/data/images/objects/spotlight/spotlight_center.png b/data/images/objects/spotlight/spotlight_center.png index 5d2cf9b0fda..f60820aa7d9 100644 Binary files a/data/images/objects/spotlight/spotlight_center.png and b/data/images/objects/spotlight/spotlight_center.png differ diff --git a/data/images/objects/water_drop/pink-drop.png b/data/images/objects/water_drop/pink-drop.png index 338e56b8bd0..ec24595fed7 100644 Binary files a/data/images/objects/water_drop/pink-drop.png and b/data/images/objects/water_drop/pink-drop.png differ diff --git a/data/images/objects/water_drop/pink-particle-0.png b/data/images/objects/water_drop/pink-particle-0.png index 3efb8dfc0f1..6edd41aedeb 100644 Binary files a/data/images/objects/water_drop/pink-particle-0.png and b/data/images/objects/water_drop/pink-particle-0.png differ diff --git a/data/images/objects/water_drop/pink-particle-1.png b/data/images/objects/water_drop/pink-particle-1.png index 1e3c90f641d..ea4303c4185 100644 Binary files a/data/images/objects/water_drop/pink-particle-1.png and b/data/images/objects/water_drop/pink-particle-1.png differ diff --git a/data/images/objects/water_drop/pink-particle-2.png b/data/images/objects/water_drop/pink-particle-2.png index 8202ed52129..fd00db64138 100644 Binary files a/data/images/objects/water_drop/pink-particle-2.png and b/data/images/objects/water_drop/pink-particle-2.png differ diff --git a/data/images/objects/water_drop/pink-splash-0.png b/data/images/objects/water_drop/pink-splash-0.png index b68ab139109..ed631396bef 100644 Binary files a/data/images/objects/water_drop/pink-splash-0.png and b/data/images/objects/water_drop/pink-splash-0.png differ diff --git a/data/images/objects/water_drop/pink-splash-1.png b/data/images/objects/water_drop/pink-splash-1.png index 9b5c95043f4..5a31808f2a8 100644 Binary files a/data/images/objects/water_drop/pink-splash-1.png and b/data/images/objects/water_drop/pink-splash-1.png differ diff --git a/data/images/objects/water_drop/pink-splash-2.png b/data/images/objects/water_drop/pink-splash-2.png index 6f741ced7da..2ce69c4cc43 100644 Binary files a/data/images/objects/water_drop/pink-splash-2.png and b/data/images/objects/water_drop/pink-splash-2.png differ diff --git a/data/images/objects/water_drop/pink-splash-3.png b/data/images/objects/water_drop/pink-splash-3.png index 522e2c26b2a..301b472bbbc 100644 Binary files a/data/images/objects/water_drop/pink-splash-3.png and b/data/images/objects/water_drop/pink-splash-3.png differ diff --git a/data/images/objects/water_drop/pink-splash-4.png b/data/images/objects/water_drop/pink-splash-4.png index 0e35a96dae3..180efe9e2b4 100644 Binary files a/data/images/objects/water_drop/pink-splash-4.png and b/data/images/objects/water_drop/pink-splash-4.png differ diff --git a/data/images/objects/water_drop/pink-splash-5.png b/data/images/objects/water_drop/pink-splash-5.png new file mode 100644 index 00000000000..f1f80fdd57f Binary files /dev/null and b/data/images/objects/water_drop/pink-splash-5.png differ diff --git a/data/images/objects/water_drop/pink_drop.sprite b/data/images/objects/water_drop/pink_drop.sprite index 2ba8aacda36..28436c3b74f 100644 --- a/data/images/objects/water_drop/pink_drop.sprite +++ b/data/images/objects/water_drop/pink_drop.sprite @@ -13,7 +13,8 @@ "pink-splash-1.png" "pink-splash-2.png" "pink-splash-3.png" - "pink-splash-4.png") + "pink-splash-4.png" + "pink-splash-5.png") ) (action (name "particle_0") diff --git a/data/images/objects/water_drop/water-drop.png b/data/images/objects/water_drop/water-drop.png index c8a18c46566..13006780702 100644 Binary files a/data/images/objects/water_drop/water-drop.png and b/data/images/objects/water_drop/water-drop.png differ diff --git a/data/images/objects/water_drop/water-particle-0.png b/data/images/objects/water_drop/water-particle-0.png index 0f5fb37d5aa..92017766aa1 100644 Binary files a/data/images/objects/water_drop/water-particle-0.png and b/data/images/objects/water_drop/water-particle-0.png differ diff --git a/data/images/objects/water_drop/water-particle-1.png b/data/images/objects/water_drop/water-particle-1.png index 07da440d2a8..3077ed07ad0 100644 Binary files a/data/images/objects/water_drop/water-particle-1.png and b/data/images/objects/water_drop/water-particle-1.png differ diff --git a/data/images/objects/water_drop/water-particle-2.png b/data/images/objects/water_drop/water-particle-2.png index dc03a5840a8..ae75c2da665 100644 Binary files a/data/images/objects/water_drop/water-particle-2.png and b/data/images/objects/water_drop/water-particle-2.png differ diff --git a/data/images/objects/water_drop/water-particle-3.png b/data/images/objects/water_drop/water-particle-3.png index dddb95c2546..17592102181 100644 Binary files a/data/images/objects/water_drop/water-particle-3.png and b/data/images/objects/water_drop/water-particle-3.png differ diff --git a/data/images/objects/water_drop/water-splash-0.png b/data/images/objects/water_drop/water-splash-0.png index cac2f4a8d5f..f3c6a8d5709 100644 Binary files a/data/images/objects/water_drop/water-splash-0.png and b/data/images/objects/water_drop/water-splash-0.png differ diff --git a/data/images/objects/water_drop/water-splash-1.png b/data/images/objects/water_drop/water-splash-1.png index f062bc0fc11..eeb02138edb 100644 Binary files a/data/images/objects/water_drop/water-splash-1.png and b/data/images/objects/water_drop/water-splash-1.png differ diff --git a/data/images/objects/water_drop/water-splash-2.png b/data/images/objects/water_drop/water-splash-2.png index 59dc9b1d10e..53b2765461d 100644 Binary files a/data/images/objects/water_drop/water-splash-2.png and b/data/images/objects/water_drop/water-splash-2.png differ diff --git a/data/images/objects/water_drop/water-splash-3.png b/data/images/objects/water_drop/water-splash-3.png index 3785fc0942c..fbbb2b6b78d 100644 Binary files a/data/images/objects/water_drop/water-splash-3.png and b/data/images/objects/water_drop/water-splash-3.png differ diff --git a/data/images/objects/water_drop/water-splash-4.png b/data/images/objects/water_drop/water-splash-4.png index 1220228b682..8f8f45d6338 100644 Binary files a/data/images/objects/water_drop/water-splash-4.png and b/data/images/objects/water_drop/water-splash-4.png differ diff --git a/data/images/objects/water_drop/water-splash-5.png b/data/images/objects/water_drop/water-splash-5.png new file mode 100644 index 00000000000..97e9ff199a1 Binary files /dev/null and b/data/images/objects/water_drop/water-splash-5.png differ diff --git a/data/images/objects/water_drop/water_drop.sprite b/data/images/objects/water_drop/water_drop.sprite index 6ae189fa5ca..729da5d2a72 100644 --- a/data/images/objects/water_drop/water_drop.sprite +++ b/data/images/objects/water_drop/water_drop.sprite @@ -13,7 +13,8 @@ "water-splash-1.png" "water-splash-2.png" "water-splash-3.png" - "water-splash-4.png") + "water-splash-4.png" + "water-splash-5.png") ) (action (name "particle_0") diff --git a/data/images/particles/ice_piece1.png b/data/images/particles/ice_piece1.png index 8502a89ad84..6b836ca435a 100644 Binary files a/data/images/particles/ice_piece1.png and b/data/images/particles/ice_piece1.png differ diff --git a/data/images/particles/ice_piece2.png b/data/images/particles/ice_piece2.png index 3b91231801e..4d299e60c77 100644 Binary files a/data/images/particles/ice_piece2.png and b/data/images/particles/ice_piece2.png differ diff --git a/data/images/particles/leaf-0.png b/data/images/particles/leaf-0.png index 5b5584adab9..8fa497f79c2 100644 Binary files a/data/images/particles/leaf-0.png and b/data/images/particles/leaf-0.png differ diff --git a/data/images/particles/leaf.png b/data/images/particles/leaf.png new file mode 100644 index 00000000000..76022ac5edf Binary files /dev/null and b/data/images/particles/leaf.png differ diff --git a/data/images/particles/leaf.sprite b/data/images/particles/leaf.sprite index b9d0eaaae1d..9792652174a 100644 --- a/data/images/particles/leaf.sprite +++ b/data/images/particles/leaf.sprite @@ -3,7 +3,7 @@ (name "default") (fps 1.0) (images - "leaf-0.png" + "leaf.png" ) ) ) diff --git a/data/images/particles/leaf2.png b/data/images/particles/leaf2.png new file mode 100644 index 00000000000..76022ac5edf Binary files /dev/null and b/data/images/particles/leaf2.png differ diff --git a/data/images/particles/leaf2.sprite b/data/images/particles/leaf2.sprite new file mode 100644 index 00000000000..48ae7045237 --- /dev/null +++ b/data/images/particles/leaf2.sprite @@ -0,0 +1,9 @@ +(supertux-sprite + (action + (name "default") + (fps 1.0) + (images + "leaf2.png" + ) + ) +) diff --git a/data/images/particles/poof-1.png b/data/images/particles/poof-1.png new file mode 100644 index 00000000000..d7041cb094b Binary files /dev/null and b/data/images/particles/poof-1.png differ diff --git a/data/images/particles/poof-2.png b/data/images/particles/poof-2.png new file mode 100644 index 00000000000..2ebe56d27c2 Binary files /dev/null and b/data/images/particles/poof-2.png differ diff --git a/data/images/particles/poof-3.png b/data/images/particles/poof-3.png new file mode 100644 index 00000000000..b39e5b6421e Binary files /dev/null and b/data/images/particles/poof-3.png differ diff --git a/data/images/particles/poof-4.png b/data/images/particles/poof-4.png new file mode 100644 index 00000000000..cab5e68141c Binary files /dev/null and b/data/images/particles/poof-4.png differ diff --git a/data/images/particles/poof-5.png b/data/images/particles/poof-5.png new file mode 100644 index 00000000000..94a8bf22bdf Binary files /dev/null and b/data/images/particles/poof-5.png differ diff --git a/data/images/particles/poof.sprite b/data/images/particles/poof.sprite new file mode 100644 index 00000000000..bba2b2caa13 --- /dev/null +++ b/data/images/particles/poof.sprite @@ -0,0 +1,11 @@ +(supertux-sprite + (action + (fps 20) + (hitbox -8 -8 0 0) + (images "poof-1.png" + "poof-2.png" + "poof-3.png" + "poof-4.png" + "poof-5.png") + ) +) diff --git a/data/images/particles/stomp.png b/data/images/particles/stomp.png index 9718a1d9a24..36eaf7994d3 100644 Binary files a/data/images/particles/stomp.png and b/data/images/particles/stomp.png differ diff --git a/data/images/particles/viciousivy-0.png b/data/images/particles/viciousivy-0.png deleted file mode 100644 index 2b5860b28d0..00000000000 Binary files a/data/images/particles/viciousivy-0.png and /dev/null differ diff --git a/data/images/particles/viciousivy-1.png b/data/images/particles/viciousivy-1.png deleted file mode 100644 index d2985037314..00000000000 Binary files a/data/images/particles/viciousivy-1.png and /dev/null differ diff --git a/data/images/particles/viciousivy-2.png b/data/images/particles/viciousivy-2.png deleted file mode 100644 index ac1faa91a30..00000000000 Binary files a/data/images/particles/viciousivy-2.png and /dev/null differ diff --git a/data/images/particles/viciousivy-3.png b/data/images/particles/viciousivy-3.png deleted file mode 100644 index 8df925471a6..00000000000 Binary files a/data/images/particles/viciousivy-3.png and /dev/null differ diff --git a/data/images/particles/viciousivy.png b/data/images/particles/viciousivy.png new file mode 100644 index 00000000000..bfddff883d1 Binary files /dev/null and b/data/images/particles/viciousivy.png differ diff --git a/data/images/particles/viciousivy.sprite b/data/images/particles/viciousivy.sprite index 5888e9861b1..631764490e1 100644 --- a/data/images/particles/viciousivy.sprite +++ b/data/images/particles/viciousivy.sprite @@ -1,12 +1,8 @@ (supertux-sprite (action (name "default") -(fps 4.0) (images - "viciousivy-0.png" -"viciousivy-1.png" -"viciousivy-2.png" -"viciousivy-3.png" + "viciousivy.png" ) ) ) diff --git a/data/images/particles/walkingleaf-0.png b/data/images/particles/walkingleaf-0.png deleted file mode 100644 index 889e9b49c91..00000000000 Binary files a/data/images/particles/walkingleaf-0.png and /dev/null differ diff --git a/data/images/particles/walkingleaf-1.png b/data/images/particles/walkingleaf-1.png deleted file mode 100644 index fbc970019b1..00000000000 Binary files a/data/images/particles/walkingleaf-1.png and /dev/null differ diff --git a/data/images/particles/walkingleaf-2.png b/data/images/particles/walkingleaf-2.png deleted file mode 100644 index 1c8c219d37e..00000000000 Binary files a/data/images/particles/walkingleaf-2.png and /dev/null differ diff --git a/data/images/particles/walkingleaf-3.png b/data/images/particles/walkingleaf-3.png deleted file mode 100644 index bfe6ce6a799..00000000000 Binary files a/data/images/particles/walkingleaf-3.png and /dev/null differ diff --git a/data/images/particles/walkingleaf.png b/data/images/particles/walkingleaf.png new file mode 100644 index 00000000000..43c2a0bdce5 Binary files /dev/null and b/data/images/particles/walkingleaf.png differ diff --git a/data/images/particles/walkingleaf.sprite b/data/images/particles/walkingleaf.sprite index dd22be8df6d..2f2487188ac 100644 --- a/data/images/particles/walkingleaf.sprite +++ b/data/images/particles/walkingleaf.sprite @@ -1,12 +1,8 @@ (supertux-sprite (action (name "default") -(fps 4.0) (images - "walkingleaf-0.png" -"walkingleaf-1.png" -"walkingleaf-2.png" -"walkingleaf-3.png" + "walkingleaf.png" ) ) ) diff --git a/data/images/powerups/airflower/air_flower-0.png b/data/images/powerups/airflower/air_flower-0.png index bf51d84c3a7..6652b2220c4 100644 Binary files a/data/images/powerups/airflower/air_flower-0.png and b/data/images/powerups/airflower/air_flower-0.png differ diff --git a/data/images/powerups/airflower/air_flower-1.png b/data/images/powerups/airflower/air_flower-1.png index 3e1c3cb2ae4..b5f058012e4 100644 Binary files a/data/images/powerups/airflower/air_flower-1.png and b/data/images/powerups/airflower/air_flower-1.png differ diff --git a/data/images/powerups/airflower/air_flower-2.png b/data/images/powerups/airflower/air_flower-2.png index a5d50e3b5ee..1b51a90a6bb 100644 Binary files a/data/images/powerups/airflower/air_flower-2.png and b/data/images/powerups/airflower/air_flower-2.png differ diff --git a/data/images/powerups/airflower/air_flower-3.png b/data/images/powerups/airflower/air_flower-3.png index 20cf44082df..3319ecee4d2 100644 Binary files a/data/images/powerups/airflower/air_flower-3.png and b/data/images/powerups/airflower/air_flower-3.png differ diff --git a/data/images/powerups/airflower/airflower.sprite b/data/images/powerups/airflower/airflower.sprite index dda2e51b8f4..0e601c8f9ac 100644 --- a/data/images/powerups/airflower/airflower.sprite +++ b/data/images/powerups/airflower/airflower.sprite @@ -2,6 +2,10 @@ (action (name "default") (images "air_flower-0.png" + "air_flower-0.png" + "air_flower-0.png" + "air_flower-0.png" + "air_flower-0.png" "air_flower-1.png" "air_flower-2.png" "air_flower-3.png" diff --git a/data/images/powerups/earthflower/earth_flower-0.png b/data/images/powerups/earthflower/earth_flower-0.png index 0237a198305..f89a124284a 100644 Binary files a/data/images/powerups/earthflower/earth_flower-0.png and b/data/images/powerups/earthflower/earth_flower-0.png differ diff --git a/data/images/powerups/earthflower/earth_flower-1.png b/data/images/powerups/earthflower/earth_flower-1.png index 5a81cb18143..29ac17adc6a 100644 Binary files a/data/images/powerups/earthflower/earth_flower-1.png and b/data/images/powerups/earthflower/earth_flower-1.png differ diff --git a/data/images/powerups/earthflower/earth_flower-2.png b/data/images/powerups/earthflower/earth_flower-2.png index 0b3d6be32c3..277a931f816 100644 Binary files a/data/images/powerups/earthflower/earth_flower-2.png and b/data/images/powerups/earthflower/earth_flower-2.png differ diff --git a/data/images/powerups/earthflower/earth_flower-3.png b/data/images/powerups/earthflower/earth_flower-3.png index 5129684fa19..3017b86b46e 100644 Binary files a/data/images/powerups/earthflower/earth_flower-3.png and b/data/images/powerups/earthflower/earth_flower-3.png differ diff --git a/data/images/powerups/earthflower/earthflower.sprite b/data/images/powerups/earthflower/earthflower.sprite index 213993e1511..d38323fc517 100644 --- a/data/images/powerups/earthflower/earthflower.sprite +++ b/data/images/powerups/earthflower/earthflower.sprite @@ -1,9 +1,22 @@ (supertux-sprite (action (name "default") + (fps 12) (images "earth_flower-0.png" + "earth_flower-0.png" + "earth_flower-0.png" + "earth_flower-0.png" + "earth_flower-0.png" + "earth_flower-0.png" + "earth_flower-1.png" "earth_flower-1.png" "earth_flower-2.png" "earth_flower-3.png" + "earth_flower-3.png" + "earth_flower-3.png" + "earth_flower-3.png" + "earth_flower-3.png" + "earth_flower-3.png" + "earth_flower-3.png" "earth_flower-2.png" "earth_flower-1.png"))) diff --git a/data/images/powerups/egg/egg.png b/data/images/powerups/egg/egg.png index dfff6650b20..df390d3c9bd 100644 Binary files a/data/images/powerups/egg/egg.png and b/data/images/powerups/egg/egg.png differ diff --git a/data/images/powerups/fireflower/fire_flower-0.png b/data/images/powerups/fireflower/fire_flower-0.png index 8c0337b1da8..f87bbd4cba2 100644 Binary files a/data/images/powerups/fireflower/fire_flower-0.png and b/data/images/powerups/fireflower/fire_flower-0.png differ diff --git a/data/images/powerups/fireflower/fire_flower-1.png b/data/images/powerups/fireflower/fire_flower-1.png index cf4cc08a4a5..f56092a751a 100644 Binary files a/data/images/powerups/fireflower/fire_flower-1.png and b/data/images/powerups/fireflower/fire_flower-1.png differ diff --git a/data/images/powerups/fireflower/fire_flower-2.png b/data/images/powerups/fireflower/fire_flower-2.png index d709eaa043a..a25a51d2ff0 100644 Binary files a/data/images/powerups/fireflower/fire_flower-2.png and b/data/images/powerups/fireflower/fire_flower-2.png differ diff --git a/data/images/powerups/fireflower/fire_flower-3.png b/data/images/powerups/fireflower/fire_flower-3.png index d832b02d9b6..ec0e9daaaee 100644 Binary files a/data/images/powerups/fireflower/fire_flower-3.png and b/data/images/powerups/fireflower/fire_flower-3.png differ diff --git a/data/images/powerups/fireflower/fireflower.sprite b/data/images/powerups/fireflower/fireflower.sprite index 72b8481441b..c026bddaf2b 100644 --- a/data/images/powerups/fireflower/fireflower.sprite +++ b/data/images/powerups/fireflower/fireflower.sprite @@ -2,8 +2,12 @@ (action (name "default") (images "fire_flower-0.png" + "fire_flower-0.png" + "fire_flower-0.png" "fire_flower-1.png" "fire_flower-2.png" "fire_flower-3.png" + "fire_flower-3.png" + "fire_flower-3.png" "fire_flower-2.png" "fire_flower-1.png"))) diff --git a/data/images/powerups/fish/fish_large.png b/data/images/powerups/fish/fish_large.deprecated.png similarity index 100% rename from data/images/powerups/fish/fish_large.png rename to data/images/powerups/fish/fish_large.deprecated.png diff --git a/data/images/powerups/fish/fish_small.png b/data/images/powerups/fish/fish_small.deprecated.png similarity index 100% rename from data/images/powerups/fish/fish_small.png rename to data/images/powerups/fish/fish_small.deprecated.png diff --git a/data/images/powerups/iceflower/ice_flower-0.png b/data/images/powerups/iceflower/ice_flower-0.png index fa24192212d..5b769108e23 100644 Binary files a/data/images/powerups/iceflower/ice_flower-0.png and b/data/images/powerups/iceflower/ice_flower-0.png differ diff --git a/data/images/powerups/iceflower/ice_flower-1.png b/data/images/powerups/iceflower/ice_flower-1.png index 1cf8c3ff69d..a107fcf26e5 100644 Binary files a/data/images/powerups/iceflower/ice_flower-1.png and b/data/images/powerups/iceflower/ice_flower-1.png differ diff --git a/data/images/powerups/iceflower/ice_flower-2.png b/data/images/powerups/iceflower/ice_flower-2.png index 49f69052d31..7c4920b0f25 100644 Binary files a/data/images/powerups/iceflower/ice_flower-2.png and b/data/images/powerups/iceflower/ice_flower-2.png differ diff --git a/data/images/powerups/iceflower/ice_flower-3.png b/data/images/powerups/iceflower/ice_flower-3.png index 4cf9a8cbda4..4f9f2598b3c 100644 Binary files a/data/images/powerups/iceflower/ice_flower-3.png and b/data/images/powerups/iceflower/ice_flower-3.png differ diff --git a/data/images/powerups/iceflower/ice_flower-4.png b/data/images/powerups/iceflower/ice_flower-4.png new file mode 100644 index 00000000000..dde011b9815 Binary files /dev/null and b/data/images/powerups/iceflower/ice_flower-4.png differ diff --git a/data/images/powerups/iceflower/iceflower.sprite b/data/images/powerups/iceflower/iceflower.sprite index e9812899aca..fe61fb858ca 100644 --- a/data/images/powerups/iceflower/iceflower.sprite +++ b/data/images/powerups/iceflower/iceflower.sprite @@ -1,9 +1,9 @@ (supertux-sprite (action (name "default") + (fps 12) (images "ice_flower-0.png" "ice_flower-1.png" "ice_flower-2.png" "ice_flower-3.png" - "ice_flower-2.png" - "ice_flower-1.png"))) + "ice_flower-4.png"))) diff --git a/data/images/tiles.strf b/data/images/tiles.strf index 2c92e3fe5a2..f40eada3bb9 100644 --- a/data/images/tiles.strf +++ b/data/images/tiles.strf @@ -21,7 +21,7 @@ ;; next-id: 7949 ;; free/skipped ids (please use before any other): - ;; 4639-4660, 5061-5089, 5268-5283, 5453-5527 + ;; 4642-4660, 5061-5089, 5268-5283, 5453-5527 ;; No group ids are currently skipped! Delete this line if any are and replace it with said ids... (tilegroup @@ -694,6 +694,7 @@ 1569 1571 4119 4120 1570 1573 4121 4122 1572 1574 4123 4124 + 4640 4641 4642 4643 1972 1976 1980 1984 1973 1977 1981 1985 1974 1978 1982 1986 @@ -8662,16 +8663,20 @@ ) (tiles - (width 2)(height 3) + (width 2)(height 5) (ids 1569 1571 1570 1573 1572 1574 + 4640 4641 + 4642 4643 ) (attributes 1024 1024 1024 1024 1024 1024 + 0 0 + 0 0 ) (images "tiles/forest/pogonia.png") ) diff --git a/data/images/tiles/forest/hole.png b/data/images/tiles/forest/hole.png index 69c7155cace..9b1307f2cb3 100644 Binary files a/data/images/tiles/forest/hole.png and b/data/images/tiles/forest/hole.png differ diff --git a/data/images/tiles/forest/pogonia.png b/data/images/tiles/forest/pogonia.png index e6ef7bfbbaa..7fcc09f6d20 100644 Binary files a/data/images/tiles/forest/pogonia.png and b/data/images/tiles/forest/pogonia.png differ diff --git a/data/images/tiles/forest/tree1.png b/data/images/tiles/forest/tree1.png index d7c7ccea441..21696627991 100644 Binary files a/data/images/tiles/forest/tree1.png and b/data/images/tiles/forest/tree1.png differ diff --git a/data/images/tiles/forest/underground/roots.png b/data/images/tiles/forest/underground/roots.png index fb719fa4b55..5c467827dbf 100644 Binary files a/data/images/tiles/forest/underground/roots.png and b/data/images/tiles/forest/underground/roots.png differ diff --git a/data/images/tiles/ghostwood/corruptvine.png b/data/images/tiles/ghostwood/corruptvine.png index 1a9cb322b34..bb27153aceb 100644 Binary files a/data/images/tiles/ghostwood/corruptvine.png and b/data/images/tiles/ghostwood/corruptvine.png differ diff --git a/data/images/tiles/ghostwood/ghosthole.png b/data/images/tiles/ghostwood/ghosthole.png index 70b6cee3506..8d541cf79e3 100644 Binary files a/data/images/tiles/ghostwood/ghosthole.png and b/data/images/tiles/ghostwood/ghosthole.png differ diff --git a/data/images/tiles/ghostwood/root-walljump.png b/data/images/tiles/ghostwood/root-walljump.png index 7647c1eba4d..c2e14339297 100644 Binary files a/data/images/tiles/ghostwood/root-walljump.png and b/data/images/tiles/ghostwood/root-walljump.png differ diff --git a/data/images/tiles/ghostwood/roots.png b/data/images/tiles/ghostwood/roots.png index 508c9984aac..9198c6bc8ab 100644 Binary files a/data/images/tiles/ghostwood/roots.png and b/data/images/tiles/ghostwood/roots.png differ diff --git a/data/images/tiles/snow/snow-walljump.png b/data/images/tiles/snow/snow-walljump.png index 4d4c090c798..af791cc08bb 100644 Binary files a/data/images/tiles/snow/snow-walljump.png and b/data/images/tiles/snow/snow-walljump.png differ diff --git a/data/images/worldmap/common/leveldot.sprite b/data/images/worldmap/common/leveldot.sprite index 6d103cc1b47..3b1e1dd0106 100644 --- a/data/images/worldmap/common/leveldot.sprite +++ b/data/images/worldmap/common/leveldot.sprite @@ -12,30 +12,26 @@ (action (name "perfect") (hitbox 16 16 0 0) - (images "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green_perfect-0.png" - "leveldot_green_perfect-1.png" - "leveldot_green_perfect-2.png" - "leveldot_green_perfect-3.png" - "leveldot_green_perfect-2.png" - "leveldot_green_perfect-1.png" - "leveldot_green_perfect-0.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png" - "leveldot_green.png") + (fps 6) + (images "leveldot_perfect.png" + "leveldot_perfect.png" + "leveldot_perfect.png" + "leveldot_perfect.png" + "leveldot_perfect.png" + "leveldot_perfect.png" + "leveldot_perfect.png" + "leveldot_perfect.png" + "leveldot_perfect.png" + "leveldot_perfect.png" + "leveldot_perfect_1.png" + "leveldot_perfect_2.png" + "leveldot_perfect_3.png" + "leveldot_perfect_3.png" + "leveldot_perfect_3.png" + "leveldot_perfect_3.png" + "leveldot_perfect_3.png" + "leveldot_perfect_3.png" + "leveldot_perfect_2.png" + "leveldot_perfect_1.png") ) ) diff --git a/data/images/worldmap/common/leveldot_green_perfect-0.png b/data/images/worldmap/common/leveldot_green_perfect-0.png deleted file mode 100644 index b92d522875d..00000000000 Binary files a/data/images/worldmap/common/leveldot_green_perfect-0.png and /dev/null differ diff --git a/data/images/worldmap/common/leveldot_green_perfect-1.png b/data/images/worldmap/common/leveldot_green_perfect-1.png deleted file mode 100644 index 25802a49a55..00000000000 Binary files a/data/images/worldmap/common/leveldot_green_perfect-1.png and /dev/null differ diff --git a/data/images/worldmap/common/leveldot_green_perfect-2.png b/data/images/worldmap/common/leveldot_green_perfect-2.png deleted file mode 100644 index bf7c9a6eb51..00000000000 Binary files a/data/images/worldmap/common/leveldot_green_perfect-2.png and /dev/null differ diff --git a/data/images/worldmap/common/leveldot_green_perfect-3.png b/data/images/worldmap/common/leveldot_green_perfect-3.png deleted file mode 100644 index d890a91b593..00000000000 Binary files a/data/images/worldmap/common/leveldot_green_perfect-3.png and /dev/null differ diff --git a/data/images/worldmap/common/leveldot_perfect.png b/data/images/worldmap/common/leveldot_perfect.png new file mode 100644 index 00000000000..9e1199b478b Binary files /dev/null and b/data/images/worldmap/common/leveldot_perfect.png differ diff --git a/data/images/worldmap/common/leveldot_perfect_1.png b/data/images/worldmap/common/leveldot_perfect_1.png new file mode 100644 index 00000000000..9bf24755608 Binary files /dev/null and b/data/images/worldmap/common/leveldot_perfect_1.png differ diff --git a/data/images/worldmap/common/leveldot_perfect_2.png b/data/images/worldmap/common/leveldot_perfect_2.png new file mode 100644 index 00000000000..deb588f6498 Binary files /dev/null and b/data/images/worldmap/common/leveldot_perfect_2.png differ diff --git a/data/images/worldmap/common/leveldot_perfect_3.png b/data/images/worldmap/common/leveldot_perfect_3.png new file mode 100644 index 00000000000..8775d762a56 Binary files /dev/null and b/data/images/worldmap/common/leveldot_perfect_3.png differ diff --git a/data/images/worldmap/shared/castle.png b/data/images/worldmap/shared/castle.png index 3b6daf3e545..11539037b32 100644 Binary files a/data/images/worldmap/shared/castle.png and b/data/images/worldmap/shared/castle.png differ diff --git a/src/object/bonus_block.cpp b/src/object/bonus_block.cpp index 273a6f594e9..0a3ddfaeac0 100644 --- a/src/object/bonus_block.cpp +++ b/src/object/bonus_block.cpp @@ -264,8 +264,8 @@ BonusBlock::get_settings() result.add_script(_("Script"), &m_script, "script"); result.add_int(_("Count"), &m_hit_counter, "count", get_default_hit_counter()); result.add_enum(_("Content"), reinterpret_cast(&m_contents), - { _("Coin"), _("Growth (fire flower)"), _("Growth (ice flower)"), _("Growth (air flower)"), - _("Growth (earth flower)"), _("Growth (retro)"), _("Star"), _("Star (retro)"), _("Tux doll"), _("Custom"), _("Script"), _("Light"), _("Light (On)"), + { _("Coin"), _("Growth (fire flower)"), _("Growth (Ice Rosette)"), _("Growth (air flower)"), + _("Growth (Rock Shroom)"), _("Growth (retro)"), _("Star"), _("Star (retro)"), _("Tux doll"), _("Custom"), _("Script"), _("Light"), _("Light (On)"), _("Trampoline"), _("Portable trampoline"), _("Coin rain"), _("Coin explosion"), _("Rock"), _("Potion") }, { "coin", "firegrow", "icegrow", "airgrow", "earthgrow", "retrogrow", "star", "retrostar", "1up", "custom", "script", "light", "light-on", "trampoline", "portabletrampoline", "rain", "explode", "rock", "potion" }, diff --git a/src/object/bullet.cpp b/src/object/bullet.cpp index 4bd62d1a0a3..6e725fd381d 100644 --- a/src/object/bullet.cpp +++ b/src/object/bullet.cpp @@ -17,6 +17,7 @@ #include "object/bullet.hpp" #include "math/random.hpp" +#include "math/util.hpp" #include "object/camera.hpp" #include "sprite/sprite.hpp" #include "sprite/sprite_manager.hpp" @@ -24,6 +25,7 @@ #include "supertux/sector.hpp" #include "video/video_system.hpp" #include "video/viewport.hpp" +#include "object/sprite_particle.hpp" Bullet::Bullet(const Vector& pos, const Vector& xm, Direction dir, BonusType type_, Player& player) : m_player(player), @@ -31,7 +33,9 @@ Bullet::Bullet(const Vector& pos, const Vector& xm, Direction dir, BonusType typ life_count(3), sprite(), lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light-small.sprite")), - type(type_) + type(type_), + angle(0), + particle_time(0) { physic.set_velocity(xm); @@ -55,11 +59,36 @@ Bullet::Bullet(const Vector& pos, const Vector& xm, Direction dir, BonusType typ m_col.m_bbox.set_pos(pos); m_col.m_bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height()); + sprite->set_action(physic.get_velocity_x() > 0 ? "right" : "left"); } void Bullet::update(float dt_sec) { + + sprite->set_angle(math::degrees(angle) * (type == BONUS_ICE ? 1 : 3)); + + if (physic.get_velocity_x() > 0) { + angle += dt_sec * math::PI * 4; + } + else { + angle -= dt_sec * math::PI * 4; + } + + particle_time += dt_sec; + if (particle_time >= 0.08) { + Sector::get().add( + (type == BONUS_ICE ? + "images/objects/bullets/icebullet_tail.sprite": + "images/objects/bullets/firebullet_tail.sprite"), + "default", + Vector(get_pos().x, get_pos().y), ANCHOR_MIDDLE, + Vector(0, 0), Vector(0, 0), + LAYER_OBJECTS - 1); + particle_time = 0; + } + + // Cause fireball color to flicker randomly. if (graphicsRandom.rand(5) != 0) { lightsprite->set_color(Color(0.3f + graphicsRandom.randf(10) / 100.0f, diff --git a/src/object/bullet.hpp b/src/object/bullet.hpp index 513fc5da0f4..b31deaf1e49 100644 --- a/src/object/bullet.hpp +++ b/src/object/bullet.hpp @@ -57,6 +57,8 @@ class Bullet final : public MovingObject SpritePtr sprite; SpritePtr lightsprite; BonusType type; + float angle; + float particle_time; private: Bullet(const Bullet&) = delete; diff --git a/src/object/player.cpp b/src/object/player.cpp index f4b56492ace..ccb91d94669 100644 --- a/src/object/player.cpp +++ b/src/object/player.cpp @@ -1627,7 +1627,7 @@ Player::handle_input() if ((get_bonus() == BONUS_FIRE && active_bullets < MAX_FIRE_BULLETS) || (get_bonus() == BONUS_ICE && active_bullets < MAX_ICE_BULLETS)) { - Vector pos = get_pos() + Vector(m_col.m_bbox.get_width() / 2.f, m_col.m_bbox.get_height() / 2.f); + Vector pos = get_pos() + Vector(m_col.m_bbox.get_width() / 2.f, m_col.m_bbox.get_height() / 4.f); Direction swim_dir; swim_dir = ((std::abs(m_swimming_angle) <= math::PI_2) || (m_water_jump && std::abs(m_physic.get_velocity_x()) < 10.f)) ? Direction::RIGHT : Direction::LEFT; diff --git a/src/object/powerup.cpp b/src/object/powerup.cpp index 54480880a57..dba3348400e 100644 --- a/src/object/powerup.cpp +++ b/src/object/powerup.cpp @@ -60,9 +60,9 @@ PowerUp::get_types() const return { { "egg", _("Egg") }, { "fire", _("Fire Flower") }, - { "ice", _("Ice Flower") }, + { "ice", _("Ice Rosette") }, { "air", _("Air Flower") }, - { "earth", _("Earth Flower") }, + { "earth", _("Rock Shroom") }, { "star", _("Star") }, { "oneup", _("Tux Doll") }, { "flip", _("Flip Potion") },