Allow setting many custom sprites (light or not), use S-Expression ob…

…jects

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

@@ -34,8 +34,17 @@
  )
 
  (linked-sprites
-   (left-eye "krosh_corrupt.sprite" "left-eye")
-   (right-eye "krosh_corrupt.sprite" "right-eye")
-   (whites "krosh_corrupt.sprite" "whites")
+   (left-eye
+     (file "krosh_corrupt.sprite")
+     (action "left-eye")
+   )
+   (right-eye
+     (file "krosh_corrupt.sprite")
+     (action "right-eye")
+   )
+   (whites
+     (file "krosh_corrupt.sprite")
+     (action "whites")
+   )
  )
 )

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

@@ -34,8 +34,17 @@
  )
 
  (linked-sprites
-   (left-eye "krush_corrupt.sprite" "left-eye")
-   (right-eye "krush_corrupt.sprite" "right-eye")
-   (whites "krush_corrupt.sprite" "whites")
+   (left-eye
+     (file "krush_corrupt.sprite")
+     (action "left-eye")
+   )
+   (right-eye
+     (file "krush_corrupt.sprite")
+     (action "right-eye")
+   )
+   (whites
+     (file "krush_corrupt.sprite")
+     (action "whites")
+   )
  )
 )

data/images/creatures/crusher/krosh_ice.sprite

@@ -34,8 +34,17 @@
  )
 
  (linked-sprites
-   (left-eye "krosh_ice.sprite" "left-eye")
-   (right-eye "krosh_ice.sprite" "right-eye")
-   (whites "krosh_ice.sprite" "whites")
+   (left-eye
+     (file "krosh_ice.sprite")
+     (action "left-eye")
+   )
+   (right-eye
+     (file "krosh_ice.sprite")
+     (action "right-eye")
+   )
+   (whites
+     (file "krosh_ice.sprite")
+     (action "whites")
+   )
  )
 )

data/images/creatures/crusher/krosh_rock.sprite

@@ -34,8 +34,17 @@
  )
 
  (linked-sprites
-   (left-eye "krosh_rock.sprite" "left-eye")
-   (right-eye "krosh_rock.sprite" "right-eye")
-   (whites "krosh_rock.sprite" "whites")
+   (left-eye
+     (file "krosh_rock.sprite")
+     (action "left-eye")
+   )
+   (right-eye
+     (file "krosh_rock.sprite")
+     (action "right-eye")
+   )
+   (whites
+     (file "krosh_rock.sprite")
+     (action "whites")
+   )
  )
 )

data/images/creatures/crusher/krush_ice.sprite

@@ -34,8 +34,17 @@
  )
 
  (linked-sprites
-   (left-eye "krush_ice.sprite" "left-eye")
-   (right-eye "krush_ice.sprite" "right-eye")
-   (whites "krush_ice.sprite" "whites")
+   (left-eye
+     (file "krush_ice.sprite")
+     (action "left-eye")
+   )
+   (right-eye
+     (file "krush_ice.sprite")
+     (action "right-eye")
+   )
+   (whites
+     (file "krush_ice.sprite")
+     (action "whites")
+   )
  )
 )

data/images/creatures/crusher/krush_rock.sprite

@@ -36,8 +36,17 @@
  )
 
  (linked-sprites
-   (left-eye "krush_rock.sprite" "left-eye")
-   (right-eye "krush_rock.sprite" "right-eye")
-   (whites "krush_rock.sprite" "whites")
+   (left-eye
+     (file "krush_rock.sprite")
+     (action "left-eye")
+   )
+   (right-eye
+     (file "krush_rock.sprite")
+     (action "right-eye")
+   )
+   (whites
+     (file "krush_rock.sprite")
+     (action "whites")
+   )
  )
 )

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

@@ -21,6 +21,9 @@
   )
 
   (linked-sprites
-    (light "dart_light.sprite" "" 1 1 1)
+    (custom-light
+      (file "dart_light.sprite")
+      (color 1 1 1)
+    )
   )
 )

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

