Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change all "normal" actions to "default" #3104

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/images/creatures/fish/forest/jumpfish.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(fps 18)
(loops 1)
(hitbox 12 24 40 46)
Expand Down
2 changes: 1 addition & 1 deletion data/images/creatures/flame/flame.sprite
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/images/creatures/flame/ghostflame.sprite
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion data/images/creatures/flame/iceflame.sprite
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion data/images/creatures/flame_fish/flame_fish.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 2 3 0 0)
(images "left-0.png"
"left-1.png"))
Expand Down
2 changes: 1 addition & 1 deletion data/images/creatures/ghosttree/ghosttree.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 230 300 40 60)
(images
"ghosttree.png"
Expand Down
2 changes: 1 addition & 1 deletion data/images/creatures/skydive/skydive.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(fps 15)
(hitbox 14 7 32 44)
(images "skydive-0.png"
Expand Down
2 changes: 1 addition & 1 deletion data/images/creatures/stalactite/stalactite_ice.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 15 32 48)
(images "stalactite_ice.png"))
(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/creatures/stalactite/stalactite_rock.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 4 15 32 48)
(images "stalactite_rock.png"))
(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/decal/forest/foxsleep.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(fps 10)
(images "foxsleep1.png"
"foxsleep2.png"
Expand Down
2 changes: 1 addition & 1 deletion data/images/engine/menu/mousecursor.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(images "mousecursor.png"))

(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/bonusblock.sprite
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(supertux-sprite
(action
(fps 15)
(name "normal")
(name "default")
(images "full-0.png"
"full-1.png"
"full-2.png"
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/brick.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
(displacement-texture (file "displacement.png")))))

(action
(name "normal")
(name "default")
(images "../../tiles/blocks/brick0.png"))

(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/brickIce.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
(displacement-texture (file "displacement.png")))))

(action
(name "normal")
(name "default")
(images "../../tiles/blocks/brick1.png"))

(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/brickWeb.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
(displacement-texture (file "displacement.png")))))

(action
(name "normal")
(name "default")
(images "../../tiles/blocks/brick2.png"))

(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/heavy-brick.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
(displacement-texture (file "displacement.png")))))

(action
(name "normal")
(name "default")
(images "../../tiles/blocks/brick3.png"))

(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/hiddenbonus.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
(diffuse-texture (file "empty.png"))
(displacement-texture (file "displacement.png")))))
(action
(name "normal")
(name "default")
(images "invisible.png"))
)
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/icedbrick.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
(images "empty.png"))

(action
(name "normal")
(name "default")
(images "../../tiles/blocks/brick1.png"))

(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/infoblock.sprite
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(supertux-sprite
(action
(fps 15)
(name "normal")
(name "default")
(images "infoblock-0.png"
"infoblock-1.png"
"infoblock-2.png"
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/orangeblock.sprite
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(supertux-sprite
(action
(fps 15)
(name "normal")
(name "default")
(images "orange-0.png"
"orange-1.png"
"orange-2.png"
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/purpleblock.sprite
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(supertux-sprite
(action
(fps 15)
(name "normal")
(name "default")
(images "purple-0.png"
"purple-1.png"
"purple-2.png"
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/retro_brick.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
(displacement-texture (file "displacement.png")))))

(action
(name "normal")
(name "default")
(images "../../tiles/blocks/retro_brick.png"))
)
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/retroblock.sprite
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(supertux-sprite
(action
(fps 15)
(name "normal")
(name "default")
(images "box-full.png"
))
(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/bonus_block/scriptblock.sprite
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(supertux-sprite
(action
(fps 15)
(name "normal")
(name "default")
(images "scriptblock-0.png"
"scriptblock-1.png"
"scriptblock-2.png"
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/castledoor/keyholes.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 0 0 0)
(images "keyholes.png"))
)
2 changes: 1 addition & 1 deletion data/images/objects/castledoor/torchflame.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 0 0 0)
(fps 4)
(images
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/coin/coin.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(fps 15.0)
(images "coin-0.png"
"coin-1.png"
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/coin/retro_coin.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(fps 15.0)
(images "retro_coin-0.png"
"retro_coin-1.png"
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/crystals/crystal_1.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(images "c2.png"
"c1.png"))
(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/crystals/crystal_2.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(images "d2.png"
"d1.png"))
(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/crystals/crystal_3.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(images "b2.png"
"b1.png"))
(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/crystals/crystal_4.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(images "a2.png"
"a1.png"))
(action
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/branchleft.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 32 123 32)
(images "branchleft.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/branchright.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 5 32 123 32)
(images "branchright.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/cave-2x3.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 32 64 96)
(images "cave-2x3.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/cave-3x2.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 32 96 64)
(images "cave-3x2.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/cave-3x4.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 32 96 128)
(images "cave-3x4.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/cave-4x3.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 32 128 96)
(images "cave-4x3.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/cave-4x4.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 32 128 128)
(images "cave-4x4.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/cave-4x6.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 32 128 192)
(images "cave-4x6.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/cave-5x3.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 32 160 96)
(images "cave-5x3.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/cave-5x7.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 32 160 224)
(images "cave-5x7.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/cave-6x4.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 32 192 128)
(images "cave-6x4.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/rockblock-0.5x0.5.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 0 16 16)
(images "rockblock-0.5x0.5.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/rockblock-1x1.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 0 32 32)
(images "rockblock-1x1.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/rockblock-1x2.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 0 32 64)
(images "rockblock-1x2.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/rockblock-1x3.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 0 32 96)
(images "rockblock-1x3.png")
)
Expand Down
2 changes: 1 addition & 1 deletion data/images/objects/fallblock/rockblock-2x1.sprite
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(supertux-sprite
(action
(name "normal")
(name "default")
(hitbox 0 0 64 32)
(images "rockblock-2x1.png")
)
Expand Down
Loading
Loading