Merge pull request #83299 from Standing-Storm/crystallized-shatter-changes

[Magiclysm] Rework crystallized mana from mana crystals

Author: Standing-Storm

data/mods/Magiclysm/cooking_components.json

@@ -20,13 +20,24 @@
         [ "mossling_fur", 8 ],
         [ "dryad_bark", 3 ],
         [ "gnome_eye", 2 ],
-        [ "bracken_eye", 1 ]
+        [ "bracken_eye", 1 ],
+        [ "dragon_blood", 1 ],
+        [ "glowing_mushroom", 1 ]
       ]
     ]
   },
   {
     "id": "mana_energy_strong",
     "type": "requirement",
-    "components": [ [ [ "golden_reed_stalk", 1 ], [ "funnelcap_chunk", 5 ], [ "bracken_eye", 1 ], [ "dryad_bark", 10 ] ] ]
+    "components": [
+      [
+        [ "golden_reed_stalk", 1 ],
+        [ "funnelcap_chunk", 5 ],
+        [ "bracken_eye", 1 ],
+        [ "dryad_bark", 10 ],
+        [ "dragon_blood", 1 ],
+        [ "glowing_mushroom", 10 ]
+      ]
+    ]
   }
 ]

data/mods/Magiclysm/effect_on_conditions/spellcasting/difficulty_modifiers.json

@@ -183,5 +183,20 @@
       { "math": [ "u_spellcasting_adjustment('difficulty', 'mod': 'magiclysm',  'flag_blacklist': 'PSIONIC') = 999" ] },
       { "math": [ "u_spellcasting_adjustment('cost',  'mod': 'magiclysm', 'flag_blacklist': 'PSIONIC') = 999" ] }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_MANA_OVERLOAD_MAKES_SPELLS_MORE_DIFFICULT",
+    "eoc_type": "EVENT",
+    "required_event": "opens_spellbook",
+    "condition": { "u_has_effect": "effect_mana_overload" },
+    "effect": [
+      {
+        "math": [ "u_spellcasting_adjustment('difficulty', 'mod': 'magiclysm')", "=", "(u_effect_intensity('effect_mana_overload') )" ]
+      },
+      {
+        "math": [ "u_spellcasting_adjustment('cost',  'mod': 'magiclysm')", "=", "(u_effect_intensity('effect_mana_overload') / 2)" ]
+      }
+    ]
   }
 ]

data/mods/Magiclysm/effects/effects.json

@@ -1988,6 +1988,20 @@
     "base_mods": { "speed_mod": [ -1 ] },
     "scaling_mods": { "speed_mod": [ -1 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "effect_mana_overload",
+    "name": [ "Mana Overload" ],
+    "desc": [ "Your leylines are overloaded with a surfeit of mana.  It is much harder to control the mana flow." ],
+    "apply_message": "You feel a tingling sensation all along your leylines.",
+    "remove_message": "Your leylines finally calm down.",
+    "max_intensity": 3,
+    "enchantments": [
+      {
+        "values": [ { "value": "REGEN_MANA", "multiply": { "math": [ "-0.3 + (u_effect_intensity('effect_mana_overload') * -0.2)" ] } } ]
+      }
+    ]
+  },
   {
     "id": "effect_dispel_magic",
     "type": "effect_type",

data/mods/Magiclysm/field.json

@@ -317,5 +317,65 @@
     "priority": 8,
     "half_life": "10 seconds",
     "phase": "gas"
+  },
+  {
+    "id": "fd_mana_overload",
+    "type": "field_type",
+    "display_field": true,
+    "phase": "gas",
+    "percent_spread": 5,
+    "half_life": "10 seconds",
+    "intensity_levels": [
+      {
+        "name": "shimmering air",
+        "sym": "~",
+        "color": "blue",
+        "dangerous": true,
+        "effects": [
+          {
+            "effect_id": "effect_mana_overload",
+            "min_duration": "15 minutes",
+            "max_duration": "45 minutes",
+            "intensity": 1,
+            "immune_in_vehicle": true,
+            "is_environmental": false
+          }
+        ]
+      },
+      {
+        "name": "glittering air",
+        "sym": "~",
+        "color": "blue",
+        "dangerous": false,
+        "light_emitted": 1,
+        "effects": [
+          {
+            "effect_id": "effect_mana_overload",
+            "intensity": 2,
+            "min_duration": "2 hours",
+            "max_duration": "4 hours",
+            "immune_in_vehicle": true,
+            "is_environmental": false
+          }
+        ]
+      },
+      {
+        "name": "glowing air",
+        "sym": "~",
+        "color": "blue",
+        "dangerous": true,
+        "light_emitted": 10,
+        "effects": [
+          {
+            "effect_id": "effect_mana_overload",
+            "intensity": 3,
+            "min_duration": "12 hours",
+            "max_duration": "24 hours",
+            "immune_in_vehicle": true,
+            "is_environmental": false
+          }
+        ]
+      }
+    ]
   }
 ]

