Merge branch 'CleverRaven:master' into patch-25

data/changelog.txt

@@ -30,6 +30,8 @@ Allow mutation transformation using the normal mutation rules
 Implement setting direction for appliances and add a directed floodlight appliance
 Asynchronous animations including sprinting and smashing
 Added enable and disable mutation EOCs
+3D vision for isometric tilesets
+Unhardcode dragging, grab fixes
 
 
 ## Content:
@@ -55,6 +57,8 @@ Crashing ship start for Aftershock
 Add more monsters to the nether monster corpse
 Living lore document
 Gastropod Foot Limb: Mutant limbs can be added in json
+Added a small office building fortified by bandits
+New location: speedway
 
 
 ## Interface:
@@ -96,6 +100,7 @@ Adds the 'Mark as dangerous' keybinding to the overmap
 Alchemy Perks for Xedra Evolved
 Bombastic Perks adds Playstyle Perks
 [Magiclysm] Ways to boost your caster level
+Disable the Bionic Professions mod by default
 
 
 ## Balance:
@@ -115,6 +120,8 @@ Most materials now burn at least a little slower than gunpowder
 stationary monsters don't let you train throwing to high levels
 player can drag heavier vehicles
 difficulty to repair depends on what the thing is made of instead of its crafting difficulty
+Hound afterimages also copy their host nicknames
+The player is substantially less effective with guns at low skill values
 
 
 ## Bugfixes:
@@ -159,6 +166,9 @@ Improving NPC shooting frequency
 Enable death effects on limited lifespan monsters
 Make Hub01 globally unique
 Charge integrated magazines when plugged in
+Don't allow to scan books that are owned by other characters
+Fix NPC putting items in open air when fetching items during an activity when 3D FOV is on
+Trees and other FLAMMABLE_ASH terrain leaves behind ash when burned down
 
 
 ## Performance:

data/json/flags.json

@@ -2224,6 +2224,11 @@
     "type": "json_flag",
     "info": "A filter for a rebreather."
   },
