(20140705)

2014-07-05 00:00:00 +02:00
parent 7e6bd08390
commit 29548c6fe0
94 changed files with 432 additions and 829 deletions
--- a/data/._level_03.txt
+++ b/data/._level_03.txt
--- a/data/Explosion16.bfxrsound
+++ b/data/Explosion16.bfxrsound
@@ -1 +0,0 @@
-3,0.5,0.32,0.31,,0.285,,1,,-1,-1,,,0.14,,,-1,,-1,,,,,-1,-1,1,1,,,-1,,-1,masterVolume
--- a/data/Explosion2.bfxrsound
+++ b/data/Explosion2.bfxrsound
@@ -1 +0,0 @@
-3,0.5,,0.2901,0.4276,0.4858,0.3,0.0327,,0.0396,,,,,,,,,,,,,0.4513,0.4207,-0.2057,1,,,,,,,masterVolume
--- a/data/Hit_Hurt10.bfxrsound
+++ b/data/Hit_Hurt10.bfxrsound
@@ -1 +0,0 @@
-3,0.5,,0.0824,,0.1102,0.3,0.2174,,-0.551,,,,,,,,,,,,,,,,1,,,,,,,masterVolume
--- a/data/Hit_Hurt16.bfxrsound
+++ b/data/Hit_Hurt16.bfxrsound
@@ -1 +0,0 @@
-3,0.5,,0.0316,,0.2791,0.3,0.2286,,-0.5036,,,,,,,,,,,,,,,,1,,,0.0144,,,,masterVolume
--- a/data/Laser_Shoot2.bfxrsound
+++ b/data/Laser_Shoot2.bfxrsound
@@ -1 +0,0 @@
-8,0.5,,0.1744,0.1511,0.1706,0.3,0.6762,0.2,-0.2748,,,,,,,,,,,0.5075,-0.0829,,0.395,-0.3199,0.625,,,,,,,masterVolume
--- a/data/Powerup10.bfxrsound
+++ b/data/Powerup10.bfxrsound
@@ -1 +0,0 @@
-2,0.5,,0.3096,,0.4346,0.3,0.2865,,0.1628,,0.5293,0.426,,,,,,,,0.3934,,,,,1,,,,,,,masterVolume
--- a/data/Powerup30.bfxrsound
+++ b/data/Powerup30.bfxrsound
@@ -1 +0,0 @@
-2,0.5,,0.1458,,0.3359,0.3,0.2684,,0.2068,,,,,,,,,,,0.5759,,0.4191,,,1,,,,,,,masterVolume
--- a/data/arrow_down.bmp
+++ b/data/arrow_down.bmp
--- a/data/arrow_down.xcf
+++ b/data/arrow_down.xcf
--- a/data/arrow_left.bmp
+++ b/data/arrow_left.bmp
--- a/data/arrow_left.xcf
+++ b/data/arrow_left.xcf
--- a/data/arrow_right.bmp
+++ b/data/arrow_right.bmp
--- a/data/arrow_right.xcf
+++ b/data/arrow_right.xcf
--- a/data/arrow_up.bmp
+++ b/data/arrow_up.bmp
--- a/data/arrow_up.xcf
+++ b/data/arrow_up.xcf
--- a/data/arrowshooter_down.bmp
+++ b/data/arrowshooter_down.bmp
--- a/data/arrowshooter_down.xcf
+++ b/data/arrowshooter_down.xcf
--- a/data/arrowshooter_left.bmp
+++ b/data/arrowshooter_left.bmp
--- a/data/arrowshooter_left.xcf
+++ b/data/arrowshooter_left.xcf
--- a/data/arrowshooter_right.bmp
+++ b/data/arrowshooter_right.bmp
--- a/data/arrowshooter_right.xcf
+++ b/data/arrowshooter_right.xcf
--- a/data/arrowshooter_up.bmp
+++ b/data/arrowshooter_up.bmp
--- a/data/arrowshooter_up.xcf
+++ b/data/arrowshooter_up.xcf
--- a/data/barrel.bmp
+++ b/data/barrel.bmp
--- a/data/barrel.xcf
+++ b/data/barrel.xcf
--- a/data/barrel2.bmp
+++ b/data/barrel2.bmp
--- a/data/barrel2.xcf
+++ b/data/barrel2.xcf
--- a/data/column.bmp
+++ b/data/column.bmp
--- a/data/column.xcf
+++ b/data/column.xcf
--- a/data/column_faded.bmp
+++ b/data/column_faded.bmp
--- a/data/end.bmp
+++ b/data/end.bmp
--- a/data/end.xcf
+++ b/data/end.xcf
--- a/data/end_point.bmp
+++ b/data/end_point.bmp
--- a/data/end_point.xcf
+++ b/data/end_point.xcf
--- a/data/exit_point.bmp
+++ b/data/exit_point.bmp
--- a/data/exit_point.xcf
+++ b/data/exit_point.xcf
--- a/data/fire.bmp
+++ b/data/fire.bmp
--- a/data/fire.xcf
+++ b/data/fire.xcf
--- a/data/floor.bmp
+++ b/data/floor.bmp
--- a/data/floor.xcf
+++ b/data/floor.xcf
--- a/data/floor_center.bmp
+++ b/data/floor_center.bmp
--- a/data/floor_center.xcf
+++ b/data/floor_center.xcf
--- a/data/floor_left.bmp
+++ b/data/floor_left.bmp
--- a/data/floor_left.xcf
+++ b/data/floor_left.xcf
--- a/data/floor_right.bmp
+++ b/data/floor_right.bmp
--- a/data/floor_right.xcf
+++ b/data/floor_right.xcf
--- a/data/hole_lava.bmp
+++ b/data/hole_lava.bmp
--- a/data/hole_lava.xcf
+++ b/data/hole_lava.xcf
--- a/data/hole_spiked.bmp
+++ b/data/hole_spiked.bmp
--- a/data/hole_spiked.xcf
+++ b/data/hole_spiked.xcf
--- a/data/lamp.bmp
+++ b/data/lamp.bmp
--- a/data/lamp.xcf
+++ b/data/lamp.xcf
--- a/data/level_03.txt
+++ b/data/level_03.txt
@@ -14,10 +14,10 @@
          ##||........||..||........||##      ################
          ##||..LLLLBB||..||..LLLL..||##      ##............##
          ##||............||........||##      ##............##
