diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json index 18ad30e32ce46..e30599901f272 100644 --- a/data/mods/Magiclysm/harvest.json +++ b/data/mods/Magiclysm/harvest.json @@ -127,7 +127,8 @@ "extend": { "entries": [ { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 } ] } }, { - "id": "dragon_black", + "id": "dragon_black_wyrmling", + "//": "Not old enough to have enough magic condensed in heart.", "type": "harvest", "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 }, @@ -138,6 +139,18 @@ { "drop": "bone", "type": "bone", "mass_ratio": 0.1 } ] }, + { + "id": "dragon_black_young", + "type": "harvest", + "copy-from": "dragon_black_wyrmling", + "extend": { "entries": [ { "drop": "young_dragon_heart_black", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] } + }, + { + "id": "dragon_black_adult", + "type": "harvest", + "copy-from": "dragon_black_wyrmling", + "extend": { "entries": [ { "drop": "crystalized_dragon_heart_black", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] } + }, { "id": "stirge", "//": "mainly arachnid drops with leather and proboscis", diff --git a/data/mods/Magiclysm/items/dragonheart.json b/data/mods/Magiclysm/items/dragonheart.json new file mode 100644 index 0000000000000..860e356ffb2ef --- /dev/null +++ b/data/mods/Magiclysm/items/dragonheart.json @@ -0,0 +1,37 @@ +[ + { + "type": "COMESTIBLE", + "comestible_type": "FOOD", + "id": "young_dragon_heart_black", + "name": { "str": "Young black dragon's heart" }, + "weight": "1100 g", + "color": "black_green", + "symbol": "%", + "healthy": -10, + "calories": 347, + "description": "A thick, hulking mass of flesh that's easily the size of your head. You can feel an young dragon's life force still pulsing inside this black heart. Forbidden to trade by governments around the world before cataclysm, the myth about eating dragon's heart might be true…", + "price": "10000000 USD", + "price_postapoc": "50 USD", + "material": [ "flesh" ], + "volume": "1 L", + "fun": -10, + "vitamins": [ [ "mutagen_black_dragon", 300 ], [ "meat_allergen", 1 ] ], + "flags": [ "PREDATOR_FUN" ] + }, + { + "type": "GENERIC", + "id": "crystalized_dragon_heart_black", + "name": { "str": "Crystalized black dragon heart" }, + "//": "The relic_data is just to make it purple.", + "weight": "8800 g", + "color": "black_green", + "symbol": "%", + "description": "A huge, heart-shaped black crystal and a dime green light within. After death, adult dragon's heart will be crystalized by their very own essence accumulated through life. Although enormous draconic magic condensed within, you are not sure there are any archmage still alive can help you unlock its secret… right?", + "price": "100000000 USD", + "price_postapoc": "5 USD", + "material": [ "crystal" ], + "volume": "8 L", + "relic_data": { "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "add": 0 } ] } ] }, + "flags": [ "UNBREAKABLE", "GEMSTONE" ] + } +] diff --git a/data/mods/Magiclysm/monsters/dragon.json b/data/mods/Magiclysm/monsters/dragon.json index 500846c8b5aa7..77010c4420d22 100644 --- a/data/mods/Magiclysm/monsters/dragon.json +++ b/data/mods/Magiclysm/monsters/dragon.json @@ -91,7 +91,7 @@ "vision_day": 30, "vision_night": 20, "path_settings": { "//min_dist": 8, "avoid_traps": true, "avoid_sharp": true }, - "harvest": "dragon_black", + "harvest": "dragon_black_wyrmling", "special_attacks": [ { "type": "bite", "cooldown": 10 }, { "id": "scratch", "cooldown": 7 }, @@ -140,6 +140,7 @@ "melee_dice": 3, "melee_dice_sides": 10, "melee_damage": [ { "damage_type": "cut", "amount": 16 } ], + "harvest": "dragon_black_young", "special_attacks": [ { "type": "bite", "cooldown": 10 }, { "id": "scratch", "cooldown": 3 }, @@ -178,6 +179,7 @@ "speed": 100, "delete": { "flags": [ "PATH_AVOID_DANGER" ] }, "emit_fields": [ { "emit_id": "emit_dragon_adult_fright", "delay": "1 s" } ], + "harvest": "dragon_black_adult", "special_attacks": [ { "type": "bite", "cooldown": 10 }, { "id": "scratch", "cooldown": 3 }, diff --git a/data/mods/Magiclysm/recipes/alchemy.json b/data/mods/Magiclysm/recipes/alchemy.json index 1e5b76798f875..fcd59417f3d2f 100644 --- a/data/mods/Magiclysm/recipes/alchemy.json +++ b/data/mods/Magiclysm/recipes/alchemy.json @@ -8,7 +8,8 @@ { "id": "FINE_DISTILL", "level": 1 }, { "id": "SEPARATE", "level": 1 }, { "id": "CONTAIN", "level": 1 }, - { "id": "MANA_FOCUS", "level": 1 } + { "id": "MANA_FOCUS", "level": 1 }, + { "id": "MAGIC_CAULDRON", "level": 1 } ], "tools": [ [ [ "food_processor", 40 ] ], [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "dragon_scale", 4, "LIST" ], [ "meat_dragon", 40 ] ] ], @@ -34,7 +35,7 @@ { "id": "SEPARATE", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 }, - { "id": "MAGIC_CAULDRON", "level": 1 } + { "id": "MAGIC_MUTAGEN", "level": 2 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "dragon_scale", 6, "LIST" ], [ "meat_dragon", 60 ] ], [ [ "dragon_blood", 500 ] ] ], diff --git a/data/mods/Magiclysm/recipes/dragon_black.json b/data/mods/Magiclysm/recipes/dragon_black.json index b6b72f6f3d563..df4930113df86 100644 --- a/data/mods/Magiclysm/recipes/dragon_black.json +++ b/data/mods/Magiclysm/recipes/dragon_black.json @@ -404,13 +404,19 @@ "time": "4 h", "batch_time_factors": [ 80, 20 ], "book_learn": [ [ "black_dragons_historical", 7 ] ], - "qualities": [ { "id": "CHEM", "level": 1 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ], - "components": [ [ [ "dragon_essence", 5 ] ], [ [ "potion_starter_superior", 1 ] ] ], + "qualities": [ + { "id": "CHEM", "level": 1 }, + { "id": "CONCENTRATE", "level": 1 }, + { "id": "MANA_INFUSE", "level": 1 }, + { "id": "MAGIC_MUTAGEN", "level": 2 } + ], + "components": [ [ [ "dragon_essence", 5 ] ], [ [ "potion_starter_superior", 1 ] ], [ [ "dragon_black_scale", 10 ] ] ], "flags": [ "SECRET" ] }, { "type": "recipe", "result": "iv_black_dragon", + "id_suffix": "from black dragon mutagen", "activity_level": "MODERATE_EXERCISE", "category": "CC_ENCHANTED", "subcategory": "CSC_ENCHANTED_POTIONS", @@ -420,10 +426,38 @@ "time": "8 h", "batch_time_factors": [ 80, 20 ], "book_learn": [ [ "black_dragons_historical", 8 ] ], - "qualities": [ { "id": "CHEM", "level": 1 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ], + "qualities": [ + { "id": "CHEM", "level": 1 }, + { "id": "CONCENTRATE", "level": 1 }, + { "id": "MANA_INFUSE", "level": 1 }, + { "id": "MAGIC_MUTAGEN", "level": 2 } + ], "components": [ [ [ "dragon_essence", 5 ] ], [ [ "mutagen_black_dragon", 1 ] ], [ [ "manatouched_serum", 1 ] ] ], "flags": [ "SECRET" ] }, + { + "type": "recipe", + "result": "iv_black_dragon", + "id_suffix": "from yonug black dragon's heart", + "activity_level": "MODERATE_EXERCISE", + "category": "CC_ENCHANTED", + "subcategory": "CSC_ENCHANTED_POTIONS", + "skill_used": "chemistry", + "skills_required": [ "spellcraft", 8 ], + "difficulty": 6, + "time": "8 h", + "batch_time_factors": [ 80, 20 ], + "book_learn": [ [ "black_dragons_historical", 8 ] ], + "qualities": [ + { "id": "CHEM", "level": 1 }, + { "id": "CONCENTRATE", "level": 1 }, + { "id": "MANA_INFUSE", "level": 1 }, + { "id": "MAGIC_MUTAGEN", "level": 2 } + ], + "result_mult": 2, + "components": [ [ [ "dragon_essence", 5 ] ], [ [ "young_dragon_heart_black", 1 ] ], [ [ "manatouched_serum", 1 ] ] ], + "flags": [ "SECRET" ] + }, { "result": "backpack_black_dragon_hide", "type": "recipe",