@@ -21,6 +21,9 @@
   )
 
   (linked-sprites
-    (light "dart_light.sprite" "" 1 1 1)
+    (custom-light
+      (file "dart_light.sprite")
+      (color 1 1 1)
+    )
   )
 )

data/images/creatures/dive_mine/dive_mine.sprite

@@ -37,7 +37,10 @@
   (fps 15.0)
   (hitbox 14 19 32 32)
   (linked-sprites
-    (ticking-glow "ticking_glow/ticking_glow.sprite" "ticking")
+    (ticking-glow
+      (file "ticking_glow/ticking_glow.sprite")
+      (action "ticking")
+    )
   )
   (images "ticking-0.png"
           "ticking-1.png"
@@ -56,11 +59,17 @@
   (fps 15.0)
   (hitbox 14 19 32 32)
   (linked-sprites
-    (ticking-glow "ticking_glow/ticking_glow.sprite" "ticking")
+    (ticking-glow
+      (file "ticking_glow/ticking_glow.sprite")
+      (action "ticking")
+    )
   )
   (mirror-action "ticking-left"))
 
  (linked-sprites
-   (ticking-glow "ticking_glow/ticking_glow.sprite" "idle")
+   (ticking-glow
+     (file "ticking_glow/ticking_glow.sprite")
+     (action "idle")
+   )
  )
-)
+)

data/images/creatures/flame/flame.sprite

@@ -15,8 +15,13 @@
           "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")
+    (custom-light
+      (file "images/objects/lightmap_light/lightmap_light-small.sprite")
+      (color 0.21 0.13 0.08)
+    )
+    (smoke
+      (file "images/particles/smoke.sprite")
+    )
   )
 )
 

data/images/creatures/flame/ghostflame.sprite

@@ -9,8 +9,13 @@
           "ghostflame-4.png"))
 
   (linked-sprites
-    (light "images/objects/lightmap_light/lightmap_light-small.sprite" "" 0.21 0 0.21)
-    (smoke "images/particles/smoke.sprite")
+    (custom-light
+      (file "images/objects/lightmap_light/lightmap_light-small.sprite")
+      (color 0.21 0 0.21)
+    )
+    (smoke
+      (file "images/particles/smoke.sprite")
+    )
   )
 )
 

data/images/creatures/flame/iceflame.sprite

@@ -12,8 +12,13 @@
           "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")
+    (custom-light
+      (file "images/objects/lightmap_light/lightmap_light-small.sprite")
+      (color 0 0.13 0.18)
+    )
+    (smoke
+      (file "images/particles/smoke.sprite")
+    )
   )
 )
 

data/images/creatures/flying_snowball/flying_snowball.sprite

@@ -39,6 +39,8 @@
   (mirror-action "melting-left"))
 
   (linked-sprites
-    (smoke "images/particles/smoke.sprite")
+    (smoke
+      (file "images/particles/smoke.sprite")
+    )
   )
 )

data/images/creatures/ghosttree/ghosttree.sprite

@@ -22,7 +22,11 @@
     (hitbox 230 300 40 60)
     (fps 4)
     (linked-sprites
-      (glow "ghosttree-glow.sprite" "dying" 1)
+      (glow
+        (file "ghosttree-glow.sprite")
+        (action "dying")
+        (loops 1)
+      )
     )
     (images
       "ghosttree-dying-0.png"
@@ -33,6 +37,8 @@
   )
 
   (linked-sprites
-    (glow "ghosttree-glow.sprite")
+    (glow
+      (file "ghosttree-glow.sprite")
+    )
   )
 )

data/images/creatures/ghosttree/root.sprite

@@ -5,6 +5,8 @@
   )
 
   (linked-sprites
-    (base "root_base.sprite")
+    (base
+      (file "root_base.sprite")
+    )
   )
 )

data/images/creatures/gold_bomb/gold_bomb.sprite

