Graphics PR (4)

data/AUTHORS

@@ -1,6 +1,6 @@
 == Images ==
 
-Most graphics as of 0.7 were created by Rustybox, Eauix, WeLuvGoatz, FrostC and Bruhmoent. Check the log for details.
+Most graphics as of 0.7 were created by Rustybox, Eauix, WeLuvGoatz, FrostC, FilipOK and Bruhmoent. Check the log for details.
 
 
 * images/background/icecliffs/icecliffs-*.png - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA

data/images/creatures/dispenser/rocket_launcher.sprite

@@ -0,0 +1,101 @@
+(supertux-sprite
+  (action
+   (name "working-left")
+   (hitbox 20 61 55 35)
+   (images "rocket_launcher-left.png"))
+
+ (action
+   (name "broken-left")
+   (loops 1)
+   (fps 20)
+   (hitbox 20 61 55 35)
+   (images "rocket_launcher-broken-left0.png"
+           "rocket_launcher-broken-left1.png"
+		   "rocket_launcher-broken-left2.png"
+		   "rocket_launcher-broken-left3.png"
+		   "rocket_launcher-broken-left4.png"
+		   "rocket_launcher-broken-left5.png"
+		   "rocket_launcher-broken-left6.png"
+		   "rocket_launcher-broken-left7.png"
+		   "rocket_launcher-broken-left6.png"
+		   "rocket_launcher-broken-left5.png"
+		   "rocket_launcher-broken-left8.png"
+		   "rocket_launcher-broken-left5.png"))
+
+ (action
+   (name "iced-left")
+   (loops 1)
+   (fps 24)
+   (hitbox 20 61 55 35)
+   (images "rocket_launcher-frozen-left0.png"
+           "rocket_launcher-frozen-left1.png"
+		   "rocket_launcher-frozen-left2.png"
+		   "rocket_launcher-frozen-left3.png"
+		   "rocket_launcher-frozen-left4.png"))
+
+ (action
+   (name "working-right")
+   (hitbox 20 61 55 35)
+   (images "rocket_launcher-right.png"))
+
+ (action
+   (name "broken-right")
+   (hitbox 20 61 55 35)
+   (loops 1)
+   (fps 20)
+   (images "rocket_launcher-broken-right0.png"
+           "rocket_launcher-broken-right1.png"
+		   "rocket_launcher-broken-right2.png"
+		   "rocket_launcher-broken-right3.png"
+		   "rocket_launcher-broken-right4.png"
+		   "rocket_launcher-broken-right5.png"
+		   "rocket_launcher-broken-right6.png"
+		   "rocket_launcher-broken-right7.png"
+		   "rocket_launcher-broken-right6.png"
+		   "rocket_launcher-broken-right5.png"
+		   "rocket_launcher-broken-right8.png"
+		   "rocket_launcher-broken-right5.png"))
+
+ (action
+   (name "iced-right")
+   (loops 1)
+   (fps 24)
+   (hitbox 20 61 55 35)
+   (images "rocket_launcher-frozen-right0.png"
+           "rocket_launcher-frozen-right1.png"
+		   "rocket_launcher-frozen-right2.png"
+		   "rocket_launcher-frozen-right3.png"
+		   "rocket_launcher-frozen-right4.png"))
+
+ (action
+   (name "turn-left")
+   (loops 1)
+   (fps 18)
+   (hitbox 20 61 55 35)
+   (images "rocket_launcher-turning7.png"
+           "rocket_launcher-turning6.png"
+		   "rocket_launcher-turning5.png"
+		   "rocket_launcher-turning4.png"
+		   "rocket_launcher-turning3.png"
+		   "rocket_launcher-turning2.png"
+		   "rocket_launcher-turning1.png"
+		   "rocket_launcher-turning0.png"
+		   "rocket_launcher-left.png"))
+
+ (action
+   (name "turn-right")
+   (loops 1)
+   (fps 18)
+   (hitbox 20 61 55 35)
+   (images "rocket_launcher-turning0.png"
+           "rocket_launcher-turning1.png"
+		   "rocket_launcher-turning2.png"
+		   "rocket_launcher-turning3.png"
+		   "rocket_launcher-turning4.png"
+		   "rocket_launcher-turning5.png"
+		   "rocket_launcher-turning6.png"
+		   "rocket_launcher-turning7.png"
+		   "rocket_launcher-right.png")
+  )
+)
+

data/images/objects/big_snowball/big_boulder.sprite

@@ -0,0 +1,11 @@
+(supertux-sprite
+    (action
+      (name "default")
+	    (hitbox 15 14 136 136)
+      (images "big_boulder.png"))
+
+    (action
+      (name "particle")
+	    (hitbox 0 0 38 38)
+      (images "boulder_particle.png"))
+)

data/images/objects/big_snowball/big_snowball.sprite

@@ -6,6 +6,6 @@
 
     (action
       (name "particle")
-	    (hitbox 2 2 29 28)
+	    (hitbox 0 0 38 38)
       (images "big_snowball_particle.png"))
 )

data/images/objects/big_snowball/boulder.sprite

@@ -0,0 +1,11 @@
+(supertux-sprite
+    (action
+      (name "default")
+	    (hitbox 6 6 87 84)
+      (images "boulder.png"))
+
+    (action
+      (name "particle")
+	    (hitbox 0 0 38 38)
+      (images "boulder_particle.png"))
+)

data/images/objects/bullets/firebullet.sprite

@@ -1,10 +1,12 @@
 (supertux-sprite
  (action
-  (hitbox 2 2 12 12)
-  (fps 20)
-  (images "fire_bullet-0.png"
-   "fire_bullet-1.png"
-   "fire_bullet-2.png"
-   "fire_bullet-3.png")
+  (name "right")
+  (hitbox 0 0 21 21)
+  (images "fire_bullet.png")
+ )
+ (action
+  (name "left")
+  (hitbox 0 0 21 21)
+  (mirror-action "right")
  )
 )

