Linked sprite support, custom MovingSprite light sprites

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

@@ -0,0 +1,8 @@
+(supertux-sprite
+  (action
+    (name "default")
+    (fps 15)
+    (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 "images/creatures/darttrap/granito/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 "images/creatures/darttrap/skull/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/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
+    (explode "images/creatures/mr_bomb/ticking_glow/ticking_glow.sprite")
+  )
 )

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")
+	)
 )

data/images/creatures/haywire/haywire.sprite

@@ -32,6 +32,9 @@
   (name "ticking-left")
   (fps 20.0)
   (hitbox 14 19 32 32)
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite" "run")
+  )
   (images "chase-0.png"
           "chase-1.png"
 		  "chase-2.png"
@@ -44,6 +47,9 @@
   (name "ticking-right")
   (fps 20.0)
   (hitbox 14 19 32 32)
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite" "run")
+  )
   (mirror-action "ticking-left"))
 
  (action
@@ -78,6 +84,9 @@
   (loops 1)
   (fps 20.0)
   (hitbox 14 19 32 32)
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite" "skid" 1)
+  )
   (images "skid-0.png"
 		  "skid-1.png"
 		  "skid-2.png"
@@ -88,13 +97,19 @@
   (loops 1)
   (fps 20.0)
   (hitbox 14 19 32 32)
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite" "skid" 1)
+  )
   (mirror-action "skid-left"))
 
  (action
   (name "jump-left")
   (loops 1)
   (fps 20.0)
   (hitbox 14 19 32 32)
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite" "jump" 1)
+  )
   (images "jump-0.png"
 		  "jump-1.png"
 		  "jump-2.png"
@@ -105,5 +120,12 @@
   (loops 1)
   (fps 20.0)
   (hitbox 14 19 32 32)
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite" "jump" 1)
+  )
   (mirror-action "jump-left"))
+
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite")
+  )
 )

data/images/creatures/kugelblitz/kugelblitz.sprite

@@ -21,4 +21,8 @@
           "pop-1.png"
           "pop-2.png"
           "pop-3.png"))
-) 
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light.sprite" "default" 0.2 0.1 0)
+  )
+)

data/images/creatures/mole/corrupted/root.sprite

@@ -39,4 +39,8 @@
     (name "base-right")
 	(hitbox 9 22 80 16)
     (mirror-action "base-left"))
-)
+
+  (linked-sprites
+    (rock "images/particles/corrupted_rock.sprite")
+  )
+)

data/images/creatures/mr_bomb/mr_bomb.sprite

@@ -33,6 +33,9 @@
   (fps 15.0)
   (loops 1)
   (hitbox 14 19 32 32)
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite" "exploding")
+  )
   (images "ticking-0.png"
           "ticking-1.png"
           "ticking-2.png"
@@ -107,6 +110,12 @@
   (fps 15.0)
   (loops 1)
   (hitbox 14 19 32 32)
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite" "exploding" 1)
+  )
   (mirror-action "ticking-left"))
-
+
+  (linked-sprites
+    (ticking-glow "ticking_glow/ticking_glow.sprite")
+  )
 )

data/images/objects/bonus_block/bonusblock.sprite

@@ -29,4 +29,8 @@
       (action
 		 (name "off")
          (images "lightblock_off.png"))
+
+  (linked-sprites
+    (on-light "images/objects/lightmap_light/bonusblock_light.png")
+  )
 )

data/images/objects/bonus_block/orangeblock.sprite

@@ -19,4 +19,8 @@
           (surface
            (diffuse-texture (file "orange_empty.png"))
            (displacement-texture (file "displacement.png")))))
+
+  (linked-sprites
+    (on-light "images/objects/lightmap_light/bonusblock_light.png")
+  )
 )

data/images/objects/bonus_block/purpleblock.sprite

@@ -19,4 +19,8 @@
           (surface
            (diffuse-texture (file "purple_empty.png"))
            (displacement-texture (file "displacement.png")))))
+
+  (linked-sprites
+    (on-light "images/objects/lightmap_light/bonusblock_light.png")
+  )
 )

data/images/objects/bonus_block/retroblock.sprite

@@ -10,4 +10,8 @@
           (surface
            (diffuse-texture (file "box-empty.png"))
            (displacement-texture (file "displacement.png")))))
+
+  (linked-sprites
+    (on-light "images/objects/lightmap_light/bonusblock_light.png")
+  )
 )

data/images/objects/bullets/firebullet.sprite

@@ -7,4 +7,8 @@
    "fire_bullet-2.png"
    "fire_bullet-3.png")
  )
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-small.sprite" "default" 0.3 0.1 0)
+  )
 )

data/images/objects/candle/candle.sprite

@@ -10,6 +10,21 @@
       "candle-4.png"
     )
   )
+  (action
+    (name "on-white")
+	(hitbox 2 22 32 32)
+	(fps 16)
+    (linked-sprites
+      (light-1 "candle-light-1.sprite" "white")
+      (light-2 "candle-light-2.sprite" "white")
+    )
+    (images 
+      "candle-1.png"
+      "candle-2.png"
+      "candle-3.png"
+      "candle-4.png"
+    )
+  )
   (action
     (name "off")
 	(hitbox 2 22 32 32)
@@ -18,5 +33,24 @@
       "candle-0.png"
 	)
   )
-)
+  (action
+    (name "off-white")
+	(hitbox 2 22 32 32)
+	(fps 16)
+    (linked-sprites
+      (light-1 "candle-light-1.sprite" "white")
+      (light-2 "candle-light-2.sprite" "white")
+    )
+    (images 
+      "candle-1.png"
+      "candle-2.png"
+      "candle-3.png"
+      "candle-4.png"
+    )
+  )
 
+  (linked-sprites
+    (light-1 "candle-light-1.sprite")
+    (light-2 "candle-light-2.sprite")
+  )
+)

data/images/objects/door/door.sprite

@@ -41,4 +41,8 @@
       "door-1.png"
       "door-0.png")
   )
+
+  (linked-sprites
+    (lock "door_lock.sprite")
+  )
 )

data/images/objects/explosion/explosion.sprite

@@ -25,5 +25,8 @@
     (hitbox 0 0 48 48)
     (images "pop-0.png")
   )
-)
 
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-large.sprite" "default" 0.6 0.6 0.6)
+  )
+)

data/images/objects/keys/key.sprite

@@ -8,4 +8,9 @@
 		(name "silver-left")
 		(hitbox 0 2 48 28)
 		(mirror-action "silver-right"))
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-small.sprite")
+    (sparkle "images/particles/sparkle.sprite")
+  )
 )

data/images/objects/lantern/lantern.sprite

@@ -20,4 +20,8 @@
         (hitbox 8 28 34 39)
         (images "lantern-1.png")
       )
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light.sprite")
+  )
 )

data/images/objects/resetpoints/torch.sprite

@@ -24,5 +24,9 @@
 "torch6.png"
 
   )
- )              
+ )
+
+  (linked-sprites
+    (light "torch_light.sprite" "default" 0.87 0.64 0.12)
+  )
 )