From abf8b3d172ecbe4db2581862a7888df0e72ade37 Mon Sep 17 00:00:00 2001
From: MatusGuy <MatusGuy@users.noreply.github.com>
Date: Sun, 17 Nov 2024 14:27:32 +0000
Subject: [PATCH 1/2] Change all "normal" actions to "default"

---
 data/images/creatures/fish/forest/jumpfish.sprite            | 2 +-
 data/images/creatures/flame/flame.sprite                     | 2 +-
 data/images/creatures/flame/ghostflame.sprite                | 2 +-
 data/images/creatures/flame/iceflame.sprite                  | 2 +-
 data/images/creatures/flame_fish/flame_fish.sprite           | 2 +-
 data/images/creatures/ghosttree/ghosttree.sprite             | 2 +-
 data/images/creatures/skydive/skydive.sprite                 | 2 +-
 data/images/creatures/stalactite/stalactite_ice.sprite       | 2 +-
 data/images/creatures/stalactite/stalactite_rock.sprite      | 2 +-
 data/images/decal/forest/foxsleep.sprite                     | 2 +-
 data/images/engine/menu/mousecursor.sprite                   | 2 +-
 data/images/objects/bonus_block/bonusblock.sprite            | 2 +-
 data/images/objects/bonus_block/brick.sprite                 | 2 +-
 data/images/objects/bonus_block/brickIce.sprite              | 2 +-
 data/images/objects/bonus_block/brickWeb.sprite              | 2 +-
 data/images/objects/bonus_block/heavy-brick.sprite           | 2 +-
 data/images/objects/bonus_block/hiddenbonus.sprite           | 2 +-
 data/images/objects/bonus_block/icedbrick.sprite             | 2 +-
 data/images/objects/bonus_block/infoblock.sprite             | 2 +-
 data/images/objects/bonus_block/orangeblock.sprite           | 2 +-
 data/images/objects/bonus_block/purpleblock.sprite           | 2 +-
 data/images/objects/bonus_block/retro_brick.sprite           | 2 +-
 data/images/objects/bonus_block/retroblock.sprite            | 2 +-
 data/images/objects/bonus_block/scriptblock.sprite           | 2 +-
 data/images/objects/castledoor/keyholes.sprite               | 2 +-
 data/images/objects/castledoor/torchflame.sprite             | 2 +-
 data/images/objects/coin/coin.sprite                         | 2 +-
 data/images/objects/coin/retro_coin.sprite                   | 2 +-
 data/images/objects/crystals/crystal_1.sprite                | 2 +-
 data/images/objects/crystals/crystal_2.sprite                | 2 +-
 data/images/objects/crystals/crystal_3.sprite                | 2 +-
 data/images/objects/crystals/crystal_4.sprite                | 2 +-
 data/images/objects/fallblock/branchleft.sprite              | 2 +-
 data/images/objects/fallblock/branchright.sprite             | 2 +-
 data/images/objects/fallblock/cave-2x3.sprite                | 2 +-
 data/images/objects/fallblock/cave-3x2.sprite                | 2 +-
 data/images/objects/fallblock/cave-3x4.sprite                | 2 +-
 data/images/objects/fallblock/cave-4x3.sprite                | 2 +-
 data/images/objects/fallblock/cave-4x4.sprite                | 2 +-
 data/images/objects/fallblock/cave-4x6.sprite                | 2 +-
 data/images/objects/fallblock/cave-5x3.sprite                | 2 +-
 data/images/objects/fallblock/cave-5x7.sprite                | 2 +-
 data/images/objects/fallblock/cave-6x4.sprite                | 2 +-
 data/images/objects/fallblock/rockblock-0.5x0.5.sprite       | 2 +-
 data/images/objects/fallblock/rockblock-1x1.sprite           | 2 +-
 data/images/objects/fallblock/rockblock-1x2.sprite           | 2 +-
 data/images/objects/fallblock/rockblock-1x3.sprite           | 2 +-
 data/images/objects/fallblock/rockblock-2x1.sprite           | 2 +-
 data/images/objects/fallblock/rockblock-2x2.sprite           | 2 +-
 data/images/objects/fallblock/rockblock-2x3.sprite           | 2 +-
 data/images/objects/fallblock/rockblock-3x1.sprite           | 2 +-
 data/images/objects/fallblock/rockblock-3x2.sprite           | 2 +-
 data/images/objects/fallblock/rockblock-3x3.sprite           | 2 +-
 data/images/objects/fallblock/rockplatform-0.5x0.5.sprite    | 2 +-
 data/images/objects/fallblock/rockplatform-1x1.sprite        | 2 +-
 data/images/objects/fallblock/rockplatform-1x3.sprite        | 2 +-
 data/images/objects/fallblock/rockplatform-2x2.sprite        | 2 +-
 data/images/objects/fallblock/rockplatform-3x3.sprite        | 2 +-
 data/images/objects/fallblock/rockplatform-4x1.sprite        | 2 +-
 data/images/objects/fallblock/rockplatform-4x3.sprite        | 2 +-
 data/images/objects/firefly/firefly.sprite                   | 2 +-
 data/images/objects/icecube/icecube.sprite                   | 2 +-
 data/images/objects/lantern/lantern.sprite                   | 2 +-
 data/images/objects/letter/letter-small.sprite               | 2 +-
 data/images/objects/magicblock/magicblock.sprite             | 2 +-
 data/images/objects/resetpoints/bell.sprite                  | 2 +-
 data/images/objects/resetpoints/default-resetpoint.sprite    | 2 +-
 data/images/objects/resetpoints/firefly.sprite               | 2 +-
 data/images/objects/resetpoints/torch.sprite                 | 2 +-
 data/images/objects/resetpoints/vbell.sprite                 | 2 +-
 data/images/objects/rock/rock-b.sprite                       | 2 +-
 data/images/objects/rock/rock-c.sprite                       | 2 +-
 data/images/objects/rock/rock-d.sprite                       | 2 +-
 data/images/objects/rock/rock.sprite                         | 2 +-
 data/images/objects/rusty-trampoline/rusty-trampoline.sprite | 2 +-
 data/images/objects/skull_tile/skull_tile.sprite             | 2 +-
 data/images/objects/snowman/snow_man_big.sprite              | 2 +-
 data/images/objects/snowman/snow_man_big_passable.sprite     | 2 +-
 data/images/objects/snowman/snow_man_small.sprite            | 2 +-
 data/images/objects/trampoline/trampoline.sprite             | 2 +-
 data/images/objects/trampoline/trampoline_fix.sprite         | 2 +-
 data/images/objects/unstable_tile/brick.sprite               | 2 +-
 data/images/objects/unstable_tile/iceplatform.sprite         | 2 +-
 data/images/objects/unstable_tile/snow.sprite                | 2 +-
 data/images/objects/weak_block/meltbox.sprite                | 2 +-
 data/images/objects/weak_block/strawbox.sprite               | 2 +-
 data/images/particles/air_bubble.sprite                      | 2 +-
 data/images/particles/ice_piece1.sprite                      | 2 +-
 data/images/particles/ice_piece2.sprite                      | 2 +-
 data/images/particles/water_piece1.sprite                    | 2 +-
 data/images/particles/water_piece2.sprite                    | 2 +-
 data/images/powerups/egg/egg.sprite                          | 2 +-
 src/sprite/sprite.cpp                                        | 2 +-
 93 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/data/images/creatures/fish/forest/jumpfish.sprite b/data/images/creatures/fish/forest/jumpfish.sprite
