From 963ba341648a0d09c0c1a6cbad17ff2a55394470 Mon Sep 17 00:00:00 2001
From: En Yi <en.yi@tutanota.com>
Date: Sat, 19 Aug 2023 13:03:13 +0800
Subject: [PATCH] Make water runner travel faster

Changelog:
- introduce travel speed: how many move can the water runner make
    - normal movement cost : 2
    - water movement cost : 1
---
 scenes/engine/EC/EC.h |  1 +
 scenes/water_flow.c   | 30 ++++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/scenes/engine/EC/EC.h b/scenes/engine/EC/EC.h
index e5f712c..59e754d 100644
--- a/scenes/engine/EC/EC.h
+++ b/scenes/engine/EC/EC.h
@@ -163,6 +163,7 @@ typedef struct _CWaterRunner {
     int32_t fill_idx;
     int16_t fill_range[2];
     uint8_t movement_delay;
+    int8_t movement_speed;
     int16_t counter;
 }CWaterRunner_t;
 
diff --git a/scenes/water_flow.c b/scenes/water_flow.c
index 432c858..4c58ee1 100644
--- a/scenes/water_flow.c
+++ b/scenes/water_flow.c
@@ -23,6 +23,7 @@ Entity_t* create_water_runner(EntityManager_t* ent_manager, int32_t width, int32
     p_crunner->bfs_tilemap.height = height;
     p_crunner->bfs_tilemap.len = total;
     p_crunner->movement_delay = 5;
+    p_crunner->movement_speed = 6;
 
     sc_queue_init(&p_crunner->bfs_queue);
     p_crunner->visited = calloc(total, sizeof(bool));
@@ -217,16 +218,29 @@ void update_water_runner_system(Scene_t* scene)
                 p_crunner->counter--;
                 if (p_crunner->counter == 0)
                 {
-                    p_crunner->current_tile = p_crunner->bfs_tilemap.tilemap[p_crunner->current_tile].to;
-                    CTransform_t* p_ct = get_component(ent, CTRANSFORM_COMP_T);
-                    p_ct->position.x = (p_crunner->current_tile % tilemap.width) * tilemap.tile_size; 
-                    p_ct->position.y = (p_crunner->current_tile / tilemap.width) * tilemap.tile_size; 
-                    tilemap.tiles[p_crunner->current_tile].wet = true;
-                    if (p_crunner->current_tile == p_crunner->target_tile)
+
+                    int8_t move_left = p_crunner->movement_speed;
+                    while (move_left)
                     {
-                        p_crunner->state = REACHABILITY_SEARCH;
+                        p_crunner->current_tile = p_crunner->bfs_tilemap.tilemap[p_crunner->current_tile].to;
+                        CTransform_t* p_ct = get_component(ent, CTRANSFORM_COMP_T);
+                        p_ct->position.x = (p_crunner->current_tile % tilemap.width) * tilemap.tile_size; 
+                        p_ct->position.y = (p_crunner->current_tile / tilemap.width) * tilemap.tile_size; 
+
+                        Tile_t* tile = tilemap.tiles + p_crunner->current_tile;
+                        tile->wet = true;
+                        move_left--;
+                        if (tile->water_level != tile->max_water_level)
+                        {
+                            move_left--;
+                        }
+                        if (p_crunner->current_tile == p_crunner->target_tile)
+                        {
+                            p_crunner->state = REACHABILITY_SEARCH;
+                            break;
+                        }
+                        p_crunner->counter = p_crunner->movement_delay;
                     }
-                    p_crunner->counter = p_crunner->movement_delay;
                 }
             break;
             case REACHABILITY_SEARCH: