Master is broken!

[edisonout]

Crap! This has to be my fault, I'm sorry. All I've updated are images and the characters' .json files - all of which worked fine when in branches on my machine. Now I've just re-synced with master and get this error message:

[Protuhj]

Be sure you get a fresh copy of the master before declaring it to be truly broken..

[edisonout]

My master is up to date. Is it not broken for you @Protuhj ?

[Protuhj]

Yes, I just tested it (I'm at work) and it's broken =/

[Protuhj]

buddy.json appears to be invalid json.

{
  "animations": {
    "pull": {
      "left": ["loop", ["5-8, 15"], 0.16],
      "right": ["loop", ["5-8,16"], 0.16]
    },
    "push": {
      "left": ["loop", ["1-4,15"], 0.16],
      "right": ["loop", ["1-4,16"], 0.16]
    },
    "walk": {
      "left": ["loop", ["2-5,1"], 0.16],
      "right": ["loop", ["2-5,2"], 0.16]
    }
  },
  "costumes": [
    {"category": "base", "name": "Buddy", "sheet": "base","ow": 1},
    {"category": "fanmade", "name": "Master Exploder", "sheet": "master_exploder""ow": 2}
                                                                                ^-- missing comma
  ],
  "name": "buddy",
  "offset": 7
}

[Protuhj]

chang.json is also invalid

{
  "animations": {
    "dropwalk": {
      "left": ["loop", ["8-10,7"], 0.16],
      "right": ["loop", ["8-10,8"], 0.16]
    }, 
    "holdwalk": {
      "left": ["loop", ["2-4,5"], 0.16],
      "right": ["loop", ["2-4,6"], 0.16]
    }, 
    "throwwalk": {
      "left": ["loop", ["2-4,7"], 0.16],
      "right": ["loop", ["2-4,8"], 0.16]
    }
  }, 
{ <--- delete
  "costumes": [
    { "category": "base", "name": "Ben Chang", "sheet": "base", "ow": 1 },
    { "category": "s2e14", "name": "Brutalitops", "sheet": "brutalitops", "ow": 2 },
    { "category": "s2e19", "name": "Butch Coolidge", "sheet": "butch", "ow": 7 },
    { "category": "s3e21", "name": "Dictator", "sheet": "dictator", "ow": 3 },
    { "category": "s4promo", "name": "Evil Chang", "sheet": "evil", "ow": 4 }, 
    { "category": "s2e18", "name": "Father", "sheet": "father", "ow": 5 },
    { "category": "s1e24", "name": "Safety First", "sheet": "safety", "ow": 6 }
  ], 
  "name": "chang",
  "offset": 8
}

[Protuhj]

jeff.json is also invalid

{
  "animations": {
    "hurt": {
      "left": ["once", ["4-5,3"], 1],
      "right": ["once", ["4-5,4"], 1]
    }
  },
{   <--- delete
  "costumes": [
    { "category": "base", "name": "Jeff Winger", "sheet": "base", "ow": 1 }, 
    { "category": "s2e4", "name": "Astronaut", "sheet": "astronaut", "ow": 2 },
    { "category": "s3e19", "name": "Asylum", "sheet": "asylum", "ow": 3 },
    { "category": "s3e12", "name": "Aviators", "sheet": "aviators", "ow": 4 },
    { "category": "s1e17", "name": "Birthday Suit", "sheet": "naked", "ow": 5 },
    { "category": "s2e6", "name": "David Beckham", "sheet": "david", "ow": 6 },
    { "category": "s3e20", "name": "Electrocuted", "sheet": "electro", "ow": 7 },
    { "category": "s1e19", "name": "Goldblumming", "sheet": "goldblum", "ow": 8 },
    { "category": "s2e2", "name": "Heather Popandlocklear", "sheet": "poplock", "ow": 9 },
    { "category": "s2e23", "name": "King of Spades", "sheet": "spades", "ow": 10 },
    { "category": "s2e13", "name": "Kool Kat", "sheet": "cool", "ow": 11 },
    { "category": "s2e21", "name": "Mercury Poisoning", "sheet": "straightjacket", "ow": 12 },
    { "category": "s3e19", "name": "Mohawk",  "sheet": "mohawk", "ow": 13 },
    { "category": "s3e1", "name": "Monkey Gas", "sheet": "monkeygas", "ow": 14 },
    { "category": "s3e12", "name": "Seacrest Hulk", "sheet": "hulk", "ow": 15 },
    { "category": "s1e17", "name": "Short Shorts", "sheet": "shorts", "ow": 16 },
    { "category": "s1e7", "name": "Sexy Cowboy", "sheet": "cowboy", "ow": 17 },
    { "category": "s1e2", "name": "Spanish 101", "sheet": "abeds_shirt", "ow": 18 },
    { "category": "s4e3", "name": "Thoraxis", "sheet": "thoraxis", "ow": 19 },
    { "category": "s3e9", "name": "Tinkletown",  "sheet": "anime", "ow": 20 },
    { "category": "s3e5", "name": "Vampire",  "sheet": "vampire", "ow": 22 },
    { "category": "s2e6", "name": "Zombie", "sheet": "zombie", "ow": 21 }
  ], 
  "name": "jeff", 
  "offset": 5
}

[Protuhj]

In the future, use http://jsonlint.com/ to validate the JSON before committing!

[danhp]

I thought i removed those animation info since we moved to a master layout.

[danhp]

Imma fix these

[Protuhj]

Verified master is fixed

[danhp]

great :D

[edisonout]

@Protuhj - thank you, that was a nice easy fix. Thought I'd really screwed things up there. @DaNiwa Already fixed. We still need the animations for when they vary from the master layout - for example Troy has 3 jumping sprites while everyone else has 1 or 2. Some have 2 for hurt. If you remove the animation code, you end up showing the black boxes which appear on the sprite sheets.

[danhp]

Got it ;)