Skip to content

Commit

Permalink
Merge pull request #29273 from zombiethoughts/Lint-04/04/2019b
Browse files Browse the repository at this point in the history
Linting blacklisted json files.
  • Loading branch information
ZhilkinSerg authored Apr 4, 2019
2 parents 005fb88 + b99c3e6 commit 6c79f15
Show file tree
Hide file tree
Showing 3 changed files with 405 additions and 382 deletions.
21 changes: 6 additions & 15 deletions data/json/npcs/missiondef.json
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,7 @@
"difficulty": 2,
"value": 150000,
"item": "black_box_transcript",
"start": {
"effect": { "u_buy_item": "black_box" },
"assign_mission_target": { "om_terrain": "lab", "reveal_radius": 3 }
},
"start": { "effect": { "u_buy_item": "black_box" }, "assign_mission_target": { "om_terrain": "lab", "reveal_radius": 3 } },
"origins": [ "ORIGIN_SECONDARY" ],
"followup": "MISSION_EXPLORE_SARCOPHAGUS",
"dialogue": {
Expand Down Expand Up @@ -476,9 +473,7 @@
"difficulty": 2,
"value": 150000,
"item": "etched_skull",
"start": {
"assign_mission_target": { "om_terrain": "cabin_strange", "om_special": "Strange Cabin", "reveal_radius": 3 }
},
"start": { "assign_mission_target": { "om_terrain": "cabin_strange", "om_special": "Strange Cabin", "reveal_radius": 3 } },
"origins": [ "ORIGIN_SECONDARY" ],
"followup": "MISSION_INVESTIGATE_PRISON_VISIONARY",
"dialogue": {
Expand All @@ -501,9 +496,7 @@
"difficulty": 2,
"value": 150000,
"item": "visions_solitude",
"start": {
"assign_mission_target": { "om_terrain": "prison_1_5", "om_special": "Prison", "reveal_radius": 3 }
},
"start": { "assign_mission_target": { "om_terrain": "prison_1_5", "om_special": "Prison", "reveal_radius": 3 } },
"origins": [ "ORIGIN_SECONDARY" ],
"dialogue": {
"describe": "St. Michael the archangel defend me in battle...",
Expand Down Expand Up @@ -687,9 +680,7 @@
"difficulty": 5,
"value": 250000,
"monster_type": "mon_charred_nightmare",
"start": {
"assign_mission_target": { "om_terrain": "necropolis_c_44", "om_special": "Necropolis", "z": -2 }
},
"start": { "assign_mission_target": { "om_terrain": "necropolis_c_44", "om_special": "Necropolis", "z": -2 } },
"monster_kill_goal": 20,
"origins": [ "ORIGIN_SECONDARY" ],
"dialogue": {
Expand All @@ -713,8 +704,8 @@
"value": 250000,
"item": "radio_repeater_mod",
"start": {
"effect": { "u_buy_item": "repeater_mod_guide" },
"assign_mission_target": { "om_terrain": "necropolis_c_23", "om_special": "Necropolis", "reveal_radius": 3, "z": -2 }
"effect": { "u_buy_item": "repeater_mod_guide" },
"assign_mission_target": { "om_terrain": "necropolis_c_23", "om_special": "Necropolis", "reveal_radius": 3, "z": -2 }
},
"origins": [ "ORIGIN_SECONDARY" ],
"followup": "MISSION_OLD_GUARD_NEC_COMMO_2",
Expand Down
Loading

0 comments on commit 6c79f15

Please sign in to comment.