[DinoMod] fix dino loot

data/mods/DinoMod/harvest_dissect.json

@@ -41,7 +41,7 @@
     "message": "With cuts and pulls equally similar to both extraction and vandalism, you scrape together the most important parts of the creature.",
     "entries": [
       { "drop": "tyrant_sample_large", "type": "mutagen_group" },
-      { "drop": "spider", "type": "bionic_group" },
+      { "drop": "military", "type": "bionic_group" },
       { "drop": "science", "type": "bionic_group" },
       { "drop": "corpses", "type": "bionic_group" }
     ]
@@ -52,7 +52,7 @@
     "message": "With cuts and pulls equally similar to both extraction and vandalism, you scrape together the most important parts of the creature.",
     "entries": [
       { "drop": "tyrant_sample_huge", "type": "mutagen_group" },
-      { "drop": "spider", "type": "bionic_group" },
+      { "drop": "military", "type": "bionic_group" },
       { "drop": "science", "type": "bionic_group" },
       { "drop": "corpses", "type": "bionic_group" }
     ]
@@ -86,7 +86,7 @@
     "type": "harvest",
     "message": "Slicing carefully into the dinosaur, you discover stomach contents that may be useful",
     "entries": [
-      { "drop": "spider", "type": "bionic_group", "faults": [  ] },
+      { "drop": "military", "type": "bionic_group", "faults": [  ] },
       { "drop": "science", "type": "bionic_group", "faults": [  ] },
       { "drop": "corpses", "type": "bionic_group", "faults": [  ] }
     ]
@@ -96,7 +96,7 @@
     "type": "harvest",
     "message": "Slicing carefully into the mosasaurus body, you discover stomach contents and biological samples that may be useful",
     "entries": [
-      { "drop": "spider", "type": "bionic_group", "faults": [  ] },
+      { "drop": "military", "type": "bionic_group", "faults": [  ] },
       { "drop": "science", "type": "bionic_group", "faults": [  ] },
       { "drop": "corpses", "type": "bionic_group", "faults": [  ] },
       { "drop": "lizard_sample_huge", "type": "mutagen_group" }

data/mods/DinoMod/mapgen/map_extras/nest_acrocanthosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_albertosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_allosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_appalachiosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_ceratosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_coelophysis.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_daspletosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_deinonychus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_dilophosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_dromaeosaurus.json

@@ -43,7 +43,11 @@
         { "item": "bone", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 20 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 20 }
       ],
-      "place_items": [ { "item": "spider", "x": 7, "y": 8 }, { "item": "spider", "x": 9, "y": 11 }, { "item": "spider", "x": 11, "y": 16 } ]
+      "place_items": [
+        { "item": "military", "x": 7, "y": 8 },
+        { "item": "science", "x": 9, "y": 11 },
+        { "item": "military", "x": 11, "y": 16 }
+      ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_dryptosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_gorgosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_nanuqsaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_saurornitholestes.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_siats.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_stenonychosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_torvosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_tyrannosaurus.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_utahraptor.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/DinoMod/mapgen/map_extras/nest_velociraptor.json

@@ -45,7 +45,7 @@
         { "item": "meat", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 },
         { "item": "feather", "x": [ 4, 17 ], "y": [ 6, 15 ], "amount": [ 10, 20 ], "repeat": [ 1, 3 ], "chance": 40 }
       ],
-      "place_items": [ { "item": "spider", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+      "place_items": [ { "item": "military", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
     }
   }
 ]

data/mods/innawood/itemgroups/military.json

@@ -0,0 +1,8 @@
+[
+  {
+    "type": "item_group",
+    "id": "military",
+    "subtype": "distribution",
+    "entries": [ { "group": "guns_improvised", "prob": 200 }, { "group": "museum_primitive", "prob": 100 } ]
+  }
+]

data/mods/innawood/itemgroups/monster_drops_lairs.json

@@ -50,24 +50,6 @@
       { "item": "honeydew", "prob": 30 }
     ]
   },
-  {
-    "type": "item_group",
-    "id": "spider",
-    "magazine": 100,
-    "subtype": "distribution",
-    "entries": [
-      { "item": "meat", "prob": 50 },
-      { "item": "meat_tainted", "prob": 60 },
-      { "item": "weed", "prob": 20 },
-      { "item": "seed_weed", "prob": 15 },
-      { "item": "seed_tobacco", "prob": 5 },
-      { "item": "rope_30", "prob": 35 },
-      { "item": "stick", "prob": 95 },
-      { "item": "bee_sting", "prob": 5 },
-      { "item": "chitin_piece", "prob": 10 },
-      { "item": "honeycomb", "prob": 10 }
-    ]
-  },
   {
     "type": "item_group",
     "id": "hive",