Merge pull request #37 from openbase/feature/4-agents-should-see-the-energy-level-and-action-points-of-on-adversary-agent

Feature/4 agents should see some global states of the last seen adversary agent

Author: DivineThreepwood

src/main/kotlin/org/openbase/planetsudo/game/GameSound.kt

@@ -77,6 +77,7 @@ enum class GameSound(uri: String) {
             return
         }
 
+        println("Play sound: ${this.name}")
         AUDIO_SERVER.playAudio(audioData)
         soundHistory[this] = Instant.now()
     }

src/main/kotlin/org/openbase/planetsudo/game/strategy/AbstractStrategy.kt

@@ -8,10 +8,7 @@ import org.openbase.planetsudo.game.GameManager
 import org.openbase.planetsudo.game.SwatTeam
 import org.openbase.planetsudo.game.SwatTeam.*
 import org.openbase.planetsudo.level.AbstractLevel
-import org.openbase.planetsudo.level.levelobjects.Agent
-import org.openbase.planetsudo.level.levelobjects.AgentInterface
-import org.openbase.planetsudo.level.levelobjects.Mothership
-import org.openbase.planetsudo.level.levelobjects.MothershipInterface
+import org.openbase.planetsudo.level.levelobjects.*
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.beans.PropertyChangeEvent
@@ -26,6 +23,7 @@ abstract class AbstractStrategy(val agent: AgentInterface) : Runnable {
 
     private val strategyOwner: Agent by lazy { agent as Agent }
     val mothership: MothershipInterface by lazy { strategyOwner.mothership }
+    val adversaryAgent: GlobalAgentInterface get() = agent.adversaryAgent
     val mothershipInternal: Mothership by lazy { strategyOwner.mothership }
     private val rules: TreeMap<Int, Rule> = TreeMap()
     private val gameManager: GameManager = GameManager.gameManager

src/main/kotlin/org/openbase/planetsudo/game/strategy/DivineStrategy.kt

@@ -281,7 +281,7 @@ class DivineStrategy(agent: AgentInterface) : AbstractStrategy(agent) {
         createRule(
             object : Rule("Shift for Extra Resource") {
                 override fun constraint(): Boolean {
-                    return agent.isCarryingResource(ResourceType.ExtremPoint) && agent.hasTonic() && !agent.isShifting && !agent.isAtMothership
+                    return agent.isCarryingResource(ResourceType.ExtremPoint) && agent.hasTonic && !agent.isShifting && !agent.isAtMothership
                 }
 
                 override fun action() {

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

@@ -54,6 +54,7 @@ class Agent(
     private var helpLevelObjectOld: AbstractLevelObject? = null
     private var adversaryObject: AbstractLevelObject? = null
     private var catchedfuel = 0
+    private var lastAversaryAgent: Agent? = null
 
     val mothership: Mothership
     val team: Team
@@ -179,7 +180,9 @@ class Agent(
         get() = level.getTouchableResource(this) != null
 
     override val seeAdversaryAgent: Boolean
-        get() = level.getAdversaryAgent(this) != null
+        get() = level.getAdversaryAgent(this)
+            .also { lastAversaryAgent = it }
+            .let { it != null }
 
     override val seeTeamAgent: Boolean
         get() = level.getTeamAgent(this) != null
@@ -482,6 +485,16 @@ class Agent(
         }
     }
 
+    override fun turnToAdversaryAgent(beta: Int) {
+        ap.actionPoint
+        if (useFuel()) {
+            level.getAdversaryAgent(this)?.let { adversaryAgent ->
+                direction.turnTo(position, adversaryAgent.position)
+                direction.angle += beta
+            }
+        }
+    }
+
     override fun turnRandom() {
         turnRandom(360)
     }
@@ -773,21 +786,27 @@ class Agent(
 
     override fun makeInvisible() {
         ap.getActionPoint(100)
-        if (hasTonicForInvisibility()) {
+        if (hasTonicForInvisibility) {
             tonic = 0
             invisible = true
         }
     }
 
     override fun shift() {
         ap.actionPoint
-        if (hasTonic()) {
+        if (hasTonic) {
             tonic--
             shiftTonic++
             GameSound.Shift.play()
         }
     }
 
+    override val adversaryAgent: GlobalAgentInterface
+        get() = GlobalAgentProxy(
+            lastAversaryAgent
+                ?: error("No adversary agent seen!"),
+        )
+
     companion object {
         const val MAX_TONIC: Int = 3
         const val AGENT_SIZE: Int = 50