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 PrepNet Phyle Faction, mobs, locations #35322

Merged
merged 43 commits into from
Nov 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
846a688
Merge pull request #1 from CleverRaven/master
Maleclypse Sep 6, 2019
d195e49
Merge pull request #2 from CleverRaven/master
Maleclypse Sep 20, 2019
bd7e561
Merge pull request #4 from CleverRaven/master
Maleclypse Oct 16, 2019
e633a9e
Readme update and Cyber Mastiff's added
Maleclypse Oct 31, 2019
8559fd0
Update afs_harvest.json
Maleclypse Oct 31, 2019
228e967
Update README.md
Maleclypse Oct 31, 2019
2ffb04f
Create prepnet_orchard.json
Maleclypse Oct 31, 2019
02d3b24
fencing, monster groups
Maleclypse Oct 31, 2019
5fb0ac5
Update afs_monster_groups.json
Maleclypse Oct 31, 2019
8550354
Create afs_factions.json
Maleclypse Oct 31, 2019
b99b741
classes and npc file
Maleclypse Nov 2, 2019
00dcf07
Quests, dialogue, item groups
Maleclypse Nov 2, 2019
a08cfe8
Linting and edits
Maleclypse Nov 2, 2019
e4c6acc
Prepet Phyle AFS debug
Maleclypse Nov 5, 2019
ad9a243
Update afs_classes.json
Maleclypse Nov 5, 2019
e77fca2
Update afs_classes.json
Maleclypse Nov 5, 2019
82241b2
Update prepnet_orchard.json
Maleclypse Nov 5, 2019
ae5bd74
factions and overmap
Maleclypse Nov 7, 2019
058153a
Update afs_overmap_terrain.json
Maleclypse Nov 8, 2019
99d39f3
Second door and coin item
Maleclypse Nov 8, 2019
d7b2fa4
atomic butter churn item
Maleclypse Nov 8, 2019
fcbbe2e
atomic churn lives
Maleclypse Nov 8, 2019
916f6ff
Bugfixes
Maleclypse Nov 14, 2019
27f7bae
add tool quality, fix burnt_out bionic quest
Maleclypse Nov 14, 2019
212ed81
Update afs_tool_quality.json
Maleclypse Nov 14, 2019
0229507
Update afs_PrepPhyle_mobs.json
Maleclypse Nov 15, 2019
b57c155
Update afs_monster_faction.json
Maleclypse Nov 15, 2019
cd6c3cc
Update data/mods/Aftershock/npcs/afs_prepnet_dialogue.json
Maleclypse Nov 15, 2019
382cd73
Update data/mods/Aftershock/npcs/afs_prepnet_dialogue.json
Maleclypse Nov 15, 2019
a63ee56
Update data/mods/Aftershock/npcs/afs_prepnet_dialogue.json
Maleclypse Nov 15, 2019
ae875bd
Update afs_prepnet_dialogue.json
Maleclypse Nov 15, 2019
355ce6c
Update afs_prepnet_dialogue.json
Maleclypse Nov 15, 2019
5fdf26c
Update afs_classes.json
Maleclypse Nov 16, 2019
5bad6d8
Update afs_monster_faction.json
Maleclypse Nov 16, 2019
2a80602
Update afs_monster_faction.json
Maleclypse Nov 16, 2019
2dfb8c2
Update afs_factions.json
Maleclypse Nov 16, 2019
a213568
Update afs_factions.json
Maleclypse Nov 16, 2019
7f8d504
Update afs_monster_faction.json
Maleclypse Nov 16, 2019
f3fb67f
Update afs_monster_faction.json
Maleclypse Nov 18, 2019
1034adf
Update prepnet_orchard.json
Maleclypse Nov 19, 2019
4e5bb71
Create afs_mutations.json
Maleclypse Nov 19, 2019
b82c007
Update afs_prepnet_dialogue.json
Maleclypse Nov 19, 2019
b358ae2
shopkeeping and pig removal
Maleclypse Nov 19, 2019
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: 5 additions & 1 deletion data/mods/Aftershock/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,8 @@ Contains json data for all recipes, sorted by category or niche.

### vehicles

Contains json data for vehicles, vehicle parts, and vehicle spawn groups.
Contains json data for vehicles, vehicle parts, and vehicle spawn groups.

### npcs

