Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

data/changelog.txt

@@ -46,6 +46,7 @@ Friendly NPC crafting by crafting menu
 Functionality to drop items off ledges/cliffs onto creatures below
 NPC fleeing behaviour adjusted and slightly improved
 Adds basic vehicle proficiencies for driving and boating, as well as athletic proficiencies which increase muscle engine output.
+Add overheat mechanics to energy guns.
 
 
 ## Content:
@@ -81,6 +82,8 @@ Add a synagogue
 Adds a chance for small, personal photographs to spawn within people’s wallets and creates a starting pool of 34 snippets from which to pull.
 Adds curved road bends, rotaries and rest stops/laybys
 JSONify Defense Mode
+Adds a new mission to the Exodii
+Add boats to river banks
 
 
 ## Interface:
@@ -143,6 +146,7 @@ Add the Mind Over Matter mod to the CDDA repository
 [MoM] Add Enervation damage type, apply it to Eater and feral vitakinetics
 [Magiclysm] Add more than a dozen spells to magiclysm
 [Magiclysm] Add fantasy species starting option
+[Magiclysm] Add two more playable fantasy species for Magiclysm
 
 
 ## Balance:

data/json/construction.json

@@ -7820,11 +7820,11 @@
     "time": "60 m",
     "qualities": [ [ { "id": "DRILL", "level": 1 } ], [ { "id": "WRENCH_FINE", "level": 1 } ] ],
     "components": [
+      [ [ "heavy_punching_bag_sack", 1 ] ],
       [ [ "nuts_bolts", 4 ] ],
       [ [ "chain", 4 ] ],
       [ [ "blanket", 6 ] ],
       [ [ "material_sand", 4000 ] ],
-      [ [ "bag_plastic", 4 ] ],
       [ [ "duct_tape", 20 ] ]
     ],
     "pre_flags": [ "INDOORS" ],

data/json/faults/faults_guns.json

@@ -28,5 +28,32 @@
     "type": "fault",
     "name": { "str": "Fouling" },
     "description": "Fouling is caused by firing gunpowder loads repeatedly, which reduces reliability and can eventually cause damage to the gun.  Fouling accumulates slowly (unless blackpowder is used) due to the design of modern smokeless powder found in the vast majority of retail cartridges and it is not a significant problem until high levels of fouling are reached due to firing thousands of rounds without cleaning your firearm."
+  },
+  {
+    "id": "fault_overheat_explosion",
+    "type": "fault",
+    "name": { "str": "Fatal containment failure" },
+    "description": "It got hot."
+  },
+  {
+    "id": "fault_overheat_venting",
+    "type": "fault",
+    "name": { "str": "Emergency venting" },
+    "description": "This weapon can uncontrollably vent coolant when overheated."
+  },
+  {
+    "id": "fault_overheat_melting",
+    "type": "fault",
+    "name": { "str": "Fused internals" },
+    "description": "Excessive heat has rendered this weapon inoperable.",
+    "item_prefix": "ruined",
+    "flags": [ "RUINED_GUN" ]
+  },
+  {
+    "id": "fault_overheat_safety",
+    "type": "fault",
+    "name": { "str": "Overheat safety" },
+    "description": "This weapon will attempt to enter a cooling cycle when overheated.",
+    "flags": [ "JAMMED_GUN" ]
   }
 ]

data/json/flags.json

@@ -190,6 +190,11 @@
     "info": "This gear <bad>prevents</bad> you from <info>hearing any sounds</info>.",
     "conflicts": [ "PARTIAL_DEAF" ]
   },
