diff --git a/data/mods/Magiclysm/Spells/item_only.json b/data/mods/Magiclysm/Spells/item_only.json index a17737ce87932..e9cb9868a405e 100644 --- a/data/mods/Magiclysm/Spells/item_only.json +++ b/data/mods/Magiclysm/Spells/item_only.json @@ -360,6 +360,331 @@ "min_damage": 2400, "max_damage": 2400 }, + { + "id": "flask_clairvoyance", + "type": "SPELL", + "name": "Omniscientia", + "description": "Connect the user to a few ethereal sensory organs, that allow the user to \"feel\" the territory nearby.", + "valid_targets": [ "hostile", "ground" ], + "flags": [ "IGNORE_WALLS", "NO_LEGS", "SILENT", "NO_EXPLOSION_SFX" ], + "effect": "attack", + "shape": "blast", + "min_aoe": 30, + "max_aoe": 30, + "field_id": "fd_clairvoyant", + "min_field_intensity": 1, + "max_field_intensity": 1 + }, + { + "id": "flask_spear", + "type": "SPELL", + "name": "Lancea", + "description": "Release the long, spear-like line of liquid, that puncture things on the path.", + "valid_targets": [ "hostile", "ground" ], + "flags": [ "NO_LEGS", "SILENT", "RANDOM_DAMAGE" ], + "min_aoe": 5, + "max_aoe": 5, + "effect": "attack", + "shape": "cone", + "min_damage": 150, + "max_damage": 250, + "damage_type": "pure", + "min_range": 15, + "max_range": 15 + }, + { + "id": "flask_confusion", + "type": "SPELL", + "name": "Turbatio", + "description": "Mental sledgehammer strike.", + "valid_targets": [ "hostile", "ground" ], + "flags": [ "NO_PROJECTILE", "IGNORE_WALLS" ], + "effect": "attack", + "shape": "cone", + "effect_str": "stunned", + "min_range": 6, + "max_range": 6, + "min_aoe": 120, + "max_aoe": 120, + "min_duration": 1500, + "max_duration": 1500 + }, + { + "id": "flask_teleport_rand", + "type": "SPELL", + "name": "Effugium", + "description": "Teleport the caster to random point nearby.", + "effect": "short_range_teleport", + "shape": "blast", + "valid_targets": [ "ground" ], + "flags": [ "IGNORE_WALLS", "NO_LEGS", "SILENT", "RANDOM_TARGET" ], + "min_aoe": 3, + "max_aoe": 3, + "min_range": 15, + "max_range": 15 + }, + { + "id": "flask_teleport", + "type": "SPELL", + "name": "Ecfugium", + "description": "Teleport the caster to picked point nearby.", + "effect": "short_range_teleport", + "shape": "blast", + "valid_targets": [ "ground" ], + "flags": [ "IGNORE_WALLS", "NO_LEGS", "SILENT", "TARGET_TELEPORT" ], + "min_aoe": 3, + "max_aoe": 3, + "min_range": 10, + "max_range": 10 + }, + { + "id": "flask_shadow_field", + "type": "SPELL", + "name": "Umbra", + "description": "Projects a lot of darkness around the user's body.", + "effect": "attack", + "field_id": "fd_darkness", + "min_field_intensity": 1, + "max_field_intensity": 1, + "shape": "blast", + "valid_targets": [ "self", "ground" ], + "min_duration": 36000, + "max_duration": 36000, + "min_range": 10, + "max_range": 10, + "min_aoe": 3, + "max_aoe": 3, + "flags": [ "NO_LEGS", "SOMATIC", "CONCENTRATE" ] + }, + { + "id": "flask_fireball", + "type": "SPELL", + "name": "Flamma", + "description": "Magic molotov's equivalent.", + "effect": "attack", + "shape": "blast", + "valid_targets": [ "self", "ally", "hostile", "ground" ], + "flags": [ "NO_LEGS", "SILENT", "RANDOM_DAMAGE", "IGNITE_FLAMMABLE" ], + "min_damage": 68, + "max_damage": 88, + "min_aoe": 7, + "max_aoe": 7, + "min_range": 15, + "max_range": 15, + "field_id": "fd_fire", + "field_chance": 5, + "min_field_intensity": 1, + "max_field_intensity": 2, + "field_intensity_variance": 1, + "damage_type": "heat" + }, + { + "id": "flask_invisibility", + "type": "SPELL", + "name": "Caecitas", + "description": "You are invisible now, and no one can see you. They still can hear or smell though.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "invisibility", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 36000, + "max_duration": 36000 + }, + { + "id": "flask_feather", + "type": "SPELL", + "name": "Pluma", + "description": "Allow you to decrease your inertia, which allows you to jump from the skyscraper's roof on your bare feet.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "feather_fall", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 36000, + "max_duration": 36000 + }, + { + "id": "flask_night_vision", + "type": "SPELL", + "name": "Visio", + "description": "Grant you an ability to see the night same as the day.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "dark_sight", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 36000, + "max_duration": 36000 + }, + { + "id": "flask_charm", + "type": "SPELL", + "name": "Venuste", + "description": "Make a creature ignore his own thoughts and make it more friendly to a user.", + "valid_targets": [ "hostile" ], + "flags": [ "NO_LEGS" ], + "effect": "charm_monster", + "shape": "blast", + "min_range": 9, + "max_range": 9, + "min_damage": 500, + "max_damage": 500, + "//": "now its 500 cause skeletal juggernaut has 480, but not sure isn't it too big?", + "min_duration": 15000, + "max_duration": 15000 + }, + { + "id": "flask_sludge_field", + "type": "SPELL", + "name": "Lutum", + "description": "Cover the ground with a thick sticky mass.", + "effect": "attack", + "field_id": "fd_sludge", + "min_field_intensity": 1, + "max_field_intensity": 3, + "field_intensity_variance": 2, + "field_chance": 1, + "shape": "blast", + "valid_targets": [ "self", "ally", "hostile", "ground" ], + "min_duration": 180000, + "max_duration": 180000, + "min_range": 10, + "max_range": 10, + "min_aoe": 6, + "max_aoe": 6, + "flags": [ "NO_LEGS", "SOMATIC", "CONCENTRATE" ] + }, + { + "id": "flask_speed", + "type": "SPELL", + "name": "Velocitas", + "description": "Make you faster, and allow to hold this state for a while.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "flask_speed_eff", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 360000, + "max_duration": 360000 + }, + { + "id": "flask_healing", + "type": "SPELL", + "name": "Sanatio", + "description": "Improve your organism's ability to heal himself.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "flask_healing_eff", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 8640000, + "max_duration": 8640000 + }, + { + "id": "flask_stamina", + "type": "SPELL", + "name": "Constantia", + "description": "You can't get tired.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "flask_stamina_eff", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 1080000, + "max_duration": 1080000 + }, + { + "id": "flask_rebreather", + "type": "SPELL", + "name": "Spiritus", + "description": "Allow you to breath underwater.", + "valid_targets": [ "self" ], + "effect": "spawn_item", + "effect_str": "flask_ethereal_rebreather", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 360000, + "max_duration": 360000 + }, + { + "id": "flask_excitement", + "type": "SPELL", + "name": "Motus", + "description": "Imrpove your reaction abilities, which makes you a better fighter.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "flask_excitement", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 360000, + "max_duration": 360000 + }, + { + "id": "flask_resistance", + "type": "SPELL", + "name": "Resistentia", + "description": "Thin layer of energy cover your body, and allow you to hold more physical damage than before.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "flask_resistance", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 1080000, + "max_duration": 1080000 + }, + { + "id": "flask_illumination", + "type": "SPELL", + "name": "Illuminatio", + "description": "Emit a bright light from your body.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "flask_illumination", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 4320000, + "max_duration": 4320000 + }, + { + "id": "flask_mana_regen", + "type": "SPELL", + "name": "Recuperatio", + "description": "Increase the amount of ley-lines your body can process at once, making you restore your mana pool faster.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "flask_mana_regen", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 4320000, + "max_duration": 4320000 + }, + { + "id": "flask_max_mana", + "type": "SPELL", + "name": "Augere", + "description": " Your own ability to hold the energy is moved apart.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "flask_max_mana", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 4320000, + "max_duration": 4320000 + }, + { + "id": "flask_regeneration", + "type": "SPELL", + "name": "Renovamen", + "description": "Slowly regenerate your damaged body.", + "valid_targets": [ "self" ], + "effect": "attack", + "effect_str": "flask_regeneration", + "shape": "blast", + "flags": [ "NO_LEGS", "SILENT" ], + "min_duration": 60000, + "max_duration": 60000 + }, { "id": "flask_regeneration_effect", "type": "SPELL", @@ -368,9 +693,96 @@ "valid_targets": [ "self" ], "min_damage": -1, "max_damage": -1, - "message": "", "effect": "attack", "shape": "blast", - "flags": [ "SILENT", "NO_EXPLOSION_SFX" ] + "flags": [ "SILENT" ] + }, + { + "id": "flask_mood", + "type": "SPELL", + "name": "Iocus", + "description": "Makes you fun.", + "effect": "morale", + "effect_str": "morale_iocus", + "shape": "blast", + "valid_targets": [ "self" ], + "flags": [ "NO_LEGS", "SILENT", "RANDOM_DAMAGE", "RANDOM_DURATION" ], + "min_damage": 50, + "max_damage": 80, + "min_duration": 8640000, + "max_duration": 25920000 + }, + { + "id": "flask_toxin", + "type": "SPELL", + "name": "Toxicum", + "description": "Poison everybody on the range.", + "valid_targets": [ "self", "ally", "hostile", "ground" ], + "flags": [ "NO_LEGS", "RANDOM_DURATION" ], + "effect": "attack", + "shape": "blast", + "min_dot": 1, + "max_dot": 1, + "min_aoe": 8, + "max_aoe": 8, + "field_id": "fd_toxic_gas", + "field_chance": 1, + "min_field_intensity": 1, + "max_field_intensity": 1, + "damage_type": "biological", + "min_duration": 2500, + "max_duration": 7500, + "min_range": 15, + "max_range": 15 + }, + { + "id": "flask_venom", + "type": "SPELL", + "name": "Venenum", + "description": "Poison the picked enemy.", + "min_dot": 5, + "max_dot": 5, + "effect": "attack", + "shape": "blast", + "valid_targets": [ "hostile" ], + "flags": [ "NO_LEGS", "SILENT" ], + "min_range": 15, + "max_range": 15, + "min_duration": 90000, + "max_duration": 90000, + "damage_type": "biological" + }, + { + "id": "alchemist_mine_pull", + "type": "SPELL", + "name": "Mana explosion", + "description": "Pull all creatures nearby, except the Alchemist.", + "valid_targets": [ "ally", "hostile", "ground", "item", "field" ], + "effect": "area_pull", + "shape": "blast", + "max_level": 35, + "min_damage": 30, + "max_damage": 30, + "min_aoe": 11, + "max_aoe": 11, + "extra_effects": [ { "id": "alchemist_mine_explosion" } ], + "flags": [ "LOUD" ], + "sound_description": "whoosh" + }, + { + "id": "alchemist_mine_explosion", + "type": "SPELL", + "name": "Mana explosion damage", + "description": "Deal some damage to creatures, except the Alchemist.", + "valid_targets": [ "ally", "hostile", "ground" ], + "effect": "attack", + "shape": "blast", + "min_damage": 110, + "max_damage": 220, + "damage_type": "pure", + "min_aoe": 4, + "max_aoe": 4, + "flags": [ "LOUD", "RANDOM_DAMAGE", "NO_EXPLOSION_SFX" ], + "message": "" } ] diff --git a/data/mods/Magiclysm/cooking_components.json b/data/mods/Magiclysm/cooking_components.json index 509383166acf2..13cb7e69706fa 100644 --- 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 index 093abc8d9e249..8f21b90103dcf 100644 --- 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 index 5d3d95d29e040..5fce2f9fd7153 100644 --- 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,7 +373,10 @@ { "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 } ] }, { @@ -295,6 +384,9 @@ "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 index 739eba4dcb063..a641641c32844 100644 --- 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 ] ] } ] diff --git a/data/mods/Magiclysm/items/alchemy_items.json b/data/mods/Magiclysm/items/alchemy_items.json index 21a23acaa70af..5b57231f1aa1e 100644 --- a/data/mods/Magiclysm/items/alchemy_items.json +++ b/data/mods/Magiclysm/items/alchemy_items.json @@ -376,54 +376,24 @@ "color": "dark_gray", "use_action": { "type": "place_trap", - "bury_question": "Bury the alchemic mine?", - "bury": { "trap": "tr_alchemist_mine_buried", "moves": 275, "practice": 7, "done_message": "You bury the alchemic mine." }, "trap": "tr_alchemist_mine", - "moves": 200, - "practice": 4, + "moves": 120, + "practice": 3, "done_message": "You set the alchemic mine." } }, - { - "type": "trap", - "id": "tr_alchemist_mine_buried", - "trigger_weight": "200 g", - "name": "buried alchemical mine", - "color": "red", - "symbol": "_", - "visibility": 10, - "avoidance": 14, - "difficulty": 10, - "action": "landmine", - "drops": [ "alchemist_mine" ], - "vehicle_data": { - "do_explosion": true, - "damage": 1000, - "sound_volume": 10, - "sound": "Boom!", - "sound_type": "explosion", - "sound_variant": "default" - } - }, { "type": "trap", "id": "tr_alchemist_mine", - "trigger_weight": "200 g", + "trigger_weight": "1 g", "name": "alchemical mine", - "color": "red", + "color": "yellow", "symbol": "^", "visibility": 1, - "avoidance": 14, - "difficulty": 10, - "action": "landmine", - "drops": [ "alchemist_mine" ], - "vehicle_data": { - "do_explosion": true, - "damage": 1000, - "sound_volume": 10, - "sound": "Boom!", - "sound_type": "explosion", - "sound_variant": "default" - } + "avoidance": 99, + "difficulty": 0, + "action": "spell", + "spell_data": { "id": "alchemist_mine_pull" }, + "drops": [ "alchemist_mine" ] } ] diff --git a/data/mods/Magiclysm/items/cast_spell_items.json b/data/mods/Magiclysm/items/cast_spell_items.json index 5a47fbd6ade99..2253e5274fef6 100644 --- a/data/mods/Magiclysm/items/cast_spell_items.json +++ b/data/mods/Magiclysm/items/cast_spell_items.json @@ -6,17 +6,16 @@ "use_action": { "type": "cast_spell", "spell_id": "potion_recover_mana", "no_fail": true, "level": 0 }, "type": "COMESTIBLE", "weight": "265 g", - "quench": 10, - "calories": 75, + "quench": 1, + "calories": 0, "volume": "250ml", "charges": 1, "fun": -1, - "healthy": 1, "symbol": "~", "container": "flask_glass", "color": "light_blue", "comestible_type": "DRINK", - "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ], + "flags": [ "EATEN_COLD", "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ], "phase": "liquid", "price": 2500, "freezing_point": 4 @@ -27,6 +26,7 @@ "name": { "str": "mana potion" }, "copy-from": "mana_potion_lesser", "use_action": { "type": "cast_spell", "spell_id": "potion_recover_mana", "no_fail": true, "level": 5 }, + "calories": 0, "price": 10000 }, { @@ -34,53 +34,300 @@ "type": "COMESTIBLE", "name": { "str": "greater mana potion" }, "copy-from": "mana_potion_lesser", + "calories": 0, "use_action": { "type": "cast_spell", "spell_id": "potion_recover_mana", "no_fail": true, "level": 15 }, "price": 30000 }, { "id": "cats_grace_potion", - "name": { "str": "potion of Cat's Grace", "str_pl": "potions of Cat's Grace" }, - "description": "This is a potion of Cat's Grace. It will increase your dexterity for 10 minutes.", - "use_action": { "type": "cast_spell", "spell_id": "cats_grace", "no_fail": true, "level": 9 }, "type": "COMESTIBLE", - "weight": "265 g", - "quench": 10, - "calories": 75, - "volume": "250ml", - "charges": 1, - "fun": -1, - "symbol": "~", - "container": "flask_glass", + "name": { "str": "potion of Cat's Grace", "str_pl": "potions of Cat's Grace" }, + "description": "This is a potion of Cat's Grace. It will increase your dexterity for 50 minutes.", + "copy-from": "mana_potion_lesser", + "calories": 25, + "use_action": { "type": "cast_spell", "spell_id": "cats_grace", "no_fail": true, "level": 25 }, "color": "yellow", - "comestible_type": "DRINK", - "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ], - "phase": "liquid", - "price": 3000, - "freezing_point": 4 + "price": 3000 }, { "id": "ogres_strength_potion", "name": { "str": "potion of Ogre's Strength", "str_pl": "potions of Ogre's Strength" }, - "description": "This is a potion of Ogre's Strength. It will increase your strength for 10 minutes.", - "use_action": { "type": "cast_spell", "spell_id": "ogres_strength", "no_fail": true, "level": 9 }, + "description": "This is a potion of Ogre's Strength. It will increase your strength for 50 minutes.", + "use_action": { "type": "cast_spell", "spell_id": "ogres_strength", "no_fail": true, "level": 25 }, "type": "COMESTIBLE", - "copy-from": "cats_grace_potion" + "color": "yellow", + "calories": 50, + "copy-from": "mana_potion_lesser" }, { "id": "eagles_sight_potion", "name": { "str": "potion of Eagle's Sight", "str_pl": "potions of Eagle's Sight" }, - "description": "This is a potion of Eagle's Sight. It will increase your perception for 10 minutes.", - "use_action": { "type": "cast_spell", "spell_id": "eagles_sight", "no_fail": true, "level": 9 }, + "description": "This is a potion of Eagle's Sight. It will increase your perception for 50 minutes.", + "use_action": { "type": "cast_spell", "spell_id": "eagles_sight", "no_fail": true, "level": 25 }, "type": "COMESTIBLE", - "copy-from": "cats_grace_potion" + "color": "yellow", + "calories": 17, + "copy-from": "mana_potion_lesser" }, { "id": "foxs_cunning_potion", "name": { "str": "potion of Fox's Cunning", "str_pl": "potions of Fox's Cunning" }, - "description": "This is a potion of Fox's Cunning. It will increase your intelligence for 10 minutes.", - "use_action": { "type": "cast_spell", "spell_id": "foxs_cunning", "no_fail": true, "level": 9 }, + "description": "This is a potion of Fox's Cunning. It will increase your intelligence for 50 minutes.", + "use_action": { "type": "cast_spell", "spell_id": "foxs_cunning", "no_fail": true, "level": 25 }, + "type": "COMESTIBLE", + "color": "yellow", + "calories": 56, + "copy-from": "mana_potion_lesser" + }, + { + "id": "flask_clairvoyance", + "type": "COMESTIBLE", + "name": { "str": "potion of clairvoyance", "str_pl": "potions of clairvoyance" }, + "description": "Close your eyes and see.", + "copy-from": "mana_potion_lesser", + "calories": 86, + "use_action": { "type": "cast_spell", "spell_id": "flask_clairvoyance", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_spear", + "type": "COMESTIBLE", + "name": { "str_sp": "\"Spear in the flask\"" }, + "description": "Use it to penetrate everything in line of sight", + "copy-from": "mana_potion_lesser", + "use_action": { "type": "cast_spell", "spell_id": "flask_spear", "no_fail": true, "level": 0 }, + "calories": 0, + "price": 40000 + }, + { + "id": "flask_confusion", + "type": "COMESTIBLE", + "name": { "str": "potion of instability", "str_pl": "potions of instability" }, + "description": "That thing temporary freeze the high brain activity for a while. It was banned by the government due the popularity in crime sphere, but some people still know the recipe.", + "copy-from": "mana_potion_lesser", + "calories": 0, + "use_action": { "type": "cast_spell", "spell_id": "flask_confusion", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_teleport_rand", + "type": "COMESTIBLE", + "name": { "str": "potion of escape", "str_pl": "potions of escape" }, + "description": "Get out of jail free card for each who care about his life.", + "copy-from": "mana_potion_lesser", + "calories": 220, + "use_action": { "type": "cast_spell", "spell_id": "flask_teleport_rand", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_teleport", + "type": "COMESTIBLE", + "name": { "str": "potion of teleportation", "str_pl": "potions of teleportation" }, + "description": "Important part of every professional robber. It was banned by the government due the popularity in crime sphere, but some people still know the recipe.", + "copy-from": "mana_potion_lesser", + "calories": 260, + "use_action": { "type": "cast_spell", "spell_id": "flask_teleport", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_shadow_field", + "type": "COMESTIBLE", + "name": { "str": "potion of shadows", "str_pl": "potions of shadows" }, + "description": "No one really knows why it was created, but it can be useful in some situations", + "copy-from": "mana_potion_lesser", + "use_action": { "type": "cast_spell", "spell_id": "flask_shadow_field", "no_fail": true, "level": 0 }, + "calories": 0, + "price": 40000 + }, + { + "id": "flask_fireball", + "type": "COMESTIBLE", + "name": { "str_sp": "\"Fire in the flask\"" }, + "description": "They were really useful in middle ages, but the price was too high, and they were supplanted with another incendiary weapon and, long after, with molotov cocktails.", + "copy-from": "mana_potion_lesser", + "calories": 0, + "use_action": { "type": "cast_spell", "spell_id": "flask_fireball", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_invisibility", + "type": "COMESTIBLE", + "name": { "str": "potion of invisibility", "str_pl": "potions of invisibility" }, + "description": "Make you totally invisible, except in mana spectrum. It was banned by the government due the popularity in crime sphere, but some people still know the recipe.", + "copy-from": "mana_potion_lesser", + "calories": 77, + "use_action": { "type": "cast_spell", "spell_id": "flask_invisibility", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_healing", + "type": "COMESTIBLE", + "name": { "str": "potion of healthiness", "str_pl": "potions of healthiness" }, + "description": "Classical medicine, used from ancient times, that came to us with almost no changes. Allow you to heal the common illness way faster than before.", + "copy-from": "mana_potion_lesser", + "calories": 358, + "use_action": { "type": "cast_spell", "spell_id": "flask_healing", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_feather", + "type": "COMESTIBLE", + "name": { "str": "potion of lesser gravity control", "str_pl": "potions of lesser gravity control" }, + "description": "Allow user to survive the fall from any height. Sadly, the required preparation and effect's weakness do not allow to use it for climbing protection.", + "copy-from": "mana_potion_lesser", + "calories": 57, + "use_action": { "type": "cast_spell", "spell_id": "flask_feather", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_night_vision", "type": "COMESTIBLE", - "copy-from": "cats_grace_potion" + "name": { "str": "potion of night vision", "str_pl": "potions of night vision" }, + "description": "Designed by Occult Coalition sorcerers, this potion was fairly popular inside the special operation forces and in the hunting communities.", + "copy-from": "mana_potion_lesser", + "calories": 56, + "use_action": { "type": "cast_spell", "spell_id": "flask_night_vision", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_charm", + "type": "COMESTIBLE", + "name": { "str": "potion of domination", "str_pl": "potions of domination" }, + "description": "Rearrange neural activity of the creature to be 100% loyal to a blood owner. It was banned by the government due the popularity in crime sphere, but some people still know the recipe.", + "copy-from": "mana_potion_lesser", + "calories": 21, + "use_action": { "type": "cast_spell", "spell_id": "flask_charm", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_sludge_field", + "type": "COMESTIBLE", + "name": { "str": "potion of slippery splash", "str_pl": "potions of slippery splash" }, + "description": "At first it was the small spell, designed to trap and kill small bugs and rodents, but someone found it useful in real fight, and improve it.", + "copy-from": "mana_potion_lesser", + "calories": 0, + "use_action": { "type": "cast_spell", "spell_id": "flask_sludge_field", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_speed", + "type": "COMESTIBLE", + "name": { "str": "potion of sprint", "str_pl": "potions of sprint" }, + "description": "They counts as doping in olympic games. Luckily you are not in stadium.", + "copy-from": "mana_potion_lesser", + "calories": 26, + "use_action": { "type": "cast_spell", "spell_id": "flask_speed", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_stamina", + "type": "COMESTIBLE", + "name": { "str": "potion of iron lungs", "str_pl": "potions of iron lungs" }, + "description": "Old recipe, used to increase the user's endurance. The diluted version was used by a different armies for fast and long forced marches.", + "copy-from": "mana_potion_lesser", + "calories": 156, + "use_action": { "type": "cast_spell", "spell_id": "flask_stamina", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_rebreather", + "type": "COMESTIBLE", + "name": { "str": "potion of water breathing", "str_pl": "potions of water breathing" }, + "description": "An old marine recipe, that saved a lot of shipwreck victim lives.", + "copy-from": "mana_potion_lesser", + "calories": 121, + "use_action": { "type": "cast_spell", "spell_id": "flask_rebreather", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_excitement", + "type": "COMESTIBLE", + "name": { "str": "potion of stimulus", "str_pl": "potions of stimulus" }, + "description": "One of the various potions, designed to make person stronger on battle field. Increase the user's senses and improve the reaction, increasing his ability to fight in melee.", + "copy-from": "mana_potion_lesser", + "calories": 89, + "use_action": { "type": "cast_spell", "spell_id": "flask_excitement", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_resistance", + "type": "COMESTIBLE", + "name": { "str": "potion of iron skin", "str_pl": "potions of iron skin" }, + "description": "Harden the user's skin, and allow to take more damage with no harm. Was popular in ancient armies, but now mostly forgotten.", + "copy-from": "mana_potion_lesser", + "calories": 211, + "use_action": { "type": "cast_spell", "spell_id": "flask_resistance", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_illumination", + "type": "COMESTIBLE", + "name": { "str": "potion of illumination", "str_pl": "potions of illumination" }, + "description": "That potion was designed in 19th century, for miners that was awared of explosive gas leaks in the mine. Not so popular now, due the abundance of electric lighters, but still useful sometimes.", + "copy-from": "mana_potion_lesser", + "calories": 7, + "use_action": { "type": "cast_spell", "spell_id": "flask_illumination", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_mana_regen", + "type": "COMESTIBLE", + "name": { "str": "potion of mana regeneration", "str_pl": "potions of mana regeneration" }, + "description": "Attract the ley-lines to user, increasing the natural mana regeneration.", + "copy-from": "mana_potion_lesser", + "calories": 66, + "use_action": { "type": "cast_spell", "spell_id": "flask_mana_regen", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_max_mana", + "type": "COMESTIBLE", + "name": { "str": "potion of mana reserves", "str_pl": "potions of mana reserves" }, + "description": "Splay user's ley-lines, what allow them to use more mana than they usually can.", + "copy-from": "mana_potion_lesser", + "calories": 76, + "use_action": { "type": "cast_spell", "spell_id": "flask_max_mana", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_regeneration", + "type": "COMESTIBLE", + "name": { "str": "potion of regeneration", "str_pl": "potions of regeneration" }, + "description": "Start a long-term spell sequence, that increase your regeneration abilities.", + "copy-from": "mana_potion_lesser", + "calories": 344, + "use_action": { "type": "cast_spell", "spell_id": "flask_regeneration", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_mood", + "type": "COMESTIBLE", + "name": { "str": "potion of happiness", "str_pl": "potions of happiness" }, + "description": "More than alcohol drink than potion, this mixture make your brain feel constant happiness, ignoring the whole boredom of reality. It cause no addiction, but it still banned in some countries, including the USA (except the Texas and New Hampshire, where it's just frowned upon)", + "copy-from": "mana_potion_lesser", + "calories": 65, + "use_action": { "type": "cast_spell", "spell_id": "flask_mood", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_toxin", + "type": "COMESTIBLE", + "name": { "str": "potion of toxin", "str_pl": "potions of toxin" }, + "description": "Spread a low lethal toxin on your enemies. Its surprisingly effective, if you have enough time.", + "copy-from": "mana_potion_lesser", + "calories": 0, + "use_action": { "type": "cast_spell", "spell_id": "flask_toxin", "no_fail": true, "level": 0 }, + "price": 40000 + }, + { + "id": "flask_venom", + "type": "COMESTIBLE", + "name": { "str": "potion of venom", "str_pl": "potions of venom" }, + "description": "Concentrated potion, teleported right in the enemy body - fast, painful, and guarantee death.", + "copy-from": "mana_potion_lesser", + "calories": 0, + "use_action": { "type": "cast_spell", "spell_id": "flask_venom", "no_fail": true, "level": 0 }, + "price": 40000 }, { "id": "animist_doll_zombie", diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json index 38356b284ecbf..bbc2d23f6c3a2 100644 --- a/data/mods/Magiclysm/items/ethereal_items.json +++ b/data/mods/Magiclysm/items/ethereal_items.json @@ -1018,5 +1018,30 @@ "name": { "str": "magical throwing knife", "str_pl": "magical throwing knives" }, "description": "A transparent blade seems to radiate intent to be thrown. Its ineffective cutting edge and odd shape makes it unsuitable for use as a tool.", "thrown_damage": [ { "damage_type": "pure", "amount": 40 } ] + }, + { + "id": "flask_ethereal_rebreather", + "name": { "str_sp": "spiritus" }, + "description": "Now you can breath under water, like a fish.", + "type": "TOOL_ARMOR", + "category": "clothing", + "weight": "0 g", + "material": [ "concentrated_mana" ], + "volume": "1 ml", + "symbol": "0", + "color": "white", + "armor": [ { "encumbrance": 0, "coverage": 75, "covers": [ "mouth" ] } ], + "flags": [ + "WATER_FRIENDLY", + "SEMITANGIBLE", + "ONLY_ONE", + "OVERSIZE", + "AURA", + "ZERO_WEIGHT", + "NO_TAKEOFF", + "NONCONDUCTIVE", + "TRADER_AVOID", + "REBREATHER" + ] } ] diff --git a/data/mods/Magiclysm/items/herbs_and_flowers.json b/data/mods/Magiclysm/items/herbs_and_flowers.json index f7cfc45a5b73c..2c22d14a9c608 100644 --- a/data/mods/Magiclysm/items/herbs_and_flowers.json +++ b/data/mods/Magiclysm/items/herbs_and_flowers.json @@ -9,7 +9,7 @@ "comestible_type": "FOOD", "flags": [ "NO_AUTO_CONSUME", "NONCONDUCTIVE" ], "symbol": "%", - "calories": 200, + "calories": 100, "description": "A fractal corolla winds inward in mathematical harmony, reflecting beauty in its ideal form.", "price_postapoc": 600, "material": "veggy", @@ -104,7 +104,7 @@ "//": "another high level component, 'mana' related", "color": "yellow", "symbol": "%", - "calories": 631, + "calories": 63, "comestible_type": "FOOD", "looks_like": "wheat", "description": "Stalks cut from a golden reed. They have a strong, spiced aroma.", @@ -119,7 +119,7 @@ "//": "'duration' and 'sustaining'", "symbol": "o", "color": "brown", - "calories": 645, + "calories": 64, "comestible_type": "FOOD", "looks_like": "egg", "description": "Heavy wooden shells surrounding a diminutive white fruit.", @@ -134,7 +134,7 @@ "//": "'range', 'area', 'aoe'", "color": "brown", "symbol": "o", - "calories": 285, + "calories": 85, "comestible_type": "FOOD", "looks_like": "egg", "description": "Knife sharp thorns from a dragonail bush. Eating them raw would be a dangerous challenge.", @@ -149,7 +149,7 @@ "//": "breaks magic enchantments (whatever that means), used to make magic armor, maybe 'breaks' related (like increasing the damage/armor penetration abilities)", "color": "blue", "symbol": "%", - "calories": 98, + "calories": 67, "comestible_type": "FOOD", "description": "The black root of a moly plant, extracted from the ground through great effort. Rumored to grant protection to those who consume it.", "price_postapoc": 300, @@ -163,7 +163,7 @@ "//": "stat bonuses", "color": "blue", "symbol": "%", - "calories": 78, + "calories": 33, "use_action": { "type": "cast_spell", "spell_id": "flower_fern_spell", "no_fail": true, "level": 0 }, "comestible_type": "FOOD", "description": "A small flower cut from a fern, it has a faint honeyed aroma. Believed to bring good luck to whoever finds it.", @@ -178,7 +178,7 @@ "//": "low and middle level spell component, same as mana crystals, weak 'mana' related", "color": "blue", "symbol": "%", - "calories": 85, + "calories": 4, "use_action": { "type": "cast_spell", "spell_id": "funnelcap_spell", "no_fail": true, "level": 0 }, "comestible_type": "FOOD", "description": "Large chunks of funnelcap meat, still leaking fine amounts of clear sap.", diff --git a/data/mods/Magiclysm/items/recipe_books.json b/data/mods/Magiclysm/items/recipe_books.json index fe51b70358fbe..f03786f655856 100644 --- a/data/mods/Magiclysm/items/recipe_books.json +++ b/data/mods/Magiclysm/items/recipe_books.json @@ -65,8 +65,8 @@ "category": "manuals", "name": { "str": "A Soulbinder's Guide to Necromancy", "str_pl": "copies of A Soulbinder's Guide to Necromancy" }, "description": "A paperback tome for the art of binding undead creatures' souls to dolls, along with emulating their healing factor.", - "weight": "1 kg", - "volume": "750 ml", + "weight": "425 g", + "volume": "450 ml", "price": 7900, "bashing": 5, "material": [ "paper" ], @@ -80,6 +80,45 @@ "time": "20 m", "fun": -2 }, + { + "id": "alchemy_illegal", + "type": "BOOK", + "category": "manuals", + "name": { "str": "small notebook", "str_pl": "copies of small notebook" }, + "description": "Small old notebook without cover. There is some illegal potion recipes, that you can't find in common books", + "weight": "260 g", + "volume": "350 ml", + "price": 13900, + "bashing": 3, + "material": [ "paper" ], + "symbol": "?", + "color": "white", + "skill": "chemistry", + "required_level": 5, + "max_level": 6, + "intelligence": 10, + "time": "20 m" + }, + { + "id": "alchemy_master", + "type": "BOOK", + "category": "manuals", + "name": { "str": "Tabula Smaragdina", "str_pl": "copies of Tabula Smaragdina" }, + "description": "Huge, hardcover book, filled with the most detailed information about alchemy history, usage, and future, authored by Trismegistus. Modern edition, published by Noita Press.", + "weight": "870 g", + "volume": "750 ml", + "price": 17800, + "bashing": 6, + "material": [ "paper" ], + "symbol": "?", + "color": "white", + "skill": "chemistry", + "required_level": 6, + "max_level": 9, + "intelligence": 12, + "time": "20 m", + "fun": -2 + }, { "id": "techno_basic", "type": "BOOK", diff --git a/data/mods/Magiclysm/morale_types.json b/data/mods/Magiclysm/morale_types.json new file mode 100644 index 0000000000000..077b612f9f51a --- /dev/null +++ b/data/mods/Magiclysm/morale_types.json @@ -0,0 +1,7 @@ +[ + { + "id": "morale_iocus", + "type": "morale_type", + "text": "Enjoyed Iocus" + } +] diff --git a/data/mods/Magiclysm/recipes/mutagens.json b/data/mods/Magiclysm/recipes/mutagens.json new file mode 100644 index 0000000000000..96f21b0685d51 --- /dev/null +++ b/data/mods/Magiclysm/recipes/mutagens.json @@ -0,0 +1,40 @@ +[ + { + "type": "recipe", + "activity_level": "fake", + "result": "manatouched_serum", + "qualities": [ { "id": "MAGIC_MUTAGEN", "level": 1 }, { "id": "MANA_INFUSE", "level": 2 }, { "id": "CONCENTRATE", "level": 1 } ], + "components": [ [ [ "mana_dust", 20 ] ], [ [ "mana_potion", 4 ], [ "mana_potion_greater", 1 ], [ "mana_infused_blood", 6 ] ] ], + "skill_used": "chemistry", + "difficulty": 4, + "skills_required": [ "spellcraft", 6 ], + "proficiencies": [ { "proficiency": "prof_alchemy" } ], + "time": "4 h", + "batch_time_factors": [ 80, 5 ], + "category": "CC_ENCHANTED", + "subcategory": "CSC_ENCHANTED_POTIONS", + "autolearn": true + }, + { + "type": "recipe", + "activity_level": "fake", + "result": "manatouched_mutagen", + "qualities": [ + { "id": "MAGIC_MUTAGEN", "level": 1 }, + { "id": "MANA_INFUSE", "level": 2 }, + { "id": "CONCENTRATE", "level": 1 }, + { "id": "SEPARATE", "level": 1 }, + { "id": "ANALYSIS", "level": 1 } + ], + "components": [ [ [ "mana_dust", 5 ] ], [ [ "mana_potion", 1 ], [ "mana_infused_blood", 2 ] ], [ [ "mutagen", 1 ] ] ], + "skill_used": "chemistry", + "difficulty": 4, + "skills_required": [ "spellcraft", 4 ], + "proficiencies": [ { "proficiency": "prof_alchemy" } ], + "time": "3 h", + "batch_time_factors": [ 80, 5 ], + "category": "CC_ENCHANTED", + "subcategory": "CSC_ENCHANTED_POTIONS", + "autolearn": true + } +] diff --git a/data/mods/Magiclysm/recipes/recipe_potions.json b/data/mods/Magiclysm/recipes/recipe_potions.json index f6460d5f175a0..5ffa54222ee7f 100644 --- a/data/mods/Magiclysm/recipes/recipe_potions.json +++ b/data/mods/Magiclysm/recipes/recipe_potions.json @@ -1,25 +1,7 @@ [ { "type": "recipe", - "activity_level": "fake", - "result": "potion_starter", - "category": "CC_ENCHANTED", - "subcategory": "CSC_ENCHANTED_POTIONS", - "skill_used": "chemistry", - "skills_required": [ "spellcraft", 2 ], - "difficulty": 3, - "charges": 7, - "time": "120 m", - "batch_time_factors": [ 75, 4 ], - "book_learn": [ [ "alchemy_basic", 3 ], [ "necro_basic", 4 ] ], - "qualities": [ { "id": "CHEM", "level": 1 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "proficiencies": [ { "proficiency": "prof_alchemy", "required": false, "time_multiplier": 1.5 } ], - "using": [ [ "hard_liquor", 7 ] ] - }, - { - "type": "recipe", - "activity_level": "fake", + "activity_level": "NO_EXERCISE", "result": "potion_starter_superior", "category": "CC_ENCHANTED", "subcategory": "CSC_ENCHANTED_POTIONS", @@ -27,281 +9,204 @@ "skills_required": [ "spellcraft", 4 ], "difficulty": 4, "charges": 7, - "time": "120 m", - "batch_time_factors": [ 75, 4 ], - "book_learn": [ [ "alchemy_basic", 3 ], [ "necro_basic", 4 ] ], + "time": "60 m", + "batch_time_factors": [ 75, 2 ], + "book_learn": [ [ "alchemy_basic", 3 ], [ "necro_basic", 4 ], [ "alchemy_master", 3 ] ], "qualities": [ { "id": "CHEM", "level": 1 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], + "tools": [ [ [ "surface_heat", 15, "LIST" ] ] ], "proficiencies": [ { "proficiency": "prof_alchemy" } ], - "components": [ [ [ "chem_ethanol", 7 ] ], [ [ "alumentum", 1 ] ] ] + "components": [ [ [ "chem_ethanol", 7 ] ], [ [ "alumentum", 1 ] ], [ [ "water_clean", 7 ] ] ] }, { "type": "recipe", - "activity_level": "fake", - "result": "mana_potion_lesser", - "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ] ] ], - "components": [ [ [ "lotus", 1 ] ], [ [ "potion_starter", 1 ] ] ], - "time": "1 h", - "batch_time_factors": [ 75, 4 ], - "skill_used": "chemistry", + "copy-from": "potion_starter_superior", + "result": "potion_starter", + "book_learn": [ [ "alchemy_basic", 1 ], [ "necro_basic", 2 ], [ "alchemy_master", 1 ] ], + "skills_required": [ "spellcraft", 2 ], "difficulty": 3, - "skills_required": [ "spellcraft", 3 ], - "proficiencies": [ { "proficiency": "prof_alchemy" } ], - "category": "CC_ENCHANTED", - "subcategory": "CSC_ENCHANTED_POTIONS", - "autolearn": true + "tools": [ [ [ "surface_heat", 15, "LIST" ] ] ], + "proficiencies": [ { "proficiency": "prof_alchemy", "required": false, "time_multiplier": 1.5 } ], + "using": [ [ "hard_liquor_and_whiskflower", 7 ] ], + "components": [ [ [ "water", 7 ], [ "water_clean", 7 ], [ "water_mineral", 7 ] ], [ [ "mana_dust", 7 ] ] ] }, { "type": "recipe", - "activity_level": "fake", - "result": "mana_potion", - "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ] ] ], - "components": [ [ [ "mana_dust", 1 ] ], [ [ "lotus", 1 ] ], [ [ "potion_starter", 1 ] ] ], - "time": "3 h", - "batch_time_factors": [ 75, 4 ], + "//": "first level flasks", + "activity_level": "NO_EXERCISE", + "qualities": [ + { "id": "CONTAIN", "level": 1 }, + { "id": "MANA_INFUSE", "level": 1 }, + { "id": "DISTILL", "level": 1 }, + { "id": "CONCENTRATE", "level": 1 } + ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "mortar_pestle", -1 ] ] ], "skill_used": "chemistry", - "difficulty": 4, - "skills_required": [ "spellcraft", 4 ], + "difficulty": 1, + "skills_required": [ "spellcraft", 2 ], "proficiencies": [ { "proficiency": "prof_alchemy" } ], + "time": "60 m", + "batch_time_factors": [ 80, 2 ], "category": "CC_ENCHANTED", "subcategory": "CSC_ENCHANTED_POTIONS", - "autolearn": true + "result": "flask_illumination", + "book_learn": [ [ "alchemy_basic", 2 ], [ "alchemy_master", 2 ] ], + "components": [ [ [ "potion_starter", 2 ] ], [ [ "glowing_mushroom", 2 ] ], [ [ "wood_barnacle", 4 ] ], [ [ "dragon_nail", 2 ] ] ] }, { "type": "recipe", - "activity_level": "fake", - "result": "mana_potion_greater", - "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "MANA_INFUSE", "level": 2 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ] ] ], - "components": [ [ [ "glow_dust", 1 ] ], [ [ "lotus", 1 ] ], [ [ "potion_starter_superior", 1 ] ] ], - "time": "4 h", - "batch_time_factors": [ 75, 4 ], - "skill_used": "chemistry", - "difficulty": 5, - "skills_required": [ "spellcraft", 5 ], - "proficiencies": [ { "proficiency": "prof_alchemy" } ], - "category": "CC_ENCHANTED", - "subcategory": "CSC_ENCHANTED_POTIONS", - "autolearn": true + "copy-from": "flask_illumination", + "result": "flask_rebreather", + "book_learn": [ [ "alchemy_basic", 2 ], [ "alchemy_master", 2 ] ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "mortar_pestle", -1 ] ] ], + "components": [ + [ [ "potion_starter", 2 ] ], + [ [ "wood_barnacle", 2 ] ], + [ [ "olieribos", 2 ] ], + [ [ "horn_moss_capsule", 2 ] ], + [ [ "golden_reed_stalk", 2 ] ] + ] }, { "type": "recipe", - "activity_level": "fake", - "result": "manatouched_serum", - "qualities": [ { "id": "MAGIC_MUTAGEN", "level": 1 }, { "id": "MANA_INFUSE", "level": 2 }, { "id": "CONCENTRATE", "level": 1 } ], - "components": [ [ [ "mana_dust", 20 ] ], [ [ "mana_potion", 4 ], [ "mana_potion_greater", 1 ], [ "mana_infused_blood", 6 ] ] ], - "skill_used": "chemistry", - "difficulty": 4, - "skills_required": [ "spellcraft", 6 ], - "proficiencies": [ { "proficiency": "prof_alchemy" } ], - "time": "4 h", - "batch_time_factors": [ 80, 5 ], - "category": "CC_ENCHANTED", - "subcategory": "CSC_ENCHANTED_POTIONS", + "copy-from": "flask_illumination", + "result": "mana_potion_lesser", + "book_learn": [ [ "alchemy_basic", 2 ], [ "alchemy_master", 2 ] ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "mortar_pestle", -1 ] ] ], + "using": [ [ "mana_energy_weak", 2 ] ], + "components": [ [ [ "potion_starter", 1 ] ] ], "autolearn": true }, { "type": "recipe", - "activity_level": "fake", - "result": "manatouched_mutagen", + "//": "second level flasks", + "activity_level": "NO_EXERCISE", "qualities": [ - { "id": "MAGIC_MUTAGEN", "level": 1 }, + { "id": "CONTAIN", "level": 1 }, { "id": "MANA_INFUSE", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, - { "id": "SEPARATE", "level": 1 }, - { "id": "ANALYSIS", "level": 1 } + { "id": "DISTILL", "level": 1 } ], - "components": [ [ [ "mana_dust", 5 ] ], [ [ "mana_potion", 1 ], [ "mana_infused_blood", 2 ] ], [ [ "mutagen", 1 ] ] ], + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], "skill_used": "chemistry", - "difficulty": 4, + "difficulty": 3, "skills_required": [ "spellcraft", 4 ], "proficiencies": [ { "proficiency": "prof_alchemy" } ], - "time": "3 h", - "batch_time_factors": [ 80, 5 ], + "time": "120 m", + "batch_time_factors": [ 60, 2 ], "category": "CC_ENCHANTED", "subcategory": "CSC_ENCHANTED_POTIONS", - "autolearn": true - }, - { - "type": "recipe", - "activity_level": "fake", "result": "cats_grace_potion", - "category": "CC_ENCHANTED", - "subcategory": "CSC_ENCHANTED_POTIONS", - "skill_used": "chemistry", - "skills_required": [ "spellcraft", 5 ], - "difficulty": 5, - "time": "60 m", - "batch_time_factors": [ 50, 4 ], - "book_learn": [ [ "alchemy_basic", 4 ] ], - "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ], - "tools": [ - [ [ "surface_heat", 10, "LIST" ] ], - [ - [ "rune_alchemist", -1 ], - [ "rune_magus", -1 ], - [ "rune_magus_weapon", -1 ], - [ "rune_magus_weapon_adept", -1 ] - ] - ], - "proficiencies": [ { "proficiency": "prof_alchemy" } ], + "book_learn": [ [ "alchemy_basic", 3 ], [ "alchemy_master", 3 ] ], "components": [ - [ [ "potion_starter", 5 ] ], - [ [ "hairball", 2 ] ], - [ - [ "catfood", 1 ], - [ "fish", 1 ], - [ "salted_fish", 1 ], - [ "fish_cooked", 1 ], - [ "fish_smoked", 1 ], - [ "dry_fish", 1 ], - [ "rehydrated_fish", 1 ], - [ "fish_canned", 1 ], - [ "fish_pickled", 1 ], - [ "fish_fried", 1 ], - [ "lutefisk", 1 ] - ], - [ [ "adderall", 10 ], [ "meth", 6 ], [ "prozac", 15 ] ] + [ [ "potion_starter_superior", 1 ] ], + [ [ "fern_flower", 2 ] ], + [ [ "glowing_mushroom", 4 ] ], + [ [ "wood_barnacle", 4 ] ] ] }, { "type": "recipe", - "activity_level": "fake", + "copy-from": "cats_grace_potion", "result": "ogres_strength_potion", - "category": "CC_ENCHANTED", - "subcategory": "CSC_ENCHANTED_POTIONS", - "skill_used": "chemistry", - "skills_required": [ "spellcraft", 5 ], - "proficiencies": [ { "proficiency": "prof_alchemy" } ], - "difficulty": 5, - "time": "60 m", - "batch_time_factors": [ 50, 4 ], - "book_learn": [ [ "alchemy_basic", 4 ] ], - "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ], - "tools": [ - [ [ "surface_heat", 10, "LIST" ] ], - [ - [ "rune_alchemist", -1 ], - [ "rune_magus", -1 ], - [ "rune_magus_weapon", -1 ], - [ "rune_magus_weapon_adept", -1 ] - ] - ], - "components": [ [ [ "potion_starter", 5 ] ], [ [ "sinew", 40 ] ], [ [ "adrenal_gland_large", 2 ] ] ] + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], + "components": [ [ [ "potion_starter_superior", 1 ] ], [ [ "fern_flower", 2 ] ], [ [ "olieribos", 4 ] ], [ [ "wood_barnacle", 4 ] ] ] }, { "type": "recipe", - "activity_level": "fake", + "copy-from": "cats_grace_potion", "result": "eagles_sight_potion", - "category": "CC_ENCHANTED", - "subcategory": "CSC_ENCHANTED_POTIONS", - "skill_used": "chemistry", - "skills_required": [ "spellcraft", 5 ], - "proficiencies": [ { "proficiency": "prof_alchemy" } ], - "difficulty": 5, - "time": "60 m", - "batch_time_factors": [ 50, 4 ], - "book_learn": [ [ "alchemy_basic", 4 ] ], - "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ], - "tools": [ - [ [ "surface_heat", 10, "LIST" ] ], - [ - [ "rune_alchemist", -1 ], - [ "rune_magus", -1 ], - [ "rune_magus_weapon", -1 ], - [ "rune_magus_weapon_adept", -1 ] - ] - ], - "components": [ - [ [ "potion_starter", 5 ] ], - [ - [ "egg_bird", 5 ], - [ "egg_bird_unfert", 5 ], - [ "egg_grouse", 5 ], - [ "egg_duck", 3 ], - [ "egg_crow", 5 ], - [ "egg_raven", 5 ], - [ "egg_bluejay", 5 ], - [ "egg_cardinal", 5 ], - [ "egg_robin", 5 ], - [ "egg_sparrow", 7 ], - [ "egg_chicken", 5 ], - [ "egg_pheasant", 5 ], - [ "egg_cockatrice", 5 ], - [ "egg_turkey", 3 ], - [ "egg_goose_canadian", 2 ] - ], - [ [ "feather", 20 ], [ "down_feather", 20 ] ], - [ - [ "liver", 3 ], - [ "veggy_canned", 3 ], - [ "veggy_salted", 5 ], - [ "carrot", 3 ], - [ "irradiated_carrot", 3 ], - [ "pumpkin", 4 ], - [ "irradiated_pumpkin", 4 ], - [ "raw_dandelion", 6 ], - [ "zucchini", 4 ], - [ "irradiated_zucchini", 4 ], - [ "rose_hips", 6 ] - ] - ] + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], + "components": [ [ [ "potion_starter_superior", 1 ] ], [ [ "fern_flower", 2 ] ], [ [ "dragon_nail", 4 ] ], [ [ "wood_barnacle", 4 ] ] ] }, { "type": "recipe", - "activity_level": "fake", + "copy-from": "cats_grace_potion", "result": "foxs_cunning_potion", - "category": "CC_ENCHANTED", - "subcategory": "CSC_ENCHANTED_POTIONS", - "skill_used": "chemistry", - "skills_required": [ "spellcraft", 5 ], - "proficiencies": [ { "proficiency": "prof_alchemy" } ], - "difficulty": 5, - "time": "60 m", - "batch_time_factors": [ 50, 4 ], - "book_learn": [ [ "alchemy_basic", 4 ] ], - "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ], - "tools": [ - [ [ "surface_heat", 10, "LIST" ] ], - [ - [ "rune_alchemist", -1 ], - [ "rune_magus", -1 ], - [ "rune_magus_weapon", -1 ], - [ "rune_magus_weapon_adept", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], "components": [ - [ [ "potion_starter", 5 ] ], - [ [ "brain", 2 ], [ "brain_cooked", 2 ] ], - [ - [ "adderall", 10 ], - [ "caff_gum", 30 ], - [ "chaw", 10 ], - [ "cig", 20 ], - [ "cigar", 5 ], - [ "handrolled_cig", 20 ] - ] + [ [ "potion_starter_superior", 1 ] ], + [ [ "fern_flower", 2 ] ], + [ [ "golden_reed_stalk", 4 ] ], + [ [ "wood_barnacle", 4 ] ] ] }, { "type": "recipe", - "activity_level": "fake", + "copy-from": "cats_grace_potion", + "result": "flask_resistance", + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], + "components": [ [ [ "potion_starter", 4 ] ], [ [ "wood_barnacle", 2 ] ], [ [ "olieribos", 2 ] ], [ [ "moly_tuber", 2 ] ] ] + }, + { + "type": "recipe", + "copy-from": "cats_grace_potion", + "result": "flask_max_mana", + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], + "components": [ [ [ "potion_starter", 2 ] ], [ [ "golden_reed_stalk", 2 ] ], [ [ "funnelcap_chunk", 6 ] ] ] + }, + { + "type": "recipe", + "copy-from": "cats_grace_potion", + "result": "flask_fireball", + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], + "components": [ [ [ "potion_starter", 2 ] ], [ [ "dragon_nail", 2 ] ], [ [ "glowing_mushroom", 4 ] ], [ [ "funnelcap_chunk", 6 ] ] ] + }, + { + "type": "recipe", + "copy-from": "cats_grace_potion", + "book_learn": [ [ "alchemy_illegal", 5 ] ], + "//": "if you read this, ping me to remind me to check does inheritance rewrite book_learn, or does it summarise the values. thank you", + "result": "flask_confusion", + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], + "components": [ [ [ "potion_starter", 2 ] ], [ [ "funnelcap_chunk", 6 ] ], [ [ "glowing_mushroom", 2 ] ], [ [ "kampuch", 1 ] ] ] + }, + { + "type": "recipe", + "copy-from": "cats_grace_potion", + "result": "flask_spear", + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], + "components": [ [ [ "potion_starter", 2 ] ], [ [ "dragon_nail", 3 ] ], [ [ "funnelcap_chunk", 5 ] ], [ [ "moly_tuber", 1 ] ] ] + }, + { + "type": "recipe", + "copy-from": "cats_grace_potion", + "result": "flask_shadow_field", + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], + "components": [ [ [ "potion_starter", 2 ] ], [ [ "glowing_mushroom", 3 ] ], [ [ "moly_tuber", 2 ] ], [ [ "golden_reed_stalk", 2 ] ] ] + }, + { + "type": "recipe", + "copy-from": "cats_grace_potion", + "result": "flask_sludge_field", + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], + "components": [ [ [ "potion_starter", 2 ] ], [ [ "kampuch", 2 ] ], [ [ "golden_reed_stalk", 1 ] ], [ [ "funnelcap_chunk", 8 ] ] ] + }, + { + "type": "recipe", + "copy-from": "cats_grace_potion", + "result": "alchemist_bomb", + "book_learn": [ [ "alchemy_basic", 4 ], [ "alchemy_master", 4 ] ], + "using": [ [ "mana_energy_weak", 3 ] ], + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], + "components": [ [ [ "potion_starter", 3 ] ] ] + }, + { + "type": "recipe", + "copy-from": "cats_grace_potion", + "result": "mana_potion", + "using": [ [ "mana_energy_weak", 3 ] ], + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "mortar_pestle", -2 ] ] ], + "components": [ [ [ "potion_starter", 1 ] ] ], + "autolearn": true + }, + { + "type": "recipe", + "copy-from": "cats_grace_potion", "result": "twisted_restore_potion", - "category": "CC_ENCHANTED", - "subcategory": "CSC_ENCHANTED_POTIONS", - "skill_used": "chemistry", - "skills_required": [ "spellcraft", 4 ], - "proficiencies": [ { "proficiency": "prof_alchemy" } ], - "difficulty": 4, - "time": "60 m", "result_mult": 5, - "batch_time_factors": [ 50, 4 ], "book_learn": [ [ "necro_basic", 3 ] ], - "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ], "tools": [ - [ [ "surface_heat", 10, "LIST" ] ], + [ [ "surface_heat", 20, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_animist", -1 ], @@ -309,21 +214,152 @@ [ "rune_animist_weapon_adept", -1 ] ] ], - "components": [ [ [ "potion_starter", 5 ] ], [ [ "edible_blood", 3, "LIST" ] ], [ [ "slime_scrap", 4 ], [ "meat_tainted", 12 ] ] ] + "components": [ [ [ "potion_starter", 5 ] ], [ [ "edible_blood", 3, "LIST" ] ], [ [ "meat_tainted", 12 ] ] ] }, { "type": "recipe", - "activity_level": "fake", - "result": "twisted_restore_potion_improved", - "category": "CC_ENCHANTED", - "subcategory": "CSC_ENCHANTED_POTIONS", + "//": "third level flasks", + "activity_level": "NO_EXERCISE", + "qualities": [ + { "id": "CONTAIN", "level": 1 }, + { "id": "MANA_INFUSE", "level": 2 }, + { "id": "CONCENTRATE", "level": 1 }, + { "id": "MANA_FOCUS", "level": 1 }, + { "id": "FINE_DISTILL", "level": 1 } + ], + "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "mortar_pestle", -3 ] ] ], "skill_used": "chemistry", + "difficulty": 5, "skills_required": [ "spellcraft", 6 ], "proficiencies": [ { "proficiency": "prof_alchemy" } ], - "difficulty": 6, - "time": "60 m", + "time": "240 m", + "batch_time_factors": [ 40, 2 ], + "category": "CC_ENCHANTED", + "subcategory": "CSC_ENCHANTED_POTIONS", + "result": "flask_healing", + "book_learn": [ [ "alchemy_master", 5 ] ], + "components": [ + [ [ "potion_starter_superior", 1 ] ], + [ [ "horn_moss_capsule", 3 ] ], + [ [ "funnelcap_chunk", 8 ] ], + [ [ "wood_barnacle", 3 ] ] + ] + }, + { + "type": "recipe", + "copy-from": "flask_healing", + "result": "flask_stamina", + "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "mortar_pestle", -3 ] ] ], + "components": [ + [ [ "potion_starter_superior", 2 ] ], + [ [ "glowing_mushroom", 2 ] ], + [ [ "kampuch", 1 ] ], + [ [ "horn_moss_capsule", 3 ] ], + [ [ "wood_barnacle", 2 ] ] + ] + }, + { + "type": "recipe", + "copy-from": "flask_healing", + "result": "flask_excitement", + "using": [ [ "mana_energy_weak", 2 ] ], + "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "mortar_pestle", -3 ] ] ], + "components": [ [ [ "potion_starter_superior", 2 ] ], [ [ "wood_barnacle", 2 ] ], [ [ "olieribos", 2 ] ], [ [ "moonflowers", 1 ] ] ] + }, + { + "type": "recipe", + "copy-from": "flask_healing", + "result": "flask_regeneration", + "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "mortar_pestle", -3 ] ] ], + "components": [ + [ [ "potion_starter_superior", 3 ] ], + [ [ "wood_barnacle", 4 ] ], + [ [ "horn_moss_capsule", 3 ] ], + [ [ "moonflowers", 1 ] ] + ] + }, + { + "type": "recipe", + "copy-from": "flask_healing", + "result": "flask_mana_regen", + "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "mortar_pestle", -3 ] ] ], + "using": [ [ "mana_energy_weak", 1 ] ], + "components": [ [ [ "potion_starter_superior", 2 ] ], [ [ "wood_barnacle", 4 ] ], [ [ "golden_reed_stalk", 2 ] ] ] + }, + { + "type": "recipe", + "copy-from": "flask_healing", + "result": "flask_mood", + "book_learn": [ [ "alchemy_illegal", 5 ] ], + "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "mortar_pestle", -3 ] ] ], + "components": [ [ [ "potion_starter_superior", 1 ] ], [ [ "whiskflower", 4 ] ], [ [ "wood_barnacle", 3 ] ], [ [ "moonflowers", 1 ] ] ] + }, + { + "type": "recipe", + "copy-from": "flask_healing", + "result": "flask_charm", + "book_learn": [ [ "alchemy_illegal", 5 ] ], + "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "mortar_pestle", -3 ] ] ], + "components": [ [ [ "potion_starter_superior", 2 ] ], [ [ "moonflowers", 2 ] ], [ [ "moly_tuber", 4 ] ] ] + }, + { + "type": "recipe", + "copy-from": "flask_healing", + "result": "flask_night_vision", + "book_learn": [ [ "alchemy_master", 5 ] ], + "using": [ [ "mana_energy_weak", 1 ] ], + "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "mortar_pestle", -3 ] ] ], + "components": [ + [ [ "potion_starter_superior", 2 ] ], + [ [ "moonflowers", 2 ] ], + [ [ "wood_barnacle", 2 ] ], + [ [ "fern_flower", 2 ] ], + [ [ "glowing_mushroom", 5 ] ] + ] + }, + { + "type": "recipe", + "copy-from": "flask_healing", + "result": "flask_toxin", + "book_learn": [ [ "alchemy_illegal", 5 ], [ "necro_basic", 5 ] ], + "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "mortar_pestle", -3 ] ] ], + "components": [ + [ [ "potion_starter_superior", 1 ] ], + [ [ "kampuch", 3 ] ], + [ [ "moonflowers", 2 ] ], + [ [ "golden_reed_stalk", 2 ] ], + [ [ "dragon_nail", 2 ] ] + ] + }, + { + "type": "recipe", + "copy-from": "flask_healing", + "result": "flask_venom", + "book_learn": [ [ "alchemy_illegal", 5 ], [ "necro_basic", 5 ] ], + "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "mortar_pestle", -3 ] ] ], + "components": [ + [ [ "potion_starter_superior", 1 ] ], + [ [ "kampuch", 2 ] ], + [ [ "moonflowers", 2 ] ], + [ [ "golden_reed_stalk", 2 ] ], + [ [ "moly_tuber", 2 ] ] + ] + }, + { + "type": "recipe", + "copy-from": "flask_healing", + "result": "mana_potion_greater", + "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "rune_alchemist", -1 ] ] ], + "using": [ [ "mana_energy_strong", 1 ], [ "mana_energy_weak", 3 ] ], + "components": [ [ [ "potion_starter_superior", 1 ] ] ], + "autolearn": true + }, + { + "type": "recipe", + "copy-from": "flask_healing", + "result": "twisted_restore_potion_improved", + "proficiencies": [ { "proficiency": "prof_alchemy" } ], "result_mult": 5, - "batch_time_factors": [ 50, 4 ], "book_learn": [ [ "necro_basic", 5 ] ], "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ], "tools": [ @@ -333,30 +369,102 @@ "components": [ [ [ "potion_starter", 5 ] ], [ [ "edible_blood", 5, "LIST" ] ], - [ [ "slime_scrap", 5 ], [ "meat_tainted", 15 ] ], - [ [ "bandages", 5 ], [ "bandages_makeshift_bleached", 7 ], [ "bandages_makeshift_boiled", 7 ] ] + [ [ "meat_tainted", 15 ] ], + [ [ "horn_moss_capsule", 5 ] ] ] }, { "type": "recipe", - "activity_level": "fake", - "result": "alchemist_bomb", + "//": "fourth level flasks", + "activity_level": "NO_EXERCISE", "qualities": [ - { "id": "CONCENTRATE", "level": 1 }, { "id": "CONTAIN", "level": 1 }, + { "id": "MANA_INFUSE", "level": 2 }, + { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 }, + { "id": "FINE_DISTILL", "level": 1 }, { "id": "MAGIC_CAULDRON", "level": 1 } ], - "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], - "components": [ [ [ "potion_starter", 6 ] ], [ [ "crystallized_mana", 25 ] ] ], - "proficiencies": [ { "proficiency": "prof_alchemy", "required": true } ], - "time": "30 m", + "tools": [ [ [ "surface_heat", 40, "LIST" ] ], [ [ "mortar_pestle", -4 ] ] ], "skill_used": "chemistry", - "batch_time_factors": [ 65, 4 ], - "difficulty": 6, - "skills_required": [ "spellcraft", 4 ], - "book_learn": [ [ "alchemy_basic", 4 ] ], + "difficulty": 5, + "skills_required": [ "spellcraft", 7 ], + "proficiencies": [ { "proficiency": "prof_alchemy" } ], + "time": "480 m", + "batch_time_factors": [ 20, 2 ], "category": "CC_ENCHANTED", - "subcategory": "CSC_ENCHANTED_OTHER" + "subcategory": "CSC_ENCHANTED_POTIONS", + "result": "flask_speed", + "book_learn": [ [ "alchemy_master", 7 ] ], + "components": [ + [ [ "potion_starter_superior", 3 ] ], + [ [ "moonflowers", 2 ] ], + [ [ "glowing_mushroom", 4 ] ], + [ [ "wood_barnacle", 2 ] ], + [ [ "golden_reed_stalk", 2 ] ] + ] + }, + { + "type": "recipe", + "copy-from": "flask_speed", + "result": "flask_teleport_rand", + "book_learn": [ [ "alchemy_illegal", 6 ] ], + "tools": [ [ [ "surface_heat", 40, "LIST" ] ], [ [ "mortar_pestle", -4 ] ] ], + "using": [ [ "mana_energy_strong", 1 ] ], + "components": [ [ [ "potion_starter_superior", 3 ] ], [ [ "sojourners_flower", 2 ] ], [ [ "dragon_nail", 4 ] ] ] + }, + { + "type": "recipe", + "copy-from": "flask_speed", + "result": "flask_teleport", + "book_learn": [ [ "alchemy_illegal", 6 ] ], + "tools": [ [ [ "surface_heat", 40, "LIST" ] ], [ [ "mortar_pestle", -4 ] ] ], + "using": [ [ "mana_energy_strong", 2 ] ], + "components": [ + [ [ "potion_starter_superior", 2 ] ], + [ [ "sojourners_flower", 3 ] ], + [ [ "dragon_nail", 2 ] ], + [ [ "moonflowers", 2 ] ] + ] + }, + { + "type": "recipe", + "copy-from": "flask_speed", + "result": "flask_clairvoyance", + "tools": [ [ [ "surface_heat", 40, "LIST" ] ], [ [ "mortar_pestle", -4 ] ] ], + "components": [ + [ [ "potion_starter_superior", 3 ] ], + [ [ "sojourners_flower", 2 ] ], + [ [ "dragon_nail", 2 ] ], + [ [ "glowing_mushroom", 6 ] ], + [ [ "moonflowers", 1 ] ] + ] + }, + { + "type": "recipe", + "copy-from": "flask_speed", + "result": "flask_invisibility", + "book_learn": [ [ "alchemy_illegal", 6 ] ], + "tools": [ [ [ "surface_heat", 40, "LIST" ] ], [ [ "mortar_pestle", -4 ] ] ], + "components": [ + [ [ "potion_starter_superior", 3 ] ], + [ [ "glowing_mushroom", 2 ] ], + [ [ "moonflowers", 2 ] ], + [ [ "funnelcap_chunk", 15 ] ], + [ [ "wood_barnacle", 4 ] ] + ] + }, + { + "type": "recipe", + "copy-from": "flask_speed", + "result": "flask_feather", + "tools": [ [ [ "surface_heat", 40, "LIST" ] ], [ [ "mortar_pestle", -4 ] ] ], + "components": [ + [ [ "potion_starter_superior", 2 ] ], + [ [ "glowing_mushroom", 8 ] ], + [ [ "moonflowers", 2 ] ], + [ [ "funnelcap_chunk", 20 ] ], + [ [ "wood_barnacle", 5 ] ] + ] } ] diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 6748f699c8581..607a68cd5fb52 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -1058,7 +1058,6 @@ "mtorch_everburning_lit", "dragon_blood", "black_dragons_historical", - "necro_basic", "magical_throwing_knife", "magical_throwing_knife_cold", "magical_throwing_knife_fire", diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index bc52114fc057f..7eefc670f67a5 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -130,6 +130,7 @@ autoselect autoshotgun avin avy +awared axolotl aztlani b @@ -822,6 +823,7 @@ hauberks hbhbh hdd headwear +healthiness heartlike heatsink heatsinks @@ -1983,6 +1985,7 @@ unspecialized unstocked untampered untargeted +untired untyped unwield unwieldiness