From: Stephen Groundwater <slacker@gluebox.com>
Date: Mon, 3 Jul 2006 15:26:27 +0000 (+0000)
Subject: Changing the firefly reset images to a reset torch.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=cb4c5dfc8aec9cc06e724037cf41eb7960076750;p=supertux.git

Changing the firefly reset images to a reset torch.

SVN-Revision: 3851
---

diff --git a/data/images/creatures/tux_big/flip/flip.xcf b/data/images/creatures/tux_big/flip/flip.xcf
index 4f78613fd..30266c6f8 100644
Binary files a/data/images/creatures/tux_big/flip/flip.xcf and b/data/images/creatures/tux_big/flip/flip.xcf differ
diff --git a/data/images/objects/firefly/firefly.sprite b/data/images/objects/firefly/firefly.sprite
index 08dea16f2..fd6ac3333 100644
--- a/data/images/objects/firefly/firefly.sprite
+++ b/data/images/objects/firefly/firefly.sprite
@@ -2,20 +2,26 @@
  (action
   (name "normal")
   (hitbox 0 0 0 0)
-  (images "firefly1.png")
+(fps 1)
+  (images "sleep-1.png"
+"sleep-1.png"
+"sleep-1.png"
+"sleep-1.png"
+"sleep-1.png"
+"sleep-1.png"
+"sleep-2.png"
+)
  )
  (action
   (name "ringing")
-(fps 14)
+(hitbox 0 32 0 0)
+(fps 7)
   (images
 "firefly2.png"
 "firefly3.png"
 "firefly4.png"
-"firefly3.png"
 "firefly5.png"
 "firefly6.png"
-"firefly7.png"
-"firefly6.png"
 
   )
  )              
diff --git a/data/images/objects/firefly/firefly1.png b/data/images/objects/firefly/firefly1.png
index c437f7b25..593543429 100644
Binary files a/data/images/objects/firefly/firefly1.png and b/data/images/objects/firefly/firefly1.png differ
diff --git a/data/images/objects/firefly/firefly2.png b/data/images/objects/firefly/firefly2.png
index 81e6fa697..7019e87cd 100644
Binary files a/data/images/objects/firefly/firefly2.png and b/data/images/objects/firefly/firefly2.png differ
diff --git a/data/images/objects/firefly/firefly3.png b/data/images/objects/firefly/firefly3.png
index aa500339f..3230b3520 100644
Binary files a/data/images/objects/firefly/firefly3.png and b/data/images/objects/firefly/firefly3.png differ
diff --git a/data/images/objects/firefly/firefly4.png b/data/images/objects/firefly/firefly4.png
index f81ca9d14..d2b1f1313 100644
Binary files a/data/images/objects/firefly/firefly4.png and b/data/images/objects/firefly/firefly4.png differ
diff --git a/data/images/objects/firefly/firefly5.png b/data/images/objects/firefly/firefly5.png
index 85ec1ea9f..d36b66ca9 100644
Binary files a/data/images/objects/firefly/firefly5.png and b/data/images/objects/firefly/firefly5.png differ
diff --git a/data/images/objects/firefly/firefly6.png b/data/images/objects/firefly/firefly6.png
index 0ce2df3c8..4f8f49f55 100644
Binary files a/data/images/objects/firefly/firefly6.png and b/data/images/objects/firefly/firefly6.png differ
diff --git a/data/images/objects/firefly/firefly7.png b/data/images/objects/firefly/firefly7.png
index 9a107282b..2497291bd 100644
Binary files a/data/images/objects/firefly/firefly7.png and b/data/images/objects/firefly/firefly7.png differ
diff --git a/data/levels/world2/castledoor.stl b/data/levels/world2/castledoor.stl
index 936e1cc2c..02f7b4af0 100644
--- a/data/levels/world2/castledoor.stl
+++ b/data/levels/world2/castledoor.stl
@@ -5,45 +5,25 @@
   (sector
     (name "main")
     (music "music/forest2.ogg")
-    (angrystone
-      (x 22)
-      (y 689)
+    (firefly
+      (x 429.1299)
+      (y 344.6518)
     )
-    (scriptedobject
-      (name "FLAMES")
-      (visible #t)
-      (physic-enabled #f)
-      (solid #f)
-      (x 1056.469)
-      (y 854.45)
-      (sprite "images/objects/castledoor/torchflame.sprite")
+    (firefly
+      (x 171.87)
+      (y 336.6223)
     )
-    (scriptedobject
-      (name "FLAMES")
-      (visible #t)
-      (physic-enabled #f)
-      (solid #f)
-      (x 613)
-      (y 153)
-      (sprite "images/objects/castledoor/torchflame.sprite")
+    (firefly
+      (x 429.1299)
+      (y 438.6518)
     )
-    (scriptedobject
-      (name "FLAMES")
-      (visible #t)
-      (physic-enabled #f)
-      (solid #f)
-      (x 174)
-      (y 153)
-      (sprite "images/objects/castledoor/torchflame.sprite")
+    (firefly
+      (x 169.87)
+      (y 446.6223)
     )
-    (scriptedobject
-      (name "FLAMES")
-      (visible #t)
-      (physic-enabled #f)
-      (solid #f)
-      (x 312.593)
-      (y 548.9799)
-      (sprite "images/objects/castledoor/torchflame.sprite")
+    (angrystone
+      (x 22)
+      (y 689)
     )
     (background
       (speed 1)