Port to Bright Nights

11 files changed, 195 insertions, 562 deletions

diff --git a/0.F_backport-map-note-colours.patch b/0.F_backport-map-note-colours.patch
deleted file mode 100644
index fceec60..0000000
--- a/0.F_backport-map-note-colours.patch
+++ /dev/null
@@ -1,347 +0,0 @@
---- a/data/json/overmap/map_extras.json
-+++ b/data/json/overmap/map_extras.json
-@@ -12,8 +12,8 @@
-     "name": "Crater",
-     "description": "There is a crater here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_crater" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "o",
-+    "color": "red",
-     "autonote": true
-   },
-   {
-@@ -32,8 +32,8 @@
-     "name": "College Kids",
-     "description": "Several corpses of college kids are here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_collegekids" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "c",
-+    "color": "light_red",
-     "autonote": true
-   },
-   {
-@@ -42,8 +42,8 @@
-     "name": "Drug Deal",
-     "description": "Several corpses of drug dealers are here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_drugdeal" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "d",
-+    "color": "light_red",
-     "autonote": true
-   },
-   {
-@@ -52,7 +52,7 @@
-     "name": "Roadworks",
-     "description": "Roadworks are here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_roadworks" },
--    "sym": "x",
-+    "sym": "X",
-     "color": "yellow",
-     "autonote": true
-   },
-@@ -62,8 +62,8 @@
-     "name": "Road Mayhem",
-     "description": "Road mayhem is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_mayhem" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "M",
-+    "color": "light_red",
-     "autonote": true
-   },
-   {
-@@ -72,8 +72,8 @@
-     "name": "Roadblock (Military)",
-     "description": "This road is blocked by military.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_roadblock" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "X",
-+    "color": "red",
-     "autonote": true
-   },
-   {
-@@ -82,8 +82,8 @@
-     "name": "Roadblock (Bandits)",
-     "description": "This road is blocked by bandits.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_bandits_block" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "X",
-+    "color": "red",
-     "autonote": true
-   },
-   {
-@@ -92,8 +92,8 @@
-     "name": "Minefield",
-     "description": "Mines are scattered here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_minefield" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "M",
-+    "color": "red",
-     "autonote": true
-   },
-   {
-@@ -102,7 +102,7 @@
-     "name": "Supply Drop",
-     "description": "Several supply crates were dropped here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_supplydrop" },
--    "sym": "x",
-+    "sym": "C",
-     "color": "yellow",
-     "autonote": true
-   },
-@@ -112,8 +112,8 @@
-     "name": "Military",
-     "description": "Several corpses of soldiers are here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_military" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "m",
-+    "color": "light_red",
-     "autonote": true
-   },
-   {
-@@ -122,8 +122,8 @@
-     "name": "Helicopter Crash",
-     "description": "Helicopter crashed here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_helicopter" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "X",
-+    "color": "light_blue",
-     "autonote": true
-   },
-   {
-@@ -132,8 +132,8 @@
-     "name": "Scientists",
-     "description": "Several corpses of scientists are here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_science" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "s",
-+    "color": "light_red",
-     "autonote": true
-   },
-   {
-@@ -142,8 +142,8 @@
-     "name": "Portal",
-     "description": "Portal is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_portal" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "P",
-+    "color": "magenta",
-     "autonote": true
-   },
-   {
-@@ -152,8 +152,8 @@
-     "name": "Portal In",
-     "description": "Another portal is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_portal_in" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "P",
-+    "color": "magenta",
-     "autonote": true
-   },
-   {
-@@ -162,8 +162,8 @@
-     "name": "Anomaly",
-     "description": "Some anomaly is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_anomaly" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "O",
-+    "color": "light_red",
-     "autonote": true
-   },
-   {
-@@ -172,7 +172,7 @@
-     "name": "Spider Nest",
-     "description": "Spider nest is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_house_spider" },
--    "sym": "x",
-+    "sym": "S",
-     "color": "yellow",
-     "autonote": true
-   },
-@@ -182,7 +182,7 @@
-     "name": "Wasp Nest",
-     "description": "Wasp nest is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_house_wasp" },
--    "sym": "x",
-+    "sym": "W",
-     "color": "yellow",
-     "autonote": true
-   },
-@@ -192,7 +192,7 @@
-     "name": "Spiders",
-     "description": "This area is covered with webs.  Probably spiders are nearby",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_spider" },
--    "sym": "x",
-+    "sym": "S",
-     "color": "yellow",
-     "autonote": true
-   },
-@@ -202,8 +202,8 @@
-     "name": "Shia LaBeouf",
-     "description": "Cannibal is nearby.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_shia" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "c",
-+    "color": "red",
-     "autonote": true
-   },
-   {
-@@ -212,8 +212,8 @@
-     "name": "Jabberwock",
-     "description": "Jabberwock is nearby.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_jabberwock" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "J",
-+    "color": "red",
-     "autonote": true
-   },
-   {
-@@ -222,8 +222,8 @@
-     "name": "Grove",
-     "description": "This area is covered with a single type of trees.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_grove" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "F",
-+    "color": "light_green",
-     "autonote": true
-   },
-   {
-@@ -232,8 +232,8 @@
-     "name": "Shrubberry",
-     "description": "This area is covered with a single type of shrubs.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_shrubbery" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "s",
-+    "color": "light_green",
-     "autonote": true
-   },
-   {
-@@ -242,8 +242,8 @@
-     "name": "Clearcut",
-     "description": "Most trees in this area were uniformly cut down.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_clearcut" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": ".",
-+    "color": "brown",
-     "autonote": true
-   },
-   {
-@@ -252,8 +252,8 @@
-     "name": "Pond",
-     "description": "Small pond is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_pond" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "p",
-+    "color": "blue",
-     "autonote": true
-   },
-   {
-@@ -283,8 +283,8 @@
-     "name": "Clay Deposit",
-     "description": "Small clay deposit is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_clay_deposit" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "c",
-+    "color": "brown",
-     "autonote": true
-   },
-   {
-@@ -293,8 +293,8 @@
-     "name": "Dead Vegetation",
-     "description": "Dead vegetation is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_dead_vegetation" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": ".",
-+    "color": "brown",
-     "autonote": true
-   },
-   {
-@@ -303,8 +303,8 @@
-     "name": "Dead Vegetation (Point)",
-     "description": "Dead vegetation is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_point_dead_vegetation" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": ".",
-+    "color": "brown",
-     "autonote": true
-   },
-   {
-@@ -313,7 +313,7 @@
-     "name": "Burned Ground",
-     "description": "Burned ground is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_burned_ground" },
--    "sym": "x",
-+    "sym": ".",
-     "color": "yellow",
-     "autonote": true
-   },
-@@ -323,7 +323,7 @@
-     "name": "Burned Ground (Point)",
-     "description": "Burned ground is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_point_burned_ground" },
--    "sym": "x",
-+    "sym": ".",
-     "color": "yellow",
-     "autonote": true
-   },
-@@ -333,8 +333,8 @@
-     "name": "Marloss Pilgrimage",
-     "description": "Marloss Pilgrimage is here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_marloss_pilgrimage" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "F",
-+    "color": "dark_gray",
-     "autonote": true
-   },
-   {
-@@ -343,7 +343,7 @@
-     "name": "Casings",
-     "description": "Several spent casings are here.",
-     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_casings" },
--    "sym": "x",
-+    "sym": "C",
-     "color": "yellow",
-     "autonote": true
-   },
-@@ -367,7 +367,7 @@
-     "name": "Wasp Nest",
-     "description": "A wasp nest.",
-     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_nest_wasp" },
--    "sym": "x",
-+    "sym": "W",
-     "color": "yellow",
-     "autonote": true
-   },
-@@ -377,8 +377,8 @@
-     "name": "Dermatik Nest",
-     "description": "A dermatik nest.",
-     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_nest_dermatik" },
--    "sym": "x",
--    "color": "yellow",
-+    "sym": "D",
-+    "color": "brown",
-     "autonote": true
-   },
-   {
diff --git a/0.F_backport-vehicle-heater-cooler-intensity-reduced.patch b/0.F_backport-vehicle-heater-cooler-intensity-reduced.patch
deleted file mode 100644
index c3d16d5..0000000
--- a/0.F_backport-vehicle-heater-cooler-intensity-reduced.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/data/json/emit.json
-+++ b/data/json/emit.json
-@@ -185,7 +185,7 @@
-   {
-     "id": "emit_heater_vehicle",
-     "type": "emit",
--    "field": "fd_hot_air3",
-+    "field": "fd_hot_air2",
-     "intensity": 3,
-     "qty": 3,
-     "chance": 100
-@@ -193,7 +193,7 @@
-   {
-     "id": "emit_cooler_vehicle",
-     "type": "emit",
--    "field": "fd_cold_air3",
-+    "field": "fd_cold_air2",
-     "intensity": 3,
-     "qty": 3,
-     "chance": 100
diff --git a/0003-inconsistent-ammo-names.patch b/0003-inconsistent-ammo-names.patch
index 4b6dcb0..abfca23 100644
--- a/0003-inconsistent-ammo-names.patch
+++ b/0003-inconsistent-ammo-names.patch
@@ -1,34 +1,50 @@
---- a/data/json/items/ammo/45.json
-+++ b/data/json/items/ammo/45.json
-@@ -63,7 +63,7 @@
-     "id": "reloaded_45_acp",
-     "copy-from": "45_acp",
-     "type": "AMMO",
--    "name": { "str": ".45 FMJ, reloaded" },
-+    "name": { "str": ".45 ACP FMJ, reloaded" },
-     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ] }
 --- a/data/json/items/ammo/223.json
 +++ b/data/json/items/ammo/223.json
-@@ -55,7 +55,7 @@
+@@ -39,7 +39,7 @@
+     "id": "556_incendiary",
+     "copy-from": "556",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO tracer" },
++    "name": { "str": "5.56 NATO M856 tracer" },
+     "description": "This ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to help keep the weapon they are fired from on target.",
+     "extend": { "effects": [ "INCENDIARY" ] }
+   },
+@@ -61,7 +61,7 @@
      "id": "bp_556",
      "copy-from": "556",
      "type": "AMMO",
 -    "name": { "str": "5.56 NATO, black powder" },
 +    "name": { "str": "5.56 NATO M855A1, 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" ] }
