From 657f435e4323d3f4ea2e6a54eb8869a93b93a76e Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 31 Mar 2023 17:14:26 -0700 Subject: Add abstracts patch. Fix patch leaving behind clutter. --- PKGBUILD | 173 +++++++++++++++++++++++---------------------- etc-03_fix-abstracts.patch | 73 +++++++++++++++++++ 2 files changed, 163 insertions(+), 83 deletions(-) create mode 100644 etc-03_fix-abstracts.patch diff --git a/PKGBUILD b/PKGBUILD index 42c69ed..c01ff4b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,7 +17,7 @@ pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental pkgver=202303311439 _pkgver=2023-03-31-1439 -pkgrel=1 +pkgrel=3 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -123,6 +123,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "etc-01_fix-rubbersplosion.patch" "etc-02_add-missing-price-postapoc.patch" + "etc-03_fix-abstracts.patch" "jc_radio-can-use-ups.patch" "jc_ammo-loudness-ap-times-2.patch" @@ -217,6 +218,7 @@ b2sums=('38723251ffd0c94bfd2a7a6abee749d0104c0ac1a0c1ce14a9c41bae647e13083607438 '0661d98d1a106c736f5e23da60e81354786569d5e2124d1247297eac8ae95ae7f9971b5c80063ef7569eb7288da1ed012e8f0301e82400dff2c3c93cdbd93999' 'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994' 'f428818d1d4df4e46ec844458cfd5f9eef5d19a89778837502eb74ed6d421113ae9a9bc2fd4fb2bcf41d433635c34912e90b90a8993e92164e6a1efe0ebae82f' + 'b41ce5db19de2f4a5857debe31560b7b8216412e5df795032363839429f732b2d2359b3679a795c55a997913588f7d495c300df402529317ef2d03de24a74273' '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a' '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' '9fb6d2945184347e5b4f56f022d9b1b40559c1210edd91cb984d2c69e711dd297eab2a06d1e7d4008052fad658a9574ebd933083e7f8f3b3600b271593cbde15' @@ -274,142 +276,142 @@ prepare() { # # # Reverts echo "Applying revert patches" # Needless item removal - patch -NREp1 -i "$srcdir"/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch + patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch # Still more ammo patches to revert - patch -NREp1 -i "$srcdir"/revert-10_still-another-ammo-patch-to-undo.patch + patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-10_still-another-ammo-patch-to-undo.patch # Revert yet more ammo rebalancing - patch -NREp1 -i "$srcdir"/revert-09_undo-yet-more-ammo-balancing.patch + patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-09_undo-yet-more-ammo-balancing.patch # Revert balance pass of rifle ammunition. - patch -NREp1 -i "$srcdir"/revert-08_undo-rifle-balance-pass.patch + patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-08_undo-rifle-balance-pass.patch # Revert removal of reloaded ammunition. - patch -NREp1 -i "$srcdir"/revert-07_Remove-handload-quality-distinction-1481.patch + patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-07_Remove-handload-quality-distinction-1481.patch # Revert Hub 01 basement removal. - patch -NREp1 -i "$srcdir"/revert-06_Obsolete-useless-hub01-basement-1457.patch + patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-06_Obsolete-useless-hub01-basement-1457.patch # Revert the book changes for now. - patch -NREp1 -i "$srcdir"/revert-02_revert-book-revamp.patch + patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-02_revert-book-revamp.patch # Revert generic night vision. - patch -NRp1 -i "$srcdir"/revert-03_generic-nv.patch + patch -NRp1 --no-backup-if-mismatch -i "$srcdir"/revert-03_generic-nv.patch # Revert telescopic lenses. - patch -NRp1 -i "$srcdir"/revert-04_telescopic-lenses.patch + patch -NRp1 --no-backup-if-mismatch -i "$srcdir"/revert-04_telescopic-lenses.patch # Revert the Infection Immune Trait and Revert Infection Resistant to as before. Also keep Truthteller. - patch -Np1 -i "$srcdir"/revert-01_removed-traits.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/revert-01_removed-traits.patch # # # Various fixes for bugs I came across # # Ammo fixes echo "Applying ammo fixes" # Fix mulitple inconsistent ammunition names and handloaded status. - patch -Np1 -i "$srcdir"/ammo-01_inconsistent-ammo-names.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-01_inconsistent-ammo-names.patch # Set a fixed loudness for 20x66mm shotgun shells like that of other shotguns: # Other shotguns have fixed loudness to work around how the short range factors causes them to be far quieter than one would otherwise expect. - patch -Np1 -i "$srcdir"/ammo-02_fix-20x66mm-loudness.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-02_fix-20x66mm-loudness.patch # Change reloaded_50bmg to be based on 50bmg: # The id and description make it pretty clear that reloaded_50bmg is not supposed to be based on Match rounds. - patch -Np1 -i "$srcdir"/ammo-03_fix-reloaded-50bmg.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-03_fix-reloaded-50bmg.patch # Fix .22 casings not stacking when every other casing stacks. - patch -Np1 -i "$srcdir"/ammo-05_22-casings-can-stack.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-05_22-casings-can-stack.patch # Fix black powder scrap shot not being flagged as black powder. - patch -Np1 -i "$srcdir"/ammo-06_fix-bp-scrap-not-being-bp.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-06_fix-bp-scrap-not-being-bp.patch # Fix ammo ordering so as to not prevent those items being modded. # Having copy-from items occuring earlier in a json than the item being copied from prevents items based on it being modified. - patch -Np1 -i "$srcdir"/ammo-10_ammo-order-fix.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-10_ammo-order-fix.patch # Fix 40mm rounds volume. # Changing abstracts with mods does not seem to work, so here this is. - patch -Np1 -i "$srcdir"/ammo-11_fix-volume-40mm.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-11_fix-volume-40mm.patch # # armor fixes echo "Applying armor fixes" # Fix Ankle Ammo Pouch to not look like a backpack: # SDG added a tile for ammo pouches to bypass this bug, but this fix still makes sense. - patch -Np1 -i "$srcdir"/armor-01_ankle-ammo-pouch-is-not-a-backpack.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/armor-01_ankle-ammo-pouch-is-not-a-backpack.patch # Fix fingerless survivor gloves losing base warmth: # They lose warmth already from the lack of coverage, no need to double up. - patch -Np1 -i "$srcdir"/armor-02_fix-survivor-fingerless-gloves-warmth.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/armor-02_fix-survivor-fingerless-gloves-warmth.patch # # bionics fixes echo "Applying bionic fixes" # Fix npc not being able to install some additional CBMs: # ie, soporific inducer, gasoline fuel cell, enhanced hearing, surgical scalpels. - patch -Np1 -i "$srcdir"/bionics-01_npc-can-use-more-bionics.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/bionics-01_npc-can-use-more-bionics.patch # Fix some CBMs having excessively high price_postapoc values: # All other CBMs are fixed to 1000, so these now are too. - patch -Np1 -i "$srcdir"/bionics-02_fix-bionic-prices.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/bionics-02_fix-bionic-prices.patch # # faction fixes echo "Applying faction fixes" # Backport the factions.json updates from DDA - patch -Np1 -i "$srcdir"/faction-01_more-factions.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/faction-01_more-factions.patch # Fix faction food supply being calculated at 288 calories per person instead of 2500. - patch -Np1 -i "$srcdir"/faction-03_fix-food-supply-calculations.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/faction-03_fix-food-supply-calculations.patch # # faction camp fixes echo "Applying faction camp fixes" # cur_level is set to -1 on all modern basecamps. Remove the recruiting penalty this legacy variable inadvertently induces. - patch -Np1 -i "$srcdir"/factioncamp-01_remove-legacy-recruiting-penalty.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/factioncamp-01_remove-legacy-recruiting-penalty.patch # # food fixes echo "Applying food fixes" # Fix several foods not being marked as the correct material: # This prevents odd outcomes such as carnivores drinking almond/soy milk and eating peanut butter. - patch -Np1 -i "$srcdir"/foods-01_fix-food-materials.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/foods-01_fix-food-materials.patch # Fix several foods using unclear naming: # Rename can_corn from corn to canned corn to make its limited use in recipes more clear. # Fix pluralization of canned beans to also be canned beans. - patch -Np1 -i "$srcdir"/foods-02_fix-food-naming.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/foods-02_fix-food-naming.patch # Fix several mutant components lacking the BAD_TASTE flag: # If raw mutant meat is flagged as disgusting, raw mutant fat must be just awful. - patch -Np1 -i "$srcdir"/foods-03_fix-mutant-bad-taste.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/foods-03_fix-mutant-bad-taste.patch # Allow canned corn to be used as a veggy_any requirement: # Canned corn was pretty much useless beyond making fish soup despite being a perfectly fine cooked vegetable. - patch -Np1 -i "$srcdir"/foods-04_allow-canned-corn-as-veggy.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/foods-04_allow-canned-corn-as-veggy.patch # # itemgroups fixes echo "Applying itemgroup fixes" # Stop police and SWAT carrying 4.6mm magazines despite having no compatible weapons: # The H&K UCP was removed from the base game some time ago. - patch -Np1 -i "$srcdir"/itemgroups-01_hk46-is-milspec.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/itemgroups-01_hk46-is-milspec.patch # Fix the pepperjack beef and burrito bowl MREs never dropping: # They weren't in the itemgroups for MREs or soldier class. - patch -Np1 -i "$srcdir"/itemgroups-02_add-missing-mre.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/itemgroups-02_add-missing-mre.patch # Fix items in unlooted, unused lockers and cabinets missing batteries: # They need to be marked as the battery contained inside the item. - patch -Np1 -i "$srcdir"/itemgroups-03_fix-shelter-batteries.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/itemgroups-03_fix-shelter-batteries.patch # # medicine fixes echo "Applying medicine fixes" # Add -4 health to antibiotics: # weak are -2, strong are -10, this feels like a nice middle ground. - patch -Np1 -i "$srcdir"/meds-01_antibiotics-unhealthy.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/meds-01_antibiotics-unhealthy.patch # # missions fixes @@ -417,220 +419,225 @@ prepare() { # Remove UCP from migration list: # I can hack around this in my mod, but better to remove it here. # It has been gone so long, no save old enough is likely to even load. - patch -Np1 -i "$srcdir"/migration-01_remove-ucp.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/migration-01_remove-ucp.patch # # missions fixes echo "Applying mission fixes" # Fix Typos: # Foraging encounter has inconsistent monster references. Change all to cougar. - patch -Np1 -i "$srcdir"/mission-01_typos.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/mission-01_typos.patch # # monster fixes echo "Applying monster fixes" # Prefix medical zombies with "zombie" like other zombies: # It just felt weird seeing "nurse" in the enemy list. - patch -Np1 -i "$srcdir"/monsters-01_medical-zombies-called-zombies.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/monsters-01_medical-zombies-called-zombies.patch # # mutation fixes echo "Applying mutation fixes" # Light Step feels too powerful in Bright Nights. - patch -Np1 -i "$srcdir"/mutations-01_nerf-lightstep.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/mutations-01_nerf-lightstep.patch # Fix Evacuee 3 background 3 being player visible: # It was missing "player_display": false - patch -Np1 -i "$srcdir"/mutations-02_fix-evac3-background-visible.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/mutations-02_fix-evac3-background-visible.patch # Port in DDA's eye colours - patch -Np1 -i "$srcdir"/mutations-03_eye-colours.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/mutations-03_eye-colours.patch # # npc fixes echo "Applying NPC fixes" # Port the updates to Isherwood Farm from DDA - patch -Np1 -i "$srcdir"/npc-01_isherwood-update.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-01_isherwood-update.patch # Port the updates to Tacoma Commune from DDA - patch -Np1 -i "$srcdir"/npc-02_tacoma-update.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-02_tacoma-update.patch # Port the updates to New England Church Community from DDA - patch -Np1 -i "$srcdir"/npc-03_godco-update.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-03_godco-update.patch # Port the updates to prison and island prison from DDA - patch -Np1 -i "$srcdir"/npc-04_island-prison-update.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-04_island-prison-update.patch # Port the updates to kindred from DDA - patch -NEp1 -i "$srcdir"/npc-05_kindred-update.patch + patch -NEp1 --no-backup-if-mismatch -i "$srcdir"/npc-05_kindred-update.patch # Port the updates to Mr Lapin from DDA - patch -Np1 -i "$srcdir"/npc-06_lapin-update.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-06_lapin-update.patch # Port the lighthouse family from DDA # Hack in some effects to use as timers and probe NPC mechanic skill. - patch -Np1 -i "$srcdir"/npc-07_lighthouse-family_v2.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-07_lighthouse-family_v2.patch # Update the Tacoma Nurse to buy almost every non-dangerous, non-electrical, and non-expensive medicine. # Also remove acceptance for various tools that are not correctly taken, such as first aid kits. - patch -Np1 -i "$srcdir"/npc-08_nurse-takes-more-meds.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-08_nurse-takes-more-meds.patch # Update the FMC broker to buy most preserved foods. # Also update the dialogue to specify that he buys more types. - patch -Np1 -i "$srcdir"/npc-09_broker-takes-more-foods.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-09_broker-takes-more-foods.patch # Port the bunker merchant from DDA - patch -Np1 -i "$srcdir"/npc-10_bunker-merchant.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-10_bunker-merchant.patch # Fix npcs failing to reload activated gas masks: # Most masks lacked a "charges_per_use: 1" field, required for npcs to know they can reload it. # They still won't activate a fresh mask on their own though. :/ - patch -Np1 -i "$srcdir"/npc-11_npcs-reload-gas-mask.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-11_npcs-reload-gas-mask.patch # Reduce Eddie Isherwood mission from requiring 1000 clay down to 100: # 1000 units of clay is such an enormous amount compared to the previous 100 sand, # I can only reason it is a typo. - patch -Np1 -i "$srcdir"/npc-12_fix-eddie-requiring-1000-clay.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-12_fix-eddie-requiring-1000-clay.patch # Assorted typos in NPC dialogue. # Fix Jack Isherwood mission listing 10 jars, when it is actually 20. - patch -Np1 -i "$srcdir"/npc-20_dialogue-fixes.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-20_dialogue-fixes.patch # # recipe fixes echo "Applying recipe fixes" # Fix reloaded 45-70 rounds and reloaded dragon shot not allowing dismantling when every other non-caseless round does. - patch -Np1 -i "$srcdir"/recipes-01_4570-dragon-can-be-dismantled.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/recipes-01_4570-dragon-can-be-dismantled.patch # # terrain and overmap fixes echo "Applying terrain and overmap fixes" # Fix some doors being unusable by npcs (incorrect door flag): # The DOOR flag is for terrain that can be opened, not those already open. - patch -Np1 -i "$srcdir"/terrain-02_fix-doors-for-npcs.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-02_fix-doors-for-npcs.patch # Fix missing floor in the tacoma clinic: # The hospital is still a mess. :/ - patch -Np1 -i "$srcdir"/terrain-03_tacoma-clinic-add-missing-floor.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-03_tacoma-clinic-add-missing-floor.patch # Fix lumbermill gasoline being spilled instead of being inside the gas pump: # The gas pump was placed on top of a tile that didn't allow items inside, causing the gasoline to be shunted to the next valid one. - patch -Np1 -i "$srcdir"/terrain-04_lumbermill-gasoline-not-spilled.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-04_lumbermill-gasoline-not-spilled.patch # Fix community garden liquid fertilizer being in a pit instead of in the storage tanks: # I'm pretty sure that having it all dumped in a pit was not intentional. - patch -Np1 -i "$srcdir"/terrain-05_community-garden-fertilizer-not-spilled.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-05_community-garden-fertilizer-not-spilled.patch # Re-hide something that feels like spoilers. - patch -Np1 -i "$srcdir"/terrain-07_rehide-redacted.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-07_rehide-redacted.patch # Fix npcs unable to drink from firestation and shelter basecamps wells: # They were missing the water_well blueprint_provides. - patch -Np1 -i "$srcdir"/terrain-09_make-firestation-shelter-wells-npc-drinkable.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-09_make-firestation-shelter-wells-npc-drinkable.patch # Fix military base minefield entrance rotation: # Both sides use the same tile, but it was incorrectly rotated 180 degrees. Fixed to 270 degrees. - patch -Np1 -i "$srcdir"/terrain-10_fix-milbase_minefield.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-10_fix-milbase_minefield.patch # Fix up several typos, missing symbols, odd naming, and many extras lacking map notes support in map extras: # More choice is better than less. You can disable undesired map notes in the map notes settings menu. - patch -Np1 -i "$srcdir"/terrain-11_clean-up-map-extras.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-11_clean-up-map-extras.patch # Add missing stairs to the free merchant center: # The roof has stairs down, but the main floor lacked a matching stairs up. - patch -Np1 -i "$srcdir"/terrain-12_add_fmc_stairs.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-12_add_fmc_stairs.patch # # tool fixes echo "Applying tool fixes" # Mark the foldable plastic bottle and steel water bottle as containers: # Being counted as tools didn't seem to fit their role. - patch -Np1 -i "$srcdir"/tools-01_foldable-bottle-is-container.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-01_foldable-bottle-is-container.patch # Fix blood draw kit being categorized as a weapon: # Upstream changed item templates, so this sets it back to be a tool. - patch -Np1 -i "$srcdir"/tools-02_vacutainer-is-not-a-weapon.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-02_vacutainer-is-not-a-weapon.patch # Fix electric shears not using batteries nor charging via UPS: # Item was unusable without this patch. - patch -Np1 -i "$srcdir"/tools-03_shears-use-light-battery.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-03_shears-use-light-battery.patch # Normalize the manhack volumes to that of the base grenade/explosive: # I don't see how a c-4 manhack could be 1/4 the volume of a stick of c-4. # Grenade hacks were also thrice as big as the base grenade. - patch -Np1 -i "$srcdir"/tools-04_normalize-drone-volume.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-04_normalize-drone-volume.patch # # vehicle fixes echo "Applying vehicle fixes" # Replace the portable generator twin engine with a large 1 cylinder: # This way it can actually function as is. - patch -Np1 -i "$srcdir"/vehicles-01_portable-generator-engine.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/vehicles-01_portable-generator-engine.patch # Rename the FBI Car: # The stock name was clearly a typo of some sort. - patch -Np1 -i "$srcdir"/vehicles-02_fix-fbi-car-name.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/vehicles-02_fix-fbi-car-name.patch # Fix the black box to actually be installable: # No tool provided screwing 3 and wrenching 3. - patch -Np1 -i "$srcdir"/vehicles-03_black-box-can-be-installed.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/vehicles-03_black-box-can-be-installed.patch # # weapon fixes echo "Applying weapon fixes" # Fix the V29 pistol to copy-from pistol_energy: # This class seems entirely made for this weapon, but it was not flagged to use it. - patch -Np1 -i "$srcdir"/weapon-01_fix-v29-copy-from.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/weapon-01_fix-v29-copy-from.patch # # Uncategorized for now echo "Applying uncategorized fixes" # Fix rubber items dismantling into 10x item volume of rubber. - patch -Np1 -i "$srcdir"/etc-01_fix-rubbersplosion.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-01_fix-rubbersplosion.patch # Add price_postapoc to a number of items that did not have one set. - patch -Np1 -i "$srcdir"/etc-02_add-missing-price-postapoc.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-02_add-missing-price-postapoc.patch + + # Convert a number of items to abstracts: + # From the usage, these are intended to be abstracts but have not yet been converted from legacy items. + # This fixes some erroneous weapon listings in custom martial arts. + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-03_fix-abstracts.patch # # # Various other fixes for bugs I came across that modify src echo "Applying source code fixes" # Fix radio, e-ink reader music, tactical tonfa not working with UPS. - patch -Np1 -i "$srcdir"/jc_radio-can-use-ups.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_radio-can-use-ups.patch # Fix ammo loudness mulitplying by six instead of two. - patch -Np1 -i "$srcdir"/jc_ammo-loudness-ap-times-2.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_ammo-loudness-ap-times-2.patch # Fix smoker racks not accepting bionic firestarter. - patch -Np1 -i "$srcdir"/jc_allow-bio-firestarter-on-smoker.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_allow-bio-firestarter-on-smoker.patch # Fix Non-Player facton NPCs from becoming sleep deprived. - patch -Np1 -i "$srcdir"/jc_stop-non-faction-npc-sleep-depirvation.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_stop-non-faction-npc-sleep-depirvation.patch # Fix Non-Player facton NPCs from becoming malnourished. - patch -Np1 -i "$srcdir"/jc_stop-non-faction-npc-malnourishment.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_stop-non-faction-npc-malnourishment.patch # Fix NPCs preferring tables to cots or woodstoves to the floor. - patch -Np1 -i "$srcdir"/jc_stop-sleeping-on-tables.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_stop-sleeping-on-tables.patch # Allow the hacker_laptop to utilize the extra functions. - patch -Np1 -i "$srcdir"/jc_allow-hacker-laptop.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_allow-hacker-laptop.patch # Expand the overmap tiles for the miltiary base to be less MMMM - patch -Np1 -i "$srcdir"/jc_more-military-base-overmap.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_more-military-base-overmap.patch # Allow npcs to pull food from the camp larder at the full range of tiles camp actions can be assigned from: # Should allow bases larger than 3x3 to have less food micromanagment for NPCs. - patch -Np1 -i "$srcdir"/jc_npc-eat-from-further-camp.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_npc-eat-from-further-camp.patch # Revert removal of half calorie consumption while sleeping: # Managing the food supply of more than a few NPCs in BN is extremely difficult compared to DDA. - patch -Np1 -i "$srcdir"/jc_reduced-kcal-during-sleep.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_reduced-kcal-during-sleep.patch # # # Additional changes echo "Applying vampirism patch" # Add vampire mutation lines and modify a number of functions to facilitate these traits. - patch -Np1 -i "$srcdir"/vampirism.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/vampirism.patch } build() { diff --git a/etc-03_fix-abstracts.patch b/etc-03_fix-abstracts.patch new file mode 100644 index 0000000..4bf8f72 --- /dev/null +++ b/etc-03_fix-abstracts.patch @@ -0,0 +1,73 @@ +--- a/data/json/items/generic/dining_kitchen.json ++++ b/data/json/items/generic/dining_kitchen.json +@@ -1,6 +1,6 @@ + [ + { +- "id": "base_silverware", ++ "abstract": "base_silverware", + "name": { "str": "generic silverware" }, + "type": "GENERIC", + "description": "generic item template", +@@ -16,7 +16,7 @@ + "to_hit": -1 + }, + { +- "id": "base_utensil", ++ "abstract": "base_utensil", + "name": { "str": "generic utensil" }, + "type": "GENERIC", + "description": "generic item template", +@@ -32,7 +32,7 @@ + "to_hit": -1 + }, + { +- "id": "base_plastic_silverware", ++ "abstract": "base_plastic_silverware", + "name": { "str": "generic silverware" }, + "type": "GENERIC", + "description": "generic item template", +@@ -48,7 +48,7 @@ + "to_hit": -2 + }, + { +- "id": "base_ceramic_dish", ++ "abstract": "base_ceramic_dish", + "name": { "str": "generic dish", "str_pl": "generic dishes" }, + "description": "generic item template", + "type": "GENERIC", +@@ -63,7 +63,7 @@ + "to_hit": -1 + }, + { +- "id": "base_glass_dish", ++ "abstract": "base_glass_dish", + "name": { "str": "generic dish", "str_pl": "generic dishes" }, + "description": "generic item template", + "type": "GENERIC", +@@ -78,7 +78,7 @@ + "to_hit": -1 + }, + { +- "id": "base_tin_dish", ++ "abstract": "base_tin_dish", + "name": { "str": "generic dish", "str_pl": "generic dishes" }, + "description": "generic item template", + "type": "GENERIC", +@@ -93,7 +93,7 @@ + "to_hit": -1 + }, + { +- "id": "base_plastic_dish", ++ "abstract": "base_plastic_dish", + "name": { "str": "generic dish", "str_pl": "generic dishes" }, + "description": "generic item template", + "type": "GENERIC", +@@ -108,7 +108,7 @@ + "to_hit": -1 + }, + { +- "id": "base_cookpot", ++ "abstract": "base_cookpot", + "name": { "str": "generic cook pot" }, + "description": "generic item template", + "type": "GENERIC", -- cgit v1.2.1