Merge pull request #1 from CleverRaven/master

Syncing With Master
mlangsdorf · Nov 14, 2020 · 189776d · 189776d
2 parents 938a274 + ee89795
commit 189776d
Show file tree

Hide file tree

Showing 7 changed files with 258 additions and 64 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -1076,7 +1076,7 @@
       { "item": "hot_pants_fur", "prob": 5 },
       { "item": "hot_pants_leather", "prob": 25 },
       { "item": "breeches", "prob": 25 },
-      { "item": "kilt", "prob": 5 }
+      { "item": "kilt", "prob": 2 }
     ]
   },
   {
@@ -1194,7 +1194,7 @@
       [ "b_shorts", 15 ],
       [ "halter_top", 30 ],
       [ "linuxtshirt", 10 ],
-      [ "kilt", 5 ],
+      [ "kilt", 2 ],
       [ "nanoskirt", 10 ],
       [ "sleeveless_tunic", 5 ],
       [ "fedora", 10 ],
@@ -1269,7 +1269,7 @@
       [ "dress_wedding", 1 ],
       [ "postman_shorts", 5 ],
       [ "b_shorts", 15 ],
-      [ "kilt", 5 ],
+      [ "kilt", 2 ],
       [ "nanoskirt", 10 ]
     ]
   },
@@ -1741,7 +1741,7 @@
       { "item": "maid_hat", "prob": 3 },
       { "item": "halter_top", "prob": 50 },
       { "item": "linuxtshirt", "prob": 20 },
-      { "item": "kilt", "prob": 5 },
+      { "item": "kilt", "prob": 2 },
       { "item": "nanoskirt", "prob": 10 },
       { "item": "sleeveless_tunic", "prob": 5 },
       { "item": "ear_spool", "prob": 30 },
@@ -2602,7 +2602,7 @@
       [ "maid_dress", 3 ],
       [ "halter_top", 50 ],
       [ "linuxtshirt", 20 ],
-      [ "kilt", 5 ],
+      [ "kilt", 2 ],
       [ "nanoskirt", 10 ],
       [ "robe", 50 ]
     ]
