A little bit of everything - Minor JSON fixes from the voices on disc…

…ord (#74187)

* pet the cow

* dextrous raccoon description

* more book price nerfing

* electric spinwheel

* jumper cable and funnel

* hatred and crimes

* llama pluralization

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -1942,7 +1942,7 @@
       { "item": "ref_matches", "prob": 60, "charges": [ 0, 32 ] },
       { "item": "sewing_kit", "prob": 47, "charges": [ 0, -1 ] },
       { "item": "tailors_kit", "prob": 3, "charges": [ 0, -1 ] },
-      { "item": "electric_spinwheel", "prob": 3, "charges": [ 0, -1 ] },
+      { "item": "electric_spinwheel", "prob": 3 },
       [ "thread", 40 ],
       [ "scissors", 50 ],
       { "item": "soldering_iron", "prob": 70 },
@@ -2520,7 +2520,7 @@
       { "item": "ref_matches", "prob": 60, "charges": [ 0, 32 ] },
       { "item": "sewing_kit", "prob": 47, "charges": [ 0, -1 ] },
       { "item": "tailors_kit", "prob": 3, "charges": [ 0, -1 ] },
-      { "item": "electric_spinwheel", "prob": 3, "charges": [ 0, -1 ] },
+      { "item": "electric_spinwheel", "prob": 3 },
       { "item": "thread", "prob": 40, "charges": [ 1, 50 ] },
       [ "hammer", 35 ],
       { "item": "extinguisher", "prob": 20, "charges": 100 },

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -2081,7 +2081,7 @@
       { "item": "sewing_kit", "prob": 30, "charges": [ 0, -1 ] },
       { "item": "shed_stick", "prob": 2 },
       { "item": "tailors_kit", "prob": 9, "charges": [ 0, -1 ] },
-      { "item": "electric_spinwheel", "prob": 9, "charges": [ 0, -1 ] },
+      { "item": "electric_spinwheel", "prob": 9 },
       [ "knitting_needles", 15 ],
       [ "sheet_kevlar_layered", 10 ],
       [ "leather", 10 ],

data/json/itemgroups/SUS/clothes_store.json

@@ -75,7 +75,7 @@
             "prob": 25
           },
           { "item": "tailors_kit", "prob": 75, "charges": [ 0, -1 ] },
-          { "item": "electric_spinwheel", "prob": 75, "charges": [ 0, -1 ] }
+          { "item": "electric_spinwheel", "prob": 75 }
         ]
       },
       { "item": "thread", "count": [ 2, 7 ], "prob": 75 },

data/json/itemgroups/SUS/domestic.json

@@ -292,7 +292,7 @@
       { "item": "boxcutter", "prob": 20 },
       { "item": "feather", "prob": 20, "charges": 1 },
       { "item": "tailors_kit", "prob": 12, "charges": [ 50, 350 ] },
-      { "item": "electric_spinwheel", "prob": 12, "charges": [ 0, 100 ] },
+      { "item": "electric_spinwheel", "prob": 12 },
       { "item": "polaroid_photo", "prob": 10 },
       { "item": "RPG_die", "prob": 10 },
       { "item": "chopsticks", "prob": 10 },

data/json/itemgroups/activities_hobbies.json

@@ -315,7 +315,7 @@
       { "group": "butane_lighter_and_fuel", "prob": 10 },
       { "item": "sewing_kit", "prob": 47, "charges": [ 0, -1 ] },
       { "item": "tailors_kit", "prob": 3, "charges": [ 0, -1 ] },
-      { "item": "electric_spinwheel", "prob": 3, "charges": [ 0, -1 ] },
+      { "item": "electric_spinwheel", "prob": 3 },
       [ "thread", 40 ],
       [ "hammer", 35 ],
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
@@ -511,7 +511,7 @@
       { "item": "matches", "prob": 60, "charges": [ 1, 20 ] },
       { "item": "sewing_kit", "prob": 47, "charges": [ 0, -1 ] },
       { "item": "tailors_kit", "prob": 3, "charges": [ 0, -1 ] },
-      { "item": "electric_spinwheel", "prob": 3, "charges": [ 0, -1 ] },
+      { "item": "electric_spinwheel", "prob": 3 },
       [ "thread", 40 ],
       [ "hammer", 35 ],
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },

data/json/itemgroups/collections_domestic.json

@@ -1140,7 +1140,7 @@
       { "item": "ref_matches", "prob": 60, "charges": [ 1, 32 ] },
       { "item": "sewing_kit", "prob": 47, "charges": [ 0, -1 ] },
       { "item": "tailors_kit", "prob": 3, "charges": [ 0, -1 ] },
-      { "item": "electric_spinwheel", "prob": 3, "charges": [ 0, -1 ] },
+      { "item": "electric_spinwheel", "prob": 3 },
       { "item": "thread", "prob": 40 },
       { "item": "scissors", "prob": 50 },
       { "item": "soldering_iron", "prob": 70 },
@@ -1281,7 +1281,7 @@
       { "item": "bottle_plastic_small", "prob": 5 },
       { "item": "sewing_kit", "prob": 47, "charges": [ 0, -1 ] },
       { "item": "tailors_kit", "prob": 3, "charges": [ 0, -1 ] },
-      { "item": "electric_spinwheel", "prob": 3, "charges": [ 0, -1 ] },
+      { "item": "electric_spinwheel", "prob": 3 },
       { "item": "thread", "prob": 40 },
       { "item": "cotton_patchwork", "prob": 1 },
       { "item": "scissors", "prob": 50 },

data/json/itemgroups/tools.json

