Refactor code in the map tile weight controller script

Author: JasonNumberThirteen

Assets/Project/Scripts/Game Objects/MapTileWeightController.cs

@@ -4,26 +4,29 @@
 public class MapTileWeightController : MonoBehaviour, IPrimaryWindowElement, IMapEditingElement
 {
 	private MapTile mapTile;
-	private bool mapTileIsSelected;
-	private bool inputIsActive = true;
-	private bool tilesCanBeHovered = true;
+	private bool hoveringTilesIsLocked;
+	private bool panelUIHoverWasDetected;
 	private UserInputController userInputController;
-	private VisualiserEventsManager visualiserEventsManager;
+	private HoveredMapTileManager hoveredMapTileManager;
+	private PanelUIHoverDetectionManager panelUIHoverDetectionManager;
 
 	public void SetPrimaryWindowElementActive(bool active)
 	{
-		inputIsActive = active;
+		hoveringTilesIsLocked = !active;
+		panelUIHoverWasDetected = false;
+		mapTile = null;
 	}
 
 	public void SetMapEditingElementActive(bool active)
 	{
-		tilesCanBeHovered = active;
+		hoveringTilesIsLocked = !active;
 	}
 
 	private void Awake()
 	{
 		userInputController = FindFirstObjectByType<UserInputController>();
-		visualiserEventsManager = FindFirstObjectByType<VisualiserEventsManager>();
+		hoveredMapTileManager = FindFirstObjectByType<HoveredMapTileManager>();
+		panelUIHoverDetectionManager = FindFirstObjectByType<PanelUIHoverDetectionManager>();
 
 		RegisterToListeners(true);
 	}
@@ -41,10 +44,15 @@ private void RegisterToListeners(bool register)
 			{
 				userInputController.wheelScrolledEvent.AddListener(OnWheelScrolled);
 			}
-			
-			if(visualiserEventsManager != null)
+
+			if(hoveredMapTileManager != null)
+			{
+				hoveredMapTileManager.hoveredMapTileWasChangedEvent.AddListener(OnHoveredMapTileWasChanged);
+			}
+
+			if(panelUIHoverDetectionManager != null)
 			{
-				visualiserEventsManager.eventReceivedEvent.AddListener(OnEventReceived);
+				panelUIHoverDetectionManager.panelUIHoverDetectionStateWasChangedEvent.AddListener(OnPanelUIHoverDetectionStateWasChanged);
 			}
 		}
 		else
@@ -53,17 +61,22 @@ private void RegisterToListeners(bool register)
 			{
 				userInputController.wheelScrolledEvent.RemoveListener(OnWheelScrolled);
 			}
-			
-			if(visualiserEventsManager != null)
+
+			if(hoveredMapTileManager != null)
+			{
+				hoveredMapTileManager.hoveredMapTileWasChangedEvent.RemoveListener(OnHoveredMapTileWasChanged);
+			}
+
+			if(panelUIHoverDetectionManager != null)
 			{
-				visualiserEventsManager.eventReceivedEvent.RemoveListener(OnEventReceived);
+				panelUIHoverDetectionManager.panelUIHoverDetectionStateWasChangedEvent.RemoveListener(OnPanelUIHoverDetectionStateWasChanged);
 			}
 		}
 	}
 
 	private void OnWheelScrolled(Vector2 scrollVector)
 	{
-		if(!inputIsActive)
+		if(hoveringTilesIsLocked || panelUIHoverWasDetected)
 		{
 			return;
 		}
@@ -74,12 +87,10 @@ private void OnWheelScrolled(Vector2 scrollVector)
 			MapTileType.Impassable
 		};
 
-		if(mapTileIsSelected || mapTile == null || !allowedMapTileTypes.Contains(mapTile.GetTileType()))
+		if(mapTile != null && allowedMapTileTypes.Contains(mapTile.GetTileType()))
 		{
-			return;
+			ModifyWeightOfMapTile(Mathf.RoundToInt(scrollVector.y));
 		}
-
-		ModifyWeightOfMapTile(Mathf.RoundToInt(scrollVector.y));
 	}
 
 	private void ModifyWeightOfMapTile(int weightValue)
@@ -90,44 +101,13 @@ private void ModifyWeightOfMapTile(int weightValue)
 		}
 	}
 
-	private void OnEventReceived(VisualiserEvent visualiserEvent)
+	private void OnHoveredMapTileWasChanged(MapTile mapTile)
 	{
-		if(!tilesCanBeHovered || visualiserEvent is not MapTileBoolVisualiserEvent mapTileBoolVisualiserEvent)
-		{
-			return;
-		}
-
-		if(mapTileBoolVisualiserEvent.GetVisualiserEventType() != VisualiserEventType.MapTileHoverStateWasChanged || !mapTileIsSelected)
-		{
-			UpdateMapTileReference(mapTileBoolVisualiserEvent);
-		}
-	}
-
-	private void UpdateMapTileReference(MapTileBoolVisualiserEvent mapTileBoolVisualiserEvent)
-	{
-		if(MapTileShouldBeSelected(mapTileBoolVisualiserEvent))
-		{
-			mapTile = mapTileBoolVisualiserEvent.GetMapTile();
-		}
-		else if(MapTileShouldBeDeselected(mapTileBoolVisualiserEvent))
-		{
-			mapTile = null;
-		}
-
-		mapTileIsSelected = mapTileBoolVisualiserEvent.GetVisualiserEventType() == VisualiserEventType.MapTileSelectionStateWasChanged && mapTileBoolVisualiserEvent.GetBoolValue();
+		this.mapTile = mapTile;
 	}
 
-	private bool MapTileShouldBeSelected(MapTileBoolVisualiserEvent mapTileBoolVisualiserEvent)
+	private void OnPanelUIHoverDetectionStateWasChanged(bool detected)
 	{
-		var mapTileHoverStateIsSetAsSelected = mapTileBoolVisualiserEvent.GetVisualiserEventType() == VisualiserEventType.MapTileHoverStateWasChanged && mapTileBoolVisualiserEvent.GetBoolValue();
-		
-		return mapTile == null && mapTileHoverStateIsSetAsSelected;
-	}
-
-	private bool MapTileShouldBeDeselected(MapTileBoolVisualiserEvent mapTileBoolVisualiserEvent)
-	{
-		var mapTileHoverStateIsSetAsNotSelected = mapTileBoolVisualiserEvent.GetVisualiserEventType() == VisualiserEventType.MapTileHoverStateWasChanged && !mapTileBoolVisualiserEvent.GetBoolValue();
-		
-		return mapTile != null && mapTileHoverStateIsSetAsNotSelected;
+		panelUIHoverWasDetected = detected;
 	}
 }