index 48d0654c8f0..cec3cf63555 100644
--- a/data/images/creatures/fish/forest/jumpfish.sprite
+++ b/data/images/creatures/fish/forest/jumpfish.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (fps 18)
     (loops 1)
     (hitbox 12 24 40 46)
diff --git a/data/images/creatures/flame/flame.sprite b/data/images/creatures/flame/flame.sprite
index f2932799265..68ce8ec6a81 100644
--- a/data/images/creatures/flame/flame.sprite
+++ b/data/images/creatures/flame/flame.sprite
@@ -1,7 +1,7 @@
 (supertux-sprite
  (action
   (hitbox 0 0 31.8 31.8)
-  (name "normal")
+  (name "default")
   (images "flame-0.png"
           "flame-1.png"))
  (action
diff --git a/data/images/creatures/flame/ghostflame.sprite b/data/images/creatures/flame/ghostflame.sprite
index 4066b0c81cb..cff0a13bdd6 100644
--- a/data/images/creatures/flame/ghostflame.sprite
+++ b/data/images/creatures/flame/ghostflame.sprite
@@ -1,7 +1,7 @@
 (supertux-sprite
  (action
   (hitbox 0.2 0.2 31.6 31.6)
-  (name "normal")
+  (name "default")
   (images "ghostflame-0.png"
           "ghostflame-1.png"
           "ghostflame-2.png"
diff --git a/data/images/creatures/flame/iceflame.sprite b/data/images/creatures/flame/iceflame.sprite
index dd3eca9ad32..01829664ddd 100644
--- a/data/images/creatures/flame/iceflame.sprite
+++ b/data/images/creatures/flame/iceflame.sprite
@@ -1,7 +1,7 @@
 (supertux-sprite
  (action
   (hitbox 0 0 31.8 31.8)
-  (name "normal")
+  (name "default")
   (images "iceflame.png"))
  (action
   (hitbox 0 0 31.8 31.8)
diff --git a/data/images/creatures/flame_fish/flame_fish.sprite b/data/images/creatures/flame_fish/flame_fish.sprite
index 5c3f3c8791e..7f1cca404b0 100644
--- a/data/images/creatures/flame_fish/flame_fish.sprite
+++ b/data/images/creatures/flame_fish/flame_fish.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
  (action
-  (name "normal")
+  (name "default")
   (hitbox 2 3 0 0)
   (images "left-0.png"
           "left-1.png"))
diff --git a/data/images/creatures/ghosttree/ghosttree.sprite b/data/images/creatures/ghosttree/ghosttree.sprite
index 7c72c5b38c3..d1494af7d8d 100644
--- a/data/images/creatures/ghosttree/ghosttree.sprite
+++ b/data/images/creatures/ghosttree/ghosttree.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 230 300 40 60)
     (images
       "ghosttree.png"
diff --git a/data/images/creatures/skydive/skydive.sprite b/data/images/creatures/skydive/skydive.sprite
index 77078c62cef..1e61e7afc84 100644
--- a/data/images/creatures/skydive/skydive.sprite
+++ b/data/images/creatures/skydive/skydive.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
 	(fps 15)
     (hitbox 14 7 32 44)
     (images "skydive-0.png"
diff --git a/data/images/creatures/stalactite/stalactite_ice.sprite b/data/images/creatures/stalactite/stalactite_ice.sprite
index 10c8b02bbf8..2b31e18d56a 100644
--- a/data/images/creatures/stalactite/stalactite_ice.sprite
+++ b/data/images/creatures/stalactite/stalactite_ice.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
 	(action
-	  (name "normal")
+	  (name "default")
 	  (hitbox 0 15 32 48)
 	  (images "stalactite_ice.png"))
 	(action
diff --git a/data/images/creatures/stalactite/stalactite_rock.sprite b/data/images/creatures/stalactite/stalactite_rock.sprite
index 10dffc977f7..ca90f3d5f52 100644
--- a/data/images/creatures/stalactite/stalactite_rock.sprite
+++ b/data/images/creatures/stalactite/stalactite_rock.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
 	(action
-	  (name "normal")
+	  (name "default")
 	  (hitbox 4 15 32 48)
 	  (images "stalactite_rock.png"))
 	(action
diff --git a/data/images/decal/forest/foxsleep.sprite b/data/images/decal/forest/foxsleep.sprite
index 6106232269f..12b5dbc7b70 100644
--- a/data/images/decal/forest/foxsleep.sprite
+++ b/data/images/decal/forest/foxsleep.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (fps 10)
     (images "foxsleep1.png"
             "foxsleep2.png"
diff --git a/data/images/engine/menu/mousecursor.sprite b/data/images/engine/menu/mousecursor.sprite
index e14259322e0..ed5781c4aae 100644
--- a/data/images/engine/menu/mousecursor.sprite
+++ b/data/images/engine/menu/mousecursor.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
  (action
-  (name "normal")
+  (name "default")
   (images "mousecursor.png"))
 
  (action
diff --git a/data/images/objects/bonus_block/bonusblock.sprite b/data/images/objects/bonus_block/bonusblock.sprite
index 92e1894d9dd..fe9dd78e112 100644
--- a/data/images/objects/bonus_block/bonusblock.sprite
+++ b/data/images/objects/bonus_block/bonusblock.sprite
@@ -1,7 +1,7 @@
 (supertux-sprite
       (action
          (fps 15)
-         (name "normal")
+         (name "default")
          (images "full-0.png"
                  "full-1.png"
                  "full-2.png"
diff --git a/data/images/objects/bonus_block/brick.sprite b/data/images/objects/bonus_block/brick.sprite
index 0d8989344e6..0433df1e499 100644
--- a/data/images/objects/bonus_block/brick.sprite
+++ b/data/images/objects/bonus_block/brick.sprite
@@ -7,7 +7,7 @@
         (displacement-texture (file "displacement.png")))))
 
  (action
-  (name "normal")
+  (name "default")
   (images "../../tiles/blocks/brick0.png"))
 
  (action
diff --git a/data/images/objects/bonus_block/brickIce.sprite b/data/images/objects/bonus_block/brickIce.sprite
index 22a1e8ba6e5..372c34ec8fe 100644
--- a/data/images/objects/bonus_block/brickIce.sprite
+++ b/data/images/objects/bonus_block/brickIce.sprite
@@ -7,7 +7,7 @@
     (displacement-texture (file "displacement.png")))))
 
  (action
-  (name "normal")
+  (name "default")
   (images "../../tiles/blocks/brick1.png"))
 
  (action
diff --git a/data/images/objects/bonus_block/brickWeb.sprite b/data/images/objects/bonus_block/brickWeb.sprite
index a01557a9049..78f86f6b369 100644
--- a/data/images/objects/bonus_block/brickWeb.sprite
+++ b/data/images/objects/bonus_block/brickWeb.sprite
@@ -7,7 +7,7 @@
     (displacement-texture (file "displacement.png")))))
 
  (action
-  (name "normal")
+  (name "default")
   (images "../../tiles/blocks/brick2.png"))
 
  (action
diff --git a/data/images/objects/bonus_block/heavy-brick.sprite b/data/images/objects/bonus_block/heavy-brick.sprite
index 72a8834747b..6e1d2304166 100644
--- a/data/images/objects/bonus_block/heavy-brick.sprite
+++ b/data/images/objects/bonus_block/heavy-brick.sprite
@@ -7,7 +7,7 @@
     (displacement-texture (file "displacement.png")))))
 
  (action
-  (name "normal")
+  (name "default")
   (images "../../tiles/blocks/brick3.png"))
 
  (action
diff --git a/data/images/objects/bonus_block/hiddenbonus.sprite b/data/images/objects/bonus_block/hiddenbonus.sprite
index 272993515c2..e77f15f1626 100644
--- a/data/images/objects/bonus_block/hiddenbonus.sprite
+++ b/data/images/objects/bonus_block/hiddenbonus.sprite
@@ -6,6 +6,6 @@
            (diffuse-texture (file "empty.png"))
            (displacement-texture (file "displacement.png")))))
       (action 
-        (name "normal")
+        (name "default")
         (images "invisible.png"))
 )
diff --git a/data/images/objects/bonus_block/icedbrick.sprite b/data/images/objects/bonus_block/icedbrick.sprite
index b71a69ba7e0..400e91ccbf1 100644
--- a/data/images/objects/bonus_block/icedbrick.sprite
+++ b/data/images/objects/bonus_block/icedbrick.sprite
@@ -4,7 +4,7 @@
   (images "empty.png"))
 
  (action
-  (name "normal")
+  (name "default")
   (images "../../tiles/blocks/brick1.png"))
 
  (action
diff --git a/data/images/objects/bonus_block/infoblock.sprite b/data/images/objects/bonus_block/infoblock.sprite
index 4236da4aaa7..9f88577e5e9 100644
--- a/data/images/objects/bonus_block/infoblock.sprite
+++ b/data/images/objects/bonus_block/infoblock.sprite
@@ -1,7 +1,7 @@
 (supertux-sprite
     (action
 	  (fps 15)
-      (name "normal")
+      (name "default")
       (images "infoblock-0.png"
               "infoblock-1.png"
               "infoblock-2.png"
diff --git a/data/images/objects/bonus_block/orangeblock.sprite b/data/images/objects/bonus_block/orangeblock.sprite
index 95dfc235e08..3d6a315b14e 100644
--- a/data/images/objects/bonus_block/orangeblock.sprite
+++ b/data/images/objects/bonus_block/orangeblock.sprite
@@ -1,7 +1,7 @@
 (supertux-sprite
       (action
          (fps 15)
-         (name "normal")
+         (name "default")
          (images "orange-0.png"
                  "orange-1.png"
                  "orange-2.png"
diff --git a/data/images/objects/bonus_block/purpleblock.sprite b/data/images/objects/bonus_block/purpleblock.sprite
index 2301e43623b..ab33589a0c2 100644
--- a/data/images/objects/bonus_block/purpleblock.sprite
+++ b/data/images/objects/bonus_block/purpleblock.sprite
@@ -1,7 +1,7 @@
 (supertux-sprite
       (action
          (fps 15)
-         (name "normal")
+         (name "default")
          (images "purple-0.png"
                  "purple-1.png"
                  "purple-2.png"
diff --git a/data/images/objects/bonus_block/retro_brick.sprite b/data/images/objects/bonus_block/retro_brick.sprite
index ce5da78aa7c..3555dd1fcf9 100644
--- a/data/images/objects/bonus_block/retro_brick.sprite
+++ b/data/images/objects/bonus_block/retro_brick.sprite
@@ -7,6 +7,6 @@
         (displacement-texture (file "displacement.png")))))
 
  (action
-  (name "normal")
+  (name "default")
   (images "../../tiles/blocks/retro_brick.png"))
  )
diff --git a/data/images/objects/bonus_block/retroblock.sprite b/data/images/objects/bonus_block/retroblock.sprite
index b5b79a4d556..ce558dcf07c 100644
--- a/data/images/objects/bonus_block/retroblock.sprite
+++ b/data/images/objects/bonus_block/retroblock.sprite
@@ -1,7 +1,7 @@
 (supertux-sprite
       (action
          (fps 15)
-         (name "normal")
+         (name "default")
          (images "box-full.png"
                  ))
       (action
diff --git a/data/images/objects/bonus_block/scriptblock.sprite b/data/images/objects/bonus_block/scriptblock.sprite
index bcdf64d4cc5..40db0a2475d 100644
--- a/data/images/objects/bonus_block/scriptblock.sprite
+++ b/data/images/objects/bonus_block/scriptblock.sprite
@@ -1,7 +1,7 @@
 (supertux-sprite
       (action
          (fps 15)
-		 (name "normal")
+		 (name "default")
          (images "scriptblock-0.png"
                  "scriptblock-1.png"
                  "scriptblock-2.png"
diff --git a/data/images/objects/castledoor/keyholes.sprite b/data/images/objects/castledoor/keyholes.sprite
index 18d2d849114..c53888754a7 100644
--- a/data/images/objects/castledoor/keyholes.sprite
+++ b/data/images/objects/castledoor/keyholes.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
  (action
-  (name "normal")
+  (name "default")
   (hitbox 0 0 0 0)
   (images "keyholes.png"))
 )
diff --git a/data/images/objects/castledoor/torchflame.sprite b/data/images/objects/castledoor/torchflame.sprite
index cb204afd283..48cf6295d69 100644
--- a/data/images/objects/castledoor/torchflame.sprite
+++ b/data/images/objects/castledoor/torchflame.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
  (action
-  (name "normal")
+  (name "default")
   (hitbox 0 0 0 0)
 (fps 4)
   (images 
diff --git a/data/images/objects/coin/coin.sprite b/data/images/objects/coin/coin.sprite
index 8c14924d1a9..b3f7196ed5b 100644
--- a/data/images/objects/coin/coin.sprite
+++ b/data/images/objects/coin/coin.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
       (action 
-          (name "normal")
+          (name "default")
           (fps 15.0)
           (images "coin-0.png"
                   "coin-1.png"
diff --git a/data/images/objects/coin/retro_coin.sprite b/data/images/objects/coin/retro_coin.sprite
index bffde1a24f7..499455e3c52 100644
--- a/data/images/objects/coin/retro_coin.sprite
+++ b/data/images/objects/coin/retro_coin.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
       (action 
-          (name "normal")
+          (name "default")
           (fps 15.0)
           (images "retro_coin-0.png"
                   "retro_coin-1.png"
diff --git a/data/images/objects/crystals/crystal_1.sprite b/data/images/objects/crystals/crystal_1.sprite
index bafe455e899..7ef48a02365 100755
--- a/data/images/objects/crystals/crystal_1.sprite
+++ b/data/images/objects/crystals/crystal_1.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
       (action 
-          (name "normal")
+          (name "default")
           (images "c2.png"
                   "c1.png"))
       (action
diff --git a/data/images/objects/crystals/crystal_2.sprite b/data/images/objects/crystals/crystal_2.sprite
index 60f625037e6..450a94f70f3 100755
--- a/data/images/objects/crystals/crystal_2.sprite
+++ b/data/images/objects/crystals/crystal_2.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
       (action 
-          (name "normal")
+          (name "default")
           (images "d2.png"
                   "d1.png"))
       (action
diff --git a/data/images/objects/crystals/crystal_3.sprite b/data/images/objects/crystals/crystal_3.sprite
index 50ad06d666b..8866dcd8087 100755
--- a/data/images/objects/crystals/crystal_3.sprite
+++ b/data/images/objects/crystals/crystal_3.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
       (action 
-          (name "normal")
+          (name "default")
           (images "b2.png"
                   "b1.png"))
       (action
diff --git a/data/images/objects/crystals/crystal_4.sprite b/data/images/objects/crystals/crystal_4.sprite
index 7aa196929ee..951cf43aed2 100755
--- a/data/images/objects/crystals/crystal_4.sprite
+++ b/data/images/objects/crystals/crystal_4.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
       (action 
-          (name "normal")
+          (name "default")
           (images "a2.png"
                   "a1.png"))
       (action
diff --git a/data/images/objects/fallblock/branchleft.sprite b/data/images/objects/fallblock/branchleft.sprite
index 8c6ce10a938..b34813d5bc0 100644
--- a/data/images/objects/fallblock/branchleft.sprite
+++ b/data/images/objects/fallblock/branchleft.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 123 32)
     (images "branchleft.png")
   )
diff --git a/data/images/objects/fallblock/branchright.sprite b/data/images/objects/fallblock/branchright.sprite
index 44b1d86f112..da5a66c6564 100644
--- a/data/images/objects/fallblock/branchright.sprite
+++ b/data/images/objects/fallblock/branchright.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 5 32 123 32)
     (images "branchright.png")
   )
diff --git a/data/images/objects/fallblock/cave-2x3.sprite b/data/images/objects/fallblock/cave-2x3.sprite
index dd00a6a3764..ef0e2948dad 100644
--- a/data/images/objects/fallblock/cave-2x3.sprite
+++ b/data/images/objects/fallblock/cave-2x3.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 64 96)
     (images "cave-2x3.png")
   )
diff --git a/data/images/objects/fallblock/cave-3x2.sprite b/data/images/objects/fallblock/cave-3x2.sprite
index a31db7c6743..609d537ba49 100644
--- a/data/images/objects/fallblock/cave-3x2.sprite
+++ b/data/images/objects/fallblock/cave-3x2.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 96 64)
     (images "cave-3x2.png")
   )
diff --git a/data/images/objects/fallblock/cave-3x4.sprite b/data/images/objects/fallblock/cave-3x4.sprite
index ad7d2936cda..37f11a888f1 100644
--- a/data/images/objects/fallblock/cave-3x4.sprite
+++ b/data/images/objects/fallblock/cave-3x4.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 96 128)
     (images "cave-3x4.png")
   )
diff --git a/data/images/objects/fallblock/cave-4x3.sprite b/data/images/objects/fallblock/cave-4x3.sprite
index 0fc808c4ab9..bce2aaf120b 100644
--- a/data/images/objects/fallblock/cave-4x3.sprite
+++ b/data/images/objects/fallblock/cave-4x3.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 128 96)
     (images "cave-4x3.png")
   )
diff --git a/data/images/objects/fallblock/cave-4x4.sprite b/data/images/objects/fallblock/cave-4x4.sprite
index 551c4e8c1ab..71cb876ff72 100644
--- a/data/images/objects/fallblock/cave-4x4.sprite
+++ b/data/images/objects/fallblock/cave-4x4.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 128 128)
     (images "cave-4x4.png")
   )
diff --git a/data/images/objects/fallblock/cave-4x6.sprite b/data/images/objects/fallblock/cave-4x6.sprite
index 09350cf50b4..835416148dc 100644
--- a/data/images/objects/fallblock/cave-4x6.sprite
+++ b/data/images/objects/fallblock/cave-4x6.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 128 192)
     (images "cave-4x6.png")
   )
diff --git a/data/images/objects/fallblock/cave-5x3.sprite b/data/images/objects/fallblock/cave-5x3.sprite
index 280898c0931..58bfb3df8ff 100644
--- a/data/images/objects/fallblock/cave-5x3.sprite
+++ b/data/images/objects/fallblock/cave-5x3.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 160 96)
     (images "cave-5x3.png")
   )
diff --git a/data/images/objects/fallblock/cave-5x7.sprite b/data/images/objects/fallblock/cave-5x7.sprite
index 89273b6fbc5..a4e0829c9dd 100644
--- a/data/images/objects/fallblock/cave-5x7.sprite
+++ b/data/images/objects/fallblock/cave-5x7.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 160 224)
     (images "cave-5x7.png")
   )
diff --git a/data/images/objects/fallblock/cave-6x4.sprite b/data/images/objects/fallblock/cave-6x4.sprite
index 72f792c1242..259fa1bb1df 100644
--- a/data/images/objects/fallblock/cave-6x4.sprite
+++ b/data/images/objects/fallblock/cave-6x4.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 192 128)
     (images "cave-6x4.png")
   )
