[Magiclysm] Cooking is good for your survivability (#60307)

* initial commit * forgot to add a teleport rand to loot group * balancing the toxin flask * balance the potion craft time for a bit * added flask of shadows to loot group * typo fixes (i hope) * replacing armor with effects * lint * plural issues * obsolete prof_fine_alchemy * Add NO_EXPLOSION_SFX to clairvoyance * Attempt to balance recipes * grammar fixes * remove necro_basic from known_bad_density
CleverRaven · Oct 5, 2022 · d65876a · d65876a
1 parent 81e1caf
commit d65876a
Show file tree

Hide file tree

Showing 15 changed files with 1,422 additions and 357 deletions.
diff --git a/data/mods/Magiclysm/Spells/item_only.json b/data/mods/Magiclysm/Spells/item_only.json
diff --git a/data/mods/Magiclysm/cooking_components.json b/data/mods/Magiclysm/cooking_components.json
@@ -3,5 +3,20 @@
     "id": "eggs_bird",
     "type": "requirement",
     "extend": { "components": [ [ [ "egg_owlbear", 1 ] ] ] }
+  },
+  {
+    "id": "hard_liquor_and_whiskflower",
+    "type": "requirement",
+    "components": [ [ [ "hard_liquor_unmixed", 1, "LIST" ], [ "mixed_alcohol_strong", 1 ], [ "whiskflower", 1 ] ] ]
+  },
+  {
+    "id": "mana_energy_weak",
+    "type": "requirement",
+    "components": [ [ [ "lotus", 1 ], [ "funnelcap_chunk", 2 ], [ "mana_dust", 5 ] ] ]
+  },
+  {
+    "id": "mana_energy_strong",
+    "type": "requirement",
+    "components": [ [ [ "golden_reed_stalk", 1 ], [ "funnelcap_chunk", 5 ] ] ]
   }
 ]
diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json
@@ -253,8 +253,8 @@
   },
   {
     "type": "effect_type",
-    "id": "debug_feather_fall",
-    "name": [ "Debug Feather Fall" ],
+    "id": "feather_fall",
+    "name": [ "Pluma" ],
     "desc": [ "You are light as a feather and fall like one." ],
     "apply_message": "Your body feels light as a feather.",
     "remove_message": "The earth pulls you down hard.",
@@ -461,6 +461,103 @@
     "desc": [ "You feel yourself a bit lighter.  You doubt you can lose weight from this." ],
     "base_mods": { "speed_mod": [ 15 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "flask_speed_eff",
+    "name": [ "Velocitas" ],
+    "desc": [ "Make you faster, and allow to hold this state for a while." ],
+    "apply_message": "You feel your legs can work much better than before",
+    "remove_message": "Your speed slows down.",
+    "rating": "good",
+    "base_mods": { "speed_mod": [ 40 ], "stamina_min": [ 20 ] }
+  },
+  {
+    "type": "effect_type",
+    "id": "flask_healing_eff",
+    "name": [ "Sanatio" ],
+    "desc": [ "Improve your organism's ability to heal himself." ],
+    "//": "i have no idea how health works now, so ill just copypaste the nature commune effect and stretch it.",
+    "base_mods": { "health_min": [ 1 ], "health_chance": [ 2880 ], "h_mod_min": [ 1 ], "h_mod_chance": [ 5760 ] }
+  },
+  {
+    "type": "effect_type",
+    "id": "flask_stamina_eff",
+    "name": [ "Constantia" ],
+    "desc": [ "You can't get tired." ],
+    "apply_message": "You feel an energy in your muscles, untired and jazzed.",
+    "remove_message": "The energy in your body fades away.",
+    "base_mods": { "stamina_min": [ 50 ] }
+  },
+  {
+    "id": "flask_excitement",
+    "type": "effect_type",
+    "name": [ "Motus" ],
+    "desc": [ "Your reaction now is way better than before." ],
+    "apply_message": "You can feel the fly wings movement now.",
+    "remove_message": "Your reflexes turn back to normal.",
+    "rating": "good",
+    "show_intensity": false,
+    "enchantments": [
+      {
+        "condition": { "not": "ALWAYS" },
+        "values": [
+          { "value": "SPEED", "add": 30 },
+          { "value": "ATTACK_SPEED", "add": 20 },
+          { "value": "BONUS_DODGE", "add": 2 },
+          { "value": "MELEE_DAMAGE", "multiply": 0.5 }
+        ]
+      }
+    ]
+  },
+  {
+    "id": "flask_resistance",
+    "type": "effect_type",
+    "name": [ "Resistentia" ],
+    "desc": [ "Thin layer of energy cover your body, and allow you to hold more physical damage than before." ],
+    "apply_message": "Your touch sense are blunted for a bit, but your skin feels more dense.",
+    "remove_message": "The sturdy feeling is gone.",
+    "rating": "good",
+    "show_intensity": false,
+    "enchantments": [
+      {
+        "condition": { "not": "ALWAYS" },
+        "values": [ { "value": "ARMOR_BASH", "add": -10 }, { "value": "ARMOR_CUT", "add": -10 }, { "value": "ARMOR_STAB", "add": -10 } ]
+      }
+    ]
+  },
+  {
+    "id": "flask_illumination",
+    "type": "effect_type",
+    "name": [ "Illuminatio" ],
+    "desc": [ "Your body emit a lot of light around." ],
+    "apply_message": "Your skin glow like an old lantern.  You feel no discomfort for some reason.",
+    "remove_message": "Your skin turn back to normal state.",
+    "rating": "good",
+    "show_intensity": false,
+    "enchantments": [ { "condition": { "not": "ALWAYS" }, "values": [ { "value": "LUMINATION", "add": 800 } ] } ]
+  },
+  {
+    "id": "flask_mana_regen",
+    "type": "effect_type",
+    "name": [ "Recuperatio" ],
+    "desc": [ "Increase the amount of ley-lines your body can process at once, making you restore your mana pool faster." ],
+    "apply_message": "You can feel the thinnest ley lines around you.",
+    "remove_message": "The mana senses blunts.",
+    "rating": "good",
+    "show_intensity": false,
+    "enchantments": [ { "condition": { "not": "ALWAYS" }, "values": [ { "value": "REGEN_MANA", "multiply": 2 } ] } ]
+  },
+  {
+    "id": "flask_max_mana",
+    "type": "effect_type",
+    "name": [ "Augere" ],
+    "desc": [ "Increase the amount of mana you can operate." ],
+    "apply_message": "You feel a deep mana well inside your body.",
+    "remove_message": "Your well feels empty now.",
+    "rating": "good",
+    "show_intensity": false,
+    "enchantments": [ { "condition": { "not": "ALWAYS" }, "values": [ { "value": "MAX_MANA", "add": 1500 } ] } ]
+  },
   {
     "id": "flask_regeneration",
     "type": "effect_type",

diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json
@@ -39,7 +39,9 @@
         { "group": "magic_recipe_basic", "prob": 3 },
         { "group": "magic_recipe_advanced", "prob": 1 },
         { "group": "dragon_books", "prob": 3 },
-        { "item": "spellcraft_theory", "prob": 2 }
+        { "item": "spellcraft_theory", "prob": 2 },
+        { "item": "alchemy_illegal", "prob": 1 },
+        { "item": "alchemy_master", "prob": 1 }
       ]
     }
   },
@@ -53,7 +55,9 @@
         { "group": "magic_recipe_basic", "prob": 6 },
         { "group": "magic_recipe_advanced", "prob": 2 },
         { "group": "dragon_books", "prob": 5 },
-        { "group": "spellcraft_books", "prob": 4 }
+        { "group": "spellcraft_books", "prob": 4 },
+        { "item": "alchemy_illegal", "prob": 1 },
+        { "item": "alchemy_master", "prob": 1 }
       ]
     }
   },
@@ -65,7 +69,9 @@
       "items": [
         { "group": "spellbook_loot_1", "prob": 3 },
         { "group": "dragon_books", "prob": 2 },
-        { "group": "spellcraft_books", "prob": 1 }
+        { "group": "spellcraft_books", "prob": 1 },
+        { "item": "alchemy_illegal", "prob": 1 },
+        { "item": "alchemy_master", "prob": 1 }
       ]
     }
   },
@@ -198,7 +204,8 @@
       { "group": "spell_scroll_tier_2", "prob": 30 },
       { "group": "magic_recipe_basic", "prob": 50 },
       { "group": "magic_recipe_advanced", "prob": 16 },
-      { "group": "spellcraft_books", "prob": 40 }
+      { "group": "spellcraft_books", "prob": 40 },
+      { "item": "alchemy_master", "prob": 12 }
     ]
   },
   {
@@ -221,25 +228,98 @@
       { "item": "wand_fireball_minor", "prob": 25, "charges-min": 3, "charges-max": 24 }
     ]
   },
