Format with trailing comma

1 files changed, 336 insertions, 371 deletions

diff --git a/sw-engine/src/main/resources/org/luxons/sevenwonders/engine/data/wonders.json b/sw-engine/src/main/resources/org/luxons/sevenwonders/engine/data/wonders.json
index 3fa5063f..9049ca5e 100644
--- a/sw-engine/src/main/resources/org/luxons/sevenwonders/engine/data/wonders.json
+++ b/sw-engine/src/main/resources/org/luxons/sevenwonders/engine/data/wonders.json
@@ -12,16 +12,14 @@
             "effects": {
               "points": 3
             }
-          },
-          {
+          }, {
             "requirements": {
               "resources": "OO"
             },
             "effects": {
               "production": "(W/S/O/C)"
             }
-          },
-          {
+          }, {
             "requirements": {
               "resources": "GG"
             },
@@ -42,16 +40,14 @@
             "effects": {
               "production": "(W/S/O/C)"
             }
-          },
-          {
+          }, {
             "requirements": {
               "resources": "WW"
             },
             "effects": {
               "production": "(G/P/L)"
             }
-          },
-          {
+          }, {
             "requirements": {
               "resources": "SSS"
             },
@@ -63,411 +59,380 @@
         "image": "alexandriaB.png"
       }
     }
-  },
-  {
-    "name": "Babylon",
-    "sides": {
-      "A": {
-        "initialResource": "C",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "CC"
-            },
-            "effects": {
-              "points": 3
-            }
+  }, {
+  "name": "Babylon",
+  "sides": {
+    "A": {
+      "initialResource": "C",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "CC"
           },
-          {
-            "requirements": {
-              "resources": "WWW"
-            },
-            "effects": {
-              "science": "any"
-            }
+          "effects": {
+            "points": 3
+          }
+        }, {
+          "requirements": {
+            "resources": "WWW"
           },
-          {
-            "requirements": {
-              "resources": "CCCC"
-            },
-            "effects": {
-              "points": 7
-            }
+          "effects": {
+            "science": "any"
           }
-        ],
-        "image": "babylonA.png"
-      },
-      "B": {
-        "initialResource": "C",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "CL"
-            },
-            "effects": {
-              "points": 3
-            }
+        }, {
+          "requirements": {
+            "resources": "CCCC"
           },
-          {
-            "requirements": {
-              "resources": "WWG"
-            },
-            "effects": {
-              "action": "PLAY_LAST_CARD"
-            }
+          "effects": {
+            "points": 7
+          }
+        }
+      ],
+      "image": "babylonA.png"
+    },
+    "B": {
+      "initialResource": "C",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "CL"
           },
-          {
-            "requirements": {
-              "resources": "CCCP"
-            },
-            "effects": {
-              "science": "any"
-            }
+          "effects": {
+            "points": 3
           }
-        ],
-        "image": "babylonB.png"
-      }
+        }, {
+          "requirements": {
+            "resources": "WWG"
+          },
+          "effects": {
+            "action": "PLAY_LAST_CARD"
+          }
+        }, {
+          "requirements": {
+            "resources": "CCCP"
+          },
+          "effects": {
+            "science": "any"
+          }
+        }
+      ],
+      "image": "babylonB.png"
     }
-  },
-  {
-    "name": "Ephesos",
-    "sides": {
-      "A": {
-        "initialResource": "P",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "SS"
-            },
-            "effects": {
-              "points": 3
-            }
+  }
+}, {
+  "name": "Ephesos",
+  "sides": {
+    "A": {
+      "initialResource": "P",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "SS"
           },
-          {
-            "requirements": {
-              "resources": "WW"
-            },
-            "effects": {
-              "gold": 9
-            }
+          "effects": {
+            "points": 3
+          }
+        }, {
+          "requirements": {
+            "resources": "WW"
           },
-          {
-            "requirements": {
-              "resources": "PP"
-            },
-            "effects": {
-              "points": 7
-            }
+          "effects": {
+            "gold": 9
           }
-        ],
-        "image": "ephesosA.png"
-      },
-      "B": {
-        "initialResource": "P",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "SS"
-            },
-            "effects": {
-              "gold": 4,
-              "points": 2
-            }
+        }, {
+          "requirements": {
+            "resources": "PP"
           },
-          {
-            "requirements": {
-              "resources": "WW"
-            },
-            "effects": {
-              "gold": 4,
-              "points": 3
-            }
+          "effects": {
+            "points": 7
+          }
+        }
+      ],
+      "image": "ephesosA.png"
+    },
+    "B": {
+      "initialResource": "P",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "SS"
           },
