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

Add some lab notes, remove snippet references to terrestrial bionics #51954

Merged
merged 11 commits into from
Nov 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 39 additions & 0 deletions data/json/itemgroups/Labs/labs_common.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,45 @@
{ "item": "jar_3l_glass_sealed", "prob": 5, "count": [ 1, 3 ] }
]
},
{
"id": "lab_files_generic",
"//": "A generic group for all not-eoc notes and files to add some random clutter to old/microlabs. Prefer more selective placement.",
"type": "item_group",
"subtype": "distribution",
"items": [
{ "item": "lab_postit_bio", "prob": 3 },
{ "item": "lab_postit_blob", "prob": 3 },
{ "item": "lab_postit_migo", "prob": 3 },
{ "item": "lab_postit_portal", "prob": 3 },
{ "item": "lab_postit_tech", "prob": 3 },
{ "item": "lab_file_bio", "prob": 1 },
{ "item": "lab_file_portal", "prob": 1 },
{ "item": "lab_file_psych", "prob": 1 },
{ "item": "lab_file_sec", "prob": 1 }
]
},
{
"id": "lab_files_biology",
"type": "item_group",
"subtype": "collection",
"items": [
{ "item": "lab_postit_bio", "prob": 50, "count": [ 1, 2 ] },
{ "item": "lab_file_bio", "prob": 33 },
{ "item": "bio_file", "prob": 10 }
]
},
{
"id": "lab_files_psychology",
"type": "item_group",
"subtype": "collection",
"items": [ { "item": "lab_file_psych", "prob": 33 }, { "item": "psych_file", "prob": 10 } ]
},
{
"id": "lab_files_security",
"type": "item_group",
"subtype": "collection",
"items": [ { "item": "lab_file_sec", "prob": 33 }, { "item": "security_file", "prob": 10 } ]
},
{
"id": "ID_supplies",
"type": "item_group",
Expand Down
179 changes: 179 additions & 0 deletions data/json/items/newspaper.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,185 @@
"copy-from": "survnote",
"snippet_category": "mutant_kid_boss"
},
{
"type": "GENERIC",
"id": "lab_postit_bio",
"copy-from": "survnote",
"name": { "str": "post-it note" },
"description": "A bright yellow post-it note.",
"snippet_category": "lab_postit_bio"
},
{
"type": "GENERIC",
"id": "lab_postit_blob",
"copy-from": "lab_postit_bio",
"name": { "str": "post-it note" },
"snippet_category": "lab_postit_blob"
},
{
"type": "GENERIC",
"id": "lab_postit_migo",
"copy-from": "lab_postit_bio",
"name": { "str": "post-it note" },
"snippet_category": "lab_postit_migo"
},
{
"type": "GENERIC",
"id": "lab_postit_portal",
"copy-from": "lab_postit_bio",
"name": { "str": "post-it note" },
"snippet_category": "lab_postit_portal"
},
{
"type": "GENERIC",
"id": "lab_postit_tech",
"copy-from": "lab_postit_bio",
"name": { "str": "post-it note" },
"snippet_category": "lab_postit_tech"
},
{
"type": "GENERIC",
"id": "lab_file_bio",
"name": { "str": "biology protocol" },
"copy-from": "file",
"description": "A sheet of paper adorned with an atom-and-flask symbol, detailing some questionable biological research.",
"snippet_category": "lab_file_bio"
},
{
"type": "GENERIC",
"id": "lab_file_psych",
"name": { "str": "psychotherapy protocol" },
"copy-from": "file",
"description": "A sheet of paper bearing an atom-and-cross symbol, pertaining to the mental wellbeing of science staff",
"snippet_category": "lab_file_psych"
},
{
"type": "GENERIC",
"id": "lab_file_portal",
"name": { "str": "metatopography protocol" },
"copy-from": "file",
"description": "A sheet of paper bearing the 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_sec",
"name": { "str": "security protocol" },
"copy-from": "file",
"description": "A sheet of paper bearing an atom-and-rifle symbol, detailing some very particular security protocols.",
"snippet_category": "lab_file_security"
},
{
"type": "GENERIC",
"id": "bio_file",
"name": { "str": "lab report (biology)", "str_pl": "lab reports (biology)" },
"//": "Low-level animal studies, long-form testing logs - naming scheme compound/subject species-test no",
"conditional_names": [
{
"type": "SNIPPET_ID",
"condition": "log_mutagen_animal",
"value": "test_1",
"name": { "str_sp": "Report PE012/08-178" }
},
{
"type": "SNIPPET_ID",
"condition": "log_mutagen_animal",
"value": "test_2",
"name": { "str_sp": "Report PE027/01-081" }
},
{
"type": "SNIPPET_ID",
"condition": "log_mutagen_animal",
"value": "test_3",
"name": { "str_sp": "Report PE031/21-003" }
},
{
"type": "SNIPPET_ID",
"condition": "log_mutagen_animal",
"value": "test_4",
"name": { "str_sp": "Report PE065/04-001" }
}
],
"description": "A manila folder with some top secret test data. Most of it is unintelligible without knowing the jargon, and the contents have obviously suffered from the chaos in this place, but there are some intact pages you can make sense of.",
"copy-from": "file",
"use_action": {
"type": "effect_on_conditions",
"description": "Activate to read the file",
"effect_on_conditions": [
{
"id": "EOC_LAB_FILE_BIO",
"effect": [ { "u_message": "log_mutagen_animal", "snippet": true, "same_snippet": true, "popup": true } ]
}
]
}
},
{
"type": "GENERIC",
"id": "psych_file",
"//": "Session logs and similar, naming scheme department code-ID-session number",
"name": { "str": "lab report (psychology)", "str_pl": "lab reports (psychology)" },
"conditional_names": [
{ "type": "SNIPPET_ID", "condition": "log_psych", "value": "dream_1", "name": { "str_sp": "Session S-3397-5" } },
{ "type": "SNIPPET_ID", "condition": "log_psych", "value": "dream_2", "name": { "str_sp": "Session T-1215-4" } },
{ "type": "SNIPPET_ID", "condition": "log_psych", "value": "dream_3", "name": { "str_sp": "Scrawled note" } }
],
"description": "A folder full of what appear to be transcripts of confidential psychotherapy sessions. Most of it is rather trivial, but certain passages catch your eye…",
"copy-from": "file",
"use_action": {
"type": "effect_on_conditions",
"description": "Activate to read the file",
"effect_on_conditions": [
{
"id": "EOC_LAB_FILE_PSY",
"effect": [ { "u_message": "log_psych", "snippet": true, "same_snippet": true, "popup": true } ]
}
]
}
},
{
"type": "GENERIC",
"id": "security_file",
"//": "Interrogation and surveillance logs, naming scheme facility/incident-material nr",
"name": { "str": "lab report (security)", "str_pl": "lab reports (security)" },
"conditional_names": [
{
"type": "SNIPPET_ID",
"condition": "log_sec",
"value": "interview_1",
"name": { "str_sp": "Personnel Debrief X10/RT338-8" }
},
{
"type": "SNIPPET_ID",
"condition": "log_sec",
"value": "interview_2",
"name": { "str_sp": "Interview Log X33/UE612-1" }
},
{
"type": "SNIPPET_ID",
"condition": "log_sec",
"value": "surveillance_1",
"name": { "str_sp": "Supplementary Material X12/ES081-4" }
},
{
"type": "SNIPPET_ID",
"condition": "log_sec",
"value": "surveillance_2",
"name": { "str_sp": "Observation Intercept XA61/RT338-3" }
}
],
"description": "A manila folder bearing an atom-and-rifle insignia. Most of it is concerned with shipping logs and personnel rotations, but there is a single page that feels out of place.",
"copy-from": "file",
"use_action": {
"type": "effect_on_conditions",
"description": "Activate to read the file",
"effect_on_conditions": [
{
"id": "EOC_LAB_FILE_SEC",
"effect": [ { "u_message": "log_sec", "snippet": true, "same_snippet": true, "popup": true } ]
}
]
}
},
{
"type": "GENERIC",
"id": "character_sheet",
Expand Down
15 changes: 12 additions & 3 deletions data/json/mapgen_palettes/lab/lab_modular_palette.json
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@
"items": {
"3": { "item": "vending_food", "chance": 90 },
"4": { "item": "vending_drink", "chance": 90 },
"P": { "item": "lab_files_security", "chance": 50 },
"U": [
{ "item": "home_hw", "chance": 10, "repeat": [ 1, 2 ] },
{ "item": "drugs_emergency", "chance": 30, "repeat": [ 1, 2 ] },
Expand Down Expand Up @@ -397,7 +398,11 @@
{ "item": "supplies_reagents_lab", "chance": 30 },
{ "item": "chem_lab", "chance": 40, "repeat": [ 1, 2 ] }
],
"r": [ { "item": "office_mess", "chance": 5 }, { "item": "office_supplies", "chance": 25 } ],
"r": [
{ "item": "office_mess", "chance": 5 },
{ "item": "office_supplies", "chance": 25 },
{ "item": "lab_files_biology", "chance": 10 }
],
"s": [ { "item": "consumer_electronics", "chance": 10 } ],
"w": [
{ "item": "chem_lab", "chance": 20 },
Expand Down Expand Up @@ -431,7 +436,7 @@
{ "item": "tools_mutation", "chance": 10, "repeat": [ 1, 2 ] },
{ "item": "cleaning", "chance": 10, "repeat": [ 1, 2 ] }
],
"P": { "item": "office_paper", "chance": 100 },
"P": [ { "item": "office_paper", "chance": 100 }, { "item": "lab_files_biology", "chance": 50 } ],
"R": [
{ "item": "lab_bookshelves", "chance": 30, "repeat": [ 1, 2 ] },
{ "item": "common_mutation_books", "chance": 20 },
Expand Down Expand Up @@ -513,7 +518,11 @@
{ "item": "supplies_reagents_lab", "chance": 30 },
{ "item": "chem_lab", "chance": 40, "repeat": [ 1, 2 ] }
],
"r": [ { "item": "office_mess", "chance": 5 }, { "item": "office_supplies", "chance": 25 } ],
"r": [
{ "item": "office_mess", "chance": 5 },
{ "item": "office_supplies", "chance": 25 },
{ "item": "lab_files_psychology", "chance": 10 }
],
"s": [ { "item": "consumer_electronics", "chance": 10 } ],
"w": [
{ "item": "chem_lab", "chance": 20 },
Expand Down
3 changes: 2 additions & 1 deletion data/json/mapgen_palettes/microlab.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@
"c": [
{ "item": "tools_science", "chance": 30, "repeat": [ 1, 3 ] },
{ "item": "supplies_reagents_lab", "chance": 70, "repeat": [ 1, 3 ] },
{ "item": "supplies_samples_lab", "chance": 10, "repeat": [ 1, 2 ] }
{ "item": "supplies_samples_lab", "chance": 10, "repeat": [ 1, 2 ] },
{ "item": "lab_files_generic", "chance": 5 }
],
"R": [
{ "item": "tools_robotics", "chance": 20, "repeat": [ 1, 3 ] },
Expand Down
3 changes: 2 additions & 1 deletion data/json/monsterdrops/mutant_experimental.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
{ "item": "recipe_labchem", "prob": 10 },
{ "item": "recipe_maiar", "prob": 10 },
{ "item": "recipe_medicalmut", "prob": 5 },
{ "item": "recipe_raptor", "prob": 5 }
{ "item": "recipe_raptor", "prob": 5 },
{ "group": "lab_files_biology", "prob": 5 }
]
},
{ "group": "mut_iv", "count": [ 3, 15 ] },
Expand Down
6 changes: 4 additions & 2 deletions data/json/monsterdrops/zombie_lab.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
{ "group": "electronics", "prob": 40 },
{ "group": "radio", "prob": 15 },
{ "group": "textbooks", "prob": 25 },
{ "group": "autodoc_installation_programs", "prob": 5 }
{ "group": "autodoc_installation_programs", "prob": 5 },
{ "group": "lab_files_generic", "prob": 15 }
]
},
{ "group": "wallets_science", "damage": [ 1, 4 ], "prob": 5 }
Expand Down Expand Up @@ -52,7 +53,8 @@
{ "group": "cop_gear", "prob": 50, "damage": [ 2, 5 ], "count": [ 1, 5 ] },
{ "group": "security_torso", "prob": 80, "damage": [ 2, 5 ], "count": [ 1, 6 ] },
{ "group": "cop_weapons", "prob": 50, "damage": [ 2, 5 ], "count": [ 2, 4 ] },
{ "item": "id_science_security_black" }
{ "item": "id_science_security_black" },
{ "group": "lab_files_security" }
]
},
{
Expand Down
Loading