-@@ -82,7 +82,7 @@
+     "proportional": {
+       "price": 0.3,
+       "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
+@@ -75,7 +75,7 @@
+     "id": "bp_556_incendiary",
+     "copy-from": "556_incendiary",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO tracer, black powder" },
++    "name": { "str": "5.56 NATO M856 tracer, black powder" },
+     "proportional": {
+       "price": 0.3,
+       "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
+@@ -98,7 +98,7 @@
      "id": "reloaded_556",
      "copy-from": "556",
      "type": "AMMO",
 -    "name": { "str": "5.56 NATO, reloaded" },
-+    "name": { "str": "5.56 NATO M855A1, reloaded" },
-     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
++    "name": { "str": "5.56 NATO M885A1, reloaded" },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+@@ -107,7 +107,7 @@
+     "id": "reloaded_556_incendiary",
+     "copy-from": "556_incendiary",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO tracer, reloaded" },
++    "name": { "str": "5.56 NATO M856 tracer, reloaded" },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 --- a/data/json/items/ammo/300blk.json
 +++ b/data/json/items/ammo/300blk.json
 @@ -26,7 +26,7 @@
@@ -50,54 +66,52 @@
 +    "name": { "str": "7.62x51mm NATO M80" },
      "casing": "762_51_casing",
      "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.",
-     "relative": { "damage": -2, "pierce": 4, "dispersion": -10 },
-@@ -54,7 +54,7 @@
+     "relative": { "damage": { "damage_type": "stab", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
+@@ -37,7 +37,7 @@
+     "id": "762_51_incendiary",
+     "copy-from": "762_51",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm NATO tracer" },
++    "name": { "str": "7.62x51mm NATO M82 tracer" },
+     "description": "This ammunition is a one-in-five mix of M80 and M62 tracer rounds to help keep the weapon they are fired from on target.",
+     "extend": { "effects": [ "INCENDIARY" ] }
+   },
+@@ -59,7 +59,7 @@
      "id": "bp_762_51",
      "copy-from": "762_51",
      "type": "AMMO",
 -    "name": { "str": "7.62x51mm, black powder" },
 +    "name": { "str": "7.62x51mm NATO M80, 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" ] }
-@@ -63,7 +63,7 @@
+     "proportional": {
+       "price": 0.3,
+       "damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
+@@ -73,7 +73,7 @@
      "id": "bp_762_51_incendiary",
      "copy-from": "762_51_incendiary",
      "type": "AMMO",
 -    "name": { "str": "7.62x51mm tracer, black powder" },
-+    "name": { "str": "7.62x51mm NATO 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" ] }
-@@ -81,7 +81,7 @@
++    "name": { "str": "7.62x51mm NATO M82 tracer, black powder" },
+     "proportional": {
+       "price": 0.3,
+       "damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
+@@ -96,7 +96,7 @@
      "id": "reloaded_762_51",
      "copy-from": "762_51",
      "type": "AMMO",
 -    "name": { "str": "7.62x51mm, reloaded" },
 +    "name": { "str": "7.62x51mm NATO M80, reloaded" },
-     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ] }
-@@ -90,7 +90,7 @@
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+@@ -105,7 +105,7 @@
      "id": "reloaded_762_51_incendiary",
      "copy-from": "762_51_incendiary",
      "type": "AMMO",
 -    "name": { "str": "7.62x51mm incendiary, reloaded" },
-+    "name": { "str": "7.62x51mm NATO incendiary, reloaded" },
-     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
++    "name": { "str": "7.62x51mm NATO M82 incendiary, reloaded" },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ] }
---- a/data/json/items/ammo/5x50.json
-+++ b/data/json/items/ammo/5x50.json
-@@ -38,7 +38,7 @@
-     "id": "reloaded_5x50dart",
-     "copy-from": "5x50dart",
-     "type": "AMMO",
--    "name": { "str": "5x50mm flechette, reloaded" },
-+    "name": { "str": "RA110 5x50mm flechette, reloaded" },
-     "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.  This one has been hand-reloaded.",
-     "effects": [ "COOKOFF", "RECYCLED" ],
-     "relative": { "range": -15, "dispersion": 40 },
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 --- a/data/json/items/ammo/357mag.json
 +++ b/data/json/items/ammo/357mag.json
 @@ -2,8 +2,8 @@
