forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Innawood] Various improvements based on feedback (CleverRaven#54149)
* Various innawood improvements * Makes water faucet and pilot light auto learn * Makes fermenting vats not require water faucets * Minor bugfix
- Loading branch information
1 parent
2ba94d9
commit e639e61
Showing
15 changed files
with
875 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
58 changes: 58 additions & 0 deletions
58
data/mods/innawood/furniture_and_terrain/furniture-tools.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| [ | ||
| { | ||
| "type": "furniture", | ||
| "id": "f_bloomery", | ||
| "name": "bloomery", | ||
| "looks_like": "f_forge_rock", | ||
| "description": "A type of metallurgical furnace for smelting iron from its oxides.", | ||
| "symbol": "U", | ||
| "color": "light_red", | ||
| "move_cost_mod": -1, | ||
| "coverage": 40, | ||
| "required_str": -1, | ||
| "crafting_pseudo_item": "bloomery", | ||
| "flags": [ "SEALED", "CONTAINER", "NOITEM", "EASY_DECONSTRUCT", "MINEABLE" ], | ||
| "deconstruct": { "items": [ { "item": "rock", "count": 30 } ] }, | ||
| "bash": { | ||
| "str_min": 18, | ||
| "str_max": 50, | ||
| "sound": "crash!", | ||
| "sound_fail": "whump.", | ||
| "items": [ { "item": "rock", "count": [ 10, 20 ] } ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "furniture", | ||
| "id": "f_fvat_empty", | ||
| "name": "fermenting vat", | ||
| "looks_like": "f_standing_tank", | ||
| "description": "A sealable vat for fermenting vinegar and various alcoholic brews.", | ||
| "symbol": "O", | ||
| "color": "brown", | ||
| "move_cost_mod": -1, | ||
| "required_str": -1, | ||
| "flags": [ "NOITEM", "SEALED", "TRANSPARENT", "FLAMMABLE", "CONTAINER", "DONT_REMOVE_ROTTEN" ], | ||
| "examine_action": "fvat_empty", | ||
| "deconstruct": { | ||
| "items": [ | ||
| { "item": "2x4", "count": 14 }, | ||
| { "item": "nail", "charges": [ 6, 12 ] }, | ||
| { "item": "sheet_metal_small", "count": [ 4, 10 ] }, | ||
| { "item": "scrap", "count": [ 5, 10 ] } | ||
| ] | ||
| }, | ||
| "bash": { | ||
| "str_min": 3, | ||
| "str_max": 45, | ||
| "sound": "smash!", | ||
| "sound_fail": "whump.", | ||
| "items": [ | ||
| { "item": "2x4", "count": [ 4, 8 ] }, | ||
| { "item": "nail", "charges": [ 4, 8 ] }, | ||
| { "item": "sheet_metal_small", "count": [ 2, 6 ] }, | ||
| { "item": "scrap", "count": [ 5, 10 ] }, | ||
| { "item": "splinter", "count": 1 } | ||
| ] | ||
| } | ||
| } | ||
| ] |
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| [ | ||
| { | ||
| "om_terrain": "crater_core", | ||
| "type": "mapgen", | ||
| "method": "json", | ||
| "weight": 250000, | ||
| "object": { | ||
| "rows": [ | ||
| "........................", | ||
| "........................", | ||
| "........................", | ||
| "........................", | ||
| "........................", | ||
| "........................", | ||
| "........................", | ||
| "........................", | ||
| "........00000000........", | ||
| "........00000000........", | ||
| "........00000000........", | ||
| "........00000000........", | ||
| "........00000000........", | ||
| "........00000000........", | ||
| "........00000000........", | ||
| "........00000000........", | ||
| "........................", | ||
| "........................", | ||
| "........................", | ||
| "........................", | ||
| "........................", | ||
| "........................", | ||
| "........................", | ||
| "........................" | ||
| ], | ||
| "//": "It's important that the bombs get placed on tiles without wreckage, otherwise they can get destroyed before they explode", | ||
| "place_item": [ | ||
| { "item": "crater_bomb", "x": [ 8, 11 ], "y": [ 8, 11 ], "amount": 1, "custom-flags": [ "ACTIVATE_ON_PLACE" ] }, | ||
| { | ||
| "item": "crater_bomb", | ||
| "x": [ 8, 11 ], | ||
| "y": [ 12, 15 ], | ||
| "amount": 1, | ||
| "custom-flags": [ "ACTIVATE_ON_PLACE" ] | ||
| }, | ||
| { | ||
| "item": "crater_bomb", | ||
| "x": [ 12, 15 ], | ||
| "y": [ 8, 11 ], | ||
| "amount": 1, | ||
| "custom-flags": [ "ACTIVATE_ON_PLACE" ] | ||
| }, | ||
| { | ||
| "item": "crater_bomb", | ||
| "x": [ 12, 15 ], | ||
| "y": [ 12, 15 ], | ||
| "amount": 1, | ||
| "custom-flags": [ "ACTIVATE_ON_PLACE" ] | ||
| } | ||
| ], | ||
| "place_items": [ { "item": "wreckage", "repeat": 3, "x": [ 0, 23 ], "y": [ 0, 23 ] } ], | ||
| "rubble": { ".": { "rubble_type": "f_rubble_rock" } }, | ||
| "terrain": { | ||
| ".": [ [ "t_region_groundcover_barren", 10 ], "t_region_groundcover" ], | ||
| "0": [ [ "t_region_groundcover_barren", 10 ], "t_region_groundcover" ] | ||
| } | ||
| } | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| [ | ||
| { | ||
| "type": "material", | ||
| "id": "cotton", | ||
| "name": "Cotton", | ||
| "density": 3, | ||
| "specific_heat_liquid": 0.02, | ||
| "specific_heat_solid": 0.02, | ||
| "latent_heat": 205, | ||
| "soft": true, | ||
| "reinforces": true, | ||
| "bash_resist": 1, | ||
| "cut_resist": 1, | ||
| "bullet_resist": 1, | ||
| "acid_resist": 3, | ||
| "fire_resist": 0, | ||
| "elec_resist": 2, | ||
| "chip_resist": 6, | ||
| "wind_resist": 70, | ||
| "repaired_with": "rag", | ||
| "salvaged_into": "cotton_patchwork", | ||
| "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ], | ||
| "bash_dmg_verb": "ripped", | ||
| "cut_dmg_verb": "cut", | ||
| "burn_data": [ | ||
| { "fuel": 1, "smoke": 1, "burn": 1, "volume_per_turn": "1250 ml" }, | ||
| { "fuel": 1, "smoke": 1, "burn": 1 }, | ||
| { "fuel": 1, "smoke": 1, "burn": 2 } | ||
| ] | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| [ | ||
| { | ||
| "result": "2byarm_guard", | ||
| "type": "recipe", | ||
| "activity_level": "LIGHT_EXERCISE", | ||
| "category": "CC_ARMOR", | ||
| "subcategory": "CSC_ARMOR_ARMS", | ||
| "skill_used": "fabrication", | ||
| "difficulty": 1, | ||
| "time": "15 m", | ||
| "autolearn": true, | ||
| "reversible": true, | ||
| "using": [ [ "cordage_short", 2 ] ], | ||
| "qualities": [ { "id": "CUT", "level": 2 } ], | ||
| "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "rag", 1 ] ] ] | ||
| } | ||
| ] |
Oops, something went wrong.