From 78d222df4096378f15a78f8f1f39dd73e2479001 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Wed, 13 May 2020 13:07:01 +0200 Subject: [PATCH] Early semi solid and alt solid. --- JTMM.g3a | Bin 73024 -> 74176 bytes assets-cg/img/semi_solid.png | Bin 0 -> 117 bytes assets-cg/img/{ground.png => solid_0.png} | Bin .../ground.png => assets-cg/img/solid_1.png | Bin include/collide.h | 2 +- src/collide.c | 10 ++++++++-- src/draw.c | 12 ++++++++---- src/main.c | 10 +++++----- .../default/solid_0.png | Bin texturepacks/programmer-art/semi_solid.png | Bin 0 -> 117 bytes .../{ground.png => solid_0.png} | Bin up-editor/img/semi_solid.png | Bin 0 -> 117 bytes up-editor/img/solid_0.png | Bin 0 -> 221 bytes up-editor/img/solid_1.png | Bin 0 -> 221 bytes up-editor/tiles.lua | 6 ++++-- 15 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 assets-cg/img/semi_solid.png rename assets-cg/img/{ground.png => solid_0.png} (100%) rename texturepacks/default/ground.png => assets-cg/img/solid_1.png (100%) rename up-editor/img/ground.png => texturepacks/default/solid_0.png (100%) create mode 100644 texturepacks/programmer-art/semi_solid.png rename texturepacks/programmer-art/{ground.png => solid_0.png} (100%) create mode 100644 up-editor/img/semi_solid.png create mode 100644 up-editor/img/solid_0.png create mode 100644 up-editor/img/solid_1.png diff --git a/JTMM.g3a b/JTMM.g3a index 8e9c94b7ae4930b93e4ab1c2c08e8237de00eb4e..efb3ab71070774c42754f91f08b6aa89ac8f359b 100644 GIT binary patch delta 12779 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 I#DDktf6iw$`~Uy| diff --git a/assets-cg/img/semi_solid.png b/assets-cg/img/semi_solid.png new file mode 100644 index 0000000000000000000000000000000000000000..675a79c870d389cbe343ca9687e19919afc690e3 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|^gUf1Lo9le z_r$OGHlLBJ?xnTChFF^e4qWp)8=V|BGWM8@FZrv!CP$>FDbRs~fgx0w|M0Ez*{6Y8 O89ZJ6T-G@yGywq9Tq3Lh literal 0 HcmV?d00001 diff --git a/assets-cg/img/ground.png b/assets-cg/img/solid_0.png similarity index 100% rename from assets-cg/img/ground.png rename to assets-cg/img/solid_0.png diff --git a/texturepacks/default/ground.png b/assets-cg/img/solid_1.png similarity index 100% rename from texturepacks/default/ground.png rename to assets-cg/img/solid_1.png diff --git a/include/collide.h b/include/collide.h index 88786e1..688df39 100644 --- a/include/collide.h +++ b/include/collide.h @@ -1,5 +1,5 @@ char collide(int x, int y, char level[], char tile); char collide_spike(int x, int y, char level[]); -char collide_solid(int x, int y, char level[], char polarity); +char collide_solid(int x, int y, char level[], char polarity, int rvspd); char collide_point(int x, int y, char level[], char tile); char collide_and_erase(int x, int y, char level[], char tile); diff --git a/src/collide.c b/src/collide.c index 981c732..8202ba9 100644 --- a/src/collide.c +++ b/src/collide.c @@ -27,13 +27,19 @@ char collide_point(int x, int y, char level[], char tile) return (level[(int)(x/16) + (int)(y/16) * LEVEL_WIDTH] == tile); } -char collide_solid(int x, int y, char level[], char polarity) +char collide_solid(int x, int y, char level[], char polarity, int rvspd) { char collided; if (polarity) collided = collide(x, y, level, 'b'); else collided = collide(x, y, level, 'r'); - return (collided || + if (!collided && rvspd > 0) + { + collided = (collide_point(x, y + PLAYER_H, level, 's') || + collide_point(x + PLAYER_W, y + PLAYER_H, level, 's')); + } + return (collided || collide(x, y, level, '0') || + collide(x, y, level, '1') || collide(x, y, level, '^') || collide(x, y, level, '~')); } diff --git a/src/draw.c b/src/draw.c index b52d7dd..2ae9bcb 100644 --- a/src/draw.c +++ b/src/draw.c @@ -8,7 +8,8 @@ #define DRAW_OFFSET_X -27 extern image_t img_player; //player texture, 16x12 -extern image_t img_ground; //ground texture, 16x16 +extern image_t img_solid_0; //solid texture, 16x16 +extern image_t img_solid_1; //solid texture, 16x16 extern image_t img_spike; //spike texture, 16x16 extern image_t img_bouncer; //bouncer texture, 16x16 extern image_t img_ice; //ice texture, 16x8 @@ -46,8 +47,11 @@ int *start_y) switch (level[i]) { case '0': - dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_ground); + dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_0); break; + case '1': + dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_1); + break; case 'r': if (!polarity) dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_red); else dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_red_dot); @@ -63,11 +67,11 @@ int *start_y) dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_bouncer); break; case '~': - dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_ground); + dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_0); dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_ice); break; case 's': - dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_ground); + dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_0); break; case '^': dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, ani_elevator[(step/2)%16]); diff --git a/src/main.c b/src/main.c index f9314ca..d308c41 100644 --- a/src/main.c +++ b/src/main.c @@ -110,14 +110,14 @@ int main(void) trunc_hspd = hspd * direction; if (1) //glue was here { - if (!collide_solid(player_x + trunc_hspd, player_y, level, polarity)) + if (!collide_solid(player_x + trunc_hspd, player_y, level, polarity, vspd)) { player_x += trunc_hspd; } else { int sign_hspd = sgn(trunc_hspd); - while (!collide_solid(player_x + sign_hspd, player_y, level, polarity)) + while (!collide_solid(player_x + sign_hspd, player_y, level, polarity, vspd)) { player_x += sign_hspd; } @@ -126,7 +126,7 @@ int main(void) } } //ground detection - if (vspd >= 0 && collide_solid(player_x, player_y + 1, level, polarity)) + if (vspd >= 0 && collide_solid(player_x, player_y + 1, level, polarity, vspd)) { on_ground = 6; vspd = 0; @@ -181,14 +181,14 @@ int main(void) } if (trunc_vspd) { - if (!collide_solid(player_x, player_y + trunc_vspd, level, polarity)) + if (!collide_solid(player_x, player_y + trunc_vspd, level, polarity, vspd)) { player_y += trunc_vspd; } else { int sign_vspd = sgn(trunc_vspd); - while (!collide_solid(player_x, player_y + sign_vspd, level, polarity)) + while (!collide_solid(player_x, player_y + sign_vspd, level, polarity, vspd)) { player_y += sign_vspd; } diff --git a/up-editor/img/ground.png b/texturepacks/default/solid_0.png similarity index 100% rename from up-editor/img/ground.png rename to texturepacks/default/solid_0.png diff --git a/texturepacks/programmer-art/semi_solid.png b/texturepacks/programmer-art/semi_solid.png new file mode 100644 index 0000000000000000000000000000000000000000..675a79c870d389cbe343ca9687e19919afc690e3 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|^gUf1Lo9le z_r$OGHlLBJ?xnTChFF^e4qWp)8=V|BGWM8@FZrv!CP$>FDbRs~fgx0w|M0Ez*{6Y8 O89ZJ6T-G@yGywq9Tq3Lh literal 0 HcmV?d00001 diff --git a/texturepacks/programmer-art/ground.png b/texturepacks/programmer-art/solid_0.png similarity index 100% rename from texturepacks/programmer-art/ground.png rename to texturepacks/programmer-art/solid_0.png diff --git a/up-editor/img/semi_solid.png b/up-editor/img/semi_solid.png new file mode 100644 index 0000000000000000000000000000000000000000..675a79c870d389cbe343ca9687e19919afc690e3 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|^gUf1Lo9le z_r$OGHlLBJ?xnTChFF^e4qWp)8=V|BGWM8@FZrv!CP$>FDbRs~fgx0w|M0Ez*{6Y8 O89ZJ6T-G@yGywq9Tq3Lh literal 0 HcmV?d00001 diff --git a/up-editor/img/solid_0.png b/up-editor/img/solid_0.png new file mode 100644 index 0000000000000000000000000000000000000000..7c1192b21a95e52664c708ebd65b911e8669152e GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(|sdx(wkF9RFp2BAf*t zk;M!Q+`=Ht$S`Y;1W=H@#M9T6{Ru0#kQ!gAic$qoD9h8uF~s8Z(o1JK8w_|H9;TPQ zSa?D7&VuS4_8f9DPWnL_TW8Ie;l8ijs#AJbZ{A7OkEX}#`0|Ag>OMHiAawAqxQ)eh z6aI`3CCs{Yyb&J+HayaM0F~QczQEF`^TA8DX`iQYuOMHiAawAqxQ)eh z6aI`3CCs{Yyb&J+HayaM0F~QczQEF`^TA8DX`iQYu