@@ -682,7 +682,7 @@
       { "item": "sewing_kit", "prob": 120, "charges": [ 0, -1 ] },
       { "item": "shed_stick", "prob": 5 },
       { "item": "tailors_kit", "prob": 10, "charges": [ 0, -1 ] },
-      { "item": "electric_spinwheel", "prob": 10, "charges": [ 0, -1 ] },
+      { "item": "electric_spinwheel", "prob": 10 },
       [ "knitting_needles", 20 ],
       [ "kevlar_shears", 100 ]
     ]

data/json/items/book/chemistry.json

@@ -365,7 +365,7 @@
     "weight": "1587 g",
     "volume": "2 L",
     "price": "79 USD 50 cent",
-    "price_postapoc": "20 USD",
+    "price_postapoc": "10 USD",
     "material": [ "paper", "cardboard" ],
     "ascii_picture": "textbook_chemistry",
     "symbol": "?",
@@ -410,7 +410,7 @@
     "weight": "1420 g",
     "volume": "1 L",
     "price": "60 USD",
-    "price_postapoc": "100 USD",
+    "price_postapoc": "10 USD",
     "material": [ "paper", "cardboard" ],
     "symbol": "?",
     "color": "blue",

data/json/items/tool/cables.json

@@ -25,7 +25,7 @@
     "id": "jumper_cable",
     "name": { "str": "jumper cable" },
     "description": "A 3-foot (or about 1 m) jumper cable: a short multi-stranded copper cable with power leads on either end, whose main purpose is to share power between vehicles, but can also link other electrical systems.",
-    "to_hit": 1,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "good" },
     "color": "light_blue",
     "symbol": "&",
     "material": [ "copper", "plastic" ],

data/json/items/tool/raincatchers.json

@@ -31,7 +31,7 @@
     "volume": "500 ml",
     "price": "5 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "neutral" },
     "material": [ "plastic" ],
     "symbol": ";",
     "color": "yellow",
@@ -44,7 +44,7 @@
       "done_message": "You place the funnel, waiting to collect rain."
     },
     "flags": [ "SINGLE_USE" ],
-    "melee_damage": { "bash": 4 }
+    "melee_damage": { "bash": 2 }
   },
   {
     "id": "leather_funnel",

data/json/items/tool/tailoring.json

@@ -356,19 +356,12 @@
     "longest_side": "43 cm",
     "price": "8 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -5,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "steel" ],
     "symbol": ";",
     "color": "light_gray",
     "ammo": [ "battery" ],
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE_WELL",
-        "rigid": true,
-        "flag_restriction": [ "BATTERY_MEDIUM" ],
-        "default_magazine": "medium_battery_cell"
-      }
-    ],
+    "use_action": [ { "type": "link_up", "cable_length": 2, "charge_rate": "1800 W" } ],
     "melee_damage": { "bash": 2 }
   },
   {

data/json/monsters/mammal.json

@@ -807,7 +807,19 @@
     "biosignature": { "biosig_item": "feces_cow", "biosig_timer": 7 },
     "special_attacks": [ [ "GRAZE", 20 ], [ "EAT_CROP", 60 ] ],
     "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you!  It lets you pat its head and seems friendly." },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "CAN_BE_CULLED", "EATS" ],
+    "flags": [
+      "SEES",
+      "HEARS",
+      "SMELLS",
+      "ANIMAL",
+      "PATH_AVOID_DANGER_1",
+      "PATH_AVOID_FIRE",
+      "WARM",
+      "CANPLAY",
+      "PET_WONT_FOLLOW",
+      "CAN_BE_CULLED",
+      "EATS"
+    ],
     "armor": { "bash": 2 }
   },
   {
@@ -856,7 +868,9 @@
       "PET_MOUNTABLE",
       "ANIMAL",
       "PATH_AVOID_DANGER_1",
+      "PATH_AVOID_FIRE",
       "WARM",
+      "CANPLAY",
       "PET_WONT_FOLLOW",
       "MILKABLE",
       "CAN_BE_CULLED",
@@ -3372,7 +3386,7 @@
   {
     "id": "mon_llama",
     "type": "MONSTER",
-    "name": { "str_sp": "llama" },
+    "name": { "str": "llama" },
     "description": "A big and wooly herbivore domesticated by the Andean cultures of South America.  Llamas and their kin are distant relatives to camels and are adapted to mountain environments.",
     "default_faction": "herbivore_domestic",
     "bodytype": "horse",

data/json/monsters/mutant_mammal.json

@@ -682,7 +682,7 @@
     "id": "mon_raccoon_mutant",
     "type": "MONSTER",
     "name": { "str": "dextrous raccoon" },
-    "description": "Their paws have grown to be longer, also enabling them to briefly stand on their back legs.  You wonder if these sleazy beasts are able to open doors yet.",
+    "description": "Its paws have grown to be longer, and it seems capable of briefly standing on its hindlimbs.  You wonder if this sleazy beast is able to open doors yet.",
     "copy-from": "mon_raccoon",
     "volume": "10 L",
     "weight": "10 kg",

data/json/monsters/zed-animal.json

@@ -654,7 +654,7 @@
   {
     "id": "mon_zllama",
     "type": "MONSTER",
-    "name": { "str_sp": "vicious vicuña" },
+    "name": { "str": "vicious vicuña" },
     "//": "The wild ancestor of the llama is called a vicuña.",
     "description": "This llama oozes a dark oil from a multitude of lesions and cuts.  Its wool has sloughed off with parts of its skin, revealing pulsating muscles and flesh.  Its mouth drips with a sickly green substance which it seems to be chewing on.",
     "default_faction": "zombie",