diff --git a/strings/brain_damage_lines.json b/strings/brain_damage_lines.json index 5efd3ac9b2..6d2443f939 100644 --- a/strings/brain_damage_lines.json +++ b/strings/brain_damage_lines.json @@ -57,7 +57,7 @@ "i will snatch erry motherfucker birthday", "the ai and borgs are mettacomming I think", "u just did the world a little bit more sad place for someone", - "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?" + "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?", "CEMISTRY SUKS!!!!!!!!", "youed call her a toeugh bithc", "git gud!!", @@ -69,9 +69,9 @@ "iS tHis bay?", "NO PRED CAN eVER CATCH MI", "SCIENCE GIB SHINK RAY PLS", - "KILL PUNPUN 4 FUN xDD" + "KILL PUNPUN 4 FUN xDD", "ooc wow rly?", - "i play @pick(roles) to only ORDER not DO" + "i play @pick(roles) to only ORDER not DO", "CRAGO ORDER @pick(cargo) PLS", "erp?", "i want to digest u!!!", diff --git a/strings/hallucination.json b/strings/hallucination.json index b277f8552f..5efe749d14 100644 --- a/strings/hallucination.json +++ b/strings/hallucination.json @@ -1,229 +1,229 @@ { - "suspicion": [ - "I'm watching you...", - "I know what you're doing", - "What are you hiding?", - "I saw that" - ], + "suspicion": [ + "I'm watching you...", + "I know what you're doing", + "What are you hiding?", + "I saw that" + ], - "greetings": [ - "", - "Hey, ", - "Hi ", - "Hello ", - "Wait, ", - "It's " - ], + "greetings": [ + "", + "Hey, ", + "Hi ", + "Hello ", + "Wait, ", + "It's " + ], - "getout": [ - "Get out", - "Get out!", - "Go away", - "Fuck off", - "OUT!", - "Out!" - ], + "getout": [ + "Get out", + "Get out!", + "Go away", + "Fuck off", + "OUT!", + "Out!" + ], - "weird": [ - "Kchck-Chkck? Kchchck!", - "Kchckchk...", - "EEEeeeeEEEE", - "khhhhh", - "#@§*&£", - "H**p m*", - "H-hhhhh..." - ], + "weird": [ + "Kchck-Chkck? Kchchck!", + "Kchckchk...", + "EEEeeeeEEEE", + "khhhhh", + "#@§*&£", + "H**p m*", + "H-hhhhh..." + ], - "didyouhearthat": [ - "Did you hear that?", - "Did you see that?", - "What was that?" - ], + "didyouhearthat": [ + "Did you hear that?", + "Did you see that?", + "What was that?" + ], - "imatraitor": [ - "Hail Ratvar", - "Hail Nar'Sie", - "Hey, i've got some TC left, want something?", - "Viva!", - "I'll spare you if you don't tell anybody about me", - "Hey, are you a traitor too?", - "You're my target, but @pick(excuses)", - "Are you mr. @pick(ling_names)?" - ], + "imatraitor": [ + "Hail Ratvar", + "Hail Nar'Sie", + "Hey, i've got some TC left, want something?", + "Viva!", + "I'll spare you if you don't tell anybody about me", + "Hey, are you a traitor too?", + "You're my target, but @pick(excuses)", + "Are you mr. @pick(ling_names)?" + ], - "excuses": [ - "i like you, so i'll spare you", - "i don't really feel like following objectives today", - "i'm not robust enough to fight you", - "who cares", - "i'll kill you later" - ], + "excuses": [ + "i like you, so i'll spare you", + "i don't really feel like following objectives today", + "i'm not robust enough to fight you", + "who cares", + "i'll kill you later" + ], - "ling_names": [ - "Alpha", - "Beta", - "Gamma", - "Delta", - "Epsilon", - "Eta", - "Theta", - "Lambda", - "Mu", - "Xi", - "Rho", - "Sigma", - "Tau", - "Upsilon", - "Phi", - "Psi", - "Omega" - ], + "ling_names": [ + "Alpha", + "Beta", + "Gamma", + "Delta", + "Epsilon", + "Eta", + "Theta", + "Lambda", + "Mu", + "Xi", + "Rho", + "Sigma", + "Tau", + "Upsilon", + "Phi", + "Psi", + "Omega" + ], - "doubt": [ - "Why?", - "What?", - "Wait, what?", - "Wait", - "Hold on", - "Uh..." - ], + "doubt": [ + "Why?", + "What?", + "Wait, what?", + "Wait", + "Hold on", + "Uh..." + ], - "aggressive": [ - "Give me that!", - "I'm going to kill you!", - "Fuck you!" - ], + "aggressive": [ + "Give me that!", + "I'm going to kill you!", + "Fuck you!" + ], - "help": [ - "HELP", - "HELP ME", - "HELP HIM", - "HELP HER", - "HELP THEM", - "HELP US", - "HELP YOURSELF" - ], + "help": [ + "HELP", + "HELP ME", + "HELP HIM", + "HELP HER", + "HELP THEM", + "HELP US", + "HELP YOURSELF" + ], - "escape": [ - "RUN!!", - "They're behind me!", - "It's here!", - "Follow me!", - "Follow me" - ], + "escape": [ + "RUN!!", + "They're behind me!", + "It's here!", + "Follow me!", + "Follow me" + ], - "infection_advice": [ - "stay away", - "don't get close", - "be careful", - "help me", - "kill me" - ], + "infection_advice": [ + "stay away", + "don't get close", + "be careful", + "help me", + "kill me" + ], - "people": [ - "Captain", - "Hos", - "Cmo", - "Rd", - "Ce", - "Hop", - "Janitor", - "AI", - "Viro", - "Qm", - "[target.first_name()]" - ], + "people": [ + "Captain", + "Hos", + "Cmo", + "Rd", + "Ce", + "Hop", + "Janitor", + "AI", + "Viro", + "Qm", + "[target.first_name()]" + ], - "accusations": [ - "rogue", - "cult", - "a cultist", - "clockcult", - "a clock cultist", - "a revhead", - "a rev", - "a gang leader", - "a gangster", - "a traitor", - "a tator", - "a ling", - "a changeling" - ], + "accusations": [ + "rogue", + "cult", + "a cultist", + "clockcult", + "a clock cultist", + "a revhead", + "a rev", + "a gang leader", + "a gangster", + "a traitor", + "a tator", + "a ling", + "a changeling" + ], - "threat": [ - "Cult", - "Wizard", - "Blob", - "Ling", - "Ops", - "Swarmers", - "Revenant", - "Traitor", - "Harm", - "I hear flashing", - "Help" - ], + "threat": [ + "Cult", + "Wizard", + "Blob", + "Ling", + "Ops", + "Swarmers", + "Revenant", + "Traitor", + "Harm", + "I hear flashing", + "Help" + ], - "location": [ - "bridge", - "armory", - "sec", - "security", - "science", - "engineering", - "cargo", - "medbay", - "atmos", - "maint", - "hops office", - "captains office", - "chapel", - "library", - "tool storage", - "botany", - "kitchen", - "the ai sat" - ], + "location": [ + "bridge", + "armory", + "sec", + "security", + "science", + "engineering", + "cargo", + "medbay", + "atmos", + "maint", + "hops office", + "captains office", + "chapel", + "library", + "tool storage", + "botany", + "kitchen", + "the ai sat" + ], - "advice": [ - "Hmm...not sure about that.", - "Yes. You're doing the right thing.", - "No. Stop what you're doing.", - "You should be wary of that person.", - "Trust that person.", - "That person wants to kill you.", - "Kill that person. You know who.", - "You should go somewhere else. Quickly.", - "Good luck. You'll need it.", - "You have my permission. Do it." - ], + "advice": [ + "Hmm...not sure about that.", + "Yes. You're doing the right thing.", + "No. Stop what you're doing.", + "You should be wary of that person.", + "Trust that person.", + "That person wants to kill you.", + "Kill that person. You know who.", + "You should go somewhere else. Quickly.", + "Good luck. You'll need it.", + "You have my permission. Do it." + ], - "chemicals": [ - "Ooze", - "Fire", - "Earth", - "Lightning", - "Air", - "Magic", - "Spiders", - "Button", - "Surprise", - "Happiness", - "Despair", - "Blood", - "Awesome", - "Infinity", - "Electronics", - "Time", - "Space", - "Pain", - "Guts", - "Life", - "Death", - "Phlebotinium", - "Mana", - "Energy", - "?????" - ] + "chemicals": [ + "Ooze", + "Fire", + "Earth", + "Lightning", + "Air", + "Magic", + "Spiders", + "Button", + "Surprise", + "Happiness", + "Despair", + "Blood", + "Awesome", + "Infinity", + "Electronics", + "Time", + "Space", + "Pain", + "Guts", + "Life", + "Death", + "Phlebotinium", + "Mana", + "Energy", + "?????" + ] -} +} \ No newline at end of file diff --git a/tools/json_verifier.py b/tools/json_verifier.py new file mode 100644 index 0000000000..04c8670705 --- /dev/null +++ b/tools/json_verifier.py @@ -0,0 +1,19 @@ +import sys +import json + +if len(sys.argv) <= 1: + exit(1) + +files = filter(len, sys.argv[1].split('\n')) +msg = [] +for file in files: + with open(file, encoding="ISO-8859-1") as f: + try: + json.load(f) + except ValueError as exception: + msg.append("JSON synxtax error on file: {}".format(file)) + msg.append(str(exception)) +if msg: + print("\n".join(msg)) + exit(1) +exit(0) diff --git a/tools/travis/build_tools.sh b/tools/travis/build_tools.sh index 193ad261a6..525b45f124 100755 --- a/tools/travis/build_tools.sh +++ b/tools/travis/build_tools.sh @@ -10,5 +10,7 @@ then phpenv global 5.6 php -l tools/WebhookProcessor/github_webhook_processor.php; php -l tools/TGUICompiler.php; + echo "Checking for JSON errors"; + find . -name "*.json" -not -path "./tgui/node_modules/*" | xargs -0 python3 ./tools/json_verifier.py; python tools/ss13_genchangelog.py html/changelog.html html/changelogs; fi;