diff --git a/data/images/objects/fallblock/rockblock-0.5x0.5.sprite b/data/images/objects/fallblock/rockblock-0.5x0.5.sprite
index 8429a8a6031..bba568ff254 100644
--- a/data/images/objects/fallblock/rockblock-0.5x0.5.sprite
+++ b/data/images/objects/fallblock/rockblock-0.5x0.5.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 16 16)
     (images "rockblock-0.5x0.5.png")
   )
diff --git a/data/images/objects/fallblock/rockblock-1x1.sprite b/data/images/objects/fallblock/rockblock-1x1.sprite
index 0c3c49e194d..cc505e98f4b 100644
--- a/data/images/objects/fallblock/rockblock-1x1.sprite
+++ b/data/images/objects/fallblock/rockblock-1x1.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 32 32)
     (images "rockblock-1x1.png")
   )
diff --git a/data/images/objects/fallblock/rockblock-1x2.sprite b/data/images/objects/fallblock/rockblock-1x2.sprite
index 45be9f37836..f87ecd028bc 100644
--- a/data/images/objects/fallblock/rockblock-1x2.sprite
+++ b/data/images/objects/fallblock/rockblock-1x2.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 32 64)
     (images "rockblock-1x2.png")
   )
diff --git a/data/images/objects/fallblock/rockblock-1x3.sprite b/data/images/objects/fallblock/rockblock-1x3.sprite
index f9254fff9c4..b19108e5c8e 100644
--- a/data/images/objects/fallblock/rockblock-1x3.sprite
+++ b/data/images/objects/fallblock/rockblock-1x3.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 32 96)
     (images "rockblock-1x3.png")
   )
