diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-29 17:38:46 +0200 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-29 17:38:46 +0200 |
| commit | a07392fc219afc45000201d2f495694ad9b82763 (patch) | |
| tree | 0eb3f2b9003ad7ceae4692242e46de56e55053b0 /map | |
| parent | Removed skybox shit (diff) | |
| parent | Norm (diff) | |
| download | 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.gz 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.bz2 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.xz 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.zst 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.zip | |
Merge branch 'fix-details'
Diffstat (limited to 'map')
| -rw-r--r-- | map/lvl_four.cub | 2 | ||||
| -rw-r--r-- | map/map_five.cub | 2 | ||||
| -rw-r--r-- | map/map_one.cub | 44 | ||||
| -rw-r--r-- | map/map_test.cub | 28 |
4 files changed, 54 insertions, 22 deletions
diff --git a/map/lvl_four.cub b/map/lvl_four.cub index 4399923..2694723 100644 --- a/map/lvl_four.cub +++ b/map/lvl_four.cub @@ -25,7 +25,7 @@ L ./map/lvl_five.cub 101 1L1 101 11T11 101111111111111110111 - 100000000000@11000TT11 + 1000000@1111111000TT11 10111111111111101111111 101 1+000000000+1 101 11111T111111011 diff --git a/map/map_five.cub b/map/map_five.cub index b92f4e3..2a11f0c 100644 --- a/map/map_five.cub +++ b/map/map_five.cub @@ -23,7 +23,7 @@ SH 4 11110111111111011100000010001 11110111111111010001010000001 11000000110101010000000000001 -10002000000000000000000000001 +10000000000000000000000000001 10000000000000000001010000001 11000001110101011111011110N01 11110111 1110101 101111 10001 diff --git a/map/map_one.cub b/map/map_one.cub index 9baf31c..16c0ec0 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,43 +1,47 @@ R 1331 998 -NO ./media/img/tex/wood_wall_1.xpm -SO ./media/img/tex/wood_wall_1.xpm -EA ./media/img/tex/wood_wall_1.xpm -WE ./media/img/tex/wood_wall_1.xpm +NO ./media/img/tex/wood_wall_1_small.xpm +SO ./media/img/tex/wood_wall_1_small.xpm +EA ./media/img/tex/wood_wall_1_small.xpm +WE ./media/img/tex/wood_wall_1_small.xpm -C ./media/img/tex/wood_ceil.xpm -F ./media/img/tex/parquet.xpm +C ./media/img/tex/wood_ceil_small.xpm +F ./media/img/tex/parquet_small.xpm S ./media/img/sprites/pillar.xpm S3 ./media/img/sprites/pylon.xpm -S4 ./media/img/sprites/hey.xpm +S4 ./media/img/sprites/larry.xpm +S5 ./media/img/sprites/linus.xpm +S6 ./media/img/sprites/linus.xpm +S7 ./media/img/sprites/linus.xpm +S8 ./media/img/sprites/pylon.xpm +S9 ./media/img/sprites/wood_chest.xpm T ./media/img/sprites/spikes.xpm SH 2 - 1111111111111111111 1000000000000000001 + 1000900080000000001 1000000000000000001 - 1000000000000000001 -111111111111000000000000000001 -100000000000000000000000000001 -100000000000000000000000000001 +111111111111000000000005000001 +10000000000000000T0T0T00000001 +100000000000020304000000T0T001 100000000000000000000000000001 1001000000T0000000000000000001 10110+0+0111000001110000000111 -111111111111110011 10000N001 -1000001 100001 111111111 -1001001 100001 -1011001 100001 +111111111111110011 1000N0001 +1000001 190001 111111111 +1001001 190001 +1911001 190001 111101111111110111 10000000110101011 10000000000000001 -1#000000000000001 -1@000000000000001 -1!000000000000001 +1#0#0#0#000000001 +1@0@0@0@000000001 +1!0!0!0!000000001 10000000000000001 11000000110100011 -11110111111101011 +111101111111T1011 11111 1 1111 diff --git a/map/map_test.cub b/map/map_test.cub new file mode 100644 index 0000000..8adf8a8 --- /dev/null +++ b/map/map_test.cub @@ -0,0 +1,28 @@ +R 800 600 + +NO ./media/img/tex/wood_wall_1_small.xpm +SO ./media/img/tex/wood_wall_1_small.xpm +EA ./media/img/tex/wood_wall_1_small.xpm +WE ./media/img/tex/wood_wall_1_small.xpm + +C ./media/img/tex/wood_ceil_small.xpm +F ./media/img/tex/parquet_small.xpm + +S ./media/img/sprites/pillar.xpm +S3 ./media/img/sprites/pylon.xpm +S4 ./media/img/sprites/larry.xpm +S5 ./media/img/sprites/linus.xpm +S6 ./media/img/sprites/linus.xpm +S7 ./media/img/sprites/linus.xpm + +T ./media/img/sprites/spikes.xpm + +SH 2 + +1111111111111111111 +1000000000000000001 +10000023456000T0001 +100E0023456000T0001 +10000023456000T0001 +1000000000000000001 +1111111111111111111 |