diff --git a/assets-cg/img/ice.png b/assets-cg/img/ice.png index 4910965..4459472 100644 Binary files a/assets-cg/img/ice.png and b/assets-cg/img/ice.png differ 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 4910965..0000000 Binary files a/texturepacks/default/ice.png and /dev/null differ diff --git a/texturepacks/programmer-art/ice.png b/texturepacks/programmer-art/ice.png index 4910965..4459472 100644 Binary files a/texturepacks/programmer-art/ice.png and b/texturepacks/programmer-art/ice.png differ diff --git a/up-editor/force_img/glue.png b/up-editor/force_img/glue.png deleted file mode 100644 index 3a83b68..0000000 Binary files a/up-editor/force_img/glue.png and /dev/null differ diff --git a/up-editor/force_img/ice.png b/up-editor/force_img/ice.png deleted file mode 100644 index 3841df5..0000000 Binary files a/up-editor/force_img/ice.png and /dev/null differ diff --git a/up-editor/img/glue.png b/up-editor/img/glue.png deleted file mode 100644 index 3641c63..0000000 Binary files a/up-editor/img/glue.png and /dev/null differ 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