diff --git a/data/images/objects/fallblock/rockblock-2x1.sprite b/data/images/objects/fallblock/rockblock-2x1.sprite
index 7630812c031..852cc1901f3 100644
--- a/data/images/objects/fallblock/rockblock-2x1.sprite
+++ b/data/images/objects/fallblock/rockblock-2x1.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 64 32)
     (images "rockblock-2x1.png")
   )
diff --git a/data/images/objects/fallblock/rockblock-2x2.sprite b/data/images/objects/fallblock/rockblock-2x2.sprite
index 5b6adc5667e..a28a22386d8 100644
--- a/data/images/objects/fallblock/rockblock-2x2.sprite
+++ b/data/images/objects/fallblock/rockblock-2x2.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 64 64)
     (images "rockblock-2x2.png")
   )
diff --git a/data/images/objects/fallblock/rockblock-2x3.sprite b/data/images/objects/fallblock/rockblock-2x3.sprite
index 6647650f71d..20a1fee5122 100644
--- a/data/images/objects/fallblock/rockblock-2x3.sprite
+++ b/data/images/objects/fallblock/rockblock-2x3.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 64 96)
     (images "rockblock-2x3.png")
   )
diff --git a/data/images/objects/fallblock/rockblock-3x1.sprite b/data/images/objects/fallblock/rockblock-3x1.sprite
index 0ab67b1485c..cc973e2fbdb 100644
--- a/data/images/objects/fallblock/rockblock-3x1.sprite
+++ b/data/images/objects/fallblock/rockblock-3x1.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 96 32)
     (images "rockblock-3x1.png")
   )
