Tux-Worldmap: enabled sprite change for iceflower powerup, added icetux graphics...

diff --git a/data/images/worldmap/common/boat/boat.sprite b/data/images/worldmap/common/boat/boat.sprite
index 01b7a65..5916c20 100644 (file)
--- a/data/images/worldmap/common/boat/boat.sprite
+++ b/data/images/worldmap/common/boat/boat.sprite
@@ -60,4 +60,22 @@
       "boat_0.png"
     )
   )
+  (action
+    (hitbox 6 41 0 0)
+    (name "ice-stop")
+    (fps 5)
+    (images 
+      "boat_1_ice.png"
+      "boat_0_ice.png"
+    )
+  )
+  (action
+    (hitbox 6 41 0 0)
+    (name "ice-walking")
+    (fps 5)
+    (images 
+      "boat_1_ice.png"
+      "boat_0_ice.png"
+    )
+  )
 )

diff --git a/data/images/worldmap/common/boat/boat.xcf b/data/images/worldmap/common/boat/boat.xcf
new file mode 100644 (file)
index 0000000..fad9190
Binary files /dev/null and b/data/images/worldmap/common/boat/boat.xcf differ

diff --git a/data/images/worldmap/common/boat/boat_0.png b/data/images/worldmap/common/boat/boat_0.png
index 5806d9c..afecad7 100644 (file)
Binary files a/data/images/worldmap/common/boat/boat_0.png and b/data/images/worldmap/common/boat/boat_0.png differ

diff --git a/data/images/worldmap/common/boat/boat_0_fire.png b/data/images/worldmap/common/boat/boat_0_fire.png
index 0a8b310..7238dd8 100644 (file)
Binary files a/data/images/worldmap/common/boat/boat_0_fire.png and b/data/images/worldmap/common/boat/boat_0_fire.png differ

diff --git a/data/images/worldmap/common/boat/boat_0_ice.png b/data/images/worldmap/common/boat/boat_0_ice.png
new file mode 100644 (file)
index 0000000..8f3340c
Binary files /dev/null and b/data/images/worldmap/common/boat/boat_0_ice.png differ

diff --git a/data/images/worldmap/common/boat/boat_1.png b/data/images/worldmap/common/boat/boat_1.png
index 00c8412..b2db6b8 100644 (file)
Binary files a/data/images/worldmap/common/boat/boat_1.png and b/data/images/worldmap/common/boat/boat_1.png differ

diff --git a/data/images/worldmap/common/boat/boat_1_fire.png b/data/images/worldmap/common/boat/boat_1_fire.png
index d991d91..b326b44 100644 (file)
Binary files a/data/images/worldmap/common/boat/boat_1_fire.png and b/data/images/worldmap/common/boat/boat_1_fire.png differ

diff --git a/data/images/worldmap/common/boat/boat_1_ice.png b/data/images/worldmap/common/boat/boat_1_ice.png
new file mode 100644 (file)
index 0000000..f259cf3
Binary files /dev/null and b/data/images/worldmap/common/boat/boat_1_ice.png differ

diff --git a/data/images/worldmap/common/boat/boat_empty.png b/data/images/worldmap/common/boat/boat_empty.png
index fb877b2..9d2228d 100644 (file)
Binary files a/data/images/worldmap/common/boat/boat_empty.png and b/data/images/worldmap/common/boat/boat_empty.png differ

diff --git a/data/images/worldmap/common/smalltux1_ice.png b/data/images/worldmap/common/smalltux1_ice.png
new file mode 100644 (file)
index 0000000..9ce5948
Binary files /dev/null and b/data/images/worldmap/common/smalltux1_ice.png differ

diff --git a/data/images/worldmap/common/smalltux2_ice.png b/data/images/worldmap/common/smalltux2_ice.png
new file mode 100644 (file)
index 0000000..a7d50f3
Binary files /dev/null and b/data/images/worldmap/common/smalltux2_ice.png differ

diff --git a/data/images/worldmap/common/smalltux3_ice.png b/data/images/worldmap/common/smalltux3_ice.png
new file mode 100644 (file)
index 0000000..db2f5c1
Binary files /dev/null and b/data/images/worldmap/common/smalltux3_ice.png differ

diff --git a/data/images/worldmap/common/smalltux4_ice.png b/data/images/worldmap/common/smalltux4_ice.png
new file mode 100644 (file)
index 0000000..7b5c9f4
Binary files /dev/null and b/data/images/worldmap/common/smalltux4_ice.png differ

diff --git a/data/images/worldmap/common/smalltux5_ice.png b/data/images/worldmap/common/smalltux5_ice.png
new file mode 100644 (file)
index 0000000..0694391
Binary files /dev/null and b/data/images/worldmap/common/smalltux5_ice.png differ

diff --git a/data/images/worldmap/common/smalltux6_ice.png b/data/images/worldmap/common/smalltux6_ice.png
new file mode 100644 (file)
index 0000000..25e764e
Binary files /dev/null and b/data/images/worldmap/common/smalltux6_ice.png differ

diff --git a/data/images/worldmap/common/smalltux7_ice.png b/data/images/worldmap/common/smalltux7_ice.png
new file mode 100644 (file)
index 0000000..76550ff
Binary files /dev/null and b/data/images/worldmap/common/smalltux7_ice.png differ

diff --git a/data/images/worldmap/common/smalltux8_ice.png b/data/images/worldmap/common/smalltux8_ice.png
new file mode 100644 (file)
index 0000000..4b6aedf
Binary files /dev/null and b/data/images/worldmap/common/smalltux8_ice.png differ

diff --git a/data/images/worldmap/common/smalltux_ice.png b/data/images/worldmap/common/smalltux_ice.png
new file mode 100644 (file)
index 0000000..69ee064
Binary files /dev/null and b/data/images/worldmap/common/smalltux_ice.png differ

diff --git a/data/images/worldmap/common/tux.sprite b/data/images/worldmap/common/tux.sprite
index 459426c..8701d19 100644 (file)
--- a/data/images/worldmap/common/tux.sprite
+++ b/data/images/worldmap/common/tux.sprite
@@ -76,5 +76,29 @@
   (hitbox 0 10 0 0)
   (images "smalltux_fire.png")
  )
+  (action
+  (name "ice-walking")
+  (hitbox 0 10 0 0)
+  (images "smalltux_ice.png"
+          "smalltux2_ice.png"
+          "smalltux3_ice.png"
+          "smalltux4_ice.png"
+          "smalltux5_ice.png"
+          "smalltux6_ice.png"
+          "smalltux7_ice.png"
+          "smalltux8_ice.png"
+          "smalltux6_ice.png"
+          "smalltux5_ice.png"
+          "smalltux4_ice.png"
+          "smalltux3_ice.png"
+          "smalltux2_ice.png"
+          "smalltux1_ice.png"
+          "smalltux_ice.png")
+ )
+ (action
+  (name "ice-stop")
+  (hitbox 0 10 0 0)
+  (images "smalltux_ice.png")
+ )
 )
 

diff --git a/src/worldmap/tux.cpp b/src/worldmap/tux.cpp
index 7503d62..41a28f0 100644 (file)
--- a/src/worldmap/tux.cpp
+++ b/src/worldmap/tux.cpp
@@ -66,6 +66,9 @@ Tux::draw(DrawingContext& context)
     case FIRE_BONUS:
       sprite->set_action(moving ? "fire-walking" : "fire-stop");
       break;
+    case ICE_BONUS:
+      sprite->set_action(moving ? "ice-walking" : "ice-stop");
+      break;
     case NO_BONUS:
       sprite->set_action(moving ? "small-walking" : "small-stop");
       break;