Skip to content

Commit

Permalink
Remove salvaging from bone (#74462)
Browse files Browse the repository at this point in the history
* destroy the evil at its core

* mod cleanup

* vanilla

* lint the linty

* destroy the tests

* reverse wood

* Update seating.json

* Revert "destroy the tests"

This reverts commit 289b428.
  • Loading branch information
Karol1223 authored Jul 22, 2024
1 parent 9e5b1a1 commit 3109a9c
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 30 deletions.
3 changes: 1 addition & 2 deletions data/json/items/comestibles/carnivore.json
Original file line number Diff line number Diff line change
Expand Up @@ -2030,8 +2030,7 @@
"price_postapoc": "0 cent",
"material": [ "mi-go_bone" ],
"volume": "250 ml",
"fun": -10,
"flags": [ "NO_SALVAGE" ]
"fun": -10
},
{
"id": "poultry",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/soup.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"volume": "500 ml",
"charges": 2,
"phase": "liquid",
"flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "NO_SALVAGE" ],
"flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ],
"fun": 10,
"vitamins": [ [ "calcium", 7 ], [ "iron", 1 ], [ "meat_allergen", 1 ] ]
},
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/resources/bone.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
"price_postapoc": "5 cent",
"milling": { "into": "meal_bone_tainted", "recipe": "meal_bone_tainted_mill_1_4" },
"fun": -10,
"extend": { "flags": [ "NO_SALVAGE" ] },
"//": "Not for use in edible recipes, and should require ~200% as much as normal for applicable inedible recipes except for charcoal."
},
{
Expand Down Expand Up @@ -108,7 +107,7 @@
"description": "A thin skewer carved from bone. Sadly, it won't make squirrel on a stick taste better.",
"category": "other",
"material": [ "bone" ],
"flags": [ "NO_SALVAGE", "TRADER_AVOID" ],
"flags": [ "TRADER_AVOID" ],
"weight": "10 g",
"volume": "25 ml",
"milling": { "into": "meal_bone_tainted", "recipe": "meal_bone_tainted_mill_6_1" },
Expand Down
1 change: 0 additions & 1 deletion data/json/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@
"chip_resist": 8,
"wind_resist": 90,
"repaired_with": "bone",
"salvaged_into": "skewer_bone",
"dmg_adj": [ "scratched", "cut", "cracked", "shattered" ],
"bash_dmg_verb": "cracked",
"cut_dmg_verb": "chipped",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/BombasticPerks/perkdata/thick_skull.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"material_thickness": 3,
"symbol": "x",
"color": "magenta",
"flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "ZERO_WEIGHT", "NO_SALVAGE", "SOFT" ],
"flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "ZERO_WEIGHT", "SOFT" ],
"armor": [
{
"covers": [ "head" ],
Expand Down
1 change: 0 additions & 1 deletion data/mods/Magiclysm/items/enchanted_ranged.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@
"NEVER_JAMS",
"NONCONDUCTIVE",
"WATERPROOF_GUN",
"NO_SALVAGE",
"NO_UNLOAD",
"RELOAD_AND_SHOOT",
"MAGIC_FOCUS",
Expand Down
24 changes: 2 additions & 22 deletions data/mods/Magiclysm/items/ethereal_items.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,17 +221,7 @@
"longest_side": "40 cm",
"material": [ "bone", "flesh" ],
"techniques": [ "PRECISE", "RAPID", "WBLOCK_2" ],
"flags": [
"REACH_ATTACK",
"REACH3",
"WHIP",
"STURDY",
"TRADER_AVOID",
"UNBREAKABLE_MELEE",
"NO_REPAIR",
"NO_SALVAGE",
"MAGIC_FOCUS"
],
"flags": [ "REACH_ATTACK", "REACH3", "WHIP", "STURDY", "TRADER_AVOID", "UNBREAKABLE_MELEE", "NO_REPAIR", "MAGIC_FOCUS" ],
"category": "weapons",
"melee_damage": { "cut": 30 }
},
Expand Down Expand Up @@ -313,7 +303,6 @@
"SHEATH_SPEAR",
"ONLY_ONE",
"NO_REPAIR",
"NO_SALVAGE",
"MAGIC_FOCUS"
],
"techniques": [ "WBLOCK_2", "WIDE", "SWEEP", "BRUTAL" ],
Expand Down Expand Up @@ -688,16 +677,7 @@
"description": "A pulsating club made of bone, stained with an ever-moving blood coating eager to absorb the living.",
"material": [ "bone", "flesh" ],
"weapon_category": [ "BATONS" ],
"flags": [
"UNBREAKABLE_MELEE",
"NONCONDUCTIVE",
"ONLY_ONE",
"NO_REPAIR",
"NO_SALVAGE",
"MAGIC_FOCUS",
"BELT_CLIP",
"TRADER_AVOID"
],
"flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "ONLY_ONE", "NO_REPAIR", "MAGIC_FOCUS", "BELT_CLIP", "TRADER_AVOID" ],
"techniques": [ "WBLOCK_2", "RAPID", "PRECISE" ],
"weight": "700 g",
"volume": "800 ml",
Expand Down

0 comments on commit 3109a9c

Please sign in to comment.