diff --git a/data/images/objects/fallblock/rockblock-3x2.sprite b/data/images/objects/fallblock/rockblock-3x2.sprite
index 37108ae5adf..146857c7b59 100644
--- a/data/images/objects/fallblock/rockblock-3x2.sprite
+++ b/data/images/objects/fallblock/rockblock-3x2.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 96 64)
     (images "rockblock-3x2.png")
   )
diff --git a/data/images/objects/fallblock/rockblock-3x3.sprite b/data/images/objects/fallblock/rockblock-3x3.sprite
index e21bd06ca87..aa1270219ae 100644
--- a/data/images/objects/fallblock/rockblock-3x3.sprite
+++ b/data/images/objects/fallblock/rockblock-3x3.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 96 96)
     (images "rockblock-3x3.png")
   )
diff --git a/data/images/objects/fallblock/rockplatform-0.5x0.5.sprite b/data/images/objects/fallblock/rockplatform-0.5x0.5.sprite
index 969ecb938b4..c81e615ee42 100644
--- a/data/images/objects/fallblock/rockplatform-0.5x0.5.sprite
+++ b/data/images/objects/fallblock/rockplatform-0.5x0.5.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 8 8 16 16)
     (images "rockplatform-0.5x0.5.png")
   )
diff --git a/data/images/objects/fallblock/rockplatform-1x1.sprite b/data/images/objects/fallblock/rockplatform-1x1.sprite
index 5743378bce8..731561da5c0 100644
--- a/data/images/objects/fallblock/rockplatform-1x1.sprite
+++ b/data/images/objects/fallblock/rockplatform-1x1.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 32 32)
     (images "rockplatform-1x1.png")
   )
diff --git a/data/images/objects/fallblock/rockplatform-1x3.sprite b/data/images/objects/fallblock/rockplatform-1x3.sprite
index 0aef7d5973d..b49d3b79438 100644
--- a/data/images/objects/fallblock/rockplatform-1x3.sprite
+++ b/data/images/objects/fallblock/rockplatform-1x3.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 32 96)
     (images "rockplatform-1x3.png")
   )
diff --git a/data/images/objects/fallblock/rockplatform-2x2.sprite b/data/images/objects/fallblock/rockplatform-2x2.sprite
index 345549cb1ac..fd5948efbdb 100644
--- a/data/images/objects/fallblock/rockplatform-2x2.sprite
+++ b/data/images/objects/fallblock/rockplatform-2x2.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 64 64)
     (images "rockplatform-2x2.png")
   )
diff --git a/data/images/objects/fallblock/rockplatform-3x3.sprite b/data/images/objects/fallblock/rockplatform-3x3.sprite
index 4a5e09d12fe..f85e0c4de67 100644
--- a/data/images/objects/fallblock/rockplatform-3x3.sprite
+++ b/data/images/objects/fallblock/rockplatform-3x3.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 96 96)
     (images "rockplatform-3x3.png")
   )
diff --git a/data/images/objects/fallblock/rockplatform-4x1.sprite b/data/images/objects/fallblock/rockplatform-4x1.sprite
index 1d69b86e50b..4f51bc1d2c6 100644
--- a/data/images/objects/fallblock/rockplatform-4x1.sprite
+++ b/data/images/objects/fallblock/rockplatform-4x1.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 128 32)
     (images "rockplatform-4x1.png")
   )
diff --git a/data/images/objects/fallblock/rockplatform-4x3.sprite b/data/images/objects/fallblock/rockplatform-4x3.sprite
index 9c3004c98cc..afa49507f09 100644
--- a/data/images/objects/fallblock/rockplatform-4x3.sprite
+++ b/data/images/objects/fallblock/rockplatform-4x3.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 32 128 96)
     (images "rockplatform-4x3.png")
   )
diff --git a/data/images/objects/firefly/firefly.sprite b/data/images/objects/firefly/firefly.sprite
index fd6ac33339b..88f77a5f729 100644
--- a/data/images/objects/firefly/firefly.sprite
+++ b/data/images/objects/firefly/firefly.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
  (action
-  (name "normal")
+  (name "default")
   (hitbox 0 0 0 0)
 (fps 1)
   (images "sleep-1.png"
diff --git a/data/images/objects/icecube/icecube.sprite b/data/images/objects/icecube/icecube.sprite
index 35f9c134da9..af0590474f5 100644
--- a/data/images/objects/icecube/icecube.sprite
+++ b/data/images/objects/icecube/icecube.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-  (name "normal")
+  (name "default")
   (hitbox 0 0 0 0)
 (fps 5)
   (images 
diff --git a/data/images/objects/lantern/lantern.sprite b/data/images/objects/lantern/lantern.sprite
index cfe4c5b614f..1337839c275 100644
--- a/data/images/objects/lantern/lantern.sprite
+++ b/data/images/objects/lantern/lantern.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
       (action
-        (name "normal")
+        (name "default")
         (hitbox 8 10 34 39)
 		(fps 16)
         (images
diff --git a/data/images/objects/letter/letter-small.sprite b/data/images/objects/letter/letter-small.sprite
index 36b0e620854..3b650d8f68f 100644
--- a/data/images/objects/letter/letter-small.sprite
+++ b/data/images/objects/letter/letter-small.sprite
@@ -1,5 +1,5 @@
 (supertux-sprite
       (action
-        (name "normal")
+        (name "default")
         (images "letter-small.png"))
 )
diff --git a/data/images/objects/magicblock/magicblock.sprite b/data/images/objects/magicblock/magicblock.sprite
index 3ba6b66250c..3ae552ccd26 100644
--- a/data/images/objects/magicblock/magicblock.sprite
+++ b/data/images/objects/magicblock/magicblock.sprite
@@ -1,7 +1,7 @@
 (supertux-sprite
       (action
       (hitbox 8 8 32 32)
-        (name "normal")
+        (name "default")
         (images "magicblock.png"))
       (action
         (name "solid")
diff --git a/data/images/objects/resetpoints/bell.sprite b/data/images/objects/resetpoints/bell.sprite
index 94f1da2d63d..04c620ac0e8 100644
--- a/data/images/objects/resetpoints/bell.sprite
+++ b/data/images/objects/resetpoints/bell.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
  (action
-  (name "normal")
+  (name "default")
   (images "bell-m.png")
   (hitbox 8 5 32 32)
  )
diff --git a/data/images/objects/resetpoints/default-resetpoint.sprite b/data/images/objects/resetpoints/default-resetpoint.sprite
index 94f1da2d63d..04c620ac0e8 100644
--- a/data/images/objects/resetpoints/default-resetpoint.sprite
+++ b/data/images/objects/resetpoints/default-resetpoint.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
  (action
-  (name "normal")
+  (name "default")
   (images "bell-m.png")
   (hitbox 8 5 32 32)
  )
diff --git a/data/images/objects/resetpoints/firefly.sprite b/data/images/objects/resetpoints/firefly.sprite
index 08dea16f213..48e20dc5329 100644
--- a/data/images/objects/resetpoints/firefly.sprite
+++ b/data/images/objects/resetpoints/firefly.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
  (action
-  (name "normal")
+  (name "default")
   (hitbox 0 0 0 0)
   (images "firefly1.png")
  )
diff --git a/data/images/objects/resetpoints/torch.sprite b/data/images/objects/resetpoints/torch.sprite
index 0e2a37f8f1b..60864918437 100644
--- a/data/images/objects/resetpoints/torch.sprite
+++ b/data/images/objects/resetpoints/torch.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
  (action
-  (name "normal")
+  (name "default")
   (hitbox 0 0 0 0)
 (fps 1)
   (images "torch-off1.png"
diff --git a/data/images/objects/resetpoints/vbell.sprite b/data/images/objects/resetpoints/vbell.sprite
index f15536cb310..bf05886669f 100644
--- a/data/images/objects/resetpoints/vbell.sprite
+++ b/data/images/objects/resetpoints/vbell.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
  (action
-  (name "normal")
+  (name "default")
   (x-offset 0)
   (y-offset 0)
   (images "vbell-m.png")
diff --git a/data/images/objects/rock/rock-b.sprite b/data/images/objects/rock/rock-b.sprite
index 4be4b6b1945..a422d6a655e 100644
--- a/data/images/objects/rock/rock-b.sprite
+++ b/data/images/objects/rock/rock-b.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 64 64)
     (images "rock-b.png")
   )
diff --git a/data/images/objects/rock/rock-c.sprite b/data/images/objects/rock/rock-c.sprite
index 5a51654c1e8..6a3e5df50a1 100644
--- a/data/images/objects/rock/rock-c.sprite
+++ b/data/images/objects/rock/rock-c.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 16 16)
     (images "rock-c.png")
   )
diff --git a/data/images/objects/rock/rock-d.sprite b/data/images/objects/rock/rock-d.sprite
index 13ee075ee00..6571bd43f1a 100644
--- a/data/images/objects/rock/rock-d.sprite
+++ b/data/images/objects/rock/rock-d.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 96 96)
     (images "rock-d.png")
   )
diff --git a/data/images/objects/rock/rock.sprite b/data/images/objects/rock/rock.sprite
index 6da3ecb6827..7a260213089 100644
--- a/data/images/objects/rock/rock.sprite
+++ b/data/images/objects/rock/rock.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 0 0 32 32)
     (images "rock.png")
   )
diff --git a/data/images/objects/rusty-trampoline/rusty-trampoline.sprite b/data/images/objects/rusty-trampoline/rusty-trampoline.sprite
index 2d7caa04540..bba2d612817 100644
--- a/data/images/objects/rusty-trampoline/rusty-trampoline.sprite
+++ b/data/images/objects/rusty-trampoline/rusty-trampoline.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 2 32 32 32)
     (images "rustytrampoline1.png")
   )
