Add patch renaming civilian helicopters.

2 files changed, 133 insertions, 1 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 43a8b7d..a3fce38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _pkgname=Cataclysm-BN
 pkgver=0.6.0
 #pkgver=202310040030
 #_pkgver=2023-10-04-0030
-pkgrel=9
+pkgrel=11
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -141,6 +141,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "vehicles-01_portable-generator-engine.patch"
         "vehicles-02_fix-fbi-car-name.patch"
         "vehicles-03_black-box-can-be-installed.patch"
+        "vehicles-04_rename-civilian-helicopters.patch"
 
         "weapon-02_Fix-usp45-load-order.patch"
 
@@ -166,6 +167,8 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "src-17_monsters-can-go-down-ramps.patch"
         #"src-18-v7_monsters-can-go-up-stairs.patch"
         "src-19_triffids-do-not-burrow.patch"
+        #"src-19_triffids-do-not-burrow-v2.patch"
+        #"src-20_prevent-holstering-gunmods.patch"
         "src-99_fix-default-mods.patch"
         
         "vampirism.patch"
@@ -260,6 +263,7 @@ b2sums=('1a311f72d159194d8737b75a484d015caf75a1920b1e9eaa0bdbcd9c0bb8aceda1f59a5
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
         '4a1724784d6b4f113e8c1954d399d07adc941a2e992e1c95ab38dbc5c31940e90ff4cec51d22da3bf971880817b4356e473747303146c2ab1be55ee4565aca41'
         '209387731490549d7b3d546ab149cea22e0ea1291356884f358cd87ca7d5425ca9a72f6f2cb7af46956634ffdb1a61d1ebfbfdbb5a2fc9fdc26d29acdc2ab0c0'
+        '90e73481eb4c1e54b53e9dcc0a182cd02957a3d63b687d585093cbf1a48a5e210779af468e60b88e9cd0f1aa85c73e615f75d5cc47b19cd6d42a6fdd1353889c'
         '83d5a89f14ff8d79f90e677def2f58b1a8a0430ec16bbe3865315b63b3702e699bae157235e70a4c613e84f05b0f7ecf8de4ecef789cb8146edfbe92020c89f0'
         '60fac0fd3c098c8a38f634372b889c4ac7d2d61f1e08fd79b6216ee6a7116cadc06b974ab2ea5efc74801a9f4a8ad029dde973d1494f6467c57ac860be64acad'
         'b41ce5db19de2f4a5857debe31560b7b8216412e5df795032363839429f732b2d2359b3679a795c55a997913588f7d495c300df402529317ef2d03de24a74273'
@@ -696,6 +700,10 @@ prepare() {
   # No tool provided screwing 3 and wrenching 3.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/vehicles-03_black-box-can-be-installed.patch
 
+  # Rename the civilian helicopters to use real names:
+  # The military models all use real names, so now the civilian craft will follow suit.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/vehicles-04_rename-civilian-helicopters.patch
+
 
   # # weapon fixes
   echo "Applying weapon fixes"
@@ -790,8 +798,13 @@ prepare() {
 
   # Fix triffid queens from destroying terrain and burrowing to the center of the Earth:
   # The growplants function was destroying the terrain, not the furniture.
+  # And since p is somehow being lost, the new terrain was never added.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-19_triffids-do-not-burrow.patch
 
+  # Prevent gunmods from being holstered: (Still in testing)
+  # This is a hack fix due to how drawing a holstered gunmod that accepts magazines crashes the game.
+  #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-20_prevent-holstering-gunmods.patch
+
   # # # Additional changes
   echo "Applying vampirism patch"
   # Add vampire mutation lines and modify a number of functions to facilitate these traits.
diff --git a/vehicles-04_rename-civilian-helicopters.patch b/vehicles-04_rename-civilian-helicopters.patch
new file mode 100644
index 0000000..816e19f
--- /dev/null
+++ b/vehicles-04_rename-civilian-helicopters.patch
@@ -0,0 +1,119 @@
+--- a/data/json/vehicles/helicopters.json
++++ b/data/json/vehicles/helicopters.json
+@@ -2,7 +2,7 @@
+   {
+     "id": "2seater2_scenario",
+     "type": "vehicle",
+-    "name": "2-seater helicopter",
++    "name": "Bell 206 Jet Ranger",
+     "parts": [
+       { "x": -5, "y": -1, "part": "frame_cover" },
+       { "x": -5, "y": 0, "part": "frame_se" },
+@@ -86,7 +86,7 @@
+   {
+     "id": "2seater2",
+     "type": "vehicle",
+-    "name": "2-seater helicopter",
++    "name": "Bell 206 Jet Ranger",
+     "parts": [
+       { "x": -5, "y": -1, "part": "frame_cover" },
+       { "x": -5, "y": 0, "part": "frame_se" },
+@@ -170,7 +170,7 @@
+   {
+     "id": "SmallFlier1",
+     "type": "vehicle",
+-    "name": "Small helicopter",
++    "name": "Schweizer S300",
+     "parts": [
+       { "x": -1, "y": 0, "part": "frame_cross" },
+       { "x": -2, "y": 0, "part": "frame_vertical" },
+@@ -221,7 +221,7 @@
+   {
+     "id": "2seater2_Wreck",
+     "type": "vehicle",
+-    "name": "2-seater helicopter",
++    "name": "Bell 206 Jet Ranger",
+     "parts": [
+       { "x": 0, "y": 1, "part": "frame_cross" },
+       { "x": -1, "y": 1, "part": "frame_cross" },
+@@ -285,7 +285,7 @@
+   {
+     "id": "SmallFlier3_Wreck",
+     "type": "vehicle",
+-    "name": "Small helicopter",
++    "name": "Schweizer S300",
+     "parts": [
+       { "x": 2, "y": 1, "part": "frame_horizontal" },
+       { "x": 1, "y": 1, "part": "frame_cross" },
+@@ -335,7 +335,7 @@
+   {
+     "id": "SmallFlier2",
+     "type": "vehicle",
+-    "name": "Small helicopter",
++    "name": "Schweizer S300",
+     "parts": [
+       { "x": 2, "y": 1, "part": "frame_ne" },
+       { "x": 2, "y": 0, "part": "frame_horizontal" },
+@@ -392,7 +392,7 @@
+   {
+     "id": "Medevac1",
+     "type": "vehicle",
+-    "name": "Medevac helicopter",
++    "name": "Bell 412 Air Ambulance",
+     "parts": [
+       { "x": -7, "y": 2, "part": "frame_cover" },
+       { "x": -7, "y": 1, "part": "frame_vertical" },
+@@ -518,7 +518,7 @@
+   {
+     "id": "Smallflier1_Wreck",
+     "type": "vehicle",
+-    "name": "Small helicopter",
++    "name": "Schweizer S300",
+     "parts": [
+       { "x": -3, "y": 0, "part": "frame_vertical" },
+       { "x": -2, "y": 0, "part": "frame_vertical" },
+@@ -556,7 +556,7 @@
+   {
+     "id": "SmallFlier2_Wreck",
+     "type": "vehicle",
+-    "name": "SmallFlier2 Wreck",
++    "name": "Schweizer S300",
+     "parts": [
+       { "x": 2, "y": 1, "part": "frame_ne" },
+       { "x": 2, "y": 0, "part": "frame_horizontal" },
+@@ -600,7 +600,7 @@
+   {
+     "id": "Medevac1_Wreck",
+     "type": "vehicle",
+-    "name": "Medevac helicopter",
++    "name": "Bell 412 Air Ambulance",
+     "parts": [
+       { "x": -3, "y": 1, "part": "frame_cross" },
+       { "x": -3, "y": 0, "part": "frame_ne" },
+@@ -694,7 +694,7 @@
+   {
+     "id": "SmallFlier3",
+     "type": "vehicle",
+-    "name": "Small helicopter",
++    "name": "Schweizer S300",
+     "parts": [
+       { "x": 2, "y": 1, "part": "frame_ne" },
+       { "x": 2, "y": 0, "part": "frame_cover" },
+@@ -755,7 +755,7 @@
+   {
+     "id": "Medevac2",
+     "type": "vehicle",
+-    "name": "Medevac helicopter",
++    "name": "Bell 412 Air Ambulance",
+     "parts": [
+       { "x": -7, "y": 2, "part": "frame_cover" },
+       { "x": -7, "y": 1, "part": "frame_vertical" },
+@@ -878,7 +878,7 @@
+   {
+     "id": "Medevac2_Wreck",
+     "type": "vehicle",
+-    "name": "Medevac helicopter",
++    "name": "Bell 412 Air Ambulance",
+     "parts": [
+       { "x": 1, "y": 1, "part": "frame_cross" },
+       { "x": 1, "y": 2, "part": "frame_horizontal" },