Aftershock errors to be fixed

data/mods/Aftershock/afs_speech.json

@@ -32,7 +32,7 @@
   {
     "type": "speech",
     "speaker": "afs_mon_migoturret",
-    "sound": "\"The better to eat you! I don't actually think I eat anymore.\"",
+    "sound": "\"The better to eat you!  I don't actually think I eat anymore.\"",
     "volume": 40
   },
   {

data/mods/Aftershock/items/afs_bioparts.json

@@ -107,6 +107,6 @@
     "durability": 7,
     "loudness": 8,
     "ammo_effects": [ "LASER", "INCENDIARY" ],
-    "flags": [ "NO_UNLOAD", "NON-FOULING" ]
+    "flags": [ "NO_UNLOAD", "NON-FOULING", "NO_RELOAD" ]
   }
 ]

data/mods/Aftershock/items/afs_item_groups.json

@@ -11,15 +11,15 @@
       { "item": "pants_cargo" },
       { "item": "kevlar" },
       { "item": "leather_pouch" },
-      { "item": "balclava", "chance": 75 },
+      { "item": "balclava" },
       { "item": "bootsheath" }
     ]
   },
   {
     "type": "item_group",
     "id": "afs_gardener_carried",
     "subtype": "collection",
-    "entries": [ { "group": "hardware", "count": [ 1, 2 ] }, { "group": "snacks", "repeat": [ 1, 3 ] } ]
+    "entries": [ { "group": "hardware", "count": [ 1, 2 ] }, { "group": "snacks", "count": [ 1, 3 ] } ]
   },
   {
     "type": "item_group",

data/mods/Aftershock/items/afs_tools.json

@@ -19,9 +19,21 @@
         "active": true,
         "type": "transform"
       },
-      { "type": "CAMERA" }
+      "CAMERA",
+      "MP3"
     ],
-    "flags": [ "WATCH", "ALARMCLOCK" ]
+    "flags": [ "WATCH", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
+  },
+  {
+    "id": "afs_atomic_smartphone_music",
+    "copy-from": "afs_atomic_smartphone",
+    "type": "TOOL",
+    "name": "aomic smartphone - music",
+    "name_plural": "atomic smartphones - music",
+    "description": "This phone is playing music, steadily raising your morale.  You can't hear anything else while you're listening.",
+    "revert_to": "afs_atomic_smartphone",
+    "use_action": "MP3_ON",
+    "flags": [ "WATCH", "TRADER_AVOID", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
   },
   {
     "id": "afs_atomic_smartphone_flashlight",
@@ -36,8 +48,7 @@
       "menu_text": "Turn off flashlight",
       "type": "transform"
     },
-    "//": "since we cost no battery, no reason not to keep these",
-    "flags": [ "WATCH", "ALARMCLOCK", "LIGHT_25" ]
+    "flags": [ "WATCH", "LIGHT_25", "CHARGEDIM", "TRADER_AVOID", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
   },
   {
     "id": "afs_wraitheon_smartphone",

data/mods/Aftershock/maps/afs_regional_map_settings.json

@@ -2,7 +2,6 @@
   {
     "type": "region_overlay",
     "regions": [ "all" ],
-    "city": { "basements": { "basement": 1000, "basement_hidden_lab_stairs": 100, "basement_bionic": 100 } },
-    "weather": { "base_temperature": 0.0 }
+    "city": { "basements": { "basement": 1000, "basement_hidden_lab_stairs": 100, "basement_bionic": 100 } }
   }
 ]

data/mods/Aftershock/maps/mapgen/prepnet_orchard.json

@@ -65,7 +65,7 @@
       "sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } },
       "place_monsters": [
         { "monster": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 },
-        { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 4, "friendly": true }
+        { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 4 }
       ],
       "place_npcs": [ { "class": "prepnet_gardener", "x": 10, "y": 9 } ]
     }
@@ -138,7 +138,7 @@
       "sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } },
       "place_monsters": [
         { "monster": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 },
-        { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 3, "friendly": true }
+        { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 3 }
       ],
       "place_npcs": [ { "class": "prepnet_gardener", "x": 10, "y": 9 } ]
     }

data/mods/Aftershock/npcs/afs_factions.json

@@ -68,6 +68,7 @@
       "hells_raiders": { "kill on sight": true },
       "marloss": { "kill on sight": true }
     },
+    "mon_faction": "PrepNet",
     "description": "A group of bionic preppers who had expected the collapse of the economy and global chaos, instead they were slightly more ready than others for the Cataclysm."
   }
 ]

data/mods/Aftershock/player/afs_professions.json

@@ -32,8 +32,10 @@
     "points": 2,
     "skills": [ { "level": 5, "name": "computer" } ],
     "items": {
-      "both": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ],
-      "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ],
+      "both": {
+        "itmes": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ],
+        "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ]
+      },
       "male": [ "briefs" ],
       "female": [ "bra", "panties" ]
     }

data/mods/Aftershock/vehicles/afs_vehicle_overrides.json

@@ -97,7 +97,7 @@
       {
         "y": 1,
         "x": 3,
-        "parts": [ "turret_mount", { "ammo_type": [ "40x46mm_m433" ], "part": "mounted_mk19", "ammo": 60, "ammo_qty": [ 1, 25 ] } ]
+        "parts": [ "turret_mount", { "ammo_type": "40x46mm_m433", "part": "mounted_mk19", "ammo": 60, "ammo_qty": [ 1, 25 ] } ]
       },
       { "y": 1, "x": 3, "parts": [ "seat", "seatbelt_heavyduty" ] },
       { "y": 0, "x": 3, "parts": [ "hdframe_vertical_2", "stowboard_vertical", "hdroof" ] },