From 60db98d9f872d31aa603a1a36c17967cf32ddefc Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Mon, 7 Mar 2016 22:54:52 +0100 Subject: [PATCH] Reworked all moves from Insurgence data files, resolving #53, and other move issues --- client/app/js/models/battles/pokemon.coffee | 2 + public/Sprites/Icons/icon330-armor.png | Bin 0 -> 17180 bytes public/Sprites/Icons/icon330s-armor.png | Bin 0 -> 17386 bytes public/js/app.js | 3 + public/js/data.js | 2 +- public/js/replays.js | 3 + server/in/data/data_formes.json | 159099 ++++++++++------- 7 files changed, 90915 insertions(+), 68194 deletions(-) create mode 100644 public/Sprites/Icons/icon330-armor.png create mode 100644 public/Sprites/Icons/icon330s-armor.png diff --git a/client/app/js/models/battles/pokemon.coffee b/client/app/js/models/battles/pokemon.coffee index 674a2f0..37ef9c5 100644 --- a/client/app/js/models/battles/pokemon.coffee +++ b/client/app/js/models/battles/pokemon.coffee @@ -135,6 +135,8 @@ class @Pokemon extends Backbone.Model # Map each move name to a move object return _(learnset).map (moveName) -> move = _(MoveData[moveName]).clone() + if typeof move is "undefined" + console.log(moveName) move['name'] = moveName move diff --git a/public/Sprites/Icons/icon330-armor.png b/public/Sprites/Icons/icon330-armor.png new file mode 100644 index 0000000000000000000000000000000000000000..5685188b08c71996be49763cb78537002bb7314a GIT binary patch literal 17180 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 literal 0 HcmV?d00001 diff --git a/public/Sprites/Icons/icon330s-armor.png b/public/Sprites/Icons/icon330s-armor.png new file mode 100644 index 0000000000000000000000000000000000000000..811ca0995ff21e117281aab258748d5de0d91036 GIT binary patch literal 17386 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