diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json index f7b32f3444627..7d94f53bdab97 100644 --- a/data/json/items/comestibles/raw_fruit.json +++ b/data/json/items/comestibles/raw_fruit.json @@ -128,7 +128,7 @@ "type": "COMESTIBLE", "id": "cranberries", "name": { "str": "handful of cranberries", "str_pl": "handfuls of cranberries" }, - "weight": "100 g", + "weight": "106 g", "color": "red", "spoils_in": 640, "comestible_type": "FOOD", @@ -139,7 +139,7 @@ "price": "17 cent", "price_postapoc": "33 cent", "material": [ "fruit" ], - "volume": "83 ml", + "volume": "250 ml", "fun": -5, "flags": [ "SMOKABLE", "RAW", "EDIBLE_FROZEN" ], "smoking_result": "dry_fruit", diff --git a/data/mods/Magiclysm/Spells/consumables.json b/data/mods/Magiclysm/Spells/consumables.json index 471738dc30f4e..c8df60f1efc78 100644 --- a/data/mods/Magiclysm/Spells/consumables.json +++ b/data/mods/Magiclysm/Spells/consumables.json @@ -64,5 +64,17 @@ "shape": "blast", "min_damage": 20, "max_damage": 20 + }, + { + "id": "pfruit_regeneration_spell", + "type": "SPELL", + "name": "Apple Potion Healing Effect", + "description": "Heals the target.", + "valid_targets": [ "self" ], + "min_damage": -1, + "max_damage": -1, + "effect": "attack", + "shape": "blast", + "flags": [ "SILENT" ] } ] diff --git a/data/mods/Magiclysm/effects/effect_potion_fruit.json b/data/mods/Magiclysm/effects/effect_potion_fruit.json new file mode 100644 index 0000000000000..716a0c41387d2 --- /dev/null +++ b/data/mods/Magiclysm/effects/effect_potion_fruit.json @@ -0,0 +1,178 @@ +[ + { + "id": "effect_pfruit_heal", + "type": "effect_type", + "name": [ "Restore Flesh and Bone" ], + "desc": [ "Thanks to that apple, your wounds are slowly healing." ], + "apply_message": "Your flesh and bones start to knit together before your eyes.", + "remove_message": "Your regeneration slows down.", + "rating": "good", + "show_intensity": false, + "enchantments": [ + { + "intermittent_activation": { "effects": [ { "frequency": "30 seconds", "spell_effects": [ { "id": "pfruit_regeneration_spell" } ] } ] } + } + ] + }, + { + "id": "effect_pfruit_cure", + "type": "effect_type", + "name": [ "Ward off Miasma" ], + "desc": [ "No illness is going to get you down now." ], + "apply_message": "You feel revitalized.", + "rating": "good", + "show_intensity": false, + "removes_effects": [ "scurvy", "redcells_anemia", "anemia", "toxin_buildup", "common_cold", "flu" ] + }, + { + "id": "effect_pfruit_attack_speed", + "type": "effect_type", + "name": [ "Quick Blows" ], + "desc": [ "Thanks to that pear, you can attack faster." ], + "apply_message": "You arms speed up.", + "remove_message": "Your muscle's twitch as the pear's magic fades.", + "rating": "good", + "show_intensity": false, + "enchantments": [ { "values": [ { "value": "ATTACK_SPEED", "add": -15 } ] } ] + }, + { + "id": "effect_pfruit_thorns", + "type": "effect_type", + "name": [ "Blackberry Thorns" ], + "desc": [ "Anyone who attacks you will regret it." ], + "apply_message": "Long thorns grow through your skin, clothes, and armor.", + "remove_message": "The thorns vanish without a trace, leaving your gear unharmed.", + "rating": "good", + "show_intensity": false, + "enchantments": [ "enchant_pfruit_thorns" ] + }, + { + "type": "enchantment", + "id": "enchant_pfruit_thorns", + "condition": "ALWAYS", + "has": "HELD", + "hit_me_effect": [ { "id": "pfruit_aura_thorns", "hit_self": false } ] + }, + { + "id": "pfruit_aura_thorns", + "type": "SPELL", + "name": "Blackberry fruit aura thorns", + "description": "Stab a monster that attacked you.", + "valid_targets": [ "hostile" ], + "flags": [ "RANDOM_DAMAGE" ], + "shape": "blast", + "effect": "attack", + "damage_type": "stab", + "min_damage": 1, + "max_damage": 4, + "min_range": 1, + "max_range": 1 + }, + { + "id": "effect_pfruit_keep_warm", + "type": "effect_type", + "name": [ "Summer's Heat" ], + "desc": [ "The magic of those strawberries is keeping you warm." ], + "apply_message": "You feel a pleasant warmth.", + "remove_message": "You shiver as a cool breeze hits your skin.", + "rating": "good", + "show_intensity": false, + "enchantments": [ { "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 50 } ] } ] + }, + { + "id": "effect_pfruit_purge", + "type": "effect_type", + "name": [ "Ward off Toxins" ], + "desc": [ "Your body will not be corrupted by these vile substances." ], + "apply_message": "You feel cleansed.", + "rating": "good", + "show_intensity": false, + "removes_effects": [ + "poison", + "venom_dmg", + "venom_weaken", + "badpoison", + "foodpoison", + "paralyzepoison", + "bloodworms", + "brainworms", + "tapeworm" + ] + }, + { + "id": "effect_pfruit_dodge", + "type": "effect_type", + "name": [ "Flexible" ], + "desc": [ "Your range of motion is greatly increased." ], + "apply_message": "You arms are as bendy as rubber.", + "remove_message": "Your limbs creak as they lose their flexibility.", + "rating": "good", + "show_intensity": false, + "limb_score_mods": [ + { "limb_score": "reaction", "modifier": 2.0 }, + { "limb_score": "block", "modifier": 1.2 }, + { "limb_score": "crawl", "modifier": 1.5 } + ], + "enchantments": [ { "values": [ { "value": "BONUS_DODGE", "add": 1 } ] } ], + "flags": [ "DOWNED_RECOVERY", "EFFECT_LIMB_SCORE_MOD" ] + }, + { + "type": "effect_type", + "id": "effect_pfruit_nightvision", + "name": [ "Wintergreen Vision" ], + "desc": [ "You can see in the dark." ], + "apply_message": "The night doesn't seem so dark anymore", + "remove_message": "The darkness of the night rushes in again.", + "rating": "good", + "limb_score_mods": [ { "limb_score": "night_vis", "modifier": 6 } ], + "flags": [ "EFFECT_LIMB_SCORE_MOD" ] + }, + { + "id": "effect_pfruit_nobleed", + "type": "effect_type", + "name": [ "Stopped Bleeding" ], + "desc": [ "Your blood is all being held within your body." ], + "apply_message": "Your wounds tingle.", + "remove_message": "You feel a prickle as your wounds ache.", + "rating": "good", + "show_intensity": false, + "removes_effects": [ "bleed" ], + "flags": [ "BLEED_IMMUNE" ] + }, + { + "id": "effect_pfruit_vision", + "type": "effect_type", + "name": [ "Good Vision" ], + "desc": [ "The magic of those apricots is helping you see better." ], + "apply_message": "You can pick out even minute details.", + "remove_message": "Distant objects loose their magical clarity.", + "rating": "good", + "show_intensity": false, + "limb_score_mods": [ { "limb_score": "vision", "modifier": 1.25 } ], + "enchantments": [ { "values": [ { "value": "PERCEPTION", "add": 2 } ] } ], + "flags": [ "GLARE_RESIST", "EFFECT_LIMB_SCORE_MOD" ] + }, + { + "id": "effect_pfruit_eat_poison", + "type": "effect_type", + "name": [ "Poison-Eater" ], + "desc": [ "You can eat toxic or spoiled food without penalty. You still should not eat zombie meat." ], + "apply_message": "Your sense of taste dulls.", + "remove_message": "Something in your mouth tastes foul.", + "rating": "good", + "show_intensity": false, + "flags": [ "IMMUNE_SPOIL" ], + "vitamins": [ { "vitamin": "mutant_toxin", "rate": [ [ -1, -1 ] ], "absorb_mult": [ 0.5 ], "tick": [ "1 s" ] } ] + }, + { + "id": "effect_pfruit_no_drunk", + "type": "effect_type", + "name": [ "Remove intoxicants" ], + "desc": [ "You are being rapidly sobered up." ], + "apply_message": "Your head pounds, but you feel much more alert.", + "remove_message": ".", + "rating": "mixed", + "show_intensity": false, + "removes_effects": [ "drunk", "meth", "high", "weed_high" ] + } +] diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json index 1a3fed8589ad1..b942b20960c5e 100644 --- a/data/mods/Magiclysm/itemgroups/itemgroups.json +++ b/data/mods/Magiclysm/itemgroups/itemgroups.json @@ -21,7 +21,7 @@ "type": "item_group", "id": "homebooks", "copy-from": "homebooks", - "extend": { "items": [ { "group": "spellbook_loot_0", "prob": 4 } ] } + "extend": { "items": [ { "group": "spellbook_loot_0", "prob": 4 }, { "item": "history_botanical_enchantment", "prob": 2 } ] } }, { "type": "item_group", diff --git a/data/mods/Magiclysm/itemgroups/recipe_books.json b/data/mods/Magiclysm/itemgroups/recipe_books.json index 74b37c7a10aff..017777e65f084 100644 --- a/data/mods/Magiclysm/itemgroups/recipe_books.json +++ b/data/mods/Magiclysm/itemgroups/recipe_books.json @@ -9,6 +9,7 @@ [ "techno_basic", 30 ], [ "enchantment_basic", 30 ], [ "book_mythological", 10 ], + [ "history_botanical_enchantment", 15 ], [ "cooking_poison", 15 ], [ "metal_legends", 5 ] ] diff --git a/data/mods/Magiclysm/items/potion_fruits.json b/data/mods/Magiclysm/items/potion_fruits.json new file mode 100644 index 0000000000000..2ddade4909b43 --- /dev/null +++ b/data/mods/Magiclysm/items/potion_fruits.json @@ -0,0 +1,293 @@ +[ + { + "type": "COMESTIBLE", + "id": "potion_fruit_apple", + "name": { "str": "potion fruit (apple)", "str_pl": "potion fruits (apple)" }, + "description": "An apple infused with mana. It will heal you if you eat it.", + "copy-from": "apple", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "66 days 16 hours", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the apple potion fruit.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_APPLE" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_APPLE", + "effect": [ { "u_add_effect": "effect_pfruit_heal", "duration": { "math": [ "150 + rand(350)" ] } } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_peach", + "name": { "str": "potion fruit (peach)", "str_pl": "potion fruits (peach)" }, + "description": "A peach infused with mana. It will cure illness if you eat it.", + "copy-from": "peach", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "30 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the peach potion fruit.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_PEACH" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_PEACH", + "effect": [ { "u_add_effect": "effect_pfruit_cure", "duration": "1 seconds" } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_pear", + "name": { "str": "potion fruit (pear)", "str_pl": "potion fruits (pear)" }, + "description": "A pear infused with mana. It will allow your blows to strike quicker if you eat it.", + "copy-from": "pear", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "40 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the pear potion fruit.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_PEAR" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_PEAR", + "effect": [ { "u_add_effect": "effect_pfruit_attack_speed", "duration": { "math": [ "250 + rand(1500)" ] } } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_blackberries", + "name": { "str": "handful of potion fruits (blackberries)", "str_pl": "handfuls of potion fruits (blackberries)" }, + "description": "A handful of blackberries infused with mana. It will harm those who attack you if you eat it.", + "copy-from": "blackberries", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "25 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the handful of blackberry potion fruits.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_BLACKBERRY" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_BLACKBERRY", + "effect": [ { "u_add_effect": "effect_pfruit_thorns", "duration": { "math": [ "500 + rand(1500)" ] } } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_raspberries", + "name": { "str": "handful of potion fruits (raspberries)", "str_pl": "handfuls of potion fruits (raspberries)" }, + "description": "A handful of raspberries infused with mana. It will lessen your pain if you eat it.", + "copy-from": "raspberries", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "25 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the handful of raspberry potion fruits.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_RASPBERRY" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_RASPBERRY", + "effect": [ { "math": [ "u_pain()", "-=", "3" ] } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_strawberries", + "name": { "str": "handful of potion fruits (strawberries)", "str_pl": "handfuls of potion fruits (strawberries)" }, + "description": "A handful of strawberries infused with mana. It will keep you warm even on an icy-cold day.", + "copy-from": "strawberries", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "25 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the handful of strawberry potion fruits.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_STRAWBERRY" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_STRAWBERRY", + "effect": [ { "u_add_effect": "effect_pfruit_keep_warm", "duration": { "math": [ "500 + rand(5000)" ] } } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_elderberries", + "name": { "str": "handful of potion fruits (elderberries)", "str_pl": "handfuls of potion fruits (elderberries)" }, + "description": "A handful of elderberries infused with mana. It will keep you alert and awake.", + "copy-from": "elderberries", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "25 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the handful of elderberry potion fruits.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_ELDERBERRY" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_ELDERBERRY", + "effect": [ { "math": [ "u_val('fatigue')", "-=", "25" ] } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_blueberries", + "name": { "str": "handful of potion fruits (blueberries)", "str_pl": "handfuls of potion fruits (blueberries)" }, + "description": "A handful of blueberries infused with mana. One handful is more satisfying than a whole bottle of water.", + "copy-from": "blueberries", + "proportional": { "calories": 0.5 }, + "quench": 100, + "spoils_in": "25 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] } + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_cranberries", + "name": { "str": "handful of potion fruits (cranberries)", "str_pl": "handfuls of potion fruits (cranberries)" }, + "description": "A handful of cranberries infused with mana. It will remove impurities in your blood.", + "copy-from": "cranberries", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "25 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the handful of cranberry potion fruits.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_CRANBERRY" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_CRANBERRY", + "effect": [ { "u_add_effect": "effect_pfruit_purge", "duration": "1 seconds" } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_huckleberries", + "name": { "str": "handful of potion fruits (huckleberries)", "str_pl": "handfuls of potion fruits (huckleberries)" }, + "description": "A handful of huckleberries infused with mana. It will make you much more flexible.", + "copy-from": "huckleberries", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "25 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the handful of huckleberry potion fruits.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_HUCKLEBERRY" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_HUCKLEBERRY", + "effect": [ { "u_add_effect": "effect_pfruit_dodge", "duration": { "math": [ "250 + rand(1500)" ] } } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_wintergreen", + "name": { "str": "handful of potion fruits (wintergreen berries)", "str_pl": "handfuls of potion fruits (wintergreen berries)" }, + "description": "A handful of wintergreen berries infused with mana. It will allow you to see in the dark.", + "copy-from": "wintergreen_berry", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "25 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the handful of wintergreen berry potion fruits.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_WINTERGREEN" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_WINTERGREEN", + "effect": [ { "u_add_effect": "effect_pfruit_nightvision", "duration": { "math": [ "500 + rand(5000)" ] } } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_cherry", + "name": { "str": "handful of potion fruits (cherries)", "str_pl": "handfuls of potion fruits (cherries)" }, + "description": "A handful of cherries infused with mana. It will prevent you from bleeding.", + "copy-from": "cherries", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "25 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the handful of cherry potion fruits.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_CHERRY" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_CHERRY", + "effect": [ { "u_add_effect": "effect_pfruit_nobleed", "duration": { "math": [ "250 + rand(1500)" ] } } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_apricot", + "name": { "str": "handful of potion fruits (apricots)", "str_pl": "handfuls of potion fruits (apricots)" }, + "description": "A handful of apricots infused with mana. It will enhance your visual acuity.", + "copy-from": "apricot", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "20 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the handful of apricot potion fruits.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_APRICOT" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_APRICOT", + "effect": [ { "u_add_effect": "effect_pfruit_vision", "duration": { "math": [ "250 + rand(1500)" ] } } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_grapes", + "name": { "str": "handful of potion fruits (grapes)", "str_pl": "handfuls of potion fruits (grapes)" }, + "description": "A handful of grapes infused with mana. It will cure intoxication.", + "copy-from": "grapes", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "20 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the handful of grape potion fruits.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_GRAPE" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_GRAPE", + "effect": [ { "u_add_effect": "effect_pfruit_no_drunk", "duration": "1 seconds" }, { "math": [ "u_pain()", "+=", "10" ] } ] + }, + { + "type": "COMESTIBLE", + "id": "potion_fruit_mayapple", + "name": { "str": "potion fruit (mayapple)", "str_pl": "potion fruits (mayapple)" }, + "description": "A mayapple infused with mana. It will allow you to eat questionable food without harm.", + "copy-from": "mayapple", + "proportional": { "quench": 0.5, "calories": 0.5 }, + "spoils_in": "20 days", + "extend": { "flags": [ "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ] }, + "use_action": { + "type": "effect_on_conditions", + "description": "Eat the mayapple potion fruits.", + "effect_on_conditions": [ "EOC_POTION_FRUIT_MAYAPPLE" ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_POTION_FRUIT_MAYAPPLE", + "effect": [ { "u_add_effect": "effect_pfruit_eat_poison", "duration": { "math": [ "250 + rand(1500)" ] } } ] + } +] diff --git a/data/mods/Magiclysm/items/recipe_books.json b/data/mods/Magiclysm/items/recipe_books.json index 1e30a9b73327c..a3bbd69676382 100644 --- a/data/mods/Magiclysm/items/recipe_books.json +++ b/data/mods/Magiclysm/items/recipe_books.json @@ -258,5 +258,28 @@ "intelligence": 10, "time": "60 m", "fun": -1 + }, + { + "id": "history_botanical_enchantment", + "type": "BOOK", + "category": "manuals", + "name": { + "str": "A Comprehensive History of Botanical Enchantment", + "str_pl": "copies of A Comprehensive History of Botanical Enchantment" + }, + "description": "A history of the ancient art of \"botanical enchantment\", infusing fruit with mana to create primitive potions. While one of the earliest methods of alchemy known, discovered in prehistoric times, advancement in alchemical techniques (to say nothing of modern chemistry) rendered it a curiosity at best in the decades leading up to the Cataclysm. Still, the book details several methods of botanical enchantment that would probably be useful.", + "weight": "750 g", + "volume": "1250 ml", + "price": 3000, + "material": [ "paper" ], + "symbol": "?", + "color": "white", + "skill": "spellcraft", + "required_level": 4, + "max_level": 4, + "intelligence": 10, + "time": "25 m", + "fun": -1, + "melee_damage": { "bash": 5 } } ] diff --git a/data/mods/Magiclysm/proficiencies.json b/data/mods/Magiclysm/proficiencies.json index c551168797d74..39603964201bc 100644 --- a/data/mods/Magiclysm/proficiencies.json +++ b/data/mods/Magiclysm/proficiencies.json @@ -73,5 +73,16 @@ "time_to_learn": "12 h", "default_time_multiplier": 2, "default_skill_penalty": 0 + }, + { + "type": "proficiency", + "id": "prof_botanical_enchantment", + "category": "prof_alchemy", + "name": { "str": "Mystic Horticulture" }, + "description": "The art of instilling mystical energy into fruit.", + "can_learn": true, + "default_time_multiplier": 2, + "default_skill_penalty": 0.2, + "time_to_learn": "10 h" } ] diff --git a/data/mods/Magiclysm/recipes/nested.json b/data/mods/Magiclysm/recipes/nested.json index 1811c4b63bf4b..4f067eb45f304 100644 --- a/data/mods/Magiclysm/recipes/nested.json +++ b/data/mods/Magiclysm/recipes/nested.json @@ -81,5 +81,33 @@ "skills_required": [ "spellcraft", 4 ], "nested_category_data": [ "suit_xlblack_dragon_hide", "helmet_xlblack_dragon_hide", "gloves_xlblack_dragon_hide", "boots_xlblack_dragon_hide" ], "difficulty": 6 + }, + { + "id": "nested_potion_fruits", + "type": "nested_category", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ENCHANTED", + "subcategory": "CSC_ENCHANTED_POTIONS", + "name": "potion fruits", + "description": "Recipes related to enchanting fruits with pure mana.", + "skill_used": "spellcraft", + "nested_category_data": [ + "potion_fruit_apple", + "potion_fruit_peach", + "potion_fruit_pear", + "potion_fruit_blackberries", + "potion_fruit_raspberries", + "potion_fruit_strawberries", + "potion_fruit_elderberries", + "potion_fruit_blueberries", + "potion_fruit_cranberries", + "potion_fruit_huckleberries", + "potion_fruit_wintergreen", + "potion_fruit_cherry", + "potion_fruit_apricot", + "potion_fruit_mayapple", + "potion_fruit_grapes" + ], + "difficulty": 4 } ] diff --git a/data/mods/Magiclysm/recipes/potion_fruits.json b/data/mods/Magiclysm/recipes/potion_fruits.json new file mode 100644 index 0000000000000..ac6c457156ebb --- /dev/null +++ b/data/mods/Magiclysm/recipes/potion_fruits.json @@ -0,0 +1,242 @@ +[ + { + "result": "potion_fruit_apple", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 6 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "apple", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_peach", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 7 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "peach", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_pear", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 7 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "pear", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_blackberries", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 5 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "blackberries", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_raspberries", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 6 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "raspberries", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_strawberries", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 6 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "strawberries", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_elderberries", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 6 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "elderberries", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_blueberries", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 5 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "blueberries", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_cranberries", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 7 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "cranberries", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_huckleberries", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 6 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "huckleberries", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_wintergreen", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 5 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "wintergreen_berry", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_cherry", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 5 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "cherries", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_apricot", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 5 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "apricot", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_mayapple", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 5 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "mayapple", 1 ], [ "mana_dust", 10 ] ] ] + }, + { + "result": "potion_fruit_grapes", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "60 m", + "batch_time_factors": [ 15, 2 ], + "autolearn": [ [ "spellcraft", 5 ], [ "cooking", 3 ] ], + "proficiencies": [ { "proficiency": "prof_alchemy" }, { "proficiency": "prof_botanical_enchantment" } ], + "book_learn": [ [ "history_botanical_enchantment", 3 ] ], + "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ], + "components": [ [ [ "grapes", 1 ], [ "mana_dust", 10 ] ] ] + } +] diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 857a7ea2557f7..5b78ebfef91c5 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -222,7 +222,6 @@ "rigid_plastic_sheet", "chem_formaldehyde", "sandwich_deluxe", - "irradiated_cranberries", "hallula", "chem_chloroform", "soaked_dandelion", @@ -719,7 +718,6 @@ "disinfectant", "oil_lamp_clay_on", "corpse_halved_upper", - "cranberries", "robofac_armor_rig", "sweet_milk_fortified", "chem_muriatic_acid",