data/images/objects/bullets/firebullet_tail.sprite

@@ -0,0 +1,11 @@
+(supertux-sprite
+ (action
+  (fps 20)
+  (hitbox -5 -5 0 0)
+  (images "fire_tail-4.png"
+			"fire_tail-3.png"
+			"fire_tail-2.png"
+			"fire_tail-1.png"
+			"fire_tail-0.png")
+ )
+)

data/images/objects/bullets/icebullet.sprite

@@ -1,9 +1,12 @@
 (supertux-sprite
-  (action
-    (hitbox 2 2 12 12)
-    (fps 20)
-    (images "ice_bullet-0.png"
-            "ice_bullet-1.png"
-            "ice_bullet-2.png"
-            "ice_bullet-3.png"))
+ (action
+  (name "right")
+  (hitbox 0 0 21 21)
+  (images "ice_bullet.png")
+ )
+ (action
+  (name "left")
+  (hitbox 0 0 21 21)
+  (mirror-action "right")
+ )
 )

data/images/objects/bullets/icebullet_tail.sprite

@@ -0,0 +1,11 @@
+(supertux-sprite
+ (action
+  (fps 20)
+  (hitbox -5 -5 0 0)
+  (images "ice_tail-4.png"
+			"ice_tail-3.png"
+			"ice_tail-2.png"
+			"ice_tail-1.png"
+			"ice_tail-0.png")
+ )
+)

data/images/objects/fallblock/ruin_brick_1x2.sprite

@@ -0,0 +1,7 @@
+(supertux-sprite
+  (action
+    (name "normal")
+    (hitbox 0 0 64 32)
+    (images "ruin_brick_1x2.png")
+  )
+)

data/images/objects/radio/radio.sprite

@@ -1,13 +1,17 @@
 (supertux-sprite
- (action
-  (name "quiet")
-  (hitbox 0 0 0 0)
-  (images "radio1.png"))
- (action
-  (name "loud")
-  (hitbox 0 0 0 0)
-  (images "radio1.png"
-   "radio2.png"
-   "radio3.png")
+  (action
+    (name "quiet")
+    (hitbox 6 19 70 43)
+    (images "radio_inactive.png"))
+  (action
+    (name "loud")
+    (hitbox 6 19 70 43)
+    (fps 18)
+    (images "radio0.png"
+            "radio1.png"
+            "radio2.png"
+		    "radio3.png"
+		    "radio4.png"
+		    "radio5.png")
   )
 )

data/images/particles/leaf.sprite

@@ -3,7 +3,7 @@
   (name "default")
   (fps 1.0)
   (images 
-    "leaf-0.png"
+    "leaf.png"
   )
  )
 )

data/images/particles/leaf2.sprite

@@ -0,0 +1,9 @@
+(supertux-sprite
+ (action
+  (name "default")
+  (fps 1.0)
+  (images 
+    "leaf2.png"
+  )
+ )
+)

data/images/particles/poof.sprite

@@ -0,0 +1,11 @@
+(supertux-sprite
+ (action
+  (fps 20)
+  (hitbox -8 -8 0 0)
+  (images "poof-1.png"
+			"poof-2.png"
+			"poof-3.png"
+			"poof-4.png"
+			"poof-5.png")
+ )
+)

data/images/particles/viciousivy.sprite

@@ -1,12 +1,8 @@
 (supertux-sprite
  (action
   (name "default")
-(fps 4.0)
   (images 
-    "viciousivy-0.png"
-"viciousivy-1.png"
-"viciousivy-2.png"
-"viciousivy-3.png"
+    "viciousivy.png"
   )
  )
 )

data/images/particles/walkingleaf.sprite

@@ -1,12 +1,8 @@
 (supertux-sprite
  (action
   (name "default")
-(fps 4.0)
   (images 
-    "walkingleaf-0.png"
-"walkingleaf-1.png"
-"walkingleaf-2.png"
-"walkingleaf-3.png"
+    "walkingleaf.png"
   )
  )
 )

data/images/powerups/iceflower/iceflower.sprite

@@ -1,9 +1,9 @@
 (supertux-sprite
        (action
          (name "default")
+	 (fps 12)
          (images "ice_flower-0.png"
                  "ice_flower-1.png"
                  "ice_flower-2.png"
                  "ice_flower-3.png"
-                 "ice_flower-2.png"
-                 "ice_flower-1.png")))
+                 "ice_flower-4.png")))

data/images/tiles.strf

@@ -21,7 +21,7 @@
 
   ;; next-id: 7949
   ;; free/skipped ids (please use before any other):
-  ;; 4639-4660, 5061-5089, 5268-5283, 5453-5527
+  ;; 4642-4660, 5061-5089, 5268-5283, 5453-5527
   ;; No group ids are currently skipped! Delete this line if any are and replace it with said ids...
 
   (tilegroup
@@ -694,6 +694,7 @@
       1569 1571 4119 4120
       1570 1573 4121 4122
       1572 1574 4123 4124
+      4640 4641 4642 4643
       1972 1976 1980 1984
       1973 1977 1981 1985
       1974 1978 1982 1986
@@ -8662,16 +8663,20 @@
   )
 
   (tiles
-    (width 2)(height 3)
+    (width 2)(height 5)
     (ids
       1569 1571
       1570 1573
       1572 1574
+      4640 4641
+      4642 4643
     )
     (attributes
       1024 1024
       1024 1024
       1024 1024
+      0    0
+      0    0
     )
     (images "tiles/forest/pogonia.png")
   )