Skip to content

Commit

Permalink
Initial commit
Browse files Browse the repository at this point in the history
  • Loading branch information
GuardianDll committed Jan 7, 2024
1 parent f255964 commit 11cb640
Show file tree
Hide file tree
Showing 8 changed files with 121 additions and 92 deletions.
126 changes: 39 additions & 87 deletions data/json/itemgroups/science_and_tech.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,35 +264,7 @@
[ "recipe_maiar", 4 ],
[ "recipe_labchem", 6 ],
[ "mutagen", 8 ],
[ "iv_mutagen", 6 ],
[ "iv_mutagen_elfa", 2 ],
[ "iv_mutagen_alpha", 2 ],
[ "iv_mutagen_raptor", 2 ],
[ "iv_mutagen_medical", 2 ],
[ "iv_mutagen_chimera", 2 ],
[ "iv_mutagen_plant", 2 ],
[ "iv_mutagen_insect", 2 ],
[ "iv_mutagen_spider", 2 ],
[ "iv_mutagen_snail", 2 ],
[ "iv_mutagen_batrachian", 2 ],
[ "iv_mutagen_fish", 2 ],
[ "iv_mutagen_slime", 2 ],
[ "iv_mutagen_rat", 2 ],
[ "iv_mutagen_beast", 2 ],
[ "iv_mutagen_cattle", 2 ],
[ "iv_mutagen_cephalopod", 2 ],
[ "iv_mutagen_bird", 2 ],
[ "iv_mutagen_lizard", 2 ],
[ "iv_mutagen_troglobite", 2 ],
[ "iv_mutagen_ursine", 2 ],
[ "iv_mutagen_feline", 2 ],
[ "iv_mutagen_lupine", 2 ],
[ "iv_mutagen_mouse", 2 ],
[ "iv_mutagen_rabbit", 2 ],
[ "iv_mutagen_crustacean", 2 ],
[ "mutagen_chelator", 5 ],
[ "purifier", 3 ],
[ "iv_purifier", 8 ],
{ "group": "mutagenic_primer_box", "prob": 61 },
[ "syringe", 8 ],
{ "item": "bleach", "prob": 20, "charges-min": 1 },
{ "item": "ammonia_liquid", "prob": 50, "charges-min": 6 },
Expand Down Expand Up @@ -335,70 +307,50 @@
[ "mutagen_lupine", 2 ],
[ "mutagen_rabbit", 2 ],
[ "mutagen_crustacean", 2 ],
[ "iv_mutagen", 6 ],
[ "iv_mutagen_elfa", 2 ],
[ "iv_mutagen_alpha", 2 ],
[ "iv_mutagen_raptor", 2 ],
[ "iv_mutagen_medical", 2 ],
[ "iv_mutagen_chimera", 2 ],
[ "iv_mutagen_plant", 2 ],
[ "iv_mutagen_insect", 2 ],
[ "iv_mutagen_spider", 2 ],
[ "iv_mutagen_snail", 2 ],
[ "iv_mutagen_batrachian", 2 ],
[ "iv_mutagen_fish", 2 ],
[ "iv_mutagen_slime", 2 ],
[ "iv_mutagen_rat", 2 ],
[ "iv_mutagen_beast", 2 ],
[ "iv_mutagen_cattle", 2 ],
[ "iv_mutagen_cephalopod", 2 ],
[ "iv_mutagen_bird", 2 ],
[ "iv_mutagen_lizard", 2 ],
[ "iv_mutagen_troglobite", 2 ],
[ "iv_mutagen_ursine", 2 ],
[ "iv_mutagen_feline", 2 ],
[ "iv_mutagen_lupine", 2 ],
[ "iv_mutagen_rabbit", 2 ],
[ "iv_mutagen_crustacean", 2 ],
[ "mutagen_chelator", 5 ],
[ "purifier", 3 ],
[ "iv_purifier", 8 ],
{ "group": "mutagenic_primer_box", "prob": 72 },
[ "syringe", 8 ]
]
},
{
"type": "item_group",
"id": "mut_iv",
"//": "If we ever get themed labs defined by what types of mutagens they worked on this itemgroup may need to be re-evaluated.",
"id": "mutagenic_primer_box",
"container-item": "box_small_plastic",
"subtype": "collection",
"items": [
[ "iv_mutagen", 10 ],
[ "iv_mutagen_elfa", 2 ],
[ "iv_mutagen_alpha", 2 ],
[ "iv_mutagen_raptor", 2 ],
[ "iv_mutagen_medical", 2 ],
[ "iv_mutagen_chimera", 2 ],
[ "iv_mutagen_plant", 2 ],
[ "iv_mutagen_insect", 2 ],
[ "iv_mutagen_spider", 2 ],
[ "iv_mutagen_snail", 2 ],
[ "iv_mutagen_batrachian", 2 ],
[ "iv_mutagen_fish", 2 ],
[ "iv_mutagen_slime", 2 ],
[ "iv_mutagen_rat", 2 ],
[ "iv_mutagen_beast", 2 ],
[ "iv_mutagen_cattle", 2 ],
[ "iv_mutagen_cephalopod", 2 ],
[ "iv_mutagen_bird", 2 ],
[ "iv_mutagen_lizard", 2 ],
[ "iv_mutagen_troglobite", 2 ],
[ "iv_mutagen_ursine", 2 ],
[ "iv_mutagen_feline", 2 ],
[ "iv_mutagen_lupine", 2 ],
[ "iv_mutagen_mouse", 2 ],
[ "iv_mutagen_rabbit", 2 ],
[ "iv_mutagen_crustacean", 2 ],
[ "iv_purifier", 20 ],
[ "syringe", 10 ]
{
"distribution": [
{ "item": "iv_mutagen", "prob": 25, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_elfa", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_alpha", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_raptor", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_medical", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_chimera", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_plant", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_insect", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_spider", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_snail", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_batrachian", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_fish", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_slime", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_rat", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_beast", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_cattle", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_cephalopod", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_bird", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_lizard", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_troglobite", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_ursine", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_feline", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_lupine", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_mouse", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_rabbit", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_mutagen_crustacean", "prob": 2, "count": [ 8, 24 ] },
{ "item": "iv_purifier", "prob": 20, "count": [ 8, 24 ] }
]
},
{ "item": "bubblewrap", "prob": 100, "count": [ 2, 5 ] },
{ "item": "lab_file_mutagen_guide", "prob": 100 },
{ "item": "lab_file_mutation_testing", "prob": 100 }
]
},
{
Expand Down
28 changes: 28 additions & 0 deletions data/json/items/containers/lab.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[
{
"id": "box_small_plastic",
"type": "GENERIC",
"category": "container",
"name": { "str": "secured plastic box", "str_pl": "secured plastic box" },

Check failure on line 6 in data/json/items/containers/lab.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses)

(~[slow] ~[.],starting_items)=> Please use "str_sp" instead of "str" and "str_pl" for text with identical singular and plural forms "type": "GENERIC", "category": "container", "name": { "str": "secured plastic box", "str_pl": "secured plastic box" }, ▲▲▲ "description": "A small, black plastic box with thick walls, with few small latches to hold a cover.", "weight": "715 g",

Check failure on line 6 in data/json/items/containers/lab.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses)

([slow] ~starting_items)=> Please use "str_sp" instead of "str" and "str_pl" for text with identical singular and plural forms "type": "GENERIC", "category": "container", "name": { "str": "secured plastic box", "str_pl": "secured plastic box" }, ▲▲▲ "description": "A small, black plastic box with thick walls, with few small latches to hold a cover.", "weight": "715 g",
"description": "A small, black plastic box with thick walls, with few small latches to hold a cover.",
"weight": "715 g",
"volume": "8100 ml",
"longest_side": "22 cm",
"//": "30 x 20 x 13,5 cm external, 27 x 17 x 9,7 cm internal",
"//2": "max_item_length 100 mm because otherwise test tubes can't fit it.",
"price": 1300,
"price_postapoc": 5,
"material": [ "plastic" ],
"symbol": "#",
"color": "dark_gray",
"pocket_data": [
{
"pocket_type": "CONTAINER",
"rigid": true,
"max_contains_volume": "4450 ml",
"max_contains_weight": "11 kg",
"max_item_length": "100 mm"
}
]
}
]
24 changes: 24 additions & 0 deletions data/json/items/newspaper.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,30 @@
"description": "A sheet of paper bearing an atom-and-flask symbol, filled with incoherent ramblings about alien geometries and how to get to them.",
"snippet_category": "lab_file_portal"
},
{
"type": "GENERIC",
"id": "lab_file_mutagen_guide",
"name": { "str_sp": "production notes" },
"description": "Big pile of documents confirming the level of purity of all ingredients used in making this batch, small card with steps that was performed in making the batch, with signature of every person on each step, and, most importantly, a quality control protocol, that describes different tests, performed on this batch, to ensure quality of… something. Series of checkmarks in table slowly appear and fade around <color_yellow>\"500 units of mutagen per 500 units of primer\"</color> ratio.",
"copy-from": "file"
},
{
"type": "GENERIC",
"id": "lab_file_mutation_testing",
"name": { "str_sp": "production tests" },
"description": "Side document, that descibe performed tests on different subjects.",
"expand_snippets": true,
"variants": [
{
"id": "lab_file_mutation_testing_1",
"name": { "str": "production tests" },

Check failure on line 158 in data/json/items/newspaper.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses)

(~[slow] ~[.],starting_items)=> Cannot autogenerate plural form. Please specify the plural form explicitly using 'str' and 'str_pl', or 'str_sp' if the singular and plural forms are the same. { "id": "lab_file_mutation_testing_1", "name": { "str": "production tests" }, ▲▲▲ "description": "\n\n<mutation_testing>", "append": true,

Check failure on line 158 in data/json/items/newspaper.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses)

([slow] ~starting_items)=> Cannot autogenerate plural form. Please specify the plural form explicitly using 'str' and 'str_pl', or 'str_sp' if the singular and plural forms are the same. { "id": "lab_file_mutation_testing_1", "name": { "str": "production tests" }, ▲▲▲ "description": "\n\n<mutation_testing>", "append": true,
"description": "\n\n<mutation_testing>",
"append": true,
"expand_snippets": true
}
],
"copy-from": "file"
},
{
"type": "GENERIC",
"id": "lab_file_sec",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/lab/lab_floorplan_cross.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@
{
"type": "palette",
"id": "lab_loot_serum_vault",
"mapping": { "r": { "items": [ { "item": "mut_iv", "chance": 50 } ] } },
"mapping": { "r": { "items": [ { "item": "mutagenic_primer_box", "chance": 50 } ] } },
"terrain": { "r": "t_thconc_floor" },
"computers": {
"6": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"failures": [ { "action": "damage" }, { "action": "manhacks" }, { "action": "shutdown" } ]
}
},
"items": { "m": [ { "item": "mut_iv", "chance": 10, "repeat": [ 2, 5 ] } ] },
"items": { "m": [ { "item": "mutagenic_primer_box", "chance": 10 } ] },
"place_loot": [
{ "group": "tools_mutation", "x": [ 3, 5 ], "y": 3, "chance": 70 },
{ "group": "rare_mutation_books", "x": [ 3, 5 ], "y": 4, "chance": 70 }
Expand Down Expand Up @@ -288,7 +288,7 @@
"failures": [ { "action": "damage" }, { "action": "secubots" }, { "action": "shutdown" } ]
}
},
"items": { "m": [ { "item": "mut_iv", "chance": 70 } ] },
"items": { "m": [ { "item": "mutagenic_primer_box", "chance": 70 } ] },
"place_loot": [
{ "group": "tools_mutation", "x": [ 3, 4 ], "y": 3, "chance": 70 },
{ "group": "rare_mutation_books", "x": [ 1, 3 ], "y": 4, "chance": 70 }
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen_palettes/lab/lab_modular_palette.json
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
{ "item": "writing_utensils", "chance": 10, "repeat": [ 1, 2 ] },
{ "item": "office_supplies", "chance": 10 }
],
"k": { "item": "mut_iv", "chance": 5, "repeat": [ 1, 4 ] },
"k": { "item": "mutagenic_primer_box", "chance": 5 },
"l": [
{ "item": "elecsto_persele", "chance": 10, "repeat": [ 1, 3 ] },
{ "item": "livingroom", "chance": 10, "repeat": [ 1, 3 ] }
Expand Down
1 change: 0 additions & 1 deletion data/json/monsterdrops/mutant_experimental.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
{ "group": "lab_files_biology", "prob": 5 }
]
},
{ "group": "mut_iv", "count": [ 3, 15 ] },
{ "item": "jumpsuit" }
]
}
Expand Down
26 changes: 26 additions & 0 deletions data/json/snippets/lab.json
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,32 @@
}
]
},
{
"type": "snippet",
"category": "<mutation_testing>",
"text": [
{
"id": "mutation_testing_1",
"text": "Prepare subject with 800 U mutagen\nApply 500 U primer compound\nObserve for 6 hours\nResults: subject's body rapidly grew feathers across whole body, including hands, arms, armpits, back and neck. Few were grown in different places, including few around subject's eyes, but were safely removed by the subject\nLong term results: subject found themselves able to split their vision."
},
{
"id": "mutation_testing_2",
"text": "Prepare subject with 300 U mutagen\nApply 300 U primer compound\nObserve for 6 hours\nResults: No observable changes. Subject asked about some food.\nLong term results: the size of object's stomach was increased at 50%."
},
{
"id": "mutation_testing_3",
"text": "Prepare subject with 2000 U mutagen\nApply 500 U primer compound\nObserve for 6 hours\nResults: The subject felt a painful headache\nLong-term results: the subject developed a heavy form of psychosis, including heavy hallucinations, delirium, and schizophrenia.  The subject was neutralized in an attempt to pull the weapon from the security guard's holster."
},
{
"id": "mutation_testing_4",
"text": "Prepare subject with 500 U mutagen\nApply 2500 U primer compound\nObserve for 6 hours\nResults: Subject died shortly after injection\nLong term results: N/A."
},
{
"id": "mutation_testing_5",
"text": "Prepare subject with 2500 U mutagen\nApply 500 U primer compound\nObserve for 6 hours\nResults: Subject died after long period of pain\nLong term results: N/A."
}
]
},
{
"type": "snippet",
"category": "lab_notes",
Expand Down

0 comments on commit 11cb640

Please sign in to comment.