One problem down, another has popped up.
Jenkins log (Well, the end of it)
+/tmp/hudson5038152500460847498.sh:10> doc/contrib/verify_json.sh
yes: standard output: Broken pipe
yes: write error
DEBUG: data/json/item_groups.json: line 5255:4: missing separator
["loincloth_leather", 1]
]
}
^
<<<<<<< HEAD
]
Build step 'Execute shell' marked build as failure
Archiving artifacts
Finished: FAILURE
I looked into the files and found out a few end in weird stuff like this: (Found in the item_groups.JSON)
[code]<<<<<<< HEAD
]
]
0df165bd23e6d3195eb3ac8abc2a2e49fa642773[/code]
instead of a ]
and that similar weird text like that had hopped into the consumables JSON
[code] {
“type” : “COMESTIBLE”,
<<<<<<< HEAD
“id” : “irradiated_papaya”,
“name” : “irradiated papaya”,
“weight” : 200,
“color” : “yellow”,
“addiction_type” : “none”,
“spoils_in” : 0,
“use_action” : “NONE”,
“stim” : 0,
“container” : “bag_plastic”,
“to_hit” : 0,
“comestible_type” : “FOOD”,
“symbol” : “%”,
“quench” : 8,
“heal” : 2,
“addiction_potential” : 0,
“nutrition” : 21,
“description” : “An irradiated papaya, while the radiation is gone it will remain edible nearly forever.”,
“price” : 10,
“material” : “veggy”,
“tool” : “null”,
“volume” : 2,
“cutting” : 0,
“phase” : “solid”,
“charges” : 1,
“bashing” : 0,
“fun” : 5
},
{
“type” : “COMESTIBLE”,
“id” : “irradiated_kiwi”,
“name” : “irradiated kiwi”,
“weight” : 100,
“color” : “brown”,
“addiction_type” : “none”,
“spoils_in” : 0,
“use_action” : “NONE”,
“stim” : 0,
“container” : “bag_plastic”,
“to_hit” : 0,
“comestible_type” : “FOOD”,
“symbol” : “%”,
“quench” : 3,
“heal” : 2,
“addiction_potential” : 0,
“nutrition” : 11,
“description” : “An irradiated kiwi, while the radiation is gone it will remain edible nearly forever.”,
“price” : 10,
“material” : “veggy”,
“tool” : “null”,
“volume” : 1,
“cutting” : 0,
“phase” : “solid”,
“charges” : 1,
“bashing” : 0,
“fun” : 3
},
{
“type” : “COMESTIBLE”,
“id” : “irradiated_apricot”,
“name” : “irradiated apricot”,
“weight” : 150,
“color” : “yellow”,
“addiction_type” : “none”,
“spoils_in” : 0,
“use_action” : “NONE”,
“stim” : 0,
“container” : “bag_plastic”,
“to_hit” : 0,
“comestible_type” : “FOOD”,
“symbol” : “%”,
“quench” : 3,
“heal” : 1,
“addiction_potential” : 0,
“nutrition” : 16,
“description” : “An irradiated apricot, while the radiation is gone it will remain edible nearly forever.”,
“price” : 10,
“material” : “veggy”,
“tool” : “null”,
“volume” : 1,
“cutting” : 0,
“phase” : “solid”,
“charges” : 1,
“bashing” : 0,
“fun” : 3
"id" : "single_malt_whiskey",
"name" : "single malt whiskey",
"weight" : 33,
"color" : "brown",
"addiction_type" : "alcohol",
"spoils_in" : 0,
"use_action" : "ALCOHOL",
"stim" : -12,
"container" : "wooden_barrel",
"to_hit" : 0,
"comestible_type" : "DRINK",
"symbol" : "~",
"quench" : -12,
"heal" : -2,
"addiction_potential" : 5,
"nutrition" : 4,
"description" : "Only the finest whiskey straight from the bung.",
"price" : 85,
"material" : "null",
"tool" : "null",
"volume" : 2,
"cutting" : 0,
"phase" : "liquid",
"charges" : 7,
"bashing" : 0,
"fun" : 17
0df165bd23e6d3195eb3ac8abc2a2e49fa642773
}[/code]
EDIT: Got some help from my not-boss. Who proved to be useful. It’s been fixed, once I add a few things I just remembered from the suggestion thread I’ll post the fix. Should be good, in theory.