-          ##||||||||..||||||||||||||||ll########............##
-          ##||||||||||||||||............................EE..##
+          ##||||||||||||||||||||||||||ll########............##
+          ##||||||||..||||||............................EE..##
          ##||||||||..||||||||||||||||llmmmmmmmm............##
-          ##||....BB....||..........||mm      mm............##
+          ##||....BB..||............||mm      mm............##
          ##||..LLLL..||||||BBLLLL..||mm      mm............##
          ##||........||||||........||mm      mmmmmmmmmmmmmm##
          ##||||||||||||||||||||||||||mm
--- a/data/logo.bmp
+++ b/data/logo.bmp
--- a/data/logo.xcf
+++ b/data/logo.xcf
--- a/data/maps.copy/level_00.txt
+++ b/data/maps.copy/level_00.txt
@@ -1,23 +0,0 @@
-33 23
-
-  ############ll################      ######ll############ll####
-  ##..........................##      ##......................##
-  ##..................||......ll########....||||||||||||||....##
-  ##..S1..............||..............S2....||................##
-  ##..................||......llmmmmmmmm....||....||||||||||||##
-  ##..........................mm      mm....||................##
-  ##mmmmmmmmmmllmmmmmmmmmmmmmmmm      mmmmmmmmmmmmll..llmmmmmm##
-                                                  mm..mm
-                                                  mm..mm
-                                                  mm..mm
-                                                  mm..mm
-                                          ##########S3##########
-                                          ##..................##
-                                          ##..................##
-                                          ll..................ll
-                                          mm..BBBBBB..BBBBBB..mm
-                                          mm||||||||ll||||||||mm
-                                          mm..................mm
-                                          mm..................mm
-                                          mm........EE........mm
-                                          mmmmmmmmmmmmmmmmmmmmmm
--- a/data/maps.copy/level_01.txt
+++ b/data/maps.copy/level_01.txt
@@ -1,51 +0,0 @@
-100 100
-
-    ##################
-    ##......S1......##
-    ##..............##
-    ##..............##
-    ##..............##
-    ##mmmmll..llmmmm##
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-############S2##############
-##||||||||........||||||||##
-##||||||||..BBll..||||||||##
-ll||....||||BB....||||||||ll
-mm||..||||||||||||||||||||mm
-mm||..||||||||||||||||||||mm
-mm||..||||||||||||||||||||mm
-mm||..........BB||||BB..||mm
-mm||||||||||..||||||||||||mm
-mmmmmmmmmmll..llmmmmmmmmmmmm
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-############S3############
-##......||......||......##
-##......||..BB..||......##
-ll......||||||||||..BB..ll
-mm||||||rrrrllrrrr||||||mm
-mm......................mm
-mm||||||....BB....||||||mm
-mm......rr||||||rr......mm
-mm......||rrrrrr||......mm
-mm....BB||......||......mm
-mmmmmmmmmmll..llmmmmmmmmmm
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-    ########..########
-    ##..............##
-    ##..............##
-    ##..............##
-    ##......EE......##
-    ##mmmmmmmmmmmmmm##
--- a/data/maps.copy/level_02.txt
+++ b/data/maps.copy/level_02.txt
@@ -1,23 +0,0 @@
-33 23
-
-  ############ll################      ##########################
-  ##..........................##      ##......................##
-  ##..................LL......ll########....LLLLLLLLLLLLLL....##
-  ##..S1..............LL..............S2....LL................##
-  ##..................LL......llmmmmmmmm....LL....LLLLLLLLLLLL##
-  ##..........................mm      mm....LL................##
-  ##mmmmmmmmmmllmmmmmmmmmmmmmmmm      mmmmmmmmmmmmll..llmmmmmm##
-                                                  mm..mm
-                                                  mm..mm
-                                                  mm..mm
-                                                  mm..mm
-                                          ##########S3##########
-                                          ##..................##
-                                          ##..................##
-                                          ll..................ll
-                                          ##..BBBBBB..BBBBBB..##
-                                          ##LLLLLLLLrr||||||||##
-                                          ##..................##
-                                          ##..................##
-                                          ##........EE........##
-                                          ##mmmmmmmmmmmmmmmmmm##
--- a/data/maps.copy/level_03.txt
+++ b/data/maps.copy/level_03.txt
@@ -1,29 +0,0 @@
-100 100
-                ##################
-                ##......S1......##
-                ##..............##
-                ##..............##
-                ##..............##
-                ##mmmmll..llmmmm##
-                      mm..mm
-                      mm..mm
-                      mm..mm
-                      mm..mm
-          ##############S2##############
-          ##||||||||||||..||||||||||||##
-          ##||........||..||........||##      ################
-          ##||..LLLLBB||..||..LLLL..||##      ##............##
-          ##||............||........||##      ##............##
-          ##||||||||..||||||||||||||||ll########............##
-          ##||||||||||||||||............................EE..##
-          ##||||||||..||||||||||||||||llmmmmmmmm............##
-          ##||....BB....||..........||mm      mm............##
-          ##||..LLLL..||||||BBLLLL..||mm      mm............##
-          ##||........||||||........||mm      mmmmmmmmmmmmmm##
-          ##||||||||||||||||||||||||||mm
-          mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-
-
-
-
-
--- a/data/maps.copy/level_04.txt
+++ b/data/maps.copy/level_04.txt
@@ -1,26 +0,0 @@
-33 26
-
-  ############ll################      ######ll##########ll######
-  ##..........................##      ##................VV....##
-  ##..........................ll########......................##
-  ##..S1..............................S2......................##
-  ##..........................llmmmmmmmm>>....................##
-  ##..................AA......mm      mm........AA............##
-  ##mmmmmmmmmmllmmmmmmmmmmmmmmmm      mmmmmmmmmmmmll..llmmmmmm##
-                                                  mm..mm
-                                                  mm..mm
-                                                  mm..mm
-                                                  mm..mm
-                                          ##########S3##########
-                                          ##..................##
-                                          ##............BBBB..##
-                                          ##................<<##
-                                          ll..BBBB............ll
-                                          ##>>................##
-                                          ##............BBBB..##
-                                          ##................<<##
-                                          ll..BBBB............ll
-                                          ##>>................##
-                                          ##..................##
-                                          ##........EE........##
-                                          ##mmmmmmmmmmmmmmmmmm##
--- a/data/maps.copy/level_05.txt
+++ b/data/maps.copy/level_05.txt
@@ -1,69 +0,0 @@
-100 100
-
-    ##################
-    ##......S1......##
-    ##..............##
-    ##..............##
-    ##..............##
-    ##mmmmll..llmmmm##
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-####ll######S2######ll####
-##......................##
-##..BB..BB......BB..BB..##
-##......................##
-##LLLLLLLLrr||rrLLLLLLLL##
-##......AA......AA......##
-##mmmmmmmmll..llmmmmmmmm##
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-############S3############
-##....VV..VV..........LL##
-##LLLLLLLLLLLLLLLLLL..LL##
-##LL..................LL##
-##LL..LLLLLLLLLLLLLLLLLL##
-##LL..................LL##
-##LLLLLLLLLLLLLLLLLL..LL##
-##LL..................LL##
-##LL..LLLLLLLLLLLLLLLLLL##
-##LL..........AA..AA....##
-##mmmmmmmmll..llmmmmmmmm##
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-######VV##VVS4############
-##LLLLLLLLLL..LLLLLLLLLL##
-##LLLLLLLLLL..........LL##
->>LLLLLLLLLLLLLLLLLL..LL##
-mmLL..................LL##
-mmLL..LLLLLLLLLLLLLLLLLL<<
-mmLL..................LLmm
->>LLLLLLLLLLLLLLLLLL..LLmm
-mmLL..................LLmm
-mmLL..LLLLLLLLLLLLLLLLLL<<
-mmLL..........LLLLLLLLLLmm
-mmLLLLLLLLLL..LLLLLLLLLLmm
-mmmmmmmmmmmm..AAmmAAmmmmmm
-          ll..ll
-          mm..mm
-          mm..mm
-          mm..mm
-          mm..mm
-    ########..########
-    ##..............##
-    ##..............##
-    ##..............##
-    ##......EE......##
-    ##mmmmmmmmmmmmmm##
-
-
-
-
--- a/data/maps.copy/level_06.txt
+++ b/data/maps.copy/level_06.txt
@@ -1,21 +0,0 @@
-100 100
-
-
-##################
-##......S1......##
-##..............##
-##..............##
-##..............##
-##mmmmll..llmmmm##
-      mm..mm
-      mm..mm
-      mm..mm
-      mm..mm
-########..########
-##..............##
-##..............##
-##..............##
-##......FF......##
-##mmmmmmmmmmmmmm##
-
-
--- a/data/player_broken.bmp
+++ b/data/player_broken.bmp
--- a/data/player_broken.xcf
+++ b/data/player_broken.xcf
--- a/data/player_down.bmp
+++ b/data/player_down.bmp
--- a/data/player_down.xcf
+++ b/data/player_down.xcf
--- a/data/player_left.bmp
+++ b/data/player_left.bmp
--- a/data/player_right.bmp
+++ b/data/player_right.bmp
--- a/data/player_right.xcf
+++ b/data/player_right.xcf
--- a/data/player_up.bmp
+++ b/data/player_up.bmp
--- a/data/player_up.xcf
+++ b/data/player_up.xcf
--- a/data/rock.bmp
+++ b/data/rock.bmp
--- a/data/rock.xcf
+++ b/data/rock.xcf
--- a/data/save_point.bmp
+++ b/data/save_point.bmp
--- a/data/save_point.xcf
+++ b/data/save_point.xcf
--- a/data/save_point_active.bmp
+++ b/data/save_point_active.bmp
--- a/data/save_point_active.xcf
+++ b/data/save_point_active.xcf
				`@@ -1 +0,0 @@`
				`3,0.5,0.32,0.31,,0.285,,1,,-1,-1,,,0.14,,,-1,,-1,,,,,-1,-1,1,1,,,-1,,-1,masterVolume`
				`@@ -1 +0,0 @@`
				`3,0.5,,0.2901,0.4276,0.4858,0.3,0.0327,,0.0396,,,,,,,,,,,,,0.4513,0.4207,-0.2057,1,,,,,,,masterVolume`
				`@@ -1 +0,0 @@`
				`3,0.5,,0.0824,,0.1102,0.3,0.2174,,-0.551,,,,,,,,,,,,,,,,1,,,,,,,masterVolume`
				`@@ -1 +0,0 @@`
				`3,0.5,,0.0316,,0.2791,0.3,0.2286,,-0.5036,,,,,,,,,,,,,,,,1,,,0.0144,,,,masterVolume`
				`@@ -1 +0,0 @@`
				`8,0.5,,0.1744,0.1511,0.1706,0.3,0.6762,0.2,-0.2748,,,,,,,,,,,0.5075,-0.0829,,0.395,-0.3199,0.625,,,,,,,masterVolume`
				`@@ -1 +0,0 @@`
				`2,0.5,,0.3096,,0.4346,0.3,0.2865,,0.1628,,0.5293,0.426,,,,,,,,0.3934,,,,,1,,,,,,,masterVolume`
				`@@ -1 +0,0 @@`
				`2,0.5,,0.1458,,0.3359,0.3,0.2684,,0.2068,,,,,,,,,,,0.5759,,0.4191,,,1,,,,,,,masterVolume`