Merge pull request #27 from CleverRaven/master

Let's talk relics

.appveyor.yml

@@ -1,5 +1,5 @@
 version: '{branch}.{build}'
-image: Visual Studio 2019
+image: Previous Visual Studio 2019
 configuration: Release
 platform: x64
 shallow_clone: true

.gitignore

@@ -123,7 +123,7 @@ nbproject/
 
 # OSX
 Cataclysm.app
-data/osx/AppIcon.icns
+build-data/osx/AppIcon.icns
 Cataclysm.dmg
 
 # Jetbrains CLion

build-scripts/build.sh

@@ -174,7 +174,7 @@ else
         run_tests ./tests/cata_test &
         if [ -n "$MODS" ]
         then
-            run_tests ./tests/cata_test --user-dir=modded $MODS &
+            run_tests ./tests/cata_test --user-dir=modded $MODS 2>&1 | sed 's/^/MOD> /' &
             wait -n
         fi
         wait -n

build-scripts/requirements.sh

@@ -23,9 +23,11 @@ else
     travis_retry=
 fi
 
-if just_json; then
-    export JUST_JSON=true
-    export CODE_COVERAGE=""
+if [[ "$TRAVIS_EVENT_TYPE" == "pull_request" ]]; then
+    if just_json; then
+        export JUST_JSON=true
+        export CODE_COVERAGE=""
+    fi
 fi
 
 set -x

data/json/items/classes/magazine.json

@@ -10,7 +10,7 @@
     "material": [ "steel" ],
     "symbol": "#",
     "color": "light_gray",
-    "armor_data": { "covers": [ "torso" ], "coverage": 5 },
+    "armor_data": { "covers": [ "torso" ], "coverage": 5, "encumbrance": 10 },
     "flags": [ "MAG_BELT", "MAG_DESTROY", "BELTED", "OVERSIZE", "WATER_FRIENDLY" ]
   }
 ]

data/json/items/gun/762R.json

@@ -6,10 +6,11 @@
     "name": { "str_sp": "Mosin-Nagant M44" },
     "description": "The Model 44 is the carbine sized variant of the standard 1891/30.  It has a shorter barrel, therefore it is weaker than the 1891/30, but easier to carry.",
     "weight": "4100 g",
