add shield break reward

Author: capnspacehook

pufferlib/ocean/impulse_wars/env.h

@@ -680,16 +680,6 @@ void resetEnv(iwEnv *e) {
     setupEnv(e);
 }
 
-float computeShotReward(const droneEntity *drone, const weaponInformation *weaponInfo) {
-    const float weaponForce = weaponInfo->fireMagnitude * weaponInfo->invMass;
-    const float scaledForce = (weaponForce * (weaponForce * SHOT_HIT_REWARD_COEF)) + 0.25f;
-    return scaledForce + computeHitStrength(drone);
-}
-
-float computeExplosionReward(const droneEntity *drone) {
-    return computeHitStrength(drone) * EXPLOSION_HIT_REWARD_COEF;
-}
-
 float computeReward(iwEnv *e, droneEntity *drone) {
     float reward = 0.0f;
 
@@ -712,20 +702,22 @@ float computeReward(iwEnv *e, droneEntity *drone) {
         droneEntity *enemyDrone = safe_array_get_at(e->drones, i);
         const bool onTeam = drone->team == enemyDrone->team;
 
+        // TODO: punish for hitting teammates?
         if (drone->stepInfo.shotHit[i] != 0.0f && !onTeam) {
-            // subtract 1 from the weapon type because 1 is added so we
-            // can use 0 as no shot was hit
             reward += drone->stepInfo.shotHit[i] * SHOT_HIT_REWARD_COEF;
         }
         if (drone->stepInfo.explosionHit[i] != 0.0f && !onTeam) {
             reward += drone->stepInfo.explosionHit[i] * EXPLOSION_HIT_REWARD_COEF;
         }
+        if (drone->stepInfo.brokeShield[i] && !onTeam) {
+            reward += SHIELD_BREAK_REWARD;
+        }
 
         if (e->numAgents == e->numDrones) {
-            if (drone->stepInfo.shotTaken[i] != 0 && !onTeam) {
+            if (drone->stepInfo.shotTaken[i] != 0) {
                 reward -= drone->stepInfo.shotTaken[i] * SHOT_HIT_REWARD_COEF;
             }
-            if (drone->stepInfo.explosionTaken[i] && !onTeam) {
+            if (drone->stepInfo.explosionTaken[i]) {
                 reward -= drone->stepInfo.explosionTaken[i] * EXPLOSION_HIT_REWARD_COEF;
             }
         }

pufferlib/ocean/impulse_wars/game.h

@@ -850,6 +850,7 @@ void destroyDroneShield(iwEnv *e, shieldEntity *shield, const bool createPieces)
         droneAddEnergy(drone, DRONE_SHIELD_BREAK_ENERGY_COST);
     }
     drone->shield = NULL;
+    e->stats[drone->idx].ownShieldBroken++;
 
     b2DestroyBody(shield->bodyID);
     b2DestroyShape(shield->bufferShapeID, false);
@@ -2444,6 +2445,8 @@ uint8_t handleProjectileBeginContact(iwEnv *e, const entity *proj, const entity
         if (shield->health <= 0.0f) {
             droneEntity *parentDrone = safe_array_get_at(e->drones, projectile->droneIdx);
             droneAddEnergy(parentDrone, DRONE_SHIELD_BREAK_ENERGY_REFILL);
+            parentDrone->stepInfo.brokeShield[shield->drone->idx] = true;
+            e->stats[parentDrone->idx].shieldsBroken++;
         }
 
         return false;

pufferlib/ocean/impulse_wars/settings.h

@@ -43,6 +43,7 @@ const float TEAMMATE_KILL_PUNISHMENT = -1.0f;
 const float DEATH_PUNISHMENT = 0.0f;
 const float ENERGY_EMPTY_PUNISHMENT = -0.75f;
 const float WEAPON_PICKUP_REWARD = 0.5f;
+const float SHIELD_BREAK_REWARD = 0.5f;
 const float SHOT_HIT_REWARD_COEF = 0.005f;
 const float EXPLOSION_HIT_REWARD_COEF = 0.005f;
 const float APPROACH_REWARD = 0.0f;

pufferlib/ocean/impulse_wars/types.h

@@ -215,6 +215,7 @@ typedef struct droneStepInfo {
     float explosionHit[_MAX_DRONES];
     float shotTaken[_MAX_DRONES];
     float explosionTaken[_MAX_DRONES];
+    bool brokeShield[_MAX_DRONES];
     bool ownShotTaken;
 } droneStepInfo;
 
@@ -311,6 +312,8 @@ typedef struct droneStats {
     float totalBursts;
     float burstsHit;
     float energyEmptied;
+    float shieldsBroken;
+    float ownShieldBroken;
     float selfKills;
     float kills;
     float wins;