+  {
+    "id": "magic_plants_common",
+    "type": "item_group",
+    "items": [ [ "olieribos", 10 ], [ "whiskflower", 30 ], { "group": "magic_plants_uncommon", "prob": 10 } ]
+  },
+  {
+    "id": "magic_plants_uncommon",
+    "type": "item_group",
+    "items": [
+      [ "kampuch", 6 ],
+      [ "glowing_mushroom", 20 ],
+      [ "horn_moss_capsule", 10 ],
+      [ "wood_barnacle", 10 ],
+      [ "dragon_nail", 10 ],
+      [ "moly_tuber", 10 ],
+      [ "fern_flower", 10 ],
+      [ "funnelcap_chunk", 10 ],
+      { "group": "magic_plants_rare", "prob": 3 }
+    ]
+  },
+  {
+    "id": "magic_plants_rare",
+    "type": "item_group",
+    "items": [ [ "platonic_flower", 10 ], [ "moonflowers", 10 ], [ "golden_reed_stalk", 5 ], [ "sojourners_flower", 5 ] ]
+  },
   {
     "id": "potions_common",
     "type": "item_group",
     "items": [
       [ "mana_potion_lesser", 90 ],
-      [ "mana_potion", 20 ],
+      [ "mana_potion", 5 ],
       [ "mana_potion_greater", 1 ],
+      [ "manatouched_serum", 1 ],
+      [ "flask_illumination", 10 ],
+      [ "flask_rebreather", 10 ],
+      { "group": "potions_uncommon", "prob": 1 }
+    ]
+  },
+  {
+    "id": "potions_uncommon",
+    "type": "item_group",
+    "items": [
+      [ "cats_grace_potion", 10 ],
       [ "ogres_strength_potion", 10 ],
-      [ "foxs_cunning_potion", 10 ],
       [ "eagles_sight_potion", 10 ],
-      [ "cats_grace_potion", 10 ],
-      [ "manatouched_serum", 1 ]
+      [ "foxs_cunning_potion", 10 ],
+      [ "flask_resistance", 10 ],
+      [ "flask_max_mana", 10 ],
+      [ "flask_fireball", 10 ],
+      [ "flask_spear", 10 ],
+      [ "flask_shadow_field", 10 ],
+      { "group": "potions_rare", "prob": 2 },
+      { "group": "potions_illegal", "prob": 1 }
+    ]
+  },
+  {
+    "id": "potions_rare",
+    "type": "item_group",
+    "items": [
+      [ "flask_healing", 10 ],
+      [ "flask_excitement", 10 ],
+      [ "flask_regeneration", 10 ],
+      [ "flask_mana_regen", 10 ],
+      [ "flask_teleport_rand", 10 ],
+      { "group": "potions_illegal", "prob": 1 }
+    ]
+  },
+  {
+    "id": "potions_illegal",
+    "type": "item_group",
+    "items": [
+      [ "flask_confusion", 10 ],
+      [ "flask_teleport", 10 ],
+      [ "flask_invisibility", 10 ],
+      [ "flask_charm", 10 ],
+      [ "flask_mood", 10 ],
+      [ "flask_toxin", 10 ],
+      [ "flask_venom", 10 ]
     ]
   },
