pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] [pingus] push by address@hidden - Added flag to .levelset t


From: pingus
Subject: [Pingus-CVS] [pingus] push by address@hidden - Added flag to .levelset that allows hidding the levelset and unlocking... on 2011-10-20 17:32 GMT
Date: Thu, 20 Oct 2011 17:36:26 +0000

Revision: 6e540e57390f
Author:   Ingo Ruhnke <address@hidden>
Date:     Thu Oct 20 10:31:54 2011
Log: Added flag to .levelset that allows hidding the levelset and unlocking all the levels

Fixes issue 103

http://code.google.com/p/pingus/source/detail?r=6e540e57390f

Added:
 /data/levels/pacman/pacman1-yingwan.pingus
 /data/levels/pacman/pacman2-yingwan.pingus
 /data/levels/pacman/pacman3-yingwan.pingus
 /data/levelsets/alien.levelset
 /data/levelsets/crystal.levelset
 /data/levelsets/hellmouth.levelset
 /data/levelsets/jungle.levelset
 /data/levelsets/mysteryisland.levelset
 /data/levelsets/pacman.levelset
 /data/levelsets/xmas.levelset
Deleted:
 /data/levels/xskat/ok/pacman1-yingwan.pingus
 /data/levels/xskat/ok/pacman2-yingwan.pingus
 /data/levels/xskat/ok/pacman3-yingwan.pingus
 /data/levelsets/alien.levelset.grumbel
 /data/levelsets/crystal.levelset.JoshDye
 /data/levelsets/egypt.levelset.JoshDye
 /data/levelsets/forest.levelset.JoshDye
 /data/levelsets/jungle.levelset.JoshDye
 /data/levelsets/mysteryisland.levelset.grumbel
 /data/levelsets/pacman.levelset.JoshDye
 /data/levelsets/snow.levelset.JoshDye
 /data/levelsets/xmas.levelset.JoshDye
Modified:
 /data/levelsets/playable.levelset.JoshDye
 /src/pingus/levelset.cpp
 /src/pingus/levelset.hpp
 /src/pingus/screens/level_menu.cpp

