Linked sprite support, custom MovingSprite light sprites

data/images/creatures/dive_mine/dive_mine.sprite

@@ -54,5 +54,8 @@
   (fps 15.0)
   (hitbox 14 19 32 32)
   (mirror-action "ticking-left"))
-
+
+  (linked-sprites
+    (ticking-glow "images/creatures/dive_mine/ticking_glow/ticking_glow.sprite")
+  )
 )

data/images/creatures/ghosttree/ghosttree.sprite

@@ -28,4 +28,8 @@
       "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

@@ -106,4 +106,8 @@
   (fps 20.0)
   (hitbox 14 19 32 32)
   (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" 0.2 0.1 0)
+  )
+)

data/images/creatures/mr_bomb/mr_bomb.sprite

@@ -108,5 +108,8 @@
   (loops 1)
   (hitbox 14 19 32 32)
   (mirror-action "ticking-left"))
-
+
+  (linked-sprites
+    (explode "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" 0.3 0.1 0)
+  )
 )

data/images/objects/candle/candle.sprite

@@ -18,5 +18,9 @@
       "candle-0.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" 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" 0.87 0.64 0.12)
+  )
 )

data/images/objects/resetpoints/torch_light.sprite

@@ -0,0 +1,8 @@
+(supertux-sprite
+    (action
+      (name "default")
+      (images "../lightmap_light/lightmap_light-small.png")
+      (hitbox 64 76 0 0)
+      (flip-offset 48)
+    )
+)

data/images/objects/rublight/rublight.sprite

@@ -19,4 +19,8 @@
     (name "inactive")
 	(images "rublight-0.png")
   )
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light.sprite")
+  )
 )

data/images/objects/torch/torch1.sprite

@@ -4,4 +4,10 @@
     (hitbox 0 0 16 100)
     (images "torch1.png")
   )
+
+  (linked-sprites
+    (flame "flame.sprite")
+    (glow "flame_glow.sprite")
+    (light "flame_light.sprite")
+  )
 )

data/images/objects/torch/torch2.sprite

@@ -4,4 +4,10 @@
     (hitbox 0 0 16 100)
     (images "torch2.png")
   )
+
+  (linked-sprites
+    (flame "flame.sprite")
+    (glow "flame_glow.sprite")
+    (light "flame_light.sprite")
+  )
 )

data/images/objects/torch/torch3.sprite

@@ -4,4 +4,10 @@
     (hitbox 0 0 16 100)
     (images "torch3.png")
   )
+
+  (linked-sprites
+    (flame "flame.sprite")
+    (glow "flame_glow.sprite")
+    (light "flame_light.sprite")
+  )
 )

data/images/objects/torch/torch4.sprite

@@ -4,4 +4,10 @@
     (hitbox 0 0 16 100)
     (images "torch4.png")
   )
+
+  (linked-sprites
+    (flame "flame.sprite")
+    (glow "flame_glow.sprite")
+    (light "flame_light.sprite")
+  )
 )

data/images/objects/weak_block/strawbox.sprite

@@ -30,4 +30,8 @@
       "strawbox-11.png"
     )
   )
+
+  (linked-sprites
+    (burn-light "images/objects/lightmap_light/lightmap_light-small.sprite")
+  )
 )

data/images/particles/sparkle.sprite

@@ -34,4 +34,8 @@
       "sparkle-0.png"
     )
   )
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-tiny.sprite")
+  )
 )

data/images/powerups/airflower/airflower.sprite

@@ -6,4 +6,9 @@
                  "air_flower-2.png"
                  "air_flower-3.png"
                  "air_flower-2.png"
-                 "air_flower-1.png")))
+                 "air_flower-1.png"))
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-small.sprite" 0.15 0 0.15)
+  )
+)

data/images/powerups/earthflower/earthflower.sprite

@@ -6,4 +6,9 @@
                  "earth_flower-2.png"
                  "earth_flower-3.png"
                  "earth_flower-2.png"
-                 "earth_flower-1.png")))
+                 "earth_flower-1.png"))
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-small.sprite" 0 0.3 0)
+  )
+)

data/images/powerups/egg/egg.sprite

