Fixes advanced gear

This fixes the errors on loading, Adds barrel lengths, moves cop bots over,

data/Unleash_The_Mods/Working_mods/Advanced_Gear_Technologies/Groups/Monster_drops.json

@@ -12,6 +12,19 @@
       { "group": "joe_head", "damage-min": 0, "damage-max": 0 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "copbot",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "baton", "prob": 8 },
+      { "item": "tazer", "prob": 3 },
+      { "item": "ceramic_armor", "prob": 15 },
+      { "item": "tonfa", "prob": 10 },
+      { "item": "shocktonfa_off", "prob": 5 },
+      { "item": "alloy_plate", "prob": 10 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",

data/Unleash_The_Mods/Working_mods/Advanced_Gear_Technologies/Items/Books.json

@@ -93,6 +93,27 @@
     "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the tank drone.  Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
     "copy-from": "schematics_generic"
   },
+  {
+    "id": "schematics_eyebot",
+    "type": "BOOK",
+    "name": { "str_sp": "eyebot schematics" },
+    "description": "Assembly plans, design specs, and technical drawings for the eyebot.  Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
+    "copy-from": "schematics_generic"
+  },
+  {
+    "id": "schematics_copbot",
+    "type": "BOOK",
+    "name": { "str_sp": "police bot schematics" },
+    "description": "Assembly plans, design specs, and technical drawings for the police bot.  Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
+    "copy-from": "schematics_generic"
+  },
+  {
+    "id": "schematics_riotbot",
+    "type": "BOOK",
+    "name": { "str_sp": "riot control bot schematics" },
+    "description": "Assembly plans, design specs, and technical drawings for the riot control bot.  Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
+    "copy-from": "schematics_generic"
+  },
   {
     "id": "schematics_tripod",
     "type": "BOOK",

data/Unleash_The_Mods/Working_mods/Advanced_Gear_Technologies/Items/Generic/melee.json

@@ -73,5 +73,56 @@
     "volume": "23250 ml",
     "melee_damage": { "bash": 12 },
     "to_hit": -16
+  },
+  {
+    "type": "GENERIC",
+    "id": "broken_eyebot",
+    "symbol": ",",
+    "color": "green",
+    "name": { "str": "broken eyebot" },
+    "category": "other",
+    "description": "A broken eyebot.  Much less threatening now that it won't be calling for backup.  Could be gutted for parts.",
+    "price": 1000,
+    "price_postapoc": 10,
+    "material": [ "steel", "plastic" ],
+    "weight": "31520 g",
+    "volume": "15 L",
+    "to_hit": -3,
+    "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
+    "melee_damage": { "bash": 6, "cut": 6 }
+  },
+  {
+    "type": "GENERIC",
+    "id": "broken_copbot",
+    "symbol": ",",
+    "color": "green",
+    "name": { "str": "broken police bot" },
+    "category": "other",
+    "description": "A broken police bot.  Much less threatening now that it's quiet and still.  Could be gutted for parts.",
+    "price": 30000,
+    "price_postapoc": 10,
+    "material": [ "steel", "plastic" ],
+    "weight": "140000 g",
+    "volume": "62500 ml",
+    "to_hit": -3,
+    "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
+    "melee_damage": { "bash": 6, "cut": 6 }
+  },
+  {
+    "type": "GENERIC",
+    "id": "broken_riotbot",
+    "symbol": ",",
+    "color": "green",
+    "name": { "str": "broken riot control bot" },
+    "category": "other",
+    "description": "A broken riot control bot.  Much less threatening now that it's out of gas.  Could be gutted for parts.",
+    "price": 30000,
+    "price_postapoc": 10,
+    "material": [ "steel", "plastic" ],
+    "weight": "140000 g",
+    "volume": "62500 ml",
+    "to_hit": -3,
+    "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
+    "melee_damage": { "bash": 6, "cut": 6 }
   }
 ]

data/Unleash_The_Mods/Working_mods/Advanced_Gear_Technologies/Items/Guns/n_ranged.json

@@ -14,6 +14,7 @@
     "weight": "854 g",
     "volume": "500 ml",
     "longest_side": "196 mm",
+    "barrel_length": "116  mm",
     "melee_damage": { "bash": 10 },
     "to_hit": -2,
     "dispersion": 225,
@@ -52,9 +53,9 @@
     "weight": "1897 g",
     "volume": "750 ml",
     "longest_side": "196 mm",
+    "barrel_length": "152 mm",
     "melee_damage": { "bash": 12 },
     "to_hit": -2,
-    "ranged_damage": { "damage_type": "bullet", "amount": 4 },
     "dispersion": 405,
     "sight_dispersion": 90,
     "recoil": 45,
@@ -92,6 +93,7 @@
     "weight": "1105 g",
     "volume": "500 ml",
     "longest_side": "196 mm",
+    "barrel_length": "127 mm",
     "melee_damage": { "bash": 12 },
     "to_hit": -2,
     "ranged_damage": { "damage_type": "bullet", "amount": 6 },
@@ -131,7 +133,8 @@
     "ammo": [ "shot" ],
     "weight": "3201 g",
     "volume": "2500 ml",
-    "longest_side": "196 mm",
+    "barrel_length": "510 mm",
+    "longest_side": "914 mm",
     "melee_damage": { "bash": 12 },
     "to_hit": -1,
     "dispersion": 75,
@@ -163,13 +166,14 @@
     "name": { "str": "nanites M16A4", "str_pl": "nanites M16A4" },
     "description": "The nanites emulation of M16A4 is looks like real.",
     "price": "1400 USD",
-    "flags": [ "MODE_BURST" ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ] ],
     "material": [ "nanites" ],
     "skill": "rifle",
     "ammo": [ "223" ],
     "weight": "3405 g",
     "volume": "3500 ml",
-    "longest_side": "508 mm",
+    "longest_side": "990 mm",
+    "barrel_length": "508 mm",
     "melee_damage": { "bash": 13 },
     "to_hit": -3,
     "dispersion": -25,
@@ -211,6 +215,7 @@
     "weight": "2900 g",
     "volume": "2250 ml",
     "longest_side": "1066 mm",
+    "barrel_length": "415 mm",
     "melee_damage": { "bash": 7 },
     "to_hit": 0,
     "dispersion": 35,

data/Unleash_The_Mods/Working_mods/Advanced_Gear_Technologies/Items/Tools/Tools.json

@@ -46,6 +46,7 @@
     "symbol": "/",
     "material": [ "superalloy" ],
     "techniques": [ "WBLOCK_1" ],
+    "weapon_category": [ "MEDIUM_SWORDS" ],
     "volume": "1000 ml",
     "melee_damage": { "bash": 4, "cut": 36, "stab": 30 },
     "flags": [ "UNBREAKABLE_MELEE", "SHEATH_SWORD" ],

data/Unleash_The_Mods/Working_mods/Advanced_Gear_Technologies/Items/Tools/n_tools.json

@@ -87,16 +87,47 @@
     "description": "This military combat knife is made of nanites and looks like the real thing.",
     "price": "100 USD",
     "material": [ "nanites" ],
-    "techniques": "RAPID",
+    "techniques": [ "RAPID" ],
     "flags": [ "DURABLE_MELEE", "SHEATH_KNIFE" ],
     "weight": "558 g",
     "volume": "500 ml",
     "melee_damage": { "bash": 2, "cut": 18, "stab": 18 },
+    "thrown_damage": [ { "damage_type": "stab", "amount": 14 } ],
     "to_hit": 1,
     "max_charges": 0,
     "initial_charges": 0,
     "charges_per_use": 0,
     "turns_per_charge": 0,
+    "weapon_category": [ "KNIVES" ],
+    "gunmod_data": {
+      "location": "bayonet lug",
+      "mod_targets": [ "pistol", "smg", "rifle", "shotgun", "launcher", "crossbow" ],
+      "blacklist_mod": [
+        "crafted_suppressor",
+        "filter_suppressor",
+        "bottle_suppressor",
+        "shot_suppressor",
+        "suppressor",
+        "suppressor_compact",
+        "m203",
+        "m203_mod",
+        "m320_mod_mod",
+        "m320_mod",
+        "M6_shotgun",
+        "makeshift_bayonet",
+        "m26_mass",
+        "m26_mass_mod",
+        "pipe_launcher40mm",
+        "rm121aux",
+        "rm121aux_mod",
+        "masterkey",
+        "masterkey_mod",
+        "u_shotgun",
+        "u_shotgun_mod"
+      ],
+      "mode_modifier": [ [ "REACH", "bayonet", 1, [ "MELEE" ] ] ],
+      "install_time": "5 s"
+    },
     "category": "weapons",
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 19 ] ]
   },

data/Unleash_The_Mods/Working_mods/Advanced_Gear_Technologies/Monsters/Bots.json

@@ -69,6 +69,111 @@
       "DROPS_AMMO"
     ]
   },