@@ -2648,7 +2648,7 @@
     "//": "clothing found on a coat rack",
     "subtype": "collection",
     "items": [
-      { "group": "scarfs_unisex", "prob": 30 },
+      { "group": "scarfs_unisex", "prob": 40 },
       { "group": "bags_unisex", "prob": 20 },
       { "group": "coats_unisex", "prob": 70 },
       { "group": "hats_unisex", "prob": 70 }
@@ -2894,7 +2894,7 @@
     "type": "item_group",
     "//": "mens pants and leg coverings for domestic locations.",
     "subtype": "distribution",
-    "items": [ { "item": "kilt", "prob": 10 }, { "item": "kilt_leather", "prob": 5 } ]
+    "items": [ { "item": "kilt", "prob": 2 }, { "item": "kilt_leather", "prob": 1 } ]
   },
   {
     "id": "gloves_unisex",

diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json
@@ -223,7 +223,7 @@
       [ "razor_shaving", 5 ],
       [ "toothbrush_plain", 10 ],
       [ "string_floss", 10 ],
-      [ "kilt", 5 ],
+      [ "kilt", 4 ],
       [ "hobo_stove", 1 ],
       [ "tinder", 1 ],
       [ "tinderbox", 1 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -1352,7 +1352,7 @@
       [ "pants_army", 10 ],
       [ "jersey", 40 ],
       [ "linuxtshirt", 20 ],
-      [ "kilt", 5 ]
+      [ "kilt", 3 ]
     ]
   },
   {
@@ -1472,7 +1472,7 @@
       { "group": "neckties", "prob": 5 },
       [ "tieclip", 2 ],
       [ "collarpin", 2 ],
-      [ "kilt", 5 ],
+      [ "kilt", 3 ],
       [ "fedora", 5 ],
       [ "kufi", 2 ],
       [ "kippah", 2 ],

diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -778,18 +778,20 @@
     "subtype": "collection",
     "entries": [
       { "group": "shoes_unisex", "prob": 50 },
-      { "item": "fishing_waders", "prob": 3 },
-      { "item": "kilt", "prob": 10 },
-      { "item": "football_armor", "prob": 10 },
+      { "item": "fishing_waders", "prob": 2 },
+      { "item": "kilt", "prob": 3 },
+      { "item": "football_armor", "prob": 3 },
       { "item": "sleeping_bag", "prob": 10 },
       { "item": "sleeping_bag_roll", "prob": 10 },
-      { "item": "bscabbard", "prob": 5 },
-      { "item": "kilt_leather", "prob": 5 },
-      { "item": "chaps_leather", "prob": 5 },
+      { "item": "bscabbard", "prob": 1 },
+      { "item": "kilt_leather", "prob": 2 },
+      { "item": "chaps_leather", "prob": 3 },
       { "group": "coats_unisex", "prob": 50 },
       { "group": "suits_unisex", "prob": 30 },
       { "group": "suits_mens", "prob": 30 },
-      { "group": "bags_unisex", "prob": 20 }
+      { "group": "bags_unisex", "prob": 20 },
+      { "group": "hats_unisex", "prob": 20 },
+      { "group": "scarfs_unisex", "prob": 30 }
     ]
   },
   {
@@ -800,18 +802,20 @@
     "entries": [
       { "group": "shoes_unisex", "prob": 50 },
       { "group": "shoes_womens", "prob": 60 },
-      { "item": "fishing_waders", "prob": 2 },
-      { "item": "football_armor", "prob": 5 },
+      { "item": "fishing_waders", "prob": 1 },
+      { "item": "football_armor", "prob": 2 },
       { "item": "skirt", "prob": 20 },
       { "item": "skirt_leather", "prob": 10 },
       { "item": "bscabbard", "prob": 3 },
       { "item": "sleeping_bag", "prob": 10 },
       { "item": "sleeping_bag_roll", "prob": 10 },
-      { "item": "chaps_leather", "prob": 5 },
+      { "item": "chaps_leather", "prob": 3 },
       { "group": "coats_unisex", "prob": 50 },
       { "group": "suits_unisex", "prob": 30 },
       { "group": "suits_womens", "prob": 40 },
-      { "group": "bags_unisex", "prob": 20 }
+      { "group": "bags_unisex", "prob": 20 },
+      { "group": "hats_unisex", "prob": 20 },
+      { "group": "scarfs_unisex", "prob": 20 }
     ]
   },
   {
@@ -822,15 +826,16 @@
     "entries": [
       { "group": "accesories_personal_unisex", "prob": 10 },
       { "group": "accesories_personal_mens", "prob": 10 },
-      { "group": "masks_unisex", "prob": 5 },
+      { "group": "masks_unisex", "prob": 3 },
       { "group": "socks_unisex", "prob": 70 },
-      { "group": "scarfs_unisex", "prob": 20 },
+      { "group": "scarfs_unisex", "prob": 30 },
       { "group": "shirts_unisex", "prob": 50 },
       { "group": "underwear_mens", "prob": 80 },
       { "group": "underwear_unisex", "prob": 80 },
       { "group": "pants_unisex", "prob": 50 },
       { "group": "pants_mens", "prob": 60 },
-      { "group": "gloves_unisex", "prob": 20 }
+      { "group": "gloves_unisex", "prob": 30 },
+      { "group": "hats_unisex", "prob": 10 }
     ]
   },
   {
@@ -841,17 +846,18 @@
     "entries": [
       { "group": "accesories_personal_unisex", "prob": 30 },
       { "group": "accesories_personal_womens", "prob": 5 },
-      { "group": "masks_unisex", "prob": 5 },
+      { "group": "masks_unisex", "prob": 3 },
       { "group": "socks_unisex", "prob": 70 },
-      { "group": "scarfs_unisex", "prob": 10 },
+      { "group": "scarfs_unisex", "prob": 30 },
       { "group": "shirts_womens", "prob": 60 },
       { "group": "shirts_unisex", "prob": 50 },
       { "group": "underwear_womens", "prob": 80 },
       { "group": "underwear_unisex", "prob": 80 },
       { "group": "pants_unisex", "prob": 50 },
       { "group": "pants_womens", "prob": 60 },
       { "group": "gloves_womens", "prob": 5 },
-      { "group": "gloves_unisex", "prob": 30 }
+      { "group": "gloves_unisex", "prob": 30 },
+      { "group": "hats_unisex", "prob": 10 }
     ]
   }
 ]
diff --git a/data/mods/Magiclysm/npc/classes.json b/data/mods/Magiclysm/npc/classes.json
@@ -75,5 +75,43 @@
       { "skill": "spellcraft", "bonus": { "rng": [ 1, 3 ] } }
     ],
     "spells": [ { "id": "light_healing", "level": 3 }, { "id": "bio_bonespear", "level": 6 } ]