@@ -111,7 +125,7 @@
      "weight": "8 g",
      "volume": "250 ml",
      "price": 140,
-@@ -26,8 +26,8 @@
+@@ -27,8 +27,8 @@
      "id": "357mag_jhp",
      "copy-from": "357mag_fmj",
      "type": "AMMO",
@@ -119,46 +133,30 @@
 -    "description": "Jacketed hollow point .357 magnum ammunition.  The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
 +    "name": { "str": ".357 Magnum JHP" },
 +    "description": "Jacketed hollow point .357 Magnum ammunition.  The .357 Magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
-     "relative": { "damage": 4, "pierce": -2 }
+     "damage": { "damage_type": "stab", "amount": 42, "armor_penetration": 0 }
    },
    {
-@@ -53,13 +53,15 @@
-     "copy-from": "357mag_fmj",
-     "type": "AMMO",
-     "name": { "str": ".357 Magnum FMJ, reloaded", "str_pl": ".357 Magnum FMJ, reloaded" },
--    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
-+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 },
-+    "extend": { "effects": [ "RECYCLED" ] }
-   },
-   {
-     "id": "reloaded_357mag_jhp",
-     "copy-from": "357mag_jhp",
+--- a/data/json/items/ammo/5x50.json
++++ b/data/json/items/ammo/5x50.json
+@@ -38,7 +38,7 @@
+     "id": "reloaded_5x50dart",
+     "copy-from": "5x50dart",
      "type": "AMMO",
-     "name": { "str": ".357 Magnum JHP, reloaded", "str_pl": ".357 Magnum JHP, reloaded" },
--    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
-+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 },
-+    "extend": { "effects": [ "RECYCLED" ] }
-   }
- ]
+-    "name": { "str": "5x50mm flechette, reloaded" },
++    "name": { "str": "RA110 5x50mm flechette, reloaded" },
+     "price_postapoc": 1200,
+     "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.  This one has been hand-reloaded.",
+     "effects": [ "COOKOFF", "RECYCLED" ],
 --- a/data/json/items/ammo/762x25.json
 +++ b/data/json/items/ammo/762x25.json
-@@ -26,7 +26,7 @@
-     "id": "762_25hot",
-     "copy-from": "762_25",
-     "type": "AMMO",
--    "name": { "str": "7.62x25mm FMJ hot load" },
-+    "name": { "str": "7.62x25mm FMJ" },
-     "description": "A high-pressure commercial version of the 7.62x25mm cartridge, loaded with an 85 gr. FMJ bullet.  It is more powerful than the original.",
-     "relative": { "price": 500, "range": 2, "damage": 4, "pierce": 3 },
-     "proportional": { "recoil": 1.4 }
-@@ -55,7 +55,8 @@
+@@ -68,7 +68,8 @@
      "id": "reloaded_762_25",
      "copy-from": "762_25hot",
      "type": "AMMO",
 -    "name": { "str": "7.62x25mm, reloaded" },
--    "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.9, "dispersion": 1.1 }
+-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 }
 +    "name": { "str": "7.62x25mm FMJ, reloaded" },
-+    "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.9, "dispersion": 1.1 },
++    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 },
 +    "extend": { "effects": [ "RECYCLED" ] }
    }
  ]
