From 58b408a130b2bec0d401b43d77ded34c9a8d34f9 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Wed, 25 Mar 2020 18:46:15 +0100 Subject: Fixed sprite parse --- map/lvl_four.cub | 2 +- map/map_one.cub | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) (limited to 'map') 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_one.cub b/map/map_one.cub index a627cf2..e7395cb 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,4 +1,4 @@ -R 1280 1024 +R 1600 1024 NO ./media/img/tex/wood_wall_1.xpm SO ./media/img/tex/wood_wall_1.xpm @@ -11,18 +11,22 @@ F ./media/img/tex/parquet.xpm S ./media/img/sprites/pillar.xpm S3 ./media/img/sprites/pylon.xpm S4 ./media/img/sprites/hey.xpm +S5 ./media/img/sprites/hey.xpm +S6 ./media/img/sprites/hey.xpm +S7 ./media/img/sprites/hey.xpm +S8 ./media/img/sprites/hey.xpm T ./media/img/sprites/spikes.xpm SH 2 - 11111111111111111111 -1111111111110000000000000000001 -1000000000000000000000000000001 -10000E0000000203040506070809001 -1000000000000000000000000000001 -1001000000000000000000000000001 -1011000001110000011111111111111 + 1111111111111111111 +111111111111000000000000000001 +100000000000000000000000000001 +10000E000000020304050607000001 +100000000000000000000000000001 +1001000000T0000000000000000001 +10110+0+0111000001111111111111 111111111111110011 1000001 100001 1001001 100001 -- cgit v1.2.3 From 94c06bc705b8598eb9ce30514f14f583f2538de8 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Wed, 25 Mar 2020 19:27:47 +0100 Subject: Solved segfault, fuck stack --- map/map_one.cub | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'map') diff --git a/map/map_one.cub b/map/map_one.cub index e7395cb..f0a498b 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -11,10 +11,11 @@ F ./media/img/tex/parquet.xpm S ./media/img/sprites/pillar.xpm S3 ./media/img/sprites/pylon.xpm S4 ./media/img/sprites/hey.xpm -S5 ./media/img/sprites/hey.xpm -S6 ./media/img/sprites/hey.xpm -S7 ./media/img/sprites/hey.xpm -S8 ./media/img/sprites/hey.xpm +S5 ./media/img/sprites/larry.xpm +S6 ./media/img/sprites/linus.xpm +S7 ./media/img/sprites/spikes.xpm +S8 ./media/img/sprites/wood_chest.xpm +S9 ./media/img/sprites/first_aid.xpm T ./media/img/sprites/spikes.xpm @@ -23,12 +24,12 @@ SH 2 1111111111111111111 111111111111000000000000000001 100000000000000000000000000001 -10000E000000020304050607000001 +100000000000020304050607080901 100000000000000000000000000001 1001000000T0000000000000000001 -10110+0+0111000001111111111111 -111111111111110011 -1000001 100001 +10110+0+0111000001110000000111 +111111111111110011 1000N0001 +1000001 100001 111111111 1001001 100001 1011001 100001 111101111111110111 -- cgit v1.2.3 From fe2d41368dce9f3594aee2491a36841a88a6a28d Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Thu, 26 Mar 2020 13:24:41 +0100 Subject: wqe --- map/map_one.cub | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'map') diff --git a/map/map_one.cub b/map/map_one.cub index f0a498b..7526283 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,12 +1,12 @@ R 1600 1024 -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 @@ -22,9 +22,12 @@ T ./media/img/sprites/spikes.xpm SH 2 1111111111111111111 -111111111111000000000000000001 + 1000000000000000001 + 1020304050607080001 + 1000000000000000001 +111111111111020304050607080001 100000000000000000000000000001 -100000000000020304050607080901 +100000000000020304050607080001 100000000000000000000000000001 1001000000T0000000000000000001 10110+0+0111000001110000000111 -- cgit v1.2.3 From b5982b835d46ba6ae7363b60254ebfa2c3439a4d Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Thu, 26 Mar 2020 14:58:02 +0100 Subject: Solved 9th sprite problem --- map/map_one.cub | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'map') diff --git a/map/map_one.cub b/map/map_one.cub index 7526283..5f0c67a 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -23,11 +23,11 @@ SH 2 1111111111111111111 1000000000000000001 - 1020304050607080001 - 1000000000000000001 -111111111111020304050607080001 -100000000000000000000000000001 -100000000000020304050607080001 + 1020304050607080901 + 1000000050607080901 +111111111111020304050607080901 +100000000000000000050607080901 +100000000000020304050607080901 100000000000000000000000000001 1001000000T0000000000000000001 10110+0+0111000001110000000111 -- cgit v1.2.3 From fa74e675631415cf28339a360776f23ad90a0625 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Thu, 26 Mar 2020 14:59:34 +0100 Subject: map fix --- map/map_one.cub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'map') diff --git a/map/map_one.cub b/map/map_one.cub index 5f0c67a..889a693 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -24,9 +24,9 @@ SH 2 1111111111111111111 1000000000000000001 1020304050607080901 - 1000000050607080901 + 1000000000000000001 111111111111020304050607080901 -100000000000000000050607080901 +100000000000000000000000000001 100000000000020304050607080901 100000000000000000000000000001 1001000000T0000000000000000001 -- cgit v1.2.3 From 7bb6cbe6543ebae891dfd0c495602ca6dfce5a93 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Fri, 27 Mar 2020 13:09:41 +0100 Subject: Ready to try traps --- map/map_one.cub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'map') diff --git a/map/map_one.cub b/map/map_one.cub index 889a693..631a8af 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,4 +1,4 @@ -R 1600 1024 +R 1024 768 NO ./media/img/tex/wood_wall_1_small.xpm SO ./media/img/tex/wood_wall_1_small.xpm -- cgit v1.2.3 From b626f171f26f709b27e790911b48f7a4272dc707 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Fri, 27 Mar 2020 13:55:24 +0100 Subject: In progress --- map/map_one.cub | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'map') diff --git a/map/map_one.cub b/map/map_one.cub index 631a8af..dbe6894 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,4 +1,4 @@ -R 1024 768 +R 1331 998 NO ./media/img/tex/wood_wall_1_small.xpm SO ./media/img/tex/wood_wall_1_small.xpm @@ -10,12 +10,7 @@ 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 -S5 ./media/img/sprites/larry.xpm -S6 ./media/img/sprites/linus.xpm -S7 ./media/img/sprites/spikes.xpm -S8 ./media/img/sprites/wood_chest.xpm -S9 ./media/img/sprites/first_aid.xpm +S4 ./media/img/sprites/larry.xpm T ./media/img/sprites/spikes.xpm @@ -23,11 +18,11 @@ SH 2 1111111111111111111 1000000000000000001 - 1020304050607080901 1000000000000000001 -111111111111020304050607080901 + 1000000000000000001 +111111111111000000000000000001 100000000000000000000000000001 -100000000000020304050607080901 +100000000000020304000000T0T001 100000000000000000000000000001 1001000000T0000000000000000001 10110+0+0111000001110000000111 -- cgit v1.2.3 From a713e118950f62700a43d21aa33fd2e3d7673af9 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Fri, 27 Mar 2020 15:07:32 +0100 Subject: Problem --- map/map_one.cub | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'map') diff --git a/map/map_one.cub b/map/map_one.cub index dbe6894..cbc3634 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -11,6 +11,7 @@ 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 T ./media/img/sprites/spikes.xpm @@ -21,7 +22,7 @@ SH 2 1000000000000000001 1000000000000000001 111111111111000000000000000001 -100000000000000000000000000001 +10000000000000000T0T0T00000001 100000000000020304000000T0T001 100000000000000000000000000001 1001000000T0000000000000000001 -- cgit v1.2.3 From 44d5f7f4da8465f4829de1232e4cf2c6c2bf76bc Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Fri, 27 Mar 2020 16:44:30 +0100 Subject: Segv fix --- map/map_one.cub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'map') diff --git a/map/map_one.cub b/map/map_one.cub index cbc3634..fbe3ef9 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -21,7 +21,7 @@ SH 2 1000000000000000001 1000000000000000001 1000000000000000001 -111111111111000000000000000001 +111111111111000000000005000001 10000000000000000T0T0T00000001 100000000000020304000000T0T001 100000000000000000000000000001 -- cgit v1.2.3 From 82a55e7b0758f1b0afa45ac19953a9eb398f3771 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Fri, 27 Mar 2020 17:04:08 +0100 Subject: Fixed shit --- map/map_one.cub | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'map') diff --git a/map/map_one.cub b/map/map_one.cub index fbe3ef9..4b88719 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -12,6 +12,10 @@ 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 +S8 ./media/img/sprites/pylon.xpm +S9 ./media/img/sprites/linus.xpm T ./media/img/sprites/spikes.xpm @@ -19,7 +23,7 @@ SH 2 1111111111111111111 1000000000000000001 - 1000000000000000001 + 1000000080000000001 1000000000000000001 111111111111000000000005000001 10000000000000000T0T0T00000001 -- cgit v1.2.3 From 38b41c7b82981453092613b30219d4062964d770 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Fri, 27 Mar 2020 17:15:57 +0100 Subject: Map update --- map/map_one.cub | 1 - 1 file changed, 1 deletion(-) (limited to 'map') diff --git a/map/map_one.cub b/map/map_one.cub index 4b88719..0935590 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -15,7 +15,6 @@ 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/linus.xpm T ./media/img/sprites/spikes.xpm -- cgit v1.2.3 From 96534d2121cd9097da83b69ea5947ea93b736edc Mon Sep 17 00:00:00 2001 From: salad Date: Fri, 27 Mar 2020 22:23:03 +0100 Subject: jattend que ca clique --- map/map_test.cub | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 map/map_test.cub (limited to 'map') diff --git a/map/map_test.cub b/map/map_test.cub new file mode 100644 index 0000000..53564f0 --- /dev/null +++ b/map/map_test.cub @@ -0,0 +1,27 @@ +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 + +T ./media/img/sprites/spikes.xpm + +SH 2 + +1111111111111111111 +1000000000000000001 +10000023456000T0001 +100E0023456000T0001 +10000023456000T0001 +1000000000000000001 +1111111111111111111 -- cgit v1.2.3 From 8fa58fb7a2a363534468ddbb0f0dafe6f577b3fd Mon Sep 17 00:00:00 2001 From: salad Date: Sat, 28 Mar 2020 15:50:34 +0100 Subject: ez --- map/map_test.cub | 1 + 1 file changed, 1 insertion(+) (limited to 'map') diff --git a/map/map_test.cub b/map/map_test.cub index 53564f0..8adf8a8 100644 --- a/map/map_test.cub +++ b/map/map_test.cub @@ -13,6 +13,7 @@ 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 -- cgit v1.2.3 From bd24c47c257ad9c4873207ea131371ad0309f84d Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Sat, 28 Mar 2020 17:02:58 +0100 Subject: Awesome --- map/map_one.cub | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'map') diff --git a/map/map_one.cub b/map/map_one.cub index 0935590..3d45184 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -30,17 +30,17 @@ SH 2 100000000000000000000000000001 1001000000T0000000000000000001 10110+0+0111000001110000000111 -111111111111110011 1000N0001 +111111111111110011 100000001 1000001 100001 111111111 1001001 100001 1011001 100001 111101111111110111 10000000110101011 10000000000000001 -1#000000000000001 -1@000000000000001 -1!000000000000001 +1#0#0#0#000000001 +1@0@0@0@000W00001 +1!0!0!0!000000001 10000000000000001 11000000110100011 -11110111111101011 +111101111111T1011 11111 1 1111 -- cgit v1.2.3 From 69ca60b6f989dedc94c2e25ab9927b26d63cbdf8 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Sun, 29 Mar 2020 17:34:48 +0200 Subject: Norm --- map/map_five.cub | 2 +- map/map_one.cub | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'map') 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 3d45184..43b9268 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -15,6 +15,7 @@ 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 @@ -22,7 +23,7 @@ SH 2 1111111111111111111 1000000000000000001 - 1000000080000000001 + 1000900080000000001 1000000000000000001 111111111111000000000005000001 10000000000000000T0T0T00000001 @@ -31,9 +32,9 @@ SH 2 1001000000T0000000000000000001 10110+0+0111000001110000000111 111111111111110011 100000001 -1000001 100001 111111111 -1001001 100001 -1011001 100001 +1000001 190001 111111111 +1001001 190001 +1911001 190001 111101111111110111 10000000110101011 10000000000000001 -- cgit v1.2.3