+  },
+  {
+    "type": "npc_class",
+    "id": "NC_NPC_MUTANT_MANATOUCHED",
+    "name": "Manatouched Mutant",
+    "job_description": "I'm becoming something more than mortal.  I need to find a way off this plane.",
+    "skills": [
+      { "skill": "spellcraft", "bonus": { "rng": [ 3, 6 ] } },
+      { "skill": "chemistry", "bonus": { "rng": [ 3, 6 ] } },
+      { "skill": "gun", "bonus": { "rng": [ 2, 4 ] } }
+    ],
+    "bonus_int": 4,
+    "bonus_per": 2,
+    "traits": [
+      { "group": "trait_mutant_npc_common" },
+      { "group": "BG_survival_story_UNIVERSAL" },
+      { "group": "NPC_starting_traits" },
+      { "group": "trait_group_manatouched" },
+      {
+        "distribution": [ { "group": "trait_group_manatouched_nonthres" }, { "group": "trait_group_manatouched_postthres" } ]
+      }
+    ]
+  },
+  {
+    "type": "npc_class",
+    "id": "NC_NPC_MUTANT_BDRAGON",
+    "name": "Black Dragon Mutant",
+    "job_description": "I've got the blood of dragons in my veins.  I need more.",
+    "skills": [ { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "unarmed", "bonus": { "rng": [ 3, 6 ] } } ],
+    "traits": [
+      { "group": "trait_mutant_npc_common" },
+      { "group": "BG_survival_story_UNIVERSAL" },
+      { "group": "NPC_starting_traits" },
+      { "group": "trait_group_bdragon" },
+      {
+        "distribution": [ { "group": "trait_group_bdragon_nonthres" }, { "group": "trait_group_bdragon_postthres" } ]
+      }
+    ]
   }
 ]
