From d4cdf05554d3024fecc7a78e9251020c1eb9cd0a Mon Sep 17 00:00:00 2001
From: KikooDX <kikoodx@paranoici.org>
Date: Sun, 10 Jan 2021 13:06:59 +0100
Subject: [PATCH] Update tileset and misc. changes.

---
 assets-cg              |  2 +-
 assets-fx              |  2 +-
 include/tiles.h        | 45 +++++++++++++++++++++++-------------------
 levels                 |  2 +-
 src/player_modifiers.c |  2 +-
 src/tiles.c            |  7 ++++++-
 6 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/assets-cg b/assets-cg
index 2709591..1bfb538 160000
--- a/assets-cg
+++ b/assets-cg
@@ -1 +1 @@
-Subproject commit 27095913e303824ad216da61f29836ced2f6a365
+Subproject commit 1bfb53822cf113d6566d53dbf67d9d1333377f64
diff --git a/assets-fx b/assets-fx
index cfb373a..6a46002 160000
--- a/assets-fx
+++ b/assets-fx
@@ -1 +1 @@
-Subproject commit cfb373a12700a07c9d51d1d27e333d36a1ad71a8
+Subproject commit 6a460020e5cb41e3f0def03c65b45bd1a7828a31
diff --git a/include/tiles.h b/include/tiles.h
index ff8dd43..96675fc 100644
--- a/include/tiles.h
+++ b/include/tiles.h
@@ -22,26 +22,31 @@ typedef unsigned char Tile_flags; /* the tile properties (bitmask) */
 
 enum {
 	ID_AIR		= TILE_AT(0, 0),
-	ID_SPIKE	= TILE_AT(0, 4),
-	ID_CHAIN	= TILE_AT(7, 2),
-	ID_ICE		= TILE_AT(0, 5),
-	ID_GLUE		= TILE_AT(0, 6),
-	ID_BASE_0	= TILE_AT(1, 0),
-	ID_BASE_1	= TILE_AT(2, 0),
-	ID_BASE_2	= TILE_AT(3, 0),
-	ID_BASE_3	= TILE_AT(4, 0),
-	ID_BASE_4	= TILE_AT(1, 1),
-	ID_BASE_5	= TILE_AT(2, 1),
-	ID_BASE_6	= TILE_AT(3, 1),
-	ID_BASE_7	= TILE_AT(4, 1),
-	ID_BASE_8	= TILE_AT(1, 2),
-	ID_BASE_9	= TILE_AT(2, 2),
-	ID_BASE_10	= TILE_AT(3, 2),
-	ID_BASE_11	= TILE_AT(4, 2),
-	ID_BASE_12	= TILE_AT(1, 3),
-	ID_BASE_13	= TILE_AT(2, 3),
-	ID_BASE_14	= TILE_AT(3, 3),
-	ID_BASE_15	= TILE_AT(4, 3),
+	ID_SPIKE	= TILE_AT(1, 0),
+	ID_CHAIN	= TILE_AT(0, 4),
+	ID_ICE_0	= TILE_AT(0, 1),
+	ID_ICE_1	= TILE_AT(0, 2),
+	ID_ICE_2	= TILE_AT(1, 2),
+	ID_ICE_3	= TILE_AT(0, 3),
+	ID_ICE_4	= TILE_AT(1, 3),
+	ID_GLUE		= TILE_AT(1, 1),
+	ID_SLIME	= TILE_AT(2, 1),
+	ID_BASE_0	= TILE_AT(0, 12),
+	ID_BASE_1	= TILE_AT(1, 12),
+	ID_BASE_2	= TILE_AT(2, 12),
+	ID_BASE_3	= TILE_AT(3, 12),
+	ID_BASE_4	= TILE_AT(0, 13),
+	ID_BASE_5	= TILE_AT(1, 13),
+	ID_BASE_6	= TILE_AT(2, 13),
+	ID_BASE_7	= TILE_AT(3, 13),
+	ID_BASE_8	= TILE_AT(0, 14),
+	ID_BASE_9	= TILE_AT(1, 14),
+	ID_BASE_10	= TILE_AT(2, 14),
+	ID_BASE_11	= TILE_AT(3, 14),
+	ID_BASE_12	= TILE_AT(0, 15),
+	ID_BASE_13	= TILE_AT(1, 15),
+	ID_BASE_14	= TILE_AT(2, 15),
+	ID_BASE_15	= TILE_AT(3, 15),
 };
 
 Tile_flags tile_get_flags(Tile tile);
diff --git a/levels b/levels
index 2045e4f..5458e79 160000
--- a/levels
+++ b/levels
@@ -1 +1 @@
-Subproject commit 2045e4fe5db9c475db850a64726a6c37d8ba7c99
+Subproject commit 5458e79f752d5f16fb95bb7d6fe90833ee8edfb4
diff --git a/src/player_modifiers.c b/src/player_modifiers.c
index f8d7c8b..6e49e0a 100644
--- a/src/player_modifiers.c
+++ b/src/player_modifiers.c
@@ -7,6 +7,6 @@ void player_mod_ice(Player *player) {
 }
 
 void player_mod_glue(Player *player) {
-	player->vars.acceleration = 0;
+	player->vars.acceleration = 1;
 	player->vars.friction = 1;
 }
diff --git a/src/tiles.c b/src/tiles.c
index 934ee24..c85dd52 100644
--- a/src/tiles.c
+++ b/src/tiles.c
@@ -9,12 +9,17 @@ Tile_flags tile_get_flags(Tile tile) {
 		case ID_SPIKE:
 			return P_SPIKE;
 			break;
-		case ID_ICE:
+		case ID_ICE_0:
+		case ID_ICE_1:
+		case ID_ICE_2:
+		case ID_ICE_3:
+		case ID_ICE_4:
 			return P_ICE;
 			break;
 		case ID_GLUE:
 			return P_GLUE;
 			break;
+		case ID_SLIME:
 		case ID_BASE_0:
 		case ID_BASE_1:
 		case ID_BASE_2: