feat(port): eye color traits (#3942)

feat: port eye colors and trait groups also adds red and violet eyes to chargen, plus sprite edits made by myself. Co-authored-by: Fris0uman <[email protected]>
cataclysmbnteam · Dec 18, 2023 · fea6c75 · fea6c75
1 parent 4b5f9ba
commit fea6c75
Show file tree

Hide file tree

Showing 5 changed files with 156 additions and 8 deletions.
diff --git a/data/json/external_tileset/External_Tileset_DP_eyes.json b/data/json/external_tileset/External_Tileset_DP_eyes.json
@@ -0,0 +1,23 @@
+[
+  {
+    "type": "mod_tileset",
+    "compatibility": [ "UNDEAD_PEOPLE_BASE", "UNDEAD_PEOPLE" ],
+    "tiles-new": [
+      {
+        "file": "external_tileset/External_Tileset_DP_eyes.png",
+        "tiles": [
+          { "id": "overlay_mutation_eye_red", "fg": 0 },
+          { "id": "overlay_mutation_eye_violet", "fg": 1 },
+          { "id": "overlay_mutation_eye_hazel", "fg": 2 },
+          { "id": "overlay_mutation_eye_blue", "fg": 3 },
+          { "id": "overlay_mutation_eye_brown", "fg": 4 },
+          { "id": "overlay_mutation_eye_gray", "fg": 5 },
+          { "id": "overlay_mutation_eye_green", "fg": 6 },
+          { "id": "overlay_mutation_eye_amber", "fg": 7 }
+        ],
+        "sprite_width": 32,
+        "sprite_height": 32
+      }
+    ]
+  }
+]
diff --git a/data/json/external_tileset/External_Tileset_DP_eyes.png b/data/json/external_tileset/External_Tileset_DP_eyes.png
diff --git a/data/json/mutations/mutation_appearance.json b/data/json/mutations/mutation_appearance.json
@@ -479,6 +479,102 @@
     "player_display": false,
     "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": "eye_red",
+    "type": "mutation",
+    "name": { "str": "Eye color: red" },
+    "description": "You have incredibly rare red eyes.",
+    "points": 0,
+    "starting_trait": true,
+    "valid": false,
+    "purifiable": false,
+    "player_display": false,
+    "types": [ "eye_color" ]
+  },
+  {
+    "id": "eye_violet",
+    "type": "mutation",
+    "name": { "str": "Eye color: violet" },
+    "description": "You have incredibly rare violet eyes.",
+    "points": 0,
+    "starting_trait": true,
+    "valid": false,
+    "purifiable": false,
+    "player_display": false,
+    "types": [ "eye_color" ]
+  },
   {
     "id": "SKIN_DARK",
     "type": "mutation",

diff --git a/data/json/mutations/mutation_type.json b/data/json/mutations/mutation_type.json
@@ -71,6 +71,10 @@
     "type": "mutation_type",
     "id": "skin_tone"
   },
+  {
+    "type": "mutation_type",
+    "id": "eye_color"
+  },
   {
     "type": "mutation_type",
     "id": "hair_style"

diff --git 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",
@@ -153,6 +153,31 @@
     "subtype": "distribution",
     "traits": [ { "trait": "SKIN_DARK", "prob": 50 }, { "trait": "SKIN_MEDIUM", "prob": 5 }, { "trait": "SKIN_TAN", "prob": 25 } ]
   },
+  {
+    "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",