From 55f003a4e5e5db0410102e4525762783ead56e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C6=A1n=20Phan=20Trung?= <94152483+sonphantrung@users.noreply.github.com> Date: Fri, 17 Jun 2022 20:12:23 +0700 Subject: [PATCH 1/7] Revives manual chain hoist --- data/json/construction.json | 12 ++++++++++++ data/json/construction_group.json | 5 +++++ .../furniture_and_terrain/appliances.json | 19 +++++++++++++++++++ data/json/items/vehicle/engineering.json | 14 ++++++++++++++ 4 files changed, 50 insertions(+) diff --git a/data/json/construction.json b/data/json/construction.json index 0a6da5e2facf4..b36c2b7e35234 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -3209,6 +3209,18 @@ "post_special": "done_appliance", "activity_level": "BRISK_EXERCISE" }, + { + "type": "construction", + "id": "app_chain_hoist", + "group": "place_chain_hoist", + "category": "APPLIANCE", + "required_skills": [ [ "fabrication", 3 ] ], + "time": "5 m", + "qualities": [ [ { "id": "WRENCH", "level": 1 } ], [ { "id": "DRILL", "level": 2 } ], [ { "id": "SCREW", "level": 1 } ] ], + "components": [ [ [ "chain_hoist", 1 ] ] ], + "pre_special": "check_support", + "post_special": "done_appliance" + }, { "type": "construction", "id": "app_minifridge", diff --git a/data/json/construction_group.json b/data/json/construction_group.json index c16b3a45dfee8..a030ebd6a43d0 100644 --- a/data/json/construction_group.json +++ b/data/json/construction_group.json @@ -1324,6 +1324,11 @@ "id": "place_anvil", "name": "Place Anvil" }, + { + "type": "construction_group", + "id": "place_chain_hoist", + "name": "Place Chain Hoist" + }, { "type": "construction_group", "id": "place_forge", diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json index 68c9c7ef835a1..bc925f405f3cb 100644 --- a/data/json/furniture_and_terrain/appliances.json +++ b/data/json/furniture_and_terrain/appliances.json @@ -225,6 +225,25 @@ "item": "kiln", "copy-from": "veh_kiln" }, + { + "type": "vehicle_part", + "id": "ap_chain_hoist", + "name": { "str": "chain hoist" }, + "looks_like": "f_machinery_light", + "symbol": "7", + "color": "yellow_red", + "categories": [ "utility" ], + "location": "center", + "description": "Manual lifting equipment featuring a chain and hook. It could be used to lift heavy loads up to 1.5 metric ton.", + "broken_color": "yellow_red", + "broken_symbol": "x", + "damage_modifier": 10, + "damage_reduction": { "all": 30 }, + "durability": 50, + "qualities": [ [ "LIFT", 3 ] ], + "item": "chain_hoist", + "flags": [ "APPLIANCE" ] + }, { "type": "vehicle_part", "id": "ap_drill_press", diff --git a/data/json/items/vehicle/engineering.json b/data/json/items/vehicle/engineering.json index aa1bf7ac2aa83..17b0d16f0b7fb 100644 --- a/data/json/items/vehicle/engineering.json +++ b/data/json/items/vehicle/engineering.json @@ -1,4 +1,18 @@ [ + { + "id": "chain_hoist", + "type": "GENERIC", + "category": "veh_parts", + "name": { "str": "chain hoist" }, + "description": "Manual lifting equipment featuring a chain and hook. It could be used to lift heavy loads up to 1.5 metric ton.", + "price": 13400, + "price_postapoc": 2000, + "weight": "14600 g", + "volume": "10500 ml", + "material": [ "steel" ], + "symbol": "&", + "color": "dark_gray" + }, { "id": "cantilever_medium", "type": "GENERIC", From 6031bcbbed22fcc037e34ea5a7c25a3754ce9d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C6=A1n=20Phan=20Trung?= <94152483+sonphantrung@users.noreply.github.com> Date: Sat, 18 Jun 2022 17:29:35 +0700 Subject: [PATCH 2/7] Added crafting recipes --- data/json/furniture_and_terrain/appliances.json | 8 +++++++- data/json/recipes/other/vehicle.json | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json index bc925f405f3cb..dbbdd140257a2 100644 --- a/data/json/furniture_and_terrain/appliances.json +++ b/data/json/furniture_and_terrain/appliances.json @@ -234,13 +234,19 @@ "color": "yellow_red", "categories": [ "utility" ], "location": "center", - "description": "Manual lifting equipment featuring a chain and hook. It could be used to lift heavy loads up to 1.5 metric ton.", + "description": "Manual lifting equipment featuring a chain and hook. It could be used to lift heavy loads up to 1.5 metric tons.", "broken_color": "yellow_red", "broken_symbol": "x", "damage_modifier": 10, "damage_reduction": { "all": 30 }, "durability": 50, + "breaks_into": [ { "item": "pipe", "count": [ 2, 20 ] }, { "item": "scrap", "count": [ 2, 12 ] } ], "qualities": [ [ "LIFT", 3 ] ], + "requirements": { + "install": { "skills": [ [ "mechanics", 5 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, + "removal": { "skills": [ [ "mechanics", 3 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] } + }, "item": "chain_hoist", "flags": [ "APPLIANCE" ] }, diff --git a/data/json/recipes/other/vehicle.json b/data/json/recipes/other/vehicle.json index 52705ccd6b4c6..b07a26760e8d4 100644 --- a/data/json/recipes/other/vehicle.json +++ b/data/json/recipes/other/vehicle.json @@ -1,4 +1,19 @@ [ + { + "result": "chain_hoist", + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_VEHICLE", + "skill_used": "mechanics", + "skills_required": [ "fabrication", 3 ], + "difficulty": 5, + "time": "360 m", + "book_learn": [ [ "textbook_fabrication", 6 ], [ "textbook_mechanics", 5 ] ], + "using": [ [ "welding_standard", 5 ], [ "steel_standard", 1 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ [ [ "pipe", 20 ] ], [ [ "chain", 1 ] ] ] + }, { "result": "cantilever_medium", "type": "recipe", From aa57116757e8da4cc7aef6c18b21075101d485f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C6=A1n=20Phan=20Trung?= <94152483+sonphantrung@users.noreply.github.com> Date: Sat, 18 Jun 2022 18:03:55 +0700 Subject: [PATCH 3/7] Added funiture and spawns --- .../furniture-appliances.json | 33 +++++++++++++++++++ data/json/mapgen/garage.json | 6 ++-- data/json/recipes/other/vehicle.json | 2 +- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index 6d6c01ead3af7..330da5a89890a 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/data/json/furniture_and_terrain/furniture-appliances.json @@ -82,6 +82,39 @@ ] } }, + { + "type": "furniture", + "id": "f_chain_hoist", + "name": "chain hoist", + "looks_like": "f_machinery_light", + "description": "Manual lifting equipment featuring a chain and hook. It could be used to lift heavy loads up to 1.5 metric tons when converted into an appliance.", + "symbol": "7", + "color": "yellow_red", + "move_cost_mod": -1, + "coverage": 65, + "required_str": -1, + "examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "chain_hoist" }, + "deconstruct": { + "items": [ + { "item": "pipe", "count": [ 18, 20 ] }, + { "item": "chain", "prob": 80 }, + { "item": "grip_hook", "prob": 95 }, + { "item": "steel_chunk", "count": [ 1, 4 ] } + ] + }, + "bash": { + "str_min": 16, + "str_max": 80, + "sound": "clang!", + "sound_fail": "ting.", + "items": [ + { "item": "pipe", "count": 2, "prob": 80 }, + { "item": "chain", "prob": 40 }, + { "item": "scrap", "count": [ 3, 8 ] }, + { "item": "steel_chunk", "count": [ 1, 2 ] } + ] + } + }, { "type": "furniture", "id": "f_dishwasher", diff --git a/data/json/mapgen/garage.json b/data/json/mapgen/garage.json index 3c18dfcb649f8..5cab873fbf50a 100644 --- a/data/json/mapgen/garage.json +++ b/data/json/mapgen/garage.json @@ -20,7 +20,7 @@ " |c..M#MM#M....M#MM#M.|,", " |c..M#MM#M....M#MM#M.|,", " |K..MMMMMMMMMMMMMMMM.|,", - " |m...................|,", + " |m..................á|,", " |---l...........HHHHH|,", " |ts|c...........HLLLL|,", " |-+|p...........Hbbbb|,", @@ -34,6 +34,7 @@ ], "terrain": { " ": "t_region_groundcover_urban", + "á": "f_chain_hoist", "E": "t_pavement", ",": "t_concrete", "U": "t_concrete", @@ -263,7 +264,7 @@ " |..MMMMMM..|-+-|f6ddd|X", " |m.........|&.s|-----|X", " |---....---|---|LLLLL|X", - " |..............|bbbbb|X", + " |á.............|bbbbb|X", " |WWWW..WWWW|...+.....|X", " |c........c|-------+-|X", " |c.xx..xx.p|xx.+T|<..OX", @@ -275,6 +276,7 @@ ], "terrain": { " ": "t_region_groundcover_urban", + "á": "f_chain_hoist", "E": "t_pavement", "X": "t_sidewalk", "U": "t_sidewalk", diff --git a/data/json/recipes/other/vehicle.json b/data/json/recipes/other/vehicle.json index b07a26760e8d4..9b14031c7ec9c 100644 --- a/data/json/recipes/other/vehicle.json +++ b/data/json/recipes/other/vehicle.json @@ -12,7 +12,7 @@ "book_learn": [ [ "textbook_fabrication", 6 ], [ "textbook_mechanics", 5 ] ], "using": [ [ "welding_standard", 5 ], [ "steel_standard", 1 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "components": [ [ [ "pipe", 20 ] ], [ [ "chain", 1 ] ] ] + "components": [ [ [ "pipe", 20 ] ], [ [ "chain", 1 ] ], [ [ "grip_hook", 1 ] ] ] }, { "result": "cantilever_medium", From 353a58c99aaec5a50f8d64293d98b15f6467cb1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C6=A1n=20Phan=20Trung?= <94152483+sonphantrung@users.noreply.github.com> Date: Sat, 18 Jun 2022 19:42:39 +0700 Subject: [PATCH 4/7] Update data/json/items/vehicle/engineering.json Co-authored-by: Anton Burmistrov --- data/json/items/vehicle/engineering.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/vehicle/engineering.json b/data/json/items/vehicle/engineering.json index 17b0d16f0b7fb..95891bbe754fd 100644 --- a/data/json/items/vehicle/engineering.json +++ b/data/json/items/vehicle/engineering.json @@ -4,7 +4,7 @@ "type": "GENERIC", "category": "veh_parts", "name": { "str": "chain hoist" }, - "description": "Manual lifting equipment featuring a chain and hook. It could be used to lift heavy loads up to 1.5 metric ton.", + "description": "Manual lifting equipment featuring a chain and hook. It could be used to lift heavy loads up to 1.5 metric tons.", "price": 13400, "price_postapoc": 2000, "weight": "14600 g", From c64facdd47a7b64c2231997549e40534f24b8b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C6=A1n=20Phan=20Trung?= <94152483+sonphantrung@users.noreply.github.com> Date: Sat, 18 Jun 2022 19:45:30 +0700 Subject: [PATCH 5/7] Fixes --- data/json/mapgen/garage.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/mapgen/garage.json b/data/json/mapgen/garage.json index 5cab873fbf50a..ea14e7d89aadb 100644 --- a/data/json/mapgen/garage.json +++ b/data/json/mapgen/garage.json @@ -34,7 +34,6 @@ ], "terrain": { " ": "t_region_groundcover_urban", - "á": "f_chain_hoist", "E": "t_pavement", ",": "t_concrete", "U": "t_concrete", @@ -57,6 +56,7 @@ }, "furniture": { "6": "f_console_broken", + "á": "f_chain_hoist", "A": "f_air_conditioner", "L": "f_locker", "b": "f_bench", @@ -276,7 +276,6 @@ ], "terrain": { " ": "t_region_groundcover_urban", - "á": "f_chain_hoist", "E": "t_pavement", "X": "t_sidewalk", "U": "t_sidewalk", @@ -300,6 +299,7 @@ }, "toilets": { "&": { } }, "furniture": { + "á": "f_chain_hoist", "6": "f_console_broken", "A": "f_air_conditioner", "L": "f_locker", From 77982ec19fcc07977c512cc1aaae9786ad573d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C6=A1n=20Phan=20Trung?= <94152483+sonphantrung@users.noreply.github.com> Date: Sat, 18 Jun 2022 19:46:36 +0700 Subject: [PATCH 6/7] Adjust grip hook recipe --- data/json/recipes/other/vehicle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/other/vehicle.json b/data/json/recipes/other/vehicle.json index 9b14031c7ec9c..b4475df3e4e1b 100644 --- a/data/json/recipes/other/vehicle.json +++ b/data/json/recipes/other/vehicle.json @@ -12,7 +12,7 @@ "book_learn": [ [ "textbook_fabrication", 6 ], [ "textbook_mechanics", 5 ] ], "using": [ [ "welding_standard", 5 ], [ "steel_standard", 1 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "components": [ [ [ "pipe", 20 ] ], [ [ "chain", 1 ] ], [ [ "grip_hook", 1 ] ] ] + "components": [ [ [ "pipe", 20 ] ], [ [ "chain", 1 ] ], [ [ "grip_hook", 2 ] ] ] }, { "result": "cantilever_medium", From e61a73836b81e18ee4214aeb2063d11ee2857b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C6=A1n=20Phan=20Trung?= <94152483+sonphantrung@users.noreply.github.com> Date: Sun, 19 Jun 2022 11:28:44 +0700 Subject: [PATCH 7/7] Update --- data/json/furniture_and_terrain/furniture-appliances.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index 330da5a89890a..be4b2594b848f 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/data/json/furniture_and_terrain/furniture-appliances.json @@ -98,7 +98,7 @@ "items": [ { "item": "pipe", "count": [ 18, 20 ] }, { "item": "chain", "prob": 80 }, - { "item": "grip_hook", "prob": 95 }, + { "item": "grip_hook", "count": [ 1, 2 ] }, { "item": "steel_chunk", "count": [ 1, 4 ] } ] },