+  {
+    "id": "OVERHEATS",
+    "type": "json_flag",
+    "info": "Continuously firing this weapon will cause it to <bad>overheat</bad> and <info>can potentially damage it</info>."
+  },
   {
     "id": "DIAMOND",
     "type": "json_flag",

data/json/furniture_and_terrain/furniture-recreation.json

@@ -397,8 +397,7 @@
         { "item": "nuts_bolts", "charges": 4 },
         { "item": "chain", "count": 4 },
         { "item": "blanket", "count": 6 },
-        { "item": "material_sand", "charges": 4000 },
-        { "item": "bag_plastic", "count": 4 }
+        { "item": "material_sand", "charges": 4000 }
       ]
     },
     "bash": {

data/json/items/appliances.json

@@ -389,7 +389,7 @@
         "max_contains_volume": "20 L",
         "max_item_volume": "32 ml",
         "max_contains_weight": "25 kg",
-        "ammo_restriction": { "diesel": 100, "gasoline": 100, "jp8": 100, "avgas": 100 }
+        "item_restriction": [ "diesel", "biodiesel", "jp8", "lamp_oil", "motor_oil" ]
       }
     ],
     "symbol": "O",

data/json/items/armor/bespoke_armor/custom_storage.json

@@ -176,8 +176,8 @@
         "holster": true,
         "max_contains_volume": "510 ml",
         "max_contains_weight": "1 kg",
-        "max_item_length": "12 cm",
-        "min_item_length": "7 cm",
+        "max_item_length": "24 cm",
+        "min_item_length": "18 cm",
         "moves": 80,
         "description": "Small pocket for a water bottle.",
         "ripoff": 2
@@ -390,8 +390,8 @@
         "holster": true,
         "max_contains_volume": "510 ml",
         "max_contains_weight": "1 kg",
-        "max_item_length": "12 cm",
-        "min_item_length": "7 cm",
+        "max_item_length": "24 cm",
+        "min_item_length": "18 cm",
         "moves": 80,
         "description": "Small pocket for a water bottle.",
         "ripoff": 2
@@ -402,8 +402,8 @@
         "holster": true,
         "max_contains_volume": "510 ml",
         "max_contains_weight": "1 kg",
-        "max_item_length": "12 cm",
-        "min_item_length": "7 cm",
+        "max_item_length": "24 cm",
+        "min_item_length": "18 cm",
         "moves": 80,
         "description": "Small pocket for a water bottle.",
         "ripoff": 2

data/json/items/armor/hats.json

@@ -495,6 +495,7 @@
     "description": "A hard plastic hat worn at construction and industrial sites.  Provides excellent protection from cuts and percussion.",
     "weight": "430 g",
     "volume": "2500 ml",
+    "longest_side": "28 cm",
     "price": 1200,
     "price_postapoc": 250,
     "material": [ "plastic" ],
@@ -709,6 +710,7 @@
     "description": "A hard plastic hat worn at construction and industrial sites, with a cloth tucked under it to serve as a makeshift hood.  Makes it a bit more comfortable to wear, and better protects the neck from sun and rain.",
     "weight": "470 g",
     "volume": "2750 ml",
+    "longest_side": "28 cm",
     "price": 1200,
     "price_postapoc": 300,
     "material": [ "plastic" ],

data/json/items/armor/helmets.json

@@ -439,6 +439,7 @@
     "description": "A distinctive helmet worn by firefighters.  More than just a piece of firefighting equipment, it serves as a badge of honor and respect.",
     "weight": "1500 g",
     "volume": "1250 ml",
+    "longest_side": "30 cm",
     "price": 24000,
     "price_postapoc": 500,
     "to_hit": 1,
@@ -591,6 +592,7 @@
     "description": "A thick foam helmet.  Designed to protect against concussion.",
     "weight": "400 g",
     "volume": "1500 ml",
+    "longest_side": "26 cm",
     "price": 17000,
     "price_postapoc": 250,
     "material": [ "plastic", "plastic_pad" ],
@@ -1071,6 +1073,7 @@
     "description": "A helmet that covers the entire head along with glareproof visors, offering the best protection for when you ride around on your motorcycle.  Activate to raise the visor.",
     "weight": "1587 g",
     "volume": "2250 ml",
+    "longest_side": "33 cm",
     "price": 32500,
     "price_postapoc": 750,
     "to_hit": -1,
@@ -1162,6 +1165,7 @@
     "description": "A helmet that covers the entire head along with glareproof visors, offering the best protection when you ride around on your motorcycle.  The visor is raised.  Activate to put down the visor.",
     "weight": "1587 g",
     "volume": "2250 ml",
