[Pingus-CVS] r3281 - in trunk/pingus: . data/data data/images/entrances data/images/exits data/images/groundpieces/transparent/halloween data/levels/halloween

[grumbel at BerliOS]

Author: grumbel
Date: 2007-10-18 10:02:39 +0200 (Thu, 18 Oct 2007)
New Revision: 3281

Added:
   trunk/pingus/data/images/entrances/halloween.png
   trunk/pingus/data/images/exits/halloween.png
Modified:
   trunk/pingus/TODO
   trunk/pingus/data/data/entrances.res
   trunk/pingus/data/data/exits.res
   trunk/pingus/data/images/groundpieces/transparent/halloween/candle1.png
   trunk/pingus/data/levels/halloween/halloween1-grumbel.pingus
Log:
- added entrance and exits for halloween

Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO   2007-10-18 06:58:47 UTC (rev 3280)
+++ trunk/pingus/TODO   2007-10-18 08:02:39 UTC (rev 3281)
@@ -212,6 +212,12 @@
 Important:
 ==========
 
+- solid color background gets 0,0 size after load
+
+- drag&drop is behind minimap
+
+- fix pt_BR.po support, currently pt.po is loaded instead
+
 - implement proper tmpfile Support (save tmp levels to ~/.pingus/tmp/
   for backup purpose in case of editor crash or so)
 

