From 62e99a728595fa2d4f2b7865c79c3a369b1943b6 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 14 Apr 2020 14:12:00 -0500 Subject: [PATCH] [Aftershock] Mastodon Mutation Line and Uplifted SWAT Profession (#37660) --- data/mods/Aftershock/items/books.json | 29 + .../items/crafting_scrap/abstract_scrap.json | 10 +- .../crafting_scrap/biomaterial_scrap.json | 42 ++ .../items/crafting_scrap/circuity_scrap.json | 10 +- .../crafting_scrap/energy_storage_scrap.json | 10 +- .../items/crafting_scrap/magnet_scrap.json | 6 +- .../items/crafting_scrap/material_scrap.json | 10 +- .../items/crafting_scrap/neural_io_scrap.json | 10 +- data/mods/Aftershock/items/item_groups.json | 35 ++ data/mods/Aftershock/items/mutagen.json | 20 + data/mods/Aftershock/items/xl_gear.json | 140 +++++ .../npcs/mutant_npcs/npc_classes_mutant.json | 19 + .../npcs/mutant_npcs/trait_groups.json | 48 ++ .../player/mutations/mastodon_mutation.json | 534 ++++++++++++++++++ .../player/{ => mutations}/mutations.json | 10 + data/mods/Aftershock/player/professions.json | 33 ++ data/mods/Aftershock/recipes/mutagens.json | 63 +++ 17 files changed, 1001 insertions(+), 28 deletions(-) create mode 100644 data/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json create mode 100644 data/mods/Aftershock/items/xl_gear.json create mode 100644 data/mods/Aftershock/player/mutations/mastodon_mutation.json rename data/mods/Aftershock/player/{ => mutations}/mutations.json (72%) create mode 100644 data/mods/Aftershock/recipes/mutagens.json diff --git a/data/mods/Aftershock/items/books.json b/data/mods/Aftershock/items/books.json index a5b3aba4e71f6..4a6b5b140abf9 100644 --- a/data/mods/Aftershock/items/books.json +++ b/data/mods/Aftershock/items/books.json @@ -129,5 +129,34 @@ "name": { "str": "tripod schematics", "str_pl": "tripod schematics" }, "description": "Bearing the logo of Honda, those are assembly plans, design specs, and technical drawings for the tripod. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" + }, + { + "id": "recipe_uplift", + "type": "BOOK", + "name": { "str": "Dr Moreau and You", "str_pl": "copies of Dr Moreau and You" }, + "description": "In what many considered a stunning example of poor taste and others considered overt specieism this text on the creation of Uplifted Animals references a story about sapient animals killing their creator. Otherwise a dry text about genetic modification.", + "copy-from": "textbook_atomic", + "skill": "cooking", + "required_level": 9, + "max_level": 10 + }, + { + "id": "millyficents_diary", + "type": "BOOK", + "name": { "str": "Millyficent's Diary", "str_pl": "copies of Millyficent's Diary" }, + "description": "A pocket-sized book filled to the margins with cramped handwriting and notes on the biology of Mi-Go and other musings. It's hard to understand and quite gruesome in some places and written in a shorthand or cipher in others.", + "weight": "600 g", + "volume": "250 ml", + "price": 300000, + "material": [ "paper" ], + "symbol": "?", + "looks_like": "ZSG", + "color": "cyan", + "skill": "cooking", + "required_level": 10, + "max_level": 10, + "intelligence": 16, + "time": "15 m", + "fun": -3 } ] diff --git a/data/mods/Aftershock/items/crafting_scrap/abstract_scrap.json b/data/mods/Aftershock/items/crafting_scrap/abstract_scrap.json index b529cda9d6512..fca57bcc6ee88 100644 --- a/data/mods/Aftershock/items/crafting_scrap/abstract_scrap.json +++ b/data/mods/Aftershock/items/crafting_scrap/abstract_scrap.json @@ -3,7 +3,7 @@ "abstract": "afs_scrap_1", "type": "GENERIC", "category": "spare_parts", - "name": "ur-scrap", + "name": { "str": "ur-scrap" }, "description": "A small techno doodad.", "looks_like": "e_scrap", "price": 500, @@ -17,7 +17,7 @@ { "type": "GENERIC", "abstract": "afs_scrap_2", - "name": "ur-scrap", + "name": { "str": "ur-scrap" }, "copy-from": "afs_scrap_1", "price": 5000, "price_postapoc": 10000 @@ -25,7 +25,7 @@ { "type": "GENERIC", "abstract": "afs_scrap_3", - "name": "ur-scrap", + "name": { "str": "ur-scrap" }, "copy-from": "afs_scrap_1", "price": 5000, "price_postapoc": 50000 @@ -33,7 +33,7 @@ { "type": "GENERIC", "abstract": "afs_scrap_4", - "name": "ur-scrap", + "name": { "str": "ur-scrap" }, "copy-from": "afs_scrap_1", "price": 50000, "price_postapoc": 100000 @@ -41,7 +41,7 @@ { "type": "GENERIC", "abstract": "afs_scrap_5", - "name": "ur-scrap", + "name": { "str": "ur-scrap" }, "copy-from": "afs_scrap_1", "price": 500000, "price_postapoc": 1000000 diff --git a/data/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json b/data/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json new file mode 100644 index 0000000000000..55bb5e2a45fd7 --- /dev/null +++ b/data/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json @@ -0,0 +1,42 @@ +[ + { + "type": "GENERIC", + "id": "afs_biomaterial_1", + "copy-from": "afs_scrap_1", + "name": { "str": "monomeric slurry" }, + "description": "A collection of the building blocks of polymers. With this and a whole lot of know how you can create proteins and other building blocks of life.", + "looks_like": "scrap" + }, + { + "type": "GENERIC", + "id": "afs_biomaterial_2", + "copy-from": "afs_scrap_2", + "name": { "str": "micellular growth medium" }, + "description": "For the mixing of biomaterials that might otherwise be antithetical to one another.", + "looks_like": "scrap" + }, + { + "type": "GENERIC", + "id": "afs_biomaterial_3", + "copy-from": "afs_scrap_1", + "name": { "str": "artificial muscle fibers" }, + "description": "Lab grown or bioprinted muscle fibers, much denser and with higher performance ratios than baseline human muscles.", + "looks_like": "scrap" + }, + { + "type": "GENERIC", + "id": "afs_biomaterial_4", + "copy-from": "afs_scrap_4", + "name": { "str": "self healing polymers" }, + "description": "Materials capable of taking environmental chemicals and utilizing them for self repair, be careful you don't make grey goo.", + "looks_like": "scrap" + }, + { + "type": "GENERIC", + "id": "afs_biomaterial_5", + "copy-from": "afs_scrap_5", + "name": { "str": "autologous totipotent tissue culture" }, + "description": "Uncontaminated pure cellular matter than with the right instructions can become just about anything.", + "looks_like": "scrap" + } +] diff --git a/data/mods/Aftershock/items/crafting_scrap/circuity_scrap.json b/data/mods/Aftershock/items/crafting_scrap/circuity_scrap.json index 648f8deda18f1..1968618eeff09 100644 --- a/data/mods/Aftershock/items/crafting_scrap/circuity_scrap.json +++ b/data/mods/Aftershock/items/crafting_scrap/circuity_scrap.json @@ -3,7 +3,7 @@ "type": "GENERIC", "id": "afs_circuitry_1", "copy-from": "afs_scrap_1", - "name": "scrap photonics", + "name": { "str": "scrap photonics" }, "description": "Small circuits blue and gold, transmitting signals through light.", "looks_like": "scrap" }, @@ -11,7 +11,7 @@ "type": "GENERIC", "id": "afs_circuitry_2", "copy-from": "afs_scrap_2", - "name": "photonic circuitry", + "name": { "str": "photonic circuitry" }, "description": "A resplendent golden grid inlaid on dark blue substrate.", "looks_like": "scrap" }, @@ -19,7 +19,7 @@ "type": "GENERIC", "id": "afs_circuitry_3", "copy-from": "afs_scrap_3", - "name": "photonic computation core", + "name": { "str": "photonic computation core" }, "description": "A monolithic circuit shaped as a glowing cube of crystal.", "looks_like": "scrap" }, @@ -27,7 +27,7 @@ "type": "GENERIC", "id": "afs_circuitry_4", "copy-from": "afs_scrap_4", - "name": "hypergeometric photonics", + "name": { "str": "hypergeometric photonics" }, "description": "In your hands lies a self-contained digital universe. Its programs glowing like stars fixed on computational shells infinitely layered.", "looks_like": "scrap" }, @@ -35,7 +35,7 @@ "type": "GENERIC", "id": "afs_circuitry_5", "copy-from": "afs_scrap_5", - "name": "acausal logic permutator", + "name": { "str": "acausal logic permutator" }, "description": "It has given you an answer, but you are yet to ask anything.", "looks_like": "scrap" } diff --git a/data/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json b/data/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json index 110562c24db93..71e55af3b07e6 100644 --- a/data/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json +++ b/data/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json @@ -3,7 +3,7 @@ "type": "GENERIC", "id": "afs_energy_storage_1", "copy-from": "afs_scrap_1", - "name": "nanowire battery", + "name": { "str": "nanowire battery" }, "description": "A small battery component with a very high energy density.", "looks_like": "scrap" }, @@ -11,7 +11,7 @@ "type": "GENERIC", "id": "afs_energy_storage_2", "copy-from": "afs_scrap_2", - "name": "ultracapacitor", + "name": { "str": "ultracapacitor" }, "description": "A capacitor made from exotic compounds, capable of storing a high amount of electric charge.", "looks_like": "scrap" }, @@ -19,7 +19,7 @@ "type": "GENERIC", "id": "afs_energy_storage_3", "copy-from": "afs_scrap_3", - "name": "ultracapacitor array", + "name": { "str": "ultracapacitor array" }, "description": "Ultracapacitors assembled into a finely tunned energy storage array.", "looks_like": "scrap" }, @@ -27,7 +27,7 @@ "type": "GENERIC", "id": "afs_energy_storage_4", "copy-from": "afs_scrap_4", - "name": "superconductive coil", + "name": { "str": "superconductive coil" }, "description": "Superconductive wire warped upon itself manipulates the electromagnetic spectrum to store vast amounts of power.", "looks_like": "scrap" }, @@ -35,7 +35,7 @@ "type": "GENERIC", "id": "afs_energy_storage_5", "copy-from": "afs_scrap_5", - "name": "zero-point energy extractor", + "name": { "str": "zero-point energy extractor" }, "description": "A complex grid pins space-time to the surface of the multiversal hyper-torus, allowing the energies within to leak into our sliver of existence.", "looks_like": "scrap" } diff --git a/data/mods/Aftershock/items/crafting_scrap/magnet_scrap.json b/data/mods/Aftershock/items/crafting_scrap/magnet_scrap.json index 64fa59e99bcf3..96e69aa16032c 100644 --- a/data/mods/Aftershock/items/crafting_scrap/magnet_scrap.json +++ b/data/mods/Aftershock/items/crafting_scrap/magnet_scrap.json @@ -3,7 +3,7 @@ "type": "GENERIC", "id": "afs_magnet_1", "copy-from": "afs_scrap_1", - "name": "high quality electromagnet", + "name": { "str": "high quality electromagnet" }, "description": "A sturdy, industrially crafted electromagnet.", "looks_like": "scrap" }, @@ -11,7 +11,7 @@ "type": "GENERIC", "id": "afs_magnet_2", "copy-from": "afs_scrap_2", - "name": "cryo electromagnet", + "name": { "str": "cryo electromagnet" }, "description": "A powerful super conductive electromagnet, that must be kept at very low temperatures to operate.", "looks_like": "scrap" }, @@ -19,7 +19,7 @@ "type": "GENERIC", "id": "afs_magnet_3", "copy-from": "afs_scrap_3", - "name": "super conductive electromagnet", + "name": { "str": "super conductive electromagnet" }, "description": "A powerful electromagnet made from a room temperature superconductor .", "looks_like": "scrap" } diff --git a/data/mods/Aftershock/items/crafting_scrap/material_scrap.json b/data/mods/Aftershock/items/crafting_scrap/material_scrap.json index ef49f59636b74..db4e97582be21 100644 --- a/data/mods/Aftershock/items/crafting_scrap/material_scrap.json +++ b/data/mods/Aftershock/items/crafting_scrap/material_scrap.json @@ -3,7 +3,7 @@ "type": "GENERIC", "id": "afs_material_1", "copy-from": "afs_scrap_1", - "name": "composite alloy", + "name": { "str": "composite alloy" }, "description": "Miscellaneous scrap pieces made from a composite alloy.", "looks_like": "scrap" }, @@ -11,7 +11,7 @@ "type": "GENERIC", "id": "afs_material_2", "copy-from": "afs_scrap_2", - "name": "vacuum cast carbide", + "name": { "str": "vacuum cast carbide" }, "description": "Malleable carbide cast by forges on high earth orbit.", "looks_like": "scrap" }, @@ -19,7 +19,7 @@ "type": "GENERIC", "id": "afs_material_3", "copy-from": "afs_scrap_1", - "name": "nanoprinted alloy", + "name": { "str": "nanoprinted alloy" }, "description": "A meta material fabricated by precisely layering different elements at an atomic scale.", "looks_like": "scrap" }, @@ -27,7 +27,7 @@ "type": "GENERIC", "id": "afs_material_4", "copy-from": "afs_scrap_4", - "name": "crystal forged neutrite", + "name": { "str": "crystal forged neutrite" }, "description": "Great forges within the Earth's core wrought hydrogen into flaming metal and poured it within lattices of super conductive lanthanum. Locked in magnetic equilibrium, it was left to cool into a dark unbreakable metal", "looks_like": "scrap" }, @@ -35,7 +35,7 @@ "type": "GENERIC", "id": "afs_material_5", "copy-from": "afs_scrap_5", - "name": "phase uneven matter", + "name": { "str": "phase uneven matter" }, "description": "Matter condensed from the liminal spaces between dimmensions.", "looks_like": "scrap" } diff --git a/data/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json b/data/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json index 538390ee5dec5..0278bef0758af 100644 --- a/data/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json +++ b/data/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json @@ -3,7 +3,7 @@ "type": "GENERIC", "id": "afs_neural_io_1", "copy-from": "afs_scrap_1", - "name": "peripheral electrode", + "name": { "str": "peripheral electrode" }, "description": "A thin strand of wire and a clamp, meant to be spliced into the smaller nerves of the human body.", "looks_like": "scrap" }, @@ -11,7 +11,7 @@ "type": "GENERIC", "id": "afs_neural_io_2", "copy-from": "afs_scrap_2", - "name": "neural electrode", + "name": { "str": "neural electrode" }, "description": "A small array of metallic needles allows complex communication between machine and human mind.", "looks_like": "scrap" }, @@ -19,7 +19,7 @@ "type": "GENERIC", "id": "afs_neural_io_3", "copy-from": "afs_scrap_3", - "name": "brain implant prod", + "name": { "str": "brain implant prod" }, "description": "A complexly etched rod of metal interfaces with the corpus callosum of the patient, granting increased control of bionic functions.", "looks_like": "scrap" }, @@ -27,7 +27,7 @@ "type": "GENERIC", "id": "afs_neural_io_4", "copy-from": "afs_scrap_4", - "name": "artificial neural tissue", + "name": { "str": "artificial neural tissue" }, "description": "Photonic axons process thought at speeds far surpassing primitive, chemical-driven communication.", "looks_like": "scrap" }, @@ -35,7 +35,7 @@ "type": "GENERIC", "id": "afs_neural_io_5", "copy-from": "afs_scrap_5", - "name": "neurosynaptic interface matrix", + "name": { "str": "neurosynaptic interface matrix" }, "description": "A membrane of artificial neurons envelops the cerebral cortex, melding machine and human intellect into a gestalt much greater than its individual parts.", "looks_like": "scrap" } diff --git a/data/mods/Aftershock/items/item_groups.json b/data/mods/Aftershock/items/item_groups.json index 48be6a3a7d45d..f0d4f286acd81 100644 --- a/data/mods/Aftershock/items/item_groups.json +++ b/data/mods/Aftershock/items/item_groups.json @@ -182,6 +182,41 @@ "subtype": "distribution", "items": [ [ "afs_titanium_tooth", 25 ] ] }, + { + "id": "swat_gear", + "type": "item_group", + "items": [ + { "item": "xlswat_armor", "prob": 12 }, + { "item": "xlballistic_vest_empty", "prob": 6 }, + { "item": "xlballistic_vest_esapi", "prob": 3 }, + { "item": "xlboots_combat", "prob": 15 }, + { "item": "xlgloves_tactical", "prob": 10 }, + { "item": "tripaw_xlgloves_tactical", "prob": 8 } + ] + }, + { + "id": "mil_armor", + "type": "item_group", + "items": [ + { "item": "xlballistic_vest_empty", "prob": 6 }, + { "item": "xlballistic_vest_esapi", "prob": 3 }, + { "item": "xlboots_combat", "prob": 15 }, + { "item": "xlgloves_tactical", "prob": 10 }, + { "item": "tripaw_xlgloves_tactical", "prob": 8 } + ] + }, + { + "id": "rare", + "type": "item_group", + "items": [ + { "item": "xlswat_armor", "prob": 60 }, + { "item": "xlballistic_vest_empty", "prob": 65 }, + { "item": "xlballistic_vest_esapi", "prob": 39 }, + { "item": "xlboots_combat", "prob": 70 }, + { "item": "xlgloves_tactical", "prob": 50 }, + { "item": "tripaw_xlgloves_tactical", "prob": 48 } + ] + }, { "type": "item_group", "id": "guns_ganger", diff --git a/data/mods/Aftershock/items/mutagen.json b/data/mods/Aftershock/items/mutagen.json index b17547f34c6cd..98c4d1f6a167a 100644 --- a/data/mods/Aftershock/items/mutagen.json +++ b/data/mods/Aftershock/items/mutagen.json @@ -18,5 +18,25 @@ "description": "An extremely rare mutagen cocktail, it smells of sulphur and glows orange.", "price": 500000, "use_action": { "type": "mutagen", "mutation_category": "MIGO" } + }, + { + "id": "iv_mutagen_mastodon", + "copy-from": "iv_mutagen_flavor", + "type": "COMESTIBLE", + "name": { "str": "mastodon serum" }, + "description": "A super-concentrated mutagen not for those frightened of this thing they have become. You need a syringe to inject it… if you really want to?", + "price": 1000000, + "color": "red", + "healthy": -4, + "use_action": { "type": "mutagen_iv", "mutation_category": "MIGO" } + }, + { + "id": "mutagen_mastodon", + "copy-from": "mutagen_flavor", + "type": "COMESTIBLE", + "name": { "str": "mastodon mutagen" }, + "description": "An extremely rare mutagen cocktail, it seeks to cure what's deep inside.", + "price": 500000, + "use_action": { "type": "mutagen", "mutation_category": "MIGO" } } ] diff --git a/data/mods/Aftershock/items/xl_gear.json b/data/mods/Aftershock/items/xl_gear.json new file mode 100644 index 0000000000000..002256065b1f5 --- /dev/null +++ b/data/mods/Aftershock/items/xl_gear.json @@ -0,0 +1,140 @@ +[ + { + "id": "xlswat_armor", + "repairs_like": "survivor_suit", + "type": "ARMOR", + "category": "armor", + "name": "SWAT armor", + "//": "This is well within the pricing structure I found for ballistic vest, shins, and LBE. LEO gear ain't cheap.", + "description": "An extra large suit of black bulletproof armor with lots of pockets. The word SWAT is emblazoned across the back. Specifically designed for Uplifted officers such as Mastodons.", + "weight": "10 kg", + "volume": "20 L", + "price": 585000, + "to_hit": -3, + "bashing": 6, + "material": [ "kevlar", "cotton" ], + "symbol": "[", + "looks_like": "touring_suit", + "color": "dark_gray", + "covers": [ "LEGS", "TORSO", "ARMS" ], + "coverage": 95, + "encumbrance": 25, + "storage": "8 L", + "warmth": 35, + "material_thickness": 9, + "valid_mods": [ "steel_padded" ], + "environmental_protection": 4, + "flags": [ "OVERSIZE", "POCKETS", "STURDY" ] + }, + { + "id": "xlballistic_vest_empty", + "type": "ARMOR", + "category": "armor", + "//": "Based on US Army SPCS", + "name": { "str": "empty ballistic vest" }, + "description": "Oversized ballistic armor without any armor inserts. The soft armor plate carrier is still protective but it won't stop high energy projectiles.", + "weight": "4 kg", + "volume": "7 L", + "price": 160000, + "material": [ "nylon" ], + "symbol": "[", + "color": "light_gray", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 6, + "warmth": 15, + "material_thickness": 8, + "flags": [ "OVERSIZE", "STURDY", "OUTER", "WATER_FRIENDLY" ] + }, + { + "id": "xlballistic_vest_esapi", + "type": "ARMOR", + "category": "armor", + "name": { "str": "ESAPI ballistic vest" }, + "description": "Oversized ballistic armor with ESAPI ceramic armor plates.", + "weight": "12 kg", + "volume": "9 L", + "price": 280000, + "material": [ "nylon", "ceramic" ], + "symbol": "[", + "color": "light_gray", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 10, + "warmth": 15, + "material_thickness": 26, + "flags": [ "OVERSIZE", "STURDY", "OUTER", "WATER_FRIENDLY", "NO_REPAIR" ] + }, + { + "id": "xlboots_combat", + "repairs_like": "boots_survivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of combat boots", + "name_plural": "pairs of combat boots", + "description": "Modern oversized reinforced tactical combat boots. Very durable.", + "weight": "1460 g", + "volume": "5 L", + "price": 7000, + "price_postapoc": 14000, + "to_hit": -1, + "bashing": 1, + "material": [ "kevlar", "leather" ], + "symbol": "[", + "looks_like": "boots", + "color": "dark_gray", + "covers": [ "FEET" ], + "coverage": 100, + "encumbrance": 25, + "warmth": 25, + "material_thickness": 5, + "environmental_protection": 2, + "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "xlgloves_tactical", + "repairs_like": "gloves_survivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of tactical gloves", + "name_plural": "pairs of tactical gloves", + "description": "A pair of oversized reinforced Kevlar tactical gloves. Commonly used by police and military units.", + "weight": "1 kg", + "volume": "750 ml", + "price": 5200, + "to_hit": 2, + "material": [ "kevlar", "leather" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 13, + "warmth": 20, + "material_thickness": 5, + "flags": [ "OVERSIZE", "VARSIZE", "STURDY" ] + }, + { + "id": "tripaw_xlgloves_tactical", + "repairs_like": "gloves_survivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of tactical gloves", + "name_plural": "pairs of tactical gloves", + "description": "A pair of reinforced Kevlar tactical gloves. Specifically designed to accomodate three fingered Killophants. Thinner than regular oversized tactical gloves.", + "weight": "320 g", + "volume": "750 ml", + "price": 5200, + "to_hit": 2, + "material": [ "kevlar", "leather" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 5, + "warmth": 20, + "material_thickness": 3, + "flags": [ "OVERSIZE", "VARSIZE", "STURDY" ] + } +] diff --git a/data/mods/Aftershock/npcs/mutant_npcs/npc_classes_mutant.json b/data/mods/Aftershock/npcs/mutant_npcs/npc_classes_mutant.json index ab0677b3ac616..7f9e7377356e1 100644 --- a/data/mods/Aftershock/npcs/mutant_npcs/npc_classes_mutant.json +++ b/data/mods/Aftershock/npcs/mutant_npcs/npc_classes_mutant.json @@ -381,5 +381,24 @@ { "group": "trait_group_raptor" }, { "distribution": [ { "group": "trait_group_raptor_nonthres" }, { "group": "trait_group_raptor_postthres" } ] } ] + }, + { + "type": "npc_class", + "id": "NC_NPC_MUTANT_MASTODON", + "name": "Mastodon Uplift", + "job_description": "Humans created me. Let's see what I can be on my own.", + "skills": [ + { "skill": "survival", "bonus": { "rng": [ 2, 4 ] } }, + { "skill": "melee", "bonus": { "rng": [ 6, 10 ] } }, + { "skill": "unarmed", "bonus": { "rng": [ 6, 10 ] } } + ], + "bonus_str": 3, + "traits": [ + { "group": "trait_mutant_npc_common" }, + { "group": "trait_group_mastodon" }, + { + "distribution": [ { "group": "trait_group_mastodon_nonthres" }, { "group": "trait_group_mastodon_postthres" } ] + } + ] } ] diff --git a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json index 57f0a4cfc5723..7f96b7efc88f3 100644 --- a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json +++ b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json @@ -919,5 +919,53 @@ { "trait": "SQUEAMISH", "prob": 10 }, { "group": "Appearance_demographics", "prob": 100 } ] + }, + { + "type": "trait_group", + "id": "trait_group_mastodon", + "subtype": "collection", + "traits": [ + { "trait": "PATCHFUR", "prob": 50 }, + { "trait": "LEATHER_FEET", "prob": 50 }, + { "trait": "SKINFOLDS", "prob": 50 }, + { "trait": "HAULER", "prob": 50 }, + { "trait": "WEAKJOINTS", "prob": 50 }, + { "trait": "UPLIFTED" }, + { "trait": "ELEPHANTINE_SMELL", "prob": 50 }, + { "trait": "SPECAILIZED_DIET", "prob": 50 }, + { "trait": "ELEPHANTINE_SMELL", "prob": 50 }, + { "trait": "CRUSHINGFEET", "prob": 50 }, + { "trait": "HERBIVORE", "prob": 50 }, + { "trait": "FACEBUMPS", "prob": 50 } + ] + }, + { + "type": "trait_group", + "id": "trait_group_mastodon_nonthres", + "subtype": "collection", + "traits": [ + { "trait": "MUT_TANK", "prob": 50 }, + { "trait": "TUSKS", "prob": 50 }, + { "distribution": [ { "trait": "SHORTFUR" }, { "trait": "MEDIUMFUR" } ] } + ] + }, + { + "type": "trait_group", + "id": "trait_group_mastodon_postthres", + "subtype": "collection", + "traits": [ + { "trait": "THRESH_MASTODON" }, + { "distribution": [ { "trait": "ELEPHANTINE" }, { "trait": "ELEPHANTINE_OK" } ] }, + { "trait": "MUT_TANK2", "prob": 50 }, + { "trait": "GIGANTIC", "prob": 20 }, + { "trait": "GIGANTIC_OK", "prob": 20 }, + { "trait": "TUSKS_POINTED", "prob": 50 }, + { + "distribution": [ + { "trait": "TRUMPET" }, + { "collection": [ { "trait": "BIG_FOOD" }, { "trait": "LARGE_DIET" }, { "trait": "FLUSH" } ] } + ] + } + ] } ] diff --git a/data/mods/Aftershock/player/mutations/mastodon_mutation.json b/data/mods/Aftershock/player/mutations/mastodon_mutation.json new file mode 100644 index 0000000000000..ea9e69577780c --- /dev/null +++ b/data/mods/Aftershock/player/mutations/mastodon_mutation.json @@ -0,0 +1,534 @@ +[ + { + "type": "mutation", + "id": "UPLIFTED", + "name": "Uplifted", + "points": 2, + "description": "You come from uplifted animal stock. This decreases morale penalties for being wet.", + "starting_trait": true, + "valid": false, + "wet_protection": [ + { "part": "HEAD", "neutral": 9 }, + { "part": "LEG_L", "neutral": 11 }, + { "part": "LEG_R", "neutral": 11 }, + { "part": "FOOT_L", "neutral": 5 }, + { "part": "FOOT_R", "neutral": 5 }, + { "part": "ARM_L", "neutral": 11 }, + { "part": "ARM_R", "neutral": 11 }, + { "part": "HAND_L", "neutral": 16 }, + { "part": "HAND_R", "neutral": 16 }, + { "part": "TORSO", "neutral": 14 } + ] + }, + { + "type": "mutation", + "id": "LEATHER_FEET", + "name": "Leathered Feet", + "points": 1, + "description": "The bottoms of your feet are tough like an animals. You receive no movement penalty for not wearing shoes.", + "category": [ "MASTODON" ] + }, + { + "type": "mutation", + "id": "SKINFOLDS", + "name": "Skinfolds", + "points": 1, + "description": "Your skin is tough. Cutting damage is slightly reduced for you. Slightly decreases wet penalties.", + "starting_trait": true, + "category": [ "MASTODON" ], + "cancels": [ "THINSKIN" ], + "wet_protection": [ + { "part": "LEG_L", "neutral": 2 }, + { "part": "LEG_R", "neutral": 2 }, + { "part": "ARM_L", "neutral": 2 }, + { "part": "ARM_R", "neutral": 2 }, + { "part": "TORSO", "neutral": 4 } + ], + "armor": [ { "parts": "ALL", "cut": 1 } ] + }, + { + "type": "mutation", + "id": "HAULER", + "name": "Hauler", + "points": 2, + "description": "You are capable of carrying far more than someone with similar strength could. Your maximum weight carried is increased by 60%.", + "category": [ "MASTODON" ], + "cancels": [ "BADBACK" ], + "weight_capacity_modifier": 1.6 + }, + { + "type": "mutation", + "id": "WEAKJOINTS", + "name": { "str": "Weak Joints" }, + "points": -1, + "description": "A common flaw in your genemod, brought on by increased muscle mass and bone density. Moving over rough terrain will slow you down more than normal.", + "cancels": [ "PARKOUR" ], + "category": [ "MASTODON" ], + "movecost_obstacle_modifier": 1.15 + }, + { + "type": "mutation", + "id": "SPECAILIZED_DIET", + "name": "Herbivorous Ancestry", + "points": -2, + "description": "You have problems with eating meat. It's possible for you to eat it, but you will suffer morale penalties and obtain less nutrition from it.", + "category": [ "MASTODON" ], + "vitamins_absorb_multi": [ [ "flesh", [ [ "vitA", 0 ], [ "vitB", 0 ], [ "vitC", 0 ], [ "calcium", 0 ], [ "iron", 0 ] ] ] ], + "cancels": [ "CANNIBAL", "MEATARIAN", "ANTIFRUIT" ] + }, + { + "type": "mutation", + "id": "ELEPHANTINE_SMELL", + "name": "Strong Scent", + "points": -1, + "description": "Your scent is particularly strong. It's vaguely offensive to humans, and animals that track your scent will do so more easily.", + "starting_trait": true, + "changes_to": [ "SMELLY2" ], + "types": [ "SCENT" ], + "scent_intensity": 800, + "social_modifiers": { "persuade": -5, "intimidate": -5 }, + "category": [ "MASTODON" ] + }, + { + "type": "mutation", + "id": "GIANT_STEPS", + "name": { "str": "Giant Step" }, + "points": -1, + "description": "You make more noise while walking. You're also more likely to set off traps.", + "category": [ "MASTODON" ], + "cancels": [ "LIGHTSTEP" ], + "noise_modifier": 1.7 + }, + { + "type": "mutation", + "id": "SLOWANDSTEADY", + "name": "Slow and Steady", + "points": -3, + "description": "You can't move as fast as most, resulting in a 10% speed penalty on flat ground.", + "category": [ "MASTODON" ], + "types": [ "RUNNING" ], + "movecost_flatground_modifier": 1.1 + }, + { + "type": "mutation", + "id": "PATCHFUR", + "name": "Patched Fur", + "points": 0, + "visibility": 2, + "ugliness": 1, + "description": "Your skin has patches of light fur. This has no impact on your life except marking you as not fully human.", + "types": [ "SKIN" ], + "changes_to": [ "SHORTFUR" ], + "category": [ "MASTODON" ] + }, + { + "type": "mutation", + "id": "SHORTFUR", + "name": { "str": "Short Fur Coat" }, + "points": 1, + "visibility": 6, + "ugliness": 2, + "bodytemp_modifiers": [ 100, 300 ], + "bodytemp_sleep": 100, + "description": "Short fur has grown to cover your entire body, providing slight protection from cold.", + "category": [ "MASTODON" ], + "types": [ "SKIN" ], + "prereqs": [ "SHORTFUR" ], + "changes_to": [ "MEDIUMFUR" ] + }, + { + "type": "mutation", + "id": "MEDIUMFUR", + "name": { "str": "Furry" }, + "points": 2, + "visibility": 10, + "ugliness": 3, + "bodytemp_modifiers": [ 350, 700 ], + "bodytemp_sleep": 500, + "description": "Thick brown fur has grown to cover your entire body, providing a slight protection against attacks, and some protection from cold.", + "types": [ "SKIN" ], + "changes_to": [ "MASTODON_FUR" ], + "prereqs": [ "LIGHTFUR" ], + "category": [ "MASTODON" ], + "armor": [ { "parts": "ALL", "bash": 2 } ] + }, + { + "type": "mutation", + "id": "MASTODON_FUR", + "name": { "str": "Shaggy Fur" }, + "points": 4, + "visibility": 10, + "ugliness": 3, + "bodytemp_modifiers": [ 750, 1500 ], + "bodytemp_sleep": 500, + "description": "Your fur has grown out and thickened, providing noticeable protection from attacks as well as considerable insulation.", + "types": [ "SKIN" ], + "prereqs": [ "MEDIUMFUR" ], + "category": [ "MASTODON" ], + "threshreq": [ "THRESH_MASTODON" ], + "armor": [ { "parts": "ALL", "bash": 4 } ] + }, + { + "type": "mutation", + "id": "CRUSHINGFEET", + "name": "Crushing Feet", + "points": -4, + "visibility": 2, + "ugliness": 2, + "mixed_effect": true, + "description": "Your feet have grown massive and ready to support huge weight. This allows kicking attacks to do much more damage, provides natural armor, and removes the need to wear shoes; however, you cannot wear normal size shoes. Reduces wet effects.", + "types": [ "LEGS" ], + "category": [ "MASTODON" ], + "wet_protection": [ { "part": "FOOT_L", "neutral": 10 }, { "part": "FOOT_R", "neutral": 10 } ], + "destroys_gear": true, + "armor": [ { "parts": [ "FOOT_L", "FOOT_R" ], "bash": 2, "cut": 2 } ], + "attacks": { + "attack_text_u": "You kick %s with your massive feet", + "attack_text_npc": "%1$s kicks %2$s with their massive feet", + "chance": 20, + "strength_damage": { "damage_type": "bash", "amount": 5 } + } + }, + { + "type": "mutation", + "id": "RUMINANT", + "copy-from": "RUMINANT", + "extend": { "category": [ "MASTODON" ] } + }, + { + "type": "mutation", + "id": "GRAZER", + "copy-from": "GRAZER", + "extend": { "category": [ "MASTODON" ] } + }, + { + "type": "mutation", + "id": "FACEBUMPS", + "name": "Face Bumps", + "points": 0, + "visibility": 3, + "ugliness": 3, + "description": "You have a pair of bumps on your face above your mouth and beside your nose.", + "changes_to": [ "TUSKS" ] + }, + { + "type": "mutation", + "id": "TUSKS", + "name": "Tusks", + "points": 1, + "visibility": 3, + "ugliness": 1, + "description": "You have a pair of small tusks on your face. They allow you to make a weak piercing goring attack.", + "types": [ "HORNS" ], + "prereqs": [ "FACEBUMPS" ], + "changes_to": [ "TUSKS_POINTED" ], + "category": [ "MASTODON" ], + "attacks": { + "attack_text_u": "You gore %s with your tusks", + "attack_text_npc": "%1$s gores %2$s with their tusks", + "chance": 20, + "base_damage": [ { "damage_type": "stab", "amount": 3 }, { "damage_type": "bash", "amount": 3 } ] + } + }, + { + "type": "mutation", + "id": "TUSKS_POINTED", + "name": "Pointed Tusks", + "points": 1, + "visibility": 8, + "ugliness": 2, + "mixed_effect": true, + "description": "You have a pair of long, pointed tusks, like someone weaponized an elephant. They allow you to make a strong piercing headbutt attack, but prevent wearing mouthgear that is not made of fabric.", + "types": [ "HORNS" ], + "prereqs": [ "HORNS" ], + "restricts_gear": [ "MOUTH" ], + "allow_soft_gear": true, + "category": [ "MASTODON" ], + "threshreq": [ "THRESH_MASTODON" ], + "attacks": { + "attack_text_u": "You stab %s with your pointed tusks", + "attack_text_npc": "%1$s stabs %2$s with their pointed tusks", + "chance": 22, + "base_damage": { "damage_type": "stab", "amount": 24 } + } + }, + { + "type": "mutation", + "id": "MUT_TANK", + "name": "Immovable", + "points": 2, + "description": "You can survive injuries that would incapacitate humans: you get a 20% bonus to all hit points. Stacks with Tough, etc.", + "social_modifiers": { "intimidate": 2 }, + "prereqs": [ "LARGE_OK", "HUGE_OK", "STR_UP_3", "STR_UP_4", "MASOCHIST_MED" ], + "threshreq": [ "THRESH_MASTODON" ], + "cancels": [ "FLIMSY", "FLIMSY2", "FLIMSY3", "GLASSJAW" ], + "changes_to": [ "MUT_TANK2" ], + "category": [ "MASTODON" ], + "hp_modifier_secondary": 0.2 + }, + { + "type": "mutation", + "id": "MUT_TANK2", + "name": "Unstoppable", + "points": 3, + "description": "Not much scares you. You get a 30% bonus to all hit points. Stacks with Tough, etc.", + "social_modifiers": { "intimidate": 3 }, + "valid": false, + "prereqs": [ "MUT_TANK" ], + "threshreq": [ "THRESH_MASTODON" ], + "cancels": [ "FLIMSY", "FLIMSY2", "FLIMSY3", "GLASSJAW" ], + "changes_to": [ "MUT_TANK3" ], + "category": [ "MASTODON" ], + "hp_modifier_secondary": 0.3 + }, + { + "type": "mutation", + "id": "MUT_TANK3", + "name": "Meatshield", + "points": 4, + "description": "You can simply take the punishment from lesser beings and keep going. You get a 40% bonus to all hit points. Stacks with Tough, etc.", + "social_modifiers": { "intimidate": 4 }, + "valid": false, + "prereqs": [ "MUT_TANK2" ], + "threshreq": [ "THRESH_MASTODON" ], + "cancels": [ "FLIMSY", "FLIMSY2", "FLIMSY3", "GLASSJAW" ], + "category": [ "MASTODON" ], + "hp_modifier_secondary": 0.4 + }, + { + "type": "mutation", + "id": "ELEPHANTINE", + "name": "Elephantine", + "points": 0, + "visibility": 1, + "ugliness": 1, + "mixed_effect": true, + "encumbrance_always": [ [ "TORSO", 10 ], [ "ARM_L", 10 ], [ "ARM_R", 10 ] ], + "description": "You have grown noticeably taller and broader. Much of it is useful muscle mass (Strength +2), but you find it throws off your balance and you get in your own way (+10 torso and arm encumbrance).", + "prereqs": [ "STR_UP", "STR_UP_2", "STR_UP_3", "STR_UP_4" ], + "cancels": [ "SMALL", "SMALL2" ], + "changes_to": [ "ELEPHANTINE_OK", "GIGANTIC" ], + "category": [ "MASTODON" ], + "passive_mods": { "str_mod": 2 }, + "weight_capacity_modifier": 1.05 + }, + { + "type": "mutation", + "id": "ELEPHANTINE_OK", + "name": "Large", + "points": 2, + "visibility": 1, + "description": "You carry your rugged body with the dignity you deserve. Strength +2.", + "prereqs": [ "ELEPHANTINE" ], + "prereqs2": [ "STR_UP", "STR_UP_2", "STR_UP_3", "STR_UP_4" ], + "cancels": [ "SMALL", "SMALL2" ], + "threshreq": [ "THRESH_MASTODON" ], + "changes_to": [ "GIGANTIC" ], + "leads_to": [ "MUT_TANK" ], + "category": [ "MASTODON" ], + "passive_mods": { "str_mod": 2 }, + "weight_capacity_modifier": 1.05 + }, + { + "type": "mutation", + "id": "GIGANTIC", + "name": "Freakishly Gigantic", + "points": -2, + "visibility": 4, + "ugliness": 4, + "mixed_effect": true, + "description": "You have grown even more massive, to the point where you cannot usefully fit into human-sized clothing or vehicles. Much of it is powerful muscle mass (Strength +4), but it's a real pain to haul around.", + "prereqs": [ "ELEPHANTINE", "ELEPHANTINE_OK" ], + "prereqs2": [ "STR_UP_3", "STR_UP_4" ], + "cancels": [ "SMALL", "SMALL2" ], + "changes_to": [ "GIGANTIC_OK" ], + "category": [ "MASTODON" ], + "passive_mods": { "str_mod": 4 }, + "hp_adjustment": -6, + "fatigue_modifier": 0.15, + "restricts_gear": [ "TORSO", "LEG_L", "LEG_R", "ARM_L", "ARM_R", "HAND_L", "HAND_R", "HEAD", "FOOT_L", "FOOT_R" ], + "destroys_gear": true, + "weight_capacity_modifier": 1.1 + }, + { + "type": "mutation", + "id": "GIGANTIC_OK", + "name": "Gigantic", + "points": 2, + "visibility": 4, + "ugliness": 3, + "mixed_effect": true, + "description": "Your cardiovascular system has caught up with your muscular physique, so who needs pathetic human cars? Strength +4.", + "prereqs": [ "ELEPHANTINE" ], + "prereqs2": [ "STR_UP_3", "STR_UP_4" ], + "cancels": [ "SMALL", "SMALL2" ], + "threshreq": [ "THRESH_MASTODON" ], + "leads_to": [ "MUT_TANK" ], + "category": [ "MASTODON" ], + "passive_mods": { "str_mod": 4 }, + "restricts_gear": [ "TORSO", "LEG_L", "LEG_R", "ARM_L", "ARM_R", "HAND_L", "HAND_R", "HEAD", "FOOT_L", "FOOT_R" ], + "destroys_gear": true, + "weight_capacity_modifier": 1.1 + }, + { + "type": "mutation", + "id": "YAKSMELL", + "name": "Terrible Odor", + "points": -2, + "visibility": 4, + "ugliness": 5, + "description": "You smell like exactly like a shaggy elephant would, assuming it sweated, which you do. Monsters that track scent will find you very easily, and humans will react poorly.", + "scent_intensity": 1200, + "prereqs": [ "ELEPHANTINE_SMELL" ], + "leads_to": [ "PHEROMONE_MAMMAL" ], + "category": [ "MASTODON" ] + }, + { + "type": "mutation", + "id": "MINITRUNK", + "name": "Proto Trunk", + "points": -1, + "visibility": 4, + "ugliness": 3, + "description": "Your face and jaw have begun… changing. Masks and such fit OK, but you're noticeably mutated.", + "changes_to": [ "BEAK", "BEAK_HUM", "BEAK_PECK", "PROBOSCIS", "MINOTAUR", "MUZZLE", "MUZZLE_BEAR", "MUZZLE_LONG", "MUZZLE_RAT" ], + "category": [ "MASTODON" ] + }, + { + "type": "mutation", + "id": "TRUNK", + "name": { "str": "Elephant Trunk" }, + "points": -4, + "visibility": 5, + "ugliness": 6, + "mixed_effect": true, + "description": "Your face resembles that of an elephant, with a significant trunk. It looks fierce but prevents wearing mouthgear. Prehensile and able to perform some fine detail work.", + "types": [ "MUZZLE" ], + "prereqs": [ "MINITRUNK" ], + "category": [ "MASTODON" ], + "restricts_gear": [ "MOUTH" ], + "social_modifiers": { "intimidate": 10 }, + "craft_skill_bonus": [ [ "electronics", 1 ], [ "tailor", 1 ], [ "mechanics", 1 ], [ "cooking", 1 ] ] + }, + { + "type": "mutation", + "id": "BIG_FOOD", + "name": "Constant Eater", + "points": -2, + "description": "You require more food than most people, but recover stamina slightly faster.", + "starting_trait": true, + "types": [ "METABOLISM" ], + "changes_to": [ "LARGE_DIET" ], + "category": [ "MASTODON" ], + "metabolism_modifier": 0.5, + "stamina_regen_modifier": 0.1 + }, + { + "type": "mutation", + "id": "LARGE_DIET", + "name": "Large Diet", + "points": -2, + "description": "You require more food than others but your ability to go the distance in both combat and athleticism is expanded.", + "types": [ "HEALING" ], + "cancels": [ "LIGHTEATER", "COLDBLOOD", "COLDBLOOD2", "COLDBLOOD3", "COLDBLOOD4", "WAKEFUL", "WAKEFUL2", "WAKEFUL3" ], + "prereqs": [ "HUNGER" ], + "category": [ "MASTODON" ], + "healing_resting": 0.25, + "fatigue_modifier": 0.75, + "fatigue_regen_modifier": 0.5, + "metabolism_modifier": 0.4 + }, + { + "type": "mutation", + "id": "FLUSH", + "name": "High Thirst", + "points": -2, + "description": "Your body needs more water than usual to flush the denser waste products.", + "starting_trait": true, + "changes_to": [ "H20NEEDS" ], + "cancels": [ "NO_THIRST" ], + "category": [ "MASTODON" ], + "thirst_modifier": 0.5 + }, + { + "type": "mutation", + "id": "H20NEEDS", + "name": "Giant Thirst", + "points": -3, + "description": "Ugh, out of water already? You need about twice the fluids of an average human.", + "prereqs": [ "THIRST" ], + "changes_to": [ "THIRST3" ], + "cancels": [ "NO_THIRST" ], + "category": [ "MASTODON" ], + "thirst_modifier": 1.0 + }, + { + "type": "mutation", + "id": "TRIPAWS", + "name": "Three Fingered", + "points": -3, + "visibility": 3, + "ugliness": 2, + "mixed_effect": true, + "description": "Your hands have fused into three fingered paws. Fine manipulation is a challenge: permanent hand encumbrance of 10, difficulty with delicate craftwork, and your gloves don't fit. But they handle water better.", + "encumbrance_always": [ [ "HAND_L", 10 ], [ "HAND_R", 10 ] ], + "restricts_gear": [ "HAND_L", "HAND_R" ], + "craft_skill_bonus": [ [ "electronics", -2 ], [ "tailor", -2 ], [ "mechanics", -2 ] ], + "types": [ "HANDS" ], + "cancels": [ "TALONS" ], + "category": [ "MASTODON" ] + }, + { + "type": "mutation", + "id": "HERBIVORE", + "copy-from": "HERBIVORE", + "extend": { "category": [ "MASTODON" ] } + }, + { + "type": "mutation", + "id": "DELIBERATE1", + "name": "Ponderous", + "points": -3, + "description": "Your weight must be delicately placed lest the ground give way. You move 10% slower.", + "types": [ "RUNNING" ], + "changes_to": [ "DELIBERATE2" ], + "cancels": [ "FLEET" ], + "category": [ "MASTODON" ], + "movecost_modifier": 1.1 + }, + { + "type": "mutation", + "id": "DELIBERATE2", + "name": "Very Deliberate", + "points": -5, + "description": "Your muscles are quite slow to move. You move 25% slower.", + "types": [ "RUNNING" ], + "prereqs": [ "DELIBERATE1" ], + "changes_to": [ "PONDEROUS3" ], + "cancels": [ "QUICK" ], + "category": [ "MASTODON" ], + "movecost_modifier": 1.25 + }, + { + "type": "mutation", + "id": "TRUMPET", + "name": "Trumpeting Voice", + "points": -1, + "mixed_effect": true, + "description": "You have a trumpeting elephantine voice. threatening NPCs will be easier, but lying will very hard.", + "changes_to": [ "SNARL" ], + "category": [ "MASTODON" ], + "social_modifiers": { "lie": -30, "intimidate": 10 } + }, + { + "type": "mutation", + "id": "THRESH_MASTODON", + "name": { "str": "Killophant" }, + "points": 1, + "description": "Your species was created as the ultimate shock troop. Inherit the earth, pedigree your ancestors, crush the foe.", + "valid": false, + "profession": true, + "purifiable": false, + "threshold": true + } +] diff --git a/data/mods/Aftershock/player/mutations.json b/data/mods/Aftershock/player/mutations/mutations.json similarity index 72% rename from data/mods/Aftershock/player/mutations.json rename to data/mods/Aftershock/player/mutations/mutations.json index 27779daffe650..7ac41ed9799f2 100644 --- a/data/mods/Aftershock/player/mutations.json +++ b/data/mods/Aftershock/player/mutations/mutations.json @@ -21,5 +21,15 @@ "valid": false, "purifiable": false, "profession": true + }, + { + "type": "mutation", + "id": "PrepNet", + "name": "PrepNet Tag", + "points": 0, + "valid": false, + "description": "NPC trait that makes monsters see it as a Prepnet. It is a bug if you have it.", + "player_display": false, + "threshold": true } ] diff --git a/data/mods/Aftershock/player/professions.json b/data/mods/Aftershock/player/professions.json index c1d140062b7a7..dc789e468184d 100644 --- a/data/mods/Aftershock/player/professions.json +++ b/data/mods/Aftershock/player/professions.json @@ -186,5 +186,38 @@ "male": [ "briefs", "collarpin", "diamond_ring" ], "female": [ "panties", "hairpin", "pearl_collar" ] } + }, + { + "type": "profession", + "ident": "afs_mastadon_swat", + "name": "Uplifted Enforcer", + "description": "You are an uplifted elephant hybrid, a precisely engineered enforcer creature created by combining human, elephant and mastodon DNA. Unlike most of your war-minded kin, you sought a peaceful retirement after completing your compulsive service period, and even earned the right to be considered a full citizen. Now, with the end of the world in the horizon, it seems that your combat skills might come useful once again.", + "points": 13, + "skills": [ + { "level": 6, "name": "gun" }, + { "level": 4, "name": "shotgun" }, + { "level": 2, "name": "pistol" }, + { "level": 3, "name": "melee" }, + { "level": 3, "name": "bashing" } + ], + "traits": [ "PROF_SWAT", "UPLIFTED", "THRESH_MASTODON", "MUT_TANK", "TUSKS" ], + "//": "Placeholder profession until mutant NPCs merged and post thresh MASTODON distribution table can be added. Need to add XL gear for MASTODON's in more items.", + "items": { + "both": { + "items": [ "socks", "swat_armor", "tac_fullhelmet", "boots_combat", "gloves_tactical", "badge_swat", "wristwatch" ], + "entries": [ + { "group": "charged_two_way_radio" }, + { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, + { "item": "bandolier_shotgun", "contents-group": "bandolier_swat_cqc1" }, + { "item": "bandolier_shotgun", "contents-group": "bandolier_swat_cqc2" }, + { "item": "legpouch_large", "contents-group": "army_mags_usp9" }, + { "item": "usp_9mm", "ammo-item": "9mmfmj", "charges": 15, "container-item": "sholster" }, + { "item": "baton-extended", "container-item": "police_belt" }, + { "item": "ksg", "ammo-item": "shot_00", "charges": 7, "contents-item": "shoulder_strap" } + ] + }, + "male": [ "boxer_shorts" ], + "female": [ "sports_bra", "boy_shorts" ] + } } ] diff --git a/data/mods/Aftershock/recipes/mutagens.json b/data/mods/Aftershock/recipes/mutagens.json new file mode 100644 index 0000000000000..97f5f3e483069 --- /dev/null +++ b/data/mods/Aftershock/recipes/mutagens.json @@ -0,0 +1,63 @@ +[ + { + "type": "recipe", + "result": "mutagen_mastodon", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_MUTAGEN", + "skill_used": "cooking", + "skills_required": [ "firstaid", 6 ], + "difficulty": 10, + "time": 120000, + "tools": [ [ [ "surface_heat", 30, "LIST" ] ] ], + "book_learn": [ [ "recipe_uplift", 9 ] ], + "qualities": [ { "id": "CHEM", "level": 3 } ], + "components": [ [ [ "mutagen", 1 ] ], [ [ "afs_biomaterial_3", 3 ] ], [ [ "slime_scrap", 5 ], [ "afs_biomaterial_5", 1 ] ] ] + }, + { + "type": "recipe", + "result": "iv_mutagen_mastodon", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_MUTAGEN", + "skill_used": "cooking", + "skills_required": [ "firstaid", 6 ], + "difficulty": 10, + "time": 120000, + "tools": [ [ [ "surface_heat", 30, "LIST" ] ] ], + "book_learn": [ [ "recipe_uplift", 9 ] ], + "qualities": [ { "id": "CHEM", "level": 3 } ], + "components": [ + [ [ "mutagen", 3 ] ], + [ [ "afs_biomaterial_3", 3 ] ], + [ [ "mutagen_medical", 1 ], [ "afs_biomaterial_5", 1 ] ], + [ [ "syringe", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "mutagen_migo", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_MUTAGEN", + "skill_used": "cooking", + "skills_required": [ "firstaid", 6 ], + "difficulty": 10, + "time": 120000, + "tools": [ [ [ "surface_heat", 30, "LIST" ] ] ], + "book_learn": [ [ "millyficents_diary", 9 ] ], + "qualities": [ { "id": "CHEM", "level": 3 } ], + "components": [ [ [ "mutagen", 1 ] ], [ [ "afs_biomaterial_3", 3 ] ], [ [ "resin_chunk", 5 ] ] ] + }, + { + "type": "recipe", + "result": "iv_mutagen_migo", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_MUTAGEN", + "skill_used": "cooking", + "skills_required": [ "firstaid", 6 ], + "difficulty": 10, + "time": 120000, + "tools": [ [ [ "surface_heat", 30, "LIST" ] ] ], + "book_learn": [ [ "millyficents_diary", 9 ] ], + "qualities": [ { "id": "CHEM", "level": 3 } ], + "components": [ [ [ "mutagen_migo", 2 ] ], [ [ "afs_biomaterial_1", 4 ] ], [ [ "syringe", 1 ] ] ] + } +]