-          {
-            "requirements": {
-              "resources": "GPL"
-            },
-            "effects": {
-              "gold": 4,
-              "points": 5
-            }
+          "effects": {
+            "gold": 4,
+            "points": 2
           }
-        ],
-        "image": "ephesosB.png"
-      }
+        }, {
+          "requirements": {
+            "resources": "WW"
+          },
+          "effects": {
+            "gold": 4,
+            "points": 3
+          }
+        }, {
+          "requirements": {
+            "resources": "GPL"
+          },
+          "effects": {
+            "gold": 4,
+            "points": 5
+          }
+        }
+      ],
+      "image": "ephesosB.png"
     }
-  },
-  {
-    "name": "Gizah",
-    "sides": {
-      "A": {
-        "initialResource": "S",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "SS"
-            },
-            "effects": {
-              "points": 3
-            }
+  }
+}, {
+  "name": "Gizah",
+  "sides": {
+    "A": {
+      "initialResource": "S",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "SS"
           },
-          {
-            "requirements": {
-              "resources": "WWW"
-            },
-            "effects": {
-              "points": 5
-            }
+          "effects": {
+            "points": 3
+          }
+        }, {
+          "requirements": {
+            "resources": "WWW"
           },
-          {
-            "requirements": {
-              "resources": "SSSS"
-            },
-            "effects": {
-              "points": 7
-            }
+          "effects": {
+            "points": 5
           }
-        ],
-        "image": "gizahA.png"
-      },
-      "B": {
-        "initialResource": "S",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "WW"
-            },
-            "effects": {
-              "points": 3
-            }
+        }, {
+          "requirements": {
+            "resources": "SSSS"
           },
-          {
-            "requirements": {
-              "resources": "SSS"
-            },
-            "effects": {
-              "points": 5
-            }
+          "effects": {
+            "points": 7
+          }
+        }
+      ],
+      "image": "gizahA.png"
+    },
+    "B": {
+      "initialResource": "S",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "WW"
           },
-          {
-            "requirements": {
-              "resources": "CCC"
-            },
-            "effects": {
-              "points": 5
-            }
+          "effects": {
+            "points": 3
+          }
+        }, {
+          "requirements": {
+            "resources": "SSS"
           },
-          {
-            "requirements": {
-              "resources": "SSSSP"
-            },
-            "effects": {
-              "points": 7
-            }
+          "effects": {
+            "points": 5
           }
-        ],
-        "image": "gizahB.png"
-      }
+        }, {
+          "requirements": {
+            "resources": "CCC"
+          },
+          "effects": {
+            "points": 5
+          }
+        }, {
+          "requirements": {
+            "resources": "SSSSP"
+          },
+          "effects": {
+            "points": 7
+          }
+        }
+      ],
+      "image": "gizahB.png"
     }
-  },
-  {
-    "name": "Halikarnassus",
-    "sides": {
-      "A": {
-        "initialResource": "L",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "CC"
-            },
-            "effects": {
-              "points": 3
-            }
+  }
+}, {
+  "name": "Halikarnassus",
+  "sides": {
+    "A": {
+      "initialResource": "L",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "CC"
           },
-          {
-            "requirements": {
-              "resources": "OOO"
-            },
-            "effects": {
-              "action": "PLAY_DISCARDED"
-            }
+          "effects": {
+            "points": 3
+          }
+        }, {
+          "requirements": {
+            "resources": "OOO"
           },
-          {
-            "requirements": {
-              "resources": "LL"
-            },
-            "effects": {
-              "points": 7
-            }
+          "effects": {
+            "action": "PLAY_DISCARDED"
           }
-        ],
-        "image": "halikarnassusA.png"
-      },
-      "B": {
-        "initialResource": "L",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "OO"
-            },
-            "effects": {
-              "points": 2,
-              "action": "PLAY_DISCARDED"
-            }
+        }, {
+          "requirements": {
+            "resources": "LL"
           },
-          {
-            "requirements": {
-              "resources": "CCC"
-            },
-            "effects": {
-              "points": 1,
-              "action": "PLAY_DISCARDED"
-            }
+          "effects": {
+            "points": 7
+          }
+        }
+      ],
+      "image": "halikarnassusA.png"
+    },
+    "B": {
+      "initialResource": "L",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "OO"
           },
-          {
-            "requirements": {
-              "resources": "GPL"
-            },
-            "effects": {
-              "action": "PLAY_DISCARDED"
-            }
+          "effects": {
+            "points": 2,
+            "action": "PLAY_DISCARDED"
           }
-        ],
-        "image": "halikarnassusB.png"
-      }
+        }, {
+          "requirements": {
+            "resources": "CCC"
+          },
+          "effects": {
+            "points": 1,
+            "action": "PLAY_DISCARDED"
+          }
+        }, {
+          "requirements": {
+            "resources": "GPL"
+          },
+          "effects": {
+            "action": "PLAY_DISCARDED"
+          }
+        }
+      ],
+      "image": "halikarnassusB.png"
     }
