From 5433305b142dd7cf0b0f23e47207a352ad77a423 Mon Sep 17 00:00:00 2001 From: j-weissen Date: Thu, 23 Jun 2022 13:35:59 +0200 Subject: [PATCH] oba jetzt wirklich --- ...ActionHandler.cs => ClickActionHandler.cs} | 5 +- ...ler.cs.meta => ClickActionHandler.cs.meta} | 0 ...tionHandlers.cs => ClickActionHandlers.cs} | 63 +++++++++---------- ...rs.cs.meta => ClickActionHandlers.cs.meta} | 0 4 files changed, 32 insertions(+), 36 deletions(-) rename Assets/Scripts/Actions/{ActionHandler.cs => ClickActionHandler.cs} (55%) rename Assets/Scripts/Actions/{ActionHandler.cs.meta => ClickActionHandler.cs.meta} (100%) rename Assets/Scripts/Actions/{ActionHandlers.cs => ClickActionHandlers.cs} (77%) rename Assets/Scripts/Actions/{ActionHandlers.cs.meta => ClickActionHandlers.cs.meta} (100%) diff --git a/Assets/Scripts/Actions/ActionHandler.cs b/Assets/Scripts/Actions/ClickActionHandler.cs similarity index 55% rename from Assets/Scripts/Actions/ActionHandler.cs rename to Assets/Scripts/Actions/ClickActionHandler.cs index 0212293..119fa9c 100644 --- a/Assets/Scripts/Actions/ActionHandler.cs +++ b/Assets/Scripts/Actions/ClickActionHandler.cs @@ -1,9 +1,10 @@ using System.Collections.Generic; +using System.Transactions; using UnityEngine; namespace Actions { - public interface ActionHandler { - public void InvokeAction(GameObject gameObject, UsableItem usableItem); + public interface ClickActionHandler { + public void InvokeAction(GameObject gameObject); public bool Matches(GameObject gameObject, UsableItem usableItem); } } \ No newline at end of file diff --git a/Assets/Scripts/Actions/ActionHandler.cs.meta b/Assets/Scripts/Actions/ClickActionHandler.cs.meta similarity index 100% rename from Assets/Scripts/Actions/ActionHandler.cs.meta rename to Assets/Scripts/Actions/ClickActionHandler.cs.meta diff --git a/Assets/Scripts/Actions/ActionHandlers.cs b/Assets/Scripts/Actions/ClickActionHandlers.cs similarity index 77% rename from Assets/Scripts/Actions/ActionHandlers.cs rename to Assets/Scripts/Actions/ClickActionHandlers.cs index 8b755c0..24a7279 100644 --- a/Assets/Scripts/Actions/ActionHandlers.cs +++ b/Assets/Scripts/Actions/ClickActionHandlers.cs @@ -1,14 +1,12 @@ using Actions; using Tiles; -using TMPro.EditorUtilities; using UnityEngine; namespace Assets.Scripts.Actions { - public abstract class AbstractTileActionHandler : ActionHandler { + public abstract class AbstractTileClickActionHandler : ClickActionHandler { protected BaseTile _tile; - protected int _usableItemId; protected ItemContainer _ic; - public virtual void InvokeAction(GameObject gameObject, UsableItem usableItem) { + public virtual void InvokeAction(GameObject gameObject) { throw new System.NotImplementedException(); } @@ -19,12 +17,12 @@ namespace Assets.Scripts.Actions { _tile = gameObject.GetComponent().Tile; rv = true; } - catch { - } + catch { } + return rv; } } - public abstract class AbstractGrassTileActionHandler : AbstractTileActionHandler { + public abstract class AbstractGrassTileClickActionHandler : AbstractTileClickActionHandler { public override bool Matches(GameObject gameObject, UsableItem usableItem) { bool rv = base.Matches(gameObject, usableItem); if(rv) { @@ -33,7 +31,7 @@ namespace Assets.Scripts.Actions { return rv; } } - public abstract class AbstractFarmlandTileActionHandler : AbstractTileActionHandler { + public abstract class AbstractFarmlandTileClickActionHandler : AbstractTileClickActionHandler { protected Crop crop; public override bool Matches(GameObject gameObject, UsableItem usableItem) { bool rv = base.Matches(gameObject, usableItem); @@ -78,7 +76,7 @@ namespace Assets.Scripts.Actions { } } } - public abstract class AbstractWaterTileActionHandler : AbstractTileActionHandler { + public abstract class AbstractWaterTileClickActionHandler : AbstractTileClickActionHandler { public override bool Matches(GameObject gameObject, UsableItem usableItem) { bool rv = base.Matches(gameObject, usableItem); if(rv) { @@ -88,25 +86,24 @@ namespace Assets.Scripts.Actions { } } - public abstract class AbstractAnimalActionHandler : ActionHandler { - public virtual void InvokeAction(GameObject gameObject, UsableItem usableItem) { + public abstract class AbstractAnimalClickActionHandler : ClickActionHandler { + public void InvokeAction(GameObject gameObject) { throw new System.NotImplementedException(); } - public virtual bool Matches(GameObject gameObject, UsableItem usableItem) { + public bool Matches(GameObject gameObject, UsableItem usableItem) { bool rv = false; try { gameObject.GetComponent(); rv = true; } - catch { - } + catch { } return rv; } } - public class GrassTileHoeActionHandler : AbstractGrassTileActionHandler { - public override void InvokeAction(GameObject gameObject, UsableItem usableItem) { + public class GrassTileClickHoeActionHandler : AbstractGrassTileClickActionHandler { + public override void InvokeAction(GameObject gameObject) { gameObject.GetComponent().Tile = new FarmlandTile(); } @@ -119,8 +116,8 @@ namespace Assets.Scripts.Actions { } } - public class GrassTileShovelActionHandler : AbstractGrassTileActionHandler { - public override void InvokeAction(GameObject gameObject, UsableItem usableItem) { + public class GrassTileClickShovelActionHandler : AbstractGrassTileClickActionHandler { + public override void InvokeAction(GameObject gameObject) { gameObject.GetComponent().Tile = new WaterTile(); } @@ -133,8 +130,8 @@ namespace Assets.Scripts.Actions { } } - public class GrassTileFenceActionHandler : AbstractGrassTileActionHandler { - public override void InvokeAction(GameObject gameObject, UsableItem usableItem) { + public class GrassTileClickFenceActionHandler : AbstractGrassTileClickActionHandler { + public override void InvokeAction(GameObject gameObject) { SpriteRenderer fenceRenderer = null; BoxCollider2D fenceCollider = null; foreach (Transform transChild in gameObject.GetComponentsInChildren()) { @@ -166,8 +163,8 @@ namespace Assets.Scripts.Actions { } } - public class FarmlandTileShovelActionHandler : AbstractFarmlandTileActionHandler { - public override void InvokeAction(GameObject gameObject, UsableItem usableItem) { + public class FarmlandTileClickShovelActionHandler : AbstractFarmlandTileClickActionHandler { + public override void InvokeAction(GameObject gameObject) { gameObject.GetComponent().Tile = new GrassTile(); } @@ -180,8 +177,8 @@ namespace Assets.Scripts.Actions { } } - public class FarmlandTileScytheActionHandler : AbstractFarmlandTileActionHandler { - public override void InvokeAction(GameObject gameObject, UsableItem usableItem) { + public class FarmlandTileClickScytheActionHandler : AbstractFarmlandTileClickActionHandler { + public override void InvokeAction(GameObject gameObject) { if(crop.FullyGrown) { Inventory.instance.AddElement(ItemContainer.Instance.GetItemByName("Wheat Seeds"), (int)(Random.Range(1, 300))); @@ -200,8 +197,8 @@ namespace Assets.Scripts.Actions { } } - public class FarmlandTileWateringCanActionHandler : AbstractFarmlandTileActionHandler { - public override void InvokeAction(GameObject gameObject, UsableItem usableItem) { + public class FarmlandTileClickWateringCanActionHandler : AbstractFarmlandTileClickActionHandler { + public override void InvokeAction(GameObject gameObject) { crop.Hydrated = true; updateFarmlandSprites(gameObject); } @@ -215,8 +212,8 @@ namespace Assets.Scripts.Actions { } } - public class FarmlandTileWheatSeedsActionHandler : AbstractFarmlandTileActionHandler { - public override void InvokeAction(GameObject gameObject, UsableItem usableItem) { + public class FarmlandTileClickWheatSeedsActionHandler : AbstractFarmlandTileClickActionHandler { + public override void InvokeAction(GameObject gameObject) { if(!crop.Planted) { crop.Plant(); Inventory.instance.RemoveElement(ItemContainer.Instance.GetItemByName("Wheat Seeds"), 1); @@ -234,8 +231,8 @@ namespace Assets.Scripts.Actions { } } - public class WaterTileShovelActionHandler : AbstractWaterTileActionHandler { - public override void InvokeAction(GameObject gameObject, UsableItem usableItem) { + public class WaterTileClickShovelActionHandler : AbstractWaterTileClickActionHandler { + public override void InvokeAction(GameObject gameObject) { gameObject.GetComponent().Tile = new GrassTile(); } @@ -248,10 +245,8 @@ namespace Assets.Scripts.Actions { } } - public class WaterTileFishingRodActionHandler : AbstractWaterTileActionHandler { - public override void InvokeAction(GameObject gameObject, UsableItem usableItem) { - ItemContainer ic = ItemContainer.Instance; - + public class WaterTileClickFishingRodActionHandler : AbstractWaterTileClickActionHandler { + public override void InvokeAction(GameObject gameObject) { FishingController fc = FishingController.instance; if(!fc.Fishing) { fc.StartFishing(); diff --git a/Assets/Scripts/Actions/ActionHandlers.cs.meta b/Assets/Scripts/Actions/ClickActionHandlers.cs.meta similarity index 100% rename from Assets/Scripts/Actions/ActionHandlers.cs.meta rename to Assets/Scripts/Actions/ClickActionHandlers.cs.meta