solve conflict

Author: DivineThreepwood

src/main/kotlin/org/openbase/planetsudo/level/levelobjects/Agent.kt

@@ -125,6 +125,9 @@ class Agent(
     override val isDisabled: Boolean
         get() = !isAlive || !hasFuel
 
+    override val carryingResourceType: ResourceType
+        get() = resource?.type ?: ResourceType.Unknown
+
     override val isCarryingResource: Boolean
         get() = resource != null
 

src/main/kotlin/org/openbase/planetsudo/level/levelobjects/AgentInterface.kt

@@ -105,6 +105,11 @@ interface AgentInterface {
      */
     val angle: Int
 
+    /**
+     * Gibt die Art der Resource an, die der Agent trägt.
+     */
+    val carryingResourceType: ResourceType
+
     /**
      * Zeigt den verbliebenen Treibstoff des Agenten an.
      *

src/main/kotlin/org/openbase/planetsudo/level/levelobjects/AgentMock.kt

@@ -31,6 +31,8 @@ class AgentMock : AgentInterface {
         get() = error("Mock does not offer any functionality.")
     override val angle: Int
         get() = error("Mock does not offer any functionality.")
+    override val carryingResourceType: Resource.ResourceType
+        get() = error("Mock does not offer any functionality.")
     override val fuel: Int
         get() = error("Mock does not offer any functionality.")
     override val fuelInPercent: Int