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.

Sign up for GitHub

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

Jump to bottom

feat: allow recovery of base materials for more plastic items #4695

Merged
merged 8 commits into from
May 29, 2024
Merged

feat: allow recovery of base materials for more plastic items #4695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
092da7e
Update with plastic uncrafts generic.json
Dracque May 26, 2024
51ac6b7
Plastic update generic.json part 2
Dracque May 26, 2024
108c3b5
Update storage.json plastic_shopping_bag
Dracque May 26, 2024
a482a54
Update generic.json umbrella uncraft
Dracque May 26, 2024
b8443a2
Update medical.json reversible blood_draw_kit
Dracque May 26, 2024
cf50626
style(autofix.ci): automated formatting
autofix-ci[bot] May 26, 2024
4e2141f
Merge branch 'cataclysmbnteam:main' into uncraft-plastic-items
Dracque May 29, 2024
4f0dbb6
fingers crossed sponge disassembly doesn't break anything
Dracque May 29, 2024
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
1 change: 1 addition & 0 deletions data/json/recipes/armor/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@
"skill_used": "fabrication",
"difficulty": 1,
"time": "15 m",
"reversible": true,
"autolearn": true,
"using": [ [ "cordage", 2 ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
Expand Down
1 change: 1 addition & 0 deletions data/json/recipes/other/medical.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"skills_required": [ "fabrication", 2 ],
"difficulty": 4,
"time": "3 m",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "CUT", "level": 1 } ],
"components": [ [ [ "syringe", 1 ] ], [ [ "flask_glass", 1 ], [ "bottle_plastic_small", 1 ] ] ]
Expand Down
109 changes: 106 additions & 3 deletions data/json/uncraft/generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,37 @@
"components": [ [ [ "steel_lump", 1 ] ] ]
},
{
"type": "uncraft",
"result": "handflare",
"type": "uncraft",
"skill_used": "fabrication",
"difficulty": 1,
"time": "20 s",
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "incendiary", 75 ] ] ]
"components": [ [ [ "incendiary", 75 ] ], [ [ "plastic_scrap", 2 ] ] ]
},
{
"result": "handflare_dead",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_scrap", 2 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "glowstick",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_scrap", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "glowstick_dead",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_scrap", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "sheet_metal",
Expand Down Expand Up @@ -2254,6 +2278,13 @@
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "plastic_chunk", 3 ] ], [ [ "scrap", 1 ] ], [ [ "wire", 5 ] ] ]
},
{
"result": "umbrella",
"type": "uncraft",
"time": "2 m",
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "plastic_chunk", 3 ] ], [ [ "scrap", 1 ] ], [ [ "wire", 5 ] ] ]
},
{
"result": "lawnmower",
"type": "uncraft",
Expand Down Expand Up @@ -4198,6 +4229,22 @@
"components": [ [ [ "plastic_scrap", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "RPG_die",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_scrap", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "pen",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_scrap", 2 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "bag_plastic",
"type": "uncraft",
Expand All @@ -4223,7 +4270,7 @@
"flags": [ "BLIND_EASY" ]
},
{
"result": "cup_plastic",
"result": "cup_plastic_unsealed",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
Expand Down Expand Up @@ -4254,6 +4301,54 @@
"components": [ [ [ "plastic_scrap", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "balloon",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_scrap", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "bubblewrap",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_scrap", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "bag_iv",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_scrap", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "magic_8_ball",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_scrap", 4 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "screen_mesh",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_scrap", 2 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "makeshift_funnel",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_chunk", 2 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "hairbrush",
"type": "uncraft",
Expand All @@ -4270,6 +4365,14 @@
"components": [ [ [ "plastic_chunk", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "sponge",
"type": "uncraft",
"skill_used": "fabrication",
"time": "6 s",
"components": [ [ [ "plastic_scrap", 4 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "barrette",
"type": "uncraft",
Expand Down
Loading