+  {
+    "id": "OLD_GUN",
+    "type": "json_flag",
+    "info": "An old gun, WWII or earlier."
+  },
   {
     "id": "USE_POWER_WHEN_HIT",
     "type": "json_flag",

data/json/itemgroups/Locations_MapExtras/mansion.json

@@ -438,7 +438,8 @@
     "subtype": "collection",
     "items": [
       { "group": "novels", "prob": 40 },
-      { "group": "mansion_books", "prob": 50 },
+      { "group": "mansion_books", "prob": 48 },
+      { "group": "memorial_mansion", "prob": 2 },
       { "group": "homebooks", "prob": 30 },
       { "group": "manuals", "prob": 10 },
       { "group": "textbooks", "prob": 5 },

data/json/itemgroups/books.json

@@ -573,8 +573,7 @@
       { "item": "vacuum_sealing", "prob": 15 },
       { "item": "baking_book", "prob": 190 },
       { "item": "book_pneumatics", "prob": 8 },
-      { "item": "cookbook_bloodforgood", "prob": 50 },
-      { "group": "memorial_mansion", "prob": 10 }
+      { "item": "cookbook_bloodforgood", "prob": 50 }
     ]
   },
   {

data/json/itemgroups/science_and_tech.json

@@ -233,6 +233,7 @@
   {
     "type": "item_group",
     "id": "mut_lab",
+    "//": "If we ever get themed labs defined by what types of mutagens they worked on this itemgroup may need to be re-evaluated.",
     "ammo": 50,
     "magazine": 100,
     "items": [
@@ -265,6 +266,11 @@
       [ "recipe_labchem", 6 ],
       [ "mutagen", 8 ],
       [ "iv_mutagen", 6 ],
+      [ "iv_mutagen_elfa", 2 ],
+      [ "iv_mutagen_alpha", 2 ],
+      [ "iv_mutagen_raptor", 2 ],
+      [ "iv_mutagen_medical", 2 ],
+      [ "iv_mutagen_chimera", 2 ],
       [ "iv_mutagen_plant", 2 ],
       [ "iv_mutagen_insect", 2 ],
       [ "iv_mutagen_spider", 2 ],
@@ -303,8 +309,14 @@
   {
     "type": "item_group",
     "id": "mutagens",
+    "//": "If we ever get themed labs defined by what types of mutagens they worked on this itemgroup may need to be re-evaluated.",
     "items": [
       [ "mutagen", 8 ],
+      [ "mutagen_elfa", 2 ],
+      [ "mutagen_alpha", 2 ],
+      [ "mutagen_raptor", 2 ],
+      [ "mutagen_medical", 2 ],
+      [ "mutagen_chimera", 2 ],
       [ "mutagen_plant", 2 ],
       [ "mutagen_insect", 2 ],
       [ "mutagen_spider", 2 ],
@@ -325,6 +337,11 @@
       [ "mutagen_rabbit", 2 ],
       [ "mutagen_crustacean", 2 ],
       [ "iv_mutagen", 6 ],
+      [ "iv_mutagen_elfa", 2 ],
+      [ "iv_mutagen_alpha", 2 ],
+      [ "iv_mutagen_raptor", 2 ],
+      [ "iv_mutagen_medical", 2 ],
+      [ "iv_mutagen_chimera", 2 ],
       [ "iv_mutagen_plant", 2 ],
       [ "iv_mutagen_insect", 2 ],
       [ "iv_mutagen_spider", 2 ],
@@ -353,8 +370,14 @@
   {
     "type": "item_group",
     "id": "mut_iv",
+    "//": "If we ever get themed labs defined by what types of mutagens they worked on this itemgroup may need to be re-evaluated.",
     "items": [
       [ "iv_mutagen", 10 ],
+      [ "iv_mutagen_elfa", 2 ],
+      [ "iv_mutagen_alpha", 2 ],
+      [ "iv_mutagen_raptor", 2 ],
+      [ "iv_mutagen_medical", 2 ],
+      [ "iv_mutagen_chimera", 2 ],
       [ "iv_mutagen_plant", 2 ],
       [ "iv_mutagen_insect", 2 ],
       [ "iv_mutagen_spider", 2 ],

data/json/items/armor/holster.json

@@ -455,6 +455,102 @@
     "flags": [ "SKINTIGHT", "WATER_FRIENDLY" ],
     "armor": [ { "encumbrance": 0, "coverage": 50, "covers": [ "torso" ], "specifically_covers": [ "torso_lower" ] } ]
   },
+  {
+    "id": "side_double_holster",
+    "type": "ARMOR",
+    "name": { "str": "side-by-side double holster" },
+    "description": "Two holsters attached together by a strap, right next to each other.  The placement means that drawing guns out of either one is slower than a regular holster.  Activate to holster/draw a gun.",
+    "weight": "500 g",
+    "volume": "1000 ml",
+    "price": 9000,
+    "price_postapoc": 1200,
+    "material": [ "leather" ],
+    "symbol": "[",
+    "looks_like": "sheath",
+    "color": "light_gray",
+    "sided": true,
+    "material_thickness": 2,
+    "pocket_data": [
+      {
+        "magazine_well": "350 ml",
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "30 cm",
+        "moves": 70
+      },
+      {
+        "magazine_well": "350 ml",
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "30 cm",
+        "moves": 70
+      }
+    ],
+    "use_action": { "type": "holster" },
+    "flags": [ "BELTED", "OVERSIZE", "PALS_LARGE" ],
+    "armor": [
+      {
+        "encumbrance": [ 5, 7 ],
+        "coverage": 5,
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_hip_r", "leg_hip_l" ]
+      }
+    ]
+  },
+  {
+    "id": "FB_double_holster",
+    "type": "ARMOR",
+    "name": { "str": "front-to-back double holster" },
+    "description": "Two holsters attached together by a strap, one in front of the other.  The placement means that drawing a gun out of the front holster is slower than the other holster.  Activate to holster/draw a gun.",
+    "weight": "500 g",
+    "volume": "1000 ml",
+    "price": 9000,
+    "price_postapoc": 1200,
+    "material": [ "leather" ],
+    "symbol": "[",
+    "looks_like": "sheath",
+    "color": "light_gray",
+    "sided": true,
+    "material_thickness": 1,
+    "pocket_data": [
+      {
+        "magazine_well": "350 ml",
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "30 cm",
+        "moves": 50
+      },
+      {
+        "magazine_well": "350 ml",
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "30 cm",
+        "moves": 80
+      }
+    ],
+    "use_action": { "type": "holster" },
+    "flags": [ "BELTED", "OVERSIZE", "PALS_LARGE" ],
+    "armor": [
+      {
+        "encumbrance": [ 8, 10 ],
+        "coverage": 8,
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_hip_r", "leg_hip_l" ]
+      }
+    ]
+  },
   {
     "id": "XL_holster",
     "type": "ARMOR",

data/json/items/tool/workshop.json

@@ -725,7 +725,7 @@
     "material": [ "steel" ],
     "symbol": ";",
     "color": "light_gray",
-    "qualities": [ [ "CUT", 2 ], [ "SAW_W", 1 ], [ "SAW_M", 1 ], [ "WRENCH", 1 ], [ "SCREW", 1 ], [ "SCREW_FINE", 1 ], [ "BUTCHER", 7 ] ],
+    "qualities": [ [ "CUT", 2 ], [ "SAW_W", 1 ], [ "SAW_M", 1 ], [ "WRENCH", 1 ], [ "SCREW", 1 ], [ "BUTCHER", 7 ] ],
     "flags": [ "SHEATH_KNIFE", "ALLOWS_BODY_BLOCK" ],
     "melee_damage": { "bash": 1, "stab": 4 }
   },

data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_beds.json

@@ -1,46 +1,18 @@
 [
   {
     "type": "mapgen",
-    "update_mapgen_id": "fbmc_fire_lookout_tower_mattress_beds_0",
+    "update_mapgen_id": "fbmc_fire_lookout_tower_beds_0",
     "method": "json",
     "object": {
-      "place_nested": [
-        { "chunks": [ "fbmc_mattress_bed_vertical" ], "x": 8, "y": 6 },
-        { "chunks": [ "fbmc_mattress_bed_vertical" ], "x": 11, "y": 6 }
-      ]
+      "place_nested": [ { "chunks": [ "fbmc_bed_vertical" ], "x": 8, "y": 6 }, { "chunks": [ "fbmc_bed_vertical" ], "x": 11, "y": 6 } ]
     }
   },
   {
     "type": "mapgen",
-    "update_mapgen_id": "fbmc_fire_lookout_tower_mattress_beds_1",
+    "update_mapgen_id": "fbmc_fire_lookout_tower_beds_1",
     "method": "json",
     "object": {
-      "place_nested": [
-        { "chunks": [ "fbmc_mattress_bed_vertical" ], "x": 10, "y": 17 },
-        { "chunks": [ "fbmc_mattress_bed_vertical" ], "x": 13, "y": 17 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "update_mapgen_id": "fbmc_fire_lookout_tower_straw_beds_0",
-    "method": "json",
-    "object": {
-      "place_nested": [
-        { "chunks": [ "fbmc_straw_bed_vertical" ], "x": 8, "y": 6 },
-        { "chunks": [ "fbmc_straw_bed_vertical" ], "x": 11, "y": 6 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "update_mapgen_id": "fbmc_fire_lookout_tower_straw_beds_1",
-    "method": "json",
-    "object": {
-      "place_nested": [
-        { "chunks": [ "fbmc_straw_bed_vertical" ], "x": 10, "y": 17 },
-        { "chunks": [ "fbmc_straw_bed_vertical" ], "x": 13, "y": 17 }
-      ]
+      "place_nested": [ { "chunks": [ "fbmc_bed_vertical" ], "x": 10, "y": 17 }, { "chunks": [ "fbmc_bed_vertical" ], "x": 13, "y": 17 } ]
     }
   }
 ]

data/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_construction.json

@@ -0,0 +1,24 @@
+[
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_fire_lookout_tower_construction_shack_0",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_construction_wall_vertical" ], "x": 7, "y": 5 },
+        { "chunks": [ "fbmc_construction_shack_south" ], "x": 8, "y": 5 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_fire_lookout_tower_construction_shack_1",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_construction_wall_vertical" ], "x": 9, "y": 14 },
+        { "chunks": [ "fbmc_construction_shack_north" ], "x": 10, "y": 14 }
+      ]
+    }
+  }
+]