Merge branch 'Kenan2000:master' into Bugs-Life

Author: Theawesomeboophis

Kenan-Modpack/AdvancedGear_CDDA_Mod/items/vehicle/vehicle_parts.json

@@ -1,4 +1,19 @@
 [
+  {
+    "id": "TRACKED",
+    "type": "json_flag",
+    "context": [ "vehicle_part" ]
+  },
+  {
+    "id": "TOOL_NONE",
+    "type": "json_flag",
+    "context": [ "vehicle_part" ]
+  },
+  {
+    "id": "NO_JACK",
+    "type": "json_flag",
+    "context": [ "vehicle_part" ]
+  },
   {
     "id": "nanovp",
     "type": "vehicle_part",

Kenan-Modpack/Arcana/chargen/scenarios.json

@@ -42,7 +42,7 @@
     "id": "arcane_urban",
     "points": 1,
     "start_name": "Hidden In Plain Sight",
-    "allowed_locs": [ "arcanist_basement", "cathedral_basement" ],
+    "allowed_locs": [ "arcanist_basement", "cathedral_basement", "necropolis_basement" ],
     "professions": [
       "unemployed",
       "priest",

Kenan-Modpack/Arcana/chargen/start_locations.json

@@ -36,5 +36,11 @@
     "id": "cathedral_basement",
     "name": { "str": "Cathedral" },
     "terrain": [ "cathedral_b_NW" ]
+  },
+  {
+    "type": "start_location",
+    "ident": "necropolis_basement",
+    "name": "Ruined City …?",
+    "terrain": [ "necropolis_b_54" ]
   }
 ]

Kenan-Modpack/Arcana/item_groups/item_groups_chalice.json

@@ -61,16 +61,20 @@
     "id": "chalice_cult_crafting",
     "type": "item_group",
     "items": [
-      [ "essence", 10 ],
-      { "item": "essence_blood", "prob": 10, "count": [ 1, 3 ] },
-      [ "gold_small", 25 ],
-      [ "silver_small", 10 ],
-      [ "fur", 10 ],
-      [ "feather", 10 ],
-      [ "charcoal", 5 ],
-      [ "scrap", 20 ],
-      [ "bee_sting", 5 ],
-      [ "chitin_piece", 15 ]
+      [ "bowl_clay", 20 ],
+      { "item": "candle", "prob": 15, "charges": [ 75, 100 ] },
+      { "item": "matches", "prob": 15, "charges": [ 15, 20 ] },
+      { "item": "silver_small", "prob": 10, "charges": [ 25, 100 ] },
+      { "item": "gold_small", "prob": 40, "charges": [ 25, 100 ] },
+      { "item": "scrap", "prob": 15, "count": [ 1, 10 ] },
+      { "item": "feather", "prob": 5, "charges": [ 10, 20 ] },
+      { "item": "chitin_piece", "prob": 5, "charges": [ 1, 5 ] },
+      { "item": "fur", "prob": 10, "count": [ 1, 5 ] },
+      { "item": "paper", "prob": 5, "charges": [ 20, 50 ] },
+      [ "bee_sting", 10 ],
+      { "group": "arcana_hunt_random", "prob": 25 },
+      { "item": "essence", "prob": 40, "count": [ 1, 3 ] },
+      { "item": "essence_blood", "prob": 35, "count": [ 2, 6 ] }
     ]
   },
   {

Kenan-Modpack/Arcana/item_groups/item_groups_cleansingflame.json

@@ -88,12 +88,22 @@
     "id": "cleansing_flame_crafting",
     "type": "item_group",
     "items": [
-      { "item": "essence_dull", "prob": 30, "count-min": 6, "count-max": 16 },
-      [ "gold_small", 5 ],
-      [ "silver_small", 15 ],
-      [ "feather", 15 ],
-      [ "scrap", 20 ],
-      [ "copper", 25 ]
+      [ "holy_symbol", 15 ],
+      [ "pot", 5 ],
+      [ "bowl_clay", 10 ],
+      { "item": "candle", "prob": 5, "charges": [ 75, 100 ] },
+      { "item": "matches", "prob": 15, "charges": [ 15, 20 ] },
+      { "item": "copper", "prob": 5, "charges": [ 25, 100 ] },
+      { "item": "scrap_copper", "prob": 5, "count": [ 1, 3 ] },
+      { "item": "silver_small", "prob": 10, "charges": [ 25, 100 ] },
+      { "item": "gold_small", "prob": 10, "charges": [ 25, 100 ] },
+      { "item": "CF_golden_scale", "prob": 20, "count": [ 2, 5 ] },
+      { "item": "scrap", "prob": 15, "count": [ 5, 10 ] },
+      { "item": "leather", "prob": 15, "count": [ 5, 10 ] },
+      { "item": "paper", "prob": 10, "charges": [ 20, 50 ] },
+      [ "chem_ethanol", 10 ],
+      { "group": "arcana_hunt_random", "prob": 25 },
+      { "item": "essence_dull", "prob": 75, "count": [ 8, 16 ] }
     ]
   },
   {

Kenan-Modpack/Arcana/item_groups/item_groups_general.json

@@ -64,14 +64,23 @@
     "id": "magic_crafting",
     "type": "item_group",
     "items": [
-      [ "gold_small", 1 ],
-      [ "gold_small", 10 ],
-      [ "silver_small", 2 ],
-      [ "silver_small", 20 ],
-      [ "scrap", 15 ],
-      [ "feather", 5 ],
-      [ "copper", 15 ],
-      [ "diamond", 1 ],
+      [ "holy_symbol", 5 ],
+      [ "pot", 5 ],
+      [ "bowl_clay", 15 ],
+      { "item": "candle", "prob": 10, "charges": [ 75, 100 ] },
+      { "item": "matches", "prob": 15, "charges": [ 15, 20 ] },
+      { "item": "copper", "prob": 5, "charges": [ 25, 100 ] },
+      { "item": "scrap_copper", "prob": 10, "count": [ 1, 3 ] },
+      { "item": "silver_small", "prob": 15, "charges": [ 25, 100 ] },
+      { "item": "gold_small", "prob": 15, "charges": [ 25, 100 ] },
+      { "group": "gemstones", "prob": 5 },
+      { "item": "scrap", "prob": 15, "count": [ 1, 10 ] },
+      { "item": "feather", "prob": 5, "charges": [ 10, 20 ] },
+      { "item": "thread", "prob": 5, "charges": [ 30, 90 ] },
+      { "item": "bone", "prob": 10, "count": [ 1, 5 ] },
+      { "item": "paper", "prob": 5, "charges": [ 20, 50 ] },
+      [ "chem_ethanol", 10 ],
+      { "group": "arcana_hunt_random", "prob": 25 },
       { "item": "essence", "prob": 25, "count": [ 1, 3 ] },
       { "item": "essence_blood", "prob": 25, "count": [ 2, 6 ] },
       { "item": "essence_dull", "prob": 25, "count": [ 8, 16 ] }

Kenan-Modpack/Arcana/item_groups/item_groups_sanguine.json

@@ -56,15 +56,25 @@
     "id": "sanguine_cult_crafting",
     "type": "item_group",
     "items": [
-      { "item": "essence_blood", "prob": 30, "count": [ 1, 3 ] },
-      [ "gold_small", 10 ],
-      [ "silver_small", 25 ],
-      [ "bone_human", 25 ],
-      [ "rag", 15 ],
-      [ "vacutainer", 20 ],
-      [ "scrap", 30 ],
-      [ "diamond", 5 ],
-      [ "jade_brooch", 5 ]
+      [ "vacutainer", 25 ],
+      [ "pot", 5 ],
+      [ "bowl_clay", 10 ],
+      { "item": "candle", "prob": 5, "charges": [ 75, 100 ] },
+      { "item": "matches", "prob": 5, "charges": [ 15, 20 ] },
+      { "item": "silver_small", "prob": 20, "charges": [ 25, 100 ] },
+      [ "peridot", 2 ],
+      [ "emerald", 2 ],
+      [ "jade_brooch", 1 ],
+      [ "pearl", 3 ],
+      [ "diamond", 2 ],
+      { "item": "scrap", "prob": 5, "count": [ 1, 10 ] },
+      { "item": "leather", "prob": 15, "charges": [ 10, 20 ] },
+      [ "chem_nitric_acid", 10 ],
+      { "item": "bone_human", "prob": 15, "count": [ 1, 5 ] },
+      [ "chem_ethanol", 5 ],
+      { "group": "arcana_hunt_random", "prob": 25 },
+      { "item": "essence", "prob": 25, "count": [ 1, 3 ] },
+      { "item": "essence_blood", "prob": 50, "count": [ 2, 6 ] }
     ]
   },
   {

Kenan-Modpack/Arcana/items/books.json

@@ -302,7 +302,7 @@
     "volume": "100ml",
     "//": "All reference notes are post-cataclysm, and only useful to people already intimately familiar with the base book.",
     "price_postapoc": 150,
-    "description": "An assortment of neatly-folded papers filled with esoteric chemical formulae and historical footnotes, some of which seem to be excerpts from old texts in Greek, Latin, Arabic, and even Chinese.  It details the findings and practices of an experienced alchemist, containing nothing but essential information and reminders for the presumably well-learned author's benefit."
+    "description": "An assortment of neatly-folded papers filled with esoteric chemical formulae and historical footnotes, some of which seem to be excerpts from old texts in Greek, Latin, Arabic, and even Chinese.  It details the findings and practices of an experienced alchemist.  It can be used instead of History of Alchemy for recipes that require the book as a reference tool."
   },
   {
     "id": "index_scrollcraft",
@@ -313,7 +313,7 @@
     "weight": "60 g",
     "volume": "100ml",
     "price_postapoc": 200,
-    "description": "A handful of rolled up papers, filled with quotations and crude sketches of strange religious scenery.  It details the studies of an experienced scribe well-versed in knowledge disguised as exotic religious poetry, containing nothing but essential information and reminders for the presumably well-learned author's benefit."
+    "description": "A handful of rolled up papers, filled with quotations and crude sketches of strange religious scenery.  It details the studies of an experienced scribe well-versed in knowledge disguised as exotic religious poetry.  It can be used instead of The Six Pillars for recipes that require the book as a reference tool."
   },
   {
     "id": "index_bloodmagic",
@@ -324,7 +324,7 @@
     "weight": "60 g",
     "volume": "100ml",
     "price_postapoc": 210,
-    "description": "A dog-eared, ragged collection of papers, filled with outlines of morbid rituals and macabre references on matters of blood.  It details the studies of an experienced blood mage, containing nothing but essential information and reminders for the presumably well-learned author's benefit."
+    "description": "A dog-eared, ragged collection of papers, filled with outlines of morbid rituals and macabre references on matters of blood.  It details the studies of an experienced blood mage.  It can be used instead of Sanguine Codex for recipes that require the book as a reference tool."
   },
   {
     "id": "index_hexenhammer",
@@ -335,7 +335,7 @@
     "weight": "60 g",
     "volume": "100ml",
     "price_postapoc": 210,
-    "description": "A carefully-gathered collection of papers outlining sacred rites and vital practices, mixing various religious practices attested to a order dedicated protecting humanity from dangerous magic.  It details the studies of an experienced mage hunter, containing nothing but essential information and reminders for the presumably well-learned author's benefit."
+    "description": "A carefully-gathered collection of papers outlining sacred rites and vital practices, mixing various religious practices attested to a order dedicated protecting humanity from dangerous magic.  It details the studies of an experienced mage hunter.  It can be used instead of The Cleansing Flame for recipes that require the book as a reference tool."
   },
   {
     "id": "index_sacrifice",
@@ -346,7 +346,7 @@
     "weight": "60 g",
     "volume": "100ml",
     "price_postapoc": 200,
-    "description": "A carefully-preserved assortment of papers, mostly filled with hymns to an otherworldly god and other unusual quotations.  On further reading it becomes evident that each song and passage holds ritual purpose, detailing the studies of an experienced scholar of this unearthly faith, containing nothing but essential information and reminders for the presumably well-learned author's benefit."
+    "description": "A carefully-preserved assortment of papers, mostly filled with hymns to an otherworldly god and other unusual quotations.  On further reading it becomes evident that each song and passage holds ritual purpose, detailing the studies of an experienced scholar of this unearthly faith.  It can be used instead of Oaths to the Chalice for recipes that require the book as a reference tool."
   },
   {
     "id": "index_syncretism",
@@ -357,7 +357,7 @@
     "weight": "60 g",
     "volume": "100ml",
     "price_postapoc": 270,
-    "description": "A mish-mash of papers filled with all manner of strange rituals seemingly from various contradictory sources. Whoever wrote this collection was a student of a well-traveled arcanist, filling their own research with essential information and reminders for the presumably well-learned author's benefit."
+    "description": "A mish-mash of papers filled with all manner of strange rituals seemingly from various contradictory sources. Whoever wrote this collection was a student of a well-traveled arcanist, filling their own research with essential information and reminders for the presumably well-learned author's benefit.  It can be used instead of A Story in Shadow for recipes that require the book as a reference tool."
   },
   {
     "id": "index_summoning",
@@ -368,7 +368,7 @@
     "weight": "60 g",
     "volume": "100ml",
     "price_postapoc": 200,
-    "description": "A neatly-ordered collection of papers, filled with strange symbols and rambling writing.  At several points the text is interrupted by detailed sketches of disturbing otherworldly horrors.  It details the findings of an experienced summoner, containing nothing but essential information and reminders for the presumably well-learned author's benefit."
+    "description": "A neatly-ordered collection of papers, filled with strange symbols and rambling writing.  At several points the text is interrupted by detailed sketches of disturbing otherworldly horrors.  It details the findings of an experienced summoner.  It can be used instead of To Master the Unknown for recipes that require the book as a reference tool."
   },
   {
     "id": "cf_rep_trade_arrangement",

Kenan-Modpack/Arcana/items/comestibles.json

@@ -298,7 +298,7 @@
     "comestible_type": "MED",
     "category": "tools",
     "name": { "str": "air talisman" },
-    "description": "A crude paper talisman marked with strange patterns, anointed with a pure sacrifice.  Using it will bind nearby summoned monsters as familiars, if they aren't hostile, allowing them to be used for more complex work.  In addition it will imbue them with protective energies, granting immunity to most environmental hazards save fire.  The protective effect will last a day, while the binding effect lasts 200 days.",
+    "description": "A crude paper talisman marked with strange patterns, anointed with a pure sacrifice.  Using it will imbue any nearby summoned monster with protective energies, if they aren't hostile, granting immunity to most environmental hazards save fire.  It will also heal nearby allies, and bind transient summons to function as familiars until they vanish.  The protective effect will last a day and only affects summoned monsters, while the healing affects all allies.",
     "price_postapoc": "24 USD",
     "weight": "150 g",
     "volume": "100 ml",

Kenan-Modpack/Arcana/items/ranged.json

@@ -11,8 +11,8 @@
     "price": "1500 USD",
     "price_postapoc": "100 USD",
     "to_hit": -2,
-    "bashing": 12,
-    "cutting": 1,
+    "bashing": 8,
+    "cutting": 10,
     "material": [ "gold", "silver" ],
     "symbol": ",",
     "looks_like": "gold_bracelet",