Merge pull request #111 from 2AA4-W24/salma

Fixed battery not decreasing properly for echo/scan

src/main/java/ca/mcmaster/se2aa4/island/team101/Drone.java

@@ -42,6 +42,7 @@ public void update(Response<?> response) {
 
         // Set the charge based on the response cost
         setCharge(typedResponse.getCost());
+        logger.info("COST OF ACTION: " + typedResponse.getCost());
 
         // Update the map only if it was a scan response
         if (lastCommand.equals("scan")) {
@@ -73,7 +74,9 @@ public Compass getCompass(){
     }
 
     private void setCharge(Integer cost) {
+        logger.info("BATTERY WAS: " + charge);
         charge -= cost;
+        logger.info("BATTERY HAS BEEN CHANGED TO: " + charge);
         logger.info("Battery level: {}", charge);
         if (charge <= 0) {
             logger.info("*** Drone is out of battery. ***");

src/main/java/ca/mcmaster/se2aa4/island/team101/EchoHandler.java

@@ -4,7 +4,7 @@
 public class EchoHandler implements ResponseHandler<EchoResponse> {
     @Override
     public EchoResponse handle(JSONObject response, JSONObject extras) {
-        int cost = extras.optInt("cost");
+        int cost = response.optInt("cost");
         String status = response.optString("status");
         int range = extras.optInt("range", 0);
         String found = extras.optString("found", "Unknown");

src/main/java/ca/mcmaster/se2aa4/island/team101/GenericResponse.java

@@ -1,8 +1,8 @@
 package ca.mcmaster.se2aa4.island.team101;
 
 public class GenericResponse {
-    private final int cost;
-    private final String status;
+    protected final int cost;
+    protected final String status;
 
     public GenericResponse(int cost, String status) {
         this.cost = cost;

src/main/java/ca/mcmaster/se2aa4/island/team101/ScanHandler.java

@@ -6,7 +6,7 @@
 public class ScanHandler implements ResponseHandler<ScanResponse> {
     @Override
     public ScanResponse handle(JSONObject response, JSONObject extras) {
-        int cost = extras.optInt("cost");
+        int cost = response.optInt("cost");
         String status = response.optString("status");
         JSONArray biomes = extras.optJSONArray("biomes");
         JSONArray creeks = extras.optJSONArray("creeks");