Port the DDA eye colours to BN.

Fix the vampirism mod as a result of the new eye colours.
Fix devices in the unlooted, unused shelters from missing batteries.

1 files changed, 186 insertions, 0 deletions

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"
+   },
+   {