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] Frankenstein NPCs #37908

Merged
merged 87 commits into from
Aug 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
0c958d2
Frankenstein recipe, class, item, book.
Maleclypse Feb 11, 2020
6abee0d
Merge pull request #14 from CleverRaven/master
Maleclypse Mar 27, 2020
ea82db7
Merge pull request #15 from CleverRaven/master
Maleclypse Apr 3, 2020
76baf49
Update frankenstein_recipes.json
Maleclypse Apr 13, 2020
2c85d39
Merge pull request #16 from CleverRaven/master
Maleclypse Apr 14, 2020
8d986f1
Merge pull request #17 from CleverRaven/master
Maleclypse Apr 23, 2020
ce276d2
Merge pull request #19 from CleverRaven/master
Maleclypse Apr 28, 2020
2010751
Merge branch 'master' into Brain-Jar-NPCs
Maleclypse May 3, 2020
27a08a9
Merge pull request #20 from CleverRaven/master
Maleclypse May 5, 2020
94cbba3
Update whately_dialogue.json
Maleclypse May 9, 2020
dff66be
Whately Cousins
Maleclypse May 9, 2020
91136ae
fixes
Maleclypse May 9, 2020
323e879
Update classes.json
Maleclypse May 9, 2020
d807c1f
fixes
Maleclypse May 10, 2020
25f247a
Update classes.json
Maleclypse May 10, 2020
9f06fdb
needs whately lmoe and whately cousin nest
Maleclypse May 10, 2020
3adb592
cousin chunks placed
Maleclypse May 10, 2020
6262f34
Update whately_dialogue.json
Maleclypse May 11, 2020
111e62c
updates LMOE and quests
Maleclypse May 30, 2020
c74dd33
Update whately_lmoe.json
Maleclypse Jun 4, 2020
03f616b
dialogue chicanery
Maleclypse Jun 4, 2020
3558e43
Merge pull request #21 from CleverRaven/master
Maleclypse Jun 20, 2020
3887691
Update whately_dialogue.json
Maleclypse Jun 28, 2020
dd691f5
add whately turrets
Maleclypse Jul 7, 2020
4e74282
Merge branch 'master' into Brain-Jar-NPCs
Maleclypse Jul 7, 2020
cd2ab86
update fun to appropriate for creating abominations
Maleclypse Jul 7, 2020
d4b190e
chemistry and linting
Maleclypse Jul 8, 2020
209db1b
terrains and fixes
Maleclypse Jul 8, 2020
5522e2f
Update whately_dialogue.json
Maleclypse Jul 8, 2020
f279811
wooden floor with lighting terrain
Maleclypse Jul 8, 2020
8c22e9d
Update terrain.json
Maleclypse Jul 8, 2020
2184b60
corrections
Maleclypse Jul 8, 2020
9d8b460
need to make background revival traits from the trait group and then …
Maleclypse Jul 9, 2020
b9ae900
Update BG_tableofcontents_AFS.JSON
Maleclypse Jul 10, 2020
51e09f8
fixes
Maleclypse Jul 10, 2020
d8956b9
All hail Wapcaplet! fixing background traits
Maleclypse Jul 12, 2020
1df56fb
broken stuff
Maleclypse Jul 12, 2020
3cfcb73
linting and nerf cargo trough
Maleclypse Jul 12, 2020
cbbe852
move effect out of update magpen
Maleclypse Jul 13, 2020
e97a16b
Whately family BG and BG Revival traits
Maleclypse Jul 14, 2020
2ba8466
Linting
Maleclypse Jul 14, 2020
df296b9
Update classes.json
Maleclypse Jul 14, 2020
a1fb41f
Update whately_lmoe.json
Maleclypse Jul 14, 2020
d492872
Merge pull request #22 from CleverRaven/master
Maleclypse Jul 15, 2020
1bbd5c0
Merge branch 'master' into Brain-Jar-NPCs
Maleclypse Jul 15, 2020
b513073
cyrus questline need to place npcs in whately bunker
Maleclypse Jul 16, 2020
4c5653a
comma missing
Maleclypse Jul 16, 2020
286aebe
Update cyrus_whately.json
Maleclypse Jul 17, 2020
1ec4806
background story and itemgroup spawn
Maleclypse Jul 17, 2020
12da5c1
Create BGRS_mi-go_1.json
Maleclypse Jul 17, 2020
5647a7d
Update bionics_groups.json
Maleclypse Jul 17, 2020
d2b7f72
reanimation backgrounds
Maleclypse Jul 19, 2020
e6e040f
schizo revivification stories
Maleclypse Jul 19, 2020
4190e7b
linting
Maleclypse Jul 19, 2020
b983fce
final backgrounds
Maleclypse Jul 19, 2020
88b1ba9
npc spawns
Maleclypse Jul 19, 2020
fe6db27
linting
Maleclypse Jul 19, 2020
4a7f414
fixes
Maleclypse Jul 20, 2020
7d2ddc8
more fixes
Maleclypse Jul 20, 2020
a735bee
Update whately_lmoe.json
Maleclypse Jul 20, 2020
484f718
Update cyrus_whately.json
Maleclypse Jul 25, 2020
1c8e95f
Update milly_whately_dialogue.json
Maleclypse Jul 26, 2020
faaaa6c
Update cyrus_whately.json
Maleclypse Jul 26, 2020
792b52a
Update milly_whately_dialogue.json
Maleclypse Jul 26, 2020
6da125b
Update milly_whately_dialogue.json
Maleclypse Jul 26, 2020
c4f82c4
Update milly_whately_dialogue.json
Maleclypse Jul 26, 2020
103f5f0
Update milly_whately_dialogue.json
Maleclypse Jul 26, 2020
a5ac2cd
Update milly_whately_dialogue.json
Maleclypse Jul 26, 2020
9d320e1
Update milly_whately_dialogue.json
Maleclypse Jul 28, 2020
ec41667
Update milly_whately_dialogue.json
Maleclypse Jul 28, 2020
73a51fb
CI build fix
Maleclypse Jul 28, 2020
729c7fe
Revert "CI build fix"
Maleclypse Jul 28, 2020
21482dc
Update milly_whately_dialogue.json
Maleclypse Jul 28, 2020
6e75219
Update milly_whately_dialogue.json
Maleclypse Jul 29, 2020
674d315
Update milly_whately_dialogue.json
Maleclypse Jul 29, 2020
c0ab689
Update milly_whately_dialogue.json
Maleclypse Jul 29, 2020
9c99547
Update milly_whately_dialogue.json
Maleclypse Jul 29, 2020
3f24b79
spacing fixes
Maleclypse Jul 30, 2020
52a3f08
Update BGRS_dreamer.json
Maleclypse Jul 30, 2020
8ef6d65
Update cyrus_whately.json
Maleclypse Jul 30, 2020
e57509a
Update cyrus_whately.json
Maleclypse Jul 30, 2020
db5806f
Update cyrus_whately.json
Maleclypse Jul 31, 2020
1c91ab2
Update frankenstein_items.json
Maleclypse Jul 31, 2020
61b8f20
fixes and backgrounds
Maleclypse Aug 1, 2020
06d2a92
a linting we will go
Maleclypse Aug 1, 2020
f9d76cb
Apply suggestions from code review
ZhilkinSerg Aug 3, 2020
b9584bf
Merge branch 'master' into Brain-Jar-NPCs
ZhilkinSerg Aug 3, 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
6 changes: 4 additions & 2 deletions data/mods/Aftershock/itemgroups/bionics_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
[ "afs_bio_linguistic_coprocessor", 10 ],
[ "afs_bio_dopamine_stimulators", 10 ],
[ "afs_bio_neurosoft_aeronautics", 5 ],
[ "afs_bio_skullgun", 5 ],
[ "bio_blaster", 5 ]
]
},
Expand All @@ -20,7 +21,7 @@
{
"id": "bionics_mil",
"type": "item_group",
"items": [ [ "bio_blaster", 5 ], [ "afs_bio_neurosoft_aeronautics", 10 ] ]
"items": [ [ "bio_blaster", 5 ], [ "afs_bio_neurosoft_aeronautics", 10 ], [ "afs_bio_skullgun", 2 ] ]
},
{
"id": "bionics_sci",
Expand All @@ -35,7 +36,8 @@
[ "afs_bio_wind_turbine", 10 ],
[ "afs_bio_missiles", 10 ],
[ "afs_bio_neurosoft_aeronautics", 10 ],
[ "afs_bio_dopamine_stimulators", 10 ]
[ "afs_bio_dopamine_stimulators", 10 ],
[ "afs_bio_skullgun", 2 ]
]
},
{
Expand Down
26 changes: 23 additions & 3 deletions data/mods/Aftershock/items/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,33 @@
"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": "cyrus'_notes",
"type": "BOOK",
"name": { "str": "Cyrus Whateley's Notes on Repurposing mi-go victims", "str_pl": "copies of Cyrus Whateley's Notes" },
"description": "A folio of notes written by a madman. They seem to suggestion ways to re-animate the dead and create various affronts to the natural order.",
"weight": "2063 g",
"volume": "2 L",
"price": 929200,
"bashing": 8,
"material": [ "paper" ],
"symbol": "?",
"looks_like": "adv_chemistry",
"color": "light_green",
"skill": "firstaid",
"required_level": 8,
"max_level": 9,
"intelligence": 13,
"fun": -3,
"time": "50 m"
},
{
"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",
"skill": "chemistry",
"required_level": 9,
"max_level": 10
},
Expand All @@ -152,11 +172,11 @@
"symbol": "?",
"looks_like": "ZSG",
"color": "cyan",
"skill": "cooking",
"skill": "chemistry",
"required_level": 10,
"max_level": 10,
"intelligence": 16,
"time": "15 m",
"time": "35 m",
"fun": -3
}
]
23 changes: 23 additions & 0 deletions data/mods/Aftershock/items/frankenstein_items.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[
{
"id": "inactive_frankenstein",
"type": "TOOL",
"name": "inactive frankenstein",
"description": "This stitched together abomination in human form lies still and waiting for you to give it the spark of life. In all likelihood you are the monster. ",
"weight": "68 kg",
"volume": "62 L",
"price": 600000,
"to_hit": -3,
"bashing": 8,
"material": "flesh",
"symbol": ";",
"color": "green",
"use_action": {
"type": "place_npc",
"npc_class_id": "frankenstein",
"summon_msg": "It's alive!",
"place_randomly": false,
"moves": 50
}
}
]
35 changes: 30 additions & 5 deletions data/mods/Aftershock/maps/mapgen/millyficent_lab.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"om_terrain": [ "mortuary_2story" ],
"weight": 100,
"object": {
"faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
"fill_ter": "t_floor",
"rows": [
"..,,,,,...uuuu...,,,,,..",
Expand Down Expand Up @@ -95,6 +96,7 @@
"om_terrain": [ "mortuary_basement" ],
"weight": 200,
"object": {
"faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
"rotation": [ 0, 3 ],
"fill_ter": "t_rock",
"rows": [
Expand Down Expand Up @@ -151,7 +153,7 @@
"T": "t_linoleum_white",
"8": "t_console_broken",
"W": "t_water_dispenser",
"*": "t_utility_light"
"*": "t_thconc_floor_olight"
},
"liquids": { "E": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
"furniture": {
Expand Down Expand Up @@ -200,6 +202,7 @@
"method": "json",
"om_terrain": [ "mortuary_2story_second" ],
"object": {
"faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
"fill_ter": "t_floor",
"rows": [
"________________________",
Expand All @@ -217,12 +220,12 @@
"__||wwww||%%%%||wwww||__",
"__wZZil.b|%%%%|8....1|__",
"|||ZZ..cb|%%%%|F.....w__",
"|&|A....b|%%%%|e.....|__",
"|%+......+%%%%m.....1|__",
"|&|A.*..b|%%%%|e.....|__",
"|%+......+%%%%m..*..1|__",
"|S|D ll P|%%%%|E.....|__",
"||||||||||:++:|h.....|__",
"__|BB>CoC|1..t|a....1|__",
"__|B..*..+.*st|o.....w__",
"__|B..*..+.*st|o.*...w__",
"__|TBBfiB|1..t|......|__",
"__||||||||||||||w||w||__",
"________________________"
Expand All @@ -241,7 +244,7 @@
"m": "t_door_metal_c",
"o": "t_centrifuge",
"x": "t_console_broken",
"*": "t_utility_light",
"*": "t_floor_olight",
"w": "t_window_bars_curtains",
">": "t_wood_stairs_down",
"_": "t_open_air"
Expand Down Expand Up @@ -282,6 +285,16 @@
"v": "f_ventilator",
"Z": "f_bed"
},
"items": {
"U": [
{ "item": "cleaning", "chance": 30 },
{ "item": "supplies_reagents_lab", "chance": 10 },
{ "item": "home_hw", "chance": 50 },
{ "item": "supplies_electronics", "chance": 50 }
],
"B": [ { "item": "exotic_books", "chance": 70 } ],
"T": [ { "item": "SUS_office_filing_cabinet", "chance": 70 } ]
},
"place_npcs": [ { "class": "millyficent_whately", "x": 17, "y": 14 } ]
}
},
Expand Down Expand Up @@ -333,5 +346,17 @@
}
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "whately_cousin_update",
"object": { "mapgensize": [ 1, 1 ], "place_npcs": [ { "class": "whately_cousin", "x": 0, "y": 0 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "whately_bioturret_update",
"object": { "mapgensize": [ 1, 1 ], "place_monster": [ { "monster": "mon_migoturret_whately", "x": 0, "y": 0 } ] }
}
]
Loading