+    "longest_side": "33 cm",
     "price": 32500,
     "price_postapoc": 750,
     "to_hit": -1,
@@ -1229,6 +1233,7 @@
     "description": "A helmet designed to protect from falls and kicks involving horses, has a small peak to protect from glare",
     "weight": "660 g",
     "volume": "1800 ml",
+    "longest_side": "28 cm",
     "price": 7000,
     "price_postapoc": 300,
     "techniques": [ "WBLOCK_1" ],

data/json/items/armor/storage.json

@@ -26,8 +26,8 @@
         "holster": true,
         "max_contains_volume": "510 ml",
         "max_contains_weight": "1 kg",
-        "max_item_length": "12 cm",
-        "min_item_length": "7 cm",
+        "max_item_length": "24 cm",
+        "min_item_length": "18 cm",
         "moves": 80,
         "description": "Small pocket for a water bottle.",
         "ripoff": 2
@@ -241,8 +241,8 @@
         "holster": true,
         "max_contains_volume": "510 ml",
         "max_contains_weight": "1 kg",
-        "max_item_length": "12 cm",
-        "min_item_length": "7 cm",
+        "max_item_length": "24 cm",
+        "min_item_length": "18 cm",
         "moves": 80,
         "description": "Small pocket for a water bottle",
         "ripoff": 2
@@ -253,8 +253,8 @@
         "holster": true,
         "max_contains_volume": "510 ml",
         "max_contains_weight": "1 kg",
-        "max_item_length": "12 cm",
-        "min_item_length": "7 cm",
+        "max_item_length": "24 cm",
+        "min_item_length": "18 cm",
         "moves": 80,
         "description": "Small pocket for a water bottle",
         "ripoff": 2
@@ -729,6 +729,7 @@
     "description": "Useful for carrying money, documents, or smuggled goods.",
     "weight": "1700 g",
     "volume": "15750 ml",
+    "longest_side": "46 cm",
     "price": 24000,
     "price_postapoc": 50,
     "to_hit": -2,
@@ -826,8 +827,8 @@
         "holster": true,
         "max_contains_volume": "510 ml",
         "max_contains_weight": "1 kg",
-        "max_item_length": "12 cm",
-        "min_item_length": "7 cm",
+        "max_item_length": "24 cm",
+        "min_item_length": "18 cm",
         "moves": 80,
         "description": "Small pocket for a water bottle",
         "ripoff": 2
@@ -2503,8 +2504,8 @@
         "holster": true,
         "max_contains_volume": "510 ml",
         "max_contains_weight": "1 kg",
-        "max_item_length": "12 cm",
-        "min_item_length": "7 cm",
+        "max_item_length": "24 cm",
+        "min_item_length": "18 cm",
         "moves": 80,
         "description": "Small pocket for a water bottle",
         "ripoff": 2

data/json/items/containers/containers.json

@@ -447,6 +447,7 @@
     "description": "A watertight plastic bottle, holds 500ml of liquid.  Some may be factory-sealed to increase shelf life.",
     "weight": "13 g",
     "volume": "510 ml",
+    "longest_side": "18 cm",
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
@@ -478,6 +479,7 @@
     "description": "An inverted plastic bottle for condiments.  Preserves its contents from rot until opened.",
     "weight": "19 g",
     "volume": "525 ml",
+    "longest_side": "22 cm",
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
@@ -508,6 +510,7 @@
     "description": "A watertight plastic bottle, holds 250ml of liquid.",
     "weight": "7 g",
     "volume": "255 ml",
+    "longest_side": "14 cm",
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
@@ -582,6 +585,7 @@
     "description": "A two-liter plastic bottle that can hold a lot of soda, or, nowadays, boiled water.",
     "weight": "53 g",
     "volume": "2040 ml",
+    "longest_side": "31 cm",
     "price": 25,
     "price_postapoc": 10,
     "material": [ "plastic" ],
@@ -1227,6 +1231,7 @@
     "ascii_picture": "bucket",
     "weight": "725 g",
     "volume": "5500 ml",
