Rework a flow of events related to map tiles

Author: JasonNumberThirteen

Assets/Project/Scenes/AStarVisualiserScene.unity

@@ -6,19 +6,20 @@ public class HoveredMapTileIndicator : MonoBehaviour, IMapEditingElement
 
 	private static readonly float ANIMATION_TRANSITION_MINIMUM_SCALE = 0.8f;
 
-	private VisualiserEventsManager visualiserEventsManager;
-	private MapTile mapTile;
-	private bool mapTileIsSelected;
-	private bool indicatorCanBeShown = true;
+	private MapTile currentMapTile;
+	private MapTile previousMapTile;
+	private HoveredMapTileManager hoveredMapTileManager;
+	private SelectedMapTileManager selectedMapTileManager;
 
 	public void SetMapEditingElementActive(bool active)
 	{
-		indicatorCanBeShown = active;
+		gameObject.SetActive(active);
 	}
 
 	private void Awake()
 	{
-		visualiserEventsManager = FindFirstObjectByType<VisualiserEventsManager>();
+		hoveredMapTileManager = FindFirstObjectByType<HoveredMapTileManager>();
+		selectedMapTileManager = FindFirstObjectByType<SelectedMapTileManager>();
 
 		RegisterToListeners(true);
 	}
@@ -30,26 +31,36 @@ private void OnDestroy()
 
 	private void OnEnable()
 	{
-		if(mapTile != null)
+		if(currentMapTile != null)
 		{
-			transform.position = mapTile.transform.position;
+			transform.position = currentMapTile.transform.position;
 		}
 	}
 
 	private void RegisterToListeners(bool register)
 	{
 		if(register)
 		{
-			if(visualiserEventsManager != null)
+			if(hoveredMapTileManager != null)
 			{
-				visualiserEventsManager.eventReceivedEvent.AddListener(OnEventReceived);
+				hoveredMapTileManager.hoveredMapTileWasChangedEvent.AddListener(OnHoveredMapTileWasChanged);
+			}
+
+			if(selectedMapTileManager != null)
+			{
+				selectedMapTileManager.selectedMapTileWasChangedEvent.AddListener(OnSelectedMapTileWasChanged);
 			}
 		}
 		else
 		{
-			if(visualiserEventsManager != null)
+			if(hoveredMapTileManager != null)
+			{
+				hoveredMapTileManager.hoveredMapTileWasChangedEvent.RemoveListener(OnHoveredMapTileWasChanged);
+			}
+
+			if(selectedMapTileManager != null)
 			{
-				visualiserEventsManager.eventReceivedEvent.RemoveListener(OnEventReceived);
+				selectedMapTileManager.selectedMapTileWasChangedEvent.RemoveListener(OnSelectedMapTileWasChanged);
 			}
 		}
 	}
@@ -59,48 +70,32 @@ private void Start()
 		gameObject.SetActive(false);
 	}
 
-	private void OnEventReceived(VisualiserEvent visualiserEvent)
+	private void OnHoveredMapTileWasChanged(MapTile mapTile)
 	{
-		if(!indicatorCanBeShown || visualiserEvent is not MapTileBoolVisualiserEvent mapTileBoolVisualiserEvent)
+		if(previousMapTile != null)
 		{
 			return;
 		}
-
-		UpdateMapTileReference(mapTileBoolVisualiserEvent);
-		UpdateIndicatorState(mapTileBoolVisualiserEvent);
+		
+		currentMapTile = mapTile;
+		
+		gameObject.SetActive(currentMapTile != null);
 	}
 
-	private void UpdateMapTileReference(MapTileBoolVisualiserEvent mapTileBoolVisualiserEvent)
+	private void OnSelectedMapTileWasChanged(MapTile mapTile)
 	{
-		var mapTile = mapTileBoolVisualiserEvent.GetMapTile();
-		var mapTileIsDefined = mapTile != null;
-		var eventType = mapTileBoolVisualiserEvent.GetVisualiserEventType();
-		var stateIsEnabled = mapTileBoolVisualiserEvent.GetBoolValue();
-
-		switch (eventType)
+		if(mapTile != null)
 		{
-			case VisualiserEventType.MapTileHoverStateWasChanged:
-				this.mapTile = mapTileIsDefined && stateIsEnabled ? mapTile : null;
-				break;
-			
-			case VisualiserEventType.MapTileSelectionStateWasChanged:
-				this.mapTile = mapTileIsDefined && !stateIsEnabled ? mapTile : null;
-				break;
+			previousMapTile = mapTile;
+			currentMapTile = null;
 		}
-	}
-
-	private void UpdateIndicatorState(MapTileBoolVisualiserEvent mapTileBoolVisualiserEvent)
-	{
-		var eventType = mapTileBoolVisualiserEvent.GetVisualiserEventType();
-		
-		if(eventType == VisualiserEventType.MapTileHoverStateWasChanged && mapTileIsSelected)
+		else
 		{
-			return;
+			currentMapTile = previousMapTile;
+			previousMapTile = null;
 		}
-		
-		mapTileIsSelected = eventType == VisualiserEventType.MapTileSelectionStateWasChanged && mapTileBoolVisualiserEvent.GetBoolValue();
 
-		gameObject.SetActive(mapTile != null);
+		gameObject.SetActive(currentMapTile != null);
 	}
 
 	private void Update()