Update ammo names patch

Add 45-70 ammo can be dismantled patch
Add NPCs stop using tables instead of cots patch

4 files changed, 123 insertions, 3 deletions

diff --git a/0003-inconsistent-ammo-names.patch b/0003-inconsistent-ammo-names.patch
index a98c955..ed5528b 100644
--- a/0003-inconsistent-ammo-names.patch
+++ b/0003-inconsistent-ammo-names.patch
@@ -87,3 +87,45 @@
      "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 },
+--- a/data/json/items/ammo/357mag.json
++++ b/data/json/items/ammo/357mag.json
+@@ -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",
+     "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" ] }
+   }
+ ]
+--- 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 @@
+     "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 }
++    "name": { "str": "7.62x25mm FMJ, reloaded" },
++    "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.9, "dispersion": 1.1 },
++    "extend": { "effects": [ "RECYCLED" ] }
+   }
+ ]
diff --git a/0014-4570-ammo-can-be-dismantled.patch b/0014-4570-ammo-can-be-dismantled.patch
new file mode 100644
index 0000000..3681df5
--- /dev/null
+++ b/0014-4570-ammo-can-be-dismantled.patch
@@ -0,0 +1,34 @@
+--- a/data/json/recipes/ammo/rifle.json
++++ b/data/json/recipes/ammo/rifle.json
+@@ -385,6 +385,7 @@
+     "batch_time_factors": [ 60, 5 ],
+     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
+     "charges": 1,
++    "reversible": true,
+     "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
+     "components": [
+       [ [ "4570_casing", 1 ] ],
+@@ -406,6 +407,7 @@
+     "batch_time_factors": [ 60, 5 ],
+     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
+     "charges": 1,
++    "reversible": true,
+     "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
+     "components": [
+       [ [ "4570_casing", 1 ] ],
+@@ -426,6 +428,7 @@
+     "batch_time_factors": [ 60, 5 ],
+     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
+     "charges": 1,
++    "reversible": true,
+     "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
+     "components": [
+       [ [ "4570_casing", 1 ] ],
+@@ -446,6 +449,7 @@
+     "batch_time_factors": [ 60, 5 ],
+     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
+     "charges": 1,
++    "reversible": true,
+     "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
+     "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ], [ [ "lead", 9 ] ] ]
+   },
diff --git a/0015-stop-sleeping-on-tables.patch b/0015-stop-sleeping-on-tables.patch
new file mode 100644
index 0000000..b114fdd
--- /dev/null
+++ b/0015-stop-sleeping-on-tables.patch
@@ -0,0 +1,35 @@
+--- a/src/character.cpp
++++ b/src/character.cpp
+@@ -8725,12 +8725,29 @@
+     const optional_vpart_position vp = g->m.veh_at( pos );
+     const cata::optional<vpart_reference> boardable = vp.part_with_feature( "BOARDABLE", true );
+     // Search the floor for bedding
++    // Note by jc:
++    // Items without floor_bedding_warmth set appear to assume 0
++    // Added clause to assume 0 == unset and thus -2000
++    // And same thing for random vehicles.
++    // No more sleeping on tables, bumpers, and funnels.
+     if( furn_at_pos != f_null ) {
+-        floor_bedding_warmth += furn_at_pos.obj().floor_bedding_warmth;
++        if( furn_at_pos.obj().floor_bedding_warmth != 0 ) {
++            floor_bedding_warmth += furn_at_pos.obj().floor_bedding_warmth;
++        } else {
++            floor_bedding_warmth -= 2000;
++        }
+     } else if( !trap_at_pos.is_null() ) {
+-        floor_bedding_warmth += trap_at_pos.floor_bedding_warmth;
++        if( trap_at_pos.floor_bedding_warmth != 0 ) {
++            floor_bedding_warmth += trap_at_pos.floor_bedding_warmth;
++        } else {
++            floor_bedding_warmth -= 2000;
++        }
+     } else if( boardable ) {
+-        floor_bedding_warmth += boardable->info().floor_bedding_warmth;
++        if( boardable->info().floor_bedding_warmth != 0 ) {
++            floor_bedding_warmth += boardable->info().floor_bedding_warmth;
++        } else {
++            floor_bedding_warmth -= 2000;
++        }
+     } else if( ter_at_pos == t_improvised_shelter ) {
+         floor_bedding_warmth -= 500;
+     } else {
diff --git a/PKGBUILD b/PKGBUILD
index 9b83e00..c4797e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=(cataclysm-dda cataclysm-dda-tiles)
 pkgname=cataclysm-dda
 pkgver=0.E.3
 _pkgver=0.E-3
-pkgrel=1.13
+pkgrel=1.16
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -42,6 +42,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
         "0011-npc-can-use-soporific.patch"
         "0012-npc-can-use-gas-fuel.patch"
         "0013-22-casings-can-stack.patch"
+        "0014-4570-ammo-can-be-dismantled.patch"
+        "0015-stop-sleeping-on-tables.patch"
         "cataclysm-dda-tileset_undeadpeople-legacy.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-tileset_undeadpeople-legacy.git/snapshot/cataclysm-dda-tileset_undeadpeople-legacy-master.tar.xz"
         "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"
@@ -54,7 +56,7 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa'
         'af47a9372ba990bc97d17362c8d89847177e6cbefaa241c23bcdc670ef29d82bf150983f4c730753cabaa77a01f8e966307831cdc192a92237d5f3e8e6599d2b'
-        '3936f88fab90b344299a62bb5bc836d03b1bb8293d2ca4cbb8a48468497119db2174f2b37a1775c0aed1be07107c4ae815f6308efa633abf76bbd6ba458ff66b'
+        'd6b6e3572edb886eb721c50bd0e00ba110c7b226c94948189be63d5fa765cfa0785f2c5f8ffd9ce8b68f327ae20e9a1d419ad2857f5af7c069c4b8ba3ef99ac0'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
         'c2ff7458d4f71a3c328a49795804b89c75ac6c4f4ec193c899501346afdba9673b8624bf60ffa3aea5256412248ff304e8731914971b074aee644b2c465ac483'
         'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904'
@@ -65,6 +67,8 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         '9cf47504583e16ba2a826bf9431f83ffd57121becb7980bbfb6996929a6bbb5a872cd2c310c4e1d457d59205b0abac306291722aba27ab7fa5a0bf45314d8b56'
         '20fbcff9879bdc06a40f56289396a03a9d6fad8aaa7ade0154c6397c0e842d0d4e12aa05fa305153bab0cffdaea670cc91882b8def07f5f422bf010c7fbbc806'
         'dd36b2b64e4999c0f188c837dae1f9c76d537a08b1c5996827a4d3028b688fe023be3711380189ed5c05316b17d6ab3e59669114ec699a3a0ee32808394ad12c'
+        'c0d32a5edb420de5b2d95d1fed8753e9a6f45ab406aa2861dd5f038409c762ab40acdeec64b51713b71aa1453c0489a62af76534652a5c4d9634ac7e0eb431b4'
+        '2ee472dca07bb8401040d4bb9358282de8fc76778bc294ce0ee255012519872f30043d7f7e9f08a7744b11c083daa07116ab2017a85786c692500b6484160f38'
         'c5397b4b740966e4b75629d98021141686ac3150b3af803e59afa3b062ba561248c77cbf8e2b7f2a97a273e7fbfdd76ab76d6485344318d0cdb5bb374f46e4c3'
         'f54bb10b6c5920b22942b1e312c315280afb720d3a897dce9333563cae3343668460d24b7d01bf36768974c729d92177e886f5ee0d22d746b19454a2ab6208fb'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -96,7 +100,7 @@ prepare() {
   # Fix Ankle Ammo Pouch to not look like a backpack
   patch -Np1 -i "$srcdir"/0002-ankle-ammo-pouch-is-not-a-backpack.patch
 
-  # Fix mulitple inconsistent ammuntion names (.45 ACP, 5.56 NATO, 7.62 NATO, RA110)
+  # Fix mulitple inconsistent ammuntion names and handloaded status
   patch -Np1 -i "$srcdir"/0003-inconsistent-ammo-names.patch
 
   # Fix missing floor in tacoma clinic
@@ -129,6 +133,11 @@ prepare() {
   # Fix .22 casings not stacking when every other casing stacks
   patch -Np1 -i "$srcdir"/0013-22-casings-can-stack.patch
 
+  # Fix reloaded 45-70 rounds not allowing dismantling
+  patch -Np1 -i "$srcdir"/0014-4570-ammo-can-be-dismantled.patch
+
+  # Fix NPCs preferring tables, bumpers, and funnels to cots and bedrolls.
+  patch -Np1 -i "$srcdir"/0015-stop-sleeping-on-tables.patch
 }
 
 build() {