Merge branch 'master' of https://github.com/aps2019project/project-5

aps2019project · May 7, 2019 · 0e69618 · 0e69618
2 parents 4d66f62 + a21e224
commit 0e69618
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/data/JsonParser.java b/src/data/JsonParser.java
@@ -150,9 +150,7 @@ public static List<Card> getSpells() throws FileNotFoundException, JSONException
                         (String)
                                 spellHashMap.get("targetType")
                 );
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            } catch (Exception e) {}
             spell.setTargetType(targetType);
             List<Object> buffs = (List<Object>) spellHashMap.get("effect");
             for(Object buffObject : buffs) {

diff --git a/src/data/spell.json b/src/data/spell.json
@@ -74,7 +74,7 @@
     "name": "Fireball",
     "price": 600,
     "manaPoint": 3,
-    "targetType": {},
+    "targetType": "",
     "effect": []
   },
   {
@@ -95,7 +95,7 @@
     "name": "Poison Lake",
     "price": 900,
     "manaPoint": 5,
-    "targetType": {},
+    "targetType": "",
     "effect": []
   },
   {