CleverRaven/Cataclysm-DDA — pull request #6107 by BevapDin (2014-02-14 17:53:06+00:00)
Title: removed/combined multiple members of same name from json

According to the RFC http://www.ietf.org/rfc/rfc4627.txt member names should be unique. The current code in json.cpp assumes that, but does not enforce or check it. As a result several json objects contain members twice (partially with different content). The json parser uses that last one. The parser should probably throw an exception on duplicated member names.

armor.json:
- combined multiple flag sets
- scrap suit: removed volume: 62, keep volume: 10

comestibles.json:
- boozeberry: removed symbol: "D", keep symbol: "~" for consistency with other drinks
- remove container: null - there was already another non-null container defined, that got used anyway.

containers.json:
- pewter bowl: remove to_hit: 1, keep to_hit: -1

tools.json
- combined multiple flag sets

- removed multiple redundant members, that hat the same properties: category, bashing, to_hit, cutting

mutations.json:
- combined cancels members of Fleet-Footed - is this correct now?

terrain.json:
- removed redundant move_cost member

dojo.json:
- removed redundant "L" member

fishing.json:
- removed to_hit: -2, keep to_hit: 1