From ff3c1ffe01337ac9391dc0e16b08ef0cc85d1049 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Fri, 20 Mar 2020 10:43:49 +0100 Subject: [PATCH] Save. Progress. Done. --- levels.lua | 2 +- platform.g3a | Bin 70600 -> 70972 bytes src/levels.c | 2 +- src/main.c | 12 +++++++++--- up-editor/screens/5058.scr | 1 + up-editor/tiles.lua | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 up-editor/screens/5058.scr diff --git a/levels.lua b/levels.lua index f940ed1..6e31c80 100755 --- a/levels.lua +++ b/levels.lua @@ -7,7 +7,7 @@ io.write("void set_level(int level_id, char level[]){") io.write("switch (level_id){") current = 0 for i = 0, 9999, 1 do - file = io.open("../up-editor/screens/"..i..".scr") + file = io.open("up-editor/screens/"..i..".scr") file_content = nil if file then file_content = file:read() diff --git a/platform.g3a b/platform.g3a index 173a9cd66121df954575dad2109aa95187df6f09..2841c159abacf19d63c6059184741ccfd9b87de9 100644 GIT binary patch delta 4633 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 delta 4537 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 ap#}cq59tG;0c1YDrVgYBknbd#&VK`v79R8f diff --git a/src/levels.c b/src/levels.c index 9633050..9d6a675 100644 --- a/src/levels.c +++ b/src/levels.c @@ -1,3 +1,3 @@ #include "levels.h" #include -void set_level(int level_id, char level[]){switch (level_id){case 4950:memcpy(level,"-----------------------------..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--.......00000..............-----------------------------",476);break;case 5050:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--000.....rr..........000000--000.....rr..........000000--000.....rr..........000000--000.....rr..........000000--000..E..rr..........000000--00000000000bbbb.....000000--00000000000bbbb00000000000--00.............00000000000--00.............00000000000--00.........000000000000000--00..S......000000000000000--00000000000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5051:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--00000000000000000000000000--00000000000000000000000000--00000000000000000000000000--00......................00--00......................00--00......................00--00......................00--00S....................E00--0000rrrrrrrrrbbbbbbbbb0000--0000vvvvvvvvvvvvvvvvvv0000--00000000000000000000000000--00000000000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5052:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--0000000000.........0000000--0000000000.......E.0000000--0000000000....000000000000--0000000000......0000000000--0000000000bb....0000000000--0000000000......0000000000--0000000000....000000000000--0000000000......0000000000--0000000000rr....0000000000--0000000.........0000000000--0000000.S.......0000000000--00000000000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5053:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--00000000000000000000000000--0000.....00000000000000000--000.......0000000000000000--00.........000000000000000--00.........000000000000000--00.........0000....b..r.00--00.........000.....b..r.00--00....0............b..rE00--00....0..........bbbrrr.00--00....0.........bvvvvvvv00--00.S..0.........v000000000--0000**00000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5054:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--00......000...v...000...00--00......000.......000.E.00--00.S....000.......000...00--00000...000...0...000...00--00000www000www0www000www00--00000www000www0www000www00--00000www000www0www000www00--00000vww000wwv0vww000wwv00--00000wwwwwwwww0wwwwwwwww00--00000wwwwwwwww0wwwwwwwww00--00000wwwwwwwww0wwwwwwwww00--00000000000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5055:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--00......................00--00......................00--00......................00--000000..............000000--.r...0..............0...b.--.r...0..............0...b.--.r.S.0..............0.E.b.--000000..............000000--00......................00--00......................00--00......................00--00000000000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5056:memcpy(level,"-----------------------------00000000000000..0000000000--00000000000000..0000000000--000000.......0..0...ww...0--000000.......0..0...ww...0--000000.......0......ww...0--000000bbb0...0.....vvvv..0--000000vww0...0..00vvvvvvE0--000000www0v.....0000000000--000000wwv0v.....0000000000--000000rrr0...0..0000000000--00...0wwv0...0..v000000000--00...bwww0...0..v000000000--00.S.bwww0***0..0000000000--00000000000000..0000000000--00000000000000..0000000000-----------------------------",476);break;case 5057:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--00....v000000vvvvvvvv...00--00....v0vv000...........00--00....0v..000.........S.00--00ww0.E...000........00000--00ww0000v...........v00000--00ww000..............00000--00ww000...........w..00000--00wwwwww00^.......v..00000--00wwwwww00^.......v..00000--00vvvvvv00^......vv..00000--00000000000......vv..00000--000000000000vvv0v00**00000--00000000000000000000000000-----------------------------",476);break;case 5150:memcpy(level,"-----------------------------..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................--..........................-----------------------------",476);break;}} \ No newline at end of file +void set_level(int level_id, char level[]){switch (level_id){case 5050:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--000.....rr..........000000--000.....rr..........000000--000.....rr..........000000--000.....rr..........000000--000..E..rr..........000000--00000000000bbbb.....000000--00000000000bbbb00000000000--00.............00000000000--00.............00000000000--00.........000000000000000--00..S......000000000000000--00000000000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5051:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--00000000000000000000000000--00000000000000000000000000--00000000000000000000000000--00......................00--00......................00--00......................00--00......................00--00S....................E00--0000rrrrrrrrrbbbbbbbbb0000--0000vvvvvvvvvvvvvvvvvv0000--00000000000000000000000000--00000000000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5052:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--0000000000.........0000000--0000000000.......E.0000000--0000000000....000000000000--0000000000......0000000000--0000000000bb....0000000000--0000000000......0000000000--0000000000....000000000000--0000000000......0000000000--0000000000rr....0000000000--0000000.........0000000000--0000000.S.......0000000000--00000000000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5053:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--00000000000000000000000000--0000.....00000000000000000--000.......0000000000000000--00.........000000000000000--00.........000000000000000--00.........0000....b..r.00--00.........000.....b..r.00--00....0............b..rE00--00....0..........bbbrrr.00--00....0.........bvvvvvvv00--00.S..0.........v000000000--0000**00000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5054:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--00......000...v...000...00--00......000.......000.E.00--00.S....000.......000...00--00000...000...0...000...00--00000www000www0www000www00--00000www000www0www000www00--00000www000www0www000www00--00000vww000wwv0vww000wwv00--00000wwwwwwwww0wwwwwwwww00--00000wwwwwwwww0wwwwwwwww00--00000wwwwwwwww0wwwwwwwww00--00000000000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5055:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--00......................00--00......................00--00......................00--000000..............000000--.r...0..............0...b.--.r...0..............0...b.--.r.S.0..............0.E.b.--000000..............000000--00......................00--00......................00--00......................00--00000000000000000000000000--00000000000000000000000000-----------------------------",476);break;case 5056:memcpy(level,"-----------------------------00000000000000..0000000000--00000000000000..0000000000--000000.......0..0...ww...0--000000.......0..0...ww...0--000000.......0......ww...0--000000bbb0...0.....vvvv..0--000000vww0...0..00vvvvvvE0--000000www0v.....0000000000--000000wwv0v.....0000000000--000000rrr0...0..0000000000--00...0wwv0...0..v000000000--00...bwww0...0..v000000000--00.S.bwww0***0..0000000000--00000000000000..0000000000--00000000000000..0000000000-----------------------------",476);break;case 5057:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--00....v000000vvvvvvvv...00--00....v0vv000...........00--00....0v..000.........S.00--00ww0.E...000........00000--00ww0000v...........v00000--00ww000..............00000--00ww000...........w..00000--00wwwwww00^.......v..00000--00wwwwww00^.......v..00000--00vvvvvv00^......vv..00000--00000000000......vv..00000--000000000000vvv0v00**00000--00000000000000000000000000-----------------------------",476);break;case 5058:memcpy(level,"-----------------------------0000000000ww0000000www0000--000000000www0000000www0000--00.....0..000000000www0000--00.S...0.^000000000www0000--00000..0.^00000........000--00000..0.^0000.........000--00.....0.^000vbww0rrrrr000--00.....0.^00rwwbw0.....000--00bb0vvv.^0vwrwwv0.....000--00wwrww..0wbwwrw00vvvvv000--00wwrww..0wwbwv000.....000--00wwrww..0rwwb0000.....000--00vvvww..0wrv000000.E.0000--0000000**0ww0000000...0000--0000000000ww0000000...0000-----------------------------",476);break;case 5059:memcpy(level,"-----------------------------00000000000000000000000000--00000000000000000000000000--000.....................00--00......................00--00......................00--00......................00--00......................00--00......................00--00......................00--00......................00--00......................00--00......................00--00......................00--00000000000000000000000000--00000000000000000000000000-----------------------------",476);break;}} \ No newline at end of file diff --git a/src/main.c b/src/main.c index 88386fb..475573c 100644 --- a/src/main.c +++ b/src/main.c @@ -42,6 +42,7 @@ int main(void) int move = 0; int direction = 0; int on_ground = 6; //remember if player is on solid + char in_water = 0; int player_x = 0; int player_y = 0; int start_x = 18*16 + 2; @@ -131,13 +132,15 @@ int main(void) } else { - if (on_ground != 6 && vspd < MAX_VSPD) vspd += GRAV; + if (on_ground != 6 && vspd < MAX_VSPD) vspd += GRAV / (1 + in_water); if (on_ground) on_ground--; } + //in water? + in_water = collide(player_x, player_y, level, 'w'); //vertical movement jump_test(&jump_pressed, &jump_buffer, &jump_hold); //jump - if (jump_buffer && (on_ground || collide(player_x, player_y, level, 'w'))) { + if (jump_buffer && (on_ground || in_water)) { vspd = JUMP_SPD; on_ground = 0; jump_hold = JUMP_SCALE; @@ -160,7 +163,9 @@ int main(void) } //vertical collision { - int trunc_vspd = vspd; //truncate vspd + int trunc_vspd; + if (in_water) trunc_vspd = vspd / 2; + else trunc_vspd = vspd; //bouncer if (collide(player_x, player_y + trunc_vspd, level, '*')) { @@ -206,6 +211,7 @@ int main(void) level_id++; set_level(level_id, level); DRAW_LEVEL(); + dprint(100, 0, C_WHITE, C_BLACK, "%d", level_id); player_x = start_x; player_y = start_y; polarity = 0; diff --git a/up-editor/screens/5058.scr b/up-editor/screens/5058.scr new file mode 100644 index 0000000..e27337b --- /dev/null +++ b/up-editor/screens/5058.scr @@ -0,0 +1 @@ +0000000000ww0000000www0000000000000www0000000www000000.....0..000000000www000000.S...0.^000000000www000000000..0.^00000........00000000..0.^0000.........00000.....0.^000vbww0rrrrr00000.....0.^00rwwbw0.....00000bb0vvv.^0vwrwwv0.....00000wwrww..0wbwwrw00v.vvv00000wwrww..0wwbwv000.....00000wwrww..0rwwb0000.....00000vvvww..0wrv000000.E.00000000000**0ww0000000...00000000000000ww0000000...0000 \ No newline at end of file diff --git a/up-editor/tiles.lua b/up-editor/tiles.lua index 30df7c0..07f10b1 100644 --- a/up-editor/tiles.lua +++ b/up-editor/tiles.lua @@ -11,6 +11,6 @@ tiles = { love.graphics.newImage(img_path.."spawn.png"), love.graphics.newImage(img_path.."exit.png"), } -tiles_char = { '0', 'r', 'b', 'v', '^', 'w', '*', 'S', 'e'} +tiles_char = { '0', 'r', 'b', 'v', '^', 'w', '*', 'S', 'E'} selected_tile = 1