data/mods/Magiclysm/furniture_and_terrain/furniture.json

@@ -197,13 +197,15 @@
     "emissions": [ "emit_glimmer" ],
     "light_emitted": 12,
     "bash": {
-      "str_min": 25,
-      "str_max": 35,
-      "sound": "glass shattering!",
+      "str_min": 40,
+      "str_max": 160,
+      "sound": "crystal shattering!",
       "sound_fail": "mana crackling!",
+      "hit_field": [ "fd_mana_overload", 1 ],
+      "destroyed_field": [ "fd_mana_overload", 3 ],
       "items": [
-        { "item": "crystallized_mana", "charges": [ 0, 100 ] },
-        { "item": "small_mana_crystal", "count": [ 0, 3 ] },
+        { "item": "crystallized_mana_raw", "count": [ 4, 8 ] },
+        { "item": "small_mana_crystal", "count": [ 0, 2 ] },
         { "item": "glass_shard", "count": [ 8, 12 ] }
       ]
     }

data/mods/Magiclysm/itemgroups/itemgroups.json

@@ -38,6 +38,7 @@
         { "group": "spellbook_tier_0", "prob": 80 },
         { "item": "magazine_augmentative_review", "prob": 10 },
         { "group": "spellbook_loot_0", "prob": 4 },
+        { "item": "alchemy_mana_processing", "prob": 2 },
         { "item": "history_botanical_enchantment", "prob": 2 }
       ]
     }
@@ -72,6 +73,7 @@
         { "group": "dragon_books", "prob": 3 },
         { "item": "spellcraft_theory", "prob": 2 },
         { "item": "caster_boosts_info", "prob": 2 },
+        { "item": "alchemy_mana_processing", "prob": 2 },
         { "item": "alchemy_illegal", "prob": 1 },
         { "item": "alchemy_master", "prob": 1 }
       ]
@@ -87,6 +89,7 @@
         { "group": "magic_recipe_basic", "prob": 6 },
         { "group": "magic_recipe_advanced", "prob": 2 },
         { "group": "dragon_books", "prob": 5 },
+        { "item": "alchemy_mana_processing", "prob": 5 },
         { "group": "spellcraft_books", "prob": 4 },
         { "item": "alchemy_illegal", "prob": 1 },
         { "item": "alchemy_master", "prob": 1 }
@@ -1656,7 +1659,10 @@
         "distribution": [ { "group": "enchanted_rings_common", "prob": 30 }, { "group": "enchanted_rings_uncommon", "prob": 10 } ],
         "prob": 40
       },
-      { "item": "crystallized_mana", "prob": 50, "charges": [ 1, 10 ] },
+      {
+        "distribution": [ { "item": "crystallized_mana_raw", "prob": 1 }, { "item": "crystallized_mana", "prob": 1, "charges": [ 1, 10 ] } ],
+        "prob": 50
+      },
       [ "copper_circlet", 10 ],
       [ "cauldron_orichalcum", 1 ],
       { "item": "small_mana_crystal", "prob": 40, "charges": [ 5, 50 ] }