+  {
+    "id": "mon_eyebot",
+    "type": "MONSTER",
+    "name": { "str": "eyebot" },
+    "description": "A quadcopter drone largely comprised of a high-resolution camera lens and a speaker, this robot hovers above the ground, documenting the carnage and mayhem around it.  While it is no longer able to report to a central authority, it's likely that some of its automated alert systems are still functional, given that the thing seems to have an operational charging station somewhere.",
+    "default_faction": "cop_bot",
+    "species": [ "ROBOT" ],
+    "diff": 2,
+    "volume": "30000 ml",
+    "weight": "40750 g",
+    "hp": 20,
+    "speed": 120,
+    "material": [ "steel" ],
+    "symbol": "e",
+    "color": "light_gray",
+    "morale": 100,
+    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
+    "dodge": 3,
+    "revert_to_itype": "bot_eyebot",
+    "special_attacks": [ [ "PHOTOGRAPH", 30 ] ],
+    "death_drops": { "groups": [ [ "robots", 4 ], [ "eyebot", 1 ] ] },
+    "death_function": { "corpse_type": "BROKEN" },
+    "flags": [ "SEES", "FLIES", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "NOHEAD", "PRIORITIZE_TARGETS", "STUN_IMMUNE" ],
+    "armor": { "bash": 8, "cut": 10, "bullet": 8 }
+  },
+  {
+    "id": "mon_copbot",
+    "type": "MONSTER",
+    "name": { "str": "police bot" },
+    "description": "One of the many models of armored law enforcement robots employed shortly before the collapse of civilization.  Solar powered like many other robots, it maintains its programmed pursuit of law and order, propelled on a trio of omni wheels.",
+    "default_faction": "cop_bot",
+    "species": [ "ROBOT" ],
+    "diff": 10,
+    "volume": "62500 ml",
+    "weight": "81500 g",
+    "hp": 80,
+    "speed": 100,
+    "material": [ "steel" ],
+    "symbol": "R",
+    "color": "light_blue",
+    "aggression": 100,
+    "morale": 100,
+    "melee_skill": 4,
+    "melee_dice": 3,
+    "melee_dice_sides": 2,
+    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
+    "dodge": 8,
+    "vision_day": 50,
+    "path_settings": { "max_dist": 5 },
+    "revert_to_itype": "bot_copbot",
+    "special_attacks": [ [ "COPBOT", 3 ] ],
+    "death_drops": { "groups": [ [ "robots", 4 ], [ "copbot", 1 ] ] },
+    "death_function": { "corpse_type": "BROKEN" },
+    "flags": [
+      "SEES",
+      "HEARS",
+      "BASHES",
+      "ELECTRONIC",
+      "COLDPROOF",
+      "NO_BREATHE",
+      "PRIORITIZE_TARGETS",
+      "PATH_AVOID_DANGER_1",
+      "STUN_IMMUNE"
+    ],
+    "armor": { "bash": 12, "cut": 8, "bullet": 6 }
+  },
+  {
+    "id": "mon_riotbot",
+    "type": "MONSTER",
+    "name": { "str": "riot control bot" },
+    "description": "A nonviolent riot-control bot, designed to suppress riots and make mass arrests of those participating.  Though its relaxation gas is by far its best-known weapon, it carries a blinding spotlight and a low-powered stungun for self-defense--in addition to a supply of electronic handcuffs.",
+    "default_faction": "cop_bot",
+    "species": [ "ROBOT" ],
+    "diff": 10,
+    "volume": "62500 ml",
+    "weight": "81500 g",
+    "hp": 80,
+    "speed": 100,
+    "material": [ "steel" ],
+    "symbol": "R",
+    "color": "light_blue",
+    "aggression": 100,
+    "morale": 100,
+    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
+    "dodge": 8,
+    "vision_day": 50,
+    "path_settings": { "max_dist": 5 },
+    "revert_to_itype": "bot_riotbot",
+    "special_attacks": [ [ "RIOTBOT", 1 ] ],
+    "special_when_hit": [ "ZAPBACK", 100 ],
+    "death_drops": { "groups": [ [ "robots", 4 ], [ "copbot", 1 ] ] },
+    "death_function": { "corpse_type": "BROKEN" },
+    "flags": [
+      "SEES",
+      "HEARS",
+      "GOODHEARING",
+      "ELECTRONIC",
+      "COLDPROOF",
+      "NO_BREATHE",
+      "PRIORITIZE_TARGETS",
+      "PATH_AVOID_DANGER_1",
+      "STUN_IMMUNE"
+    ],
+    "armor": { "bash": 12, "cut": 8, "bullet": 6 }
+  },
   {
     "id": "mon_chickenbot",
     "type": "MONSTER",