@@ -179,6 +179,9 @@
   (mirror-action "ticking-left"))
 
   (linked-sprites
-    (ticking-glow "images/creatures/mr_bomb/ticking_glow/ticking_glow.sprite" "exploding")
+    (ticking-glow
+      (file "images/creatures/mr_bomb/ticking_glow/ticking_glow.sprite")
+      (action "exploding")
+    )
   )
 )

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

@@ -42,7 +42,11 @@
 	)
 
 	(linked-sprites
-	  (rock-particles "images/particles/granito_piece.sprite")
-	  (shard "root_spike.sprite")
+		(rock-particles
+			(file "images/particles/granito_piece.sprite")
+		)
+		(shard
+			(file "root_spike.sprite")
+		)
 	)
 )

data/images/creatures/haywire/haywire.sprite

@@ -33,7 +33,10 @@
   (fps 20.0)
   (hitbox 14 19 32 32)
   (linked-sprites
-    (ticking-glow "ticking_glow/ticking_glow.sprite" "run")
+    (ticking-glow
+      (file "ticking_glow/ticking_glow.sprite")
+      (action "run")
+    )
   )
   (images "chase-0.png"
           "chase-1.png"
@@ -48,7 +51,10 @@
   (fps 20.0)
   (hitbox 14 19 32 32)
   (linked-sprites
-    (ticking-glow "ticking_glow/ticking_glow.sprite" "run")
+    (ticking-glow
+      (file "ticking_glow/ticking_glow.sprite")
+      (action "run")
+    )
   )
   (mirror-action "ticking-left"))
 
@@ -85,7 +91,11 @@
   (fps 20.0)
   (hitbox 14 19 32 32)
   (linked-sprites
-    (ticking-glow "ticking_glow/ticking_glow.sprite" "skid" 1)
+    (ticking-glow
+      (file "ticking_glow/ticking_glow.sprite")
+      (action "skid")
+      (loops 1)
+    )
   )
   (images "skid-0.png"
 		  "skid-1.png"
@@ -98,7 +108,11 @@
   (fps 20.0)
   (hitbox 14 19 32 32)
   (linked-sprites
-    (ticking-glow "ticking_glow/ticking_glow.sprite" "skid" 1)
+    (ticking-glow
+      (file "ticking_glow/ticking_glow.sprite")
+      (action "skid")
+      (loops 1)
+    )
   )
   (mirror-action "skid-left"))
 
@@ -108,7 +122,11 @@
   (fps 20.0)
   (hitbox 14 19 32 32)
   (linked-sprites
-    (ticking-glow "ticking_glow/ticking_glow.sprite" "jump" 1)
+    (ticking-glow
+      (file "ticking_glow/ticking_glow.sprite")
+      (action "jump")
+      (loops 1)
+    )
   )
   (images "jump-0.png"
 		  "jump-1.png"
@@ -121,11 +139,17 @@
   (fps 20.0)
   (hitbox 14 19 32 32)
   (linked-sprites
-    (ticking-glow "ticking_glow/ticking_glow.sprite" "jump" 1)
+    (ticking-glow
+      (file "ticking_glow/ticking_glow.sprite")
+      (action "jump")
+      (loops 1)
+    )
   )
   (mirror-action "jump-left"))
 
   (linked-sprites
-    (ticking-glow "ticking_glow/ticking_glow.sprite")
+    (ticking-glow
+      (file "ticking_glow/ticking_glow.sprite")
+    )
   )
 )

data/images/creatures/kugelblitz/kugelblitz.sprite

@@ -23,6 +23,10 @@
           "pop-3.png"))
 
   (linked-sprites
-    (light "images/objects/lightmap_light/lightmap_light.sprite" "default" 0.2 0.1 0)
+    (custom-light
+      (file "images/objects/lightmap_light/lightmap_light.sprite")
+      (action "default")
+      (color 0.2 0.1 0)
+    )
   )
 )