diff options
| author | salaaad2 <arthurdurant263@gmail.com> | 2020-03-11 18:59:58 +0100 |
|---|---|---|
| committer | salaaad2 <arthurdurant263@gmail.com> | 2020-03-11 18:59:58 +0100 |
| commit | b6388b5101d8187f746f91c89842e932a1d01cb6 (patch) | |
| tree | 70bd9ba7012f5906db01b485ec8f58f5a4697240 /map | |
| parent | close but no cigar (diff) | |
| parent | ca tue (diff) | |
| download | 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.gz 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.bz2 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.xz 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.zst 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.zip | |
get merged
Diffstat (limited to '')
| -rw-r--r-- | map/lvl_five.cub | 13 | ||||
| -rw-r--r-- | map/lvl_one.cub | 2 | ||||
| -rw-r--r-- | map/map_five.cub | 3 | ||||
| -rw-r--r-- | map/map_one.cub | 17 |
4 files changed, 21 insertions, 14 deletions
diff --git a/map/lvl_five.cub b/map/lvl_five.cub index 02df893..bd8acab 100644 --- a/map/lvl_five.cub +++ b/map/lvl_five.cub @@ -12,24 +12,25 @@ F ./media/img/plate_small.xpm LT ./media/img/larry_world.xpm L ./map/map_four.cub +T ./media/img/spikes.xpm SH 16 MU ./media/sound/TAPE-DU-PIED-ET-FRAPPE-TA-TANTE.wav 111111111111111111111111111111 -100000000000000000000000000001 +1T0000000000000000000000000001 11111101111110110111111110111111 - 1111101 101001 10000001 + 1111101 101T01 10000001 1000001 11101101 1111110111111 - 1101101 10000001 1000000000001 + 11T1101 10000001 1T00000000001 101101 111111101 1111111111101 111101 101 101 1000001 101 1011101 101 1011101 101 - 11110000011111N1 1010001 101 + 11110000011111N1 101T001 101 1011011111101111 10111111101 101101 1L0011 10000000001 100001 110111111111111111101 101101 11110000000000000000001 - 101101 10111111111110011111101 + 101101 1011111111111T011111101 111011111101111111111110111111011 -100000000000000000000000000000001 +1T00000000000000000000000000000T1 111111111111111111111111111111111 diff --git a/map/lvl_one.cub b/map/lvl_one.cub index 8eec433..d0ce0a2 100644 --- a/map/lvl_one.cub +++ b/map/lvl_one.cub @@ -1,4 +1,4 @@ -R 1800 1100 +R 1600 1000 NO ./media/img/BRIQUASSE_3.xpm SO ./media/img/BRIQUASSE_3.xpm diff --git a/map/map_five.cub b/map/map_five.cub index 3c6bc4a..d5c3361 100644 --- a/map/map_five.cub +++ b/map/map_five.cub @@ -8,11 +8,10 @@ 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 -SH 5 +SH 4 1111111111111111111111111111111 1000000000110000000000000000001 diff --git a/map/map_one.cub b/map/map_one.cub index 680f4f8..b0eedb0 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,4 +1,4 @@ -R 1000 700 +R 1400 900 NO ./media/img/BRIQUASSES.xpm SO ./media/img/BRIQUASSES_2.xpm @@ -9,21 +9,28 @@ S ./media/img/pillar.xpm C ./media/img/arrow1.xpm F ./media/img/arrow2.xpm -SH 6 +T ./media/img/spikes.xpm +SH 4 111111111111111111 +<<<<<<< HEAD 100000000002000001 100000030002000001 100100000004000201 1011000N0111000001 +======= +120000000011000001 +100100000000000201 +101100000111000001 +>>>>>>> master 111111111111110011 1000001 100001 1001001 100001 1011001 100001 111101111111110111 110000001101010111 -100020000000000011 -100000000000000011 -110000001101010111 +100020T00000000011 +100000T00000W00011 +110000T01101010111 111101111111010111 11111 1 1111 |