Add patch to set 20x66mm shot loudness to 160

Add patch for functional portable generators
Add patch to normalize drone volume

4 files changed, 97 insertions, 6 deletions

diff --git a/0013-fix-20x66mm-loudness.patch b/0013-fix-20x66mm-loudness.patch
new file mode 100644
index 0000000..8660115
--- /dev/null
+++ b/0013-fix-20x66mm-loudness.patch
@@ -0,0 +1,10 @@
+--- a/data/json/items/ammo/20x66mm.json
++++ b/data/json/items/ammo/20x66mm.json
+@@ -124,6 +124,7 @@
+     "range": 12,
+     "damage": 60,
+     "recoil": 2500,
++    "loudness": "160",
+     "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
+   },
+   {
diff --git a/0014-portable-generator-engine.patch b/0014-portable-generator-engine.patch
new file mode 100644
index 0000000..70e1c2d
--- /dev/null
+++ b/0014-portable-generator-engine.patch
@@ -0,0 +1,11 @@
+--- a/data/json/vehicles/utility.json
++++ b/data/json/vehicles/utility.json
+@@ -120,7 +120,7 @@
+     "parts": [
+       { "x": 0, "y": 0, "part": "frame_cover" },
+       { "x": 0, "y": 0, "part": "small_storage_battery" },
+-      { "x": 0, "y": 0, "part": "engine_vtwin" },
++      { "x": 0, "y": 0, "part": "engine_1cyl_large" },
+       { "x": 0, "y": 0, "part": "generator_7500w" },
+       { "x": 0, "y": 0, "parts": [ "wheel_mount_light", "wheel_small" ] },
+       { "x": 1, "y": 0, "part": "frame_cover" },
diff --git a/0015-normalize-drone-volume.patch b/0015-normalize-drone-volume.patch
new file mode 100644
index 0000000..a45ebf0
--- /dev/null
+++ b/0015-normalize-drone-volume.patch
@@ -0,0 +1,56 @@
+--- a/data/json/items/corpses/inactive_bots.json
++++ b/data/json/items/corpses/inactive_bots.json
+@@ -5,7 +5,7 @@
+     "name": { "str": "inactive EMP hack" },
+     "description": "This is an inactive EMP hack.  EMP hacks are fist-sized robots that fly through the air.  This one contains an EMP grenade and attacks by flying at its target and detonating.  Use this item to reprogram and release the EMP hack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
+     "weight": "4700 g",
+-    "volume": "750 ml",
++    "volume": "250 ml",
+     "price": 64500,
+     "to_hit": -3,
+     "bashing": 6,
+@@ -31,7 +31,7 @@
+     "name": { "str": "inactive C-4 hack" },
+     "description": "This is an inactive C-4 hack.  C-4 hacks are fist-sized robots that fly through the air.  This one contains some C-4 and attacks by flying at its target and detonating.  Use this item to reprogram and activate the C-4 hack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
+     "weight": "5870 g",
+-    "volume": "250 ml",
++    "volume": "1000 ml",
+     "price": 67500,
+     "to_hit": -3,
+     "bashing": 6,
+@@ -57,7 +57,7 @@
+     "name": { "str": "inactive flashbang hack" },
+     "description": "This is an inactive flashbang hack.  Flashbang hacks are fist-sized robots that fly through the air.  This one contains a flashbang and attacks by flying at its target and detonating.  Use this item to reprogram and activate the flashbang hack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
+     "weight": "4536 g",
+-    "volume": "750 ml",
++    "volume": "250 ml",
+     "price": 59500,
+     "to_hit": -3,
+     "bashing": 6,
+@@ -83,7 +83,7 @@
+     "name": { "str": "inactive tear gas hack" },
+     "description": "This is an inactive tear gas hack.  Tear gas hacks are fist-sized robots that fly through the air.  This one contains a tear gas canister and attacks by flying at its target and releasing tear gas.  Use this item to reprogram and activate the tear gas hack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
+     "weight": "5360 g",
+-    "volume": "750 ml",
++    "volume": "250 ml",
+     "price": 60500,
+     "to_hit": -3,
+     "bashing": 6,
+@@ -179,7 +179,7 @@
+     "name": { "str": "inactive manhack" },
+     "description": "This is an inactive manhack.  Manhacks are fist-sized robots that fly through the air.  They are covered with whirring blades and attack by throwing themselves against their target.  Use this item to reprogram and activate the manhack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
+     "weight": "5400 g",
+-    "volume": "750 ml",
++    "volume": "250 ml",
+     "price": 60000,
+     "to_hit": -3,
+     "bashing": 6,
+@@ -205,7 +205,7 @@
+     "name": { "str": "inactive mininuke hack" },
+     "description": "This is an inactive mininuke hack.  Many times as large as a normal manhack, a mininuke hack contains a mininuke and attack by flying at their target and detonating.  Use this item to reprogram and activate the mininuke hack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
+     "weight": "25000 g",
+-    "volume": "18750 ml",
++    "volume": "16000 ml",
+     "price": 2677500,
+     "to_hit": -3,
+     "bashing": 6,
diff --git a/PKGBUILD b/PKGBUILD
index abccd5d..d2cd5a5 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=2.4
+pkgrel=2.6
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -44,6 +44,9 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
         "0010-4570-ammo-can-be-dismantled.patch"
         "0011-add-missing-mre.patch"
         "0012-fix-doors-for-npcs.patch"
+        "0013-fix-20x66mm-loudness.patch"
+        "0014-portable-generator-engine.patch"
+        "0015-normalize-drone-volume.patch"
 
         "jc_ammo-loudness-ap-times-2.patch"
         "jc_allow-bio-firestarter-on-smoker.patch"
@@ -55,7 +58,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
 
         "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-tileset_undeadpeople.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-tileset_undeadpeople.git/snapshot/cataclysm-dda-tileset_undeadpeople-master.tar.xz"
-        "cataclysm-dda-mod_vampire-stuff-redone-tileset.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_vampire-stuff-redone-tileset.git/snapshot/cataclysm-dda-mod_vampire-stuff-redone-tileset-master.tar.xz"
+        #"cataclysm-dda-mod_vampire-stuff-redone-tileset.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_vampire-stuff-redone-tileset.git/snapshot/cataclysm-dda-mod_vampire-stuff-redone-tileset-master.tar.xz"
         "cataclysm-dda-mod_battle-maid-redone-tileset.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_battle-maid-redone-tileset.git/snapshot/cataclysm-dda-mod_battle-maid-redone-tileset-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"
@@ -79,6 +82,9 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         'c0d32a5edb420de5b2d95d1fed8753e9a6f45ab406aa2861dd5f038409c762ab40acdeec64b51713b71aa1453c0489a62af76534652a5c4d9634ac7e0eb431b4'
         '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
         '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3'
+        'd44a8a7581e050e58ad2f3c7c42befd8065b65a352b8cf580ade16c89a0caf41857993896497613b4a2b4045fa281f7746cacf25c518db707009b917410787fd'
+        '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
+        '8203bb062d72559da908a5020963503303c0aaa4a2ab61e57cfb713f58de40f1cb50b8b6dfbeec3a9addc41cbec5ae17fbf57230c3614f9b69fe6b0c55bf3fad'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'c2ff7458d4f71a3c328a49795804b89c75ac6c4f4ec193c899501346afdba9673b8624bf60ffa3aea5256412248ff304e8731914971b074aee644b2c465ac483'
         'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904'
@@ -86,8 +92,7 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'ad4e4626e1e3358059c7023eff0ac38ca5e05eb4ff86449a649fc25c88c3ce4bc27bef317b62fe42398ae24845d109a4f77aad2ed3eb9e18f2388fe9ee87368f'
         'b6a6c9c1791bc625b773aa1d0b90f98f0821aa06807353f1c179cbbb9090391e9ab7fe8d567a029bcf94dddf31c40d3e525d1033d2de81520726c0e69021f278'
-        '88e643e6b34119ddd7e3178d1974d5cbbcb4effb7a2a2768654745cab609e624090ff64f51166eee5d0eb531262c38664a2731f73ed44f7895142cd7279a87e9'
-        '0c9692d1065a5333784b42f1e961dde5ffec1ce06a6f86ed20830d85e0ed6882e400385bc4a9208f50afa6f8e37ef57731f9dce3983f550f8a5483c149541f65'
+        '135c5e7b76029b9f12d2a8f2b2227783c379f942f0c2de6a942967cbaddd98a4ccad39b019698812dc464bb20341d9784949aa6295897f4365992a55cec06790'
         '020f01c7cafede24e9eca44facf3beb638b51248ece3ff0d6f27af385c980c4a4c31cd9d69f1082c0204d13cddc39415c72d88e489ef689d72e35f6070f60b40'
         'f54bb10b6c5920b22942b1e312c315280afb720d3a897dce9333563cae3343668460d24b7d01bf36768974c729d92177e886f5ee0d22d746b19454a2ab6208fb'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -152,6 +157,15 @@ prepare() {
   # Fix some doors being unusable by npcs (incorrect door flag)
   patch -Np1 -i "$srcdir"/0012-fix-doors-for-npcs.patch
 
+  # Fix the loudness of 20x66mm shotgun shells like other shotguns
+  patch -Np1 -i "$srcdir"/0013-fix-20x66mm-loudness.patch
+
+  # Replace the portable generator twin engine with a large 1 cylinder so it can actually function as is
+  patch -Np1 -i "$srcdir"/0014-portable-generator-engine.patch
+
+  # Normalize the manhack volumes to that of the base grenade/explosive
+  patch -Np1 -i "$srcdir"/0015-normalize-drone-volume.patch
+
 
   # Various other fixes for bugs I came across that modify src
   # Fix ammo loudness mulitplying by six instead of two
@@ -243,8 +257,8 @@ package_cataclysm-dda-tiles() {
   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"
 
-  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"
+  #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"
 
   # Sound
   mv "$srcdir/cataclysm-dda-soundpack_jcsoundpack-master" "$srcdir/jcsoundpack"