diff options
| author | salaaad2 <arthudurant263@gmail.com> | 2020-03-10 16:16:08 +0100 |
|---|---|---|
| committer | salaaad2 <arthudurant263@gmail.com> | 2020-03-10 16:16:08 +0100 |
| commit | 0d589d0038624e3123e6166f6521d1421dd69b23 (patch) | |
| tree | 26db0ad344a9c730192eea0bff01bb410ba225b7 /map | |
| parent | still retard (diff) | |
| parent | ok now (diff) | |
| download | 42-cub3d-0d589d0038624e3123e6166f6521d1421dd69b23.tar.gz 42-cub3d-0d589d0038624e3123e6166f6521d1421dd69b23.tar.bz2 42-cub3d-0d589d0038624e3123e6166f6521d1421dd69b23.tar.xz 42-cub3d-0d589d0038624e3123e6166f6521d1421dd69b23.tar.zst 42-cub3d-0d589d0038624e3123e6166f6521d1421dd69b23.zip | |
merge master
Diffstat (limited to 'map')
| -rw-r--r-- | map/lvl_five.cub | 4 | ||||
| -rw-r--r-- | map/lvl_four.cub | 6 | ||||
| -rw-r--r-- | map/lvl_one.cub | 9 | ||||
| -rw-r--r-- | map/lvl_three.cub | 6 | ||||
| -rw-r--r-- | map/lvl_two.cub | 6 | ||||
| -rw-r--r-- | map/map_five.cub | 1 | ||||
| -rw-r--r-- | map/map_four.cub | 17 | ||||
| -rw-r--r-- | map/map_two.cub | 1 |
8 files changed, 26 insertions, 24 deletions
diff --git a/map/lvl_five.cub b/map/lvl_five.cub index 22d66ab..02df893 100644 --- a/map/lvl_five.cub +++ b/map/lvl_five.cub @@ -9,10 +9,10 @@ S ./media/img/pillar.xpm C ./media/img/plate_small.xpm F ./media/img/plate_small.xpm -LT ./media/img/larry.xpm +LT ./media/img/larry_world.xpm L ./map/map_four.cub -SH 20 +SH 16 MU ./media/sound/TAPE-DU-PIED-ET-FRAPPE-TA-TANTE.wav 111111111111111111111111111111 diff --git a/map/lvl_four.cub b/map/lvl_four.cub index ff39482..a562044 100644 --- a/map/lvl_four.cub +++ b/map/lvl_four.cub @@ -6,10 +6,12 @@ EA ./media/img/arrow3.xpm WE ./media/img/arrow4.xpm S ./media/img/pillar.xpm -C 180,70,110 -F 100,140,114 +C ./media/img/arrow4.xpm +F ./media/img/arrow2.xpm MU ./media/sound/TAPE-DU-PIED-ET-FRAPPE-TA-TANTE.wav +SH 8 + LT ./media/img/plate.xpm L ./map/lvl_five.cub diff --git a/map/lvl_one.cub b/map/lvl_one.cub index 6df5ad2..8eec433 100644 --- a/map/lvl_one.cub +++ b/map/lvl_one.cub @@ -1,14 +1,15 @@ -R 1600 1050 +R 1800 1100 NO ./media/img/BRIQUASSE_3.xpm SO ./media/img/BRIQUASSE_3.xpm EA ./media/img/BRIQUASSE_3.xpm WE ./media/img/BRIQUASSE_3.xpm -S ./media/img/segfot.xpm +S ./media/img/pillar.xpm -C 50,100,200 -F 50,190,124 +C ./media/img/BRIQUASSE_3.xpm +F ./media/img/BRIQUASSE_3.xpm +SH 4 L ./map/lvl_two.cub LT ./media/img/crapaud.xpm diff --git a/map/lvl_three.cub b/map/lvl_three.cub index 45e51d9..d429b98 100644 --- a/map/lvl_three.cub +++ b/map/lvl_three.cub @@ -6,8 +6,10 @@ EA ./media/img/brickwall.xpm WE ./media/img/brickwall.xpm S ./media/img/pillar.xpm -C 100,100,175 -F 100,160,114 +C ./media/img/brickwall.xpm +F ./media/img/brickwall.xpm + +SH 4 LT ./media/img/crapaud.xpm L ./map/lvl_four.cub diff --git a/map/lvl_two.cub b/map/lvl_two.cub index 6c76feb..2e12e19 100644 --- a/map/lvl_two.cub +++ b/map/lvl_two.cub @@ -6,8 +6,10 @@ EA ./media/img/BRIQUASSE_3.xpm WE ./media/img/BRIQUASSE_3.xpm S ./media/img/pillar.xpm -C 100,100,175 -F 50,190,124 +C ./media/img/BRIQUASSE_3.xpm +F ./media/img/BRIQUASSE_3.xpm + +SH 4 L ./map/lvl_three.cub LT ./media/img/crapaud.xpm diff --git a/map/map_five.cub b/map/map_five.cub index cd0a944..3c6bc4a 100644 --- a/map/map_five.cub +++ b/map/map_five.cub @@ -8,6 +8,7 @@ S ./media/img/crapaud.xpm F ./media/img/terre.xpm C 225,30,0 +SB ./media/img/normal_sky.xpm LT ./media/img/linuz.xpm L ./map/map_two.cub diff --git a/map/map_four.cub b/map/map_four.cub index 1e6e2d4..8dcd6fe 100644 --- a/map/map_four.cub +++ b/map/map_four.cub @@ -1,9 +1,9 @@ R 1600 1100 -NO ./media/img/larry.xpm -SO ./media/img/larry.xpm -EA ./media/img/larry.xpm -WE ./media/img/larry.xpm +NO ./media/img/larry_world.xpm +SO ./media/img/larry_world.xpm +EA ./media/img/larry_world.xpm +WE ./media/img/larry_world.xpm S ./media/img/larry.xpm C 26,165,204 @@ -14,14 +14,7 @@ F 24,170,25 10000000000000000000001 10000000000000000000001 10000000000000000000001 -10000000000000000000001 -10000000000000000000001 -10000000000000000000001 -10E00000000000000000001 -10000000000000000000001 -10000000000000000000001 -10000000000000000000001 -10000000000000000000001 +10E00000000000020000001 10000000000000000000001 10000000000000000000001 10000000000000000000001 diff --git a/map/map_two.cub b/map/map_two.cub index 2d6dd1c..085b681 100644 --- a/map/map_two.cub +++ b/map/map_two.cub @@ -6,6 +6,7 @@ EA ./media/img/linuz.xpm WE ./media/img/linuz.xpm S ./media/img/linuz.xpm +SH 5 C 50,100,200 F 150,150,124 |