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

Appliance update. Extend crafting_pseudo_item. JSONize freezers and fridges. Update Freezers/Fridges to use iexamine::transform #2172

Merged
merged 28 commits into from
Nov 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
68d0081
Extend crafting_pseudo_item into array
KheirFerrum Nov 7, 2022
8c0642a
Linting
KheirFerrum Nov 7, 2022
42e85b2
Add freezers. Fix JSON
KheirFerrum Nov 7, 2022
de821bb
Add freezer recipe
KheirFerrum Nov 7, 2022
df82516
Update mod files to new format
KheirFerrum Nov 7, 2022
b685658
Add glass fridge/freezer. Update load function
KheirFerrum Nov 7, 2022
de8e536
Return to normal names
KheirFerrum Nov 7, 2022
5c81208
Linting, add freezers/glass freezers
KheirFerrum Nov 7, 2022
844ac2f
Recipe and group for glass fridge/freezer
KheirFerrum Nov 7, 2022
a232c21
glass fridge recipe, more linting
KheirFerrum Nov 7, 2022
c8a2ae9
Incremental json fixes
KheirFerrum Nov 7, 2022
3115e26
Weight update to glass fridge/freezer weight
KheirFerrum Nov 7, 2022
704276e
Remove Const
KheirFerrum Nov 9, 2022
c395a6d
Fridge Tanks
KheirFerrum Nov 10, 2022
b6154f6
Remove Fridge Tanks
KheirFerrum Nov 11, 2022
4ef29c7
Quick fix to display and deconstruction
KheirFerrum Nov 11, 2022
f8dd720
floor lamp cleanup
KheirFerrum Nov 14, 2022
a9e2965
Fridges./Freezers use iexamine transform
KheirFerrum Nov 14, 2022
d28baf6
Update minifreezer
KheirFerrum Nov 14, 2022
f8aac99
Astyle
KheirFerrum Nov 14, 2022
24860d0
Minor name fix
KheirFerrum Nov 14, 2022
27abb64
TFLAG
KheirFerrum Nov 18, 2022
d14a69f
Update to accommodate extend/delete
KheirFerrum Nov 19, 2022
4ea274a
Merge branch 'upload' into appliance-update
KheirFerrum Nov 19, 2022
f4653b3
Convert to reference.
KheirFerrum Nov 20, 2022
839c2cb
Update documentation
KheirFerrum Nov 23, 2022
7f4aebd
Update description text
KheirFerrum Nov 26, 2022
7868b10
Simplify code
KheirFerrum Nov 27, 2022
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
71 changes: 40 additions & 31 deletions data/json/construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -4204,25 +4204,16 @@
},
{
"type": "construction",
"id": "constr_gridfridge_switch_off",
"group": "toggle_refrigerator_freezer",
"required_skills": [ ],
"id": "constr_gridglass_fridge",
"group": "install_glass_refrigerator",
"category": "FURN",
"time": "1 m",
"dark_craftable": true,
"pre_furniture": "f_fridge_on",
"post_furniture": "f_fridge_off"
},
{
"type": "construction",
"id": "constr_gridfridge_switch_on",
"group": "toggle_refrigerator_freezer",
"required_skills": [ ],
"category": "FURN",
"time": "1 m",
"dark_craftable": true,
"pre_furniture": "f_fridge_off",
"post_furniture": "f_fridge_on"
"time": "10 m",
"qualities": [ ],
"components": [ [ [ "glass_fridge", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_glass_fridge"
},
{
"type": "construction",
Expand All @@ -4239,25 +4230,29 @@
},
{
"type": "construction",
"id": "constr_gridminifreezer_switch_off",
"group": "toggle_refrigerator_freezer",
"required_skills": [ ],
"id": "constr_gridfreezer",
"group": "install_freezer",
"category": "FURN",
"time": "1 m",
"dark_craftable": true,
"pre_furniture": "f_minifreezer_on",
"post_furniture": "f_minifreezer_off"
"required_skills": [ ],
"time": "10 m",
"qualities": [ ],
"components": [ [ [ "fridge", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_freezer"
},
{
"type": "construction",
"id": "constr_gridminifreezer_switch_on",
"group": "toggle_refrigerator_freezer",
"required_skills": [ ],
"id": "constr_gridglass_freezer",
"group": "install_glass_freezer",
"category": "FURN",
"time": "1 m",
"dark_craftable": true,
"pre_furniture": "f_minifreezer_off",
"post_furniture": "f_minifreezer_on"
"required_skills": [ ],
"time": "10 m",
"qualities": [ ],
"components": [ [ [ "glass_freezer", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_glass_freezer"
},
{
"type": "construction",
Expand Down Expand Up @@ -4413,6 +4408,20 @@
"pre_special": "check_empty",
"post_furniture": "f_gridvac_sealer"
},
{
"type": "construction",
"id": "constr_gridcraftrig",
"group": "place_craftrig",
"category": "OTHER",
"required_skills": [ [ "electronics", 1 ] ],
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "craftrig", 1 ] ], [ [ "cable", 5 ] ], [ [ "solder_wire", 10 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_craftrig"
},
{
"type": "construction",
"id": "constr_gridrvkitchen",
Expand Down
25 changes: 20 additions & 5 deletions data/json/construction_group.json
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,16 @@
"id": "install_large_storage_battery",
"name": "Install Large Storage Battery"
},
{
"type": "construction_group",
"id": "install_freezer",
"name": "Install Freezer"
},
{
"type": "construction_group",
"id": "install_glass_freezer",
"name": "Install Glass Freezer"
},
{
"type": "construction_group",
"id": "install_minifreezer",
Expand All @@ -929,6 +939,11 @@
"id": "install_refrigerator",
"name": "Install Refrigerator"
},
{
"type": "construction_group",
"id": "install_glass_refrigerator",
"name": "Install Glass Refrigerator"
},
{
"type": "construction_group",
"id": "place_small_space_heater",
Expand Down Expand Up @@ -1104,6 +1119,11 @@
"id": "place_vaccuum_sealer",
"name": "Place Vaccuum Sealer"
},
{
"type": "construction_group",
"id": "place_craftrig",
"name": "Place FOODCO Kitchen Buddy"
},
{
"type": "construction_group",
"id": "place_water_mill",
Expand Down Expand Up @@ -1314,11 +1334,6 @@
"id": "tape_up_window",
"name": "Tape Up Window"
},
{
"type": "construction_group",
"id": "toggle_refrigerator_freezer",
"name": "Toggle Refrigerator/Freezer"
},
{
"type": "construction_group",
"id": "wax_floor",
Expand Down
Loading