From e4b1df12801011ce88ea6df6dab4ca2b69622220 Mon Sep 17 00:00:00 2001
From: Govorunb <Govorunb@users.noreply.github.com>
Date: Fri, 3 Nov 2023 03:57:52 +1100
Subject: [PATCH] classic post-push refactor

---
 SCHIZO/Creatures/Components/CarryCreature.cs          |  2 +-
 .../SCHIZO/Creatures/Components/CarryCreature.cs      |  2 +-
 .../SCHIZO/Creatures/Components/IOnMeleeAttack.cs     |  6 ------
 .../Creatures/Components/IOnMeleeAttack.cs.meta       | 11 -----------
 4 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 Unity/Assets/Scripts/SCHIZO/Creatures/Components/IOnMeleeAttack.cs
 delete mode 100644 Unity/Assets/Scripts/SCHIZO/Creatures/Components/IOnMeleeAttack.cs.meta

diff --git a/SCHIZO/Creatures/Components/CarryCreature.cs b/SCHIZO/Creatures/Components/CarryCreature.cs
index 3750d984..def87ff7 100644
--- a/SCHIZO/Creatures/Components/CarryCreature.cs
+++ b/SCHIZO/Creatures/Components/CarryCreature.cs
@@ -4,7 +4,7 @@
 namespace SCHIZO.Creatures.Components;
 
 /// <summary>Adapted from <see cref="CollectShiny"/></summary>
-partial class CarryCreature : IOnTakeDamage
+partial class CarryCreature : IOnTakeDamage, IOnMeleeAttack
 {
     private GetCarried target;
     private bool targetPickedUp;
diff --git a/Unity/Assets/Scripts/SCHIZO/Creatures/Components/CarryCreature.cs b/Unity/Assets/Scripts/SCHIZO/Creatures/Components/CarryCreature.cs
index 9c3eea82..7227fa0e 100644
--- a/Unity/Assets/Scripts/SCHIZO/Creatures/Components/CarryCreature.cs
+++ b/Unity/Assets/Scripts/SCHIZO/Creatures/Components/CarryCreature.cs
@@ -4,7 +4,7 @@
 
 namespace SCHIZO.Creatures.Components
 {
-    public sealed partial class CarryCreature : CustomCreatureAction, IOnMeleeAttack
+    public sealed partial class CarryCreature : CustomCreatureAction
     {
         [SerializeField]
         private EcoTargetType_All _ecoTargetType;
diff --git a/Unity/Assets/Scripts/SCHIZO/Creatures/Components/IOnMeleeAttack.cs b/Unity/Assets/Scripts/SCHIZO/Creatures/Components/IOnMeleeAttack.cs
deleted file mode 100644
index ff8d4e80..00000000
--- a/Unity/Assets/Scripts/SCHIZO/Creatures/Components/IOnMeleeAttack.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace SCHIZO.Creatures.Components
-{
-    public partial interface IOnMeleeAttack
-    {
-    }
-}
\ No newline at end of file
diff --git a/Unity/Assets/Scripts/SCHIZO/Creatures/Components/IOnMeleeAttack.cs.meta b/Unity/Assets/Scripts/SCHIZO/Creatures/Components/IOnMeleeAttack.cs.meta
deleted file mode 100644
index 921c0275..00000000
--- a/Unity/Assets/Scripts/SCHIZO/Creatures/Components/IOnMeleeAttack.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 30a535428fa28c34795a18413a0f0712
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: