diff --git a/JTMM.g3a b/JTMM.g3a index db6ce56..11c2db3 100644 Binary files a/JTMM.g3a and b/JTMM.g3a differ diff --git a/downloadmaps.sh b/downloadmaps.sh new file mode 100644 index 0000000..f8441b3 --- /dev/null +++ b/downloadmaps.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +cd mappacks +#git clone https://gitea.planet-casio.com/ +for FOLDER in * +do + cd $FOLDER + git pull + cd .. +done diff --git a/downloadpacks.sh b/downloadpacks.sh index fae501e..65c130f 100755 --- a/downloadpacks.sh +++ b/downloadpacks.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/bin/env bash cd texturepacks git clone https://gitea.planet-casio.com/Massena/jtmm_mariotheme git clone https://gitea.planet-casio.com/Massena/jtmm_1bittheme @@ -6,7 +6,7 @@ git clone https://gitea.planet-casio.com/Massena/jtmm_celestepicotheme git clone https://gitea.planet-casio.com/KikooDX/jtmm_crafttheme for FOLDER in * do -cd $FOLDER -git pull -cd .. + cd $FOLDER + git pull + cd .. done diff --git a/include/last_level.h b/include/last_level.h new file mode 100644 index 0000000..987e5b5 --- /dev/null +++ b/include/last_level.h @@ -0,0 +1 @@ +#define LAST_LEVEL 5062 diff --git a/include/shared_define.h b/include/shared_define.h index 849dce1..c166452 100644 --- a/include/shared_define.h +++ b/include/shared_define.h @@ -1,5 +1,5 @@ +#include "last_level.h" #define PLAYER_H 11 #define PLAYER_W 11 #define LEVEL_WIDTH 28 -#define LAST_LEVEL 5062 #define FPS 50 diff --git a/mappacks/jtmm/5050.scr b/mappacks/jtmm/5050.scr new file mode 100644 index 0000000..5c7d056 --- /dev/null +++ b/mappacks/jtmm/5050.scr @@ -0,0 +1 @@ +0000000000000000000000000000000000000000000000000000000.....rr..........000000000.....rr..........000000000.....rr..........000000000.....rr..........000000000..E..rr.......t..00000000011111111bbbb.....00000000000000000bbbb1111100000000.........dddd0000000000000.........dddd0000000000000.....T...11110000000000000..S......0000000000000000011111111100000000000000000000000000000000000000000 \ No newline at end of file diff --git a/mappacks/jtmm/5051.scr b/mappacks/jtmm/5051.scr new file mode 100644 index 0000000..799c415 --- /dev/null +++ b/mappacks/jtmm/5051.scr @@ -0,0 +1 @@ +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000......................0000......................0000......................0000......................0000S....................E000011rrrrrrrrrbbbbbbbbb11000000vvvvvvvvvvvvvvvvvv0000000000000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/mappacks/jtmm/5052.scr b/mappacks/jtmm/5052.scr new file mode 100644 index 0000000..f22248b --- /dev/null +++ b/mappacks/jtmm/5052.scr @@ -0,0 +1 @@ +00000000000000000000000000000000000000000000000000000000000000.........00000000000000000.......E.00000000000000000....1111100000000000000000......00000000000000000000bb....00000000000000000000......00000000000000000000....1100000000000000000000......00000000000000000000rr....00000000000000000.........00000000000000000.S.......00000000000000000111111111000000000000000000000000000000000000 \ No newline at end of file diff --git a/mappacks/jtmm/5053.scr b/mappacks/jtmm/5053.scr new file mode 100644 index 0000000..320caca --- /dev/null +++ b/mappacks/jtmm/5053.scr @@ -0,0 +1 @@ +0000000000000000000000000000000000000000000000000000000000000000000000000000000000.....00000000000000000000.......000000000000000000.........00000000000000000.........00000000000000000.........0000....b..r.0000.........000.....b..r.0000....1............b..rE0000....0..........bbbrrr.0000....0.........bvvvvvvv0000.S..0.........v1111111000011**0111111111000000000000000000000000000000000000 \ No newline at end of file diff --git a/mappacks/jtmm/5054.scr b/mappacks/jtmm/5054.scr new file mode 100644 index 0000000..6e54e98 --- /dev/null +++ b/mappacks/jtmm/5054.scr @@ -0,0 +1 @@ +000000000000000000000000000000000000000000000000000000......000...v...000...0000......000.......000.E.0000.S....000.......000...0000111...000...1...000...0000000www000www0www000www0000000www000www0www000www0000000www000www0www000www0000000vww000wwv0vww000wwv0000000wwwwwwwww0wwwwwwwww0000000wwwwwwwww0wwwwwwwww0000000wwwwwwwww0wwwwwwwww000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/mappacks/jtmm/5055.scr b/mappacks/jtmm/5055.scr new file mode 100644 index 0000000..db24bb0 --- /dev/null +++ b/mappacks/jtmm/5055.scr @@ -0,0 +1 @@ +000000000000000000000000000000000000000000000000000000......................0000......................0000......................00001111..............111000.r...0..............0...b..r...0..............0...b..r.S.0..............0.E.b.111110..............01111100......................0000......................0000......................000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/mappacks/jtmm/5056.scr b/mappacks/jtmm/5056.scr new file mode 100644 index 0000000..29e52f0 --- /dev/null +++ b/mappacks/jtmm/5056.scr @@ -0,0 +1 @@ +00000000000000..000000000000000000000000..0000000000000000.......0..0...ww...0000000.......0..0...ww...0000000.......0......ww...0000000bbb1...0.....vvvv..0000000vww0...0..11vvvvvvE0000000www0v.....0000000000000000wwv0v.....0000000000000000rrr0...1..000000000000...0wwv0...0..v00000000000...bwww0...0..v00000000000.S.bwww0***0..000000000000111111100000..000000000000000000000000..0000000000 \ No newline at end of file diff --git a/mappacks/jtmm/5057.scr b/mappacks/jtmm/5057.scr new file mode 100644 index 0000000..f8ba1d0 --- /dev/null +++ b/mappacks/jtmm/5057.scr @@ -0,0 +1 @@ +000000000000000000000000000000000000000000000000000000....v000000vvvvvvvv...0000....v0vv000...........0000....0v..000.........S.0000ww1.E...000........1110000ww0111v...........v0000000ww000..............0000000ww000...........w..0000000wwwwww11^.......v..0000000wwwwww00^.......v..0000000vvvvvv00^......vv..0000000000000000......vv..00000000000000000vvv1v00**0000000000000000000000000000000 \ No newline at end of file diff --git a/mappacks/jtmm/5058.scr b/mappacks/jtmm/5058.scr new file mode 100644 index 0000000..6c177bc --- /dev/null +++ b/mappacks/jtmm/5058.scr @@ -0,0 +1 @@ +0000000000ww0000000www0000000000000www0000000www000000.....0..000000000www000000.S...0.^000000000www000000111..0.^00000........00000000..0.^0000.........00000.....0.^000vbww1rrrrr00000.....0.^00rwwbw0.....00000bb1vvv.^0vwrwwv0.....00000wwrww..0wbwwrw00v.vvv00000wwrww..0wwbwv000.....00000wwrww..0rwwb0000.....00000vvvww..0wrv000001.E.10000000000**0ww0000000...00000000000000ww0000000...0000 \ No newline at end of file diff --git a/mappacks/jtmm/5059.scr b/mappacks/jtmm/5059.scr new file mode 100644 index 0000000..e6c6aed --- /dev/null +++ b/mappacks/jtmm/5059.scr @@ -0,0 +1 @@ +......................................1111111...................0vvvvv0...................0v...v01..................0v.E..v0..................0v....v0..................0vvvv.v0................110000v.00...............10vvv0v.w0.............1110vb.rv.b.0.............0v...b.r..bv0.............0S...b.r..v00.............00vv1vvv1v00...............0000000000................................... \ No newline at end of file diff --git a/mappacks/jtmm/5060.scr b/mappacks/jtmm/5060.scr new file mode 100644 index 0000000..5037c76 --- /dev/null +++ b/mappacks/jtmm/5060.scr @@ -0,0 +1 @@ +000000000000000000000000000000000vvvvvv0000000000000000000vv....vv^...v000000000...0v......v^v...000000000...0v..v...v^..^.000000000.S.0vww0v..v^..^.0E.000000rrr0vvww0..v^..^.0..000000.v000vww0.vv^.v^.0v.000000.vv00vvbv.vv^..^..w.000000..v0vvww0..v^..^....000000...0vwrwv..v^..^....000000....wwwvv..v^v.^w...000000vr..wwvvv.wr...^vvvv0000000vv10000vvv0v0v00000000000000000000000000000000000 \ No newline at end of file diff --git a/mappacks/jtmm/5061.scr b/mappacks/jtmm/5061.scr new file mode 100644 index 0000000..ccd2733 --- /dev/null +++ b/mappacks/jtmm/5061.scr @@ -0,0 +1 @@ +000000000000000000000000000000000000000000000000000000Ev..........v.0.......0000............v.0.....T.0000v1111111//////0.......0000000000001.....0..1vvvv0000000000000.....0......v00000.....000....*0v.....v0000.......0^.vvv000v....v0000.......0^........v...00000...1v..v^.........v..00000..100..v^....vvv.....00000S.00t..v^...v000v...v0000011001110011100000111000000000000000000000000000000 \ No newline at end of file diff --git a/mappacks/jtmm/5062.scr b/mappacks/jtmm/5062.scr new file mode 100644 index 0000000..59eff19 --- /dev/null +++ b/mappacks/jtmm/5062.scr @@ -0,0 +1 @@ +........v.v......v.....v.........w..v......v.....v.........vw.v.......v...v..........vw.v........v*v....vv..v...vv..................vvSv.................vvv...vr.v...............v...vr.v..v...............v.v....wv..v..............v.v*...bv..v.......vvv....v..v....wvb.v.....v.b.v..v..^......v..v....v..b..vv.bv.......wv..v...v..v..v.r.v.......rv.S.v.....vrrv..v.........wvrbv.....v...v..v.. \ No newline at end of file diff --git a/up-editor/screens/recover.lua b/mappacks/jtmm/recover.lua similarity index 100% rename from up-editor/screens/recover.lua rename to mappacks/jtmm/recover.lua diff --git a/setmap.sh b/setmap.sh new file mode 100755 index 0000000..633cbcc --- /dev/null +++ b/setmap.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +rm -dr up-editor/screens/ -v +mkdir up-editor/screens/ -v +cp -r $1/*.scr up-editor/screens/ -v +echo "#define LAST_LEVEL $(($(ls up-editor/screens -1 | wc -l)+5049))" >\ +include/last_level.h +echo "updated include/last_level.h" diff --git a/setpack.sh b/settextures.sh similarity index 81% rename from setpack.sh rename to settextures.sh index 7d13c00..04370c8 100755 --- a/setpack.sh +++ b/settextures.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/bin/env bash for FOLDER in "$@";do cp -r $FOLDER/*.png assets-cg/img/ -v done diff --git a/transfer.sh b/transfer.sh index c6c0031..ecea475 100755 --- a/transfer.sh +++ b/transfer.sh @@ -1,3 +1,3 @@ -#!/usr/bin/bash +#!/usr/bin/env bash cp JTMM.g3a /media/user/disk/ -v echo done