+    "volume": "2720 ml",
+    "longest_side": "1015 mm",
     "price": 23000,
     "price_postapoc": 3000,
     "relative": {
-      "volume": "-500 ml",
       "range": -6,
       "ranged_damage": { "damage_type": "bullet", "amount": -3 },
       "dispersion": 60,
@@ -23,6 +24,8 @@
     "name": { "str_sp": "Mosin-Nagant M44-EBR" },
     "description": "This carbine packs the classic Mosin-Nagant model 44 action in a modern-day stock capable of accepting modifications.",
     "weight": "4330 g",
+    "volume": "2870 ml",
+    "longest_side": "1015 mm",
     "price_postapoc": 3500,
     "material": [ "steel", "plastic" ],
     "color": "light_gray",
@@ -49,7 +52,8 @@
     "name": { "str_sp": "Mosin-Nagant 1891/30" },
     "description": "The Mosin-Nagant 1891/30 is a bolt action, internal magazine-fed, military rifle, developed by the Russian Empire, and later used and perfected by the Soviet Union.",
     "weight": "4000 g",
-    "volume": "3 L",
+    "volume": "3120 ml",
+    "longest_side": "1241 mm",
     "price": 19000,
     "price_postapoc": 3000,
     "to_hit": -1,
@@ -90,6 +94,8 @@
     "name": { "str_sp": "Mosin-Nagant 1891/30-EBR" },
     "description": "This Mosin-Nagant has exchanged the classic wooden stock for a modern synthetic model, carefully balanced to the same weight and handling yet offering support for modern accessories.",
     "weight": "4230 g",
+    "volume": "3300 ml",
+    "longest_side": "1241 mm",
     "material": [ "steel", "plastic" ],
     "color": "light_gray",
     "price_postapoc": 3500,

data/json/items/resources/misc.json

@@ -136,7 +136,7 @@
     "symbol": "*",
     "color": "light_gray",
     "name": { "str": "flint" },
-    "description": "A rock with sharp edges, that can be used as a butchering tool, if nothing else is available.  Makes a passable melee weapon, and can also make sparks if stuck against high-carbon steel.",
+    "description": "A rock with sharp edges, that can be used as a butchering tool, if nothing else is available.  Makes a passable melee weapon, and can also make sparks if struck against high-carbon steel.",
     "material": [ "stone" ],
     "weight": "500 g",
     "volume": "250 ml",
@@ -166,7 +166,7 @@
     "type": "GENERIC",
     "category": "spare_parts",
     "name": { "str": "ESAPI ballistic plate" },
-    "description": "A polygonal ceramic ballistic plate with a slightly concave profile.  Its inner surface is coated with Ultra High Molecular Weight Polyethylene, and is labelled \"TOP\", while its outer surface is labelled \"STRIKE FACE\".  This is intended to be worn in a ballistic vest and can withstand several high energy rifle rounds before breaking.",
+    "description": "A polygonal ceramic ballistic plate with a slightly concave profile.  Its inner surface is coated with Ultra High Molecular Weight Polyethylene, and is labeled \"TOP\", while its outer surface is labeled \"STRIKE FACE\".  This is intended to be worn in a ballistic vest and can withstand several high energy rifle rounds before breaking.",
     "weight": "2500 g",
     "volume": "1533 ml",
     "price": 60000,

data/json/items/resources/tailoring.json

@@ -231,7 +231,7 @@
     "type": "TOOL",
     "category": "spare_parts",
     "name": "rigid kevlar plate",
-    "description": "This is a compressed panel of kevlar treated with epoxy or other adhesive.  It could be used to repair items made of Kevlar.",
+    "description": "This is a compressed panel of Kevlar treated with epoxy or other adhesive.  It could be used to repair items made of Kevlar.",
     "weight": "300 g",
     "volume": "250 ml",
     "price": 1000,

data/json/items/tool/explosives.json

@@ -467,7 +467,7 @@
     "type": "TOOL",
     "category": "weapons",
     "name": { "str": "flashbang" },
-    "description": "This is a military police style flashbang.  Use this item to pull the pin and light the fuse.  You will then have five turns before it detonates with intense light and sound, blinding, deafening and disorienting anyone nearby.",
+    "description": "This is a military police style flashbang.  Use this item to pull the pin and light the fuse.  You will then have five seconds before it detonates with intense light and sound, blinding, deafening and disorienting anyone nearby.",
     "weight": "236 g",
     "volume": "250 ml",
     "price": 2000,
@@ -522,7 +522,7 @@
     "name": { "str": "fungicidal gas grenade" },
     "price": 3600,
     "price_postapoc": 750,
-    "description": "This is a canister grenade filled with fungicidal solution.  Use this item to pull the pin and light the fuse, turning it into an active fungicidal grenade.  In five turns it will begin to expel a volatile spray that is highly toxic to fungal life forms.",
+    "description": "This is a canister grenade filled with fungicidal solution.  Use this item to pull the pin and light the fuse, turning it into an active fungicidal grenade.  In five seconds it will begin to expel a volatile spray that is highly toxic to fungal life forms.",
     "countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "fungicidalbomb_act" }
   },
   {
@@ -545,7 +545,7 @@
     "name": { "str": "makeshift fungicidal gas grenade" },
     "price": 3600,
     "price_postapoc": 500,
-    "description": "This is a makeshift canister grenade filled with fungicidal solution.  Use this item to pull the pin and light the fuse, turning it into an active fungicidal grenade.  In five turns it will begin to expel a volatile spray that is highly toxic to fungal life forms.",
+    "description": "This is a makeshift canister grenade filled with fungicidal solution.  Use this item to pull the pin and light the fuse, turning it into an active fungicidal grenade.  In five seconds it will begin to expel a volatile spray that is highly toxic to fungal life forms.",
     "countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "fungicidalbomb_makeshift_act" }
   },
   {
@@ -565,7 +565,7 @@
     "type": "TOOL",
     "category": "weapons",
     "name": { "str": "makeshift gas canister" },
-    "description": "This is a crude gasbomb using household chemicals.  Use this item to arm it.  In three turns it will begin to expel a highly toxic gas for a short time.  This gas poisons those exposed to it, in addition to obscuring vision and scent.",
+    "description": "This is a crude gasbomb using household chemicals.  Use this item to arm it.  In three seconds it will begin to expel a highly toxic gas for a short time.  This gas poisons those exposed to it, in addition to obscuring vision and scent.",
     "weight": "1264 g",
     "volume": "250 ml",
     "price": 500,
@@ -621,7 +621,7 @@
     "type": "TOOL",
     "category": "weapons",
     "name": { "str": "grenade" },
-    "description": "This is a military-grade fragmentary hand grenade.  Use this item to pull the pin and light the fuse.  You will then have five turns before it explodes; throwing it would be a good idea.",
+    "description": "This is a military-grade fragmentary hand grenade.  Use this item to pull the pin and light the fuse.  You will then have five seconds before it explodes; throwing it would be a good idea.",
     "weight": "397 g",
     "volume": "250 ml",
     "price": 1500,
@@ -673,7 +673,7 @@
     "type": "TOOL",
     "category": "weapons",
     "name": { "str": "EMP grenade" },
-    "description": "This is a grenade that generates an electromagnetic pulse with a low-inductance capacitor bank discharged into a single-loop antenna.  It also produces a mild electric shock cloud.  Use this item to pull the pin and light the fuse, turning it into an active EMP grenade.  You will then have three turns before it detonates, creating an EMP field that damages robots and drains bionic energy.",
+    "description": "This is a grenade that generates an electromagnetic pulse with a low-inductance capacitor bank discharged into a single-loop antenna.  It also produces a mild electric shock cloud.  Use this item to pull the pin and light the fuse, turning it into an active EMP grenade.  You will then have three seconds before it detonates, creating an EMP field that damages robots and drains bionic energy.",
     "weight": "400 g",
     "volume": "250 ml",
     "price": 6000,
@@ -731,7 +731,7 @@
     "type": "TOOL",
     "category": "weapons",
     "name": { "str": "incendiary grenade" },
-    "description": "This is a military-grade incendiary hand grenade.  Use this item to pull the pin and light the fuse.  You will then have five turns before it explodes into a raging inferno; throwing it would be a good idea.",
+    "description": "This is a military-grade incendiary hand grenade.  Use this item to pull the pin and light the fuse.  You will then have five seconds before it explodes into a raging inferno; throwing it would be a good idea.",
     "weight": "180 g",
     "volume": "250 ml",
     "price": 2000,
@@ -794,7 +794,7 @@
     "name": { "str": "tear gas grenade" },
     "price": 3600,
     "price_postapoc": 250,
-    "description": "This is a canister grenade filled with noxious irritant.  Use this item to pull the pin and light the fuse, turning it into an active tear gas grenade.  In five turns it will begin to expel a highly toxic gas for some time.  This gas damages and slows those who enter it, as well as obscuring vision and scent.",
+    "description": "This is a canister grenade filled with noxious irritant.  Use this item to pull the pin and light the fuse, turning it into an active tear gas grenade.  In five seconds it will begin to expel a highly toxic gas for some time.  This gas damages and slows those who enter it, as well as obscuring vision and scent.",
     "countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "gasbomb_act" }
   },
   {
@@ -817,7 +817,7 @@
     "name": { "str": "insecticidal gas grenade" },
     "price": 3600,
     "price_postapoc": 750,
-    "description": "This is a canister grenade filled with insecticidal solution.  Use this item to pull the pin and light the fuse, turning it into an active insecticidal grenade.  In five turns it will begin to expel a volatile spray that is highly toxic to insect life forms.",
+    "description": "This is a canister grenade filled with insecticidal solution.  Use this item to pull the pin and light the fuse, turning it into an active insecticidal grenade.  In five seconds it will begin to expel a volatile spray that is highly toxic to insect life forms.",
     "countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "insecticidalbomb_act" }
   },
   {
@@ -841,7 +841,7 @@
     "name": { "str": "makeshift insecticidal gas grenade" },
     "price": 3600,
     "price_postapoc": 500,
-    "description": "This is a makeshift canister grenade filled with insecticidal solution.  Use this item to pull the pin and light the fuse, turning it into an active insecticidal grenade.  In five turns it will begin to expel a volatile spray that is highly toxic to insect life forms.",
+    "description": "This is a makeshift canister grenade filled with insecticidal solution.  Use this item to pull the pin and light the fuse, turning it into an active insecticidal grenade.  In five seconds it will begin to expel a volatile spray that is highly toxic to insect life forms.",
     "countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "insecticidalbomb_makeshift_act" }
   },
   {
@@ -1338,7 +1338,7 @@
     "copy-from": "grenade_canister",
     "type": "GENERIC",
     "name": { "str": "smoke bomb" },
-    "description": "This is a canister grenade filled with a variety of pyrotechnic chemicals.  Use this item to pull the pin and light the fuse, turning it into an active smoke bomb.  Five turns after you do that, it will begin to expel a thick black smoke.  This smoke will slow those who enter it, as well as obscuring vision and scent.",
+    "description": "This is a canister grenade filled with a variety of pyrotechnic chemicals.  Use this item to pull the pin and light the fuse, turning it into an active smoke bomb.  Five seconds after you do that, it will begin to expel a thick black smoke.  This smoke will slow those who enter it, as well as obscuring vision and scent.",
     "price": 1800,
     "price_postapoc": 0,
     "weight": "569 g",
@@ -1360,7 +1360,7 @@
     "type": "TOOL",
     "category": "weapons",
     "name": { "str": "ANFO charge" },
-    "description": "This is a large metal keg filled with ANFO pellets and equipped with a dynamite primer.  Use this item to light the fuse.  You will then have twenty turns before it explodes and creates a large fireball.",
+    "description": "This is a large metal keg filled with ANFO pellets and equipped with a dynamite primer.  Use this item to light the fuse.  You will then have twenty seconds before it explodes and creates a large fireball.",
     "weight": "77800 g",
     "volume": "50 L",
     "price": 75000,
@@ -1426,7 +1426,7 @@
     "category": "weapons",
     "name": { "str": "small bootleg frag device" },
     "looks_like": "tool_black_powder_charge",
-    "description": "This is a home-made explosive device, consisting of a large plastic jug filled with military explosives and scrap metal, equipped with a delayed fuze.  Use this item to pull the pin.  Once you do it should explode in about 20 seconds. ",
+    "description": "This is a home-made explosive device, consisting of a large plastic jug filled with military explosives and scrap metal, equipped with a delayed fuse.  Use this item to pull the pin.  Once you do it should explode in about 20 seconds. ",
     "weight": "6500 g",
     "volume": "4 L",
     "price": 20000,

data/json/items/tool/firefighting.json

@@ -7,7 +7,7 @@
     "name": { "str": "crash axe" },
     "looks_like": "hatchet",
     "//": "Same stats as a hatchet, except it has prying instead of hammering.",
-    "description": "A short lightweight emergency tool with a quarter circular blade, a short pick opposite the blade and an insulated handle.  Used on airplanes to chop down or pry walls or cabinets to gain access in case of fire.",
+    "description": "A short lightweight emergency tool with a quarter circular blade, a short pick opposite the blade, and an insulated handle.  Used on airplanes to chop down or pry walls, or cabinets to gain access in case of fire.",
     "price": 2500,
     "price_postapoc": 750,
     "material": [ "steel" ],
@@ -127,7 +127,7 @@
     "type": "TOOL",
     "category": "tools",
     "name": { "str": "throwable fire extinguisher" },
-    "description": "This is a fire extinguisher in grenade form.  While not as effective as a regular fire extinguisher, you can use it from a distance.  It has a plastic plug that can be pulled, but is primarely activated by heat, so just throw it into the flames.",
+    "description": "This is a fire extinguisher in grenade form.  While not as effective as a regular fire extinguisher, you can use it from a distance.  It has a plastic plug that can be pulled, but is primarily activated by heat, so just throw it into the flames.",
     "weight": "630 g",
     "volume": "250 ml",
     "price": 3000,

data/json/items/tool/lighting.json

@@ -539,7 +539,7 @@
     "id": "oxylamp",
     "type": "TOOL",
     "name": { "str": "acetylene lamp (off)", "str_pl": "acetylene lamps (off)" },
-    "description": "An antique brass lamp designed to run from a pressurized cylinder of acetylene.  It is an efficient, if not somewhat dangerous light source.",
+    "description": "An antique brass lamp designed to run from a pressurized cylinder of acetylene.  It is an efficient, if somewhat dangerous, light source.",
     "weight": "800 g",
     "volume": "500 ml",
     "price": 6500,

data/json/items/tool/misc.json

@@ -505,7 +505,7 @@
     "id": "pheromone",
     "type": "TOOL",
     "name": { "str": "zombie pheromone" },
-    "description": "This is a disgusting ball of rotting meat of zombie origin.  Squeezing this gland causes a small cloud of pheromones to spray into the air.  Apparently the foul secretion can change zombies' attitude towards you, and they may ignore you for a short period of time.  Perhaps they briefly consider you as one of them.",
+    "description": "This is a disgusting ball of rotting meat of zombie origin.  Squeezing this gland causes a small cloud of pheromones to spray into the air.  Apparently, the foul secretion can change zombies' attitude towards you, and they may ignore you for a short period of time.  Perhaps they briefly consider you as one of them.",
     "weight": "238 g",
     "volume": "250 ml",
     "price": 4000,

data/json/items/tool/stoneworking.json

@@ -39,7 +39,7 @@
     "symbol": ";",
     "color": "brown",
     "name": { "str": "primitive rock drill" },
-    "description": "A thick blunted wooden stick.  Can be used to drill rough holes in rock, if water and sand are available, but the process is lenghty.",
+    "description": "A thick blunted wooden stick.  Can be used to drill rough holes in rock, if water and sand are available, but the process is lengthy.",
     "category": "tools",
     "price": 10,
     "material": "wood",