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] forgotten experiment #44709

Merged
merged 40 commits into from
Nov 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
ff64589
[Aftershock] forgotten experiment
LyleSY Oct 8, 2020
2353632
Sadie dialog
LyleSY Oct 8, 2020
90afee6
missing lab assistant mission
LyleSY Oct 8, 2020
8a89cc8
true formatting
LyleSY Oct 8, 2020
50f89b2
stimulation
LyleSY Oct 8, 2020
e8bc7f2
Update data/mods/Aftershock/npcs/classes.json
LyleSY Oct 9, 2020
c7d89eb
duration troubleshooting
LyleSY Oct 9, 2020
04f0009
more duration troubleshooting
LyleSY Oct 10, 2020
2fe10fe
custom location dialog and mission rework
LyleSY Oct 10, 2020
7b36c64
lose_var troubleshooting
LyleSY Oct 10, 2020
83e5c98
location check reformatting
LyleSY Oct 10, 2020
46edfba
Wilhemina and Nicodemus bugfix
LyleSY Oct 12, 2020
341849e
finish fixing Sadie's mission
LyleSY Oct 12, 2020
29e4f64
Cyrus alpha mission fix
LyleSY Oct 13, 2020
173278c
one broken cyborg mission fix
LyleSY Oct 14, 2020
cdeb78d
Sadie INT fix
LyleSY Oct 14, 2020
78156eb
Sadie spawn fix
LyleSY Oct 14, 2020
d1cf22e
Sadie int fix again
LyleSY Oct 18, 2020
b04d610
Sadie spawn troubleshooting more
LyleSY Oct 18, 2020
cba7cc3
More Sadie spawn troubleshooting
LyleSY Oct 18, 2020
ee4bd09
Sadie spawn at regular warehouse
LyleSY Oct 18, 2020
9316589
remove Sadie location dialog
LyleSY Oct 18, 2020
718fdc2
sadie_spawn nested mapgen
LyleSY Oct 27, 2020
b6a1869
stick Sadie in storage
LyleSY Oct 27, 2020
53ff7c4
revert Cyrus mission
LyleSY Oct 27, 2020
b4cc868
revert some more
LyleSY Oct 27, 2020
2b35a27
lint storage, more drugs
LyleSY Oct 27, 2020
77e6dea
Billy heart drop
LyleSY Oct 27, 2020
6ab68f7
Fix Sadie dialog
LyleSY Oct 28, 2020
bf3918f
many Sadie fixes
LyleSY Oct 30, 2020
c3f59c1
free Sadie
LyleSY Oct 30, 2020
c8d61c8
remove extra follow
LyleSY Oct 30, 2020
d5be545
formatting error fix
LyleSY Oct 30, 2020
90eac2c
Travis troubleshooting
LyleSY Oct 30, 2020
7f7716e
Sadie items and start background migration
LyleSY Oct 30, 2020
218e9ed
add Sadie to BG_traits_afs
LyleSY Oct 30, 2020
423d262
add Sadie to BG_BR_tableofcontents_AFS
LyleSY Oct 30, 2020
6f7318b
move Sadie location dialog to BGBR_Sadie
LyleSY Oct 30, 2020
48470fa
finish moving Sadie location dialog
LyleSY Oct 30, 2020
3fad6b4
Mansion fix
LyleSY Oct 30, 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
121 changes: 121 additions & 0 deletions data/mods/Aftershock/maps/mapgen/sadie_large_storage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": "large_storage_units_3",
"weight": 1000,
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
"-------66666666666666666",
"|AAAAA|.................",
"|G 7y................",
"|G 7y................",
"| MM |8................",
"|-----|..........|-----|",
"|C MM7y........y7 MM A|",
"|CMM 7y........y7 A|",
"|C M |8........8| MM A|",
"|-----|..........|-----|",
"|G M 7y........y7 C|",
"|G MM7y........y7MM C|",
"|G MM |8........8| MM C|",
"|-----|..........|-----|",
"|G MM 7y........y7 MM G|",
"|G 7y........y7 G|",
"|G GGG|8........8| MM G|",
"|-----|..........|-----|",
"|G MM 7y........y7 MMA|",
"|G MM 7y........y7MM A|",
"|G MM7y........y7MM G|",
"|MM |8........8| MM M|",
"| MMM |..........|CCCCC|",
"------------------------"
],
"terrain": {
" ": "t_thconc_floor",
"+": "t_door_c",
"-": "t_wall_w",
".": "t_pavement",
"1": "t_window",
"2": "t_sidewalk",
"3": "t_tree_young",
"4": "t_chaingate_l",
"5": "t_wall_wood",
"6": "t_chainfence_h",
"7": "t_door_metal_locked",
"8": "t_gates_mech_control",
"E": "t_dirtfloor",
"r": "t_pavement",
"y": "t_pavement_y",
"|": "t_wall_w"
},
"furniture": {
"A": "f_rack",
"B": "f_toilet",
"C": "f_counter",
"D": "f_sink",
"E": "f_sink",
"F": "f_chair",
"G": "f_locker",
"H": "f_table",
"I": "f_sofa",
"M": [ "f_crate_c", "f_cardboard_box" ]
},
"place_items": [
{ "item": "livingroom", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 50, "repeat": [ 1, 6 ] },
{ "item": "hardware_bulk", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "home_hw", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 5, "repeat": [ 1, 6 ] },
{ "item": "tools_home", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 35, "repeat": [ 1, 6 ] },
{ "item": "tools_construction", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "supplies_electronics", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 10, "repeat": [ 1, 6 ] },
{ "item": "gear_survival", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 5, "repeat": [ 1, 6 ] },
{ "item": "homebooks", "x": [ 1, 5 ], "y": [ 6, 8 ], "chance": 50, "repeat": [ 1, 6 ] },
{ "item": "supplies_fuel", "x": [ 1, 5 ], "y": [ 6, 8 ], "chance": 35, "repeat": [ 1, 6 ] },
{ "item": "bedroom", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 50, "repeat": [ 1, 6 ] },
{ "item": "dresser", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 50, "repeat": [ 1, 6 ] },
{ "item": "mil_surplus", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 35, "repeat": [ 1, 6 ] },
{ "item": "mil_hw", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 6 ] },
{ "item": "mil_armor", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] },
{ "item": "mil_accessories", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] },
{ "item": "weapons", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 35, "repeat": [ 1, 6 ] },
{ "item": "ammo_pistol_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "mags_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "mags_crime", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "homeguns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "mansion_guns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] },
{ "item": "gunmod_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 6 ] },
{ "item": "gear_soldier_sidearm", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] },
{ "item": "softdrugs", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 50, "repeat": [ 1, 6 ] },
{ "item": "harddrugs", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 30, "repeat": [ 1, 6 ] },
{ "item": "gear_medical", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 50, "repeat": [ 1, 6 ] },
{ "item": "drugs_emergency", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 40, "repeat": [ 1, 6 ] },
{ "item": "drugs_pharmacy", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 50, "repeat": [ 1, 6 ] },
{ "item": "drugs_soldier", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "bionics_common", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "dining", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 50, "repeat": [ 1, 6 ] },
{ "item": "kitchen", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 50, "repeat": [ 1, 6 ] },
{ "item": "oven", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 35, "repeat": [ 1, 6 ] },
{ "item": "camping", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "vending_food", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 35, "repeat": [ 1, 6 ] },
{ "item": "vending_drink", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 35, "repeat": [ 1, 6 ] },
{ "item": "cannedfood", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 35, "repeat": [ 1, 6 ] },
{ "item": "snacks", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "pasta", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "snacks_fancy", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 10, "repeat": [ 1, 6 ] },
{ "item": "coffee_shop", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 10, "repeat": [ 1, 6 ] },
{ "item": "alcohol", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 10, "repeat": [ 1, 6 ] },
{ "item": "mil_food", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 5, "repeat": [ 1, 6 ] },
{ "item": "methlab", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 70, "repeat": [ 1, 6 ] },
{ "item": "harddrugs", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 50, "repeat": [ 1, 6 ] },
{ "item": "chem_home", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] },
{ "item": "chem_lab", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 6 ] },
{ "item": "arcade_prizes", "x": [ 18, 22 ], "y": [ 14, 16 ], "chance": 50, "repeat": [ 1, 6 ] },
{ "item": "antique", "x": [ 18, 22 ], "y": [ 14, 16 ], "chance": 35, "repeat": [ 1, 6 ] },
{ "item": "farming_tools", "x": [ 18, 22 ], "y": [ 18, 22 ], "chance": 35, "repeat": [ 1, 6 ] },
{ "item": "farming_seeds", "x": [ 18, 22 ], "y": [ 18, 22 ], "chance": 10, "repeat": [ 1, 6 ] }
],
"place_nested": [ { "chunks": [ [ "Sadie_spawn", 20 ] ], "x": 3, "y": 3 } ]
}
}
]
8 changes: 8 additions & 0 deletions data/mods/Aftershock/maps/nested/sadie_spawn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "Sadie_spawn",
"object": { "mapgensize": [ 1, 1 ], "place_npcs": [ { "class": "sadie", "x": 0, "y": 0 } ] }
}
]
52 changes: 52 additions & 0 deletions data/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
[
{
"id": "BGSS_Sadie_STORY1",
"type": "talk_topic",
"dynamic_line": {
"and": [
{
"at_safe_space": true,
"no": "This might not be a very private place.",
"yes": "This feels like a good place to relax. Want to play doctor with real scalpels?"
LyleSY marked this conversation as resolved.
Show resolved Hide resolved
},
" ",
{
"npc_at_om_location": "field",
"no": "",
"yes": "This place is so boring. We should take people and kill some drugs."
},
{
"npc_at_om_location": "water",
"no": "",
"yes": "Water water everywhere. Let's go skinny dipping. I bet you'll attract some leeches. I need them for something I want to do to you. It'll be so weird."
},
{
"npc_at_om_location": "subterranean",
"no": "",
"yes": "I like it down here. This reminds me of that time I was down in a place like this and someone creeped up behind me and hit me in the back of the head with a shovel. *shiver* It still gives me goosebumps."
},
{
"npc_at_om_location": "forest",
"no": "",
"yes": "I love nature. It smells so good out here, like living things growing and multiplying and dying and returning from the dead with horrifying new powers and trying to slowly rip us apart and eat us. It brings back really happy memories for me."
},
{
"npc_at_om_location": "swamp",
"no": "",
"yes": "I love swampy places like this. The smell of the pussywillows, the sound of the crickets, the giant mutant mosquitoes hungry for our blood. It's like we're in a sexy vampire romance novel."
},
{
"npc_at_om_location": "Lab",
"no": "",
"yes": "What a beautiful facility. I bet they have all kinds of lovely toys to play with. We should kill everyone here and do some creative self-experimentation."
},
{
"npc_at_om_location": "Mansion_Wild",
"no": "",
"yes": "Ooh, it's like a murder mystery here. Are we the murderers, the murdered, or the mystery?"
}
]
},
"responses": [ { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" }, { "text": "<end_talking>", "topic": "TALK_DONE" } ]
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@
"topic": "BGSS_CYBERNINJA_STORY1",
"condition": { "npc_has_trait": "BGSS_CYBERNINJA" },
"switch": true
},
{
"text": "<BGSS_intro_question>",
"topic": "BGSS_Sadie_STORY1",
"condition": { "npc_has_trait": "BGSS_Sadie" },
"switch": true
}
]
}
Expand Down
13 changes: 13 additions & 0 deletions data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json
Original file line number Diff line number Diff line change
Expand Up @@ -238,5 +238,18 @@
"purifiable": false,
"types": [ "BACKGROUND_SURVIVAL_STORY" ],
"flags": [ "BG_SURVIVAL_STORY" ]
},
{
"type": "mutation",
"//": "This is a unique background story trait that should not be given out randomly.",
"id": "BGSS_Sadie",
"name": { "str": "Sadie Story" },
"points": 0,
"description": "This NPC could tell you about how they survived the Cataclysm",
"player_display": false,
"valid": false,
"purifiable": false,
"types": [ "BACKGROUND_SURVIVAL_STORY" ],
"flags": [ "BG_SURVIVAL_STORY" ]
}
]
74 changes: 72 additions & 2 deletions data/mods/Aftershock/npcs/classes.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"class": "whately_cousin",
"attitude": 0,
"mission": 3,
"chat": "TALK_WHATELY_GENERIC1",
"chat": "TALK_WHATELY_1",
"faction": "whately_family",
"gender": "female"
},
Expand All @@ -156,8 +156,78 @@
"class": "whately_cousin",
"attitude": 0,
"mission": 3,
"chat": "TALK_WHATELY_GENERIC1",
"chat": "TALK_WHATELY_1",
"faction": "whately_family",
"gender": "male"
},
{
"type": "npc",
"id": "sadie",
"name_unique": "Sadie",
"name_suffix": "forgotten experiment",
"class": "afs_forgotten_experiment",
"attitude": 0,
"mission": 7,
"chat": "TALK_Sadie_1",
"mission_offered": "MISSION_sadie_heart",
"faction": "no_faction",
"gender": "female"
},
{
"type": "npc_class",
"id": "afs_forgotten_experiment",
"name": "forgotten experiment",
"job_description": "What a magical world to explore…",
"common": false,
"worn_override": "NC_CYBORG_worn",
"carry_override": "NC_DOCTOR_misc",
"weapon_override": "EMPTY_GROUP",
"traits": [
[ "PRETTY", 100 ],
[ "OPTIMISTIC", 100 ],
[ "FORGETFUL", 100 ],
[ "STR_UP_3", 100 ],
[ "THRESH_MEDICAL", 100 ],
[ "CENOBITE", 100 ],
{ "group": "trait_group_medical" },
{
"distribution": [ { "group": "trait_group_medical_nonthres" }, { "group": "trait_group_medical_postthres" } ]
},
[ "BGSS_Sadie", 100 ]
],
"skills": [
{ "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -4 } ] } ] } },
{ "skill": "firstaid", "bonus": { "rng": [ 4, 8 ] } }
],
"bionics": [
{ "id": "bio_ankles", "chance": 5 },
{ "id": "bio_batteries", "chance": 20 },
{ "id": "bio_carbon", "chance": 30 },
{ "id": "bio_claws", "chance": 10 },
{ "id": "bio_noise", "chance": 10 },
{ "id": "bio_power_weakness", "chance": 5 },
{ "id": "bio_itchy", "chance": 15 },
{ "id": "bio_laser", "chance": 10 },
{ "id": "bio_thumbs", "chance": 10 },
{ "id": "bio_spasm", "chance": 10 },
{ "id": "bio_shakes", "chance": 10 },
{ "id": "bio_dex_enhancer", "chance": 20 },
{ "id": "bio_sleepy", "chance": 5 },
{ "id": "bio_heat_absorb", "chance": 20 },
{ "id": "bio_eye_enhancer", "chance": 20 },
{ "id": "bio_pokedeye", "chance": 10 },
{ "id": "bio_hydraulics", "chance": 10 },
{ "id": "bio_painkiller", "chance": 15 },
{ "id": "bio_shock", "chance": 10 },
{ "id": "bio_speed", "chance": 10 },
{ "id": "bio_str_enhancer", "chance": 100 },
{ "id": "bio_armor_head", "chance": 3 },
{ "id": "bio_armor_torso", "chance": 15 },
{ "id": "bio_armor_arms", "chance": 30 },
{ "id": "bio_armor_legs", "chance": 25 },
{ "id": "bio_razors", "chance": 15 },
{ "id": "bio_power_storage", "chance": 100 },
{ "id": "bio_torsionratchet", "chance": 20 }
]
}
]
4 changes: 2 additions & 2 deletions data/mods/Aftershock/npcs/cyrus_whately.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"goal": "MGOAL_FIND_ITEM",
"difficulty": 4,
"value": 0,
"item": "mutagen",
"item": "mutagen_alpha",
"count": 3,
"origins": [ "ORIGIN_SECONDARY" ],
"followup": "MISSION_FRANKENSTEIN_4",
Expand All @@ -175,7 +175,7 @@
"difficulty": 6,
"value": 0,
"item": "bot_broken_cyborg",
"count": 3,
"count": 1,
"origins": [ "ORIGIN_SECONDARY" ],
"followup": "MISSION_FRANKENSTEIN_5",
"dialogue": {
Expand Down
Loading