+    "longest_side": "25 cm",
     "price": 300,
     "price_postapoc": 10,
     "material": [ "steel" ],
@@ -1350,6 +1355,7 @@
     "description": "A half-gallon carton constructed of a paper, aluminum, and plastic laminate.  It has a threaded cap to keep liquid from leaking out.",
     "weight": "28 g",
     "volume": "2003 ml",
+    "longest_side": "32 cm",
     "price": 0,
     "price_postapoc": 0,
     "to_hit": 1,
@@ -1405,6 +1411,7 @@
     "description": "A cardboard container with 12 individual cavities for storing eggs.",
     "weight": "28 g",
     "volume": "620 ml",
+    "longest_side": "29 cm",
     "price": 0,
     "price_postapoc": 0,
     "to_hit": 1,
@@ -1459,6 +1466,7 @@
     "//": "Represents a 4 cm radius x 5 cm height steel can.",
     "weight": "40 g",
     "volume": "262 ml",
+    "longest_side": "8 cm",
     "price": 0,
     "price_postapoc": 0,
     "material": [ "steel" ],
@@ -1487,6 +1495,7 @@
     "//": "Represents a 4 cm radius x 10 cm height steel can.",
     "looks_like": "can_food",
     "weight": "70 g",
+    "longest_side": "10 cm",
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
@@ -1511,6 +1520,7 @@
     "description": "A military-style water canteen with a 1.5 liter capacity.  Commonly worn at the hip.",
     "weight": "155 g",
     "volume": "1575 ml",
+    "longest_side": "20 cm",
     "price": 800,
     "price_postapoc": 50,
     "to_hit": 1,
@@ -1549,9 +1559,10 @@
     "looks_like": "bottle_plastic",
     "description": "A Thermos brand vacuum flask.  Built for temperature retention, helps keep things hot or cold.  Contains 1L of liquid.",
     "weight": "530 g",
+    "volume": "1250 ml",
+    "longest_side": "32 cm",
     "price": 1595,
     "price_postapoc": 100,
-    "volume": "1250 ml",
     "material": [ "steel" ],
     "symbol": "I",
     "color": "green",
@@ -1954,6 +1965,7 @@
     "description": "A bulky plastic jerrycan, meant to carry fuel, but can carry other liquids in a pinch.",
     "weight": "1587 g",
     "volume": "10500 ml",
+    "longest_side": "33 cm",
     "price": 1250,
     "price_postapoc": 50,
     "to_hit": -2,
@@ -2037,6 +2049,7 @@
     "description": "A standard plastic jug used for milk and household cleaning chemicals.  Some may be factory-sealed to increase shelf life.",
     "weight": "190 g",
     "volume": "3825 ml",
+    "longest_side": "28 cm",
     "price": 0,
     "price_postapoc": 10,
     "to_hit": 1,
@@ -2298,6 +2311,7 @@
     "description": "A waterproof case designed for a standard smartphone.  Will protect your smartphone from water damage entirely.",
     "weight": "50 g",
     "volume": "125 ml",
+    "longest_side": "18 cm",
     "price": 1000,
     "price_postapoc": 100,
     "material": [ "plastic" ],
@@ -2875,6 +2889,7 @@
         "pocket_type": "CONTAINER",
         "max_contains_volume": "100 ml",
         "max_contains_weight": "230 g",
+        "max_item_length": "16 cm",
         "moves": 100,
         "watertight": true,
         "rigid": true,
@@ -4157,6 +4172,7 @@
     "description": "A metal paint can, able to hold a gallon of liquid.",
     "weight": "400 g",
     "volume": "4325 ml",
+    "longest_side": "21 cm",
     "price": 10,
     "price_postapoc": 3,
     "material": [ "steel" ],
@@ -4182,6 +4198,7 @@
     "description": "A plastic paint can, able to hold a gallon of liquid.",
     "weight": "50 g",
     "volume": "4325 ml",
+    "longest_side": "21 cm",
     "price": 10,
     "price_postapoc": 3,
     "material": [ "plastic" ],