-  },
-  {
-    "name": "Olympia",
-    "sides": {
-      "A": {
-        "initialResource": "W",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "WW"
-            },
-            "effects": {
-              "points": 3
-            }
+  }
+}, {
+  "name": "Olympia",
+  "sides": {
+    "A": {
+      "initialResource": "W",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "WW"
           },
-          {
-            "requirements": {
-              "resources": "SS"
-            },
-            "effects": {
-              "action": "ONE_FREE_PER_AGE"
-            }
+          "effects": {
+            "points": 3
+          }
+        }, {
+          "requirements": {
+            "resources": "SS"
           },
-          {
-            "requirements": {
-              "resources": "OO"
-            },
-            "effects": {
-              "points": 7
-            }
+          "effects": {
+            "action": "ONE_FREE_PER_AGE"
           }
-        ],
-        "image": "olympiaA.png"
-      },
-      "B": {
-        "initialResource": "W",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "WW"
-            },
-            "effects": {
-              "discount": {
-                "resourceTypes": "WSOC",
-                "providers": [
-                  "LEFT_PLAYER",
-                  "RIGHT_PLAYER"
-                ],
-                "discountedPrice": 1
-              }
-            }
+        }, {
+          "requirements": {
+            "resources": "OO"
           },
-          {
-            "requirements": {
-              "resources": "SS"
-            },
-            "effects": {
-              "points": 5
-            }
+          "effects": {
+            "points": 7
+          }
+        }
+      ],
+      "image": "olympiaA.png"
+    },
+    "B": {
+      "initialResource": "W",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "WW"
           },
-          {
-            "requirements": {
-              "resources": "OOL"
-            },
-            "effects": {
-              "action": "COPY_GUILD"
+          "effects": {
+            "discount": {
+              "resourceTypes": "WSOC",
+              "providers": [
+                "LEFT_PLAYER", "RIGHT_PLAYER"
+              ],
+              "discountedPrice": 1
             }
           }
-        ],
-        "image": "olympiaB.png"
-      }
+        }, {
+          "requirements": {
+            "resources": "SS"
+          },
+          "effects": {
+            "points": 5
+          }
+        }, {
+          "requirements": {
+            "resources": "OOL"
+          },
+          "effects": {
+            "action": "COPY_GUILD"
+          }
+        }
+      ],
+      "image": "olympiaB.png"
     }
-  },
-  {
-    "name": "Rhodos",
-    "sides": {
-      "A": {
-        "initialResource": "O",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "WW"
-            },
-            "effects": {
-              "points": 3
-            }
+  }
+}, {
+  "name": "Rhodos",
+  "sides": {
+    "A": {
+      "initialResource": "O",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "WW"
           },
-          {
-            "requirements": {
-              "resources": "CCC"
-            },
-            "effects": {
-              "military": 2
-            }
+          "effects": {
+            "points": 3
+          }
+        }, {
+          "requirements": {
+            "resources": "CCC"
           },
-          {
-            "requirements": {
-              "resources": "OOOO"
-            },
-            "effects": {
-              "points": 7
-            }
+          "effects": {
+            "military": 2
           }
-        ],
-        "image": "rhodosA.png"
-      },
-      "B": {
-        "initialResource": "O",
-        "stages": [
-          {
-            "requirements": {
-              "resources": "SSS"
-            },
-            "effects": {
-              "gold": 3,
-              "military": 1,
-              "points": 3
-            }
+        }, {
+          "requirements": {
+            "resources": "OOOO"
           },
-          {
-            "requirements": {
-              "resources": "OOOO"
-            },
-            "effects": {
-              "gold": 4,
-              "military": 1,
-              "points": 4
-            }
+          "effects": {
+            "points": 7
           }
-        ],
-        "image": "rhodosB.png"
-      }
+        }
+      ],
+      "image": "rhodosA.png"
+    },
+    "B": {
+      "initialResource": "O",
+      "stages": [
+        {
+          "requirements": {
+            "resources": "SSS"
+          },
+          "effects": {
+            "gold": 3,
+            "military": 1,
+            "points": 3
+          }
+        }, {
+          "requirements": {
+            "resources": "OOOO"
+          },
+          "effects": {
+            "gold": 4,
+            "military": 1,
+            "points": 4
+          }
+        }
+      ],
+      "image": "rhodosB.png"
     }
   }
+}
 ]