Linked sprite support, custom MovingSprite light sprites

data/images/creatures/crusher/corrupted/krosh_corrupt.sprite

@@ -18,18 +18,24 @@
   )
  )
  (action
-  (name "whites")
+  (name "left-eye")
   (hitbox 16 16 128 128)
-  (images "krosh_corrupt_whites.png")
+  (images "krosh_corrupt_eyes.png")
  )
  (action
-  (name "lefteye")
+  (name "right-eye")
   (hitbox 16 16 128 128)
   (images "krosh_corrupt_eyes.png")
  )
  (action
-  (name "righteye")
+  (name "whites")
   (hitbox 16 16 128 128)
-  (images "krosh_corrupt_eyes.png")
+  (images "krosh_corrupt_whites.png")
+ )
+
+ (linked-sprites
+   (left-eye "krosh_corrupt.sprite" "left-eye")
+   (right-eye "krosh_corrupt.sprite" "right-eye")
+   (whites "krosh_corrupt.sprite" "whites")
  )
 )

data/images/creatures/crusher/corrupted/krush_corrupt.sprite

@@ -18,18 +18,24 @@
   )
  )
  (action
-  (name "whites")
+  (name "left-eye")
   (hitbox 8 8 64 64)
-  (images "krush_corrupt_whites.png")
+  (images "krush_corrupt_eyes.png")
  )
  (action
-  (name "lefteye")
+  (name "right-eye")
   (hitbox 8 8 64 64)
   (images "krush_corrupt_eyes.png")
  )
  (action
-  (name "righteye")
+  (name "whites")
   (hitbox 8 8 64 64)
-  (images "krush_corrupt_eyes.png")
+  (images "krush_corrupt_whites.png")
+ )
+
+ (linked-sprites
+   (left-eye "krush_corrupt.sprite" "left-eye")
+   (right-eye "krush_corrupt.sprite" "right-eye")
+   (whites "krush_corrupt.sprite" "whites")
  )
 )

data/images/creatures/crusher/krosh_ice.sprite

@@ -18,18 +18,24 @@
   )
  )
  (action
-  (name "whites")
+  (name "left-eye")
   (hitbox 4 4 128 128)
-  (images "krosh_ice_whites.png")
+  (images "krosh_ice_lefteye.png")
  )
  (action
-  (name "lefteye")
+  (name "right-eye")
   (hitbox 4 4 128 128)
-  (images "krosh_ice_lefteye.png")
+  (images "krosh_ice_righteye.png")
  )
  (action
-  (name "righteye")
+  (name "whites")
   (hitbox 4 4 128 128)
-  (images "krosh_ice_righteye.png")
+  (images "krosh_ice_whites.png")
+ )
+
+ (linked-sprites
+   (left-eye "krosh_ice.sprite" "left-eye")
+   (right-eye "krosh_ice.sprite" "right-eye")
+   (whites "krosh_ice.sprite" "whites")
  )
 )

data/images/creatures/crusher/krosh_rock.sprite

@@ -18,18 +18,24 @@
   )
  )
  (action
-  (name "whites")
+  (name "left-eye")
   (hitbox 4 4 128 128)
-  (images "krosh_rock_whites.png")
+  (images "krosh_rock_lefteye.png")
  )
  (action
-  (name "lefteye")
+  (name "right-eye")
   (hitbox 4 4 128 128)
-  (images "krosh_rock_lefteye.png")
+  (images "krosh_rock_righteye.png")
  )
  (action
-  (name "righteye")
+  (name "whites")
   (hitbox 4 4 128 128)
-  (images "krosh_rock_righteye.png")
+  (images "krosh_rock_whites.png")
+ )
+
+ (linked-sprites
+   (left-eye "krosh_rock.sprite" "left-eye")
+   (right-eye "krosh_rock.sprite" "right-eye")
+   (whites "krosh_rock.sprite" "whites")
  )
 )

data/images/creatures/crusher/krush_ice.sprite

@@ -18,18 +18,24 @@
   )
  )
  (action
-  (name "whites")
+  (name "left-eye")
   (hitbox 3 3 64 64)
-  (images "krush_ice_whites.png")
+  (images "krush_ice_lefteye.png")
  )
  (action
-  (name "lefteye")
+  (name "right-eye")
   (hitbox 3 3 64 64)
-  (images "krush_ice_lefteye.png")
+  (images "krush_ice_righteye.png")
  )
  (action
-  (name "righteye")
+  (name "whites")
   (hitbox 3 3 64 64)
-  (images "krush_ice_righteye.png")
+  (images "krush_ice_whites.png")
+ )
+
+ (linked-sprites
+   (left-eye "krush_ice.sprite" "left-eye")
+   (right-eye "krush_ice.sprite" "right-eye")
+   (whites "krush_ice.sprite" "whites")
  )
 )

data/images/creatures/crusher/krush_rock.sprite

@@ -20,18 +20,24 @@
   )
  )
  (action
-  (name "whites")
+  (name "left-eye")
   (hitbox 3 3 64 64)
-  (images "krush_rock_whites.png")
+  (images "krush_rock_lefteye.png")
  )
  (action
-  (name "lefteye")
+  (name "right-eye")
   (hitbox 3 3 64 64)
-  (images "krush_rock_lefteye.png")
+  (images "krush_rock_righteye.png")
  )
  (action
-  (name "righteye")
+  (name "whites")
   (hitbox 3 3 64 64)
-  (images "krush_rock_righteye.png")
+  (images "krush_rock_whites.png")
+ )
+
+ (linked-sprites
+   (left-eye "krush_rock.sprite" "left-eye")
+   (right-eye "krush_rock.sprite" "right-eye")
+   (whites "krush_rock.sprite" "whites")
  )
 )

