From 3f6bb90b2adc6cc386fca8dbe94fd6d666cbecbe Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 1 Aug 2020 12:58:46 -0700 Subject: Improve patch names --- 0001-vehicle-heater-cooler-intensity-reduced.patch | 20 ++++++++++++++++++++ 0002-quiverfull-house-correct-stairs.patch | 11 +++++++++++ 0003-ankle-ammo-pouch-is-not-a-backpack.patch | 11 +++++++++++ PKGBUILD | 12 ++++++------ ammo_pouch.diff | 11 ----------- emit.diff | 20 -------------------- house_quiverfull.diff | 11 ----------- 7 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 0001-vehicle-heater-cooler-intensity-reduced.patch create mode 100644 0002-quiverfull-house-correct-stairs.patch create mode 100644 0003-ankle-ammo-pouch-is-not-a-backpack.patch delete mode 100644 ammo_pouch.diff delete mode 100644 emit.diff delete mode 100644 house_quiverfull.diff diff --git a/0001-vehicle-heater-cooler-intensity-reduced.patch b/0001-vehicle-heater-cooler-intensity-reduced.patch new file mode 100644 index 0000000..c3d16d5 --- /dev/null +++ b/0001-vehicle-heater-cooler-intensity-reduced.patch @@ -0,0 +1,20 @@ +--- 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/0002-quiverfull-house-correct-stairs.patch b/0002-quiverfull-house-correct-stairs.patch new file mode 100644 index 0000000..ad40706 --- /dev/null +++ b/0002-quiverfull-house-correct-stairs.patch @@ -0,0 +1,11 @@ +--- a/data/json/mapgen/house/house_quiverfull.json ++++ b/data/json/mapgen/house/house_quiverfull.json +@@ -29,7 +29,7 @@ + "%or E|R y| h F#.", + "%# + + O#.", + ".# |||R R|J 5o.", +- ".#HHsHH|< R|n 4o.", ++ ".#HHsHH|> R|n 4o.", + ".#|||||| |R R|JJ 123#.", + ".#q+ ||||+|||#.", + ".#q+ + d#.", diff --git a/0003-ankle-ammo-pouch-is-not-a-backpack.patch b/0003-ankle-ammo-pouch-is-not-a-backpack.patch new file mode 100644 index 0000000..85c7833 --- /dev/null +++ b/0003-ankle-ammo-pouch-is-not-a-backpack.patch @@ -0,0 +1,11 @@ +--- a/data/json/items/armor/ammo_pouch.json ++++ b/data/json/items/armor/ammo_pouch.json +@@ -192,7 +192,7 @@ + "price_postapoc": 4500, + "material": "cotton", + "symbol": "[", +- "looks_like": "ragpouch", ++ "looks_like": "boostrap", + "color": "dark_gray", + "covers": [ "FOOT_EITHER" ], + "coverage": 5, diff --git a/PKGBUILD b/PKGBUILD index 00b4820..2e2a222 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -27,9 +27,9 @@ 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" - "emit.diff" - "house_quiverfull.diff" - "ammo_pouch.diff" + "0001-vehicle-heater-cooler-intensity-reduced.patch" + "0002-quiverfull-house-correct-stairs.patch" + "0003-ankle-ammo-pouch-is-not-a-backpack.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" @@ -73,13 +73,13 @@ prepare() { # Hotfixes # Fix Vehicle Heater and Cooler to be less severe - patch -Np1 -i "$srcdir"/emit.diff + patch -Np1 -i "$srcdir"/0001-vehicle-heater-cooler-intensity-reduced.patch # Fix Quiverfull house to have the correct stairs - patch -Np1 -i "$srcdir"/house_quiverfull.diff + patch -Np1 -i "$srcdir"/0002-quiverfull-house-correct-stairs.patch # Fix Ankle Ammo Pouch to not look like a backpack - patch -Np1 -i "$srcdir"/ammo_pouch.diff + patch -Np1 -i "$srcdir"/0003-ankle-ammo-pouch-is-not-a-backpack.patch } build() { diff --git a/ammo_pouch.diff b/ammo_pouch.diff deleted file mode 100644 index 85c7833..0000000 --- a/ammo_pouch.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/data/json/items/armor/ammo_pouch.json -+++ b/data/json/items/armor/ammo_pouch.json -@@ -192,7 +192,7 @@ - "price_postapoc": 4500, - "material": "cotton", - "symbol": "[", -- "looks_like": "ragpouch", -+ "looks_like": "boostrap", - "color": "dark_gray", - "covers": [ "FOOT_EITHER" ], - "coverage": 5, diff --git a/emit.diff b/emit.diff deleted file mode 100644 index c3d16d5..0000000 --- a/emit.diff +++ /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/house_quiverfull.diff b/house_quiverfull.diff deleted file mode 100644 index ad40706..0000000 --- a/house_quiverfull.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/data/json/mapgen/house/house_quiverfull.json -+++ b/data/json/mapgen/house/house_quiverfull.json -@@ -29,7 +29,7 @@ - "%or E|R y| h F#.", - "%# + + O#.", - ".# |||R R|J 5o.", -- ".#HHsHH|< R|n 4o.", -+ ".#HHsHH|> R|n 4o.", - ".#|||||| |R R|JJ 123#.", - ".#q+ ||||+|||#.", - ".#q+ + d#.", -- cgit v1.2.1