diff --git a/data/images/objects/skull_tile/skull_tile.sprite b/data/images/objects/skull_tile/skull_tile.sprite
index c830391b6c2..3c0dde65911 100644
--- a/data/images/objects/skull_tile/skull_tile.sprite
+++ b/data/images/objects/skull_tile/skull_tile.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (images "skull.png")
   )
   (action
diff --git a/data/images/objects/snowman/snow_man_big.sprite b/data/images/objects/snowman/snow_man_big.sprite
index 0e62b73c8d0..b36557e71ed 100755
--- a/data/images/objects/snowman/snow_man_big.sprite
+++ b/data/images/objects/snowman/snow_man_big.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
       (action 
-          (name "normal")
+          (name "default")
           (images "s_manbig_1.png"
                   "s_manbig_2.png"
                   "s_manbig_3.png"
diff --git a/data/images/objects/snowman/snow_man_big_passable.sprite b/data/images/objects/snowman/snow_man_big_passable.sprite
index 15475621dcd..1ee4aac4230 100755
--- a/data/images/objects/snowman/snow_man_big_passable.sprite
+++ b/data/images/objects/snowman/snow_man_big_passable.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
       (action 
-          (name "normal")
+          (name "default")
           (hitbox 2 4 1 1)
           (images "s_manbig_1.png"
                   "s_manbig_2.png"
diff --git a/data/images/objects/snowman/snow_man_small.sprite b/data/images/objects/snowman/snow_man_small.sprite
index f9685e295b6..adb266ab4c0 100755
--- a/data/images/objects/snowman/snow_man_small.sprite
+++ b/data/images/objects/snowman/snow_man_small.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
       (action 
-          (name "normal")
+          (name "default")
           (images "s_man_1.png"
                   "s_man_2.png"
                   "s_man_3.png"
diff --git a/data/images/objects/trampoline/trampoline.sprite b/data/images/objects/trampoline/trampoline.sprite
index 45e7637d6d5..b2be1e4e1d4 100644
--- a/data/images/objects/trampoline/trampoline.sprite
+++ b/data/images/objects/trampoline/trampoline.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 2 32 32 32)
     (images "trampoline1-0.png")
   )
diff --git a/data/images/objects/trampoline/trampoline_fix.sprite b/data/images/objects/trampoline/trampoline_fix.sprite
index 5e24be7afe3..6b65d5ecdc1 100644
--- a/data/images/objects/trampoline/trampoline_fix.sprite
+++ b/data/images/objects/trampoline/trampoline_fix.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (hitbox 2 32 32 32)
     (images "trampoline2-0.png")
   )
diff --git a/data/images/objects/unstable_tile/brick.sprite b/data/images/objects/unstable_tile/brick.sprite
index a186ae01d8f..8adfe0003e9 100644
--- a/data/images/objects/unstable_tile/brick.sprite
+++ b/data/images/objects/unstable_tile/brick.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (images 
       "brick-0.png"
     )
diff --git a/data/images/objects/unstable_tile/iceplatform.sprite b/data/images/objects/unstable_tile/iceplatform.sprite
index 51c691b5ebe..3f553df3d25 100644
--- a/data/images/objects/unstable_tile/iceplatform.sprite
+++ b/data/images/objects/unstable_tile/iceplatform.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (images 
       "iceplatform.png"
     )
diff --git a/data/images/objects/unstable_tile/snow.sprite b/data/images/objects/unstable_tile/snow.sprite
index bfe6c992cf3..447291d23d6 100644
--- a/data/images/objects/unstable_tile/snow.sprite
+++ b/data/images/objects/unstable_tile/snow.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (images 
       "snow-0.png"
     )
diff --git a/data/images/objects/weak_block/meltbox.sprite b/data/images/objects/weak_block/meltbox.sprite
index 391ee6e0e26..a4ec1246653 100644
--- a/data/images/objects/weak_block/meltbox.sprite
+++ b/data/images/objects/weak_block/meltbox.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (images 
       "meltbox-0.png"
     )
diff --git a/data/images/objects/weak_block/strawbox.sprite b/data/images/objects/weak_block/strawbox.sprite
index fb2689642b4..9b277026f41 100644
--- a/data/images/objects/weak_block/strawbox.sprite
+++ b/data/images/objects/weak_block/strawbox.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (images 
       "strawbox-0.png"
     )
diff --git a/data/images/particles/air_bubble.sprite b/data/images/particles/air_bubble.sprite
index 4c51ad33204..3f8c52fede5 100644
--- a/data/images/particles/air_bubble.sprite
+++ b/data/images/particles/air_bubble.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
  (action
-  (name "normal")
+  (name "default")
   (fps 15)
   (loops 1)
   (images "air_bubble-0.png"
diff --git a/data/images/particles/ice_piece1.sprite b/data/images/particles/ice_piece1.sprite
index d97d99a6328..cc4f7bce825 100644
--- a/data/images/particles/ice_piece1.sprite
+++ b/data/images/particles/ice_piece1.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (fps 1)
     (images "ice_piece1.png"))
  )
diff --git a/data/images/particles/ice_piece2.sprite b/data/images/particles/ice_piece2.sprite
index fe0db82ddb0..340addd8409 100644
--- a/data/images/particles/ice_piece2.sprite
+++ b/data/images/particles/ice_piece2.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (fps 1)
     (images "ice_piece2.png"))
  )
diff --git a/data/images/particles/water_piece1.sprite b/data/images/particles/water_piece1.sprite
index a2f0be7785b..fec99b8b387 100644
--- a/data/images/particles/water_piece1.sprite
+++ b/data/images/particles/water_piece1.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (fps 8)
     (images "water_piece1-1.png"
             "water_piece1-2.png"
diff --git a/data/images/particles/water_piece2.sprite b/data/images/particles/water_piece2.sprite
index 8ddd3610429..e7718fb5171 100644
--- a/data/images/particles/water_piece2.sprite
+++ b/data/images/particles/water_piece2.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (fps 6)
     (images "water_piece2-1.png"
             "water_piece2-2.png"))
diff --git a/data/images/powerups/egg/egg.sprite b/data/images/powerups/egg/egg.sprite
index 61959ad86b6..ae61c8e34ef 100644
--- a/data/images/powerups/egg/egg.sprite
+++ b/data/images/powerups/egg/egg.sprite
@@ -1,6 +1,6 @@
 (supertux-sprite
   (action
-    (name "normal")
+    (name "default")
     (images "egg.png")
   )
   (action
diff --git a/src/sprite/sprite.cpp b/src/sprite/sprite.cpp
index b3dc6bf58bd..f2233a9e7fe 100644
--- a/src/sprite/sprite.cpp
+++ b/src/sprite/sprite.cpp
@@ -34,7 +34,7 @@ Sprite::Sprite(SpriteData& newdata) :
   m_color(1.0f, 1.0f, 1.0f, 1.0f),
   m_blend(),
   m_is_paused(false),
-  m_action(m_data.get_action("normal"))
+  m_action(m_data.get_action("default"))
 {
   if (!m_action)
     m_action = m_data.actions.begin()->second.get();

From 5af437743566370a3ef4cfba4ddadb36f6b1d326 Mon Sep 17 00:00:00 2001
From: MatusGuy <MatusGuy@users.noreply.github.com>
Date: Sun, 24 Nov 2024 11:27:03 +0000
Subject: [PATCH 2/2] remove action inconsistencies in code

---
 src/badguy/badguy.cpp           | 2 +-
 src/badguy/fish_jumping.cpp     | 4 ++--
 src/badguy/ghosttree.cpp        | 2 +-
 src/badguy/skydive.cpp          | 2 +-
 src/badguy/yeti_stalactite.cpp  | 2 +-
 src/gui/mousecursor.cpp         | 2 +-
 src/object/bigsnowball.cpp      | 4 ++--
 src/object/bonus_block.cpp      | 2 +-
 src/object/bumper.cpp           | 6 +++---
 src/object/firefly.cpp          | 2 +-
 src/object/lantern.cpp          | 2 +-
 src/object/magicblock.cpp       | 2 +-
 src/object/player.cpp           | 2 +-
 src/object/rusty_trampoline.cpp | 2 +-
 src/object/trampoline.cpp       | 2 +-
 src/object/unstable_tile.cpp    | 6 +++---
 src/object/weak_block.cpp       | 2 +-
 17 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index 1de57d6aa51..39d9a15735c 100644
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -1152,7 +1152,7 @@ BadGuy::after_editor_set()
   MovingSprite::after_editor_set();
 
   const std::string direction_str = m_start_dir == Direction::AUTO ? "left" : dir_to_string(m_start_dir);
-  const std::string actions[] = {"editor", "normal", "idle", "flying", "walking", "standing", "swim"};
+  const std::string actions[] = {"editor", "default", "idle", "flying", "walking", "standing", "swim"};
   bool action_set = false;
 
   for (const auto& action_str : actions)
diff --git a/src/badguy/fish_jumping.cpp b/src/badguy/fish_jumping.cpp
index 40a00e21208..a1ebec53aaf 100644
--- a/src/badguy/fish_jumping.cpp
+++ b/src/badguy/fish_jumping.cpp
@@ -111,7 +111,7 @@ FishJumping::active_update(float dt_sec)
   // Set sprite.
   if (!m_frozen && !is_ignited())
     set_action((m_physic.get_velocity_y() == 0.f && m_in_water) ? "wait" :
-      m_physic.get_velocity_y() < 0.f ? "normal" : "down");
+      m_physic.get_velocity_y() < 0.f ? "default" : "down");
 
   // We can't afford flying out of the tilemap, 'cause the engine would remove us.
   if ((get_pos().y - 31.8f) < 0) // Too high, let us fall.
@@ -162,7 +162,7 @@ void
 FishJumping::kill_fall()
 {
   if (!is_ignited())
-  set_action("normal");
+  set_action("default");
   BadGuy::kill_fall();
 }
 
diff --git a/src/badguy/ghosttree.cpp b/src/badguy/ghosttree.cpp
index c777ddaed45..f6ff0ab5af3 100644
--- a/src/badguy/ghosttree.cpp
+++ b/src/badguy/ghosttree.cpp
@@ -199,7 +199,7 @@ GhostTree::active_update(float dt_sec)
           die();
         }
         if (m_lives > 0) {
-          set_action("normal");
+          set_action("default");
           mystate = STATE_IDLE;
           spawn_lantern();
         }
diff --git a/src/badguy/skydive.cpp b/src/badguy/skydive.cpp
index eabdd05af74..8a80dd411f3 100644
--- a/src/badguy/skydive.cpp
+++ b/src/badguy/skydive.cpp
@@ -29,7 +29,7 @@ SkyDive::SkyDive(const ReaderMapping& reader) :
   BadGuy(reader, "images/creatures/skydive/skydive.sprite")
 {
   SoundManager::current()->preload("sounds/explosion.wav");
-  set_action("normal");
+  set_action("default");
 }
 
 void
diff --git a/src/badguy/yeti_stalactite.cpp b/src/badguy/yeti_stalactite.cpp
index 00c231f65a8..70d87a6f828 100644
--- a/src/badguy/yeti_stalactite.cpp
+++ b/src/badguy/yeti_stalactite.cpp
@@ -59,7 +59,7 @@ YetiStalactite::update(float dt_sec)
     set_state(STATE_ACTIVE);
     state = STALACTITE_HANGING;
     // Attempt to minimize any potential collisions during this process.
-    set_action("normal");
+    set_action("default");
     set_pos(m_start_position);
     set_colgroup_active(COLGROUP_TOUCHABLE);
   }
diff --git a/src/gui/mousecursor.cpp b/src/gui/mousecursor.cpp
index 03f3ec99b68..0f05c280670 100644
--- a/src/gui/mousecursor.cpp
+++ b/src/gui/mousecursor.cpp
@@ -62,7 +62,7 @@ MouseCursor::apply_state(MouseCursorState state)
     switch(state)
     {
       case MouseCursorState::NORMAL:
-        m_sprite->set_action("normal");
+        m_sprite->set_action("default");
         break;
 
       case MouseCursorState::CLICK:
diff --git a/src/object/bigsnowball.cpp b/src/object/bigsnowball.cpp
index 3f8239b8ebf..10d169e6b08 100644
--- a/src/object/bigsnowball.cpp
+++ b/src/object/bigsnowball.cpp
@@ -50,7 +50,7 @@ BigSnowball::BigSnowball(const ReaderMapping& reader) :
     m_dir = string_to_dir(dir_str);
   }
   m_physic.set_velocity_x(m_dir == Direction::RIGHT ? m_speed : -m_speed);
-  set_action("normal", m_dir);
+  set_action("default", m_dir);
 }
 
 BigSnowball::BigSnowball(const Vector& pos, const Direction& dir, bool bounce) :
@@ -70,7 +70,7 @@ BigSnowball::BigSnowball(const Vector& pos, const Direction& dir, bool bounce) :
   if (bounce) {
     m_physic.set_velocity_y(SPEED_Y);
   }
-  set_action("normal", m_dir);
+  set_action("default", m_dir);
 }
 
 ObjectSettings
