From f92fb66cd887672b51bfe2aa5d0c1c851dec2b73 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Tue, 19 May 2020 14:09:19 +0200 Subject: [PATCH] [main.c] Fix friction? Restored ice --- assets-cg/img/ice.png | Bin 181 -> 171 bytes src/draw.c | 3 +-- src/main.c | 10 ++++++++-- texturepacks/default/ice.png | Bin 181 -> 0 bytes texturepacks/programmer-art/ice.png | Bin 181 -> 171 bytes up-editor/force_img/glue.png | Bin 133 -> 0 bytes up-editor/force_img/ice.png | Bin 172 -> 0 bytes up-editor/img/glue.png | Bin 296 -> 0 bytes up-editor/tiles.lua | 5 +++-- 9 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 texturepacks/default/ice.png delete mode 100644 up-editor/force_img/glue.png delete mode 100644 up-editor/force_img/ice.png delete mode 100644 up-editor/img/glue.png diff --git a/assets-cg/img/ice.png b/assets-cg/img/ice.png index 4910965555856a3e09dd67ff1965f0cd98b3b39c..4459472724d2fed4f6f6b777afb1267c6dc0b57c 100644 GIT binary patch delta 112 zcmdnWxSDZ-xS{|D8v_G_{OA9PK#H+A$lZxy-8q?;Ku)Tsi(`mI??elImse*_wi>Kj z^zoGO!>c|g3fS1#)Vxd%$2NEi$tFxr=lOc(XTPiN#fHuelLDF9_A@eQ`WUqwj@an~ PG=;&_)z4*}Q$iB}doU;; delta 122 zcmZ3@xRr5&xFQD!8v_HwhqC(VK#H+A$lZxy-8q?;Ku*4=i(`n!#EBOAesTP1DJcm+ z&=A$&J&$vK%FDjv6}M W>Jra+UMLc19)qW=pUXO@geCynyDP8& diff --git a/src/draw.c b/src/draw.c index 9e5094c..0bd5027 100644 --- a/src/draw.c +++ b/src/draw.c @@ -12,7 +12,7 @@ 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 +extern image_t img_ice; //ice texture, 16x16 extern image_t img_blue; //blue bloc texture, 16x16 extern image_t img_blue_dot; //off blue bloc texture, 16x16 extern image_t img_red; //red bloc texture, 16x16 @@ -72,7 +72,6 @@ int *start_y, int tp_positions[]) draw_anim(x, y, &img_bouncer, step); break; case '~': - draw_anim(x, y, &img_solid_0, step); draw_anim(x, y, &img_ice, step); break; case '/': diff --git a/src/main.c b/src/main.c index ea12d60..326955b 100644 --- a/src/main.c +++ b/src/main.c @@ -11,7 +11,7 @@ #include "shared_define.h" #define MAX_HSPD 2.0 -#define DRILL_HSPD 4.5 +#define DRILL_HSPD 6.0 #define ACCELERATION 1.0 #define DECELERATION 0.5 #define MIN_VSPD -12.0 @@ -145,7 +145,7 @@ int main(void) int trunc_hspd; //ice if (collide(player_x, player_y + 1, level, '~')) friction = 0.2; - move = keydown(KEY_RIGHT) + 0 - keydown(KEY_LEFT); + move = keydown(KEY_RIGHT) - keydown(KEY_LEFT); if (move) { if (hspd < MAX_HSPD) { @@ -159,6 +159,12 @@ int main(void) else hspd -= DECELERATION / 4 * friction; if (hspd < 0) hspd = 0; } + else if (hspd < 0) + { + if (friction != 0.2) hspd += DECELERATION * friction; + else hspd += DECELERATION / 4 * friction; + if (hspd > 0) hspd = 0; + } trunc_hspd = hspd * direction; if (1) //glue was here { diff --git a/texturepacks/default/ice.png b/texturepacks/default/ice.png deleted file mode 100644 index 4910965555856a3e09dd67ff1965f0cd98b3b39c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!3HEhl+{lMQjEnx?oJHr&dIz4a`HW0978lF zCSQs9{okHh@N;q8hyCan4V9*>}8xSO4zE8I6LLVjD8=eF|k;Z^OOo$-=|OB_)6$t@g>05Bg@6 Z4EtJL;yKR?MFOp6@O1TaS?83{1OTg`K7RlJ diff --git a/texturepacks/programmer-art/ice.png b/texturepacks/programmer-art/ice.png index 4910965555856a3e09dd67ff1965f0cd98b3b39c..4459472724d2fed4f6f6b777afb1267c6dc0b57c 100644 GIT binary patch delta 112 zcmdnWxSDZ-xS{|D8v_G_{OA9PK#H+A$lZxy-8q?;Ku)Tsi(`mI??elImse*_wi>Kj z^zoGO!>c|g3fS1#)Vxd%$2NEi$tFxr=lOc(XTPiN#fHuelLDF9_A@eQ`WUqwj@an~ PG=;&_)z4*}Q$iB}doU;; delta 122 zcmZ3@xRr5&xFQD!8v_HwhqC(VK#H+A$lZxy-8q?;Ku*4=i(`n!#EBOAesTP1DJcm+ z&=A$&J&$vK%FDjv6}M W>Jra+UMLc19)qW=pUXO@geCynyDP8& diff --git a/up-editor/force_img/glue.png b/up-editor/force_img/glue.png deleted file mode 100644 index 3a83b68f86b534e4372c41b44b5244cba1771ae5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|>^)r^Lo9le z|LmXf(4LvKp;PE=h+zZkbeGdlEqOq|beCqu)0qi8PHYdEd~S$LJd~cJH{19~a^jVS bM4)MPJ4Am^3BJ+^G>XB~)z4*}Q$iB}IDRQz diff --git a/up-editor/force_img/ice.png b/up-editor/force_img/ice.png deleted file mode 100644 index 3841df50b16eb62897f5b9b5927f54d4e8354d19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|(mY)pLo9le zuf+WRZ_g}pM#P#i*=WiBO$iR{H=fMYxX5GP5ObCX2zuK2Wk5cMf;r zkF3X2(+{nlIpHBt+Gk2e+ir&GDpm*7&fkbJdu}hb)rDE@ke3^;#2=vDI^E`6_x0S* Q0BvOOboFyt=akR{0CwUzG5`Po diff --git a/up-editor/img/glue.png b/up-editor/img/glue.png deleted file mode 100644 index 3641c63f3e00b45d0978d7a0d31479ebccbf1107..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8U)v6XN=RF++3Nod5s- ze=p$s3>0Kc@^*J&O5?6c0dm+&Jbhi+pRfvZGbpFlODzKm$#}XrhHzX@PHbR32?Ef2r^9H%D4Q6M8P_sI@J=_h?11Vl2ohYqEsNoU}Ruqple{NYiJo_ uXlP|%U}bEg4I~W=f+m?>L(!0%pOTqYiCcs6`Q9v`1_n=8KbLh*2~7Y|7f!DL diff --git a/up-editor/tiles.lua b/up-editor/tiles.lua index 980830b..6f8e9cc 100644 --- a/up-editor/tiles.lua +++ b/up-editor/tiles.lua @@ -9,6 +9,7 @@ tiles = { love.graphics.newImage(img_path.."elevator.png"), love.graphics.newImage(img_path.."water.png"), love.graphics.newImage(img_path.."bouncer.png"), + love.graphics.newImage(img_path.."ice.png"), love.graphics.newImage(img_path.."semi_solid.png"), love.graphics.newImage(img_path.."teleporter_0.png"), love.graphics.newImage(img_path.."teleporter_1.png"), @@ -16,7 +17,7 @@ tiles = { love.graphics.newImage(img_path.."spawn.png"), love.graphics.newImage(img_path.."exit.png"), } -tiles_char = { '0', '1', 'r', 'b', 'v', '^', 'w', '*', '/', 't', 'T', 'd', 'S', -'E' } +tiles_char = { '0', '1', 'r', 'b', 'v', '^', 'w', '*', '~', '/', 't', 'T', 'd', +'S', 'E' } selected_tile = 1