Merge pull request #90 from CleverRaven/master

Merge pull request CleverRaven#38241 from Fris0uman/liquid_bash

.github/stale.yml

@@ -23,6 +23,7 @@ exemptLabels:
   - "(P5 - Long-term)"
   - "(S2 - Confirmed)"
   - "0.E Feature Freeze"
+  - "0.E Content Freeze"
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: true

CMakeLists.txt

@@ -193,7 +193,7 @@ ELSE (CMAKE_BUILD_TYPE STREQUAL Debug)
     MESSAGE(STATUS "PIXMAPS_UNITY_ENTRY_PATH      : ${PIXMAPS_UNITY_ENTRY_PATH}")
     MESSAGE(STATUS "MANPAGE_ENTRY_PATH            : ${MANPAGE_ENTRY_PATH}\n")
     ADD_DEFINITIONS(-DRELEASE)
-    # Use PREFIX as storage of data,gfx, etc.. Usefull only on *nix OS.
+    # Use PREFIX as storage of data,gfx, etc.. Useful only on *nix OS.
     IF (PREFIX AND NOT WIN32)
       ADD_DEFINITIONS(-DDATA_DIR_PREFIX)
     ENDIF (PREFIX AND NOT WIN32)

data/json/bionics.json

@@ -132,23 +132,23 @@
   {
     "id": "bio_blood_anal",
     "type": "bionic",
-    "name": "Blood Analysis",
+    "name": { "str": "Blood Analysis" },
     "description": "Small sensors have been surgically implanted in your heart, allowing you to analyze your blood.  This will detect many illnesses, drugs, and other conditions.",
     "occupied_bodyparts": [ [ "TORSO", 5 ] ],
     "act_cost": "100 J"
   },
   {
     "id": "bio_blood_filter",
     "type": "bionic",
-    "name": "Blood Filter",
+    "name": { "str": "Blood Filter" },
     "description": "A filtration system in your heart allows you to actively filter out chemical impurities, primarily drugs.  It will have limited impact on viruses.  Note that it is not a targeted filter; ALL drugs in your system will be affected.",
     "occupied_bodyparts": [ [ "TORSO", 10 ] ],
     "act_cost": "600 J"
   },
   {
     "id": "bio_cable",
     "type": "bionic",
-    "name": "Cable Charger System",
+    "name": { "str": "Cable Charger System" },
     "description": "You have a complex port surgically mounted above your hip.  While active, it will recharge bionic power when connected to a power source via jumper cable.",
     "occupied_bodyparts": [ [ "TORSO", 10 ] ],
     "is_remote_fueled": true,
@@ -202,7 +202,7 @@
   {
     "id": "bio_chain_lightning",
     "type": "bionic",
-    "name": "Chain Lightning",
+    "name": { "str": "Chain Lightning" },
     "description": "Your body is equipped with a chain lightning generator, allowing you to emit a blast of lightning at a target, leaving a trail of lightning in its wake, jumping to additional targets within 4 tiles of the previous target.",
     "occupied_bodyparts": [ [ "TORSO", 16 ], [ "ARM_L", 4 ], [ "ARM_R", 4 ] ],
     "act_cost": "100 kJ",
@@ -244,7 +244,7 @@
   {
     "id": "bio_cloak",
     "type": "bionic",
-    "name": "Cloaking System",
+    "name": { "str": "Cloaking System" },
     "description": "This high-power system uses a set of cameras and LEDs to make you blend into your background, rendering you fully invisible to normal vision.  However, you may be detected by infrared, sonar, etc.",
     "occupied_bodyparts": [
       [ "TORSO", 15 ],
@@ -266,7 +266,7 @@
   {
     "id": "bio_cqb",
     "type": "bionic",
-    "name": "Close Quarters Battle",
+    "name": { "str": "Close Quarters Battle" },
     "description": "Bionic processors and databanks, loaded with martial arts combat programs, are surgically integrated into your nervous system.  Whilst active, the CQB module will improve your hand to hand combat skills, but prevents you from improving them through combat experience.",
     "occupied_bodyparts": [ [ "HEAD", 4 ] ],
     "act_cost": "20 J",
@@ -294,7 +294,7 @@
   {
     "id": "bio_digestion",
     "type": "bionic",
-    "name": "Expanded Digestive System",
+    "name": { "str": "Expanded Digestive System" },
     "description": "You have been outfitted with three synthetic stomachs and industrial-grade intestines.  Not only can you extract much more nutrition from food, but you are highly resistant to foodborne illness, and can sometimes eat rotten food.",
     "occupied_bodyparts": [ [ "TORSO", 20 ] ],
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
@@ -310,15 +310,15 @@
   {
     "id": "bio_dis_shock",
     "type": "bionic",
-    "name": "Electrical Discharge",
+    "name": { "str": "Electrical Discharge" },
     "description": "A malfunctioning bionic which occasionally discharges electricity through your body, causing pain and brief paralysis but no damage.",
     "occupied_bodyparts": [ [ "TORSO", 6 ] ],
     "flags": [ "BIONIC_FAULTY" ]
   },
   {
     "id": "bio_drain",
     "type": "bionic",
-    "name": "Electrical Drain",
+    "name": { "str": "Electrical Drain" },
     "description": "A malfunctioning bionic.  It doesn't perform any useful function, but will occasionally draw power from your batteries.",
     "occupied_bodyparts": [ [ "TORSO", 2 ] ],
     "flags": [ "BIONIC_FAULTY" ]
@@ -334,7 +334,7 @@
   {
     "id": "bio_ears",
     "type": "bionic",
-    "name": "Enhanced Hearing",
+    "name": { "str": "Enhanced Hearing" },
     "description": "When this bionic is active, your hearing will be drastically improved, allowing you to hear ten times better than the average person.  Additionally, high-intensity sounds will be automatically dampened before they can damage your hearing.",
     "occupied_bodyparts": [ [ "HEAD", 3 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
@@ -343,15 +343,15 @@
   {
     "id": "bio_emp",
     "type": "bionic",
-    "name": "Directional EMP",
+    "name": { "str": "Directional EMP" },
     "description": "Surgically mounted in the palm of your hand are small parabolic EMP field generators.  You may use power to fire a wide, but short-ranged blast which will disable electronics and robots.",
     "occupied_bodyparts": [ [ "ARM_R", 1 ], [ "HAND_R", 2 ] ],
     "act_cost": "50 kJ"
   },
   {
     "type": "bionic",
     "id": "bio_emp_armgun",
-    "name": "EMP Projector",
+    "name": { "str": "EMP Projector" },
     "description": "A ranged EMP generator system is implanted on the palm of your right hand and arm.  The system fires precise, single-target pulses that require time to aim.  Extremely effective against electronic targets but mostly useless otherwise.",
     "occupied_bodyparts": [ [ "ARM_R", 10 ], [ "HAND_R", 5 ] ],
     "act_cost": "50 kJ",
@@ -361,7 +361,7 @@
   {
     "id": "bio_ethanol",
     "type": "bionic",
-    "name": "Ethanol Burner",
+    "name": { "str": "Ethanol Burner" },
     "description": "You burn alcohol as fuel in an extremely efficient reaction.",
     "occupied_bodyparts": [ [ "TORSO", 26 ] ],
     "fuel_options": [ "chem_ethanol", "chem_methanol", "denat_alcohol" ],
@@ -384,7 +384,7 @@
   {
     "id": "bio_eye_enhancer",
     "type": "bionic",
-    "name": "Diamond Cornea",
+    "name": { "str": "Diamond Cornea" },
     "description": "Your vision is greatly enhanced, giving you a +2 bonus to perception.",
     "occupied_bodyparts": [ [ "EYES", 1 ] ],
     "stat_bonus": [ [ "PER", 2 ] ],
@@ -430,7 +430,7 @@
   {
     "id": "bio_faraday",
     "type": "bionic",
-    "name": "Dielectric Capacitance System",
+    "name": { "str": "Dielectric Capacitance System" },
     "description": "Throughout your body lies a network of miniature piezoelectric capacitors which can be charged with bionic power to temporarily protect you from external electrical discharge.",
     "occupied_bodyparts": [
       [ "TORSO", 8 ],
@@ -467,7 +467,7 @@
   {
     "id": "bio_flashlight",
     "type": "bionic",
-    "name": "Cranial Flashlight",
+    "name": { "str": "Cranial Flashlight" },
     "description": "Surgically mounted between your eyes is a small but powerful LED flashlight.",
     "occupied_bodyparts": [ [ "EYES", 1 ] ],
     "act_cost": "3 J",
@@ -585,7 +585,7 @@
   {
     "id": "bio_int_enhancer",
     "type": "bionic",
-    "name": "Cerebral Booster",
+    "name": { "str": "Cerebral Booster" },
     "description": "Your brain has been enhanced with bionic coprocessors, giving you a +2 bonus to intelligence.",
     "occupied_bodyparts": [ [ "HEAD", 7 ] ],
     "stat_bonus": [ [ "INT", 2 ] ],
@@ -648,7 +648,7 @@
   {
     "id": "bio_magnet",
     "type": "bionic",
-    "name": "Electromagnetic Unit",
+    "name": { "str": "Electromagnetic Unit" },
     "description": "Surgically embedded in your right hand is a powerful electromagnet, allowing you to use your own strength to pull all nearby magnetic objects towards you.  Unlucky bystanders might be injured or killed by flying objects.",
     "occupied_bodyparts": [ [ "HAND_R", 3 ] ],
     "act_cost": "10 kJ"
@@ -664,7 +664,7 @@
   {
     "id": "bio_memory",
     "type": "bionic",
-    "name": "Enhanced Memory Banks",
+    "name": { "str": "Enhanced Memory Banks" },
     "description": "Your memory has been enhanced with small quantum storage drives.  While active, you learn - both through reading and practice - more quickly.  Additionally, you can't forget skills you've already learned, and the layout of terrain you've explored will remain in your memory for an incredibly long time.",
     "occupied_bodyparts": [ [ "HEAD", 3 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
@@ -932,7 +932,7 @@
   {
     "id": "bio_shock",
     "type": "bionic",
-    "name": "Electroshock Unit",
+    "name": { "str": "Electroshock Unit" },
     "description": "While fighting unarmed, or with a weapon that conducts electricity, there is a chance that a successful hit will shock your opponent, inflicting extra damage and disabling them temporarily at the cost of some energy.",
     "occupied_bodyparts": [ [ "TORSO", 8 ], [ "ARM_L", 3 ], [ "ARM_R", 3 ], [ "HAND_L", 1 ], [ "HAND_R", 1 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
@@ -948,7 +948,7 @@
   {
     "id": "bio_sleepy",
     "type": "bionic",
-    "name": "Endocrine Enervator",
+    "name": { "str": "Endocrine Enervator" },
     "description": "Through a combination of psychochemical manipulation and old fashioned electrical nerve stimulation, this malfunctioning bionic alters your brain chemistry in such a way as to cause fatigue.  You will find yourself tiring a bit faster than before.",
     "occupied_bodyparts": [ [ "HEAD", 2 ] ],
     "flags": [ "BIONIC_FAULTY" ]

data/json/construction.json

@@ -34,6 +34,7 @@
     "pre_note": "Mark a spot for crafting.  Crafting tasks next to this tile will automatically use this location instead of attempting to craft in your hands, with the usual crafting speed penalty for working on the ground.  Does not prevent using a proper workbench, if available.  Deconstruct or smash to remove.",
     "pre_special": "check_empty",
     "post_flags": [ "keep_items" ],
+    "dark_craftable": true,
     "post_terrain": "f_ground_crafting_spot"
   },
   {
@@ -3040,6 +3041,7 @@
     "pre_note": "Firewood or other flammable materials on a nearby tile marked in this way may be used to automatically refuel fires.  This will be done to maintain light during long-running tasks that require it such as crafting or reading, but not (for example) if you are simply waiting nearby.",
     "pre_special": "check_no_trap",
     "post_special": "done_mark_firewood",
+    "dark_craftable": true,
     "post_flags": [ "keep_items" ]
   },
   {
@@ -3052,6 +3054,7 @@
     "pre_note": "Mark a spot for target practice.  Firing will automatically target the first practice target location found in gun range, if no enemies are around.",
     "pre_special": "check_no_trap",
     "post_special": "done_mark_practice_target",
+    "dark_craftable": true,
     "post_flags": [ "keep_items" ]
   },
   {

data/json/items/ammo/22.json

@@ -58,7 +58,7 @@
     "id": "bp_22_fmj",
     "copy-from": "22_fmj",
     "type": "AMMO",
-    "name": ".22 LR FMJ, black powder",
+    "name": { "str": ".22 LR FMJ, black powder" },
     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -67,7 +67,7 @@
     "id": "bp_22_lr",
     "copy-from": "22_lr",
     "type": "AMMO",
-    "name": ".22 LR, black powder",
+    "name": { "str": ".22 LR, black powder" },
     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -76,7 +76,7 @@
     "id": "reloaded_22_lr",
     "copy-from": "22_lr",
     "type": "AMMO",
-    "name": ".22 LR, reloaded",
+    "name": { "str": ".22 LR, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -85,7 +85,7 @@
     "id": "reloaded_22_fmj",
     "copy-from": "22_fmj",
     "type": "AMMO",
-    "name": ".22 FMJ, reloaded",
+    "name": { "str": ".22 FMJ, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/json/items/ammo/270win.json

@@ -26,7 +26,7 @@
     "id": "bp_270win_jsp",
     "copy-from": "270win_jsp",
     "type": "AMMO",
-    "name": ".270 Winchester JSP, black powder",
+    "name": { "str": ".270 Winchester JSP, black powder" },
     "proportional": { "price": 0.3, "damage": 0.7, "recoil": 0.7, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -35,7 +35,7 @@
     "id": "reloaded_270win_jsp",
     "copy-from": "270win_jsp",
     "type": "AMMO",
-    "name": ".270 Winchester JSP, reloaded",
+    "name": { "str": ".270 Winchester JSP, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/json/items/ammo/300.json

@@ -26,7 +26,7 @@
     "id": "bp_300_winmag",
     "copy-from": "300_winmag",
     "type": "AMMO",
-    "name": ".300 Winchester Magnum, black powder",
+    "name": { "str": ".300 Winchester Magnum, black powder" },
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/json/items/ammo/3006.json

@@ -42,7 +42,7 @@
     "id": "bp_3006",
     "copy-from": "3006",
     "type": "AMMO",
-    "name": ".30-06 Springfield, black powder",
+    "name": { "str": ".30-06 Springfield, black powder" },
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -51,7 +51,7 @@
     "id": "bp_3006_incendiary",
     "copy-from": "3006_incendiary",
     "type": "AMMO",
-    "name": ".30-06 Springfield tracer, black powder",
+    "name": { "str": ".30-06 Springfield tracer, black powder" },
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -60,7 +60,7 @@
     "id": "bp_3006fmj",
     "copy-from": "bp_3006",
     "type": "AMMO",
-    "name": ".30-06 Springfield M2 AP, black powder",
+    "name": { "str": ".30-06 Springfield M2 AP, black powder" },
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -69,7 +69,7 @@
     "id": "reloaded_3006",
     "copy-from": "3006",
     "type": "AMMO",
-    "name": ".30-06 Springfield, reloaded",
+    "name": { "str": ".30-06 Springfield, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -78,7 +78,7 @@
     "id": "reloaded_3006_incendiary",
     "copy-from": "3006_incendiary",
     "type": "AMMO",
-    "name": ".30-06 incendiary, reloaded",
+    "name": { "str": ".30-06 incendiary, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -87,7 +87,7 @@
     "id": "reloaded_3006fmj",
     "copy-from": "3006fmj",
     "type": "AMMO",
-    "name": ".30-06 M2 AP, reloaded",
+    "name": { "str": ".30-06 M2 AP, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/json/items/ammo/300blk.json

@@ -2,7 +2,7 @@
   {
     "id": "300blk",
     "type": "AMMO",
-    "name": ".300 AAC Blackout",
+    "name": { "str": ".300 AAC Blackout" },
     "description": "A .300 AAC Blackout round with a 125gr open tip match bullet.  300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm.  It is compatible with standard AR-15 lower receivers and will feed from STANAG magazines.",
     "weight": "18 g",
     "volume": "250 ml",
@@ -26,7 +26,7 @@
     "id": "300blk_ss",
     "copy-from": "300blk",
     "type": "AMMO",
-    "name": ".300 AAC Blackout",
+    "name": { "str": ".300 AAC Blackout" },
     "description": "A subsonic .300 AAC Blackout round with a 220gr open tip match bullet.  300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm.  It is compatible with standard AR-15 lower receivers and will feed from STANAG magazines.",
     "weight": "21 g",
     "range": 40,
@@ -37,7 +37,7 @@
     "id": "bp_300blk",
     "copy-from": "300blk",
     "type": "AMMO",
-    "name": ".300 AAC Blackout, black powder",
+    "name": { "str": ".300 AAC Blackout, black powder" },
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -46,7 +46,7 @@
     "id": "reloaded_300blk",
     "copy-from": "300blk",
     "type": "AMMO",
-    "name": ".300 AAC Blackout, reloaded",
+    "name": { "str": ".300 AAC Blackout, reloaded" },
     "description": ".300 AAC Blackout is an intermediate cartridge that achieves ballistics similar to the 7.62x39 but allows use on the AR-15 platform.  The round is necked-up from the 5.56mm NATO, but feeds from a STANAG magazine.  It requires a specific barrel, so will not work in a standard M4 or similar carbine.  This one has been hand-reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },

data/json/items/ammo/308.json

@@ -2,7 +2,7 @@
   {
     "id": "308",
     "type": "AMMO",
-    "name": ".308 Winchester",
+    "name": { "str": ".308 Winchester" },
     "description": ".308 Winchester ammunition with 168gr hollow point bullets.  The .308 round is one of the most popular hunting cartridges in the world due to its accuracy and power.",
     "weight": "18 g",
     "volume": "250 ml",