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

Finally Ferals #2780

Merged
merged 19 commits into from
May 11, 2023
Merged
Show file tree
Hide file tree
Changes from 10 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
18 changes: 18 additions & 0 deletions data/json/harvest.json
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,24 @@
{ "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }
]
},
{
"id": "CBM_SCI_FERAL",
"type": "harvest",
"entries": [
{
"drop": "bionics_sci",
"type": "bionic_group",
"flags": [ "NO_STERILE", "NO_PACKED" ],
"faults": [ "fault_bionic_salvaged" ]
},
{ "drop": "human_flesh", "type": "flesh", "mass_ratio": 0.2 },
{ "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
{ "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 },
{ "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 },
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
{ "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.01 }
]
},
{
"id": "CBM_TECH",
"type": "harvest",
Expand Down
52 changes: 52 additions & 0 deletions data/json/items/gun/monster_gun.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,58 @@
"dispersion": 100,
"durability": 8
},
{
"id": "feral_human_thrown_rock",
"type": "GUN",
"symbol": "%",
"color": "red",
"name": { "str": "hurled rubble" },
"description": "Stone at the ready to crush that which isn't part of the blob.",
"material": [ "stone" ],
"flags": [
"PRIMITIVE_RANGED_WEAPON",
"NEVER_JAMS",
"NONCONDUCTIVE",
"NO_REPAIR",
"WATERPROOF_GUN",
"NO_SALVAGE",
"NO_UNLOAD",
"WATERPROOF_GUN",
"NEVER_JAMS"
],
"skill": "throw",
"ammo": [ "rock" ],
"ammo_effects": [ "NO_PENETRATE_OBSTACLES", "NEVER_MISFIRES" ],
"clip_size": 1,
"ranged_damage": { "damage_type": "bash", "amount": -1 },
"weight": "540 g",
"volume": "210 ml",
"bashing": 1,
"to_hit": 1,
"loudness": 2,
"range": 6,
"dispersion": 150,
"durability": 8
},
{
"id": "feral_jackboot_gun",
"type": "GUN",
"symbol": "R",
"color": "dark_gray",
"name": { "str": "feral bikers' shotgun" },
"description": "A fake shotgun for feral bikers (because monster aiming is too lethal).",
"material": [ "steel", "aluminum", "plastic" ],
"skill": "shotgun",
"flags": [ "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "NO_UNLOAD", "RELOAD_AND_SHOOT" ],
"ammo": [ "shot" ],
"clip_size": 6,
"weight": "3402 g",
"volume": "2450 ml",
"bashing": 3,
"dispersion": 3250,
"range": 65,
"durability": 9
},
{
"id": "emp_frond",
"type": "GUN",
Expand Down
Loading