diff -Nru magicor-1.1/data/levels/egypt/egypt-02.lvl magicor-1.0/data/levels/egypt/egypt-02.lvl --- magicor-1.1/data/levels/egypt/egypt-02.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/egypt/egypt-02.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -4,7 +4,7 @@ description Egyptian themed level 2. background egypt/bg-hieroglyphs -music egypt/egyptian-akward +music egypt/egyptian-trance shadows 1 tile 1 1 egypt/bricks diff -Nru magicor-1.1/data/levels/egypt/egypt-03.lvl magicor-1.0/data/levels/egypt/egypt-03.lvl --- magicor-1.1/data/levels/egypt/egypt-03.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/egypt/egypt-03.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -4,7 +4,7 @@ description Egyptian themed level 3. background egypt/bg-wall -music egypt/egyptian-sadness +music egypt/egyptian-trance shadows 1 tile 4 4 egypt/bricks diff -Nru magicor-1.1/data/levels/egypt/egypt-05.lvl magicor-1.0/data/levels/egypt/egypt-05.lvl --- magicor-1.1/data/levels/egypt/egypt-05.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/egypt/egypt-05.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -4,7 +4,7 @@ description Egyptian themed level 5. background egypt/bg-hieroglyphs -music egypt/egyptian-akward +music egypt/egyptian-trance shadows 1 tile 3 4 egypt/bricks diff -Nru magicor-1.1/data/levels/egypt/egypt-06.lvl magicor-1.0/data/levels/egypt/egypt-06.lvl --- magicor-1.1/data/levels/egypt/egypt-06.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/egypt/egypt-06.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -4,7 +4,7 @@ description Egyptian themed level 6. background egypt/bg-wall -music egypt/egyptian-sadness +music egypt/egyptian-trance shadows 1 tile 2 2 egypt/bricks diff -Nru magicor-1.1/data/levels/egypt/egypt-08.lvl magicor-1.0/data/levels/egypt/egypt-08.lvl --- magicor-1.1/data/levels/egypt/egypt-08.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/egypt/egypt-08.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -4,7 +4,7 @@ description Egyptian themed level 8. background egypt/bg-wall -music egypt/egyptian-akward +music egypt/egyptian-trance shadows 1 tile 4 3 egypt/bricks diff -Nru magicor-1.1/data/levels/egypt/egypt-09.lvl magicor-1.0/data/levels/egypt/egypt-09.lvl --- magicor-1.1/data/levels/egypt/egypt-09.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/egypt/egypt-09.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -5,7 +5,7 @@ hint background egypt/bg-hieroglyphs -music egypt/egyptian-sadness +music egypt/egyptian-trance shadows 1 tile 0 0 egypt/bricks diff -Nru magicor-1.1/data/levels/egypt/egypt-11.lvl magicor-1.0/data/levels/egypt/egypt-11.lvl --- magicor-1.1/data/levels/egypt/egypt-11.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/egypt/egypt-11.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -5,7 +5,7 @@ hint background egypt/bg-wall -music egypt/egyptian-akward +music egypt/egyptian-trance shadows 1 tile 0 0 egypt/bricks diff -Nru magicor-1.1/data/levels/egypt/egypt-12.lvl magicor-1.0/data/levels/egypt/egypt-12.lvl --- magicor-1.1/data/levels/egypt/egypt-12.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/egypt/egypt-12.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -4,7 +4,7 @@ description Egyptian themed level 12. background egypt/bg-bricks -music egypt/egyptian-sadness +music egypt/egyptian-trance shadows 1 tile 6 5 egypt/bricks diff -Nru magicor-1.1/data/levels/egypt/egypt-13.lvl magicor-1.0/data/levels/egypt/egypt-13.lvl --- magicor-1.1/data/levels/egypt/egypt-13.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/egypt/egypt-13.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -1,4 +1,4 @@ -# Generated by Magicor-LevelEditor 1.0 +# Generated by Magicor-LevelEditor 0.1 beta title Egypt 13 credits wagner frederic description @@ -22,7 +22,6 @@ tile 9 5 egypt/bricks tile 11 5 egypt/bricks tile 9 6 egypt/bricks -tile 18 6 tiles/tube-vertical tile 7 7 egypt/bricks tile 8 7 egypt/bricks tile 9 7 egypt/bricks @@ -153,4 +152,4 @@ sprite 2 7 tube up 1 sprite 3 9 tube up 2 sprite 15 11 tube up 1 -sprite 18 5 tube up 2 \ No newline at end of file +sprite 18 6 tube up 2 diff -Nru magicor-1.1/data/levels/egypt/egypt-14.lvl magicor-1.0/data/levels/egypt/egypt-14.lvl --- magicor-1.1/data/levels/egypt/egypt-14.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/egypt/egypt-14.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -1,11 +1,11 @@ -# Generated by Magicor-LevelEditor 1.0 +# Generated by Magicor-LevelEditor 0.1 beta title Egypt 14 credits wagner frederic description hint background egypt/bg-bricks -music egypt/egyptian-akward +music egypt/egyptian-trance shadows 1 tile 19 3 tiles/tube-vertical @@ -71,6 +71,8 @@ tile 16 13 egypt/bricks tile 3 14 egypt/bricks tile 5 14 egypt/bricks +tile 6 14 egypt/bricks +tile 7 14 egypt/bricks tile 12 14 egypt/bricks tile 3 15 egypt/bricks tile 5 15 egypt/bricks @@ -109,7 +111,6 @@ sprite 10 14 fire sprite 16 16 fire sprite 7 7 ice -sprite 7 14 ice sprite 1 16 lava dormant sprite 2 16 lava dormant sprite 3 16 lava dormant @@ -135,9 +136,7 @@ sprite 17 16 lava dormant sprite 18 16 lava dormant sprite 3 8 player right -sprite 5 10 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 8 14 stationary-enemy up sprites/spikes samples/spikes 16 sprite 0 6 tube up 1 sprite 1 12 tube up 1 sprite 14 7 tube up 2 -sprite 19 2 tube up 2 \ No newline at end of file +sprite 19 2 tube up 2 diff -Nru magicor-1.1/data/levels/egypt/egypt-15.lvl magicor-1.0/data/levels/egypt/egypt-15.lvl --- magicor-1.1/data/levels/egypt/egypt-15.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/egypt/egypt-15.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -5,7 +5,7 @@ hint background egypt/bg-bricks -music egypt/egyptian-sadness +music egypt/egyptian-trance shadows 1 tile 4 0 egypt/bricks Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/egypt/egyptian-akward.xm and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/egypt/egyptian-akward.xm differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/egypt/egyptian-sadness.xm and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/egypt/egyptian-sadness.xm differ diff -Nru magicor-1.1/data/levels/level-04.lvl magicor-1.0/data/levels/level-04.lvl --- magicor-1.1/data/levels/level-04.lvl 1970-01-01 01:00:00.000000000 +0100 +++ magicor-1.0/data/levels/level-04.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -0,0 +1,36 @@ +# Generated by Magicor-LevelEditor 1.0 +title Level 04 +credits Claudio Canepa +description Tutorial level 4 +hint + +background backgrounds/maroon +music +shadows 1 + +tile 7 13 tiles/squares +tile 8 13 tiles/squares +tile 9 13 tiles/squares +tile 10 13 tiles/squares + +sprite 8 8 direction down +sprite 8 10 direction up +sprite 9 8 fire +sprite 7 9 ice connect-right +sprite 7 10 ice +sprite 7 11 ice +sprite 7 12 ice +sprite 8 9 ice connect +sprite 9 7 ice connect-right +sprite 9 9 ice connect-left +sprite 10 7 ice connect-left +sprite 10 8 ice +sprite 10 9 ice +sprite 10 10 ice +sprite 10 11 ice +sprite 10 12 ice +sprite 7 12 lava dormant +sprite 8 12 lava dormant +sprite 9 12 lava dormant +sprite 10 12 lava dormant +sprite 7 8 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/level-05.lvl magicor-1.0/data/levels/level-05.lvl --- magicor-1.1/data/levels/level-05.lvl 1970-01-01 01:00:00.000000000 +0100 +++ magicor-1.0/data/levels/level-05.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -0,0 +1,34 @@ +# Generated by Magicor-LevelEditor 1.0 +title level 05 +credits Claudio Canepa +description +hint + +background +music +shadows 1 + +tile 13 10 forest/tile-wood +tile 13 11 forest/tile-wood +tile 15 11 forest/tile-wood +tile 13 12 forest/tile-wood +tile 15 12 forest/tile-wood +tile 17 12 forest/tile-wood +tile 13 13 forest/tile-wood +tile 14 13 forest/tile-wood +tile 15 13 forest/tile-wood +tile 16 13 forest/tile-wood +tile 17 13 forest/tile-wood +tile 18 13 forest/tile-wood +tile 14 14 forest/tile-wood +tile 15 14 forest/tile-wood +tile 16 14 forest/tile-wood +tile 17 14 forest/tile-wood +tile 18 14 forest/tile-wood +tile 19 14 forest/tile-wood + +sprite 19 13 fire +sprite 13 9 ice connect-right +sprite 14 9 ice connect +sprite 15 9 ice connect-left +sprite 13 8 player right \ No newline at end of file Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/B100M801.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/B100M801.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/box_3_lindo_fog_halo1.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/box_3_lindo_fog_halo1.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/box_3_lindo_fog_sinnormal.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/box_3_lindo_fog_sinnormal.png differ diff -Nru magicor-1.1/data/levels/pompei/brushes magicor-1.0/data/levels/pompei/brushes --- magicor-1.1/data/levels/pompei/brushes 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/brushes 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -tile pompei/tile-hmosaic -tile pompei/tile-vmosaic -decoration pompei/decor-left 32 32 -decoration pompei/decor-hcenter 32 32 -decoration pompei/decor-right 32 32 - Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/decor-hcenter.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/decor-hcenter.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/decor-left.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/decor-left.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/decor-right.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/decor-right.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/huevospline_3_lindo_fog_b.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/huevospline_3_lindo_fog_b.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/huevospline_3_lindo_leopard_detail_0_doble(unrot)_noshadow.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/huevospline_3_lindo_leopard_detail_0_doble(unrot)_noshadow.png differ diff -Nru magicor-1.1/data/levels/pompei/pompei-01.lvl magicor-1.0/data/levels/pompei/pompei-01.lvl --- magicor-1.1/data/levels/pompei/pompei-01.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-01.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 01 -credits claudio canepa -description -hint - -background pompei/B100M801 -music pompei/pompei1 -shadows 1 - -tile 5 7 pompei/tile-hmosaic -tile 6 7 pompei/tile-hmosaic -tile 7 7 pompei/tile-hmosaic -tile 11 7 pompei/tile-hmosaic -tile 12 7 pompei/tile-hmosaic -tile 13 7 pompei/tile-hmosaic -tile 3 11 pompei/tile-hmosaic -tile 11 11 pompei/tile-hmosaic -tile 12 11 pompei/tile-hmosaic -tile 13 11 pompei/tile-hmosaic -tile 15 11 pompei/tile-hmosaic -tile 16 11 pompei/tile-hmosaic -tile 9 12 pompei/tile-hmosaic -tile 10 12 pompei/tile-hmosaic -tile 11 12 pompei/tile-hmosaic -tile 1 13 pompei/tile-hmosaic -tile 5 13 pompei/tile-hmosaic -tile 6 13 pompei/tile-hmosaic -tile 7 13 pompei/tile-hmosaic -tile 4 15 pompei/tile-hmosaic -tile 8 15 pompei/tile-hmosaic -tile 14 15 pompei/tile-hmosaic -tile 17 15 pompei/tile-hmosaic -tile 18 15 pompei/tile-hmosaic - -sprite 5 7 decoration pompei/decor-right 32 32 8 -sprite 6 7 decoration pompei/decor-right 32 32 8 -sprite 7 7 decoration pompei/decor-right 32 32 8 -sprite 11 7 decoration pompei/decor-left 32 32 8 -sprite 12 7 decoration pompei/decor-left 32 32 8 -sprite 13 7 decoration pompei/decor-left 32 32 8 -sprite 1 12 fire -sprite 4 14 fire -sprite 8 14 fire -sprite 14 14 fire -sprite 17 14 fire -sprite 6 12 ice connect-right -sprite 7 6 ice connect-right -sprite 7 12 ice connect -sprite 8 5 ice -sprite 8 6 ice connect -sprite 8 12 ice connect-left -sprite 9 6 ice connect -sprite 10 5 ice -sprite 10 6 ice connect -sprite 11 6 ice connect-left -sprite 5 12 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-02.lvl magicor-1.0/data/levels/pompei/pompei-02.lvl --- magicor-1.1/data/levels/pompei/pompei-02.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-02.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,70 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 02 -credits claudio canepa -description -hint - -background pompei/box_3_lindo_fog_halo1 -music pompei/pompei2 -shadows 1 - -tile 8 7 pompei/tile-hmosaic -tile 9 7 pompei/tile-hmosaic -tile 10 7 pompei/tile-hmosaic -tile 11 7 pompei/tile-hmosaic -tile 9 8 pompei/tile-hmosaic -tile 10 8 pompei/tile-hmosaic -tile 16 8 pompei/tile-hmosaic -tile 4 9 pompei/tile-hmosaic -tile 5 9 pompei/tile-hmosaic -tile 6 9 pompei/tile-hmosaic -tile 9 9 pompei/tile-hmosaic -tile 10 9 pompei/tile-hmosaic -tile 12 9 pompei/tile-hmosaic -tile 15 9 pompei/tile-hmosaic -tile 4 10 pompei/tile-hmosaic -tile 10 10 pompei/tile-hmosaic -tile 14 10 pompei/tile-hmosaic -tile 3 11 pompei/tile-hmosaic -tile 4 11 pompei/tile-hmosaic -tile 14 11 pompei/tile-hmosaic -tile 2 12 pompei/tile-hmosaic -tile 3 12 pompei/tile-hmosaic -tile 4 12 pompei/tile-hmosaic -tile 5 12 pompei/tile-hmosaic -tile 6 12 pompei/tile-hmosaic -tile 8 12 pompei/tile-hmosaic -tile 10 12 pompei/tile-hmosaic -tile 11 12 pompei/tile-hmosaic -tile 13 12 pompei/tile-hmosaic -tile 14 12 pompei/tile-hmosaic -tile 15 12 pompei/tile-hmosaic -tile 16 12 pompei/tile-hmosaic -tile 17 12 pompei/tile-hmosaic -tile 7 14 pompei/tile-hmosaic -tile 9 14 pompei/tile-hmosaic -tile 12 14 pompei/tile-hmosaic - -sprite 2 12 decoration pompei/decor-left 32 32 8 -sprite 3 12 decoration pompei/decor-hcenter 32 32 8 -sprite 4 12 decoration pompei/decor-hcenter 32 32 8 -sprite 5 12 decoration pompei/decor-hcenter 32 32 8 -sprite 6 12 decoration pompei/decor-right 32 32 8 -sprite 13 12 decoration pompei/decor-left 32 32 8 -sprite 14 12 decoration pompei/decor-hcenter 32 32 8 -sprite 15 12 decoration pompei/decor-hcenter 32 32 8 -sprite 16 12 decoration pompei/decor-hcenter 32 32 8 -sprite 17 12 decoration pompei/decor-right 32 32 8 -sprite 7 8 fire -sprite 11 11 fire -sprite 12 8 fire -sprite 17 11 fire -sprite 7 9 ice connect-right -sprite 8 9 ice connect-left -sprite 8 10 ice -sprite 8 11 ice -sprite 9 10 ice -sprite 9 11 ice -sprite 9 12 ice -sprite 9 13 ice -sprite 5 8 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-03.lvl magicor-1.0/data/levels/pompei/pompei-03.lvl --- magicor-1.1/data/levels/pompei/pompei-03.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-03.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 03 -credits claudio canepa -description -hint - -background pompei/box_3_lindo_fog_sinnormal -music pompei/pompei1 -shadows 1 - -tile 9 6 pompei/tile-hmosaic -tile 10 6 pompei/tile-hmosaic -tile 4 7 pompei/tile-hmosaic -tile 5 7 pompei/tile-hmosaic -tile 6 7 pompei/tile-hmosaic -tile 7 7 pompei/tile-hmosaic -tile 10 7 pompei/tile-hmosaic -tile 3 8 pompei/tile-hmosaic -tile 9 8 pompei/tile-hmosaic -tile 10 8 pompei/tile-hmosaic -tile 2 9 pompei/tile-hmosaic -tile 10 9 pompei/tile-hmosaic -tile 4 10 pompei/tile-hmosaic -tile 5 10 pompei/tile-hmosaic -tile 10 10 pompei/tile-hmosaic -tile 14 10 pompei/tile-hmosaic -tile 15 10 pompei/tile-hmosaic -tile 16 10 pompei/tile-hmosaic -tile 2 11 pompei/tile-hmosaic -tile 6 11 pompei/tile-hmosaic -tile 10 11 pompei/tile-hmosaic -tile 3 12 pompei/tile-hmosaic -tile 4 13 pompei/tile-hmosaic -tile 5 13 pompei/tile-hmosaic -tile 9 13 pompei/tile-hmosaic -tile 10 13 pompei/tile-hmosaic -tile 11 13 pompei/tile-hmosaic -tile 12 13 pompei/tile-hmosaic - -sprite 14 10 decoration pompei/decor-left 32 32 8 -sprite 15 10 decoration pompei/decor-hcenter 32 32 8 -sprite 16 10 decoration pompei/decor-right 32 32 8 -sprite 5 12 fire -sprite 9 9 fire -sprite 11 6 fire -sprite 12 6 fire -sprite 15 9 fire -sprite 6 10 ice connect-right -sprite 7 9 ice -sprite 7 10 ice connect -sprite 8 10 ice connect -sprite 9 10 ice connect-left -sprite 11 7 ice connect-right -sprite 11 8 ice connect-right -sprite 11 9 ice connect-right -sprite 11 10 ice connect-right -sprite 11 11 ice connect-right -sprite 11 12 ice connect-right -sprite 12 7 ice connect-left -sprite 12 8 ice connect-left -sprite 12 9 ice connect-left -sprite 12 10 ice connect-left -sprite 12 11 ice connect-left -sprite 12 12 ice connect-left -sprite 9 12 lava dormant -sprite 10 12 lava dormant -sprite 11 12 lava dormant -sprite 12 12 lava dormant -sprite 6 9 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-04.lvl magicor-1.0/data/levels/pompei/pompei-04.lvl --- magicor-1.1/data/levels/pompei/pompei-04.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-04.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 04 -credits claudio canepa -description -hint - -background pompei/huevospline_3_lindo_leopard_detail_0_doble(unrot)_noshadow -music pompei/pompei2 -shadows 1 - -tile 5 7 pompei/tile-hmosaic -tile 6 7 pompei/tile-hmosaic -tile 7 7 pompei/tile-hmosaic -tile 8 7 pompei/tile-hmosaic -tile 10 7 pompei/tile-hmosaic -tile 11 7 pompei/tile-hmosaic -tile 12 7 pompei/tile-hmosaic -tile 13 7 pompei/tile-hmosaic -tile 14 7 pompei/tile-hmosaic -tile 4 8 pompei/tile-hmosaic -tile 5 8 pompei/tile-hmosaic -tile 16 9 pompei/tile-hmosaic -tile 7 10 pompei/tile-hmosaic -tile 8 10 pompei/tile-hmosaic -tile 10 10 pompei/tile-hmosaic -tile 11 10 pompei/tile-hmosaic -tile 12 10 pompei/tile-hmosaic -tile 15 10 pompei/tile-hmosaic -tile 18 10 pompei/tile-hmosaic -tile 5 11 pompei/tile-hmosaic -tile 6 11 pompei/tile-hmosaic -tile 7 11 pompei/tile-hmosaic -tile 9 11 pompei/tile-hmosaic -tile 10 11 pompei/tile-hmosaic -tile 11 11 pompei/tile-hmosaic -tile 17 11 pompei/tile-hmosaic -tile 16 12 pompei/tile-hmosaic -tile 8 13 pompei/tile-hmosaic -tile 15 13 pompei/tile-hmosaic -tile 1 14 pompei/tile-hmosaic -tile 2 14 pompei/tile-hmosaic -tile 4 14 pompei/tile-hmosaic -tile 5 14 pompei/tile-hmosaic -tile 6 14 pompei/tile-hmosaic -tile 7 14 pompei/tile-hmosaic -tile 8 14 pompei/tile-hmosaic -tile 15 14 pompei/tile-hmosaic -tile 8 15 pompei/tile-hmosaic -tile 9 15 pompei/tile-hmosaic -tile 10 15 pompei/tile-hmosaic -tile 11 15 pompei/tile-hmosaic -tile 12 15 pompei/tile-hmosaic -tile 13 15 pompei/tile-hmosaic -tile 14 15 pompei/tile-hmosaic -tile 15 15 pompei/tile-hmosaic - -sprite 4 14 decoration pompei/decor-left 32 32 8 -sprite 5 14 decoration pompei/decor-hcenter 32 32 8 -sprite 6 7 decoration pompei/decor-left 32 32 8 -sprite 6 14 decoration pompei/decor-hcenter 32 32 8 -sprite 7 7 decoration pompei/decor-right 32 32 8 -sprite 7 14 decoration pompei/decor-hcenter 32 32 8 -sprite 8 14 decoration pompei/decor-right 32 32 8 -sprite 9 15 decoration pompei/decor-left 32 32 8 -sprite 10 15 decoration pompei/decor-hcenter 32 32 8 -sprite 11 15 decoration pompei/decor-right 32 32 8 -sprite 12 15 decoration pompei/decor-left 32 32 8 -sprite 13 15 decoration pompei/decor-hcenter 32 32 8 -sprite 14 15 decoration pompei/decor-right 32 32 8 -sprite 10 8 fire -sprite 14 14 fire -sprite 3 10 ice connect-right -sprite 4 10 ice connect -sprite 4 11 ice connect-right -sprite 5 10 ice connect-left -sprite 9 6 ice -sprite 9 7 ice connect -sprite 10 9 ice -sprite 11 14 ice connect-right -sprite 12 14 ice connect-left -sprite 8 6 player right -sprite 9 14 stationary-enemy up sprites/spikes samples/spikes 2 -sprite 11 12 stationary-enemy down sprites/spikes samples/spikes 2 -sprite 4 8 trapola -sprite 12 7 trapola \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-05.lvl magicor-1.0/data/levels/pompei/pompei-05.lvl --- magicor-1.1/data/levels/pompei/pompei-05.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-05.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 05 -credits claudio canepa -description -hint - -background pompei/rect_cz_touched_2c3 -music pompei/pompei1 -shadows 1 - -tile 8 1 pompei/tile-hmosaic -tile 9 1 pompei/tile-hmosaic -tile 10 1 pompei/tile-hmosaic -tile 11 1 pompei/tile-hmosaic -tile 8 2 pompei/tile-hmosaic -tile 9 2 pompei/tile-hmosaic -tile 10 2 pompei/tile-hmosaic -tile 11 2 pompei/tile-hmosaic -tile 9 3 pompei/tile-hmosaic -tile 10 3 pompei/tile-hmosaic -tile 4 4 pompei/tile-hmosaic -tile 5 4 pompei/tile-hmosaic -tile 6 4 pompei/tile-hmosaic -tile 9 4 pompei/tile-hmosaic -tile 10 4 pompei/tile-hmosaic -tile 4 5 pompei/tile-hmosaic -tile 10 5 pompei/tile-hmosaic -tile 3 6 pompei/tile-hmosaic -tile 4 6 pompei/tile-hmosaic -tile 2 7 pompei/tile-hmosaic -tile 3 7 pompei/tile-hmosaic -tile 4 7 pompei/tile-hmosaic -tile 5 7 pompei/tile-hmosaic -tile 6 7 pompei/tile-hmosaic -tile 8 7 pompei/tile-hmosaic -tile 10 7 pompei/tile-hmosaic -tile 11 7 pompei/tile-hmosaic -tile 12 7 pompei/tile-hmosaic -tile 7 16 pompei/tile-hmosaic -tile 8 16 pompei/tile-hmosaic -tile 9 16 pompei/tile-hmosaic -tile 10 16 pompei/tile-hmosaic -tile 11 16 pompei/tile-hmosaic - -sprite 2 7 decoration pompei/decor-left 32 32 8 -sprite 3 7 decoration pompei/decor-hcenter 32 32 8 -sprite 4 7 decoration pompei/decor-hcenter 32 32 8 -sprite 5 7 decoration pompei/decor-hcenter 32 32 8 -sprite 6 7 decoration pompei/decor-right 32 32 8 -sprite 7 3 fire -sprite 12 6 fire -sprite 4 3 ice -sprite 6 3 ice -sprite 7 4 ice connect-right -sprite 8 4 ice connect-left -sprite 8 5 ice -sprite 8 6 ice -sprite 9 5 ice -sprite 9 6 ice -sprite 9 7 ice -sprite 9 8 ice -sprite 9 9 ice -sprite 9 10 ice -sprite 9 11 ice -sprite 9 12 ice -sprite 9 13 ice -sprite 9 14 ice -sprite 9 15 ice -sprite 7 15 lava dormant -sprite 8 15 lava dormant -sprite 9 15 lava dormant -sprite 10 15 lava dormant -sprite 11 15 lava dormant -sprite 4 2 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-06.lvl magicor-1.0/data/levels/pompei/pompei-06.lvl --- magicor-1.1/data/levels/pompei/pompei-06.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-06.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,67 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 06 -credits claudio canepa -description -hint - -background pompei/B100M801 -music pompei/pompei2 -shadows 1 - -tile 5 4 pompei/tile-hmosaic -tile 16 5 pompei/tile-hmosaic -tile 17 6 pompei/tile-hmosaic -tile 2 7 pompei/tile-hmosaic -tile 4 8 pompei/tile-hmosaic -tile 9 8 pompei/tile-hmosaic -tile 5 10 pompei/tile-hmosaic -tile 6 10 pompei/tile-hmosaic -tile 7 10 pompei/tile-hmosaic -tile 8 10 pompei/tile-hmosaic -tile 8 11 pompei/tile-hmosaic -tile 9 11 pompei/tile-hmosaic -tile 9 13 pompei/tile-hmosaic -tile 10 13 pompei/tile-hmosaic -tile 11 13 pompei/tile-hmosaic -tile 7 15 pompei/tile-hmosaic -tile 13 15 pompei/tile-hmosaic - -sprite 5 5 fire -sprite 6 2 fire -sprite 7 2 fire -sprite 7 14 fire -sprite 10 10 fire -sprite 13 14 fire -sprite 2 6 ice connect-right -sprite 3 6 ice connect -sprite 4 6 ice connect -sprite 5 6 ice connect -sprite 5 8 ice connect -sprite 6 3 ice connect-right -sprite 6 4 ice connect-right -sprite 6 5 ice connect-right -sprite 6 6 ice connect -sprite 6 7 ice connect-right -sprite 6 8 ice connect -sprite 7 3 ice connect-left -sprite 7 4 ice connect-left -sprite 7 5 ice connect-left -sprite 7 6 ice connect-left -sprite 7 7 ice connect-left -sprite 7 8 ice connect -sprite 7 12 ice connect-right -sprite 8 8 ice connect -sprite 8 12 ice connect -sprite 9 12 ice connect-left -sprite 10 11 ice connect-left -sprite 11 12 ice connect-right -sprite 12 12 ice connect -sprite 13 12 ice connect-left -sprite 15 5 ice connect-right -sprite 16 4 ice connect-right -sprite 16 6 ice connect-right -sprite 17 5 ice connect-left -sprite 9 12 lava dormant -sprite 10 12 lava dormant -sprite 11 12 lava dormant -sprite 2 5 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-07.lvl magicor-1.0/data/levels/pompei/pompei-07.lvl --- magicor-1.1/data/levels/pompei/pompei-07.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-07.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 07 -credits claudio canepa -description -hint - -background pompei/huevospline_3_lindo_fog_b -music pompei/pompei1 -shadows 1 - -tile 6 2 pompei/tile-hmosaic -tile 0 11 pompei/tile-hmosaic -tile 19 11 pompei/tile-hmosaic -tile 0 12 pompei/tile-hmosaic -tile 1 12 pompei/tile-hmosaic -tile 18 12 pompei/tile-hmosaic -tile 19 12 pompei/tile-hmosaic -tile 1 13 pompei/tile-hmosaic -tile 2 13 pompei/tile-hmosaic -tile 17 13 pompei/tile-hmosaic -tile 18 13 pompei/tile-hmosaic -tile 2 14 pompei/tile-hmosaic -tile 3 14 pompei/tile-hmosaic -tile 16 14 pompei/tile-hmosaic -tile 17 14 pompei/tile-hmosaic -tile 3 15 pompei/tile-hmosaic -tile 4 15 pompei/tile-hmosaic -tile 15 15 pompei/tile-hmosaic -tile 16 15 pompei/tile-hmosaic - -sprite 0 11 decoration pompei/decor-right 32 32 8 -sprite 3 15 decoration pompei/decor-left 32 32 8 -sprite 4 15 decoration pompei/decor-right 32 32 8 -sprite 15 15 decoration pompei/decor-left 32 32 8 -sprite 16 15 decoration pompei/decor-right 32 32 8 -sprite 19 11 decoration pompei/decor-left 32 32 8 -sprite 0 10 fire nofall -sprite 1 11 fire nofall -sprite 2 12 fire nofall -sprite 3 13 fire nofall -sprite 4 14 fire nofall -sprite 15 14 fire nofall -sprite 16 13 fire nofall -sprite 17 12 fire nofall -sprite 18 11 fire nofall -sprite 19 10 fire nofall -sprite 6 1 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-08.lvl magicor-1.0/data/levels/pompei/pompei-08.lvl --- magicor-1.1/data/levels/pompei/pompei-08.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-08.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 08 -credits claudio canepa -description -hint - -background pompei/box_3_lindo_fog_halo1 -music pompei/pompei2 -shadows 1 - -tile 8 3 tiles/tube-right-down -tile 9 3 tiles/tube-horizontal -tile 8 4 tiles/tube-vertical -tile 5 5 pompei/tile-hmosaic -tile 6 5 pompei/tile-hmosaic -tile 7 5 pompei/tile-hmosaic -tile 8 5 tiles/tube-vertical -tile 11 5 pompei/tile-hmosaic -tile 6 6 tiles/tube-horizontal -tile 7 6 tiles/tube-horizontal -tile 8 6 tiles/tube-left-up -tile 4 7 pompei/tile-hmosaic -tile 5 7 pompei/tile-hmosaic -tile 7 7 pompei/tile-hmosaic -tile 12 7 pompei/tile-hmosaic -tile 16 7 pompei/tile-hmosaic -tile 7 8 pompei/tile-hmosaic -tile 13 8 pompei/tile-hmosaic -tile 3 9 pompei/tile-hmosaic -tile 4 9 pompei/tile-hmosaic -tile 5 9 pompei/tile-hmosaic -tile 6 9 pompei/tile-hmosaic -tile 7 9 pompei/tile-hmosaic -tile 13 9 pompei/tile-hmosaic -tile 15 9 pompei/tile-hmosaic -tile 16 9 pompei/tile-hmosaic -tile 13 10 pompei/tile-hmosaic -tile 13 11 pompei/tile-hmosaic -tile 14 11 pompei/tile-hmosaic -tile 10 12 pompei/tile-hmosaic -tile 12 14 pompei/tile-hmosaic - -sprite 3 9 decoration pompei/decor-left 32 32 8 -sprite 4 9 decoration pompei/decor-hcenter 32 32 8 -sprite 5 9 decoration pompei/decor-hcenter 32 32 8 -sprite 6 9 decoration pompei/decor-hcenter 32 32 8 -sprite 7 9 decoration pompei/decor-right 32 32 8 -sprite 6 8 fire -sprite 12 6 fire -sprite 12 13 fire -sprite 13 7 fire -sprite 16 8 fire -sprite 4 8 ice -sprite 9 8 ice connect-right -sprite 10 8 ice connect -sprite 11 8 ice connect -sprite 12 8 ice connect -sprite 6 4 player right -sprite 5 6 tube left -sprite 10 3 tube right \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-09.lvl magicor-1.0/data/levels/pompei/pompei-09.lvl --- magicor-1.1/data/levels/pompei/pompei-09.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-09.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 09 -credits claudio canepa -description -hint - -background pompei/huevospline_3_lindo_leopard_detail_0_doble(unrot)_noshadow -music pompei/pompei1 -shadows 1 - -tile 12 5 pompei/tile-hmosaic -tile 11 6 pompei/tile-hmosaic -tile 17 6 pompei/tile-hmosaic -tile 9 7 pompei/tile-hmosaic -tile 16 7 pompei/tile-hmosaic -tile 0 8 pompei/tile-hmosaic -tile 15 8 pompei/tile-hmosaic -tile 14 9 pompei/tile-hmosaic -tile 2 10 pompei/tile-hmosaic -tile 3 10 pompei/tile-hmosaic -tile 4 10 pompei/tile-hmosaic -tile 5 10 pompei/tile-hmosaic -tile 6 10 pompei/tile-hmosaic -tile 8 10 pompei/tile-hmosaic -tile 9 10 pompei/tile-hmosaic -tile 13 10 pompei/tile-hmosaic -tile 16 10 pompei/tile-hmosaic -tile 17 10 pompei/tile-hmosaic -tile 18 10 pompei/tile-hmosaic -tile 12 11 pompei/tile-hmosaic -tile 11 12 pompei/tile-hmosaic -tile 0 13 pompei/tile-hmosaic -tile 3 13 pompei/tile-hmosaic -tile 4 13 pompei/tile-hmosaic -tile 5 13 pompei/tile-hmosaic -tile 6 13 pompei/tile-hmosaic -tile 8 13 pompei/tile-hmosaic -tile 10 13 pompei/tile-hmosaic -tile 7 16 pompei/tile-hmosaic - -sprite 2 10 decoration pompei/decor-right 32 32 8 -sprite 3 10 decoration pompei/decor-right 32 32 8 -sprite 3 13 decoration pompei/decor-left 32 32 8 -sprite 4 10 decoration pompei/decor-right 32 32 8 -sprite 4 13 decoration pompei/decor-hcenter 32 32 8 -sprite 5 13 decoration pompei/decor-hcenter 32 32 8 -sprite 6 13 decoration pompei/decor-right 32 32 8 -sprite 11 6 decoration pompei/decor-right 32 32 8 -sprite 12 5 decoration pompei/decor-right 32 32 8 -sprite 7 15 fire -sprite 8 9 fire -sprite 10 9 fire -sprite 18 9 fire -sprite 6 9 ice connect-right -sprite 7 9 ice connect-left -sprite 7 10 ice connect -sprite 10 10 ice connect-left -sprite 16 8 ice connect -sprite 17 8 ice connect -sprite 18 8 ice connect-left -sprite 3 9 player right -sprite 5 10 trapola -sprite 14 9 trapola -sprite 17 10 trapola -sprite 9 8 tube down -sprite 14 3 tube up \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-10.lvl magicor-1.0/data/levels/pompei/pompei-10.lvl --- magicor-1.1/data/levels/pompei/pompei-10.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-10.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 10 -credits Claudio Canepa -description -hint - -background pompei/B100M801 -music pompei/pompei2 -shadows 1 - -tile 8 3 pompei/tile-hmosaic -tile 0 4 pompei/tile-hmosaic -tile 6 4 pompei/tile-hmosaic -tile 8 4 pompei/tile-hmosaic -tile 1 5 pompei/tile-hmosaic -tile 2 5 pompei/tile-hmosaic -tile 3 5 pompei/tile-hmosaic -tile 6 5 pompei/tile-hmosaic -tile 8 5 pompei/tile-hmosaic -tile 8 6 pompei/tile-hmosaic -tile 11 6 pompei/tile-hmosaic -tile 8 7 pompei/tile-hmosaic -tile 9 7 pompei/tile-hmosaic -tile 5 8 pompei/tile-hmosaic -tile 8 8 pompei/tile-hmosaic -tile 9 8 tiles/tube-right-down -tile 12 8 pompei/tile-hmosaic -tile 5 9 pompei/tile-hmosaic -tile 6 9 pompei/tile-hmosaic -tile 8 9 pompei/tile-hmosaic -tile 9 9 pompei/tile-hmosaic -tile 10 9 pompei/tile-hmosaic -tile 11 9 pompei/tile-hmosaic -tile 12 9 pompei/tile-hmosaic -tile 13 9 pompei/tile-hmosaic -tile 14 9 pompei/tile-hmosaic -tile 14 10 pompei/tile-hmosaic -tile 8 11 pompei/tile-hmosaic -tile 9 11 pompei/tile-hmosaic -tile 10 11 pompei/tile-hmosaic -tile 14 11 pompei/tile-hmosaic -tile 8 12 pompei/tile-hmosaic -tile 9 12 tiles/tube-vertical -tile 13 12 pompei/tile-hmosaic -tile 14 12 pompei/tile-hmosaic -tile 8 13 pompei/tile-hmosaic -tile 9 13 tiles/tube-vertical -tile 14 13 pompei/tile-hmosaic -tile 8 14 pompei/tile-hmosaic -tile 9 14 tiles/tube-right-up -tile 16 14 pompei/tile-hmosaic -tile 4 15 pompei/tile-hmosaic -tile 5 15 pompei/tile-hmosaic -tile 6 15 pompei/tile-hmosaic -tile 7 15 pompei/tile-hmosaic -tile 8 15 pompei/tile-hmosaic -tile 11 15 pompei/tile-hmosaic -tile 12 15 pompei/tile-hmosaic -tile 14 15 pompei/tile-hmosaic - -sprite 4 4 fire -sprite 12 14 fire -sprite 13 8 fire -sprite 2 4 ice -sprite 4 5 ice connect-left -sprite 4 8 ice connect-right -sprite 7 9 ice -sprite 7 10 ice -sprite 7 11 ice -sprite 7 12 ice -sprite 7 13 ice -sprite 7 14 ice -sprite 4 14 lava dormant -sprite 5 14 lava dormant -sprite 6 14 lava dormant -sprite 7 14 lava dormant -sprite 0 3 player right -sprite 10 8 tube right -sprite 10 14 tube right diff -Nru magicor-1.1/data/levels/pompei/pompei-11.lvl magicor-1.0/data/levels/pompei/pompei-11.lvl --- magicor-1.1/data/levels/pompei/pompei-11.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-11.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 11 -credits claudio canepa -description -hint - -background pompei/box_3_lindo_fog_sinnormal -music pompei/pompei1 -shadows 1 - -tile 11 6 pompei/tile-hmosaic -tile 12 6 pompei/tile-hmosaic -tile 13 6 pompei/tile-hmosaic -tile 12 8 pompei/tile-hmosaic -tile 13 8 pompei/tile-hmosaic -tile 14 8 pompei/tile-hmosaic -tile 3 9 pompei/tile-hmosaic -tile 16 10 pompei/tile-hmosaic -tile 5 12 pompei/tile-hmosaic -tile 6 12 pompei/tile-hmosaic -tile 7 12 pompei/tile-hmosaic -tile 8 12 pompei/tile-hmosaic -tile 9 14 pompei/tile-hmosaic - -sprite 12 8 decoration pompei/decor-left 32 32 8 -sprite 13 8 decoration pompei/decor-hcenter 32 32 8 -sprite 14 8 decoration pompei/decor-right 32 32 8 -sprite 3 8 fire -sprite 7 7 fire -sprite 9 13 fire -sprite 12 7 fire -sprite 16 9 fire -sprite 5 8 ice connect-right -sprite 5 9 ice -sprite 5 10 ice -sprite 5 11 ice -sprite 6 8 ice connect -sprite 7 6 ice connect-right -sprite 7 8 ice connect -sprite 8 5 ice connect-right -sprite 8 6 ice connect-left -sprite 8 7 ice -sprite 8 8 ice connect-left -sprite 8 9 ice -sprite 8 10 ice -sprite 8 11 ice -sprite 9 4 ice connect-right -sprite 9 5 ice connect-left -sprite 10 4 ice connect-left -sprite 5 11 lava dormant -sprite 6 11 lava dormant -sprite 7 11 lava dormant -sprite 8 11 lava dormant -sprite 5 7 player right -sprite 4 9 stationary-enemy right sprites/spikes samples/spikes 1 -sprite 12 5 stationary-enemy up sprites/spikes samples/spikes 1 -sprite 13 7 stationary-enemy up sprites/spikes samples/spikes 1 \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-12.lvl magicor-1.0/data/levels/pompei/pompei-12.lvl --- magicor-1.1/data/levels/pompei/pompei-12.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-12.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 12 -credits claudio canepa -description -hint - -background pompei/huevospline_3_lindo_leopard_detail_0_doble(unrot)_noshadow -music pompei/pompei2 -shadows 1 - -tile 1 7 pompei/tile-hmosaic -tile 3 7 pompei/tile-hmosaic -tile 4 7 pompei/tile-hmosaic -tile 11 7 pompei/tile-hmosaic -tile 11 8 pompei/tile-hmosaic -tile 16 8 pompei/tile-hmosaic -tile 19 9 pompei/tile-hmosaic -tile 1 10 pompei/tile-hmosaic -tile 2 10 pompei/tile-hmosaic -tile 3 10 pompei/tile-hmosaic -tile 4 10 pompei/tile-hmosaic -tile 5 10 pompei/tile-hmosaic -tile 6 10 pompei/tile-hmosaic -tile 8 10 pompei/tile-hmosaic -tile 9 10 pompei/tile-hmosaic -tile 11 10 pompei/tile-hmosaic -tile 13 10 pompei/tile-hmosaic -tile 14 10 pompei/tile-hmosaic -tile 15 10 pompei/tile-hmosaic -tile 18 10 pompei/tile-hmosaic -tile 17 11 pompei/tile-hmosaic -tile 15 12 pompei/tile-hmosaic -tile 0 13 pompei/tile-hmosaic -tile 7 13 pompei/tile-hmosaic -tile 10 13 pompei/tile-hmosaic -tile 12 13 pompei/tile-hmosaic -tile 13 13 pompei/tile-hmosaic -tile 14 13 pompei/tile-hmosaic -tile 16 13 pompei/tile-hmosaic - -sprite 1 10 decoration pompei/decor-left 32 32 8 -sprite 2 10 decoration pompei/decor-hcenter 32 32 8 -sprite 3 10 decoration pompei/decor-hcenter 32 32 8 -sprite 4 10 decoration pompei/decor-hcenter 32 32 8 -sprite 5 10 decoration pompei/decor-hcenter 32 32 8 -sprite 6 10 decoration pompei/decor-right 32 32 8 -sprite 13 10 decoration pompei/decor-left 32 32 8 -sprite 14 10 decoration pompei/decor-hcenter 32 32 8 -sprite 15 10 decoration pompei/decor-right 32 32 8 -sprite 2 8 fire -sprite 4 5 fire -sprite 8 8 fire -sprite 13 8 fire -sprite 0 5 ice connect -sprite 1 5 ice connect-left -sprite 2 7 ice connect -sprite 2 9 ice -sprite 4 6 ice -sprite 8 9 ice -sprite 10 10 ice connect -sprite 13 9 ice -sprite 15 8 ice connect-right -sprite 1 9 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-13.lvl magicor-1.0/data/levels/pompei/pompei-13.lvl --- magicor-1.1/data/levels/pompei/pompei-13.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-13.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,92 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 13 -credits claudio canepa -description -hint - -background pompei/huevospline_3_lindo_leopard_detail_0_doble(unrot)_noshadow -music pompei/pompei1 -shadows 1 - -tile 16 3 pompei/tile-hmosaic -tile 17 3 pompei/tile-hmosaic -tile 18 3 pompei/tile-hmosaic -tile 6 4 pompei/tile-hmosaic -tile 10 4 pompei/tile-hmosaic -tile 11 4 pompei/tile-hmosaic -tile 12 4 pompei/tile-hmosaic -tile 13 4 pompei/tile-hmosaic -tile 10 5 pompei/tile-hmosaic -tile 14 5 pompei/tile-hmosaic -tile 19 5 pompei/tile-hmosaic -tile 10 6 pompei/tile-hmosaic -tile 6 7 pompei/tile-hmosaic -tile 10 7 pompei/tile-hmosaic -tile 11 7 pompei/tile-hmosaic -tile 12 7 pompei/tile-hmosaic -tile 13 7 pompei/tile-hmosaic -tile 14 7 pompei/tile-hmosaic -tile 15 7 pompei/tile-hmosaic -tile 2 8 pompei/tile-hmosaic -tile 5 8 pompei/tile-hmosaic -tile 8 9 tiles/tube-vertical -tile 4 10 pompei/tile-hmosaic -tile 0 11 pompei/tile-hmosaic -tile 3 11 pompei/tile-hmosaic -tile 4 11 tiles/tube-vertical -tile 6 13 pompei/tile-hmosaic -tile 7 13 pompei/tile-hmosaic -tile 8 13 pompei/tile-hmosaic -tile 9 13 pompei/tile-hmosaic -tile 10 13 pompei/tile-hmosaic -tile 3 14 pompei/tile-hmosaic -tile 4 14 pompei/tile-hmosaic -tile 5 14 pompei/tile-hmosaic -tile 11 14 pompei/tile-hmosaic -tile 14 14 pompei/tile-hmosaic -tile 15 14 pompei/tile-hmosaic -tile 16 14 pompei/tile-hmosaic - -sprite 3 14 decoration pompei/decor-left 32 32 8 -sprite 4 14 decoration pompei/decor-hcenter 32 32 8 -sprite 5 14 decoration pompei/decor-right 32 32 8 -sprite 14 14 decoration pompei/decor-left 32 32 8 -sprite 15 14 decoration pompei/decor-hcenter 32 32 8 -sprite 16 14 decoration pompei/decor-right 32 32 8 -sprite 7 3 fire -sprite 9 3 fire -sprite 11 3 fire -sprite 11 6 fire -sprite 15 2 fire -sprite 15 13 fire -sprite 7 4 ice connect -sprite 8 4 ice connect -sprite 9 4 ice connect -sprite 11 5 ice connect-right -sprite 12 5 ice connect -sprite 12 6 ice connect-right -sprite 13 5 ice connect-left -sprite 13 6 ice connect-left -sprite 15 3 ice connect-right -sprite 15 5 ice connect-left -sprite 16 2 ice -sprite 6 12 lava dormant -sprite 7 12 lava dormant -sprite 8 12 lava dormant -sprite 9 12 lava dormant -sprite 10 12 lava dormant -sprite 12 6 lava dormant -sprite 13 6 lava dormant -sprite 14 6 lava dormant -sprite 15 6 lava dormant -sprite 6 3 player right -sprite 2 7 stationary-enemy up sprites/spikes samples/spikes 1 -sprite 6 6 stationary-enemy up sprites/spikes samples/spikes 1 -sprite 10 3 stationary-enemy up sprites/spikes samples/spikes 1 -sprite 14 4 stationary-enemy up sprites/spikes samples/spikes 1 -sprite 2 4 tube up 2 -sprite 3 12 tube down 2 -sprite 4 12 tube down 1 -sprite 8 8 tube up 1 -sprite 15 10 tube down 3 -sprite 18 2 tube up 3 \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-14.lvl magicor-1.0/data/levels/pompei/pompei-14.lvl --- magicor-1.1/data/levels/pompei/pompei-14.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-14.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 14 -credits claudio canepa -description -hint - -background pompei/box_3_lindo_fog_halo1 -music pompei/pompei2 -shadows 1 - -tile 9 2 pompei/tile-hmosaic -tile 9 3 pompei/tile-hmosaic -tile 5 4 pompei/tile-hmosaic -tile 9 4 pompei/tile-hmosaic -tile 1 5 pompei/tile-hmosaic -tile 8 5 pompei/tile-hmosaic -tile 9 5 pompei/tile-hmosaic -tile 10 5 pompei/tile-hmosaic -tile 1 6 pompei/tile-hmosaic -tile 9 6 pompei/tile-hmosaic -tile 1 7 pompei/tile-hmosaic -tile 7 7 pompei/tile-hmosaic -tile 8 8 pompei/tile-hmosaic -tile 9 8 pompei/tile-hmosaic -tile 10 8 pompei/tile-hmosaic -tile 16 8 pompei/tile-hmosaic -tile 3 9 pompei/tile-hmosaic -tile 4 9 pompei/tile-hmosaic -tile 5 9 pompei/tile-hmosaic -tile 8 9 pompei/tile-hmosaic -tile 10 9 pompei/tile-hmosaic -tile 18 9 pompei/tile-hmosaic -tile 5 10 pompei/tile-hmosaic -tile 17 10 pompei/tile-hmosaic -tile 2 11 pompei/tile-hmosaic -tile 15 12 pompei/tile-hmosaic -tile 6 13 pompei/tile-hmosaic -tile 7 13 pompei/tile-hmosaic -tile 8 13 pompei/tile-hmosaic -tile 9 13 pompei/tile-hmosaic -tile 10 13 pompei/tile-hmosaic -tile 11 13 pompei/tile-hmosaic -tile 12 13 pompei/tile-hmosaic - -sprite 8 5 decoration pompei/decor-left 32 32 8 -sprite 8 8 decoration pompei/decor-left 32 32 8 -sprite 9 5 decoration pompei/decor-hcenter 32 32 8 -sprite 9 8 decoration pompei/decor-hcenter 32 32 8 -sprite 10 5 decoration pompei/decor-right 32 32 8 -sprite 10 8 decoration pompei/decor-right 32 32 8 -sprite 5 5 fire -sprite 17 9 fire -sprite 2 6 ice connect -sprite 3 6 ice connect -sprite 4 6 ice connect -sprite 5 6 ice connect -sprite 6 6 ice connect-left -sprite 6 9 ice connect-left -sprite 11 6 ice connect-right -sprite 11 7 ice connect-right -sprite 12 6 ice connect -sprite 12 7 ice connect -sprite 12 8 ice -sprite 12 9 ice -sprite 12 10 ice -sprite 12 11 ice -sprite 12 12 ice -sprite 13 6 ice connect -sprite 13 7 ice connect-left -sprite 14 6 ice connect -sprite 15 6 ice connect -sprite 16 6 ice connect-left -sprite 6 12 lava dormant -sprite 7 12 lava dormant -sprite 8 12 lava dormant -sprite 9 12 lava dormant -sprite 10 12 lava dormant -sprite 11 12 lava dormant -sprite 12 12 lava dormant -sprite 10 7 player right -sprite 3 11 stationary-enemy right sprites/spikes samples/spikes 4 -sprite 7 9 stationary-enemy left sprites/spikes samples/spikes 4 \ No newline at end of file diff -Nru magicor-1.1/data/levels/pompei/pompei-15.lvl magicor-1.0/data/levels/pompei/pompei-15.lvl --- magicor-1.1/data/levels/pompei/pompei-15.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/pompei/pompei-15.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,98 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title Pompei 15 -credits claudio canepa -description -hint - -background pompei/huevospline_3_lindo_leopard_detail_0_doble(unrot)_noshadow -music -shadows 1 - -tile 11 2 pompei/tile-hmosaic -tile 11 3 pompei/tile-hmosaic -tile 11 4 pompei/tile-hmosaic -tile 13 4 pompei/tile-hmosaic -tile 14 4 pompei/tile-hmosaic -tile 15 4 pompei/tile-hmosaic -tile 17 4 pompei/tile-hmosaic -tile 19 4 pompei/tile-hmosaic -tile 11 5 pompei/tile-hmosaic -tile 11 6 pompei/tile-hmosaic -tile 16 6 pompei/tile-hmosaic -tile 17 6 pompei/tile-hmosaic -tile 3 7 pompei/tile-hmosaic -tile 11 7 pompei/tile-hmosaic -tile 14 7 pompei/tile-hmosaic -tile 15 7 pompei/tile-hmosaic -tile 16 7 pompei/tile-hmosaic -tile 0 8 pompei/tile-hmosaic -tile 5 8 pompei/tile-hmosaic -tile 6 8 pompei/tile-hmosaic -tile 7 8 pompei/tile-hmosaic -tile 3 9 pompei/tile-hmosaic -tile 0 10 pompei/tile-hmosaic -tile 5 10 pompei/tile-hmosaic -tile 3 11 pompei/tile-hmosaic -tile 4 11 pompei/tile-hmosaic -tile 5 11 pompei/tile-hmosaic -tile 6 11 pompei/tile-hmosaic -tile 10 11 pompei/tile-hmosaic -tile 11 11 pompei/tile-hmosaic -tile 12 11 pompei/tile-hmosaic -tile 17 11 pompei/tile-hmosaic -tile 18 11 pompei/tile-hmosaic -tile 12 12 pompei/tile-hmosaic -tile 15 12 pompei/tile-hmosaic -tile 8 13 pompei/tile-hmosaic -tile 9 13 pompei/tile-hmosaic -tile 14 13 pompei/tile-hmosaic -tile 1 14 pompei/tile-hmosaic -tile 6 14 pompei/tile-hmosaic -tile 7 14 pompei/tile-hmosaic -tile 12 14 pompei/tile-hmosaic -tile 13 14 pompei/tile-hmosaic -tile 10 15 pompei/tile-hmosaic -tile 11 15 pompei/tile-hmosaic -tile 5 16 pompei/tile-hmosaic -tile 6 16 pompei/tile-hmosaic -tile 8 16 pompei/tile-hmosaic -tile 9 16 pompei/tile-hmosaic - -sprite 4 11 decoration pompei/decor-left 32 32 8 -sprite 5 11 decoration pompei/decor-hcenter 32 32 8 -sprite 6 11 decoration pompei/decor-right 32 32 8 -sprite 6 14 decoration pompei/decor-left 32 32 8 -sprite 8 13 decoration pompei/decor-left 32 32 8 -sprite 11 2 decoration pompei/decor-left 32 32 8 -sprite 11 3 decoration pompei/decor-left 32 32 8 -sprite 11 4 decoration pompei/decor-left 32 32 8 -sprite 11 5 decoration pompei/decor-right 32 32 8 -sprite 11 6 decoration pompei/decor-right 32 32 8 -sprite 11 7 decoration pompei/decor-right 32 32 8 -sprite 13 4 decoration pompei/decor-left 32 32 8 -sprite 14 4 decoration pompei/decor-hcenter 32 32 8 -sprite 15 4 decoration pompei/decor-right 32 32 8 -sprite 8 12 fire -sprite 10 7 fire -sprite 17 2 fire -sprite 7 11 ice connect -sprite 8 11 ice connect -sprite 9 11 ice connect -sprite 10 8 ice connect-right -sprite 10 9 ice connect-right -sprite 10 10 ice connect-right -sprite 11 1 ice -sprite 11 8 ice connect-left -sprite 11 9 ice connect-left -sprite 11 10 ice connect-left -sprite 14 3 ice -sprite 14 6 ice -sprite 17 3 ice -sprite 10 10 lava dormant -sprite 11 10 lava dormant -sprite 12 10 lava dormant -sprite 4 10 player right -sprite 3 11 trapola -sprite 6 8 trapola -sprite 15 1 tube down -sprite 16 11 tube up \ No newline at end of file Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/pompei1.xm and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/pompei1.xm differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/pompei2.xm and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/pompei2.xm differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/rect_cz_touched_2c3.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/rect_cz_touched_2c3.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/pompei/tile-hmosaic.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/pompei/tile-hmosaic.png differ diff -Nru magicor-1.1/data/levels/snow/brushes magicor-1.0/data/levels/snow/brushes --- magicor-1.1/data/levels/snow/brushes 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/brushes 2007-01-21 22:11:24.000000000 +0100 @@ -1,4 +1,4 @@ tile snow/snow decoration snow/snowman 64 96 decoration snow/i1 32 32 -decoration snow/snowtop 32 48 +decoration snow/snowtop 32 32 Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/snow/i1.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/snow/i1.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/snow/ice2.xm and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/snow/ice2.xm differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/snow/ice3.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/snow/ice3.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/snow/ice.xm and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/snow/ice.xm differ diff -Nru magicor-1.1/data/levels/snow/snow-01.lvl magicor-1.0/data/levels/snow/snow-01.lvl --- magicor-1.1/data/levels/snow/snow-01.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-01.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -5,7 +5,7 @@ hint background snow/ice2 -music snow/ice +music shadows 1 tile 19 8 snow/snow @@ -51,27 +51,10 @@ tile 1 15 snow/snow tile 0 16 snow/snow -sprite 0 13 decoration snow/snowtop 32 48 8 -sprite 1 13 decoration snow/snowtop 32 48 8 -sprite 2 12 decoration snow/snowtop 32 48 8 -sprite 3 11 decoration snow/snowtop 32 48 8 -sprite 4 10 decoration snow/snowtop 32 48 8 -sprite 4 14 decoration snow/i1 32 32 4 -sprite 5 9 decoration snow/snowtop 32 48 8 -sprite 6 9 decoration snow/snowtop 32 48 8 -sprite 7 9 decoration snow/snowtop 32 48 8 -sprite 8 8 decoration snow/snowtop 32 48 8 -sprite 9 8 decoration snow/snowtop 32 48 8 -sprite 10 8 decoration snow/snowtop 32 48 8 -sprite 11 8 decoration snow/snowtop 32 48 8 -sprite 12 8 decoration snow/snowtop 32 48 8 -sprite 13 8 decoration snow/snowtop 32 48 8 -sprite 14 9 decoration snow/snowtop 32 48 8 -sprite 15 9 decoration snow/snowtop 32 48 8 -sprite 16 10 decoration snow/snowtop 32 48 8 -sprite 17 11 decoration snow/snowtop 32 48 8 +sprite 0 13 decoration snow/snowtop 32 32 8 +sprite 1 13 decoration snow/snowtop 32 32 8 +sprite 4 14 decoration snow/i1 32 32 8 sprite 18 6 decoration snow/snowman 64 96 8 -sprite 18 10 decoration snow/i1 32 32 4 -sprite 18 12 decoration snow/snowtop 32 48 8 +sprite 18 10 decoration snow/i1 32 32 8 sprite 10 8 fire sprite 13 8 player left \ No newline at end of file diff -Nru magicor-1.1/data/levels/snow/snow-02.lvl magicor-1.0/data/levels/snow/snow-02.lvl --- magicor-1.1/data/levels/snow/snow-02.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-02.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -1,11 +1,11 @@ # Generated by Magicor-LevelEditor 1.0 title snow 02 credits wagner frederic -description -hint +description +hint background snow/ice2 -music snow/ice2 +music shadows 1 tile 0 0 snow/snow @@ -52,18 +52,18 @@ tile 17 17 snow/snow tile 18 17 snow/snow -sprite 0 11 decoration snow/snowtop 32 48 8 +sprite 0 11 decoration snow/snowtop 32 32 8 sprite 0 14 decoration snow/i1 32 32 8 -sprite 1 12 decoration snow/snowtop 32 48 8 -sprite 2 12 decoration snow/snowtop 32 48 8 -sprite 3 11 decoration snow/snowtop 32 48 8 -sprite 4 11 decoration snow/snowtop 32 48 8 -sprite 10 11 decoration snow/snowtop 32 48 8 -sprite 15 11 decoration snow/snowtop 32 48 8 -sprite 16 11 decoration snow/snowtop 32 48 8 -sprite 17 12 decoration snow/snowtop 32 48 8 -sprite 18 12 decoration snow/snowtop 32 48 8 -sprite 19 11 decoration snow/snowtop 32 48 8 +sprite 1 12 decoration snow/snowtop 32 32 8 +sprite 2 12 decoration snow/snowtop 32 32 8 +sprite 3 11 decoration snow/snowtop 32 32 8 +sprite 4 11 decoration snow/snowtop 32 32 8 +sprite 10 11 decoration snow/snowtop 32 32 8 +sprite 15 11 decoration snow/snowtop 32 32 8 +sprite 16 11 decoration snow/snowtop 32 32 8 +sprite 17 12 decoration snow/snowtop 32 32 8 +sprite 18 12 decoration snow/snowtop 32 32 8 +sprite 19 11 decoration snow/snowtop 32 32 8 sprite 1 12 fire sprite 10 13 fire sprite 18 12 fire @@ -91,4 +91,4 @@ sprite 10 1 player right sprite 9 16 stationary-enemy up sprites/spikes samples/spikes 18 sprite 10 16 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 11 16 stationary-enemy up sprites/spikes samples/spikes 18 +sprite 11 16 stationary-enemy up sprites/spikes samples/spikes 18 \ No newline at end of file diff -Nru magicor-1.1/data/levels/snow/snow-03.lvl magicor-1.0/data/levels/snow/snow-03.lvl --- magicor-1.1/data/levels/snow/snow-03.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-03.lvl 2007-01-21 22:11:24.000000000 +0100 @@ -1,11 +1,11 @@ # Generated by Magicor-LevelEditor 1.0 title snow 03 credits wagner frederic -description -hint +description +hint background snow/ice1 -music snow/ice +music shadows 1 tile 2 0 snow/snow @@ -166,44 +166,44 @@ tile 17 17 snow/snow tile 19 17 tiles/tube-right-up -sprite 0 9 decoration snow/snowtop 32 48 8 -sprite 0 15 decoration snow/snowtop 32 48 8 -sprite 1 9 decoration snow/snowtop 32 48 8 -sprite 1 15 decoration snow/snowtop 32 48 8 -sprite 2 4 decoration snow/snowtop 32 48 8 -sprite 2 9 decoration snow/snowtop 32 48 8 -sprite 2 15 decoration snow/snowtop 32 48 8 -sprite 3 9 decoration snow/snowtop 32 48 8 -sprite 3 15 decoration snow/snowtop 32 48 8 -sprite 4 9 decoration snow/snowtop 32 48 8 -sprite 4 15 decoration snow/snowtop 32 48 8 -sprite 5 4 decoration snow/snowtop 32 48 8 -sprite 5 7 decoration snow/snowtop 32 48 8 -sprite 5 9 decoration snow/snowtop 32 48 8 -sprite 5 15 decoration snow/snowtop 32 48 8 -sprite 6 15 decoration snow/snowtop 32 48 8 -sprite 7 9 decoration snow/snowtop 32 48 8 -sprite 7 11 decoration snow/snowtop 32 48 8 -sprite 7 15 decoration snow/snowtop 32 48 8 -sprite 9 9 decoration snow/snowtop 32 48 8 -sprite 9 15 decoration snow/snowtop 32 48 8 -sprite 11 9 decoration snow/snowtop 32 48 8 -sprite 11 11 decoration snow/snowtop 32 48 8 -sprite 11 15 decoration snow/snowtop 32 48 8 +sprite 0 9 decoration snow/snowtop 32 32 8 +sprite 0 15 decoration snow/snowtop 32 32 8 +sprite 1 9 decoration snow/snowtop 32 32 8 +sprite 1 15 decoration snow/snowtop 32 32 8 +sprite 2 4 decoration snow/snowtop 32 32 8 +sprite 2 9 decoration snow/snowtop 32 32 8 +sprite 2 15 decoration snow/snowtop 32 32 8 +sprite 3 9 decoration snow/snowtop 32 32 8 +sprite 3 15 decoration snow/snowtop 32 32 8 +sprite 4 9 decoration snow/snowtop 32 32 8 +sprite 4 15 decoration snow/snowtop 32 32 8 +sprite 5 4 decoration snow/snowtop 32 32 8 +sprite 5 7 decoration snow/snowtop 32 32 8 +sprite 5 9 decoration snow/snowtop 32 32 8 +sprite 5 15 decoration snow/snowtop 32 32 8 +sprite 6 15 decoration snow/snowtop 32 32 8 +sprite 7 9 decoration snow/snowtop 32 32 8 +sprite 7 11 decoration snow/snowtop 32 32 8 +sprite 7 15 decoration snow/snowtop 32 32 8 +sprite 9 9 decoration snow/snowtop 32 32 8 +sprite 9 15 decoration snow/snowtop 32 32 8 +sprite 11 9 decoration snow/snowtop 32 32 8 +sprite 11 11 decoration snow/snowtop 32 32 8 +sprite 11 15 decoration snow/snowtop 32 32 8 sprite 12 6 decoration snow/i1 32 32 8 -sprite 12 9 decoration snow/snowtop 32 48 8 +sprite 12 9 decoration snow/snowtop 32 32 8 sprite 13 6 decoration snow/i1 32 32 8 -sprite 13 11 decoration snow/snowtop 32 48 8 -sprite 13 15 decoration snow/snowtop 32 48 8 +sprite 13 11 decoration snow/snowtop 32 32 8 +sprite 13 15 decoration snow/snowtop 32 32 8 sprite 14 6 decoration snow/i1 32 32 8 -sprite 14 9 decoration snow/snowtop 32 48 8 -sprite 15 9 decoration snow/snowtop 32 48 8 -sprite 15 11 decoration snow/snowtop 32 48 8 -sprite 15 15 decoration snow/snowtop 32 48 8 -sprite 17 9 decoration snow/snowtop 32 48 8 -sprite 17 11 decoration snow/snowtop 32 48 8 -sprite 17 15 decoration snow/snowtop 32 48 8 -sprite 18 15 decoration snow/snowtop 32 48 8 +sprite 14 9 decoration snow/snowtop 32 32 8 +sprite 15 9 decoration snow/snowtop 32 32 8 +sprite 15 11 decoration snow/snowtop 32 32 8 +sprite 15 15 decoration snow/snowtop 32 32 8 +sprite 17 9 decoration snow/snowtop 32 32 8 +sprite 17 11 decoration snow/snowtop 32 32 8 +sprite 17 15 decoration snow/snowtop 32 32 8 +sprite 18 15 decoration snow/snowtop 32 32 8 sprite 14 14 direction down sprite 14 15 direction down sprite 1 12 fire @@ -223,4 +223,4 @@ sprite 16 8 tube down 1 sprite 16 16 tube up 3 sprite 19 8 tube left 6 -sprite 19 16 tube up 6 +sprite 19 16 tube up 6 \ No newline at end of file diff -Nru magicor-1.1/data/levels/snow/snow-04.lvl magicor-1.0/data/levels/snow/snow-04.lvl --- magicor-1.1/data/levels/snow/snow-04.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-04.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,240 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow 04 -credits wagner frederic -description -hint - -background snow/ice2 -music snow/ice2 -shadows 1 - -tile 0 2 snow/snow -tile 1 2 snow/snow -tile 2 2 snow/snow -tile 4 2 snow/snow -tile 5 2 snow/snow -tile 7 2 snow/snow -tile 8 2 snow/snow -tile 9 2 snow/snow -tile 11 2 snow/snow -tile 12 2 snow/snow -tile 14 2 snow/snow -tile 15 2 snow/snow -tile 16 2 snow/snow -tile 1 5 snow/snow -tile 2 5 snow/snow -tile 3 5 snow/snow -tile 5 5 snow/snow -tile 6 5 snow/snow -tile 7 5 snow/snow -tile 9 5 snow/snow -tile 10 5 snow/snow -tile 12 5 snow/snow -tile 13 5 snow/snow -tile 14 5 snow/snow -tile 15 5 snow/snow -tile 17 6 snow/snow -tile 18 6 snow/snow -tile 19 6 snow/snow -tile 1 8 snow/snow -tile 3 8 snow/snow -tile 4 8 snow/snow -tile 5 8 snow/snow -tile 6 8 snow/snow -tile 8 8 snow/snow -tile 9 8 snow/snow -tile 11 8 snow/snow -tile 12 8 snow/snow -tile 13 8 snow/snow -tile 15 8 snow/snow -tile 16 8 snow/snow -tile 17 8 snow/snow -tile 13 10 snow/snow -tile 14 10 snow/snow -tile 15 10 snow/snow -tile 0 11 snow/snow -tile 1 11 snow/snow -tile 2 11 snow/snow -tile 3 11 snow/snow -tile 4 11 snow/snow -tile 8 11 snow/snow -tile 9 11 snow/snow -tile 10 11 snow/snow -tile 12 11 snow/snow -tile 13 11 snow/snow -tile 17 11 snow/snow -tile 18 11 snow/snow -tile 19 11 snow/snow -tile 3 12 snow/snow -tile 4 12 snow/snow -tile 6 12 snow/snow -tile 7 12 snow/snow -tile 8 12 snow/snow -tile 4 13 snow/snow -tile 6 13 snow/snow -tile 10 13 snow/snow -tile 11 13 snow/snow -tile 12 13 snow/snow -tile 15 13 snow/snow -tile 16 13 snow/snow -tile 17 13 snow/snow -tile 0 15 snow/snow -tile 1 15 snow/snow -tile 2 15 snow/snow -tile 3 15 snow/snow -tile 4 15 snow/snow -tile 5 15 snow/snow -tile 6 15 snow/snow -tile 7 15 snow/snow -tile 8 15 snow/snow -tile 9 15 snow/snow -tile 10 15 snow/snow -tile 11 15 snow/snow -tile 12 15 snow/snow -tile 13 15 snow/snow -tile 14 15 snow/snow -tile 15 15 snow/snow -tile 16 15 snow/snow -tile 17 15 snow/snow -tile 18 15 snow/snow -tile 19 15 snow/snow -tile 0 16 snow/snow -tile 1 16 snow/snow -tile 2 16 snow/snow -tile 3 16 snow/snow -tile 4 16 snow/snow -tile 5 16 snow/snow -tile 6 16 snow/snow -tile 7 16 snow/snow -tile 8 16 snow/snow -tile 9 16 snow/snow -tile 10 16 snow/snow -tile 11 16 snow/snow -tile 12 16 snow/snow -tile 13 16 snow/snow -tile 14 16 snow/snow -tile 15 16 snow/snow -tile 16 16 snow/snow -tile 17 16 snow/snow -tile 18 16 snow/snow -tile 19 16 snow/snow -tile 0 17 snow/snow -tile 1 17 snow/snow -tile 2 17 snow/snow -tile 3 17 snow/snow -tile 4 17 snow/snow -tile 5 17 snow/snow -tile 6 17 snow/snow -tile 7 17 snow/snow -tile 8 17 snow/snow -tile 9 17 snow/snow -tile 10 17 snow/snow -tile 11 17 snow/snow -tile 12 17 snow/snow -tile 13 17 snow/snow -tile 14 17 snow/snow -tile 15 17 snow/snow -tile 16 17 snow/snow -tile 17 17 snow/snow -tile 18 17 snow/snow -tile 19 17 snow/snow - -sprite 0 1 decoration snow/snowtop 32 48 8 -sprite 0 10 decoration snow/snowtop 32 48 8 -sprite 0 12 decoration snow/i1 32 32 8 -sprite 0 14 decoration snow/snowtop 32 48 8 -sprite 1 1 decoration snow/snowtop 32 48 8 -sprite 1 4 decoration snow/snowtop 32 48 8 -sprite 1 7 decoration snow/snowtop 32 48 8 -sprite 1 10 decoration snow/snowtop 32 48 8 -sprite 1 14 decoration snow/snowtop 32 48 8 -sprite 2 1 decoration snow/snowtop 32 48 8 -sprite 2 4 decoration snow/snowtop 32 48 8 -sprite 2 10 decoration snow/snowtop 32 48 8 -sprite 2 14 decoration snow/snowtop 32 48 8 -sprite 3 4 decoration snow/snowtop 32 48 8 -sprite 3 7 decoration snow/snowtop 32 48 8 -sprite 3 9 decoration snow/i1 32 32 8 -sprite 3 10 decoration snow/snowtop 32 48 8 -sprite 3 14 decoration snow/snowtop 32 48 8 -sprite 4 1 decoration snow/snowtop 32 48 8 -sprite 4 7 decoration snow/snowtop 32 48 8 -sprite 4 10 decoration snow/snowtop 32 48 8 -sprite 4 14 decoration snow/snowtop 32 48 8 -sprite 5 1 decoration snow/snowtop 32 48 8 -sprite 5 4 decoration snow/snowtop 32 48 8 -sprite 5 7 decoration snow/snowtop 32 48 8 -sprite 5 14 decoration snow/snowtop 32 48 8 -sprite 6 4 decoration snow/snowtop 32 48 8 -sprite 6 7 decoration snow/snowtop 32 48 8 -sprite 6 14 decoration snow/snowtop 32 48 8 -sprite 7 1 decoration snow/snowtop 32 48 8 -sprite 7 4 decoration snow/snowtop 32 48 8 -sprite 7 14 decoration snow/snowtop 32 48 8 -sprite 8 1 decoration snow/snowtop 32 48 8 -sprite 8 7 decoration snow/snowtop 32 48 8 -sprite 8 10 decoration snow/snowtop 32 48 8 -sprite 8 14 decoration snow/snowtop 32 48 8 -sprite 9 1 decoration snow/snowtop 32 48 8 -sprite 9 3 decoration snow/i1 32 32 8 -sprite 9 4 decoration snow/snowtop 32 48 8 -sprite 9 7 decoration snow/snowtop 32 48 8 -sprite 9 10 decoration snow/snowtop 32 48 8 -sprite 9 14 decoration snow/snowtop 32 48 8 -sprite 10 4 decoration snow/snowtop 32 48 8 -sprite 10 10 decoration snow/snowtop 32 48 8 -sprite 10 12 decoration snow/snowtop 32 48 8 -sprite 10 14 decoration snow/snowtop 32 48 8 -sprite 11 1 decoration snow/snowtop 32 48 8 -sprite 11 7 decoration snow/snowtop 32 48 8 -sprite 11 12 decoration snow/snowtop 32 48 8 -sprite 11 14 decoration snow/snowtop 32 48 8 -sprite 12 1 decoration snow/snowtop 32 48 8 -sprite 12 4 decoration snow/snowtop 32 48 8 -sprite 12 7 decoration snow/snowtop 32 48 8 -sprite 12 12 decoration snow/snowtop 32 48 8 -sprite 12 14 decoration snow/snowtop 32 48 8 -sprite 13 4 decoration snow/snowtop 32 48 8 -sprite 13 7 decoration snow/snowtop 32 48 8 -sprite 13 9 decoration snow/snowtop 32 48 8 -sprite 13 14 decoration snow/snowtop 32 48 8 -sprite 14 1 decoration snow/snowtop 32 48 8 -sprite 14 4 decoration snow/snowtop 32 48 8 -sprite 14 9 decoration snow/snowtop 32 48 8 -sprite 14 14 decoration snow/snowtop 32 48 8 -sprite 15 1 decoration snow/snowtop 32 48 8 -sprite 15 4 decoration snow/snowtop 32 48 8 -sprite 15 7 decoration snow/snowtop 32 48 8 -sprite 15 9 decoration snow/snowtop 32 48 8 -sprite 15 12 decoration snow/snowtop 32 48 8 -sprite 15 14 decoration snow/snowtop 32 48 8 -sprite 16 1 decoration snow/snowtop 32 48 8 -sprite 16 7 decoration snow/snowtop 32 48 8 -sprite 16 12 decoration snow/snowtop 32 48 8 -sprite 16 14 decoration snow/snowtop 32 48 8 -sprite 17 5 decoration snow/snowtop 32 48 8 -sprite 17 7 decoration snow/snowtop 32 48 8 -sprite 17 10 decoration snow/snowtop 32 48 8 -sprite 17 12 decoration snow/snowtop 32 48 8 -sprite 17 14 decoration snow/snowtop 32 48 8 -sprite 18 3 decoration snow/snowman 64 96 8 -sprite 18 5 decoration snow/snowtop 32 48 8 -sprite 18 10 decoration snow/snowtop 32 48 8 -sprite 18 14 decoration snow/snowtop 32 48 8 -sprite 19 5 decoration snow/snowtop 32 48 8 -sprite 19 10 decoration snow/snowtop 32 48 8 -sprite 19 14 decoration snow/snowtop 32 48 8 -sprite 19 14 fire -sprite 0 1 player right -sprite 1 4 stationary-enemy up sprites/spikes samples/spikes 01 -sprite 5 4 stationary-enemy up sprites/spikes samples/spikes 01 -sprite 6 7 stationary-enemy up sprites/spikes samples/spikes 01 -sprite 7 4 stationary-enemy up sprites/spikes samples/spikes 01 -sprite 9 4 stationary-enemy up sprites/spikes samples/spikes 01 -sprite 9 10 stationary-enemy up sprites/spikes samples/spikes 01 -sprite 12 4 stationary-enemy up sprites/spikes samples/spikes 01 -sprite 12 7 stationary-enemy up sprites/spikes samples/spikes 01 -sprite 15 7 stationary-enemy up sprites/spikes samples/spikes 01 -sprite 17 5 stationary-enemy up sprites/spikes samples/spikes 01 -sprite 17 7 stationary-enemy up sprites/spikes samples/spikes 01 -sprite 17 12 stationary-enemy up sprites/spikes samples/spikes 01 diff -Nru magicor-1.1/data/levels/snow/snow-05.lvl magicor-1.0/data/levels/snow/snow-05.lvl --- magicor-1.1/data/levels/snow/snow-05.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-05.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,190 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow 05 -credits wagner frederic -description -hint - -background snow/ice1 -music snow/ice -shadows 1 - -tile 0 3 snow/snow -tile 1 3 snow/snow -tile 2 3 snow/snow -tile 3 3 snow/snow -tile 4 3 snow/snow -tile 5 3 snow/snow -tile 6 3 snow/snow -tile 7 3 snow/snow -tile 9 3 snow/snow -tile 11 3 snow/snow -tile 12 3 snow/snow -tile 13 3 snow/snow -tile 14 3 snow/snow -tile 15 3 snow/snow -tile 16 3 snow/snow -tile 17 3 snow/snow -tile 18 3 snow/snow -tile 19 3 snow/snow -tile 0 5 snow/snow -tile 1 5 snow/snow -tile 2 5 snow/snow -tile 3 5 snow/snow -tile 4 5 snow/snow -tile 5 5 snow/snow -tile 6 5 snow/snow -tile 8 5 snow/snow -tile 10 5 snow/snow -tile 12 5 snow/snow -tile 13 5 snow/snow -tile 14 5 snow/snow -tile 15 5 snow/snow -tile 16 5 snow/snow -tile 17 5 snow/snow -tile 18 5 snow/snow -tile 19 5 snow/snow -tile 0 7 snow/snow -tile 1 7 snow/snow -tile 2 7 snow/snow -tile 3 7 snow/snow -tile 4 7 snow/snow -tile 5 7 snow/snow -tile 7 7 snow/snow -tile 9 7 snow/snow -tile 11 7 snow/snow -tile 13 7 snow/snow -tile 14 7 snow/snow -tile 15 7 snow/snow -tile 16 7 snow/snow -tile 17 7 snow/snow -tile 18 7 snow/snow -tile 19 7 snow/snow -tile 0 9 snow/snow -tile 1 9 snow/snow -tile 2 9 snow/snow -tile 3 9 snow/snow -tile 4 9 snow/snow -tile 6 9 snow/snow -tile 8 9 snow/snow -tile 10 9 snow/snow -tile 12 9 snow/snow -tile 14 9 snow/snow -tile 15 9 snow/snow -tile 16 9 snow/snow -tile 17 9 snow/snow -tile 18 9 snow/snow -tile 19 9 snow/snow -tile 0 11 snow/snow -tile 1 11 snow/snow -tile 2 11 snow/snow -tile 3 11 snow/snow -tile 5 11 snow/snow -tile 7 11 snow/snow -tile 9 11 snow/snow -tile 11 11 snow/snow -tile 13 11 snow/snow -tile 15 11 snow/snow -tile 16 11 snow/snow -tile 17 11 snow/snow -tile 18 11 snow/snow -tile 19 11 snow/snow -tile 0 13 snow/snow -tile 1 13 snow/snow -tile 2 13 snow/snow -tile 4 13 snow/snow -tile 6 13 snow/snow -tile 8 13 snow/snow -tile 10 13 snow/snow -tile 12 13 snow/snow -tile 14 13 snow/snow -tile 16 13 snow/snow -tile 17 13 snow/snow -tile 18 13 snow/snow -tile 19 13 snow/snow -tile 0 15 snow/snow -tile 1 15 snow/snow -tile 3 15 snow/snow -tile 5 15 snow/snow -tile 7 15 snow/snow -tile 9 15 snow/snow -tile 11 15 snow/snow -tile 13 15 snow/snow -tile 15 15 snow/snow -tile 17 15 snow/snow -tile 18 15 snow/snow -tile 19 15 snow/snow -tile 19 16 snow/snow -tile 0 17 snow/snow -tile 1 17 snow/snow -tile 2 17 snow/snow -tile 3 17 snow/snow -tile 4 17 snow/snow -tile 5 17 snow/snow -tile 6 17 snow/snow -tile 7 17 snow/snow -tile 8 17 snow/snow -tile 9 17 snow/snow -tile 10 17 snow/snow -tile 11 17 snow/snow -tile 12 17 snow/snow -tile 13 17 snow/snow -tile 14 17 snow/snow -tile 15 17 snow/snow -tile 16 17 snow/snow -tile 17 17 snow/snow -tile 18 17 snow/snow -tile 19 17 snow/snow - -sprite 0 2 decoration snow/snowtop 32 48 8 -sprite 1 2 decoration snow/snowtop 32 48 8 -sprite 1 12 decoration snow/i1 32 32 8 -sprite 2 2 decoration snow/snowtop 32 48 8 -sprite 2 4 decoration snow/i1 32 32 8 -sprite 3 2 decoration snow/snowtop 32 48 8 -sprite 4 2 decoration snow/snowtop 32 48 8 -sprite 5 2 decoration snow/snowtop 32 48 8 -sprite 6 2 decoration snow/snowtop 32 48 8 -sprite 7 2 decoration snow/snowtop 32 48 8 -sprite 9 2 decoration snow/snowtop 32 48 8 -sprite 11 2 decoration snow/snowtop 32 48 8 -sprite 12 2 decoration snow/snowtop 32 48 8 -sprite 13 2 decoration snow/snowtop 32 48 8 -sprite 14 2 decoration snow/snowtop 32 48 8 -sprite 15 2 decoration snow/snowtop 32 48 8 -sprite 16 2 decoration snow/snowtop 32 48 8 -sprite 16 8 decoration snow/i1 32 32 8 -sprite 17 2 decoration snow/snowtop 32 48 8 -sprite 18 2 decoration snow/snowtop 32 48 8 -sprite 19 2 decoration snow/snowtop 32 48 8 -sprite 19 4 decoration snow/i1 32 32 8 -sprite 18 16 fire -sprite 16 2 ice -sprite 17 16 ice -sprite 6 2 player right -sprite 3 14 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 4 12 stationary-enemy up sprites/spikes samples/spikes 1 -sprite 5 10 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 5 14 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 6 8 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 6 12 stationary-enemy up sprites/spikes samples/spikes 1 -sprite 7 6 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 7 10 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 7 14 stationary-enemy up sprites/spikes samples/spikes 1 -sprite 8 4 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 8 8 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 8 12 stationary-enemy up sprites/spikes samples/spikes 22 -sprite 9 6 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 9 10 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 9 14 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 10 4 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 10 8 stationary-enemy up sprites/spikes samples/spikes 22 -sprite 10 12 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 11 6 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 11 10 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 11 14 stationary-enemy up sprites/spikes samples/spikes 1 -sprite 12 8 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 12 12 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 13 10 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 13 14 stationary-enemy up sprites/spikes samples/spikes 1 -sprite 14 12 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 15 14 stationary-enemy up sprites/spikes samples/spikes 1 diff -Nru magicor-1.1/data/levels/snow/snow-06.lvl magicor-1.0/data/levels/snow/snow-06.lvl --- magicor-1.1/data/levels/snow/snow-06.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-06.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,132 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow-06 -credits wagner frederic -description -hint - -background snow/ice2 -music snow/ice2 -shadows 1 - -tile 0 0 snow/snow -tile 1 0 snow/snow -tile 2 0 snow/snow -tile 16 0 snow/snow -tile 1 1 snow/snow -tile 10 1 snow/snow -tile 16 1 snow/snow -tile 1 2 snow/snow -tile 10 2 snow/snow -tile 16 2 snow/snow -tile 17 2 snow/snow -tile 18 2 snow/snow -tile 19 2 snow/snow -tile 1 3 snow/snow -tile 10 3 snow/snow -tile 17 3 snow/snow -tile 18 3 snow/snow -tile 19 3 snow/snow -tile 1 4 snow/snow -tile 10 4 snow/snow -tile 1 5 snow/snow -tile 10 5 snow/snow -tile 1 6 snow/snow -tile 10 6 snow/snow -tile 1 7 snow/snow -tile 1 8 snow/snow -tile 3 8 snow/snow -tile 6 9 snow/snow -tile 7 9 snow/snow -tile 8 9 snow/snow -tile 9 9 snow/snow -tile 10 9 snow/snow -tile 2 10 snow/snow -tile 3 10 snow/snow -tile 5 10 snow/snow -tile 6 10 snow/snow -tile 7 10 snow/snow -tile 8 10 snow/snow -tile 9 10 snow/snow -tile 10 10 snow/snow -tile 17 12 snow/snow -tile 17 13 snow/snow -tile 18 13 snow/snow -tile 0 14 snow/snow -tile 1 14 snow/snow -tile 2 14 snow/snow -tile 3 14 snow/snow -tile 4 14 snow/snow -tile 5 14 snow/snow -tile 6 14 snow/snow -tile 7 14 snow/snow -tile 8 14 snow/snow -tile 9 14 snow/snow -tile 10 14 snow/snow -tile 11 14 snow/snow -tile 12 14 snow/snow -tile 13 14 snow/snow -tile 14 14 snow/snow -tile 15 14 snow/snow -tile 16 14 snow/snow -tile 17 14 snow/snow -tile 18 14 snow/snow -tile 19 14 snow/snow -tile 0 15 snow/snow -tile 1 15 snow/snow -tile 19 15 snow/snow -tile 0 16 snow/snow -tile 19 16 snow/snow -tile 0 17 snow/snow -tile 19 17 snow/snow - -sprite 0 13 decoration snow/snowtop 32 48 8 -sprite 1 13 decoration snow/snowtop 32 48 8 -sprite 2 13 decoration snow/snowtop 32 48 8 -sprite 3 13 decoration snow/snowtop 32 48 8 -sprite 10 0 decoration snow/snowtop 32 48 8 -sprite 15 15 decoration snow/i1 32 32 8 -sprite 19 4 decoration snow/i1 32 32 8 -sprite 4 7 fire -sprite 17 11 fire -sprite 4 8 ice connect-left -sprite 11 1 ice connect-right -sprite 11 7 ice connect-right -sprite 11 8 ice connect-right -sprite 12 1 ice connect-left -sprite 12 2 ice -sprite 12 3 ice -sprite 12 4 ice -sprite 12 5 ice -sprite 12 6 ice -sprite 12 7 ice connect-left -sprite 12 8 ice connect-left -sprite 12 9 ice -sprite 12 10 ice -sprite 12 11 ice -sprite 12 12 ice -sprite 12 13 ice -sprite 17 0 ice -sprite 17 1 ice -sprite 18 0 ice -sprite 18 1 ice -sprite 19 0 ice -sprite 19 1 ice -sprite 4 13 lava dormant -sprite 5 13 lava dormant -sprite 6 13 lava dormant -sprite 7 13 lava dormant -sprite 8 13 lava dormant -sprite 9 13 lava dormant -sprite 10 13 lava dormant -sprite 11 13 lava dormant -sprite 12 13 lava dormant -sprite 13 13 lava dormant -sprite 14 13 lava dormant -sprite 15 13 lava dormant -sprite 16 13 lava dormant -sprite 3 7 player right -sprite 10 8 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 11 9 stationary-enemy right sprites/spikes samples/spikes 10 -sprite 16 12 stationary-enemy left sprites/spikes samples/spikes 10 -sprite 2 10 tube up -sprite 5 9 tube up \ No newline at end of file diff -Nru magicor-1.1/data/levels/snow/snow-07.lvl magicor-1.0/data/levels/snow/snow-07.lvl --- magicor-1.1/data/levels/snow/snow-07.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-07.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,217 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow-07 -credits wagner frederic -description -hint - -background snow/ice3 -music snow/ice -shadows 1 - -tile 0 0 snow/snow -tile 1 0 snow/snow -tile 2 0 snow/snow -tile 3 0 snow/snow -tile 4 0 snow/snow -tile 5 0 snow/snow -tile 6 0 snow/snow -tile 7 0 snow/snow -tile 8 0 snow/snow -tile 9 0 snow/snow -tile 10 0 snow/snow -tile 11 0 snow/snow -tile 12 0 snow/snow -tile 13 0 snow/snow -tile 14 0 snow/snow -tile 15 0 snow/snow -tile 16 0 snow/snow -tile 17 0 snow/snow -tile 18 0 snow/snow -tile 19 0 snow/snow -tile 0 1 snow/snow -tile 1 1 snow/snow -tile 2 1 snow/snow -tile 3 1 snow/snow -tile 4 1 snow/snow -tile 7 1 snow/snow -tile 8 1 snow/snow -tile 9 1 snow/snow -tile 11 1 snow/snow -tile 13 1 snow/snow -tile 14 1 snow/snow -tile 15 1 snow/snow -tile 16 1 snow/snow -tile 17 1 snow/snow -tile 18 1 snow/snow -tile 19 1 snow/snow -tile 1 2 snow/snow -tile 3 2 snow/snow -tile 4 2 snow/snow -tile 7 2 snow/snow -tile 9 2 snow/snow -tile 11 2 snow/snow -tile 13 2 snow/snow -tile 14 2 snow/snow -tile 17 2 snow/snow -tile 19 2 snow/snow -tile 1 3 snow/snow -tile 3 3 snow/snow -tile 7 3 snow/snow -tile 9 3 snow/snow -tile 13 3 snow/snow -tile 19 3 snow/snow -tile 3 4 snow/snow -tile 7 4 snow/snow -tile 9 4 snow/snow -tile 13 4 snow/snow -tile 7 5 snow/snow -tile 9 5 snow/snow -tile 2 7 snow/snow -tile 3 7 snow/snow -tile 4 7 snow/snow -tile 5 7 snow/snow -tile 6 7 snow/snow -tile 7 7 snow/snow -tile 8 7 snow/snow -tile 9 7 snow/snow -tile 10 7 snow/snow -tile 11 7 snow/snow -tile 12 7 snow/snow -tile 13 7 snow/snow -tile 14 7 snow/snow -tile 15 7 snow/snow -tile 16 7 snow/snow -tile 17 7 snow/snow -tile 17 8 snow/snow -tile 17 9 snow/snow -tile 16 10 snow/snow -tile 17 10 snow/snow -tile 0 11 snow/snow -tile 1 11 snow/snow -tile 2 11 snow/snow -tile 3 11 snow/snow -tile 4 11 snow/snow -tile 5 11 snow/snow -tile 6 11 snow/snow -tile 7 11 snow/snow -tile 8 11 snow/snow -tile 9 11 snow/snow -tile 10 11 snow/snow -tile 11 11 snow/snow -tile 12 11 snow/snow -tile 13 11 snow/snow -tile 14 11 snow/snow -tile 15 11 snow/snow -tile 16 11 snow/snow -tile 17 11 snow/snow -tile 0 12 snow/snow -tile 0 13 snow/snow -tile 0 14 snow/snow -tile 1 14 snow/snow -tile 0 15 snow/snow -tile 1 15 snow/snow -tile 2 15 snow/snow -tile 3 15 snow/snow -tile 4 15 snow/snow -tile 5 15 snow/snow -tile 6 15 snow/snow -tile 7 15 snow/snow -tile 8 15 snow/snow -tile 9 15 snow/snow -tile 10 15 snow/snow -tile 11 15 snow/snow -tile 12 15 snow/snow -tile 13 15 snow/snow -tile 14 15 snow/snow -tile 15 15 snow/snow -tile 16 15 snow/snow -tile 17 15 snow/snow -tile 18 15 snow/snow -tile 19 15 snow/snow -tile 0 16 snow/snow -tile 1 16 snow/snow -tile 2 16 snow/snow -tile 3 16 snow/snow -tile 4 16 snow/snow -tile 5 16 snow/snow -tile 6 16 snow/snow -tile 7 16 snow/snow -tile 8 16 snow/snow -tile 9 16 snow/snow -tile 10 16 snow/snow -tile 11 16 snow/snow -tile 12 16 snow/snow -tile 13 16 snow/snow -tile 14 16 snow/snow -tile 15 16 snow/snow -tile 16 16 snow/snow -tile 17 16 snow/snow -tile 18 16 snow/snow -tile 19 16 snow/snow -tile 0 17 snow/snow -tile 19 17 snow/snow - -sprite 0 10 decoration snow/snowtop 32 48 8 -sprite 1 4 decoration snow/i1 32 32 8 -sprite 1 10 decoration snow/snowtop 32 48 8 -sprite 2 6 decoration snow/snowtop 32 48 8 -sprite 2 10 decoration snow/snowtop 32 48 8 -sprite 3 5 decoration snow/i1 32 32 8 -sprite 3 6 decoration snow/snowtop 32 48 8 -sprite 4 6 decoration snow/snowtop 32 48 8 -sprite 5 6 decoration snow/snowtop 32 48 8 -sprite 6 6 decoration snow/snowtop 32 48 8 -sprite 7 6 decoration snow/snowtop 32 48 8 -sprite 8 6 decoration snow/snowtop 32 48 8 -sprite 9 6 decoration snow/snowtop 32 48 8 -sprite 10 6 decoration snow/snowtop 32 48 8 -sprite 11 3 decoration snow/i1 32 32 8 -sprite 11 6 decoration snow/snowtop 32 48 8 -sprite 12 6 decoration snow/snowtop 32 48 8 -sprite 13 5 decoration snow/i1 32 32 8 -sprite 13 6 decoration snow/snowtop 32 48 8 -sprite 14 6 decoration snow/snowtop 32 48 8 -sprite 15 6 decoration snow/snowtop 32 48 8 -sprite 16 6 decoration snow/snowtop 32 48 8 -sprite 16 14 decoration snow/snowtop 32 48 8 -sprite 17 3 decoration snow/i1 32 32 8 -sprite 17 6 decoration snow/snowtop 32 48 8 -sprite 17 14 decoration snow/snowtop 32 48 8 -sprite 18 14 decoration snow/snowtop 32 48 8 -sprite 19 4 decoration snow/i1 32 32 8 -sprite 19 14 decoration snow/snowtop 32 48 8 -sprite 1 13 fire -sprite 16 9 fire -sprite 8 2 ice -sprite 8 3 ice -sprite 8 4 ice -sprite 8 5 ice -sprite 8 6 ice -sprite 2 14 lava -sprite 3 10 lava -sprite 3 14 lava -sprite 4 10 lava -sprite 4 14 lava -sprite 5 10 lava -sprite 5 14 lava -sprite 6 10 lava -sprite 6 14 lava -sprite 7 10 lava -sprite 7 14 lava -sprite 8 10 lava -sprite 8 14 lava -sprite 9 10 lava -sprite 9 14 lava -sprite 10 10 lava -sprite 10 14 lava -sprite 11 10 lava -sprite 11 14 lava -sprite 12 10 lava -sprite 12 14 lava -sprite 13 10 lava -sprite 13 14 lava -sprite 14 10 lava -sprite 14 14 lava -sprite 15 10 lava -sprite 15 14 lava -sprite 10 6 player right diff -Nru magicor-1.1/data/levels/snow/snow-08.lvl magicor-1.0/data/levels/snow/snow-08.lvl --- magicor-1.1/data/levels/snow/snow-08.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-08.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,185 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow-08 -credits wagner frederic -description -hint - -background snow/ice1 -music snow/ice2 -shadows 1 - -tile 2 0 tiles/tube-vertical -tile 3 0 snow/snow -tile 7 0 snow/snow -tile 13 0 snow/snow -tile 16 0 snow/snow -tile 17 0 tiles/tube-vertical -tile 2 1 tiles/tube-vertical -tile 3 1 snow/snow -tile 7 1 snow/snow -tile 13 1 snow/snow -tile 16 1 snow/snow -tile 17 1 tiles/tube-vertical -tile 2 2 tiles/tube-vertical -tile 3 2 snow/snow -tile 7 2 snow/snow -tile 8 2 snow/snow -tile 10 2 snow/snow -tile 12 2 snow/snow -tile 13 2 snow/snow -tile 16 2 snow/snow -tile 17 2 tiles/tube-vertical -tile 2 3 tiles/tube-vertical -tile 3 3 snow/snow -tile 16 3 snow/snow -tile 17 3 tiles/tube-vertical -tile 2 4 tiles/tube-vertical -tile 3 4 snow/snow -tile 5 4 snow/snow -tile 6 4 snow/snow -tile 7 4 snow/snow -tile 8 4 snow/snow -tile 9 4 snow/snow -tile 10 4 snow/snow -tile 11 4 snow/snow -tile 12 4 snow/snow -tile 13 4 snow/snow -tile 14 4 snow/snow -tile 16 4 snow/snow -tile 17 4 tiles/tube-vertical -tile 2 5 tiles/tube-vertical -tile 3 5 snow/snow -tile 16 5 snow/snow -tile 17 5 tiles/tube-vertical -tile 2 6 tiles/tube-vertical -tile 3 6 snow/snow -tile 5 6 snow/snow -tile 6 6 snow/snow -tile 7 6 snow/snow -tile 8 6 snow/snow -tile 9 6 snow/snow -tile 10 6 snow/snow -tile 11 6 snow/snow -tile 12 6 snow/snow -tile 13 6 snow/snow -tile 16 6 snow/snow -tile 17 6 tiles/tube-vertical -tile 2 7 tiles/tube-vertical -tile 3 7 snow/snow -tile 16 7 snow/snow -tile 17 7 tiles/tube-vertical -tile 2 8 tiles/tube-vertical -tile 3 8 snow/snow -tile 5 8 snow/snow -tile 6 8 snow/snow -tile 7 8 snow/snow -tile 8 8 snow/snow -tile 9 8 snow/snow -tile 10 8 snow/snow -tile 11 8 snow/snow -tile 12 8 snow/snow -tile 13 8 snow/snow -tile 14 8 snow/snow -tile 16 8 snow/snow -tile 17 8 tiles/tube-vertical -tile 2 9 tiles/tube-vertical -tile 3 9 snow/snow -tile 16 9 snow/snow -tile 17 9 tiles/tube-vertical -tile 2 10 tiles/tube-vertical -tile 3 10 snow/snow -tile 5 10 snow/snow -tile 6 10 snow/snow -tile 7 10 snow/snow -tile 8 10 snow/snow -tile 9 10 snow/snow -tile 10 10 snow/snow -tile 11 10 snow/snow -tile 12 10 snow/snow -tile 13 10 snow/snow -tile 14 10 snow/snow -tile 16 10 snow/snow -tile 17 10 tiles/tube-vertical -tile 2 11 tiles/tube-right-up -tile 17 11 tiles/tube-left-up -tile 3 12 snow/snow -tile 5 12 snow/snow -tile 6 12 snow/snow -tile 7 12 snow/snow -tile 8 12 snow/snow -tile 9 12 snow/snow -tile 10 12 snow/snow -tile 11 12 snow/snow -tile 12 12 snow/snow -tile 13 12 snow/snow -tile 14 12 snow/snow -tile 16 12 snow/snow -tile 3 13 snow/snow -tile 16 13 snow/snow -tile 5 14 snow/snow -tile 6 14 snow/snow -tile 7 14 snow/snow -tile 8 14 snow/snow -tile 9 14 snow/snow -tile 10 14 snow/snow -tile 11 14 snow/snow -tile 12 14 snow/snow -tile 13 14 snow/snow -tile 14 14 snow/snow -tile 3 15 snow/snow -tile 16 15 snow/snow -tile 0 16 snow/snow -tile 1 16 snow/snow -tile 2 16 snow/snow -tile 3 16 snow/snow -tile 4 16 snow/snow -tile 5 16 snow/snow -tile 6 16 snow/snow -tile 7 16 snow/snow -tile 8 16 snow/snow -tile 9 16 snow/snow -tile 10 16 snow/snow -tile 11 16 snow/snow -tile 12 16 snow/snow -tile 13 16 snow/snow -tile 14 16 snow/snow -tile 15 16 snow/snow -tile 16 16 snow/snow -tile 17 16 snow/snow -tile 18 16 snow/snow -tile 19 16 snow/snow -tile 0 17 snow/snow -tile 1 17 snow/snow -tile 2 17 snow/snow -tile 3 17 snow/snow -tile 16 17 snow/snow -tile 17 17 snow/snow -tile 18 17 snow/snow -tile 19 17 snow/snow - -sprite 0 15 fire -sprite 10 5 fire -sprite 19 15 fire -sprite 6 9 ice -sprite 8 11 ice -sprite 8 15 ice -sprite 10 3 ice -sprite 12 7 ice -sprite 12 13 ice -sprite 13 5 ice -sprite 8 1 player right -sprite 0 0 tube down 9 -sprite 1 15 tube up 9 -sprite 2 15 tube up 3 -sprite 3 11 tube right 5 -sprite 4 15 tube up 2 -sprite 8 8 tube up 1 -sprite 9 14 tube up 2 -sprite 12 10 tube up 3 -sprite 14 6 tube up 5 -sprite 15 15 tube up 1 -sprite 16 11 tube left 5 -sprite 17 15 tube up 6 -sprite 18 0 tube down 8 -sprite 18 15 tube up 8 -sprite 19 0 tube down 6 \ No newline at end of file diff -Nru magicor-1.1/data/levels/snow/snow-09.lvl magicor-1.0/data/levels/snow/snow-09.lvl --- magicor-1.1/data/levels/snow/snow-09.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-09.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,174 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow-09 -credits wagner frederic -description -hint - -background snow/ice1 -music snow/ice -shadows 1 - -tile 3 0 tiles/tube-vertical -tile 8 0 snow/snow -tile 9 0 snow/snow -tile 10 0 snow/snow -tile 11 0 snow/snow -tile 12 0 snow/snow -tile 13 0 snow/snow -tile 14 0 snow/snow -tile 15 0 snow/snow -tile 16 0 snow/snow -tile 17 0 snow/snow -tile 18 0 snow/snow -tile 19 0 snow/snow -tile 1 1 snow/snow -tile 3 1 tiles/tube-vertical -tile 9 1 snow/snow -tile 10 1 snow/snow -tile 11 1 snow/snow -tile 12 1 snow/snow -tile 13 1 snow/snow -tile 14 1 snow/snow -tile 15 1 snow/snow -tile 16 1 snow/snow -tile 17 1 snow/snow -tile 18 1 snow/snow -tile 19 1 snow/snow -tile 1 2 snow/snow -tile 3 2 tiles/tube-vertical -tile 12 2 snow/snow -tile 13 2 snow/snow -tile 14 2 snow/snow -tile 15 2 snow/snow -tile 16 2 snow/snow -tile 17 2 snow/snow -tile 18 2 snow/snow -tile 19 2 snow/snow -tile 1 3 snow/snow -tile 3 3 tiles/tube-vertical -tile 17 3 snow/snow -tile 18 3 snow/snow -tile 19 3 snow/snow -tile 1 4 snow/snow -tile 3 4 tiles/tube-vertical -tile 19 4 snow/snow -tile 1 5 snow/snow -tile 3 5 tiles/tube-vertical -tile 19 5 snow/snow -tile 1 6 snow/snow -tile 3 6 tiles/tube-vertical -tile 19 6 snow/snow -tile 1 7 snow/snow -tile 3 7 tiles/tube-vertical -tile 10 7 snow/snow -tile 11 7 snow/snow -tile 12 7 snow/snow -tile 1 8 snow/snow -tile 3 8 tiles/tube-right-up -tile 1 9 snow/snow -tile 3 9 snow/snow -tile 4 9 snow/snow -tile 5 9 snow/snow -tile 6 9 snow/snow -tile 1 10 snow/snow -tile 3 10 snow/snow -tile 1 11 snow/snow -tile 3 11 snow/snow -tile 1 12 snow/snow -tile 3 12 snow/snow -tile 5 12 snow/snow -tile 6 12 snow/snow -tile 7 12 snow/snow -tile 8 12 snow/snow -tile 9 12 snow/snow -tile 1 13 snow/snow -tile 3 13 snow/snow -tile 1 14 snow/snow -tile 3 14 snow/snow -tile 1 15 snow/snow -tile 3 15 snow/snow -tile 0 17 snow/snow -tile 1 17 snow/snow -tile 2 17 snow/snow -tile 3 17 snow/snow -tile 4 17 snow/snow -tile 5 17 snow/snow -tile 6 17 snow/snow -tile 7 17 snow/snow -tile 8 17 snow/snow -tile 9 17 snow/snow -tile 10 17 snow/snow -tile 11 17 snow/snow -tile 12 17 snow/snow -tile 13 17 snow/snow -tile 14 17 snow/snow -tile 15 17 snow/snow -tile 16 17 snow/snow -tile 17 17 snow/snow -tile 18 17 snow/snow -tile 19 17 snow/snow - -sprite 5 8 decoration snow/snowtop 32 48 8 -sprite 5 11 decoration snow/snowtop 32 48 8 -sprite 5 16 decoration snow/snowtop 32 48 8 -sprite 6 8 decoration snow/snowtop 32 48 8 -sprite 6 10 decoration snow/i1 32 32 8 -sprite 6 11 decoration snow/snowtop 32 48 8 -sprite 6 16 decoration snow/snowtop 32 48 8 -sprite 7 11 decoration snow/snowtop 32 48 8 -sprite 7 16 decoration snow/snowtop 32 48 8 -sprite 8 11 decoration snow/snowtop 32 48 8 -sprite 8 13 decoration snow/i1 32 32 8 -sprite 8 16 decoration snow/snowtop 32 48 8 -sprite 9 11 decoration snow/snowtop 32 48 8 -sprite 9 16 decoration snow/snowtop 32 48 8 -sprite 10 4 decoration snow/snowman 64 96 8 -sprite 10 6 decoration snow/snowtop 32 48 8 -sprite 10 16 decoration snow/snowtop 32 48 8 -sprite 11 6 decoration snow/snowtop 32 48 8 -sprite 11 16 decoration snow/snowtop 32 48 8 -sprite 12 6 decoration snow/snowtop 32 48 8 -sprite 12 8 decoration snow/i1 32 32 8 -sprite 12 16 decoration snow/snowtop 32 48 8 -sprite 13 16 decoration snow/snowtop 32 48 8 -sprite 14 16 decoration snow/snowtop 32 48 8 -sprite 15 16 decoration snow/snowtop 32 48 8 -sprite 16 16 decoration snow/snowtop 32 48 8 -sprite 17 16 decoration snow/snowtop 32 48 8 -sprite 18 16 decoration snow/snowtop 32 48 8 -sprite 19 7 decoration snow/i1 32 32 8 -sprite 19 16 decoration snow/snowtop 32 48 8 -sprite 2 0 fire -sprite 6 11 fire -sprite 11 16 fire -sprite 16 9 fire -sprite 1 16 ice -sprite 2 1 ice -sprite 2 2 ice -sprite 2 3 ice -sprite 2 4 ice -sprite 2 5 ice -sprite 2 6 ice -sprite 2 7 ice -sprite 2 8 ice -sprite 2 9 ice -sprite 2 10 ice -sprite 2 11 ice -sprite 2 12 ice -sprite 2 13 ice -sprite 2 14 ice -sprite 2 15 ice -sprite 2 16 ice -sprite 14 10 ice connect-right -sprite 15 10 ice connect -sprite 16 10 ice connect -sprite 17 10 ice connect -sprite 18 10 ice connect -sprite 19 10 ice connect -sprite 2 16 lava dormant -sprite 3 16 lava dormant -sprite 4 16 lava dormant -sprite 6 8 player right -sprite 8 16 stationary-enemy up sprites/spikes samples/spikes 1 -sprite 0 0 tube down -sprite 4 8 tube right diff -Nru magicor-1.1/data/levels/snow/snow-10.lvl magicor-1.0/data/levels/snow/snow-10.lvl --- magicor-1.1/data/levels/snow/snow-10.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-10.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,150 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow-10 -credits wagner frederic -description -hint - -background snow/ice3 -music snow/ice2 -shadows 1 - -tile 12 0 snow/snow -tile 13 0 snow/snow -tile 15 0 snow/snow -tile 12 1 snow/snow -tile 13 1 snow/snow -tile 15 1 snow/snow -tile 12 2 snow/snow -tile 13 2 snow/snow -tile 15 2 snow/snow -tile 12 3 snow/snow -tile 13 3 snow/snow -tile 15 3 snow/snow -tile 1 4 snow/snow -tile 3 4 snow/snow -tile 10 4 snow/snow -tile 12 4 snow/snow -tile 13 4 snow/snow -tile 15 4 snow/snow -tile 1 5 snow/snow -tile 3 5 snow/snow -tile 12 5 snow/snow -tile 15 5 snow/snow -tile 1 6 snow/snow -tile 3 6 snow/snow -tile 4 6 snow/snow -tile 5 6 snow/snow -tile 6 6 snow/snow -tile 7 6 snow/snow -tile 8 6 snow/snow -tile 9 6 snow/snow -tile 10 6 snow/snow -tile 11 6 snow/snow -tile 13 6 snow/snow -tile 15 6 snow/snow -tile 1 7 snow/snow -tile 3 7 snow/snow -tile 4 7 snow/snow -tile 5 7 tiles/tube-vertical -tile 6 7 snow/snow -tile 12 7 snow/snow -tile 13 7 snow/snow -tile 15 7 snow/snow -tile 1 8 snow/snow -tile 3 8 snow/snow -tile 4 8 snow/snow -tile 6 8 snow/snow -tile 13 8 snow/snow -tile 15 8 snow/snow -tile 1 9 snow/snow -tile 3 9 snow/snow -tile 4 9 snow/snow -tile 0 10 snow/snow -tile 1 10 snow/snow -tile 3 10 snow/snow -tile 4 10 snow/snow -tile 5 10 snow/snow -tile 6 10 snow/snow -tile 7 10 snow/snow -tile 8 10 snow/snow -tile 9 10 snow/snow -tile 10 10 snow/snow -tile 11 10 snow/snow -tile 12 10 snow/snow -tile 13 10 snow/snow -tile 15 10 snow/snow -tile 16 10 snow/snow -tile 17 10 snow/snow -tile 15 11 snow/snow -tile 15 12 snow/snow -tile 15 13 snow/snow -tile 0 15 snow/snow -tile 1 15 snow/snow -tile 2 15 snow/snow -tile 3 15 snow/snow -tile 4 15 snow/snow -tile 5 15 snow/snow -tile 6 15 snow/snow -tile 7 15 snow/snow -tile 8 15 snow/snow -tile 9 15 snow/snow -tile 10 15 snow/snow -tile 11 15 snow/snow -tile 12 15 snow/snow -tile 13 15 snow/snow -tile 14 15 snow/snow -tile 15 15 snow/snow -tile 16 15 snow/snow -tile 17 15 snow/snow -tile 18 15 snow/snow -tile 19 15 snow/snow -tile 14 16 snow/snow -tile 15 16 snow/snow -tile 16 16 snow/snow -tile 14 17 snow/snow - -sprite 7 12 decoration snow/snowman 64 96 8 -sprite 8 7 decoration snow/i1 32 32 8 -sprite 9 7 decoration snow/i1 32 32 8 -sprite 10 7 decoration snow/i1 32 32 8 -sprite 4 0 fire -sprite 8 0 fire -sprite 17 9 fire -sprite 1 2 ice connect-right -sprite 2 2 ice connect -sprite 2 14 ice -sprite 3 2 ice connect -sprite 4 1 ice -sprite 4 2 ice connect -sprite 5 2 ice connect -sprite 6 2 ice connect -sprite 6 9 ice -sprite 7 2 ice connect -sprite 8 1 ice -sprite 8 2 ice connect -sprite 9 2 ice connect -sprite 10 2 ice connect -sprite 11 2 ice connect -sprite 13 5 ice connect-right -sprite 14 0 ice -sprite 14 1 ice -sprite 14 2 ice -sprite 14 3 ice -sprite 14 4 ice -sprite 14 5 ice connect-left -sprite 9 5 lava dormant -sprite 10 5 lava dormant -sprite 11 5 lava dormant -sprite 12 6 lava dormant -sprite 13 5 lava dormant -sprite 6 1 player right -sprite 2 4 stationary-enemy left sprites/spikes samples/spikes 1 -sprite 2 5 stationary-enemy right sprites/spikes samples/spikes 1 -sprite 2 6 stationary-enemy left sprites/spikes samples/spikes 1 -sprite 2 7 stationary-enemy right sprites/spikes samples/spikes 1 -sprite 2 8 stationary-enemy left sprites/spikes samples/spikes 1 -sprite 2 9 stationary-enemy right sprites/spikes samples/spikes 1 -sprite 8 14 stationary-enemy up sprites/spikes samples/spikes 8 -sprite 1 15 tube up -sprite 5 6 tube up -sprite 5 8 tube down \ No newline at end of file diff -Nru magicor-1.1/data/levels/snow/snow-11.lvl magicor-1.0/data/levels/snow/snow-11.lvl --- magicor-1.1/data/levels/snow/snow-11.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-11.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,263 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow-11 -credits wagner frederic -description -hint - -background snow/ice2 -music snow/ice -shadows 1 - -tile 0 0 snow/snow -tile 1 0 tiles/tube-vertical -tile 2 0 tiles/tube-vertical -tile 3 0 tiles/tube-vertical -tile 4 0 snow/snow -tile 5 0 snow/snow -tile 6 0 snow/snow -tile 7 0 snow/snow -tile 8 0 snow/snow -tile 10 0 snow/snow -tile 11 0 snow/snow -tile 12 0 snow/snow -tile 13 0 snow/snow -tile 14 0 tiles/tube-vertical -tile 15 0 snow/snow -tile 16 0 snow/snow -tile 17 0 snow/snow -tile 18 0 snow/snow -tile 19 0 snow/snow -tile 0 1 snow/snow -tile 4 1 snow/snow -tile 5 1 snow/snow -tile 6 1 snow/snow -tile 7 1 snow/snow -tile 8 1 snow/snow -tile 10 1 snow/snow -tile 11 1 snow/snow -tile 12 1 snow/snow -tile 13 1 snow/snow -tile 15 1 snow/snow -tile 16 1 snow/snow -tile 17 1 snow/snow -tile 18 1 snow/snow -tile 19 1 snow/snow -tile 0 3 snow/snow -tile 1 3 snow/snow -tile 2 3 snow/snow -tile 3 3 snow/snow -tile 5 3 snow/snow -tile 6 3 snow/snow -tile 7 3 snow/snow -tile 8 3 snow/snow -tile 9 3 snow/snow -tile 10 3 snow/snow -tile 11 3 snow/snow -tile 12 3 snow/snow -tile 13 3 snow/snow -tile 14 3 snow/snow -tile 15 3 snow/snow -tile 16 3 snow/snow -tile 17 3 snow/snow -tile 18 3 snow/snow -tile 14 4 snow/snow -tile 15 4 snow/snow -tile 16 4 snow/snow -tile 17 4 snow/snow -tile 18 4 snow/snow -tile 19 4 tiles/tube-vertical -tile 0 5 snow/snow -tile 1 5 snow/snow -tile 2 5 snow/snow -tile 3 5 snow/snow -tile 5 5 snow/snow -tile 6 5 snow/snow -tile 7 5 snow/snow -tile 8 5 snow/snow -tile 10 5 snow/snow -tile 11 5 snow/snow -tile 12 5 snow/snow -tile 14 5 snow/snow -tile 15 5 snow/snow -tile 16 5 snow/snow -tile 18 5 snow/snow -tile 19 5 tiles/tube-vertical -tile 0 6 snow/snow -tile 1 6 snow/snow -tile 2 6 snow/snow -tile 3 6 snow/snow -tile 5 6 snow/snow -tile 6 6 snow/snow -tile 7 6 snow/snow -tile 8 6 snow/snow -tile 9 6 snow/snow -tile 10 6 snow/snow -tile 11 6 snow/snow -tile 12 6 snow/snow -tile 14 6 snow/snow -tile 16 6 snow/snow -tile 18 6 snow/snow -tile 19 6 tiles/tube-vertical -tile 12 7 snow/snow -tile 14 7 snow/snow -tile 16 7 snow/snow -tile 19 7 tiles/tube-vertical -tile 0 8 snow/snow -tile 1 8 snow/snow -tile 2 8 snow/snow -tile 3 8 snow/snow -tile 5 8 snow/snow -tile 6 8 snow/snow -tile 7 8 snow/snow -tile 9 8 snow/snow -tile 10 8 snow/snow -tile 12 8 snow/snow -tile 14 8 snow/snow -tile 16 8 snow/snow -tile 19 8 tiles/tube-vertical -tile 0 9 snow/snow -tile 1 9 snow/snow -tile 2 9 snow/snow -tile 3 9 snow/snow -tile 5 9 snow/snow -tile 6 9 snow/snow -tile 7 9 snow/snow -tile 8 9 snow/snow -tile 9 9 snow/snow -tile 10 9 snow/snow -tile 12 9 snow/snow -tile 14 9 snow/snow -tile 16 9 snow/snow -tile 19 9 tiles/tube-vertical -tile 10 10 snow/snow -tile 12 10 snow/snow -tile 14 10 snow/snow -tile 19 10 tiles/tube-vertical -tile 0 11 snow/snow -tile 1 11 snow/snow -tile 2 11 snow/snow -tile 3 11 snow/snow -tile 4 11 snow/snow -tile 5 11 snow/snow -tile 6 11 snow/snow -tile 8 11 snow/snow -tile 10 11 snow/snow -tile 12 11 snow/snow -tile 14 11 snow/snow -tile 19 11 tiles/tube-vertical -tile 0 12 snow/snow -tile 1 12 snow/snow -tile 2 12 snow/snow -tile 3 12 snow/snow -tile 4 12 snow/snow -tile 5 12 snow/snow -tile 6 12 snow/snow -tile 7 12 snow/snow -tile 8 12 snow/snow -tile 10 12 snow/snow -tile 12 12 snow/snow -tile 14 12 snow/snow -tile 19 12 tiles/tube-vertical -tile 19 13 tiles/tube-vertical -tile 19 14 tiles/tube-left-up -tile 0 15 snow/snow -tile 1 15 snow/snow -tile 2 15 snow/snow -tile 3 15 snow/snow -tile 4 15 snow/snow -tile 5 15 snow/snow -tile 6 15 snow/snow -tile 7 15 snow/snow -tile 8 15 snow/snow -tile 9 15 snow/snow -tile 10 15 snow/snow -tile 11 15 snow/snow -tile 12 15 snow/snow -tile 13 15 snow/snow -tile 14 15 snow/snow -tile 15 15 snow/snow -tile 16 15 snow/snow -tile 17 15 snow/snow -tile 18 15 snow/snow -tile 19 15 snow/snow -tile 0 16 snow/snow -tile 1 16 snow/snow -tile 2 16 snow/snow -tile 3 16 snow/snow -tile 4 16 snow/snow -tile 5 16 snow/snow -tile 6 16 snow/snow -tile 7 16 snow/snow -tile 8 16 snow/snow -tile 9 16 snow/snow -tile 10 16 snow/snow -tile 11 16 snow/snow -tile 12 16 snow/snow -tile 13 16 snow/snow -tile 14 16 snow/snow -tile 15 16 snow/snow -tile 16 16 snow/snow -tile 17 16 snow/snow -tile 18 16 snow/snow -tile 19 16 snow/snow -tile 0 17 snow/snow -tile 1 17 snow/snow -tile 2 17 snow/snow -tile 3 17 snow/snow -tile 4 17 snow/snow -tile 5 17 snow/snow -tile 6 17 snow/snow -tile 7 17 snow/snow -tile 8 17 snow/snow -tile 9 17 snow/snow -tile 10 17 snow/snow -tile 11 17 snow/snow -tile 12 17 snow/snow -tile 13 17 snow/snow -tile 14 17 snow/snow -tile 15 17 snow/snow -tile 16 17 snow/snow -tile 17 17 snow/snow -tile 18 17 snow/snow -tile 19 17 snow/snow - -sprite 0 14 decoration snow/snowtop 32 48 8 -sprite 1 14 decoration snow/snowtop 32 48 8 -sprite 2 14 decoration snow/snowtop 32 48 8 -sprite 3 14 decoration snow/snowtop 32 48 8 -sprite 4 14 decoration snow/snowtop 32 48 8 -sprite 5 14 decoration snow/snowtop 32 48 8 -sprite 6 14 decoration snow/snowtop 32 48 8 -sprite 7 14 decoration snow/snowtop 32 48 8 -sprite 8 14 decoration snow/snowtop 32 48 8 -sprite 9 14 decoration snow/snowtop 32 48 8 -sprite 10 14 decoration snow/snowtop 32 48 8 -sprite 11 14 decoration snow/snowtop 32 48 8 -sprite 12 14 decoration snow/snowtop 32 48 8 -sprite 13 14 decoration snow/snowtop 32 48 8 -sprite 14 14 decoration snow/snowtop 32 48 8 -sprite 15 14 decoration snow/snowtop 32 48 8 -sprite 16 10 decoration snow/i1 32 32 8 -sprite 16 14 decoration snow/snowtop 32 48 8 -sprite 17 14 decoration snow/snowtop 32 48 8 -sprite 18 7 decoration snow/i1 32 32 8 -sprite 9 14 fire -sprite 11 14 fire -sprite 9 0 ice -sprite 9 1 ice -sprite 9 2 ice -sprite 16 14 player left -sprite 5 4 stationary-enemy up sprites/spikes samples/spikes 8 -sprite 5 7 stationary-enemy up sprites/spikes samples/spikes 8 -sprite 5 10 stationary-enemy up sprites/spikes samples/spikes 8 -sprite 10 14 stationary-enemy up sprites/spikes samples/spikes 6 -sprite 0 2 tube right 5 -sprite 0 4 tube right 3 -sprite 0 7 tube right 2 -sprite 0 10 tube right 1 -sprite 1 1 tube down 1 -sprite 2 1 tube down 2 -sprite 3 1 tube down 3 -sprite 14 1 tube down 5 -sprite 18 14 tube left 4 -sprite 19 3 tube up 4 diff -Nru magicor-1.1/data/levels/snow/snow-12.lvl magicor-1.0/data/levels/snow/snow-12.lvl --- magicor-1.1/data/levels/snow/snow-12.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-12.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,157 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow-12 -credits wagner frederic -description -hint - -background snow/ice1 -music snow/ice2 -shadows 1 - -tile 0 4 snow/snow -tile 1 4 snow/snow -tile 3 4 snow/snow -tile 4 4 snow/snow -tile 5 4 snow/snow -tile 6 4 snow/snow -tile 7 4 snow/snow -tile 8 4 snow/snow -tile 9 4 snow/snow -tile 11 4 snow/snow -tile 12 4 snow/snow -tile 13 4 snow/snow -tile 14 4 snow/snow -tile 15 4 snow/snow -tile 16 4 snow/snow -tile 17 4 snow/snow -tile 19 4 snow/snow -tile 0 7 snow/snow -tile 1 7 snow/snow -tile 2 7 snow/snow -tile 3 7 snow/snow -tile 4 7 snow/snow -tile 5 7 snow/snow -tile 6 7 snow/snow -tile 7 7 snow/snow -tile 9 7 snow/snow -tile 10 7 snow/snow -tile 12 7 snow/snow -tile 13 7 snow/snow -tile 14 7 snow/snow -tile 15 7 snow/snow -tile 16 7 snow/snow -tile 17 7 snow/snow -tile 18 7 snow/snow -tile 19 7 snow/snow -tile 1 8 tiles/tube-vertical -tile 18 8 tiles/tube-vertical -tile 0 9 tiles/tube-right-down -tile 1 9 tiles/tube-left-up -tile 18 9 tiles/tube-right-up -tile 19 9 tiles/tube-left-down -tile 0 10 tiles/tube-vertical -tile 19 10 tiles/tube-vertical -tile 0 11 tiles/tube-vertical -tile 2 11 snow/snow -tile 4 11 snow/snow -tile 6 11 snow/snow -tile 8 11 snow/snow -tile 10 11 snow/snow -tile 12 11 snow/snow -tile 13 11 snow/snow -tile 14 11 snow/snow -tile 16 11 snow/snow -tile 18 11 snow/snow -tile 19 11 tiles/tube-vertical -tile 0 12 tiles/tube-vertical -tile 9 12 tiles/tube-vertical -tile 19 12 tiles/tube-vertical -tile 0 13 tiles/tube-vertical -tile 2 13 snow/snow -tile 4 13 snow/snow -tile 6 13 snow/snow -tile 8 13 snow/snow -tile 9 13 tiles/tube-vertical -tile 10 13 snow/snow -tile 12 13 snow/snow -tile 14 13 snow/snow -tile 16 13 snow/snow -tile 18 13 snow/snow -tile 19 13 tiles/tube-vertical -tile 0 14 tiles/tube-vertical -tile 9 14 tiles/tube-vertical -tile 19 14 tiles/tube-vertical -tile 0 17 snow/snow -tile 1 17 snow/snow -tile 2 17 snow/snow -tile 3 17 snow/snow -tile 4 17 snow/snow -tile 5 17 snow/snow -tile 6 17 snow/snow -tile 7 17 snow/snow -tile 8 17 snow/snow -tile 9 17 snow/snow -tile 10 17 snow/snow -tile 11 17 snow/snow -tile 12 17 snow/snow -tile 13 17 snow/snow -tile 14 17 snow/snow -tile 15 17 snow/snow -tile 16 17 snow/snow -tile 17 17 snow/snow -tile 18 17 snow/snow -tile 19 17 snow/snow - -sprite 0 3 decoration snow/snowtop 32 48 8 -sprite 0 8 decoration snow/i1 32 32 8 -sprite 1 3 decoration snow/snowtop 32 48 8 -sprite 3 3 decoration snow/snowtop 32 48 8 -sprite 4 3 decoration snow/snowtop 32 48 8 -sprite 5 3 decoration snow/snowtop 32 48 8 -sprite 6 3 decoration snow/snowtop 32 48 8 -sprite 7 3 decoration snow/snowtop 32 48 8 -sprite 8 3 decoration snow/snowtop 32 48 8 -sprite 9 3 decoration snow/snowtop 32 48 8 -sprite 11 3 decoration snow/snowtop 32 48 8 -sprite 12 3 decoration snow/snowtop 32 48 8 -sprite 13 3 decoration snow/snowtop 32 48 8 -sprite 14 3 decoration snow/snowtop 32 48 8 -sprite 15 1 decoration snow/snowman 64 96 8 -sprite 15 3 decoration snow/snowtop 32 48 8 -sprite 16 3 decoration snow/snowtop 32 48 8 -sprite 17 3 decoration snow/snowtop 32 48 8 -sprite 17 8 decoration snow/i1 32 32 8 -sprite 19 3 decoration snow/snowtop 32 48 8 -sprite 19 8 decoration snow/i1 32 32 8 -sprite 4 5 fire -sprite 10 9 fire -sprite 15 5 fire -sprite 1 11 ice connect -sprite 3 11 ice connect -sprite 4 6 ice -sprite 5 11 ice connect -sprite 7 11 ice connect -sprite 10 10 ice -sprite 11 11 ice connect -sprite 13 16 ice -sprite 15 6 ice -sprite 15 11 ice connect -sprite 17 11 ice connect -sprite 9 3 player right -sprite 0 6 stationary-enemy up sprites/spikes samples/spikes 10 -sprite 1 16 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 3 16 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 5 6 stationary-enemy up sprites/spikes samples/spikes 8 -sprite 5 16 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 7 16 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 11 16 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 14 6 stationary-enemy up sprites/spikes samples/spikes 8 -sprite 15 16 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 17 16 stationary-enemy up sprites/spikes samples/spikes 16 -sprite 19 6 stationary-enemy up sprites/spikes samples/spikes 10 -sprite 0 15 tube down 1 -sprite 1 7 tube up 1 -sprite 9 11 tube up 3 -sprite 9 15 tube down 3 -sprite 18 7 tube up 2 -sprite 19 15 tube down 2 diff -Nru magicor-1.1/data/levels/snow/snow-13.lvl magicor-1.0/data/levels/snow/snow-13.lvl --- magicor-1.1/data/levels/snow/snow-13.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-13.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,150 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow-13 -credits wagner frederic -description Egyptian themed level 12. -hint - -background snow/ice1 -music snow/ice -shadows 1 - -tile 3 0 snow/snow -tile 15 0 snow/snow -tile 3 1 snow/snow -tile 15 1 snow/snow -tile 2 2 snow/snow -tile 16 2 snow/snow -tile 2 3 snow/snow -tile 5 3 snow/snow -tile 6 3 snow/snow -tile 7 3 snow/snow -tile 8 3 snow/snow -tile 9 3 snow/snow -tile 10 3 snow/snow -tile 11 3 snow/snow -tile 12 3 snow/snow -tile 13 3 snow/snow -tile 16 3 snow/snow -tile 8 4 snow/snow -tile 9 4 snow/snow -tile 10 4 snow/snow -tile 11 4 snow/snow -tile 16 4 snow/snow -tile 17 4 snow/snow -tile 18 4 snow/snow -tile 19 4 snow/snow -tile 3 5 snow/snow -tile 4 5 snow/snow -tile 5 5 snow/snow -tile 6 5 snow/snow -tile 8 5 snow/snow -tile 9 5 snow/snow -tile 10 5 snow/snow -tile 11 5 snow/snow -tile 18 5 snow/snow -tile 19 5 snow/snow -tile 3 6 snow/snow -tile 8 6 snow/snow -tile 11 6 snow/snow -tile 3 7 snow/snow -tile 8 7 snow/snow -tile 11 7 snow/snow -tile 12 7 snow/snow -tile 13 7 snow/snow -tile 14 7 snow/snow -tile 18 7 snow/snow -tile 3 8 snow/snow -tile 5 8 snow/snow -tile 8 8 snow/snow -tile 11 8 snow/snow -tile 14 8 snow/snow -tile 15 8 snow/snow -tile 18 8 snow/snow -tile 3 9 snow/snow -tile 15 9 snow/snow -tile 18 9 snow/snow -tile 3 10 snow/snow -tile 7 10 snow/snow -tile 8 10 snow/snow -tile 9 10 snow/snow -tile 10 10 snow/snow -tile 11 10 snow/snow -tile 12 10 snow/snow -tile 15 10 snow/snow -tile 18 10 snow/snow -tile 3 11 snow/snow -tile 7 11 snow/snow -tile 18 11 snow/snow -tile 3 12 snow/snow -tile 4 12 snow/snow -tile 5 12 snow/snow -tile 6 12 snow/snow -tile 7 12 snow/snow -tile 8 12 snow/snow -tile 9 12 snow/snow -tile 10 12 snow/snow -tile 11 12 snow/snow -tile 12 12 snow/snow -tile 13 12 snow/snow -tile 15 12 snow/snow -tile 16 12 snow/snow -tile 17 12 snow/snow -tile 18 12 snow/snow -tile 14 13 snow/snow -tile 15 13 snow/snow -tile 0 17 snow/snow -tile 1 17 snow/snow -tile 2 17 snow/snow -tile 3 17 snow/snow -tile 4 17 snow/snow -tile 5 17 snow/snow -tile 6 17 snow/snow -tile 7 17 snow/snow -tile 8 17 snow/snow -tile 9 17 snow/snow -tile 10 17 snow/snow -tile 11 17 snow/snow -tile 12 17 snow/snow -tile 13 17 snow/snow -tile 14 17 snow/snow -tile 15 17 snow/snow -tile 16 17 snow/snow -tile 17 17 snow/snow -tile 18 17 snow/snow -tile 19 17 snow/snow - -sprite 0 16 decoration snow/snowtop 32 48 8 -sprite 1 14 decoration snow/snowman 64 96 8 -sprite 1 16 decoration snow/snowtop 32 48 8 -sprite 2 16 decoration snow/snowtop 32 48 8 -sprite 3 13 decoration snow/i1 32 32 8 -sprite 3 16 decoration snow/snowtop 32 48 8 -sprite 4 16 decoration snow/snowtop 32 48 8 -sprite 5 16 decoration snow/snowtop 32 48 8 -sprite 6 16 decoration snow/snowtop 32 48 8 -sprite 7 16 decoration snow/snowtop 32 48 8 -sprite 8 16 decoration snow/snowtop 32 48 8 -sprite 9 16 decoration snow/snowtop 32 48 8 -sprite 10 16 decoration snow/snowtop 32 48 8 -sprite 11 16 decoration snow/snowtop 32 48 8 -sprite 12 16 decoration snow/snowtop 32 48 8 -sprite 13 16 decoration snow/snowtop 32 48 8 -sprite 14 16 decoration snow/snowtop 32 48 8 -sprite 15 14 decoration snow/i1 32 32 8 -sprite 15 16 decoration snow/snowtop 32 48 8 -sprite 16 16 decoration snow/snowtop 32 48 8 -sprite 17 16 decoration snow/snowtop 32 48 8 -sprite 18 16 decoration snow/snowtop 32 48 8 -sprite 19 16 decoration snow/snowtop 32 48 8 -sprite 6 11 fire -sprite 17 11 fire -sprite 10 0 ice -sprite 10 9 ice -sprite 18 3 ice -sprite 19 2 ice -sprite 19 3 ice -sprite 10 2 player right -sprite 5 9 stationary-enemy down sprites/spikes samples/spikes 16 -sprite 6 10 stationary-enemy left sprites/spikes samples/spikes 16 -sprite 8 9 stationary-enemy down sprites/spikes samples/spikes 16 -sprite 11 9 stationary-enemy down sprites/spikes samples/spikes 16 \ No newline at end of file diff -Nru magicor-1.1/data/levels/snow/snow-14.lvl magicor-1.0/data/levels/snow/snow-14.lvl --- magicor-1.1/data/levels/snow/snow-14.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-14.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,187 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow-14 -credits wagner frederic -description -hint - -background snow/ice3 -music snow/ice5 -shadows 1 - -tile 0 2 snow/snow -tile 1 2 snow/snow -tile 2 2 snow/snow -tile 3 2 snow/snow -tile 4 2 snow/snow -tile 5 2 snow/snow -tile 7 2 snow/snow -tile 8 2 snow/snow -tile 9 2 snow/snow -tile 10 2 snow/snow -tile 12 2 snow/snow -tile 13 2 snow/snow -tile 14 2 snow/snow -tile 15 2 snow/snow -tile 16 2 snow/snow -tile 17 2 snow/snow -tile 18 2 snow/snow -tile 19 2 snow/snow -tile 0 3 snow/snow -tile 8 3 snow/snow -tile 9 3 snow/snow -tile 0 4 snow/snow -tile 4 4 snow/snow -tile 5 4 snow/snow -tile 6 4 snow/snow -tile 7 4 snow/snow -tile 8 4 snow/snow -tile 9 4 snow/snow -tile 11 4 snow/snow -tile 12 4 snow/snow -tile 0 5 snow/snow -tile 8 5 snow/snow -tile 9 5 snow/snow -tile 11 5 snow/snow -tile 12 5 snow/snow -tile 0 6 snow/snow -tile 4 6 snow/snow -tile 8 6 snow/snow -tile 9 6 snow/snow -tile 11 6 snow/snow -tile 12 6 snow/snow -tile 14 6 snow/snow -tile 15 6 snow/snow -tile 0 7 snow/snow -tile 4 7 snow/snow -tile 5 7 snow/snow -tile 8 7 snow/snow -tile 9 7 snow/snow -tile 11 7 snow/snow -tile 12 7 snow/snow -tile 14 7 snow/snow -tile 15 7 snow/snow -tile 0 8 snow/snow -tile 4 8 snow/snow -tile 5 8 snow/snow -tile 6 8 snow/snow -tile 8 8 snow/snow -tile 9 8 snow/snow -tile 11 8 snow/snow -tile 12 8 snow/snow -tile 14 8 snow/snow -tile 15 8 snow/snow -tile 17 8 snow/snow -tile 18 8 snow/snow -tile 0 9 snow/snow -tile 1 9 snow/snow -tile 2 9 snow/snow -tile 8 9 snow/snow -tile 9 9 snow/snow -tile 11 9 snow/snow -tile 12 9 snow/snow -tile 14 9 snow/snow -tile 15 9 snow/snow -tile 17 9 snow/snow -tile 18 9 snow/snow -tile 0 10 snow/snow -tile 0 11 snow/snow -tile 8 11 snow/snow -tile 9 11 snow/snow -tile 0 12 snow/snow -tile 5 12 snow/snow -tile 6 12 snow/snow -tile 8 12 snow/snow -tile 9 12 snow/snow -tile 11 12 snow/snow -tile 12 12 snow/snow -tile 0 13 snow/snow -tile 5 13 snow/snow -tile 6 13 snow/snow -tile 8 13 snow/snow -tile 9 13 snow/snow -tile 11 13 snow/snow -tile 12 13 snow/snow -tile 0 14 snow/snow -tile 2 14 snow/snow -tile 3 14 snow/snow -tile 5 14 snow/snow -tile 6 14 snow/snow -tile 8 14 snow/snow -tile 9 14 snow/snow -tile 11 14 snow/snow -tile 12 14 snow/snow -tile 14 14 snow/snow -tile 15 14 snow/snow -tile 0 15 snow/snow -tile 2 15 snow/snow -tile 3 15 snow/snow -tile 5 15 snow/snow -tile 6 15 snow/snow -tile 8 15 snow/snow -tile 9 15 snow/snow -tile 11 15 snow/snow -tile 12 15 snow/snow -tile 14 15 snow/snow -tile 15 15 snow/snow -tile 0 16 snow/snow -tile 2 16 snow/snow -tile 3 16 snow/snow -tile 5 16 snow/snow -tile 6 16 snow/snow -tile 7 16 snow/snow -tile 8 16 snow/snow -tile 9 16 snow/snow -tile 10 16 snow/snow -tile 11 16 snow/snow -tile 12 16 snow/snow -tile 14 16 snow/snow -tile 15 16 snow/snow -tile 0 17 snow/snow -tile 1 17 snow/snow -tile 2 17 snow/snow -tile 3 17 snow/snow -tile 4 17 snow/snow -tile 5 17 snow/snow -tile 6 17 snow/snow -tile 7 17 snow/snow -tile 8 17 snow/snow -tile 9 17 snow/snow -tile 10 17 snow/snow -tile 11 17 snow/snow -tile 12 17 snow/snow -tile 13 17 snow/snow -tile 14 17 snow/snow -tile 15 17 snow/snow -tile 16 17 snow/snow -tile 17 17 snow/snow -tile 18 17 snow/snow -tile 19 17 snow/snow - -sprite 0 1 decoration snow/snowtop 32 48 8 -sprite 1 1 decoration snow/snowtop 32 48 8 -sprite 1 6 decoration snow/snowman 64 96 8 -sprite 2 1 decoration snow/snowtop 32 48 8 -sprite 3 1 decoration snow/snowtop 32 48 8 -sprite 4 1 decoration snow/snowtop 32 48 8 -sprite 5 1 decoration snow/snowtop 32 48 8 -sprite 6 5 decoration snow/i1 32 32 8 -sprite 7 1 decoration snow/snowtop 32 48 8 -sprite 8 1 decoration snow/snowtop 32 48 8 -sprite 9 1 decoration snow/snowtop 32 48 8 -sprite 10 1 decoration snow/snowtop 32 48 8 -sprite 12 1 decoration snow/snowtop 32 48 8 -sprite 13 1 decoration snow/snowtop 32 48 8 -sprite 14 1 decoration snow/snowtop 32 48 8 -sprite 15 1 decoration snow/snowtop 32 48 8 -sprite 16 1 decoration snow/snowtop 32 48 8 -sprite 17 1 decoration snow/snowtop 32 48 8 -sprite 18 1 decoration snow/snowtop 32 48 8 -sprite 19 1 decoration snow/snowtop 32 48 8 -sprite 2 13 fire -sprite 6 11 fire -sprite 8 10 fire -sprite 12 11 fire -sprite 15 13 fire -sprite 19 16 fire -sprite 8 1 player right -sprite 10 11 stationary-enemy right sprites/spikes samples/spikes 32 diff -Nru magicor-1.1/data/levels/snow/snow-15.lvl magicor-1.0/data/levels/snow/snow-15.lvl --- magicor-1.1/data/levels/snow/snow-15.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/snow/snow-15.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,188 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title snow-15 -credits wagner frederic -description -hint - -background snow/ice3 -music snow/ice -shadows 1 - -tile 0 2 snow/snow -tile 1 2 snow/snow -tile 2 2 snow/snow -tile 3 2 snow/snow -tile 4 2 snow/snow -tile 5 2 snow/snow -tile 7 2 snow/snow -tile 8 2 snow/snow -tile 9 2 snow/snow -tile 10 2 snow/snow -tile 12 2 snow/snow -tile 13 2 snow/snow -tile 14 2 snow/snow -tile 15 2 snow/snow -tile 16 2 snow/snow -tile 17 2 snow/snow -tile 18 2 snow/snow -tile 19 2 snow/snow -tile 0 3 snow/snow -tile 8 3 snow/snow -tile 9 3 snow/snow -tile 0 4 snow/snow -tile 3 4 snow/snow -tile 4 4 snow/snow -tile 5 4 snow/snow -tile 6 4 snow/snow -tile 7 4 snow/snow -tile 8 4 snow/snow -tile 9 4 snow/snow -tile 11 4 snow/snow -tile 12 4 snow/snow -tile 0 5 snow/snow -tile 8 5 snow/snow -tile 9 5 snow/snow -tile 11 5 snow/snow -tile 12 5 snow/snow -tile 0 6 snow/snow -tile 4 6 snow/snow -tile 8 6 snow/snow -tile 9 6 snow/snow -tile 11 6 snow/snow -tile 12 6 snow/snow -tile 14 6 snow/snow -tile 15 6 snow/snow -tile 0 7 snow/snow -tile 4 7 snow/snow -tile 5 7 snow/snow -tile 8 7 snow/snow -tile 9 7 snow/snow -tile 11 7 snow/snow -tile 12 7 snow/snow -tile 14 7 snow/snow -tile 15 7 snow/snow -tile 0 8 snow/snow -tile 4 8 snow/snow -tile 5 8 snow/snow -tile 6 8 snow/snow -tile 8 8 snow/snow -tile 9 8 snow/snow -tile 11 8 snow/snow -tile 12 8 snow/snow -tile 14 8 snow/snow -tile 15 8 snow/snow -tile 17 8 snow/snow -tile 18 8 snow/snow -tile 0 9 snow/snow -tile 1 9 snow/snow -tile 2 9 snow/snow -tile 8 9 snow/snow -tile 9 9 snow/snow -tile 11 9 snow/snow -tile 12 9 snow/snow -tile 14 9 snow/snow -tile 15 9 snow/snow -tile 17 9 snow/snow -tile 18 9 snow/snow -tile 0 10 snow/snow -tile 0 11 snow/snow -tile 8 11 snow/snow -tile 9 11 snow/snow -tile 0 12 snow/snow -tile 5 12 snow/snow -tile 6 12 snow/snow -tile 8 12 snow/snow -tile 9 12 snow/snow -tile 11 12 snow/snow -tile 12 12 snow/snow -tile 0 13 snow/snow -tile 5 13 snow/snow -tile 6 13 snow/snow -tile 8 13 snow/snow -tile 9 13 snow/snow -tile 11 13 snow/snow -tile 12 13 snow/snow -tile 0 14 snow/snow -tile 2 14 snow/snow -tile 3 14 snow/snow -tile 5 14 snow/snow -tile 6 14 snow/snow -tile 8 14 snow/snow -tile 9 14 snow/snow -tile 11 14 snow/snow -tile 12 14 snow/snow -tile 14 14 snow/snow -tile 15 14 snow/snow -tile 0 15 snow/snow -tile 2 15 snow/snow -tile 3 15 snow/snow -tile 5 15 snow/snow -tile 6 15 snow/snow -tile 8 15 snow/snow -tile 9 15 snow/snow -tile 11 15 snow/snow -tile 12 15 snow/snow -tile 14 15 snow/snow -tile 15 15 snow/snow -tile 0 16 snow/snow -tile 2 16 snow/snow -tile 3 16 snow/snow -tile 5 16 snow/snow -tile 6 16 snow/snow -tile 7 16 snow/snow -tile 8 16 snow/snow -tile 9 16 snow/snow -tile 10 16 snow/snow -tile 11 16 snow/snow -tile 12 16 snow/snow -tile 14 16 snow/snow -tile 15 16 snow/snow -tile 0 17 snow/snow -tile 1 17 snow/snow -tile 2 17 snow/snow -tile 3 17 snow/snow -tile 4 17 snow/snow -tile 5 17 snow/snow -tile 6 17 snow/snow -tile 7 17 snow/snow -tile 8 17 snow/snow -tile 9 17 snow/snow -tile 10 17 snow/snow -tile 11 17 snow/snow -tile 12 17 snow/snow -tile 13 17 snow/snow -tile 14 17 snow/snow -tile 15 17 snow/snow -tile 16 17 snow/snow -tile 17 17 snow/snow -tile 18 17 snow/snow -tile 19 17 snow/snow - -sprite 0 1 decoration snow/snowtop 32 48 8 -sprite 1 1 decoration snow/snowtop 32 48 8 -sprite 1 6 decoration snow/snowman 64 96 8 -sprite 2 1 decoration snow/snowtop 32 48 8 -sprite 3 1 decoration snow/snowtop 32 48 8 -sprite 4 1 decoration snow/snowtop 32 48 8 -sprite 5 1 decoration snow/snowtop 32 48 8 -sprite 6 5 decoration snow/i1 32 32 8 -sprite 7 1 decoration snow/snowtop 32 48 8 -sprite 8 1 decoration snow/snowtop 32 48 8 -sprite 9 1 decoration snow/snowtop 32 48 8 -sprite 10 1 decoration snow/snowtop 32 48 8 -sprite 12 1 decoration snow/snowtop 32 48 8 -sprite 13 1 decoration snow/snowtop 32 48 8 -sprite 14 1 decoration snow/snowtop 32 48 8 -sprite 15 1 decoration snow/snowtop 32 48 8 -sprite 16 1 decoration snow/snowtop 32 48 8 -sprite 17 1 decoration snow/snowtop 32 48 8 -sprite 18 1 decoration snow/snowtop 32 48 8 -sprite 19 1 decoration snow/snowtop 32 48 8 -sprite 2 13 fire -sprite 6 11 fire -sprite 8 10 fire -sprite 12 11 fire -sprite 15 13 fire -sprite 19 16 fire -sprite 8 1 player right -sprite 10 11 stationary-enemy right sprites/spikes samples/spikes 32 Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/snow/snowman.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/snow/snowman.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/snow/snow.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/snow/snow.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/snow/snowtop.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/snow/snowtop.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/_test/blob-die.wav and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/_test/blob-die.wav differ diff -Nru magicor-1.1/data/levels/_test/brushes magicor-1.0/data/levels/_test/brushes --- magicor-1.1/data/levels/_test/brushes 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/_test/brushes 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -walking-enemy _test/walking_blob _test/blob-die 1 diff -Nru magicor-1.1/data/levels/_test/level-05.lvl magicor-1.0/data/levels/_test/level-05.lvl --- magicor-1.1/data/levels/_test/level-05.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/_test/level-05.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title 005 fragment bug -credits Claudio Canepa -description -hint - -background -music -shadows 1 - -tile 13 10 forest/tile-wood -tile 13 11 forest/tile-wood -tile 15 11 forest/tile-wood -tile 13 12 forest/tile-wood -tile 15 12 forest/tile-wood -tile 17 12 forest/tile-wood -tile 13 13 forest/tile-wood -tile 14 13 forest/tile-wood -tile 15 13 forest/tile-wood -tile 16 13 forest/tile-wood -tile 17 13 forest/tile-wood -tile 18 13 forest/tile-wood -tile 14 14 forest/tile-wood -tile 15 14 forest/tile-wood -tile 16 14 forest/tile-wood -tile 17 14 forest/tile-wood -tile 18 14 forest/tile-wood -tile 19 14 forest/tile-wood - -sprite 19 13 fire -sprite 13 9 ice connect-right -sprite 14 9 ice connect -sprite 15 9 ice connect-left -sprite 13 8 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/_test/level-07a.lvl magicor-1.0/data/levels/_test/level-07a.lvl --- magicor-1.1/data/levels/_test/level-07a.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/_test/level-07a.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,122 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title 007a ball demo 1 -credits cc -description -hint - -background -music -shadows 1 - -tile 0 1 tiles/stone -tile 1 1 tiles/stone -tile 2 1 tiles/stone -tile 3 1 tiles/stone -tile 4 1 tiles/stone -tile 5 1 tiles/stone -tile 6 1 tiles/stone -tile 7 1 tiles/stone -tile 8 1 tiles/stone -tile 9 1 tiles/stone -tile 10 1 tiles/stone -tile 11 1 tiles/stone -tile 12 1 tiles/stone -tile 13 1 tiles/stone -tile 14 1 tiles/stone -tile 15 1 tiles/stone -tile 16 1 tiles/stone -tile 17 1 tiles/stone -tile 18 1 tiles/stone -tile 0 2 tiles/stone -tile 4 2 tiles/stone -tile 14 2 tiles/stone -tile 18 2 tiles/stone -tile 0 3 tiles/stone -tile 4 3 tiles/stone -tile 14 3 tiles/stone -tile 18 3 tiles/stone -tile 0 4 tiles/stone -tile 4 4 tiles/stone -tile 14 4 tiles/stone -tile 18 4 tiles/stone -tile 0 5 tiles/stone -tile 4 5 tiles/stone -tile 5 5 tiles/stone -tile 6 5 tiles/stone -tile 7 5 tiles/stone -tile 8 5 tiles/stone -tile 9 5 tiles/stone -tile 10 5 tiles/stone -tile 11 5 tiles/stone -tile 12 5 tiles/stone -tile 13 5 tiles/stone -tile 14 5 tiles/stone -tile 18 5 tiles/stone -tile 0 6 tiles/stone -tile 4 6 tiles/stone -tile 18 6 tiles/stone -tile 0 7 tiles/stone -tile 4 7 tiles/stone -tile 6 7 tiles/stone -tile 7 7 tiles/stone -tile 8 7 tiles/stone -tile 9 7 tiles/stone -tile 10 7 tiles/stone -tile 11 7 tiles/stone -tile 12 7 tiles/stone -tile 13 7 tiles/stone -tile 14 7 tiles/stone -tile 18 7 tiles/stone -tile 0 8 tiles/stone -tile 4 8 tiles/stone -tile 18 8 tiles/stone -tile 0 9 tiles/stone -tile 4 9 tiles/stone -tile 18 9 tiles/stone -tile 0 10 tiles/stone -tile 4 10 tiles/stone -tile 18 10 tiles/stone -tile 0 11 tiles/stone -tile 4 11 tiles/stone -tile 18 11 tiles/stone -tile 0 12 tiles/stone -tile 4 12 tiles/stone -tile 18 12 tiles/stone -tile 0 13 tiles/stone -tile 1 13 tiles/stone -tile 2 13 tiles/stone -tile 3 13 tiles/stone -tile 4 13 tiles/stone -tile 5 13 tiles/stone -tile 6 13 tiles/stone -tile 7 13 tiles/stone -tile 8 13 tiles/stone -tile 9 13 tiles/stone -tile 10 13 tiles/stone -tile 11 13 tiles/stone -tile 12 13 tiles/stone -tile 13 13 tiles/stone -tile 14 13 tiles/stone -tile 15 13 tiles/stone -tile 16 13 tiles/stone -tile 17 13 tiles/stone -tile 18 13 tiles/stone -tile 5 15 tiles/stone -tile 6 15 tiles/stone -tile 7 15 tiles/stone -tile 8 15 tiles/stone -tile 8 17 tiles/stone -tile 9 17 tiles/stone -tile 10 17 tiles/stone - -sprite 1 7 ball 0 -1 0.25 -sprite 2 9 ball 0 -1 2 -sprite 3 11 ball 0 -1 5 -sprite 7 6 ball 1 1 5 -sprite 9 6 ball 1 1 2 -sprite 6 6 ball 1 1 0.25 -sprite 8 4 ball 1 0 0.25 -sprite 9 3 ball 1 0 2 -sprite 10 2 ball 1 0 5 -sprite 10 16 fire -sprite 10 6 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/_test/level-07d.lvl magicor-1.0/data/levels/_test/level-07d.lvl --- magicor-1.1/data/levels/_test/level-07d.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/_test/level-07d.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,81 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title 007d touchs -credits cc -description -hint - -background backgrounds/stone -music -shadows 1 - -tile 16 7 tiles/stone -tile 17 7 tiles/stone -tile 18 7 tiles/stone -tile 16 8 tiles/stone -tile 18 8 tiles/stone -tile 3 9 tiles/stone -tile 4 9 tiles/stone -tile 5 9 tiles/stone -tile 6 9 tiles/stone -tile 7 9 tiles/stone -tile 8 9 tiles/stone -tile 9 9 tiles/stone -tile 10 9 tiles/stone -tile 11 9 tiles/stone -tile 12 9 tiles/stone -tile 13 9 tiles/stone -tile 14 9 tiles/stone -tile 16 9 tiles/stone -tile 18 9 tiles/stone -tile 16 10 tiles/stone -tile 18 10 tiles/stone -tile 3 11 tiles/stone -tile 4 11 tiles/stone -tile 5 11 tiles/stone -tile 6 11 tiles/stone -tile 7 11 tiles/stone -tile 8 11 tiles/stone -tile 9 11 tiles/stone -tile 10 11 tiles/stone -tile 11 11 tiles/stone -tile 12 11 tiles/stone -tile 13 11 tiles/stone -tile 14 11 tiles/stone -tile 16 11 tiles/stone -tile 18 11 tiles/stone -tile 16 12 tiles/stone -tile 18 12 tiles/stone -tile 3 13 tiles/stone -tile 4 13 tiles/stone -tile 5 13 tiles/stone -tile 6 13 tiles/stone -tile 7 13 tiles/stone -tile 8 13 tiles/stone -tile 9 13 tiles/stone -tile 10 13 tiles/stone -tile 11 13 tiles/stone -tile 12 13 tiles/stone -tile 13 13 tiles/stone -tile 14 13 tiles/stone -tile 16 13 tiles/stone -tile 17 13 tiles/stone -tile 18 13 tiles/stone -tile 8 15 tiles/stone - -sprite 6 10 ball 1 0 2 -sprite 7 12 ball 1 1 2 -sprite 8 8 ball 1 0 2 -sprite 17 8 ball 0 1 2 -sprite 8 14 fire -sprite 3 8 ice connect-right -sprite 4 8 ice connect-left -sprite 6 8 ice -sprite 13 8 ice connect-right -sprite 14 8 ice connect-left -sprite 17 12 lava -sprite 5 8 player right -sprite 3 10 tube up -sprite 8 10 fire -sprite 3 12 tube right -sprite 14 10 tube down -sprite 14 12 tube left \ No newline at end of file diff -Nru magicor-1.1/data/levels/_test/level-07e.lvl magicor-1.0/data/levels/_test/level-07e.lvl --- magicor-1.1/data/levels/_test/level-07e.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/_test/level-07e.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title 007e ball h y v -credits cc -description -hint - -background -music -shadows 1 - -tile 3 4 tiles/stone -tile 4 4 tiles/stone -tile 5 4 tiles/stone -tile 6 4 tiles/stone -tile 3 5 tiles/stone -tile 6 5 tiles/stone -tile 7 5 tiles/stone -tile 8 5 tiles/stone -tile 9 5 tiles/stone -tile 10 5 tiles/stone -tile 11 5 tiles/stone -tile 3 6 tiles/stone -tile 3 7 tiles/stone -tile 6 7 tiles/stone -tile 11 7 tiles/stone -tile 3 8 tiles/stone -tile 4 8 tiles/stone -tile 5 8 tiles/stone -tile 6 8 tiles/stone -tile 7 8 tiles/stone -tile 8 8 tiles/stone -tile 9 8 tiles/stone -tile 10 8 tiles/stone -tile 11 8 tiles/stone -tile 12 8 tiles/stone - -sprite 5 5 ball 0 -1 2 -sprite 7 7 ball 1 0 2 -sprite 12 7 fire -sprite 8 7 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/_test/level-07f.lvl magicor-1.0/data/levels/_test/level-07f.lvl --- magicor-1.1/data/levels/_test/level-07f.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/_test/level-07f.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title 007f ball diag -credits cc -description -hint - -background -music -shadows 1 - -tile 6 4 tiles/stone -tile 7 4 tiles/stone -tile 8 4 tiles/stone -tile 9 4 tiles/stone -tile 10 4 tiles/stone -tile 6 5 tiles/stone -tile 10 5 tiles/stone -tile 11 5 tiles/stone -tile 6 6 tiles/stone -tile 8 6 tiles/stone -tile 11 6 tiles/stone -tile 6 7 tiles/stone -tile 10 7 tiles/stone -tile 11 7 tiles/stone -tile 6 8 tiles/stone -tile 7 8 tiles/stone -tile 8 8 tiles/stone -tile 9 8 tiles/stone -tile 10 8 tiles/stone - -sprite 8 7 ball 1 1 2 -sprite 11 4 fire -sprite 8 5 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/_test/level-07g.lvl magicor-1.0/data/levels/_test/level-07g.lvl --- magicor-1.1/data/levels/_test/level-07g.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/_test/level-07g.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,125 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title 007g balls diferent grav -credits cc -description -hint - -background -music -shadows 1 - -tile 1 1 tiles/stone -tile 2 1 tiles/stone -tile 3 1 tiles/stone -tile 4 1 tiles/stone -tile 5 1 tiles/stone -tile 6 1 tiles/stone -tile 7 1 tiles/stone -tile 8 1 tiles/stone -tile 9 1 tiles/stone -tile 10 1 tiles/stone -tile 11 1 tiles/stone -tile 12 1 tiles/stone -tile 13 1 tiles/stone -tile 14 1 tiles/stone -tile 15 1 tiles/stone -tile 16 1 tiles/stone -tile 17 1 tiles/stone -tile 18 1 tiles/stone -tile 1 2 tiles/stone -tile 18 2 tiles/stone -tile 1 3 tiles/stone -tile 2 3 tiles/stone -tile 3 3 tiles/stone -tile 4 3 tiles/stone -tile 5 3 tiles/stone -tile 6 3 tiles/stone -tile 7 3 tiles/stone -tile 8 3 tiles/stone -tile 9 3 tiles/stone -tile 10 3 tiles/stone -tile 11 3 tiles/stone -tile 12 3 tiles/stone -tile 13 3 tiles/stone -tile 14 3 tiles/stone -tile 15 3 tiles/stone -tile 16 3 tiles/stone -tile 17 3 tiles/stone -tile 18 3 tiles/stone -tile 1 4 tiles/stone -tile 8 4 tiles/stone -tile 11 4 tiles/stone -tile 18 4 tiles/stone -tile 1 5 tiles/stone -tile 8 5 tiles/stone -tile 11 5 tiles/stone -tile 18 5 tiles/stone -tile 1 6 tiles/stone -tile 8 6 tiles/stone -tile 11 6 tiles/stone -tile 18 6 tiles/stone -tile 1 7 tiles/stone -tile 8 7 tiles/stone -tile 11 7 tiles/stone -tile 18 7 tiles/stone -tile 1 8 tiles/stone -tile 8 8 tiles/stone -tile 11 8 tiles/stone -tile 18 8 tiles/stone -tile 1 9 tiles/stone -tile 8 9 tiles/stone -tile 11 9 tiles/stone -tile 18 9 tiles/stone -tile 1 10 tiles/stone -tile 8 10 tiles/stone -tile 11 10 tiles/stone -tile 18 10 tiles/stone -tile 1 11 tiles/stone -tile 8 11 tiles/stone -tile 9 11 tiles/stone -tile 10 11 tiles/stone -tile 11 11 tiles/stone -tile 18 11 tiles/stone -tile 1 12 tiles/stone -tile 8 12 tiles/stone -tile 11 12 tiles/stone -tile 18 12 tiles/stone -tile 1 13 tiles/stone -tile 8 13 tiles/stone -tile 11 13 tiles/stone -tile 18 13 tiles/stone -tile 1 14 tiles/stone -tile 8 14 tiles/stone -tile 11 14 tiles/stone -tile 18 14 tiles/stone -tile 1 15 tiles/stone -tile 8 15 tiles/stone -tile 11 15 tiles/stone -tile 18 15 tiles/stone -tile 1 16 tiles/stone -tile 2 16 tiles/stone -tile 3 16 tiles/stone -tile 4 16 tiles/stone -tile 5 16 tiles/stone -tile 6 16 tiles/stone -tile 7 16 tiles/stone -tile 8 16 tiles/stone -tile 11 16 tiles/stone -tile 12 16 tiles/stone -tile 13 16 tiles/stone -tile 14 16 tiles/stone -tile 15 16 tiles/stone -tile 16 16 tiles/stone -tile 17 16 tiles/stone -tile 18 16 tiles/stone - -sprite 2 15 ball 0 1 10 .1 -sprite 3 15 ball 0 1 10 .2 -sprite 4 15 ball 0 1 10 .3 -sprite 5 15 ball 0 1 10 .4 -sprite 6 15 ball 0 1 10 .5 -sprite 7 15 ball 0 1 10 .6 -sprite 12 7 ball 1 1 0.1 .1 -sprite 3 2 ball 1 1 0.5 .1 -sprite 10 10 fire -sprite 17 15 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/_test/level-08.lvl magicor-1.0/data/levels/_test/level-08.lvl --- magicor-1.1/data/levels/_test/level-08.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/_test/level-08.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title 008 tubes bug -credits claudio canepa -description -hint - -background -music -shadows 1 - -tile 1 11 tiles/stone -tile 6 11 tiles/tube-vertical -tile 11 11 tiles/tube-vertical -tile 2 12 tiles/stone -tile 5 12 tiles/stone -tile 6 12 tiles/stone -tile 7 12 tiles/stone -tile 8 12 tiles/stone -tile 10 12 tiles/stone -tile 11 12 tiles/stone -tile 12 12 tiles/stone -tile 15 12 tiles/stone -tile 3 13 tiles/stone -tile 14 13 tiles/stone -tile 4 14 tiles/stone -tile 5 14 tiles/stone -tile 6 14 tiles/stone -tile 7 14 tiles/stone -tile 8 14 tiles/stone -tile 9 14 tiles/stone -tile 11 14 tiles/stone -tile 12 14 tiles/stone -tile 13 14 tiles/stone -tile 16 15 tiles/stone - -sprite 16 14 fire -sprite 7 11 player right -sprite 1 10 tube right 2 -sprite 6 10 tube up 1 -sprite 8 6 tube down 3 -sprite 10 15 tube up 3 -sprite 11 10 tube up 1 -sprite 15 11 tube left 2 \ No newline at end of file diff -Nru magicor-1.1/data/levels/_test/level-09.lvl magicor-1.0/data/levels/_test/level-09.lvl --- magicor-1.1/data/levels/_test/level-09.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/_test/level-09.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title 009 spit lava -credits cc -description -hint - -background backgrounds/stone -music music/playing -shadows 1 - -tile 12 8 tiles/stone -tile 6 9 tiles/stone -tile 7 9 tiles/stone -tile 8 9 tiles/stone -tile 9 9 tiles/stone -tile 9 10 tiles/stone -tile 9 11 tiles/stone -tile 9 12 tiles/stone -tile 9 13 tiles/stone -tile 10 13 tiles/stone -tile 11 13 tiles/stone -tile 12 13 tiles/stone -tile 15 13 tiles/stone -tile 16 13 tiles/stone - -sprite 10 8 fire -sprite 10 9 ice connect-left -sprite 10 12 lava spit_dorm -sprite 11 12 lava dormant -sprite 12 12 lava spit_dorm -sprite 15 12 lava -sprite 16 12 lava spiting -sprite 6 8 player right diff -Nru magicor-1.1/data/levels/_test/level-10a.lvl magicor-1.0/data/levels/_test/level-10a.lvl --- magicor-1.1/data/levels/_test/level-10a.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/_test/level-10a.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title 010a seekers - out -credits cc -description -hint - -background -music -shadows 1 - -tile 7 9 tiles/stone -tile 9 9 tiles/stone -tile 10 9 tiles/stone -tile 11 9 tiles/stone -tile 5 17 tiles/stone -tile 6 17 tiles/stone -tile 7 17 tiles/stone -tile 8 17 tiles/stone -tile 9 17 tiles/stone -tile 10 17 tiles/stone - -sprite 7 7 fire -sprite 8 8 fire -sprite 10 7 fire -sprite 7 8 ice -sprite 8 9 ice connect -sprite 10 8 ice -sprite 9 8 player right \ No newline at end of file diff -Nru magicor-1.1/data/levels/_test/level-11a.lvl magicor-1.0/data/levels/_test/level-11a.lvl --- magicor-1.1/data/levels/_test/level-11a.lvl 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/data/levels/_test/level-11a.lvl 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -# Generated by Magicor-LevelEditor 1.0 -title 011a Trapola -credits cc -description -hint - -background -music -shadows 1 - -tile 3 8 tiles/stone -tile 4 8 tiles/stone -tile 6 8 tiles/stone -tile 7 8 tiles/stone -tile 9 8 tiles/stone -tile 10 8 tiles/stone -tile 10 10 tiles/stone -tile 3 11 tiles/stone -tile 4 11 tiles/stone -tile 6 11 tiles/stone -tile 7 11 tiles/stone -tile 8 11 tiles/stone -tile 9 11 tiles/stone -tile 10 11 tiles/stone -tile 11 11 tiles/stone -tile 14 11 tiles/stone -tile 5 12 tiles/stone -tile 13 12 tiles/stone -tile 12 13 tiles/stone -tile 11 14 tiles/stone -tile 1 15 tiles/stone -tile 2 15 tiles/stone -tile 3 15 tiles/stone -tile 4 15 tiles/stone -tile 5 15 tiles/stone -tile 6 15 tiles/stone -tile 7 15 tiles/stone -tile 8 15 tiles/stone -tile 9 15 tiles/stone -tile 10 15 tiles/stone -tile 16 15 tiles/stone -tile 17 15 tiles/stone -tile 18 15 tiles/stone - -sprite 2 8 trapola -sprite 8 8 trapola -sprite 15 14 trapola -sprite 6 9 fire -sprite 2 11 ice connect-right -sprite 2 12 ball 0 -1 2 -sprite 5 7 ice -sprite 5 8 ice connect -sprite 6 10 ice -sprite 15 11 ice connect -sprite 16 11 ice connect -sprite 17 11 ice connect -sprite 18 11 ice connect-left -sprite 4 7 player right -sprite 14 4 tube down -sprite 15 15 tube up -sprite 18 10 walking-enemy right _test/walking_blob _test/blob-die 1 \ No newline at end of file Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/levels/_test/walking_blob.png and /tmp/FtMbFjvN4L/magicor-1.0/data/levels/_test/walking_blob.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/music/menu.xm and /tmp/FtMbFjvN4L/magicor-1.0/data/music/menu.xm differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/sprites/ball_b.png and /tmp/FtMbFjvN4L/magicor-1.0/data/sprites/ball_b.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/sprites/lava.png and /tmp/FtMbFjvN4L/magicor-1.0/data/sprites/lava.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/sprites/player-penguin.png and /tmp/FtMbFjvN4L/magicor-1.0/data/sprites/player-penguin.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/sprites/seeker3x18.png and /tmp/FtMbFjvN4L/magicor-1.0/data/sprites/seeker3x18.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/sprites/spiting_lava.png and /tmp/FtMbFjvN4L/magicor-1.0/data/sprites/spiting_lava.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/sprites/trapola2b_exp.png and /tmp/FtMbFjvN4L/magicor-1.0/data/sprites/trapola2b_exp.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/sprites/trapola2_q.png and /tmp/FtMbFjvN4L/magicor-1.0/data/sprites/trapola2_q.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/data/sprites/trapola.png and /tmp/FtMbFjvN4L/magicor-1.0/data/sprites/trapola.png differ diff -Nru magicor-1.1/debian/changelog magicor-1.0/debian/changelog --- magicor-1.1/debian/changelog 2009-06-24 08:10:59.000000000 +0200 +++ magicor-1.0/debian/changelog 2009-06-24 08:10:59.000000000 +0200 @@ -1,24 +1,24 @@ -magicor (1.1-1) unstable; urgency=low +magicor (1.0-2ubuntu1) intrepid; urgency=low - * New upstream release - * debian/control: - + change my mail address - + Bump Standards-Version to 3.8.1 - + Remove DM flag - + Update debhelper to 7 - + Update python to 2.5 - + move python from Build-Depends to Build-Depends-Indep - * Update debian/Compat to 7 - * Update python version in debian/magicor.install - * Update python version in debian/magicor.dirs - * Fix for victory animation problem (closes: #412391) - * Fix for penguin artifact in ice block problem (closes: #412486) - * Time statistics for completed levels (closes: #413317) - * Fix lintian warnings: - W: magicor: description-contains-homepage - I: magicor source: build-depends-without-arch-dep python + * Sync with Debian unstable (LP: #234150). + * New Ubuntu changes: + + debian/control: + - As Ubuntu's cdbs symlinks identical files, magicor needs a + strict versioned Depends on magicor-data for the symlinked + files to be in the same version (LP: #183029). + - Modify Maintainer value to match DebianMaintainerField spec. - -- Xavier Oswald Fri, 24 Apr 2009 13:02:12 +0200 + -- Michael Bienia Fri, 23 May 2008 09:37:12 +0200 + +magicor (1.0-2) unstable; urgency=high + + * Fix FTBFS: dh_install: magicor missing files (closes: #477004) + thanks to Kumar Appaiah and Piotr Ozarowski patch + * Update debian/control Standards-Version to 3.7.3 + * Add debian/control Homepage field + * Add debian/control XS-Dm-Upload-Allowed field + + -- Xavier Oswald Tue, 06 May 2008 21:43:31 +0200 magicor (1.0-1) unstable; urgency=low diff -Nru magicor-1.1/debian/compat magicor-1.0/debian/compat --- magicor-1.1/debian/compat 2009-06-24 08:10:59.000000000 +0200 +++ magicor-1.0/debian/compat 2009-06-24 08:10:59.000000000 +0200 @@ -1 +1 @@ -7 +5 diff -Nru magicor-1.1/debian/control magicor-1.0/debian/control --- magicor-1.1/debian/control 2009-06-24 08:10:59.000000000 +0200 +++ magicor-1.0/debian/control 2009-06-24 08:10:59.000000000 +0200 @@ -1,17 +1,19 @@ Source: magicor Section: games Priority: optional -Maintainer: Xavier Oswald +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Xavier Oswald Uploaders: Frederic Wagner -Build-Depends: debhelper (>= 7), cdbs -Build-Depends-Indep: python (>= 2.5) -Standards-Version: 3.8.1 +Build-Depends: debhelper (>= 5), cdbs, python-all-dev (>= 2.3.5-11) +Build-Depends-Indep: python-support (>= 0.5.3) +Standards-Version: 3.7.3 Homepage: http://magicor.sf.net/ +XS-Dm-Upload-Allowed: yes Package: magicor Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python( >= 2.5), - python-pygame, magicor-data, libsdl-image1.2, libsdl-mixer1.2, +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, + python-pygame, magicor-data (= ${binary:Version}), libsdl-image1.2, libsdl-mixer1.2, python-gtk2, libglade2-0 Description: puzzle game in the spirit of solomon's key Magicor is a small puzzle game similar to the old NES classic @@ -20,7 +22,7 @@ Package: magicor-data Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python ( >= 2.5) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Description: data files for the magicor puzzle game Magicor is a small puzzle game similar to the old NES classic solomon's key. You control tux the penguin and create ice blocks diff -Nru magicor-1.1/debian/magicor.1 magicor-1.0/debian/magicor.1 --- magicor-1.1/debian/magicor.1 2009-06-24 08:10:59.000000000 +0200 +++ magicor-1.0/debian/magicor.1 2009-06-24 08:10:59.000000000 +0200 @@ -1,6 +1,6 @@ .TH MAGICOR 1 "January 17, 2007" .SH NAME -Magicor \- Puzzle game in the spirit of solomon's key +magicor \- Puzzle game in the spirit of solomon's key .SH SYNOPSIS .B magicor [\fIOPTION\fR] diff -Nru magicor-1.1/debian/magicor-data.install magicor-1.0/debian/magicor-data.install --- magicor-1.1/debian/magicor-data.install 2009-06-24 08:10:59.000000000 +0200 +++ magicor-1.0/debian/magicor-data.install 2009-06-24 08:10:59.000000000 +0200 @@ -23,10 +23,6 @@ debian/tmp/usr/share/games/magicor/levels/snow/brushes debian/tmp/usr/share/games/magicor/levels/snow/*.png debian/tmp/usr/share/games/magicor/levels/snow/*.lvl -debian/tmp/usr/share/games/magicor/levels/snow/*.xm -debian/tmp/usr/share/games/magicor/levels/pompei/brushes -debian/tmp/usr/share/games/magicor/levels/pompei/*.png -debian/tmp/usr/share/games/magicor/levels/pompei/*.lvl debian/tmp/usr/share/games/magicor/music/*.xm debian/tmp/usr/share/games/magicor/samples/*.wav debian/tmp/usr/share/games/magicor/sprites/*.png diff -Nru magicor-1.1/debian/magicor.dirs magicor-1.0/debian/magicor.dirs --- magicor-1.1/debian/magicor.dirs 2009-06-24 08:10:59.000000000 +0200 +++ magicor-1.0/debian/magicor.dirs 2009-06-24 08:10:59.000000000 +0200 @@ -1,3 +1,3 @@ usr/games -usr/lib/python2.5/site-packages/magicor +usr/share/games/magicor/magicor etc diff -Nru magicor-1.1/debian/magicor-editor.1 magicor-1.0/debian/magicor-editor.1 --- magicor-1.1/debian/magicor-editor.1 2009-06-24 08:10:59.000000000 +0200 +++ magicor-1.0/debian/magicor-editor.1 2009-06-24 08:10:59.000000000 +0200 @@ -1,11 +1,11 @@ .TH MAGICOR-EDITOR 1 "January 17, 2007" .SH NAME -Magicor-Editor \- Level editor for Magicor +magicor-editor \- Level editor for magicor .SH SYNOPSIS -.B magicor-editor +.B magicor [\fIOPTION\fR] .SH DESCRIPTION -Magicor-LevelEditor \- Level editor for Magicor +magicor-editor \- Level editor for magicor .SH OPTIONS .TP \fB\-h\fR, \fB\-\-help\fR diff -Nru magicor-1.1/debian/magicor.install magicor-1.0/debian/magicor.install --- magicor-1.1/debian/magicor.install 2009-06-24 08:10:59.000000000 +0200 +++ magicor-1.0/debian/magicor.install 2009-06-24 08:10:59.000000000 +0200 @@ -1,8 +1,8 @@ -debian/tmp/usr/games/magicor -debian/tmp/usr/games/magicor-editor debian/tmp/etc/magicor.conf debian/tmp/etc/magicor-editor.conf -debian/tmp/usr/lib/python2.5/site-packages/magicor/*.py -debian/tmp/usr/lib/python2.5/site-packages/magicor/editor/*.py -debian/tmp/usr/lib/python2.5/site-packages/magicor/sprites/*.py -debian/tmp/usr/lib/python2.5/site-packages/magicor/states/*.py +debian/tmp/usr/share/games/magicor/magicor/*.py +debian/tmp/usr/share/games/magicor/magicor/editor/*.py +debian/tmp/usr/share/games/magicor/magicor/sprites/*.py +debian/tmp/usr/share/games/magicor/magicor/states/*.py +debian/tmp/usr/share/games/magicor/Magicor.py +debian/tmp/usr/share/games/magicor/Magicor-LevelEditor.py diff -Nru magicor-1.1/debian/magicor.links magicor-1.0/debian/magicor.links --- magicor-1.1/debian/magicor.links 1970-01-01 01:00:00.000000000 +0100 +++ magicor-1.0/debian/magicor.links 2009-06-24 08:10:59.000000000 +0200 @@ -0,0 +1,2 @@ +usr/share/games/magicor/Magicor.py usr/games/magicor +usr/share/games/magicor/Magicor-LevelEditor.py usr/games/magicor-editor diff -Nru magicor-1.1/debian/rules magicor-1.0/debian/rules --- magicor-1.1/debian/rules 2009-06-24 08:10:59.000000000 +0200 +++ magicor-1.0/debian/rules 2009-06-24 08:10:59.000000000 +0200 @@ -7,5 +7,19 @@ DEB_MAKE_CLEAN_TARGET = clean DEB_MAKE_BUILD_TARGET = all -DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp/ +DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp DEB_MAKE_MAKEFILE = Makefile.debian + +binary-install/magicor:: + dh_pysupport -pmagicor /usr/share/games/magicor/magicor + dh_pysupport -pmagicor /usr/share/games/magicor + +# install/magicor:: +# dh_install debian/tmp/usr/lib/`pyversions -d`/site-packages/magicor/*.py usr/share/magicor +# dh_install debian/tmp/usr/lib/`pyversions -d`/site-packages/magicor/editor/*.py usr/share/magicor/editor +# dh_install debian/tmp/usr/lib/`pyversions -d`/site-packages/magicor/sprites/*.py usr/share/magicor/sprites +# dh_install debian/tmp/usr/lib/`pyversions -d`/site-packages/magicor/states/*.py usr/share/magicor/states +# dh_install debian/tmp/usr/lib/`pyversions -d`/site-packages/magicor/*.py usr/lib/`pyversions -d`/site-packages/magicor +# dh_install debian/tmp/usr/lib/`pyversions -d`/site-packages/magicor/editor/*.py usr/lib/`pyversions -d`/site-packages/magicor/editor +# dh_install debian/tmp/usr/lib/`pyversions -d`/site-packages/magicor/sprites/*.py usr/lib/`pyversions -d`/site-packages/magicor/sprites +# dh_install debian/tmp/usr/lib/`pyversions -d`/site-packages/magicor/states/*.py usr/lib/`pyversions -d`/site-packages/magicor/states Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/blob.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/blob.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/dormant-lava.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/dormant-lava.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/fire.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/fire.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/ice.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/ice.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/lava.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/lava.png differ diff -Nru magicor-1.1/doc/manual.docbook magicor-1.0/doc/manual.docbook --- magicor-1.1/doc/manual.docbook 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/doc/manual.docbook 1970-01-01 01:00:00.000000000 +0100 @@ -1,502 +0,0 @@ - - - - - Magicor manual - PeterGebauer - 2006-2007Peter Gebauer - - - Magicor, the puzzle game - - - - - - - - - - - - - This is a fast-paced puzzle game that you can play for five - minutes or hours, depending on how much time you have and how - much you like it. The objective is to extinguish burning fires - using already blocks of ice, either created by the player or the - game itself. Although learning the game physics and controls is - easy, solving some of the levels is not. - - - - - - - The game is free (as in freedom of speech), licensed as Public Domain, - and it has been developed using all free tools and libraries on - free platforms. Enjoy it! (note: the game is also ported to Windows, - thanks Claudio!) See link - - for license information. - - - - Game objective - - The objective of the game is to extinguish all bunring fires. You do - this by pushing or dropping ice blocks so they collide with the fire - using the player. - - - Common objects in the game - - - - - - Player - - - - - - - - - - Ice block - - - - - - - - - - Fire - - - - - - - - - - -
- - To push an ice block you need only walk towards it, try to walk through - it even, the player will kick the ice block once in contact with it and - the block will slide until it hits a wall or falls down. - - - - - - - Like the arrows suggest, just walk towards the ice block. - - - - - - - - - Try walking past the ice block, the player will kick it and the - ice block will slide towards the fire, eventually hitting it and - thus extinguishing it. - - - - - That is how you push/slide an already existing block of ice, but the - player can also create and destroy ice blocks. The player is limited - to creating and destroying ice blocks below the - player left and right sides. - - - - - - - - A clear case of having to create ones own ice blocks. Just walk - up to the ledge and press the action button. The tutorial arrows - indicate that something needs to be done no less than four times. - - - - - - - - - - *Swosh* and there's the newly created block of ice. The block - will freeze stuck to the ledge so the player can safely stand on it. - - - - - - - - - - The player has now created a walking bridge of connected ice blocks - all the way to above the fire. - - - - - - - - - - We step back one unit and sever the connection by the destroying a - block of ice so that the rightmost ice block will be disconnected. - Once disconnected the ice block will start to fall towards the fire. - Again, when hitting the fire it will be extinguished; mission - accomplished! - - - - - Pushing ice blocks can only be done if the ice block has no obstacles - on the other side. Even another ice block will stop an ice block from - being pushed. - - - - - - - - These ice blocks are too heavy to push. - - - - - - - - - - So the player simply climbs up. Note that the player can only climb - on top of blocks that are reachable. (one block worth of height) - - - - - Once on top of ice blocks you can destroy one of them or jump down on - the other side. This climbing behaviour is activated every time you try - to push an ice block that is next to another ice block or a solid ledge. - - - An explanation of falling blocks: unless single ice blocks (or even a - row of connected ice blocks) is supported by solids below or connected - to solids, it will start to fall until it hits a solid, is destroyed - or falls into obvlivion (below screen visibility). - - - - - Complicating the game - - You didn't think all levels would be as easy as the tutorial ones, did - you? There are several additional elements to make solving the levels - more difficult. - - - Some additional objects - - - - - - - Spikes - - - - - - - - - These are nearly invisible, burried into solids. If the player or - an ice block is near this trap, spikes will shoot out killing - the player or destroying the ice block. - - - - Active lava - - - - - - - - - Active lava will kill the player and destroy ice if touched. - - - - Dormant lava - - - - - - - - - This type of dormant lava is harmless to both player and - ice blocks, but beware: lava can be ignited if a burning fire - should happen to touch it, making it active, lethal lava. - - - - -
- - To make things even worse many levels will have moving enemies that will - kill the player on touch. Lucky for the player, these enemies can be - destroyed by squishing them between an ice block and a solid or another - ice block. Depending on the level theme these enemies move and look - differently, below are some examples. - - - Enemy examples - - - - - - Scarab (from Egypt theme) - - - - - - - - - - Blob (from Space theme) - - - - - - - - - - -
- - As you can see, with the additional, very dangerous objects this game - can become quite complicated in spite of it's simple physics engine. - Many levels will require logic and timing in addition to a heap of - intuition. Good luck! - - - - - Configuration - - There are several ways to configure Magicor; edit configuration file, - add command line options or use the in-game options menu. - - - Enemy examples - - - - - - Fullscreen - True for fullscren, false for windowed. - - - Eyecandy - Set to false to disable extra nice graphical effects. - - - Sound - - Set to false to disable sound. (if both sound and - music are disabled, audio will not be initialized at all) - - - - Music - - Set to false to disable music. (if both sound and - music are disabled, audio will not be initialized at all) - - - - Sound vol - - Set the sound volume from 0 (silent) to 100 (loud). - - - - Music vol - - Set the music volume from 0 (silent) to 100 (loud). - - - - Joystick - - Toggle joystick support. If disabled the joystick will not - be initialized at all. - - - - -
-
- In-game options - - The in-game options screen will give you the following options: - - Fullscreen (toggle using action) - Eyecandy (toggle using action) - Sound (toggle using action) - Music (toggle using action) - Sound vol (change using left/right) - Music vol (change using left/right) - Keyboard controls (enter submenu using action) - Joystick controls (enter submenu using action) - - -
-
- Controls - - - Up (move up in menus) - Down (move down in menus) - Left (move player left or change menu option) - Right (move player right or change menu option) - Action (create/destroy ice, toggle or select menu option) - Start (obsolete, use Action instead) - Escape (activate/deactivate menu; only customizable for joystick, always ESCAPE-key for keyboard controls) - - -
-
- Configuration files - - The global configuration file should be located in - /etc/magicor.conf or - /usr/local/etc/magicor.conf on GNU and BSD - systems. - - - The personal/user-specific configuration file is found in - ~/.magicor/magicor.conf and it will override - any global settings. - - - Regardless of platform and global/user-specific configuration, the - contents of it will be the same. Here's a typical example: - - - -default_tile = tiles/stone -eyecandy = 1 -joystick = 1 -music = 1 -music_vol = 100 -sound = 1 -sound_vol = 100 - - - - Quite simple to follow. "default_tile" can be ignored, but note that - boolean values are either 0 or 1. - -
-
- Command line options - - This is the output from running the help-option: - -usage: Magicor.py [options] - -options: - -h, --help show this help message and exit - -c CONFIGPATH, --config=CONFIGPATH - use this default config, default ###CONFIG_PATH### - -j JOYSTICK, --joystick=JOYSTICK - enable/disable joystick - -m MUSIC, --music=MUSIC - enable/disable music - -s SOUND, --sound=SOUND - enable/disable sound - -f FULLSCREEN, --fullscreen=FULLSCREEN - enable/disable fullscreen - - -
- - - - Appendix - License - - Copyright 2006 Peter Gebauer - (see README for info on contributed work) - - - This project and all of it's content, regardless of copyright holder, is - released as Public Domain as stated: - - - The person or persons who have associated work with this document (the - "Dedicator" or "Certifier") hereby either (a) certifies that, to the - best of his knowledge, the work of authorship identified is in the - public domain of the country from which the work is published, or (b) - hereby dedicates whatever copyright the dedicators holds in the work - of authorship identified below (the "Work") to the public domain. A - certifier, moreover, dedicates any copyright interest he may have in - the associated work, and for these purposes, is described as a - "dedicator" below. - - - A certifier has taken reasonable steps to verify the copyright status - of this work. Certifier recognizes that his good faith efforts may not - shield him from liability if in fact the work certified is not in the - public domain. - - - Dedicator makes this dedication for the benefit of the public at large - and to the detriment of the Dedicator's heirs and - successors. Dedicator intends this dedication to be an overt act of - relinquishment in perpetuity of all present and future rights under - copyright law, whether vested or contingent, in the Work. Dedicator - understands that such relinquishment of all rights includes the - relinquishment of all rights to enforce (by lawsuit or otherwise) - those copyrights in the Work. - - - Dedicator recognizes that, once placed in the public domain, the Work - may be freely reproduced, distributed, transmitted, used, modified, - built upon, or otherwise exploited by anyone for any purpose, - commercial or non-commercial, and in any way, including by methods - that have not yet been invented or conceived. - - - - - Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/player.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/player.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/scarab.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/scarab.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/screenshot01.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/screenshot01.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/screenshot02.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/screenshot02.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/screenshot03.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/screenshot03.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/screenshot04.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/screenshot04.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/screenshot05.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/screenshot05.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/screenshot06.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/screenshot06.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/screenshot07.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/screenshot07.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/screenshot08.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/screenshot08.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/screenshot09.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/screenshot09.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/spikes.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/spikes.png differ Binary files /tmp/vdnAj2AcQw/magicor-1.1/doc/title.png and /tmp/FtMbFjvN4L/magicor-1.0/doc/title.png differ diff -Nru magicor-1.1/magicor/editor/brushes.py magicor-1.0/magicor/editor/brushes.py --- magicor-1.1/magicor/editor/brushes.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/editor/brushes.py 2007-01-21 22:11:24.000000000 +0100 @@ -60,7 +60,8 @@ self.top = top def __str__(self): - return "%s"%self.name + return "%s"%self.name + class PlayerBrush(SpriteBrush): @@ -407,19 +408,3 @@ def __str__(self): return "%s %s"%(self.name, self.direction) - -class TrapolaBrush(SpriteBrush): - def __init__(self): - SpriteBrush.__init__(self, - "trapola", - "sprites/trapola2_q", - 32,32, - 0,0,0) - -##class BallBrush(ResourceBrush): -## def __init__(self): -## SpriteBrush.__init__(self, -## "ball", -## "sprites/ball_b", -## 8,8, -## 0,14,14) diff -Nru magicor-1.1/magicor/editor/gtkgui.py magicor-1.0/magicor/editor/gtkgui.py --- magicor-1.1/magicor/editor/gtkgui.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/editor/gtkgui.py 2007-01-21 22:11:24.000000000 +0100 @@ -397,11 +397,8 @@ def __init__(self, config, loadfile = None): Editor.__init__(self, config, loadfile) - gladeFile = "%s/editor/magicor-editor.glade"%config.get("data_path", "data") - try: - self.glade = glade.XML(gladeFile) - except RuntimeError, re: - raise RuntimeError("%s; glade file %s"%(re, gladeFile)) + self.glade = glade.XML("%s/editor/magicor-editor.glade" + %config.get("data_path", "data")) self.glade.signal_autoconnect(self) if loadfile: self.setTitle(os.path.basename(loadfile)) diff -Nru magicor-1.1/magicor/editor/__init__.py magicor-1.0/magicor/editor/__init__.py --- magicor-1.1/magicor/editor/__init__.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/editor/__init__.py 2007-01-21 22:11:24.000000000 +0100 @@ -155,7 +155,6 @@ TubeBrush("right"), TubeBrush("down"), DirectionBrush("right"), - TrapolaBrush() ] + self.loadBrushes() def clear(self): diff -Nru magicor-1.1/magicor/__init__.py magicor-1.0/magicor/__init__.py --- magicor-1.1/magicor/__init__.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/__init__.py 2007-01-21 22:11:24.000000000 +0100 @@ -16,30 +16,6 @@ from magicor.resources import getResources _CONFIG = None -g_groups = {} -g_printkeys = {} -g_devflags = { "F5":False, "F6":False, "F7":False ,"F8":False } - -def toggle_devflag( key ): - global g_devflags - if g_devflags.has_key(key): - g_devflags[key] = not g_devflags[key] - -def dbgPrint(key,cond,*args): - global g_printkeys - if cond and g_printkeys.has_key(key): - print args - -def parse_printkeys(s): - global g_printkeys - kl=s.split(":") - for k in kl: - g_printkeys[k]=True - print "In parse printkeys: found key:>%s<"%k - -def set_group(key, val): - global g_groups - g_groups[key]=val class Text(object): TEXT_INDEX = "abcdefghijklmnopqrstuvwxyz0123456789.,!?" @@ -111,7 +87,6 @@ return self._next def eventKeyDown(self, event): - print event pass def eventKeyUp(self, event): @@ -230,14 +205,13 @@ """ def __init__(self, config = {}): - self.byFrame = False - self.doFrame = True pygame.display.init() pygame.display.set_caption("Magicor") pygame.mouse.set_visible(False) for k in ("sound", "joystick", "music", "eyecandy"): if not config.has_key(k): config[k] = 1 + for k in ("sound_vol", "music_vol"): if (not config.has_key(k) or config.getInt(k) < 0 or config.getInt(k) > 100): @@ -276,35 +250,17 @@ def handleEvents(self, state, events): if events: for event in events: - if ( self.config.get("devmode", False) - and event.type == pygame.KEYDOWN ): - self.doFrame = True - if event.key==pygame.K_F11: - self.byFrame = not self.byFrame - if event.key==pygame.K_F5: - toggle_devflag("F5") - if event.key==pygame.K_F6: - toggle_devflag("F6") - if event.key==pygame.K_F7: - toggle_devflag("F7") - if event.key==pygame.K_F8: - toggle_devflag("F8") - en = "event%s"%pygame.event.event_name(event.type) f = getattr(state, en, None) if callable(f): f(event) def start(self, state): - self.doFrame = True while state: - if self.byFrame: - self.doFrame = False self.handleEvents(state, pygame.event.get()) state.eventJoystick() - if self.doFrame: - state.run() - pygame.display.flip() + state.run() + pygame.display.flip() self.clock.tick(25) state = state.next() diff -Nru magicor-1.1/magicor/sprites/blocks.py magicor-1.0/magicor/sprites/blocks.py --- magicor-1.1/magicor/sprites/blocks.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/sprites/blocks.py 2007-01-21 22:11:24.000000000 +0100 @@ -7,7 +7,6 @@ import random from magicor.sprites import * -from magicor import g_groups class BlocksGroup(AnimationGroup): @@ -313,10 +312,6 @@ self.moving = 0 def push(self, direction): - global g_groups - fire=g_groups['fires'].getSpriteAt(self.x, self.y-32, None, None) - if fire is not None: - fire.followMe = self if direction < 0: self.moving = -99999 elif direction > 0: @@ -325,20 +320,7 @@ def eventStop(self): self.resources.playSound("samples/blockland") # self.zoomSurface = None - - def hack_info_vel(self): - if self.falling: - self.veldir= [0,1] - self.fasteness = 4 - else: - self.veldir[1]=0 - if not self.moving: - self.veldir[0]=0 - self.fasteness = 0 - else: - self.fasteness = 4 - if self.moving>0: self.veldir[0]=1 - else: self.veldir[0]=-1 + class NormalIce(Ice): diff -Nru magicor-1.1/magicor/sprites/fires.py magicor-1.0/magicor/sprites/fires.py --- magicor-1.1/magicor/sprites/fires.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/sprites/fires.py 2007-01-21 22:11:24.000000000 +0100 @@ -9,8 +9,6 @@ from magicor.sprites import * from magicor.sprites.lights import YellowLight, YellowSpark from magicor.sprites.blocks import Ice -from magicor import g_groups -from magicor.sprites.seekers import Seeker class Fire(PhysicsSprite): @@ -31,7 +29,6 @@ self.players = players self.light = YellowLight(x - 32, y - 32) self.canFall = canFall - self.followMe = None lightsGroup.add(self.light) self.lightsGroup = lightsGroup @@ -45,64 +42,16 @@ self.lightsGroup.add(YellowSpark(self.x - 32, self.y - 32, dx, dy)) def physics(self): - if self.followMe is not None: - #sliding - if not self.followMe.alive(): - #the iceblock was killed - self.x = self.x/32*32 - self.followMe = None - else: - prev_x=self.x - self.x = self.followMe.x - if self.followMe.falling or not self.followMe.moving: - self.x = self.x/32*32 - self.followMe=None - for s in pygame.sprite.spritecollide(self, self.blocksGroup, False): # usar sprite collision ? - if isinstance(s, Ice): - if s.falling and s.x == self.x and s.y == self.y: - s.kill() - self.resources.playSound("samples/bonus") - self.kill() - break - else: - self.x = (prev_x+self.width/2)/32*32 - self.followMe = None - #check world colisions - if self.followMe is not None: - if self.followMe.moving>0: - if self.level[(self.x+self.width)/32,(self.y+self.height/2)/32]: - self.x = self.x/32*32 - self.followMe = None - else: - if self.level[self.x/32,(self.y+self.height/2)/32]: - self.x = (self.x/32+1)*32 - self.followMe = None - #enemies are not checked, they need to be flying enemies wich - #can take damage from fire. - self.light.x = self.x - 32 + random.randint(-4, 4) - self.light.y = self.y - 32 + random.randint(-4, 4) - else: - #static or falling - for s in self.blocksGroup.sprites(): - if isinstance(s, Ice) and s.x == self.x and s.y == self.y: - s.kill() - self.resources.playSound("samples/bonus") - self.kill() - break - for player in self.players.sprites(): - if player.x == self.x and player.y == self.y and not player.dead: - player.die() - if self.canFall and not self.blockedBelow(): - self.y += 4 - if 9>self.level.height*30-self.y>4: - # fire falling out of the level, lauch seekers to kill players - x=self.x+self.width/2.; y=self.y; da=math.radians(360./16.) - for s in g_groups['players']: - target = s - break - for i in range(0,16): - heading = [math.cos(i*da),math.sin(i*da)] - g_groups['stones'].add(Seeker(x+heading[0]*4., y+heading[1]*4., heading,3.,target)) - self.light.x = self.x - 32 + random.randint(-4, 4) - self.light.y = self.y - 32 + random.randint(-4, 4) - + for s in self.blocksGroup.sprites(): + if isinstance(s, Ice) and s.x == self.x and s.y == self.y: + s.kill() + self.resources.playSound("samples/bonus") + self.kill() + break + for player in self.players.sprites(): + if player.x == self.x and player.y == self.y and not player.dead: + player.die() + if self.canFall and not self.blockedBelow(): + self.y += 4 + self.light.x = self.x - 32 + random.randint(-4, 4) + self.light.y = self.y - 32 + random.randint(-4, 4) diff -Nru magicor-1.1/magicor/sprites/__init__.py magicor-1.0/magicor/sprites/__init__.py --- magicor-1.1/magicor/sprites/__init__.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/sprites/__init__.py 2007-01-21 22:11:24.000000000 +0100 @@ -6,9 +6,8 @@ """ import pygame.sprite + from magicor.resources import getResources -from operator import itemgetter -from magicor import g_printkeys,g_devflags,dbgPrint class Frame(object): """ @@ -225,7 +224,7 @@ animation = self._animations[self._animationName] return bool(not animation or self._index >= len(animation)) - def setAnimation(self, name, bResetIndex=True): + def setAnimation(self, name): """ Use specified set of animation. Raises KeyError if the animation set is not found. @@ -355,8 +354,6 @@ self.moving = 0 self.tubed = False self.falling = False - self.veldir = [0,0] - self.fasteness = 0 self.level = level def testFall(self): @@ -368,14 +365,6 @@ def eventStop(self): pass - def hack_info_vel(self): - """build self.veldir and self.fasteness from native params""" - pass - - def doAction(self,action): - if action=='die': - self.kill() - def physics(self): x, y = self.x / 32, self.y / 32 right, bottom = (self.x + 32) / 32, (self.y + 32) / 32 @@ -506,502 +495,3 @@ return True return False -##-> support functions for PhysicsStoneSprite - -# bStop signals the cases where the sprite position must be updated to the last -#point where colision doenst occur; alternatively -# bNonBlockingInteraction = not bStop -def getSpritesTouched( self,toTravel ): - #move the sprite to the tentative position; if no colision: done, else - #for each sprite do: move self from initial position to tentative position in - #steps of one, when colision detected freeTravel can be calc. The min free travel - #will be the final free travel ( counting only the sprites with bStop = True ) - #if both sprites are small and fasteness is not small collision - #can be missed - x0=self.x; y0=self.y - #q: we need the pygame sprite moved, this really do it? Y. remember to - #restore prior to return - self.rect.x += self.veldir[0]*toTravel - self.rect.y += self.veldir[1]*toTravel - r=self.radius - minFreeTravel = toTravel - tl=[] - bGenStuck = False - steps=int(toTravel)+1 - dbgPrint( 'sb', g_devflags['F5'], "@@in spriteTouch - tryMove=",toTravel," steps=",steps) - dx=toTravel/float(steps)*self.veldir[0] - dy=toTravel/float(steps)*self.veldir[1] - for group,ignoreSubgroup, minOverlap,bStop, self_action, inflict_action in self.collisionTable: - for s in pygame.sprite.spritecollide(self, group, False): - if ((ignoreSubgroup is None) or - (ignoreSubgroup is not None and s.subgroup!=ignoreSubgroup) - ): - dbgPrint( 'sb', g_devflags['F5'], "@@@ spriteTouched x,y,width,height",s.x,s.y,s.width,s.height) - dbgPrint( 'sb', g_devflags['F5'], "@@@ sprite Ball x,y,width,height",x0,y0,self.width,self.height) - dbgPrint( 'sb', g_devflags['F5'], "@@@ moved Ball x,y", self.rect.x,self.rect.y) - ww=s.width-2.*minOverlap; hh=s.height-2.*minOverlap - target=pygame.Rect(s.x+minOverlap,s.y+minOverlap,ww,hh) - #####-> must be from the initial position - px=x0+self.width/2.-r ; py=y0+self.height/2.0-r - bBump = False - for i in range(0,steps): - dbgPrint( 'sb', g_devflags['F5'], " probe left,right:",px,px+2*r) - if target.colliderect( px,py,2.*r,2.*r ): - bBump=True - break - px+=dx - py+=dy - dbgPrint( 'sb', g_devflags['F5'], "bBump=",bBump," i=",i) - if bBump: - if i==0 and bStop: - bStuck = True - bGenStuck = True - freeTravel = 0 - overshot = toTravel - else: - bStuck = False - freeTravel = (i-1)/float(steps)*toTravel - overshot = toTravel - freeTravel - else: - bStuck = False - freeTravel = toTravel - overshot = 0 - dbgPrint( 'sb', g_devflags['F5'], "overshot",overshot) - tl.append( ( freeTravel, minOverlap, bStop,bStuck, - group, s, - self_action, inflict_action) ) - if bStop and freeTravel=self.level.width*32: - bOutOfScreen = True - elif self.level[int(x1+self.width)/32,y0/32]: - #world colision - excess=int(x1+self.width)%32 #+1 seems correct but looks worse - x1 -= excess - nonColisionTravel = x1-x0 - self.bounceDir = [-1,0] - bBump = True - else: - pass - return bBump, toTravel, nonColisionTravel, bOutOfScreen - -def mov_v(self,toTravel): - x0=int(self.x);y0=self.y - r=self.radius - bOutOfScreen = False - bBump = False - nonColisionTravel = toTravel - y1=y0+self.veldir[1]*toTravel - if self.veldir[1]<0: - if y1+self.height<0: - bOutOfScreen = True - elif self.level[x0/32,int(y1)/32]: - #world colision - y1 = (int(y1)/32+1)*32 - nonColisionTravel = y0-y1 - self.bounceDir = [0,1] - bBump = True - else: - pass - else: - if y1>=self.level.height*32: - bOutOfScreen = True - elif self.level[x0/32,int(y1+self.height)/32]: - #world colision - excess = int(y1+self.height)%32+1 - y1 -= excess - nonColisionTravel = y1-y0 - self.bounceDir = [0,-1] - bBump = True - else: - pass - return bBump, toTravel, nonColisionTravel, bOutOfScreen - - -def mov_diagonal(self,toTravel): - #asume fasteness <32 - x0=self.x;y0=self.y - r=self.radius-1 - veldir = self.veldir - level = self.level - bOutOfScreen = False - bBump = False - nonColisionTravel = toTravel - #tentative next pos - x1=x0+veldir[0]*toTravel - y1=y0+veldir[1]*toTravel - #check out of screen - if veldir[0]<0: - if x1+self.width<0: - bOutOfScreen = True - else: - if x1>=self.level.width*32: - bOutOfScreen = True - if veldir[1]<0: - if y1+self.height<0: - bOutOfScreen = True - else: - if y1>=self.level.height*32: - bOutOfScreen = True - if bOutOfScreen: - return bBump, toTravel, toTravel, bOutOfScreen - - #test colision by checking the posible colisions of three points - #if a,b center of stone, - #the case test are: - # (a,b)+r*cos(45)*veldir - # (a,b)+r*(veldir[0],0) - # (a,b)+r*(0,veldir[1]) - #and we need to test if colisions happens when moving - #dt*fasteness*veldir - a=x0+self.width/2.0 - b=y0+self.height/2.0 - - aa=a+r*veldir[0] - bb=b+r*veldir[1] - - steps = int(toTravel)+1; - dx=self.fasteness/float(steps)*veldir[0] - dy=self.fasteness/float(steps)*veldir[1] - - self.bounceDir = veldir - for i in range(0,steps): - aa += dx; a += dx - bb += dy; b += dy - #note: aa and bb seems the correct but with veldir >0 bounces prematurelly - #with (aa-1) and (bb-1) looks better, albeit not perfect. - if level[int(aa)/32,int(b)/32]: - bBump=True - self.bounceDir[0]=-veldir[0] - if level[int(a)/32,int(bb)/32]: - self.bounceDir[1]=-veldir[1] - bBump = True - if bBump: - break - - if not bBump: - aa=(x0+self.width/2.0)+r*0.7071*veldir[0] - bb=(y0+self.height/2.0)+r*0.7071*veldir[1] - for i in range(0,steps): - aa += dx - bb += dy - if level[int(aa)/32,int(bb)/32]: - bBump=True - self.bounceDir[0]=-veldir[0] - self.bounceDir[1]=-veldir[1] - if bBump: - break - if bBump: - nonColisionTravel = i/float(steps)*toTravel - else: - nonColisionTravel = toTravel - - return bBump, toTravel, nonColisionTravel, bOutOfScreen - -def calcSpriteBounceDir( ts , s ): - """ts sprite to bounce - s obstacle sprite - .move() must be mov_diag""" - #for robustness the entire plane is partitioned in five regions: - #the diagonals of sprite target grows to the infinite. points over the - #diagonals are one region, the interior of each rotated quadrant are the - #others. Then, sprite to bounce is asigned the region of its center. - #Each region has an obvious meaning of tell bounce dir. - #diagonals are: - # y= s.height/s.width(x-s.x)+ s.y - # y=-s.height/s.width(x-s.x)+ s.y+s.height - # note: if minOverlap is refined to (minOverlap_x,minOverlap_y) then - # corrections will be needed - # algoritms that revert one or more components of veldir proven not - # robust. - - cx = ts.x+ts.width/2. - cy = ts.y+ts.height/2. - - u = s.height/float(s.width)*(cx-s.x) - d1 = u + s.y - cy - d2 = -u + s.y+s.height -cy - dbgPrint( 'sb', g_devflags['F5'], "d1=",d1," d2=",d2) - if abs(d1)<0.3 or abs(d2)<0.3: - #into diagonals - if s.x+s.width/2.0: - if d2>0: - ts.bounceDir[1]=-1 - ts.bounceDir[0]=ts.veldir[0] - else: - ts.bounceDir[0]=1 - ts.bounceDir[1]=ts.veldir[1] - else: - if d2>0: - ts.bounceDir[0]=-1 - ts.bounceDir[1]=ts.veldir[1] - else: - ts.bounceDir[1]= 1 - ts.bounceDir[0]=ts.veldir[0] - -class PhysicsStoneSprite(AnimatedSprite): - """ non living entities - visual aspect must be near round, to facilitate colision detection""" - def __init__(self, level, x, y, w, h, animations,radius, veldir, - fasteness, collisionTable=[], dvy=0., bounceFactor=1, subgroup="global"): - AnimatedSprite.__init__(self, x, y, w, h, animations) - self.level = level - self.radius = radius - self.veldir = veldir - self.fasteness = fasteness - if fasteness<0: - self.move = mov_0 - elif veldir[0] and veldir[1]: - self.move = mov_diagonal - elif veldir[0]: - self.move = mov_h - else: - self.move = mov_v - - self.subgroup = subgroup - self.bounceFactor = bounceFactor - self.dvy = dvy - dbgPrint( 'sb', g_devflags['F5'], "##################### in constructor phstones: dvy=",self.dvy) - self.collisionTable = collisionTable - - self.moving = fasteness>0 - self.tubed = False - self.falling = False - self.bounceDir = None - - def hack_info_vel(self): #must be NOP. - pass - - def physics(self): - maxBounces = 4 - x0 = self.x - y0 = self.y - r = self.radius - dvy = self.dvy - if dvy: - dt = 1.0 - toTravel = 0.5*dvy + self.fasteness*self.veldir[1] - if toTravel<0: - toTravel = -toTravel - else: - toTravel = self.fasteness - while toTravel and maxBounces: - maxBounces -= 1 - dbgPrint( 'sb', g_devflags['F5'], "@@@@@@@@@@@@@@ maxBounces=",maxBounces) - bBump, toTravel, nonColisionTravel, bOutOfScreen = self.move(self,toTravel) - dbgPrint( 'sb', g_devflags['F5']," bBump=",bBump," toTravel=",toTravel," nonColisionTravel=",nonColisionTravel) - maxTravel, bGenStuck, tl = getSpritesTouched( self, nonColisionTravel ) - dbgPrint( 'sb', g_devflags['F5']," maxTravel=",maxTravel," bGenStuck=",bGenStuck) - x1 = x0 + maxTravel*self.veldir[0] - y1 = y0 + maxTravel*self.veldir[1] - self.x = x1; self.y=y1 - self.rect.x=x1; self.rect.y=y1 - #update toTravel, and fasteness if grav - if not dvy: - toTravel -= maxTravel - else: - if toTravel<=maxTravel: - used_dt = dt - else: - used_dt = dt*maxTravel/toTravel - if used_dt<0: - used_dt = -used_dt - dt -= used_dt - if self.veldir[1]>0: - self.fasteness += used_dt*dvy - else: - self.fasteness -= used_dt*dvy - if self.fasteness<0: - self.fasteness = -self.fasteness - self.veldir[1]=1 - toTravel = (0.5*dvy+self.fasteness*self.veldir[1])*dt - if toTravel<0 : - toTravel = -toTravel - if toTravel<1.e-6: - toTravel = 0 - dbgPrint( 'sb', g_devflags['F5']," decremented toTravel=",toTravel) - - x0=x1; y0=y1 - if bOutOfScreen: - bOutOfScreen = ( x1+self.width<0 or x1>self.level.width or - y1+self.height<0 or y1>self.level.height ) - - #handle world colisions - if nonColisionTravel==maxTravel: - if bBump: - toTravel = self.OnWorldCollision(self,toTravel) - tl=[] # at the risk of loosing some touch, empty the list - # and let the next pass detect the touchs ( reason: - # bounce after bounce of world colision does bad --> - #UPDATE: badiness untested-unanalized for this version) - - #process all sprite touch - for freeTravel, minOverlap, bStop,bStuck, collideGroup, spriteTouched,\ - self_action, inflict_action in tl: - dbgPrint( 'sb', g_devflags['F5'],"@@@", self_action ) - if self_action =="bounceSelf" or self_action=="bounceBoth": - spriteTouched.hack_info_vel() - dbgPrint( 'sb', g_devflags['F5'], "bounce; veldir=[ %d , %d ]"%(self.veldir[0],self.veldir[1])) - - #get bounce direction for self - if not(self.veldir[0] and self.veldir[1]): - self.bounceDir = [-self.veldir[0],-self.veldir[1]] - else: - calcSpriteBounceDir( self , spriteTouched ) - dbgPrint( 'sb', g_devflags['F5'], " bounceDir=[ %d , %d ]"%(self.bounceDir[0],self.bounceDir[1])) - - #if not bounceBoth must handle the 'chase' case - if self_action=="bounceSelf": - fasteness = self.fasteness - #code can be added to reduce fasteness when rev chase - if (self.bounceDir[0] and - self.bounceDir[0]==spriteTouched.veldir[0] and - self.fasteness1.e-6: - toTravel *= fasteness/self.fasteness - else: - toTravel = fasteness - self.fasteness = fasteness - - else: #"bounceBoth" , untested - #'bounce' direction for spriteTouched, simetrical to bounceSelf - if isinstance( spriteTouched,PhysicsStoneSprite ): - if not(spriteTouched.veldir[0] and spriteTouched.veldir[1]): - spriteTouched.bounceDir = [-spriteTouched.veldir[0],-spriteTouched.veldir[1]] - else: - calcSpriteBounceDir( spriteTouched, self ) - collide_bounce( spriteTouched , 0) - else: - #old style physycs sprite; they only move h or v - # TODO - pass - #spriteTouched.doAction("afterBeBounced") - - toTravel = collide_bounce(self,toTravel) - dbgPrint( 'sb', g_devflags['F5']," after bounce toTravel=",toTravel) -### note: maybe the else must catch self_action=='atach' - else: - self.doAction(self_action) - spriteTouched.doAction(inflict_action) - #good, all sprite touchs procesed - if bOutOfScreen: - self.kill() - return - #tryied to move k-times - if toTravel: - dbgPrint( 'sb', g_devflags['F5'], "@@@probably stuck-crushed. toTravel=",toTravel) - - - def doAction(self,action): - if action=='die': - self.kill() - -# probably we must add detection of "crushed" diff -Nru magicor-1.1/magicor/sprites/player.py magicor-1.0/magicor/sprites/player.py --- magicor-1.1/magicor/sprites/player.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/sprites/player.py 2007-01-21 22:11:24.000000000 +0100 @@ -114,7 +114,7 @@ (ImageFrame(self.IMAGE, 32, 48), SoundFrame("samples/push"), AnimationFrame(12, 2), - AnimationFrame(13, 2), + AnimationFrame(13, 4), AnimationFrame(12, 2), AnimationFrame(0, 0), AttributeFrame("pushing", False), @@ -199,7 +199,7 @@ (ImageFrame(self.IMAGE, 32, 48), SoundFrame("samples/push"), AnimationFrame(14, 2), - AnimationFrame(15, 2), + AnimationFrame(15, 4), AnimationFrame(14, 2), AnimationFrame(3, 0), AttributeFrame("pushing", False), @@ -472,10 +472,6 @@ self.setAnimation("happy") self._finished = True - def doAction(self,action): - if action=='die': - self.die() - def physics(self): if self.dead: self.x += self.dieX @@ -524,8 +520,7 @@ self.height, self, Tube) - if ((tube and tube.direction == "left") - or not self.blockedRightAbove()): + if tube or not self.blockedRightAbove(): self.jumping = True if tube: self.setAnimation("jump-tube-right") @@ -533,8 +528,7 @@ else: self.setAnimation("jump-right") self.moving = 0 - elif (block and not block.blockedRight() and - block.y+464: - self.event_mov1_terminated() - -def mov2_seeker(self): - other_heading = [(self.target.x+self.target.width/2.)-(self.x+self.width/2.), - (self.target.y+self.target.height/2.)-(self.y+self.height/2.)] - d=norm2(other_heading) - if d<1.e-6: d=1. - other_heading = [other_heading[0]/d, other_heading[1]/d] - a=0.9 - new_heading = [ a*self.heading[0]+(1.-a)*other_heading[0], - a*self.heading[1]+(1.-a)*other_heading[1] ] - n2=norm2(new_heading) - self.heading = [new_heading[0]/n2, new_heading[1]/n2] - angle1=angle_from_heading(self.heading) - if self.angle0!=angle1: - self.setAnimation("%d"%angle1,False) - self.angle0 = angle1 - terminal_fasteness = 6. - self.fasteness = a*self.fasteness+(1.-a)*terminal_fasteness - if d<4.: - self.target.die() - self.x+=self.heading[0]*self.fasteness - self.y+=self.heading[1]*self.fasteness - - -class Seeker(AnimatedSprite): - def __init__(self, x, y, heading,fasteness,target): - self.xx0 = x; self.yy0=y - self.fasteness = fasteness - self.target = target - #normalize heading, just in case - n2=norm2(heading) - if n2<1.e-6: - n2=heading[1]=1.0 - self.heading =[ heading[0]/n2 , heading[1]/n2 ] - self.angle0 = angle_from_heading(self.heading) - initial_anim = "%d"%self.angle0 - - self.subgroup = 'seeker' - d={"default": (ImageFrame("sprites/seeker3x18", 18, 18), - CallbackFrame(self.setAnimation, initial_anim))} - for i in range(0,16): - d["%d"%i]=( - ImageFrame("sprites/seeker3x18", 18, 18), - AnimationFrame(i*4,2), - AnimationFrame(i*4+1,2), - AnimationFrame(i*4+2,2), - AnimationFrame(i*4+3,2), - JumpFrame(i*4) ) - - self.mov = mov1_seeker - - AnimatedSprite.__init__(self, x, y, 18, 18, d ,'default') - - def event_mov1_terminated(self): - self.mov=mov2_seeker - - def physics(self): - self.mov(self) diff -Nru magicor-1.1/magicor/sprites/stones.py magicor-1.0/magicor/sprites/stones.py --- magicor-1.1/magicor/sprites/stones.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/sprites/stones.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -""" - flying stones - -Copyright 2006 Peter Gebauer. Licensed as Public Domain. -(see LICENSE for more info) -""" - -import math, random -from magicor.sprites import * -from magicor.sprites.blocks import Ice -from magicor import g_groups - -class Ball(PhysicsStoneSprite): - """ destroyed if touching fire or active lava. kills living things - main params: movement_type, fasteness, position, velocity""" - @classmethod - def parse(cls,arg): - - spl = arg.split(" ", 4) - veldir=[0,0] - try: - veldir[0]=int(spl[0]) - veldir[1]=int(spl[1]) - fasteness = float(spl[2]) - t=veldir[0]*veldir[1] - if ( t!=0 and t!=1 ) or fasteness<0: - raise ValueError - if len(spl)<4: - dvy = 0. - else: - dvy = float(spl[3]) - if dvy<0: - raise ValueError - bReadOk = True - except ValueError,IndexError: - bReadOk = False - warnings.warn( "Ball requires veldir_x , veldir_y , fasteness, [ dvy ]") - print "in Ball.parse; returns ",bReadOk, veldir, fasteness - print "in Ball.parse; returns ",bReadOk, veldir, fasteness, dvy - return bReadOk, veldir, fasteness, dvy - - def __init__(self, level, x, y, veldir, fasteness, dvy=0.,bounceFactor=1.,subgroup="global"): - PhysicsStoneSprite.__init__( - self, level, x+16-4, y+16-4, 8, 8, - {"default": (ImageFrame("sprites/ball_b", 8, 8), - AnimationFrame(0, 8), - JumpFrame(1),), - "evaporate": (ImageFrame("sprites/ball_b", 8, 8), - AnimationFrame(1,2), - AnimationFrame(2,2), - AnimationFrame(3,2), - KillFrame())}, - 4, - veldir,fasteness,[],dvy - ) - self.OnWorldCollision = collide_bounce - self.collisionTable = [ (g_groups['fires'],None,4,False,'evaporate',None), - (g_groups['blocks'],None,1,True,'bounceSelf',None), - (g_groups['enemies'],None,3,True,'evaporate','die'), - (g_groups['players'],None,2,True,'bounceSelf',None) - ] - - - def doAction(self,action): - if action == 'evaporate': - self.setAnimation('evaporate') - return - if action == 'die': - self.kill() - return - print "Unknown action for Ball" - - - diff -Nru magicor-1.1/magicor/sprites/world.py magicor-1.0/magicor/sprites/world.py --- magicor-1.1/magicor/sprites/world.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/sprites/world.py 2007-01-21 22:11:24.000000000 +0100 @@ -5,61 +5,40 @@ (see LICENSE for more info) """ -import random,math +import random from magicor.sprites import * from magicor.sprites.blocks import Ice -from magicor.sprites.seekers import Seeker -from magicor import Text, g_groups +from magicor import Text class Lava(AnimatedSprite): def __init__(self, x, y, blocksGroup, players, fireGroup, - worldGroup, dormant,bSpiting,t): - if bSpiting: s="sprites/spiting_lava" - else: s="sprites/lava" + worldGroup, dormant): AnimatedSprite.__init__( self, x, y, 32, 64, - {"default": (ImageFrame(s, 32, 64), - AnimationFrame((0+x/32)%12, 2), - AnimationFrame((1+x/32)%12, 2), - AnimationFrame((2+x/32)%12, 2), - AnimationFrame((3+x/32)%12, 2), - AnimationFrame((4+x/32)%12, 2), - AnimationFrame((5+x/32)%12, 2), - AnimationFrame((6+x/32)%12, 2), - AnimationFrame((7+x/32)%12, 2), - AnimationFrame((8+x/32)%12, 2), - AnimationFrame((9+x/32)%12, 2), - AnimationFrame((10+x/32)%12, 2), - AnimationFrame((11+x/32)%12, 2), + {"default": (ImageFrame("sprites/lava", 32, 64), + AnimationFrame(0, 8), + AnimationFrame(1, 8), + AnimationFrame(2, 8), + AnimationFrame(3, 8), JumpFrame(1)), - "dormant": (ImageFrame(s, 32, 64), - AnimationFrame(12, 8),), - "erupt": (ImageFrame(s, 32, 64), - AnimationFrame(12, 2), - AnimationFrame(13, 2), - AnimationFrame(14, 2), - AnimationFrame(15, 2), - AnimationFrame(16, 2), - AnimationFrame(17, 2), - AnimationFrame(18, 2), - CallbackFrame(self.ignitePeers)), -## AnimationFrame(0, 4), -## AnimationFrame(1, 4), -## AnimationFrame(2, 4), -## AnimationFrame(3, 4), -## AnimationFrame(4, 4), -## AnimationFrame(5, 4), -## AnimationFrame(6, 4), -## AnimationFrame(7, 4), -## JumpFrame(8)), + "dormant": (ImageFrame("sprites/lava", 32, 64), + AnimationFrame(4, 8),), + "erupt": (ImageFrame("sprites/lava", 32, 64), + AnimationFrame(4, 4), + AnimationFrame(5, 4), + AnimationFrame(6, 4), + AnimationFrame(7, 4), + CallbackFrame(self.ignitePeers), + AnimationFrame(0, 8), + AnimationFrame(1, 8), + AnimationFrame(2, 8), + AnimationFrame(3, 8), + JumpFrame(5)), } ) self.dormant = dormant - self.bSpiting = bSpiting - self.spitDelta = t - self.spitCnt = t if dormant: self.setAnimation("dormant") self.worldGroup = worldGroup @@ -73,7 +52,6 @@ self.resources.playSound("samples/erupt") def ignitePeers(self): - self.setAnimation("default") for lava in self.worldGroup.getSprites(self.x - 1, self.y, 0, @@ -107,13 +85,6 @@ and player.y == self.y and not player.dead): player.die() - - if self.bSpiting: - if self.spitCnt>0: - self.spitCnt -=1 - else: - #create a new lump - self.spitCnt = self.spitDelta class Tube(PhysicsSprite): @@ -227,89 +198,3 @@ def draw(self, surface): PhysicsSprite.draw(self, surface) - -class Trapola(AnimatedSprite): - def __init__(self, x, y): - self.explodeStage = 0 # frame count from explosion - AnimatedSprite.__init__( self, x, y, 32, 34, - {"default": (ImageFrame("sprites/trapola2_q", 32, 34), - AnimationFrame(0, 3), - AnimationFrame(1, 3), - AnimationFrame(2, 3), - AnimationFrame(3, 3), - AnimationFrame(4, 3), - AnimationFrame(5, 3), - AnimationFrame(6, 3), - AnimationFrame(7, 3), - AnimationFrame(8, 3), - AnimationFrame(9, 3), - AnimationFrame(10, 3), - AnimationFrame(11, 3), - JumpFrame(1) - ), - "explode": (ImageFrame("sprites/trapola2b_exp", 64, 64), - AnimationFrame(0, 2), - AnimationFrame(1, 2), - AnimationFrame(2, 2), - AnimationFrame(3, 2), - AnimationFrame(4, 2), - AnimationFrame(5, 2), - AnimationFrame(6, 2), - AnimationFrame(7, 2), - AnimationFrame(8, 2), - AnimationFrame(9, 2), - AnimationFrame(10, 2), - AnimationFrame(11, 2), - AnimationFrame(12, 2), - AnimationFrame(13, 2), - AnimationFrame(14, 2), - AnimationFrame(15, 2), - #JumpFrame(15) - KillFrame() - ) - } - ) - - def eventExplode(self): - #HERE: start box animation, including sound effects - self.explodeStage=1 - self.setAnimation("explode") - # setAnimation at fault or missing feature? - self.width = 64 - self.height = 64 - - def physics(self): - if self.explodeStage==0: - #if any sprite except decoration and light touches, then trigger the trapola - for k,group in g_groups.iteritems(): - if k!='decorations' and k!='world': - s=pygame.sprite.spritecollideany(self,group) - if s: - self.eventExplode() - break - - else: - self.explodeStage +=1 - if self.explodeStage<2*8+2 and self.explodeStage%8==1: - #release a wave of seekers - x=self.x+8; y=self.y+8 - da=math.radians(360./8.) - a0=(self.explodeStage/8-1)*math.radians(360./16.) - target = None - for s in g_groups['players']: - target = s - break - if target is None: - return - for i in range(0,8): - heading = [math.cos(i*da+a0),math.sin(i*da+a0)] - g_groups['stones'].add(Seeker(x+heading[0]*4., y+heading[1]*4., heading,3.,target)) - - - def draw(self, surface, offsetX = 0, offsetY = 0): - if self.explodeStage!=0: - #correct for bigger size - offsetX -= 16 - offsetY -= 16 - AnimatedSprite.draw(self, surface, offsetX, offsetY) - diff -Nru magicor-1.1/magicor/states/play.py magicor-1.0/magicor/states/play.py --- magicor-1.1/magicor/states/play.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/states/play.py 2007-01-21 22:11:24.000000000 +0100 @@ -8,16 +8,15 @@ import pygame, time, os, warnings from pygame.mixer import music -from magicor import Text, set_group +from magicor import Text from magicor.resources import ResourceNotFound from magicor.states import MenuState, BaseState, ErrorState from magicor.states.options import MainOptionsState from magicor.sprites import AnimationGroup from magicor.sprites.blocks import BlocksGroup, Ice, NormalIce -from magicor.sprites.world import Lava, Tube, Trapola +from magicor.sprites.world import Lava, Tube from magicor.sprites.fires import Fire from magicor.sprites.player import Player -from magicor.sprites.stones import Ball from magicor.sprites.decorations import Decoration from magicor.sprites.enemies import (WalkingEnemy, ClimbingEnemy, @@ -74,19 +73,12 @@ self.resources[self.config["default_tile"]]) self.level = level self.blocks = BlocksGroup() - set_group( 'blocks', self.blocks ) self.decorations = AnimationGroup() self.fires = AnimationGroup() - set_group( 'fires', self.fires ) self.world = AnimationGroup() - set_group( 'world', self.world ) self.lights = AnimationGroup() self.enemies = AnimationGroup() - set_group( 'enemies', self.enemies ) self.players = AnimationGroup() - set_group( 'players', self.players ) - self.stones = AnimationGroup() - set_group( 'stones', self.stones ) self.hudSprites = AnimationGroup() self.starting = 17 self.startTime = time.time() @@ -159,29 +151,12 @@ elif arg == "connect-right": ice.addConnections(1) elif name == "lava": - ##->@@spitting lava modifications - bSpiting = False - t=None - if arg is None: - bDormant=False - else: - spl=arg.split(' ') - if spl[0]=='dormant': - bDormant=True - else: - bSpiting=True - bDormant=bool(spl[0]=='spit_dorm') - if len(spl)<2: t=16 - else: t = int(spl[3]) self.world.add(Lava(x * 32, y * 32, self.blocks, self.players, self.fires, self.world, - bDormant, - bSpiting, - t)) - ##<-@@spitting lava modifications + bool(arg == "dormant"))) elif name == "fire": self.fires.add(Fire(x * 32, y * 32, self.level, @@ -258,18 +233,6 @@ self.players, self.fires, self.world)) - elif name == "ball": - bReadOk, direction, fasteness, dvy = Ball.parse(arg) - if bReadOk: - self.stones.add(Ball(self.level, x*32, y*32,direction,fasteness,dvy)) - - elif name == "trapola": - self.world.add(Trapola(x*32,y*32-1)) - if not self.level[x,y]: - #TODO: put a suitable tile if empty - at this time level - #designers should put a tile behind the trapola - self.level[x, y] = "!" - elif name == "direction": self.hudSprites.add(Direction(x * 32, y * 32, arg)) if not self.player: @@ -389,17 +352,6 @@ v = 16 + self.ending if self.ending == 0: if self.player._finished: - this_time = int(time.time() - self.startTime) - if self.config.has_key("time_"+self.level.title): - best_time = min(self.config.getInt("time_"+self.level.title), this_time) - else: - best_time = this_time - print "best time for "+self.level.title+" is "+str(best_time) - self.config["time_"+self.level.title] = best_time - fn = "%s/magicor.conf"%self.config.get("user_path", "~/.magicor") - self.config.saveFile(fn) - - self._next = self.previous(self.config, self.data, self.screen) @@ -414,16 +366,15 @@ self.renderSurface.blit(self.levelSurface, (0, 0)) self.fires.animate() self.fires.draw(self.renderSurface) + self.players.draw(self.renderSurface) self.enemies.draw(self.renderSurface) self.world.animate() - self.lights.update() - self.lights.draw(self.renderSurface) - self.blocks.draw(self.renderSurface) - self.players.draw(self.renderSurface) self.world.draw(self.renderSurface) - self.stones.draw(self.renderSurface) self.decorations.animate() self.decorations.draw(self.renderSurface) + self.lights.update() + self.lights.draw(self.renderSurface) + self.blocks.draw(self.renderSurface) self.hudSprites.update() self.hudSprites.draw(self.renderSurface) self.screen.blit(self.renderSurface, (80, 16)) @@ -448,17 +399,15 @@ self.fires.update() self.fires.draw(self.renderSurface) self.players.update() + self.players.draw(self.renderSurface) self.enemies.update() self.enemies.draw(self.renderSurface) self.world.update() - self.blocks.update() - self.stones.update() - self.blocks.draw(self.renderSurface) - self.players.draw(self.renderSurface) self.world.draw(self.renderSurface) self.decorations.update() self.decorations.draw(self.renderSurface) - self.stones.draw(self.renderSurface) + self.blocks.update() + self.blocks.draw(self.renderSurface) if self.config.get("eyecandy"): self.lights.update() self.lights.draw(self.renderSurface) diff -Nru magicor-1.1/magicor/states/title.py magicor-1.0/magicor/states/title.py --- magicor-1.1/magicor/states/title.py 2009-04-24 12:59:37.000000000 +0200 +++ magicor-1.0/magicor/states/title.py 2007-01-21 22:11:24.000000000 +0100 @@ -129,7 +129,6 @@ self.resources.setDefaultTile( self.resources[self.config["default_tile"]]) self.scaleAngle = 0 - self.selectDelay = 0 self.loaded = False self.shadeSurface = pygame.Surface((screen.get_width(), screen.get_height()), @@ -145,20 +144,14 @@ self.levelPaths = {} for path, levelInfo in self.resources.loadLevelData(): for filename, data in levelInfo: - theme = os.path.dirname(filename[len(path):])[1:] - if not theme.startswith("_") or config.get("devmode"): - level = Level(data) - level.theme = theme or None - self.levels.append(level) - self.levelPaths[level] = path + filename + theme = os.path.dirname(filename[len(path):]) + level = Level(data) + level.theme = theme or None + self.levels.append(level) + self.levelPaths[level] = path + filename self.levels.sort(lambda x, y: cmp(x.theme, y.theme) or cmp(x.title, y.title)) - #start possibly at a level never tried - for i in xrange(len(self.levels)): - if (not self.config.getInt("time_"+self.levels[i].title)): - self.selected = i - break if self.data.lastLevelFinished: for i in xrange(len(self.levels)): if (self.levels[i].id == self.data.lastLevelFinished @@ -170,17 +163,14 @@ if self.levels[i].id == self.data.lastLevel: self.selected = i break - if config.getBool("music"): - self.resources.playMusic("music/menu") + self.resources.stopMusic() self.updateInfo() def control(self): if self.controls.escape: self.setNext(TitleState(self.config, self.data, self.screen)) - self.resources.stopMusic() self.controls.clear() elif self.controls.start or self.controls.action: - self.resources.stopMusic() self.resources.playSound("samples/start") self.setNext(PlayState(self.config, self.data, @@ -191,13 +181,13 @@ self.resources.playSound("samples/menu") self.selected = (self.selected - 1) % len(self.levels) self.loaded = False - self.selectDelay = 2 + self.controls.clear() self.updateInfo() elif self.controls.down: self.resources.playSound("samples/menu") self.loaded = False self.selected = (self.selected + 1) % len(self.levels) - self.selectDelay = 2 + self.controls.clear() self.updateInfo() def updateInfo(self): @@ -218,14 +208,11 @@ self.renderLevel(self.renderSurface) rendered = True except (ValueError, ResourceNotFound), e: - warnings.warn("Unable to init level-Resource not found: %s"%e) + warnings.warn("unable to init level: %s"%e) del self.levels[self.selected] def run(self): - if self.selectDelay: - self.selectDelay -= 1 - else: - self.control() + self.control() width, height = self.screen.get_width(), self.screen.get_height() if self.levels: if self.eyecandy: @@ -258,13 +245,7 @@ else: self.text.font = self.resources["fonts/info-inactive"] if i >= 0 and i < len(self.levels): - if (self.config.getInt("time_"+self.levels[i].title)): - time = self.config.getInt("time_"+self.levels[i].title) - minutes, seconds = divmod(time, 60) - self.text.draw(self.levels[i].title+" ("+str(minutes)+"m"+str(seconds)+"s)", 0, y) - else: - self.text.draw(self.levels[i].title, 0, y) - + self.text.draw(self.levels[i].title, 0, y) self.text.font = self.resources["fonts/info"] #self.text.draw("difficulty %s" # %(self.levels[self.selected].difficulty or "not set"), 0, 268, @@ -341,12 +322,6 @@ elif sprite.name == "direction": v = "sprites/arrow" offset = ["right", "down", "left", "up"].index(sprite.args) - elif sprite.name == "trapola": - w, h = 32, 32 - v = "sprites/trapola2_q" - elif sprite.name == "ball": - w, h = 8, 8 - v = "sprites/ball_b" if v: surface.blit(self.resources["%s"%v], (x * 32, y * 32), diff -Nru magicor-1.1/Magicor.py magicor-1.0/Magicor.py --- magicor-1.1/Magicor.py 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/Magicor.py 2007-01-21 22:11:24.000000000 +0100 @@ -16,7 +16,7 @@ from optparse import OptionParser sys.path.append(".") -from magicor import GameEngine, getConfig, parse_printkeys +from magicor import GameEngine, getConfig from magicor.states.intro import CopyrightNoticeState parser = OptionParser(usage="%prog [options]") @@ -33,24 +33,17 @@ baseConf="~/.magicor/magicor.conf" parser.add_option("-j", "--joystick", - action="store", type="int", dest="joystick", - default=None, + action="store", type="int", dest="joystick", default=None, help="enable/disable joystick") parser.add_option("-m", "--music", - action="store", type="int", dest="music", - default=None, + action="store", type="int", dest="music", default=None, help="enable/disable music") parser.add_option("-s", "--sound", - action="store", type="int", dest="sound", - default=None, + action="store", type="int", dest="sound", default=None, help="enable/disable sound") parser.add_option("-f", "--fullscreen", - action="store", type="int", dest="fullscreen", - default=None, + action="store", type="int", dest="fullscreen", default=None, help="enable/disable fullscreen") -parser.add_option("-d","--dev", type="int", dest= "devmode", - default=None, help="enable dev keys") -parser.add_option("-k","--keysprintdbg",type="string", dest="printkeys",default="",help="keys to enable selective printing of debug info. Separator is ':'") (options, args) = parser.parse_args() paths = [ options.configPath, baseConf ] @@ -61,15 +54,12 @@ conf["data_path"]='data' if options.joystick != None: - conf["joystick"] = bool(options.joystick) + conf["joystick"] = options.joystick if options.music != None: conf["music"] = options.music if options.sound != None: conf["sound"] = options.sound if options.fullscreen != None: - conf["fullscreen"] = bool(options.fullscreen) -if options.devmode != None: - conf["devmode"] = bool(options.devmode) -parse_printkeys(options.printkeys) + conf["fullscreen"] = options.fullscreen gameEngine = GameEngine(conf) gameEngine.start(CopyrightNoticeState(conf, None, gameEngine.screen)) diff -Nru magicor-1.1/Makefile magicor-1.0/Makefile --- magicor-1.1/Makefile 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/Makefile 2007-01-21 22:11:24.000000000 +0100 @@ -13,6 +13,7 @@ # Do not change this unless you know what you're doing. PYTHON_VERSION=$(shell python -c "import sys; print sys.version[:3]") #PYTHON_VERSION=2.4 +#PYTHON_VERSION=2.3 # The prefix is added as a prefix (duh) to all other paths as default. PREFIX=/usr/local @@ -24,31 +25,17 @@ SHARE_PATH=$(PREFIX)/share/magicor # Where to find the system-wide config file. CONFIG=$(PREFIX)/etc -# Docbook XSL stylesheet to use -DOCBOOK_STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl -# Options (string parameters) passed to the XSLT processor -#DOCBOOK_OPTIONS=--stringparam name value -# Docbook processing command -DOCBOOK_PROCESS=xsltproc -o $@ $(DOCBOOK_OPTIONS) $(DOCBOOK_STYLESHEET) $< - -# For developers, change version with Magicor version number -VERSION=1.1 +VERSION=1.0 .PHONY: all all: - @echo "Environment:" @echo "Detected Python $(PYTHON_VERSION)" @echo "Library path set to $(PYTHON_LIB)" @echo "Binary path set to $(BIN_PATH)" @echo "Data path set to $(SHARE_PATH)" @echo "Default config in $(CONFIG)" - @echo - @echo "Docbook process (optional doc-target):" - @echo $(DOCBOOK_PROCESS) - @echo - @echo "Valid targets: install, uninstall, clean, doc" - @echo + @echo "Edit the Makefile variables as you must, then 'make install' to install" .PHONY: install install: @@ -63,13 +50,13 @@ chmod a+x $(BIN_PATH)/magicor-editor mkdir -p $(SHARE_PATH) cp -fr data/* $(SHARE_PATH) - @echo "Done. If everything wen't well you can now run '$(BIN_PATH)/Magicor'" + @echo "Done. If everything wen't well you can now run '$(BIN_PATH)/magicor'" .PHONY: uninstall uninstall: rm -Rf $(PYTHON_LIB) rm -Rf $(SHARE_PATH) - rm -f $(BIN_PATH)/magicor $(BIN_PATH)/magicor-editor + rm -f $(BIN_PATH)/magicor* .PHONY: clean clean: @@ -92,9 +79,3 @@ tar -cvzf magicor-source-$(VERSION).tar.gz -C dist magicor-$(VERSION) rsync -Cavr data dist/magicor-$(VERSION)/ tar -cvzf magicor-data-$(VERSION).tar.gz -C dist magicor-$(VERSION)/data - -.PHONY: doc -doc: doc/manual.xhtml - -mdoc/manual.xhtml: doc/manual.docbook - $(DOCBOOK_PROCESS) diff -Nru magicor-1.1/Makefile.debian magicor-1.0/Makefile.debian --- magicor-1.1/Makefile.debian 2009-04-24 13:12:12.000000000 +0200 +++ magicor-1.0/Makefile.debian 2009-06-24 08:10:59.000000000 +0200 @@ -12,42 +12,30 @@ # Do not change this unless you know what you're doing. PYTHON_VERSION=$(shell python -c "import sys; print sys.version[:3]") -#PYTHON_VERSION=2.5 +#PYTHON_VERSION=2.4 +#PYTHON_VERSION=2.3 # The prefix is added as a prefix (duh) to all other paths as default. PREFIX=$(DESTDIR) # Where the magicor package will be installed, including final directory. -PYTHON_LIB=$(PREFIX)/usr/lib/python$(PYTHON_VERSION)/site-packages/magicor +PYTHON_LIB=$(PREFIX)/usr/share/games/magicor/magicor # Where the executable scripts will be installed. -BIN_PATH=$(PREFIX)/usr/games +BIN_PATH=$(PREFIX)/usr/share/games/magicor # Where the shared data will be stored. SHARE_PATH=$(PREFIX)/usr/share/games/magicor # Where to find the system-wide config file. CONFIG=$(PREFIX)/etc -# Docbook XSL stylesheet to use -DOCBOOK_STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl -# Options (string parameters) passed to the XSLT processor -#DOCBOOK_OPTIONS=--stringparam name value -# Docbook processing command -DOCBOOK_PROCESS=xsltproc -o $@ $(DOCBOOK_OPTIONS) $(DOCBOOK_STYLESHEET) $< -# For developers, change version with Magicor version number -VERSION=1.1 +VERSION=1.0 .PHONY: all all: - @echo "Environment:" @echo "Detected Python $(PYTHON_VERSION)" @echo "Library path set to $(PYTHON_LIB)" @echo "Binary path set to $(BIN_PATH)" @echo "Data path set to $(SHARE_PATH)" @echo "Default config in $(CONFIG)" - @echo - @echo "Docbook process (optional doc-target):" - @echo $(DOCBOOK_PROCESS) - @echo - @echo "Valid targets: install, uninstall, clean, doc" - @echo + @echo "Edit the Makefile variables as you must, then 'make install' to install" .PHONY: install install: @@ -55,13 +43,13 @@ mkdir -p $(PYTHON_LIB) cp -fr magicor/* $(PYTHON_LIB) mkdir -p $(BIN_PATH) - cat Magicor.py | python scripts/replacer.py "###CONFIG_PATH###" /etc/magicor.conf > $(BIN_PATH)/magicor + cat Magicor.py | python scripts/replacer.py "###CONFIG_PATH###" /etc/magicor.conf > $(BIN_PATH)/Magicor.py mkdir -p $(CONFIG) cat etc/magicor.conf | python scripts/replacer.py "###SHARE_PATH###" /usr/share/games/magicor > $(CONFIG)/magicor.conf - cat Magicor-LevelEditor.py | python scripts/replacer.py "###CONFIG_PATH###" /etc/magicor-editor.conf > $(BIN_PATH)/magicor-editor + cat Magicor-LevelEditor.py | python scripts/replacer.py "###CONFIG_PATH###" /etc/magicor-editor.conf > $(BIN_PATH)/Magicor-LevelEditor.py cat etc/magicor-editor.conf | python scripts/replacer.py "###SHARE_PATH###" /usr/share/games/magicor > $(CONFIG)/magicor-editor.conf - chmod a+x $(BIN_PATH)/magicor - chmod a+x $(BIN_PATH)/magicor-editor + chmod a+x $(BIN_PATH)/Magicor.py + chmod a+x $(BIN_PATH)/Magicor-LevelEditor.py mkdir -p $(SHARE_PATH) cp -fr data/* $(SHARE_PATH) @echo "Done. If everything wen't well you can now run '$(BIN_PATH)/magicor'" @@ -79,7 +67,6 @@ find . -name "*~" | xargs rm -f rm -Rf dist rm -f magicor-*.tar.gz - rm -f *.cdbs-config_list .PHONY: dist dist: @@ -87,7 +74,6 @@ mkdir -p dist/magicor-$(VERSION) rsync -Cavr --include=*.py magicor dist/magicor-$(VERSION)/ rsync -Cavr --include=*.py scripts dist/magicor-$(VERSION)/ - cp -f *.py dist/magicor-$(VERSION)/ rsync -Cavr etc dist/magicor-$(VERSION)/ cp -f README INSTALL LICENSE COPYRIGHT Makefile dist/magicor-$(VERSION)/ rsync -Cavr --exclude=levels data dist/magicor-$(VERSION)/ @@ -96,8 +82,3 @@ rsync -Cavr data/levels/* dist/magicor-$(VERSION)/data/levels/ sync for f in $$(find dist/magicor-$(VERSION)/data/levels/ -maxdepth 1 -mindepth 1 -type d -printf "%f "); do tar -cvzf magicor-levels-$$f-$(VERSION).tar.gz -C dist/magicor-$(VERSION)/data/levels $$f; done -.PHONY: doc -doc: doc/manual.xhtml - -mdoc/manual.xhtml: doc/manual.docbook - $(DOCBOOK_PROCESS) diff -Nru magicor-1.1/README magicor-1.0/README --- magicor-1.1/README 2009-04-24 12:59:35.000000000 +0200 +++ magicor-1.0/README 2007-01-21 22:11:24.000000000 +0100 @@ -64,6 +64,5 @@ - PyGame hackers - The Gimp hackers (wonderful tool! all graphics made with it) - Michael Krause (author of soundtracker, which I used to make the music) - - Danc ( http://www.lostgarden.com/ for his free textures ) Thanks to all testers and puzzle-game fans out there! diff -Nru magicor-1.1/winstaller/inno_script.iss magicor-1.0/winstaller/inno_script.iss --- magicor-1.1/winstaller/inno_script.iss 2009-04-24 12:59:34.000000000 +0200 +++ magicor-1.0/winstaller/inno_script.iss 2007-01-21 22:11:24.000000000 +0100 @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Magicor" -#define MyVersion "1.1" +#define MyVersion "1.0" #define MyAppPublisher "Peter Gebauer" #define MyAppURL "http://magicor.sourceforge.net" #define MyAppExeName "Magicor.exe" diff -Nru magicor-1.1/winstaller/make_installer.bat magicor-1.0/winstaller/make_installer.bat --- magicor-1.1/winstaller/make_installer.bat 2009-04-24 12:59:34.000000000 +0200 +++ magicor-1.0/winstaller/make_installer.bat 2007-01-21 22:11:24.000000000 +0100 @@ -11,21 +11,20 @@ rem aca se podria borrar el subdir editor, pero de momento no lo hacemos rem hide a problem with magicor.conf path search -undirty.py +%pythonpath% undirty.py rem build a binary distribution with py2exe copy make_bin_distro.py .\magi\*.* cd magi -..\make_bin_distro.py py2exe +%pythonpath% make_bin_distro.py py2exe cd .. svn export ..\data .\magi\dist\data -rd /Q /S .\magi\dist\data\levels\_test copy ..\magicor.conf .\magi\dist\*.* rem add cleaned docs, convert line endings copy ..\LICENSE .\magi\dist\LICENCE.TXT -un2dos.py +%pythonpath% un2dos.py copy readme_win.txt .\magi\dist\README.TXT copy penguin_icon3.ico .\magi\dist\penguin_icon3.ico diff -Nru magicor-1.1/winstaller/README_DEV.txt magicor-1.0/winstaller/README_DEV.txt --- magicor-1.1/winstaller/README_DEV.txt 2009-04-24 12:59:34.000000000 +0200 +++ magicor-1.0/winstaller/README_DEV.txt 2007-01-21 22:11:24.000000000 +0100 @@ -4,7 +4,6 @@ a python + pygame installation that works well with magicor py2exe module, used to build an intermediary binary installation Inno Setup ( a free tool, follow links in py2exe page if you need to download ) - svn (subversion) A checkout of the magicor relevant version to be built. windows XP OS @@ -13,11 +12,10 @@ pygame 1.7.1 py2exe 0.6.5 inno setup 5.1.8.0 - subversion (svn) 1.3.2 win xp + sp2 -The last rev of Magicor tested was rev 175 +The last rev of Magicor tested was rev 134 Not all is fully automated and fancy: @@ -31,22 +29,6 @@ .Theres no error control. Check the output. How to build: -You must work from a checkout for the relevant version, under control of svn. -If your working copy has all the files at the desired version, it is ok to to use to build. Files in your working copy not added to the project are not included. -*Check* that you have a magicor.conf with the desired values at the standart location prior to build. After you adjust paths and version, create a console, cd to winstaller dir and run make_installer.bat -notes for 1.1 release: - -in level.py, class DataParser, method parse I replaced - else: - warnings.warn("invalid data on lin %d ; line=%s"%(lc,line)) - - -by - else: - if spl[0]!='hint' and spl[0]!='description': - warnings.warn("invalid data on lin %d ; line=%s"%(lc,line)) - -That to get rid of a popup error windows when quiting magicor. \ No newline at end of file diff -Nru magicor-1.1/winstaller/readme_win.txt magicor-1.0/winstaller/readme_win.txt --- magicor-1.1/winstaller/readme_win.txt 2009-04-24 12:59:34.000000000 +0200 +++ magicor-1.0/winstaller/readme_win.txt 2007-01-21 22:11:24.000000000 +0100 @@ -1,5 +1,3 @@ - - Contents ------- 1 Copyright, license and contributors @@ -25,9 +23,10 @@ -------- Magicor is a puzzle game similar to Solomons Key, but quite different. - - For installation instructions read INSTALL - - For copyright information read COPYRIGHT - For license information read LICENSE + - Magicor was writen in Python language, using the pygame library + - For updates, source code and other info go to the Magicor project page: + http:\\magicor.sourceforge.net 3 Gameplay instructions @@ -58,13 +57,11 @@ 4 Troubleshoting ----------------- - In old hardware you can set 'eyecandy=false' for better results ( from the options menu or by direct edit magicor.conf ) - - If you hear no sound, use the DirectX diagnostics and tools ( provided with windows ) and try to lower the hardware acceleration slider for sounds. By example old mobos for pentium 3 with via chipset dont give sound at full acceleration but run ok with one notch less. - - Fullscreen is very slow at this time, dont use it. - - At present time the level editor is not suported by the windows installer ; you must get the source version for this. + 5 Special thanks ---------------- - GNU @@ -74,8 +71,5 @@ - PyGame hackers - The Gimp hackers (wonderful tool! all graphics made with it) - Michael Krause (author of soundtracker, which I used to make the music) - - Danc ( http://www.lostgarden.com/ for his free textures ) Thanks to all testers and puzzle-game fans out there! - -Magicor home: http://magicor/sourceforge.net \ No newline at end of file