From 2c12bc3ff9f09db2bcfa7fe1b298c1920c8f7f8c Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Wed, 31 Aug 2022 13:57:32 +0700 Subject: [PATCH 01/10] adds more floor types to carpet --- .../terrain-floors-indoor.json | 360 ++++++++++++++++++ 1 file changed, 360 insertions(+) diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json index 71e0664a5479c..50c20940597c7 100644 --- a/data/json/furniture_and_terrain/terrain-floors-indoor.json +++ b/data/json/furniture_and_terrain/terrain-floors-indoor.json @@ -866,6 +866,366 @@ "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_metal_floor" } }, + { + "type": "terrain", + "id": "t_carpet_base_strconcrete", + "name": "Carpet", + "symbol": ".", + "color": "red", + "move_cost": 2, + "copy-from": "t_carpet_base", + "description": "Base concrete carpet!", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_strconc_floor", + "str_min": 5, + "str_max": 15, + "str_min_supported": 100, + "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] + }, + "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_strconc_floor" } + }, + { + "type": "terrain", + "id": "t_carpet_strconcrete_red", + "copy-from": "t_carpet_base_strconcrete", + "name": "industrial red carpet", + "alias": "t_carpet_concrete", + "looks_like": "t_carpet_red", + "symbol": ".", + "color": "red", + "move_cost": 2, + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "description": "Firm, low-pile, high-durability carpet in a red color, for laying down on bare concrete." + }, + { + "type": "terrain", + "id": "t_carpet_strconcrete_yellow", + "copy-from": "t_carpet_base_strconcrete", + "name": "industrial yellow carpet", + "description": "Firm, low-pile, high-durability carpet in a yellow color, for laying down on bare concrete.", + "symbol": ".", + "color": "yellow", + "move_cost": 2, + "looks_like": "t_carpet_yellow", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_strconc_floor" } + }, + { + "type": "terrain", + "id": "t_carpet_strconcrete_green", + "copy-from": "t_carpet_base_strconcrete", + "name": "industrial green carpet", + "description": "Firm, low-pile, high-durability carpet in a green color, for laying down on bare concrete.", + "symbol": ".", + "color": "green", + "move_cost": 2, + "looks_like": "t_carpet_green", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_strconc_floor" } + }, + { + "type": "terrain", + "id": "t_carpet_strconcrete_purple", + "copy-from": "t_carpet_base_strconcrete", + "name": "industrial purple carpet", + "description": "Firm, low-pile, high-durability carpet in a purple color, for laying down on bare concrete.", + "symbol": ".", + "color": "magenta", + "move_cost": 2, + "looks_like": "t_carpet_purple", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_strconc_floor" } + }, + { + "type": "terrain", + "id": "t_carpet_base_rock", + "name": "Carpet", + "symbol": ".", + "color": "red", + "move_cost": 2, + "copy-from": "t_carpet_base", + "description": "Base rock carpet!", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_rock_floor", + "str_min": 5, + "str_max": 15, + "str_min_supported": 100, + "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] + }, + "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_rock_floor" } + }, + { + "type": "terrain", + "id": "t_carpet_rock_red", + "copy-from": "t_carpet_base_rock", + "name": "red carpet", + "alias": "t_carpet_rock", + "looks_like": "t_carpet_red", + "symbol": ".", + "color": "red", + "move_cost": 2, + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "description": "Soft red carpet." + }, + { + "type": "terrain", + "id": "t_carpet_rock_yellow", + "copy-from": "t_carpet_base_rock", + "name": "yellow carpet", + "description": "Soft yellow carpet.", + "symbol": ".", + "color": "yellow", + "move_cost": 2, + "looks_like": "t_carpet_yellow", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_rock_floor" } + }, + { + "type": "terrain", + "id": "t_carpet_rock_green", + "copy-from": "t_carpet_base_rock", + "name": "green carpet", + "description": "Soft green carpet.", + "symbol": ".", + "color": "green", + "move_cost": 2, + "looks_like": "t_carpet_green", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_rock_floor" } + }, + { + "type": "terrain", + "id": "t_carpet_rock_purple", + "copy-from": "t_carpet_base_rock", + "name": "purple carpet", + "description": "Soft purple carpet.", + "symbol": ".", + "color": "magenta", + "move_cost": 2, + "looks_like": "t_carpet_purple", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_rock_floor" } + }, + { + "type": "terrain", + "id": "t_carpet_base_primitive", + "name": "Carpet", + "symbol": ".", + "color": "red", + "move_cost": 2, + "copy-from": "t_carpet_base", + "description": "Base primitive floor carpet!", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_floor_primitive", + "str_min": 5, + "str_max": 15, + "str_min_supported": 100, + "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] + }, + "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_floor_primitive" } + }, + { + "type": "terrain", + "id": "t_carpet_primitive_red", + "copy-from": "t_carpet_base_primitive", + "name": "red carpet", + "alias": "t_carpet_primitive", + "looks_like": "t_carpet_red", + "symbol": ".", + "color": "red", + "move_cost": 2, + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "description": "Soft red carpet." + }, + { + "type": "terrain", + "id": "t_carpet_primitive_yellow", + "copy-from": "t_carpet_base_primitive", + "name": "yellow carpet", + "description": "Soft yellow carpet.", + "symbol": ".", + "color": "yellow", + "move_cost": 2, + "looks_like": "t_carpet_yellow", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_floor_primitive" } + }, + { + "type": "terrain", + "id": "t_carpet_primitive_green", + "copy-from": "t_carpet_base_primitive", + "name": "green carpet", + "description": "Soft green carpet.", + "symbol": ".", + "color": "green", + "move_cost": 2, + "looks_like": "t_carpet_green", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_floor_primitive" } + }, + { + "type": "terrain", + "id": "t_carpet_primitive_purple", + "copy-from": "t_carpet_base_primitive", + "name": "purple carpet", + "description": "Soft purple carpet.", + "symbol": ".", + "color": "magenta", + "move_cost": 2, + "looks_like": "t_carpet_purple", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_floor_primitive" } + }, + { + "type": "terrain", + "id": "t_carpet_base_linoleum_gray", + "name": "Carpet", + "symbol": ".", + "color": "red", + "move_cost": 2, + "copy-from": "t_carpet_base", + "description": "Base gray linoleum floor carpet!", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_linoleum_gray", + "str_min": 5, + "str_max": 15, + "str_min_supported": 100, + "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] + }, + "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_linoleum_gray" } + }, + { + "type": "terrain", + "id": "t_carpet_linoleum_gray_red", + "copy-from": "t_carpet_base_linoleum_gray", + "name": "red carpet", + "alias": "t_carpet_linoleum_gray", + "looks_like": "t_carpet_red", + "symbol": ".", + "color": "red", + "move_cost": 2, + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "description": "Soft red carpet." + }, + { + "type": "terrain", + "id": "t_carpet_linoleum_gray_yellow", + "copy-from": "t_carpet_base_linoleum_gray", + "name": "yellow carpet", + "description": "Soft yellow carpet.", + "symbol": ".", + "color": "yellow", + "move_cost": 2, + "looks_like": "t_carpet_yellow", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_linoleum_gray" } + }, + { + "type": "terrain", + "id": "t_carpet_linoleum_gray_green", + "copy-from": "t_carpet_base_linoleum_gray", + "name": "green carpet", + "description": "Soft green carpet.", + "symbol": ".", + "color": "green", + "move_cost": 2, + "looks_like": "t_carpet_green", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_linoleum_gray" } + }, + { + "type": "terrain", + "id": "t_carpet_linoleum_gray_purple", + "copy-from": "t_carpet_base_linoleum_gray", + "name": "purple carpet", + "description": "Soft purple carpet.", + "symbol": ".", + "color": "magenta", + "move_cost": 2, + "looks_like": "t_carpet_purple", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_linoleum_gray" } + }, + { + "type": "terrain", + "id": "t_carpet_base_linoleum_white", + "name": "Carpet", + "symbol": ".", + "color": "red", + "move_cost": 2, + "copy-from": "t_carpet_base", + "description": "Base white linoleum floor carpet!", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_linoleum_white", + "str_min": 5, + "str_max": 15, + "str_min_supported": 100, + "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] + }, + "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_linoleum_white" } + }, + { + "type": "terrain", + "id": "t_carpet_linoleum_white_red", + "copy-from": "t_carpet_base_linoleum_white", + "name": "red carpet", + "alias": "t_carpet_linoleum_white", + "looks_like": "t_carpet_red", + "symbol": ".", + "color": "red", + "move_cost": 2, + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "description": "Soft red carpet." + }, + { + "type": "terrain", + "id": "t_carpet_linoleum_white_yellow", + "copy-from": "t_carpet_base_linoleum_white", + "name": "yellow carpet", + "description": "Soft yellow carpet.", + "symbol": ".", + "color": "yellow", + "move_cost": 2, + "looks_like": "t_carpet_yellow", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_linoleum_white" } + }, + { + "type": "terrain", + "id": "t_carpet_linoleum_white_green", + "copy-from": "t_carpet_base_linoleum_white", + "name": "green carpet", + "description": "Soft green carpet.", + "symbol": ".", + "color": "green", + "move_cost": 2, + "looks_like": "t_carpet_green", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_linoleum_white" } + }, + { + "type": "terrain", + "id": "t_carpet_linoleum_white_purple", + "copy-from": "t_carpet_base_linoleum_white", + "name": "purple carpet", + "description": "Soft purple carpet.", + "symbol": ".", + "color": "magenta", + "move_cost": 2, + "looks_like": "t_carpet_purple", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_linoleum_white" } + }, { "type": "terrain", "id": "t_linoleum_white", From e4f5e3b90207a067757a7a7844423d84486a1ea6 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Wed, 31 Aug 2022 14:11:52 +0700 Subject: [PATCH 02/10] Update construction.json --- data/json/construction.json | 288 ++++++++++++++++++++++++++++++++++++ 1 file changed, 288 insertions(+) diff --git a/data/json/construction.json b/data/json/construction.json index d9e4bd9777e73..301a2b2cdd63f 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -3037,6 +3037,294 @@ "pre_terrain": "t_floor", "post_terrain": "t_carpet_green" }, + { + "type": "construction", + "id": "constr_carpet_conc_red", + "group": "carpet_floor_red", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "r_carpet", 1 ] ] ], + "pre_terrain": "t_thconc_floor", + "post_terrain": "t_carpet_concrete_red" + }, + { + "type": "construction", + "id": "constr_carpet_conc_purple", + "group": "carpet_floor_purple", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "p_carpet", 1 ] ] ], + "pre_terrain": "t_thconc_floor", + "post_terrain": "t_carpet_concrete_purple" + }, + { + "type": "construction", + "id": "constr_carpet_conc_yellow", + "group": "carpet_floor_yellow", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "y_carpet", 1 ] ] ], + "pre_terrain": "t_thconc_floor", + "post_terrain": "t_carpet_concrete_yellow" + }, + { + "type": "construction", + "id": "constr_carpet_conc_green", + "group": "carpet_floor_green", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "g_carpet", 1 ] ] ], + "pre_terrain": "t_thconc_floor", + "post_terrain": "t_carpet_concrete_green" + }, + { + "type": "construction", + "id": "constr_carpet_strconc_red", + "group": "carpet_floor_red", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "r_carpet", 1 ] ] ], + "pre_terrain": "t_strconc_floor", + "post_terrain": "t_carpet_strconcrete_red" + }, + { + "type": "construction", + "id": "constr_carpet_strconc_purple", + "group": "carpet_floor_purple", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "p_carpet", 1 ] ] ], + "pre_terrain": "t_strconc_floor", + "post_terrain": "t_carpet_strconcrete_purple" + }, + { + "type": "construction", + "id": "constr_carpet_strconc_yellow", + "group": "carpet_floor_yellow", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "y_carpet", 1 ] ] ], + "pre_terrain": "t_strconc_floor", + "post_terrain": "t_carpet_strconcrete_yellow" + }, + { + "type": "construction", + "id": "constr_carpet_strconc_green", + "group": "carpet_floor_green", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "g_carpet", 1 ] ] ], + "pre_terrain": "t_strconc_floor", + "post_terrain": "t_carpet_strconcrete_green" + }, + { + "type": "construction", + "id": "constr_carpet_rock_red", + "group": "carpet_floor_red", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "r_carpet", 1 ] ] ], + "pre_terrain": "t_rock_floor", + "post_terrain": "t_carpet_rock_red" + }, + { + "type": "construction", + "id": "constr_carpet_rock_purple", + "group": "carpet_floor_purple", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "p_carpet", 1 ] ] ], + "pre_terrain": "t_rock_floor", + "post_terrain": "t_carpet_rock_purple" + }, + { + "type": "construction", + "id": "constr_carpet_rock_yellow", + "group": "carpet_floor_yellow", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "y_carpet", 1 ] ] ], + "pre_terrain": "t_rock_floor", + "post_terrain": "t_carpet_rock_yellow" + }, + { + "type": "construction", + "id": "constr_carpet_rock_green", + "group": "carpet_floor_green", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "g_carpet", 1 ] ] ], + "pre_terrain": "t_rock_floor", + "post_terrain": "t_carpet_rock_green" + }, + { + "type": "construction", + "id": "constr_carpet_primitive_red", + "group": "carpet_floor_red", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "r_carpet", 1 ] ] ], + "pre_terrain": "t_floor_primitive", + "post_terrain": "t_carpet_primitive_red" + }, + { + "type": "construction", + "id": "constr_carpet_primitive_purple", + "group": "carpet_floor_purple", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "p_carpet", 1 ] ] ], + "pre_terrain": "t_floor_primitive", + "post_terrain": "t_carpet_primitive_purple" + }, + { + "type": "construction", + "id": "constr_carpet_primitive_yellow", + "group": "carpet_floor_yellow", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "y_carpet", 1 ] ] ], + "pre_terrain": "t_floor_primitive", + "post_terrain": "t_carpet_primitive_yellow" + }, + { + "type": "construction", + "id": "constr_carpet_primitive_green", + "group": "carpet_floor_green", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "g_carpet", 1 ] ] ], + "pre_terrain": "t_floor_primitive", + "post_terrain": "t_carpet_primitive_green" + }, + { + "type": "construction", + "id": "constr_carpet_linoleum_gray_red", + "group": "carpet_floor_red", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "r_carpet", 1 ] ] ], + "pre_terrain": "t_linoleum_gray", + "post_terrain": "t_carpet_linoleum_gray_red" + }, + { + "type": "construction", + "id": "constr_carpet_linoleum_gray_purple", + "group": "carpet_floor_purple", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "p_carpet", 1 ] ] ], + "pre_terrain": "t_linoleum_gray", + "post_terrain": "t_carpet_linoleum_gray_purple" + }, + { + "type": "construction", + "id": "constr_carpet_linoleum_gray_yellow", + "group": "carpet_floor_yellow", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "y_carpet", 1 ] ] ], + "pre_terrain": "t_linoleum_gray", + "post_terrain": "t_carpet_linoleum_gray_yellow" + }, + { + "type": "construction", + "id": "constr_carpet_linoleum_gray_green", + "group": "carpet_floor_green", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "g_carpet", 1 ] ] ], + "pre_terrain": "t_linoleum_gray", + "post_terrain": "t_carpet_linoleum_gray_green" + }, + { + "type": "construction", + "id": "constr_carpet_linoleum_white_red", + "group": "carpet_floor_red", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "r_carpet", 1 ] ] ], + "pre_terrain": "t_linoleum_white", + "post_terrain": "t_carpet_linoleum_white_red" + }, + { + "type": "construction", + "id": "constr_carpet_linoleum_white_purple", + "group": "carpet_floor_purple", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "p_carpet", 1 ] ] ], + "pre_terrain": "t_linoleum_white", + "post_terrain": "t_carpet_linoleum_white_purple" + }, + { + "type": "construction", + "id": "constr_carpet_linoleum_white_yellow", + "group": "carpet_floor_yellow", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "y_carpet", 1 ] ] ], + "pre_terrain": "t_linoleum_white", + "post_terrain": "t_carpet_linoleum_white_yellow" + }, + { + "type": "construction", + "id": "constr_carpet_linoleum_white_green", + "group": "carpet_floor_green", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "g_carpet", 1 ] ] ], + "pre_terrain": "t_linoleum_white", + "post_terrain": "t_carpet_linoleum_white_green" + }, { "type": "construction", "id": "constr_floor_waxed", From 8a7b1bb6137ffe4d3613de06e4c9083847eb8ccd Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Wed, 31 Aug 2022 16:59:01 +0700 Subject: [PATCH 03/10] Update terrain-floors-indoor.json --- data/json/furniture_and_terrain/terrain-floors-indoor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json index 50c20940597c7..6fa10267b4c26 100644 --- a/data/json/furniture_and_terrain/terrain-floors-indoor.json +++ b/data/json/furniture_and_terrain/terrain-floors-indoor.json @@ -1225,7 +1225,7 @@ "looks_like": "t_carpet_purple", "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_linoleum_white" } - }, + }, { "type": "terrain", "id": "t_linoleum_white", From e734ed36220dd96d962d8f6a136c0818f5244102 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Wed, 31 Aug 2022 20:57:28 +0700 Subject: [PATCH 04/10] changed nails component to duct tape --- data/json/construction.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/json/construction.json b/data/json/construction.json index 301a2b2cdd63f..dc05c4b21cff8 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -3045,7 +3045,7 @@ "required_skills": [ [ "fabrication", 1 ] ], "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "nail", 5 ] ], [ [ "r_carpet", 1 ] ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "r_carpet", 1 ] ] ], "pre_terrain": "t_thconc_floor", "post_terrain": "t_carpet_concrete_red" }, @@ -3057,7 +3057,7 @@ "required_skills": [ [ "fabrication", 1 ] ], "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "nail", 5 ] ], [ [ "p_carpet", 1 ] ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "p_carpet", 1 ] ] ], "pre_terrain": "t_thconc_floor", "post_terrain": "t_carpet_concrete_purple" }, @@ -3069,7 +3069,7 @@ "required_skills": [ [ "fabrication", 1 ] ], "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "nail", 5 ] ], [ [ "y_carpet", 1 ] ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "y_carpet", 1 ] ] ], "pre_terrain": "t_thconc_floor", "post_terrain": "t_carpet_concrete_yellow" }, @@ -3081,7 +3081,7 @@ "required_skills": [ [ "fabrication", 1 ] ], "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "nail", 5 ] ], [ [ "g_carpet", 1 ] ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "g_carpet", 1 ] ] ], "pre_terrain": "t_thconc_floor", "post_terrain": "t_carpet_concrete_green" }, @@ -3093,7 +3093,7 @@ "required_skills": [ [ "fabrication", 1 ] ], "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "nail", 5 ] ], [ [ "r_carpet", 1 ] ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "r_carpet", 1 ] ] ], "pre_terrain": "t_strconc_floor", "post_terrain": "t_carpet_strconcrete_red" }, @@ -3105,7 +3105,7 @@ "required_skills": [ [ "fabrication", 1 ] ], "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "nail", 5 ] ], [ [ "p_carpet", 1 ] ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "p_carpet", 1 ] ] ], "pre_terrain": "t_strconc_floor", "post_terrain": "t_carpet_strconcrete_purple" }, @@ -3117,7 +3117,7 @@ "required_skills": [ [ "fabrication", 1 ] ], "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "nail", 5 ] ], [ [ "y_carpet", 1 ] ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "y_carpet", 1 ] ] ], "pre_terrain": "t_strconc_floor", "post_terrain": "t_carpet_strconcrete_yellow" }, @@ -3129,7 +3129,7 @@ "required_skills": [ [ "fabrication", 1 ] ], "time": "30 m", "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], - "components": [ [ [ "nail", 5 ] ], [ [ "g_carpet", 1 ] ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "g_carpet", 1 ] ] ], "pre_terrain": "t_strconc_floor", "post_terrain": "t_carpet_strconcrete_green" }, From 723661a3d734d27fca94c86dd84d9406f5847f1e Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Wed, 31 Aug 2022 21:07:02 +0700 Subject: [PATCH 05/10] removed nails in concrete and metal floor deconstruct result --- .../terrain-floors-indoor.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json index 6fa10267b4c26..6d98e3ada4ab8 100644 --- a/data/json/furniture_and_terrain/terrain-floors-indoor.json +++ b/data/json/furniture_and_terrain/terrain-floors-indoor.json @@ -739,7 +739,7 @@ "str_min_supported": 100, "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] }, - "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_thconc_floor" } + "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 } ], "ter_set": "t_thconc_floor" } }, { "type": "terrain", @@ -765,7 +765,7 @@ "move_cost": 2, "looks_like": "t_carpet_yellow", "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], - "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_thconc_floor" } + "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 } ], "ter_set": "t_thconc_floor" } }, { "type": "terrain", @@ -778,7 +778,7 @@ "move_cost": 2, "looks_like": "t_carpet_green", "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], - "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_thconc_floor" } + "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 } ], "ter_set": "t_thconc_floor" } }, { "type": "terrain", @@ -791,7 +791,7 @@ "move_cost": 2, "looks_like": "t_carpet_purple", "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], - "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_thconc_floor" } + "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 } ], "ter_set": "t_thconc_floor" } }, { "type": "terrain", @@ -811,7 +811,7 @@ "str_min_supported": 100, "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] }, - "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_metal_floor" } + "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 } ], "ter_set": "t_metal_floor" } }, { "type": "terrain", @@ -824,7 +824,7 @@ "looks_like": "t_carpet_red", "description": "Firm, low-pile, totally non-flammable carpet in a red color, with an insulation layer beneath.", "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], - "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_metal_floor" } + "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 } ], "ter_set": "t_metal_floor" } }, { "type": "terrain", @@ -838,7 +838,7 @@ "move_cost": 2, "looks_like": "t_carpet_yellow", "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], - "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_metal_floor" } + "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 } ], "ter_set": "t_metal_floor" } }, { "type": "terrain", @@ -851,7 +851,7 @@ "move_cost": 2, "looks_like": "t_carpet_green", "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], - "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_metal_floor" } + "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 } ], "ter_set": "t_metal_floor" } }, { "type": "terrain", @@ -864,7 +864,7 @@ "move_cost": 2, "looks_like": "t_carpet_purple", "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], - "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_metal_floor" } + "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 } ], "ter_set": "t_metal_floor" } }, { "type": "terrain", @@ -884,7 +884,7 @@ "str_min_supported": 100, "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] }, - "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_strconc_floor" } + "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 } ], "ter_set": "t_strconc_floor" } }, { "type": "terrain", @@ -910,7 +910,7 @@ "move_cost": 2, "looks_like": "t_carpet_yellow", "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], - "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_strconc_floor" } + "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 } ], "ter_set": "t_strconc_floor" } }, { "type": "terrain", @@ -923,7 +923,7 @@ "move_cost": 2, "looks_like": "t_carpet_green", "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], - "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_strconc_floor" } + "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 } ], "ter_set": "t_strconc_floor" } }, { "type": "terrain", @@ -936,7 +936,7 @@ "move_cost": 2, "looks_like": "t_carpet_purple", "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], - "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_strconc_floor" } + "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 } ], "ter_set": "t_strconc_floor" } }, { "type": "terrain", From 63db7e360c7f6b04d36228100c7e3f5d1549b033 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Wed, 31 Aug 2022 21:53:06 +0700 Subject: [PATCH 06/10] Update terrain-floors-indoor.json --- data/json/furniture_and_terrain/terrain-floors-indoor.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json index 6d98e3ada4ab8..038850a2459bf 100644 --- a/data/json/furniture_and_terrain/terrain-floors-indoor.json +++ b/data/json/furniture_and_terrain/terrain-floors-indoor.json @@ -737,7 +737,7 @@ "str_min": 5, "str_max": 15, "str_min_supported": 100, - "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] + "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] } ] }, "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 } ], "ter_set": "t_thconc_floor" } }, @@ -809,7 +809,7 @@ "str_min": 5, "str_max": 15, "str_min_supported": 100, - "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] + "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] } ] }, "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 } ], "ter_set": "t_metal_floor" } }, @@ -882,7 +882,7 @@ "str_min": 5, "str_max": 15, "str_min_supported": 100, - "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] + "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] } ] }, "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 } ], "ter_set": "t_strconc_floor" } }, From b52816b6bf1fc34e329f6f764d71701be6d86941 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Thu, 1 Sep 2022 10:19:39 +0700 Subject: [PATCH 07/10] Update construction.json --- data/json/construction.json | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/data/json/construction.json b/data/json/construction.json index dc05c4b21cff8..987e122d101e0 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -3133,6 +3133,54 @@ "pre_terrain": "t_strconc_floor", "post_terrain": "t_carpet_strconcrete_green" }, + { + "type": "construction", + "id": "constr_carpet_metal_red", + "group": "carpet_floor_red", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "r_carpet", 1 ] ] ], + "pre_terrain": "t_metal_floor", + "post_terrain": "t_carpet_metal_red" + }, + { + "type": "construction", + "id": "constr_carpet_metal_purple", + "group": "carpet_floor_purple", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "p_carpet", 1 ] ] ], + "pre_terrain": "t_metal_floor", + "post_terrain": "t_carpet_metal_purple" + }, + { + "type": "construction", + "id": "constr_carpet_metal_yellow", + "group": "carpet_floor_yellow", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "y_carpet", 1 ] ] ], + "pre_terrain": "t_metal_floor", + "post_terrain": "t_carpet_metal_yellow" + }, + { + "type": "construction", + "id": "constr_carpet_metal_green", + "group": "carpet_floor_green", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "duct_tape", 5 ] ], [ [ "g_carpet", 1 ] ] ], + "pre_terrain": "t_metal_floor", + "post_terrain": "t_carpet_metal_green" + }, { "type": "construction", "id": "constr_carpet_rock_red", From 2c6ecbf6c5b1c832823e321dbc0d1d14ad65580a Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Thu, 1 Sep 2022 10:38:20 +0700 Subject: [PATCH 08/10] Update construction.json --- data/json/construction.json | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/data/json/construction.json b/data/json/construction.json index 987e122d101e0..39e62d3be59dd 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -3037,6 +3037,54 @@ "pre_terrain": "t_floor", "post_terrain": "t_carpet_green" }, + { + "type": "construction", + "id": "constr_carpet_wood_red", + "group": "carpet_floor_red", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "r_carpet", 1 ] ] ], + "pre_terrain": "t_floor_noroof", + "post_terrain": "t_carpet_wood_red" + }, + { + "type": "construction", + "id": "constr_carpet_wood_purple", + "group": "carpet_floor_purple", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "p_carpet", 1 ] ] ], + "pre_terrain": "t_floor_noroof", + "post_terrain": "t_carpet_wood_purple" + }, + { + "type": "construction", + "id": "constr_carpet_wood_yellow", + "group": "carpet_floor_yellow", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "y_carpet", 1 ] ] ], + "pre_terrain": "t_floor_noroof", + "post_terrain": "t_carpet_wood_yellow" + }, + { + "type": "construction", + "id": "constr_carpet_wood_green", + "group": "carpet_floor_green", + "category": "DECORATE", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "30 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ], + "components": [ [ [ "nail", 5 ] ], [ [ "g_carpet", 1 ] ] ], + "pre_terrain": "t_floor_noroof", + "post_terrain": "t_carpet_wood_green" + }, { "type": "construction", "id": "constr_carpet_conc_red", From 41983489b4a8b6ab107479ff319f574d7b2487b4 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Thu, 1 Sep 2022 10:45:55 +0700 Subject: [PATCH 09/10] Update terrain-floors-indoor.json --- .../terrain-floors-indoor.json | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json index 038850a2459bf..43e48e759cb94 100644 --- a/data/json/furniture_and_terrain/terrain-floors-indoor.json +++ b/data/json/furniture_and_terrain/terrain-floors-indoor.json @@ -721,6 +721,77 @@ "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_floor" } }, + { + "type": "terrain", + "id": "t_carpet_base_wood", + "name": "carpet", + "description": "Base carpet!", + "symbol": ".", + "color": "red", + "move_cost": 2, + "comfort": 1, + "roof": "t_flat_roof", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_floor", + "str_min": 5, + "str_max": 15, + "str_min_supported": 100, + "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ] + }, + "deconstruct": { "items": [ { "item": "r_carpet", "count": 1 }, { "item": "nail", "charges": [ 2, 5 ] } ], "ter_set": "t_floor" } + }, + { + "type": "terrain", + "id": "t_carpet_wood_red", + "copy-from": "t_carpet_base_wood", + "name": "carpet", + "symbol": ".", + "color": "red", + "connects_to": "CARPET", + "move_cost": 2, + "roof": "t_flat_roof", + "description": "Soft red carpet.", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "ter_set": "t_floor", "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ] } + }, + { + "type": "terrain", + "id": "t_carpet_wood_yellow", + "copy-from": "t_carpet_base_wood", + "name": "yellow carpet", + "description": "Soft yellow carpet.", + "symbol": ".", + "color": "yellow", + "move_cost": 2, + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "y_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_floor" } + }, + { + "type": "terrain", + "id": "t_carpet_wood_green", + "copy-from": "t_carpet_base_wood", + "name": "green carpet", + "description": "Soft green carpet.", + "symbol": ".", + "color": "green", + "move_cost": 2, + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "g_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_floor" } + }, + { + "type": "terrain", + "id": "t_carpet_wood_purple", + "copy-from": "t_carpet_base_wood", + "name": "purple carpet", + "description": "Soft purple carpet.", + "symbol": ".", + "color": "magenta", + "move_cost": 2, + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ], + "deconstruct": { "items": [ { "item": "p_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_floor" } + }, { "type": "terrain", "id": "t_carpet_base_concrete", From 67594d9fb0d51800a8dd0a28e97c07774f35f1f3 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Thu, 15 Sep 2022 18:08:58 +0700 Subject: [PATCH 10/10] Update terrain-floors-indoor.json --- data/json/furniture_and_terrain/terrain-floors-indoor.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json index 43e48e759cb94..98429b134fad4 100644 --- a/data/json/furniture_and_terrain/terrain-floors-indoor.json +++ b/data/json/furniture_and_terrain/terrain-floors-indoor.json @@ -747,6 +747,7 @@ "id": "t_carpet_wood_red", "copy-from": "t_carpet_base_wood", "name": "carpet", + "looks_like": "t_carpet_red", "symbol": ".", "color": "red", "connects_to": "CARPET", @@ -761,6 +762,7 @@ "id": "t_carpet_wood_yellow", "copy-from": "t_carpet_base_wood", "name": "yellow carpet", + "looks_like": "t_carpet_yellow", "description": "Soft yellow carpet.", "symbol": ".", "color": "yellow", @@ -773,6 +775,7 @@ "id": "t_carpet_wood_green", "copy-from": "t_carpet_base_wood", "name": "green carpet", + "looks_like": "t_carpet_green", "description": "Soft green carpet.", "symbol": ".", "color": "green", @@ -785,6 +788,7 @@ "id": "t_carpet_wood_purple", "copy-from": "t_carpet_base_wood", "name": "purple carpet", + "looks_like": "t_carpet_purple", "description": "Soft purple carpet.", "symbol": ".", "color": "magenta",