data/images/creatures/darttrap/granito/dart_light.sprite

@@ -0,0 +1,7 @@
+(supertux-sprite
+  (action
+    (name "default")
+    (hitbox 16 16 0 0)
+    (images "dart_light.png")
+  )
+)

data/images/creatures/darttrap/granito/root_dart.sprite

@@ -3,20 +3,24 @@
     (name "flying-left")
     (hitbox 6 13 20 8)
     (images "root_dart_left.png")
-    )
+  )
   (action
     (name "flying-right")
     (hitbox 6 13 20 8)
     (mirror-action "flying-left")
-    )
+  )
   (action
     (name "flying-down")
     (hitbox 13 6 8 20)
     (images "root_dart_down.png")
-    )
+  )
   (action
     (name "flying-up")
     (hitbox 13 6 8 20)
     (flip-action "flying-down")
-    )
   )
+
+  (linked-sprites
+    (light "dart_light.sprite" "" 1 1 1)
+  )
+)

data/images/creatures/darttrap/skull/dart_light.sprite

@@ -0,0 +1,7 @@
+(supertux-sprite
+  (action
+    (name "default")
+    (hitbox 16 16 0 0)
+    (images "dart_light.png")
+  )
+)

data/images/creatures/darttrap/skull/skull_dart.sprite

@@ -19,4 +19,8 @@
     (hitbox 12 6 9 22)
     (flip-action "flying-down")
   )
-)
+
+  (linked-sprites
+    (light "dart_light.sprite" "" 1 1 1)
+  )
+)

data/images/creatures/dive_mine/dive_mine.sprite

@@ -29,13 +29,16 @@
 
  (action
   (name "iced-right")
-  (hitbox 6 13 45 43)
+  (hitbox 10 13 45 43)
   (mirror-action "iced-left"))
 
  (action
   (name "ticking-left")
   (fps 15.0)
   (hitbox 14 19 32 32)
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite" "ticking")
+  )
   (images "ticking-0.png"
           "ticking-1.png"
           "ticking-2.png"
@@ -45,14 +48,19 @@
 		  "ticking-6.png"
 		  "ticking-7.png"
 		  "ticking-8.png"
-		  "ticking-9.png"
-          ))
+		  "ticking-9.png"))
 
 
  (action
   (name "ticking-right")
   (fps 15.0)
   (hitbox 14 19 32 32)
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite" "ticking")
+  )
   (mirror-action "ticking-left"))
-
-)
+
+ (linked-sprites
+   (ticking-glow "ticking_glow/ticking_glow.sprite" "idle")
+ )
+)

data/images/creatures/flame/flame.sprite

@@ -13,5 +13,10 @@
           "flame-fade-1.png"
           "flame-fade-2.png"
           "flame-fade-3.png"))
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-small.sprite" "" 0.21 0.13 0.08)
+    (smoke "images/particles/smoke.sprite")
+  )
 )
 

data/images/creatures/flame/ghostflame.sprite

@@ -7,5 +7,10 @@
           "ghostflame-2.png"
           "ghostflame-3.png"
           "ghostflame-4.png"))
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-small.sprite" "" 0.21 0 0.21)
+    (smoke "images/particles/smoke.sprite")
+  )
 )
 

data/images/creatures/flame/iceflame.sprite

@@ -10,5 +10,10 @@
   (images "iceflame-fade-0.png"
           "iceflame-fade-1.png"
           "iceflame-fade-2.png"))
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-small.sprite" "" 0 0.13 0.18)
+    (smoke "images/particles/smoke.sprite")
+  )
 )
 

data/images/creatures/flying_snowball/flying_snowball.sprite

@@ -37,4 +37,8 @@
   (fps 20)
   (hitbox 8 8 32 32)
   (mirror-action "melting-left"))
+
+  (linked-sprites
+    (smoke "images/particles/smoke.sprite")
+  )
 )

data/images/creatures/ghosttree/ghosttree.sprite

@@ -21,11 +21,18 @@
     (name "dying")
     (hitbox 230 300 40 60)
     (fps 4)
+    (linked-sprites
+      (glow "ghosttree-glow.sprite" "dying" 1)
+    )
     (images
       "ghosttree-dying-0.png"
       "ghosttree-dying-0.png"
       "ghosttree-dying-0.png"
       "ghosttree-dying-0.png"
     )
   )
+
+  (linked-sprites
+    (glow "ghosttree-glow.sprite")
+  )
 )

data/images/creatures/ghosttree/root.sprite

@@ -3,4 +3,8 @@
     (name "default")
     (images "root.png")
   )
+
+  (linked-sprites
+    (base "root_base.sprite")
+  )
 )

data/images/creatures/gold_bomb/gold_bomb.sprite

@@ -177,5 +177,8 @@
   (loops 1)
   (hitbox 14 19 32 32)
   (mirror-action "ticking-left"))
-
+
+  (linked-sprites
+    (ticking-glow "images/creatures/mr_bomb/ticking_glow/ticking_glow.sprite" "exploding")
+  )
 )

data/images/creatures/granito/corrupted/big/rock_mine.sprite

@@ -40,4 +40,9 @@
 	  (hitbox 18 26 48 48)
 	  (mirror-action "broken-left")
 	)
+
+	(linked-sprites
+	  (rock-particles "images/particles/granito_piece.sprite")
+	  (shard "root_spike.sprite")
+	)
 )