Modified: trunk/pingus/data/data/entrances.res
===================================================================
--- trunk/pingus/data/data/entrances.res        2007-10-18 06:58:47 UTC (rev 
3280)
+++ trunk/pingus/data/data/entrances.res        2007-10-18 08:02:39 UTC (rev 
3281)
@@ -44,6 +44,12 @@
       (image-pos 0 0))
 
     (sprite
+      (name "halloween")
+;;      (origin "bottom_center")
+      (offset 0 0)
+      (image-file "../images/entrances/halloween.png"))
+
+    (sprite
       (name "wood_bottom")
 ;;      (origin "bottom_center")
       (offset 0 0)

Modified: trunk/pingus/data/data/exits.res
===================================================================
--- trunk/pingus/data/data/exits.res    2007-10-18 06:58:47 UTC (rev 3280)
+++ trunk/pingus/data/data/exits.res    2007-10-18 08:02:39 UTC (rev 3281)
@@ -20,6 +20,12 @@
       (image-file "../images/exits/ice2.png"))
 
     (sprite
+      (name "halloween")
+      (origin "bottom_center")
+      (offset 0 0)
+      (image-file "../images/exits/halloween.png"))
+
+    (sprite
       (name "stone")
       (origin "bottom_center")
       (offset 0 0)

Added: trunk/pingus/data/images/entrances/halloween.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/entrances/halloween.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/pingus/data/images/exits/halloween.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/exits/halloween.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Modified: 
trunk/pingus/data/images/groundpieces/transparent/halloween/candle1.png
===================================================================
(Binary files differ)

Modified: trunk/pingus/data/levels/halloween/halloween1-grumbel.pingus
===================================================================
--- trunk/pingus/data/levels/halloween/halloween1-grumbel.pingus        
2007-10-18 06:58:47 UTC (rev 3280)
+++ trunk/pingus/data/levels/halloween/halloween1-grumbel.pingus        
2007-10-18 08:02:39 UTC (rev 3281)
@@ -12,7 +12,7 @@
     (time -1)
     (difficulty 0)
     (playable 1)
-    (comment "none")
+    (comment "")
     (music "none")
     (actions 
       (basher 20)
@@ -27,6 +27,12 @@
       (slider 20))
     (levelsize 2000 1000))
   (objects 
+    (exit 
+      (surface 
+        (image "exits/halloween")
+        (modifier "ROT0"))
+      (position 917 510 -100)
+      (owner-id 0))
     (groundpiece 
       (type "transparent")
       (surface 
@@ -219,9 +225,6 @@
         (image "groundpieces/transparent/misc/moos6")
         (modifier "ROT0"))
       (position 603 423 0))
-    (solidcolor-background 
-      (position 19 139 -1000)
-      (color 0 0 0 1))
     (groundpiece 
       (type "transparent")
       (surface 
@@ -252,26 +255,12 @@
       (owner-id 0)
       (direction "misc")
       (release-rate 150))
-    (hotspot 
-      (surface 
-        (image "entrances/snow_back")
-        (modifier "ROT0"))
-      (position 356 217 0)
-      (speed 0)
-      (parallax 0))
-    (hotspot 
-      (surface 
-        (image "entrances/snow_front")
-        (modifier "ROT0"))
-      (position 356 217 0)
-      (speed 0)
-      (parallax 0))
     (groundpiece 
       (type "ground")
       (surface 
         (image "groundpieces/ground/halloween/ground3")
         (modifier "ROT0"))
-      (position 968 492 0))
+      (position 1051 466 0))
     (groundpiece 
       (type "ground")
       (surface 
@@ -343,13 +332,13 @@
       (surface 
         (image "groundpieces/transparent/halloween/kirby3")
         (modifier "ROT0"))
-      (position 989 474 0))
+      (position 1072 448 0))
     (groundpiece 
       (type "transparent")
       (surface 
         (image "groundpieces/transparent/halloween/hat1")
         (modifier "ROT0"))
-      (position 984 462 0))
+      (position 1067 436 0))
     (groundpiece 
       (type "transparent")
       (surface 
@@ -475,7 +464,7 @@
       (surface 
         (image "groundpieces/ground/halloween/ground2")
         (modifier "ROT0"))
-      (position 738 667 0))
+      (position 739 668 0))
     (groundpiece 
       (type "transparent")
       (surface 
@@ -511,6 +500,80 @@
       (surface 
         (image "groundpieces/transparent/misc/moos6")
         (modifier "ROT0"))
-      (position 647 427 0))))
+      (position 647 427 0))
+    (groundpiece 
+      (type "ground")
+      (surface 
+        (image "groundpieces/ground/halloween/ground2")
+        (modifier "ROT0"))
+      (position 741 506 0))
+    (groundpiece 
+      (type "ground")
+      (surface 
+        (image "groundpieces/ground/halloween/ground2")
+        (modifier "ROT0"))
+      (position 700 506 0))
+    (groundpiece 
+      (type "ground")
+      (surface 
+        (image "groundpieces/ground/halloween/ground2")
+        (modifier "ROT0"))
+      (position 829 504 0))
+    (groundpiece 
+      (type "ground")
+      (surface 
+        (image "groundpieces/ground/halloween/ground2")
+        (modifier "ROT0"))
+      (position 787 531 0))
+    (groundpiece 
+      (type "transparent")
+      (surface 
+        (image "groundpieces/transparent/misc/moos6")
+        (modifier "ROT0"))
+      (position 739 504 0))
+    (groundpiece 
+      (type "transparent")
+      (surface 
+        (image "groundpieces/transparent/misc/moos6")
+        (modifier "ROT0"))
+      (position 793 505 0))
+    (groundpiece 
+      (type "transparent")
+      (surface 
+        (image "groundpieces/transparent/misc/moos6")
+        (modifier "ROT0"))
+      (position 849 505 0))
+    (groundpiece 
+      (type "transparent")
+      (surface 
+        (image "groundpieces/transparent/misc/moos6")
+        (modifier "ROT0"))
+      (position 911 505 0))
+    (groundpiece 
+      (type "transparent")
+      (surface 
+        (image "groundpieces/transparent/misc/moos6")
+        (modifier "ROT0"))
+      (position 692 505 0))
+    (hotspot 
+      (surface 
+        (image "entrances/halloween")
+        (modifier "ROT0"))
+      (position 359 197 100)
+      (speed 0)
+      (parallax 0))
+    (surface-background 
+      (surface 
+        (image "textures/cyanspace")
+        (modifier "ROT0"))
+      (position 202 -105 -1000)
+      (color 0 0 0 0)
+      (stretch-x #f)
+      (stretch-y #f)
+      (keep-aspect #f)
+      (scroll-x 0)
+      (scroll-y 0)
+      (para-x 0.5)
+      (para-y 0.5))))
 
 ;; EOF ;;