Fix broken observations/score

cswinter · Oct 14, 2019 · 77b0fef · 77b0fef
1 parent f89ba6c
commit 77b0fef
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 26 deletions.
diff --git a/server/app/com/clemenswinter/codecraftserver/controllers/Application.scala b/server/app/com/clemenswinter/codecraftserver/controllers/Application.scala
@@ -86,22 +86,27 @@ class Application @Inject()(
       bb.putFloat(ob.timestep.toFloat / ob.maxGameLength)
 
       // Allied drone
-      val drone = ob.alliedDrones(0)
-      val x = drone.xPos
-      val y = drone.yPos
-      bb.putFloat(x / 1000.0f)
-      bb.putFloat(y / 1000.0f)
-      bb.putFloat(math.sin(drone.orientation).toFloat)
-      bb.putFloat(math.cos(drone.orientation).toFloat)
-      bb.putFloat(drone.storedResources / 50.0f)
-      bb.putFloat(if (drone.isConstructing) 1.0f else -1.0f)
-      bb.putFloat(if (drone.isHarvesting) 1.0f else -1.0f)
-      bb.putFloat(0.1f * drone.hitpoints)
-      bb.putFloat(0.5f * drone.storageModules)
-      bb.putFloat(0.5f * drone.missileBatteries)
-      bb.putFloat(0.5f * drone.constructors)
-      bb.putFloat(0.5f * drone.engines)
-      bb.putFloat(0.5f * drone.shieldGenerators)
+      var x = 0.0f
+      var y = 0.0f
+      ob.alliedDrones.headOption match {
+        case Some(drone) =>
+          x = drone.xPos
+          y = drone.yPos
+          bb.putFloat(x / 1000.0f)
+          bb.putFloat(y / 1000.0f)
+          bb.putFloat(math.sin(drone.orientation).toFloat)
+          bb.putFloat(math.cos(drone.orientation).toFloat)
+          bb.putFloat(drone.storedResources / 50.0f)
+          bb.putFloat(if (drone.isConstructing) 1.0f else -1.0f)
+          bb.putFloat(if (drone.isHarvesting) 1.0f else -1.0f)
+          bb.putFloat(0.1f * drone.hitpoints)
+          bb.putFloat(0.5f * drone.storageModules)
+          bb.putFloat(0.5f * drone.missileBatteries)
+          bb.putFloat(0.5f * drone.constructors)
+          bb.putFloat(0.5f * drone.engines)
+          bb.putFloat(0.5f * drone.shieldGenerators)
+        case None => for (_ <- 0 until droneProperties) bb.putFloat(0.0f)
+      }
 
       // 10 closest minerals
       for (m <- ob.minerals.sortBy(m => (m.xPos * m.xPos + m.yPos * m.yPos) / m.size).take(10)) {
@@ -110,16 +115,14 @@ class Application @Inject()(
         bb.putFloat(math.sqrt((m.yPos - y) * (m.yPos - y) + (m.xPos - x) * (m.xPos - x)).toFloat / 1000.0f)
         bb.putFloat(m.size / 100.0f)
       }
-      for (m <- 0 until (10 - ob.minerals.size) * 4) {
+      for (_ <- 0 until (10 - ob.minerals.size) * 4) {
         bb.putFloat(0.0f)
       }
 
       // 10 closest enemy drones
-      for (m <- ob.enemyDrones.sortBy(m => (m.xPos * m.xPos + m.yPos * m.yPos) / m.size).take(10)) {
-        val x = drone.xPos
-        val y = drone.yPos
-        bb.putFloat(x / 1000.0f)
-        bb.putFloat(y / 1000.0f)
+      for (drone <- ob.enemyDrones.sortBy(m => (m.xPos * m.xPos + m.yPos * m.yPos) / m.size).take(10)) {
+        bb.putFloat((drone.xPos - x) / 1000.0f)
+        bb.putFloat((drone.yPos - y) / 1000.0f)
         bb.putFloat(math.sin(drone.orientation).toFloat)
         bb.putFloat(math.cos(drone.orientation).toFloat)
         bb.putFloat(drone.storedResources / 50.0f)
@@ -132,7 +135,7 @@ class Application @Inject()(
         bb.putFloat(0.5f * drone.engines)
         bb.putFloat(0.5f * drone.shieldGenerators)
       }
-      for (m <- 0 until (10 - ob.enemyDrones.size) * droneProperties) {
+      for (_ <- 0 until (10 - ob.enemyDrones.size) * droneProperties) {
         bb.putFloat(0.0f)
       }
     }

diff --git a/server/app/com/clemenswinter/codecraftserver/controllers/MultiplayerServer.scala b/server/app/com/clemenswinter/codecraftserver/controllers/MultiplayerServer.scala
@@ -213,7 +213,7 @@ class PlayerController(val maxGameLength: Int, val player: Player) extends MetaC
       sim.timestep,
       maxGameLength,
       sim.winner.map(_.id),
-      for (d <- alliedDrones)
+      for (d <- alliedDrones if !d.isDead)
         yield
           DroneObservation(
             d.position.x,
@@ -251,13 +251,17 @@ class PlayerController(val maxGameLength: Int, val player: Player) extends MetaC
         )).toSeq,
       for (m <- minerals.toSeq if !m.harvested)
         yield MineralObservation(m.position.x, m.position.y, m.size),
-      alliedDrones.toSeq.map(score).sum,
+      alliedDrones.toSeq
+        .filter(!_.isDead)
+        .map(score)
+        .sum, // TODO: why doesn't dead drone get removed? (maybe one tick too late?)
       sim.dronesFor(enemyPlayer).map(score).sum
     )
   }
 
-  def score(drone: Drone): Double =
+  def score(drone: Drone): Double = {
     drone.spec.resourceCost * (drone.hitpoints / drone.maxHitpoints.toDouble + 1.0)
+  }
 
   def act(action: Action): Unit = {
     observationsReady = Promise()