Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Aftershock] Mastodon Mutation Line and Uplifted SWAT Profession #37660

Merged
merged 45 commits into from
Apr 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
6abee0d
Merge pull request #14 from CleverRaven/master
Maleclypse Mar 27, 2020
ea82db7
Merge pull request #15 from CleverRaven/master
Maleclypse Apr 3, 2020
d4109f9
Mastodon Mutations and Profession
Maleclypse Feb 3, 2020
6bdab95
Update mastodon_mutation.json
Maleclypse Feb 3, 2020
27f959c
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 3, 2020
55eef9f
Update data/mods/Aftershock/player/professions.json
Maleclypse Feb 3, 2020
71b5122
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 3, 2020
114fd80
Update mastodon_mutation.json
Maleclypse Feb 3, 2020
2c2ab42
Mastodon Items
Maleclypse Feb 4, 2020
849cbc6
spacing
Maleclypse Feb 4, 2020
de69329
Fixes, suggestions
Maleclypse Feb 8, 2020
e070311
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 8, 2020
8558b70
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 8, 2020
e68490f
Update data/mods/Aftershock/player/professions.json
Maleclypse Feb 8, 2020
1a3c381
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 8, 2020
2aeba32
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 8, 2020
1aa94f2
Update data/mods/Aftershock/player/professions.json
Maleclypse Feb 8, 2020
887eb5a
remove xl power armor from item groups
Maleclypse Feb 8, 2020
3506e3f
typos and 4th wall changes
Maleclypse Mar 4, 2020
8c45dfa
Update data/mods/Aftershock/player/professions.json
Maleclypse Mar 8, 2020
8c8435f
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Mar 22, 2020
887107d
updating prof and mutations
Maleclypse Mar 22, 2020
005a6ac
biomaterial scrap added, name string convetion for remainder
Maleclypse Apr 3, 2020
8ffaf95
adding mutagens and recipes
Maleclypse Apr 3, 2020
b274a84
Update mutagens.json
Maleclypse Apr 3, 2020
1067c5f
lint
Maleclypse Apr 3, 2020
e56bd17
mutagen recipe books
Maleclypse Apr 4, 2020
533cd66
typo
Maleclypse Apr 4, 2020
d7e5823
extend mutations
Maleclypse Apr 4, 2020
928aadb
Update mastodon_mutation.json
Maleclypse Apr 4, 2020
24770ad
trying to make extends work
Maleclypse Apr 4, 2020
56290fa
trait groups and npc class
Maleclypse Apr 5, 2020
49ed7e4
Update professions.json
Maleclypse Apr 5, 2020
e5e5bdd
linting
Maleclypse Apr 5, 2020
aeb5564
extraneous comma
Maleclypse Apr 5, 2020
bbdc53c
Update npc_classes_mutant.json
Maleclypse Apr 5, 2020
1fdef30
Update trait_groups.json
Maleclypse Apr 5, 2020
9ef1ddc
Merge branch 'master' into AFS-SWATODON-Profession
Maleclypse Apr 12, 2020
7424fdc
fix profession
Maleclypse Apr 13, 2020
366b0fc
Update mastodon_mutation.json
Maleclypse Apr 13, 2020
c4ac802
Delete npc_classes_mutant.json
Maleclypse Apr 13, 2020
c1af1dc
Create npc_classes_mutant.json
Maleclypse Apr 13, 2020
31d8713
Update npc_classes_mutant.json
Maleclypse Apr 13, 2020
634a102
remove trigger happy
Maleclypse Apr 13, 2020
bfec2ea
Update npc_classes_mutant.json
Maleclypse Apr 13, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions data/mods/Aftershock/items/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]
10 changes: 5 additions & 5 deletions data/mods/Aftershock/items/crafting_scrap/abstract_scrap.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -17,31 +17,31 @@
{
"type": "GENERIC",
"abstract": "afs_scrap_2",
"name": "ur-scrap",
"name": { "str": "ur-scrap" },
"copy-from": "afs_scrap_1",
"price": 5000,
"price_postapoc": 10000
},
{
"type": "GENERIC",
"abstract": "afs_scrap_3",
"name": "ur-scrap",
"name": { "str": "ur-scrap" },
"copy-from": "afs_scrap_1",
"price": 5000,
"price_postapoc": 50000
},
{
"type": "GENERIC",
"abstract": "afs_scrap_4",
"name": "ur-scrap",
"name": { "str": "ur-scrap" },
"copy-from": "afs_scrap_1",
"price": 50000,
"price_postapoc": 100000
},
{
"type": "GENERIC",
"abstract": "afs_scrap_5",
"name": "ur-scrap",
"name": { "str": "ur-scrap" },
"copy-from": "afs_scrap_1",
"price": 500000,
"price_postapoc": 1000000
Expand Down
42 changes: 42 additions & 0 deletions data/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
10 changes: 5 additions & 5 deletions data/mods/Aftershock/items/crafting_scrap/circuity_scrap.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@
"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"
},
{
"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"
},
{
"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"
},
{
"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"
},
{
"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"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@
"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"
},
{
"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"
},
{
"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"
},
{
"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"
},
{
"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"
}
Expand Down
6 changes: 3 additions & 3 deletions data/mods/Aftershock/items/crafting_scrap/magnet_scrap.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
"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"
},
{
"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"
},
{
"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"
}
Expand Down
10 changes: 5 additions & 5 deletions data/mods/Aftershock/items/crafting_scrap/material_scrap.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@
"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"
},
{
"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"
},
{
"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"
},
{
"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"
},
{
"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"
}
Expand Down
10 changes: 5 additions & 5 deletions data/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@
"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"
},
{
"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"
},
{
"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"
},
{
"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"
},
{
"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"
}
Expand Down
35 changes: 35 additions & 0 deletions data/mods/Aftershock/items/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
20 changes: 20 additions & 0 deletions data/mods/Aftershock/items/mutagen.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
}
]
Loading