@@ -7,5 +7,9 @@
     (name "shadow")
     (images "egg-shade.png")
   )
-)
 
+  (linked-sprites
+    (shade "egg.sprite")
+    (light "images/objects/lightmap_light/lightmap_light-small.sprite" 0.2 0.2 0)
+  )
+)

data/images/powerups/fireflower/fireflower.sprite

@@ -6,4 +6,9 @@
                  "fire_flower-2.png"
                  "fire_flower-3.png"
                  "fire_flower-2.png"
-                 "fire_flower-1.png")))
+                 "fire_flower-1.png"))
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-small.sprite" 0.3 0 0)
+  )
+)

data/images/powerups/iceflower/iceflower.sprite

@@ -6,4 +6,9 @@
                  "ice_flower-2.png"
                  "ice_flower-3.png"
                  "ice_flower-2.png"
-                 "ice_flower-1.png")))
+                 "ice_flower-1.png"))
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-small.sprite" 0 0.1 0.2)
+  )
+)

data/images/powerups/star/star.sprite

@@ -8,4 +8,9 @@
                  "star-4.png"
                  "star-3.png"
                  "star-2.png"
-                 "star-1.png")))
+                 "star-1.png"))
+
+  (linked-sprites
+    (light "images/objects/lightmap_light/lightmap_light-small.sprite" 0.4 0.4 0.4)
+  )
+)

src/badguy/badguy.cpp

@@ -140,17 +140,16 @@ BadGuy::draw(DrawingContext& context)
 
   if (m_state == STATE_INIT || m_state == STATE_INACTIVE)
   {
-    if (Editor::is_active()) {
-      m_sprite->draw(context.color(), get_pos(), m_layer, m_flip);
-    }
+    if (Editor::is_active())
+      MovingSprite::draw(context);
   }
   else
   {
     if (m_state == STATE_FALLING)
     {
       context.push_transform();
       context.set_flip(context.get_flip() ^ VERTICAL_FLIP);
-      m_sprite->draw(context.color(), get_pos(), m_layer, m_flip);
+      MovingSprite::draw(context);
       context.pop_transform();
     }
     else
@@ -165,7 +164,11 @@ BadGuy::draw(DrawingContext& context)
       {
         if (m_frozen && is_portable())
           m_freezesprite->draw(context.color(), get_pos(), m_layer);
-        m_sprite->draw(context.color(), get_pos(), m_layer - (m_frozen ? 1 : 0), m_flip);
+
+        if (m_frozen)
+          m_sprite->draw(context.color(), get_pos(), m_layer - 1, m_flip);
+        else
+          MovingSprite::draw(context);
       }
 
       if (m_glowing)

src/badguy/bomb.cpp

@@ -28,7 +28,7 @@
 Bomb::Bomb(const Vector& pos, Direction dir_, const std::string& custom_sprite /*= "images/creatures/mr_bomb/mr_bomb.sprite"*/ ) :
   BadGuy( pos, dir_, custom_sprite ),
   ticking(SoundManager::current()->create_sound_source("sounds/fizz.wav")),
-  m_exploding_sprite(SpriteManager::current()->create("images/creatures/mr_bomb/ticking_glow/ticking_glow.sprite"))
+  m_exploding_sprite(m_sprite->get_linked_sprite("explode"))
 {
   SoundManager::current()->preload("sounds/explosion.wav");
   set_action("ticking", dir_, 1);
@@ -41,6 +41,14 @@ Bomb::Bomb(const Vector& pos, Direction dir_, const std::string& custom_sprite /
   ticking->play();
 }
 
+MovingSprite::LinkedSprites
+Bomb::get_linked_sprites()
+{
+  return {
+    { "explode", m_exploding_sprite }
+  };
+}
+
 void
 Bomb::collision_solid(const CollisionHit& hit)
 {

src/badguy/bomb.hpp

@@ -47,6 +47,9 @@ class Bomb final : public BadGuy
   virtual void stop_looping_sounds() override;
   virtual void play_looping_sounds() override;
 
+protected:
+  LinkedSprites get_linked_sprites() override;
+
 private:
   std::unique_ptr<SoundSource> ticking;
   SpritePtr m_exploding_sprite;