Contains json data for npcs, factions, and design document for any new factions, specific new faction PrepPhyle. Bionic Preppers living simple farming life with bionic upgrades, prefer to upgrade animals instead of relying on robots.
35 changes: 35 additions & 0 deletions data/mods/Aftershock/items/afs__items.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@
"flags": "TRADER_AVOID",
"qualities": [ [ "SAW_M_FINE", 1 ], [ "SCREW_FINE", 1 ], [ "CUT_FINE", 2 ] ]
},
{
"type": "GENERIC",
"id": "crypto_coin",
"name": "Crypto coins",
"description": "PrepNet had been heavily involved in avoiding taxes by using untraceable internet currencies. If this movement had grown it could have crippled the US tax base but the cataclysm happened first. These are physical coins with random numbers sequences embossed on them.",
"price": 12000,
"price_postapoc": 15000,
"//": "The coins would be worthless but the PrepNet Phyle still retains some manufacturing capacity",
"weight": "1 g",
"to_hit": -3,
"color": "cyan",
"symbol": "$",
"material": [ "plastic" ]
},
{
"id": "afs_basin",
"type": "CONTAINER",
Expand Down Expand Up @@ -137,5 +151,26 @@
"material": [ "steel", "lead" ],
"symbol": "0",
"color": "yellow"
},
{
"id": "atomic_butterchurn",
"type": "GENERIC",
"category": "tools",
"name": "folded atomic butter churn",
"description": "The Rivtech Churninator 4000, the only churn to be banned by 13 religious sects. The legs are currently folded up for travel. Unlike a standard churn that requires cream separated from raw milk this churn requires only raw milk, salt and a healthy respect for glowing objects.",
"weight": "6464 g",
"volume": "11356 ml",
"price": 5000,
"price_postapoc": 45000,
"looks_like": [ "still" ],
"symbol": "u",
"color": "light_green",
"use_action": { "type": "deploy_furn", "furn_type": "f_atomic_butter_churn" },
"qualities": [ [ "CONTAIN", 1 ], [ "CHURN", 2 ] ],
"to_hit": -2,
"bashing": 5,
"material": [ "plastic", "steel" ],
"//": "I figured bionic preppers would have a sci-fi solution to some low tech problems.",
"flags": [ "LEAK_DAM", "RADIOACTIVE", "DURABLE_MELEE" ]
}
]
37 changes: 37 additions & 0 deletions data/mods/Aftershock/items/afs_furniture.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[
{
"type": "furniture",
"id": "f_atomic_butter_churn",
"name": "atomic butter churn on a stand",
"description": "The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready to add raw milk and salt. It will churn turn the earth is a cinder.",
"symbol": "H",
"color": "light_green",
"crafting_pseudo_item": "atomic_butter_churn",
"move_cost_mod": -1,
"coverage": 70,
"required_str": -1,
"flags": [ "NOITEM", "SEALED", "ALLOW_FIELD_EFFECT", "TRANSPARENT", "FLAMMABLE", "CONTAINER", "LIQUIDCONT" ],
"examine_action": "keg",
"keg_capacity": 45,
"deconstruct": {
"items": [
{ "item": "plastic_chunk", "count": 10 },
{ "item": "water_faucet", "count": 1 },
{ "item": "sheet_metal_small", "count": [ 12, 20 ] },
{ "item": "scrap", "count": [ 5, 10 ] }
]
},
"bash": {
"str_min": 12,
"str_max": 50,
"sound": "smash!",
"sound_fail": "whump.",
"items": [
{ "item": "plastic_chunk", "count": [ 6, 8 ] },
{ "item": "water_faucet", "prob": 50 },
{ "item": "sheet_metal_small", "count": [ 6, 12 ] },
{ "item": "scrap", "count": [ 10, 20 ] }
]
}
}
]
57 changes: 57 additions & 0 deletions data/mods/Aftershock/items/afs_item_groups.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
[
{
"type": "item_group",
"id": "afs_gardener_worn",
"subtype": "collection",
"entries": [
{ "item": "boots_combat" },
{ "item": "briefs" },
{ "item": "socks" },
{ "item": "polo_shirt" },
{ "item": "pants_cargo" },
{ "item": "kevlar" },
{ "item": "leather_pouch" },
{ "item": "balclava", "chance": 75 },
{ "item": "bootsheath" }
]
},
{
"type": "item_group",
"id": "afs_gardener_carried",
"subtype": "collection",
"entries": [ { "group": "hardware", "count": [ 1, 2 ] }, { "group": "snacks", "repeat": [ 1, 3 ] } ]
},
{
"type": "item_group",
"id": "afs_gardener_wield",
"subtype": "collection",
"entries": [ { "item": "machete" } ]
},
{
"type": "item_group",
"id": "afs_gardener_misc",
"subtype": "collection",
"items": [
{ "item": "RobofacCoin", "count-min": 5, "count-max": 30, "prob": 30 },
{ "group": "forage_spring", "count-min": 10, "count-max": 30, "prob": 30 },
{ "group": "fresh_produce", "prob": 80, "count": [ 4, 8 ] },
{ "group": "tools_home", "prob": 80, "count": [ 1, 3 ] },
{ "group": "tools_construction", "prob": 30, "count": [ 1, 3 ] },
{ "group": "tools_carpentry", "prob": 30, "count": [ 1, 3 ] },
{ "group": "tools_earthworking", "prob": 30, "count": [ 1, 3 ] },
{ "group": "supplies_hardware", "prob": 20, "count": [ 1, 3 ] },
{ "group": "forage_summer", "prob": 20, "count": [ 1, 3 ] },
[ "tool_belt", 15 ],
[ "dump_pouch", 5 ],
[ "ragpouch", 15 ],
[ "leather_pouch", 15 ],
[ "quiver", 15 ],
[ "quiver_large", 5 ],
[ "crowbar", 25 ],
[ "machete", 25 ],
[ "ax", 25 ],
[ "arrow_metal", 25 ],
[ "bolt_steel", 10 ]
]
}
]
8 changes: 8 additions & 0 deletions data/mods/Aftershock/items/afs_tool_quality.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"type": "tool_quality",
"id": "CHURN",
"name": "churn",
"//": "Delete this when you mainline Dairy products existing PR"
}
]
9 changes: 9 additions & 0 deletions data/mods/Aftershock/maps/afs_overmap_terrain.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
"mondensity": 2,
"flags": [ "SIDEWALK" ]
},
{
"id": "prepnet_orchard",
"type": "overmap_terrain",
"copy-from": "generic_city_building",
"name": "PrepNet orchard",
"sym": "#",
"color": "i_green",
"flags": [ "SOURCE_FOOD" ]
},
{
"id": "municipal_reactor_ware",
"type": "overmap_terrain",
Expand Down
146 changes: 146 additions & 0 deletions data/mods/Aftershock/maps/mapgen/prepnet_orchard.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "prepnet_orchard" ],
"weight": 100,
"object": {
"faction_owner": [ { "id": "Prepnet_Phyle", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
"rows": [
"________________________",
"________________________",
"----__------------------",
"....__................u-",
"....__.................-",
"....__ddd....t.T.7d7....",
"FFwww+wwFFFFFFFFFFFFFFFF",
"FpwCcccwudd...d........F",
"F.wCcccWdbd..t.T.7.7...F",
"F.WcccHwdbdd...........F",
"F.wCccHW.dd.....d......F",
"FpwDccHwu#...t.T.7.7...F",
"F.www+ww...............F",
"F..##..p..u............F",
"F.......a....t.Td7.7...F",
"F..#.d.....#.....d.....F",
"F.a..u4d.d.............F",
"Fud...d......t.T.7.7...F",
"F..#4.au4.#...dd.......F",
"F.4..dd.p.d............F",
"F....#4.d....7.7.7.7...F",
"F.4u.u.d4d..#...d......F",
"F#..4...d..............F",
"FFFFFFFFFFFFFFFFFFFFFFFF"
],
"terrain": {
"#": "t_underbrush_harvested_spring",
"+": "t_door_c",
"-": "t_fence_h",
".": "t_grass",
"4": "t_tree_pine",
"7": "t_tree_apple",
"C": "t_thconc_floor",
"D": "t_thconc_floor",
"H": "t_thconc_floor",
"T": "t_tree_cherry",
"W": "t_window_domestic",
"_": "t_sidewalk",
"a": "t_tree_birch",
"b": "t_grass",
"c": "t_thconc_floor",
"d": "t_dirt",
"p": "t_grass",
"t": "t_tree_plum",
"u": "t_underbrush",
"w": "t_wall_log",
"F": "t_fence_barbed"
},
"furniture": { "C": "f_chair", "D": "f_desk", "H": "f_sofa", "b": "f_bench" },
"place_items": [
{ "item": "supplies_farming", "x": 6, "y": 13, "chance": 50 },
{ "item": "supplies_farming", "x": 4, "y": 11, "chance": 15 },
{ "item": "supplies_farming", "x": 6, "y": 7, "chance": 15 },
{ "item": "supplies_farming", "x": 3, "y": 9, "chance": 99 }
],
"sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } },
"place_monsters": [
{ "monster": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 },
{ "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 4, "friendly": true }
],
"place_npcs": [ { "class": "prepnet_gardener", "x": 10, "y": 9 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "prepnet_orchard" ],
"weight": 100,
"object": {
"faction_owner": [ { "id": "Prepnet_Phyle", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
"rows": [
"________________________",
"________________________",
"----__------------------",
"...&__................U-",
"....__.................-",
"....__ddd........7dt....",
"FFwww+wwFFFFFFFFFFFFFFFF",
"FpwCcccwUdd..#.s.......F",
"F.wCcccWdbd..#.s.7.t...F",
"F.WcccHwdbdd...........F",
"F.wCccHW.ad............F",
"FpwDccHwUu...#.s.7.t...F",
"F.www+ww#....#.s.......F",
"F..uu..p..U..#.s.......F",
"F.......T....#.s.7.t...F",
"F..u.d.....u...........F",
"F.T..U4d.d.............F",
"FUd...d......#.s.7.t...F",
"F..u4.TU4.u..#.s.......F",
"F.4..dd.p.d..#.s.......F",
"F....u4.d....#.s.7.t...F",
"F.4U.U.d4d..u...d......F",
"Fu..4...d..............F",
"FFFFFFFFFFFFFFFFFFFFFFFF"
],
"terrain": {
"#": "t_shrub_strawberry",
"&": "t_grass",
"+": "t_door_c",
"-": "t_fence_h",
".": "t_grass",
"4": "t_tree_pine",
"7": "t_tree_cherry",
"C": "t_thconc_floor",
"D": "t_thconc_floor",
"H": "t_thconc_floor",
"T": "t_tree_birch",
"U": "t_underbrush",
"W": "t_window_domestic",
"_": "t_sidewalk",
"a": "t_dirt",
"b": "t_grass",
"c": "t_thconc_floor",
"d": "t_dirt",
"p": "t_grass",
"s": "t_shrub_blueberry",
"t": "t_tree_apricot",
"u": "t_underbrush_harvested_spring",
"w": "t_wall_log",
"F": "t_fence_barbed"
},
"furniture": { "&": "f_trashcan", "C": "f_chair", "D": "f_desk", "H": "f_sofa", "a": "f_trashcan", "b": "f_bench" },
"place_items": [
{ "item": "supplies_farming", "x": 6, "y": 13, "chance": 50 },
{ "item": "supplies_farming", "x": 4, "y": 11, "chance": 15 },
{ "item": "supplies_farming", "x": 6, "y": 7, "chance": 15 }
],
"sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } },
"place_monsters": [
{ "monster": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 },
{ "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 3, "friendly": true }
],
"place_npcs": [ { "class": "prepnet_gardener", "x": 10, "y": 9 } ]
}
}
]
65 changes: 65 additions & 0 deletions data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[
{
"id": "afs_mon_cyber_mastiff",
"copy-from": "mon_dog",
"default_faction": "PrepNet",
"type": "MONSTER",
"name": { "str": "Cyber Mastiff", "str_pl": "Cyber Mastifs" },
"//": "Rare, location specific only",
"description": "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic enhancements. These hounds defend Prep Phyle lands from all comers undead and otherwise.",
"volume": "57500 ml",
"weight": 57500,
"hp": 86,
"speed": 100,
"aggression": 3,
"morale": 10,
"melee_dice": 1,
"melee_dice_sides": 2,
"melee_cut": 7,
"dodge": 3,
"armor_bash": 8,
"armor_cut": 14,
"looks_like": "mon_dog_gpyrenees",
"vision_day": 30,
"vision_night": 8,
"harvest": "CBM_DOG",
"reproduction": { "baby_monster": "afs_mon_cyber_mastiff_pup", "baby_count": 7, "baby_timer": 320 },
"//": "1-7 puppies & 300-320 days per-litter for size medium canines",
"flags": [ "ANIMAL", "PET_MOUNTABLE", "HEARS", "HIT_AND_RUN", "KEENNOSE", "PATH_AVOID_DANGER_1", "SEES", "SMELLS", "WARM" ],
"anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ]
},
{
"id": "afs_mon_cyber_mastiff_pup",
"type": "MONSTER",
"name": { "str": "Cyber Mastiff puppy", "str_pl": "Cyber Mastiff puppies" },
"description": "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an adult dog. CBMs are implanted but immature in growth with the puppy.",
"default_faction": "PrepNet",
"bodytype": "dog",
"looks_like": "mon_dog_gpyrenees_pup",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"volume": "750 ml",
"weight": 1000,
"hp": 15,
"speed": 65,
"material": [ "flesh" ],
"symbol": "d",
"color": "light_gray",
"aggression": -12,
"morale": 5,
"melee_skill": 2,
"melee_dice": 1,
"melee_dice_sides": 1,
"melee_cut": 3,
"dodge": 1,
"vision_night": 5,
"harvest": "mammal_tiny",
"path_settings": { "max_dist": 10 },
"upgrades": { "age_grow": 42, "into": "afs_mon_cyber_mastiff" },
"biosignature": { "biosig_item": "feces_dog", "biosig_timer": 6 },
"fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ],
"death_function": [ "NORMAL" ],
"special_attacks": [ [ "EAT_FOOD", 100 ] ],
"flags": [ "ANIMAL", "DOGFOOD", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SEES", "SMELLS", "WARM" ]
}
]
Loading