Skip to content

Commit

Permalink
Autodoc un/install. Menu minor unclutter (#936)
Browse files Browse the repository at this point in the history
* a

* Created Autodoc items, menu entries, uncraft. Created new category in construction menu "Workshop" as part of uncluttering.

* minor fix

* minor fix

* remove "f_" from items id and lint plugin test

* proper lint testing

* Final adjustments, tested, working

Installing autodoc requires now Electronics 5, 2 power conv, 2 heavy batteries, 40 copper wire.
Installing autodoc sofa requires electronics 4, maybe it should just stay without requirements?

* fix conflicts

* resolve even more conflicts

* resolving conflicts harder

* Update recipe_deconstruction.json

* its not conflict

* Update recipe_deconstruction.json

* Update recipe_deconstruction.json

* N

* l don't know what it wants from me

* God help me

* Last try..

* Update recipe_deconstruction.json

* reverting previous one

* removing my changes from recipe_dec

* adding my changes again

* Update recipe_deconstruction.json

* Update recipe_deconstruction.json

* Update recipe_deconstruction.json

* testing if i can edit this file at all

* added my code at the end after the last } ]

* Update recipe_deconstruction.json

* Update recipe_deconstruction.json

* Update recipe_deconstruction.json

* Update recipe_deconstruction.json

* Update recipe_deconstruction.json

* turns out fetching and updating not only my "upload" branch but also this pr branch should solve the problem
  • Loading branch information
SzQ1 authored Nov 1, 2021
1 parent 558be0e commit 8ef70c2
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 22 deletions.
24 changes: 24 additions & 0 deletions data/json/construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -4411,5 +4411,29 @@
"pre_terrain": "t_railroad_rubble",
"dark_craftable": true,
"post_terrain": "t_dirt"
},
{
"type": "construction",
"id": "constr_f_autodoc",
"description": "Install Autodoc",
"category": "WORKSHOP",
"required_skills": [ [ "electronics", 5 ] ],
"time": "20 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SCREW", "level": 1 } ] ],
"components": [ [ [ "autodoc", 1 ] ], [ [ "power_supply", 2 ] ], [ [ "heavy_battery_cell", 2 ] ], [ [ "cable", 40 ] ] ],
"pre_special": "check_empty",
"post_terrain": "f_autodoc"
},
{
"type": "construction",
"id": "constr_f_autodoc_couch",
"description": "Install Autodoc couch",
"category": "WORKSHOP",
"required_skills": [ [ "electronics", 4 ] ],
"time": "10 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SCREW", "level": 1 } ] ],
"components": [ [ [ "autodoc_couch", 1 ] ] ],
"pre_special": "check_empty",
"post_terrain": "f_autodoc_couch"
}
]
5 changes: 5 additions & 0 deletions data/json/construction_category.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
"id": "CONSTRUCT",
"name": "Constructions"
},
{
"type": "construction_category",
"id": "WORKSHOP",
"name": "Workshop"
},
{
"type": "construction_category",
"id": "FURN",
Expand Down
24 changes: 2 additions & 22 deletions data/json/furniture_and_terrain/furniture-medical.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,7 @@
"flags": [ "TRANSPARENT", "AUTODOC", "CONTAINER" ],
"examine_action": "autodoc",
"surgery_skill_multiplier": 1.0,
"deconstruct": {
"items": [
{ "item": "processor", "count": [ 1, 2 ] },
{ "item": "RAM", "count": [ 4, 8 ] },
{ "item": "cable", "charges": [ 4, 6 ] },
{ "item": "small_lcd_screen", "count": [ 1, 2 ] },
{ "item": "e_scrap", "count": [ 10, 16 ] },
{ "item": "circuit", "count": [ 6, 10 ] },
{ "item": "power_supply", "count": [ 2, 4 ] },
{ "item": "amplifier", "count": [ 2, 4 ] },
{ "item": "plastic_chunk", "count": [ 10, 12 ] },
{ "item": "scrap", "count": [ 6, 8 ] }
]
},
"deconstruct": { "items": [ { "item": "autodoc", "count": 1 } ] },
"bash": {
"str_min": 8,
"str_max": 150,
Expand Down Expand Up @@ -59,14 +46,7 @@
"comfort": 4,
"floor_bedding_warmth": 500,
"required_str": 10,
"deconstruct": {
"items": [
{ "item": "2x4", "count": 12 },
{ "item": "rag", "count": [ 30, 33 ] },
{ "item": "nail", "charges": [ 8, 10 ] },
{ "item": "cable", "charges": [ 1, 2 ], "prob": 50 }
]
},
"deconstruct": { "items": [ { "item": "autodoc_couch", "count": 1 } ] },
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "BLOCKSDOOR", "MOUNTABLE", "AUTODOC_COUCH" ],
"bash": {
"str_min": 10,
Expand Down
29 changes: 29 additions & 0 deletions data/json/items/tool/med.json
Original file line number Diff line number Diff line change
Expand Up @@ -211,5 +211,34 @@
"menu_text": "Unwrap badge",
"type": "transform"
}
},
{
"id": "autodoc_couch",
"type": "TOOL",
"name": "Autodoc operation couch",
"symbol": "H",
"looks_like": "f_autodoc_couch",
"description": "A plush red sofa made less comfortable by the medical machinery directly above it. It has a single leather strap on the right armrest.",
"weight": "100000 g",
"volume": "40 L",
"price": 10000,
"price_postapoc": 500,
"to_hit": -3,
"bashing": 6,
"material": [ "wood" ]
},
{
"type": "TOOL",
"id": "autodoc",
"name": { "str": "Autodoc Mk. XI" },
"description": "A surgical apparatus used for installation and removal of bionics. It's only as skilled as its operator.",
"color": "light_cyan",
"symbol": "&",
"looks_like": "f_robotic_arm",
"weight": "120000 g",
"volume": "50 L",
"material": [ "steel", "plastic" ],
"bashing": 8,
"price": 40000
}
]
36 changes: 36 additions & 0 deletions data/json/recipes/recipe_deconstruction.json
Original file line number Diff line number Diff line change
Expand Up @@ -4141,5 +4141,41 @@
[ [ "plastic_chunk", 2 ] ],
[ [ "small_lcd_screen", 1 ] ]
]
},
{
"result": "autodoc",
"type": "uncraft",
"skill_used": "electronics",
"difficulty": 4,
"time": "40 m",
"using": [ [ "soldering_standard", 40 ], [ "welding_standard", 3 ] ],
"qualities": [
{ "id": "HAMMER", "level": 1 },
{ "id": "SCREW", "level": 1 },
{ "id": "WRENCH", "level": 1 },
{ "id": "SAW_M", "level": 1 }
],
"components": [
[ [ "processor", 2 ] ],
[ [ "android_arms", 1 ] ],
[ [ "RAM", 8 ] ],
[ [ "cable", 6 ] ],
[ [ "small_lcd_screen", 2 ] ],
[ [ "e_scrap", 16 ] ],
[ [ "circuit", 10 ] ],
[ [ "power_supply", 4 ] ],
[ [ "amplifier", 4 ] ],
[ [ "plastic_chunk", 12 ] ],
[ [ "scrap", 10 ] ]
]
},
{
"result": "autodoc_couch",
"type": "uncraft",
"skill_used": "fabrication",
"time": "15 m",
"difficulty": 2,
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
"components": [ [ [ "2x4", 12 ] ], [ [ "rag", 33 ] ], [ [ "nail", 15 ] ], [ [ "cable", 10 ] ] ]
}
]

0 comments on commit 8ef70c2

Please sign in to comment.