Commit changes after running make style-all-json

CleverRaven · Dec 26, 2019 · 15f1d0f · 15f1d0f
1 parent 097c266
commit 15f1d0f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 55 deletions.
diff --git a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
@@ -195,12 +195,7 @@
     "end": {
       "opinion": { "trust": 1, "value": 1 },
       "effect": [ { "u_buy_item": "leather_armor_horse", "count": 1 } ],
-      "update_mapgen": [
-        {
-          "om_terrain": "horse_farm_isherwood_4",
-          "set": [ { "point": "furniture", "id": "f_anvil", "x": 6, "y": 12 } ]
-        }
-      ]
+      "update_mapgen": [ { "om_terrain": "horse_farm_isherwood_4", "set": [ { "point": "furniture", "id": "f_anvil", "x": 6, "y": 12 } ] } ]
     }
   },
   {

diff --git a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
@@ -186,12 +186,7 @@
     },
     "end": {
       "opinion": { "trust": 5, "value": 5 },
-      "update_mapgen": [
-        {
-          "om_terrain": "cabin_isherwood",
-          "place_nested": [ { "chunks": [ "cabin_isherwood_update" ], "x": 3, "y": 1 } ]
-        }
-      ]
+      "update_mapgen": [ { "om_terrain": "cabin_isherwood", "place_nested": [ { "chunks": [ "cabin_isherwood_update" ], "x": 3, "y": 1 } ] } ]
     }
   }
 ]
diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json b/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json
@@ -131,10 +131,7 @@
     "value": 50000,
     "start": {
       "update_mapgen": [
-        {
-          "om_terrain": "evac_center_19",
-          "place_npcs": [ { "class": "evac_guard3", "x": 12, "y": 12, "target": true } ]
-        },
+        { "om_terrain": "evac_center_19", "place_npcs": [ { "class": "evac_guard3", "x": 12, "y": 12, "target": true } ] },
         {
           "om_terrain": "evac_center_7",
           "place_npcs": [ { "class": "scavenger_hunter", "x": [ 9, 15 ], "y": [ 9, 15 ] } ]

diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
@@ -251,10 +251,7 @@
           "place_furniture": [ { "furn": "f_bookcase", "x": 17, "y": 11 } ],
           "place_npcs": [ { "class": "ranch_farmer_1", "x": 19, "y": 20 } ]
         },
-        {
-          "om_terrain": "ranch_camp_66",
-          "place_npcs": [ { "class": "ranch_woodcutter_1", "x": 4, "y": 11 } ]
-        }
+        { "om_terrain": "ranch_camp_66", "place_npcs": [ { "class": "ranch_woodcutter_1", "x": 4, "y": 11 } ] }
       ]
     }
   },
@@ -586,10 +583,7 @@
     },
     "end": {
       "update_mapgen": [
-        {
-          "om_terrain": "ranch_camp_59",
-          "place_nested": [ { "chunks": [ "tacoma_commune_clinic_10" ], "x": 0, "y": 2 } ]
-        },
+        { "om_terrain": "ranch_camp_59", "place_nested": [ { "chunks": [ "tacoma_commune_clinic_10" ], "x": 0, "y": 2 } ] },
         {
           "om_terrain": "ranch_camp_60",
           "place_nested": [ { "chunks": [ "tacoma_commune_chopshop_10" ], "x": 0, "y": 4 } ]
@@ -621,10 +615,7 @@
     },
     "end": {
       "update_mapgen": [
-        {
-          "om_terrain": "ranch_camp_59",
-          "place_nested": [ { "chunks": [ "tacoma_commune_clinic_11" ], "x": 0, "y": 2 } ]
-        },
+        { "om_terrain": "ranch_camp_59", "place_nested": [ { "chunks": [ "tacoma_commune_clinic_11" ], "x": 0, "y": 2 } ] },
         {
           "om_terrain": "ranch_camp_60",
           "place_nested": [ { "chunks": [ "tacoma_commune_chopshop_11" ], "x": 0, "y": 4 } ]
@@ -674,10 +665,7 @@
     },
     "end": {
       "update_mapgen": [
-        {
-          "om_terrain": "ranch_camp_49",
-          "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_12" ], "x": 0, "y": 9 } ]
-        },
+        { "om_terrain": "ranch_camp_49", "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_12" ], "x": 0, "y": 9 } ] },
         {
           "om_terrain": "ranch_camp_60",
           "place_nested": [ { "chunks": [ "tacoma_commune_chopshop_12_done" ], "x": 0, "y": 4 } ]
@@ -714,14 +702,8 @@
     },
     "end": {
       "update_mapgen": [
-        {
-          "om_terrain": "ranch_camp_49",
-          "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_13" ], "x": 0, "y": 9 } ]
-        },
-        {
-          "om_terrain": "ranch_camp_66",
-          "place_npcs": [ { "class": "ranch_barber", "x": 5, "y": 3 } ]
-        },
+        { "om_terrain": "ranch_camp_49", "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_13" ], "x": 0, "y": 9 } ] },
+        { "om_terrain": "ranch_camp_66", "place_npcs": [ { "class": "ranch_barber", "x": 5, "y": 3 } ] },
         {
           "om_terrain": "ranch_camp_70",
           "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ],
@@ -793,10 +775,7 @@
       "failure": "It was a lost cause anyways..."
     },
     "end": {
-      "update_mapgen": {
-        "om_terrain": "ranch_camp_51",
-        "place_nested": [ { "chunks": [ "tacoma_commune_bar_15" ], "x": 0, "y": 0 } ]
-      }
+      "update_mapgen": { "om_terrain": "ranch_camp_51", "place_nested": [ { "chunks": [ "tacoma_commune_bar_15" ], "x": 0, "y": 0 } ] }
     }
   },
   {
@@ -823,10 +802,7 @@
     },
     "end": {
       "update_mapgen": [
-        {
-          "om_terrain": "ranch_camp_51",
-          "place_nested": [ { "chunks": [ "tacoma_commune_bar_16_done" ], "x": 0, "y": 0 } ]
-        },
+        { "om_terrain": "ranch_camp_51", "place_nested": [ { "chunks": [ "tacoma_commune_bar_16_done" ], "x": 0, "y": 0 } ] },
         {
           "om_terrain": "ranch_camp_52",
           "place_nested": [ { "chunks": [ "tacoma_commune_greenhouse_16" ], "x": 2, "y": 10 } ]

diff --git a/data/mods/FictonalWeapons/fic_mods.json b/data/mods/FictonalWeapons/fic_mods.json
@@ -32,13 +32,7 @@
     "color": "light_gray",
     "location": "underbarrel",
     "mod_targets": [ "pistol", "smg" ],
-    "gun_data": {
-      "ammo": "flammable",
-      "skill": "launcher",
-      "dispersion": 320,
-      "durability": 10,
-      "clip_size": 300
-    },
+    "gun_data": { "ammo": "flammable", "skill": "launcher", "dispersion": 320, "durability": 10, "clip_size": 300 },
     "flags": [ "FIRE_50" ],
     "dispersion_modifier": 25,
     "min_skills": [ [ "weapon", 2 ], [ "launcher", 2 ] ]