diff --git a/0008-npc-can-use-more-bionics.patch b/0008-npc-can-use-more-bionics.patch
index 57e4720..d140ab1 100644
--- a/0008-npc-can-use-more-bionics.patch
+++ b/0008-npc-can-use-more-bionics.patch
@@ -1,35 +1,25 @@
 --- a/data/json/bionics.json
 +++ b/data/json/bionics.json
-@@ -337,7 +337,7 @@
+@@ -338,7 +338,7 @@
      "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 ] ],
+     "occupied_bodyparts": [ [ "head", 3 ] ],
 -    "flags": [ "BIONIC_TOGGLED" ],
 +    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
      "included_bionics": [ "bio_earplugs" ]
    },
    {
-@@ -1000,7 +1000,8 @@
-     "name": { "str": "Autonomous Surgical Scalpels" },
-     "description": "A system of surgical grade scalpels is implanted on your fingers.  They allow you to make automated precise cuts and can also be used as a high-quality butchering tool.",
-     "occupied_bodyparts": [ [ "ARM_R", 1 ], [ "ARM_L", 1 ] ],
--    "fake_item": "bio_scalpel"
-+    "fake_item": "bio_scalpel",
-+    "flags": [ "BIONIC_NPC_USABLE" ]
-   },
-   {
-     "id": "bio_sunglasses",
-@@ -1196,6 +1197,6 @@
+@@ -1200,6 +1200,6 @@
      "name": { "str": "Soporific Induction" },
      "description": "An electrode has been implanted into your brain's ventrolateral preoptic nucleus.  It turns on whenever you're trying to fall asleep, creating an artificial but effective sensation of fatigue.",
-     "occupied_bodyparts": [ [ "HEAD", 1 ] ],
+     "occupied_bodyparts": [ [ "head", 1 ] ],
 -    "flags": [ "BIONIC_TOGGLED" ]
 +    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
    }
  ]
 --- a/data/json/items/bionics.json
 +++ b/data/json/items/bionics.json