=======================================
--- /dev/null
+++ /data/levels/pacman/pacman1-yingwan.pingus  Thu Oct 20 10:31:54 2011
@@ -0,0 +1,103 @@
+;; generated by xml2sexpr.rb
+(pingus-level
+  (version 2)
+  (head
+    (levelname "Pacman 1")
+ (description "Get to Mr. Pacman and avoid all the nasty ghosties to bring the Pingus home.")
+    (author "Ying-Wan Lam <address@hidden>")
+    (number-of-pingus 50)
+    (number-to-save 40)
+    (time -1)
+    (playable 1)
+    (actions
+      (basher 12)
+      (blocker 10)
+      (bomber 10)
+      (bridger 12)
+      (digger 5)
+      (floater 10)
+      (jumper 5)
+      (miner 5))
+    (music "none")
+    (levelsize 800 600))
+  (objects
+    (surface-background
+      (surface
+        (image "textures/stars")
+        (modifier "ROT0"))
+      (color 0 0 0 0)
+      (scroll-x 0.0)
+      (scroll-y 0.0)
+      (para-x 0.5)
+      (para-y 0.5)
+      (stretch-x #f)
+      (stretch-y #f))
+    (hotspot
+      (surface
+        (image "special/pacman/pacman-bkg")
+        (modifier "ROT0"))
+      (position 174 16 -5)
+      (speed -1)
+      (parallax 1))
+    (groundpiece
+      (type "ground")
+      (surface
+        (image "special/pacman/pacman-maze")
+        (modifier "ROT0"))
+      (position 174 16 0))
+    (groundpiece
+      (type "solid")
+      (surface
+        (image "special/pacman/pacman-frame")
+        (modifier "ROT0"))
+      (position 174 16 0))
+    (entrance
+      (position 227 99 0)
+      (type "generic")
+      (direction "right")
+      (release-rate 30)
+      (owner-id 0))
+    (exit
+      (owner-id 0)
+      (position 413 459 0)
+      (surface
+        (image "special/pacman/pacman")
+        (modifier "ROT0"))
+      (owner-id 0))
+    (hotspot
+      (surface
+        (image "special/pacman/blinky")
+        (modifier "ROT0"))
+      (position 430 186 80)
+      (speed -1)
+      (parallax 1))
+    (hotspot
+      (surface
+        (image "special/pacman/inky")
+        (modifier "ROT0"))
+      (position 362 426 80)
+      (speed -1)
+      (parallax 1))
+    (hotspot
+      (surface
+        (image "special/pacman/pinky")
+        (modifier "ROT0"))
+      (position 436 380 80)
+      (speed -1)
+      (parallax 1))
+    (hotspot
+      (surface
+        (image "special/pacman/clyde")
+        (modifier "ROT0"))
+      (position 361 233 80)
+      (speed -1)
+      (parallax 1))
+    (spike
+      (position 360 234 100))
+    (spike
+      (position 360 426 100))
+    (spike
+      (position 436 379 100))
+    (spike
+      (position 431 186 100))))
+;; EOF ;;
=======================================
--- /dev/null
+++ /data/levels/pacman/pacman2-yingwan.pingus  Thu Oct 20 10:31:54 2011
@@ -0,0 +1,103 @@
+;; generated by xml2sexpr.rb
+(pingus-level
+  (version 2)
+  (head
+    (levelname "Pacman 2")
+    (description "Another tour in Pacman's maze.")
+    (author "Ying-Wan Lam <address@hidden>")
+    (number-of-pingus 50)
+    (number-to-save 40)
+    (time -1)
+    (playable 1)
+    (actions
+      (basher 5)
+      (blocker 10)
+      (bomber 10)
+      (bridger 10)
+      (digger 5)
+      (floater 10)
+      (jumper 5)
+      (miner 5))
+    (music "none")
+    (levelsize 800 600))
+  (objects
+    (surface-background
+      (surface
+        (image "textures/stars")
+        (modifier "ROT0"))
+      (color 0 0 0 0)
+      (scroll-x 0.0)
+      (scroll-y 0.0)
+      (para-x 0.5)
+      (para-y 0.5)
+      (stretch-x #f)
+      (stretch-y #f))
+    (hotspot
+      (surface
+        (image "special/pacman/pacman-bkg")
+        (modifier "ROT0"))
+      (position 174 16 -5)
+      (speed -1)
+      (parallax 1))
+    (groundpiece
+      (type "ground")
+      (surface
+        (image "special/pacman/pacman-maze")
+        (modifier "ROT0"))
+      (position 174 16 0))
+    (groundpiece
+      (type "solid")
+      (surface
+        (image "special/pacman/pacman-frame")
+        (modifier "ROT0"))
+      (position 174 16 0))
+    (entrance
+      (position 567 102 0)
+      (type "generic")
+      (direction "right")
+      (release-rate 30)
+      (owner-id 0))
+    (exit
+      (owner-id 0)
+      (position 204 555 0)
+      (surface
+        (image "special/pacman/pacman")
+        (modifier "ROT0"))
+      (owner-id 0))
+    (hotspot
+      (surface
+        (image "special/pacman/blinky")
+        (modifier "ROT0"))
+      (position 484 283 80)
+      (speed -1)
+      (parallax 1))
+    (hotspot
+      (surface
+        (image "special/pacman/inky")
+        (modifier "ROT0"))
+      (position 307 378 80)
+      (speed -1)
+      (parallax 1))
+    (hotspot
+      (surface
+        (image "special/pacman/pinky")
+        (modifier "ROT0"))
+      (position 459 379 80)
+      (speed -1)
+      (parallax 1))
+    (hotspot
+      (surface
+        (image "special/pacman/clyde")
+        (modifier "ROT0"))
+      (position 410 232 80)
+      (speed -1)
+      (parallax 1))
+    (spike
+      (position 409 234 100))
+    (spike
+      (position 307 378 100))
+    (spike
+      (position 459 377 100))
+    (spike
+      (position 484 283 100))))
+;; EOF ;;
=======================================
--- /dev/null
+++ /data/levels/pacman/pacman3-yingwan.pingus  Thu Oct 20 10:31:54 2011
@@ -0,0 +1,104 @@
+;; generated by xml2sexpr.rb
+(pingus-level
+  (version 2)
+  (head
+    (levelname "Pacman 3")
+    (description "One more Pacman level. Yes. It can be solved :).")
+    (author "Ying-Wan Lam <address@hidden>")
+    (number-of-pingus 20)
+    (number-to-save 12)
+    (time -1)
+    (playable 1)
+    (actions
+      (basher 20)
+      (blocker 20)
+      (bomber 20)
+      (bridger 20)
+      (climber 20)
+      (digger 20)
+      (floater 20)
+      (jumper 20)
+      (miner 20))
+    (music "none")
+    (levelsize 800 600))
+  (objects
+    (surface-background
+      (surface
+        (image "textures/stars")
+        (modifier "ROT0"))
+      (color 0 0 0 0)
+      (scroll-x 0.0)
+      (scroll-y 0.0)
+      (para-x 0.5)
+      (para-y 0.5)
+      (stretch-x #f)
+      (stretch-y #f))
+    (hotspot
+      (surface
+        (image "special/pacman/pacman-bkg")
+        (modifier "ROT0"))
+      (position 174 16 -5)
+      (speed -1)
+      (parallax 1))
+    (groundpiece
+      (type "ground")
+      (surface
+        (image "special/pacman/pacman-maze")
+        (modifier "ROT0"))
+      (position 174 16 0))
+    (groundpiece
+      (type "solid")
+      (surface
+        (image "special/pacman/pacman-frame")
+        (modifier "ROT0"))
+      (position 174 16 0))
+    (entrance
+      (position 578 291 0)
+      (type "generic")
+      (direction "left")
+      (release-rate 150)
+      (owner-id 0))
+    (exit
+      (owner-id 0)
+      (position 192 315 0)
+      (surface
+        (image "special/pacman/pacman")
+        (modifier "ROT0"))
+      (owner-id 0))
+    (hotspot
+      (surface
+        (image "special/pacman/blinky")
+        (modifier "ROT0"))
+      (position 417 274 80)
+      (speed -1)
+      (parallax 1))
+    (hotspot
+      (surface
+        (image "special/pacman/inky")
+        (modifier "ROT0"))
+      (position 362 106 80)
+      (speed -1)
+      (parallax 1))
+    (hotspot
+      (surface
+        (image "special/pacman/pinky")
+        (modifier "ROT0"))
+      (position 382 522 80)
+      (speed -1)
+      (parallax 1))
+    (hotspot
+      (surface
+        (image "special/pacman/clyde")
+        (modifier "ROT0"))
+      (position 384 291 80)
+      (speed -1)
+      (parallax 1))
+    (spike
+      (position 386 290 100))
+    (spike
+      (position 363 106 100))
+    (spike
+      (position 418 275 100))
+    (spike
+      (position 386 522 100))))
+;; EOF ;;
=======================================
--- /dev/null
+++ /data/levelsets/alien.levelset      Thu Oct 20 10:31:54 2011
@@ -0,0 +1,21 @@
+;; -*- scheme -*-
+(pingus-levelset
+ (title "Alien by Josh Dye")
+ (description "Escape from alien")
+ (image  "levelsets/alien")
+ (developer-only #t)
+ (levels
+  (level (filename "alien/aliens1-phil"))
+  (level (filename "alien/aliens2-phil"))
+  (level (filename "alien/aliens4-phil"))
+  (level (filename "alien/aliens5-phil"))
+  (level (filename "alien/aliens6-phil"))
+  (level (filename "alien/aliens7-phil"))
+  (level (filename "alien/space-9-tom"))
+  (level (filename "alien/space-loop-timpany"))
+  (level (filename "alien/space-tom1"))
+  (level (filename "alien/space2"))
+  (level (filename "alien/space-11-rz+eriksoe"))
+ )
+)
+;; EOF ;;
=======================================
--- /dev/null
+++ /data/levelsets/crystal.levelset    Thu Oct 20 10:31:54 2011
@@ -0,0 +1,29 @@
+;; -*- scheme -*-
+(pingus-levelset
+ (title "Crystal")
+ (description "Crystaline sparkling full of danger")
+ (image  "levelsets/xmas")
+ (developer-only #t)
+ (locked #f)
+ (levels
+  (level (filename "crystal/cave-crystal1-mw"))
+  (level (filename "crystal/cave-crystal2-mw"))
+  (level (filename "crystal/crystal10-rz"))
+  (level (filename "crystal/crystal1"))
+  (level (filename "crystal/crystal2"))
+  (level (filename "crystal/crystal3"))
+  (level (filename "crystal/crystal4"))
+  (level (filename "crystal/crystal5"))
+  (level (filename "crystal/crystalcave1-gunter"))
+  (level (filename "crystal/crystalcave2-gunter"))
+  (level (filename "crystal/crystalcave3-gunter"))
+  (level (filename "crystal/crystalcave4-gunter"))
+  (level (filename "crystal/crystal-phil1"))
+  (level (filename "crystal/jewel"))
+  (level (filename "crystal/lonely"))
+  (level (filename "crystal/longway"))
+  (level (filename "crystal/parallel"))
+  (level (filename "crystal/sept-crystal1-mw"))
+  ))
+
+;; EOF ;;
=======================================
--- /dev/null
+++ /data/levelsets/hellmouth.levelset  Thu Oct 20 10:31:54 2011
@@ -0,0 +1,32 @@
+;; -*- scheme -*-
+(pingus-levelset
+ (title "Hellmouth")
+ (description "A cave full of slime...")
+ (image  "levelsets/alien")
+ (developer-only #t)
+ (locked #f)
+ (levels
+  (level (filename "hellmouth/hellmouth01-grumbel"))
+  (level (filename "hellmouth/hellmouth02-grumbel"))
+  (level (filename "hellmouth/hellmouth03-grumbel"))
+  (level (filename "hellmouth/hellmouth04-grumbel"))
+  (level (filename "hellmouth/hellmouth05-grumbel"))
+  (level (filename "hellmouth/hellmouth06-grumbel"))
+  (level (filename "hellmouth/hellmouth07-grumbel"))
+  (level (filename "hellmouth/hellmouth08-grumbel"))
+  (level (filename "hellmouth/hellmouth09-grumbel"))
+  (level (filename "hellmouth/hellmouth10-grumbel"))
+  (level (filename "hellmouth/hellmouth11-rz"))
+  (level (filename "hellmouth/hellmouth12-grumbel"))
+  (level (filename "hellmouth/hellmouth13-grumbel"))
+  (level (filename "hellmouth/hellmouth14-grumbel"))
+  (level (filename "hellmouth/hellmouth15-grumbel"))
+  (level (filename "hellmouth/hellmouth17-grumbel"))
+  (level (filename "hellmouth/hellmouth20-grumbel"))
+  (level (filename "hellmouth/hellmouth21-grumbel"))
+  (level (filename "hellmouth/hellmouth22-grumbel"))
+  (level (filename "hellmouth/hellmouth23-rz+eriksoe"))
+  (level (filename "hellmouth/hellmouth24-rz"))
+  )
+ )
+;; EOF ;;
=======================================
--- /dev/null
+++ /data/levelsets/jungle.levelset     Thu Oct 20 10:31:54 2011
@@ -0,0 +1,22 @@
+;; -*- scheme -*-
+(pingus-levelset
+ (title "Jungle")
+ (description "")
+ (image  "levelsets/xmas")
+ (developer-only #t)
+ (locked #f)
+ (levels
+  (level (filename "jungle/cave-jungle1-mw"))
+  (level (filename "jungle/foliage3"))
+  (level (filename "jungle/headbang"))
+  (level (filename "jungle/intersec"))
+  (level (filename "jungle/jungle-13-rz+eriksoe"))
+  (level (filename "jungle/jungle1"))
+  (level (filename "jungle/jungle2"))
+  (level (filename "jungle/jungle-airline-timpany"))
+  (level (filename "jungle/jungle-crisscross-timpany"))
+  (level (filename "jungle/rinse"))
+  (level (filename "jungle/wland-timpany"))
+  ))
+
+;; EOF ;;
=======================================
--- /dev/null
+++ /data/levelsets/mysteryisland.levelset      Thu Oct 20 10:31:54 2011
@@ -0,0 +1,23 @@
+;; -*- scheme -*-
+(pingus-levelset
+ (title "Island of Mystery")
+ (description "Marooned on an Uncharted Isle [by Lachlan McCubbin]")
+ (image "levelsets/mysteryisland")
+ (developer-only #t)
+ (locked #f)
+ (levels
+  (level (filename "mysteryisland/volcano1-grumbel"))
+  (level (filename "mysteryisland/multi1-lac"))
+  (level (filename "mysteryisland/use-the-slide-lac"))
+  (level (filename "mysteryisland/hall-of-illusion-lac"))
+  (level (filename "mysteryisland/emperiment-lac"))
+  (level (filename "mysteryisland/madscientist1-lac"))
+  (level (filename "mysteryisland/cave-lac"))
+  (level (filename "mysteryisland/revenge2-lac"))
+  (level (filename "mysteryisland/lavapit3"))
+  (level (filename "mysteryisland/snow2-lac"))
+  (level (filename "mysteryisland/rainy1-lac"))
+  (level (filename "mysteryisland/theend-lac"))
+ )
+)
+;; EOF ;;
=======================================
--- /dev/null
+++ /data/levelsets/pacman.levelset     Thu Oct 20 10:31:54 2011
@@ -0,0 +1,14 @@
+;; -*- scheme -*-
+(pingus-levelset
+ (title "Pac-Man")
+ (description "Trapped in a video game")
+ (image  "levelsets/pacman")
+ (developer-only #t)
+ (locked #f)
+ (levels
+  (level (filename "pacman/pacman1-yingwan"))
+  (level (filename "pacman/pacman2-yingwan"))
+  (level (filename "pacman/pacman3-yingwan"))
+  ))
+
+;; EOF ;;
=======================================
--- /dev/null
+++ /data/levelsets/xmas.levelset       Thu Oct 20 10:31:54 2011
@@ -0,0 +1,14 @@
+;; -*- scheme -*-
+(pingus-levelset
+ (title "X-Mas 2007")
+ (description "Merry Christmas and a Happy New Year")
+ (image  "levelsets/xmas")
+ (developer-only #t)
+ (locked #f)
+ (levels
+  (level (filename "xmas/xmas1-grumbel"))
+  (level (filename "xmas/xmas2-grumbel"))
+  (level (filename "xmas/xmas3-grumbel"))
+  ))
+
+;; EOF ;;
=======================================
--- /data/levels/xskat/ok/pacman1-yingwan.pingus        Tue Sep  6 16:14:19 2011
+++ /dev/null
@@ -1,103 +0,0 @@
-;; generated by xml2sexpr.rb
-(pingus-level
-  (version 2)
-  (head
-    (levelname "Pacman 1")
- (description "Get to Mr. Pacman and avoid all the nasty ghosties to bring the Pingus home.")
-    (author "Ying-Wan Lam <address@hidden>")
-    (number-of-pingus 50)
-    (number-to-save 40)
-    (time -1)
-    (playable 1)
-    (actions
-      (basher 12)
-      (blocker 10)
-      (bomber 10)
-      (bridger 12)
-      (digger 5)
-      (floater 10)
-      (jumper 5)
-      (miner 5))
-    (music "none")
-    (levelsize 800 600))
-  (objects
-    (surface-background
-      (surface
-        (image "textures/stars")
-        (modifier "ROT0"))
-      (color 0 0 0 0)
-      (scroll-x 0.0)
-      (scroll-y 0.0)
-      (para-x 0.5)
-      (para-y 0.5)
-      (stretch-x #f)
-      (stretch-y #f))
-    (hotspot
-      (surface
-        (image "special/pacman/pacman-bkg")
-        (modifier "ROT0"))
-      (position 174 16 -5)
-      (speed -1)
-      (parallax 1))
-    (groundpiece
-      (type "ground")
-      (surface
-        (image "special/pacman/pacman-maze")
-        (modifier "ROT0"))
-      (position 174 16 0))
-    (groundpiece
-      (type "solid")
-      (surface
-        (image "special/pacman/pacman-frame")
-        (modifier "ROT0"))
-      (position 174 16 0))
-    (entrance
-      (position 227 99 0)
-      (type "generic")
-      (direction "right")
-      (release-rate 30)
-      (owner-id 0))
-    (exit
-      (owner-id 0)
-      (position 413 459 0)
-      (surface
-        (image "special/pacman/pacman")
-        (modifier "ROT0"))
-      (owner-id 0))
-    (hotspot
-      (surface
-        (image "special/pacman/blinky")
-        (modifier "ROT0"))
-      (position 430 186 80)
-      (speed -1)
-      (parallax 1))
-    (hotspot
-      (surface
-        (image "special/pacman/inky")
-        (modifier "ROT0"))
-      (position 362 426 80)
-      (speed -1)
-      (parallax 1))
-    (hotspot
-      (surface
-        (image "special/pacman/pinky")
-        (modifier "ROT0"))
-      (position 436 380 80)
-      (speed -1)
-      (parallax 1))
-    (hotspot
-      (surface
-        (image "special/pacman/clyde")
-        (modifier "ROT0"))
-      (position 361 233 80)
-      (speed -1)
-      (parallax 1))
-    (spike
-      (position 360 234 100))
-    (spike
-      (position 360 426 100))
-    (spike
-      (position 436 379 100))
-    (spike
-      (position 431 186 100))))
-;; EOF ;;
=======================================
--- /data/levels/xskat/ok/pacman2-yingwan.pingus        Tue Sep  6 16:14:19 2011
+++ /dev/null
@@ -1,103 +0,0 @@
-;; generated by xml2sexpr.rb
-(pingus-level
-  (version 2)
-  (head
-    (levelname "Pacman 2")
-    (description "Another tour in Pacman's maze.")
-    (author "Ying-Wan Lam <address@hidden>")
-    (number-of-pingus 50)
-    (number-to-save 40)
-    (time -1)
-    (playable 1)
-    (actions
-      (basher 5)
-      (blocker 10)
-      (bomber 10)
-      (bridger 10)
-      (digger 5)
-      (floater 10)
-      (jumper 5)
-      (miner 5))
-    (music "none")
-    (levelsize 800 600))
-  (objects
-    (surface-background
-      (surface
-        (image "textures/stars")
-        (modifier "ROT0"))
-      (color 0 0 0 0)
-      (scroll-x 0.0)
-      (scroll-y 0.0)
-      (para-x 0.5)
-      (para-y 0.5)
-      (stretch-x #f)
-      (stretch-y #f))
-    (hotspot
-      (surface
-        (image "special/pacman/pacman-bkg")
-        (modifier "ROT0"))
-      (position 174 16 -5)
-      (speed -1)
-      (parallax 1))
-    (groundpiece
-      (type "ground")
-      (surface
-        (image "special/pacman/pacman-maze")
-        (modifier "ROT0"))
-      (position 174 16 0))
-    (groundpiece
-      (type "solid")
-      (surface
-        (image "special/pacman/pacman-frame")
-        (modifier "ROT0"))
-      (position 174 16 0))
-    (entrance
-      (position 567 102 0)
-      (type "generic")
-      (direction "right")
-      (release-rate 30)
-      (owner-id 0))
-    (exit
-      (owner-id 0)
-      (position 204 555 0)
-      (surface
-        (image "special/pacman/pacman")
-        (modifier "ROT0"))
-      (owner-id 0))
-    (hotspot
-      (surface
-        (image "special/pacman/blinky")
-        (modifier "ROT0"))
-      (position 484 283 80)
-      (speed -1)
-      (parallax 1))
-    (hotspot
-      (surface
-        (image "special/pacman/inky")
-        (modifier "ROT0"))
-      (position 307 378 80)
-      (speed -1)
-      (parallax 1))
-    (hotspot
-      (surface
-        (image "special/pacman/pinky")
-        (modifier "ROT0"))
-      (position 459 379 80)
-      (speed -1)
-      (parallax 1))
-    (hotspot
-      (surface
-        (image "special/pacman/clyde")
-        (modifier "ROT0"))
-      (position 410 232 80)
-      (speed -1)
-      (parallax 1))
-    (spike
-      (position 409 234 100))
-    (spike
-      (position 307 378 100))
-    (spike
-      (position 459 377 100))
-    (spike
-      (position 484 283 100))))
-;; EOF ;;
=======================================
--- /data/levels/xskat/ok/pacman3-yingwan.pingus        Tue Sep  6 16:14:19 2011
+++ /dev/null
@@ -1,104 +0,0 @@
-;; generated by xml2sexpr.rb
-(pingus-level
-  (version 2)
-  (head
-    (levelname "Pacman 3")
-    (description "One more Pacman level. Yes. It can be solved :).")
-    (author "Ying-Wan Lam <address@hidden>")
-    (number-of-pingus 20)
-    (number-to-save 12)
-    (time -1)
-    (playable 1)
-    (actions
-      (basher 20)
-      (blocker 20)
-      (bomber 20)
-      (bridger 20)
-      (climber 20)
-      (digger 20)
-      (floater 20)
-      (jumper 20)
-      (miner 20))
-    (music "none")
-    (levelsize 800 600))
-  (objects
-    (surface-background
-      (surface
-        (image "textures/stars")
-        (modifier "ROT0"))
-      (color 0 0 0 0)
-      (scroll-x 0.0)
-      (scroll-y 0.0)
-      (para-x 0.5)
-      (para-y 0.5)
-      (stretch-x #f)
-      (stretch-y #f))
-    (hotspot
-      (surface
-        (image "special/pacman/pacman-bkg")
-        (modifier "ROT0"))
-      (position 174 16 -5)
-      (speed -1)
-      (parallax 1))
-    (groundpiece
-      (type "ground")
-      (surface
-        (image "special/pacman/pacman-maze")
-        (modifier "ROT0"))
-      (position 174 16 0))
-    (groundpiece
-      (type "solid")
-      (surface
-        (image "special/pacman/pacman-frame")
-        (modifier "ROT0"))
-      (position 174 16 0))
-    (entrance
-      (position 578 291 0)
-      (type "generic")
-      (direction "left")
-      (release-rate 150)
-      (owner-id 0))
-    (exit
-      (owner-id 0)
-      (position 192 315 0)
-      (surface
-        (image "special/pacman/pacman")
-        (modifier "ROT0"))
-      (owner-id 0))
-    (hotspot
-      (surface
-        (image "special/pacman/blinky")
-        (modifier "ROT0"))
-      (position 417 274 80)
-      (speed -1)
-      (parallax 1))
-    (hotspot
-      (surface
-        (image "special/pacman/inky")
-        (modifier "ROT0"))
-      (position 362 106 80)
-      (speed -1)
-      (parallax 1))
-    (hotspot
-      (surface
-        (image "special/pacman/pinky")
-        (modifier "ROT0"))
-      (position 382 522 80)
-      (speed -1)
-      (parallax 1))
-    (hotspot
-      (surface
-        (image "special/pacman/clyde")
-        (modifier "ROT0"))
-      (position 384 291 80)
-      (speed -1)
-      (parallax 1))
-    (spike
-      (position 386 290 100))
-    (spike
-      (position 363 106 100))
-    (spike
-      (position 418 275 100))
-    (spike
-      (position 386 522 100))))
-;; EOF ;;
=======================================
--- /data/levelsets/alien.levelset.grumbel      Mon Oct  3 08:27:19 2011
+++ /dev/null
@@ -1,20 +0,0 @@
-;; -*- scheme -*-
-(pingus-levelset
- (title "Alien by Josh Dye")
- (description "Escape from alien")
- (image  "levelsets/alien")
- (levels
-  (level (filename "alien/aliens1-phil"))
-  (level (filename "alien/aliens2-phil"))
-  (level (filename "alien/aliens4-phil"))
-  (level (filename "alien/aliens5-phil"))
-  (level (filename "alien/aliens6-phil"))
-  (level (filename "alien/aliens7-phil"))
-  (level (filename "alien/space-9-tom"))
-  (level (filename "alien/space-loop-timpany"))
-  (level (filename "alien/space-tom1"))
-  (level (filename "alien/space2"))
-  (level (filename "alien/space-11-rz+eriksoe"))
- )
-)
-;; EOF ;;
=======================================
--- /data/levelsets/crystal.levelset.JoshDye    Tue Aug 30 06:40:23 2011
+++ /dev/null
@@ -1,13 +0,0 @@
-;; -*- scheme -*-
-(pingus-levelset
- (title "Crystal")
- (description "")
- (image  "levelsets/xmas")
- (levels
-(level (filename "playable/crystal-10-rz"))
-(level (filename "playable/crystal2"))
-(level (filename "playable/crystal5"))
-
-    ))
-
-;; EOF ;;
=======================================
--- /data/levelsets/egypt.levelset.JoshDye      Tue Aug 30 06:40:23 2011
+++ /dev/null
@@ -1,14 +0,0 @@
-;; -*- scheme -*-
-(pingus-levelset
- (title "Egypt")
- (description "")
- (image  "levelsets/xmas")
-(levels
-(level (filename "playable/egypt1-judit"))
-(level (filename "playable/egypt1-moredhel"))
-(level (filename "playable/pyramid1-yingwan"))
-(level (filename "playable/pyramid2-yingwan"))
-
-    ))
-
-;; EOF ;;
=======================================
--- /data/levelsets/forest.levelset.JoshDye     Tue Aug 30 06:40:23 2011
+++ /dev/null
@@ -1,13 +0,0 @@
-;; -*- scheme -*-
-(pingus-levelset
- (title "Forest")
- (description "")
- (image  "levelsets/xmas")
- (levels
-  (level (filename "forest/forest1-grumbel"))
-(level (filename "playable/forest1-chei"))
-(level (filename "playable/forest2-chei"))
-
-    ))
-
-;; EOF ;;
=======================================
--- /data/levelsets/jungle.levelset.JoshDye     Tue Aug 30 06:40:23 2011
+++ /dev/null
@@ -1,14 +0,0 @@
-;; -*- scheme -*-
-(pingus-levelset
- (title "Jungle")
- (description "")
- (image  "levelsets/xmas")
-(levels
-(level (filename "playable/jungle-13-rz+eriksoe"))
-(level (filename "playable/jungle-airline-timpany"))
-(level (filename "playable/jungle-crisscross-timpany"))
-(level (filename "playable/jungle1"))
-
-    ))
-
-;; EOF ;;
=======================================
--- /data/levelsets/mysteryisland.levelset.grumbel      Mon Oct  3 08:28:13 2011
+++ /dev/null
@@ -1,21 +0,0 @@
-;; -*- scheme -*-
-(pingus-levelset
- (title "Island of Mystery")
- (description "Marooned on an Uncharted Isle [by Lachlan McCubbin]")
- (image "levelsets/mysteryisland")
- (levels
-  (level (filename "mysteryisland/volcano1-grumbel"))
-  (level (filename "mysteryisland/multi1-lac"))
-  (level (filename "mysteryisland/use-the-slide-lac"))
-  (level (filename "mysteryisland/hall-of-illusion-lac"))
-  (level (filename "mysteryisland/emperiment-lac"))
-  (level (filename "mysteryisland/madscientist1-lac"))
-  (level (filename "mysteryisland/cave-lac"))
-  (level (filename "mysteryisland/revenge2-lac"))
-  (level (filename "mysteryisland/lavapit3"))
-  (level (filename "mysteryisland/snow2-lac"))
-  (level (filename "mysteryisland/rainy1-lac"))
-  (level (filename "mysteryisland/theend-lac"))
- )
-)
-;; EOF ;;
=======================================
--- /data/levelsets/pacman.levelset.JoshDye     Tue Aug 30 06:40:23 2011
+++ /dev/null
@@ -1,12 +0,0 @@
-;; -*- scheme -*-
-(pingus-levelset
- (title "Pac-Man")
- (description "Trapped in a video game")
- (image  "levelsets/pacman")
- (levels
-  (level (filename "playable/pacman1-yingwan"))
-  (level (filename "playable/pacman2-yingwan"))
-  (level (filename "playable/pacman3-yingwan"))
-  ))
-
-;; EOF ;;
=======================================
--- /data/levelsets/snow.levelset.JoshDye       Tue Aug 30 06:40:23 2011
+++ /dev/null
@@ -1,36 +0,0 @@
-;; -*- scheme -*-
-(pingus-levelset
- (title "Winter")
- (description "")
- (image  "levelsets/xmas")
- (levels
-(level (filename "playable/cave-snow1-mw"))
-(level (filename "playable/sept-snow1-mw"))
-(level (filename "playable/winter1-chei"))
-(level (filename "playable/winter2-chei"))
-(level (filename "playable/snow-lukis"))
-(level (filename "playable/snow1-marcotte"))
-(level (filename "playable/snow1"))
-(level (filename "playable/snow10-grumbel"))
-(level (filename "playable/snow11-grumbel"))
-(level (filename "playable/snow12-grumbel"))
-(level (filename "playable/snow14-grumbel"))
-(level (filename "playable/snow15-grumbel"))
-(level (filename "playable/snow16-grumbel"))
-(level (filename "playable/snow17-grumbel"))
-(level (filename "playable/snow19-grumbel"))
-(level (filename "playable/snow2"))
-(level (filename "playable/snow20-grumbel"))
-(level (filename "playable/snow21-grumbel"))
-(level (filename "playable/snow22-grumbel"))
-(level (filename "playable/snow3"))
-(level (filename "playable/snow4"))
-(level (filename "playable/snow5"))
-(level (filename "playable/snow6"))
-(level (filename "playable/snow7-grumbel"))
-(level (filename "playable/snow8-grumbel"))
-(level (filename "playable/snow9-grumbel"))
-
-    ))
-
-;; EOF ;;
=======================================
--- /data/levelsets/xmas.levelset.JoshDye       Tue Aug 30 06:40:23 2011
+++ /dev/null
@@ -1,12 +0,0 @@
-;; -*- scheme -*-
-(pingus-levelset
- (title "X-Mas 2007")
- (description "Merry Christmas and a Happy New Year")
- (image  "levelsets/xmas")
- (levels
-  (level (filename "xmas/xmas1-grumbel"))
-  (level (filename "xmas/xmas2-grumbel"))
-  (level (filename "xmas/xmas3-grumbel"))
-  ))
-
-;; EOF ;;
=======================================
--- /data/levelsets/playable.levelset.JoshDye   Mon Sep 12 06:15:58 2011
+++ /data/levelsets/playable.levelset.JoshDye   Thu Oct 20 10:31:54 2011
@@ -3,6 +3,8 @@
  (title "Playable")
  (description "")
  (image  "levelsets/xmas")
+ (developer-only #t)
+ (locked #f)
  (levels
 (level (filename "playable/alle"))
 (level (filename "playable/avaritia-cbrucher"))
@@ -45,7 +47,6 @@
 (level (filename "playable/Lev4"))
 (level (filename "playable/level13"))
 (level (filename "playable/level9"))
-(level (filename "playable/lonely"))
 (level (filename "playable/longway"))
 (level (filename "playable/mauern"))
 (level (filename "playable/miner-tutorial-grumbel"))
=======================================
--- /src/pingus/levelset.cpp    Wed Oct 19 20:35:33 2011
+++ /src/pingus/levelset.cpp    Thu Oct 20 10:31:54 2011
@@ -20,6 +20,7 @@

 #include "math/math.hpp"
 #include "pingus/plf_res_mgr.hpp"
+#include "pingus/globals.hpp"
 #include "pingus/savegame_manager.hpp"
 #include "util/log.hpp"
 #include "util/raise_exception.hpp"
@@ -67,7 +68,7 @@
     std::unique_ptr<Levelset> levelset(new Levelset);

     std::string tmp;
-    if (reader.read_string("title",       tmp))
+    if (reader.read_string("title", tmp))
     {
       levelset->set_title(tmp);
     }
@@ -82,19 +83,32 @@
       levelset->set_image(tmp);
     }

-    FileReader level_reader = reader.read_section("levels");
-    std::vector<FileReader> sections = level_reader.get_sections();
- for(std::vector<FileReader>::iterator i = sections.begin(); i != sections.end(); ++i)
-    {
-      if (i->get_name() == "level")
-      {
-        if (!i->read_string("filename", tmp))
-        {
- log_error("Levelset: " << pathname.str() << " is missing filename tag");
-        }
-        else
-        {
-          levelset->add_level(tmp);
+    bool tmp_bool;
+    if (reader.read_bool("developer-only", tmp_bool))
+    {
+      levelset->set_developer_only(tmp_bool);
+    }
+
+    bool locked = true;
+    reader.read_bool("locked", locked);
+
+    // skip level loading when levels won't be used
+    if (!levelset->get_developer_only() || globals::developer_mode)
+    {
+      FileReader level_reader = reader.read_section("levels");
+      std::vector<FileReader> sections = level_reader.get_sections();
+ for(std::vector<FileReader>::iterator i = sections.begin(); i != sections.end(); ++i)
+      {
+        if (i->get_name() == "level")
+        {
+          if (!i->read_string("filename", tmp))
+          {
+ log_error("Levelset: " << pathname.str() << " is missing filename tag");
+          }
+          else
+          {
+            levelset->add_level(tmp, !locked);
+          }
         }
       }
     }
@@ -108,6 +122,7 @@
 Levelset::Levelset() :
   m_title(),
   m_description(),
+  m_developer_only(false),
   m_sprite(),
   m_completion(0),
   m_levels()
@@ -139,6 +154,12 @@
 {
   m_sprite = Sprite(image);
 }
+
+void
+Levelset::set_developer_only(bool developer_only)
+{
+  m_developer_only = developer_only;
+}

 void
 Levelset::add_level(const std::string& resname, bool accessible)
@@ -199,6 +220,12 @@
 {
   return m_sprite;
 }
+
+bool
+Levelset::get_developer_only() const
+{
+  return m_developer_only;
+}

 void
 Levelset::refresh()
=======================================
--- /src/pingus/levelset.hpp    Wed Oct 19 20:35:33 2011
+++ /src/pingus/levelset.hpp    Thu Oct 20 10:31:54 2011
@@ -42,6 +42,7 @@
 private:
   std::string m_title;
   std::string m_description;
+  bool m_developer_only;
   Sprite m_sprite;
   int  m_completion;
   std::vector<Level*> m_levels;
@@ -60,8 +61,10 @@
   void set_title(const std::string& title);
   void set_description(const std::string& description);
   void set_image(const std::string& image);
+  void set_developer_only(bool developer_only);
   void add_level(const std::string& resname, bool accessible = false);

+  bool get_developer_only() const;
   std::string get_title() const;
   std::string get_description() const;
   Sprite get_image() const;
=======================================
--- /src/pingus/screens/level_menu.cpp  Wed Oct 19 20:35:33 2011
+++ /src/pingus/screens/level_menu.cpp  Thu Oct 20 10:31:54 2011
@@ -130,7 +130,11 @@
     {
       try
       {
-        levelsets.push_back(Levelset::from_file(*i).release());
+        std::unique_ptr<Levelset> levelset = Levelset::from_file(*i);
+        if (!levelset->get_developer_only() || globals::developer_mode)
+        {
+          levelsets.push_back(levelset.release());
+        }
       }
       catch(const std::exception& err)
       {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]