diff --git a/data/mods/Magiclysm/Spells/mana_upgrades.json b/data/mods/Magiclysm/Spells/mana_upgrades.json new file mode 100644 index 0000000000000..5ca147a188bae --- /dev/null +++ b/data/mods/Magiclysm/Spells/mana_upgrades.json @@ -0,0 +1,433 @@ +[ + { + "id": "mana_upgrade_efficiency_01", + "type": "SPELL", + "name": { "str": "First Circle: Lesser Mana Efficiency." }, + "description": "Perform a magical ritual to increase the efficiency by which your body processes mana, granting you the Lesser Mana Efficiency trait. The ritual must end when the sun is in the sky and you are at least one story above the ground.\n\nThe chance of the ritual's success depends in your spell level and Spellcraft skill.", + "valid_targets": [ "self" ], + "shape": "blast", + "effect": "effect_on_condition", + "effect_str": "EOC_SPELL_GRANT_MANA_ADD1", + "flags": [ "VERBAL", "SOMATIC", "CONCENTRATE" ], + "components": "spell_components_mana_upgrade_efficiency_01", + "difficulty": 6, + "max_level": 15, + "energy_source": "MANA", + "base_energy_cost": 800, + "base_casting_time": 2520000 + }, + { + "type": "effect_on_condition", + "id": "EOC_SPELL_GRANT_MANA_ADD1", + "condition": { "and": [ "is_day", { "math": [ "u_val('pos_z')", ">=", "1" ] } ] }, + "effect": [ + { + "run_eocs": [ + { + "id": "EOC_SPELL_GRANT_MANA_ADD1_PART2", + "condition": { + "roll_contested": { "math": [ "u_spell_level('mana_upgrade_efficiency_01') + (u_skill('spellcraft') / 2 )" ] }, + "difficulty": 15 + }, + "effect": [ { "u_mutate_towards": "MANA_ADD1", "category": "MANATOUCHED", "use_vitamins": false } ], + "false_effect": [ + { + "u_message": "As you intone the final words of the spell, you wait for the change, but nothing happens. You must need more practice." + } + ] + } + ] + } + ], + "false_effect": [ + { + "u_message": "You intone the final words of the spell, but without the proper conditions being fulfilled it has no effect." + } + ] + }, + { + "id": "spell_components_mana_upgrade_efficiency_01", + "type": "requirement", + "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ], + "components": [ + [ [ "mana_energy_weak", 5, "LIST" ] ], + [ [ "mercury", 100 ] ], + [ [ "crystallized_mana", 25 ] ], + [ [ "copper", 250 ], [ "scrap_copper", 5 ] ] + ] + }, + { + "id": "mana_upgrade_efficiency_02", + "type": "SPELL", + "name": { "str": "Second Circle: Mana Efficiency." }, + "description": "Perform a magical ritual to increase the efficiency by which your body processes mana, granting you the Mana Efficiency trait. You must already have the Lesser Mana Efficiency trait for the spell to take full effect. The ritual must end within one hour of noon and you are at least four stories above the ground.\n\nThe chance of the ritual's success depends in your spell level and Spellcraft skill.", + "valid_targets": [ "self" ], + "shape": "blast", + "effect": "effect_on_condition", + "effect_str": "EOC_SPELL_GRANT_MANA_ADD2", + "flags": [ "VERBAL", "SOMATIC", "CONCENTRATE" ], + "components": "spell_components_mana_upgrade_efficiency_02", + "difficulty": 9, + "max_level": 15, + "energy_source": "MANA", + "base_energy_cost": 1400, + "base_casting_time": 3960000 + }, + { + "type": "effect_on_condition", + "id": "EOC_SPELL_GRANT_MANA_ADD2", + "condition": { + "and": [ + { "math": [ "time_since('midnight', 'unit': 'hours') >= 11" ] }, + { "math": [ "time_since('midnight', 'unit': 'hours') <= 13" ] }, + { "math": [ "u_val('pos_z')", ">=", "4" ] } + ] + }, + "effect": [ + { + "run_eocs": [ + { + "id": "EOC_SPELL_GRANT_MANA_ADD2_PART2", + "condition": { + "roll_contested": { "math": [ "u_spell_level('mana_upgrade_efficiency_02') + (u_skill('spellcraft') / 2 )" ] }, + "difficulty": 15 + }, + "effect": [ { "u_mutate_towards": "MANA_ADD2", "category": "MANATOUCHED", "use_vitamins": false } ], + "false_effect": [ + { + "u_message": "As you intone the final words of the spell, you wait for the change, but nothing happens. You must need more practice." + } + ] + } + ] + } + ], + "false_effect": [ + { + "u_message": "You intone the final words of the spell, but without the proper conditions being fulfilled it has no effect." + } + ] + }, + { + "id": "spell_components_mana_upgrade_efficiency_02", + "type": "requirement", + "qualities": [ { "id": "MANA_INFUSE", "level": 2 }, { "id": "MANA_FOCUS", "level": 2 } ], + "components": [ + [ [ "mana_energy_strong", 5, "LIST" ] ], + [ [ "mercury", 250 ] ], + [ [ "mana_infused_blood", 10 ] ], + [ [ "crystallized_mana", 75 ] ], + [ [ "silver_small", 250 ] ] + ] + }, + { + "id": "mana_upgrade_regeneration_01", + "type": "SPELL", + "name": { "str": "First Circle: Lesser Mana Regeneration." }, + "description": "Perform a magical ritual to increase the speed by which your body restores its mana, granting you the Lesser Mana Regeneration trait. The ritual must be performed while standing in a river or a stream.\n\nThe chance of the ritual's success depends in your spell level and Spellcraft skill.", + "valid_targets": [ "self" ], + "shape": "blast", + "effect": "effect_on_condition", + "effect_str": "EOC_SPELL_GRANT_MANA_REGEN1", + "flags": [ "VERBAL", "SOMATIC", "CONCENTRATE" ], + "components": "spell_components_mana_upgrade_regeneration_01", + "difficulty": 6, + "max_level": 15, + "energy_source": "MANA", + "base_energy_cost": 800, + "base_casting_time": 2520000 + }, + { + "type": "effect_on_condition", + "id": "EOC_SPELL_GRANT_MANA_REGEN1", + "condition": { + "and": [ + "u_is_outside", + { + "and": [ + { "or": [ { "u_is_on_terrain_with_flag": "SHALLOW_WATER" }, { "u_is_on_terrain_with_flag": "DEEP_WATER" } ] }, + { "u_is_on_terrain_with_flag": "CURRENT" }, + { "not": { "u_is_on_terrain": "t_sewage" } }, + { "not": { "u_is_on_terrain": "t_water_pool_shallow_outdoors" } } + ] + } + ] + }, + "effect": [ + { + "run_eocs": [ + { + "id": "EOC_SPELL_GRANT_MANA_REGEN1_PART2", + "condition": { + "roll_contested": { "math": [ "u_spell_level('mana_upgrade_regeneration_01') + (u_skill('spellcraft') / 2 )" ] }, + "difficulty": 15 + }, + "effect": [ { "u_mutate_towards": "MANA_REGEN1", "category": "MANATOUCHED", "use_vitamins": false } ], + "false_effect": [ + { + "u_message": "As you intone the final words of the spell, you wait for the change, but nothing happens. You must need more practice." + } + ] + } + ] + } + ], + "false_effect": [ + { + "u_message": "You intone the final words of the spell, but without the proper conditions being fulfilled it has no effect." + } + ] + }, + { + "id": "spell_components_mana_upgrade_regeneration_01", + "type": "requirement", + "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ], + "components": [ + [ [ "mana_energy_weak", 5, "LIST" ] ], + [ [ "mercury", 100 ] ], + [ [ "crystallized_mana", 25 ] ], + [ [ "mana_potion_lesser", 40 ], [ "mana_potion", 10 ], [ "mana_potion_greater", 2 ] ] + ] + }, + { + "id": "mana_upgrade_regeneration_02", + "type": "SPELL", + "name": { "str": "Second Circle: Mana Regeneration." }, + "description": "Perform a magical ritual to increase the speed by which your body restores its mana, granting you the Mana Regeneration trait. You must already have the Lesser Mana Regeneration trait for the spell to take full effect. The ritual must be performed while standing in a river.\n\nThe chance of the ritual's success depends in your spell level and Spellcraft skill.", + "valid_targets": [ "self" ], + "shape": "blast", + "effect": "effect_on_condition", + "effect_str": "EOC_SPELL_GRANT_MANA_REGEN2", + "flags": [ "VERBAL", "SOMATIC", "CONCENTRATE" ], + "components": "spell_components_mana_upgrade_regeneration_02", + "difficulty": 9, + "max_level": 15, + "energy_source": "MANA", + "base_energy_cost": 1400, + "base_casting_time": 3960000 + }, + { + "type": "effect_on_condition", + "id": "EOC_SPELL_GRANT_MANA_REGEN2", + "condition": { + "and": [ + "u_is_outside", + { + "and": [ + { "or": [ { "u_is_on_terrain_with_flag": "SHALLOW_WATER" }, { "u_is_on_terrain_with_flag": "DEEP_WATER" } ] }, + { + "or": [ + { "u_at_om_location": "generic_river_bank" }, + { "u_at_om_location": "generic_river" }, + { "u_at_om_location": "river_center" }, + { "u_at_om_location": "river" }, + { "u_at_om_location": "river_c_not_ne" }, + { "u_at_om_location": "river_c_not_nw" }, + { "u_at_om_location": "river_c_not_se" }, + { "u_at_om_location": "river_c_not_sw" }, + { "u_at_om_location": "river_ne" }, + { "u_at_om_location": "river_se" }, + { "u_at_om_location": "river_sw" }, + { "u_at_om_location": "river_nw" } + ] + }, + { "u_is_on_terrain_with_flag": "CURRENT" }, + { "not": { "u_is_on_terrain": "t_sewage" } }, + { "not": { "u_is_on_terrain": "t_water_pool_shallow_outdoors" } } + ] + } + ] + }, + "effect": [ + { + "run_eocs": [ + { + "id": "EOC_SPELL_GRANT_MANA_REGEN2_PART2", + "condition": { + "roll_contested": { "math": [ "u_spell_level('mana_upgrade_regeneration_02') + (u_skill('spellcraft') / 2 )" ] }, + "difficulty": 15 + }, + "effect": [ { "u_mutate_towards": "MANA_REGEN2", "category": "MANATOUCHED", "use_vitamins": false } ], + "false_effect": [ + { + "u_message": "As you intone the final words of the spell, you wait for the change, but nothing happens. You must need more practice." + } + ] + } + ] + } + ], + "false_effect": [ + { + "u_message": "You intone the final words of the spell, but without the proper conditions being fulfilled it has no effect." + } + ] + }, + { + "id": "spell_components_mana_upgrade_regeneration_02", + "type": "requirement", + "qualities": [ { "id": "MANA_INFUSE", "level": 2 }, { "id": "MANA_FOCUS", "level": 2 } ], + "components": [ + [ [ "mana_energy_strong", 5, "LIST" ] ], + [ [ "mercury", 250 ] ], + [ [ "mana_infused_blood", 10 ] ], + [ [ "crystallized_mana", 75 ] ], + [ [ "mana_potion_lesser", 200 ], [ "mana_potion", 50 ], [ "mana_potion_greater", 10 ] ] + ] + }, + { + "id": "mana_upgrade_sensitivity_01", + "type": "SPELL", + "name": { "str": "First Circle: Lesser Mana Sensitivity." }, + "description": "Perform a magical ritual to increase the sensitivity that your body has to mana, granting you the Lesser Mana Sensitivity trait. The ritual must take place in a natural location away (at least 4 OM tiles) from buildings, roads, or other evidence of civilization.\n\nThe chance of the ritual's success depends in your spell level and Spellcraft skill.", + "valid_targets": [ "self" ], + "shape": "blast", + "effect": "effect_on_condition", + "effect_str": "EOC_SPELL_GRANT_MANA_MULT1", + "flags": [ "VERBAL", "SOMATIC", "CONCENTRATE" ], + "components": "spell_components_mana_upgrade_sensitivity_01", + "difficulty": 6, + "max_level": 15, + "energy_source": "MANA", + "base_energy_cost": 800, + "base_casting_time": 2520000 + }, + { + "type": "effect_on_condition", + "id": "EOC_SPELL_GRANT_MANA_MULT1", + "condition": { + "and": [ + "u_is_outside", + { "not": { "u_at_om_location": "FACTION_CAMP_ANY" } }, + { "not": { "u_near_om_location": "cabin", "range": 4 } }, + { "not": { "u_near_om_location": "magic_cabin", "range": 4 } }, + { "not": { "u_near_om_location": "road_curved", "range": 4 } }, + { "not": { "u_near_om_location": "road_four_way", "range": 4 } }, + { "not": { "u_near_om_location": "road_tee", "range": 4 } }, + { "not": { "u_near_om_location": "road_straight", "range": 4 } }, + { "not": { "u_near_om_location": "road_end", "range": 4 } }, + { "not": { "u_near_om_location": "road_sw", "range": 4 } }, + { "not": { "u_near_om_location": "road_ne", "range": 4 } }, + { "not": { "u_near_om_location": "road_ew", "range": 4 } }, + { "not": { "u_near_om_location": "road_ns", "range": 4 } }, + { "not": { "u_near_om_location": "road_nesw", "range": 4 } }, + { "not": { "u_near_om_location": "road", "range": 4 } }, + { "not": { "u_near_om_location": "dirt_road", "range": 4 } }, + { "not": { "u_near_om_location": "dumpsite", "range": 4 } } + ] + }, + "effect": [ + { + "run_eocs": [ + { + "id": "EOC_SPELL_GRANT_MANA_MULT1_PART2", + "condition": { + "roll_contested": { "math": [ "u_spell_level('mana_upgrade_sensitivity_01') + (u_skill('spellcraft') / 2 )" ] }, + "difficulty": 15 + }, + "effect": [ { "u_mutate_towards": "MANA_MULT1", "category": "MANATOUCHED", "use_vitamins": false } ], + "false_effect": [ + { + "u_message": "As you intone the final words of the spell, you wait for the change, but nothing happens. You must need more practice." + } + ] + } + ] + } + ], + "false_effect": [ + { + "u_message": "You intone the final words of the spell, but without the proper conditions being fulfilled it has no effect." + } + ] + }, + { + "id": "spell_components_mana_upgrade_sensitivity_01", + "type": "requirement", + "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ], + "components": [ + [ [ "mana_energy_weak", 5, "LIST" ] ], + [ [ "mercury", 100 ] ], + [ [ "crystallized_mana", 25 ] ], + [ [ "precious_gemstones", 5, "LIST" ], [ "semiprecious_gemstones", 25, "LIST" ] ] + ] + }, + { + "id": "mana_upgrade_sensitivity_02", + "type": "SPELL", + "name": { "str": "Second Circle: Mana Sensitivity." }, + "description": "Perform a magical ritual to increase the sensitivity that your body has to mana, granting you the Mana Sensitivity trait. You must already have the Lesser Mana Sensitivity trait for the spell to take full effect. The ritual must take place in a natural location far away (at least 15 OM tiles) from buildings, roads, or other evidence of civilization.\n\nThe chance of the ritual's success depends in your spell level and Spellcraft skill.", + "valid_targets": [ "self" ], + "shape": "blast", + "effect": "effect_on_condition", + "effect_str": "EOC_SPELL_GRANT_MANA_MULT2", + "flags": [ "VERBAL", "SOMATIC", "CONCENTRATE" ], + "components": "spell_components_mana_upgrade_sensitivity_02", + "difficulty": 9, + "max_level": 15, + "energy_source": "MANA", + "base_energy_cost": 1400, + "base_casting_time": 3960000 + }, + { + "type": "effect_on_condition", + "id": "EOC_SPELL_GRANT_MANA_MULT2", + "condition": { + "and": [ + "u_is_outside", + { "not": { "u_at_om_location": "FACTION_CAMP_ANY" } }, + { "not": { "u_near_om_location": "cabin", "range": 15 } }, + { "not": { "u_near_om_location": "magic_cabin", "range": 15 } }, + { "not": { "u_near_om_location": "road_curved", "range": 15 } }, + { "not": { "u_near_om_location": "road_four_way", "range": 15 } }, + { "not": { "u_near_om_location": "road_tee", "range": 15 } }, + { "not": { "u_near_om_location": "road_straight", "range": 15 } }, + { "not": { "u_near_om_location": "road_end", "range": 15 } }, + { "not": { "u_near_om_location": "road_sw", "range": 15 } }, + { "not": { "u_near_om_location": "road_ne", "range": 15 } }, + { "not": { "u_near_om_location": "road_ew", "range": 15 } }, + { "not": { "u_near_om_location": "road_ns", "range": 15 } }, + { "not": { "u_near_om_location": "road_nesw", "range": 15 } }, + { "not": { "u_near_om_location": "road", "range": 15 } }, + { "not": { "u_near_om_location": "dirt_road", "range": 15 } }, + { "not": { "u_near_om_location": "dumpsite", "range": 15 } } + ] + }, + "effect": [ + { + "run_eocs": [ + { + "id": "EOC_SPELL_GRANT_MANA_MULT2_PART2", + "condition": { + "roll_contested": { "math": [ "u_spell_level('mana_upgrade_sensitivity_02') + (u_skill('spellcraft') / 2 )" ] }, + "difficulty": 15 + }, + "effect": [ { "u_mutate_towards": "MANA_MULT2", "category": "MANATOUCHED", "use_vitamins": false } ], + "false_effect": [ + { + "u_message": "As you intone the final words of the spell, you wait for the change, but nothing happens. You must need more practice." + } + ] + } + ] + } + ], + "false_effect": [ + { + "u_message": "You intone the final words of the spell, but without the proper conditions being fulfilled it has no effect." + } + ] + }, + { + "id": "spell_components_mana_upgrade_sensitivity_02", + "type": "requirement", + "qualities": [ { "id": "MANA_INFUSE", "level": 2 }, { "id": "MANA_FOCUS", "level": 2 } ], + "components": [ + [ [ "mana_energy_strong", 5, "LIST" ] ], + [ [ "mercury", 250 ] ], + [ [ "mana_infused_blood", 10 ] ], + [ [ "crystallized_mana", 75 ] ], + [ [ "precious_gemstones", 25, "LIST" ], [ "semiprecious_gemstones", 150, "LIST" ] ] + ] + } +] diff --git a/data/mods/Magiclysm/itemgroups/recipe_books.json b/data/mods/Magiclysm/itemgroups/recipe_books.json index 3779eb264988b..95002b0d38e18 100644 --- a/data/mods/Magiclysm/itemgroups/recipe_books.json +++ b/data/mods/Magiclysm/itemgroups/recipe_books.json @@ -10,6 +10,7 @@ [ "enchantment_basic", 30 ], [ "book_mythological", 10 ], [ "history_botanical_enchantment", 20 ], + [ "journeyman_enchanting", 20 ], [ "arcane_archer_companion", 15 ], [ "cooking_poison", 15 ], [ "metal_legends", 5 ] diff --git a/data/mods/Magiclysm/itemgroups/spellbooks.json b/data/mods/Magiclysm/itemgroups/spellbooks.json index fa1e7a76b9a21..924b9dd69d989 100644 --- a/data/mods/Magiclysm/itemgroups/spellbooks.json +++ b/data/mods/Magiclysm/itemgroups/spellbooks.json @@ -354,6 +354,7 @@ { "group": "spellbook_tier_1", "prob": 50 }, { "group": "spellbook_tier_2", "prob": 18 }, { "group": "spellbook_tier_3", "prob": 2 }, + { "group": "spellbook_mana_upgrades", "prob": 1 }, { "group": "spell_scroll_tier_1", "prob": 300 }, { "group": "spell_scroll_tier_2", "prob": 100 } ] @@ -366,8 +367,23 @@ { "group": "spellbook_tier_1", "prob": 30 }, { "group": "spellbook_tier_2", "prob": 50 }, { "group": "spellbook_tier_3", "prob": 15 }, + { "group": "spellbook_mana_upgrades", "prob": 8 }, { "group": "spell_scroll_tier_2", "prob": 300 }, { "group": "spell_scroll_tier_3", "prob": 100 } ] + }, + { + "id": "spellbook_mana_upgrades", + "type": "item_group", + "//": "Contains the books with spells that upgrade mana traits", + "items": [ + { "item": "first_circle_mana_amount_upgrade_spellbook", "prob": 200 }, + { "item": "second_circle_mana_amount_upgrade_spellbook", "prob": 50 }, + { "item": "first_circle_mana_regen_upgrade_spellbook", "prob": 200 }, + { "item": "second_circle_mana_regen_upgrade_spellbook", "prob": 50 }, + { "item": "first_circle_mana_mult_upgrade_spellbook", "prob": 200 }, + { "item": "second_circle_mana_mult_upgrade_spellbook", "prob": 50 }, + { "item": "all_first_circle_upgrades_spellbook", "prob": 50 } + ] } ] diff --git a/data/mods/Magiclysm/items/alchemy_items.json b/data/mods/Magiclysm/items/alchemy_items.json index 62213ca14097c..8ecd93afa9c66 100644 --- a/data/mods/Magiclysm/items/alchemy_items.json +++ b/data/mods/Magiclysm/items/alchemy_items.json @@ -66,6 +66,25 @@ "qualities": [ [ "MANA_FOCUS", 1 ] ], "armor": [ { "encumbrance": 1, "coverage": 5, "covers": [ "head" ] } ] }, + { + "id": "silver_circlet", + "type": "ARMOR", + "category": "armor", + "name": { "str": "silver circlet" }, + "description": "A wooden band with silver trimmings to be worn on the head. Touching your temples with it on makes you feel very calm.", + "weight": "700 g", + "volume": "600ml", + "price": 3000, + "price_postapoc": 200, + "material": [ "silver", "wood" ], + "symbol": "[", + "color": "light_gray", + "warmth": 0, + "material_thickness": 1, + "flags": [ "BELTED" ], + "qualities": [ [ "MANA_FOCUS", 2 ] ], + "armor": [ { "encumbrance": 1, "coverage": 5, "covers": [ "head" ] } ] + }, { "id": "potion_starter", "copy-from": "mixed_alcohol_strong", diff --git a/data/mods/Magiclysm/items/recipe_books.json b/data/mods/Magiclysm/items/recipe_books.json index be4e6403399ed..480ecc587d50b 100644 --- a/data/mods/Magiclysm/items/recipe_books.json +++ b/data/mods/Magiclysm/items/recipe_books.json @@ -45,8 +45,8 @@ "category": "manuals", "name": { "str": "A Beginner's Guide to Alchemy", "str_pl": "copies of A Beginner's Guide to Alchemy" }, "description": "A paperback tome for the art of liquid magic, alcohol not included.", - "weight": "1 kg", - "volume": "750 ml", + "weight": "780 g", + "volume": "1550 ml", "price": 7900, "material": [ "paper" ], "symbol": "?", @@ -302,5 +302,23 @@ "time": "25 m", "fun": 1, "melee_damage": { "bash": 5 } + }, + { + "id": "journeyman_enchanting", + "type": "BOOK", + "category": "manuals", + "name": { "str": "The Journeyman Enchanter's Primer", "str_pl": "copies of The Journeyman Enchanter's Primer" }, + "description": "Despite the title, this seems to be written in Middle English. A little obtuse, but you can make out most of the words well enough.", + "weight": "600 g", + "volume": "850 ml", + "price": 8000, + "material": [ "paper" ], + "looks_like": "manual_gun", + "skill": "fabrication", + "required_level": 4, + "max_level": 5, + "intelligence": 9, + "symbol": "?", + "color": "light_gray" } ] diff --git a/data/mods/Magiclysm/items/spellbooks.json b/data/mods/Magiclysm/items/spellbooks.json index a49f746be35b1..4c7c9cd6551a5 100644 --- a/data/mods/Magiclysm/items/spellbooks.json +++ b/data/mods/Magiclysm/items/spellbooks.json @@ -1249,5 +1249,114 @@ "type": "learn_spell", "spells": [ "kelvinist_firebolt", "kelvinist_extinguish_fire_spell", "create_lighter", "kelvinist_anti_cold", "burning_hands" ] } + }, + { + "id": "all_first_circle_upgrades_spellbook", + "type": "BOOK", + "category": "manuals", + "name": { "str": "The Rites of the First Circle", "str_pl": "copies of The Rites of the First Circle" }, + "//": "All 3 first circle mana trait upgrade spells", + "description": "A weighty tome containing all three of the Rites of the First Circle, the rituals used by dedicated mages to increase their ability to channel and recover mana.", + "weight": "1588 g", + "volume": "2250 ml", + "price": 50000, + "material": [ "paper" ], + "looks_like": "cookbook", + "symbol": "?", + "color": "white", + "use_action": { + "type": "learn_spell", + "spells": [ "mana_upgrade_efficiency_01", "mana_upgrade_regeneration_01", "mana_upgrade_sensitivity_01" ] + } + }, + { + "id": "first_circle_mana_amount_upgrade_spellbook", + "type": "BOOK", + "category": "manuals", + "name": { "str": "The Rite of the First Circle: Mana Pool", "str_pl": "copies of The Rite of the First Circle: Mana Pool" }, + "description": "A lengthy list of the rituals and components necessary to slightly increase the efficiency by which the mage's body processes mana.", + "weight": "483 g", + "volume": "825 ml", + "price": 50000, + "material": [ "paper" ], + "looks_like": "cookbook", + "symbol": "?", + "color": "white", + "use_action": { "type": "learn_spell", "spells": [ "mana_upgrade_efficiency_01" ] } + }, + { + "id": "second_circle_mana_amount_upgrade_spellbook", + "type": "BOOK", + "category": "manuals", + "name": { "str": "The Rite of the Second Circle: Mana Pool", "str_pl": "copies of The Rite of the Second Circle: Mana Pool" }, + "description": "A lengthy list of the rituals and components necessary to increase the efficiency by which the mage's body processes mana.", + "weight": "900 g", + "volume": "1200 ml", + "price": 50000, + "material": [ "paper" ], + "looks_like": "cookbook", + "symbol": "?", + "color": "white", + "use_action": { "type": "learn_spell", "spells": [ "mana_upgrade_efficiency_02" ] } + }, + { + "id": "first_circle_mana_regen_upgrade_spellbook", + "type": "BOOK", + "category": "manuals", + "name": { "str": "The Rite of the First Circle: Mana Flow", "str_pl": "copies of The Rite of the First Circle: Mana Flow" }, + "description": "A lengthy list of the rituals and components necessary to slightly increase the rate by which the mage's body regains mana.", + "weight": "483 g", + "volume": "825 ml", + "price": 50000, + "material": [ "paper" ], + "looks_like": "cookbook", + "symbol": "?", + "color": "red", + "use_action": { "type": "learn_spell", "spells": [ "mana_upgrade_regeneration_01" ] } + }, + { + "id": "second_circle_mana_regen_upgrade_spellbook", + "type": "BOOK", + "category": "manuals", + "name": { "str": "The Rite of the Second Circle: Mana Flow", "str_pl": "copies of The Rite of the Second Circle: Mana Flow" }, + "description": "A lengthy list of the rituals and components necessary to increase the rate by which the mage's body regains mana.", + "weight": "900 g", + "volume": "1200 ml", + "price": 50000, + "material": [ "paper" ], + "looks_like": "cookbook", + "symbol": "?", + "color": "red", + "use_action": { "type": "learn_spell", "spells": [ "mana_upgrade_regeneration_02" ] } + }, + { + "id": "first_circle_mana_mult_upgrade_spellbook", + "type": "BOOK", + "category": "manuals", + "name": { "str": "The Rite of the First Circle: Mana Sense", "str_pl": "copies of The Rite of the First Circle: Mana Sense" }, + "description": "A lengthy list of the rituals and components necessary to slightly increase the sensitivity that the mage's body has to mana.", + "weight": "483 g", + "volume": "825 ml", + "price": 50000, + "material": [ "paper" ], + "looks_like": "cookbook", + "symbol": "?", + "color": "red", + "use_action": { "type": "learn_spell", "spells": [ "mana_upgrade_sensitivity_01" ] } + }, + { + "id": "second_circle_mana_mult_upgrade_spellbook", + "type": "BOOK", + "category": "manuals", + "name": { "str": "The Rite of the Second Circle: Mana Sense", "str_pl": "copies of The Rite of the Second Circle: Mana Sense" }, + "description": "A lengthy list of the rituals and components necessary to increase the sensitivity that the mage's body has to mana.", + "weight": "900 g", + "volume": "1200 ml", + "price": 50000, + "material": [ "paper" ], + "looks_like": "cookbook", + "symbol": "?", + "color": "red", + "use_action": { "type": "learn_spell", "spells": [ "mana_upgrade_sensitivity_02" ] } } ] diff --git a/data/mods/Magiclysm/items/tools.json b/data/mods/Magiclysm/items/tools.json index 7363271a337ec..bd29e5b805fc5 100644 --- a/data/mods/Magiclysm/items/tools.json +++ b/data/mods/Magiclysm/items/tools.json @@ -165,7 +165,7 @@ { "id": "magic_circle_rank_1", "type": "TOOL", - "name": { "str": "Magic Circle Rank 1", "str_pl": "Magic Circles Rank 2" }, + "name": { "str": "Magic Circle Rank 1", "str_pl": "Magic Circles Rank 1" }, "description": "This is the pseudo-tool provided by having a nearby magic circle. You shouldn't see this as an individual item.", "symbol": "O", "color": "red", diff --git a/data/mods/Magiclysm/recipes/alchemy.json b/data/mods/Magiclysm/recipes/alchemy.json index aad165f8baa24..1e5b76798f875 100644 --- a/data/mods/Magiclysm/recipes/alchemy.json +++ b/data/mods/Magiclysm/recipes/alchemy.json @@ -94,7 +94,7 @@ "proficiencies": [ { "proficiency": "prof_alchemy" } ], "category": "CC_ENCHANTED", "subcategory": "CSC_ENCHANTED_OTHER", - "autolearn": true + "book_learn": [ [ "journeyman_enchanting", 4 ], [ "alchemy_basic", 3 ] ] }, { "type": "recipe", @@ -108,7 +108,7 @@ "proficiencies": [ { "proficiency": "prof_alchemy" } ], "category": "CC_ENCHANTED", "subcategory": "CSC_ENCHANTED_OTHER", - "autolearn": true + "book_learn": [ [ "journeyman_enchanting", 4 ], [ "alchemy_basic", 3 ] ] }, { "type": "recipe", @@ -122,7 +122,7 @@ "proficiencies": [ { "proficiency": "prof_alchemy" } ], "category": "CC_ENCHANTED", "subcategory": "CSC_ENCHANTED_OTHER", - "autolearn": true + "book_learn": [ [ "journeyman_enchanting", 4 ], [ "alchemy_basic", 3 ] ] }, { "result": "bundle_demon_chitin_piece", diff --git a/data/mods/Magiclysm/recipes/magic_tools.json b/data/mods/Magiclysm/recipes/magic_tools.json index 15a2cddb371ed..b24aa6d5652d8 100644 --- a/data/mods/Magiclysm/recipes/magic_tools.json +++ b/data/mods/Magiclysm/recipes/magic_tools.json @@ -73,6 +73,26 @@ "qualities": [ { "id": "CHISEL", "level": 1 } ], "components": [ [ [ "copper_bracelet", 1 ] ] ] }, + { + "type": "recipe", + "activity_level": "BRISK_EXERCISE", + "result": "silver_circlet", + "byproducts": [ [ "tinder", 1 ] ], + "category": "CC_ENCHANTED", + "subcategory": "CSC_ENCHANTED_TOOLS", + "skill_used": "fabrication", + "skills_required": [ "spellcraft", 3 ], + "difficulty": 4, + "time": "1 h", + "book_learn": [ [ "journeyman_enchanting", 4 ] ], + "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "CUT_FINE", "level": 1 } ], + "proficiencies": [ + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_fine_metalsmithing", "required": false, "time_multiplier": 3 } + ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], + "components": [ [ [ "silver_small", 50 ] ], [ [ "splinter", 3 ] ] ] + }, { "type": "recipe", "activity_level": "BRISK_EXERCISE", @@ -83,7 +103,7 @@ "skills_required": [ "spellcraft", 3 ], "difficulty": 4, "time": "20 m", - "book_learn": [ [ "alchemy_basic", 3 ], [ "necro_basic", 4 ], [ "techno_basic", 4 ] ], + "book_learn": [ [ "alchemy_basic", 3 ], [ "necro_basic", 4 ], [ "techno_basic", 4 ], [ "journeyman_enchanting", 4 ] ], "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_fine_metalsmithing", "required": false, "time_multiplier": 3 } diff --git a/data/mods/Magiclysm/requirements/alchemy.json b/data/mods/Magiclysm/requirements/alchemy.json index 7956b1b9fe85c..52f38fb7bcbe7 100644 --- a/data/mods/Magiclysm/requirements/alchemy.json +++ b/data/mods/Magiclysm/requirements/alchemy.json @@ -4,5 +4,32 @@ "type": "requirement", "//": "Dragon scales. For when any color is interchangeable.", "components": [ [ [ "dragon_black_scale", 1 ] ] ] + }, + { + "id": "semiprecious_gemstones", + "type": "requirement", + "//": "semi-precious gems, for rituals or alchemy ", + "components": [ + [ + [ "garnet", 1 ], + [ "amethyst", 1 ], + [ "aquamarine", 1 ], + [ "alexandrite", 1 ], + [ "malachite", 1 ], + [ "pearl", 1 ], + [ "peridot", 1 ], + [ "opal", 1 ], + [ "tourmaline", 1 ], + [ "citrine", 1 ], + [ "blue_topaz", 1 ], + [ "onyx", 1 ] + ] + ] + }, + { + "id": "precious_gemstones", + "type": "requirement", + "//": "precious gems, for rituals or alchemy ", + "components": [ [ [ "diamond", 1 ], [ "emerald", 1 ], [ "ruby", 1 ], [ "sapphire", 1 ] ] ] } ] diff --git a/data/mods/Magiclysm/worldgen/magic_academy.json b/data/mods/Magiclysm/worldgen/magic_academy.json index 7d24450294f9f..0e5cd7dcc0050 100644 --- a/data/mods/Magiclysm/worldgen/magic_academy.json +++ b/data/mods/Magiclysm/worldgen/magic_academy.json @@ -206,7 +206,8 @@ "H": [ { "item": "magic_shop_clothes", "chance": 5 }, { "item": "enchanted_small_items", "chance": 10 }, - { "item": "magic_shop_books", "chance": 10 } + { "item": "magic_shop_books", "chance": 10 }, + { "item": "spellbook_mana_upgrades", "chance": 1 } ], "`": [ { "item": "alchemy_items", "chance": 35, "repeat": [ 1, 2 ] }, @@ -261,7 +262,11 @@ "furniture": { "&": "f_magic_bench" }, "items": { "&": [ { "item": "magic_tools_and_loot", "chance": 35, "repeat": [ 1, 2 ] }, { "item": "magic_shop_potions", "chance": 30 } ], - "R": [ { "item": "magic_shop_books", "chance": 30 }, { "item": "dragon_books", "chance": 10 } ] + "R": [ + { "item": "magic_shop_books", "chance": 30 }, + { "item": "dragon_books", "chance": 10 }, + { "item": "spellbook_mana_upgrades", "chance": 5 } + ] }, "place_monsters": [ { "monster": "GROUP_TOWER_GOLEM", "x": 12, "y": 12, "density": 0.01, "repeat": [ 3, 5 ] } ] } @@ -303,7 +308,11 @@ "furniture": { "&": "f_magic_bench" }, "items": { "&": [ { "item": "magic_tools_and_loot", "chance": 35 }, { "item": "magic_shop_potions", "chance": 30 } ], - "R": [ { "item": "magic_shop_books", "chance": 30 }, { "item": "dragon_books", "chance": 10 } ] + "R": [ + { "item": "magic_shop_books", "chance": 30 }, + { "item": "dragon_books", "chance": 10 }, + { "item": "spellbook_mana_upgrades", "chance": 5 } + ] }, "place_monsters": [ { "monster": "GROUP_TOWER_GOLEM", "x": 12, "y": 12, "density": 0.01, "repeat": [ 3, 5 ] } ] } @@ -393,11 +402,16 @@ "items": { "r": [ { "item": "magic_shop_books", "chance": 20 }, + { "item": "spellbook_mana_upgrades", "chance": 5 }, { "item": "magic_shop_wands", "chance": 10 }, { "item": "enchanted_small_items", "chance": 5 }, { "item": "enchanted_combat_items", "chance": 2 } ], - "R": [ { "item": "magic_shop_books", "chance": 30 }, { "item": "dragon_books", "chance": 30 } ] + "R": [ + { "item": "magic_shop_books", "chance": 30 }, + { "item": "spellbook_mana_upgrades", "chance": 5 }, + { "item": "dragon_books", "chance": 30 } + ] }, "place_monsters": [ { "monster": "GROUP_TOWER_GOLEM", "x": 12, "y": 12, "density": 0.01, "repeat": [ 3, 5 ] } ] } diff --git a/data/mods/Magiclysm/worldgen/magic_basement.json b/data/mods/Magiclysm/worldgen/magic_basement.json index 43d8c979e2e4e..be2cbc88334b3 100644 --- a/data/mods/Magiclysm/worldgen/magic_basement.json +++ b/data/mods/Magiclysm/worldgen/magic_basement.json @@ -62,7 +62,11 @@ }, "furniture": { "&": "f_magiclysm_translocator_gate", "!": "f_rack_coat", "?": "f_bookcase", "=": "f_bookcase" }, "items": { - "?": [ { "item": "magic_shop_books", "chance": 40 }, { "item": "magic_shop_potions", "chance": 60 } ], + "?": [ + { "item": "magic_shop_books", "chance": 40 }, + { "item": "spellbook_mana_upgrades", "chance": 2 }, + { "item": "magic_shop_potions", "chance": 60 } + ], "=": [ { "item": "novels", "chance": 30 }, { "item": "homebooks", "chance": 10 } ], "~": [ { "item": "magic_shop_potions", "chance": 15, "repeat": [ 1, 2 ] } ], "I": [ diff --git a/data/mods/Magiclysm/worldgen/wizard-towers.json b/data/mods/Magiclysm/worldgen/wizard-towers.json index 8e0139ea08ba8..2ced3d9dd0d17 100644 --- a/data/mods/Magiclysm/worldgen/wizard-towers.json +++ b/data/mods/Magiclysm/worldgen/wizard-towers.json @@ -188,6 +188,7 @@ { "item": "homebooks", "chance": 45, "repeat": [ 1, 5 ] }, { "item": "spellbook_loot_1", "chance": 35, "repeat": [ 0, 2 ] }, { "item": "spellbook_loot_2", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "spellbook_mana_upgrades", "chance": 1 }, { "item": "dragon_books", "chance": 10 } ] }, diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 8b57604645cca..f400f60b8b68d 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -578,7 +578,6 @@ "lizardfolk_javelin", "cooking_poison", "wizard_beginner", - "alchemy_basic", "mkey_opening", "enchantment_basic", "magical_throwing_knife_pure_special",