-@@ -266,7 +266,7 @@
+@@ -268,7 +268,7 @@
    },
    {
      "id": "bio_ears",
@@ -38,7 +28,7 @@
      "type": "BIONIC_ITEM",
      "name": { "str": "Enhanced Hearing CBM" },
      "looks_like": "bio_int_enhancer",
-@@ -741,7 +741,7 @@
+@@ -743,7 +743,7 @@
    },
    {
      "id": "bio_fuel_cell_gasoline",
@@ -47,7 +37,7 @@
      "type": "BIONIC_ITEM",
      "name": { "str": "Gasoline Fuel Cell CBM" },
      "looks_like": "bio_int_enhancer",
-@@ -839,7 +839,7 @@
+@@ -841,7 +841,7 @@
    },
    {
      "id": "bio_surgical_razor",
diff --git a/0009-22-casings-can-stack.patch b/0009-22-casings-can-stack.patch
index 4085863..e52b8bb 100644
--- a/0009-22-casings-can-stack.patch
+++ b/0009-22-casings-can-stack.patch
@@ -1,17 +1,17 @@
 --- a/data/json/items/generic/casing.json
 +++ b/data/json/items/generic/casins.json
-@@ -32,13 +32,9 @@
-   { 
+@@ -31,13 +31,11 @@
+   },
+   {
      "id": "22_casing_new",
 +    "copy-from": "casing",
      "type": "GENERIC",
 -    "category": "spare_parts",
--    "price": 100,
+     "price": 100,
+     "price_postapoc": 0,
      "name": { "str": "unused .22 casing" },
 -    "symbol": "=",
 -    "color": "yellow",
      "description": "An unfired, like-new .22 round casing, with the primer still intact.",
--    "material": [ "powder", "brass" ],
+     "material": [ "powder", "brass" ],
      "volume": "3 ml",
-     "weight": "1 g"
-   },
diff --git a/PKGBUILD b/PKGBUILD
index b7ecadc..fa277a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,30 +7,28 @@
 # Arch version lacks the MSX++UnDeadPeopleEdition Legacy tileset
 # Arch version lacks the @ soundpack
 # Arch version lacks the CO.AG musicpack
+# Arch version is not BN
 
-pkgbase=cataclysm-dda
-pkgname=(cataclysm-dda cataclysm-dda-tiles)
-pkgname=cataclysm-dda
-pkgver=0.E.3
-_pkgver=0.E-3
-pkgrel=2.10
+pkgbase=cataclysm-bn
+pkgname=(cataclysm-bn cataclysm-bn-tiles)
+pkgname=cataclysm-bn
+pkgver=1710
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
 #url="http://en.cataclysmdda.com/"
-url="https://cataclysmdda.org/"
+url="https://github.com/cataclysmbnteam/Cataclysm-BN"
 arch=('x86_64' 'aarch64')
 license=("CCPL:by-sa")
 depends=('ncurses' 'hicolor-icon-theme' 'gettext')
 makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle')
-source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/archive/$_pkgver.tar.gz"
-        "cataclysm-dda.desktop"
-        "cataclysm-dda-tiles.desktop"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/$pkgver.tar.gz"
+        "cataclysm-bn.desktop"
+        "cataclysm-bn-tiles.desktop"
 
-        "0.F_backport-vehicle-heater-cooler-intensity-reduced.patch"
         "0.F_backport-tacoma-barn-door-position.patch"
         "0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch"
-        "0.F_backport-map-note-colours.patch"
 
         "0001-quiverfull-house-correct-stairs.patch"
         "0002-ankle-ammo-pouch-is-not-a-backpack.patch"
@@ -63,22 +61,20 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
         "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         )
-b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0dd45e3d81a46b908b08e07b58a11a42ece4dd306f3e282805da121299f'
-        '8cff87d80bf30b86f995f77a97cc1ddb7b809148d100f3c0d74e706fe59eac52de55710fb7aed1abd59836c05f2474c7d68455736aac4f229d1cdf806d7240a1'
-        '8ffff827ed464af678497da5129eb69d3d1a4c6994bbcc00ef7f7b240cd04e7961c3c0ac52d6940252241406c04e647fac19c9327847afced33988eb15973ba8'
-        '3659d59eec3167bdb647cb622f15fe899516980ac92972393589574db23a580368b449812ec75ec74cfb86082a1c12896fc9f26b7c16c36ed9ad8506d41eac67'
+b2sums=('117ac58ac4190370bd77611b7e528baf629323b5a3f90ef97119a67e0991564be7eea8f143b0f9d7594d56efe473669c6daa63f7b8ff723796351c08ac370dcf'
+        '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
+        'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3'
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
-        'd429bdf583ba6a69814f3a33a983650bcaa61b8edaed6560491972478515adb996482af248b10df8b4435bfad487ecba6c2ca0a249a4daee54994117a2742055'
         '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa'
         '025213998583972e7551bd7bd7376ab65857e28d4338fab60ae792a6b3bd48983aec77e5143baaa63d4f3feb7cd590c4bded529c410e4d18f2b8c5813f25daa3'
-        '33a6f33ca9066ea7e190f017e0d57bd23b0ffb458944bd2a6f20f04ec7e1db43c34b64e606f2c0207ce500957230325116e9e00d92c51be280bda899c34d5580'
+        '0b1fdf70fd02d76d35e223ac3313453ad4aae6737c0fb24f17725b0b87159883753267b95bd739b87fb709ef6cd8268ad895af5d335f45c938b29713851e7f20'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
         '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
         '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501'
         'd34d673fe04d4317ef3c1ac3f088b6614f7c20414cfe44aa0ff71bdc932c517c4e6295492f158ced84232af8f54d1672ae56078b156593d58bf8fe7ffc3d475d'
-        '23a13fccf6514caa6ca23476fe2ce6df180720038c4bb2caa971ef42b31f214b07ed95650d2cb3df173590c8bec02986aced516a6b266cff557b5dcfb7d8ce48'
-        'dd36b2b64e4999c0f188c837dae1f9c76d537a08b1c5996827a4d3028b688fe023be3711380189ed5c05316b17d6ab3e59669114ec699a3a0ee32808394ad12c'
+        'f3bdbaac5dbe9384571fe5ec14d2d25035f227a977c25349b8188e7343804e3973b898b44c34f9abe9318666294f4fdfe780fd516dcbdb29c4ac52f6d0ed6cad'
+        '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
         'c0d32a5edb420de5b2d95d1fed8753e9a6f45ab406aa2861dd5f038409c762ab40acdeec64b51713b71aa1453c0489a62af76534652a5c4d9634ac7e0eb431b4'
         '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
         '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3'
@@ -86,11 +82,11 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
         '8203bb062d72559da908a5020963503303c0aaa4a2ab61e57cfb713f58de40f1cb50b8b6dfbeec3a9addc41cbec5ae17fbf57230c3614f9b69fe6b0c55bf3fad'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
-        'c2ff7458d4f71a3c328a49795804b89c75ac6c4f4ec193c899501346afdba9673b8624bf60ffa3aea5256412248ff304e8731914971b074aee644b2c465ac483'
-        'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904'
+        'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9'
+        '8e9bf6ff4bafc6397c6631392aaddd2866537943ae3bbdb95282945acba385d66f6d9879fd283eeafbb8df4e927f3ecc061fb36ecb5d38dbddecd2fd9c735e56'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
-        '8e5dbd01fff578c594b14f13c9108857888fe31169683692c17d813ccbac735c0cd68ac07b6c8351ea59457effa8f758b542f5e2c0a07568cb53b0a448c1620e'
+        '8d2085a7c7f0a38ea4feb213a99f2bd93ec98e91aa564f3aa54e39b9ed1dd901f0629c3c0715ce00d84286f3831e8901131eecd0e0e9e79bbbe7928673f4e081'
         'b6a6c9c1791bc625b773aa1d0b90f98f0821aa06807353f1c179cbbb9090391e9ab7fe8d567a029bcf94dddf31c40d3e525d1033d2de81520726c0e69021f278'
         '89a5a7548bb0d47c78e12db3c915f1f9647ebba66baf8e3f4ab9579f8023585a1ca8e4c33224b4290d37a6b97aaa2bca3d785b1c6a066a661fac80d80c4dea21'
         '020f01c7cafede24e9eca44facf3beb638b51248ece3ff0d6f27af385c980c4a4c31cd9d69f1082c0204d13cddc39415c72d88e489ef689d72e35f6070f60b40'
@@ -98,26 +94,32 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
 prepare() {
-  cd "Cataclysm-DDA-$_pkgver"
+  cd "Cataclysm-BN-$pkgver"
   sed -i 's/-Werror//' Makefile
   sed -i 's/ncursesw5-config/ncursesw6-config/' Makefile
   sed -i 's/shell git/shell false/' Makefile
   sed -i 's/-Os/-O3/' Makefile
 
+  # Fix filenames
+  sed -i 's|cataclysm-dda|cataclysm-bn|' CMakeLists.txt
+  sed -i 's|cataclysm-dda|cataclysm-bn|' Makefile
+  sed -i 's|TARGET_NAME = cataclysm|TARGET_NAME = cataclysm-bn|' Makefile
+  sed -i 's|cataclysm.a|cataclysm-bn.a|' Makefile
+  sed -i 's|cataclysm.a|cataclysm-bn.a|' tests/Makefile
+  sed -i 's|cataclysm-dda|cataclysm-bn|' lang/CMakeLists.txt
+  sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
+
+  # Fix version
+  sed -i 's|VERSION = the-fork|VERSION = 1710|' Makefile
 
-  # Backports from 0.F
-  # Fix Vehicle Heater and Cooler to be less severe
-  patch -Np1 -i "$srcdir"/0.F_backport-vehicle-heater-cooler-intensity-reduced.patch
 
+  # Backports from 0.F
   # Fix tacoma barn doors being placed in the same spot twice
   patch -Np1 -i "$srcdir"/0.F_backport-tacoma-barn-door-position.patch
 
   # Fix npcs unable to drink from firestation and shelter basecamps wells
   patch -Np1 -i "$srcdir"/0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch
 
-  # Map note colour and symbols
-  patch -Np1 -i "$srcdir"/0.F_backport-map-note-colours.patch
-
 
   # Various other fixes for bugs I came across
   # Fix Quiverfull house to have the correct stairs that modify json
@@ -189,7 +191,7 @@ prepare() {
 }
 
 build() {
-  cd "Cataclysm-DDA-$_pkgver"
+  cd "Cataclysm-BN-$pkgver"
 
   #export CFLAGS="$CFLAGS -fPIE"
   export CXXFLAGS="$CXXFLAGS -fPIE"
@@ -202,17 +204,20 @@ build() {
   ./lang/compile_mo.sh
 }
 
-package_cataclysm-dda() {
-  cd "Cataclysm-DDA-$_pkgver"
+package_cataclysm-bn() {
+  cd "Cataclysm-BN-$pkgver"
 
   make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LTO=1 LOCALIZE=1 LANGUAGES=all install
 
+  # Fix binary names
+  #mv "$pkgdir/usr/bin/cataclysm" "$pkgdir/usr/bin/cataclysm-bn"
+
   # Docs
-  install -d "$pkgdir/usr/share/doc/cataclysm-dda"
-  cp --reflink -r doc/* "$pkgdir/usr/share/doc/cataclysm-dda"
+  install -d "$pkgdir/usr/share/doc/cataclysm-bn"
+  cp --reflink -r doc/* "$pkgdir/usr/share/doc/cataclysm-bn"
   # undo symlink
-  rm "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md"
-  cp --reflink 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md"
+  rm "$pkgdir/usr/share/doc/cataclysm-bn/JSON_LOADING_ORDER.md"
+  cp --reflink 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-bn/JSON_LOADING_ORDER.md"
 
   # License
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -221,7 +226,7 @@ package_cataclysm-dda() {
   cd lang/mo
   for i in *; do
     install -d "${pkgdir}/usr/share/locale/${i}/LC_MESSAGES"
-    cp "${i}/LC_MESSAGES/cataclysm-dda.mo" "${pkgdir}/usr/share/locale/${i}/LC_MESSAGES"
+    cp "${i}/LC_MESSAGES/cataclysm-bn.mo" "${pkgdir}/usr/share/locale/${i}/LC_MESSAGES"
   done
 
   # Help
@@ -231,46 +236,53 @@ package_cataclysm-dda() {
 #  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }
 
-package_cataclysm-dda-tiles() {
+package_cataclysm-bn-tiles() {
   pkgdesc="A graphical post-apocalyptic roguelike."
-  depends=('cataclysm-dda' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer')
-  cd "Cataclysm-DDA-$_pkgver"
+  depends=('cataclysm-bn' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer')
+  cd "Cataclysm-BN-$pkgver"
 
   make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 ZLEVELS=1 TILES=1 SOUND=1 LTO=1 LOCALIZE=1 LANGUAGES=all install
+  
+  # Fix binary names
+  #mkmv "$pkgdir/usr/bin/cataclysm-tiles" "$pkgdir/usr/bin/cataclysm-bn-tiles"
 
   # Icon
-  install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png"
-  install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  #install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png"
+  #install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/pixmaps/$pkgname.png"
   install -Dm644 "${srcdir}/$pkgname.desktop" "${pkgdir}/usr/share/applications/$pkgname.desktop"
 
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
+
   # Tilesset (Legacy)
   mv "$srcdir/cataclysm-dda-tileset_undeadpeople-legacy-master" "$srcdir/undeadpeople-legacy"
-  cp --reflink -r "$srcdir/undeadpeople-legacy" "$pkgdir/usr/share/cataclysm-dda/gfx"
+  cp --reflink -r "$srcdir/undeadpeople-legacy" "$pkgdir/usr/share/cataclysm-bn/gfx"
 
   # Tileset
   mv "$srcdir/cataclysm-dda-tileset_undeadpeople-master" "$srcdir/undeadpeople"
-  cp --reflink -r "$srcdir/undeadpeople" "$pkgdir/usr/share/cataclysm-dda/gfx"
+  cp --reflink -r "$srcdir/undeadpeople" "$pkgdir/usr/share/cataclysm-bn/gfx"
+  rm -rf "$pkgdir/usr/share/cataclysm-bn/gfx/MSX++UndeadPeopleEdition"
 
   #mv "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master" "$srcdir/battle-maid-redone-tileset"
-  cp --reflink -r "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master/battle-maid-redone-tileset-pt1" "$pkgdir/usr/share/cataclysm-dda/mods"
-  cp --reflink -r "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master/battle-maid-redone-tileset-pt2" "$pkgdir/usr/share/cataclysm-dda/mods"
+  cp --reflink -r "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master/battle-maid-redone-tileset-pt1" "$pkgdir/usr/share/cataclysm-bn/mods"
+  cp --reflink -r "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master/battle-maid-redone-tileset-pt2" "$pkgdir/usr/share/cataclysm-bn/mods"
 
   #mv "$srcdir/cataclysm-dda-mod_vampire-stuff-redone-tileset-master" "$srcdir/vampire-stuff-redone-tileset"
-  #cp --reflink -r "$srcdir/vampire-stuff-redone-tileset" "$pkgdir/usr/share/cataclysm-dda/mods"
+  #cp --reflink -r "$srcdir/vampire-stuff-redone-tileset" "$pkgdir/usr/share/cataclysm-bn/mods"
+
 
   # Sound
   mv "$srcdir/cataclysm-dda-soundpack_jcsoundpack-master" "$srcdir/jcsoundpack"
-  cp --reflink -r "$srcdir/jcsoundpack" "$pkgdir/usr/share/cataclysm-dda/sound"
+  cp --reflink -r "$srcdir/jcsoundpack" "$pkgdir/usr/share/cataclysm-bn/sound"
 
   # Music
   mv "$srcdir/cataclysm-dda-musicpack_coag-musicpack-master" "$srcdir/coag-musicpack"
-  install -Dm644 "$srcdir/coag-musicpack/musicset.json" "$pkgdir/usr/share/cataclysm-dda/sound/jcsoundpack/musicset.json"
-  cp --reflink -r "$srcdir/coag-musicpack/music" "$pkgdir/usr/share/cataclysm-dda/sound/jcsoundpack"
+  install -Dm644 "$srcdir/coag-musicpack/musicset.json" "$pkgdir/usr/share/cataclysm-bn/sound/jcsoundpack/musicset.json"
+  cp --reflink -r "$srcdir/coag-musicpack/music" "$pkgdir/usr/share/cataclysm-bn/sound/jcsoundpack"
+
 
   # hack: remove overlapping files
-  cd "$pkgdir/../cataclysm-dda"
+  cd "$pkgdir/../cataclysm-bn"
   find . -type f -exec rm -f "$pkgdir"/{} \;
   cd "$pkgdir"
   find . -type d -empty -delete
diff --git a/cataclysm-dda-tiles.desktop b/cataclysm-bn-tiles.desktop
index 62f53c3..090d1b1 100644
--- a/cataclysm-dda-tiles.desktop
+++ b/cataclysm-bn-tiles.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Cataclysm: Dark Days Ahead (Tiles)
+Name=Cataclysm: Bright Nights (Tiles)
 Comment=A turn-based survival game set in a post-apocalyptic world.
 Exec=cataclysm-tiles
-Icon=cataclysm-dda
+Icon=cataclysm-bn
 Terminal=false
 Type=Application
 Categories=Game;AdventureGame;RolePlaying;
diff --git a/cataclysm-dda.desktop b/cataclysm-bn.desktop
index f78f8bc..5920d7c 100644
--- a/cataclysm-dda.desktop
+++ b/cataclysm-bn.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Cataclysm: Dark Days Ahead
+Name=Cataclysm: Bright Nights
 Comment=A turn-based survival game set in a post-apocalyptic world.
 Exec=cataclysm
-Icon=cataclysm-dda
+Icon=cataclysm-bn
 Terminal=false
 Type=Application
 Categories=Game;AdventureGame;RolePlaying;
diff --git a/custom.patch b/custom.patch
index 694b919..15b5ef5 100644
--- a/custom.patch
+++ b/custom.patch
@@ -1,24 +1,3 @@
---- a/src/suffer.cpp
-+++ b/src/suffer.cpp
-@@ -118,6 +118,8 @@
- static const trait_id trait_FRESHWATEROSMOSIS( "FRESHWATEROSMOSIS" );
- static const trait_id trait_GILLS( "GILLS" );
- static const trait_id trait_GILLS_CEPH( "GILLS_CEPH" );
-+static const trait_id trait_THRESH_GYNOID( "THRESH_GYNOID" );
-+static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" );
- static const trait_id trait_JITTERY( "JITTERY" );
- static const trait_id trait_KILLER( "KILLER" );
- static const trait_id trait_LEAVES( "LEAVES" );
-@@ -245,7 +247,8 @@
- 
- void Character::suffer_while_underwater()
- {
--    if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) ) {
-+    if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) &&
-+        !has_trait( trait_THRESH_GYNOID ) && !has_trait( trait_THRESH_VAMP ) ) {
-         oxygen--;
-     }
-     if( oxygen < 12 && worn_with_flag( "REBREATHER" ) ) {
 --- a/src/character.cpp
 +++ b/src/character.cpp
 @@ -251,6 +251,7 @@
@@ -26,9 +5,9 @@
  static const trait_id trait_THRESH_PLANT( "THRESH_PLANT" );
  static const trait_id trait_THRESH_SPIDER( "THRESH_SPIDER" );
 +static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" );
+ static const trait_id trait_TOUGH_FEET( "TOUGH_FEET" );
  static const trait_id trait_TRANSPIRATION( "TRANSPIRATION" );
  static const trait_id trait_URSINE_EYE( "URSINE_EYE" );
- static const trait_id trait_VISCOUS( "VISCOUS" );
 @@ -4775,7 +4775,7 @@
  
  void Character::update_bodytemp()
@@ -40,7 +19,7 @@
          return;
 --- a/src/map_field.cpp
 +++ b/src/map_field.cpp
-@@ -87,6 +87,7 @@
+@@ -88,6 +88,7 @@
  static const trait_id trait_M_SKIN3( "M_SKIN3" );
  static const trait_id trait_THRESH_MARLOSS( "THRESH_MARLOSS" );
  static const trait_id trait_THRESH_MYCUS( "THRESH_MYCUS" );
@@ -48,7 +27,7 @@
  static const trait_id trait_WEB_WALKER( "WEB_WALKER" );
  
  void map::create_burnproducts( const tripoint &p, const item &fuel, const units::mass &burned_mass )
-@@ -1524,7 +1525,8 @@
+@@ -1395,7 +1396,8 @@
              if( ( cur.get_field_intensity() > 1 || !one_in( 3 ) ) && ( !inside || one_in( 3 ) ) ) {
                  u.add_env_effect( effect_teargas, bp_mouth, 5, 20_seconds );
              }
@@ -58,17 +37,39 @@
                  u.add_env_effect( effect_blind, bp_eyes, cur.get_field_intensity() * 2, 10_seconds );
              }
          }
-@@ -1651,8 +1653,8 @@
+@@ -1526,8 +1528,9 @@
              // The gas won't harm you inside a vehicle.
              if( !inside ) {
                  // Full body suits protect you from the effects of the gas.
--                if( !( u.worn_with_flag( flag_GAS_PROOF ) && u.get_env_resist( bp_mouth ) >= 15 &&
--                       u.get_env_resist( bp_eyes ) >= 15 ) ) {
+-                if( !( u.worn_with_flag( flag_GAS_PROOF ) && u.get_env_resist( bodypart_id( "mouth" ) ) >= 15 &&
+-                       u.get_env_resist( bodypart_id( "eyes" ) ) >= 15 ) ) {
 +                if( !( u.has_trait( trait_THRESH_VAMP ) ) && !( u.worn_with_flag( flag_GAS_PROOF ) &&
-+                        u.get_env_resist( bp_mouth ) >= 15 && u.get_env_resist( bp_eyes ) >= 15 ) ) {
++                        u.get_env_resist( bodypart_id( "mouth" ) ) >= 15 &&
++                        u.get_env_resist( bodypart_id( "eyes" ) ) >= 15 ) ) {
                      const int intensity = cur.get_field_intensity();
                      bool inhaled = u.add_env_effect( effect_poison, bp_mouth, 5, intensity * 1_minutes );
                      if( u.has_trait( trait_THRESH_MYCUS ) || u.has_trait( trait_THRESH_MARLOSS ) ||
+--- a/src/suffer.cpp
++++ b/src/suffer.cpp
+@@ -118,6 +118,8 @@
+ static const trait_id trait_FRESHWATEROSMOSIS( "FRESHWATEROSMOSIS" );
+ static const trait_id trait_GILLS( "GILLS" );
+ static const trait_id trait_GILLS_CEPH( "GILLS_CEPH" );
++static const trait_id trait_THRESH_GYNOID( "THRESH_GYNOID" );
++static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" );
+ static const trait_id trait_JITTERY( "JITTERY" );
+ static const trait_id trait_KILLER( "KILLER" );
+ static const trait_id trait_LEAVES( "LEAVES" );
+@@ -245,7 +247,8 @@
+ 
+ void Character::suffer_while_underwater()
+ {
+-    if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) ) {
++    if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) &&
++        !has_trait( trait_THRESH_GYNOID ) && !has_trait( trait_THRESH_VAMP ) ) {
+         oxygen--;
+     }
+     if( oxygen < 12 && worn_with_flag( "REBREATHER" ) ) {
 --- a/data/json/field_type.json
 +++ b/data/json/field_type.json
 @@ -303,7 +303,7 @@
diff --git a/jc_allow-bio-firestarter-on-smoker.patch b/jc_allow-bio-firestarter-on-smoker.patch
index e81a493..6ced728 100644
--- a/jc_allow-bio-firestarter-on-smoker.patch
+++ b/jc_allow-bio-firestarter-on-smoker.patch
@@ -1,6 +1,6 @@
 --- a/src/iexamine.cpp
 +++ b/src/iexamine.cpp
-@@ -4868,18 +4868,30 @@
+@@ -4866,18 +4866,30 @@
          return;
      }
  
@@ -18,12 +18,12 @@
 -    p.use_charges( "fire", 1 );
 -    for( auto &it : g->m.i_at( examp ) ) {
 -        if( it.has_flag( flag_SMOKABLE ) ) {
--            it.process_temperature_rot( 1, examp, nullptr );
+-            it.process_rot( 1, false, examp, nullptr );
 -            it.set_flag( flag_PROCESSING );
 +    if( has_bionic_firestarter ) {
 +        for( auto &it : g->m.i_at( examp ) ) {
 +            if( it.has_flag( flag_SMOKABLE ) ) {
-+                it.process_temperature_rot( 1, examp, nullptr );
++                it.process_rot( 1, false, examp, nullptr );
 +                it.set_flag( flag_PROCESSING );
 +            }
 +        }
@@ -31,7 +31,7 @@
 +        p.use_charges( "fire", 1 );
 +        for( auto &it : g->m.i_at( examp ) ) {
 +            if( it.has_flag( flag_SMOKABLE ) ) {
-+                it.process_temperature_rot( 1, examp, nullptr );
++                it.process_rot( 1, false, examp, nullptr );
 +                it.set_flag( flag_PROCESSING );
 +            }
          }
diff --git a/jc_npcs-eat-when-hungry.patch b/jc_npcs-eat-when-hungry.patch
index 2074bef..1c7bf0c 100644
--- a/jc_npcs-eat-when-hungry.patch
+++ b/jc_npcs-eat-when-hungry.patch
@@ -1,9 +1,9 @@
 --- a/src/npcmove.cpp
 +++ b/src/npcmove.cpp
-@@ -1829,7 +1829,9 @@
+@@ -1858,7 +1858,9 @@
      }
  
-     if( one_in( 3 ) && ( get_thirst() > 40 ||
+     if( one_in( 3 ) && ( get_thirst() > thirst_levels::thirsty ||
 -                         get_stored_kcal() + stomach.get_calories() < get_healthy_kcal() * 0.95 ) ) {
 +                         get_stored_kcal() + stomach.get_calories() < get_healthy_kcal() * 0.95 ||
 +                         ( get_hunger() > 160 &&
@@ -11,7 +11,7 @@
          if( consume_food_from_camp() ) {
              return npc_noop;
          }
-@@ -3697,12 +3699,15 @@
+@@ -3820,13 +3822,14 @@
          return true;
      }
      faction *yours = g->u.get_faction();
@@ -19,12 +19,11 @@
 +    int camp_kcals = std::min( std::max( 0, get_healthy_kcal() - get_stored_kcal() -
                                           stomach.get_calories() ), yours->food_supply );
      if( camp_kcals > 0 ) {
+         complain_about( "camp_food_thanks", 1_hours, "<camp_food_thanks>", false );
          mod_hunger( -camp_kcals );
          mod_stored_kcal( camp_kcals );
          yours->food_supply -= camp_kcals;
 +        stomach.mod_calories( camp_kcals );
-+        stomach.mod_contents( -2400_ml );
-+        stomach.mod_contents( 1200_ml );
          return true;
      }
-     return false;
+     complain_about( "camp_larder_empty", 1_hours, "<camp_larder_empty>", false );