diff --git a/src/object/bonus_block.cpp b/src/object/bonus_block.cpp
index 1a9dcf48fb1..3ce5e37d4a6 100644
--- a/src/object/bonus_block.cpp
+++ b/src/object/bonus_block.cpp
@@ -71,7 +71,7 @@ BonusBlock::BonusBlock(const Vector& pos, int tile_data) :
   m_lightsprite(),
   m_coin_sprite(get_default_coin_sprite())
 {
-  set_action("normal");
+  set_action("default");
   m_contents = get_content_by_data(tile_data);
   preload_contents(tile_data);
 }
diff --git a/src/object/bumper.cpp b/src/object/bumper.cpp
index aed2c14b563..ffad69b4ea5 100644
--- a/src/object/bumper.cpp
+++ b/src/object/bumper.cpp
@@ -45,7 +45,7 @@ Bumper::Bumper(const ReaderMapping& reader) :
     m_dir = string_to_dir(dir_str);
   else if (reader.get("left", old_facing_left) && old_facing_left)
     m_dir = Direction::LEFT;
-  set_action("normal", m_dir);
+  set_action("default", m_dir);
   m_physic.enable_gravity(false);
 }
 
@@ -63,7 +63,7 @@ void
 Bumper::update(float dt_sec)
 {
   if (m_sprite->animation_done())
-    set_action("normal", m_dir);
+    set_action("default", m_dir);
 
   // Pushing rocks, as well as dynamic with tilemap, platform, and fallblock.
 
@@ -132,7 +132,7 @@ Bumper::after_editor_set()
 {
   MovingSprite::after_editor_set();
 
-  set_action("normal", m_dir);
+  set_action("default", m_dir);
 }
 
 void
diff --git a/src/object/firefly.cpp b/src/object/firefly.cpp
index 37b473d7a66..969a0a31300 100644
--- a/src/object/firefly.cpp
+++ b/src/object/firefly.cpp
@@ -92,7 +92,7 @@ Firefly::update_state()
   }
   else // Is deactivated.
   {
-    set_action("normal");
+    set_action("default");
   }
 }
 