+  {
+    "id": "potions_rare",
+    "type": "item_group",
+    "items": [ [ "flask_healing", 10 ], [ "flask_excitement", 10 ], [ "flask_regeneration", 10 ], [ "flask_mana_regen", 10 ] ]
+  },
   {
     "id": "magic_shop_potions",
     "type": "item_group",
     "items": [
       { "group": "potions_common", "prob": 80 },
+      { "group": "potions_uncommon", "prob": 30 },
+      { "group": "potions_rare", "prob": 5 },
       { "group": "alchemy_items", "prob": 30 },
       { "group": "magical_reagents", "prob": 20 },
       [ "crystallized_mana", 55 ],
@@ -257,7 +337,10 @@
       [ "bulette_plate", 10 ],
       [ "cauldron_orichalcum", 7 ],
       [ "mithril_ingot", 2 ],
-      { "item": "bulette_pearl", "prob": 8, "count-min": 1, "count-max": 2 }
+      { "item": "bulette_pearl", "prob": 8, "count-min": 1, "count-max": 2 },
+      { "group": "magic_plants_common", "prob": 6 },
+      { "group": "magic_plants_uncommon", "prob": 3 },
+      { "group": "magic_plants_rare", "prob": 1 }
     ]
   },
   {
@@ -270,8 +353,11 @@
       { "group": "enchanted_tools_plus1", "prob": 10 },
       { "group": "jewelry_safe", "prob": 10 },
       { "group": "jewelry_front", "prob": 8 },
-      { "group": "potions_common", "prob": 15 },
-      { "group": "magical_reagents", "prob": 20 },
+      { "group": "potions_common", "prob": 15, "count-min": 1, "count-max": 3 },
+      { "group": "potions_uncommon", "prob": 7, "count-min": 1, "count-max": 2 },
+      { "group": "potions_rare", "prob": 3 },
+      { "group": "potions_illegal", "prob": 1 },
+      { "group": "magical_reagents", "prob": 45, "count-min": 1, "count-max": 3 },
       {
         "distribution": [
           { "group": "enchanted_wands_lesser", "prob": 15 },
@@ -287,14 +373,20 @@
       { "item": "bone_human", "prob": 60, "count-min": 1, "count-max": 5 },
       { "item": "denarius", "prob": 40, "count-min": 2, "count-max": 5 },
       [ "cauldron_orichalcum", 10 ],
-      { "group": "tools_toolbox", "prob": 10 }
+      { "group": "tools_toolbox", "prob": 20 },
+      { "group": "magic_plants_common", "prob": 40, "count-min": 1, "count-max": 14 },
+      { "group": "magic_plants_uncommon", "prob": 20, "count-min": 1, "count-max": 8 },
+      { "group": "magic_plants_rare", "prob": 5, "count-min": 1, "count-max": 4 }
     ]
   },
   {
     "id": "demon_spider_lair_treasure",
     "type": "item_group",
     "items": [
       { "group": "potions_common", "prob": 20 },
+      { "group": "potions_uncommon", "prob": 20 },
+      { "group": "potions_rare", "prob": 10 },
+      { "group": "potions_illegal", "prob": 10 },
       { "group": "enchanted_wands_lesser", "prob": 15 },
       { "group": "spellbook_loot_1", "prob": 35, "count": [ 1, 3 ] },
       { "group": "enchanted_rings_common", "prob": 20 },
@@ -859,7 +951,12 @@
     "//": "Reagents you'd use in crafting a wide variety of things, including alchemy and rituals.",
     "type": "item_group",
     "subtype": "distribution",
-    "items": [ { "item": "mercury", "prob": 15, "charges-min": 50 } ]
+    "items": [
+      { "item": "mercury", "prob": 15, "charges-min": 50 },
+      { "group": "magic_plants_common", "prob": 6 },
+      { "group": "magic_plants_uncommon", "prob": 3 },
+      { "group": "magic_plants_rare", "prob": 1 }
+    ]
   },
   {
     "id": "science",
@@ -1162,7 +1259,10 @@
       "items": [
         { "group": "enchanted_tokens_tool", "prob": 3 },
         { "group": "enchanted_tokens_weapon", "prob": 2 },
-        { "group": "potions_common", "prob": 12 }
+        { "group": "potions_common", "prob": 12 },
+        { "group": "potions_uncommon", "prob": 6 },
+        { "group": "potions_rare", "prob": 3 },
+        { "group": "potions_illegal", "prob": 1 }
       ]
     }
   },
@@ -1175,6 +1275,9 @@
       { "group": "enchanted_tokens_tool", "prob": 15 },
       { "group": "enchanted_tokens_weapon", "prob": 5 },
       { "group": "potions_common", "prob": 35 },
+      { "group": "potions_uncommon", "prob": 20 },
+      { "group": "potions_rare", "prob": 10 },
+      { "group": "potions_illegal", "prob": 1 },
       { "group": "spellcraft_books", "prob": 10 },
       {
         "distribution": [

diff --git a/data/mods/Magiclysm/itemgroups/recipe_books.json b/data/mods/Magiclysm/itemgroups/recipe_books.json
@@ -17,6 +17,6 @@
     "id": "magic_recipe_advanced",
     "type": "item_group",
     "//": "Higher tier recipes, where most school-related recipes require their rune or rune weapon.",
-    "items": [ [ "magic_armormaking", 30 ] ]
+    "items": [ [ "magic_armormaking", 30 ], [ "alchemy_illegal", 30 ], [ "alchemy_master", 30 ] ]
   }
 ]