From f01de16a1938242b1e603548d2c6743274a9d7ff Mon Sep 17 00:00:00 2001
From: ForgottenArbiter <43520548+ForgottenArbiter@users.noreply.github.com>
Date: Sun, 28 Jul 2019 08:28:25 -0500
Subject: [PATCH] Add additional fields to powers to expose miscellaneous
 attributes

---
 .../communicationmod/GameStateConverter.java  | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/main/java/communicationmod/GameStateConverter.java b/src/main/java/communicationmod/GameStateConverter.java
index e355dd3..e63330c 100644
--- a/src/main/java/communicationmod/GameStateConverter.java
+++ b/src/main/java/communicationmod/GameStateConverter.java
@@ -703,12 +703,37 @@ private static HashMap<String, Object> convertPlayerToJson(AbstractPlayer player
         return jsonPlayer;
     }
 
+    /**
+     * Checks whether the given object has the specified field. If so, returns the field's value. Else returns null.
+     * @param object The object used to look for the specified field
+     * @param fieldName The field that we want to access
+     * @return The value of the field, if present, or else null.
+     */
+    private static Object getFieldIfExists(Object object, String fieldName) {
+        Class objectClass = object.getClass();
+        for (Field field : objectClass.getDeclaredFields()) {
+            if (field.getName().equals(fieldName)) {
+                try {
+                    field.setAccessible(true);
+                    return field.get(object);
+                } catch(IllegalAccessException e) {
+                    e.printStackTrace();
+                    return null;
+                }
+            }
+        }
+        return null;
+    }
+
     /**
      * Creates a GSON-compatible representation of the given creature's powers
      * The power object contains:
      * "id" (string): The id of the power
      * "name" (string): The name of the power, in the currently selected language
      * "amount" (int): The amount of the power
+     * "damage" (int, optional): The amount of damage the power does, if applicable
+     * "misc" (int, optional): Contains misc values that don't fit elsewhere (such as the base value for Flight)
+     * "card" (object, optional): The card associated with the power (for powers like Nightmare)
      * @param creature The creature whose powers are to be converted
      * @return A list of power objects
      */
@@ -719,6 +744,25 @@ private static ArrayList<Object> convertCreaturePowersToJson(AbstractCreature cr
             json_power.put("id", power.ID);
             json_power.put("name", power.name);
             json_power.put("amount", power.amount);
+            Object damage = getFieldIfExists(power, "damage");
+            if (damage != null) {
+                json_power.put("daamge", (int)damage);
+            }
+            Object card = getFieldIfExists(power, "card");
+            if (card != null) {
+                json_power.put("card", convertCardToJson((AbstractCard)card));
+            }
+            String[] miscFieldNames = {
+                    "basePower", "maxAmt", "storedAmount", "hpLoss"
+            };
+            Object misc = null;
+            for (String fieldName : miscFieldNames) {
+                misc = getFieldIfExists(power, fieldName);
+                if (misc != null) {
+                    json_power.put("misc", (int)misc);
+                    break;
+                }
+            }
             powers.add(json_power);
         }
         return powers;