diff --git a/data/mods/Magiclysm/npc/trait_groups.json b/data/mods/Magiclysm/npc/trait_groups.json
@@ -0,0 +1,140 @@
+[
+  {
+    "type": "trait_group",
+    "id": "trait_mutant_npc_common",
+    "subtype": "collection",
+    "traits": [
+      { "distribution": [ { "trait": "FASTLEARNER" }, { "trait": "SLOWLEARNER" } ], "prob": 10 },
+      {
+        "distribution": [ { "trait": "FASTREADER" }, { "trait": "SLOWREADER" }, { "trait": "ILLITERATE", "prob": 5 } ],
+        "prob": 10
+      },
+      { "distribution": [ { "trait": "PARKOUR" }, { "trait": "BADKNEES" } ], "prob": 10 },
+      { "distribution": [ { "trait": "LIAR" }, { "trait": "TRUTHTELLER" } ], "prob": 10 },
+      {
+        "distribution": [
+          { "trait": "MARTIAL_ARTS" },
+          { "trait": "MARTIAL_ARTS2" },
+          { "trait": "MARTIAL_ARTS3" },
+          { "trait": "MARTIAL_ARTS4" },
+          { "trait": "MARTIAL_ARTS5" }
+        ],
+        "prob": 10
+      },
+      { "trait": "DEFT", "prob": 10 },
+      { "trait": "ADRENALINE", "prob": 10 },
+      { "trait": "OUTDOORSMAN", "prob": 10 },
+      { "trait": "PAINRESIST", "prob": 10 },
+      { "trait": "QUICK", "prob": 10 },
+      { "trait": "ROBUST", "prob": 10 },
+      { "trait": "SELFAWARE", "prob": 10 },
+      { "trait": "SPIRITUAL", "prob": 10 },
+      { "trait": "STYLISH", "prob": 10 },
+      { "trait": "ALBINO", "prob": 5 },
+      { "trait": "ASTHMA", "prob": 5 },
+      { "trait": "CHEMIMBALANCE", "prob": 10 },
+      { "trait": "HOARDER", "prob": 10 },
+      { "trait": "JITTERY", "prob": 10 },
+      { "trait": "MOODSWINGS", "prob": 10 },
+      { "trait": "SAVANT", "prob": 10 },
+      { "trait": "SCHIZOPHRENIC", "prob": 10 },
+      { "trait": "SQUEAMISH", "prob": 10 },
+      { "group": "Appearance_demographics", "prob": 100 }
+    ]
+  },
+  {
+    "type": "trait_group",
+    "id": "trait_group_manatouched",
+    "subtype": "collection",
+    "traits": [
+      { "trait": "FEYHEARING", "prob": 50 },
+      { "trait": "FASTREADER", "prob": 50 },
+      { "trait": "FASTLEARNER", "prob": 50 },
+      { "trait": "GOODMEMORY", "prob": 50 },
+      { "trait": "SPIRITUAL", "prob": 50 },
+      { "trait": "LOVES_BOOKS" },
+      { "trait": "BADCARDIO", "prob": 50 },
+      { "trait": "SLOWHEALER", "prob": 50 },
+      { "trait": "ASTHMA", "prob": 50 }
+    ]
+  },
+  {
+    "type": "trait_group",
+    "id": "trait_group_manatouched_nonthres",
+    "subtype": "collection",
+    "traits": [
+      { "trait": "MANA_ADD_MANATOUCHED", "prob": 50 },
+      { "trait": "MANA_REGEN_MANATOUCHED", "prob": 50 },
+      { "trait": "MANA_LUM", "prob": 50 },
+      { "trait": "WEAK", "prob": 50 },
+      { "trait": "ROT2", "prob": 25 },
+      { "trait": "BIOLUM0", "prob": 65 },
+      { "distribution": [ { "trait": "MANA_MULT3" }, { "trait": "MANA_MULT_MANATOUCHED" } ] }
+    ]
+  },
+  {
+    "type": "trait_group",
+    "id": "trait_group_manatouched_postthres",
+    "subtype": "collection",
+    "traits": [
+      { "trait": "THRESH_MANA" },
+      { "distribution": [ { "trait": "MANA_SIPHON_1" }, { "trait": "MANA_SIPHON_2" } ] },
+      { "trait": "MANA_SEEKER_BOLTS" },
+      { "trait": "ALBINO", "prob": 50 },
+      { "trait": "MANA_CRYST_MANA", "prob": 50 },
+      { "trait": "MANA_SUBTLE_SPELL", "prob": 50 },
+      { "trait": "MANA_SILENT_SPELL", "prob": 50 },
+      { "trait": "MANA_REGEN_MANATOUCHED", "prob": 50 }
+    ]
+  },
+  {
+    "type": "trait_group",
+    "id": "trait_group_bdragon",
+    "subtype": "collection",
+    "traits": [
+      { "trait": "GOODHEARING", "prob": 50 },
+      { "distribution": [ { "trait": "DRAGON_STR" }, { "trait": "DRAGON_STR2" }, { "trait": "DRAGON_STR3" } ] },
+      { "trait": "PAINRESIST", "prob": 50 },
+      { "trait": "ANTIJUNK", "prob": 50 },
+      { "trait": "NAUSEA", "prob": 50 },
+      { "trait": "HUNGER", "prob": 50 },
+      { "trait": "ADDICTIVE", "prob": 50 },
+      { "trait": "CLUMSY", "prob": 50 },
+      { "trait": "HOARDER", "prob": 50 },
+      { "trait": "LIZ_EYE", "prob": 50 },
+      { "trait": "LARGE_DRAGON", "prob": 20 },
+      { "trait": "SCALES", "prob": 30 },
+      { "trait": "THIRST2", "prob": 40 },
+      { "trait": "CARNIVORE", "prob": 70 },
+      { "trait": "DRAGONBLOOD", "prob": 40 },
+      { "trait": "HISS", "prob": 60 }
+    ]
+  },
+  {
+    "type": "trait_group",
+    "id": "trait_group_bdragon_nonthres",
+    "subtype": "collection",
+    "traits": [
+      { "trait": "TERRIFYING", "prob": 50 },
+      { "trait": "BADTEMPER", "prob": 50 },
+      { "trait": "CHEMIMBALANCE", "prob": 50 },
+      { "trait": "POISRESIST", "prob": 50 },
+      { "trait": "TOE_CLAWS", "prob": 50 },
+      { "trait": "SCALES", "prob": 50 }
+    ]
+  },
+  {
+    "type": "trait_group",
+    "id": "trait_group_bdragon_postthres",
+    "subtype": "collection",
+    "traits": [
+      { "trait": "THRESH_DRAGON_BLACK" },
+      { "trait": "LIZ_IR", "prob": 50 },
+      { "trait": "REGEN_LIZ", "prob": 50 },
+      { "trait": "DRAGON_SCALES_BLACK", "prob": 50 },
+      { "trait": "DRAGON_FEET", "prob": 50 },
+      { "trait": "LARGE_OK_DRAGON", "prob": 50 },
+      { "trait": "DRAGON_BREATH_BLACK", "prob": 50 }
+    ]
+  }
+]