From 1c5f63b61b0b39c6232ab0984bb7b860aadd3f52 Mon Sep 17 00:00:00 2001
From: "Eevee (Evelyn Woods)" <eevee.git@veekun.com>
Date: Tue, 29 Dec 2020 17:08:51 -0700
Subject: [PATCH] Add a new experimental tile: sand

---
 js/main-editor.js | 1 +
 js/tileset.js     | 2 ++
 js/tiletypes.js   | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/js/main-editor.js b/js/main-editor.js
index 3bbd299..2c9f9a2 100644
--- a/js/main-editor.js
+++ b/js/main-editor.js
@@ -1261,6 +1261,7 @@ const EDITOR_PALETTE = [{
         'gate_blue',
         'gate_yellow',
         'gate_green',
+        'sand',
     ],
 }];
 
diff --git a/js/tileset.js b/js/tileset.js
index a9ef498..cc86093 100644
--- a/js/tileset.js
+++ b/js/tileset.js
@@ -893,6 +893,8 @@ export const LL_TILESET_LAYOUT = Object.assign({}, CC2_TILESET_LAYOUT, {
     gate_green: [3, 39],
 
     skeleton_key: [4, 39],
+
+    sand: [10, 40],
 });
 
 export class Tileset {
diff --git a/js/tiletypes.js b/js/tiletypes.js
index 27976cf..7849897 100644
--- a/js/tiletypes.js
+++ b/js/tiletypes.js
@@ -612,6 +612,11 @@ const TILE_TYPES = {
                 ! other.has_item('hiking_boots'));
         },
     },
+    sand: {
+        draw_layer: DRAW_LAYERS.terrain,
+        blocks_collision: COLLISION.block_cc1 | COLLISION.block_cc2,
+        speed_factor: 0.5,
+    },
 
     // Hazards
     fire: {
@@ -2189,6 +2194,7 @@ const TILE_TYPES = {
         is_item: true,
         is_tool: true,
         blocks_collision: COLLISION.block_cc1 | (COLLISION.monster_solid & ~COLLISION.rover),
+        item_ignores: new Set(['sand']),
         // FIXME uhh these "ignore" that dirt and gravel block us, but they don't ignore the on_arrive, so, uhhhh
     },
     // Other tools