data/mods/Magiclysm/itemgroups/recipe_books.json

@@ -13,7 +13,8 @@
       [ "journeyman_enchanting", 20 ],
       [ "arcane_archer_companion", 15 ],
       [ "cooking_poison", 15 ],
-      [ "metal_legends", 5 ]
+      [ "metal_legends", 5 ],
+      [ "alchemy_mana_processing", 10 ]
     ]
   },
   {

data/mods/Magiclysm/items/alchemy_items.json

@@ -31,6 +31,20 @@
     "//": "Potion recipes that require a full owlbear egg could also instead require larger amounts of stone shell.  Since 1 egg gives 3 shells, you could perhaps have 1 egg be equivalent to 5 or more shells when making potions.",
     "melee_damage": { "bash": 5, "cut": 3 }
   },
+  {
+    "id": "crystallized_mana_raw",
+    "type": "ITEM",
+    "category": "spare_parts",
+    "name": { "str": "raw mana crystal" },
+    "description": "A large chunk of crystal, removed from a leyline nexus.  It requires alchemical processing to transform into crystallized mana.",
+    "weight": "10325 g",
+    "volume": "5 L",
+    "price": "50 USD",
+    "price_postapoc": "3 USD 50 cent",
+    "material": [ "crystallized_mana" ],
+    "symbol": "=",
+    "color": "cyan"
+  },
   {
     "id": "copper_infuser",
     "copy-from": "copper_bracelet",

data/mods/Magiclysm/items/recipe_books.json

@@ -125,6 +125,27 @@
     "read_skill": "chemistry",
     "read_fun": -2
   },
+  {
+    "id": "alchemy_mana_processing",
+    "type": "ITEM",
+    "subtypes": [ "BOOK" ],
+    "category": "manuals",
+    "name": { "str": "Quintessential Refinement", "str_pl": "copies of Quintessential Refinement" },
+    "description": "A reference manual for the process needed to turn raw mana crystals into useful crystallized mana, for those who prefer to source their mana from nature instead of the time-consuming and extremely fatiguing process of condensing the mana using thaumaturgy.",
+    "weight": "425 g",
+    "volume": "450 ml",
+    "price": "50 USD",
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "white",
+    "required_level": 6,
+    "max_level": 9,
+    "intelligence": 12,
+    "time": "20 m",
+    "melee_damage": { "bash": 6 },
+    "read_skill": "chemistry",
+    "read_fun": -2
+  },
   {
     "id": "techno_basic",
     "type": "ITEM",

data/mods/Magiclysm/recipes/alchemy.json

@@ -157,5 +157,35 @@
     "subcategory": "CSC_ENCHANTED_OTHER",
     "autolearn": true,
     "charges": 10
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "crystallized_mana",
+    "id_suffix": "using_alchemy",
+    "charges": 8,
+    "batch_time_factors": [ 40, 3 ],
+    "qualities": [
+      { "id": "CONCENTRATE", "level": 1 },
+      { "id": "FINE_DISTILL", "level": 1 },
+      { "id": "SEPARATE", "level": 1 },
+      { "id": "CONTAIN", "level": 1 },
+      { "id": "MANA_FOCUS", "level": 1 }
+    ],
+    "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
+    "components": [
+      [ [ "crystallized_mana_raw", 1 ] ],
+      [ [ "mana_energy_weak", 1, "LIST" ] ],
+      [ [ "mercury", 5 ] ],
+      [ [ "chem_sulphur", 20 ], [ "chunk_sulfur", 1 ] ]
+    ],
+    "proficiencies": [ { "proficiency": "prof_alchemy", "required": false } ],
+    "time": "4 h",
+    "skill_used": "chemistry",
+    "difficulty": 5,
+    "skills_required": [ "spellcraft", 6 ],
+    "book_learn": [ [ "alchemy_master", 6 ], [ "alchemy_mana_processing", 4 ] ],
+    "category": "CC_ENCHANTED",
+    "subcategory": "CSC_ENCHANTED_OTHER"
   }
 ]