diff --git a/src/object/lantern.cpp b/src/object/lantern.cpp
index 9b979d0602e..88dfc4bd501 100644
--- a/src/object/lantern.cpp
+++ b/src/object/lantern.cpp
@@ -82,7 +82,7 @@ Lantern::updateColor(){
     set_action("off");
     m_sprite->set_color(Color(1.0f, 1.0f, 1.0f));
   } else {
-    set_action("normal");
+    set_action("default");
     m_sprite->set_color(lightcolor);
   }
 }
diff --git a/src/object/magicblock.cpp b/src/object/magicblock.cpp
index 66b92910051..6c54f897b96 100644
--- a/src/object/magicblock.cpp
+++ b/src/object/magicblock.cpp
@@ -180,7 +180,7 @@ MagicBlock::update(float dt_sec)
     set_group(COLGROUP_STATIC);
   } else {
     m_color.alpha = ALPHA_NONSOLID;
-    set_action("normal");
+    set_action("default");
     set_group(COLGROUP_DISABLED);
   }
 }
diff --git a/src/object/player.cpp b/src/object/player.cpp
index 1203d5fbec5..5d8f3afa7fd 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -144,7 +144,7 @@ const float SWIM_BOOST_SPEED = 600.f;
 const float SWIM_TO_BOOST_ACCEL = 15.f;
 const float TURN_MAGNITUDE = 0.15f;
 const float TURN_MAGNITUDE_BOOST = 0.2f;
-const std::array<std::string, 2> BUBBLE_ACTIONS = { "normal", "small" };
+const std::array<std::string, 2> BUBBLE_ACTIONS = { "default", "small" };
 
 /* Buttjump variables */
 
diff --git a/src/object/rusty_trampoline.cpp b/src/object/rusty_trampoline.cpp
index 9b3ce246bb5..6a6c9e2fe61 100644
--- a/src/object/rusty_trampoline.cpp
+++ b/src/object/rusty_trampoline.cpp
@@ -49,7 +49,7 @@ RustyTrampoline::update(float dt_sec)
     if (counter < 1) {
       remove_me();
     } else {
-      set_action("normal");
+      set_action("default");
     }
 
   }
diff --git a/src/object/trampoline.cpp b/src/object/trampoline.cpp
index 8485918414f..0cf0ef2ee15 100644
--- a/src/object/trampoline.cpp
+++ b/src/object/trampoline.cpp
@@ -84,7 +84,7 @@ void
 Trampoline::update(float dt_sec)
 {
   if (m_sprite->animation_done()) {
-    set_action("normal");
+    set_action("default");
   }
 
   Rock::update(dt_sec);
diff --git a/src/object/unstable_tile.cpp b/src/object/unstable_tile.cpp
index 231d36e43bc..beccab7f54c 100644
--- a/src/object/unstable_tile.cpp
+++ b/src/object/unstable_tile.cpp
@@ -57,7 +57,7 @@ UnstableTile::UnstableTile(const ReaderMapping& mapping, int type) :
     parse_type(mapping);
   }
 
-  set_action("normal");
+  set_action("default");
 
   physic.set_gravity_modifier(.98f);
   physic.enable_gravity(false);
@@ -199,7 +199,7 @@ UnstableTile::revive()
   m_col.set_movement(Vector(0.0f, 0.0f));
   m_revive_timer.stop();
   m_respawn.reset(new FadeHelper(&m_alpha, FADE_IN_TIME, 1.f));
-  set_action("normal");
+  set_action("default");
 }
 
 void
@@ -233,7 +233,7 @@ UnstableTile::update(float dt_sec)
       }
       else
       {
-        set_action("normal");
+        set_action("default");
         m_fall_timer.stop();
         m_col.set_pos(m_original_pos);
       }
diff --git a/src/object/weak_block.cpp b/src/object/weak_block.cpp
index 266ce21b550..49d39d686c8 100644
--- a/src/object/weak_block.cpp
+++ b/src/object/weak_block.cpp
@@ -63,7 +63,7 @@ WeakBlock::WeakBlock(const ReaderMapping& mapping) :
   else
     SoundManager::current()->preload("sounds/sizzle.ogg");
 
-  set_action("normal");
+  set_action("default");
 }
 
 void