summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--PKGBUILD19
-rw-r--r--itemgroups-03_fix-shelter-batteries.patch41
-rw-r--r--mutations-03_eye-colours.patch186
-rw-r--r--vampirism.patch11
4 files changed, 252 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index c3c9a47..3d7fdb4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=cataclysm-bn
_pkgname=Cataclysm-BN-cbn-experimental
pkgver=202201182023
_pkgver=2022-01-18-2023
-pkgrel=2
+pkgrel=6
pkgdesc="A post-apocalyptic roguelike."
#url="http://cataclysmrl.blogspot.com/"
#url="http://www.cataclysm.glyphgryph.com/"
@@ -47,6 +47,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
"itemgroups-01_hk46-is-milspec.patch"
"itemgroups-02_add-missing-mre.patch"
+ "itemgroups-03_fix-shelter-batteries.patch"
"meds-01_antibiotics-unhealthy.patch"
@@ -54,6 +55,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
"mutations-01_nerf-lightstep.patch"
"mutations-02_fix-evac3-background-visible.patch"
+ "mutations-03_eye-colours.patch"
"npc-01_isherwood-update.patch"
"npc-02_tacoma-update.patch"
@@ -116,13 +118,15 @@ b2sums=('c2ba9f8cf1dd9448dfc5f918d0459ae4145ade15821a3024d446b506c5f7da72bab1043
'b3f3be15fb87b1cdb6230216328f648e66d06fd2eeee9a6a3ff3f6b8e94c5213af7a2a4643f1e59ca8801056325ad4be4b88d723c2ec52c4ecc6f8c356ff8c82'
'76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
'417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
+ 'dae75d9cd00f1f3ceabf257f1d82d245ace6582cf7ea98a40c1d1eb9b7e1832cb2a0c13f25c814a05a70931c42a06694a67829ea55554cc680eaa8ddf16c84a8'
'931ac85c657c1c504de1ea629205b19f79a11acdd7c62cf71b909323ec1588610b1f575bc58ab01c3fbcd334fca8fbc114316570732f55a3f7fb3dd2984cd442'
'8bb71fbec3deece7bd0f9084e20ef5853812e71e2ebcd43011f7779499cbb99c7a8bc5c618d8ef9f55e5ce54c9fc4a5f4d3167bb63f9821a68889f9f3e1386f5'
'08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d'
'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
+ '0793bb7aa67d3989ef093cc17e6d9dd6d2e3999562fe1039b44f0fb9297623bda49271cb7b17d7fab4dc14299e0e5f13eb8f3711dbffc10bf7ffa68838f0585b'
'24c5f9ee5553b66ac937785b3312378adbca096888b05da8b0cdc9c0586ee51e9a3754615cc03a659cfe70ba2f48f7ce0359025c816c887c7691424c685f5f96'
'4f98126afadd7ad3346e2a55c02a06e1f5709406984835ff4ee206c4b52ef7ce8c52eee3f581fa36799a59578e05375b5db884b88b35866fbc6bb1330b79fe83'
- 'e51bf3f26ed46d3572959a33cee680728dfff361195d1594eabe609d0e741d63c641c9423c33ebadf305a6b3443f348db2bf7120c20c5f5f77f38864e1323786'
+ 'e2595c1859afe68d2b1d4ba8e424b6948063da75ee54ce11bf19f4e0263eefb40673245985d672da54dcc5b66a3fd414110726c36b55a994f08eb461446d9b57'
'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
'71768899e631c5293d5fb8bcb237ca54f880913b6400d445c8a0322cb69801fe85b94b1293306e2f33fac6067cbd892c4665b9563bdc9ff4df5be245c7e7108f'
'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
@@ -150,8 +154,8 @@ b2sums=('c2ba9f8cf1dd9448dfc5f918d0459ae4145ade15821a3024d446b506c5f7da72bab1043
'1919a87a97a1cc625a8a0f5f6a3affb45b0c9630768b42718c5a3df563127cc0436845d01a354b24a16080a89f53df0515a9b62dc14f5292a951057386e9d5d6'
'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
'4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
- '5948f8f328176aa51cb9e41c018231db5307d41ae69e1e4515be03ff6b5b2c368c9962f0f683184983cccca239acedc9a4d1f06c42d6140415a134ea0268a8ff'
- 'cef466fc4010f1507e9719078bdc9a1a6300c7961cdb596edd7e4098c2209ec2bf67a34a0693570ac40de65b37065a2323d488d823d1ef9c421652af6c784e3a'
+ '816103c2772b50fcbfa86ecb238a54781c4d176e0c858e4a7f307f640a8444e1951b404359bd2bfb492f9e8aeb5b99a9e0f15dec0c0b6b8a130d351a07c0df67'
+ 'a0a7758d0834deefa92f2a2c5db1cf65334dae9e4e244803f65f09265bf4a8bc4da40464f5a98fb3f2b7de5a2912359e38adc0ca2146d96a5930e1151b99027d'
'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
'9d0e17552338c9d92ff696f1834a5d99c29d5dfbab6903b620410f62527a0ba60720c9ceec8e203b737f784ade8a53dbaca428ac7cc439f3f4f765aac7f1170f'
'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -242,6 +246,10 @@ prepare() {
# They weren't in the itemgroups for MREs or soldier class.
patch -Np1 -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
+
# # monster fixes
echo "Applying medicine fixes"
@@ -266,6 +274,9 @@ prepare() {
# It was missing "player_display": false
patch -Np1 -i "$srcdir"/mutations-02_fix-evac3-background-visible.patch
+ # Port in DDA's eye colours
+ patch -Np1 -i "$srcdir"/mutations-03_eye-colours.patch
+
# # npc fixes
echo "Applying NPC fixes"
diff --git a/itemgroups-03_fix-shelter-batteries.patch b/itemgroups-03_fix-shelter-batteries.patch
new file mode 100644
index 0000000..33c2c04
--- /dev/null
+++ b/itemgroups-03_fix-shelter-batteries.patch
@@ -0,0 +1,41 @@
+--- a/data/json/itemgroups/SUS/evac_shelter.json
++++ b/data/json/itemgroups/SUS/evac_shelter.json
+@@ -10,7 +10,13 @@
+ { "item": "jacket_evac", "prob": 75 },
+ { "item": "emer_blanket", "prob": 75 },
+ { "item": "mask_gas", "prob": 2 },
+- { "item": "flashlight", "prob": 50 },
++ {
++ "item": "light_disposable_cell",
++ "charges-min": 150,
++ "charges-max": 300,
++ "container-item": "flashlight",
++ "prob": 50
++ },
+ { "item": "light_disposable_cell", "prob": 10 },
+ { "item": "lighter", "prob": 20 },
+ { "item": "whistle", "prob": 70 },
+@@ -65,9 +71,21 @@
+ "collection": [
+ { "item": "extinguisher", "prob": 70 },
+ { "item": "1st_aid", "count": [ 1, 3 ], "prob": 65 },
+- { "item": "two_way_radio", "prob": 65 },
++ {
++ "item": "light_disposable_cell",
++ "charges-min": 150,
++ "charges-max": 300,
++ "container-item": "two_way_radio",
++ "prob": 65
++ },
+ { "item": "light_disposable_cell", "count": [ 2, 4 ], "prob": 65 },
+- { "item": "electric_lantern", "prob": 35 },
++ {
++ "item": "light_disposable_cell",
++ "charges-min": 150,
++ "charges-max": 300,
++ "container-item": "electric_lantern",
++ "prob": 35
++ },
+ { "item": "barometer", "prob": 8 }
+ ],
+ "prob": 10
diff --git a/mutations-03_eye-colours.patch b/mutations-03_eye-colours.patch
new file mode 100644
index 0000000..18ff03b
--- /dev/null
+++ b/mutations-03_eye-colours.patch
@@ -0,0 +1,186 @@
+--- a/data/json/npcs/appearance_trait_groups.json
++++ b/data/json/npcs/appearance_trait_groups.json
+@@ -19,49 +19,49 @@
+ "type": "trait_group",
+ "id": "Appearance_Irish",
+ "subtype": "collection",
+- "traits": [ { "group": "Hair_Irish", "prob": 100 }, { "group": "Skin_Fair", "prob": 100 } ]
++ "traits": [ { "group": "Hair_Irish", "prob": 100 }, { "group": "Skin_Fair", "prob": 100 }, { "group": "Eye_light", "prob": 100 } ]
+ },
+ {
+ "type": "trait_group",
+ "id": "Appearance_Caucasian",
+ "subtype": "collection",
+- "traits": [ { "group": "Hair_Any", "prob": 100 }, { "group": "Skin_White", "prob": 100 } ]
++ "traits": [ { "group": "Hair_Any", "prob": 100 }, { "group": "Skin_White", "prob": 100 }, { "group": "Eye_any", "prob": 100 } ]
+ },
+ {
+ "type": "trait_group",
+ "id": "Appearance_Germanic",
+ "subtype": "collection",
+- "traits": [ { "group": "Hair_Fair", "prob": 100 }, { "group": "Skin_Fair", "prob": 100 } ]
++ "traits": [ { "group": "Hair_Fair", "prob": 100 }, { "group": "Skin_Fair", "prob": 100 }, { "group": "Eye_light", "prob": 100 } ]
+ },
+ {
+ "type": "trait_group",
+ "id": "Appearance_Latin",
+ "subtype": "collection",
+- "traits": [ { "group": "Hair_Dark", "prob": 100 }, { "group": "Skin_Medium", "prob": 100 } ]
++ "traits": [ { "group": "Hair_Dark", "prob": 100 }, { "group": "Skin_Medium", "prob": 100 }, { "group": "Eye_dark", "prob": 100 } ]
+ },
+ {
+ "type": "trait_group",
+ "id": "Appearance_African",
+ "subtype": "collection",
+- "traits": [ { "group": "Hair_Dark", "prob": 100 }, { "group": "Skin_Dark", "prob": 100 } ]
++ "traits": [ { "group": "Hair_Dark", "prob": 100 }, { "group": "Skin_Dark", "prob": 100 }, { "group": "Eye_dark", "prob": 100 } ]
+ },
+ {
+ "type": "trait_group",
+ "id": "Appearance_EastAsian",
+ "subtype": "collection",
+- "traits": [ { "group": "Hair_Dark", "prob": 100 }, { "trait": "SKIN_TAN", "prob": 100 } ]
++ "traits": [ { "group": "Hair_Dark", "prob": 100 }, { "trait": "SKIN_TAN", "prob": 100 }, { "group": "Eye_dark", "prob": 100 } ]
+ },
+ {
+ "type": "trait_group",
+ "id": "Appearance_SouthAsian",
+ "subtype": "collection",
+- "traits": [ { "group": "Hair_Dark", "prob": 100 }, { "trait": "SKIN_TAN", "prob": 100 } ]
++ "traits": [ { "group": "Hair_Dark", "prob": 100 }, { "trait": "SKIN_TAN", "prob": 100 }, { "group": "Eye_dark", "prob": 100 } ]
+ },
+ {
+ "type": "trait_group",
+ "id": "Appearance_Mixed",
+ "subtype": "collection",
+- "traits": [ { "group": "Hair_Any", "prob": 100 }, { "group": "Skin_Any", "prob": 100 } ]
++ "traits": [ { "group": "Hair_Any", "prob": 100 }, { "group": "Skin_Any", "prob": 100 }, { "group": "Eye_any", "prob": 100 } ]
+ },
+ {
+ "type": "trait_group",
+@@ -155,6 +155,31 @@
+ },
+ {
+ "type": "trait_group",
++ "id": "Eye_light",
++ "subtype": "distribution",
++ "traits": [ { "trait": "eye_blue", "prob": 55 }, { "trait": "eye_gray", "prob": 25 }, { "trait": "eye_green", "prob": 15 } ]
++ },
++ {
++ "type": "trait_group",
++ "id": "Eye_dark",
++ "subtype": "distribution",
++ "traits": [ { "trait": "eye_brown", "prob": 60 }, { "trait": "eye_hazel", "prob": 20 }, { "trait": "eye_amber", "prob": 20 } ]
++ },
++ {
++ "type": "trait_group",
++ "id": "Eye_any",
++ "subtype": "distribution",
++ "traits": [
++ { "trait": "eye_brown", "prob": 70 },
++ { "trait": "eye_hazel", "prob": 9 },
++ { "trait": "eye_amber", "prob": 8 },
++ { "trait": "eye_blue", "prob": 8 },
++ { "trait": "eye_gray", "prob": 3 },
++ { "trait": "eye_green", "prob": 2 }
++ ]
++ },
++ {
++ "type": "trait_group",
+ "id": "Hair_Black",
+ "subtype": "distribution",
+ "traits": [
+--- a/data/json/mutations/mutation_appearance.json
++++ b/data/json/mutations/mutation_appearance.json
+@@ -477,6 +513,78 @@
+ "types": [ "hair_style" ]
+ },
+ {
++ "id": "eye_blue",
++ "type": "mutation",
++ "name": { "str": "Eye color: blue" },
++ "description": "You have blue eyes.",
++ "points": 0,
++ "starting_trait": true,
++ "valid": false,
++ "purifiable": false,
++ "player_display": false,
++ "types": [ "eye_color" ]
++ },
++ {
++ "id": "eye_brown",
++ "type": "mutation",
++ "name": { "str": "Eye color: brown" },
++ "description": "You have brown eyes.",
++ "points": 0,
++ "starting_trait": true,
++ "valid": false,
++ "purifiable": false,
++ "player_display": false,
++ "types": [ "eye_color" ]
++ },
++ {
++ "id": "eye_hazel",
++ "type": "mutation",
++ "name": { "str": "Eye color: hazel" },
++ "description": "You have hazel eyes.",
++ "points": 0,
++ "starting_trait": true,
++ "valid": false,
++ "purifiable": false,
++ "player_display": false,
++ "types": [ "eye_color" ]
++ },
++ {
++ "id": "eye_amber",
++ "type": "mutation",
++ "name": { "str": "Eye color: amber" },
++ "description": "You have amber eyes.",
++ "points": 0,
++ "starting_trait": true,
++ "valid": false,
++ "purifiable": false,
++ "player_display": false,
++ "types": [ "eye_color" ]
++ },
++ {
++ "id": "eye_gray",
++ "type": "mutation",
++ "name": { "str": "Eye color: gray" },
++ "description": "You have gray eyes.",
++ "points": 0,
++ "starting_trait": true,
++ "valid": false,
++ "purifiable": false,
++ "player_display": false,
++ "types": [ "eye_color" ]
++ },
++ {
++ "id": "eye_green",
++ "type": "mutation",
++ "name": { "str": "Eye color: green" },
++ "description": "You have green eyes.",
++ "points": 0,
++ "starting_trait": true,
++ "valid": false,
++ "purifiable": false,
++ "player_display": false,
++ "types": [ "eye_color" ]
++ },
++ {
+ "id": "SKIN_DARK",
+ "type": "mutation",
+ "name": { "str": "Skin tone: dark brown" },
+--- a/data/json/mutations/mutation_type.json
++++ b/data/json/mutations/mutation_type.json
+@@ -69,6 +73,10 @@
+ },
+ {
+ "type": "mutation_type",
++ "id": "eye_color"
++ },
++ {
++ "type": "mutation_type",
+ "id": "hair_style"
+ },
+ {
diff --git a/vampirism.patch b/vampirism.patch
index c7230eb..653c847 100644
--- a/vampirism.patch
+++ b/vampirism.patch
@@ -667,7 +667,7 @@
--- a/data/json/mutations/mutation_ordering.json
+++ b/data/json/mutations/mutation_ordering.json
-@@ -73,6 +73,7 @@
+@@ -77,6 +77,7 @@
"TROGLO2",
"TROGLO3",
"URSINE_FUR",
@@ -675,3 +675,12 @@
"VISCOUS"
],
"order": 1500
+@@ -185,7 +186,7 @@
+ { "id": [ "FLOWERS" ], "order": 5000 },
+ { "id": [ "ELFA_EARS", "FELINE_EARS", "LUPINE_EARS", "RABBIT_EARS", "URSINE_EARS" ], "order": 5500 },
+ { "id": [ "ANTENNAE", "ANTLERS", "CURVED_HORNS", "HORNS", "POINTED_HORNS" ], "order": 6000 },
+- { "id": [ "COMPOUND_EYES", "ELFAEYES", "FEL_EYE", "LIZ_EYE" ], "order": 6500 },
++ { "id": [ "COMPOUND_EYES", "ELFAEYES", "FEL_EYE", "LIZ_EYE", "VAMP_EYES" ], "order": 6500 },
+ {
+ "id": [
+ "BEAK",
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-06 03:33:42 +0000